From 18e6c4f4821bd0681f5805e7149f5812192d92fb Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Sat, 16 Jan 2016 17:42:59 -0500 Subject: [PATCH] Tweaked various biomes to match past versions more --- .../common/biome/overworld/BiomeGenChaparral.java | 2 +- .../biome/overworld/BiomeGenCherryBlossomGrove.java | 7 ------- .../biome/overworld/BiomeGenDeciduousForest.java | 2 +- .../biome/overworld/BiomeGenEucalyptusForest.java | 4 ++-- .../common/biome/overworld/BiomeGenMountain.java | 10 +++++----- .../common/biome/overworld/BiomeGenTundra.java | 12 ++++++------ .../common/biome/overworld/BiomeGenWoodland.java | 13 +++++++++++++ 7 files changed, 28 insertions(+), 22 deletions(-) diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenChaparral.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenChaparral.java index 88bfa0e72..54852cf91 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenChaparral.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenChaparral.java @@ -62,7 +62,7 @@ public class BiomeGenChaparral extends BOPBiome grassGenerator.add("dampgrass", 1, (new GeneratorGrass.Builder()).with(BOPPlants.DAMPGRASS).create()); // trees - this.addGenerator("trees", GeneratorStage.TREE, (new GeneratorBush.Builder()).amountPerChunk(8).create()); + this.addGenerator("trees", GeneratorStage.TREE, (new GeneratorBush.Builder()).amountPerChunk(3).create()); // other plants this.addGenerator("berry_bushes", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.2F).with(BOPPlants.BERRYBUSH).create()); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java index 2bbfe484b..ce03d4638 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java @@ -10,7 +10,6 @@ package biomesoplenty.common.biome.overworld; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockTallGrass; -import net.minecraft.init.Blocks; import net.minecraft.util.BlockPos; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; @@ -23,9 +22,7 @@ import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.enums.BOPPlants; import biomesoplenty.common.enums.BOPTrees; import biomesoplenty.common.enums.BOPWoods; -import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod; import biomesoplenty.common.world.BOPWorldSettings; -import biomesoplenty.common.world.feature.GeneratorBlobs; import biomesoplenty.common.world.feature.GeneratorDoubleFlora; import biomesoplenty.common.world.feature.GeneratorFlora; import biomesoplenty.common.world.feature.GeneratorGrass; @@ -45,10 +42,6 @@ public class BiomeGenCherryBlossomGrove extends BOPBiome this.addWeight(BOPClimates.COOL_TEMPERATE, 3); - // boulders - this.addGenerator("boulders", GeneratorStage.SAND, (new GeneratorBlobs.Builder()).amountPerChunk(0.5F).placeOn(Blocks.grass).with(Blocks.stone.getDefaultState()).minRadius(0.3F).maxRadius(1.2F).numBalls(1).scatterYMethod(ScatterYMethod.AT_SURFACE).create()); - this.addGenerator("big_boulders", GeneratorStage.SAND, (new GeneratorBlobs.Builder()).amountPerChunk(0.1F).placeOn(Blocks.grass).with(Blocks.stone.getDefaultState()).minRadius(0.3F).maxRadius(4.0F).numBalls(3).scatterYMethod(ScatterYMethod.AT_SURFACE).create()); - // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(6.0F); this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeciduousForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeciduousForest.java index cd57f0565..65a293da0 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeciduousForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeciduousForest.java @@ -36,7 +36,7 @@ public class BiomeGenDeciduousForest extends BOPBiome this.addGenerator("trees", GeneratorStage.TREE, treeGenerator); treeGenerator.add("birch_bush", 2, (new GeneratorBush.Builder()).log(BlockPlanks.EnumType.BIRCH).leaves(BlockPlanks.EnumType.BIRCH).create()); treeGenerator.add("oak_bush", 3, (new GeneratorBush.Builder()).create()); - treeGenerator.add("tall_oak", 6, (new GeneratorBulbTree.Builder()).minHeight(10).maxHeight(15).vine(null).create()); + treeGenerator.add("tall_oak", 6, (new GeneratorBulbTree.Builder()).minHeight(10).maxHeight(20).vine(null).create()); // grasses GeneratorWeighted grassGenerator = new GeneratorWeighted(10.0F); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java index 7d5a3e83a..e27581a76 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java @@ -41,8 +41,8 @@ public class BiomeGenEucalyptusForest extends BOPBiome // trees GeneratorWeighted treeGenerator = new GeneratorWeighted(5); this.addGenerator("trees", GeneratorStage.TREE, treeGenerator); - treeGenerator.add("eucalyptus_bush", 1, (new GeneratorBush.Builder()).log(BlockPlanks.EnumType.BIRCH).leaves(BlockPlanks.EnumType.BIRCH).create()); - treeGenerator.add("tall_eucalyptus", 4, (new GeneratorBulbTree.Builder()).minHeight(10).maxHeight(25).log(BlockPlanks.EnumType.BIRCH).leaves(BlockPlanks.EnumType.BIRCH).vine(null).create()); + treeGenerator.add("eucalyptus_bush", 4, (new GeneratorBush.Builder()).log(BlockPlanks.EnumType.BIRCH).leaves(BlockPlanks.EnumType.BIRCH).create()); + treeGenerator.add("tall_eucalyptus", 1, (new GeneratorBulbTree.Builder()).minHeight(10).maxHeight(25).log(BlockPlanks.EnumType.BIRCH).leaves(BlockPlanks.EnumType.BIRCH).vine(null).create()); // TODO: Add Eucalyptus wood as a new wood type - the bark is quite special // grasses diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java index 0d2df1b83..4fb7384f0 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java @@ -75,7 +75,7 @@ public class BiomeGenMountain extends BOPBiome } this.setColor(0x80A355); - this.setTemperatureRainfall(0.25F, 0.1F); + this.setTemperatureRainfall(0.5F, 0.1F); if (type == MountainType.PEAKS) { @@ -156,8 +156,8 @@ public class BiomeGenMountain extends BOPBiome this.dirtBlock = this.fillerBlock; this.coarseDirtBlock = conf.getBlockState("coarseDirtBlock", this.coarseDirtBlock); this.stoneBlock = conf.getBlockState("stoneBlock", this.stoneBlock); - this.snowBlock = conf.getBlockState("snowBlock", this.snowBlock); - this.packedSnowBlock = conf.getBlockState("packedSnowBlock", this.packedSnowBlock); + //this.snowBlock = conf.getBlockState("snowBlock", this.snowBlock); + //this.packedSnowBlock = conf.getBlockState("packedSnowBlock", this.packedSnowBlock); } @Override @@ -186,8 +186,8 @@ public class BiomeGenMountain extends BOPBiome } else { - this.topBlock = this.snowBlock; - this.fillerBlock = this.packedSnowBlock; + this.topBlock = this.grassBlock; + this.fillerBlock = this.dirtBlock; } } else diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java index fb570826b..e1669286b 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java @@ -33,7 +33,7 @@ public class BiomeGenTundra extends BOPBiome public BiomeGenTundra() { // terrain - this.terrainSettings.avgHeight(64).heightVariation(30, 30).minHeight(59).octaves(2, 2, 1, 0, 1, 1); + this.terrainSettings.avgHeight(64).heightVariation(5, 10).minHeight(59).octaves(2, 2, 1, 0, 1, 1); this.setColor(0xA09456); this.setTemperatureRainfall(0.165F, 0.5F); // temperature deliberately borderline between rain and snow @@ -46,14 +46,14 @@ public class BiomeGenTundra extends BOPBiome this.addGenerator("boulders", GeneratorStage.SAND, (new GeneratorBlobs.Builder()).amountPerChunk(0.5F).placeOn(Blocks.grass).with(Blocks.cobblestone.getDefaultState()).minRadius(0.3F).maxRadius(1.2F).numBalls(1).scatterYMethod(ScatterYMethod.AT_SURFACE).create()); // sand & gravel - this.addGenerator("sand", GeneratorStage.SAND_PASS2, (new GeneratorWaterside.Builder()).amountPerChunk(8).maxRadius(7).with(Blocks.sand.getDefaultState()).create()); - this.addGenerator("gravel", GeneratorStage.SAND_PASS2, (new GeneratorWaterside.Builder()).amountPerChunk(8).maxRadius(7).with(Blocks.gravel.getDefaultState()).create()); + this.addGenerator("sand", GeneratorStage.SAND_PASS2, (new GeneratorWaterside.Builder()).amountPerChunk(4).maxRadius(7).with(Blocks.sand.getDefaultState()).create()); + this.addGenerator("gravel", GeneratorStage.SAND_PASS2, (new GeneratorWaterside.Builder()).amountPerChunk(12).maxRadius(7).with(Blocks.gravel.getDefaultState()).create()); // lakes this.addGenerator("lakes", GeneratorStage.SAND, (new GeneratorLakes.Builder()).amountPerChunk(0.3F).waterLakeForBiome(this).create()); // trees - this.addGenerator("trees", GeneratorStage.TREE, (new GeneratorBush.Builder()).amountPerChunk(3).create()); + this.addGenerator("trees", GeneratorStage.TREE, (new GeneratorBush.Builder()).amountPerChunk(2).create()); // other plants this.addGenerator("shrubs", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.3F).with(BOPPlants.SHRUB).create()); @@ -91,13 +91,13 @@ public class BiomeGenTundra extends BOPBiome @Override public int getGrassColorAtPos(BlockPos pos) { - return 0x908A56; + return 0xAD8456; } @Override public int getFoliageColorAtPos(BlockPos pos) { - return 0xA09456; + return 0xBF664E; } } \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java index 2951b3e2a..686a4f019 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java @@ -11,6 +11,7 @@ package biomesoplenty.common.biome.overworld; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockTallGrass; import net.minecraft.init.Blocks; +import net.minecraft.util.BlockPos; import biomesoplenty.api.biome.BOPBiome; import biomesoplenty.api.biome.generation.GeneratorStage; import biomesoplenty.api.biome.generation.GeneratorWeighted; @@ -103,4 +104,16 @@ public class BiomeGenWoodland extends BOPBiome if (!settings.generateBopGems) {this.removeGenerator("amber");} } + @Override + public int getGrassColorAtPos(BlockPos pos) + { + return 0xB0BA51; + } + + @Override + public int getFoliageColorAtPos(BlockPos pos) + { + return 0x9CA825; + } + } \ No newline at end of file