Corrected wolf variant spawn reasons list

Updated cloud-paper to resolve warning message

buildSrc/src/main/kotlin/Versions.kt

@@ -28,7 +28,7 @@ object Versions {
     }
     
     object Fabric {
-        const val fabricAPI = "0.128.1+${Mod.minecraft}"
+        const val fabricAPI = "0.129.0+${Mod.minecraft}"
         const val cloud = "2.0.0-beta.11"
     }
 //
@@ -41,7 +41,7 @@ object Versions {
         const val mixin = "0.15.5+mixin.0.8.7"
         const val mixinExtras = "0.4.1"
         
-        const val minecraft = "1.21.7"
+        const val minecraft = "1.21.8"
         const val yarn = "$minecraft+build.1"
         const val fabricLoader = "0.16.14"
         
@@ -56,15 +56,15 @@ object Versions {
 //    }
     
     object Bukkit {
-        const val minecraft = "1.21.7-R0.1"
-        const val paperBuild = "$minecraft-20250630.144242-1"
+        const val minecraft = "1.21.8-R0.1"
+        const val paperBuild = "$minecraft-20250717.233435-4"
         const val paper = paperBuild
         const val paperLib = "1.0.8"
         const val reflectionRemapper = "0.1.2"
         const val paperDevBundle = paperBuild
         const val runPaper = "2.3.1"
         const val paperWeight = "2.0.0-beta.17"
-        const val cloud = "2.0.0-beta.10"
+        const val cloud = "2.0.0-beta.11"
         const val multiverse = "5.0.2"
     }
     

platforms/bukkit/build.gradle.kts

@@ -8,7 +8,7 @@ dependencies {
     paperweight.paperDevBundle(Versions.Bukkit.paperDevBundle)
 
     shaded(project(":platforms:bukkit:common"))
-    shaded(project(":platforms:bukkit:nms:v1_21_7"))
+    shaded(project(":platforms:bukkit:nms:v1_21_8"))
     shaded("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper)
 }
 

platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java

@@ -27,6 +27,7 @@ import com.dfsek.terra.bukkit.world.BukkitPlatformBiome;
 
 import org.bukkit.NamespacedKey;
 import org.bukkit.World;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Wolf;
 import org.bukkit.entity.Wolf.Variant;
 import org.bukkit.event.EventHandler;
@@ -34,6 +35,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
 import org.bukkit.event.server.PluginEnableEvent;
+import org.bukkit.event.world.ChunkLoadEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -46,7 +48,7 @@ import java.util.List;
 public class CommonListener implements Listener {
     private static final Logger logger = LoggerFactory.getLogger(CommonListener.class);
     private static final List<SpawnReason> WOLF_VARIANT_SPAWN_REASONS = List.of(
-        SpawnReason.SPAWNER, SpawnReason.TRIAL_SPAWNER, SpawnReason.SPAWNER_EGG, SpawnReason.DEFAULT
+        SpawnReason.SPAWNER, SpawnReason.TRIAL_SPAWNER, SpawnReason.SPAWNER_EGG, SpawnReason.NATURAL
     );
     private final Platform platform;
 
@@ -68,21 +70,12 @@ public class CommonListener implements Listener {
         }
     }
 
-    @EventHandler
-    public void onWolfSpawn(CreatureSpawnEvent event) {
-        if (!(event.getEntity() instanceof Wolf wolf)) {
-            return;
-        }
-
+    private void applyWolfVariant(Wolf wolf) {
         // Doesn't apply if variant has already been applied
         if (wolf.getVariant() != Variant.PALE) {
             return;
         }
 
-        if (!WOLF_VARIANT_SPAWN_REASONS.contains(event.getSpawnReason())) {
-            return;
-        }
-
         World world = wolf.getWorld();
         if (!(world.getGenerator() instanceof BukkitChunkGeneratorWrapper wrapper)) {
             return;
@@ -113,4 +106,31 @@ public class CommonListener implements Listener {
                 }
             });
     }
+
+    @EventHandler
+    public void onWolfSpawn(CreatureSpawnEvent event) {
+        if (!(event.getEntity() instanceof Wolf wolf)) {
+            return;
+        }
+
+        if (!WOLF_VARIANT_SPAWN_REASONS.contains(event.getSpawnReason())) {
+            logger.debug("Ignoring wolf spawned with reason: " + event.getSpawnReason());
+            return;
+        }
+
+        applyWolfVariant(wolf);
+    }
+
+    @EventHandler
+    public void onChunkGenerate(ChunkLoadEvent event) {
+        if (!event.isNewChunk()) {
+            return;
+        }
+
+        for (Entity entity : event.getChunk().getEntities()) {
+            if (entity instanceof Wolf wolf) {
+                applyWolfVariant(wolf);
+            }
+        }
+    }
 }

platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java

@@ -47,8 +47,8 @@ public interface Initializer {
     private static PlatformImpl constructPlatform(TerraBukkitPlugin plugin) {
         try {
             String packageVersion = NMS;
-            if (NMS.equals("v1_21_5") || NMS.equals("v1_21_6")) {
-                packageVersion = "v1_21_7";
+            if (NMS.equals("v1_21_5") || NMS.equals("v1_21_6") || NMS.equals("v1_21_7")) {
+                packageVersion = "v1_21_8";
             }
 
             Class<?> platformClass = Class.forName(TERRA_PACKAGE + "." + packageVersion + ".NMSPlatform");

platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/AwfulBukkitHacks.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.bukkit.nms.v1_21_7;
+package com.dfsek.terra.bukkit.nms.v1_21_8;
 
-import com.dfsek.terra.bukkit.nms.v1_21_7.config.VanillaBiomeProperties;
+import com.dfsek.terra.bukkit.nms.v1_21_8.config.VanillaBiomeProperties;
 
 import com.dfsek.terra.bukkit.world.BukkitBiomeInfo;
 

platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSAddon.java

@@ -1,11 +1,11 @@
-package com.dfsek.terra.bukkit.nms.v1_21_7;
+package com.dfsek.terra.bukkit.nms.v1_21_8;
 
 import com.dfsek.terra.api.event.events.config.ConfigurationLoadEvent;
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.bukkit.BukkitAddon;
 import com.dfsek.terra.bukkit.PlatformImpl;
-import com.dfsek.terra.bukkit.nms.v1_21_7.config.VanillaBiomeProperties;
+import com.dfsek.terra.bukkit.nms.v1_21_8.config.VanillaBiomeProperties;
 
 
 public class NMSAddon extends BukkitAddon {

platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSBiomeInfo.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_7;
+package com.dfsek.terra.bukkit.nms.v1_21_8;
 
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.level.biome.Biome;

platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSBiomeInjector.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_7;
+package com.dfsek.terra.bukkit.nms.v1_21_8;
 
 import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
@@ -12,7 +12,7 @@ import java.util.Objects;
 import java.util.Optional;
 
 import com.dfsek.terra.api.config.ConfigPack;
-import com.dfsek.terra.bukkit.nms.v1_21_7.config.VanillaBiomeProperties;
+import com.dfsek.terra.bukkit.nms.v1_21_8.config.VanillaBiomeProperties;
 
 
 public class NMSBiomeInjector {

platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSBiomeProvider.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_7;
+package com.dfsek.terra.bukkit.nms.v1_21_8;
 
 import com.mojang.serialization.MapCodec;
 import net.minecraft.core.Holder;

platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSChunkGeneratorDelegate.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_7;
+package com.dfsek.terra.bukkit.nms.v1_21_8;
 
 import com.mojang.serialization.MapCodec;
 import net.minecraft.core.BlockPos;

platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSInjectListener.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_7;
+package com.dfsek.terra.bukkit.nms.v1_21_8;
 
 import net.minecraft.server.level.ChunkMap;
 import net.minecraft.server.level.ServerLevel;

platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSPlatform.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_7;
+package com.dfsek.terra.bukkit.nms.v1_21_8;
 
 import com.dfsek.tectonic.api.TypeRegistry;
 
@@ -12,22 +12,22 @@ import com.dfsek.terra.api.world.biome.PlatformBiome;
 import com.dfsek.terra.bukkit.PlatformImpl;
 import com.dfsek.terra.bukkit.TerraBukkitPlugin;
 
-import com.dfsek.terra.bukkit.nms.v1_21_7.config.BiomeAdditionsSoundTemplate;
-import com.dfsek.terra.bukkit.nms.v1_21_7.config.BiomeMoodSoundTemplate;
-import com.dfsek.terra.bukkit.nms.v1_21_7.config.BiomeParticleConfigTemplate;
-import com.dfsek.terra.bukkit.nms.v1_21_7.config.EntityTypeTemplate;
+import com.dfsek.terra.bukkit.nms.v1_21_8.config.BiomeAdditionsSoundTemplate;
+import com.dfsek.terra.bukkit.nms.v1_21_8.config.BiomeMoodSoundTemplate;
+import com.dfsek.terra.bukkit.nms.v1_21_8.config.BiomeParticleConfigTemplate;
+import com.dfsek.terra.bukkit.nms.v1_21_8.config.EntityTypeTemplate;
 
-import com.dfsek.terra.bukkit.nms.v1_21_7.config.MusicSoundTemplate;
+import com.dfsek.terra.bukkit.nms.v1_21_8.config.MusicSoundTemplate;
 
-import com.dfsek.terra.bukkit.nms.v1_21_7.config.SoundEventTemplate;
+import com.dfsek.terra.bukkit.nms.v1_21_8.config.SoundEventTemplate;
 
-import com.dfsek.terra.bukkit.nms.v1_21_7.config.SpawnCostConfig;
+import com.dfsek.terra.bukkit.nms.v1_21_8.config.SpawnCostConfig;
 
-import com.dfsek.terra.bukkit.nms.v1_21_7.config.SpawnEntryConfig;
-import com.dfsek.terra.bukkit.nms.v1_21_7.config.SpawnSettingsTemplate;
-import com.dfsek.terra.bukkit.nms.v1_21_7.config.SpawnTypeConfig;
+import com.dfsek.terra.bukkit.nms.v1_21_8.config.SpawnEntryConfig;
+import com.dfsek.terra.bukkit.nms.v1_21_8.config.SpawnSettingsTemplate;
+import com.dfsek.terra.bukkit.nms.v1_21_8.config.SpawnTypeConfig;
 
-import com.dfsek.terra.bukkit.nms.v1_21_7.config.VillagerTypeTemplate;
+import com.dfsek.terra.bukkit.nms.v1_21_8.config.VillagerTypeTemplate;
 
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.Music;

platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSWorldProperties.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_7;
+package com.dfsek.terra.bukkit.nms.v1_21_8;
 
 import net.minecraft.world.level.LevelHeightAccessor;
 

platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/Reflection.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_7;
+package com.dfsek.terra.bukkit.nms.v1_21_8;
 
 import net.minecraft.core.Holder;
 import net.minecraft.core.Holder.Reference;

platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/RegistryFetcher.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_7;
+package com.dfsek.terra.bukkit.nms.v1_21_8;
 
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.Registries;

platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/BiomeAdditionsSoundTemplate.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_7.config;
+package com.dfsek.terra.bukkit.nms.v1_21_8.config;
 
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;

platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/BiomeMoodSoundTemplate.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_7.config;
+package com.dfsek.terra.bukkit.nms.v1_21_8.config;
 
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;

platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/BiomeParticleConfigTemplate.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_7.config;
+package com.dfsek.terra.bukkit.nms.v1_21_8.config;
 
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
@@ -7,10 +7,7 @@ import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.commands.arguments.ParticleArgument;
 import net.minecraft.core.HolderLookup;
-import net.minecraft.core.HolderLookup.Provider;
-import net.minecraft.core.HolderLookup.RegistryLookup;
 import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.core.registries.Registries;
 import net.minecraft.world.level.biome.AmbientParticleSettings;
 
 import java.util.stream.Stream;

platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/EntityTypeTemplate.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_7.config;
+package com.dfsek.terra.bukkit.nms.v1_21_8.config;
 
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;

platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/MusicSoundTemplate.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_7.config;
+package com.dfsek.terra.bukkit.nms.v1_21_8.config;
 
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;

platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/SoundEventTemplate.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_7.config;
+package com.dfsek.terra.bukkit.nms.v1_21_8.config;
 
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;

platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/SpawnCostConfig.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_7.config;
+package com.dfsek.terra.bukkit.nms.v1_21_8.config;
 
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;

platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/SpawnEntryConfig.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_7.config;
+package com.dfsek.terra.bukkit.nms.v1_21_8.config;
 
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;

platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/SpawnSettingsTemplate.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_7.config;
+package com.dfsek.terra.bukkit.nms.v1_21_8.config;
 
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;

platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/SpawnTypeConfig.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_7.config;
+package com.dfsek.terra.bukkit.nms.v1_21_8.config;
 
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;

platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/VanillaBiomeProperties.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_7.config;
+package com.dfsek.terra.bukkit.nms.v1_21_8.config;
 
 import com.dfsek.tectonic.api.config.template.ConfigTemplate;
 import com.dfsek.tectonic.api.config.template.annotations.Default;

platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/VillagerTypeTemplate.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_21_7.config;
+package com.dfsek.terra.bukkit.nms.v1_21_8.config;
 
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;