diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerField.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerField.java index 439bad8ef..bad15869a 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerField.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerField.java @@ -13,11 +13,17 @@ import biomesoplenty.api.enums.BOPFlowers; import biomesoplenty.api.enums.BOPGems; import biomesoplenty.api.enums.BOPPlants; import biomesoplenty.api.generation.GeneratorStage; +import biomesoplenty.common.world.generator.GeneratorDoubleFlora; import biomesoplenty.common.world.generator.GeneratorFlora; import biomesoplenty.common.world.generator.GeneratorGrass; import biomesoplenty.common.world.generator.GeneratorOreSingle; import biomesoplenty.common.world.generator.GeneratorWeighted; +import biomesoplenty.common.world.generator.tree.GeneratorProfileTree; +import biomesoplenty.common.world.generator.tree.GeneratorTwigletTree; import net.minecraft.block.BlockFlower.EnumFlowerType; +import net.minecraft.block.material.Material; +import net.minecraft.block.BlockDoublePlant; +import net.minecraft.block.BlockPlanks; import net.minecraft.block.BlockTallGrass; import net.minecraft.util.math.BlockPos; @@ -25,30 +31,37 @@ public class BiomeGenFlowerField extends BOPOverworldBiome { public BiomeGenFlowerField() { - super("flower_field", new PropsBuilder("Flower Field").withGuiColour(4044093).withTemperature(0.6F).withRainfall(0.7F)); + super("flower_field", new PropsBuilder("Flower Field").withGuiColour(4044093).withTemperature(0.7F).withRainfall(0.7F)); // terrain - this.terrainSettings.avgHeight(64).heightVariation(4, 12); + this.terrainSettings.avgHeight(64).heightVariation(5, 5).octaves(0, 1, 2, 2, 1, 0); this.addWeight(BOPClimates.WARM_TEMPERATE, 2); this.canGenerateVillages = false; + // trees + GeneratorWeighted treeGenerator = new GeneratorWeighted(3.0F); + this.addGenerator("trees", GeneratorStage.TREE, treeGenerator); + treeGenerator.add("small_bush", 1, (new GeneratorFlora.Builder()).placeOn(this.topBlock).replace(Material.AIR).withNonDecayingLeaf(BlockPlanks.EnumType.OAK).create()); + // flowers - GeneratorWeighted flowerGenerator = new GeneratorWeighted(45); + GeneratorWeighted flowerGenerator = new GeneratorWeighted(17.5F); this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); - flowerGenerator.add("pink_tulip", 5, (new GeneratorFlora.Builder().with(EnumFlowerType.PINK_TULIP).create())); - flowerGenerator.add("white_tulip", 8, (new GeneratorFlora.Builder().with(EnumFlowerType.WHITE_TULIP).create())); - flowerGenerator.add("orange_tulip", 10, (new GeneratorFlora.Builder().with(EnumFlowerType.ORANGE_TULIP).create())); - flowerGenerator.add("red_tulip", 13, (new GeneratorFlora.Builder().with(EnumFlowerType.RED_TULIP).create())); - flowerGenerator.add("oxeye_daisy", 2, (new GeneratorFlora.Builder().with(EnumFlowerType.OXEYE_DAISY).create())); - flowerGenerator.add("dandelion", 2, (new GeneratorFlora.Builder().with(EnumFlowerType.DANDELION).create())); - flowerGenerator.add("poppy", 2, (new GeneratorFlora.Builder().with(EnumFlowerType.POPPY).create())); - flowerGenerator.add("white_anemone", 1, (new GeneratorFlora.Builder().with(BOPFlowers.WHITE_ANEMONE)).create()); - flowerGenerator.add("houstonia", 1, (new GeneratorFlora.Builder().with(EnumFlowerType.HOUSTONIA).create())); + flowerGenerator.add("pink_tulip", 6, (new GeneratorFlora.Builder().with(EnumFlowerType.PINK_TULIP).create())); + flowerGenerator.add("white_tulip", 9, (new GeneratorFlora.Builder().with(EnumFlowerType.WHITE_TULIP).create())); + flowerGenerator.add("orange_tulip", 11, (new GeneratorFlora.Builder().with(EnumFlowerType.ORANGE_TULIP).create())); + flowerGenerator.add("red_tulip", 14, (new GeneratorFlora.Builder().with(EnumFlowerType.RED_TULIP).create())); + flowerGenerator.add("oxeye_daisy", 3, (new GeneratorFlora.Builder().with(EnumFlowerType.OXEYE_DAISY).create())); + flowerGenerator.add("dandelion", 3, (new GeneratorFlora.Builder().with(EnumFlowerType.DANDELION).create())); + flowerGenerator.add("poppy", 3, (new GeneratorFlora.Builder().with(EnumFlowerType.POPPY).create())); + flowerGenerator.add("white_anemone", 2, (new GeneratorFlora.Builder().with(BOPFlowers.WHITE_ANEMONE)).create()); + flowerGenerator.add("houstonia", 2, (new GeneratorFlora.Builder().with(EnumFlowerType.HOUSTONIA).create())); + flowerGenerator.add("rose", 1, (new GeneratorDoubleFlora.Builder()).amountPerChunk(1).with(BlockDoublePlant.EnumPlantType.ROSE).create()); + flowerGenerator.add("syringa", 1, (new GeneratorDoubleFlora.Builder()).amountPerChunk(1).with(BlockDoublePlant.EnumPlantType.SYRINGA).create()); // grasses - GeneratorWeighted grassGenerator = new GeneratorWeighted(25.0F); + GeneratorWeighted grassGenerator = new GeneratorWeighted(20.0F); this.addGenerator("grass", GeneratorStage.GRASS, grassGenerator); grassGenerator.add("shortgrass", 1, (new GeneratorGrass.Builder()).with(BOPPlants.SHORTGRASS).create()); grassGenerator.add("mediumgrass", 1, (new GeneratorGrass.Builder()).with(BOPPlants.MEDIUMGRASS).create()); @@ -60,16 +73,4 @@ public class BiomeGenFlowerField extends BOPOverworldBiome this.addGenerator("peridot", GeneratorStage.SAND, (new GeneratorOreSingle.Builder()).amountPerChunk(12).with(BOPGems.PERIDOT).create()); } - - @Override - public int getGrassColorAtPos(BlockPos pos) - { - return getModdedBiomeGrassColor(7390273); - } - - @Override - public int getFoliageColorAtPos(BlockPos pos) - { - return getModdedBiomeFoliageColor(7390273); - } } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java index ab4e81dd5..039c45cb3 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java @@ -50,7 +50,7 @@ public class BiomeGenOminousWoods extends BOPOverworldBiome // terrain this.terrainSettings.avgHeight(66).heightVariation(5, 10); - this.skyColor = 0x545B82; + this.skyColor = 0x384460; this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.LOAMY); this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.LOAMY); @@ -61,8 +61,8 @@ public class BiomeGenOminousWoods extends BOPOverworldBiome this.beachBiomeLocation = null; - this.fogColor = 0x403C4F; - this.fogDensity = 0.2F; + this.fogColor = 0x3B3D4C; + this.fogDensity = 0.175F; this.addWeight(BOPClimates.COLD_SWAMP, 1); @@ -83,8 +83,8 @@ public class BiomeGenOminousWoods extends BOPOverworldBiome // grasses GeneratorWeighted grassGenerator = new GeneratorWeighted(3.0F); this.addGenerator("grass", GeneratorStage.GRASS, grassGenerator); - grassGenerator.add("shortgrass", 2, (new GeneratorGrass.Builder()).with(BOPPlants.SHORTGRASS).create()); - grassGenerator.add("mediumgrass", 3, (new GeneratorGrass.Builder()).with(BOPPlants.MEDIUMGRASS).create()); + grassGenerator.add("shortgrass", 3, (new GeneratorGrass.Builder()).with(BOPPlants.SHORTGRASS).create()); + grassGenerator.add("mediumgrass", 2, (new GeneratorGrass.Builder()).with(BOPPlants.MEDIUMGRASS).create()); grassGenerator.add("tallgrass", 1, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.GRASS).create()); // flowers @@ -93,7 +93,7 @@ public class BiomeGenOminousWoods extends BOPOverworldBiome flowerGenerator.add("deathbloom", 2, (new GeneratorFlora.Builder()).with(BOPFlowers.DEATHBLOOM).create()); // other plants - this.addGenerator("bramble", GeneratorStage.FLOWERS,(new GeneratorBramble.Builder()).maxHeight(5).minLength(10).maxLength(20).amountPerChunk(1.0F).create()); + this.addGenerator("bramble", GeneratorStage.FLOWERS,(new GeneratorBramble.Builder()).maxHeight(4).minLength(5).maxLength(15).amountPerChunk(0.75F).create()); this.addGenerator("poison_ivy", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.1F).generationAttempts(16).with(BOPPlants.POISONIVY).create()); this.addGenerator("thorns", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.3F).with(BOPPlants.THORN).create()); this.addGenerator("dead_leaf_piles", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.3F).placeOn(BlockQueries.fertile).with(BOPPlants.DEADLEAFPILE).create()); @@ -127,6 +127,6 @@ public class BiomeGenOminousWoods extends BOPOverworldBiome @Override public int getFoliageColorAtPos(BlockPos pos) { - return getModdedBiomeFoliageColor(0x604268); + return getModdedBiomeFoliageColor(0x5A4166); } }