From 2c0aff19410e70bfe12a5b5e2b2fbc92626584bd Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Sat, 15 Mar 2014 16:24:20 -0400 Subject: [PATCH] Various tweaks to biomes --- .../common/biomes/BiomeGenBayou.java | 2 ++ .../common/biomes/BiomeGenChaparral.java | 1 + .../biomes/BiomeGenConiferousForest.java | 2 ++ .../biomes/BiomeGenConiferousForestSnow.java | 1 + .../common/biomes/BiomeGenFrostForest.java | 2 ++ .../common/biomes/BiomeGenGrove.java | 1 + .../common/biomes/BiomeGenHeathland.java | 1 + .../common/biomes/BiomeGenJadeCliffs.java | 2 ++ .../common/biomes/BiomeGenLushDesert.java | 2 ++ .../common/biomes/BiomeGenOminousWoods.java | 2 ++ .../common/biomes/BiomeGenRedwoodForest.java | 1 + .../common/biomes/BiomeGenSacredSprings.java | 1 + .../common/biomes/BiomeGenShield.java | 1 + .../common/biomes/BiomeGenSpruceWoods.java | 2 ++ .../common/biomes/BiomeGenThicket.java | 4 ++-- .../common/biomes/BiomeGenTundra.java | 2 ++ .../common/biomes/BiomeGenWetland.java | 1 + .../BirchForestForcedDecorator.java | 19 +++++++++++++++++- .../DesertForcedDecorator.java | 1 + .../ExtremeHillsForcedDecorator.java | 17 ++++++++++++++++ .../ForestForcedDecorator.java | 17 ++++++++++++++++ .../JungleForcedDecorator.java | 18 +++++++++++++++++ .../PlainsForcedDecorator.java | 17 ++++++++++++++++ .../RoofedForestForcedDecorator.java | 19 ++++++++++++++++++ .../SavannaForcedDecorator.java | 15 ++++++++++++++ .../SwampForcedDecorator.java | 20 +++++++++++++++++-- .../TaigaForcedDecorator.java | 3 ++- 27 files changed, 168 insertions(+), 6 deletions(-) diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenBayou.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenBayou.java index c958c20ff..cd4f32bfc 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenBayou.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenBayou.java @@ -55,6 +55,8 @@ public class BiomeGenBayou extends BOPBiome this.bopWorldFeatures.waterReedsPerChunk = 4; this.bopWorldFeatures.koruPerChunk = 1; this.bopWorldFeatures.seaweedPerChunk = 15; + this.bopWorldFeatures.leafPilesPerChunk = 5; + this.bopWorldFeatures.deadLeafPilesPerChunk = 10; this.bopWorldFeatures.generatePumpkins = false; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenChaparral.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenChaparral.java index 21579a202..0a17bcdac 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenChaparral.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenChaparral.java @@ -47,6 +47,7 @@ public class BiomeGenChaparral extends BOPBiome this.bopWorldFeatures.shrubsPerChunk = 10; this.bopWorldFeatures.waterReedsPerChunk = 2; this.bopWorldFeatures.leafPilesPerChunk = 10; + this.bopWorldFeatures.deadLeafPilesPerChunk = 5; this.bopWorldFeatures.generatePumpkins = false; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenConiferousForest.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenConiferousForest.java index 2f3028d42..31eef5b82 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenConiferousForest.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenConiferousForest.java @@ -45,6 +45,8 @@ public class BiomeGenConiferousForest extends BOPBiome this.bopWorldFeatures.shrubsPerChunk = 8; this.bopWorldFeatures.waterReedsPerChunk = 2; this.bopWorldFeatures.cloverPatchesPerChunk = 10; + this.bopWorldFeatures.leafPilesPerChunk = 4; + this.bopWorldFeatures.deadLeafPilesPerChunk = 8; this.bopWorldFeatures.seaweedPerChunk = 5; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenConiferousForestSnow.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenConiferousForestSnow.java index 999441b9c..780d2ab54 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenConiferousForestSnow.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenConiferousForestSnow.java @@ -42,6 +42,7 @@ public class BiomeGenConiferousForestSnow extends BOPBiome this.bopWorldFeatures.bopFlowersPerChunk = 3; this.bopWorldFeatures.shrubsPerChunk = 4; + this.bopWorldFeatures.deadLeafPilesPerChunk = 8; } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenFrostForest.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenFrostForest.java index 192973ead..fc10e95e0 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenFrostForest.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenFrostForest.java @@ -35,6 +35,8 @@ public class BiomeGenFrostForest extends BOPBiome this.bopWorldFeatures.shrubsPerChunk = 1; this.bopWorldFeatures.bopFlowersPerChunk = 3; + this.bopWorldFeatures.leafPilesPerChunk = 2; + this.bopWorldFeatures.deadLeafPilesPerChunk = 4; this.bopWorldFeatures.generatePumpkins = false; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenGrove.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenGrove.java index 2a1a02c20..6b4f61d57 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenGrove.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenGrove.java @@ -39,6 +39,7 @@ public class BiomeGenGrove extends BOPBiome this.bopWorldFeatures.berryBushesPerChunk = 2; this.bopWorldFeatures.shrubsPerChunk = 3; this.bopWorldFeatures.cloverPatchesPerChunk = 20; + this.bopWorldFeatures.leafPilesPerChunk = 5; this.bopWorldFeatures.generatePumpkins = false; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenHeathland.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenHeathland.java index 6d34842d3..be2b2401b 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenHeathland.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenHeathland.java @@ -42,6 +42,7 @@ public class BiomeGenHeathland extends BOPBiome this.bopWorldFeatures.berryBushesPerChunk = 1; this.bopWorldFeatures.shrubsPerChunk = 5; this.bopWorldFeatures.leafPilesPerChunk = 10; + this.bopWorldFeatures.deadLeafPilesPerChunk = 5; this.bopWorldFeatures.generatePumpkins = false; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenJadeCliffs.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenJadeCliffs.java index 2b6143eec..285515689 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenJadeCliffs.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenJadeCliffs.java @@ -35,6 +35,8 @@ public class BiomeGenJadeCliffs extends BOPBiome this.bopWorldFeatures.bopFlowersPerChunk = 3; this.bopWorldFeatures.wildCarrotsPerChunk = 1; + this.bopWorldFeatures.leafPilesPerChunk = 4; + this.bopWorldFeatures.deadLeafPilesPerChunk = 2; } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenLushDesert.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenLushDesert.java index 101ac0aea..c789172d0 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenLushDesert.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenLushDesert.java @@ -48,6 +48,8 @@ public class BiomeGenLushDesert extends BOPBiome this.bopWorldFeatures.waterLakesPerChunk = 5; this.bopWorldFeatures.waterReedsPerChunk = 4; this.bopWorldFeatures.bromeliadsPerChunk = 3; + this.bopWorldFeatures.leafPilesPerChunk = 2; + this.bopWorldFeatures.deadLeafPilesPerChunk = 4; this.bopWorldFeatures.generateSand = true; this.bopWorldFeatures.generatePumpkins = false; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenOminousWoods.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenOminousWoods.java index 83dc6f66f..274bebe57 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenOminousWoods.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenOminousWoods.java @@ -51,6 +51,8 @@ public class BiomeGenOminousWoods extends BOPBiome this.bopWorldFeatures.bopFlowersPerChunk = 1; this.bopWorldFeatures.thornsPerChunk = 9; this.bopWorldFeatures.poisonIvyPerChunk = 3; + this.bopWorldFeatures.leafPilesPerChunk = 2; + this.bopWorldFeatures.deadLeafPilesPerChunk = 4; //TODO: FEATURE customBiomeDecorator.poisonWaterPerChunk = 15; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenRedwoodForest.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenRedwoodForest.java index f9bd9df4f..8a0b48e88 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenRedwoodForest.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenRedwoodForest.java @@ -39,6 +39,7 @@ public class BiomeGenRedwoodForest extends BOPBiome this.bopWorldFeatures.shrubsPerChunk = 10; this.bopWorldFeatures.waterReedsPerChunk = 2; this.bopWorldFeatures.leafPilesPerChunk = 15; + this.bopWorldFeatures.deadLeafPilesPerChunk = 5; this.bopWorldFeatures.generatePumpkins = false; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenSacredSprings.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenSacredSprings.java index 4b3408177..7a92e840c 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenSacredSprings.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenSacredSprings.java @@ -35,6 +35,7 @@ public class BiomeGenSacredSprings extends BOPBiome this.theBiomeDecorator.grassPerChunk = 4; this.theBiomeDecorator.waterlilyPerChunk = 5; this.bopWorldFeatures.seaweedPerChunk = 15; + this.bopWorldFeatures.leafPilesPerChunk = 10; this.bopWorldFeatures.bopFlowersPerChunk = 2; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenShield.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenShield.java index 0e5c9c92f..03c3fdce0 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenShield.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenShield.java @@ -37,6 +37,7 @@ public class BiomeGenShield extends BOPBiome this.bopWorldFeatures.shrubsPerChunk = 4; this.bopWorldFeatures.waterReedsPerChunk = 4; this.bopWorldFeatures.leafPilesPerChunk = 10; + this.bopWorldFeatures.deadLeafPilesPerChunk = 5; this.bopWorldFeatures.seaweedPerChunk = 5; this.bopWorldFeatures.generateStoneInGrass2 = true; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenSpruceWoods.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenSpruceWoods.java index 3b7f48cc2..65a82dad5 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenSpruceWoods.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenSpruceWoods.java @@ -38,6 +38,8 @@ public class BiomeGenSpruceWoods extends BOPBiome this.bopWorldFeatures.wildCarrotsPerChunk = 1; this.bopWorldFeatures.shrubsPerChunk = 5; this.bopWorldFeatures.waterReedsPerChunk = 2; + this.bopWorldFeatures.leafPilesPerChunk = 6; + this.bopWorldFeatures.deadLeafPilesPerChunk = 3; } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenThicket.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenThicket.java index 2e69af539..e775d44a2 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenThicket.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenThicket.java @@ -31,8 +31,8 @@ public class BiomeGenThicket extends BOPBiome this.bopWorldFeatures.bopFlowersPerChunk = 5; this.bopWorldFeatures.thornsPerChunk = 55; this.bopWorldFeatures.shrubsPerChunk = 5; - this.bopWorldFeatures.leafPilesPerChunk = 10; - this.bopWorldFeatures.deadLeafPilesPerChunk = 5; + this.bopWorldFeatures.leafPilesPerChunk = 5; + this.bopWorldFeatures.deadLeafPilesPerChunk = 10; } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenTundra.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenTundra.java index 954ea5f78..1cab31a31 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenTundra.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenTundra.java @@ -39,6 +39,8 @@ public class BiomeGenTundra extends BOPBiome this.bopWorldFeatures.shrubsPerChunk = 2; this.bopWorldFeatures.waterReedsPerChunk = 2; this.bopWorldFeatures.rockpilesPerChunk = 25; + this.bopWorldFeatures.leafPilesPerChunk = 5; + this.bopWorldFeatures.deadLeafPilesPerChunk = 5; } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenWetland.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenWetland.java index 45d8e48a4..9fcd66ba2 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenWetland.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenWetland.java @@ -63,6 +63,7 @@ public class BiomeGenWetland extends BOPBiome this.bopWorldFeatures.cloverPatchesPerChunk = 15; this.bopWorldFeatures.seaweedPerChunk = 15; this.bopWorldFeatures.leafPilesPerChunk = 10; + this.bopWorldFeatures.deadLeafPilesPerChunk = 5; } @Override diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/BirchForestForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/BirchForestForcedDecorator.java index 460f42e81..9f7c06e62 100644 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/BirchForestForcedDecorator.java +++ b/src/main/java/biomesoplenty/common/world/forceddecorators/BirchForestForcedDecorator.java @@ -3,9 +3,12 @@ package biomesoplenty.common.world.forceddecorators; import java.util.HashMap; import java.util.Random; +import net.minecraft.init.Blocks; +import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.common.world.decoration.IBOPDecoration; import biomesoplenty.common.world.features.WorldGenBOPFlora; +import biomesoplenty.common.world.features.WorldGenBOPTallGrass; public class BirchForestForcedDecorator extends ForcedDecorator { @@ -13,7 +16,8 @@ public class BirchForestForcedDecorator extends ForcedDecorator { this.bopWorldFeatures.poisonIvyPerChunk = 3; this.bopWorldFeatures.cloverPatchesPerChunk = 15; - this.bopWorldFeatures.leafPilesPerChunk = 5; + this.bopWorldFeatures.leafPilesPerChunk = 4; + this.bopWorldFeatures.deadLeafPilesPerChunk = 2; } @Override @@ -26,4 +30,17 @@ public class BirchForestForcedDecorator extends ForcedDecorator return flowerMap; } + + @Override + public HashMap getWeightedWorldGenForGrass() + { + HashMap grassMap = new HashMap(); + + grassMap.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 1), 0.5D); + grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 10), 0.25D); + grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 11), 0.25D); + + return grassMap; + } } diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/DesertForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/DesertForcedDecorator.java index 4fd3c1852..d6ac663fc 100644 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/DesertForcedDecorator.java +++ b/src/main/java/biomesoplenty/common/world/forceddecorators/DesertForcedDecorator.java @@ -10,5 +10,6 @@ public class DesertForcedDecorator extends ForcedDecorator public DesertForcedDecorator() { this.bopWorldFeatures.tinyCactiPerChunk = 10; + this.bopWorldFeatures.generateQuicksand = true; } } diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/ExtremeHillsForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/ExtremeHillsForcedDecorator.java index d58dcb433..c5eac5c5e 100644 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/ExtremeHillsForcedDecorator.java +++ b/src/main/java/biomesoplenty/common/world/forceddecorators/ExtremeHillsForcedDecorator.java @@ -3,9 +3,12 @@ package biomesoplenty.common.world.forceddecorators; import java.util.HashMap; import java.util.Random; +import net.minecraft.init.Blocks; +import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.common.world.decoration.IBOPDecoration; import biomesoplenty.common.world.features.WorldGenBOPFlora; +import biomesoplenty.common.world.features.WorldGenBOPTallGrass; public class ExtremeHillsForcedDecorator extends ForcedDecorator { @@ -14,6 +17,7 @@ public class ExtremeHillsForcedDecorator extends ForcedDecorator this.bopWorldFeatures.bopFlowersPerChunk = 3; this.bopWorldFeatures.shrubsPerChunk = 1; this.bopWorldFeatures.leafPilesPerChunk = 3; + this.bopWorldFeatures.deadLeafPilesPerChunk = 1; } @Override @@ -25,4 +29,17 @@ public class ExtremeHillsForcedDecorator extends ForcedDecorator return flowerMap; } + + @Override + public HashMap getWeightedWorldGenForGrass() + { + HashMap grassMap = new HashMap(); + + grassMap.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 2), 0.5D); + grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 10), 0.5D); + grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 11), 0.5D); + + return grassMap; + } } diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/ForestForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/ForestForcedDecorator.java index c702fe897..26663df7c 100644 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/ForestForcedDecorator.java +++ b/src/main/java/biomesoplenty/common/world/forceddecorators/ForestForcedDecorator.java @@ -4,15 +4,18 @@ import java.util.HashMap; import java.util.Random; import net.minecraft.init.Blocks; +import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.common.world.decoration.IBOPDecoration; import biomesoplenty.common.world.features.WorldGenBOPFlora; +import biomesoplenty.common.world.features.WorldGenBOPTallGrass; public class ForestForcedDecorator extends ForcedDecorator { public ForestForcedDecorator() { this.bopWorldFeatures.leafPilesPerChunk = 15; + this.bopWorldFeatures.deadLeafPilesPerChunk = 5; this.bopWorldFeatures.bopFlowersPerChunk = 5; this.bopWorldFeatures.cloverPatchesPerChunk = 5; this.bopWorldFeatures.riverCanePerChunk = 5; @@ -33,4 +36,18 @@ public class ForestForcedDecorator extends ForcedDecorator return flowerMap; } + + @Override + public HashMap getWeightedWorldGenForGrass() + { + HashMap grassMap = new HashMap(); + + grassMap.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 1), 0.5D); + grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 2), 0.5D); + grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 10), 0.5D); + grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 11), 0.5D); + + return grassMap; + } } diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/JungleForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/JungleForcedDecorator.java index 73970cd46..43b1b52ce 100644 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/JungleForcedDecorator.java +++ b/src/main/java/biomesoplenty/common/world/forceddecorators/JungleForcedDecorator.java @@ -3,9 +3,12 @@ package biomesoplenty.common.world.forceddecorators; import java.util.HashMap; import java.util.Random; +import net.minecraft.init.Blocks; +import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.common.world.decoration.IBOPDecoration; import biomesoplenty.common.world.features.WorldGenBOPFlora; +import biomesoplenty.common.world.features.WorldGenBOPTallGrass; public class JungleForcedDecorator extends ForcedDecorator { @@ -26,4 +29,19 @@ public class JungleForcedDecorator extends ForcedDecorator return flowerMap; } + + @Override + public HashMap getWeightedWorldGenForGrass() + { + HashMap grassMap = new HashMap(); + + grassMap.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 1D); + grassMap.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 1), 0.5D); + grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 2), 0.5D); + grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 10), 0.5D); + grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 11), 0.5D); + + return grassMap; + } } diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/PlainsForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/PlainsForcedDecorator.java index 885e16dd3..8d414bc8f 100644 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/PlainsForcedDecorator.java +++ b/src/main/java/biomesoplenty/common/world/forceddecorators/PlainsForcedDecorator.java @@ -3,10 +3,13 @@ package biomesoplenty.common.world.forceddecorators; import java.util.HashMap; import java.util.Random; +import net.minecraft.init.Blocks; +import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.common.world.decoration.IBOPDecoration; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; +import biomesoplenty.common.world.features.WorldGenBOPTallGrass; public class PlainsForcedDecorator extends ForcedDecorator { @@ -26,4 +29,18 @@ public class PlainsForcedDecorator extends ForcedDecorator return flowerMap; } + + @Override + public HashMap getWeightedWorldGenForGrass() + { + HashMap grassMap = new HashMap(); + + grassMap.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 1), 0.5D); + grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 2), 0.5D); + grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 10), 0.5D); + grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 11), 0.5D); + + return grassMap; + } } diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/RoofedForestForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/RoofedForestForcedDecorator.java index acdc4aeff..b210c4413 100644 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/RoofedForestForcedDecorator.java +++ b/src/main/java/biomesoplenty/common/world/forceddecorators/RoofedForestForcedDecorator.java @@ -1,9 +1,14 @@ package biomesoplenty.common.world.forceddecorators; +import java.util.HashMap; import java.util.Random; +import net.minecraft.init.Blocks; +import net.minecraft.world.gen.feature.WorldGenerator; +import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.common.world.decoration.IBOPDecoration; import biomesoplenty.common.world.features.WorldGenBOPFlora; +import biomesoplenty.common.world.features.WorldGenBOPTallGrass; public class RoofedForestForcedDecorator extends ForcedDecorator { @@ -15,4 +20,18 @@ public class RoofedForestForcedDecorator extends ForcedDecorator this.bopWorldFeatures.deadLeafPilesPerChunk = 4; this.bopWorldFeatures.waterReedsPerChunk = 2; } + + @Override + public HashMap getWeightedWorldGenForGrass() + { + HashMap grassMap = new HashMap(); + + grassMap.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 1), 0.5D); + grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 2), 0.5D); + grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 10), 0.25D); + grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 11), 0.25D); + + return grassMap; + } } diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/SavannaForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/SavannaForcedDecorator.java index 0797a36f6..2131313e5 100644 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/SavannaForcedDecorator.java +++ b/src/main/java/biomesoplenty/common/world/forceddecorators/SavannaForcedDecorator.java @@ -4,10 +4,12 @@ import java.util.HashMap; import java.util.Random; import net.minecraft.init.Blocks; +import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.common.world.decoration.IBOPDecoration; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; +import biomesoplenty.common.world.features.WorldGenBOPTallGrass; public class SavannaForcedDecorator extends ForcedDecorator { @@ -29,4 +31,17 @@ public class SavannaForcedDecorator extends ForcedDecorator return flowerMap; } + + @Override + public HashMap getWeightedWorldGenForGrass() + { + HashMap grassMap = new HashMap(); + + grassMap.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 2), 0.5D); + grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 10), 0.5D); + grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 11), 0.5D); + + return grassMap; + } } diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/SwampForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/SwampForcedDecorator.java index 693df3cfe..4a24573f7 100644 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/SwampForcedDecorator.java +++ b/src/main/java/biomesoplenty/common/world/forceddecorators/SwampForcedDecorator.java @@ -4,9 +4,11 @@ import java.util.HashMap; import java.util.Random; import net.minecraft.init.Blocks; +import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.common.world.decoration.IBOPDecoration; import biomesoplenty.common.world.features.WorldGenBOPFlora; +import biomesoplenty.common.world.features.WorldGenBOPTallGrass; public class SwampForcedDecorator extends ForcedDecorator { @@ -20,8 +22,8 @@ public class SwampForcedDecorator extends ForcedDecorator this.bopWorldFeatures.waterReedsPerChunk = 5; this.bopWorldFeatures.toadstoolsPerChunk = 1; this.bopWorldFeatures.blueMilksPerChunk = 1; - this.bopWorldFeatures.leafPilesPerChunk = 5; - this.bopWorldFeatures.deadLeafPilesPerChunk = 2; + this.bopWorldFeatures.leafPilesPerChunk = 2; + this.bopWorldFeatures.deadLeafPilesPerChunk = 4; } @Override @@ -33,4 +35,18 @@ public class SwampForcedDecorator extends ForcedDecorator return flowerMap; } + + @Override + public HashMap getWeightedWorldGenForGrass() + { + HashMap grassMap = new HashMap(); + + grassMap.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 1), 0.5D); + grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 2), 0.5D); + grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 10), 0.5D); + grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 11), 0.5D); + + return grassMap; + } } diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/TaigaForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/TaigaForcedDecorator.java index 4685c8976..1131e69b5 100644 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/TaigaForcedDecorator.java +++ b/src/main/java/biomesoplenty/common/world/forceddecorators/TaigaForcedDecorator.java @@ -11,8 +11,9 @@ public class TaigaForcedDecorator extends ForcedDecorator { public TaigaForcedDecorator() { - this.bopWorldFeatures.deadLeafPilesPerChunk = 2; this.bopWorldFeatures.bopFlowersPerChunk = 2; + this.bopWorldFeatures.leafPilesPerChunk = 2; + this.bopWorldFeatures.deadLeafPilesPerChunk = 4; } @Override