diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java index 2c33a3f2f..5b6151ebb 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java @@ -8,11 +8,14 @@ package biomesoplenty.common.biome.overworld; +import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.config.IBOPWorldSettings; import biomesoplenty.api.config.IBOPWorldSettings.GeneratorType; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.api.generation.GeneratorStage; +import biomesoplenty.common.block.BlockBOPDirt; import biomesoplenty.common.block.BlockBOPDoublePlant; +import biomesoplenty.common.block.BlockBOPGrass; import biomesoplenty.common.block.BlockBOPLilypad; import biomesoplenty.common.entities.EntityButterfly; import biomesoplenty.common.entities.EntitySnail; @@ -43,6 +46,9 @@ public class BiomeGenCherryBlossomGrove extends BOPBiome // terrain this.terrainSettings.avgHeight(63).heightVariation(5, 25).sidewaysNoise(0.8F); + this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.SILTY); + this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.SILTY); + this.canSpawnInBiome = false; this.canGenerateVillages = false; @@ -103,6 +109,8 @@ public class BiomeGenCherryBlossomGrove extends BOPBiome if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("topaz");} if (!settings.isEnabled(GeneratorType.FLAX)) {this.removeGenerator("flax");} + if (!settings.isEnabled(GeneratorType.SOILS)) {this.topBlock = Blocks.GRASS.getDefaultState(); this.fillerBlock = Blocks.DIRT.getDefaultState();} + if (!settings.isEnabled(GeneratorType.FOLIAGE)) {this.removeGenerator("bushes"); this.removeGenerator("koru"); this.removeGenerator("shrubs"); this.removeGenerator("leaf_piles"); this.removeGenerator("dead_leaf_piles"); this.removeGenerator("clover_patches"); this.removeGenerator("sprouts");} if (!settings.isEnabled(GeneratorType.PLANTS)) {this.removeGenerator("cattail"); this.removeGenerator("double_cattail"); this.removeGenerator("river_cane"); this.removeGenerator("tiny_cacti"); this.removeGenerator("roots"); this.removeGenerator("rafflesia"); this.removeGenerator("desert_sprouts");} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLavenderFields.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLavenderFields.java index 04698bd5c..f23710265 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLavenderFields.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLavenderFields.java @@ -8,10 +8,13 @@ package biomesoplenty.common.biome.overworld; +import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.config.IBOPWorldSettings; import biomesoplenty.api.config.IBOPWorldSettings.GeneratorType; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.api.generation.GeneratorStage; +import biomesoplenty.common.block.BlockBOPDirt; +import biomesoplenty.common.block.BlockBOPGrass; import biomesoplenty.common.entities.EntityButterfly; import biomesoplenty.common.enums.BOPFlowers; import biomesoplenty.common.enums.BOPGems; @@ -25,6 +28,7 @@ import biomesoplenty.common.world.generator.GeneratorWeighted; import biomesoplenty.common.world.generator.tree.GeneratorBasicTree; import biomesoplenty.common.world.generator.tree.GeneratorBigTree; import net.minecraft.block.BlockTallGrass; +import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; public class BiomeGenLavenderFields extends BOPBiome @@ -35,6 +39,9 @@ public class BiomeGenLavenderFields extends BOPBiome // terrain this.terrainSettings.avgHeight(64).heightVariation(4, 12); + + this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.SILTY); + this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.SILTY); this.canSpawnInBiome = false; this.canGenerateVillages = false; @@ -69,6 +76,8 @@ public class BiomeGenLavenderFields extends BOPBiome { if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("peridot");} + if (!settings.isEnabled(GeneratorType.SOILS)) {this.topBlock = Blocks.GRASS.getDefaultState(); this.fillerBlock = Blocks.DIRT.getDefaultState();} + if (!settings.isEnabled(GeneratorType.PLANTS)) {this.removeGenerator("cattail"); this.removeGenerator("double_cattail"); this.removeGenerator("river_cane"); this.removeGenerator("tiny_cacti"); this.removeGenerator("roots"); this.removeGenerator("rafflesia"); this.removeGenerator("desert_sprouts");} if (!settings.isEnabled(GeneratorType.FOLIAGE)) {this.removeGenerator("bushes"); this.removeGenerator("koru"); this.removeGenerator("shrubs"); this.removeGenerator("leaf_piles"); this.removeGenerator("dead_leaf_piles"); this.removeGenerator("clover_patches"); this.removeGenerator("sprouts");} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java index ba3f18e0f..620c10900 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java @@ -14,6 +14,8 @@ import biomesoplenty.api.config.IBOPWorldSettings.GeneratorType; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.api.generation.GeneratorStage; import biomesoplenty.common.block.BlockBOPCoral; +import biomesoplenty.common.block.BlockBOPDirt; +import biomesoplenty.common.block.BlockBOPGrass; import biomesoplenty.common.block.BlockBOPLilypad; import biomesoplenty.common.block.BlockBOPMushroom; import biomesoplenty.common.entities.EntityButterfly; @@ -51,6 +53,9 @@ public class BiomeGenMysticGrove extends BOPBiome // terrain this.terrainSettings.avgHeight(63).heightVariation(5, 25); + + this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.SILTY); + this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.SILTY); this.skyColor = 0x88E8D0; @@ -138,6 +143,8 @@ public class BiomeGenMysticGrove extends BOPBiome if (!settings.isEnabled(GeneratorType.HOT_SPRINGS)) {this.removeGenerator("hot_springs");} if (!settings.isEnabled(GeneratorType.LIQUID_POISON)) {this.removeGenerator("poison_lakes");} + + if (!settings.isEnabled(GeneratorType.SOILS)) {this.topBlock = Blocks.GRASS.getDefaultState(); this.fillerBlock = Blocks.DIRT.getDefaultState();} if (!settings.isEnabled(GeneratorType.FOLIAGE)) {this.removeGenerator("bushes"); this.removeGenerator("koru"); this.removeGenerator("shrubs"); this.removeGenerator("leaf_piles"); this.removeGenerator("dead_leaf_piles"); this.removeGenerator("clover_patches"); this.removeGenerator("sprouts");} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyForest.java index 212d3a18f..7550a9e58 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyForest.java @@ -8,10 +8,13 @@ package biomesoplenty.common.biome.overworld; +import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.config.IBOPWorldSettings; import biomesoplenty.api.config.IBOPWorldSettings.GeneratorType; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.api.generation.GeneratorStage; +import biomesoplenty.common.block.BlockBOPDirt; +import biomesoplenty.common.block.BlockBOPGrass; import biomesoplenty.common.enums.BOPFlowers; import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.enums.BOPPlants; @@ -24,6 +27,7 @@ import biomesoplenty.common.world.generator.tree.GeneratorBasicTree; import biomesoplenty.common.world.generator.tree.GeneratorBigTree; import net.minecraft.block.BlockPlanks; import net.minecraft.block.BlockTallGrass; +import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; @@ -37,6 +41,9 @@ public class BiomeGenSnowyForest extends BOPBiome // terrain this.terrainSettings.avgHeight(66).heightVariation(6, 21); + this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.SILTY); + this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.SILTY); + this.canGenerateVillages = false; this.addWeight(BOPClimates.TUNDRA, 7); @@ -73,6 +80,8 @@ public class BiomeGenSnowyForest extends BOPBiome public void applySettings(IBOPWorldSettings settings) { if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("tanzanite");} + + if (!settings.isEnabled(GeneratorType.SOILS)) {this.topBlock = Blocks.GRASS.getDefaultState(); this.fillerBlock = Blocks.DIRT.getDefaultState();} if (!settings.isEnabled(GeneratorType.FOLIAGE)) {this.removeGenerator("bushes"); this.removeGenerator("koru"); this.removeGenerator("shrubs"); this.removeGenerator("leaf_piles"); this.removeGenerator("dead_leaf_piles"); this.removeGenerator("clover_patches"); this.removeGenerator("sprouts");} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java index 9408bf7db..3b3d4dc41 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java @@ -9,10 +9,13 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.biome.BOPBiomes; +import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.config.IBOPWorldSettings; import biomesoplenty.api.config.IBOPWorldSettings.GeneratorType; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.api.generation.GeneratorStage; +import biomesoplenty.common.block.BlockBOPDirt; +import biomesoplenty.common.block.BlockBOPGrass; import biomesoplenty.common.enums.BOPFlowers; import biomesoplenty.common.enums.BOPGems; import biomesoplenty.common.enums.BOPPlants; @@ -38,6 +41,9 @@ public class BiomeGenTundra extends BOPBiome // terrain this.terrainSettings.avgHeight(64).heightVariation(5, 10).minHeight(59).octaves(2, 2, 1, 0, 1, 1); + this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.SILTY); + this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.SILTY); + this.addWeight(BOPClimates.TUNDRA, 10); this.canGenerateRivers = false; @@ -93,6 +99,8 @@ public class BiomeGenTundra extends BOPBiome { if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("tanzanite");} + if (!settings.isEnabled(GeneratorType.SOILS)) {this.topBlock = Blocks.GRASS.getDefaultState(); this.fillerBlock = Blocks.DIRT.getDefaultState();} + if (!settings.isEnabled(GeneratorType.FOLIAGE)) {this.removeGenerator("bushes"); this.removeGenerator("koru"); this.removeGenerator("shrubs"); this.removeGenerator("leaf_piles"); this.removeGenerator("dead_leaf_piles"); this.removeGenerator("clover_patches"); this.removeGenerator("sprouts");} if (!settings.isEnabled(GeneratorType.PLANTS)) {this.removeGenerator("cattail"); this.removeGenerator("double_cattail"); this.removeGenerator("river_cane"); this.removeGenerator("tiny_cacti"); this.removeGenerator("roots"); this.removeGenerator("rafflesia"); this.removeGenerator("desert_sprouts");}