From 2f91e75d669644a6e9e289a1dad41aca8f7b6f28 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Mon, 7 Apr 2014 17:09:30 -0400 Subject: [PATCH] Fixed underground decoration, added Duckweed to more biomes --- .../common/biomes/overworld/BiomeGenBorealForest.java | 1 + .../common/biomes/overworld/BiomeGenCherryBlossomGrove.java | 1 + .../common/biomes/overworld/BiomeGenDeciduousForest.java | 1 + .../common/biomes/overworld/BiomeGenRainforest.java | 1 + .../common/biomes/overworld/BiomeGenSeasonalForest.java | 1 + .../common/biomes/overworld/BiomeGenShield.java | 1 + .../common/biomes/overworld/BiomeGenSilkglades.java | 1 + .../common/biomes/overworld/BiomeGenSpruceWoods.java | 1 + .../biomes/overworld/BiomeGenTemperateRainforest.java | 1 + .../common/biomes/overworld/BiomeGenWoodland.java | 1 + .../world/features/WorldGenBOPUndergroundDecoration.java | 2 +- .../common/world/generation/WorldGenFieldAssociation.java | 6 +++--- 12 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBorealForest.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBorealForest.java index 333b573cb..07583be93 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBorealForest.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenBorealForest.java @@ -36,6 +36,7 @@ public class BiomeGenBorealForest extends BOPBiome this.bopWorldFeatures.setFeature("shrubsPerChunk", 10); this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4); this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 10); + this.bopWorldFeatures.setFeature("algaePerChunk", 2); this.bopWorldFeatures.setFeature("bopGrassPerChunk", 50); diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenCherryBlossomGrove.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenCherryBlossomGrove.java index 7d95dc5cb..ce69572d5 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenCherryBlossomGrove.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenCherryBlossomGrove.java @@ -36,6 +36,7 @@ public class BiomeGenCherryBlossomGrove extends BOPBiome this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 15); this.bopWorldFeatures.setFeature("leafPilesPerChunk", 15); this.bopWorldFeatures.setFeature("generatePumpkins", false); + this.bopWorldFeatures.setFeature("algaePerChunk", 2); this.bopWorldFeatures.setFeature("bopGrassPerChunk", 15); diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenDeciduousForest.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenDeciduousForest.java index 7e4de0fed..7fa23d7a4 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenDeciduousForest.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenDeciduousForest.java @@ -38,6 +38,7 @@ public class BiomeGenDeciduousForest extends BOPBiome this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2); this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10); this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 10); + this.bopWorldFeatures.setFeature("algaePerChunk", 3); this.bopWorldFeatures.setFeature("bopGrassPerChunk", 10); diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenRainforest.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenRainforest.java index 9edb9b63b..0d0b6f042 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenRainforest.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenRainforest.java @@ -47,6 +47,7 @@ public class BiomeGenRainforest extends BOPBiome this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 20); this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10); this.bopWorldFeatures.setFeature("seaweedPerChunk", 15); + this.bopWorldFeatures.setFeature("algaePerChunk", 2); this.bopWorldFeatures.setFeature("generatePumpkins", false); this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 6), 12); diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSeasonalForest.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSeasonalForest.java index 2eb8e9e4e..f24e1b023 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSeasonalForest.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSeasonalForest.java @@ -36,6 +36,7 @@ public class BiomeGenSeasonalForest extends BOPBiome this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4); this.bopWorldFeatures.setFeature("leafPilesPerChunk", 8); this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 15); + this.bopWorldFeatures.setFeature("algaePerChunk", 3); this.bopWorldFeatures.setFeature("bopGrassPerChunk", 8); diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenShield.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenShield.java index 7f5bc01b4..31a3d29b1 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenShield.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenShield.java @@ -36,6 +36,7 @@ public class BiomeGenShield extends BOPBiome this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10); this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 5); this.bopWorldFeatures.setFeature("seaweedPerChunk", 5); + this.bopWorldFeatures.setFeature("algaePerChunk", 4); this.bopWorldFeatures.setFeature("generateStoneInGrass2", true); this.bopWorldFeatures.setFeature("bopGrassPerChunk", 12); diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSilkglades.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSilkglades.java index 3c96f29ac..917ed428e 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSilkglades.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSilkglades.java @@ -50,6 +50,7 @@ public class BiomeGenSilkglades extends BOPBiome this.bopWorldFeatures.setFeature("koruPerChunk", 1); this.bopWorldFeatures.setFeature("cobwebNestsPerChunk", 2); this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 15); + this.bopWorldFeatures.setFeature("algaePerChunk", 2); this.bopWorldFeatures.setFeature("bopGrassPerChunk", 2); diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSpruceWoods.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSpruceWoods.java index 80fabf7b5..8c7a822ff 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSpruceWoods.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenSpruceWoods.java @@ -38,6 +38,7 @@ public class BiomeGenSpruceWoods extends BOPBiome this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2); this.bopWorldFeatures.setFeature("leafPilesPerChunk", 6); this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 3); + this.bopWorldFeatures.setFeature("algaePerChunk", 2); this.bopWorldFeatures.setFeature("bopGrassPerChunk", 100); diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenTemperateRainforest.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenTemperateRainforest.java index f6724d658..1f84e706d 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenTemperateRainforest.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenTemperateRainforest.java @@ -43,6 +43,7 @@ public class BiomeGenTemperateRainforest extends BOPBiome this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2); this.bopWorldFeatures.setFeature("leafPilesPerChunk", 15); this.bopWorldFeatures.setFeature("seaweedPerChunk", 15); + this.bopWorldFeatures.setFeature("algaePerChunk", 5); this.bopWorldFeatures.setFeature("bopGrassPerChunk", 25); diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenWoodland.java b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenWoodland.java index f105f26b0..e6d8be294 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenWoodland.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenWoodland.java @@ -35,6 +35,7 @@ public class BiomeGenWoodland extends BOPBiome this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10); this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 10); this.bopWorldFeatures.setFeature("logsPerChunk", 10); + this.bopWorldFeatures.setFeature("algaePerChunk", 3); this.bopWorldFeatures.setFeature("bopGrassPerChunk", 7); diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenBOPUndergroundDecoration.java b/src/main/java/biomesoplenty/common/world/features/WorldGenBOPUndergroundDecoration.java index dddb568a6..bdc540a57 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenBOPUndergroundDecoration.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenBOPUndergroundDecoration.java @@ -57,7 +57,7 @@ public class WorldGenBOPUndergroundDecoration extends WorldGeneratorBOP { int randX = x + random.nextInt(16) + 8; int randZ = z + random.nextInt(16) + 8; - int randY = random.nextInt(world.getHeightValue(randX, randZ) * 2); + int randY = random.nextInt(60); this.generate(world, random, randX, randY, randZ); } diff --git a/src/main/java/biomesoplenty/common/world/generation/WorldGenFieldAssociation.java b/src/main/java/biomesoplenty/common/world/generation/WorldGenFieldAssociation.java index c00f0dd00..040936010 100644 --- a/src/main/java/biomesoplenty/common/world/generation/WorldGenFieldAssociation.java +++ b/src/main/java/biomesoplenty/common/world/generation/WorldGenFieldAssociation.java @@ -45,8 +45,8 @@ public class WorldGenFieldAssociation associateFeature("deadLeafPilesPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("foliage"), 15, 256)); associateFeature("lavenderPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("flowers2"), 3)); associateFeature("thornsPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("plants"), 5)); - associateFeature("stalagmitesPerChunk", new WorldGenBOPTallGrass(BOPBlockHelper.get("stoneFormations"), 0)); - associateFeature("stalactitesPerChunk", new WorldGenBOPTallGrass(BOPBlockHelper.get("stoneFormations"), 1)); + associateFeature("stalagmitesPerChunk", new WorldGenBOPUndergroundDecoration(BOPBlockHelper.get("stoneFormations"), 0)); + associateFeature("stalactitesPerChunk", new WorldGenBOPUndergroundDecoration(BOPBlockHelper.get("stoneFormations"), 1)); associateFeature("desertSproutsPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("plants"), 2)); associateFeature("bromeliadsPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 12)); associateFeature("waterReedsPerChunk", new WorldGenWaterReeds()); @@ -64,7 +64,7 @@ public class WorldGenFieldAssociation associateFeature("sproutsPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("foliage"), 5)); associateFeature("tinyCactiPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("plants"), 12)); associateFeature("oasesPerChunk", new WorldGenWaterside(Blocks.grass, 7, Blocks.sand, Blocks.hardened_clay)); - associateFeature("minersDelightPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("flowers2"), 6)); + associateFeature("minersDelightPerChunk", new WorldGenBOPUndergroundDecoration(BOPBlockHelper.get("flowers2"), 6)); associateFeature("rootsPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("plants"), 15)); associateFeature("grassSplatterPerChunk", new WorldGenGrassSplatter()); associateFeature("rockpilesPerChunk", new WorldGenBOPBlob(Blocks.cobblestone, 0));