From 01784f1eff784d4eb2c191854a1f82a354a60460 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Mon, 20 Jan 2014 18:26:05 -0500 Subject: [PATCH] Started adding new vanilla flowers to our biomes --- .../common/biomes/BiomeGenBambooForest.java | 6 ++---- .../common/biomes/BiomeGenBorealForest.java | 11 +++++++++++ .../common/biomes/BiomeGenBrushland.java | 11 +++++++++++ .../common/biomes/BiomeGenChaparral.java | 14 ++++++++++++++ .../common/biomes/BiomeGenCherryBlossomGrove.java | 3 +++ .../common/biomes/BiomeGenConiferousForest.java | 3 +++ .../biomes/BiomeGenConiferousForestSnow.java | 3 +++ .../common/biomes/BiomeGenDeciduousForest.java | 2 +- .../biomesoplenty/common/biomes/BiomeGenFen.java | 11 +++++++++++ .../common/biomes/BiomeGenGrove.java | 2 ++ .../common/biomes/BiomeGenHeathland.java | 5 ++++- .../common/biomes/BiomeGenJadeCliffs.java | 14 ++++++++++++++ .../common/biomes/BiomeGenLushDesert.java | 2 ++ .../common/biomes/BiomeGenLushSwamp.java | 2 ++ .../common/biomes/BiomeGenMeadow.java | 3 +++ .../common/biomes/BiomeGenRainforest.java | 15 +++++++++++++++ .../common/biomes/BiomeGenRedwoodForest.java | 14 +++++++++++++- .../common/biomes/BiomeGenSacredSprings.java | 12 ++++++++++-- .../common/biomes/BiomeGenShrubland.java | 12 ++++++++++++ .../common/biomes/BiomeGenSludgepit.java | 2 +- .../biomes/BiomeGenTemperateRainforest.java | 4 +++- .../common/biomes/BiomeGenThicket.java | 12 ++++++++++++ .../common/biomes/BiomeGenTropicalRainforest.java | 5 ++++- .../common/biomes/BiomeGenTropics.java | 4 ++++ .../common/biomes/BiomeGenWetland.java | 3 +++ .../common/biomes/BiomeGenWoodland.java | 13 +++++++++++++ .../java/biomesoplenty/common/core/BOPBiomes.java | 8 ++++---- 27 files changed, 180 insertions(+), 16 deletions(-) diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenBambooForest.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenBambooForest.java index e2629f46c..2156a2a85 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenBambooForest.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenBambooForest.java @@ -5,13 +5,12 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase.Height; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.BOPBlockHelper; -import biomesoplenty.common.world.features.WorldGenBOPFlora; +import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.trees.WorldGenBulbTree; public class BiomeGenBambooForest extends BOPBiome @@ -35,7 +34,6 @@ public class BiomeGenBambooForest extends BOPBiome this.bopWorldFeatures.riverCanePerChunk = 6; this.bopWorldFeatures.shrubsPerChunk = 6; this.bopWorldFeatures.bushesPerChunk = 5; - this.bopWorldFeatures.cloverPatchesPerChunk = 10; this.bopWorldFeatures.generatePumpkins = false; } @@ -81,7 +79,7 @@ public class BiomeGenBambooForest extends BOPBiome @Override public WorldGenerator getRandomWorldGenForGrass(Random random) { - return random.nextInt(4) == 0 ? new WorldGenTallGrass(Blocks.tallgrass, 2) : (random.nextInt(2) == 0 ? new WorldGenTallGrass(BOPBlockHelper.get("foliage"), 10) : (random.nextInt(2) == 0 ? new WorldGenTallGrass(BOPBlockHelper.get("foliage"), 11) : new WorldGenTallGrass(BOPBlockHelper.get("foliage"), 1))); + return random.nextInt(4) == 0 ? new WorldGenTallGrass(Blocks.tallgrass, 2) : (random.nextInt(2) == 0 ? new WorldGenTallGrass(BOPBlockHelper.get("foliage"), 10) : (random.nextInt(2) == 0 ? new WorldGenTallGrass(BOPBlockHelper.get("foliage"), 11) : (random.nextInt(8) == 0 ? new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 3, 9, 64) : new WorldGenTallGrass(BOPBlockHelper.get("foliage"), 1)))); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenBorealForest.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenBorealForest.java index 290f2ae69..1079c2fd3 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenBorealForest.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenBorealForest.java @@ -11,6 +11,7 @@ import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.BOPBlockHelper; +import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2; import biomesoplenty.common.world.features.trees.WorldGenOriginalTree; @@ -46,6 +47,16 @@ public class BiomeGenBorealForest extends BOPBiome (random.nextInt(3) == 0 ? worldGeneratorTrees : new WorldGenBOPTaiga2(Blocks.log, Blocks.leaves, 1, 1, false, 13, 9, 2)))); } + @Override + public HashMap getWeightedWorldGenForBOPFlowers() + { + HashMap flowerMap = new HashMap(); + + flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 4, 10, 5), 1D); + + return flowerMap; + } + @Override public HashMap getWeightedWorldGenForGrass() { diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenBrushland.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenBrushland.java index 1044cfea5..23ce7f58f 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenBrushland.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenBrushland.java @@ -7,6 +7,7 @@ import net.minecraft.init.Blocks; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.BOPBlockHelper; +import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBrush1; import biomesoplenty.common.world.features.trees.WorldGenBrush2; @@ -43,6 +44,16 @@ public class BiomeGenBrushland extends BOPBiome return random.nextInt(2) == 0 ? new WorldGenBrush2(Blocks.log, Blocks.leaves, 3, 0, Blocks.grass) : (random.nextInt(5) == 0 ? new WorldGenBrush1() : new WorldGenMiniShrub(Blocks.log, Blocks.leaves, 0, 0, Blocks.grass, Blocks.sand)); } + @Override + public HashMap getWeightedWorldGenForBOPFlowers() + { + HashMap flowerMap = new HashMap(); + + flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 0.5D); + + return flowerMap; + } + @Override public HashMap getWeightedWorldGenForGrass() { diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenChaparral.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenChaparral.java index 16fcc2a8a..e999940fd 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenChaparral.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenChaparral.java @@ -11,6 +11,8 @@ import net.minecraft.world.biome.BiomeGenBase.Height; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.BOPBlockHelper; +import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; +import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBOPShrub; import biomesoplenty.common.world.features.trees.WorldGenMiniShrub; @@ -37,6 +39,7 @@ public class BiomeGenChaparral extends BOPBiome this.theBiomeDecorator.treesPerChunk = 8; this.theBiomeDecorator.grassPerChunk = 20; + this.bopWorldFeatures.bopFlowersPerChunk = 5; this.bopWorldFeatures.bushesPerChunk = 10; this.bopWorldFeatures.berryBushesPerChunk = 2; this.bopWorldFeatures.generateStoneInGrass = true; @@ -52,6 +55,17 @@ public class BiomeGenChaparral extends BOPBiome { return random.nextInt(2) == 0 ? new WorldGenMiniShrub(Blocks.log, Blocks.leaves, 0, 0, Blocks.grass, Blocks.sand) : (random.nextInt(5) == 0 ? new WorldGenBOPShrub(Blocks.log, Blocks.leaves, 0, 0, Blocks.grass, Blocks.sand) : new WorldGenChaparral3()); } + + @Override + public HashMap getWeightedWorldGenForBOPFlowers() + { + HashMap flowerMap = new HashMap(); + + flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 4, 10, 5), 1D); + flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 1, 7, 5), 0.5D); + + return flowerMap; + } @Override public HashMap getWeightedWorldGenForGrass() diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenCherryBlossomGrove.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenCherryBlossomGrove.java index bc39299ec..91a27e557 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenCherryBlossomGrove.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenCherryBlossomGrove.java @@ -10,6 +10,7 @@ import net.minecraft.world.biome.BiomeGenBase.Height; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.BOPBlockHelper; +import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBOPBigTree; @@ -32,6 +33,7 @@ public class BiomeGenCherryBlossomGrove extends BOPBiome this.theBiomeDecorator.grassPerChunk = 15; this.theBiomeDecorator.flowersPerChunk = -999; + this.bopWorldFeatures.bopFlowersPerChunk = 10; this.bopWorldFeatures.shrubsPerChunk = 2; this.bopWorldFeatures.cloverPatchesPerChunk = 15; this.bopWorldFeatures.generatePumpkins = false; @@ -52,6 +54,7 @@ public class BiomeGenCherryBlossomGrove extends BOPBiome flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 6), 3D); flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 9), 6D); flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 0), 5D); + flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 1, 7, 5), 1D); return flowerMap; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenConiferousForest.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenConiferousForest.java index 0423c9a87..abd3aae5d 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenConiferousForest.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenConiferousForest.java @@ -10,6 +10,7 @@ import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.BOPBlockHelper; +import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2; import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga3; @@ -64,6 +65,8 @@ public class BiomeGenConiferousForest extends BOPBiome grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 2), 1D); grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 10), 0.5D); grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 11), 0.5D); + grassMap.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.5D); + grassMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 3, 9, 64), 0.5D); return grassMap; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenConiferousForestSnow.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenConiferousForestSnow.java index aac33a0a9..9fa81a3bb 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenConiferousForestSnow.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenConiferousForestSnow.java @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.Random; import biomesoplenty.api.BOPBlockHelper; +import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2; @@ -71,6 +72,8 @@ public class BiomeGenConiferousForestSnow extends BOPBiome grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 2), 1D); grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 10), 0.5D); grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 11), 0.5D); + grassMap.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.25D); + grassMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 3, 9, 64), 0.25D); return grassMap; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenDeciduousForest.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenDeciduousForest.java index 52bac68fa..096e74dec 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenDeciduousForest.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenDeciduousForest.java @@ -53,7 +53,7 @@ public class BiomeGenDeciduousForest extends BOPBiome HashMap grassMap = new HashMap(); grassMap.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); - grassMap.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 2D); + grassMap.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 1D); grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 10), 0.5D); grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 11), 0.5D); diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenFen.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenFen.java index 24f191629..537e8ed18 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenFen.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenFen.java @@ -10,6 +10,7 @@ import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.BOPBlockHelper; +import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.WorldGenMoss; import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga1; @@ -61,6 +62,16 @@ public class BiomeGenFen extends BOPBiome new WorldGenBOPTaiga1(Blocks.log, Blocks.leaves, 0, 0, false, 7, 5, 1)); } + @Override + public HashMap getWeightedWorldGenForBOPFlowers() + { + HashMap flowerMap = new HashMap(); + + flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 0.5D); + + return flowerMap; + } + @Override public HashMap getWeightedWorldGenForGrass() { diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenGrove.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenGrove.java index 3d62be7a2..eebee6c1d 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenGrove.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenGrove.java @@ -10,6 +10,7 @@ import net.minecraft.world.biome.BiomeGenBase.Height; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.BOPBlockHelper; +import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenMiniShrub; @@ -56,6 +57,7 @@ public class BiomeGenGrove extends BOPBiome flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 0), 16D); flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 9), 3D); + flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 5, 11, 3), 2D); return flowerMap; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenHeathland.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenHeathland.java index 8c8e9c6d6..9a8fd0d0a 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenHeathland.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenHeathland.java @@ -11,6 +11,7 @@ import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.BOPBlockHelper; +import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBOPShrub; @@ -37,7 +38,7 @@ public class BiomeGenHeathland extends BOPBiome this.theBiomeDecorator.grassPerChunk = 10; this.theBiomeDecorator.deadBushPerChunk = 2; - this.bopWorldFeatures.bopFlowersPerChunk = 30; + this.bopWorldFeatures.bopFlowersPerChunk = 20; this.bopWorldFeatures.berryBushesPerChunk = 1; this.bopWorldFeatures.shrubsPerChunk = 5; this.bopWorldFeatures.generatePumpkins = false; @@ -56,6 +57,8 @@ public class BiomeGenHeathland extends BOPBiome HashMap flowerMap = new HashMap(); flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 7), 1D); + flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 0.5D); + flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 1, 7, 5), 0.25D); return flowerMap; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenJadeCliffs.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenJadeCliffs.java index f45eb8ff1..7e9a94c82 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenJadeCliffs.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenJadeCliffs.java @@ -1,5 +1,6 @@ package biomesoplenty.common.biomes; +import java.util.HashMap; import java.util.Random; import net.minecraft.block.Block; @@ -12,6 +13,8 @@ import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.common.configuration.BOPConfigurationMisc; +import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; +import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.trees.WorldGenPineTree; public class BiomeGenJadeCliffs extends BOPBiome @@ -31,6 +34,7 @@ public class BiomeGenJadeCliffs extends BOPBiome this.theBiomeDecorator.treesPerChunk = 12; this.theBiomeDecorator.grassPerChunk = 3; + this.bopWorldFeatures.bopFlowersPerChunk = 3; this.bopWorldFeatures.wildCarrotsPerChunk = 1; } @@ -40,6 +44,16 @@ public class BiomeGenJadeCliffs extends BOPBiome { return random.nextInt(4) == 0 ? new WorldGenShrub(0, 1) : new WorldGenPineTree(); } + + @Override + public HashMap getWeightedWorldGenForBOPFlowers() + { + HashMap flowerMap = new HashMap(); + + flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 1, 7, 5), 0.5D); + + return flowerMap; + } @Override public WorldGenerator getRandomWorldGenForGrass(Random random) diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenLushDesert.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenLushDesert.java index 625282a2e..d18164841 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenLushDesert.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenLushDesert.java @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.Random; import biomesoplenty.api.BOPBlockHelper; +import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenCypress; @@ -67,6 +68,7 @@ public class BiomeGenLushDesert extends BOPBiome { HashMap flowerMap = new HashMap(); + flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 4, 10, 5), 0.5D); flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 7), 1D); return flowerMap; diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenLushSwamp.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenLushSwamp.java index 0d11add34..204af3e57 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenLushSwamp.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenLushSwamp.java @@ -61,6 +61,8 @@ public class BiomeGenLushSwamp extends BOPBiome HashMap flowerMap = new HashMap(); flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 4), 1D); + flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 0.5D); + flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 0.75D); return flowerMap; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenMeadow.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenMeadow.java index 050e12d65..c5c789c02 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenMeadow.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenMeadow.java @@ -12,6 +12,7 @@ import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenDoublePlant; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.BOPBlockHelper; +import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBOPShrub; @@ -58,6 +59,8 @@ public class BiomeGenMeadow extends BOPBiome flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 0), 3D); flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 4), 1D); + flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 5, 11, 3), 0.5D); + flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 1, 7, 5), 0.5D); return flowerMap; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenRainforest.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenRainforest.java index 89c80f69d..374ffa64e 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenRainforest.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenRainforest.java @@ -1,5 +1,6 @@ package biomesoplenty.common.biomes; +import java.util.HashMap; import java.util.Random; import net.minecraft.block.Block; @@ -12,6 +13,7 @@ import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.common.entities.EntityJungleSpider; +import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.trees.WorldGenOriginalTree; @@ -47,6 +49,19 @@ public class BiomeGenRainforest extends BOPBiome customBiomeDecorator.orangeFlowersPerChunk = 6;*/ } + @Override + public HashMap getWeightedWorldGenForBOPFlowers() + { + HashMap flowerMap = new HashMap(); + + flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 6), 3D); + flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 0.5D); + flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 4, 10, 5), 1D); + flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 1, 7, 5), 0.5D); + + return flowerMap; + } + @Override //TODO: getRandomWorldGenForTrees() public WorldGenAbstractTree func_150567_a(Random random) diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenRedwoodForest.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenRedwoodForest.java index f1a77267b..efef5b68c 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenRedwoodForest.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenRedwoodForest.java @@ -11,6 +11,8 @@ import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.BOPBlockHelper; +import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; +import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenRedwoodTree; import biomesoplenty.common.world.features.trees.WorldGenRedwoodTree2; @@ -45,7 +47,17 @@ public class BiomeGenRedwoodForest extends BOPBiome { return random.nextInt(4) == 0 ? new WorldGenRedwoodTree(BOPBlockHelper.get("logs3"), BOPBlockHelper.get("colorizedLeaves1"), 0, 3, false, 40, 10) : (random.nextInt(8) == 0 ? new WorldGenShrub(0,0) : new WorldGenRedwoodTree2(BOPBlockHelper.get("logs3"), BOPBlockHelper.get("colorizedLeaves1"), 0, 3, false, 20, 15)); } - + + @Override + public HashMap getWeightedWorldGenForBOPFlowers() + { + HashMap flowerMap = new HashMap(); + + flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 4, 10, 5), 1D); + flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 0.5D); + + return flowerMap; + } @Override public HashMap getWeightedWorldGenForGrass() diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenSacredSprings.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenSacredSprings.java index ada008394..002400203 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenSacredSprings.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenSacredSprings.java @@ -1,5 +1,6 @@ package biomesoplenty.common.biomes; +import java.util.HashMap; import java.util.Random; import net.minecraft.init.Blocks; @@ -10,6 +11,7 @@ import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.common.entities.EntityJungleSpider; +import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.trees.WorldGenSacredOak; import cpw.mods.fml.relauncher.Side; @@ -49,9 +51,15 @@ public class BiomeGenSacredSprings extends BOPBiome } @Override - public WorldGenBOPFlora getRandomWorldGenForBOPFlowers(Random random) + public HashMap getWeightedWorldGenForBOPFlowers() { - return random.nextInt(3) == 0 ? new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 6) : new WorldGenBOPFlora(Blocks.red_flower, 1); + HashMap flowerMap = new HashMap(); + + flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 6), 3D); + flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 6D); + flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 5, 11, 5), 1D); + + return flowerMap; } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenShrubland.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenShrubland.java index 7e5a24952..47a30e7a5 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenShrubland.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenShrubland.java @@ -1,5 +1,6 @@ package biomesoplenty.common.biomes; +import java.util.HashMap; import java.util.Random; import net.minecraft.block.Block; @@ -12,6 +13,7 @@ import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.BOPBlockHelper; +import biomesoplenty.common.world.features.WorldGenBOPFlora; public class BiomeGenShrubland extends BOPBiome { @@ -45,6 +47,16 @@ public class BiomeGenShrubland extends BOPBiome return new WorldGenShrub(0, 0); } + + @Override + public HashMap getWeightedWorldGenForBOPFlowers() + { + HashMap flowerMap = new HashMap(); + + flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 0.5D); + + return flowerMap; + } @Override public WorldGenerator getRandomWorldGenForGrass(Random random) diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenSludgepit.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenSludgepit.java index 8b45ca378..92d515312 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenSludgepit.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenSludgepit.java @@ -68,7 +68,7 @@ public class BiomeGenSludgepit extends BOPBiome grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 10), 0.5D); grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 11), 0.5D); grassMap.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 0), 0.5D); - grassMap.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 1D); + grassMap.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); return grassMap; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenTemperateRainforest.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenTemperateRainforest.java index abad2fbaf..95fd5d049 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenTemperateRainforest.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenTemperateRainforest.java @@ -12,6 +12,7 @@ import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.common.configuration.BOPConfigurationMisc; +import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.WorldGenMoss; import biomesoplenty.common.world.features.trees.WorldGenBOPSwampTree; @@ -62,11 +63,12 @@ public class BiomeGenTemperateRainforest extends BOPBiome HashMap grassMap = new HashMap(); grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 1), 1D); - grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 2), 0.5D); + grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 2), 2D); grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 10), 0.5D); grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 11), 0.5D); grassMap.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D); grassMap.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.5D); + grassMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 3, 9, 64), 0.25D); return grassMap; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenThicket.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenThicket.java index 14b441367..b0cb34a81 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenThicket.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenThicket.java @@ -1,5 +1,6 @@ package biomesoplenty.common.biomes; +import java.util.HashMap; import java.util.Random; import net.minecraft.init.Blocks; @@ -9,6 +10,7 @@ import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.BOPBlockHelper; +import biomesoplenty.common.world.features.WorldGenBOPFlora; public class BiomeGenThicket extends BOPBiome { @@ -37,6 +39,16 @@ public class BiomeGenThicket extends BOPBiome { return random.nextInt(5) == 0 ? worldGeneratorTrees : new WorldGenShrub(0, 0); } + + @Override + public HashMap getWeightedWorldGenForBOPFlowers() + { + HashMap flowerMap = new HashMap(); + + flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 0.5D); + + return flowerMap; + } @Override public WorldGenerator getRandomWorldGenForGrass(Random random) diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenTropicalRainforest.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenTropicalRainforest.java index b7407ec76..9d4c9f3d6 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenTropicalRainforest.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenTropicalRainforest.java @@ -14,6 +14,7 @@ import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.common.configuration.BOPConfigurationMisc; import biomesoplenty.common.entities.EntityJungleSpider; +import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenRainforestTree1; @@ -43,7 +44,7 @@ public class BiomeGenTropicalRainforest extends BOPBiome this.theBiomeDecorator.waterlilyPerChunk = 2; this.bopWorldFeatures.bopFlowersPerChunk = 10; - this.bopWorldFeatures.doubleTallGrassPerChunk = 4; + this.bopWorldFeatures.doubleTallGrassPerChunk = 8; this.bopWorldFeatures.generatePumpkins = false; this.bopWorldFeatures.generateMelons = true; this.bopWorldFeatures.sproutsPerChunk = 2; @@ -78,6 +79,8 @@ public class BiomeGenTropicalRainforest extends BOPBiome grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 10), 0.5D); grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 11), 0.5D); grassMap.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + grassMap.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.75D); + grassMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 3, 9, 64), 1D); return grassMap; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenTropics.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenTropics.java index 5265178ee..ef8a447f9 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenTropics.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenTropics.java @@ -12,6 +12,7 @@ import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.common.configuration.BOPConfigurationMisc; import biomesoplenty.common.entities.EntityJungleSpider; +import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenPalmTree1; @@ -64,6 +65,8 @@ public class BiomeGenTropics extends BOPBiome flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 9), 0.5D); flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 5), 0.75D); flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers2"), 0), 5D); + flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 0.5D); + flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 4, 10, 5), 1D); return flowerMap; } @@ -76,6 +79,7 @@ public class BiomeGenTropics extends BOPBiome grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 10), 0.5D); grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 11), 0.5D); grassMap.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + grassMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 3, 9, 64), 0.25D); return grassMap; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenWetland.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenWetland.java index 5ec12c0e4..ed054532d 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenWetland.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenWetland.java @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.Random; import biomesoplenty.api.BOPBlockHelper; +import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.WorldGenMoss; @@ -78,6 +79,7 @@ public class BiomeGenWetland extends BOPBiome HashMap flowerMap = new HashMap(); flowerMap.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 1), 1D); + flowerMap.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 0.5D); return flowerMap; } @@ -91,6 +93,7 @@ public class BiomeGenWetland extends BOPBiome grassMap.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 11), 0.5D); grassMap.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.5D); grassMap.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + grassMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 3, 9, 64), 0.75D); return grassMap; } diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenWoodland.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenWoodland.java index 8982b55fa..012fdfcdc 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenWoodland.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenWoodland.java @@ -4,6 +4,8 @@ import java.util.HashMap; import java.util.Random; import biomesoplenty.api.BOPBlockHelper; +import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; +import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import net.minecraft.block.Block; import net.minecraft.init.Blocks; @@ -31,6 +33,7 @@ public class BiomeGenWoodland extends BOPBiome this.theBiomeDecorator.grassPerChunk = 7; this.theBiomeDecorator.mushroomsPerChunk = 4; + this.bopWorldFeatures.bopFlowersPerChunk = 5; this.bopWorldFeatures.toadstoolsPerChunk = 3; this.bopWorldFeatures.shrubsPerChunk = 20; this.bopWorldFeatures.waterReedsPerChunk = 2; @@ -45,6 +48,16 @@ public class BiomeGenWoodland extends BOPBiome { return random.nextInt(10) == 0 ? worldGeneratorBigTree : worldGeneratorTrees; } + + @Override + public HashMap getWeightedWorldGenForBOPFlowers() + { + HashMap flowerMap = new HashMap(); + + flowerMap.put(new WorldGenBOPDoubleFlora(Blocks.double_plant, Blocks.double_plant, 4, 10, 5), 1D); + + return flowerMap; + } @Override public HashMap getWeightedWorldGenForGrass() diff --git a/src/main/java/biomesoplenty/common/core/BOPBiomes.java b/src/main/java/biomesoplenty/common/core/BOPBiomes.java index 050d12399..2993fb0b1 100644 --- a/src/main/java/biomesoplenty/common/core/BOPBiomes.java +++ b/src/main/java/biomesoplenty/common/core/BOPBiomes.java @@ -110,7 +110,7 @@ public class BOPBiomes registerVanillaBiome(new BOPBiomeEntry(BiomeGenBase.icePlains, TemperatureType.ICY, 50)); registerVanillaBiome(new BOPBiomeEntry(BiomeGenBase.field_150584_S, TemperatureType.ICY, 50)); - registerBiome(new BOPBiomeEntry(new BiomeGenAlps(BOPConfigurationIDs.alpsID).setBiomeName("Alps"), TemperatureType.ICY, 50)); + registerBiome(new BOPBiomeEntry(new BiomeGenAlps(BOPConfigurationIDs.alpsID).setBiomeName("Alps"), TemperatureType.ICY, 25)); registerBiome(new BOPBiomeEntry(new BiomeGenArctic(BOPConfigurationIDs.arcticID).setBiomeName("Arctic"), TemperatureType.ICY, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenBambooForest(BOPConfigurationIDs.bambooForestID).setBiomeName("Bamboo Forest"), TemperatureType.HOT, 25)); registerBiome(new BOPBiomeEntry(new BiomeGenBayou(BOPConfigurationIDs.bayouID).setBiomeName("Bayou"), TemperatureType.WARM, 50)); @@ -131,7 +131,7 @@ public class BOPBiomes registerBiome(new BOPBiomeEntry(new BiomeGenFlowerField(BOPConfigurationIDs.flowerFieldID).setBiomeName("Flower Field"), TemperatureType.WARM, 25)); registerBiome(new BOPBiomeEntry(new BiomeGenFrostForest(BOPConfigurationIDs.frostForestID).setBiomeName("Frost Forest"), TemperatureType.ICY, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenGrassland(BOPConfigurationIDs.grasslandID).setBiomeName("Grassland"), TemperatureType.COOL, 50)); - registerBiome(new BOPBiomeEntry(new BiomeGenGrove(BOPConfigurationIDs.groveID).setBiomeName("Grove"), TemperatureType.WARM, 50)); + registerBiome(new BOPBiomeEntry(new BiomeGenGrove(BOPConfigurationIDs.groveID).setBiomeName("Grove"), TemperatureType.COOL, 25)); registerBiome(new BOPBiomeEntry(new BiomeGenHeathland(BOPConfigurationIDs.heathlandID).setBiomeName("Heathland"), TemperatureType.WARM, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenHighland(BOPConfigurationIDs.highlandID).setBiomeName("Highland"), TemperatureType.WARM, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenJadeCliffs(BOPConfigurationIDs.jadeCliffsID).setBiomeName("Jade Cliffs"), TemperatureType.WARM, 25)); @@ -147,7 +147,7 @@ public class BOPBiomes registerBiome(new BOPBiomeEntry(new BiomeGenOminousWoods(BOPConfigurationIDs.ominousWoodsID).setBiomeName("Ominous Woods"), TemperatureType.COOL, 15)); registerBiome(new BOPBiomeEntry(new BiomeGenOriginValley(BOPConfigurationIDs.originValleyID).setBiomeName("Origin Valley"), TemperatureType.WARM, 5)); registerBiome(new BOPBiomeEntry(new BiomeGenOutback(BOPConfigurationIDs.outbackID).setBiomeName("Outback"), TemperatureType.HOT, 50)); - registerBiome(new BOPBiomeEntry(new BiomeGenPasture(BOPConfigurationIDs.pastureID).setBiomeName("Pasture"), TemperatureType.WARM, 50)); + registerBiome(new BOPBiomeEntry(new BiomeGenPasture(BOPConfigurationIDs.pastureID).setBiomeName("Pasture"), TemperatureType.WARM, 25)); registerBiome(new BOPBiomeEntry(new BiomeGenPrairie(BOPConfigurationIDs.prairieID).setBiomeName("Prairie"), TemperatureType.WARM, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenQuagmire(BOPConfigurationIDs.quagmireID).setBiomeName("Quagmire"), TemperatureType.WARM, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenRainforest(BOPConfigurationIDs.rainforestID).setBiomeName("Rainforest"), TemperatureType.WARM, 50)); @@ -162,7 +162,7 @@ public class BOPBiomes registerBiome(new BOPBiomeEntry(new BiomeGenTemperateRainforest(BOPConfigurationIDs.temperateRainforestID).setBiomeName("Temperate Rainforest"), TemperatureType.WARM, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenThicket(BOPConfigurationIDs.thicketID).setBiomeName("Thicket"), TemperatureType.WARM, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenTimber(BOPConfigurationIDs.timberID).setBiomeName("Timber"), TemperatureType.COOL, 50)); - registerBiome(new BOPBiomeEntry(new BiomeGenTropicalRainforest(BOPConfigurationIDs.tropicalRainforestID).setBiomeName("Tropical Rainforest"), TemperatureType.HOT, 50)); + registerBiome(new BOPBiomeEntry(new BiomeGenTropicalRainforest(BOPConfigurationIDs.tropicalRainforestID).setBiomeName("Tropical Rainforest"), TemperatureType.HOT, 25)); registerBiome(new BOPBiomeEntry(new BiomeGenTropics(BOPConfigurationIDs.tropicsID).setBiomeName("Tropics"), TemperatureType.HOT, 25)); registerBiome(new BOPBiomeEntry(new BiomeGenTundra(BOPConfigurationIDs.tundraID).setBiomeName("Tundra"), TemperatureType.ICY, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenVolcano(BOPConfigurationIDs.volcanoID).setBiomeName("Volcano"), TemperatureType.HOT, 50));