From 7211a7e9692f6a3ec752c6e05652efdc267e045b Mon Sep 17 00:00:00 2001 From: Amnet Date: Sat, 21 Sep 2013 15:57:55 +0200 Subject: [PATCH] Config file stuff --- .../configuration/BOPBiomes.java | 55 ++++++++- .../configfile/BOPConfigurationBiomeGen.java | 16 ++- .../BOPConfigurationTerrainGen.java | 112 +++++++++++++++++- .../world/layer/BiomeLayerBiomes.java | 23 ++-- .../world/layer/BiomeLayerShore.java | 19 ++- 5 files changed, 203 insertions(+), 22 deletions(-) diff --git a/common/biomesoplenty/configuration/BOPBiomes.java b/common/biomesoplenty/configuration/BOPBiomes.java index 6382ffddb..7fceb3409 100644 --- a/common/biomesoplenty/configuration/BOPBiomes.java +++ b/common/biomesoplenty/configuration/BOPBiomes.java @@ -531,40 +531,93 @@ public class BOPBiomes { private static void addVillageBiomes() { + addVillageBiome(Biomes.alps, BOPConfigurationTerrainGen.alpsVillage); addVillageBiome(Biomes.arctic, BOPConfigurationTerrainGen.arcticVillage); + addVillageBiome(Biomes.autumnHills, BOPConfigurationTerrainGen.autumnHillsVillage); + addVillageBiome(Biomes.badlands, BOPConfigurationTerrainGen.badlandsVillage); + addVillageBiome(Biomes.bambooForest, BOPConfigurationTerrainGen.bambooForestVillage); + addVillageBiome(Biomes.bayou, BOPConfigurationTerrainGen.bayouVillage); addVillageBiome(Biomes.birchForest, BOPConfigurationTerrainGen.birchForestVillage); + addVillageBiome(Biomes.bog, BOPConfigurationTerrainGen.bogVillage); + addVillageBiome(Biomes.borealForest, BOPConfigurationTerrainGen.borealForestVillage); addVillageBiome(Biomes.brushland, BOPConfigurationTerrainGen.brushlandVillage); + addVillageBiome(Biomes.canyon, BOPConfigurationTerrainGen.canyonVillage); addVillageBiome(Biomes.chaparral, BOPConfigurationTerrainGen.chaparralVillage); + addVillageBiome(Biomes.cherryBlossomGrove, BOPConfigurationTerrainGen.cherryBlossomGroveVillage); addVillageBiome(Biomes.coniferousForest, BOPConfigurationTerrainGen.coniferousForestVillage); addVillageBiome(Biomes.coniferousForestSnow, BOPConfigurationTerrainGen.coniferousForestSnowVillage); + //addVillageBiome(Biomes.crag, BOPConfigurationTerrainGen.cragVillage); + addVillageBiome(Biomes.deadForest, BOPConfigurationTerrainGen.deadForestVillage); + addVillageBiome(Biomes.deadForestSnow, BOPConfigurationTerrainGen.deadForestSnowVillage); + addVillageBiome(Biomes.deadSwamp, BOPConfigurationTerrainGen.deadSwampVillage); + //addVillageBiome(Biomes.deadlands, BOPConfigurationTerrainGen.deadlandsVillage); addVillageBiome(Biomes.deciduousForest, BOPConfigurationTerrainGen.deciduousForestVillage); - addVillageBiome(Biomes.frostForest, BOPConfigurationTerrainGen.frostForestVillage); + addVillageBiome(Biomes.dunes, BOPConfigurationTerrainGen.dunesVillage); + addVillageBiome(Biomes.fen, BOPConfigurationTerrainGen.fenVillage); addVillageBiome(Biomes.field, BOPConfigurationTerrainGen.fieldVillage); + addVillageBiome(Biomes.frostForest, BOPConfigurationTerrainGen.frostForestVillage); + //addVillageBiome(Biomes.fungiForest, BOPConfigurationTerrainGen.fungiForestVillage); + //addVillageBiome(Biomes.garden, BOPConfigurationTerrainGen.gardenVillage); + addVillageBiome(Biomes.glacier, BOPConfigurationTerrainGen.glacierVillage); addVillageBiome(Biomes.grassland, BOPConfigurationTerrainGen.grasslandVillage); addVillageBiome(Biomes.grove, BOPConfigurationTerrainGen.groveVillage); addVillageBiome(Biomes.heathland, BOPConfigurationTerrainGen.heathlandVillage); + addVillageBiome(Biomes.highland, BOPConfigurationTerrainGen.highlandVillage); + addVillageBiome(Biomes.hotSprings, BOPConfigurationTerrainGen.hotSpringsVillage); + //addVillageBiome(Biomes.icyHills, BOPConfigurationTerrainGen.icyHillsVillage); + addVillageBiome(Biomes.jadeCliffs, BOPConfigurationTerrainGen.jadeCliffsVillage); addVillageBiome(Biomes.lushDesert, BOPConfigurationTerrainGen.lushDesertVillage); addVillageBiome(Biomes.lushSwamp, BOPConfigurationTerrainGen.lushSwampVillage); + addVillageBiome(Biomes.mangrove, BOPConfigurationTerrainGen.mangroveVillage); addVillageBiome(Biomes.mapleWoods, BOPConfigurationTerrainGen.mapleWoodsVillage); + addVillageBiome(Biomes.marsh, BOPConfigurationTerrainGen.marshVillage); addVillageBiome(Biomes.meadow, BOPConfigurationTerrainGen.meadowVillage); addVillageBiome(Biomes.meadowForest, BOPConfigurationTerrainGen.meadowVillage); + addVillageBiome(Biomes.mesa, BOPConfigurationTerrainGen.mesaVillage); + addVillageBiome(Biomes.moor, BOPConfigurationTerrainGen.moorVillage); + addVillageBiome(Biomes.mountain, BOPConfigurationTerrainGen.mountainVillage); + //addVillageBiome(Biomes.mysticGrove, BOPConfigurationTerrainGen.mysticGroveVillage); + addVillageBiome(Biomes.oasis, BOPConfigurationTerrainGen.oasisVillage); + //addVillageBiome(Biomes.ominousWoods, BOPConfigurationTerrainGen.ominousWoodsVillage); + //addVillageBiome(Biomes.ominousWoodsThick, BOPConfigurationTerrainGen.ominousWoodsVillage); + addVillageBiome(Biomes.orchard, BOPConfigurationTerrainGen.orchardVillage); + //addVillageBiome(Biomes.originValley, BOPConfigurationTerrainGen.originValleyVillage); addVillageBiome(Biomes.outback, BOPConfigurationTerrainGen.outbackVillage); addVillageBiome(Biomes.overgrownGreens, BOPConfigurationTerrainGen.overgrownGreensVillage); + addVillageBiome(Biomes.pasture, BOPConfigurationTerrainGen.pastureVillage); + addVillageBiome(Biomes.polar, BOPConfigurationTerrainGen.polarVillage); addVillageBiome(Biomes.prairie, BOPConfigurationTerrainGen.prairieVillage); + addVillageBiome(Biomes.quagmire, BOPConfigurationTerrainGen.quagmireVillage); + addVillageBiome(Biomes.rainforest, BOPConfigurationTerrainGen.rainforestVillage); + addVillageBiome(Biomes.redwoodForest, BOPConfigurationTerrainGen.redwoodForestVillage); + //addVillageBiome(Biomes.sacredSprings, BOPConfigurationTerrainGen.sacredSpringsVillage); addVillageBiome(Biomes.savanna, BOPConfigurationTerrainGen.savannaVillage); + addVillageBiome(Biomes.seasonalForest, BOPConfigurationTerrainGen.seasonalForestVillage); + addVillageBiome(Biomes.shield, BOPConfigurationTerrainGen.shieldVillage); addVillageBiome(Biomes.scrubland, BOPConfigurationTerrainGen.scrublandVillage); addVillageBiome(Biomes.shrubland, BOPConfigurationTerrainGen.shrublandVillage); + //addVillageBiome(Biomes.silkglades, BOPConfigurationTerrainGen.silkgladesVillage); + addVillageBiome(Biomes.sludgepit, BOPConfigurationTerrainGen.sludgepitVillage); addVillageBiome(Biomes.spruceWoods, BOPConfigurationTerrainGen.spruceWoodsVillage); addVillageBiome(Biomes.steppe, BOPConfigurationTerrainGen.steppeVillage); + addVillageBiome(Biomes.temperateRainforest, BOPConfigurationTerrainGen.temperateRainforestVillage); + addVillageBiome(Biomes.thicket, BOPConfigurationTerrainGen.thicketVillage); addVillageBiome(Biomes.timber, BOPConfigurationTerrainGen.timberVillage); addVillageBiome(Biomes.tropicalRainforest, BOPConfigurationTerrainGen.tropicalRainforestVillage); + addVillageBiome(Biomes.tropics, BOPConfigurationTerrainGen.tropicsVillage); addVillageBiome(Biomes.tundra, BOPConfigurationTerrainGen.tundraVillage); + addVillageBiome(Biomes.volcano, BOPConfigurationTerrainGen.volcanoVillage); + //addVillageBiome(Biomes.wasteland, BOPConfigurationTerrainGen.wastelandVillage); addVillageBiome(Biomes.wetland, BOPConfigurationTerrainGen.wetlandVillage); addVillageBiome(Biomes.woodland, BOPConfigurationTerrainGen.woodlandVillage); addVillageBiome(Biomes.plainsNew, BOPConfigurationTerrainGen.plainsVillage); addVillageBiome(Biomes.desertNew, BOPConfigurationTerrainGen.desertVillage); addVillageBiome(Biomes.forestNew, BOPConfigurationTerrainGen.forestVillage); + addVillageBiome(Biomes.extremeHillsNew, BOPConfigurationTerrainGen.extremeHillsVillage); + addVillageBiome(Biomes.taigaNew, BOPConfigurationTerrainGen.taigaVillage); + addVillageBiome(Biomes.swamplandNew, BOPConfigurationTerrainGen.swamplandVillage); + addVillageBiome(Biomes.jungleNew, BOPConfigurationTerrainGen.jungleVillage); } private static void addStrongholdBiomes() diff --git a/common/biomesoplenty/configuration/configfile/BOPConfigurationBiomeGen.java b/common/biomesoplenty/configuration/configfile/BOPConfigurationBiomeGen.java index b8be3352e..5633e37de 100644 --- a/common/biomesoplenty/configuration/configfile/BOPConfigurationBiomeGen.java +++ b/common/biomesoplenty/configuration/configfile/BOPConfigurationBiomeGen.java @@ -102,16 +102,19 @@ public class BOPConfigurationBiomeGen public static boolean jungleGen; // Nether biomes - public static boolean undergardenGen; public static boolean corruptedSandsGen; public static boolean phantasmagoricInfernoGen; public static boolean boneyardGen; - //Beach variations - + // Beach variations public static boolean gravelBeachGen; public static boolean overgrownBeachGen; + + // Ocean biomes + public static boolean coralReefGen; + public static boolean kelpForestGen; + public static boolean oceanicAbyssGen; public static void init(File configFile) { @@ -213,16 +216,19 @@ public class BOPConfigurationBiomeGen taigaGen = config.get("Vanilla Biomes To Generate", "Taiga", true).getBoolean(true); // Nether biomes - undergardenGen = config.get("Nether Biomes To Generate", "Undergarden", true).getBoolean(true); corruptedSandsGen = config.get("Nether Biomes To Generate", "CorruptedSands", true).getBoolean(true); phantasmagoricInfernoGen = config.get("Nether Biomes To Generate", "PhantasmagoricInferno", true).getBoolean(true); boneyardGen = config.get("Nether Biomes To Generate", "Boneyard", true).getBoolean(true); // Beach variations - gravelBeachGen = config.get("Beach Variations To Generate", "Gravel Beach", true).getBoolean(true); overgrownBeachGen = config.get("Beach Variations To Generate", "Overgrown Beach", false).getBoolean(true); + + // Ocean biomes + coralReefGen = config.get("Ocean Biomes To Generate", "Coral Reef", true).getBoolean(false); + kelpForestGen = config.get("Ocean Biomes To Generate", "Kelp Forest", true).getBoolean(false); + oceanicAbyssGen = config.get("Ocean Biomes To Generate", "Oceanic Abyss", true).getBoolean(false); FMLCommonHandler.instance().getFMLLogger().log(Level.INFO, "[BiomesOPlenty] Generated Biome Gen Config!"); } diff --git a/common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java b/common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java index 16d2f6c21..9a647f5ab 100644 --- a/common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java +++ b/common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java @@ -26,38 +26,90 @@ public class BOPConfigurationTerrainGen public static int villageDistance; // Village biomes + public static boolean alpsVillage; public static boolean arcticVillage; + public static boolean autumnHillsVillage; + public static boolean badlandsVillage; + public static boolean bambooForestVillage; + public static boolean bayouVillage; public static boolean birchForestVillage; + public static boolean bogVillage; + public static boolean borealForestVillage; public static boolean brushlandVillage; + public static boolean canyonVillage; public static boolean chaparralVillage; + public static boolean cherryBlossomGroveVillage; public static boolean coniferousForestVillage; public static boolean coniferousForestSnowVillage; + public static boolean cragVillage; + public static boolean deadForestVillage; + public static boolean deadForestSnowVillage; + public static boolean deadSwampVillage; + public static boolean deadlandsVillage; public static boolean deciduousForestVillage; - public static boolean frostForestVillage; + public static boolean dunesVillage; + public static boolean fenVillage; public static boolean fieldVillage; + public static boolean frostForestVillage; + public static boolean fungiForestVillage; + public static boolean gardenVillage; + public static boolean glacierVillage; public static boolean grasslandVillage; public static boolean groveVillage; public static boolean heathlandVillage; + public static boolean highlandVillage; + public static boolean hotSpringsVillage; + public static boolean icyHillsVillage; + public static boolean jadeCliffsVillage; public static boolean lushDesertVillage; public static boolean lushSwampVillage; + public static boolean mangroveVillage; public static boolean mapleWoodsVillage; + public static boolean marshVillage; public static boolean meadowVillage; + public static boolean mesaVillage; + public static boolean moorVillage; + public static boolean mountainVillage; + public static boolean mysticGroveVillage; + public static boolean oasisVillage; + public static boolean ominousWoodsVillage; + public static boolean orchardVillage; + public static boolean originValleyVillage; public static boolean outbackVillage; public static boolean overgrownGreensVillage; + public static boolean pastureVillage; + public static boolean polarVillage; public static boolean prairieVillage; + public static boolean quagmireVillage; + public static boolean rainforestVillage; + public static boolean redwoodForestVillage; + public static boolean sacredSpringsVillage; public static boolean savannaVillage; public static boolean scrublandVillage; + public static boolean seasonalForestVillage; + public static boolean shieldVillage; public static boolean shrublandVillage; + public static boolean silkgladesVillage; + public static boolean sludgepitVillage; public static boolean spruceWoodsVillage; public static boolean steppeVillage; + public static boolean temperateRainforestVillage; + public static boolean thicketVillage; public static boolean timberVillage; public static boolean tropicalRainforestVillage; + public static boolean tropicsVillage; public static boolean tundraVillage; + public static boolean volcanoVillage; + public static boolean wastelandVillage; public static boolean wetlandVillage; public static boolean woodlandVillage; public static boolean plainsVillage; public static boolean desertVillage; + public static boolean extremeHillsVillage; public static boolean forestVillage; + public static boolean taigaVillage; + public static boolean swamplandVillage; + public static boolean jungleVillage; public static void init(File configFile) { @@ -86,40 +138,92 @@ public class BOPConfigurationTerrainGen } // Biomes with villages + alpsVillage = config.get("Allow Villages", "Alps", false).getBoolean(false); arcticVillage = config.get("Allow Villages", "Arctic", true).getBoolean(false); + autumnHillsVillage = config.get("Allow Villages", "AutumnHills", false).getBoolean(false); + badlandsVillage = config.get("Allow Villages", "Badlands", false).getBoolean(false); + bambooForestVillage = config.get("Allow Villages", "BambooForest", false).getBoolean(false); + bayouVillage = config.get("Allow Villages", "Bayou", false).getBoolean(false); birchForestVillage = config.get("Allow Villages", "BirchForest", true).getBoolean(false); + bogVillage = config.get("Allow Villages", "Bog", false).getBoolean(false); + borealForestVillage = config.get("Allow Villages", "BorealForest", false).getBoolean(false); brushlandVillage = config.get("Allow Villages", "Brushland", true).getBoolean(false); + canyonVillage = config.get("Allow Villages", "Canyon", false).getBoolean(false); chaparralVillage = config.get("Allow Villages", "Chaparral", true).getBoolean(false); + cherryBlossomGroveVillage = config.get("Allow Villages", "CherryBlossomGrove", false).getBoolean(false); coniferousForestVillage = config.get("Allow Villages", "ConiferousForest", true).getBoolean(false); - coniferousForestSnowVillage = config.get("Allow Villages", "SnowyConiferousForest", true).getBoolean(false); + coniferousForestSnowVillage = config.get("Allow Villages", "ConiferousForestSnow", true).getBoolean(false); + //cragVillage = config.get("Allow Villages", "Crag", false).getBoolean(false); + deadForestVillage = config.get("Allow Villages", "DeadForest", false).getBoolean(false); + deadForestSnowVillage = config.get("Allow Villages", "DeadForestSnow", false).getBoolean(false); + deadSwampVillage = config.get("Allow Villages", "DeadSwamp", false).getBoolean(false); + //deadlandsVillage = config.get("Allow Villages", "Deadlands", false).getBoolean(false); deciduousForestVillage = config.get("Allow Villages", "DeciduousForest", true).getBoolean(false); - frostForestVillage = config.get("Allow Villages", "FrostForest", true).getBoolean(false); + dunesVillage = config.get("Allow Villages", "Dunes", false).getBoolean(false); + fenVillage = config.get("Allow Villages", "Fen", false).getBoolean(false); fieldVillage = config.get("Allow Villages", "Field", true).getBoolean(false); + frostForestVillage = config.get("Allow Villages", "FrostForest", true).getBoolean(false); + //fungiForestVillage = config.get("Allow Villages", "FungiForest", false).getBoolean(false); + //gardenVillage = config.get("Allow Villages", "Garden", false).getBoolean(false); + glacierVillage = config.get("Allow Villages", "Glacier", false).getBoolean(false); grasslandVillage = config.get("Allow Villages", "Grassland", true).getBoolean(false); groveVillage = config.get("Allow Villages", "Grove", true).getBoolean(false); heathlandVillage = config.get("Allow Villages", "Heathland", true).getBoolean(false); + highlandVillage = config.get("Allow Villages", "Highland", false).getBoolean(false); + hotSpringsVillage = config.get("Allow Villages", "HotSprings", false).getBoolean(false); + //icyHillsVillage = config.get("Allow Villages", "IcyHills", false).getBoolean(false); + jadeCliffsVillage = config.get("Allow Villages", "JadeCliffs", false).getBoolean(false); lushDesertVillage = config.get("Allow Villages", "LushDesert", true).getBoolean(false); lushSwampVillage = config.get("Allow Villages", "LushSwamp", true).getBoolean(false); + mangroveVillage = config.get("Allow Villages", "Mangrove", false).getBoolean(false); mapleWoodsVillage = config.get("Allow Villages", "MapleWoods", true).getBoolean(false); + marshVillage = config.get("Allow Villages", "Marsh", false).getBoolean(false); meadowVillage = config.get("Allow Villages", "Meadow", true).getBoolean(false); + mesaVillage = config.get("Allow Villages", "Mesa", false).getBoolean(false); + moorVillage = config.get("Allow Villages", "Moor", false).getBoolean(false); + mountainVillage = config.get("Allow Villages", "Mountain", false).getBoolean(false); + //mysticGroveVillage = config.get("Allow Villages", "MysticGrove", false).getBoolean(false); + oasisVillage = config.get("Allow Villages", "Oasis", false).getBoolean(false); + //ominousWoodsVillage = config.get("Allow Villages", "OminousWoods", false).getBoolean(false); + orchardVillage = config.get("Allow Villages", "Orchard", false).getBoolean(false); + //originValleyVillage = config.get("Allow Villages", "OriginValley", false).getBoolean(false); outbackVillage = config.get("Allow Villages", "Outback", true).getBoolean(false); overgrownGreensVillage = config.get("Allow Villages", "OvergrownGreens", true).getBoolean(false); + pastureVillage = config.get("Allow Villages", "Pasture", false).getBoolean(false); + polarVillage = config.get("Allow Villages", "Polar", false).getBoolean(false); prairieVillage = config.get("Allow Villages", "Prairie", true).getBoolean(false); + quagmireVillage = config.get("Allow Villages", "Quagmire", false).getBoolean(false); + rainforestVillage = config.get("Allow Villages", "Rainforest", false).getBoolean(false); + redwoodForestVillage = config.get("Allow Villages", "RedwoodForest", false).getBoolean(false); + //sacredSpringsVillage = config.get("Allow Villages", "SacredSprings", false).getBoolean(false); savannaVillage = config.get("Allow Villages", "Savanna", true).getBoolean(false); scrublandVillage = config.get("Allow Villages", "Scrubland", true).getBoolean(false); + seasonalForestVillage = config.get("Allow Villages", "SeasonalForest", false).getBoolean(false); + shieldVillage = config.get("Allow Villages", "Shield", false).getBoolean(false); shrublandVillage = config.get("Allow Villages", "Shrubland", true).getBoolean(false); + //silkgladesVillage = config.get("Allow Villages", "Silkgladess", false).getBoolean(false); + sludgepitVillage = config.get("Allow Villages", "Sludgepit", false).getBoolean(false); spruceWoodsVillage = config.get("Allow Villages", "SpruceWoods", true).getBoolean(false); steppeVillage = config.get("Allow Villages", "Steppe", true).getBoolean(false); + temperateRainforestVillage = config.get("Allow Villages", "TemperateRainforest", false).getBoolean(false); + thicketVillage = config.get("Allow Villages", "Thicket", false).getBoolean(false); timberVillage = config.get("Allow Villages", "Timber", true).getBoolean(false); tropicalRainforestVillage = config.get("Allow Villages", "TropicalRainforest", true).getBoolean(false); + tropicsVillage = config.get("Allow Villages", "Tropics", false).getBoolean(false); tundraVillage = config.get("Allow Villages", "Tundra", true).getBoolean(false); + volcanoVillage = config.get("Allow Villages", "Volcano", false).getBoolean(false); + //wastelandVillage = config.get("Allow Villages", "Wasteland", false).getBoolean(false); wetlandVillage = config.get("Allow Villages", "Wetland", true).getBoolean(false); woodlandVillage = config.get("Allow Villages", "Woodland", true).getBoolean(false); // Vanilla biomes desertVillage = config.get("Allow Villages", "Desert", true).getBoolean(true); - forestVillage = config.get("Allow Villages", "Forest", true).getBoolean(true); + extremeHillsVillage = config.get("Allow Villages", "ExtremeHills", false).getBoolean(false); + forestVillage = config.get("Allow Villages", "Forest", false).getBoolean(false); + jungleVillage = config.get("Allow Villages", "Jungle", false).getBoolean(false); plainsVillage = config.get("Allow Villages", "Plains", true).getBoolean(true); + swamplandVillage = config.get("Allow Villages", "Swampland", false).getBoolean(false); + taigaVillage = config.get("Allow Villages", "Taiga", false).getBoolean(false); FMLCommonHandler.instance().getFMLLogger().log(Level.INFO, "[BiomesOPlenty] Generated Terrain Gen Config!"); } diff --git a/common/biomesoplenty/world/layer/BiomeLayerBiomes.java b/common/biomesoplenty/world/layer/BiomeLayerBiomes.java index 941cecedd..d6765efa4 100644 --- a/common/biomesoplenty/world/layer/BiomeLayerBiomes.java +++ b/common/biomesoplenty/world/layer/BiomeLayerBiomes.java @@ -30,15 +30,24 @@ public class BiomeLayerBiomes extends BiomeLayer oceanBiomes.add(BiomeGenBase.ocean); if (Biomes.oceanAbyss.isPresent()) { - oceanBiomes.add(Biomes.oceanAbyss.get()); + if (BOPConfigurationBiomeGen.oceanicAbyssGen) + { + oceanBiomes.add(Biomes.oceanAbyss.get()); + } } if (Biomes.oceanCoral.isPresent()) { - oceanBiomes.add(Biomes.oceanCoral.get()); + if (BOPConfigurationBiomeGen.coralReefGen) + { + oceanBiomes.add(Biomes.oceanCoral.get()); + } } if (Biomes.oceanKelp.isPresent()) { - oceanBiomes.add(Biomes.oceanKelp.get()); + if (BOPConfigurationBiomeGen.kelpForestGen) + { + oceanBiomes.add(Biomes.oceanKelp.get()); + } } //NETHER BIOMES @@ -48,28 +57,28 @@ public class BiomeLayerBiomes extends BiomeLayer } if (Biomes.netherGarden.isPresent()) { - if (BOPConfigurationBiomeGen.undergardenGen == true) + if (BOPConfigurationBiomeGen.undergardenGen) { netherBiomes.add(Biomes.netherGarden.get()); } } if (Biomes.netherDesert.isPresent()) { - if (BOPConfigurationBiomeGen.corruptedSandsGen == true) + if (BOPConfigurationBiomeGen.corruptedSandsGen) { netherBiomes.add(Biomes.netherDesert.get()); } } if (Biomes.netherLava.isPresent()) { - if (BOPConfigurationBiomeGen.phantasmagoricInfernoGen == true) + if (BOPConfigurationBiomeGen.phantasmagoricInfernoGen) { netherBiomes.add(Biomes.netherLava.get()); } } if (Biomes.netherBone.isPresent()) { - if (BOPConfigurationBiomeGen.boneyardGen == true) + if (BOPConfigurationBiomeGen.boneyardGen) { netherBiomes.add(Biomes.netherBone.get()); } diff --git a/common/biomesoplenty/world/layer/BiomeLayerShore.java b/common/biomesoplenty/world/layer/BiomeLayerShore.java index ca28c61dc..cdfe298ba 100644 --- a/common/biomesoplenty/world/layer/BiomeLayerShore.java +++ b/common/biomesoplenty/world/layer/BiomeLayerShore.java @@ -21,14 +21,14 @@ public class BiomeLayerShore extends BiomeLayer beachBiomes.add(BiomeGenBase.beach); if (Biomes.beachGravel.isPresent()) { - if (BOPConfigurationBiomeGen.gravelBeachGen == true) + if (BOPConfigurationBiomeGen.gravelBeachGen) { beachBiomes.add(Biomes.beachGravel.get()); } } if (Biomes.beachOvergrown.isPresent()) { - if (BOPConfigurationBiomeGen.overgrownBeachGen == true) + if (BOPConfigurationBiomeGen.overgrownBeachGen) { beachBiomes.add(Biomes.beachOvergrown.get()); } @@ -38,15 +38,24 @@ public class BiomeLayerShore extends BiomeLayer oceanBiomes.add(BiomeGenBase.ocean); if (Biomes.oceanAbyss.isPresent()) { - oceanBiomes.add(Biomes.oceanAbyss.get()); + if (BOPConfigurationBiomeGen.oceanicAbyssGen) + { + oceanBiomes.add(Biomes.oceanAbyss.get()); + } } if (Biomes.oceanCoral.isPresent()) { - oceanBiomes.add(Biomes.oceanCoral.get()); + if (BOPConfigurationBiomeGen.coralReefGen) + { + oceanBiomes.add(Biomes.oceanCoral.get()); + } } if (Biomes.oceanKelp.isPresent()) { - oceanBiomes.add(Biomes.oceanKelp.get()); + if (BOPConfigurationBiomeGen.kelpForestGen) + { + oceanBiomes.add(Biomes.oceanKelp.get()); + } } }