From 08d1d7b9347ba63773d79c8bad957fdf735408e8 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Sat, 16 Nov 2013 20:54:14 -0500 Subject: [PATCH] Prevented underground liquid poison/spring water lakes from generating in the Origin Valley, Nether, and Promised Land --- .../biomes/BiomeDecoratorBOP.java | 24 ++++++++++++------- .../biomes/BiomeGenOriginValley.java | 1 + .../biomes/nether/BiomeGenNetherBase.java | 1 + .../biomes/nether/BiomeGenNetherBlood.java | 1 + .../biomes/nether/BiomeGenNetherBone.java | 1 + .../biomes/nether/BiomeGenNetherDesert.java | 1 + .../biomes/nether/BiomeGenNetherGarden.java | 1 + .../biomes/nether/BiomeGenNetherLava.java | 1 + .../BiomeGenPromisedLandForest.java | 1 + .../BiomeGenPromisedLandPlains.java | 1 + .../BiomeGenPromisedLandShrub.java | 1 + .../BiomeGenPromisedLandSwamp.java | 1 + 12 files changed, 27 insertions(+), 8 deletions(-) diff --git a/common/biomesoplenty/biomes/BiomeDecoratorBOP.java b/common/biomesoplenty/biomes/BiomeDecoratorBOP.java index b70990125..d3fa644b0 100644 --- a/common/biomesoplenty/biomes/BiomeDecoratorBOP.java +++ b/common/biomesoplenty/biomes/BiomeDecoratorBOP.java @@ -446,6 +446,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator public boolean generateQuicksand; public boolean generateSponge; public boolean generateMossySkystone; + public boolean generateUndergroundLakes; public BiomeDecoratorBOP(BiomeGenBase par1BiomeGenBase) { @@ -687,6 +688,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator generateQuicksand = false; generateSponge = false; generateMossySkystone = false; + generateUndergroundLakes = true; biome = par1BiomeGenBase; } @@ -775,10 +777,13 @@ public class BiomeDecoratorBOP extends BiomeDecorator { if (var9999 == 1) { - var3 = chunk_X + randomGenerator.nextInt(16) + 8; - var4 = randomGenerator.nextInt(randomGenerator.nextInt(randomGenerator.nextInt(32) + 8) + 8); - var5 = chunk_Z + randomGenerator.nextInt(16) + 8; - (new WorldGenLakes(Fluids.springWater.get().blockID)).generate(currentWorld, randomGenerator, var3, var4, var5); + if (generateUndergroundLakes) + { + var3 = chunk_X + randomGenerator.nextInt(16) + 8; + var4 = randomGenerator.nextInt(randomGenerator.nextInt(randomGenerator.nextInt(32) + 8) + 8); + var5 = chunk_Z + randomGenerator.nextInt(16) + 8; + (new WorldGenLakes(Fluids.springWater.get().blockID)).generate(currentWorld, randomGenerator, var3, var4, var5); + } } } } @@ -802,10 +807,13 @@ public class BiomeDecoratorBOP extends BiomeDecorator { if (var9998 == 1) { - var3 = chunk_X + randomGenerator.nextInt(16) + 8; - var4 = randomGenerator.nextInt(randomGenerator.nextInt(randomGenerator.nextInt(32) + 8) + 8); - var5 = chunk_Z + randomGenerator.nextInt(16) + 8; - (new WorldGenLakes(Fluids.liquidPoison.get().blockID)).generate(currentWorld, randomGenerator, var3, var4, var5); + if (generateUndergroundLakes) + { + var3 = chunk_X + randomGenerator.nextInt(16) + 8; + var4 = randomGenerator.nextInt(randomGenerator.nextInt(randomGenerator.nextInt(32) + 8) + 8); + var5 = chunk_Z + randomGenerator.nextInt(16) + 8; + (new WorldGenLakes(Fluids.liquidPoison.get().blockID)).generate(currentWorld, randomGenerator, var3, var4, var5); + } } } } diff --git a/common/biomesoplenty/biomes/BiomeGenOriginValley.java b/common/biomesoplenty/biomes/BiomeGenOriginValley.java index 9b172fac9..d4a4ecc9c 100644 --- a/common/biomesoplenty/biomes/BiomeGenOriginValley.java +++ b/common/biomesoplenty/biomes/BiomeGenOriginValley.java @@ -29,6 +29,7 @@ public class BiomeGenOriginValley extends BiomeGenBase customBiomeDecorator.stalagmitesPerChunk = -999; customBiomeDecorator.stalactitesPerChunk = -999; customBiomeDecorator.minersDelightPerChunk = -999; + customBiomeDecorator.generateUndergroundLakes = false; } /** diff --git a/common/biomesoplenty/biomes/nether/BiomeGenNetherBase.java b/common/biomesoplenty/biomes/nether/BiomeGenNetherBase.java index d00e03482..8f681e3b1 100644 --- a/common/biomesoplenty/biomes/nether/BiomeGenNetherBase.java +++ b/common/biomesoplenty/biomes/nether/BiomeGenNetherBase.java @@ -22,6 +22,7 @@ public class BiomeGenNetherBase extends BiomeGenBase customBiomeDecorator.gravesPerChunk = 1; customBiomeDecorator.burningBlossomsPerChunk = 1; customBiomeDecorator.waspHivesPerChunk = 1; + customBiomeDecorator.generateUndergroundLakes = false; spawnableMonsterList.clear(); spawnableCreatureList.clear(); spawnableWaterCreatureList.clear(); diff --git a/common/biomesoplenty/biomes/nether/BiomeGenNetherBlood.java b/common/biomesoplenty/biomes/nether/BiomeGenNetherBlood.java index 5a280e2ff..fdfb936e5 100644 --- a/common/biomesoplenty/biomes/nether/BiomeGenNetherBlood.java +++ b/common/biomesoplenty/biomes/nether/BiomeGenNetherBlood.java @@ -22,6 +22,7 @@ public class BiomeGenNetherBlood extends BiomeGenBase fillerBlock = (byte)Blocks.flesh.get().blockID; customBiomeDecorator.gravesPerChunk = 1; customBiomeDecorator.waspHivesPerChunk = 1; + customBiomeDecorator.generateUndergroundLakes = false; spawnableMonsterList.clear(); spawnableCreatureList.clear(); spawnableWaterCreatureList.clear(); diff --git a/common/biomesoplenty/biomes/nether/BiomeGenNetherBone.java b/common/biomesoplenty/biomes/nether/BiomeGenNetherBone.java index 0b60f9361..0ee139a04 100644 --- a/common/biomesoplenty/biomes/nether/BiomeGenNetherBone.java +++ b/common/biomesoplenty/biomes/nether/BiomeGenNetherBone.java @@ -23,6 +23,7 @@ public class BiomeGenNetherBone extends BiomeGenBase customBiomeDecorator.boneSpines2PerChunk = 12; customBiomeDecorator.gravesPerChunk = 1; customBiomeDecorator.waspHivesPerChunk = 1; + customBiomeDecorator.generateUndergroundLakes = false; spawnableMonsterList.clear(); spawnableCreatureList.clear(); spawnableWaterCreatureList.clear(); diff --git a/common/biomesoplenty/biomes/nether/BiomeGenNetherDesert.java b/common/biomesoplenty/biomes/nether/BiomeGenNetherDesert.java index b41fbb64b..d0b7811c5 100644 --- a/common/biomesoplenty/biomes/nether/BiomeGenNetherDesert.java +++ b/common/biomesoplenty/biomes/nether/BiomeGenNetherDesert.java @@ -22,6 +22,7 @@ public class BiomeGenNetherDesert extends BiomeGenBase customBiomeDecorator.thornsPerChunk = 10; customBiomeDecorator.gravesPerChunk = 1; customBiomeDecorator.waspHivesPerChunk = 1; + customBiomeDecorator.generateUndergroundLakes = false; spawnableMonsterList.clear(); spawnableCreatureList.clear(); spawnableWaterCreatureList.clear(); diff --git a/common/biomesoplenty/biomes/nether/BiomeGenNetherGarden.java b/common/biomesoplenty/biomes/nether/BiomeGenNetherGarden.java index eb088fbc8..6a2eb1e8d 100644 --- a/common/biomesoplenty/biomes/nether/BiomeGenNetherGarden.java +++ b/common/biomesoplenty/biomes/nether/BiomeGenNetherGarden.java @@ -34,6 +34,7 @@ public class BiomeGenNetherGarden extends BiomeGenBase customBiomeDecorator.gravesPerChunk = 1; customBiomeDecorator.burningBlossomsPerChunk = 8; customBiomeDecorator.waspHivesPerChunk = 1; + customBiomeDecorator.generateUndergroundLakes = false; spawnableMonsterList.clear(); spawnableCreatureList.clear(); spawnableWaterCreatureList.clear(); diff --git a/common/biomesoplenty/biomes/nether/BiomeGenNetherLava.java b/common/biomesoplenty/biomes/nether/BiomeGenNetherLava.java index 1f9f9aa89..166600ddb 100644 --- a/common/biomesoplenty/biomes/nether/BiomeGenNetherLava.java +++ b/common/biomesoplenty/biomes/nether/BiomeGenNetherLava.java @@ -32,6 +32,7 @@ public class BiomeGenNetherLava extends BiomeGenBase customBiomeDecorator.gravesPerChunk = 1; customBiomeDecorator.burningBlossomsPerChunk = 4; customBiomeDecorator.waspHivesPerChunk = 1; + customBiomeDecorator.generateUndergroundLakes = false; customBiomeDecorator.generateAsh = true; spawnableMonsterList.clear(); spawnableCreatureList.clear(); diff --git a/common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandForest.java b/common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandForest.java index 75aa4b82e..7f8d171ee 100644 --- a/common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandForest.java +++ b/common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandForest.java @@ -48,6 +48,7 @@ public class BiomeGenPromisedLandForest extends BiomeGenBase implements IWCFog spawnableCaveCreatureList.clear(); customBiomeDecorator.generatePumpkins = false; customBiomeDecorator.generateMossySkystone = true; + customBiomeDecorator.generateUndergroundLakes = false; //customBiomeDecorator.generateClouds = true; //this.customBiomeDecorator.generateLakes = false; theWorldGenerator = new WorldGenWaterSpring(Block.waterMoving.blockID, 8); diff --git a/common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandPlains.java b/common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandPlains.java index c65940fde..aa82ccc2d 100644 --- a/common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandPlains.java +++ b/common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandPlains.java @@ -44,6 +44,7 @@ public class BiomeGenPromisedLandPlains extends BiomeGenBase implements IWCFog spawnableCaveCreatureList.clear(); customBiomeDecorator.generatePumpkins = false; customBiomeDecorator.generateMossySkystone = true; + customBiomeDecorator.generateUndergroundLakes = false; //customBiomeDecorator.generateClouds = true; //this.customBiomeDecorator.generateLakes = false; theWorldGenerator = new WorldGenWaterSpring(Block.waterMoving.blockID, 8); diff --git a/common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandShrub.java b/common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandShrub.java index f906ae8aa..c58fe60b5 100644 --- a/common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandShrub.java +++ b/common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandShrub.java @@ -43,6 +43,7 @@ public class BiomeGenPromisedLandShrub extends BiomeGenBase implements IWCFog spawnableCaveCreatureList.clear(); customBiomeDecorator.generatePumpkins = false; customBiomeDecorator.generateMossySkystone = true; + customBiomeDecorator.generateUndergroundLakes = false; //customBiomeDecorator.generateClouds = true; //this.customBiomeDecorator.generateLakes = false; theWorldGenerator = new WorldGenWaterSpring(Block.waterMoving.blockID, 8); diff --git a/common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandSwamp.java b/common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandSwamp.java index 463ba13d3..7097b1d57 100644 --- a/common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandSwamp.java +++ b/common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandSwamp.java @@ -49,6 +49,7 @@ public class BiomeGenPromisedLandSwamp extends BiomeGenBase implements IWCFog spawnableCaveCreatureList.clear(); customBiomeDecorator.generatePumpkins = false; customBiomeDecorator.generateMossySkystone = true; + customBiomeDecorator.generateUndergroundLakes = false; //customBiomeDecorator.generateClouds = true; //this.customBiomeDecorator.generateLakes = false; theWorldGenerator = new WorldGenWaterSpring(Block.waterMoving.blockID, 8);