diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBambooForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBambooForest.java index f68b21e72..dc0bea9f6 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBambooForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBambooForest.java @@ -68,7 +68,7 @@ public class BiomeGenBambooForest extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.5F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("dandelion", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.DANDELION).create())); flowerGenerator.add("poppy", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.POPPY).create())); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBog.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBog.java index beb8f2dec..895ef980d 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBog.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBog.java @@ -82,7 +82,7 @@ public class BiomeGenBog extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.5F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("dandelion", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.DANDELION).create())); flowerGenerator.add("poppy", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.POPPY).create())); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java index 2883cb82e..2dd0681b7 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java @@ -71,7 +71,7 @@ public class BiomeGenBorealForest extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.5F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("rose", 2, (new GeneratorDoubleFlora.Builder().with(BlockDoublePlant.EnumPlantType.ROSE).create())); flowerGenerator.add("dandelion", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.DANDELION).create())); flowerGenerator.add("poppy", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.POPPY).create())); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenChaparral.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenChaparral.java index ef83d2e34..1e7fee430 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenChaparral.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenChaparral.java @@ -57,7 +57,7 @@ public class BiomeGenChaparral extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.5F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("rose", 8, (new GeneratorDoubleFlora.Builder()).amountPerChunk(1).with(BlockDoublePlant.EnumPlantType.ROSE).create()); flowerGenerator.add("syringa", 4, (new GeneratorDoubleFlora.Builder()).amountPerChunk(1).with(BlockDoublePlant.EnumPlantType.SYRINGA).create()); flowerGenerator.add("dandelion", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.DANDELION).create())); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java index 05a465149..3b1648d8d 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java @@ -59,7 +59,7 @@ public class BiomeGenCherryBlossomGrove extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(6.0F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("pink_daffodil", 4, (new GeneratorFlora.Builder().with(BOPFlowers.PINK_DAFFODIL).create())); flowerGenerator.add("white_anemones", 3, (new GeneratorFlora.Builder().with(BOPFlowers.WHITE_ANEMONE).create())); flowerGenerator.add("clover", 2, (new GeneratorFlora.Builder().with(BOPFlowers.CLOVER).create())); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java index 05b635fe6..9a0c2b275 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java @@ -84,7 +84,7 @@ public class BiomeGenConiferousForest extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.6F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("bluebells", 1, (new GeneratorFlora.Builder().with(BOPFlowers.BLUEBELLS)).generationAttempts(128).create()); flowerGenerator.add("oxeye_daisy", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.OXEYE_DAISY).create())); flowerGenerator.add("dandelion", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.DANDELION).create())); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadForest.java index 250aa7a7a..5b407bfca 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadForest.java @@ -112,7 +112,8 @@ public class BiomeGenDeadForest extends BOPBiome this.addGenerator("trees", GeneratorStage.TREE, treeGenerator); treeGenerator.add("spruce", 3, (new GeneratorTaigaTree.Builder()).minHeight(6).maxHeight(16).create()); // TODO: implement pine cones treeGenerator.add("dying_tree", 5, (new GeneratorBigTree.Builder()).minHeight(5).maxHeight(12).foliageHeight(2).leaves(BlockPlanks.EnumType.OAK).create()); - treeGenerator.add("dead_tree", 2, (new GeneratorBigTree.Builder()).minHeight(5).maxHeight(12).foliageHeight(0).foliageDensity(0.5D).log(BlockPlanks.EnumType.DARK_OAK).leaves(Blocks.AIR.getDefaultState()).create()); + treeGenerator.add("oak", 3, (new GeneratorBasicTree.Builder()).create()); + treeGenerator.add("dead_tree", 1, (new GeneratorBigTree.Builder()).minHeight(5).maxHeight(12).foliageHeight(0).foliageDensity(0.5D).log(BlockPlanks.EnumType.DARK_OAK).leaves(Blocks.AIR.getDefaultState()).create()); } GeneratorWeighted grassGen = (GeneratorWeighted)this.getGenerator("grass"); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java index b21784080..6b01a682d 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java @@ -63,7 +63,7 @@ public class BiomeGenEucalyptusForest extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.5F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("dandelion", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.DANDELION).create())); flowerGenerator.add("poppy", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.POPPY).create())); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFen.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFen.java index bcdfe68e8..9e9034964 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFen.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFen.java @@ -96,7 +96,7 @@ public class BiomeGenFen extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.5F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("poppy", 1, (new GeneratorFlora.Builder()).with(BlockFlower.EnumFlowerType.POPPY).create()); // other plants diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerField.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerField.java index 65c7a8781..4afb36999 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerField.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerField.java @@ -40,7 +40,7 @@ public class BiomeGenFlowerField extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(50); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("pink_tulip", 2, (new GeneratorFlora.Builder().with(EnumFlowerType.PINK_TULIP).create())); flowerGenerator.add("white_tulip", 5, (new GeneratorFlora.Builder().with(EnumFlowerType.WHITE_TULIP).create())); flowerGenerator.add("orange_tulip", 7, (new GeneratorFlora.Builder().with(EnumFlowerType.ORANGE_TULIP).create())); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerIsland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerIsland.java index f4778beba..d91d5ad95 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerIsland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerIsland.java @@ -84,7 +84,7 @@ public class BiomeGenFlowerIsland extends BOPBiome this.addGenerator("sprouts", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.5F).with(BOPPlants.SPROUT).create()); // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(4.0F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("dandelion", 3, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.DANDELION).create())); flowerGenerator.add("poppy", 5, (new GeneratorFlora.Builder().with(EnumFlowerType.POPPY).create())); flowerGenerator.add("white_anemones", 4, (new GeneratorFlora.Builder().with(BOPFlowers.WHITE_ANEMONE).create())); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrove.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrove.java index 3a8360917..73bfd6b51 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrove.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrove.java @@ -64,7 +64,7 @@ public class BiomeGenGrove extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(3.0F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("clover", 4, (new GeneratorFlora.Builder().with(BOPFlowers.CLOVER).create())); flowerGenerator.add("white_anemones", 2, (new GeneratorFlora.Builder().with(BOPFlowers.WHITE_ANEMONE).create())); flowerGenerator.add("paeonias", 1, (new GeneratorDoubleFlora.Builder()).with(BlockDoublePlant.EnumPlantType.PAEONIA).create()); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHeathland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHeathland.java index 475278eca..7edcb44f4 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHeathland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHeathland.java @@ -58,7 +58,7 @@ public class BiomeGenHeathland extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(3.0F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("wildflower", 7, (new GeneratorFlora.Builder()).with(BOPFlowers.WILDFLOWER).create()); flowerGenerator.add("dandelion", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.DANDELION).create())); flowerGenerator.add("allium", 4, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.ALLIUM).create())); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushDesert.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushDesert.java index e020cbeef..f47a01df3 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushDesert.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushDesert.java @@ -80,7 +80,7 @@ public class BiomeGenLushDesert extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(4.0F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("wildflowers", 4, (new GeneratorFlora.Builder().with(BOPFlowers.WILDFLOWER).create())); flowerGenerator.add("white_anemones", 1, (new GeneratorFlora.Builder().with(BOPFlowers.WHITE_ANEMONE).create())); flowerGenerator.add("dandelion", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.DANDELION).create())); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushSwamp.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushSwamp.java index fc928553a..8183fa5c2 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushSwamp.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushSwamp.java @@ -86,7 +86,7 @@ public class BiomeGenLushSwamp extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.7F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("blue_hydrangeas", 3, (new GeneratorFlora.Builder().with(BOPFlowers.BLUE_HYDRANGEA).create())); flowerGenerator.add("swampflower", 2, (new GeneratorFlora.Builder()).with(BOPFlowers.SWAMPFLOWER).create()); flowerGenerator.add("blue_orchid", 1, (new GeneratorFlora.Builder().with(EnumFlowerType.BLUE_ORCHID).create())); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java index 8ea531773..b9e4901d4 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java @@ -61,7 +61,7 @@ public class BiomeGenMapleWoods extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.1F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("violet", 1, (new GeneratorFlora.Builder().with(BOPFlowers.VIOLET).create())); flowerGenerator.add("dandelion", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.DANDELION).create())); flowerGenerator.add("poppy", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.POPPY).create())); @@ -97,15 +97,6 @@ public class BiomeGenMapleWoods extends BOPBiome if (!settings.isEnabled(GeneratorType.WATER_PLANTS)) {this.removeGenerator("algae"); this.removeGenerator("water_reeds"); this.removeGenerator("medium_lily"); this.removeGenerator("small_lily"); this.removeGenerator("tiny_lily");} - GeneratorWeighted treeGen = (GeneratorWeighted)this.getGenerator("trees"); - if (!settings.isEnabled(GeneratorType.TREES)) {this.removeGenerator("trees"); - - GeneratorWeighted treeGenerator = new GeneratorWeighted(20); - this.addGenerator("trees", GeneratorStage.TREE, treeGenerator); - treeGenerator.add("maple", 4, (new GeneratorBasicTree.Builder()).log(BlockPlanks.EnumType.OAK).leaves(BlockPlanks.EnumType.OAK).minHeight(5).maxHeight(10).create()); - treeGenerator.add("spruce", 2, (new GeneratorTaigaTree.Builder()).minHeight(10).maxHeight(19).create()); // TODO: implement pine cones - } - GeneratorWeighted flowerGen = (GeneratorWeighted)this.getGenerator("flowers"); if (!settings.isEnabled(GeneratorType.FLOWERS)) {flowerGen.removeGenerator("bluebells"); flowerGen.removeGenerator("clover"); flowerGen.removeGenerator("swampflower"); flowerGen.removeGenerator("deathbloom"); flowerGen.removeGenerator("glowflower"); flowerGen.removeGenerator("blue_hydrangeas"); flowerGen.removeGenerator("pink_daffodil"); flowerGen.removeGenerator("white_anemones"); flowerGen.removeGenerator("orange_cosmos"); flowerGen.removeGenerator("wildflowers"); flowerGen.removeGenerator("violet"); flowerGen.removeGenerator("hibiscus"); flowerGen.removeGenerator("goldenrods"); flowerGen.removeGenerator("icy_irises"); flowerGen.removeGenerator("wilted_lily"); flowerGen.removeGenerator("lily_of_the_valley"); flowerGen.removeGenerator("bromeliad"); this.removeGenerator("bromeliad");} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java index 9c3378df8..67510e1d3 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java @@ -72,7 +72,7 @@ public class BiomeGenMeadow extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.5F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("clover", 2, (new GeneratorFlora.Builder().with(BOPFlowers.CLOVER).create())); flowerGenerator.add("blue_hydrangeas", 3, (new GeneratorFlora.Builder().with(BOPFlowers.BLUE_HYDRANGEA).create())); flowerGenerator.add("syringa", 1, (new GeneratorDoubleFlora.Builder().with(BlockDoublePlant.EnumPlantType.SYRINGA).create())); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMoor.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMoor.java index 5aa2c8932..fd7bba9b5 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMoor.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMoor.java @@ -65,7 +65,7 @@ public class BiomeGenMoor extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.6F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("swampflower", 1, (new GeneratorFlora.Builder()).with(BOPFlowers.SWAMPFLOWER).create()); // grasses diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java index f219c4150..ee99f6da4 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java @@ -85,10 +85,10 @@ public class BiomeGenMysticGrove extends BOPBiome // trees & logs GeneratorWeighted treeGenerator = new GeneratorWeighted(10); this.addGenerator("trees", GeneratorStage.TREE, treeGenerator); - treeGenerator.add("flowering_vine", 8, (new GeneratorBasicTree.Builder()).minHeight(8).maxHeight(12).maxLeavesRadius(2).leaves(Blocks.LEAVES.getDefaultState().withProperty(BlockOldLeaf.CHECK_DECAY, Boolean.valueOf(false))).vine(BOPBlocks.flower_vine.getDefaultState()).create()); - treeGenerator.add("magic", 15, (new GeneratorBasicTree.Builder()).log(BOPWoods.MAGIC).leaves(BOPTrees.MAGIC).create()); - treeGenerator.add("jacaranda", 7, (new GeneratorBasicTree.Builder()).minHeight(4).maxHeight(7).log(BOPWoods.JACARANDA).leaves(BOPTrees.JACARANDA).create()); - treeGenerator.add("oak_large", 9, (new GeneratorBigTree.Builder()).altLeaves(BOPTrees.FLOWERING).create()); + treeGenerator.add("flowering_vine", 10, (new GeneratorBasicTree.Builder()).minHeight(8).maxHeight(12).maxLeavesRadius(2).leaves(Blocks.LEAVES.getDefaultState().withProperty(BlockOldLeaf.CHECK_DECAY, Boolean.valueOf(false))).vine(BOPBlocks.flower_vine.getDefaultState()).create()); + treeGenerator.add("magic", 17, (new GeneratorBasicTree.Builder()).log(BOPWoods.MAGIC).leaves(BOPTrees.MAGIC).create()); + treeGenerator.add("jacaranda", 9, (new GeneratorBasicTree.Builder()).minHeight(4).maxHeight(7).log(BOPWoods.JACARANDA).leaves(BOPTrees.JACARANDA).create()); + treeGenerator.add("oak_large", 11, (new GeneratorBigTree.Builder()).altLeaves(BOPTrees.FLOWERING).create()); treeGenerator.add("oak_huge", 1, (new GeneratorBigTree.Builder()).minHeight(20).maxHeight(25).altLeaves(BOPTrees.FLOWERING).create()); // grasses @@ -101,7 +101,7 @@ public class BiomeGenMysticGrove extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(1.5F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("clover", 1, (new GeneratorFlora.Builder().with(BOPFlowers.CLOVER).create())); flowerGenerator.add("blue_hydrangeas", 2, (new GeneratorFlora.Builder().with(BOPFlowers.BLUE_HYDRANGEA).create())); flowerGenerator.add("syringa", 1, (new GeneratorDoubleFlora.Builder().with(BlockDoublePlant.EnumPlantType.SYRINGA).create())); @@ -169,10 +169,11 @@ public class BiomeGenMysticGrove extends BOPBiome GeneratorWeighted treeGenerator = new GeneratorWeighted(10); this.addGenerator("trees", GeneratorStage.TREE, treeGenerator); - treeGenerator.add("flowering_vine", 2, (new GeneratorBasicTree.Builder()).minHeight(8).maxHeight(12).maxLeavesRadius(2).leaves(Blocks.LEAVES.getDefaultState().withProperty(BlockOldLeaf.CHECK_DECAY, Boolean.valueOf(false))).vine(Blocks.VINE.getDefaultState()).create()); - treeGenerator.add("magic", 9, (new GeneratorBasicTree.Builder()).create()); - treeGenerator.add("jacaranda", 1, (new GeneratorBasicTree.Builder()).minHeight(4).maxHeight(7).create()); - treeGenerator.add("oak_large", 3, (new GeneratorBigTree.Builder()).create()); + treeGenerator.add("flowering_vine", 10, (new GeneratorBasicTree.Builder()).minHeight(8).maxHeight(12).maxLeavesRadius(2).leaves(Blocks.LEAVES.getDefaultState().withProperty(BlockOldLeaf.CHECK_DECAY, Boolean.valueOf(false))).vine(Blocks.VINE.getDefaultState()).create()); + treeGenerator.add("magic", 17, (new GeneratorBasicTree.Builder()).create()); + treeGenerator.add("jacaranda", 9, (new GeneratorBasicTree.Builder()).minHeight(4).maxHeight(7).create()); + treeGenerator.add("oak_large", 11, (new GeneratorBigTree.Builder()).create()); + treeGenerator.add("oak_huge", 1, (new GeneratorBigTree.Builder()).minHeight(20).maxHeight(25).create()); } GeneratorWeighted flowerGen = (GeneratorWeighted)this.getGenerator("flowers"); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java index 7e9ae3085..2a2bd8151 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java @@ -83,7 +83,7 @@ public class BiomeGenOminousWoods extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.7F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("deathbloom", 2, (new GeneratorFlora.Builder()).with(BOPFlowers.DEATHBLOOM).create()); // other plants diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOrchard.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOrchard.java index 558839882..d83747337 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOrchard.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOrchard.java @@ -39,7 +39,7 @@ public class BiomeGenOrchard extends BOPBiome this.spawnableCreatureList.add(new SpawnListEntry(EntityButterfly.class, 6, 2, 4)); // trees - GeneratorWeighted treeGenerator = new GeneratorWeighted(4); + GeneratorWeighted treeGenerator = new GeneratorWeighted(3); this.addGenerator("trees", GeneratorStage.TREE, treeGenerator); treeGenerator.add("oak_large", 1, (new GeneratorBigTree.Builder()).altLeaves(BOPTrees.FLOWERING).create()); @@ -54,7 +54,7 @@ public class BiomeGenOrchard extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(1.5F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("white_anemones", 1, (new GeneratorFlora.Builder().with(BOPFlowers.WHITE_ANEMONE).generationAttempts(16).create())); flowerGenerator.add("houstonia", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.HOUSTONIA).create())); flowerGenerator.add("oxeye_daisy", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.OXEYE_DAISY).create())); @@ -99,7 +99,7 @@ public class BiomeGenOrchard extends BOPBiome GeneratorWeighted treeGen = (GeneratorWeighted)this.getGenerator("trees"); if (!settings.isEnabled(GeneratorType.TREES)) {this.removeGenerator("trees"); - GeneratorWeighted treeGenerator = new GeneratorWeighted(4); + GeneratorWeighted treeGenerator = new GeneratorWeighted(3); this.addGenerator("trees", GeneratorStage.TREE, treeGenerator); treeGenerator.add("oak_large", 1, (new GeneratorBigTree.Builder()).create()); } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOriginIsland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOriginIsland.java index 6146c4fc5..9acd63a0e 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOriginIsland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOriginIsland.java @@ -71,7 +71,7 @@ public class BiomeGenOriginIsland extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.4F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("rose", 8, (new GeneratorFlora.Builder().with(BOPFlowers.ROSE).create())); flowerGenerator.add("yellow_flower", 10, (new GeneratorFlora.Builder().with(EnumFlowerType.DANDELION).create())); } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOvergrownCliffs.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOvergrownCliffs.java index 75d6ee17f..8e2d158c2 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOvergrownCliffs.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOvergrownCliffs.java @@ -60,7 +60,7 @@ public class BiomeGenOvergrownCliffs extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(1.5F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("orange_cosmos", 4, (new GeneratorFlora.Builder().with(BOPFlowers.ORANGE_COSMOS).create())); flowerGenerator.add("dandelion", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.DANDELION).create())); flowerGenerator.add("poppy", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.POPPY).create())); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPrairie.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPrairie.java index f378080fa..160b6f883 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPrairie.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPrairie.java @@ -63,7 +63,7 @@ public class BiomeGenPrairie extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.6F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("white_anemones", 1, (new GeneratorFlora.Builder().with(BOPFlowers.WHITE_ANEMONE).generationAttempts(16).create())); flowerGenerator.add("goldenrods", 2, (new GeneratorFlora.Builder().with(BOPFlowers.GOLDENROD).generationAttempts(16).create())); flowerGenerator.add("houstonia", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.HOUSTONIA).create())); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRainforest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRainforest.java index 9d860ab61..821018233 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRainforest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRainforest.java @@ -67,7 +67,7 @@ public class BiomeGenRainforest extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(1.5F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("pink_daffodil", 3, (new GeneratorFlora.Builder().with(BOPFlowers.PINK_DAFFODIL).create())); flowerGenerator.add("orange_cosmos", 4, (new GeneratorFlora.Builder().with(BOPFlowers.ORANGE_COSMOS).create())); flowerGenerator.add("blue_orchid", 2, (new GeneratorFlora.Builder().with(EnumFlowerType.BLUE_ORCHID).create())); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRedwoodForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRedwoodForest.java index 3a59f9720..e43ec0159 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRedwoodForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRedwoodForest.java @@ -63,7 +63,7 @@ public class BiomeGenRedwoodForest extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.5F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("blue_orchid", 1, (new GeneratorFlora.Builder().with(EnumFlowerType.BLUE_ORCHID).create())); flowerGenerator.add("dandelion", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.DANDELION).create())); flowerGenerator.add("poppy", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.POPPY).create())); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSeasonalForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSeasonalForest.java index 05e217655..9398a30a8 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSeasonalForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSeasonalForest.java @@ -62,7 +62,7 @@ public class BiomeGenSeasonalForest extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.5F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("dandelion", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.DANDELION).create())); flowerGenerator.add("poppy", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.POPPY).create())); @@ -118,19 +118,6 @@ public class BiomeGenSeasonalForest extends BOPBiome if (!settings.isEnabled(GeneratorType.WATER_PLANTS)) {this.removeGenerator("algae"); this.removeGenerator("water_reeds"); this.removeGenerator("medium_lily"); this.removeGenerator("small_lily"); this.removeGenerator("tiny_lily");} - GeneratorWeighted treeGen = (GeneratorWeighted)this.getGenerator("trees"); - if (!settings.isEnabled(GeneratorType.TREES)) {this.removeGenerator("trees"); - - GeneratorWeighted treeGenerator = new GeneratorWeighted(15); - this.addGenerator("trees", GeneratorStage.TREE, treeGenerator); - treeGenerator.add("large_oak", 1, (new GeneratorBigTree.Builder()).log(BlockPlanks.EnumType.OAK).leaves(BlockPlanks.EnumType.OAK).create()); - treeGenerator.add("oak", 1, (new GeneratorBasicTree.Builder()).minHeight(8).maxHeight(12).create()); - treeGenerator.add("yellow_autumn", 4, (new GeneratorBasicTree.Builder()).log(BlockPlanks.EnumType.BIRCH).leaves(BlockPlanks.EnumType.BIRCH).minHeight(5).maxHeight(8).create()); - treeGenerator.add("maple", 4, (new GeneratorBasicTree.Builder()).log(BlockPlanks.EnumType.OAK).leaves(BlockPlanks.EnumType.OAK).minHeight(5).maxHeight(8).create()); - treeGenerator.add("orange_autumn", 5, (new GeneratorBasicTree.Builder()).log(BlockPlanks.EnumType.DARK_OAK).leaves(BlockPlanks.EnumType.DARK_OAK).minHeight(5).maxHeight(8).create()); - treeGenerator.add("dying_tree", 2, (new GeneratorBigTree.Builder()).minHeight(5).maxHeight(12).foliageHeight(2).leaves(BlockPlanks.EnumType.OAK).create()); - } - GeneratorWeighted grassGen = (GeneratorWeighted)this.getGenerator("grass"); if (!settings.isEnabled(GeneratorType.GRASSES)) {grassGen.removeGenerator("shortgrass"); grassGen.removeGenerator("mediumgrass"); grassGen.removeGenerator("wheatgrass"); grassGen.removeGenerator("dampgrass");} } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java index 76be15e09..5898d1e31 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java @@ -87,7 +87,7 @@ public class BiomeGenShield extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.5F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("dandelion", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.DANDELION).create())); flowerGenerator.add("poppy", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.POPPY).create())); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyConiferousForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyConiferousForest.java index 7da2e004f..fae8361b2 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyConiferousForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyConiferousForest.java @@ -63,7 +63,7 @@ public class BiomeGenSnowyConiferousForest extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.1F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("violet", 1, (new GeneratorFlora.Builder().with(BOPFlowers.VIOLET).create())); flowerGenerator.add("dandelion", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.DANDELION).create())); flowerGenerator.add("poppy", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.POPPY).create())); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyForest.java index 0ac25ef40..01355a096 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyForest.java @@ -68,7 +68,7 @@ public class BiomeGenSnowyForest extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.3F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("violets", 1, (new GeneratorFlora.Builder().with(BOPFlowers.VIOLET).create())); // gem diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java index 6ec170594..17892ad88 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java @@ -86,7 +86,7 @@ public class BiomeGenTemperateRainforest extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.5F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("dandelion", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.DANDELION).create())); flowerGenerator.add("poppy", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.POPPY).create())); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalIsland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalIsland.java index 685d969f5..947fc7053 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalIsland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalIsland.java @@ -77,7 +77,7 @@ public class BiomeGenTropicalIsland extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(2.0F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("hibiscus", 6, (new GeneratorFlora.Builder().with(BOPFlowers.PINK_HIBISCUS).create())); flowerGenerator.add("blue_hydrangeas", 2, (new GeneratorFlora.Builder().with(BOPFlowers.BLUE_HYDRANGEA).create())); flowerGenerator.add("white_anemones", 1, (new GeneratorFlora.Builder().with(BOPFlowers.WHITE_ANEMONE).create())); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalRainforest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalRainforest.java index cb5ad4e45..391bc2e79 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalRainforest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalRainforest.java @@ -61,7 +61,7 @@ public class BiomeGenTropicalRainforest extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(1.5F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("orange_cosmos", 4, (new GeneratorFlora.Builder().with(BOPFlowers.ORANGE_COSMOS).create())); flowerGenerator.add("dandelion", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.DANDELION).create())); flowerGenerator.add("poppy", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.POPPY).create())); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java index a832a03aa..3a3b74722 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java @@ -79,7 +79,7 @@ public class BiomeGenTundra extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.1F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("violet", 1, (new GeneratorFlora.Builder().with(BOPFlowers.VIOLET).create())); // grasses diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java index 00672dc3e..2b1ae5b43 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java @@ -69,7 +69,7 @@ public class BiomeGenWasteland extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.05F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("wilted_lily", 1, (new GeneratorFlora.Builder()).with(BOPFlowers.WILTED_LILY).create()); // lakes diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java index 5fec56230..ca8e43310 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java @@ -90,7 +90,7 @@ public class BiomeGenWetland extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.7F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("swampflower", 2, (new GeneratorFlora.Builder()).with(BOPFlowers.SWAMPFLOWER).create()); flowerGenerator.add("blue_orchid", 1, (new GeneratorFlora.Builder().with(EnumFlowerType.BLUE_ORCHID).create())); flowerGenerator.add("dandelion", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.DANDELION).create())); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java index 1b89b57c2..665605309 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java @@ -76,7 +76,7 @@ public class BiomeGenWoodland extends BOPBiome // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.5F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("rose", 1, (new GeneratorDoubleFlora.Builder()).with(BlockDoublePlant.EnumPlantType.ROSE).create()); flowerGenerator.add("oxeye_daisy", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.OXEYE_DAISY).create())); flowerGenerator.add("dandelion", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.DANDELION).create())); diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForest.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForest.java index fab0ea799..87c917786 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForest.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForest.java @@ -48,7 +48,7 @@ public class BiomeExtBirchForest extends ExtendedBiomeWrapper // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.4F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("clover", 1, (new GeneratorFlora.Builder().with(BOPFlowers.CLOVER).create())); flowerGenerator.add("lily_of_the_valley", 1, (new GeneratorFlora.Builder().with(BOPFlowers.LILY_OF_THE_VALLEY)).generationAttempts(128).create()); diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForestHills.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForestHills.java index a53c4a923..59a5cadab 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForestHills.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForestHills.java @@ -48,7 +48,7 @@ public class BiomeExtBirchForestHills extends ExtendedBiomeWrapper // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.4F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("clover", 1, (new GeneratorFlora.Builder().with(BOPFlowers.CLOVER).create())); flowerGenerator.add("lily_of_the_valley", 1, (new GeneratorFlora.Builder().with(BOPFlowers.LILY_OF_THE_VALLEY)).generationAttempts(128).create()); diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtColdTaiga.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtColdTaiga.java index b0258893a..ea9db216b 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtColdTaiga.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtColdTaiga.java @@ -26,7 +26,7 @@ public class BiomeExtColdTaiga extends ExtendedBiomeWrapper // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.3F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("violet", 1, (new GeneratorFlora.Builder().with(BOPFlowers.VIOLET).create())); // gem diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtColdTaigaHills.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtColdTaigaHills.java index fc69cd1d1..a98089b9a 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtColdTaigaHills.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtColdTaigaHills.java @@ -26,7 +26,7 @@ public class BiomeExtColdTaigaHills extends ExtendedBiomeWrapper // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.3F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("violet", 1, (new GeneratorFlora.Builder().with(BOPFlowers.VIOLET).create())); // gem diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtExtremeHills.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtExtremeHills.java index 3c1a2ee51..8242d6dab 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtExtremeHills.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtExtremeHills.java @@ -39,7 +39,7 @@ public class BiomeExtExtremeHills extends ExtendedBiomeWrapper // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.2F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("violet", 1, (new GeneratorFlora.Builder().with(BOPFlowers.VIOLET).create())); } diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtExtremeHillsPlus.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtExtremeHillsPlus.java index e964fc4bc..b2421a0a1 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtExtremeHillsPlus.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtExtremeHillsPlus.java @@ -39,7 +39,7 @@ public class BiomeExtExtremeHillsPlus extends ExtendedBiomeWrapper // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.2F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("violet", 1, (new GeneratorFlora.Builder().with(BOPFlowers.VIOLET).create())); } diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForest.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForest.java index 0de2f53f8..a45065727 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForest.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForest.java @@ -62,7 +62,7 @@ public class BiomeExtForest extends ExtendedBiomeWrapper // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.5F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("white_anemones", 1, (new GeneratorFlora.Builder().with(BOPFlowers.WHITE_ANEMONE).create())); flowerGenerator.add("blue_hydrangeas", 3, (new GeneratorFlora.Builder().with(BOPFlowers.BLUE_HYDRANGEA).create())); diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForestHills.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForestHills.java index 2ac315e70..6499fbb4d 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForestHills.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForestHills.java @@ -62,7 +62,7 @@ public class BiomeExtForestHills extends ExtendedBiomeWrapper // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.5F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("white_anemones", 1, (new GeneratorFlora.Builder().with(BOPFlowers.WHITE_ANEMONE).create())); flowerGenerator.add("blue_hydrangeas", 3, (new GeneratorFlora.Builder().with(BOPFlowers.BLUE_HYDRANGEA).create())); diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtIceMountains.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtIceMountains.java index 1744707d0..948929bfd 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtIceMountains.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtIceMountains.java @@ -26,7 +26,7 @@ public class BiomeExtIceMountains extends ExtendedBiomeWrapper // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.1F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("icy_irises", 1, (new GeneratorFlora.Builder().with(BOPFlowers.ICY_IRIS).create())); flowerGenerator.add("violet", 1, (new GeneratorFlora.Builder().with(BOPFlowers.VIOLET).create())); diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtIcePlains.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtIcePlains.java index f107056bd..54a907d91 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtIcePlains.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtIcePlains.java @@ -26,7 +26,7 @@ public class BiomeExtIcePlains extends ExtendedBiomeWrapper // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.1F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("icy_irises", 1, (new GeneratorFlora.Builder().with(BOPFlowers.ICY_IRIS).create())); flowerGenerator.add("violet", 1, (new GeneratorFlora.Builder().with(BOPFlowers.VIOLET).create())); diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtJungle.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtJungle.java index 62e9e1808..dd6b70b1f 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtJungle.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtJungle.java @@ -33,7 +33,7 @@ public class BiomeExtJungle extends ExtendedBiomeWrapper // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(1.5F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("orange_cosmos", 4, (new GeneratorFlora.Builder().with(BOPFlowers.ORANGE_COSMOS).create())); // gem diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtJungleHills.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtJungleHills.java index b6acba83a..d36bd93ec 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtJungleHills.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtJungleHills.java @@ -33,7 +33,7 @@ public class BiomeExtJungleHills extends ExtendedBiomeWrapper // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(1.5F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("orange_cosmos", 4, (new GeneratorFlora.Builder().with(BOPFlowers.ORANGE_COSMOS).create())); // gem diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaiga.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaiga.java index 3bceeda5c..c330da905 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaiga.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaiga.java @@ -33,7 +33,7 @@ public class BiomeExtMegaTaiga extends ExtendedBiomeWrapper // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.3F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("violet", 1, (new GeneratorFlora.Builder().with(BOPFlowers.VIOLET).create())); // gem diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaigaHills.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaigaHills.java index fccb93d56..887f8cfde 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaigaHills.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaigaHills.java @@ -33,7 +33,7 @@ public class BiomeExtMegaTaigaHills extends ExtendedBiomeWrapper // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.3F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("violet", 1, (new GeneratorFlora.Builder().with(BOPFlowers.VIOLET).create())); // gem diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMesa.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMesa.java index e6ffa0854..dadb5d168 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMesa.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMesa.java @@ -24,7 +24,7 @@ public class BiomeExtMesa extends ExtendedBiomeWrapper // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.2F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("bromeliad", 2, (new GeneratorFlora.Builder().with(BOPFlowers.BROMELIAD).create())); // gem diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMesaPlateau.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMesaPlateau.java index d8a9088b8..00d4c5926 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMesaPlateau.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMesaPlateau.java @@ -24,7 +24,7 @@ public class BiomeExtMesaPlateau extends ExtendedBiomeWrapper // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.2F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("bromeliad", 2, (new GeneratorFlora.Builder().with(BOPFlowers.BROMELIAD).create())); // gem diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtPlains.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtPlains.java index b1a1a9809..aad1525ad 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtPlains.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtPlains.java @@ -28,7 +28,7 @@ public class BiomeExtPlains extends ExtendedBiomeWrapper // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.5F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("clover", 4, (new GeneratorFlora.Builder().with(BOPFlowers.CLOVER).create())); flowerGenerator.add("white_anemones", 2, (new GeneratorFlora.Builder().with(BOPFlowers.WHITE_ANEMONE).create())); diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSavanna.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSavanna.java index 8a51a5f55..37b26a9ca 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSavanna.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSavanna.java @@ -32,7 +32,7 @@ public class BiomeExtSavanna extends ExtendedBiomeWrapper // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.8F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("wildflower", 4, (new GeneratorFlora.Builder()).with(BOPFlowers.WILDFLOWER).create()); flowerGenerator.add("clover", 2, (new GeneratorFlora.Builder().with(BOPFlowers.CLOVER).create())); diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSavannaPlateau.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSavannaPlateau.java index 67709d96a..05035c07d 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSavannaPlateau.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSavannaPlateau.java @@ -26,7 +26,7 @@ public class BiomeExtSavannaPlateau extends ExtendedBiomeWrapper // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.8F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("wildflower", 4, (new GeneratorFlora.Builder()).with(BOPFlowers.WILDFLOWER).create()); flowerGenerator.add("clover", 2, (new GeneratorFlora.Builder().with(BOPFlowers.CLOVER).create())); diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSwampland.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSwampland.java index e43277b35..b393c436e 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSwampland.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSwampland.java @@ -54,7 +54,7 @@ public class BiomeExtSwampland extends ExtendedBiomeWrapper // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.6F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("swampflower", 1, (new GeneratorFlora.Builder()).with(BOPFlowers.SWAMPFLOWER).create()); // shrooms diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaiga.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaiga.java index bb6f545c4..dc8e087eb 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaiga.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaiga.java @@ -33,7 +33,7 @@ public class BiomeExtTaiga extends ExtendedBiomeWrapper // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.3F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("violet", 1, (new GeneratorFlora.Builder().with(BOPFlowers.VIOLET).create())); // gem diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaigaHills.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaigaHills.java index bb3298425..54c42cabc 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaigaHills.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaigaHills.java @@ -33,7 +33,7 @@ public class BiomeExtTaigaHills extends ExtendedBiomeWrapper // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.3F); - this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); + this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); flowerGenerator.add("violet", 1, (new GeneratorFlora.Builder().with(BOPFlowers.VIOLET).create())); // gem diff --git a/src/main/java/biomesoplenty/common/world/generator/tree/GeneratorBigTree.java b/src/main/java/biomesoplenty/common/world/generator/tree/GeneratorBigTree.java index f34bfa2b8..61246882f 100644 --- a/src/main/java/biomesoplenty/common/world/generator/tree/GeneratorBigTree.java +++ b/src/main/java/biomesoplenty/common/world/generator/tree/GeneratorBigTree.java @@ -49,9 +49,9 @@ public class GeneratorBigTree extends GeneratorTreeBase // defaults this.amountPerChunk = 1.0F; this.placeOn = BlockQueries.fertile; - this.replace = new BlockQueryMaterial(Material.AIR, Material.LEAVES); + this.replace = BlockQueries.airOrLeaves; this.log = Blocks.LOG.getDefaultState(); - this.leaves = Blocks.LEAVES.getDefaultState(); + this.leaves = Blocks.LEAVES.getDefaultState().withProperty(BlockLeaves.CHECK_DECAY, Boolean.valueOf(false)); this.vine = null; this.hanging = null; this.trunkFruit = null; diff --git a/src/main/java/biomesoplenty/common/world/generator/tree/GeneratorBush.java b/src/main/java/biomesoplenty/common/world/generator/tree/GeneratorBush.java index de8437f6a..014ee8ced 100644 --- a/src/main/java/biomesoplenty/common/world/generator/tree/GeneratorBush.java +++ b/src/main/java/biomesoplenty/common/world/generator/tree/GeneratorBush.java @@ -29,7 +29,7 @@ public class GeneratorBush extends GeneratorTreeBase this.minHeight = 2; this.maxHeight = 4; this.placeOn = BlockQueries.fertile; - this.replace = BlockQueries.airOrLeaves; + this.replace = BlockQueries.replaceable; this.log = Blocks.LOG.getDefaultState(); this.leaves = Blocks.LEAVES.getDefaultState(); this.vine = null; @@ -71,6 +71,12 @@ public class GeneratorBush extends GeneratorTreeBase //Generate a bush 3 blocks tall, with the bottom block already set to a log for (int y = 0; y < height; ++y) { + // log in the center + if (height - y > 1) + { + this.setLog(world, pos.add(0, y, 0)); + } + //Reduces the radius closer to the top of the bush int leavesRadius = (height - y > 1 ? 2 : 1); @@ -98,13 +104,7 @@ public class GeneratorBush extends GeneratorTreeBase } } } - } - - // log in the center - if (height - y > 1) - { - this.setLog(world, pos.add(0, y, 0)); - } + } } return true; diff --git a/src/main/java/biomesoplenty/common/world/generator/tree/GeneratorPalmTree.java b/src/main/java/biomesoplenty/common/world/generator/tree/GeneratorPalmTree.java index 197c17d04..167947870 100644 --- a/src/main/java/biomesoplenty/common/world/generator/tree/GeneratorPalmTree.java +++ b/src/main/java/biomesoplenty/common/world/generator/tree/GeneratorPalmTree.java @@ -31,7 +31,7 @@ public class GeneratorPalmTree extends GeneratorTreeBase this.minHeight = 10; this.maxHeight = 14; this.placeOn = BlockQueries.fertile; - this.replace = BlockQueries.replaceable; + this.replace = BlockQueries.airOrLeaves; this.log = Blocks.LOG.getDefaultState(); this.leaves = Blocks.LEAVES.getDefaultState(); this.vine = null;