From 75a823f99407a00c11358c3299b199e898dd5da2 Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 7 Apr 2021 19:05:45 -0300 Subject: [PATCH] mapping --- gradle.properties | 4 ++-- .../java/carpet/mixins/BastionRemnantFeatureMixin.java | 6 +++--- .../java/carpet/mixins/DesertPyramidFeatureMixin.java | 8 ++++---- src/main/java/carpet/mixins/EndCityFeatureMixin.java | 6 +++--- src/main/java/carpet/mixins/FlatChunkGeneratorMixin.java | 4 ++-- .../mixins/NoiseChunkGenerator_husksSpawnMixin.java | 4 ++-- src/main/java/carpet/utils/PerimeterDiagnostics.java | 6 +++--- src/main/java/carpet/utils/SpawnReporter.java | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/gradle.properties b/gradle.properties index caa9c9c8..a4dc4896 100644 --- a/gradle.properties +++ b/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 diff --git a/src/main/java/carpet/mixins/BastionRemnantFeatureMixin.java b/src/main/java/carpet/mixins/BastionRemnantFeatureMixin.java index 9e3024cf..497d0c71 100644 --- a/src/main/java/carpet/mixins/BastionRemnantFeatureMixin.java +++ b/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 spawnList = class_6012.method_34989( + private static final Pool 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 getMonsterSpawns() + public Pool getMonsterSpawns() { if (CarpetSettings.piglinsSpawningInBastions) return spawnList; diff --git a/src/main/java/carpet/mixins/DesertPyramidFeatureMixin.java b/src/main/java/carpet/mixins/DesertPyramidFeatureMixin.java index 379f8bcf..842c8a73 100644 --- a/src/main/java/carpet/mixins/DesertPyramidFeatureMixin.java +++ b/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 { - private static final class_6012 MONSTER_SPAWNS; + private static final Pool 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 codec) @@ -31,7 +31,7 @@ public abstract class DesertPyramidFeatureMixin extends StructureFeature getMonsterSpawns() + public Pool getMonsterSpawns() { if (CarpetSettings.huskSpawningInTemples) { diff --git a/src/main/java/carpet/mixins/EndCityFeatureMixin.java b/src/main/java/carpet/mixins/EndCityFeatureMixin.java index 6deefc73..641a2f55 100644 --- a/src/main/java/carpet/mixins/EndCityFeatureMixin.java +++ b/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 { - private static final class_6012 spawnList = class_6012.method_34989(new SpawnSettings.SpawnEntry(EntityType.SHULKER, 10, 4, 4)); + private static final Pool spawnList = Pool.of(new SpawnSettings.SpawnEntry(EntityType.SHULKER, 10, 4, 4)); public EndCityFeatureMixin(Codec codec) { @@ -25,7 +25,7 @@ public abstract class EndCityFeatureMixin extends StructureFeature getMonsterSpawns() + public Pool getMonsterSpawns() { if (CarpetSettings.shulkerSpawningInEndCities) return spawnList; diff --git a/src/main/java/carpet/mixins/FlatChunkGeneratorMixin.java b/src/main/java/carpet/mixins/FlatChunkGeneratorMixin.java index 0124e0d4..7a6adc4c 100644 --- a/src/main/java/carpet/mixins/FlatChunkGeneratorMixin.java +++ b/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 getEntitySpawnList(Biome biome, StructureAccessor accessor, SpawnGroup group, BlockPos pos) + public Pool getEntitySpawnList(Biome biome, StructureAccessor accessor, SpawnGroup group, BlockPos pos) { if (CarpetSettings.flatWorldStructureSpawning) { diff --git a/src/main/java/carpet/mixins/NoiseChunkGenerator_husksSpawnMixin.java b/src/main/java/carpet/mixins/NoiseChunkGenerator_husksSpawnMixin.java index a855596d..8f563592 100644 --- a/src/main/java/carpet/mixins/NoiseChunkGenerator_husksSpawnMixin.java +++ b/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> cir) + private void isInsidePyramid(Biome biome, StructureAccessor accessor, SpawnGroup group, BlockPos pos, CallbackInfoReturnable> cir) { if (CarpetSettings.huskSpawningInTemples && group == SpawnGroup.MONSTER) { diff --git a/src/main/java/carpet/utils/PerimeterDiagnostics.java b/src/main/java/carpet/utils/PerimeterDiagnostics.java index aef09385..257068fd 100644 --- a/src/main/java/carpet/utils/PerimeterDiagnostics.java +++ b/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; } diff --git a/src/main/java/carpet/utils/SpawnReporter.java b/src/main/java/carpet/utils/SpawnReporter.java index 63b8831b..52aef85d 100644 --- a/src/main/java/carpet/utils/SpawnReporter.java +++ b/src/main/java/carpet/utils/SpawnReporter.java @@ -420,7 +420,7 @@ public class SpawnReporter // yeeted from SpawnHelper - temporary fix private static List 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 report(BlockPos pos, ServerWorld worldIn)