From d22dbc4a941940b357ad9a5805ff3074c3bf6b17 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Sat, 15 Mar 2014 16:00:00 -0400 Subject: [PATCH] Finished the forced decorators for vanilla biomes --- .../BirchForestForcedDecorator.java | 1 + .../DesertForcedDecorator.java | 2 +- .../ExtremeHillsForcedDecorator.java | 16 ++++++++++++- .../ForestForcedDecorator.java | 24 ++++++++++++++++++- .../IcePlainsForcedDecorator.java | 14 ++++++++++- .../JungleForcedDecorator.java | 17 ++++++++++++- .../forceddecorators/MesaForcedDecorator.java | 19 ++++++++++++++- .../MushroomIslandForcedDecorator.java | 4 +++- .../OceanForcedDecorator.java | 2 +- .../PlainsForcedDecorator.java | 17 ++++++++++++- .../RoofedForestForcedDecorator.java | 6 ++++- .../SavannaForcedDecorator.java | 20 +++++++++++++++- .../SwampForcedDecorator.java | 2 ++ .../TaigaForcedDecorator.java | 15 +++++++++++- 14 files changed, 147 insertions(+), 12 deletions(-) diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/BirchForestForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/BirchForestForcedDecorator.java index 11e21e326..460f42e81 100644 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/BirchForestForcedDecorator.java +++ b/src/main/java/biomesoplenty/common/world/forceddecorators/BirchForestForcedDecorator.java @@ -13,6 +13,7 @@ public class BirchForestForcedDecorator extends ForcedDecorator { this.bopWorldFeatures.poisonIvyPerChunk = 3; this.bopWorldFeatures.cloverPatchesPerChunk = 15; + this.bopWorldFeatures.leafPilesPerChunk = 5; } @Override diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/DesertForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/DesertForcedDecorator.java index 2b91c25ec..4fd3c1852 100644 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/DesertForcedDecorator.java +++ b/src/main/java/biomesoplenty/common/world/forceddecorators/DesertForcedDecorator.java @@ -9,6 +9,6 @@ public class DesertForcedDecorator extends ForcedDecorator { public DesertForcedDecorator() { - + this.bopWorldFeatures.tinyCactiPerChunk = 10; } } diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/ExtremeHillsForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/ExtremeHillsForcedDecorator.java index 2234213ff..d58dcb433 100644 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/ExtremeHillsForcedDecorator.java +++ b/src/main/java/biomesoplenty/common/world/forceddecorators/ExtremeHillsForcedDecorator.java @@ -1,7 +1,9 @@ package biomesoplenty.common.world.forceddecorators; +import java.util.HashMap; import java.util.Random; +import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.common.world.decoration.IBOPDecoration; import biomesoplenty.common.world.features.WorldGenBOPFlora; @@ -9,6 +11,18 @@ public class ExtremeHillsForcedDecorator extends ForcedDecorator { public ExtremeHillsForcedDecorator() { - + this.bopWorldFeatures.bopFlowersPerChunk = 3; + this.bopWorldFeatures.shrubsPerChunk = 1; + this.bopWorldFeatures.leafPilesPerChunk = 3; } + + @Override + public HashMap getWeightedWorldGenForBOPFlowers() + { + HashMap flowerMap = new HashMap(); + + flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 8), 8); + + return flowerMap; + } } diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/ForestForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/ForestForcedDecorator.java index 73670df7a..c702fe897 100644 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/ForestForcedDecorator.java +++ b/src/main/java/biomesoplenty/common/world/forceddecorators/ForestForcedDecorator.java @@ -1,7 +1,10 @@ package biomesoplenty.common.world.forceddecorators; +import java.util.HashMap; import java.util.Random; +import net.minecraft.init.Blocks; +import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.common.world.decoration.IBOPDecoration; import biomesoplenty.common.world.features.WorldGenBOPFlora; @@ -9,6 +12,25 @@ public class ForestForcedDecorator extends ForcedDecorator { public ForestForcedDecorator() { - + this.bopWorldFeatures.leafPilesPerChunk = 15; + this.bopWorldFeatures.bopFlowersPerChunk = 5; + this.bopWorldFeatures.cloverPatchesPerChunk = 5; + this.bopWorldFeatures.riverCanePerChunk = 5; + this.bopWorldFeatures.shrubsPerChunk = 2; + this.bopWorldFeatures.waterReedsPerChunk = 6; + this.bopWorldFeatures.poisonIvyPerChunk = 1; + this.bopWorldFeatures.bushesPerChunk = 2; + this.bopWorldFeatures.berryBushesPerChunk = 1; + this.bopWorldFeatures.toadstoolsPerChunk = 2; } + + @Override + public HashMap getWeightedWorldGenForBOPFlowers() + { + HashMap flowerMap = new HashMap(); + + flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 4), 8); + + return flowerMap; + } } diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/IcePlainsForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/IcePlainsForcedDecorator.java index 21f3ecbc9..6e19daa05 100644 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/IcePlainsForcedDecorator.java +++ b/src/main/java/biomesoplenty/common/world/forceddecorators/IcePlainsForcedDecorator.java @@ -1,7 +1,9 @@ package biomesoplenty.common.world.forceddecorators; +import java.util.HashMap; import java.util.Random; +import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.common.world.decoration.IBOPDecoration; import biomesoplenty.common.world.features.WorldGenBOPFlora; @@ -9,6 +11,16 @@ public class IcePlainsForcedDecorator extends ForcedDecorator { public IcePlainsForcedDecorator() { - + this.bopWorldFeatures.bopFlowersPerChunk = 1; } + + @Override + public HashMap getWeightedWorldGenForBOPFlowers() + { + HashMap flowerMap = new HashMap(); + + flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 8), 8); + + return flowerMap; + } } diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/JungleForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/JungleForcedDecorator.java index 1405bb09f..73970cd46 100644 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/JungleForcedDecorator.java +++ b/src/main/java/biomesoplenty/common/world/forceddecorators/JungleForcedDecorator.java @@ -1,7 +1,9 @@ package biomesoplenty.common.world.forceddecorators; +import java.util.HashMap; import java.util.Random; +import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.common.world.decoration.IBOPDecoration; import biomesoplenty.common.world.features.WorldGenBOPFlora; @@ -9,6 +11,19 @@ public class JungleForcedDecorator extends ForcedDecorator { public JungleForcedDecorator() { - + this.bopWorldFeatures.leafPilesPerChunk = 10; + this.bopWorldFeatures.bopFlowersPerChunk = 10; + this.bopWorldFeatures.seaweedPerChunk = 15; + this.bopWorldFeatures.poisonIvyPerChunk = 1; } + + @Override + public HashMap getWeightedWorldGenForBOPFlowers() + { + HashMap flowerMap = new HashMap(); + + flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 5), 12); + + return flowerMap; + } } diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/MesaForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/MesaForcedDecorator.java index ce58e07e1..bd267e9f1 100644 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/MesaForcedDecorator.java +++ b/src/main/java/biomesoplenty/common/world/forceddecorators/MesaForcedDecorator.java @@ -1,14 +1,31 @@ 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 MesaForcedDecorator extends ForcedDecorator { public MesaForcedDecorator() { - + this.bopWorldFeatures.tinyCactiPerChunk = 10; + this.bopWorldFeatures.bromeliadsPerChunk = 10; } + + @Override + public HashMap getWeightedWorldGenForGrass() + { + HashMap grassMap = new HashMap(); + + grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("plants"), 1), 1D); + grassMap.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + + return grassMap; + } } diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/MushroomIslandForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/MushroomIslandForcedDecorator.java index b768e4b72..fe8025d03 100644 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/MushroomIslandForcedDecorator.java +++ b/src/main/java/biomesoplenty/common/world/forceddecorators/MushroomIslandForcedDecorator.java @@ -9,6 +9,8 @@ public class MushroomIslandForcedDecorator extends ForcedDecorator { public MushroomIslandForcedDecorator() { - + this.bopWorldFeatures.blueMilksPerChunk = 2; + this.bopWorldFeatures.toadstoolsPerChunk = 8; + this.bopWorldFeatures.portobellosPerChunk = 6; } } diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/OceanForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/OceanForcedDecorator.java index 6d12461e0..ed1e6a8dd 100644 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/OceanForcedDecorator.java +++ b/src/main/java/biomesoplenty/common/world/forceddecorators/OceanForcedDecorator.java @@ -9,6 +9,6 @@ public class OceanForcedDecorator extends ForcedDecorator { public OceanForcedDecorator() { - + this.bopWorldFeatures.seaweedPerChunk = 20; } } diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/PlainsForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/PlainsForcedDecorator.java index 97bcbcddd..885e16dd3 100644 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/PlainsForcedDecorator.java +++ b/src/main/java/biomesoplenty/common/world/forceddecorators/PlainsForcedDecorator.java @@ -1,14 +1,29 @@ package biomesoplenty.common.world.forceddecorators; +import java.util.HashMap; import java.util.Random; +import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.common.world.decoration.IBOPDecoration; +import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; public class PlainsForcedDecorator extends ForcedDecorator { public PlainsForcedDecorator() { - + this.bopWorldFeatures.bopFlowersPerChunk = 8; + this.bopWorldFeatures.wildCarrotsPerChunk = 1; } + + @Override + public HashMap getWeightedWorldGenForBOPFlowers() + { + HashMap flowerMap = new HashMap(); + + flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 0), 10); + flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 9), 5); + + return flowerMap; + } } diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/RoofedForestForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/RoofedForestForcedDecorator.java index 2e21f939e..acdc4aeff 100644 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/RoofedForestForcedDecorator.java +++ b/src/main/java/biomesoplenty/common/world/forceddecorators/RoofedForestForcedDecorator.java @@ -9,6 +9,10 @@ public class RoofedForestForcedDecorator extends ForcedDecorator { public RoofedForestForcedDecorator() { - + this.bopWorldFeatures.toadstoolsPerChunk = 1; + this.bopWorldFeatures.blueMilksPerChunk = 1; + this.bopWorldFeatures.leafPilesPerChunk = 8; + this.bopWorldFeatures.deadLeafPilesPerChunk = 4; + this.bopWorldFeatures.waterReedsPerChunk = 2; } } diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/SavannaForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/SavannaForcedDecorator.java index b58792d0c..0797a36f6 100644 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/SavannaForcedDecorator.java +++ b/src/main/java/biomesoplenty/common/world/forceddecorators/SavannaForcedDecorator.java @@ -1,14 +1,32 @@ package biomesoplenty.common.world.forceddecorators; +import java.util.HashMap; import java.util.Random; +import net.minecraft.init.Blocks; +import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.common.world.decoration.IBOPDecoration; +import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; public class SavannaForcedDecorator extends ForcedDecorator { public SavannaForcedDecorator() { - + this.bopWorldFeatures.leafPilesPerChunk = 10; + this.bopWorldFeatures.deadLeafPilesPerChunk = 5; + this.bopWorldFeatures.bopFlowersPerChunk = 10; + this.bopWorldFeatures.bushesPerChunk = 3; + this.bopWorldFeatures.waterReedsPerChunk = 5; } + + @Override + public HashMap getWeightedWorldGenForBOPFlowers() + { + HashMap flowerMap = new HashMap(); + + flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 7), 8); + + return flowerMap; + } } diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/SwampForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/SwampForcedDecorator.java index 41f8e7d5b..693df3cfe 100644 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/SwampForcedDecorator.java +++ b/src/main/java/biomesoplenty/common/world/forceddecorators/SwampForcedDecorator.java @@ -20,6 +20,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; } @Override diff --git a/src/main/java/biomesoplenty/common/world/forceddecorators/TaigaForcedDecorator.java b/src/main/java/biomesoplenty/common/world/forceddecorators/TaigaForcedDecorator.java index 7ea3e9fd5..4685c8976 100644 --- a/src/main/java/biomesoplenty/common/world/forceddecorators/TaigaForcedDecorator.java +++ b/src/main/java/biomesoplenty/common/world/forceddecorators/TaigaForcedDecorator.java @@ -1,7 +1,9 @@ package biomesoplenty.common.world.forceddecorators; +import java.util.HashMap; import java.util.Random; +import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.common.world.decoration.IBOPDecoration; import biomesoplenty.common.world.features.WorldGenBOPFlora; @@ -9,6 +11,17 @@ public class TaigaForcedDecorator extends ForcedDecorator { public TaigaForcedDecorator() { - + this.bopWorldFeatures.deadLeafPilesPerChunk = 2; + this.bopWorldFeatures.bopFlowersPerChunk = 2; } + + @Override + public HashMap getWeightedWorldGenForBOPFlowers() + { + HashMap flowerMap = new HashMap(); + + flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 8), 8); + + return flowerMap; + } }