Some minor fixes with fissures. Disabled fissure clusters as they wer…

…e awful for cascading lag. Fissures themselves are mostly fine, due to their rarity + low likeliness to cascade. (see #40)
TerraFirmaCraft · Apr 18, 2019 · 8fde69a · 8fde69a
1 parent 21ccbfe
commit 8fde69a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/main/java/net/dries007/tfc/TerraFirmaCraft.java b/src/main/java/net/dries007/tfc/TerraFirmaCraft.java
@@ -156,8 +156,8 @@ public void init(FMLInitializationEvent event)
 
         GameRegistry.registerWorldGenerator(new RarityBasedWorldGen(x -> x.lavaFissureRarity, new WorldGenFissure(true, 20)), 0);
         GameRegistry.registerWorldGenerator(new RarityBasedWorldGen(x -> x.waterFissureRarity, new WorldGenFissure(false, -1)), 0);
-        GameRegistry.registerWorldGenerator(new RarityBasedWorldGen(x -> x.lavaFissureClusterRarity, new WorldGenSurfaceFissureCluster(true)), 1);
-        GameRegistry.registerWorldGenerator(new RarityBasedWorldGen(x -> x.waterFissureClusterRarity, new WorldGenSurfaceFissureCluster(false)), 1);
+        //GameRegistry.registerWorldGenerator(new RarityBasedWorldGen(x -> x.lavaFissureClusterRarity, new WorldGenSurfaceFissureCluster(true)), 1);
+        //GameRegistry.registerWorldGenerator(new RarityBasedWorldGen(x -> x.waterFissureClusterRarity, new WorldGenSurfaceFissureCluster(false)), 1);
         GameRegistry.registerWorldGenerator(new WorldGenOre(), 2);
         //todo: add cave decorator
         GameRegistry.registerWorldGenerator(new WorldGenTrees(), 4);

diff --git a/src/main/java/net/dries007/tfc/world/classic/worldgen/WorldGenFissure.java b/src/main/java/net/dries007/tfc/world/classic/worldgen/WorldGenFissure.java
@@ -10,6 +10,7 @@
 
 import com.google.common.collect.ImmutableList;
 import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.world.World;
@@ -98,7 +99,10 @@ protected void generate(World world, Random rng, BlockPos start)
 
         for (BlockPos pos : list)
         {
-            world.setBlockToAir(pos);
+            if (pos.getY() < 10 && world.getBlockState(pos).getBlock() != Blocks.BEDROCK)
+            {
+                world.setBlockToAir(pos);
+            }
             for (int d = 1; d <= poolDepth; d++)
                 fill(world, pos.add(0, -d, 0), rock, localFillBlock);
 

diff --git a/src/main/java/net/dries007/tfc/world/classic/worldgen/WorldGenSoilPits.java b/src/main/java/net/dries007/tfc/world/classic/worldgen/WorldGenSoilPits.java
@@ -29,6 +29,7 @@
 /**
  * todo: make these bigger without causing cascading lag.
  * This will require larger re-writes on the scale of oregen
+ * Wait for 1.13+ as AlcatrazEscapee is doing a worldgen rewrite anyway
  */
 public class WorldGenSoilPits implements IWorldGenerator
 {