feat: dragon roost worldgen cleanup

AlexModGuy · Dec 26, 2023 · 2e70e2e · 2e70e2e
1 parent af5b1ff
commit 2e70e2e
Show file tree

Hide file tree

Showing 17 changed files with 470 additions and 569 deletions.
diff --git a/src/main/java/com/github/alexthe666/iceandfire/block/BlockReturningState.java b/src/main/java/com/github/alexthe666/iceandfire/block/BlockReturningState.java
@@ -3,7 +3,6 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.util.RandomSource;
-import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.state.BlockBehaviour;
@@ -17,56 +16,28 @@
 
 public class BlockReturningState extends Block {
     public static final BooleanProperty REVERTS = BooleanProperty.create("revert");
-    public Item itemBlock;
     private final BlockState returnState;
 
-/*    public BlockReturningState(float hardness, float resistance, SoundType sound, BlockState returnToState) {
-        super(
-            BlockBehaviour.Properties
-                .of()
-                .sound(sound)
-                .strength(hardness, resistance)
-                .randomTicks()
-        );
-
-        this.returnState = returnToState;
-        this.registerDefaultState(this.stateDefinition.any().setValue(REVERTS, Boolean.FALSE));
-    }*/
-
     public static BlockReturningState builder(float hardness, float resistance, SoundType sound, boolean slippery, MapColor color, NoteBlockInstrument instrument, PushReaction reaction, boolean ignited, BlockState returnToState) {
-        BlockBehaviour.Properties props = BlockBehaviour.Properties.of().mapColor(color).sound(sound).strength(hardness, resistance).friction(0.98F).randomTicks();
-        if (instrument != null) {
-            props.instrument(instrument);
-        }
-        if (reaction != null) {
-            props.pushReaction(reaction);
-        }
-        if (ignited) {
+        BlockBehaviour.Properties props = BlockBehaviour.Properties.of().mapColor(color).instrument(instrument).pushReaction(reaction).sound(sound).strength(hardness, resistance).friction(0.98F).randomTicks();
+        if (ignited)
             props.ignitedByLava();
-        }
         return new BlockReturningState(props, returnToState);
     }
     public static BlockReturningState builder(float hardness, float resistance, SoundType sound, MapColor color, NoteBlockInstrument instrument, PushReaction reaction, boolean ignited, BlockState returnToState) {
-        BlockBehaviour.Properties props = BlockBehaviour.Properties.of().mapColor(color).sound(sound).strength(hardness, resistance).randomTicks();
-        if (instrument != null) {
-            props.instrument(instrument);
-        }
-        if (reaction != null) {
-            props.pushReaction(reaction);
-        }
-        if (ignited) {
+        BlockBehaviour.Properties props = BlockBehaviour.Properties.of().mapColor(color).instrument(instrument).pushReaction(reaction).sound(sound).strength(hardness, resistance).randomTicks();
+        if (ignited)
             props.ignitedByLava();
-        }
         return new BlockReturningState(props, returnToState);
     }
 
-
     public BlockReturningState(BlockBehaviour.Properties props, BlockState returnToState) {
         super(props);
         this.returnState = returnToState;
         this.registerDefaultState(this.stateDefinition.any().setValue(REVERTS, Boolean.FALSE));
     }
 
+    // FIXME :: Unused because isRandomlyTicking is not used -> The chunk check might be a performance problem anyway (and potentially not needed)
     @Override
     public void tick(@NotNull BlockState state, ServerLevel worldIn, @NotNull BlockPos pos, @NotNull RandomSource rand) {
         if (!worldIn.isClientSide) {

diff --git a/src/main/java/com/github/alexthe666/iceandfire/event/WorldGenUtils.java b/src/main/java/com/github/alexthe666/iceandfire/event/WorldGenUtils.java
diff --git a/src/main/java/com/github/alexthe666/iceandfire/util/WorldUtil.java b/src/main/java/com/github/alexthe666/iceandfire/util/WorldUtil.java
@@ -1,5 +1,6 @@
 package com.github.alexthe666.iceandfire.util;
 
+import com.github.alexthe666.iceandfire.world.IafWorldData;
 import com.github.alexthe666.iceandfire.world.IafWorldRegistry;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.RegistryAccess;
@@ -9,7 +10,6 @@
 import net.minecraft.server.level.ChunkHolder;
 import net.minecraft.server.level.ServerChunkCache;
 import net.minecraft.server.level.ServerLevel;
-import net.minecraft.util.Mth;
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.Difficulty;
 import net.minecraft.world.level.*;
@@ -225,7 +225,11 @@ public static boolean isInWorldHeight(final int yBlock, final Level world) {
     }
 
     public static boolean canGenerate(int configChance, final WorldGenLevel level, final RandomSource random, final BlockPos origin, final String id, boolean checkFluid) {
-        boolean canGenerate = random.nextInt(configChance) == 0 && IafWorldRegistry.isFarEnoughFromSpawn(level, origin) && IafWorldRegistry.isFarEnoughFromDangerousGen(level, origin, id);
+        return canGenerate(configChance, level, random, origin, id, IafWorldData.FeatureType.SURFACE, checkFluid);
+    }
+
+    public static boolean canGenerate(int configChance, final WorldGenLevel level, final RandomSource random, final BlockPos origin, final String id, final IafWorldData.FeatureType type, boolean checkFluid) {
+        boolean canGenerate = random.nextInt(configChance) == 0 && IafWorldRegistry.isFarEnoughFromSpawn(level, origin) && IafWorldRegistry.isFarEnoughFromDangerousGen(level, origin, id, type);
 
         if (canGenerate && checkFluid) {
             if (!level.getFluidState(origin.below()).isEmpty()) {

diff --git a/src/main/java/com/github/alexthe666/iceandfire/world/gen/TypedFeature.java b/src/main/java/com/github/alexthe666/iceandfire/world/gen/TypedFeature.java
@@ -4,4 +4,6 @@
 
 public interface TypedFeature {
     IafWorldData.FeatureType getFeatureType();
+
+    String getId();
 }
diff --git a/src/main/java/com/github/alexthe666/iceandfire/world/gen/WorldGenCyclopsCave.java b/src/main/java/com/github/alexthe666/iceandfire/world/gen/WorldGenCyclopsCave.java
@@ -38,7 +38,7 @@ public WorldGenCyclopsCave(final Codec<NoneFeatureConfiguration> configuration)
 
     @Override
     public boolean place(final FeaturePlaceContext<NoneFeatureConfiguration> context) {
-        if (!WorldUtil.canGenerate(IafConfig.spawnCyclopsCaveChance, context.level(), context.random(), context.origin(), "cyclopes_cave", true)) {
+        if (!WorldUtil.canGenerate(IafConfig.spawnCyclopsCaveChance, context.level(), context.random(), context.origin(), getId(), true)) {
             return false;
         }
 
@@ -261,4 +261,9 @@ private BlockState getFenceState(final LevelAccessor level, final BlockPos posit
     public IafWorldData.FeatureType getFeatureType() {
         return IafWorldData.FeatureType.SURFACE;
     }
+
+    @Override
+    public String getId() {
+        return "cyclops_cave";
+    }
 }
diff --git a/src/main/java/com/github/alexthe666/iceandfire/world/gen/WorldGenDragonCave.java b/src/main/java/com/github/alexthe666/iceandfire/world/gen/WorldGenDragonCave.java
@@ -59,7 +59,7 @@ public boolean place(FeaturePlaceContext<NoneFeatureConfiguration> context) {
         WorldGenLevel worldIn = context.level();
         RandomSource rand = context.random();
         BlockPos position = context.origin();
-        if (rand.nextInt(IafConfig.generateDragonDenChance) != 0 || !IafWorldRegistry.isFarEnoughFromSpawn(worldIn, position) || !IafWorldRegistry.isFarEnoughFromDangerousGen(worldIn, position, "dragon_cave", IafWorldData.FeatureType.UNDERGROUND)) {
+        if (rand.nextInt(IafConfig.generateDragonDenChance) != 0 || !IafWorldRegistry.isFarEnoughFromSpawn(worldIn, position) || !IafWorldRegistry.isFarEnoughFromDangerousGen(worldIn, position, getId(), getFeatureType())) {
             return false;
         }
         isMale = rand.nextBoolean();
@@ -220,7 +220,7 @@ public void setGoldPile(LevelAccessor world, BlockPos pos, RandomSource rand) {
     }
 
     private EntityDragonBase createDragon(final WorldGenLevel worldGen, final RandomSource random, final BlockPos position, int dragonAge) {
-        EntityDragonBase dragon = getType().create(worldGen.getLevel());
+        EntityDragonBase dragon = getDragonType().create(worldGen.getLevel());
         dragon.setGender(isMale);
         dragon.growDragon(dragonAge);
         dragon.setAgingDisabled(true);
@@ -233,7 +233,7 @@ private EntityDragonBase createDragon(final WorldGenLevel worldGen, final Random
         return dragon;
     }
 
-    public abstract EntityType<? extends EntityDragonBase> getType();
+    public abstract EntityType<? extends EntityDragonBase> getDragonType();
 
     private static class SphereInfo {
         int radius;
@@ -249,4 +249,9 @@ private SphereInfo(int radius, BlockPos pos) {
     public IafWorldData.FeatureType getFeatureType() {
         return IafWorldData.FeatureType.UNDERGROUND;
     }
+
+    @Override
+    public String getId() {
+        return "dragon_cave";
+    }
 }