etc/BiomesOPlenty
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Changed the amount of trees in the Orchard biome, made flowers actually use the flower generator stage, fixed shrubs not replacing grass/other replaceable foliage

Browse source
This commit is contained in:
Forstride 2016-08-10 19:23:01 -04:00
parent 48ddc0e8c4
commit 08dc4392b5
62 changed files with 82 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBambooForest.java
View file

@ -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()));

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBog.java
View file

@ -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()));

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java
View file

@ -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()));

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenChaparral.java
View file

@ -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()));

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java
View file

@ -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()));

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java
View file

@ -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()));

3
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadForest.java
View file

@ -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");

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java
View file

@ -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()));

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFen.java
View file

@ -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

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerField.java
View file

@ -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()));

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerIsland.java
View file

@ -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()));

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrove.java
View file

@ -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());

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHeathland.java
View file

@ -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()));

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushDesert.java
View file

@ -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()));

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushSwamp.java
View file

@ -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()));

11
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java
View file

@ -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");}

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java
View file

@ -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()));

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMoor.java
View file

@ -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

19
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java
View file

@ -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");

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java
View file

@ -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

6
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOrchard.java
View file

@ -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());
}

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOriginIsland.java
View file

@ -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()));
}

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOvergrownCliffs.java
View file

@ -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()));

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPrairie.java
View file

@ -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()));

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRainforest.java
View file

@ -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()));

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRedwoodForest.java
View file

@ -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()));

15
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSeasonalForest.java
View file

@ -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");}
}

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java
View file

@ -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()));

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyConiferousForest.java
View file

@ -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()));

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyForest.java
View file

@ -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

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java
View file

@ -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()));

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalIsland.java
View file

@ -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()));

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalRainforest.java
View file

@ -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()));

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java
View file

@ -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

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java
View file

@ -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

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java
View file

@ -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()));

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java
View file

@ -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()));

2
src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForest.java
View file

@ -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());

2
src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForestHills.java
View file

@ -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());

2
src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtColdTaiga.java
View file

@ -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

2
src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtColdTaigaHills.java
View file

@ -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

2
src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtExtremeHills.java
View file

@ -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()));
}

2
src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtExtremeHillsPlus.java
View file

@ -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()));
}

2
src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForest.java
View file

@ -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()));

2
src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForestHills.java
View file

@ -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()));

2
src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtIceMountains.java
View file

@ -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()));

2
src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtIcePlains.java
View file

@ -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()));

2
src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtJungle.java
View file

@ -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

2
src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtJungleHills.java
View file

@ -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

2
src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaiga.java
View file

@ -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

2
src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaigaHills.java
View file

@ -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

2
src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMesa.java
View file

@ -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

2
src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMesaPlateau.java
View file

@ -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

2
src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtPlains.java
View file

@ -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()));

2
src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSavanna.java
View file

@ -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()));

2
src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSavannaPlateau.java
View file

@ -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()));

2
src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSwampland.java
View file

@ -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

2
src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaiga.java
View file

@ -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

2
src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaigaHills.java
View file

@ -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

4
src/main/java/biomesoplenty/common/world/generator/tree/GeneratorBigTree.java
View file

@ -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;

14
src/main/java/biomesoplenty/common/world/generator/tree/GeneratorBush.java
View file

@ -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);
@ -99,12 +105,6 @@ public class GeneratorBush extends GeneratorTreeBase
}
}
}
// log in the center
if (height - y > 1)
{
this.setLog(world, pos.add(0, y, 0));
}
}
return true;

2
src/main/java/biomesoplenty/common/world/generator/tree/GeneratorPalmTree.java
View file

@ -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;