From aae38dabae336dd6a0ccc2b4e8065c2caffc97c2 Mon Sep 17 00:00:00 2001 From: Forstride Date: Tue, 16 Feb 2016 21:58:26 -0500 Subject: [PATCH] Tweaked Heathland biome --- .../common/biome/overworld/BiomeGenHeathland.java | 13 ++++++++----- .../biome/overworld/BiomeGenVolcanicIsland.java | 2 +- .../common/biome/overworld/BiomeGenWasteland.java | 3 ++- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHeathland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHeathland.java index a1a90daac..98cdbd3ae 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHeathland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHeathland.java @@ -28,6 +28,8 @@ import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.enums.BOPPlants; import biomesoplenty.common.enums.BOPTrees; import biomesoplenty.common.enums.BOPWoods; +import biomesoplenty.common.util.block.BlockQuery; +import biomesoplenty.common.util.block.BlockQuery.IBlockPosQuery; import biomesoplenty.common.world.BOPWorldSettings; import biomesoplenty.common.world.feature.GeneratorDoubleFlora; import biomesoplenty.common.world.feature.GeneratorFlora; @@ -45,10 +47,10 @@ public class BiomeGenHeathland extends BOPBiome { // terrain - this.terrainSettings.avgHeight(65).heightVariation(5, 15).octaves(0, 1, 2, 2, 1, 0).sidewaysNoise(0.1D); + this.terrainSettings.avgHeight(75).heightVariation(7, 10).octaves(0, 1, 2, 2, 1, 0).sidewaysNoise(0.1D); this.setColor(0xADAE68); - this.setTemperatureRainfall(0.75F, 0.05F); + this.setTemperatureRainfall(0.75F, 0.2F); this.addWeight(BOPClimates.DRY_TEMPERATE, 5); @@ -79,14 +81,15 @@ public class BiomeGenHeathland extends BOPBiome grassGenerator.add("dampgrass", 1, (new GeneratorGrass.Builder()).with(BOPPlants.DAMPGRASS).create()); // trees - GeneratorWeighted treeGenerator = new GeneratorWeighted(7); + IBlockPosQuery suitableTreePosition = BlockQuery.buildAnd().withAltitudeBetween(77, 90).materials(Material.ground, Material.grass).create(); + GeneratorWeighted treeGenerator = new GeneratorWeighted(12); this.addGenerator("trees", GeneratorStage.TREE, treeGenerator); treeGenerator.add("red_bush", 7, (new GeneratorFlora.Builder()).placeOn(this.topBlock).replace(Material.air).withNonDecayingLeaf(BOPTrees.MAPLE).create()); treeGenerator.add("small_bush", 11, (new GeneratorFlora.Builder()).placeOn(this.topBlock).replace(Material.air).withNonDecayingLeaf(BlockPlanks.EnumType.OAK).create()); treeGenerator.add("oak_bush", 3, (new GeneratorBush.Builder()).maxHeight(2).create()); treeGenerator.add("oak", 2, (new GeneratorBasicTree.Builder()).minHeight(3).maxHeight(5).create()); - treeGenerator.add("decaying_tree", 2, (new GeneratorBigTree.Builder()).amountPerChunk(1.0F).minHeight(5).maxHeight(12).foliageHeight(2).create()); - treeGenerator.add("pine", 1, (new GeneratorPineTree.Builder()).minHeight(6).maxHeight(18).log(BOPWoods.PINE).leaves(BOPTrees.PINE).create()); + treeGenerator.add("decaying_tree", 1, (new GeneratorBigTree.Builder()).amountPerChunk(1.0F).minHeight(5).maxHeight(12).foliageHeight(2).create()); + treeGenerator.add("pine", 15, (new GeneratorPineTree.Builder()).minHeight(6).maxHeight(18).log(BOPWoods.PINE).leaves(BOPTrees.PINE).placeOn(suitableTreePosition).create()); // other plants this.addGenerator("thorns", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.4F).with(BOPPlants.THORN).create()); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenVolcanicIsland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenVolcanicIsland.java index bb9baff06..674fd1f77 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenVolcanicIsland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenVolcanicIsland.java @@ -26,7 +26,7 @@ public class BiomeGenVolcanicIsland extends BOPBiome // terrain this.terrainSettings.avgHeight(120).heightVariation(50, 50).octaves(1, 1, 2, 2, 3, 2).sidewaysNoise(0.1D); - this.setTemperatureRainfall(1.2F, 0.5F); + this.setTemperatureRainfall(1.2F, 0.0F); this.setColor(6645093); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java index a20c664b0..7648fc0bf 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java @@ -50,7 +50,7 @@ public class BiomeGenWasteland extends BOPBiome this.terrainSettings.avgHeight(66).heightVariation(1,5); this.setColor(0x5A5440); - this.setTemperatureRainfall(2.0F, 0.05F); + this.setTemperatureRainfall(2.0F, 0.0F); this.topBlock = BOPBlocks.dried_sand.getDefaultState(); this.fillerBlock = BOPBlocks.dried_sand.getDefaultState(); this.waterColorMultiplier = 0xE5FF00; @@ -86,6 +86,7 @@ public class BiomeGenWasteland extends BOPBiome flowerGenerator.add("wilted_lily", 1, (new GeneratorFlora.Builder()).with(BOPFlowers.WILTED_LILY).create()); // lakes + this.addGenerator("lakes", GeneratorStage.SAND, (new GeneratorLakes.Builder()).amountPerChunk(0.05F).waterLakeForBiome(this).create()); this.addGenerator("poison_lakes", GeneratorStage.SAND, (new GeneratorLakes.Builder()).amountPerChunk(0.05F).waterLakeForBiome(this).liquid(BOPBlocks.poison).frozenLiquid((IBlockState)null).create()); // spikes