diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java index 84114f4c6..5bfb6a205 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java @@ -47,7 +47,7 @@ public class BiomeGenWasteland extends BOPBiome public BiomeGenWasteland() { // terrain - this.terrainSettings.avgHeight(64).heightVariation(5, 5); + this.terrainSettings.avgHeight(64).heightVariation(0,5); this.setColor(0x5A5440); this.setTemperatureRainfall(0.9F, 0.05F); @@ -68,17 +68,14 @@ public class BiomeGenWasteland extends BOPBiome this.spawnableWaterCreatureList.clear(); // trees + IBlockPosQuery emptyDriedDirt = BlockQuery.buildAnd().withAirAbove().states(this.topBlock).create(); GeneratorWeighted treeGenerator = new GeneratorWeighted(0.5F); this.addGenerator("trees", GeneratorStage.TREE, treeGenerator); - treeGenerator.add("dead_tree", 1, (new GeneratorBigTree.Builder()).amountPerChunk(0.5F).minHeight(5).maxHeight(12).foliageHeight(0).foliageDensity(0.5D).log(BOPWoods.DEAD).leaves(Blocks.air.getDefaultState()).create()); - - // grasses - GeneratorWeighted grassGenerator = new GeneratorWeighted(0.2F); - this.addGenerator("grass", GeneratorStage.GRASS, grassGenerator); - grassGenerator.add("dead_bushes", 1, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.DEAD_BUSH).create()); + treeGenerator.add("dead_tree", 1, (new GeneratorBigTree.Builder()).amountPerChunk(0.5F).placeOn(emptyDriedDirt).minHeight(5).maxHeight(12).foliageHeight(0).foliageDensity(0.5D).log(BOPWoods.DEAD).leaves(Blocks.air.getDefaultState()).create()); // other plants this.addGenerator("dead_grass", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(1.0F).with(BOPPlants.DEADGRASS).create()); + this.addGenerator("desertgrass", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.5F).with(BOPPlants.DESERTGRASS).create()); // flowers GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.05F); @@ -86,11 +83,11 @@ 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.5F).waterLakeForBiome(this).create()); - this.addGenerator("poison_lakes", GeneratorStage.SAND, (new GeneratorLakes.Builder()).amountPerChunk(0.2F).waterLakeForBiome(this).liquid(BOPBlocks.poison).frozenLiquid((IBlockState)null).create()); + this.addGenerator("lakes", GeneratorStage.SAND, (new GeneratorLakes.Builder()).amountPerChunk(0.1F).waterLakeForBiome(this).create()); + this.addGenerator("poison_lakes", GeneratorStage.SAND, (new GeneratorLakes.Builder()).amountPerChunk(0.1F).waterLakeForBiome(this).liquid(BOPBlocks.poison).frozenLiquid((IBlockState)null).create()); // spikes - this.addGenerator("spikes", GeneratorStage.PRE, (new GeneratorSpike.Builder()).amountPerChunk(0.6F).create()); + this.addGenerator("spikes", GeneratorStage.PRE, (new GeneratorSpike.Builder()).amountPerChunk(0.2F).create()); // gem this.addGenerator("malachite", GeneratorStage.SAND, (new GeneratorOreSingle.Builder()).amountPerChunk(12).with(BOPGems.MALACHITE).create()); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenXericShrubland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenXericShrubland.java index d2fda42a1..a4556d1ba 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenXericShrubland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenXericShrubland.java @@ -64,12 +64,9 @@ public class BiomeGenXericShrubland extends BOPBiome this.addGenerator("cacti", GeneratorStage.FLOWERS,(new GeneratorColumns.Builder()).amountPerChunk(1.5F).generationAttempts(3).placeOn(this.topBlock).with(Blocks.cactus.getDefaultState()).minHeight(1).maxHeight(2).create()); // flowers - GeneratorWeighted flowerGenerator = new GeneratorWeighted(4.0F); + GeneratorWeighted flowerGenerator = new GeneratorWeighted(1.0F); this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator); - flowerGenerator.add("wildflowers", 4, (new GeneratorFlora.Builder().with(BOPFlowers.WILDFLOWER).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())); - flowerGenerator.add("dandelions", 2, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.DANDELION).create())); + flowerGenerator.add("wildflowers", 1, (new GeneratorFlora.Builder().with(BOPFlowers.WILDFLOWER).create())); // grasses (note weighting must be quite high as the grasses will only grow on the splattered grass blocks) GeneratorWeighted grassGenerator = new GeneratorWeighted(12.0F); @@ -92,12 +89,12 @@ public class BiomeGenXericShrubland extends BOPBiome @Override public int getGrassColorAtPos(BlockPos pos) { - return 0xE2CDA5; + return 0xD4E0A6; } @Override public int getFoliageColorAtPos(BlockPos pos) { - return 0xE2CDA5; + return 0xD4E0A6; } } diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/deadgrass.png b/src/main/resources/assets/biomesoplenty/textures/blocks/deadgrass.png index 4ade1c19b..09d612eed 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/deadgrass.png and b/src/main/resources/assets/biomesoplenty/textures/blocks/deadgrass.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/desertgrass.png b/src/main/resources/assets/biomesoplenty/textures/blocks/desertgrass.png index d037ae5f0..acb0f1650 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/desertgrass.png and b/src/main/resources/assets/biomesoplenty/textures/blocks/desertgrass.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/dried_dirt.png b/src/main/resources/assets/biomesoplenty/textures/blocks/dried_dirt.png index 494b033dc..25a0c60fe 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/dried_dirt.png and b/src/main/resources/assets/biomesoplenty/textures/blocks/dried_dirt.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/wilted_lily.png b/src/main/resources/assets/biomesoplenty/textures/blocks/wilted_lily.png index 97514d71f..8ad2c5034 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/wilted_lily.png and b/src/main/resources/assets/biomesoplenty/textures/blocks/wilted_lily.png differ