mapping

gradle.properties

@@ -5,9 +5,9 @@ org.gradle.jvmargs=-Xmx1G
 	# check these on https://fabricmc.net/use
     # or better: https://modmuss50.me/fabric.html
 	minecraft_version=21w13a
-	yarn_mappings=21w13a+build.55
+	yarn_mappings=21w13a+build.59
 	loader_version=0.11.3
-	fabric_version=0.32.6+1.17
+	fabric_version=0.32.7+1.17
 
 # Mod Properties
 	mod_version = 1.4.30

src/main/java/carpet/mixins/BastionRemnantFeatureMixin.java

@@ -4,8 +4,8 @@ import carpet.CarpetSettings;
 
 import com.google.common.collect.Lists;
 import com.mojang.serialization.Codec;
-import net.minecraft.class_6012;
 import net.minecraft.entity.EntityType;
+import net.minecraft.util.collection.Pool;
 import net.minecraft.world.MobSpawnerLogic;
 import net.minecraft.world.biome.SpawnSettings;
 import net.minecraft.world.gen.feature.BastionRemnantFeature;
@@ -20,7 +20,7 @@ import java.util.List;
 @Mixin(BastionRemnantFeature.class)
 public abstract class BastionRemnantFeatureMixin extends JigsawFeature
 {
-    private static final class_6012<SpawnSettings.SpawnEntry> spawnList = class_6012.method_34989(
+    private static final Pool<SpawnSettings.SpawnEntry> spawnList = Pool.of(
             new SpawnSettings.SpawnEntry(EntityType.PIGLIN_BRUTE, 5, 1, 2),
             new SpawnSettings.SpawnEntry(EntityType.PIGLIN, 10, 2, 4),
             new SpawnSettings.SpawnEntry(EntityType.HOGLIN, 2, 1, 2)
@@ -32,7 +32,7 @@ public abstract class BastionRemnantFeatureMixin extends JigsawFeature
     }
 
     @Override
-    public class_6012<SpawnSettings.SpawnEntry> getMonsterSpawns()
+    public Pool<SpawnSettings.SpawnEntry> getMonsterSpawns()
     {
         if (CarpetSettings.piglinsSpawningInBastions)
             return spawnList;

src/main/java/carpet/mixins/DesertPyramidFeatureMixin.java

@@ -3,8 +3,8 @@ package carpet.mixins;
 import carpet.CarpetSettings;
 import com.google.common.collect.Lists;
 import com.mojang.serialization.Codec;
-import net.minecraft.class_6012;
 import net.minecraft.entity.EntityType;
+import net.minecraft.util.collection.Pool;
 import net.minecraft.world.biome.SpawnSettings;
 import net.minecraft.world.gen.feature.DefaultFeatureConfig;
 import net.minecraft.world.gen.feature.DesertPyramidFeature;
@@ -17,11 +17,11 @@ import java.util.List;
 @Mixin(DesertPyramidFeature.class)
 public abstract class DesertPyramidFeatureMixin extends StructureFeature<DefaultFeatureConfig>
 {
-    private static final class_6012<SpawnSettings.SpawnEntry> MONSTER_SPAWNS;
+    private static final Pool<SpawnSettings.SpawnEntry> MONSTER_SPAWNS;
     
     static
     {
-        MONSTER_SPAWNS = class_6012.method_34989(new SpawnSettings.SpawnEntry(EntityType.HUSK, 1, 1, 1));
+        MONSTER_SPAWNS = Pool.of(new SpawnSettings.SpawnEntry(EntityType.HUSK, 1, 1, 1));
     }
 
     public DesertPyramidFeatureMixin(Codec<DefaultFeatureConfig> codec)
@@ -31,7 +31,7 @@ public abstract class DesertPyramidFeatureMixin extends StructureFeature<Default
 
 
     @Override
-    public class_6012<SpawnSettings.SpawnEntry> getMonsterSpawns()
+    public Pool<SpawnSettings.SpawnEntry> getMonsterSpawns()
     {
         if (CarpetSettings.huskSpawningInTemples)
         {

src/main/java/carpet/mixins/EndCityFeatureMixin.java

@@ -3,8 +3,8 @@ package carpet.mixins;
 import carpet.CarpetSettings;
 import com.google.common.collect.Lists;
 import com.mojang.serialization.Codec;
-import net.minecraft.class_6012;
 import net.minecraft.entity.EntityType;
+import net.minecraft.util.collection.Pool;
 import net.minecraft.world.biome.SpawnSettings;
 import net.minecraft.world.gen.feature.DefaultFeatureConfig;
 import net.minecraft.world.gen.feature.EndCityFeature;
@@ -17,7 +17,7 @@ import java.util.List;
 @Mixin(EndCityFeature.class)
 public abstract class EndCityFeatureMixin extends StructureFeature<DefaultFeatureConfig>
 {
-    private static final class_6012<SpawnSettings.SpawnEntry> spawnList = class_6012.method_34989(new SpawnSettings.SpawnEntry(EntityType.SHULKER, 10, 4, 4));
+    private static final Pool<SpawnSettings.SpawnEntry> spawnList = Pool.of(new SpawnSettings.SpawnEntry(EntityType.SHULKER, 10, 4, 4));
 
     public EndCityFeatureMixin(Codec<DefaultFeatureConfig> codec)
     {
@@ -25,7 +25,7 @@ public abstract class EndCityFeatureMixin extends StructureFeature<DefaultFeatur
     }
 
     @Override
-    public class_6012<SpawnSettings.SpawnEntry> getMonsterSpawns()
+    public Pool<SpawnSettings.SpawnEntry> getMonsterSpawns()
     {
         if (CarpetSettings.shulkerSpawningInEndCities)
             return spawnList;

src/main/java/carpet/mixins/FlatChunkGeneratorMixin.java

@@ -1,8 +1,8 @@
 package carpet.mixins;
 
 import carpet.CarpetSettings;
-import net.minecraft.class_6012;
 import net.minecraft.entity.SpawnGroup;
+import net.minecraft.util.collection.Pool;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.SpawnSettings;
@@ -26,7 +26,7 @@ public abstract class FlatChunkGeneratorMixin extends ChunkGenerator
     }
 
     @Override
-    public class_6012<SpawnSettings.SpawnEntry> getEntitySpawnList(Biome biome, StructureAccessor accessor, SpawnGroup group, BlockPos pos)
+    public Pool<SpawnSettings.SpawnEntry> getEntitySpawnList(Biome biome, StructureAccessor accessor, SpawnGroup group, BlockPos pos)
     {
         if (CarpetSettings.flatWorldStructureSpawning)
         {

src/main/java/carpet/mixins/NoiseChunkGenerator_husksSpawnMixin.java

@@ -1,8 +1,8 @@
 package carpet.mixins;
 
 import carpet.CarpetSettings;
-import net.minecraft.class_6012;
 import net.minecraft.entity.SpawnGroup;
+import net.minecraft.util.collection.Pool;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.SpawnSettings;
@@ -30,7 +30,7 @@ public abstract class NoiseChunkGenerator_husksSpawnMixin extends ChunkGenerator
     }
 
     @Inject(method = "getEntitySpawnList", at = @At("HEAD"), cancellable = true)
-    private void isInsidePyramid(Biome biome, StructureAccessor accessor, SpawnGroup group, BlockPos pos, CallbackInfoReturnable<class_6012<SpawnSettings.SpawnEntry>> cir)
+    private void isInsidePyramid(Biome biome, StructureAccessor accessor, SpawnGroup group, BlockPos pos, CallbackInfoReturnable<Pool<SpawnSettings.SpawnEntry>> cir)
     {
         if (CarpetSettings.huskSpawningInTemples && group == SpawnGroup.MONSTER)
         {

src/main/java/carpet/utils/PerimeterDiagnostics.java

@@ -159,10 +159,10 @@ public class PerimeterDiagnostics
 
     private boolean check_entity_spawn(BlockPos pos)
     {
-        if (sle == null || !worldServer.getChunkManager().getChunkGenerator().getEntitySpawnList(worldServer.getBiome(pos), worldServer.getStructureAccessor(), ctype, pos).method_34994().contains(sle))
+        if (sle == null || !worldServer.getChunkManager().getChunkGenerator().getEntitySpawnList(worldServer.getBiome(pos), worldServer.getStructureAccessor(), ctype, pos).getEntries().contains(sle))
         {
             sle = null;
-            for (SpawnSettings.SpawnEntry sle: worldServer.getChunkManager().getChunkGenerator().getEntitySpawnList(worldServer.getBiome(pos), worldServer.getStructureAccessor(), ctype, pos).method_34994())
+            for (SpawnSettings.SpawnEntry sle: worldServer.getChunkManager().getChunkGenerator().getEntitySpawnList(worldServer.getBiome(pos), worldServer.getStructureAccessor(), ctype, pos).getEntries())
             {
                 if (el.getType() == sle.type)
                 {
@@ -170,7 +170,7 @@ public class PerimeterDiagnostics
                     break;
                 }
             }
-            if (sle == null || !worldServer.getChunkManager().getChunkGenerator().getEntitySpawnList(worldServer.getBiome(pos), worldServer.getStructureAccessor(), ctype, pos).method_34994().contains(sle))
+            if (sle == null || !worldServer.getChunkManager().getChunkGenerator().getEntitySpawnList(worldServer.getBiome(pos), worldServer.getStructureAccessor(), ctype, pos).getEntries().contains(sle))
             {
                 return false;
             }

src/main/java/carpet/utils/SpawnReporter.java

@@ -420,7 +420,7 @@ public class SpawnReporter
 
     // yeeted from SpawnHelper - temporary fix
     private static List<SpawnSettings.SpawnEntry> method_29950(ServerWorld serverWorld, StructureAccessor structureAccessor, ChunkGenerator chunkGenerator, SpawnGroup spawnGroup, BlockPos blockPos, /*@Nullable*/ Biome biome) {
-        return spawnGroup == SpawnGroup.MONSTER && serverWorld.getBlockState(blockPos.down()).getBlock() == Blocks.NETHER_BRICKS && structureAccessor.getStructureAt(blockPos, false, StructureFeature.FORTRESS).hasChildren() ? StructureFeature.FORTRESS.getMonsterSpawns().method_34994() : chunkGenerator.getEntitySpawnList(biome != null ? biome : serverWorld.getBiome(blockPos), structureAccessor, spawnGroup, blockPos).method_34994();
+        return spawnGroup == SpawnGroup.MONSTER && serverWorld.getBlockState(blockPos.down()).getBlock() == Blocks.NETHER_BRICKS && structureAccessor.getStructureAt(blockPos, false, StructureFeature.FORTRESS).hasChildren() ? StructureFeature.FORTRESS.getMonsterSpawns().getEntries() : chunkGenerator.getEntitySpawnList(biome != null ? biome : serverWorld.getBiome(blockPos), structureAccessor, spawnGroup, blockPos).getEntries();
     }
 
     public static List<BaseText> report(BlockPos pos, ServerWorld worldIn)