diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenAlps.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenAlps.java index 58f1ffbf5..8c13404df 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenAlps.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenAlps.java @@ -52,6 +52,12 @@ public class BiomeGenAlps extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.HOT_SPRINGS)) {this.removeGenerator("hot_springs");} 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/BiomeGenBambooForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBambooForest.java index a503a96b1..f68b21e72 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBambooForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBambooForest.java @@ -113,6 +113,12 @@ public class BiomeGenBambooForest extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { +if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("topaz");} 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/BiomeGenBayou.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBayou.java index fc13dfaed..95e9248f8 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBayou.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBayou.java @@ -114,6 +114,12 @@ public class BiomeGenBayou extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("malachite");} if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("toadstools"); this.removeGenerator("flat_mushroom"); this.removeGenerator("blue_milk_caps"); this.removeGenerator("portobellos");} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBog.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBog.java index 139bad608..beb8f2dec 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBog.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBog.java @@ -131,6 +131,12 @@ public class BiomeGenBog extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("malachite");} if (!settings.isEnabled(GeneratorType.POISON_IVY)) {this.removeGenerator("poison_ivy");} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java index 882f0463e..2883cb82e 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java @@ -93,6 +93,12 @@ public class BiomeGenBorealForest extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("amber");} if (!settings.isEnabled(GeneratorType.POISON_IVY)) {this.removeGenerator("poison_ivy");} if (!settings.isEnabled(GeneratorType.FLAX)) {this.removeGenerator("flax");} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBrushland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBrushland.java index dca3d3853..191ca0aef 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBrushland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBrushland.java @@ -77,6 +77,12 @@ public class BiomeGenBrushland extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("ruby");} if (!settings.isEnabled(GeneratorType.THORNS)) {this.removeGenerator("thorns");} if (!settings.isEnabled(GeneratorType.QUICKSAND)) {this.removeGenerator("quicksand");} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenChaparral.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenChaparral.java index afc9526e6..ef83d2e34 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenChaparral.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenChaparral.java @@ -96,6 +96,12 @@ public class BiomeGenChaparral extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("peridot");} if (!settings.isEnabled(GeneratorType.BERRY_BUSHES)) {this.removeGenerator("berry_bushes");} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java index 8183ca1ac..05a465149 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java @@ -106,6 +106,12 @@ public class BiomeGenCherryBlossomGrove extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("topaz");} if (!settings.isEnabled(GeneratorType.FLAX)) {this.removeGenerator("flax");} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenColdDesert.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenColdDesert.java index 2b35cb252..fdcb2a081 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenColdDesert.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenColdDesert.java @@ -81,6 +81,12 @@ public class BiomeGenColdDesert extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("tanzanite");} 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/BiomeGenConiferousForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java index 4862426c8..05b635fe6 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java @@ -108,6 +108,12 @@ public class BiomeGenConiferousForest extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("amber");} if (!settings.isEnabled(GeneratorType.POISON_IVY)) {this.removeGenerator("poison_ivy");} if (!settings.isEnabled(GeneratorType.FLAX)) {this.removeGenerator("flax");} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCoralReef.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCoralReef.java index a6a5414e7..9ae0f1bdb 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCoralReef.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCoralReef.java @@ -52,6 +52,12 @@ public class BiomeGenCoralReef extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("sapphire");} 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/BiomeGenCrag.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCrag.java index 96f497739..f7e9703d3 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCrag.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCrag.java @@ -50,6 +50,12 @@ public class BiomeGenCrag extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + 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/BiomeGenDeadForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadForest.java index 2dc6a71be..250aa7a7a 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadForest.java @@ -88,6 +88,12 @@ public class BiomeGenDeadForest extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("tanzanite");} if (!settings.isEnabled(GeneratorType.THORNS)) {this.removeGenerator("thorns");} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadSwamp.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadSwamp.java index 43f943ceb..46d314fbb 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadSwamp.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadSwamp.java @@ -100,6 +100,12 @@ public class BiomeGenDeadSwamp extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("malachite");} if (!settings.isEnabled(GeneratorType.SOILS)) {this.topBlock = Blocks.GRASS.getDefaultState(); this.fillerBlock = Blocks.DIRT.getDefaultState();} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java index a5bb428a6..b21784080 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java @@ -88,6 +88,12 @@ public class BiomeGenEucalyptusForest extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("topaz");} 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/BiomeGenFen.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFen.java index 1a2bfcf0b..bcdfe68e8 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFen.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFen.java @@ -131,6 +131,12 @@ public class BiomeGenFen extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("malachite");} if (!settings.isEnabled(GeneratorType.SOILS)) {this.topBlock = Blocks.GRASS.getDefaultState(); this.fillerBlock = Blocks.DIRT.getDefaultState();} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerField.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerField.java index e2d165314..65c7a8781 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerField.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerField.java @@ -63,6 +63,12 @@ public class BiomeGenFlowerField extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("peridot");} 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/BiomeGenFlowerIsland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerIsland.java index 8bee60e00..f68bd1d7c 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerIsland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerIsland.java @@ -102,6 +102,12 @@ public class BiomeGenFlowerIsland extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("peridot");} 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/BiomeGenGlacier.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGlacier.java index 491822453..344c61387 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGlacier.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGlacier.java @@ -50,6 +50,12 @@ public class BiomeGenGlacier extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("malachite");} } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrassland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrassland.java index 9021f6fc3..41a3d28b0 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrassland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrassland.java @@ -91,6 +91,12 @@ public class BiomeGenGrassland extends BOPBiome { @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("peridot");} if (!settings.isEnabled(GeneratorType.FLAX)) {this.removeGenerator("flax");} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGravelBeach.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGravelBeach.java index f44b4da08..6a101deec 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGravelBeach.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGravelBeach.java @@ -8,6 +8,9 @@ package biomesoplenty.common.biome.overworld; +import biomesoplenty.api.config.IBOPWorldSettings; +import biomesoplenty.api.config.IBOPWorldSettings.GeneratorType; +import biomesoplenty.common.world.generator.GeneratorWeighted; import net.minecraft.init.Blocks; public class BiomeGenGravelBeach extends BOPBiome @@ -34,4 +37,18 @@ public class BiomeGenGravelBeach extends BOPBiome this.topBlock = Blocks.GRAVEL.getDefaultState(); this.fillerBlock = Blocks.GRAVEL.getDefaultState(); } + + @Override + public void applySettings(IBOPWorldSettings settings) + { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("toadstools"); this.removeGenerator("flat_mushroom"); this.removeGenerator("blue_milk_caps"); this.removeGenerator("portobellos");} + + 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/BiomeGenGrove.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrove.java index 79dc47d11..3a8360917 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrove.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrove.java @@ -89,6 +89,12 @@ public class BiomeGenGrove extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("amber");} if (!settings.isEnabled(GeneratorType.BERRY_BUSHES)) {this.removeGenerator("berry_bushes");} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHeathland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHeathland.java index 17feee43b..475278eca 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHeathland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHeathland.java @@ -101,6 +101,12 @@ public class BiomeGenHeathland extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("peridot");} if (!settings.isEnabled(GeneratorType.THORNS)) {this.removeGenerator("thorns");} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHighland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHighland.java index 63a09406f..fdcbc7582 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHighland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHighland.java @@ -61,6 +61,12 @@ public class BiomeGenHighland extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + 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");} GeneratorWeighted grassGen = (GeneratorWeighted)this.getGenerator("grass"); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenKelpForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenKelpForest.java index 89228c6ce..1e908c803 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenKelpForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenKelpForest.java @@ -54,6 +54,12 @@ public class BiomeGenKelpForest extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("sapphire");} 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/BiomeGenLandOfLakes.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLandOfLakes.java index b9c41ab92..3f206757b 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLandOfLakes.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLandOfLakes.java @@ -111,6 +111,12 @@ public class BiomeGenLandOfLakes extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("malachite");} if (!settings.isEnabled(GeneratorType.SOILS)) {this.topBlock = Blocks.GRASS.getDefaultState(); this.fillerBlock = Blocks.DIRT.getDefaultState();} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLavenderFields.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLavenderFields.java index f23710265..294684cf4 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLavenderFields.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLavenderFields.java @@ -74,6 +74,12 @@ public class BiomeGenLavenderFields extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("peridot");} if (!settings.isEnabled(GeneratorType.SOILS)) {this.topBlock = Blocks.GRASS.getDefaultState(); this.fillerBlock = Blocks.DIRT.getDefaultState();} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushDesert.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushDesert.java index fa291fd91..e020cbeef 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushDesert.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushDesert.java @@ -104,6 +104,12 @@ public class BiomeGenLushDesert extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("ruby");} 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/BiomeGenLushSwamp.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushSwamp.java index 27fdf3bca..fc928553a 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushSwamp.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushSwamp.java @@ -126,6 +126,12 @@ public class BiomeGenLushSwamp extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("malachite");} if (!settings.isEnabled(GeneratorType.BERRY_BUSHES)) {this.removeGenerator("berry_bushes");} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMangrove.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMangrove.java index 7a1570c90..737c89c83 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMangrove.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMangrove.java @@ -114,6 +114,12 @@ public class BiomeGenMangrove extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("sapphire");} GeneratorWeighted treeGen = (GeneratorWeighted)this.getGenerator("trees"); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java index 37604b46b..8ea531773 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java @@ -82,6 +82,12 @@ public class BiomeGenMapleWoods extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("tanzanite");} if (!settings.isEnabled(GeneratorType.POISON_IVY)) {this.removeGenerator("poison_ivy");} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMarsh.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMarsh.java index 1cc107ed2..511bceda2 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMarsh.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMarsh.java @@ -92,6 +92,12 @@ public class BiomeGenMarsh extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("malachite");} if (!settings.isEnabled(GeneratorType.SOILS)) {this.topBlock = Blocks.GRASS.getDefaultState(); this.fillerBlock = Blocks.DIRT.getDefaultState();} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java index a6b5d5774..9c3378df8 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java @@ -110,6 +110,12 @@ public class BiomeGenMeadow extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("peridot");} if (!settings.isEnabled(GeneratorType.FLAX)) {this.removeGenerator("flax");} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMoor.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMoor.java index f3ee277b3..5aa2c8932 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMoor.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMoor.java @@ -93,6 +93,12 @@ public class BiomeGenMoor extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("malachite");} if (!settings.isEnabled(GeneratorType.FLAX)) {this.removeGenerator("flax");} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java index 19c2ca03f..75dd09ac1 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java @@ -162,6 +162,12 @@ public class BiomeGenMountain extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.FLAX)) {this.removeGenerator("flax");} if (!settings.isEnabled(GeneratorType.BERRY_BUSHES)) {this.removeGenerator("berry_bushes");} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java index 8eefbf374..f219c4150 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java @@ -142,6 +142,12 @@ public class BiomeGenMysticGrove extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("topaz");} if (!settings.isEnabled(GeneratorType.HOT_SPRINGS)) {this.removeGenerator("hot_springs");} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOasis.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOasis.java index e7b91c6b2..e18f22093 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOasis.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOasis.java @@ -109,6 +109,12 @@ public class BiomeGenOasis extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("ruby");} 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/BiomeGenOminousWoods.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java index 2f5d425f7..7e9ae3085 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java @@ -103,6 +103,12 @@ public class BiomeGenOminousWoods extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("malachite");} if (!settings.isEnabled(GeneratorType.POISON_IVY)) {this.removeGenerator("poison_ivy");} if (!settings.isEnabled(GeneratorType.THORNS)) {this.removeGenerator("thorns");} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOrchard.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOrchard.java index 1272e8551..558839882 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOrchard.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOrchard.java @@ -78,6 +78,12 @@ public class BiomeGenOrchard extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("peridot");} if (!settings.isEnabled(GeneratorType.FLAX)) {this.removeGenerator("flax");} if (!settings.isEnabled(GeneratorType.BERRY_BUSHES)) {this.removeGenerator("berry_bushes");} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOriginIsland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOriginIsland.java index 1cef66b2d..6146c4fc5 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOriginIsland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOriginIsland.java @@ -10,6 +10,7 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.config.IBOPWorldSettings; +import biomesoplenty.api.config.IBOPWorldSettings.GeneratorType; import biomesoplenty.api.generation.GeneratorStage; import biomesoplenty.common.block.BlockBOPGrass; import biomesoplenty.common.block.BlockBOPGrass.BOPGrassType; @@ -80,6 +81,9 @@ public class BiomeGenOriginIsland extends BOPBiome public void applySettings(IBOPWorldSettings settings) { this.removeGenerator("roots"); + this.removeGenerator("stone_formations"); + this.removeGenerator("glowshrooms"); + this.removeGenerator("miners_delight"); } @Override diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOutback.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOutback.java index a8b8a879a..ec438efc6 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOutback.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOutback.java @@ -83,6 +83,12 @@ public class BiomeGenOutback extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("ruby");} IBlockPosQuery emptyRedSand = BlockQuery.buildAnd().withAirAbove().states(this.topBlock).create(); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOvergrownCliffs.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOvergrownCliffs.java index c878f93db..75d6ee17f 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOvergrownCliffs.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOvergrownCliffs.java @@ -81,6 +81,12 @@ public class BiomeGenOvergrownCliffs extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.HOT_SPRINGS)) {this.removeGenerator("hot_springs");} 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/BiomeGenPrairie.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPrairie.java index dd029a3b3..f378080fa 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPrairie.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPrairie.java @@ -88,6 +88,12 @@ public class BiomeGenPrairie extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("peridot");} if (!settings.isEnabled(GeneratorType.FLAX)) {this.removeGenerator("flax");} if (!settings.isEnabled(GeneratorType.BERRY_BUSHES)) {this.removeGenerator("berry_bushes");} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenQuagmire.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenQuagmire.java index f55e47a16..c15db9478 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenQuagmire.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenQuagmire.java @@ -88,6 +88,12 @@ public class BiomeGenQuagmire extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("malachite");} IBlockPosQuery emptyMud = BlockQuery.buildAnd().withAirAbove().states(this.topBlock).create(); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRainforest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRainforest.java index e29e7e4a4..9d860ab61 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRainforest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRainforest.java @@ -97,6 +97,12 @@ public class BiomeGenRainforest extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("topaz");} 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/BiomeGenRedwoodForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRedwoodForest.java index 7fe814aba..3a59f9720 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRedwoodForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRedwoodForest.java @@ -105,6 +105,12 @@ public class BiomeGenRedwoodForest extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("amber");} 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/BiomeGenSacredSprings.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSacredSprings.java index 3d55bf1d2..56efef04e 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSacredSprings.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSacredSprings.java @@ -91,6 +91,12 @@ public class BiomeGenSacredSprings extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("topaz");} if (!settings.isEnabled(GeneratorType.HOT_SPRINGS)) {this.removeGenerator("hot_springs");} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSeasonalForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSeasonalForest.java index 8070693ae..05e217655 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSeasonalForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSeasonalForest.java @@ -100,6 +100,12 @@ public class BiomeGenSeasonalForest extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("amber");} if (!settings.isEnabled(GeneratorType.POISON_IVY)) {this.removeGenerator("poison_ivy");} if (!settings.isEnabled(GeneratorType.FLAX)) {this.removeGenerator("flax");} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java index dc6016a03..76be15e09 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java @@ -123,6 +123,12 @@ public class BiomeGenShield extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("amber");} 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/BiomeGenShrubland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShrubland.java index a1ac9ddc5..258025c78 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShrubland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShrubland.java @@ -85,6 +85,12 @@ public class BiomeGenShrubland extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("peridot");} if (!settings.isEnabled(GeneratorType.FLAX)) {this.removeGenerator("flax");} if (!settings.isEnabled(GeneratorType.BERRY_BUSHES)) {this.removeGenerator("berry_bushes");} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyConiferousForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyConiferousForest.java index 3a67468d1..7da2e004f 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyConiferousForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyConiferousForest.java @@ -84,6 +84,12 @@ public class BiomeGenSnowyConiferousForest extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("tanzanite");} if (!settings.isEnabled(GeneratorType.SOILS)) {this.topBlock = Blocks.GRASS.getDefaultState(); this.fillerBlock = Blocks.DIRT.getDefaultState();} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyForest.java index 7550a9e58..0ac25ef40 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyForest.java @@ -79,6 +79,12 @@ public class BiomeGenSnowyForest extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("tanzanite");} if (!settings.isEnabled(GeneratorType.SOILS)) {this.topBlock = Blocks.GRASS.getDefaultState(); this.fillerBlock = Blocks.DIRT.getDefaultState();} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSteppe.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSteppe.java index 8d017cb20..446a522a7 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSteppe.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSteppe.java @@ -95,6 +95,12 @@ public class BiomeGenSteppe extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("ruby");} if (!settings.isEnabled(GeneratorType.SOILS)) {this.topBlock = Blocks.GRASS.getDefaultState(); this.usualTopBlock = Blocks.GRASS.getDefaultState(); this.fillerBlock = Blocks.DIRT.getDefaultState();} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java index 699df5f76..6ec170594 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java @@ -117,6 +117,12 @@ public class BiomeGenTemperateRainforest extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("amber");} if (!settings.isEnabled(GeneratorType.POISON_IVY)) {this.removeGenerator("poison_ivy");} if (!settings.isEnabled(GeneratorType.FLAX)) {this.removeGenerator("flax");} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalIsland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalIsland.java index 22334d1bb..685d969f5 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalIsland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalIsland.java @@ -91,6 +91,12 @@ public class BiomeGenTropicalIsland extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("topaz");} 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/BiomeGenTropicalRainforest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalRainforest.java index af73242fb..cb5ad4e45 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalRainforest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalRainforest.java @@ -103,6 +103,12 @@ public class BiomeGenTropicalRainforest extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("topaz");} if (!settings.isEnabled(GeneratorType.POISON_IVY)) {this.removeGenerator("poison_ivy");} if (!settings.isEnabled(GeneratorType.QUICKSAND)) {this.removeGenerator("quicksand");} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java index 3b3d4dc41..a832a03aa 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java @@ -97,6 +97,12 @@ public class BiomeGenTundra extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("tanzanite");} if (!settings.isEnabled(GeneratorType.SOILS)) {this.topBlock = Blocks.GRASS.getDefaultState(); this.fillerBlock = Blocks.DIRT.getDefaultState();} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenVolcanicIsland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenVolcanicIsland.java index 7854e8254..36fe82a8c 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenVolcanicIsland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenVolcanicIsland.java @@ -10,6 +10,8 @@ package biomesoplenty.common.biome.overworld; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.api.block.IBlockPosQuery; +import biomesoplenty.api.config.IBOPWorldSettings; +import biomesoplenty.api.config.IBOPWorldSettings.GeneratorType; import biomesoplenty.api.generation.GeneratorStage; import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod; import biomesoplenty.common.util.block.BlockQuery; @@ -53,4 +55,16 @@ public class BiomeGenVolcanicIsland extends BOPBiome // gem this.addGenerator("emeralds", GeneratorStage.SAND, (new GeneratorOreSingle.Builder()).amountPerChunk(12).with(Blocks.EMERALD_ORE.getDefaultState()).create()); } + + @Override + public void applySettings(IBOPWorldSettings settings) + { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + 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.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + } } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java index 7c6d82b03..bf11e9952 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java @@ -87,6 +87,12 @@ public class BiomeGenWasteland extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("malachite");} if (!settings.isEnabled(GeneratorType.LIQUID_POISON)) {this.removeGenerator("poison_lakes");} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java index c73266313..5fec56230 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java @@ -129,6 +129,12 @@ public class BiomeGenWetland extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("malachite");} 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/BiomeGenWoodland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java index 16332a4b8..1b89b57c2 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java @@ -105,6 +105,12 @@ public class BiomeGenWoodland extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("amber");} if (!settings.isEnabled(GeneratorType.POISON_IVY)) {this.removeGenerator("poison_ivy");} if (!settings.isEnabled(GeneratorType.FLAX)) {this.removeGenerator("flax");} diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenXericShrubland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenXericShrubland.java index 5f9ec1052..42bbc8de6 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenXericShrubland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenXericShrubland.java @@ -100,6 +100,12 @@ public class BiomeGenXericShrubland extends BOPBiome @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("ruby");} 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/vanilla/BiomeExtBirchForest.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForest.java index e25d912a8..fab0ea799 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForest.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForest.java @@ -59,6 +59,12 @@ public class BiomeExtBirchForest extends ExtendedBiomeWrapper @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("amber");} if (!settings.isEnabled(GeneratorType.POISON_IVY)) {this.removeGenerator("poison_ivy");} if (!settings.isEnabled(GeneratorType.FLAX)) {this.removeGenerator("flax");} diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForestHills.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForestHills.java index 245a5b3ec..a53c4a923 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForestHills.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForestHills.java @@ -59,6 +59,12 @@ public class BiomeExtBirchForestHills extends ExtendedBiomeWrapper @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("amber");} if (!settings.isEnabled(GeneratorType.POISON_IVY)) {this.removeGenerator("poison_ivy");} if (!settings.isEnabled(GeneratorType.FLAX)) {this.removeGenerator("flax");} diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtColdTaiga.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtColdTaiga.java index a023d97bf..b0258893a 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtColdTaiga.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtColdTaiga.java @@ -36,6 +36,12 @@ public class BiomeExtColdTaiga extends ExtendedBiomeWrapper @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("tanzanite");} if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("flowers");} diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtColdTaigaHills.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtColdTaigaHills.java index 7fd854415..fc69cd1d1 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtColdTaigaHills.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtColdTaigaHills.java @@ -36,6 +36,12 @@ public class BiomeExtColdTaigaHills extends ExtendedBiomeWrapper @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("tanzanite");} if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("flowers");} diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtDesert.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtDesert.java index 246509d5c..f6ffc2b44 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtDesert.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtDesert.java @@ -31,6 +31,12 @@ public class BiomeExtDesert extends ExtendedBiomeWrapper @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("ruby");} if (!settings.isEnabled(GeneratorType.QUICKSAND)) {this.removeGenerator("quicksand");} diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtDesertHills.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtDesertHills.java index f4c98fcf0..4f0893a2a 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtDesertHills.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtDesertHills.java @@ -25,6 +25,12 @@ public class BiomeExtDesertHills extends ExtendedBiomeWrapper @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("ruby");} 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/vanilla/BiomeExtEnd.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtEnd.java index 53e6cd0f9..c38b13f30 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtEnd.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtEnd.java @@ -32,6 +32,11 @@ public class BiomeExtEnd extends ExtendedBiomeWrapper @Override public void applySettings(IBOPWorldSettings settings) { + this.removeGenerator("stone_formations"); + this.removeGenerator("glowshrooms"); + this.removeGenerator("miners_delight"); + this.removeGenerator("roots"); + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("amethyst");} if (!settings.isEnabled(GeneratorType.END_FEATURES)) {this.removeGenerator("crystals"); this.removeGenerator("biome_essence");} } diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtExtremeHills.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtExtremeHills.java index 237521115..3c1a2ee51 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtExtremeHills.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtExtremeHills.java @@ -46,6 +46,12 @@ public class BiomeExtExtremeHills extends ExtendedBiomeWrapper @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("toadstools"); this.removeGenerator("flat_mushroom"); this.removeGenerator("blue_milk_caps"); this.removeGenerator("portobellos");} 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/vanilla/BiomeExtExtremeHillsPlus.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtExtremeHillsPlus.java index e1eec6088..e964fc4bc 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtExtremeHillsPlus.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtExtremeHillsPlus.java @@ -46,6 +46,12 @@ public class BiomeExtExtremeHillsPlus extends ExtendedBiomeWrapper @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("toadstools"); this.removeGenerator("flat_mushroom"); this.removeGenerator("blue_milk_caps"); this.removeGenerator("portobellos");} 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/vanilla/BiomeExtForest.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForest.java index 69140c654..0de2f53f8 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForest.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForest.java @@ -73,6 +73,12 @@ public class BiomeExtForest extends ExtendedBiomeWrapper @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("amber");} if (!settings.isEnabled(GeneratorType.POISON_IVY)) {this.removeGenerator("poison_ivy");} if (!settings.isEnabled(GeneratorType.FLAX)) {this.removeGenerator("flax");} diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForestHills.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForestHills.java index db8bc8f50..2ac315e70 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForestHills.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForestHills.java @@ -73,6 +73,12 @@ public class BiomeExtForestHills extends ExtendedBiomeWrapper @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("amber");} if (!settings.isEnabled(GeneratorType.POISON_IVY)) {this.removeGenerator("poison_ivy");} if (!settings.isEnabled(GeneratorType.FLAX)) {this.removeGenerator("flax");} diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtIceMountains.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtIceMountains.java index 2f30f4299..1744707d0 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtIceMountains.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtIceMountains.java @@ -37,6 +37,12 @@ public class BiomeExtIceMountains extends ExtendedBiomeWrapper @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("tanzanite");} if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("flowers");} diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtIcePlains.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtIcePlains.java index 7026e29f8..f107056bd 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtIcePlains.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtIcePlains.java @@ -37,6 +37,12 @@ public class BiomeExtIcePlains extends ExtendedBiomeWrapper @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("tanzanite");} if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("flowers");} diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtJungle.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtJungle.java index d52837d5c..62e9e1808 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtJungle.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtJungle.java @@ -43,6 +43,12 @@ public class BiomeExtJungle extends ExtendedBiomeWrapper @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("topaz");} if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("flowers");} diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtJungleHills.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtJungleHills.java index f8edbbf08..b6acba83a 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtJungleHills.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtJungleHills.java @@ -43,6 +43,12 @@ public class BiomeExtJungleHills extends ExtendedBiomeWrapper @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("topaz");} if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("flowers");} diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaiga.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaiga.java index a74e3a009..3bceeda5c 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaiga.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaiga.java @@ -43,6 +43,12 @@ public class BiomeExtMegaTaiga extends ExtendedBiomeWrapper @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("tanzanite");} if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("flowers");} diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaigaHills.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaigaHills.java index 7b4a4d6e5..fccb93d56 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaigaHills.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaigaHills.java @@ -43,6 +43,12 @@ public class BiomeExtMegaTaigaHills extends ExtendedBiomeWrapper @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("tanzanite");} if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("flowers");} diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMesa.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMesa.java index 939409223..e6ffa0854 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMesa.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMesa.java @@ -34,6 +34,12 @@ public class BiomeExtMesa extends ExtendedBiomeWrapper @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("ruby");} if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("flowers");} diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMesaPlateau.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMesaPlateau.java index 5d58e2238..d8a9088b8 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMesaPlateau.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMesaPlateau.java @@ -34,6 +34,12 @@ public class BiomeExtMesaPlateau extends ExtendedBiomeWrapper @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("ruby");} if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("flowers");} diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMushroomIsland.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMushroomIsland.java index 1c62859d7..a3739884a 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMushroomIsland.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMushroomIsland.java @@ -20,7 +20,7 @@ public class BiomeExtMushroomIsland extends ExtendedBiomeWrapper this.addGenerator("toadstools", GeneratorStage.SHROOM,(new GeneratorFlora.Builder()).amountPerChunk(0.5F).with(BlockBOPMushroom.MushroomType.TOADSTOOL).create()); this.addGenerator("blue_milk_caps", GeneratorStage.SHROOM,(new GeneratorFlora.Builder()).amountPerChunk(0.2F).with(BlockBOPMushroom.MushroomType.BLUE_MILK_CAP).create()); this.addGenerator("portobellos", GeneratorStage.SHROOM,(new GeneratorFlora.Builder()).amountPerChunk(0.3F).with(BlockBOPMushroom.MushroomType.PORTOBELLO).create()); - this.addGenerator("glowshrooms", GeneratorStage.SHROOM,(new GeneratorFlora.Builder()).amountPerChunk(0.1F).with(BlockBOPMushroom.MushroomType.GLOWSHROOM).create()); + this.addGenerator("glowshrooms_surface", GeneratorStage.SHROOM,(new GeneratorFlora.Builder()).amountPerChunk(0.1F).with(BlockBOPMushroom.MushroomType.GLOWSHROOM).create()); // gem this.addGenerator("malachite", GeneratorStage.SAND, (new GeneratorOreSingle.Builder()).amountPerChunk(12).with(BOPGems.MALACHITE).create()); @@ -29,9 +29,15 @@ public class BiomeExtMushroomIsland extends ExtendedBiomeWrapper @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("malachite");} - if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("toadstools"); this.removeGenerator("flat_mushroom"); this.removeGenerator("blue_milk_caps"); this.removeGenerator("portobellos"); this.removeGenerator("glowshrooms");} + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("toadstools"); this.removeGenerator("flat_mushroom"); this.removeGenerator("blue_milk_caps"); this.removeGenerator("portobellos"); this.removeGenerator("glowshrooms_surface"); this.removeGenerator("glowshrooms");} 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/vanilla/BiomeExtOcean.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtOcean.java index bb06ec7d1..f46273b84 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtOcean.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtOcean.java @@ -20,6 +20,14 @@ public class BiomeExtOcean extends ExtendedBiomeWrapper @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("sapphire");} + + 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/vanilla/BiomeExtPlains.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtPlains.java index ce96d3b86..b1a1a9809 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtPlains.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtPlains.java @@ -39,6 +39,12 @@ public class BiomeExtPlains extends ExtendedBiomeWrapper @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("peridot");} if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("flowers");} diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtRoofedForest.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtRoofedForest.java index 7ed199cec..5c541a319 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtRoofedForest.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtRoofedForest.java @@ -36,6 +36,12 @@ public class BiomeExtRoofedForest extends ExtendedBiomeWrapper @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("amber");} if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("toadstools"); this.removeGenerator("flat_mushroom"); this.removeGenerator("blue_milk_caps"); this.removeGenerator("portobellos");} diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSavanna.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSavanna.java index 73ec45edf..8a51a5f55 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSavanna.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSavanna.java @@ -43,6 +43,12 @@ public class BiomeExtSavanna extends ExtendedBiomeWrapper @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("ruby");} if (!settings.isEnabled(GeneratorType.QUICKSAND)) {this.removeGenerator("quicksand");} diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSavannaPlateau.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSavannaPlateau.java index 56fb9608e..67709d96a 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSavannaPlateau.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSavannaPlateau.java @@ -37,6 +37,12 @@ public class BiomeExtSavannaPlateau extends ExtendedBiomeWrapper @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("ruby");} if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("flowers");} diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSwampland.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSwampland.java index 47e5c27ea..e43277b35 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSwampland.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtSwampland.java @@ -76,6 +76,12 @@ public class BiomeExtSwampland extends ExtendedBiomeWrapper @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("malachite");} if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("flowers");} diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaiga.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaiga.java index 6c6e14cb2..bb6f545c4 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaiga.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaiga.java @@ -43,6 +43,12 @@ public class BiomeExtTaiga extends ExtendedBiomeWrapper @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("tanzanite");} if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("flowers");} diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaigaHills.java b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaigaHills.java index 708bfb512..bb3298425 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaigaHills.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaigaHills.java @@ -43,6 +43,12 @@ public class BiomeExtTaigaHills extends ExtendedBiomeWrapper @Override public void applySettings(IBOPWorldSettings settings) { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + if (!settings.isEnabled(GeneratorType.GEMS)) {this.removeGenerator("tanzanite");} if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("flowers");} diff --git a/src/main/java/biomesoplenty/common/biome/vanilla/ExtendedBiomeWrapper.java b/src/main/java/biomesoplenty/common/biome/vanilla/ExtendedBiomeWrapper.java index 7ab7b1224..4e821e331 100644 --- a/src/main/java/biomesoplenty/common/biome/vanilla/ExtendedBiomeWrapper.java +++ b/src/main/java/biomesoplenty/common/biome/vanilla/ExtendedBiomeWrapper.java @@ -5,16 +5,25 @@ import java.util.Map; import biomesoplenty.api.biome.BiomeOwner; import biomesoplenty.api.biome.IExtendedBiome; +import biomesoplenty.api.block.BOPBlocks; +import biomesoplenty.api.block.IBlockPosQuery; import biomesoplenty.api.config.IBOPWorldSettings; import biomesoplenty.api.config.IConfigObj; +import biomesoplenty.api.config.IBOPWorldSettings.GeneratorType; import biomesoplenty.api.enums.BOPClimates; import biomesoplenty.api.generation.GeneratorStage; import biomesoplenty.api.generation.IGenerator; +import biomesoplenty.common.block.BlockBOPMushroom; +import biomesoplenty.common.enums.BOPFlowers; import biomesoplenty.common.enums.BOPPlants; import biomesoplenty.common.util.biome.BiomeUtils; +import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod; +import biomesoplenty.common.util.block.BlockQuery; import biomesoplenty.common.world.GenerationManager; +import biomesoplenty.common.world.generator.GeneratorColumns; import biomesoplenty.common.world.generator.GeneratorFlora; import net.minecraft.init.Biomes; +import net.minecraft.init.Blocks; import net.minecraft.util.ResourceLocation; import net.minecraft.world.biome.Biome; @@ -32,10 +41,21 @@ public class ExtendedBiomeWrapper implements IExtendedBiome // roots this.addGenerator("roots", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(4.0F).with(BOPPlants.ROOT).create()); + + IBlockPosQuery suitableStonePosition = BlockQuery.buildAnd().withAltitudeBetween(0, 55).blocks(Blocks.STONE).create(); + this.addGenerator("miners_delight", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.25F).generationAttempts(64).with(BOPFlowers.MINERS_DELIGHT).placeOn(suitableStonePosition).scatterYMethod(ScatterYMethod.BELOW_GROUND).create()); + this.addGenerator("glowshrooms", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(1.5F).generationAttempts(64).placeOn(suitableStonePosition).with(BOPBlocks.mushroom.getDefaultState().withProperty(BlockBOPMushroom.VARIANT, BlockBOPMushroom.MushroomType.GLOWSHROOM)).scatterYMethod(ScatterYMethod.BELOW_GROUND).create()); + this.addGenerator("stone_formations", GeneratorStage.FLOWERS,(new GeneratorColumns.Builder()).amountPerChunk(30.0F).generationAttempts(32).placeOn(suitableStonePosition).with(BOPBlocks.stone_formations.getDefaultState()).minHeight(1).maxHeight(7).randomDirection(true).scatterYMethod(ScatterYMethod.BELOW_GROUND).create()); } @Override - public void applySettings(IBOPWorldSettings settings){} + public void applySettings(IBOPWorldSettings settings) + { + if (!settings.isEnabled(GeneratorType.MUSHROOMS)) {this.removeGenerator("glowshrooms");} + if (!settings.isEnabled(GeneratorType.PLANTS)) {this.removeGenerator("roots");} + if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("miners_delight");} + if (!settings.isEnabled(GeneratorType.ROCK_FORMATIONS)) {this.removeGenerator("stone_formations");} + } @Override public void configure(IConfigObj conf)