From 2b95a878ad0d995b72c2839eac94284142b19dba Mon Sep 17 00:00:00 2001 From: altrisi Date: Wed, 18 Jan 2023 14:41:46 +0100 Subject: [PATCH] Remove now fixed `flatWorldStructureSpawning` rule and cleanup some unused mixins --- src/main/java/carpet/CarpetSettings.java | 7 -- .../carpet/fakes/PlacedFeatureInterface.java | 7 -- .../FlatLevelSource_structuresMixin.java | 82 ------------------- .../mixins/PlacedFeature_scarpetMixin.java | 15 ---- .../java/carpet/script/utils/BiomeInfo.java | 2 - src/main/resources/carpet.mixins.json | 2 - 6 files changed, 115 deletions(-) delete mode 100644 src/main/java/carpet/fakes/PlacedFeatureInterface.java delete mode 100644 src/main/java/carpet/mixins/FlatLevelSource_structuresMixin.java delete mode 100644 src/main/java/carpet/mixins/PlacedFeature_scarpetMixin.java diff --git a/src/main/java/carpet/CarpetSettings.java b/src/main/java/carpet/CarpetSettings.java index ded6c7f9..5c20d3d8 100644 --- a/src/main/java/carpet/CarpetSettings.java +++ b/src/main/java/carpet/CarpetSettings.java @@ -13,7 +13,6 @@ import carpet.utils.SpawnChunks; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.commands.CommandSourceStack; import net.minecraft.core.BlockPos; -import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.MinecraftServer; @@ -898,12 +897,6 @@ public class CarpetSettings @Rule(desc = "Spawning requires much less CPU and Memory", category = OPTIMIZATION) public static boolean lagFreeSpawning = false; - - @Rule( - desc = "Allows structure mobs to spawn in flat worlds", - category = {EXPERIMENTAL, CREATIVE} - ) - public static boolean flatWorldStructureSpawning = false; @Rule( desc = "Increases for testing purposes number of blue skulls shot by the wither", diff --git a/src/main/java/carpet/fakes/PlacedFeatureInterface.java b/src/main/java/carpet/fakes/PlacedFeatureInterface.java deleted file mode 100644 index 392dda04..00000000 --- a/src/main/java/carpet/fakes/PlacedFeatureInterface.java +++ /dev/null @@ -1,7 +0,0 @@ -package carpet.fakes; - -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; - -public interface PlacedFeatureInterface { - //ConfiguredFeature getRawFeature(); -} diff --git a/src/main/java/carpet/mixins/FlatLevelSource_structuresMixin.java b/src/main/java/carpet/mixins/FlatLevelSource_structuresMixin.java deleted file mode 100644 index 1fe31c7d..00000000 --- a/src/main/java/carpet/mixins/FlatLevelSource_structuresMixin.java +++ /dev/null @@ -1,82 +0,0 @@ -package carpet.mixins; - -import net.minecraft.core.HolderSet; -import net.minecraft.core.Registry; -import net.minecraft.world.level.levelgen.structure.StructureSet; -import org.spongepowered.asm.mixin.Mixin; - -import net.minecraft.world.level.biome.BiomeSource; -import net.minecraft.world.level.chunk.ChunkGenerator; -import net.minecraft.world.level.levelgen.FlatLevelSource; - -@Mixin(FlatLevelSource.class) // YEET -public abstract class FlatLevelSource_structuresMixin extends ChunkGenerator -{ - public FlatLevelSource_structuresMixin(BiomeSource biomeSource) { - super(biomeSource); - } - -/* - @Override - public WeightedRandomList getMobsAt(Holder biome, StructureFeatureManager accessor, MobCategory group, BlockPos pos) - { - if (!CarpetSettings.flatWorldStructureSpawning) return super.getMobsAt(biome, accessor, group, pos); - - // vanila noise one - if (accessor.getStructureAt(pos, StructureFeature.SWAMP_HUT).isValid()) { - if (group == MobCategory.MONSTER) { - return SwamplandHutFeature.SWAMPHUT_ENEMIES; - } - - if (group == MobCategory.CREATURE) { - return SwamplandHutFeature.SWAMPHUT_ANIMALS; - } - } - - if (group == MobCategory.MONSTER) { - if (accessor.getStructureAt(pos, StructureFeature.PILLAGER_OUTPOST).isValid()) { - return PillagerOutpostFeature.OUTPOST_ENEMIES; - } - - if (accessor.getStructureAt(pos, StructureFeature.OCEAN_MONUMENT).isValid()) { - return OceanMonumentFeature.MONUMENT_ENEMIES; - } - - if (accessor.getStructureAt(pos, StructureFeature.NETHER_BRIDGE).isValid()) { - return NetherFortressFeature.FORTRESS_ENEMIES; - } - } - - - // carpet spawns - if (group == MobCategory.MONSTER) - { - if (CarpetSettings.huskSpawningInTemples) - { - if (accessor.getStructureAt(pos, StructureFeature.DESERT_PYRAMID).isValid()) - { - return CustomSpawnLists.PYRAMID_SPAWNS; - } - } - if (CarpetSettings.shulkerSpawningInEndCities) - { - if (accessor.getStructureAt(pos, StructureFeature.END_CITY).isValid()) - { - return CustomSpawnLists.SHULKER_SPAWNS; - } - } - if (CarpetSettings.piglinsSpawningInBastions) - { - if (accessor.getStructureAt(pos, StructureFeature.BASTION_REMNANT).isValid()) - { - return CustomSpawnLists.BASTION_SPAWNS; - } - } - } - return (group == MobCategory.UNDERGROUND_WATER_CREATURE || group == MobCategory.AXOLOTLS) && accessor.getStructureAt(pos, StructureFeature.OCEAN_MONUMENT).isValid() ? MobSpawnSettings.EMPTY_MOB_LIST : super.getMobsAt(biome, accessor, group, pos); - - - } - - */ -} diff --git a/src/main/java/carpet/mixins/PlacedFeature_scarpetMixin.java b/src/main/java/carpet/mixins/PlacedFeature_scarpetMixin.java deleted file mode 100644 index 2e4f149d..00000000 --- a/src/main/java/carpet/mixins/PlacedFeature_scarpetMixin.java +++ /dev/null @@ -1,15 +0,0 @@ -package carpet.mixins; - -import carpet.fakes.PlacedFeatureInterface; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; - -import java.util.function.Supplier; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; -import net.minecraft.world.level.levelgen.placement.PlacedFeature; - -@Mixin(PlacedFeature.class) -public class PlacedFeature_scarpetMixin implements PlacedFeatureInterface { - -} diff --git a/src/main/java/carpet/script/utils/BiomeInfo.java b/src/main/java/carpet/script/utils/BiomeInfo.java index 12cac5a7..cfc36c74 100644 --- a/src/main/java/carpet/script/utils/BiomeInfo.java +++ b/src/main/java/carpet/script/utils/BiomeInfo.java @@ -1,7 +1,5 @@ package carpet.script.utils; -import carpet.fakes.PlacedFeatureInterface; -import carpet.script.value.BlockValue; import carpet.script.value.ListValue; import carpet.script.value.NumericValue; import carpet.script.value.StringValue; diff --git a/src/main/resources/carpet.mixins.json b/src/main/resources/carpet.mixins.json index eb99e596..e5c7fd66 100644 --- a/src/main/resources/carpet.mixins.json +++ b/src/main/resources/carpet.mixins.json @@ -81,14 +81,12 @@ "Level_scarpetPlopMixin", "WorldGenRegion_scarpetPlopMixin", "StructurePiece_scarpetPlopMixin", - "PlacedFeature_scarpetMixin", "PieceGeneratorSupplier_plopMixin", "ServerGamePacketListenerImpl_scarpetEventsMixin", "ServerPlayerGameMode_scarpetEventsMixin", "Player_parrotMixin", "SaplingBlock_desertShrubsMixin", "EntityMixin", - "FlatLevelSource_structuresMixin", "ChunkGenerator_scarpetMixin", "Guardian_renewableSpongesMixin", "Husk_templesMixin",