diff --git a/src/minecraft/biomesoplenty/BiomesOPlenty.java b/src/minecraft/biomesoplenty/BiomesOPlenty.java index f418746e7..10df95167 100644 --- a/src/minecraft/biomesoplenty/BiomesOPlenty.java +++ b/src/minecraft/biomesoplenty/BiomesOPlenty.java @@ -1,7 +1,5 @@ package biomesoplenty; -import java.io.File; - import net.minecraft.creativetab.CreativeTabs; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.MinecraftForge; @@ -54,13 +52,13 @@ public class BiomesOPlenty public static CommonProxy proxy; public static CreativeTabs tabBiomesOPlenty; - public static String mainBOPConfig; + public static String configPath; @EventHandler public void preInit(FMLPreInitializationEvent event) { - mainBOPConfig = event.getModConfigurationDirectory() + "/biomesoplenty/" + "main.cfg"; - BOPConfiguration.init(new File(mainBOPConfig)); + configPath = event.getModConfigurationDirectory() + "/biomesoplenty/"; + BOPConfiguration.init(configPath); Version.check(); @@ -81,7 +79,7 @@ public class BiomesOPlenty } // Achievement declaration - if (BOPConfiguration.achievements) + if (BOPConfiguration.Misc.achievements) { AchievementHelper.init(); } @@ -111,13 +109,13 @@ public class BiomesOPlenty proxy.registerRenderers(); - if (BOPConfiguration.netherOverride) + if (BOPConfiguration.TerrainGen.netherOverride) { DimensionManager.unregisterProviderType(-1); DimensionManager.registerProviderType(-1, WorldProviderBOPhell.class, true); } - DimensionManager.registerProviderType(BOPConfiguration.promisedLandDimID, WorldProviderPromised.class, false); - DimensionManager.registerDimension(BOPConfiguration.promisedLandDimID, BOPConfiguration.promisedLandDimID); + DimensionManager.registerProviderType(BOPConfiguration.IDs.promisedLandDimID, WorldProviderPromised.class, false); + DimensionManager.registerDimension(BOPConfiguration.IDs.promisedLandDimID, BOPConfiguration.IDs.promisedLandDimID); BOPCrossIntegration.init(); } diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenBadlands.java b/src/minecraft/biomesoplenty/biomes/BiomeGenBadlands.java index 42daf138d..feadfc33c 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenBadlands.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenBadlands.java @@ -58,7 +58,7 @@ public class BiomeGenBadlands extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.skyColors) + if (BOPConfiguration.Misc.skyColors) return 9814727; else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenBayou.java b/src/minecraft/biomesoplenty/biomes/BiomeGenBayou.java index c3c9f29dd..be8e976e3 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenBayou.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenBayou.java @@ -108,7 +108,7 @@ public class BiomeGenBayou extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.skyColors) + if (BOPConfiguration.Misc.skyColors) return 11322556; else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenConiferousForest.java b/src/minecraft/biomesoplenty/biomes/BiomeGenConiferousForest.java index 2e6eec6c8..65411ce10 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenConiferousForest.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenConiferousForest.java @@ -43,7 +43,7 @@ public class BiomeGenConiferousForest extends BiomeGenBase @Override public WorldGenerator getRandomWorldGenForTrees(Random par1Random) { - if (BOPConfiguration.realisticTrees) + if (BOPConfiguration.Main.realisticTrees) { return par1Random.nextInt(5) == 0 ? new WorldGenFir1() : (par1Random.nextInt(3) == 0 ? new WorldGenFir2() : new WorldGenFir3()); } diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenCrag.java b/src/minecraft/biomesoplenty/biomes/BiomeGenCrag.java index 9967aaa62..be929cfd4 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenCrag.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenCrag.java @@ -52,7 +52,7 @@ public class BiomeGenCrag extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.skyColors) + if (BOPConfiguration.Misc.skyColors) return 4944498; else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenDeadForest.java b/src/minecraft/biomesoplenty/biomes/BiomeGenDeadForest.java index fa214190d..28ddd6976 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenDeadForest.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenDeadForest.java @@ -68,7 +68,7 @@ public class BiomeGenDeadForest extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.skyColors) + if (BOPConfiguration.Misc.skyColors) return 9873591; else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenDeadForestSnow.java b/src/minecraft/biomesoplenty/biomes/BiomeGenDeadForestSnow.java index 0d043ca2f..6c077841c 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenDeadForestSnow.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenDeadForestSnow.java @@ -90,7 +90,7 @@ public class BiomeGenDeadForestSnow extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.skyColors) + if (BOPConfiguration.Misc.skyColors) return 9873591; else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenDeadSwamp.java b/src/minecraft/biomesoplenty/biomes/BiomeGenDeadSwamp.java index 4daf0a6ab..9ee6ae41e 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenDeadSwamp.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenDeadSwamp.java @@ -95,7 +95,7 @@ public class BiomeGenDeadSwamp extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.skyColors) + if (BOPConfiguration.Misc.skyColors) return 6451816; else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenDeadlands.java b/src/minecraft/biomesoplenty/biomes/BiomeGenDeadlands.java index 1d24ca159..038e585d8 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenDeadlands.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenDeadlands.java @@ -78,7 +78,7 @@ public class BiomeGenDeadlands extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.skyColors) + if (BOPConfiguration.Misc.skyColors) return 4464929; else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenDesertNew.java b/src/minecraft/biomesoplenty/biomes/BiomeGenDesertNew.java index 087e0398f..bbce35a69 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenDesertNew.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenDesertNew.java @@ -67,7 +67,7 @@ public class BiomeGenDesertNew extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.skyColors) + if (BOPConfiguration.Misc.skyColors) return 13877903; else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenFrostForest.java b/src/minecraft/biomesoplenty/biomes/BiomeGenFrostForest.java index 8748f0fb1..ff093ac0b 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenFrostForest.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenFrostForest.java @@ -79,7 +79,7 @@ public class BiomeGenFrostForest extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.skyColors) + if (BOPConfiguration.Misc.skyColors) return 13557994; else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenFungiForest.java b/src/minecraft/biomesoplenty/biomes/BiomeGenFungiForest.java index bca27b4a4..d585a418b 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenFungiForest.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenFungiForest.java @@ -109,7 +109,7 @@ public class BiomeGenFungiForest extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.skyColors) + if (BOPConfiguration.Misc.skyColors) return 5888980; else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenIcyHills.java b/src/minecraft/biomesoplenty/biomes/BiomeGenIcyHills.java index d426f9266..675fde74c 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenIcyHills.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenIcyHills.java @@ -67,7 +67,7 @@ public class BiomeGenIcyHills extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.skyColors) + if (BOPConfiguration.Misc.skyColors) return 16777215; else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenJadeCliffs.java b/src/minecraft/biomesoplenty/biomes/BiomeGenJadeCliffs.java index 2481fb560..bee03e220 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenJadeCliffs.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenJadeCliffs.java @@ -60,7 +60,7 @@ public class BiomeGenJadeCliffs extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.skyColors) + if (BOPConfiguration.Misc.skyColors) return 12045485; else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenJungleNew.java b/src/minecraft/biomesoplenty/biomes/BiomeGenJungleNew.java index de18a6c48..995e5318f 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenJungleNew.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenJungleNew.java @@ -115,7 +115,7 @@ public class BiomeGenJungleNew extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.skyColors) + if (BOPConfiguration.Misc.skyColors) return 9225359; else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenMesa.java b/src/minecraft/biomesoplenty/biomes/BiomeGenMesa.java index bb934cb7d..c561f9cf0 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenMesa.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenMesa.java @@ -57,7 +57,7 @@ public class BiomeGenMesa extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.skyColors) + if (BOPConfiguration.Misc.skyColors) return 15898486; else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenMoor.java b/src/minecraft/biomesoplenty/biomes/BiomeGenMoor.java index f9a8bb119..b9d3f8d6e 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenMoor.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenMoor.java @@ -99,7 +99,7 @@ public class BiomeGenMoor extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.skyColors) + if (BOPConfiguration.Misc.skyColors) return 10536403; else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenMountain.java b/src/minecraft/biomesoplenty/biomes/BiomeGenMountain.java index ff46f75e6..859df1512 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenMountain.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenMountain.java @@ -31,7 +31,7 @@ public class BiomeGenMountain extends BiomeGenBase @Override public WorldGenerator getRandomWorldGenForTrees(Random par1Random) { - if (BOPConfiguration.realisticTrees) + if (BOPConfiguration.Main.realisticTrees) { return par1Random.nextInt(4) == 0 ? new WorldGenRealPineTree2() : (par1Random.nextInt(6) == 0 ? new WorldGenRealPineTree() : worldGeneratorTrees); } diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenMysticGrove.java b/src/minecraft/biomesoplenty/biomes/BiomeGenMysticGrove.java index 13c402a1e..c4ad31c65 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenMysticGrove.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenMysticGrove.java @@ -25,7 +25,7 @@ public class BiomeGenMysticGrove extends BiomeGenBase super(par1); theBiomeDecorator = new BiomeDecoratorBOP(this); customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator; - if (BOPConfiguration.realisticTrees) + if (BOPConfiguration.Main.realisticTrees) { customBiomeDecorator.treesPerChunk = 1; } @@ -61,7 +61,7 @@ public class BiomeGenMysticGrove extends BiomeGenBase @Override public WorldGenerator getRandomWorldGenForTrees(Random par1Random) { - if (BOPConfiguration.realisticTrees) + if (BOPConfiguration.Main.realisticTrees) { return new WorldGenRealMagic(); } @@ -102,7 +102,7 @@ public class BiomeGenMysticGrove extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.skyColors) + if (BOPConfiguration.Misc.skyColors) return 16751558; else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenOminousWoods.java b/src/minecraft/biomesoplenty/biomes/BiomeGenOminousWoods.java index 56b517fda..c0ac56693 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenOminousWoods.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenOminousWoods.java @@ -90,7 +90,7 @@ public class BiomeGenOminousWoods extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.skyColors) + if (BOPConfiguration.Misc.skyColors) return 5069168; else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenOminousWoodsThick.java b/src/minecraft/biomesoplenty/biomes/BiomeGenOminousWoodsThick.java index f882f4d13..50574836d 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenOminousWoodsThick.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenOminousWoodsThick.java @@ -92,7 +92,7 @@ public class BiomeGenOminousWoodsThick extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.skyColors) + if (BOPConfiguration.Misc.skyColors) return 5069168; else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenOriginValley.java b/src/minecraft/biomesoplenty/biomes/BiomeGenOriginValley.java index 0511f420a..fcd06a32f 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenOriginValley.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenOriginValley.java @@ -60,7 +60,7 @@ public class BiomeGenOriginValley extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.skyColors) + if (BOPConfiguration.Misc.skyColors) return 8703228; else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandForest.java b/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandForest.java index 8b728ec3b..3a34857c5 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandForest.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandForest.java @@ -110,8 +110,8 @@ public class BiomeGenPromisedLandForest extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.skyColors) - return BOPConfiguration.promisedLandSkyColor; + if (BOPConfiguration.Misc.skyColors) + return BOPConfiguration.Misc.promisedLandSkyColor; else { par1 /= 3.0F; diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandPlains.java b/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandPlains.java index 8c3c5acd9..30bc6df3d 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandPlains.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandPlains.java @@ -104,8 +104,8 @@ public class BiomeGenPromisedLandPlains extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.skyColors) - return BOPConfiguration.promisedLandSkyColor; + if (BOPConfiguration.Misc.skyColors) + return BOPConfiguration.Misc.promisedLandSkyColor; else { par1 /= 3.0F; diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandSwamp.java b/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandSwamp.java index 9f495bade..7130cf912 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandSwamp.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandSwamp.java @@ -109,8 +109,8 @@ public class BiomeGenPromisedLandSwamp extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.skyColors) - return BOPConfiguration.promisedLandSkyColor; + if (BOPConfiguration.Misc.skyColors) + return BOPConfiguration.Misc.promisedLandSkyColor; else { par1 /= 3.0F; diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenQuagmire.java b/src/minecraft/biomesoplenty/biomes/BiomeGenQuagmire.java index 8f7570392..0e557e476 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenQuagmire.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenQuagmire.java @@ -86,7 +86,7 @@ public class BiomeGenQuagmire extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.skyColors) + if (BOPConfiguration.Misc.skyColors) return 12436670; else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenRedwoodForest.java b/src/minecraft/biomesoplenty/biomes/BiomeGenRedwoodForest.java index 2d88a4988..8824660e9 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenRedwoodForest.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenRedwoodForest.java @@ -36,7 +36,7 @@ public class BiomeGenRedwoodForest extends BiomeGenBase @Override public WorldGenerator getRandomWorldGenForTrees(Random par1Random) { - if (BOPConfiguration.realisticTrees) + if (BOPConfiguration.Main.realisticTrees) { return par1Random.nextInt(4) == 0 ? new WorldGenRealRedwood() : (par1Random.nextInt(2) == 0 ? new WorldGenShrub(0,0) : new WorldGenRealRedwood2()); } diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenSacredSprings.java b/src/minecraft/biomesoplenty/biomes/BiomeGenSacredSprings.java index 681276759..ce9126800 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenSacredSprings.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenSacredSprings.java @@ -100,7 +100,7 @@ public class BiomeGenSacredSprings extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.skyColors) + if (BOPConfiguration.Misc.skyColors) return 1995007; else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenSludgepit.java b/src/minecraft/biomesoplenty/biomes/BiomeGenSludgepit.java index a7a28f093..ef83f81cf 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenSludgepit.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenSludgepit.java @@ -103,7 +103,7 @@ public class BiomeGenSludgepit extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.skyColors) + if (BOPConfiguration.Misc.skyColors) return 7039816; else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenSwampNew.java b/src/minecraft/biomesoplenty/biomes/BiomeGenSwampNew.java index 736cdcc97..29bd6295f 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenSwampNew.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenSwampNew.java @@ -108,7 +108,7 @@ public class BiomeGenSwampNew extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.skyColors) + if (BOPConfiguration.Misc.skyColors) return 4149332; else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenTropicalRainforest.java b/src/minecraft/biomesoplenty/biomes/BiomeGenTropicalRainforest.java index beca3ff3d..9ac2fe868 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenTropicalRainforest.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenTropicalRainforest.java @@ -95,7 +95,7 @@ public class BiomeGenTropicalRainforest extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.skyColors) + if (BOPConfiguration.Misc.skyColors) return 12971089; else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenTropics.java b/src/minecraft/biomesoplenty/biomes/BiomeGenTropics.java index 32e3a38ae..ff1df80b3 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenTropics.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenTropics.java @@ -72,7 +72,7 @@ public class BiomeGenTropics extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.skyColors) + if (BOPConfiguration.Misc.skyColors) return 3333631; else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenVolcano.java b/src/minecraft/biomesoplenty/biomes/BiomeGenVolcano.java index 35f7ffc66..f40cdfdf5 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenVolcano.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenVolcano.java @@ -43,7 +43,7 @@ public class BiomeGenVolcano extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.skyColors) + if (BOPConfiguration.Misc.skyColors) return 8026746; else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenWasteland.java b/src/minecraft/biomesoplenty/biomes/BiomeGenWasteland.java index 169abb438..318ee48b6 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenWasteland.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenWasteland.java @@ -63,7 +63,7 @@ public class BiomeGenWasteland extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.skyColors) + if (BOPConfiguration.Misc.skyColors) return 10465942; else { diff --git a/src/minecraft/biomesoplenty/blocks/BlockPromisedPortal.java b/src/minecraft/biomesoplenty/blocks/BlockPromisedPortal.java index 95f27f472..f27327431 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockPromisedPortal.java +++ b/src/minecraft/biomesoplenty/blocks/BlockPromisedPortal.java @@ -77,9 +77,9 @@ public class BlockPromisedPortal extends Block if (par5Entity instanceof EntityPlayerMP) { EntityPlayerMP thePlayer = (EntityPlayerMP) par5Entity; - if (par5Entity.dimension != BOPConfiguration.promisedLandDimID) + if (par5Entity.dimension != BOPConfiguration.IDs.promisedLandDimID) { - thePlayer.mcServer.getConfigurationManager().transferPlayerToDimension(thePlayer, BOPConfiguration.promisedLandDimID, new TeleporterPromised(thePlayer.mcServer.worldServerForDimension(BOPConfiguration.promisedLandDimID))); + thePlayer.mcServer.getConfigurationManager().transferPlayerToDimension(thePlayer, BOPConfiguration.IDs.promisedLandDimID, new TeleporterPromised(thePlayer.mcServer.worldServerForDimension(BOPConfiguration.IDs.promisedLandDimID))); } else { diff --git a/src/minecraft/biomesoplenty/configuration/BOPBiomes.java b/src/minecraft/biomesoplenty/configuration/BOPBiomes.java index f5a80e871..9c1cf55f4 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPBiomes.java +++ b/src/minecraft/biomesoplenty/configuration/BOPBiomes.java @@ -27,7 +27,8 @@ public class BOPBiomes { public static int getLastBiomeID() { int x; - for(x = 255; x >= 0; x--) { + for(x = 255; x >= 0; x--) + { if (BiomeGenBase.biomeList[x] == null) { break; @@ -64,121 +65,121 @@ public class BOPBiomes { private static void initializeBiomes() { - Biomes.alps = Optional.of((new BiomeGenAlps(BOPConfiguration.alpsID)).setColor(353825).setBiomeName("Alps").func_76733_a(5159473).setTemperatureRainfall(0.0F, 0.0F).setMinMaxHeight(2.0F, 3.0F)); - Biomes.alpsForest = Optional.of((new BiomeGenAlpsForest(BOPConfiguration.alpsForestID)).setColor(353825).setBiomeName("Alps Mountainside").func_76733_a(5159473).setTemperatureRainfall(0.0F, 0.0F).setMinMaxHeight(1.0F, 2.0F)); - Biomes.alpsBase = Optional.of((new BiomeGenAlpsBase(BOPConfiguration.alpsBaseID)).setColor(353825).setBiomeName("Alps Forest").func_76733_a(5159473).setTemperatureRainfall(0.5F, 0.4F).setMinMaxHeight(0.2F, 0.5F)); - Biomes.arctic = Optional.of((new BiomeGenArctic(BOPConfiguration.arcticID)).setColor(14090235).setBiomeName("Arctic").setEnableSnow().setTemperatureRainfall(0.05F, 0.0F).setMinMaxHeight(0.2F, 0.2F)); - Biomes.badlands = Optional.of((new BiomeGenBadlands(BOPConfiguration.badlandsID)).setColor(16421912).setBiomeName("Badlands").setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.3F, 0.9F)); - Biomes.bambooForest = Optional.of((new BiomeGenBambooForest(BOPConfiguration.bambooForestID)).setColor(112).setBiomeName("Bamboo Forest").setMinMaxHeight(0.2F, 0.4F).setTemperatureRainfall(1.2F, 0.9F)); - Biomes.bayou = Optional.of((new BiomeGenBayou(BOPConfiguration.bayouID)).setColor(522674).setBiomeName("Bayou").func_76733_a(9154376).setMinMaxHeight(0.1F, 0.3F).setTemperatureRainfall(0.5F, 0.9F)); + Biomes.alps = Optional.of((new BiomeGenAlps(BOPConfiguration.IDs.alpsID)).setColor(353825).setBiomeName("Alps").func_76733_a(5159473).setTemperatureRainfall(0.0F, 0.0F).setMinMaxHeight(2.0F, 3.0F)); + Biomes.alpsForest = Optional.of((new BiomeGenAlpsForest(BOPConfiguration.IDs.alpsForestID)).setColor(353825).setBiomeName("Alps Mountainside").func_76733_a(5159473).setTemperatureRainfall(0.0F, 0.0F).setMinMaxHeight(1.0F, 2.0F)); + Biomes.alpsBase = Optional.of((new BiomeGenAlpsBase(BOPConfiguration.IDs.alpsBaseID)).setColor(353825).setBiomeName("Alps Forest").func_76733_a(5159473).setTemperatureRainfall(0.5F, 0.4F).setMinMaxHeight(0.2F, 0.5F)); + Biomes.arctic = Optional.of((new BiomeGenArctic(BOPConfiguration.IDs.arcticID)).setColor(14090235).setBiomeName("Arctic").setEnableSnow().setTemperatureRainfall(0.05F, 0.0F).setMinMaxHeight(0.2F, 0.2F)); + Biomes.badlands = Optional.of((new BiomeGenBadlands(BOPConfiguration.IDs.badlandsID)).setColor(16421912).setBiomeName("Badlands").setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.3F, 0.9F)); + Biomes.bambooForest = Optional.of((new BiomeGenBambooForest(BOPConfiguration.IDs.bambooForestID)).setColor(112).setBiomeName("Bamboo Forest").setMinMaxHeight(0.2F, 0.4F).setTemperatureRainfall(1.2F, 0.9F)); + Biomes.bayou = Optional.of((new BiomeGenBayou(BOPConfiguration.IDs.bayouID)).setColor(522674).setBiomeName("Bayou").func_76733_a(9154376).setMinMaxHeight(0.1F, 0.3F).setTemperatureRainfall(0.5F, 0.9F)); - Biomes.beachGravel = Optional.of((new BiomeGenBeachGravel(BOPConfiguration.beachGravelID)).setColor(16440917).setBiomeName("Gravel Beach").setTemperatureRainfall(0.2F, 0.8F).setMinMaxHeight(0.0F, 0.1F)); - Biomes.beachOvergrown = Optional.of((new BiomeGenBeachOvergrown(BOPConfiguration.beachOvergrownID)).setColor(16440917).setBiomeName("Overgrown Beach").setTemperatureRainfall(0.8F, 0.5F).setMinMaxHeight(0.0F, 0.1F)); + Biomes.beachGravel = Optional.of((new BiomeGenBeachGravel(BOPConfiguration.IDs.beachGravelID)).setColor(16440917).setBiomeName("Gravel Beach").setTemperatureRainfall(0.2F, 0.8F).setMinMaxHeight(0.0F, 0.1F)); + Biomes.beachOvergrown = Optional.of((new BiomeGenBeachOvergrown(BOPConfiguration.IDs.beachOvergrownID)).setColor(16440917).setBiomeName("Overgrown Beach").setTemperatureRainfall(0.8F, 0.5F).setMinMaxHeight(0.0F, 0.1F)); - Biomes.birchForest = Optional.of((new BiomeGenBirchForest(BOPConfiguration.birchForestID)).setColor(353825).setBiomeName("Birch Forest").func_76733_a(5159473).setTemperatureRainfall(0.4F, 0.3F)); - Biomes.bog = Optional.of((new BiomeGenBog(BOPConfiguration.bogID)).setColor(522674).setBiomeName("Bog").func_76733_a(9154376).setMinMaxHeight(0.2F, 0.4F).setTemperatureRainfall(0.8F, 0.9F)); - Biomes.borealForest = Optional.of((new BiomeGenBorealForest(BOPConfiguration.borealForestID)).setColor(353825).setBiomeName("Boreal Forest").func_76733_a(5159473).setMinMaxHeight(0.2F, 1.0F).setTemperatureRainfall(0.6F, 0.7F)); - Biomes.brushland = Optional.of((new BiomeGenBrushland(BOPConfiguration.brushlandID)).setColor(16421912).setBiomeName("Brushland").setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.3F, 0.3F)); - Biomes.canyon = Optional.of((new BiomeGenCanyon(BOPConfiguration.canyonID)).setColor(9286496).setBiomeName("Canyon").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(1.5F, 2.0F)); - Biomes.canyonRavine = Optional.of((new BiomeGenCanyonRavine(BOPConfiguration.canyonRavineID)).setColor(9286496).setBiomeName("Canyon Ravine").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.3F, 0.4F)); - Biomes.chaparral = Optional.of((new BiomeGenChaparral(BOPConfiguration.chaparralID)).setColor(9286496).setBiomeName("Chaparral").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.3F, 0.6F)); - Biomes.cherryBlossomGrove = Optional.of((new BiomeGenCherryBlossomGrove(BOPConfiguration.cherryBlossomGroveID)).setColor(9286496).setBiomeName("Cherry Blossom Grove").setMinMaxHeight(0.3F, 0.4F).setTemperatureRainfall(0.7F, 0.8F)); - Biomes.coniferousForest = Optional.of((new BiomeGenConiferousForest(BOPConfiguration.coniferousForestID)).setColor(747097).setBiomeName("Coniferous Forest").func_76733_a(5159473).setTemperatureRainfall(0.5F, 0.4F).setMinMaxHeight(0.2F, 0.8F)); - Biomes.coniferousForestSnow = Optional.of((new BiomeGenConiferousForestSnow(BOPConfiguration.coniferousForestSnowID)).setColor(14090235).setBiomeName("Snowy Coniferous Forest").setTemperatureRainfall(0.0F, 0.0F).setMinMaxHeight(0.2F, 0.7F)); - Biomes.crag = Optional.of((new BiomeGenCrag(BOPConfiguration.cragID)).setColor(9286496).setBiomeName("Crag").setMinMaxHeight(2.0F, 3.0F).setTemperatureRainfall(0.4F, 0.2F)); - Biomes.deadForest = Optional.of((new BiomeGenDeadForest(BOPConfiguration.deadForestID)).setColor(522674).setBiomeName("Dead Forest").func_76733_a(9154376).setMinMaxHeight(0.2F, 0.7F).setTemperatureRainfall(1.2F, 0.1F)); - Biomes.deadForestSnow = Optional.of((new BiomeGenDeadForestSnow(BOPConfiguration.deadForestSnowID)).setColor(522674).setBiomeName("Snowy Dead Forest").func_76733_a(9154376).setEnableSnow().setTemperatureRainfall(0.05F, 0.8F).setMinMaxHeight(0.2F, 0.7F)); - Biomes.deadSwamp = Optional.of((new BiomeGenDeadSwamp(BOPConfiguration.deadSwampID)).setColor(522674).setBiomeName("Dead Swamp").func_76733_a(9154376).setMinMaxHeight(0.1F, 0.2F).setTemperatureRainfall(0.8F, 0.9F)); - Biomes.deadlands = Optional.of((new BiomeGenDeadlands(BOPConfiguration.deadlandsID)).setColor(522674).setBiomeName("Deadlands").setDisableRain().func_76733_a(9154376).setMinMaxHeight(0.1F, 0.5F).setTemperatureRainfall(2.0F, 0.0F)); - Biomes.deciduousForest = Optional.of((new BiomeGenDeciduousForest(BOPConfiguration.deciduousForestID)).setColor(353825).setBiomeName("Deciduous Forest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F)); - Biomes.dunes = Optional.of((new BiomeGenDunes(BOPConfiguration.dunesID)).setColor(13786898).setBiomeName("Dunes").setDisableRain().setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.5F, 1.3F)); - Biomes.fen = Optional.of((new BiomeGenFen(BOPConfiguration.fenID)).setColor(9286496).setBiomeName("Fen").setTemperatureRainfall(0.4F, 0.0F).setMinMaxHeight(0.2F, 0.4F)); - Biomes.field = Optional.of((new BiomeGenField(BOPConfiguration.fieldID)).setColor(9286496).setBiomeName("Field").setTemperatureRainfall(0.6F, 0.7F).setMinMaxHeight(0.3F, 0.3F)); - Biomes.fieldForest = Optional.of((new BiomeGenFieldForest(BOPConfiguration.fieldForestID)).setColor(9286496).setBiomeName("Forested Field").setTemperatureRainfall(0.6F, 0.7F).setMinMaxHeight(0.3F, 0.3F)); - Biomes.frostForest = Optional.of((new BiomeGenFrostForest(BOPConfiguration.frostForestID)).setColor(14090235).setBiomeName("Frost Forest").setEnableSnow().setTemperatureRainfall(0.0F, 0.0F).setMinMaxHeight(0.3F, 0.4F)); - Biomes.fungiForest = Optional.of((new BiomeGenFungiForest(BOPConfiguration.fungiForestID)).setColor(747097).setBiomeName("Fungi Forest").func_76733_a(5159473).setTemperatureRainfall(0.9F, 1.0F).setMinMaxHeight(0.2F, 0.5F)); - Biomes.garden = Optional.of((new BiomeGenGarden(BOPConfiguration.gardenID)).setColor(9286496).setBiomeName("Garden").setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(0.3F, 0.4F)); - Biomes.glacier = Optional.of((new BiomeGenGlacier(BOPConfiguration.glacierID)).setColor(6316128).setBiomeName("Glacier").setEnableSnow().setMinMaxHeight(0.4F, 1.0F).setTemperatureRainfall(0.0F, 0.0F)); - Biomes.grassland = Optional.of((new BiomeGenGrassland(BOPConfiguration.grasslandID)).setColor(9286496).setBiomeName("Grassland").setTemperatureRainfall(0.7F, 0.7F).setMinMaxHeight(0.3F, 0.3F)); - Biomes.grove = Optional.of((new BiomeGenGrove(BOPConfiguration.groveID)).setColor(9286496).setBiomeName("Grove").setTemperatureRainfall(0.4F, 0.8F).setMinMaxHeight(0.3F, 0.4F)); - Biomes.heathland = Optional.of((new BiomeGenHeathland(BOPConfiguration.heathlandID)).setColor(353825).setBiomeName("Heathland").func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.1F).setMinMaxHeight(0.3F, 0.4F)); - Biomes.highland = Optional.of((new BiomeGenHighland(BOPConfiguration.highlandID)).setColor(6316128).setBiomeName("Highland").setMinMaxHeight(0.9F, 1.9F).setTemperatureRainfall(0.5F, 0.5F)); - Biomes.hotSprings = Optional.of((new BiomeGenHotSprings(BOPConfiguration.hotSpringsID)).setColor(10486015).setBiomeName("Hot Springs").setMinMaxHeight(0.2F, 0.5F).setTemperatureRainfall(0.5F, 0.7F)); - Biomes.icyHills = Optional.of((new BiomeGenIcyHills(BOPConfiguration.icyHillsID)).setColor(14090235).setBiomeName("Icy Hills").setEnableSnow().setTemperatureRainfall(0.0F, 0.0F).setMinMaxHeight(0.3F, 0.8F)); - Biomes.jadeCliffs = Optional.of((new BiomeGenJadeCliffs(BOPConfiguration.jadeCliffsID)).setColor(14090235).setBiomeName("Jade Cliffs").setTemperatureRainfall(0.5F, 0.1F).setMinMaxHeight(0.5F, 1.5F)); - Biomes.lushDesert = Optional.of((new BiomeGenLushDesert(BOPConfiguration.lushDesertID)).setColor(16421912).setBiomeName("Lush Desert").setTemperatureRainfall(0.8F, 0.2F).setMinMaxHeight(0.2F, 0.9F)); - Biomes.lushSwamp = Optional.of((new BiomeGenLushSwamp(BOPConfiguration.lushSwampID)).setColor(522674).setBiomeName("Lush Swamp").func_76733_a(9154376).setMinMaxHeight(0.2F, 0.3F).setTemperatureRainfall(0.7F, 1.0F)); - Biomes.mangrove = Optional.of((new BiomeGenMangrove(BOPConfiguration.mangroveID)).setColor(16440917).setBiomeName("Mangrove").setMinMaxHeight(0.1F, 0.3F).setTemperatureRainfall(0.8F, 0.9F)); - Biomes.mapleWoods = Optional.of((new BiomeGenMapleWoods(BOPConfiguration.mapleWoodsID)).setColor(747097).setBiomeName("Maple Woods").func_76733_a(5159473).setTemperatureRainfall(0.2F, 0.8F).setMinMaxHeight(0.3F, 0.6F)); - Biomes.marsh = Optional.of((new BiomeGenMarsh(BOPConfiguration.marshID)).setColor(10486015).setBiomeName("Marsh").setMinMaxHeight(-0.5F, 0.0F).setTemperatureRainfall(0.5F, 0.9F)); - Biomes.meadow = Optional.of((new BiomeGenMeadow(BOPConfiguration.meadowID)).setColor(9286496).setBiomeName("Meadow").setTemperatureRainfall(0.7F, 0.7F)); - Biomes.meadowForest = Optional.of((new BiomeGenMeadowForest(BOPConfiguration.meadowForestID)).setColor(9286496).setBiomeName("Meadow Forest").setTemperatureRainfall(0.7F, 0.7F)); - Biomes.mesa = Optional.of((new BiomeGenMesa(BOPConfiguration.mesaID)).setColor(16421912).setBiomeName("Mesa").setDisableRain().setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.4F, 2.0F)); - Biomes.moor = Optional.of((new BiomeGenMoor(BOPConfiguration.moorID)).setColor(16421912).setBiomeName("Moor").setTemperatureRainfall(0.5F, 1.0F).setMinMaxHeight(0.7F, 0.8F)); - Biomes.mountain = Optional.of((new BiomeGenMountain(BOPConfiguration.mountainID)).setColor(14090235).setBiomeName("Mountain").setTemperatureRainfall(0.5F, 0.1F).setMinMaxHeight(1.2F, 1.2F).setMinMaxHeight(0.2F, 0.5F)); - Biomes.mysticGrove = Optional.of((new BiomeGenMysticGrove(BOPConfiguration.mysticGroveID)).setColor(353825).setBiomeName("Mystic Grove").setDisableRain().func_76733_a(5159473).setTemperatureRainfall(0.9F, 1.0F)); + Biomes.birchForest = Optional.of((new BiomeGenBirchForest(BOPConfiguration.IDs.birchForestID)).setColor(353825).setBiomeName("Birch Forest").func_76733_a(5159473).setTemperatureRainfall(0.4F, 0.3F)); + Biomes.bog = Optional.of((new BiomeGenBog(BOPConfiguration.IDs.bogID)).setColor(522674).setBiomeName("Bog").func_76733_a(9154376).setMinMaxHeight(0.2F, 0.4F).setTemperatureRainfall(0.8F, 0.9F)); + Biomes.borealForest = Optional.of((new BiomeGenBorealForest(BOPConfiguration.IDs.borealForestID)).setColor(353825).setBiomeName("Boreal Forest").func_76733_a(5159473).setMinMaxHeight(0.2F, 1.0F).setTemperatureRainfall(0.6F, 0.7F)); + Biomes.brushland = Optional.of((new BiomeGenBrushland(BOPConfiguration.IDs.brushlandID)).setColor(16421912).setBiomeName("Brushland").setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.3F, 0.3F)); + Biomes.canyon = Optional.of((new BiomeGenCanyon(BOPConfiguration.IDs.canyonID)).setColor(9286496).setBiomeName("Canyon").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(1.5F, 2.0F)); + Biomes.canyonRavine = Optional.of((new BiomeGenCanyonRavine(BOPConfiguration.IDs.canyonRavineID)).setColor(9286496).setBiomeName("Canyon Ravine").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.3F, 0.4F)); + Biomes.chaparral = Optional.of((new BiomeGenChaparral(BOPConfiguration.IDs.chaparralID)).setColor(9286496).setBiomeName("Chaparral").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.3F, 0.6F)); + Biomes.cherryBlossomGrove = Optional.of((new BiomeGenCherryBlossomGrove(BOPConfiguration.IDs.cherryBlossomGroveID)).setColor(9286496).setBiomeName("Cherry Blossom Grove").setMinMaxHeight(0.3F, 0.4F).setTemperatureRainfall(0.7F, 0.8F)); + Biomes.coniferousForest = Optional.of((new BiomeGenConiferousForest(BOPConfiguration.IDs.coniferousForestID)).setColor(747097).setBiomeName("Coniferous Forest").func_76733_a(5159473).setTemperatureRainfall(0.5F, 0.4F).setMinMaxHeight(0.2F, 0.8F)); + Biomes.coniferousForestSnow = Optional.of((new BiomeGenConiferousForestSnow(BOPConfiguration.IDs.coniferousForestSnowID)).setColor(14090235).setBiomeName("Snowy Coniferous Forest").setTemperatureRainfall(0.0F, 0.0F).setMinMaxHeight(0.2F, 0.7F)); + Biomes.crag = Optional.of((new BiomeGenCrag(BOPConfiguration.IDs.cragID)).setColor(9286496).setBiomeName("Crag").setMinMaxHeight(2.0F, 3.0F).setTemperatureRainfall(0.4F, 0.2F)); + Biomes.deadForest = Optional.of((new BiomeGenDeadForest(BOPConfiguration.IDs.deadForestID)).setColor(522674).setBiomeName("Dead Forest").func_76733_a(9154376).setMinMaxHeight(0.2F, 0.7F).setTemperatureRainfall(1.2F, 0.1F)); + Biomes.deadForestSnow = Optional.of((new BiomeGenDeadForestSnow(BOPConfiguration.IDs.deadForestSnowID)).setColor(522674).setBiomeName("Snowy Dead Forest").func_76733_a(9154376).setEnableSnow().setTemperatureRainfall(0.05F, 0.8F).setMinMaxHeight(0.2F, 0.7F)); + Biomes.deadSwamp = Optional.of((new BiomeGenDeadSwamp(BOPConfiguration.IDs.deadSwampID)).setColor(522674).setBiomeName("Dead Swamp").func_76733_a(9154376).setMinMaxHeight(0.1F, 0.2F).setTemperatureRainfall(0.8F, 0.9F)); + Biomes.deadlands = Optional.of((new BiomeGenDeadlands(BOPConfiguration.IDs.deadlandsID)).setColor(522674).setBiomeName("Deadlands").setDisableRain().func_76733_a(9154376).setMinMaxHeight(0.1F, 0.5F).setTemperatureRainfall(2.0F, 0.0F)); + Biomes.deciduousForest = Optional.of((new BiomeGenDeciduousForest(BOPConfiguration.IDs.deciduousForestID)).setColor(353825).setBiomeName("Deciduous Forest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F)); + Biomes.dunes = Optional.of((new BiomeGenDunes(BOPConfiguration.IDs.dunesID)).setColor(13786898).setBiomeName("Dunes").setDisableRain().setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.5F, 1.3F)); + Biomes.fen = Optional.of((new BiomeGenFen(BOPConfiguration.IDs.fenID)).setColor(9286496).setBiomeName("Fen").setTemperatureRainfall(0.4F, 0.0F).setMinMaxHeight(0.2F, 0.4F)); + Biomes.field = Optional.of((new BiomeGenField(BOPConfiguration.IDs.fieldID)).setColor(9286496).setBiomeName("Field").setTemperatureRainfall(0.6F, 0.7F).setMinMaxHeight(0.3F, 0.3F)); + Biomes.fieldForest = Optional.of((new BiomeGenFieldForest(BOPConfiguration.IDs.fieldForestID)).setColor(9286496).setBiomeName("Forested Field").setTemperatureRainfall(0.6F, 0.7F).setMinMaxHeight(0.3F, 0.3F)); + Biomes.frostForest = Optional.of((new BiomeGenFrostForest(BOPConfiguration.IDs.frostForestID)).setColor(14090235).setBiomeName("Frost Forest").setEnableSnow().setTemperatureRainfall(0.0F, 0.0F).setMinMaxHeight(0.3F, 0.4F)); + Biomes.fungiForest = Optional.of((new BiomeGenFungiForest(BOPConfiguration.IDs.fungiForestID)).setColor(747097).setBiomeName("Fungi Forest").func_76733_a(5159473).setTemperatureRainfall(0.9F, 1.0F).setMinMaxHeight(0.2F, 0.5F)); + Biomes.garden = Optional.of((new BiomeGenGarden(BOPConfiguration.IDs.gardenID)).setColor(9286496).setBiomeName("Garden").setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(0.3F, 0.4F)); + Biomes.glacier = Optional.of((new BiomeGenGlacier(BOPConfiguration.IDs.glacierID)).setColor(6316128).setBiomeName("Glacier").setEnableSnow().setMinMaxHeight(0.4F, 1.0F).setTemperatureRainfall(0.0F, 0.0F)); + Biomes.grassland = Optional.of((new BiomeGenGrassland(BOPConfiguration.IDs.grasslandID)).setColor(9286496).setBiomeName("Grassland").setTemperatureRainfall(0.7F, 0.7F).setMinMaxHeight(0.3F, 0.3F)); + Biomes.grove = Optional.of((new BiomeGenGrove(BOPConfiguration.IDs.groveID)).setColor(9286496).setBiomeName("Grove").setTemperatureRainfall(0.4F, 0.8F).setMinMaxHeight(0.3F, 0.4F)); + Biomes.heathland = Optional.of((new BiomeGenHeathland(BOPConfiguration.IDs.heathlandID)).setColor(353825).setBiomeName("Heathland").func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.1F).setMinMaxHeight(0.3F, 0.4F)); + Biomes.highland = Optional.of((new BiomeGenHighland(BOPConfiguration.IDs.highlandID)).setColor(6316128).setBiomeName("Highland").setMinMaxHeight(0.9F, 1.9F).setTemperatureRainfall(0.5F, 0.5F)); + Biomes.hotSprings = Optional.of((new BiomeGenHotSprings(BOPConfiguration.IDs.hotSpringsID)).setColor(10486015).setBiomeName("Hot Springs").setMinMaxHeight(0.2F, 0.5F).setTemperatureRainfall(0.5F, 0.7F)); + Biomes.icyHills = Optional.of((new BiomeGenIcyHills(BOPConfiguration.IDs.icyHillsID)).setColor(14090235).setBiomeName("Icy Hills").setEnableSnow().setTemperatureRainfall(0.0F, 0.0F).setMinMaxHeight(0.3F, 0.8F)); + Biomes.jadeCliffs = Optional.of((new BiomeGenJadeCliffs(BOPConfiguration.IDs.jadeCliffsID)).setColor(14090235).setBiomeName("Jade Cliffs").setTemperatureRainfall(0.5F, 0.1F).setMinMaxHeight(0.5F, 1.5F)); + Biomes.lushDesert = Optional.of((new BiomeGenLushDesert(BOPConfiguration.IDs.lushDesertID)).setColor(16421912).setBiomeName("Lush Desert").setTemperatureRainfall(0.8F, 0.2F).setMinMaxHeight(0.2F, 0.9F)); + Biomes.lushSwamp = Optional.of((new BiomeGenLushSwamp(BOPConfiguration.IDs.lushSwampID)).setColor(522674).setBiomeName("Lush Swamp").func_76733_a(9154376).setMinMaxHeight(0.2F, 0.3F).setTemperatureRainfall(0.7F, 1.0F)); + Biomes.mangrove = Optional.of((new BiomeGenMangrove(BOPConfiguration.IDs.mangroveID)).setColor(16440917).setBiomeName("Mangrove").setMinMaxHeight(0.1F, 0.3F).setTemperatureRainfall(0.8F, 0.9F)); + Biomes.mapleWoods = Optional.of((new BiomeGenMapleWoods(BOPConfiguration.IDs.mapleWoodsID)).setColor(747097).setBiomeName("Maple Woods").func_76733_a(5159473).setTemperatureRainfall(0.2F, 0.8F).setMinMaxHeight(0.3F, 0.6F)); + Biomes.marsh = Optional.of((new BiomeGenMarsh(BOPConfiguration.IDs.marshID)).setColor(10486015).setBiomeName("Marsh").setMinMaxHeight(-0.5F, 0.0F).setTemperatureRainfall(0.5F, 0.9F)); + Biomes.meadow = Optional.of((new BiomeGenMeadow(BOPConfiguration.IDs.meadowID)).setColor(9286496).setBiomeName("Meadow").setTemperatureRainfall(0.7F, 0.7F)); + Biomes.meadowForest = Optional.of((new BiomeGenMeadowForest(BOPConfiguration.IDs.meadowForestID)).setColor(9286496).setBiomeName("Meadow Forest").setTemperatureRainfall(0.7F, 0.7F)); + Biomes.mesa = Optional.of((new BiomeGenMesa(BOPConfiguration.IDs.mesaID)).setColor(16421912).setBiomeName("Mesa").setDisableRain().setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.4F, 2.0F)); + Biomes.moor = Optional.of((new BiomeGenMoor(BOPConfiguration.IDs.moorID)).setColor(16421912).setBiomeName("Moor").setTemperatureRainfall(0.5F, 1.0F).setMinMaxHeight(0.7F, 0.8F)); + Biomes.mountain = Optional.of((new BiomeGenMountain(BOPConfiguration.IDs.mountainID)).setColor(14090235).setBiomeName("Mountain").setTemperatureRainfall(0.5F, 0.1F).setMinMaxHeight(1.2F, 1.2F).setMinMaxHeight(0.2F, 0.5F)); + Biomes.mysticGrove = Optional.of((new BiomeGenMysticGrove(BOPConfiguration.IDs.mysticGroveID)).setColor(353825).setBiomeName("Mystic Grove").setDisableRain().func_76733_a(5159473).setTemperatureRainfall(0.9F, 1.0F)); - Biomes.netherBase = Optional.of((new BiomeGenNetherBase(BOPConfiguration.netherBaseID)).setColor(16711680).setBiomeName("Nether").setDisableRain().setTemperatureRainfall(2.0F, 0.0F)); - Biomes.netherGarden = Optional.of((new BiomeGenNetherGarden(BOPConfiguration.netherGardenID)).setColor(16711680).setBiomeName("Undergarden").setDisableRain().setTemperatureRainfall(2.0F, 0.0F)); - Biomes.netherDesert = Optional.of((new BiomeGenNetherDesert(BOPConfiguration.netherDesertID)).setColor(16711680).setBiomeName("Corrupted Sands").setDisableRain().setTemperatureRainfall(2.0F, 0.0F)); - Biomes.netherLava = Optional.of((new BiomeGenNetherLava(BOPConfiguration.netherLavaID)).setColor(16711680).setBiomeName("Phantasmagoric Inferno").setDisableRain().setTemperatureRainfall(2.0F, 0.0F)); - Biomes.netherBone = Optional.of((new BiomeGenNetherBone(BOPConfiguration.netherBoneID)).setColor(16711680).setBiomeName("Boneyard").setDisableRain().setTemperatureRainfall(2.0F, 0.0F)); + Biomes.netherBase = Optional.of((new BiomeGenNetherBase(BOPConfiguration.IDs.netherBaseID)).setColor(16711680).setBiomeName("Nether").setDisableRain().setTemperatureRainfall(2.0F, 0.0F)); + Biomes.netherGarden = Optional.of((new BiomeGenNetherGarden(BOPConfiguration.IDs.netherGardenID)).setColor(16711680).setBiomeName("Undergarden").setDisableRain().setTemperatureRainfall(2.0F, 0.0F)); + Biomes.netherDesert = Optional.of((new BiomeGenNetherDesert(BOPConfiguration.IDs.netherDesertID)).setColor(16711680).setBiomeName("Corrupted Sands").setDisableRain().setTemperatureRainfall(2.0F, 0.0F)); + Biomes.netherLava = Optional.of((new BiomeGenNetherLava(BOPConfiguration.IDs.netherLavaID)).setColor(16711680).setBiomeName("Phantasmagoric Inferno").setDisableRain().setTemperatureRainfall(2.0F, 0.0F)); + Biomes.netherBone = Optional.of((new BiomeGenNetherBone(BOPConfiguration.IDs.netherBoneID)).setColor(16711680).setBiomeName("Boneyard").setDisableRain().setTemperatureRainfall(2.0F, 0.0F)); - Biomes.oasis = Optional.of((new BiomeGenOasis(BOPConfiguration.oasisID)).setColor(16421912).setBiomeName("Oasis").setTemperatureRainfall(1.9F, 2.0F).setMinMaxHeight(0.3F, 0.4F)); + Biomes.oasis = Optional.of((new BiomeGenOasis(BOPConfiguration.IDs.oasisID)).setColor(16421912).setBiomeName("Oasis").setTemperatureRainfall(1.9F, 2.0F).setMinMaxHeight(0.3F, 0.4F)); - Biomes.oceanCoral = Optional.of((new BiomeGenOceanCoral(BOPConfiguration.oceanCoralID)).setColor(10486015).setBiomeName("Coral Reef").setMinMaxHeight(-0.4F, -0.1F).setTemperatureRainfall(0.5F, 0.9F)); - Biomes.oceanKelp = Optional.of((new BiomeGenOceanKelp(BOPConfiguration.oceanKelpID)).setColor(10486015).setBiomeName("Kelp Forest").setMinMaxHeight(-0.4F, -0.1F).setTemperatureRainfall(0.5F, 0.9F)); + Biomes.oceanCoral = Optional.of((new BiomeGenOceanCoral(BOPConfiguration.IDs.oceanCoralID)).setColor(10486015).setBiomeName("Coral Reef").setMinMaxHeight(-0.4F, -0.1F).setTemperatureRainfall(0.5F, 0.9F)); + Biomes.oceanKelp = Optional.of((new BiomeGenOceanKelp(BOPConfiguration.IDs.oceanKelpID)).setColor(10486015).setBiomeName("Kelp Forest").setMinMaxHeight(-0.4F, -0.1F).setTemperatureRainfall(0.5F, 0.9F)); - Biomes.ominousWoods = Optional.of((new BiomeGenOminousWoods(BOPConfiguration.ominousWoodsID)).setColor(353825).setBiomeName("Ominous Woods").setDisableRain().func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.9F)); - Biomes.ominousWoodsThick = Optional.of((new BiomeGenOminousWoodsThick(BOPConfiguration.ominousWoodsThickID)).setColor(353825).setBiomeName("Thick Ominous Woods").setDisableRain().func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.9F)); - Biomes.orchard = Optional.of((new BiomeGenOrchard(BOPConfiguration.orchardID)).setColor(9286496).setBiomeName("Orchard").setTemperatureRainfall(0.8F, 0.4F)); - Biomes.originValley = Optional.of((new BiomeGenOriginValley(BOPConfiguration.originValleyID)).setColor(353825).setBiomeName("Origin Valley").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(0.2F, 0.6F)); - Biomes.outback = Optional.of((new BiomeGenOutback(BOPConfiguration.outbackID)).setColor(9286496).setBiomeName("Outback").setTemperatureRainfall(0.8F, 0.0F).setMinMaxHeight(0.3F, 0.4F)); - Biomes.pasture = Optional.of((new BiomeGenPasture(BOPConfiguration.pastureID)).setColor(9286496).setBiomeName("Pasture").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.3F, 0.4F)); - Biomes.pastureMeadow = Optional.of((new BiomeGenPastureMeadow(BOPConfiguration.pastureMeadowID)).setColor(9286496).setBiomeName("Pasture Meadow").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.3F, 0.4F)); - Biomes.pastureThin = Optional.of((new BiomeGenPastureThin(BOPConfiguration.pastureThinID)).setColor(9286496).setBiomeName("Thinned Pasture").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.3F, 0.4F)); - Biomes.polar = Optional.of((new BiomeGenPolar(BOPConfiguration.polarID)).setColor(6316128).setBiomeName("Polar").setMinMaxHeight(-0.5F, 0.0F).setTemperatureRainfall(0.0F, 0.0F)); - Biomes.prairie = Optional.of((new BiomeGenPrairie(BOPConfiguration.prairieID)).setColor(353825).setBiomeName("Prairie").func_76733_a(5159473).setTemperatureRainfall(0.9F, 0.6F).setMinMaxHeight(0.3F, 0.4F)); + Biomes.ominousWoods = Optional.of((new BiomeGenOminousWoods(BOPConfiguration.IDs.ominousWoodsID)).setColor(353825).setBiomeName("Ominous Woods").setDisableRain().func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.9F)); + Biomes.ominousWoodsThick = Optional.of((new BiomeGenOminousWoodsThick(BOPConfiguration.IDs.ominousWoodsThickID)).setColor(353825).setBiomeName("Thick Ominous Woods").setDisableRain().func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.9F)); + Biomes.orchard = Optional.of((new BiomeGenOrchard(BOPConfiguration.IDs.orchardID)).setColor(9286496).setBiomeName("Orchard").setTemperatureRainfall(0.8F, 0.4F)); + Biomes.originValley = Optional.of((new BiomeGenOriginValley(BOPConfiguration.IDs.originValleyID)).setColor(353825).setBiomeName("Origin Valley").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(0.2F, 0.6F)); + Biomes.outback = Optional.of((new BiomeGenOutback(BOPConfiguration.IDs.outbackID)).setColor(9286496).setBiomeName("Outback").setTemperatureRainfall(0.8F, 0.0F).setMinMaxHeight(0.3F, 0.4F)); + Biomes.pasture = Optional.of((new BiomeGenPasture(BOPConfiguration.IDs.pastureID)).setColor(9286496).setBiomeName("Pasture").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.3F, 0.4F)); + Biomes.pastureMeadow = Optional.of((new BiomeGenPastureMeadow(BOPConfiguration.IDs.pastureMeadowID)).setColor(9286496).setBiomeName("Pasture Meadow").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.3F, 0.4F)); + Biomes.pastureThin = Optional.of((new BiomeGenPastureThin(BOPConfiguration.IDs.pastureThinID)).setColor(9286496).setBiomeName("Thinned Pasture").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.3F, 0.4F)); + Biomes.polar = Optional.of((new BiomeGenPolar(BOPConfiguration.IDs.polarID)).setColor(6316128).setBiomeName("Polar").setMinMaxHeight(-0.5F, 0.0F).setTemperatureRainfall(0.0F, 0.0F)); + Biomes.prairie = Optional.of((new BiomeGenPrairie(BOPConfiguration.IDs.prairieID)).setColor(353825).setBiomeName("Prairie").func_76733_a(5159473).setTemperatureRainfall(0.9F, 0.6F).setMinMaxHeight(0.3F, 0.4F)); - Biomes.promisedLandForest = Optional.of((new BiomeGenPromisedLandForest(BOPConfiguration.promisedLandForestID)).setColor(112).setBiomeName("Wonderous Woods").setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.1F, 2.0F)); - Biomes.promisedLandPlains = Optional.of((new BiomeGenPromisedLandPlains(BOPConfiguration.promisedLandPlainsID)).setColor(112).setBiomeName("Majestic Meadow").setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.1F, 2.0F)); - Biomes.promisedLandSwamp = Optional.of((new BiomeGenPromisedLandSwamp(BOPConfiguration.promisedLandSwampID)).setColor(112).setBiomeName("Blessed Bog").setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.1F, 2.0F)); + Biomes.promisedLandForest = Optional.of((new BiomeGenPromisedLandForest(BOPConfiguration.IDs.promisedLandForestID)).setColor(112).setBiomeName("Wonderous Woods").setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.1F, 2.0F)); + Biomes.promisedLandPlains = Optional.of((new BiomeGenPromisedLandPlains(BOPConfiguration.IDs.promisedLandPlainsID)).setColor(112).setBiomeName("Majestic Meadow").setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.1F, 2.0F)); + Biomes.promisedLandSwamp = Optional.of((new BiomeGenPromisedLandSwamp(BOPConfiguration.IDs.promisedLandSwampID)).setColor(112).setBiomeName("Blessed Bog").setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.1F, 2.0F)); - Biomes.quagmire = Optional.of((new BiomeGenQuagmire(BOPConfiguration.quagmireID)).setColor(522674).setBiomeName("Quagmire").func_76733_a(9154376).setMinMaxHeight(0.2F, 0.3F).setTemperatureRainfall(0.8F, 0.9F)); - Biomes.rainforest = Optional.of((new BiomeGenRainforest(BOPConfiguration.rainforestID)).setColor(5470985).setBiomeName("Rainforest").func_76733_a(5470985).setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.7F, 1.8F)); - Biomes.redwoodForest = Optional.of((new BiomeGenRedwoodForest(BOPConfiguration.redwoodForestID)).setColor(747097).setBiomeName("Redwood Forest").func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.3F, 0.4F)); - Biomes.sacredSprings = Optional.of((new BiomeGenSacredSprings(BOPConfiguration.sacredSpringsID)).setColor(522674).setBiomeName("Sacred Springs").func_76733_a(9154376).setMinMaxHeight(0.4F, 1.2F).setTemperatureRainfall(1.2F, 0.9F)); - Biomes.savanna = Optional.of((new BiomeGenSavanna(BOPConfiguration.savannaID)).setColor(9286496).setBiomeName("Savanna").setTemperatureRainfall(1.5F, 0.1F).setMinMaxHeight(0.3F, 0.4F)); - Biomes.savannaPlateau = Optional.of((new BiomeGenSavannaPlateau(BOPConfiguration.savannaPlateauID)).setColor(9286496).setBiomeName("Savanna Plateau").setTemperatureRainfall(1.5F, 0.1F).setMinMaxHeight(0.9F, 0.9F)); - Biomes.scrubland = Optional.of((new BiomeGenScrubland(BOPConfiguration.scrublandID)).setColor(9286496).setBiomeName("Scrubland").setTemperatureRainfall(1.2F, 0.0F).setMinMaxHeight(0.3F, 0.5F)); - Biomes.seasonalForest = Optional.of((new BiomeGenSeasonalForest(BOPConfiguration.seasonalForestID)).setColor(353825).setBiomeName("Seasonal Forest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(0.3F, 0.7F)); - Biomes.seasonalSpruceForest = Optional.of((new BiomeGenSeasonalSpruceForest(BOPConfiguration.seasonalSpruceForestID)).setColor(353825).setBiomeName("Seasonal Spruce Forest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(0.3F, 0.7F)); - Biomes.shield = Optional.of((new BiomeGenShield(BOPConfiguration.shieldID)).setColor(522674).setBiomeName("Shield").func_76733_a(9154376).setMinMaxHeight(0.1F, 0.3F).setTemperatureRainfall(0.5F, 0.8F)); - Biomes.shore = Optional.of((new BiomeGenShore(BOPConfiguration.shoreID)).setColor(9286496).setBiomeName("Shore").setMinMaxHeight(-1.0F, 0.4F).setTemperatureRainfall(0.8F, 0.4F)); - Biomes.shrubland = Optional.of((new BiomeGenShrubland(BOPConfiguration.shrublandID)).setColor(9286496).setBiomeName("Shrubland").setMinMaxHeight(0.3F, 0.4F).setTemperatureRainfall(0.6F, 0.0F)); - Biomes.shrublandForest = Optional.of((new BiomeGenShrublandForest(BOPConfiguration.shrublandForestID)).setColor(9286496).setBiomeName("Thick Shrubland").setMinMaxHeight(0.3F, 0.4F).setTemperatureRainfall(0.6F, 0.0F)); - Biomes.sludgepit = Optional.of((new BiomeGenSludgepit(BOPConfiguration.sludgepitID)).setColor(522674).setBiomeName("Sludgepit").func_76733_a(9154376).setMinMaxHeight(0.1F, 0.3F).setTemperatureRainfall(0.8F, 0.9F)); - Biomes.spruceWoods = Optional.of((new BiomeGenSpruceWoods(BOPConfiguration.spruceWoodsID)).setColor(353825).setBiomeName("Spruce Woods").func_76733_a(5159473).setTemperatureRainfall(0.6F, 0.7F)); - Biomes.steppe = Optional.of((new BiomeGenSteppe(BOPConfiguration.steppeID)).setColor(9286496).setBiomeName("Steppe").setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.3F, 0.4F)); - Biomes.temperateRainforest = Optional.of((new BiomeGenTemperateRainforest(BOPConfiguration.temperateRainforestID)).setColor(353825).setBiomeName("Temperate Rainforest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(0.2F, 1.2F)); - Biomes.thicket = Optional.of((new BiomeGenThicket(BOPConfiguration.thicketID)).setColor(353825).setBiomeName("Thicket").func_76733_a(5159473).setTemperatureRainfall(0.6F, 0.2F).setMinMaxHeight(0.2F, 0.2F)); - Biomes.timber = Optional.of((new BiomeGenTimber(BOPConfiguration.timberID)).setColor(353825).setBiomeName("Timber").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(0.3F, 0.4F)); - Biomes.timberThin = Optional.of((new BiomeGenTimberThin(BOPConfiguration.timberThinID)).setColor(353825).setBiomeName("Thinned Timber").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(0.3F, 0.4F)); - Biomes.tropicalRainforest = Optional.of((new BiomeGenTropicalRainforest(BOPConfiguration.tropicalRainforestID)).setColor(9286496).setBiomeName("Tropical Rainforest").setTemperatureRainfall(1.2F, 0.9F).setMinMaxHeight(0.3F, 0.7F)); - Biomes.tropics = Optional.of((new BiomeGenTropics(BOPConfiguration.tropicsID)).setColor(9286496).setBiomeName("Tropics").setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.1F, 1.5F)); - Biomes.tundra = Optional.of((new BiomeGenTundra(BOPConfiguration.tundraID)).setColor(14090235).setBiomeName("Tundra").setTemperatureRainfall(0.2F, 0.8F).setMinMaxHeight(0.2F, 0.4F)); - Biomes.volcano = Optional.of((new BiomeGenVolcano(BOPConfiguration.volcanoID)).setColor(9286496).setBiomeName("Volcano").setDisableRain().setMinMaxHeight(0.6F, 0.9F).setTemperatureRainfall(2.0F, 0.0F)); - Biomes.wasteland = Optional.of((new BiomeGenWasteland(BOPConfiguration.wastelandID)).setColor(16421912).setBiomeName("Wasteland").setDisableRain().setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.3F, 0.4F)); - Biomes.wetland = Optional.of((new BiomeGenWetland(BOPConfiguration.wetlandID)).setColor(522674).setBiomeName("Wetland").func_76733_a(9154376).setMinMaxHeight(0.3F, 0.5F).setTemperatureRainfall(0.8F, 0.9F)); - Biomes.woodland = Optional.of((new BiomeGenWoodland(BOPConfiguration.woodlandID)).setColor(353825).setBiomeName("Woodland").func_76733_a(5159473).setTemperatureRainfall(1.7F, 0.2F).setMinMaxHeight(0.3F, 0.4F)); + Biomes.quagmire = Optional.of((new BiomeGenQuagmire(BOPConfiguration.IDs.quagmireID)).setColor(522674).setBiomeName("Quagmire").func_76733_a(9154376).setMinMaxHeight(0.2F, 0.3F).setTemperatureRainfall(0.8F, 0.9F)); + Biomes.rainforest = Optional.of((new BiomeGenRainforest(BOPConfiguration.IDs.rainforestID)).setColor(5470985).setBiomeName("Rainforest").func_76733_a(5470985).setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.7F, 1.8F)); + Biomes.redwoodForest = Optional.of((new BiomeGenRedwoodForest(BOPConfiguration.IDs.redwoodForestID)).setColor(747097).setBiomeName("Redwood Forest").func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.3F, 0.4F)); + Biomes.sacredSprings = Optional.of((new BiomeGenSacredSprings(BOPConfiguration.IDs.sacredSpringsID)).setColor(522674).setBiomeName("Sacred Springs").func_76733_a(9154376).setMinMaxHeight(0.4F, 1.2F).setTemperatureRainfall(1.2F, 0.9F)); + Biomes.savanna = Optional.of((new BiomeGenSavanna(BOPConfiguration.IDs.savannaID)).setColor(9286496).setBiomeName("Savanna").setTemperatureRainfall(1.5F, 0.1F).setMinMaxHeight(0.3F, 0.4F)); + Biomes.savannaPlateau = Optional.of((new BiomeGenSavannaPlateau(BOPConfiguration.IDs.savannaPlateauID)).setColor(9286496).setBiomeName("Savanna Plateau").setTemperatureRainfall(1.5F, 0.1F).setMinMaxHeight(0.9F, 0.9F)); + Biomes.scrubland = Optional.of((new BiomeGenScrubland(BOPConfiguration.IDs.scrublandID)).setColor(9286496).setBiomeName("Scrubland").setTemperatureRainfall(1.2F, 0.0F).setMinMaxHeight(0.3F, 0.5F)); + Biomes.seasonalForest = Optional.of((new BiomeGenSeasonalForest(BOPConfiguration.IDs.seasonalForestID)).setColor(353825).setBiomeName("Seasonal Forest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(0.3F, 0.7F)); + Biomes.seasonalSpruceForest = Optional.of((new BiomeGenSeasonalSpruceForest(BOPConfiguration.IDs.seasonalSpruceForestID)).setColor(353825).setBiomeName("Seasonal Spruce Forest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(0.3F, 0.7F)); + Biomes.shield = Optional.of((new BiomeGenShield(BOPConfiguration.IDs.shieldID)).setColor(522674).setBiomeName("Shield").func_76733_a(9154376).setMinMaxHeight(0.1F, 0.3F).setTemperatureRainfall(0.5F, 0.8F)); + Biomes.shore = Optional.of((new BiomeGenShore(BOPConfiguration.IDs.shoreID)).setColor(9286496).setBiomeName("Shore").setMinMaxHeight(-1.0F, 0.4F).setTemperatureRainfall(0.8F, 0.4F)); + Biomes.shrubland = Optional.of((new BiomeGenShrubland(BOPConfiguration.IDs.shrublandID)).setColor(9286496).setBiomeName("Shrubland").setMinMaxHeight(0.3F, 0.4F).setTemperatureRainfall(0.6F, 0.0F)); + Biomes.shrublandForest = Optional.of((new BiomeGenShrublandForest(BOPConfiguration.IDs.shrublandForestID)).setColor(9286496).setBiomeName("Thick Shrubland").setMinMaxHeight(0.3F, 0.4F).setTemperatureRainfall(0.6F, 0.0F)); + Biomes.sludgepit = Optional.of((new BiomeGenSludgepit(BOPConfiguration.IDs.sludgepitID)).setColor(522674).setBiomeName("Sludgepit").func_76733_a(9154376).setMinMaxHeight(0.1F, 0.3F).setTemperatureRainfall(0.8F, 0.9F)); + Biomes.spruceWoods = Optional.of((new BiomeGenSpruceWoods(BOPConfiguration.IDs.spruceWoodsID)).setColor(353825).setBiomeName("Spruce Woods").func_76733_a(5159473).setTemperatureRainfall(0.6F, 0.7F)); + Biomes.steppe = Optional.of((new BiomeGenSteppe(BOPConfiguration.IDs.steppeID)).setColor(9286496).setBiomeName("Steppe").setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.3F, 0.4F)); + Biomes.temperateRainforest = Optional.of((new BiomeGenTemperateRainforest(BOPConfiguration.IDs.temperateRainforestID)).setColor(353825).setBiomeName("Temperate Rainforest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(0.2F, 1.2F)); + Biomes.thicket = Optional.of((new BiomeGenThicket(BOPConfiguration.IDs.thicketID)).setColor(353825).setBiomeName("Thicket").func_76733_a(5159473).setTemperatureRainfall(0.6F, 0.2F).setMinMaxHeight(0.2F, 0.2F)); + Biomes.timber = Optional.of((new BiomeGenTimber(BOPConfiguration.IDs.timberID)).setColor(353825).setBiomeName("Timber").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(0.3F, 0.4F)); + Biomes.timberThin = Optional.of((new BiomeGenTimberThin(BOPConfiguration.IDs.timberThinID)).setColor(353825).setBiomeName("Thinned Timber").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(0.3F, 0.4F)); + Biomes.tropicalRainforest = Optional.of((new BiomeGenTropicalRainforest(BOPConfiguration.IDs.tropicalRainforestID)).setColor(9286496).setBiomeName("Tropical Rainforest").setTemperatureRainfall(1.2F, 0.9F).setMinMaxHeight(0.3F, 0.7F)); + Biomes.tropics = Optional.of((new BiomeGenTropics(BOPConfiguration.IDs.tropicsID)).setColor(9286496).setBiomeName("Tropics").setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.1F, 1.5F)); + Biomes.tundra = Optional.of((new BiomeGenTundra(BOPConfiguration.IDs.tundraID)).setColor(14090235).setBiomeName("Tundra").setTemperatureRainfall(0.2F, 0.8F).setMinMaxHeight(0.2F, 0.4F)); + Biomes.volcano = Optional.of((new BiomeGenVolcano(BOPConfiguration.IDs.volcanoID)).setColor(9286496).setBiomeName("Volcano").setDisableRain().setMinMaxHeight(0.6F, 0.9F).setTemperatureRainfall(2.0F, 0.0F)); + Biomes.wasteland = Optional.of((new BiomeGenWasteland(BOPConfiguration.IDs.wastelandID)).setColor(16421912).setBiomeName("Wasteland").setDisableRain().setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.3F, 0.4F)); + Biomes.wetland = Optional.of((new BiomeGenWetland(BOPConfiguration.IDs.wetlandID)).setColor(522674).setBiomeName("Wetland").func_76733_a(9154376).setMinMaxHeight(0.3F, 0.5F).setTemperatureRainfall(0.8F, 0.9F)); + Biomes.woodland = Optional.of((new BiomeGenWoodland(BOPConfiguration.IDs.woodlandID)).setColor(353825).setBiomeName("Woodland").func_76733_a(5159473).setTemperatureRainfall(1.7F, 0.2F).setMinMaxHeight(0.3F, 0.4F)); - Biomes.plainsNew = Optional.of((new BiomeGenPlainsNew(BOPConfiguration.plainsNewID)).setColor(9286496).setBiomeName("Plains").setTemperatureRainfall(0.8F, 0.4F)); - Biomes.desertNew = Optional.of((new BiomeGenDesertNew(BOPConfiguration.desertNewID)).setColor(16421912).setBiomeName("Desert").setDisableRain().setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.2F, 0.3F)); - Biomes.extremeHillsNew = Optional.of((new BiomeGenHillsNew(BOPConfiguration.extremeHillsNewID)).setColor(6316128).setBiomeName("Extreme Hills").setMinMaxHeight(1.0F, 2.0F).setTemperatureRainfall(0.2F, 0.3F)); - Biomes.forestNew = Optional.of((new BiomeGenForestNew(BOPConfiguration.forestNewID)).setColor(353825).setBiomeName("Forest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F)); - Biomes.taigaNew = Optional.of((new BiomeGenTaigaNew(BOPConfiguration.taigaNewID)).setColor(747097).setBiomeName("Taiga").func_76733_a(5159473).setEnableSnow().setTemperatureRainfall(0.05F, 0.8F).setMinMaxHeight(0.3F, 0.5F)); - Biomes.swamplandNew = Optional.of((new BiomeGenSwampNew(BOPConfiguration.swamplandNewID)).setColor(522674).setBiomeName("Swampland").func_76733_a(9154376).setMinMaxHeight(0.1F, 0.3F).setTemperatureRainfall(0.8F, 0.9F)); - Biomes.jungleNew = Optional.of((new BiomeGenJungleNew(BOPConfiguration.jungleNewID)).setColor(5470985).setBiomeName("Jungle").func_76733_a(5470985).setTemperatureRainfall(1.2F, 0.9F).setMinMaxHeight(0.4F, 0.5F)); + Biomes.plainsNew = Optional.of((new BiomeGenPlainsNew(BOPConfiguration.IDs.plainsNewID)).setColor(9286496).setBiomeName("Plains").setTemperatureRainfall(0.8F, 0.4F)); + Biomes.desertNew = Optional.of((new BiomeGenDesertNew(BOPConfiguration.IDs.desertNewID)).setColor(16421912).setBiomeName("Desert").setDisableRain().setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.2F, 0.3F)); + Biomes.extremeHillsNew = Optional.of((new BiomeGenHillsNew(BOPConfiguration.IDs.extremeHillsNewID)).setColor(6316128).setBiomeName("Extreme Hills").setMinMaxHeight(1.0F, 2.0F).setTemperatureRainfall(0.2F, 0.3F)); + Biomes.forestNew = Optional.of((new BiomeGenForestNew(BOPConfiguration.IDs.forestNewID)).setColor(353825).setBiomeName("Forest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F)); + Biomes.taigaNew = Optional.of((new BiomeGenTaigaNew(BOPConfiguration.IDs.taigaNewID)).setColor(747097).setBiomeName("Taiga").func_76733_a(5159473).setEnableSnow().setTemperatureRainfall(0.05F, 0.8F).setMinMaxHeight(0.3F, 0.5F)); + Biomes.swamplandNew = Optional.of((new BiomeGenSwampNew(BOPConfiguration.IDs.swamplandNewID)).setColor(522674).setBiomeName("Swampland").func_76733_a(9154376).setMinMaxHeight(0.1F, 0.3F).setTemperatureRainfall(0.8F, 0.9F)); + Biomes.jungleNew = Optional.of((new BiomeGenJungleNew(BOPConfiguration.IDs.jungleNewID)).setColor(5470985).setBiomeName("Jungle").func_76733_a(5470985).setTemperatureRainfall(1.2F, 0.9F).setMinMaxHeight(0.4F, 0.5F)); } private static void addToBiomeDictionary() @@ -387,77 +388,77 @@ public class BOPBiomes { private static void addVillageBiomes() { - addVillageBiome(Biomes.alps, BOPConfiguration.alpsVillage); - addVillageBiome(Biomes.arctic, BOPConfiguration.arcticVillage); - addVillageBiome(Biomes.badlands, BOPConfiguration.badlandsVillage); - addVillageBiome(Biomes.bambooForest, BOPConfiguration.bambooForestVillage); - addVillageBiome(Biomes.bayou, BOPConfiguration.bayouVillage); - addVillageBiome(Biomes.birchForest, BOPConfiguration.birchForestVillage); - addVillageBiome(Biomes.bog, BOPConfiguration.bogVillage); - addVillageBiome(Biomes.borealForest, BOPConfiguration.borealForestVillage); - addVillageBiome(Biomes.brushland, BOPConfiguration.brushlandVillage); - addVillageBiome(Biomes.canyon, BOPConfiguration.canyonVillage); - addVillageBiome(Biomes.chaparral, BOPConfiguration.chaparralVillage); - addVillageBiome(Biomes.cherryBlossomGrove, BOPConfiguration.cherryBlossomGroveVillage); - addVillageBiome(Biomes.coniferousForest, BOPConfiguration.coniferousForestVillage); - addVillageBiome(Biomes.coniferousForestSnow, BOPConfiguration.coniferousForestSnowVillage); - addVillageBiome(Biomes.deadForest, BOPConfiguration.deadForestVillage); - addVillageBiome(Biomes.deadForestSnow, BOPConfiguration.deadForestSnowVillage); - addVillageBiome(Biomes.deadSwamp, BOPConfiguration.deadSwampVillage); - addVillageBiome(Biomes.deciduousForest, BOPConfiguration.deciduousForestVillage); - addVillageBiome(Biomes.dunes, BOPConfiguration.dunesVillage); - addVillageBiome(Biomes.fen, BOPConfiguration.fenVillage); - addVillageBiome(Biomes.field, BOPConfiguration.fieldVillage); - addVillageBiome(Biomes.frostForest, BOPConfiguration.frostForestVillage); - addVillageBiome(Biomes.glacier, BOPConfiguration.glacierVillage); - addVillageBiome(Biomes.grassland, BOPConfiguration.grasslandVillage); - addVillageBiome(Biomes.grove, BOPConfiguration.groveVillage); - addVillageBiome(Biomes.heathland, BOPConfiguration.heathlandVillage); - addVillageBiome(Biomes.highland, BOPConfiguration.highlandVillage); - addVillageBiome(Biomes.hotSprings, BOPConfiguration.hotSpringsVillage); - addVillageBiome(Biomes.jadeCliffs, BOPConfiguration.jadeCliffsVillage); - addVillageBiome(Biomes.lushDesert, BOPConfiguration.lushDesertVillage); - addVillageBiome(Biomes.lushSwamp, BOPConfiguration.lushSwampVillage); - addVillageBiome(Biomes.mangrove, BOPConfiguration.mangroveVillage); - addVillageBiome(Biomes.mapleWoods, BOPConfiguration.mapleWoodsVillage); - addVillageBiome(Biomes.marsh, BOPConfiguration.marshVillage); - addVillageBiome(Biomes.meadow, BOPConfiguration.meadowVillage); - addVillageBiome(Biomes.mesa, BOPConfiguration.mesaVillage); - addVillageBiome(Biomes.moor, BOPConfiguration.moorVillage); - addVillageBiome(Biomes.mountain, BOPConfiguration.mountainVillage); - addVillageBiome(Biomes.oasis, BOPConfiguration.oasisVillage); - addVillageBiome(Biomes.orchard, BOPConfiguration.orchardVillage); - addVillageBiome(Biomes.outback, BOPConfiguration.outbackVillage); - addVillageBiome(Biomes.pasture, BOPConfiguration.pastureVillage); - addVillageBiome(Biomes.polar, BOPConfiguration.polarVillage); - addVillageBiome(Biomes.prairie, BOPConfiguration.prairieVillage); - addVillageBiome(Biomes.quagmire, BOPConfiguration.quagmireVillage); - addVillageBiome(Biomes.rainforest, BOPConfiguration.rainforestVillage); - addVillageBiome(Biomes.redwoodForest, BOPConfiguration.redwoodForestVillage); - addVillageBiome(Biomes.savanna, BOPConfiguration.savannaVillage); - addVillageBiome(Biomes.scrubland, BOPConfiguration.scrublandVillage); - addVillageBiome(Biomes.seasonalForest, BOPConfiguration.seasonalForestVillage); - addVillageBiome(Biomes.shield, BOPConfiguration.shieldVillage); - addVillageBiome(Biomes.shrubland, BOPConfiguration.shrublandVillage); - addVillageBiome(Biomes.sludgepit, BOPConfiguration.sludgepitVillage); - addVillageBiome(Biomes.spruceWoods, BOPConfiguration.spruceWoodsVillage); - addVillageBiome(Biomes.temperateRainforest, BOPConfiguration.temperateRainforestVillage); - addVillageBiome(Biomes.thicket, BOPConfiguration.thicketVillage); - addVillageBiome(Biomes.timber, BOPConfiguration.timberVillage); - addVillageBiome(Biomes.tropicalRainforest, BOPConfiguration.tropicalRainforestVillage); - addVillageBiome(Biomes.tropics, BOPConfiguration.tropicsVillage); - addVillageBiome(Biomes.tundra, BOPConfiguration.tundraVillage); - addVillageBiome(Biomes.volcano, BOPConfiguration.volcanoVillage); - addVillageBiome(Biomes.wetland, BOPConfiguration.wetlandVillage); - addVillageBiome(Biomes.woodland, BOPConfiguration.woodlandVillage); + addVillageBiome(Biomes.alps, BOPConfiguration.TerrainGen.alpsVillage); + addVillageBiome(Biomes.arctic, BOPConfiguration.TerrainGen.arcticVillage); + addVillageBiome(Biomes.badlands, BOPConfiguration.TerrainGen.badlandsVillage); + addVillageBiome(Biomes.bambooForest, BOPConfiguration.TerrainGen.bambooForestVillage); + addVillageBiome(Biomes.bayou, BOPConfiguration.TerrainGen.bayouVillage); + addVillageBiome(Biomes.birchForest, BOPConfiguration.TerrainGen.birchForestVillage); + addVillageBiome(Biomes.bog, BOPConfiguration.TerrainGen.bogVillage); + addVillageBiome(Biomes.borealForest, BOPConfiguration.TerrainGen.borealForestVillage); + addVillageBiome(Biomes.brushland, BOPConfiguration.TerrainGen.brushlandVillage); + addVillageBiome(Biomes.canyon, BOPConfiguration.TerrainGen.canyonVillage); + addVillageBiome(Biomes.chaparral, BOPConfiguration.TerrainGen.chaparralVillage); + addVillageBiome(Biomes.cherryBlossomGrove, BOPConfiguration.TerrainGen.cherryBlossomGroveVillage); + addVillageBiome(Biomes.coniferousForest, BOPConfiguration.TerrainGen.coniferousForestVillage); + addVillageBiome(Biomes.coniferousForestSnow, BOPConfiguration.TerrainGen.coniferousForestSnowVillage); + addVillageBiome(Biomes.deadForest, BOPConfiguration.TerrainGen.deadForestVillage); + addVillageBiome(Biomes.deadForestSnow, BOPConfiguration.TerrainGen.deadForestSnowVillage); + addVillageBiome(Biomes.deadSwamp, BOPConfiguration.TerrainGen.deadSwampVillage); + addVillageBiome(Biomes.deciduousForest, BOPConfiguration.TerrainGen.deciduousForestVillage); + addVillageBiome(Biomes.dunes, BOPConfiguration.TerrainGen.dunesVillage); + addVillageBiome(Biomes.fen, BOPConfiguration.TerrainGen.fenVillage); + addVillageBiome(Biomes.field, BOPConfiguration.TerrainGen.fieldVillage); + addVillageBiome(Biomes.frostForest, BOPConfiguration.TerrainGen.frostForestVillage); + addVillageBiome(Biomes.glacier, BOPConfiguration.TerrainGen.glacierVillage); + addVillageBiome(Biomes.grassland, BOPConfiguration.TerrainGen.grasslandVillage); + addVillageBiome(Biomes.grove, BOPConfiguration.TerrainGen.groveVillage); + addVillageBiome(Biomes.heathland, BOPConfiguration.TerrainGen.heathlandVillage); + addVillageBiome(Biomes.highland, BOPConfiguration.TerrainGen.highlandVillage); + addVillageBiome(Biomes.hotSprings, BOPConfiguration.TerrainGen.hotSpringsVillage); + addVillageBiome(Biomes.jadeCliffs, BOPConfiguration.TerrainGen.jadeCliffsVillage); + addVillageBiome(Biomes.lushDesert, BOPConfiguration.TerrainGen.lushDesertVillage); + addVillageBiome(Biomes.lushSwamp, BOPConfiguration.TerrainGen.lushSwampVillage); + addVillageBiome(Biomes.mangrove, BOPConfiguration.TerrainGen.mangroveVillage); + addVillageBiome(Biomes.mapleWoods, BOPConfiguration.TerrainGen.mapleWoodsVillage); + addVillageBiome(Biomes.marsh, BOPConfiguration.TerrainGen.marshVillage); + addVillageBiome(Biomes.meadow, BOPConfiguration.TerrainGen.meadowVillage); + addVillageBiome(Biomes.mesa, BOPConfiguration.TerrainGen.mesaVillage); + addVillageBiome(Biomes.moor, BOPConfiguration.TerrainGen.moorVillage); + addVillageBiome(Biomes.mountain, BOPConfiguration.TerrainGen.mountainVillage); + addVillageBiome(Biomes.oasis, BOPConfiguration.TerrainGen.oasisVillage); + addVillageBiome(Biomes.orchard, BOPConfiguration.TerrainGen.orchardVillage); + addVillageBiome(Biomes.outback, BOPConfiguration.TerrainGen.outbackVillage); + addVillageBiome(Biomes.pasture, BOPConfiguration.TerrainGen.pastureVillage); + addVillageBiome(Biomes.polar, BOPConfiguration.TerrainGen.polarVillage); + addVillageBiome(Biomes.prairie, BOPConfiguration.TerrainGen.prairieVillage); + addVillageBiome(Biomes.quagmire, BOPConfiguration.TerrainGen.quagmireVillage); + addVillageBiome(Biomes.rainforest, BOPConfiguration.TerrainGen.rainforestVillage); + addVillageBiome(Biomes.redwoodForest, BOPConfiguration.TerrainGen.redwoodForestVillage); + addVillageBiome(Biomes.savanna, BOPConfiguration.TerrainGen.savannaVillage); + addVillageBiome(Biomes.scrubland, BOPConfiguration.TerrainGen.scrublandVillage); + addVillageBiome(Biomes.seasonalForest, BOPConfiguration.TerrainGen.seasonalForestVillage); + addVillageBiome(Biomes.shield, BOPConfiguration.TerrainGen.shieldVillage); + addVillageBiome(Biomes.shrubland, BOPConfiguration.TerrainGen.shrublandVillage); + addVillageBiome(Biomes.sludgepit, BOPConfiguration.TerrainGen.sludgepitVillage); + addVillageBiome(Biomes.spruceWoods, BOPConfiguration.TerrainGen.spruceWoodsVillage); + addVillageBiome(Biomes.temperateRainforest, BOPConfiguration.TerrainGen.temperateRainforestVillage); + addVillageBiome(Biomes.thicket, BOPConfiguration.TerrainGen.thicketVillage); + addVillageBiome(Biomes.timber, BOPConfiguration.TerrainGen.timberVillage); + addVillageBiome(Biomes.tropicalRainforest, BOPConfiguration.TerrainGen.tropicalRainforestVillage); + addVillageBiome(Biomes.tropics, BOPConfiguration.TerrainGen.tropicsVillage); + addVillageBiome(Biomes.tundra, BOPConfiguration.TerrainGen.tundraVillage); + addVillageBiome(Biomes.volcano, BOPConfiguration.TerrainGen.volcanoVillage); + addVillageBiome(Biomes.wetland, BOPConfiguration.TerrainGen.wetlandVillage); + addVillageBiome(Biomes.woodland, BOPConfiguration.TerrainGen.woodlandVillage); - addVillageBiome(Biomes.plainsNew, BOPConfiguration.plainsVillage); - addVillageBiome(Biomes.desertNew, BOPConfiguration.desertVillage); - addVillageBiome(Biomes.forestNew, BOPConfiguration.forestVillage); - addVillageBiome(Biomes.extremeHillsNew, BOPConfiguration.extremeHillsVillage); - addVillageBiome(Biomes.taigaNew, BOPConfiguration.taigaVillage); - addVillageBiome(Biomes.swamplandNew, BOPConfiguration.swamplandVillage); - addVillageBiome(Biomes.jungleNew, BOPConfiguration.jungleVillage); + addVillageBiome(Biomes.plainsNew, BOPConfiguration.TerrainGen.plainsVillage); + addVillageBiome(Biomes.desertNew, BOPConfiguration.TerrainGen.desertVillage); + addVillageBiome(Biomes.forestNew, BOPConfiguration.TerrainGen.forestVillage); + addVillageBiome(Biomes.extremeHillsNew, BOPConfiguration.TerrainGen.extremeHillsVillage); + addVillageBiome(Biomes.taigaNew, BOPConfiguration.TerrainGen.taigaVillage); + addVillageBiome(Biomes.swamplandNew, BOPConfiguration.TerrainGen.swamplandVillage); + addVillageBiome(Biomes.jungleNew, BOPConfiguration.TerrainGen.jungleVillage); } private static void addStrongholdBiomes() @@ -547,311 +548,311 @@ public class BOPBiomes { private static void registerBiomes() { - if (BOPConfiguration.addToDefault) + if (BOPConfiguration.TerrainGen.addToDefault) { - if (BOPConfiguration.alpsGen) { + if (BOPConfiguration.BiomeGen.alpsGen) { registerBiome(Biomes.alps); } - if (BOPConfiguration.arcticGen) { + if (BOPConfiguration.BiomeGen.arcticGen) { registerBiome(Biomes.arctic); } - if (BOPConfiguration.badlandsGen) { + if (BOPConfiguration.BiomeGen.badlandsGen) { registerBiome(Biomes.badlands); } - if (BOPConfiguration.bambooForestGen) { + if (BOPConfiguration.BiomeGen.bambooForestGen) { registerBiome(Biomes.bambooForest); } - if (BOPConfiguration.bayouGen) { + if (BOPConfiguration.BiomeGen.bayouGen) { registerBiome(Biomes.bayou); } - if (BOPConfiguration.birchForestGen) { + if (BOPConfiguration.BiomeGen.birchForestGen) { registerBiome(Biomes.birchForest); } - if (BOPConfiguration.bogGen) { + if (BOPConfiguration.BiomeGen.bogGen) { registerBiome(Biomes.bog); } - if (BOPConfiguration.borealForestGen) { + if (BOPConfiguration.BiomeGen.borealForestGen) { registerBiome(Biomes.borealForest); } - if (BOPConfiguration.brushlandGen) { + if (BOPConfiguration.BiomeGen.brushlandGen) { registerBiome(Biomes.brushland); } - if (BOPConfiguration.canyonGen) { + if (BOPConfiguration.BiomeGen.canyonGen) { registerBiome(Biomes.canyon); } - if (BOPConfiguration.chaparralGen) { + if (BOPConfiguration.BiomeGen.chaparralGen) { registerBiome(Biomes.chaparral); } - if (BOPConfiguration.cherryBlossomGroveGen) { + if (BOPConfiguration.BiomeGen.cherryBlossomGroveGen) { registerBiome(Biomes.cherryBlossomGrove); } - if (BOPConfiguration.coniferousForestGen) { + if (BOPConfiguration.BiomeGen.coniferousForestGen) { registerBiome(Biomes.coniferousForest); } - if (BOPConfiguration.coniferousForestSnowGen) { + if (BOPConfiguration.BiomeGen.coniferousForestSnowGen) { registerBiome(Biomes.coniferousForestSnow); } - if (BOPConfiguration.cragGen) { + if (BOPConfiguration.BiomeGen.cragGen) { registerBiome(Biomes.crag); } - if (BOPConfiguration.deadForestGen) { + if (BOPConfiguration.BiomeGen.deadForestGen) { registerBiome(Biomes.deadForest); } - if (BOPConfiguration.deadForestSnowGen) { + if (BOPConfiguration.BiomeGen.deadForestSnowGen) { registerBiome(Biomes.deadForestSnow); } - if (BOPConfiguration.deadSwampGen) { + if (BOPConfiguration.BiomeGen.deadSwampGen) { registerBiome(Biomes.deadSwamp); } - if (BOPConfiguration.deadlandsGen) { + if (BOPConfiguration.BiomeGen.deadlandsGen) { registerBiome(Biomes.deadlands); } - if (BOPConfiguration.deciduousForestGen) { + if (BOPConfiguration.BiomeGen.deciduousForestGen) { registerBiome(Biomes.deciduousForest); } - if (BOPConfiguration.dunesGen) { + if (BOPConfiguration.BiomeGen.dunesGen) { registerBiome(Biomes.dunes); } - if (BOPConfiguration.fenGen) { + if (BOPConfiguration.BiomeGen.fenGen) { registerBiome(Biomes.fen); } - if (BOPConfiguration.fieldGen) { + if (BOPConfiguration.BiomeGen.fieldGen) { registerBiome(Biomes.field); } - if (BOPConfiguration.frostForestGen) { + if (BOPConfiguration.BiomeGen.frostForestGen) { registerBiome(Biomes.frostForest); } - if (BOPConfiguration.fungiForestGen) { + if (BOPConfiguration.BiomeGen.fungiForestGen) { registerBiome(Biomes.fungiForest); } - if (BOPConfiguration.gardenGen) { + if (BOPConfiguration.BiomeGen.gardenGen) { registerBiome(Biomes.garden); } - if (BOPConfiguration.glacierGen) { + if (BOPConfiguration.BiomeGen.glacierGen) { registerBiome(Biomes.glacier); } - if (BOPConfiguration.grasslandGen) { + if (BOPConfiguration.BiomeGen.grasslandGen) { registerBiome(Biomes.grassland); } - if (BOPConfiguration.groveGen) { + if (BOPConfiguration.BiomeGen.groveGen) { registerBiome(Biomes.grove); } - if (BOPConfiguration.heathlandGen) { + if (BOPConfiguration.BiomeGen.heathlandGen) { registerBiome(Biomes.heathland); } - if (BOPConfiguration.highlandGen) { + if (BOPConfiguration.BiomeGen.highlandGen) { registerBiome(Biomes.highland); } - if (BOPConfiguration.hotSpringsGen) { + if (BOPConfiguration.BiomeGen.hotSpringsGen) { registerBiome(Biomes.hotSprings); } - if (BOPConfiguration.icyHillsGen) { + if (BOPConfiguration.BiomeGen.icyHillsGen) { registerBiome(Biomes.icyHills); } - if (BOPConfiguration.jadeCliffsGen) { + if (BOPConfiguration.BiomeGen.jadeCliffsGen) { registerBiome(Biomes.jadeCliffs); } - if (BOPConfiguration.lushDesertGen) { + if (BOPConfiguration.BiomeGen.lushDesertGen) { registerBiome(Biomes.lushDesert); } - if (BOPConfiguration.lushSwampGen) { + if (BOPConfiguration.BiomeGen.lushSwampGen) { registerBiome(Biomes.lushSwamp); } - if (BOPConfiguration.mangroveGen) { + if (BOPConfiguration.BiomeGen.mangroveGen) { registerBiome(Biomes.mangrove); } - if (BOPConfiguration.mapleWoodsGen) { + if (BOPConfiguration.BiomeGen.mapleWoodsGen) { registerBiome(Biomes.mapleWoods); } - if (BOPConfiguration.marshGen) { + if (BOPConfiguration.BiomeGen.marshGen) { registerBiome(Biomes.marsh); } - if (BOPConfiguration.meadowGen) { + if (BOPConfiguration.BiomeGen.meadowGen) { registerBiome(Biomes.meadow); } - if (BOPConfiguration.mesaGen) { + if (BOPConfiguration.BiomeGen.mesaGen) { registerBiome(Biomes.mesa); } - if (BOPConfiguration.moorGen) { + if (BOPConfiguration.BiomeGen.moorGen) { registerBiome(Biomes.moor); } - if (BOPConfiguration.mountainGen) { + if (BOPConfiguration.BiomeGen.mountainGen) { registerBiome(Biomes.mountain); } - // if (BOPConfiguration.mushroomIslandGen) + // if (BOPConfiguration.BiomeGen.mushroomIslandGen) // GameRegistry.addBiome(BiomeGenBase.mushroomIsland); - if (BOPConfiguration.mysticGroveGen) { + if (BOPConfiguration.BiomeGen.mysticGroveGen) { registerBiome(Biomes.mysticGrove); } - if (BOPConfiguration.oasisGen) { + if (BOPConfiguration.BiomeGen.oasisGen) { registerBiome(Biomes.oasis); } - if (BOPConfiguration.ominousWoodsGen) { + if (BOPConfiguration.BiomeGen.ominousWoodsGen) { registerBiome(Biomes.ominousWoods); } - if (BOPConfiguration.orchardGen) { + if (BOPConfiguration.BiomeGen.orchardGen) { registerBiome(Biomes.orchard); } - if (BOPConfiguration.originValleyGen) { + if (BOPConfiguration.BiomeGen.originValleyGen) { registerBiome(Biomes.originValley); } - if (BOPConfiguration.outbackGen) { + if (BOPConfiguration.BiomeGen.outbackGen) { registerBiome(Biomes.outback); } - if (BOPConfiguration.pastureGen) { + if (BOPConfiguration.BiomeGen.pastureGen) { registerBiome(Biomes.pasture); } - if (BOPConfiguration.polarGen) { + if (BOPConfiguration.BiomeGen.polarGen) { registerBiome(Biomes.polar); } - if (BOPConfiguration.prairieGen) { + if (BOPConfiguration.BiomeGen.prairieGen) { registerBiome(Biomes.prairie); } - if (BOPConfiguration.quagmireGen) { + if (BOPConfiguration.BiomeGen.quagmireGen) { registerBiome(Biomes.quagmire); } - if (BOPConfiguration.rainforestGen) { + if (BOPConfiguration.BiomeGen.rainforestGen) { registerBiome(Biomes.rainforest); } - if (BOPConfiguration.redwoodForestGen) { + if (BOPConfiguration.BiomeGen.redwoodForestGen) { registerBiome(Biomes.redwoodForest); } - if (BOPConfiguration.sacredSpringsGen) { + if (BOPConfiguration.BiomeGen.sacredSpringsGen) { registerBiome(Biomes.sacredSprings); } - if (BOPConfiguration.savannaGen) { + if (BOPConfiguration.BiomeGen.savannaGen) { registerBiome(Biomes.savanna); } - if (BOPConfiguration.scrublandGen) { + if (BOPConfiguration.BiomeGen.scrublandGen) { registerBiome(Biomes.scrubland); } - if (BOPConfiguration.seasonalForestGen) { + if (BOPConfiguration.BiomeGen.seasonalForestGen) { registerBiome(Biomes.seasonalForest); } - if (BOPConfiguration.shieldGen) { + if (BOPConfiguration.BiomeGen.shieldGen) { registerBiome(Biomes.shield); } - if (BOPConfiguration.shrublandGen) { + if (BOPConfiguration.BiomeGen.shrublandGen) { registerBiome(Biomes.shrubland); } - if (BOPConfiguration.sludgepitGen) { + if (BOPConfiguration.BiomeGen.sludgepitGen) { registerBiome(Biomes.sludgepit); } - if (BOPConfiguration.spruceWoodsGen) { + if (BOPConfiguration.BiomeGen.spruceWoodsGen) { registerBiome(Biomes.spruceWoods); } - if (BOPConfiguration.steppeGen) { + if (BOPConfiguration.BiomeGen.steppeGen) { registerBiome(Biomes.steppe); } - if (BOPConfiguration.temperateRainforestGen) { + if (BOPConfiguration.BiomeGen.temperateRainforestGen) { registerBiome(Biomes.temperateRainforest); } - if (BOPConfiguration.thicketGen) { + if (BOPConfiguration.BiomeGen.thicketGen) { registerBiome(Biomes.thicket); } - if (BOPConfiguration.timberGen) { + if (BOPConfiguration.BiomeGen.timberGen) { registerBiome(Biomes.timber); } - if (BOPConfiguration.tropicalRainforestGen) { + if (BOPConfiguration.BiomeGen.tropicalRainforestGen) { registerBiome(Biomes.tropicalRainforest); } - if (BOPConfiguration.tropicsGen) { + if (BOPConfiguration.BiomeGen.tropicsGen) { registerBiome(Biomes.tropics); } - if (BOPConfiguration.tundraGen) { + if (BOPConfiguration.BiomeGen.tundraGen) { registerBiome(Biomes.tundra); } - if (BOPConfiguration.volcanoGen) { + if (BOPConfiguration.BiomeGen.volcanoGen) { registerBiome(Biomes.volcano); } - if (BOPConfiguration.wastelandGen) { + if (BOPConfiguration.BiomeGen.wastelandGen) { registerBiome(Biomes.wasteland); } - if (BOPConfiguration.wetlandGen) { + if (BOPConfiguration.BiomeGen.wetlandGen) { registerBiome(Biomes.wetland); } - if (BOPConfiguration.woodlandGen) { + if (BOPConfiguration.BiomeGen.woodlandGen) { registerBiome(Biomes.woodland); } // Vanilla biomes generation - if (BOPConfiguration.plainsGen) + if (BOPConfiguration.BiomeGen.plainsGen) { - if (BOPConfiguration.vanillaEnhanced) + if (BOPConfiguration.TerrainGen.vanillaEnhanced) { registerBiome(Biomes.plainsNew); GameRegistry.removeBiome(BiomeGenBase.plains); @@ -860,9 +861,9 @@ public class BOPBiomes { GameRegistry.removeBiome(BiomeGenBase.plains); } - if (BOPConfiguration.desertGen) + if (BOPConfiguration.BiomeGen.desertGen) { - if (BOPConfiguration.vanillaEnhanced) + if (BOPConfiguration.TerrainGen.vanillaEnhanced) { registerBiome(Biomes.desertNew); GameRegistry.removeBiome(BiomeGenBase.desert); @@ -871,9 +872,9 @@ public class BOPBiomes { GameRegistry.removeBiome(BiomeGenBase.desert); } - if (BOPConfiguration.extremeHillsGen) + if (BOPConfiguration.BiomeGen.extremeHillsGen) { - if (BOPConfiguration.vanillaEnhanced) + if (BOPConfiguration.TerrainGen.vanillaEnhanced) { registerBiome(Biomes.extremeHillsNew); GameRegistry.removeBiome(BiomeGenBase.extremeHills); @@ -882,9 +883,9 @@ public class BOPBiomes { GameRegistry.removeBiome(BiomeGenBase.extremeHills); } - if (BOPConfiguration.forestGen) + if (BOPConfiguration.BiomeGen.forestGen) { - if (BOPConfiguration.vanillaEnhanced) + if (BOPConfiguration.TerrainGen.vanillaEnhanced) { registerBiome(Biomes.forestNew); GameRegistry.removeBiome(BiomeGenBase.forest); @@ -893,9 +894,9 @@ public class BOPBiomes { GameRegistry.removeBiome(BiomeGenBase.forest); } - if (BOPConfiguration.taigaGen) + if (BOPConfiguration.BiomeGen.taigaGen) { - if (BOPConfiguration.vanillaEnhanced) + if (BOPConfiguration.TerrainGen.vanillaEnhanced) { registerBiome(Biomes.taigaNew); GameRegistry.removeBiome(BiomeGenBase.taiga); @@ -904,9 +905,9 @@ public class BOPBiomes { GameRegistry.removeBiome(BiomeGenBase.taiga); } - if (BOPConfiguration.swamplandGen) + if (BOPConfiguration.BiomeGen.swamplandGen) { - if (BOPConfiguration.vanillaEnhanced) + if (BOPConfiguration.TerrainGen.vanillaEnhanced) { registerBiome(Biomes.swamplandNew); GameRegistry.removeBiome(BiomeGenBase.swampland); @@ -915,9 +916,9 @@ public class BOPBiomes { GameRegistry.removeBiome(BiomeGenBase.swampland); } - if (BOPConfiguration.jungleGen) + if (BOPConfiguration.BiomeGen.jungleGen) { - if (BOPConfiguration.vanillaEnhanced) + if (BOPConfiguration.TerrainGen.vanillaEnhanced) { registerBiome(Biomes.jungleNew); GameRegistry.removeBiome(BiomeGenBase.jungle); @@ -930,306 +931,306 @@ public class BOPBiomes { private static void addBiomes() { - if (BOPConfiguration.alpsGen) { + if (BOPConfiguration.BiomeGen.alpsGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.alps); } - if (BOPConfiguration.arcticGen) { + if (BOPConfiguration.BiomeGen.arcticGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.arctic); } - if (BOPConfiguration.badlandsGen) { + if (BOPConfiguration.BiomeGen.badlandsGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.badlands); } - if (BOPConfiguration.bambooForestGen) { + if (BOPConfiguration.BiomeGen.bambooForestGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.bambooForest); } - if (BOPConfiguration.bayouGen) { + if (BOPConfiguration.BiomeGen.bayouGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.bayou); } - if (BOPConfiguration.birchForestGen) { + if (BOPConfiguration.BiomeGen.birchForestGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.birchForest); } - if (BOPConfiguration.bogGen) { + if (BOPConfiguration.BiomeGen.bogGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.bog); } - if (BOPConfiguration.borealForestGen) { + if (BOPConfiguration.BiomeGen.borealForestGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.borealForest); } - if (BOPConfiguration.brushlandGen) { + if (BOPConfiguration.BiomeGen.brushlandGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.brushland); } - if (BOPConfiguration.canyonGen) { + if (BOPConfiguration.BiomeGen.canyonGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.canyon); } - if (BOPConfiguration.chaparralGen) { + if (BOPConfiguration.BiomeGen.chaparralGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.chaparral); } - if (BOPConfiguration.cherryBlossomGroveGen) { + if (BOPConfiguration.BiomeGen.cherryBlossomGroveGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.cherryBlossomGrove); } - if (BOPConfiguration.coniferousForestGen) { + if (BOPConfiguration.BiomeGen.coniferousForestGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.coniferousForest); } - if (BOPConfiguration.coniferousForestSnowGen) { + if (BOPConfiguration.BiomeGen.coniferousForestSnowGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.coniferousForestSnow); } - if (BOPConfiguration.cragGen) { + if (BOPConfiguration.BiomeGen.cragGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.crag); } - if (BOPConfiguration.deadForestGen) { + if (BOPConfiguration.BiomeGen.deadForestGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.deadForest); } - if (BOPConfiguration.deadForestSnowGen) { + if (BOPConfiguration.BiomeGen.deadForestSnowGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.deadForestSnow); } - if (BOPConfiguration.deadSwampGen) { + if (BOPConfiguration.BiomeGen.deadSwampGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.deadSwamp); } - if (BOPConfiguration.deadlandsGen) { + if (BOPConfiguration.BiomeGen.deadlandsGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.deadlands); } - if (BOPConfiguration.deciduousForestGen) { + if (BOPConfiguration.BiomeGen.deciduousForestGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.deciduousForest); } - if (BOPConfiguration.dunesGen) { + if (BOPConfiguration.BiomeGen.dunesGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.dunes); } - if (BOPConfiguration.fenGen) { + if (BOPConfiguration.BiomeGen.fenGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.fen); } - if (BOPConfiguration.fieldGen) { + if (BOPConfiguration.BiomeGen.fieldGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.field); } - if (BOPConfiguration.frostForestGen) { + if (BOPConfiguration.BiomeGen.frostForestGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.frostForest); } - if (BOPConfiguration.fungiForestGen) { + if (BOPConfiguration.BiomeGen.fungiForestGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.fungiForest); } - if (BOPConfiguration.gardenGen) { + if (BOPConfiguration.BiomeGen.gardenGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.garden); } - if (BOPConfiguration.glacierGen) { + if (BOPConfiguration.BiomeGen.glacierGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.glacier); } - if (BOPConfiguration.grasslandGen) { + if (BOPConfiguration.BiomeGen.grasslandGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.grassland); } - if (BOPConfiguration.groveGen) { + if (BOPConfiguration.BiomeGen.groveGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.grove); } - if (BOPConfiguration.heathlandGen) { + if (BOPConfiguration.BiomeGen.heathlandGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.heathland); } - if (BOPConfiguration.highlandGen) { + if (BOPConfiguration.BiomeGen.highlandGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.highland); } - if (BOPConfiguration.hotSpringsGen) { + if (BOPConfiguration.BiomeGen.hotSpringsGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.hotSprings); } - if (BOPConfiguration.icyHillsGen) { + if (BOPConfiguration.BiomeGen.icyHillsGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.icyHills); } - if (BOPConfiguration.jadeCliffsGen) { + if (BOPConfiguration.BiomeGen.jadeCliffsGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.jadeCliffs); } - if (BOPConfiguration.lushDesertGen) { + if (BOPConfiguration.BiomeGen.lushDesertGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.lushDesert); } - if (BOPConfiguration.lushSwampGen) { + if (BOPConfiguration.BiomeGen.lushSwampGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.lushSwamp); } - if (BOPConfiguration.mangroveGen) { + if (BOPConfiguration.BiomeGen.mangroveGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.mangrove); } - if (BOPConfiguration.mapleWoodsGen) { + if (BOPConfiguration.BiomeGen.mapleWoodsGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.mapleWoods); } - if (BOPConfiguration.marshGen) { + if (BOPConfiguration.BiomeGen.marshGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.marsh); } - if (BOPConfiguration.meadowGen) { + if (BOPConfiguration.BiomeGen.meadowGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.meadow); } - if (BOPConfiguration.mesaGen) { + if (BOPConfiguration.BiomeGen.mesaGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.mesa); } - if (BOPConfiguration.moorGen) { + if (BOPConfiguration.BiomeGen.moorGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.moor); } - if (BOPConfiguration.mountainGen) { + if (BOPConfiguration.BiomeGen.mountainGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.mountain); } - if (BOPConfiguration.mysticGroveGen) { + if (BOPConfiguration.BiomeGen.mysticGroveGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.mysticGrove); } - if (BOPConfiguration.oasisGen) { + if (BOPConfiguration.BiomeGen.oasisGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.oasis); } - if (BOPConfiguration.ominousWoodsGen) { + if (BOPConfiguration.BiomeGen.ominousWoodsGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.ominousWoods); } - if (BOPConfiguration.orchardGen) { + if (BOPConfiguration.BiomeGen.orchardGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.orchard); } - if (BOPConfiguration.originValleyGen) { + if (BOPConfiguration.BiomeGen.originValleyGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.originValley); } - if (BOPConfiguration.outbackGen) { + if (BOPConfiguration.BiomeGen.outbackGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.outback); } - if (BOPConfiguration.pastureGen) { + if (BOPConfiguration.BiomeGen.pastureGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.pasture); } - if (BOPConfiguration.polarGen) { + if (BOPConfiguration.BiomeGen.polarGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.polar); } - if (BOPConfiguration.prairieGen) { + if (BOPConfiguration.BiomeGen.prairieGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.prairie); } - if (BOPConfiguration.quagmireGen) { + if (BOPConfiguration.BiomeGen.quagmireGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.quagmire); } - if (BOPConfiguration.rainforestGen) { + if (BOPConfiguration.BiomeGen.rainforestGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.rainforest); } - if (BOPConfiguration.redwoodForestGen) { + if (BOPConfiguration.BiomeGen.redwoodForestGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.redwoodForest); } - if (BOPConfiguration.sacredSpringsGen) { + if (BOPConfiguration.BiomeGen.sacredSpringsGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.sacredSprings); } - if (BOPConfiguration.savannaGen) { + if (BOPConfiguration.BiomeGen.savannaGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.savanna); } - if (BOPConfiguration.scrublandGen) { + if (BOPConfiguration.BiomeGen.scrublandGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.scrubland); } - if (BOPConfiguration.seasonalForestGen) { + if (BOPConfiguration.BiomeGen.seasonalForestGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.seasonalForest); } - if (BOPConfiguration.shieldGen) { + if (BOPConfiguration.BiomeGen.shieldGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.shield); } - if (BOPConfiguration.shrublandGen) { + if (BOPConfiguration.BiomeGen.shrublandGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.shrubland); } - if (BOPConfiguration.sludgepitGen) { + if (BOPConfiguration.BiomeGen.sludgepitGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.sludgepit); } - if (BOPConfiguration.spruceWoodsGen) { + if (BOPConfiguration.BiomeGen.spruceWoodsGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.spruceWoods); } - if (BOPConfiguration.steppeGen) { + if (BOPConfiguration.BiomeGen.steppeGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.steppe); } - if (BOPConfiguration.temperateRainforestGen) { + if (BOPConfiguration.BiomeGen.temperateRainforestGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.temperateRainforest); } - if (BOPConfiguration.thicketGen) { + if (BOPConfiguration.BiomeGen.thicketGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.thicket); } - if (BOPConfiguration.timberGen) { + if (BOPConfiguration.BiomeGen.timberGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.timber); } - if (BOPConfiguration.tropicalRainforestGen) { + if (BOPConfiguration.BiomeGen.tropicalRainforestGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.tropicalRainforest); } - if (BOPConfiguration.tropicsGen) { + if (BOPConfiguration.BiomeGen.tropicsGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.tropics); } - if (BOPConfiguration.tundraGen) { + if (BOPConfiguration.BiomeGen.tundraGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.tundra); } - if (BOPConfiguration.volcanoGen) { + if (BOPConfiguration.BiomeGen.volcanoGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.volcano); } - if (BOPConfiguration.wastelandGen) { + if (BOPConfiguration.BiomeGen.wastelandGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.wasteland); } - if (BOPConfiguration.wetlandGen) { + if (BOPConfiguration.BiomeGen.wetlandGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.wetland); } - if (BOPConfiguration.woodlandGen) { + if (BOPConfiguration.BiomeGen.woodlandGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.woodland); } // Vanilla biomes generation - if (BOPConfiguration.plainsGen) + if (BOPConfiguration.BiomeGen.plainsGen) { - if (BOPConfiguration.vanillaEnhanced) + if (BOPConfiguration.TerrainGen.vanillaEnhanced) { addBiomeToWorldTypes(getWorldTypes(), Biomes.plainsNew); removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.plains); @@ -1238,9 +1239,9 @@ public class BOPBiomes { removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.plains); } - if (BOPConfiguration.desertGen) + if (BOPConfiguration.BiomeGen.desertGen) { - if (BOPConfiguration.vanillaEnhanced) + if (BOPConfiguration.TerrainGen.vanillaEnhanced) { addBiomeToWorldTypes(getWorldTypes(), Biomes.desertNew); removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.desert); @@ -1249,9 +1250,9 @@ public class BOPBiomes { removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.desert); } - if (BOPConfiguration.extremeHillsGen) + if (BOPConfiguration.BiomeGen.extremeHillsGen) { - if (BOPConfiguration.vanillaEnhanced) + if (BOPConfiguration.TerrainGen.vanillaEnhanced) { addBiomeToWorldTypes(getWorldTypes(), Biomes.extremeHillsNew); removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.extremeHills); @@ -1260,9 +1261,9 @@ public class BOPBiomes { removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.extremeHills); } - if (BOPConfiguration.forestGen) + if (BOPConfiguration.BiomeGen.forestGen) { - if (BOPConfiguration.vanillaEnhanced) + if (BOPConfiguration.TerrainGen.vanillaEnhanced) { addBiomeToWorldTypes(getWorldTypes(), Biomes.forestNew); removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.forest); @@ -1271,9 +1272,9 @@ public class BOPBiomes { removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.forest); } - if (BOPConfiguration.taigaGen) + if (BOPConfiguration.BiomeGen.taigaGen) { - if (BOPConfiguration.vanillaEnhanced) + if (BOPConfiguration.TerrainGen.vanillaEnhanced) { addBiomeToWorldTypes(getWorldTypes(), Biomes.taigaNew); removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.taiga); @@ -1282,9 +1283,9 @@ public class BOPBiomes { removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.taiga); } - if (BOPConfiguration.swamplandGen) + if (BOPConfiguration.BiomeGen.swamplandGen) { - if (BOPConfiguration.vanillaEnhanced) + if (BOPConfiguration.TerrainGen.vanillaEnhanced) { addBiomeToWorldTypes(getWorldTypes(), Biomes.swamplandNew); removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.swampland); @@ -1293,9 +1294,9 @@ public class BOPBiomes { removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.swampland); } - if (BOPConfiguration.jungleGen) + if (BOPConfiguration.BiomeGen.jungleGen) { - if (BOPConfiguration.vanillaEnhanced) + if (BOPConfiguration.TerrainGen.vanillaEnhanced) { addBiomeToWorldTypes(getWorldTypes(), Biomes.jungleNew); removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.jungle); @@ -1307,7 +1308,7 @@ public class BOPBiomes { public static Set getWorldTypes() { if (worldTypes.isEmpty()) { - if (BOPConfiguration.addToDefault) + if (BOPConfiguration.TerrainGen.addToDefault) { worldTypes.add(WorldType.DEFAULT); worldTypes.add(WorldType.LARGE_BIOMES); diff --git a/src/minecraft/biomesoplenty/configuration/BOPBlocks.java b/src/minecraft/biomesoplenty/configuration/BOPBlocks.java index 4c97a6c2d..bff4f00cb 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPBlocks.java +++ b/src/minecraft/biomesoplenty/configuration/BOPBlocks.java @@ -118,87 +118,87 @@ public class BOPBlocks private static void initializeBlocks() { // Block declaration - Blocks.mud = Optional.of((new BlockMud(BOPConfiguration.mudID)).setHardness(0.6F).setStepSound(Block.soundSandFootstep).setUnlocalizedName("bop.mud")); - Blocks.driedDirt = Optional.of(new BlockBOPGeneric(BOPConfiguration.driedDirtID, Material.rock, BlockType.DRIED_DIRT).setUnlocalizedName("bop.generic")); - Blocks.redRock = Optional.of((new BlockBOPRedRock(BOPConfiguration.redRockID)).setUnlocalizedName("bop.redRocks")); - Blocks.ash = Optional.of((new BlockAsh(BOPConfiguration.ashID)).setHardness(0.4F).setStepSound(Block.soundSandFootstep).setUnlocalizedName("bop.ash")); - Blocks.plants = Optional.of((new BlockBOPPlant(BOPConfiguration.plantsID)).setUnlocalizedName("bop.plants")); - Blocks.flowers = Optional.of((new BlockBOPFlower(BOPConfiguration.flowersID)).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.flowers")); - Blocks.mushrooms = Optional.of((new BlockBOPMushroom(BOPConfiguration.mushroomsID)).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.mushrooms")); - Blocks.coral = Optional.of((new BlockBOPCoral(BOPConfiguration.coralID)).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.coral")); - Blocks.willow = Optional.of((new BlockWillow(BOPConfiguration.willowID)).setHardness(0.2F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.willow")); - Blocks.ivy = Optional.of((new BlockIvy(BOPConfiguration.ivyID)).setHardness(0.2F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.ivy")); - Blocks.leaves1 = Optional.of((new BlockBOPLeaves(BOPConfiguration.leaves1ID, LeafCategory.CAT1)).setUnlocalizedName("bop.leaves1")); - Blocks.leaves2 = Optional.of((new BlockBOPLeaves(BOPConfiguration.leaves2ID, LeafCategory.CAT2)).setUnlocalizedName("bop.leaves2")); - Blocks.foliage = Optional.of((new BlockBOPFoliage(BOPConfiguration.foliageID)).setUnlocalizedName("bop.foliage")); - Blocks.ashStone = Optional.of(new BlockBOPGeneric(BOPConfiguration.ashStoneID, Material.rock, BlockType.ASH_STONE)); - Blocks.hardIce = Optional.of(new BlockBOPGeneric(BOPConfiguration.hardIceID, Material.rock, BlockType.HARD_ICE)); - Blocks.leavesFruit = Optional.of((new BlockBOPAppleLeaves(BOPConfiguration.leavesFruitID)).setUnlocalizedName("bop.leavesFruit")); - Blocks.bamboo = Optional.of(new BlockBamboo(BOPConfiguration.bambooID).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.bamboo")); - Blocks.mudBrick = Optional.of(new BlockBOPGeneric(BOPConfiguration.mudBrickBlockID, Material.rock, BlockType.MUD_BRICK)); - Blocks.mudBricksStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.mudBrickStairsID, Blocks.redRock.get(), Category.MUD_BRICKS)).setUnlocalizedName("bop.mudBricksStairs")); - Blocks.stoneDoubleSlab = Optional.of((BlockHalfSlab)(new BlockBOPSlab(BOPConfiguration.stoneDoubleSlabID, true, Material.rock, SlabCategory.STONE)).setUnlocalizedName("bop.stoneDoubleSlab")); - Blocks.stoneSingleSlab = Optional.of((BlockHalfSlab)(new BlockBOPSlab(BOPConfiguration.stoneSingleSlabID, false, Material.rock, SlabCategory.STONE)).setUnlocalizedName("bop.stoneSingleSlab")); - Blocks.originGrass = Optional.of((new BlockOriginGrass(BOPConfiguration.originGrassID)).setHardness(0.6F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.originGrass")); - Blocks.longGrass = Optional.of((new BlockLongGrass(BOPConfiguration.longGrassID)).setHardness(0.6F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.longGrass")); - Blocks.treeMoss = Optional.of((new BlockTreeMoss(BOPConfiguration.treeMossID)).setHardness(0.2F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.treeMoss")); - Blocks.logs1 = Optional.of((new BlockBOPLog(BOPConfiguration.logs1ID,LogCategory.CAT1)).setUnlocalizedName("bop.wood1")); - Blocks.logs2 = Optional.of((new BlockBOPLog(BOPConfiguration.logs2ID,LogCategory.CAT2)).setUnlocalizedName("bop.wood2")); - Blocks.logs3 = Optional.of((new BlockBOPLog(BOPConfiguration.logs3ID,LogCategory.CAT3)).setUnlocalizedName("bop.wood3")); - Blocks.logs4 = Optional.of((new BlockBOPLog(BOPConfiguration.logs4ID,LogCategory.CAT4)).setUnlocalizedName("bop.wood4")); - Blocks.petals = Optional.of((new BlockBOPPetals(BOPConfiguration.petalsID)).setUnlocalizedName("bop.petals")); - Blocks.saplings = Optional.of((new BlockBOPSapling(BOPConfiguration.saplingsID)).setUnlocalizedName("bop.saplings")); - Blocks.colorizedSaplings = Optional.of((new BlockBOPColorizedSapling(BOPConfiguration.colourizedSaplingsID)).setUnlocalizedName("bop.colorizedSaplings")); - Blocks.redCobbleStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.redCobbleStairsID, Blocks.redRock.get(), Category.RED_COBBLE)).setUnlocalizedName("bop.redCobbleStairs")); - Blocks.redBricksStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.redBrickStairsID, Blocks.redRock.get(), Category.RED_BRICKS)).setUnlocalizedName("bop.redBricksStairs")); - Blocks.hardSand = Optional.of(new BlockBOPGeneric(BOPConfiguration.hardSandID, Material.sand, BlockType.HARD_SAND)); - Blocks.hardDirt = Optional.of(new BlockBOPGeneric(BOPConfiguration.hardDirtID, Material.rock, BlockType.HARD_DIRT)); - Blocks.holyGrass = Optional.of(new BlockBOPGrass(BOPConfiguration.holyGrassID).setUnlocalizedName("bop.holyGrass")); - Blocks.holyDirt = Optional.of(new BlockBOPGeneric(BOPConfiguration.holyDirtID, Material.sand, BlockType.HOLY_DIRT)); - Blocks.holyStone = Optional.of((new BlockBOPSkystone(BOPConfiguration.holyStoneID)).setUnlocalizedName("bop.holyStone")); - Blocks.holyCobbleStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.holyCobbleStairsID, Blocks.holyStone.get(), Category.HOLY_COBBLE)).setUnlocalizedName("bop.holyCobbleStairs")); - Blocks.holyBricksStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.holyBrickStairsID, Blocks.holyStone.get(), Category.HOLY_BRICKS)).setUnlocalizedName("bop.holyBricksStairs")); - Blocks.crystal = Optional.of(new BlockBOPGeneric(BOPConfiguration.crystalID, Material.glass, BlockType.CRYSTAL)); - Blocks.promisedPortal = Optional.of(new BlockPromisedPortal(BOPConfiguration.promisedLandPortalID).setUnlocalizedName("bop.promisedPortal").setBlockUnbreakable().setResistance(6000000.0F).setLightValue(1.0F)); + Blocks.mud = Optional.of((new BlockMud(BOPConfiguration.IDs.mudID)).setHardness(0.6F).setStepSound(Block.soundSandFootstep).setUnlocalizedName("bop.mud")); + Blocks.driedDirt = Optional.of(new BlockBOPGeneric(BOPConfiguration.IDs.driedDirtID, Material.rock, BlockType.DRIED_DIRT).setUnlocalizedName("bop.generic")); + Blocks.redRock = Optional.of((new BlockBOPRedRock(BOPConfiguration.IDs.redRockID)).setUnlocalizedName("bop.redRocks")); + Blocks.ash = Optional.of((new BlockAsh(BOPConfiguration.IDs.ashID)).setHardness(0.4F).setStepSound(Block.soundSandFootstep).setUnlocalizedName("bop.ash")); + Blocks.plants = Optional.of((new BlockBOPPlant(BOPConfiguration.IDs.plantsID)).setUnlocalizedName("bop.plants")); + Blocks.flowers = Optional.of((new BlockBOPFlower(BOPConfiguration.IDs.flowersID)).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.flowers")); + Blocks.mushrooms = Optional.of((new BlockBOPMushroom(BOPConfiguration.IDs.mushroomsID)).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.mushrooms")); + Blocks.coral = Optional.of((new BlockBOPCoral(BOPConfiguration.IDs.coralID)).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.coral")); + Blocks.willow = Optional.of((new BlockWillow(BOPConfiguration.IDs.willowID)).setHardness(0.2F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.willow")); + Blocks.ivy = Optional.of((new BlockIvy(BOPConfiguration.IDs.ivyID)).setHardness(0.2F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.ivy")); + Blocks.leaves1 = Optional.of((new BlockBOPLeaves(BOPConfiguration.IDs.leaves1ID, LeafCategory.CAT1)).setUnlocalizedName("bop.leaves1")); + Blocks.leaves2 = Optional.of((new BlockBOPLeaves(BOPConfiguration.IDs.leaves2ID, LeafCategory.CAT2)).setUnlocalizedName("bop.leaves2")); + Blocks.foliage = Optional.of((new BlockBOPFoliage(BOPConfiguration.IDs.foliageID)).setUnlocalizedName("bop.foliage")); + Blocks.ashStone = Optional.of(new BlockBOPGeneric(BOPConfiguration.IDs.ashStoneID, Material.rock, BlockType.ASH_STONE)); + Blocks.hardIce = Optional.of(new BlockBOPGeneric(BOPConfiguration.IDs.hardIceID, Material.rock, BlockType.HARD_ICE)); + Blocks.leavesFruit = Optional.of((new BlockBOPAppleLeaves(BOPConfiguration.IDs.leavesFruitID)).setUnlocalizedName("bop.leavesFruit")); + Blocks.bamboo = Optional.of(new BlockBamboo(BOPConfiguration.IDs.bambooID).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.bamboo")); + Blocks.mudBrick = Optional.of(new BlockBOPGeneric(BOPConfiguration.IDs.mudBrickBlockID, Material.rock, BlockType.MUD_BRICK)); + Blocks.mudBricksStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.mudBrickStairsID, Blocks.redRock.get(), Category.MUD_BRICKS)).setUnlocalizedName("bop.mudBricksStairs")); + Blocks.stoneDoubleSlab = Optional.of((BlockHalfSlab)(new BlockBOPSlab(BOPConfiguration.IDs.stoneDoubleSlabID, true, Material.rock, SlabCategory.STONE)).setUnlocalizedName("bop.stoneDoubleSlab")); + Blocks.stoneSingleSlab = Optional.of((BlockHalfSlab)(new BlockBOPSlab(BOPConfiguration.IDs.stoneSingleSlabID, false, Material.rock, SlabCategory.STONE)).setUnlocalizedName("bop.stoneSingleSlab")); + Blocks.originGrass = Optional.of((new BlockOriginGrass(BOPConfiguration.IDs.originGrassID)).setHardness(0.6F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.originGrass")); + Blocks.longGrass = Optional.of((new BlockLongGrass(BOPConfiguration.IDs.longGrassID)).setHardness(0.6F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.longGrass")); + Blocks.treeMoss = Optional.of((new BlockTreeMoss(BOPConfiguration.IDs.treeMossID)).setHardness(0.2F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.treeMoss")); + Blocks.logs1 = Optional.of((new BlockBOPLog(BOPConfiguration.IDs.logs1ID,LogCategory.CAT1)).setUnlocalizedName("bop.wood1")); + Blocks.logs2 = Optional.of((new BlockBOPLog(BOPConfiguration.IDs.logs2ID,LogCategory.CAT2)).setUnlocalizedName("bop.wood2")); + Blocks.logs3 = Optional.of((new BlockBOPLog(BOPConfiguration.IDs.logs3ID,LogCategory.CAT3)).setUnlocalizedName("bop.wood3")); + Blocks.logs4 = Optional.of((new BlockBOPLog(BOPConfiguration.IDs.logs4ID,LogCategory.CAT4)).setUnlocalizedName("bop.wood4")); + Blocks.petals = Optional.of((new BlockBOPPetals(BOPConfiguration.IDs.petalsID)).setUnlocalizedName("bop.petals")); + Blocks.saplings = Optional.of((new BlockBOPSapling(BOPConfiguration.IDs.saplingsID)).setUnlocalizedName("bop.saplings")); + Blocks.colorizedSaplings = Optional.of((new BlockBOPColorizedSapling(BOPConfiguration.IDs.colourizedSaplingsID)).setUnlocalizedName("bop.colorizedSaplings")); + Blocks.redCobbleStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.redCobbleStairsID, Blocks.redRock.get(), Category.RED_COBBLE)).setUnlocalizedName("bop.redCobbleStairs")); + Blocks.redBricksStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.redBrickStairsID, Blocks.redRock.get(), Category.RED_BRICKS)).setUnlocalizedName("bop.redBricksStairs")); + Blocks.hardSand = Optional.of(new BlockBOPGeneric(BOPConfiguration.IDs.hardSandID, Material.sand, BlockType.HARD_SAND)); + Blocks.hardDirt = Optional.of(new BlockBOPGeneric(BOPConfiguration.IDs.hardDirtID, Material.rock, BlockType.HARD_DIRT)); + Blocks.holyGrass = Optional.of(new BlockBOPGrass(BOPConfiguration.IDs.holyGrassID).setUnlocalizedName("bop.holyGrass")); + Blocks.holyDirt = Optional.of(new BlockBOPGeneric(BOPConfiguration.IDs.holyDirtID, Material.sand, BlockType.HOLY_DIRT)); + Blocks.holyStone = Optional.of((new BlockBOPSkystone(BOPConfiguration.IDs.holyStoneID)).setUnlocalizedName("bop.holyStone")); + Blocks.holyCobbleStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.holyCobbleStairsID, Blocks.holyStone.get(), Category.HOLY_COBBLE)).setUnlocalizedName("bop.holyCobbleStairs")); + Blocks.holyBricksStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.holyBrickStairsID, Blocks.holyStone.get(), Category.HOLY_BRICKS)).setUnlocalizedName("bop.holyBricksStairs")); + Blocks.crystal = Optional.of(new BlockBOPGeneric(BOPConfiguration.IDs.crystalID, Material.glass, BlockType.CRYSTAL)); + Blocks.promisedPortal = Optional.of(new BlockPromisedPortal(BOPConfiguration.IDs.promisedLandPortalID).setUnlocalizedName("bop.promisedPortal").setBlockUnbreakable().setResistance(6000000.0F).setLightValue(1.0F)); - Blocks.amethystOre = Optional.of(new BlockBOPAmethyst(BOPConfiguration.amethystOreID, Material.rock).setUnlocalizedName("bop.amethystOre")); + Blocks.amethystOre = Optional.of(new BlockBOPAmethyst(BOPConfiguration.IDs.amethystOreID, Material.rock).setUnlocalizedName("bop.amethystOre")); - Blocks.moss = Optional.of((new BlockMoss(BOPConfiguration.mossID)).setHardness(0.2F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.moss")); + Blocks.moss = Optional.of((new BlockMoss(BOPConfiguration.IDs.mossID)).setHardness(0.2F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.moss")); - Blocks.cragRock = Optional.of(new BlockBOPGeneric(BOPConfiguration.cragRockID, Material.rock, BlockType.CRAG_ROCK)); + Blocks.cragRock = Optional.of(new BlockBOPGeneric(BOPConfiguration.IDs.cragRockID, Material.rock, BlockType.CRAG_ROCK)); - Blocks.cloud = Optional.of((new BlockCloud(BOPConfiguration.cloudID)).setHardness(0.1F).setLightOpacity(3).setStepSound(Block.soundClothFootstep).setUnlocalizedName("bop.cloud")); + Blocks.cloud = Optional.of((new BlockCloud(BOPConfiguration.IDs.cloudID)).setHardness(0.1F).setLightOpacity(3).setStepSound(Block.soundClothFootstep).setUnlocalizedName("bop.cloud")); - Blocks.bones = Optional.of((new BlockBones(BOPConfiguration.bonesID)).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("bop.bones")); + Blocks.bones = Optional.of((new BlockBones(BOPConfiguration.IDs.bonesID)).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("bop.bones")); - Blocks.glass = Optional.of((new BlockBOPGlass(BOPConfiguration.glassID)).setStepSound(Block.soundGlassFootstep).setUnlocalizedName("bop.glass")); + Blocks.glass = Optional.of((new BlockBOPGlass(BOPConfiguration.IDs.glassID)).setStepSound(Block.soundGlassFootstep).setUnlocalizedName("bop.glass")); - Blocks.altar = Optional.of((new BlockAltar(BOPConfiguration.altarID)).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("bop.altar")); + Blocks.altar = Optional.of((new BlockAltar(BOPConfiguration.IDs.altarID)).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("bop.altar")); - Blocks.puddle = Optional.of((new BlockPuddle(BOPConfiguration.puddleID)).setStepSound(Block.soundGravelFootstep).setUnlocalizedName("bop.puddle")); - Blocks.grave = Optional.of((new BlockGrave(BOPConfiguration.graveID)).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("bop.grave")); + Blocks.puddle = Optional.of((new BlockPuddle(BOPConfiguration.IDs.puddleID)).setStepSound(Block.soundGravelFootstep).setUnlocalizedName("bop.puddle")); + Blocks.grave = Optional.of((new BlockGrave(BOPConfiguration.IDs.graveID)).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("bop.grave")); - Blocks.planks = Optional.of((new BlockBOPPlank(BOPConfiguration.planksID)).setResistance(5.0F).setStepSound(Block.soundWoodFootstep).setUnlocalizedName("bop.planks")); + Blocks.planks = Optional.of((new BlockBOPPlank(BOPConfiguration.IDs.planksID)).setResistance(5.0F).setStepSound(Block.soundWoodFootstep).setUnlocalizedName("bop.planks")); - Blocks.woodenDoubleSlab1 = Optional.of((BlockHalfSlab)(new BlockBOPSlab(BOPConfiguration.woodenDoubleSlab1ID, true, Material.wood, SlabCategory.WOOD1)).setUnlocalizedName("bop.woodenDoubleSlab1")); - Blocks.woodenSingleSlab1 = Optional.of((BlockHalfSlab)(new BlockBOPSlab(BOPConfiguration.woodenSingleSlab1ID, false, Material.wood, SlabCategory.WOOD1)).setUnlocalizedName("bop.woodenSingleSlab1")); - Blocks.woodenDoubleSlab2 = Optional.of((BlockHalfSlab)(new BlockBOPSlab(BOPConfiguration.woodenDoubleSlab2ID, true, Material.wood, SlabCategory.WOOD2)).setUnlocalizedName("bop.woodenDoubleSlab2")); - Blocks.woodenSingleSlab2 = Optional.of((BlockHalfSlab)(new BlockBOPSlab(BOPConfiguration.woodenSingleSlab2ID, false, Material.wood, SlabCategory.WOOD2)).setUnlocalizedName("bop.woodenSingleSlab2")); + Blocks.woodenDoubleSlab1 = Optional.of((BlockHalfSlab)(new BlockBOPSlab(BOPConfiguration.IDs.woodenDoubleSlab1ID, true, Material.wood, SlabCategory.WOOD1)).setUnlocalizedName("bop.woodenDoubleSlab1")); + Blocks.woodenSingleSlab1 = Optional.of((BlockHalfSlab)(new BlockBOPSlab(BOPConfiguration.IDs.woodenSingleSlab1ID, false, Material.wood, SlabCategory.WOOD1)).setUnlocalizedName("bop.woodenSingleSlab1")); + Blocks.woodenDoubleSlab2 = Optional.of((BlockHalfSlab)(new BlockBOPSlab(BOPConfiguration.IDs.woodenDoubleSlab2ID, true, Material.wood, SlabCategory.WOOD2)).setUnlocalizedName("bop.woodenDoubleSlab2")); + Blocks.woodenSingleSlab2 = Optional.of((BlockHalfSlab)(new BlockBOPSlab(BOPConfiguration.IDs.woodenSingleSlab2ID, false, Material.wood, SlabCategory.WOOD2)).setUnlocalizedName("bop.woodenSingleSlab2")); - Blocks.acaciaStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.acaciaStairsID, Blocks.planks.get(), Category.ACACIA)).setUnlocalizedName("bop.acaciaStairs")); - Blocks.cherryStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.cherryStairsID, Blocks.planks.get(), Category.CHERRY)).setUnlocalizedName("bop.cherryStairs")); - Blocks.darkStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.darkStairsID, Blocks.planks.get(), Category.DARK)).setUnlocalizedName("bop.darkStairs")); - Blocks.firStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.firStairsID, Blocks.planks.get(), Category.FIR)).setUnlocalizedName("bop.firStairs")); - Blocks.holyStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.holyStairsID, Blocks.planks.get(), Category.HOLY)).setUnlocalizedName("bop.holyStairs")); - Blocks.magicStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.magicStairsID, Blocks.planks.get(), Category.MAGIC)).setUnlocalizedName("bop.magicStairs")); - Blocks.mangroveStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.mangroveStairsID, Blocks.planks.get(), Category.MANGROVE)).setUnlocalizedName("bop.mangroveStairs")); - Blocks.palmStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.palmStairsID, Blocks.planks.get(), Category.PALM)).setUnlocalizedName("bop.palmStairs")); - Blocks.redwoodStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.redwoodStairsID, Blocks.planks.get(), Category.REDWOOD)).setUnlocalizedName("bop.redwoodStairs")); - Blocks.willowStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.willowStairsID, Blocks.planks.get(), Category.WILLOW)).setUnlocalizedName("bop.willowStairs")); - Blocks.pineStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.pineStairsID, Blocks.planks.get(), Category.PINE)).setUnlocalizedName("bop.pineStairs")); - Blocks.hellBarkStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.hellBarkStairsID, Blocks.planks.get(), Category.HELL_BARK)).setUnlocalizedName("bop.hellBarkStairs")); - Blocks.jacarandaStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.jacarandaStairsID, Blocks.planks.get(), Category.JACARANDA)).setUnlocalizedName("bop.jacarandaStairs")); - Blocks.leavesColorized = Optional.of((new BlockBOPColorizedLeaves(BOPConfiguration.colourizedLeavesID)).setUnlocalizedName("bop.leavesColorized")); + Blocks.acaciaStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.acaciaStairsID, Blocks.planks.get(), Category.ACACIA)).setUnlocalizedName("bop.acaciaStairs")); + Blocks.cherryStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.cherryStairsID, Blocks.planks.get(), Category.CHERRY)).setUnlocalizedName("bop.cherryStairs")); + Blocks.darkStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.darkStairsID, Blocks.planks.get(), Category.DARK)).setUnlocalizedName("bop.darkStairs")); + Blocks.firStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.firStairsID, Blocks.planks.get(), Category.FIR)).setUnlocalizedName("bop.firStairs")); + Blocks.holyStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.holyStairsID, Blocks.planks.get(), Category.HOLY)).setUnlocalizedName("bop.holyStairs")); + Blocks.magicStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.magicStairsID, Blocks.planks.get(), Category.MAGIC)).setUnlocalizedName("bop.magicStairs")); + Blocks.mangroveStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.mangroveStairsID, Blocks.planks.get(), Category.MANGROVE)).setUnlocalizedName("bop.mangroveStairs")); + Blocks.palmStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.palmStairsID, Blocks.planks.get(), Category.PALM)).setUnlocalizedName("bop.palmStairs")); + Blocks.redwoodStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.redwoodStairsID, Blocks.planks.get(), Category.REDWOOD)).setUnlocalizedName("bop.redwoodStairs")); + Blocks.willowStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.willowStairsID, Blocks.planks.get(), Category.WILLOW)).setUnlocalizedName("bop.willowStairs")); + Blocks.pineStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.pineStairsID, Blocks.planks.get(), Category.PINE)).setUnlocalizedName("bop.pineStairs")); + Blocks.hellBarkStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.hellBarkStairsID, Blocks.planks.get(), Category.HELL_BARK)).setUnlocalizedName("bop.hellBarkStairs")); + Blocks.jacarandaStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.jacarandaStairsID, Blocks.planks.get(), Category.JACARANDA)).setUnlocalizedName("bop.jacarandaStairs")); + Blocks.leavesColorized = Optional.of((new BlockBOPColorizedLeaves(BOPConfiguration.IDs.colourizedLeavesID)).setUnlocalizedName("bop.leavesColorized")); } private static void registerBlocks() diff --git a/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java b/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java index f4e3dc9ec..cf442a8ff 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java +++ b/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java @@ -8,1009 +8,1147 @@ import net.minecraftforge.common.Property; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; -public class BOPConfiguration { +public class BOPConfiguration +{ + public static File mainConfigFile; + public static File biomeGenConfigFile; + public static File terrainGenConfigFile; + public static File idConfigFile; + public static File miscConfigFile; - public static Configuration config; - - // Configuration variables - public static boolean skyColors; - public static int biomeSize; - public static boolean addToDefault; - public static boolean achievements; - public static boolean dungeonLoot; - public static boolean vanillaEnhanced; - public static boolean netherOverride; - public static boolean rainCreatesPuddles; - public static boolean realisticTrees; - - public static boolean amethystTools; - public static boolean mudTools; - public static boolean altarCrafting; - public static boolean scytheCrafting; - public static boolean staffCrafting; - public static boolean enderporterCrafting; - public static boolean dartCrafting; - public static boolean flowerbandCrafting; - - public static int villageDistance; - - public static int promisedLandDimID; - - public static int promisedLandSkyColor; - - public static boolean alpsGen; - public static boolean arcticGen; - public static boolean badlandsGen; - public static boolean bambooForestGen; - public static boolean bayouGen; - public static boolean birchForestGen; - public static boolean bogGen; - public static boolean borealForestGen; - public static boolean brushlandGen; - public static boolean canyonGen; - public static boolean chaparralGen; - public static boolean cherryBlossomGroveGen; - public static boolean coniferousForestGen; - public static boolean coniferousForestSnowGen; - public static boolean cragGen; - public static boolean deadForestGen; - public static boolean deadForestSnowGen; - public static boolean deadSwampGen; - public static boolean deadlandsGen; - public static boolean deciduousForestGen; - public static boolean dunesGen; - public static boolean fenGen; - public static boolean fieldGen; - public static boolean frostForestGen; - public static boolean fungiForestGen; - public static boolean gardenGen; - public static boolean glacierGen; - public static boolean grasslandGen; - public static boolean groveGen; - public static boolean heathlandGen; - public static boolean highlandGen; - public static boolean hotSpringsGen; - public static boolean icyHillsGen; - public static boolean jadeCliffsGen; - public static boolean lushDesertGen; - public static boolean lushSwampGen; - public static boolean mangroveGen; - public static boolean mapleWoodsGen; - public static boolean marshGen; - public static boolean meadowGen; - public static boolean mesaGen; - public static boolean moorGen; - public static boolean mountainGen; - // public static boolean mushroomIslandGen; - public static boolean mysticGroveGen; - public static boolean oasisGen; - public static boolean oceanGen; - public static boolean ominousWoodsGen; - public static boolean orchardGen; - public static boolean originValleyGen; - public static boolean outbackGen; - public static boolean pastureGen; - public static boolean polarGen; - public static boolean prairieGen; - public static boolean quagmireGen; - public static boolean rainforestGen; - public static boolean redwoodForestGen; - public static boolean sacredSpringsGen; - public static boolean savannaGen; - public static boolean scrublandGen; - public static boolean seasonalForestGen; - public static boolean shieldGen; - public static boolean shrublandGen; - public static boolean sludgepitGen; - public static boolean spruceWoodsGen; - public static boolean steppeGen; - public static boolean temperateRainforestGen; - public static boolean thicketGen; - public static boolean timberGen; - public static boolean tropicalRainforestGen; - public static boolean tropicsGen; - public static boolean tundraGen; - public static boolean volcanoGen; - public static boolean wastelandGen; - public static boolean wetlandGen; - public static boolean woodlandGen; - - // Vanilla biomes - public static boolean plainsGen; - public static boolean desertGen; - public static boolean extremeHillsGen; - public static boolean forestGen; - public static boolean taigaGen; - public static boolean swamplandGen; - public static boolean jungleGen; - - // Nether biomes - - public static boolean undergardenGen; - public static boolean corruptedSandsGen; - public static boolean phantasmagoricInfernoGen; - public static boolean boneyardGen; - - //Beach variations - - public static boolean gravelBeachGen; - public static boolean overgrownBeachGen; - - //Block IDS - public static int mudID; - public static int driedDirtID; - public static int redRockID; - public static int ashID; - public static int ashStoneID; - public static int hardIceID; - public static int originGrassID; - public static int longGrassID; - public static int hardSandID; - public static int hardDirtID; - public static int holyGrassID; - public static int holyDirtID; - public static int holyStoneID; - public static int cragRockID; - - public static int plantsID; - public static int flowersID; - public static int mushroomsID; - public static int coralID; - public static int willowID; - public static int ivyID; - - public static int leaves1ID; - public static int leaves2ID; - public static int foliageID; - - public static int leavesFruitID; - public static int bambooID; - public static int mudBrickBlockID; - public static int mudBrickStairsID; - public static int stoneDoubleSlabID; - public static int stoneSingleSlabID; - - public static int treeMossID; - - public static int logs1ID; - public static int logs2ID; - public static int logs3ID; - public static int logs4ID; - public static int petalsID; - public static int saplingsID; - public static int colourizedSaplingsID; - public static int redCobbleStairsID; - public static int redBrickStairsID; - public static int holyCobbleStairsID; - public static int holyBrickStairsID; - - public static int promisedLandPortalID; - public static int amethystOreID; - - public static int mossID; - - public static int puddleID; - - public static int planksID; - - public static int woodenDoubleSlab1ID; - public static int woodenSingleSlab1ID; - public static int woodenDoubleSlab2ID; - public static int woodenSingleSlab2ID; - - public static int acaciaStairsID; - public static int cherryStairsID; - public static int darkStairsID; - public static int firStairsID; - public static int holyStairsID; - public static int magicStairsID; - public static int mangroveStairsID; - public static int palmStairsID; - public static int redwoodStairsID; - public static int willowStairsID; - public static int pineStairsID; - public static int hellBarkStairsID; - public static int jacarandaStairsID; - - public static int colourizedLeavesID; - - public static int crystalID; - public static int cloudID; - - public static int bonesID; - public static int glassID; - public static int altarID; - public static int graveID; - - //Item IDs - public static int foodID; - - public static int ancientStaffID; - public static int enderporterID; - - public static int bopDiscID; - public static int bopDiscMudID; - - public static int miscItemsID; - public static int mudballID; - public static int dartBlowerID; - public static int dartID; - public static int soulManipulatorID; - - public static int bopBucketID; - - public static int swordMudID; - public static int shovelMudID; - public static int pickaxeMudID; - public static int axeMudID; - public static int hoeMudID; - public static int helmetMudID; - public static int chestplateMudID; - public static int leggingsMudID; - public static int bootsMudID; - - public static int swordAmethystID; - public static int shovelAmethystID; - public static int pickaxeAmethystID; - public static int axeAmethystID; - public static int hoeAmethystID; - public static int helmetAmethystID; - public static int chestplateAmethystID; - public static int leggingsAmethystID; - public static int bootsAmethystID; - - public static int scytheWoodID; - public static int scytheStoneID; - public static int scytheIronID; - public static int scytheGoldID; - public static int scytheDiamondID; - public static int scytheMudID; - public static int scytheAmethystID; - - public static int flowerBandID; - - //Liquid IDs - public static int springWaterStillID; - public static int liquidPoisonStillID; - - //Biome IDs - public static int alpsID; - public static int alpsForestID; - public static int alpsBaseID; - public static int arcticID; - public static int badlandsID; - public static int bambooForestID; - public static int bayouID; - - public static int beachGravelID; - public static int beachOvergrownID; - - public static int birchForestID; - public static int bogID; - public static int borealForestID; - public static int brushlandID; - public static int canyonID; - public static int canyonRavineID; - public static int chaparralID; - public static int cherryBlossomGroveID; - public static int coniferousForestID; - public static int coniferousForestSnowID; - public static int cragID; - public static int deadForestID; - public static int deadForestSnowID; - public static int deadSwampID; - public static int deadlandsID; - public static int deciduousForestID; - public static int dunesID; - public static int fenID; - public static int fieldID; - public static int fieldForestID; - public static int frostForestID; - public static int fungiForestID; - public static int gardenID; - public static int glacierID; - public static int grasslandID; - public static int groveID; - public static int heathlandID; - public static int highlandID; - public static int hotSpringsID; - public static int icyHillsID; - public static int jadeCliffsID; - public static int lushDesertID; - public static int lushSwampID; - public static int mangroveID; - public static int mapleWoodsID; - public static int marshID; - public static int meadowID; - public static int meadowForestID; - public static int mesaID; - public static int moorID; - public static int mountainID; - public static int mysticGroveID; - - public static int netherBaseID; - public static int netherGardenID; - public static int netherDesertID; - public static int netherLavaID; - public static int netherBoneID; - - public static int oasisID; - - public static int oceanCoralID; - public static int oceanKelpID; - - public static int ominousWoodsID; - public static int ominousWoodsThickID; - public static int orchardID; - public static int originValleyID; - public static int outbackID; - public static int pastureID; - public static int pastureMeadowID; - public static int pastureThinID; - public static int polarID; - public static int prairieID; - - public static int promisedLandForestID; - public static int promisedLandPlainsID; - public static int promisedLandSwampID; - - public static int quagmireID; - public static int rainforestID; - public static int redwoodForestID; - public static int reefID; - public static int sacredSpringsID; - public static int savannaID; - public static int savannaPlateauID; - public static int scrublandID; - public static int seasonalForestID; - public static int seasonalSpruceForestID; - public static int shieldID; - public static int shoreID; - public static int shrublandID; - public static int shrublandForestID; - public static int sludgepitID; - public static int spruceWoodsID; - public static int steppeID; - public static int temperateRainforestID; - public static int thicketID; - public static int timberID; - public static int timberThinID; - public static int tropicalRainforestID; - public static int tropicsID; - public static int tundraID; - public static int volcanoID; - public static int wastelandID; - public static int wetlandID; - public static int woodlandID; - - public static int plainsNewID; - public static int desertNewID; - public static int desertHillsNewID; - public static int extremeHillsNewID; - public static int extremeHillsEdgeNewID; - public static int forestNewID; - public static int forestHillsNewID; - public static int taigaNewID; - public static int taigaHillsNewID; - public static int swamplandNewID; - public static int jungleNewID; - public static int jungleHillsNewID; - - public static int entityMudballID; - public static int entityDartID; - public static int entityPoisonDartID; - - public static int jungleSpiderID; - public static int rosesterID; - public static int globID; - - // Village biomes - public static boolean alpsVillage; - public static boolean arcticVillage; - 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 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 mushroomIslandVillage; - 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 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 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 Property seenVersion; - public static Property seenWorldTypeMsg; - - public static void init(File configFile) + public static void init(String configpath) { - config = new Configuration(configFile); + mainConfigFile = new File(configpath + "main.cfg"); + biomeGenConfigFile = new File(configpath + "biomegen.cfg"); + terrainGenConfigFile = new File(configpath + "terraingen.cfg"); + idConfigFile = new File(configpath + "ids.cfg"); + miscConfigFile = new File(configpath + "misc.cfg"); - try + BOPConfiguration.Main.init(mainConfigFile); + BOPConfiguration.BiomeGen.init(biomeGenConfigFile); + BOPConfiguration.TerrainGen.init(terrainGenConfigFile); + BOPConfiguration.IDs.init(idConfigFile); + BOPConfiguration.Misc.init(miscConfigFile); + } + + public static class Main + { + public static Configuration config; + + // Configuration variables + public static boolean realisticTrees; + + public static Property seenVersion; + public static Property seenWorldTypeMsg; + + public static void init(File configFile) { - config.load(); + config = new Configuration(configFile); - biomeSize = config.get("Biomes O\' Plenty World Type Settings", "Biome Size", 4, "Default World Type has 4. Large Biomes World Type has 6.").getInt(); - achievements = config.get("Miscellanious Settings", "Add Biomes O\' Plenty Achievements", true).getBoolean(false); - dungeonLoot = config.get("Miscellanious Settings", "Add Custom Dungeon Loot", true).getBoolean(false); - vanillaEnhanced = config.get("Biome Settings", "Enhanced Vanilla Biomes", true).getBoolean(false); - promisedLandDimID = config.get("Dimension Settings", "Promised Land Dimension ID", 20, null).getInt(); - netherOverride = config.get("Dimension Settings", "Enable Nether Override", true).getBoolean(true); - rainCreatesPuddles = config.get("Miscellanious Settings", "Enable Puddles During Rain", true).getBoolean(true); - - amethystTools = config.get("Crafting Settings", "Enable Amethyst Tool/Armor Crafting", true).getBoolean(true); - mudTools = config.get("Crafting Settings", "Enable Mud Tool/Armor Crafting", true).getBoolean(true); - altarCrafting = config.get("Crafting Settings", "Enable Altar Items Crafting", true).getBoolean(true); - scytheCrafting = config.get("Crafting Settings", "Enable Scythe Crafting", true).getBoolean(true); - staffCrafting = config.get("Crafting Settings", "Enable Ancient Staff Crafting", true).getBoolean(true); - enderporterCrafting = config.get("Crafting Settings", "Enable Enderporter Crafting", true).getBoolean(true); - dartCrafting = config.get("Crafting Settings", "Enable Dartblower/Dart Crafting", true).getBoolean(true); - flowerbandCrafting = config.get("Crafting Settings", "Enable Flower Band Crafting", true).getBoolean(true); + try + { + config.load(); - addToDefault = config.get("Biome Settings", "Add Biomes To Default World", false).getBoolean(true); - //realisticTrees = config.get("Biome Settings", "Realistic Trees", true).getBoolean(true); - realisticTrees = false; + //realisticTrees = config.get("Biome Settings", "Realistic Trees", true).getBoolean(true); + realisticTrees = false; - villageDistance = config.get("Biomes O\' Plenty World Type Settings", "Distance between villages", 32, "In Vanilla it is set to 32").getInt(); - if (villageDistance < 8) { - villageDistance = 8; + seenVersion = config.get("Vars", "Seen Version", "null"); + seenWorldTypeMsg = config.get("Vars", "Seen WorldType Msg", false); + + FMLCommonHandler.instance().getFMLLogger().log(Level.INFO, "[BiomesOPlenty] Generated Config!"); + } + catch (Exception e) + { + FMLLog.log(Level.SEVERE, e, "Biomes O Plenty has had a problem loading its configuration"); + } + finally + { + if (config.hasChanged()) { + config.save(); + } } - - //Hard-Coded Colors - skyColors = config.get("Hard-Coded Colors", "Enable Sky Colors", true).getBoolean(false); - - promisedLandSkyColor = config.get("Hard-Coded Colors", "Promised Land Sky Color", 50175, null).getInt(); - - //Biome generation - alpsGen = config.get("Biomes To Generate", "Alps", true).getBoolean(false); - arcticGen = config.get("Biomes To Generate", "Arctic", true).getBoolean(false); - badlandsGen = config.get("Biomes To Generate", "Badlands", true).getBoolean(false); - bambooForestGen = config.get("Biomes To Generate", "BambooForest", true).getBoolean(false); - bayouGen = config.get("Biomes To Generate", "Bayou", true).getBoolean(false); - birchForestGen = config.get("Biomes To Generate", "BirchForest", true).getBoolean(false); - bogGen = config.get("Biomes To Generate", "Bog", true).getBoolean(false); - borealForestGen = config.get("Biomes To Generate", "BorealForest", true).getBoolean(false); - brushlandGen = config.get("Biomes To Generate", "Brushland", true).getBoolean(false); - canyonGen = config.get("Biomes To Generate", "Canyon", true).getBoolean(false); - chaparralGen = config.get("Biomes To Generate", "Chaparral", true).getBoolean(false); - cherryBlossomGroveGen = config.get("Biomes To Generate", "CherryBlossomGrove", true).getBoolean(false); - coniferousForestGen = config.get("Biomes To Generate", "ConiferousForest", true).getBoolean(false); - coniferousForestSnowGen = config.get("Biomes To Generate", "ConiferousForestSnow", true).getBoolean(false); - cragGen = config.get("Biomes To Generate", "Crag", true).getBoolean(false); - deadForestGen = config.get("Biomes To Generate", "DeadForest", true).getBoolean(false); - deadForestSnowGen = config.get("Biomes To Generate", "DeadForestSnow", true).getBoolean(false); - deadSwampGen = config.get("Biomes To Generate", "DeadSwamp", true).getBoolean(false); - deadlandsGen = config.get("Biomes To Generate", "Deadlands", true).getBoolean(false); - deciduousForestGen = config.get("Biomes To Generate", "DeciduousForest", true).getBoolean(false); - dunesGen = config.get("Biomes To Generate", "Dunes", true).getBoolean(false); - fenGen = config.get("Biomes To Generate", "Fen", true).getBoolean(false); - fieldGen = config.get("Biomes To Generate", "Field", true).getBoolean(false); - frostForestGen = config.get("Biomes To Generate", "FrostForest", true).getBoolean(false); - fungiForestGen = config.get("Biomes To Generate", "FungiForest", true).getBoolean(false); - gardenGen = config.get("Biomes To Generate", "Garden", true).getBoolean(false); - glacierGen = config.get("Biomes To Generate", "Glacier", true).getBoolean(false); - grasslandGen = config.get("Biomes To Generate", "Grassland", true).getBoolean(false); - groveGen = config.get("Biomes To Generate", "Grove", true).getBoolean(false); - heathlandGen = config.get("Biomes To Generate", "Heathland", true).getBoolean(false); - highlandGen = config.get("Biomes To Generate", "Highland", true).getBoolean(false); - hotSpringsGen = config.get("Biomes To Generate", "HotSprings", true).getBoolean(false); - icyHillsGen = config.get("Biomes To Generate", "IcyHills", true).getBoolean(false); - jadeCliffsGen = config.get("Biomes To Generate", "JadeCliffs", true).getBoolean(false); - lushDesertGen = config.get("Biomes To Generate", "LushDesert", true).getBoolean(false); - lushSwampGen = config.get("Biomes To Generate", "LushSwamp", true).getBoolean(false); - mangroveGen = config.get("Biomes To Generate", "Mangrove", true).getBoolean(false); - mapleWoodsGen = config.get("Biomes To Generate", "MapleWoods", true).getBoolean(false); - marshGen = config.get("Biomes To Generate", "Marsh", true).getBoolean(false); - meadowGen = config.get("Biomes To Generate", "Meadow", true).getBoolean(false); - mesaGen = config.get("Biomes To Generate", "Mesa", true).getBoolean(false); - moorGen = config.get("Biomes To Generate", "Moor", true).getBoolean(false); - mountainGen = config.get("Biomes To Generate", "Mountain", true).getBoolean(false); - // mushroomIslandGen = config.get("Biomes To Generate", "MushroomIsland", true).getBoolean(false); - mysticGroveGen = config.get("Biomes To Generate", "MysticGrove", true).getBoolean(false); - oasisGen = config.get("Biomes To Generate", "Oasis", true).getBoolean(false); - oceanGen = config.get("Biomes To Generate", "Ocean", true).getBoolean(false); - ominousWoodsGen = config.get("Biomes To Generate", "OminousWoods", true).getBoolean(false); - orchardGen = config.get("Biomes To Generate", "Orchard", true).getBoolean(false); - originValleyGen = config.get("Biomes To Generate", "OriginValley", true).getBoolean(false); - outbackGen = config.get("Biomes To Generate", "Outback", true).getBoolean(false); - pastureGen = config.get("Biomes To Generate", "Pasture", true).getBoolean(false); - polarGen = config.get("Biomes To Generate", "Polar", true).getBoolean(false); - prairieGen = config.get("Biomes To Generate", "Prairie", true).getBoolean(false); - quagmireGen = config.get("Biomes To Generate", "Quagmire", true).getBoolean(false); - rainforestGen = config.get("Biomes To Generate", "Rainforest", true).getBoolean(false); - redwoodForestGen = config.get("Biomes To Generate", "RedwoodForest", true).getBoolean(false); - sacredSpringsGen = config.get("Biomes To Generate", "SacredSprings", true).getBoolean(false); - savannaGen = config.get("Biomes To Generate", "Savanna", true).getBoolean(false); - scrublandGen = config.get("Biomes To Generate", "Scrubland", true).getBoolean(false); - seasonalForestGen = config.get("Biomes To Generate", "SeasonalForest", true).getBoolean(false); - shieldGen = config.get("Biomes To Generate", "Shield", true).getBoolean(false); - shrublandGen = config.get("Biomes To Generate", "Shrubland", true).getBoolean(false); - sludgepitGen = config.get("Biomes To Generate", "Sludgepit", true).getBoolean(false); - spruceWoodsGen = config.get("Biomes To Generate", "SpruceWoods", true).getBoolean(false); - steppeGen = config.get("Biomes To Generate", "Steppe", true).getBoolean(false); - temperateRainforestGen = config.get("Biomes To Generate", "TemperateRainforest", true).getBoolean(false); - thicketGen = config.get("Biomes To Generate", "Thicket", true).getBoolean(false); - timberGen = config.get("Biomes To Generate", "Timber", true).getBoolean(false); - tropicalRainforestGen = config.get("Biomes To Generate", "TropicalRainforest", true).getBoolean(false); - tropicsGen = config.get("Biomes To Generate", "Tropics", true).getBoolean(false); - tundraGen = config.get("Biomes To Generate", "Tundra", true).getBoolean(false); - volcanoGen = config.get("Biomes To Generate", "Volcano", true).getBoolean(false); - wastelandGen = config.get("Biomes To Generate", "Wasteland", true).getBoolean(false); - wetlandGen = config.get("Biomes To Generate", "Wetland", true).getBoolean(false); - woodlandGen = config.get("Biomes To Generate", "Woodland", true).getBoolean(false); - - // Vanilla biomes - desertGen = config.get("Vanilla Biomes To Generate", "Desert", true).getBoolean(true); - extremeHillsGen = config.get("Vanilla Biomes To Generate", "ExtremeHills", true).getBoolean(true); - forestGen = config.get("Vanilla Biomes To Generate", "Forest", true).getBoolean(true); - jungleGen = config.get("Vanilla Biomes To Generate", "Jungle", true).getBoolean(true); - plainsGen = config.get("Vanilla Biomes To Generate", "Plains", true).getBoolean(true); - swamplandGen = config.get("Vanilla Biomes To Generate", "Swampland", true).getBoolean(true); - 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); - - // Biomes with villages - alpsVillage = config.get("Allow Villages", "Alps", false).getBoolean(false); - arcticVillage = config.get("Allow Villages", "Arctic", false).getBoolean(false); - badlandsVillage = config.get("Allow Villages", "Badlands", false).getBoolean(false); - bambooForestVillage = config.get("Allow Villages", "BambooForest", true).getBoolean(false); - bayouVillage = config.get("Allow Villages", "Bayou", true).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", true).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", "ConiferousForestSnow", true).getBoolean(false); - cragVillage = config.get("Allow Villages", "Crag", false).getBoolean(false); - deadForestVillage = config.get("Allow Villages", "DeadForest", true).getBoolean(false); - deadForestSnowVillage = config.get("Allow Villages", "DeadForestSnow", true).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); - 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); - // mushroomIslandVillage = config.get("Allow Villages", "MushroomIsland", false).getBoolean(false); - mysticGroveVillage = config.get("Allow Villages", "MysticGrove", false).getBoolean(false); - oasisVillage = config.get("Allow Villages", "Oasis", true).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", false).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", true).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", true).getBoolean(false); - shrublandVillage = config.get("Allow Villages", "Shrubland", true).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", true).getBoolean(false); - thicketVillage = config.get("Allow Villages", "Thicket", false).getBoolean(false); - timberVillage = config.get("Allow Villages", "Timber", false).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", false).getBoolean(false); - woodlandVillage = config.get("Allow Villages", "Woodland", true).getBoolean(false); - - // Vanilla biomes - desertVillage = config.get("Allow Villages", "Desert", true).getBoolean(true); - extremeHillsVillage = config.get("Allow Villages", "ExtremeHills", false).getBoolean(false); - forestVillage = config.get("Allow Villages", "Forest", true).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", true).getBoolean(false); - - // Get Terrain Block ID's - mudID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Mud ID", 160, null).getInt(); - driedDirtID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Dried Dirt ID", 161, null).getInt(); - redRockID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Red Rock ID", 162, null).getInt(); - ashID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Ash Block ID", 163, null).getInt(); - ashStoneID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Ash Stone ID", 164, null).getInt(); - hardIceID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Hard Ice ID", 165, null).getInt(); - originGrassID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Origin Grass ID", 166, null).getInt(); - hardSandID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Hard Sand ID", 167, null).getInt(); - hardDirtID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Hard Dirt ID", 168, null).getInt(); - holyGrassID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Holy Grass ID", 169, null).getInt(); - holyDirtID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Holy Dirt ID", 170, null).getInt(); - holyStoneID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Skystone ID", 171, null).getInt(); - cragRockID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Crag Rock ID", 172, null).getInt(); - longGrassID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Long Grass ID", 173, null).getInt(); - - // Get Crafted Block ID's - plantsID = config.getBlock("Plant ID", 1920, null).getInt(); - flowersID = config.getBlock("Flower ID", 1921, null).getInt(); - willowID = config.getBlock("Willow ID", 1922, null).getInt(); - - leaves1ID = config.getBlock("Leaf Block ID 1", 1923, null).getInt(); - leaves2ID = config.getBlock("Leaf Block ID 2", 1924, null).getInt(); - foliageID = config.getBlock("Foliage ID", 1925, null).getInt(); - - leavesFruitID = config.getBlock("Fruit Leaf Block ID", 1926, null).getInt(); - bambooID = config.getBlock("Bamboo ID", 1927, null).getInt(); - mudBrickBlockID = config.getBlock("Mud Bricks ID", 1928, null).getInt(); - mudBrickStairsID = config.getBlock("Mud Brick Stairs ID", 1929, null).getInt(); - stoneDoubleSlabID = config.getBlock("Stone Double Slab ID", 1930, null).getInt(); - stoneSingleSlabID = config.getBlock("Stone Single Slab ID", 1931, null).getInt(); - - treeMossID = config.getBlock("Tree Moss ID", 1932, null).getInt(); - - logs1ID = config.getBlock("Log Block ID 1", 1933, null).getInt(); - logs2ID = config.getBlock("Log Block ID 2", 1934, null).getInt(); - logs3ID = config.getBlock("Log Block ID 3", 1935, null).getInt(); - petalsID = config.getBlock("Petal ID", 1936, null).getInt(); - saplingsID = config.getBlock("Sapling ID", 1937, null).getInt(); - colourizedSaplingsID = config.getBlock("Colourized Sapling ID", 1938, null).getInt(); - redCobbleStairsID = config.getBlock("Red Cobble Stairs ID", 1939, null).getInt(); - redBrickStairsID = config.getBlock("Red Brick Stairs ID", 1940, null).getInt(); - - promisedLandPortalID = config.getBlock("Promised Land Portal ID", 1941, null).getInt(); - amethystOreID = config.getBlock("Amethyst Ore ID", 1942, null).getInt(); - - ivyID = config.getBlock("Ivy ID", 1943, null).getInt(); - - mossID = config.getBlock("Moss ID", 1944, null).getInt(); - - planksID = config.getBlock("Planks ID", 1947, null).getInt(); - - woodenDoubleSlab1ID = config.getBlock("Wooden Double Slab 1 ID", 1948, null).getInt(); - woodenSingleSlab1ID = config.getBlock("Wooden Single Slab 1 ID", 1949, null).getInt(); - woodenDoubleSlab2ID = config.getBlock("Wooden Double Slab 2 ID", 1950, null).getInt(); - woodenSingleSlab2ID = config.getBlock("Wooden Single Slab 2 ID", 1951, null).getInt(); - - acaciaStairsID = config.getBlock("Acacia Stairs ID", 1952, null).getInt(); - cherryStairsID = config.getBlock("Cherry Stairs ID", 1953, null).getInt(); - darkStairsID = config.getBlock("Dark Stairs ID", 1954, null).getInt(); - firStairsID = config.getBlock("Fir Stairs ID", 1955, null).getInt(); - holyStairsID = config.getBlock("Holy Stairs ID", 1956, null).getInt(); - magicStairsID = config.getBlock("Magic Stairs ID", 1957, null).getInt(); - mangroveStairsID = config.getBlock("Mangrove Stairs ID", 1958, null).getInt(); - palmStairsID = config.getBlock("Palm Stairs ID", 1959, null).getInt(); - redwoodStairsID = config.getBlock("Redwood Stairs ID", 1960, null).getInt(); - willowStairsID = config.getBlock("Willow Stairs ID", 1961, null).getInt(); - - colourizedLeavesID = config.getBlock("Colourized Leaves ID", 1962, null).getInt(); - - crystalID = config.getBlock("Crystal ID", 1963, null).getInt(); - cloudID = config.getBlock("Cloud ID", 1964, null).getInt(); - - holyCobbleStairsID = config.getBlock("Skystone Cobble Stairs ID", 1965, null).getInt(); - holyBrickStairsID = config.getBlock("Skystone Brick Stairs ID", 1966, null).getInt(); - - mushroomsID = config.getBlock("Mushroom ID", 1967, null).getInt(); - - bonesID = config.getBlock("Bones ID", 1968, null).getInt(); - coralID = config.getBlock("Coral ID", 1969, null).getInt(); - - //1970, 1971, 1972 & 1973 used by Liquids - - logs4ID = config.getBlock("Log Block ID 4", 1974, null).getInt(); - - pineStairsID = config.getBlock("Pine Stairs ID", 1975, null).getInt(); - hellBarkStairsID = config.getBlock("Hell Bark Stairs ID", 1976, null).getInt(); - jacarandaStairsID = config.getBlock("Jacaranda ID", 1977, null).getInt(); - - glassID = config.getBlock("Glass ID", 1978, null).getInt(); - - altarID = config.getBlock("Altar ID", 1979, null).getInt(); - - puddleID = config.getBlock("Puddle ID", 1980, null).getInt(); - - graveID = config.getBlock("Grave ID", 1981, null).getInt(); - - // Get Item ID's - foodID = config.getItem("Food ID", 21003, null).getInt(); - - ancientStaffID = config.getItem("Ancient Staff ID", 21006).getInt(); - enderporterID = config.getItem("Enderporter ID", 21007).getInt(); - - miscItemsID = config.getItem("Misc Items ID", 21010).getInt(); - mudballID = config.getItem("Mud Ball ID", 21011).getInt(); - dartBlowerID = config.getItem("Dart Blower ID", 21012).getInt(); - dartID = config.getItem("Dart ID", 21013).getInt(); - - bopDiscID = config.getItem("Traversia Music Disc ID", 21019, null).getInt(); - bopDiscMudID = config.getItem("Muddy Music Disc ID", 21020, null).getInt(); - - swordMudID = config.getItem("Muddy Sword ID", 21060, null).getInt(); - shovelMudID = config.getItem("Muddy Shovel ID", 21061, null).getInt(); - pickaxeMudID = config.getItem("Muddy Pickaxe ID", 21062, null).getInt(); - axeMudID = config.getItem("Muddy Axe ID", 21063, null).getInt(); - hoeMudID = config.getItem("Muddy Hoe ID", 21064, null).getInt(); - helmetMudID = config.getItem("Muddy Helmet ID", 21065, null).getInt(); - chestplateMudID = config.getItem("Muddy Chestplate ID", 21066, null).getInt(); - leggingsMudID = config.getItem("Muddy Leggings ID", 21067, null).getInt(); - bootsMudID = config.getItem("Muddy Boots ID", 21068, null).getInt(); - - swordAmethystID = config.getItem("Amethyst Sword ID", 21069, null).getInt(); - shovelAmethystID = config.getItem("Amethyst Shovel ID", 21070, null).getInt(); - pickaxeAmethystID = config.getItem("Amethyst Pickaxe ID", 21071, null).getInt(); - axeAmethystID = config.getItem("Amethyst Axe ID", 21072, null).getInt(); - hoeAmethystID = config.getItem("Amethyst Hoe ID", 21073, null).getInt(); - helmetAmethystID = config.getItem("Amethyst Helmet ID", 21074, null).getInt(); - chestplateAmethystID = config.getItem("Amethyst Chestplate ID", 21075, null).getInt(); - leggingsAmethystID = config.getItem("Amethyst Leggings ID", 21076, null).getInt(); - bootsAmethystID = config.getItem("Amethyst Boots ID", 21077, null).getInt(); - - flowerBandID = config.getItem("Flower Band ID", 21078, null).getInt(); - - bopBucketID = config.getItem("Spring Water Bucket ID", 21079, null).getInt(); - - soulManipulatorID = config.getItem("Soul Manipulator ID", 21080).getInt(); - - scytheWoodID = config.getItem("Wood Scythe ID", 21081).getInt(); - scytheStoneID = config.getItem("Stone Scythe ID", 21082).getInt(); - scytheIronID = config.getItem("Iron Scythe ID", 21083).getInt(); - scytheGoldID = config.getItem("Gold Scythe ID", 21084).getInt(); - scytheDiamondID = config.getItem("Diamond Scythe ID", 21085).getInt(); - scytheMudID = config.getItem("Mud Scythe ID", 21086).getInt(); - scytheAmethystID = config.getItem("Amethyst Scythe ID", 21087).getInt(); - - //Liquid Ids - springWaterStillID = config.get("Liquid IDs", "Spring Water Still ID (ID before this must be free!)", 1971, null).getInt(); - liquidPoisonStillID = config.get("Liquid IDs", "Liquid Poison Still ID (ID before this must be free!)", 1973, null).getInt(); - - //Mob IDs - jungleSpiderID = config.get("Mob IDs", "Jungle Spider ID", 101, null).getInt(); - rosesterID = config.get("Mob IDs", "Rosester ID", 102, null).getInt(); - globID = config.get("Mob IDs", "Glob ID", 106, null).getInt(); - - //Projectile IDs - entityMudballID = config.get("Entity IDs", "Mudball ID", 103, null).getInt();; - entityDartID = config.get("Entity IDs", "Dart ID", 104, null).getInt();; - entityPoisonDartID = config.get("Entity IDs", "Poison Dart ID", 105, null).getInt();; - - FMLCommonHandler.instance().getFMLLogger().log(Level.INFO, "[BiomesOPlenty] Generating Biome ID's"); - - //23-79 ExtraBiomesXL - - savannaPlateauID = config.get("Biome IDs", "Savanna Plateau (Sub-Biome) ID", 39).getInt(); - fieldForestID = config.get("Biome IDs", "Forested Field (Sub-Biome) ID", 40).getInt(); - seasonalSpruceForestID = config.get("Biome IDs", "Seasonal Spruce Forest (Sub-Biome) ID", 41).getInt(); - alpsBaseID = config.get("Biome IDs", "Alps Forest (Sub-Biome) ID", 42).getInt(); - alpsForestID = config.get("Biome IDs", "Alps Mountainside (Sub-Biome) ID", 43).getInt(); - timberThinID = config.get("Biome IDs", "Thinned Timber (Sub-Biome) ID", 44).getInt(); - pastureThinID = config.get("Biome IDs", "Thinned Pasture (Sub-Biome) ID", 45).getInt(); - pastureMeadowID = config.get("Biome IDs", "Pasture Meadow (Sub-Biome) ID", 46).getInt(); - ominousWoodsThickID = config.get("Biome IDs", "Thick Ominous Woods (Sub-Biome) ID", 47).getInt(); - shrublandForestID = config.get("Biome IDs", "Thick Shrubland (Sub-Biome) ID", 48).getInt(); - canyonRavineID = config.get("Biome IDs", "Canyon Ravine (Sub-Biome) ID", 49).getInt(); - meadowForestID = config.get("Biome IDs", "Meadow Forest (Sub-Biome) ID", 50).getInt(); - - oceanCoralID = config.get("Biome IDs", "Coral Reef (Ocean) ID", 58).getInt(); - oceanKelpID = config.get("Biome IDs", "Kelp Forest (Ocean) ID", 59).getInt(); - - beachGravelID = config.get("Biome IDs", "Gravel Beach ID", 60).getInt(); - beachOvergrownID = config.get("Biome IDs", "Overgrown Beach ID", 61).getInt(); - - promisedLandForestID = config.get("Biome IDs", "Wonderous Woods (Promised Land) ID", 62).getInt(); - promisedLandPlainsID = config.get("Biome IDs", "Majestic Meadow (Promised Land) ID", 63).getInt(); - promisedLandSwampID = config.get("Biome IDs", "Blessed Bog (Promised Land) ID", 64).getInt(); - - netherBaseID = config.get("Biome IDs", "Nether Base (Nether) ID", 65).getInt(); - netherGardenID = config.get("Biome IDs", "Undergarden (Nether) ID", 66).getInt(); - netherDesertID = config.get("Biome IDs", "Corrupted Sands (Nether) ID", 67).getInt(); - netherLavaID = config.get("Biome IDs", "Phantasmagoric Inferno (Nether) ID", 68).getInt(); - netherBoneID = config.get("Biome IDs", "Boneyard (Nether) ID", 69).getInt(); - - //70-87 Twilight Forest - - //80-169 Better World Generation 4 - - alpsID = config.get("Biome IDs", "Alps ID", 170).getInt(); - arcticID = config.get("Biome IDs", "Arctic ID", 171).getInt(); - badlandsID = config.get("Biome IDs", "Badlands ID", 172).getInt(); - bambooForestID = config.get("Biome IDs", "Bamboo Forest ID", 173).getInt(); - bayouID = config.get("Biome IDs", "Bayou ID", 174).getInt(); - birchForestID = config.get("Biome IDs", "Birch Forest ID", 175).getInt(); - bogID = config.get("Biome IDs", "Bog ID", 176).getInt(); - borealForestID = config.get("Biome IDs", "Boreal Forest ID", 177).getInt(); - brushlandID = config.get("Biome IDs", "Brushland ID", 178).getInt(); - canyonID = config.get("Biome IDs", "Canyon ID", 179).getInt(); - chaparralID = config.get("Biome IDs", "Chaparral ID", 180).getInt(); - cherryBlossomGroveID = config.get("Biome IDs", "Cherry Blossom Grove ID", 181).getInt(); - coniferousForestID = config.get("Biome IDs", "Coniferous Forest ID", 182).getInt(); - coniferousForestSnowID = config.get("Biome IDs", "Coniferous Forest (Snow) ID", 183).getInt(); - cragID = config.get("Biome IDs", "Crag ID", 184).getInt(); - deadForestID = config.get("Biome IDs", "Dead Forest ID", 185).getInt(); - deadForestSnowID = config.get("Biome IDs", "Dead Forest (Snow) ID", 186).getInt(); - deadSwampID = config.get("Biome IDs", "Dead Swamp ID", 187).getInt(); - deadlandsID = config.get("Biome IDs", "Deadlands ID", 188).getInt(); - deciduousForestID = config.get("Biome IDs", "Deciduous Forest ID", 189).getInt(); - dunesID = config.get("Biome IDs", "Dunes ID", 190).getInt(); - fenID = config.get("Biome IDs", "Fen ID", 191).getInt(); - fieldID = config.get("Biome IDs", "Field ID", 192).getInt(); - frostForestID = config.get("Biome IDs", "Frost Forest ID", 193).getInt(); - fungiForestID = config.get("Biome IDs", "Fungi Forest ID", 194).getInt(); - gardenID = config.get("Biome IDs", "Garden ID", 195).getInt(); - glacierID = config.get("Biome IDs", "Glacier ID", 196).getInt(); - grasslandID = config.get("Biome IDs", "Grassland ID", 197).getInt(); - groveID = config.get("Biome IDs", "Grove ID", 198).getInt(); - heathlandID = config.get("Biome IDs", "Heathland ID", 199).getInt(); - highlandID = config.get("Biome IDs", "Highland ID", 200).getInt(); - hotSpringsID = config.get("Biome IDs", "Hot Springs ID", 201).getInt(); - icyHillsID = config.get("Biome IDs", "Icy Hills ID", 202).getInt(); - jadeCliffsID = config.get("Biome IDs", "Jade Cliffs ID", 203).getInt(); - lushDesertID = config.get("Biome IDs", "Lush Desert ID", 204).getInt(); - lushSwampID = config.get("Biome IDs", "Lush Swamp ID", 205).getInt(); - mangroveID = config.get("Biome IDs", "Mangrove ID", 206).getInt(); - - //207-209 left for Mo Creatures - - mapleWoodsID = config.get("Biome IDs", "Maple Woods ID", 210).getInt(); - marshID = config.get("Biome IDs", "Marsh ID", 211).getInt(); - meadowID = config.get("Biome IDs", "Meadow ID", 212).getInt(); - mesaID = config.get("Biome IDs", "Mesa ID", 213).getInt(); - moorID = config.get("Biome IDs", "Moor ID", 214).getInt(); - mountainID = config.get("Biome IDs", "Mountain ID", 215).getInt(); - mysticGroveID = config.get("Biome IDs", "Mystic Grove ID", 216).getInt(); - oasisID = config.get("Biome IDs", "Oasis ID", 217).getInt(); - ominousWoodsID = config.get("Biome IDs", "Ominous Woods ID", 218).getInt(); - orchardID = config.get("Biome IDs", "Orchard ID", 219).getInt(); - originValleyID = config.get("Biome IDs", "Origin Valley ID", 220).getInt(); - outbackID = config.get("Biome IDs", "Outback ID", 221).getInt(); - pastureID = config.get("Biome IDs", "Pasture ID", 222).getInt(); - polarID = config.get("Biome IDs", "Polar ID", 223).getInt(); - prairieID = config.get("Biome IDs", "Prairie ID", 224).getInt(); - quagmireID = config.get("Biome IDs", "Quagmire ID", 225).getInt(); - rainforestID = config.get("Biome IDs", "Rainforest ID", 226).getInt(); - redwoodForestID = config.get("Biome IDs", "Redwood Forest ID", 227).getInt(); - sacredSpringsID = config.get("Biome IDs", "Sacred Springs ID", 228).getInt(); - savannaID = config.get("Biome IDs", "Savanna ID", 229).getInt(); - scrublandID = config.get("Biome IDs", "Scrubland ID", 230).getInt(); - seasonalForestID = config.get("Biome IDs", "Seasonal Forest ID", 231).getInt(); - shieldID = config.get("Biome IDs", "Shield ID", 232).getInt(); - shoreID = config.get("Biome IDs", "Shore ID", 233).getInt(); - shrublandID = config.get("Biome IDs", "Shrubland ID", 234).getInt(); - sludgepitID = config.get("Biome IDs", "Sludgepit ID", 235).getInt(); - spruceWoodsID = config.get("Biome IDs", "Spruce Woods ID", 236).getInt(); - steppeID = config.get("Biome IDs", "Steppe ID", 237).getInt(); - temperateRainforestID = config.get("Biome IDs", "Temperate Rainforest ID", 238).getInt(); - thicketID = config.get("Biome IDs", "Thicket ID", 239).getInt(); - timberID = config.get("Biome IDs", "Timber ID", 240).getInt(); - tropicalRainforestID = config.get("Biome IDs", "Tropical Rainforest ID", 241).getInt(); - tropicsID = config.get("Biome IDs", "Tropics ID", 242).getInt(); - tundraID = config.get("Biome IDs", "Tundra ID", 243).getInt(); - volcanoID = config.get("Biome IDs", "Volcano ID", 244).getInt(); - wastelandID = config.get("Biome IDs", "Wasteland ID", 245).getInt(); - wetlandID = config.get("Biome IDs", "Wetland ID", 246).getInt(); - woodlandID = config.get("Biome IDs", "Woodland ID", 247).getInt(); - - plainsNewID = config.get("Biome IDs", "Plains (New) ID", 248).getInt(); - desertNewID = config.get("Biome IDs", "Desert (New) ID", 249).getInt(); - forestNewID = config.get("Biome IDs", "Forest (New) ID", 250).getInt(); - taigaNewID = config.get("Biome IDs", "Taiga (New) ID", 251).getInt(); - swamplandNewID = config.get("Biome IDs", "Swampland (New) ID", 252).getInt(); - extremeHillsNewID = config.get("Biome IDs", "Extreme Hills (New) ID", 253).getInt(); - jungleNewID = config.get("Biome IDs", "Jungle (New) ID", 254).getInt(); - - seenVersion = config.get("Vars", "Seen Version", "null"); - seenWorldTypeMsg = config.get("Vars", "Seen WorldType Msg", false); - - FMLCommonHandler.instance().getFMLLogger().log(Level.INFO, "[BiomesOPlenty] Generated Config!"); } - catch (Exception e) + } + + public static class BiomeGen + { + public static Configuration config; + + public static boolean alpsGen; + public static boolean arcticGen; + public static boolean badlandsGen; + public static boolean bambooForestGen; + public static boolean bayouGen; + public static boolean birchForestGen; + public static boolean bogGen; + public static boolean borealForestGen; + public static boolean brushlandGen; + public static boolean canyonGen; + public static boolean chaparralGen; + public static boolean cherryBlossomGroveGen; + public static boolean coniferousForestGen; + public static boolean coniferousForestSnowGen; + public static boolean cragGen; + public static boolean deadForestGen; + public static boolean deadForestSnowGen; + public static boolean deadSwampGen; + public static boolean deadlandsGen; + public static boolean deciduousForestGen; + public static boolean dunesGen; + public static boolean fenGen; + public static boolean fieldGen; + public static boolean frostForestGen; + public static boolean fungiForestGen; + public static boolean gardenGen; + public static boolean glacierGen; + public static boolean grasslandGen; + public static boolean groveGen; + public static boolean heathlandGen; + public static boolean highlandGen; + public static boolean hotSpringsGen; + public static boolean icyHillsGen; + public static boolean jadeCliffsGen; + public static boolean lushDesertGen; + public static boolean lushSwampGen; + public static boolean mangroveGen; + public static boolean mapleWoodsGen; + public static boolean marshGen; + public static boolean meadowGen; + public static boolean mesaGen; + public static boolean moorGen; + public static boolean mountainGen; + // public static boolean mushroomIslandGen; + public static boolean mysticGroveGen; + public static boolean oasisGen; + public static boolean oceanGen; + public static boolean ominousWoodsGen; + public static boolean orchardGen; + public static boolean originValleyGen; + public static boolean outbackGen; + public static boolean pastureGen; + public static boolean polarGen; + public static boolean prairieGen; + public static boolean quagmireGen; + public static boolean rainforestGen; + public static boolean redwoodForestGen; + public static boolean sacredSpringsGen; + public static boolean savannaGen; + public static boolean scrublandGen; + public static boolean seasonalForestGen; + public static boolean shieldGen; + public static boolean shrublandGen; + public static boolean sludgepitGen; + public static boolean spruceWoodsGen; + public static boolean steppeGen; + public static boolean temperateRainforestGen; + public static boolean thicketGen; + public static boolean timberGen; + public static boolean tropicalRainforestGen; + public static boolean tropicsGen; + public static boolean tundraGen; + public static boolean volcanoGen; + public static boolean wastelandGen; + public static boolean wetlandGen; + public static boolean woodlandGen; + + // Vanilla biomes + public static boolean plainsGen; + public static boolean desertGen; + public static boolean extremeHillsGen; + public static boolean forestGen; + public static boolean taigaGen; + public static boolean swamplandGen; + public static boolean jungleGen; + + // Nether biomes + + public static boolean undergardenGen; + public static boolean corruptedSandsGen; + public static boolean phantasmagoricInfernoGen; + public static boolean boneyardGen; + + //Beach variations + + public static boolean gravelBeachGen; + public static boolean overgrownBeachGen; + + public static void init(File configFile) { - FMLLog.log(Level.SEVERE, e, "Biomes O Plenty has had a problem loading its configuration"); + config = new Configuration(configFile); + + try + { + config.load(); + + //Biome generation + alpsGen = config.get("Biomes To Generate", "Alps", true).getBoolean(false); + arcticGen = config.get("Biomes To Generate", "Arctic", true).getBoolean(false); + badlandsGen = config.get("Biomes To Generate", "Badlands", true).getBoolean(false); + bambooForestGen = config.get("Biomes To Generate", "BambooForest", true).getBoolean(false); + bayouGen = config.get("Biomes To Generate", "Bayou", true).getBoolean(false); + birchForestGen = config.get("Biomes To Generate", "BirchForest", true).getBoolean(false); + bogGen = config.get("Biomes To Generate", "Bog", true).getBoolean(false); + borealForestGen = config.get("Biomes To Generate", "BorealForest", true).getBoolean(false); + brushlandGen = config.get("Biomes To Generate", "Brushland", true).getBoolean(false); + canyonGen = config.get("Biomes To Generate", "Canyon", true).getBoolean(false); + chaparralGen = config.get("Biomes To Generate", "Chaparral", true).getBoolean(false); + cherryBlossomGroveGen = config.get("Biomes To Generate", "CherryBlossomGrove", true).getBoolean(false); + coniferousForestGen = config.get("Biomes To Generate", "ConiferousForest", true).getBoolean(false); + coniferousForestSnowGen = config.get("Biomes To Generate", "ConiferousForestSnow", true).getBoolean(false); + cragGen = config.get("Biomes To Generate", "Crag", true).getBoolean(false); + deadForestGen = config.get("Biomes To Generate", "DeadForest", true).getBoolean(false); + deadForestSnowGen = config.get("Biomes To Generate", "DeadForestSnow", true).getBoolean(false); + deadSwampGen = config.get("Biomes To Generate", "DeadSwamp", true).getBoolean(false); + deadlandsGen = config.get("Biomes To Generate", "Deadlands", true).getBoolean(false); + deciduousForestGen = config.get("Biomes To Generate", "DeciduousForest", true).getBoolean(false); + dunesGen = config.get("Biomes To Generate", "Dunes", true).getBoolean(false); + fenGen = config.get("Biomes To Generate", "Fen", true).getBoolean(false); + fieldGen = config.get("Biomes To Generate", "Field", true).getBoolean(false); + frostForestGen = config.get("Biomes To Generate", "FrostForest", true).getBoolean(false); + fungiForestGen = config.get("Biomes To Generate", "FungiForest", true).getBoolean(false); + gardenGen = config.get("Biomes To Generate", "Garden", true).getBoolean(false); + glacierGen = config.get("Biomes To Generate", "Glacier", true).getBoolean(false); + grasslandGen = config.get("Biomes To Generate", "Grassland", true).getBoolean(false); + groveGen = config.get("Biomes To Generate", "Grove", true).getBoolean(false); + heathlandGen = config.get("Biomes To Generate", "Heathland", true).getBoolean(false); + highlandGen = config.get("Biomes To Generate", "Highland", true).getBoolean(false); + hotSpringsGen = config.get("Biomes To Generate", "HotSprings", true).getBoolean(false); + icyHillsGen = config.get("Biomes To Generate", "IcyHills", true).getBoolean(false); + jadeCliffsGen = config.get("Biomes To Generate", "JadeCliffs", true).getBoolean(false); + lushDesertGen = config.get("Biomes To Generate", "LushDesert", true).getBoolean(false); + lushSwampGen = config.get("Biomes To Generate", "LushSwamp", true).getBoolean(false); + mangroveGen = config.get("Biomes To Generate", "Mangrove", true).getBoolean(false); + mapleWoodsGen = config.get("Biomes To Generate", "MapleWoods", true).getBoolean(false); + marshGen = config.get("Biomes To Generate", "Marsh", true).getBoolean(false); + meadowGen = config.get("Biomes To Generate", "Meadow", true).getBoolean(false); + mesaGen = config.get("Biomes To Generate", "Mesa", true).getBoolean(false); + moorGen = config.get("Biomes To Generate", "Moor", true).getBoolean(false); + mountainGen = config.get("Biomes To Generate", "Mountain", true).getBoolean(false); + // mushroomIslandGen = config.get("Biomes To Generate", "MushroomIsland", true).getBoolean(false); + mysticGroveGen = config.get("Biomes To Generate", "MysticGrove", true).getBoolean(false); + oasisGen = config.get("Biomes To Generate", "Oasis", true).getBoolean(false); + oceanGen = config.get("Biomes To Generate", "Ocean", true).getBoolean(false); + ominousWoodsGen = config.get("Biomes To Generate", "OminousWoods", true).getBoolean(false); + orchardGen = config.get("Biomes To Generate", "Orchard", true).getBoolean(false); + originValleyGen = config.get("Biomes To Generate", "OriginValley", true).getBoolean(false); + outbackGen = config.get("Biomes To Generate", "Outback", true).getBoolean(false); + pastureGen = config.get("Biomes To Generate", "Pasture", true).getBoolean(false); + polarGen = config.get("Biomes To Generate", "Polar", true).getBoolean(false); + prairieGen = config.get("Biomes To Generate", "Prairie", true).getBoolean(false); + quagmireGen = config.get("Biomes To Generate", "Quagmire", true).getBoolean(false); + rainforestGen = config.get("Biomes To Generate", "Rainforest", true).getBoolean(false); + redwoodForestGen = config.get("Biomes To Generate", "RedwoodForest", true).getBoolean(false); + sacredSpringsGen = config.get("Biomes To Generate", "SacredSprings", true).getBoolean(false); + savannaGen = config.get("Biomes To Generate", "Savanna", true).getBoolean(false); + scrublandGen = config.get("Biomes To Generate", "Scrubland", true).getBoolean(false); + seasonalForestGen = config.get("Biomes To Generate", "SeasonalForest", true).getBoolean(false); + shieldGen = config.get("Biomes To Generate", "Shield", true).getBoolean(false); + shrublandGen = config.get("Biomes To Generate", "Shrubland", true).getBoolean(false); + sludgepitGen = config.get("Biomes To Generate", "Sludgepit", true).getBoolean(false); + spruceWoodsGen = config.get("Biomes To Generate", "SpruceWoods", true).getBoolean(false); + steppeGen = config.get("Biomes To Generate", "Steppe", true).getBoolean(false); + temperateRainforestGen = config.get("Biomes To Generate", "TemperateRainforest", true).getBoolean(false); + thicketGen = config.get("Biomes To Generate", "Thicket", true).getBoolean(false); + timberGen = config.get("Biomes To Generate", "Timber", true).getBoolean(false); + tropicalRainforestGen = config.get("Biomes To Generate", "TropicalRainforest", true).getBoolean(false); + tropicsGen = config.get("Biomes To Generate", "Tropics", true).getBoolean(false); + tundraGen = config.get("Biomes To Generate", "Tundra", true).getBoolean(false); + volcanoGen = config.get("Biomes To Generate", "Volcano", true).getBoolean(false); + wastelandGen = config.get("Biomes To Generate", "Wasteland", true).getBoolean(false); + wetlandGen = config.get("Biomes To Generate", "Wetland", true).getBoolean(false); + woodlandGen = config.get("Biomes To Generate", "Woodland", true).getBoolean(false); + + // Vanilla biomes + desertGen = config.get("Vanilla Biomes To Generate", "Desert", true).getBoolean(true); + extremeHillsGen = config.get("Vanilla Biomes To Generate", "ExtremeHills", true).getBoolean(true); + forestGen = config.get("Vanilla Biomes To Generate", "Forest", true).getBoolean(true); + jungleGen = config.get("Vanilla Biomes To Generate", "Jungle", true).getBoolean(true); + plainsGen = config.get("Vanilla Biomes To Generate", "Plains", true).getBoolean(true); + swamplandGen = config.get("Vanilla Biomes To Generate", "Swampland", true).getBoolean(true); + 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); + + FMLCommonHandler.instance().getFMLLogger().log(Level.INFO, "[BiomesOPlenty] Generated Config!"); + } + catch (Exception e) + { + FMLLog.log(Level.SEVERE, e, "Biomes O Plenty has had a problem loading its configuration"); + } + finally + { + if (config.hasChanged()) { + config.save(); + } + } } - finally + } + + public static class TerrainGen + { + public static Configuration config; + + public static int biomeSize; + public static boolean addToDefault; + public static boolean vanillaEnhanced; + public static boolean netherOverride; + + public static int villageDistance; + + // Village biomes + public static boolean alpsVillage; + public static boolean arcticVillage; + 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 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 mushroomIslandVillage; + 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 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 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) { - if (config.hasChanged()) { - config.save(); + config = new Configuration(configFile); + + try + { + config.load(); + + biomeSize = config.get("Biomes O\' Plenty World Type Settings", "Biome Size", 4, "Default World Type has 4. Large Biomes World Type has 6.").getInt(); + addToDefault = config.get("Biome Settings", "Add Biomes To Default World", false).getBoolean(true); + vanillaEnhanced = config.get("Biome Settings", "Enhanced Vanilla Biomes", true).getBoolean(false); + netherOverride = config.get("Dimension Settings", "Enable Nether Override", true).getBoolean(true); + + villageDistance = config.get("Biomes O\' Plenty World Type Settings", "Distance between villages", 32, "In Vanilla it is set to 32").getInt(); + if (villageDistance < 8) + { + villageDistance = 8; + } + + // Biomes with villages + alpsVillage = config.get("Allow Villages", "Alps", false).getBoolean(false); + arcticVillage = config.get("Allow Villages", "Arctic", false).getBoolean(false); + badlandsVillage = config.get("Allow Villages", "Badlands", false).getBoolean(false); + bambooForestVillage = config.get("Allow Villages", "BambooForest", true).getBoolean(false); + bayouVillage = config.get("Allow Villages", "Bayou", true).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", true).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", "ConiferousForestSnow", true).getBoolean(false); + cragVillage = config.get("Allow Villages", "Crag", false).getBoolean(false); + deadForestVillage = config.get("Allow Villages", "DeadForest", true).getBoolean(false); + deadForestSnowVillage = config.get("Allow Villages", "DeadForestSnow", true).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); + 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); + // mushroomIslandVillage = config.get("Allow Villages", "MushroomIsland", false).getBoolean(false); + mysticGroveVillage = config.get("Allow Villages", "MysticGrove", false).getBoolean(false); + oasisVillage = config.get("Allow Villages", "Oasis", true).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", false).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", true).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", true).getBoolean(false); + shrublandVillage = config.get("Allow Villages", "Shrubland", true).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", true).getBoolean(false); + thicketVillage = config.get("Allow Villages", "Thicket", false).getBoolean(false); + timberVillage = config.get("Allow Villages", "Timber", false).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", false).getBoolean(false); + woodlandVillage = config.get("Allow Villages", "Woodland", true).getBoolean(false); + + // Vanilla biomes + desertVillage = config.get("Allow Villages", "Desert", true).getBoolean(true); + extremeHillsVillage = config.get("Allow Villages", "ExtremeHills", false).getBoolean(false); + forestVillage = config.get("Allow Villages", "Forest", true).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", true).getBoolean(false); + + FMLCommonHandler.instance().getFMLLogger().log(Level.INFO, "[BiomesOPlenty] Generated Config!"); + } + catch (Exception e) + { + FMLLog.log(Level.SEVERE, e, "Biomes O Plenty has had a problem loading its configuration"); + } + finally + { + if (config.hasChanged()) { + config.save(); + } + } + } + } + + public static class IDs + { + public static Configuration config; + + public static int promisedLandDimID; + + //Block IDS + public static int mudID; + public static int driedDirtID; + public static int redRockID; + public static int ashID; + public static int ashStoneID; + public static int hardIceID; + public static int originGrassID; + public static int longGrassID; + public static int hardSandID; + public static int hardDirtID; + public static int holyGrassID; + public static int holyDirtID; + public static int holyStoneID; + public static int cragRockID; + + public static int plantsID; + public static int flowersID; + public static int mushroomsID; + public static int coralID; + public static int willowID; + public static int ivyID; + + public static int leaves1ID; + public static int leaves2ID; + public static int foliageID; + + public static int leavesFruitID; + public static int bambooID; + public static int mudBrickBlockID; + public static int mudBrickStairsID; + public static int stoneDoubleSlabID; + public static int stoneSingleSlabID; + + public static int treeMossID; + + public static int logs1ID; + public static int logs2ID; + public static int logs3ID; + public static int logs4ID; + public static int petalsID; + public static int saplingsID; + public static int colourizedSaplingsID; + public static int redCobbleStairsID; + public static int redBrickStairsID; + public static int holyCobbleStairsID; + public static int holyBrickStairsID; + + public static int promisedLandPortalID; + public static int amethystOreID; + + public static int mossID; + + public static int puddleID; + + public static int planksID; + + public static int woodenDoubleSlab1ID; + public static int woodenSingleSlab1ID; + public static int woodenDoubleSlab2ID; + public static int woodenSingleSlab2ID; + + public static int acaciaStairsID; + public static int cherryStairsID; + public static int darkStairsID; + public static int firStairsID; + public static int holyStairsID; + public static int magicStairsID; + public static int mangroveStairsID; + public static int palmStairsID; + public static int redwoodStairsID; + public static int willowStairsID; + public static int pineStairsID; + public static int hellBarkStairsID; + public static int jacarandaStairsID; + + public static int colourizedLeavesID; + + public static int crystalID; + public static int cloudID; + + public static int bonesID; + public static int glassID; + public static int altarID; + public static int graveID; + + //Item IDs + public static int foodID; + + public static int ancientStaffID; + public static int enderporterID; + + public static int bopDiscID; + public static int bopDiscMudID; + + public static int miscItemsID; + public static int mudballID; + public static int dartBlowerID; + public static int dartID; + public static int soulManipulatorID; + + public static int bopBucketID; + + public static int swordMudID; + public static int shovelMudID; + public static int pickaxeMudID; + public static int axeMudID; + public static int hoeMudID; + public static int helmetMudID; + public static int chestplateMudID; + public static int leggingsMudID; + public static int bootsMudID; + + public static int swordAmethystID; + public static int shovelAmethystID; + public static int pickaxeAmethystID; + public static int axeAmethystID; + public static int hoeAmethystID; + public static int helmetAmethystID; + public static int chestplateAmethystID; + public static int leggingsAmethystID; + public static int bootsAmethystID; + + public static int scytheWoodID; + public static int scytheStoneID; + public static int scytheIronID; + public static int scytheGoldID; + public static int scytheDiamondID; + public static int scytheMudID; + public static int scytheAmethystID; + + public static int flowerBandID; + + //Liquid IDs + public static int springWaterStillID; + public static int liquidPoisonStillID; + + //Biome IDs + public static int alpsID; + public static int alpsForestID; + public static int alpsBaseID; + public static int arcticID; + public static int badlandsID; + public static int bambooForestID; + public static int bayouID; + + public static int beachGravelID; + public static int beachOvergrownID; + + public static int birchForestID; + public static int bogID; + public static int borealForestID; + public static int brushlandID; + public static int canyonID; + public static int canyonRavineID; + public static int chaparralID; + public static int cherryBlossomGroveID; + public static int coniferousForestID; + public static int coniferousForestSnowID; + public static int cragID; + public static int deadForestID; + public static int deadForestSnowID; + public static int deadSwampID; + public static int deadlandsID; + public static int deciduousForestID; + public static int dunesID; + public static int fenID; + public static int fieldID; + public static int fieldForestID; + public static int frostForestID; + public static int fungiForestID; + public static int gardenID; + public static int glacierID; + public static int grasslandID; + public static int groveID; + public static int heathlandID; + public static int highlandID; + public static int hotSpringsID; + public static int icyHillsID; + public static int jadeCliffsID; + public static int lushDesertID; + public static int lushSwampID; + public static int mangroveID; + public static int mapleWoodsID; + public static int marshID; + public static int meadowID; + public static int meadowForestID; + public static int mesaID; + public static int moorID; + public static int mountainID; + public static int mysticGroveID; + + public static int netherBaseID; + public static int netherGardenID; + public static int netherDesertID; + public static int netherLavaID; + public static int netherBoneID; + + public static int oasisID; + + public static int oceanCoralID; + public static int oceanKelpID; + + public static int ominousWoodsID; + public static int ominousWoodsThickID; + public static int orchardID; + public static int originValleyID; + public static int outbackID; + public static int pastureID; + public static int pastureMeadowID; + public static int pastureThinID; + public static int polarID; + public static int prairieID; + + public static int promisedLandForestID; + public static int promisedLandPlainsID; + public static int promisedLandSwampID; + + public static int quagmireID; + public static int rainforestID; + public static int redwoodForestID; + public static int reefID; + public static int sacredSpringsID; + public static int savannaID; + public static int savannaPlateauID; + public static int scrublandID; + public static int seasonalForestID; + public static int seasonalSpruceForestID; + public static int shieldID; + public static int shoreID; + public static int shrublandID; + public static int shrublandForestID; + public static int sludgepitID; + public static int spruceWoodsID; + public static int steppeID; + public static int temperateRainforestID; + public static int thicketID; + public static int timberID; + public static int timberThinID; + public static int tropicalRainforestID; + public static int tropicsID; + public static int tundraID; + public static int volcanoID; + public static int wastelandID; + public static int wetlandID; + public static int woodlandID; + + public static int plainsNewID; + public static int desertNewID; + public static int desertHillsNewID; + public static int extremeHillsNewID; + public static int extremeHillsEdgeNewID; + public static int forestNewID; + public static int forestHillsNewID; + public static int taigaNewID; + public static int taigaHillsNewID; + public static int swamplandNewID; + public static int jungleNewID; + public static int jungleHillsNewID; + + public static int entityMudballID; + public static int entityDartID; + public static int entityPoisonDartID; + + public static int jungleSpiderID; + public static int rosesterID; + public static int globID; + + public static void init(File configFile) + { + config = new Configuration(configFile); + + try + { + config.load(); + + promisedLandDimID = config.get("Dimension Settings", "Promised Land Dimension ID", 20, null).getInt(); + + // Get Terrain Block ID's + mudID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Mud ID", 160, null).getInt(); + driedDirtID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Dried Dirt ID", 161, null).getInt(); + redRockID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Red Rock ID", 162, null).getInt(); + ashID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Ash Block ID", 163, null).getInt(); + ashStoneID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Ash Stone ID", 164, null).getInt(); + hardIceID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Hard Ice ID", 165, null).getInt(); + originGrassID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Origin Grass ID", 166, null).getInt(); + hardSandID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Hard Sand ID", 167, null).getInt(); + hardDirtID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Hard Dirt ID", 168, null).getInt(); + holyGrassID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Holy Grass ID", 169, null).getInt(); + holyDirtID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Holy Dirt ID", 170, null).getInt(); + holyStoneID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Skystone ID", 171, null).getInt(); + cragRockID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Crag Rock ID", 172, null).getInt(); + longGrassID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Long Grass ID", 173, null).getInt(); + + // Get Crafted Block ID's + plantsID = config.getBlock("Plant ID", 1920, null).getInt(); + flowersID = config.getBlock("Flower ID", 1921, null).getInt(); + willowID = config.getBlock("Willow ID", 1922, null).getInt(); + + leaves1ID = config.getBlock("Leaf Block ID 1", 1923, null).getInt(); + leaves2ID = config.getBlock("Leaf Block ID 2", 1924, null).getInt(); + foliageID = config.getBlock("Foliage ID", 1925, null).getInt(); + + leavesFruitID = config.getBlock("Fruit Leaf Block ID", 1926, null).getInt(); + bambooID = config.getBlock("Bamboo ID", 1927, null).getInt(); + mudBrickBlockID = config.getBlock("Mud Bricks ID", 1928, null).getInt(); + mudBrickStairsID = config.getBlock("Mud Brick Stairs ID", 1929, null).getInt(); + stoneDoubleSlabID = config.getBlock("Stone Double Slab ID", 1930, null).getInt(); + stoneSingleSlabID = config.getBlock("Stone Single Slab ID", 1931, null).getInt(); + + treeMossID = config.getBlock("Tree Moss ID", 1932, null).getInt(); + + logs1ID = config.getBlock("Log Block ID 1", 1933, null).getInt(); + logs2ID = config.getBlock("Log Block ID 2", 1934, null).getInt(); + logs3ID = config.getBlock("Log Block ID 3", 1935, null).getInt(); + petalsID = config.getBlock("Petal ID", 1936, null).getInt(); + saplingsID = config.getBlock("Sapling ID", 1937, null).getInt(); + colourizedSaplingsID = config.getBlock("Colourized Sapling ID", 1938, null).getInt(); + redCobbleStairsID = config.getBlock("Red Cobble Stairs ID", 1939, null).getInt(); + redBrickStairsID = config.getBlock("Red Brick Stairs ID", 1940, null).getInt(); + + promisedLandPortalID = config.getBlock("Promised Land Portal ID", 1941, null).getInt(); + amethystOreID = config.getBlock("Amethyst Ore ID", 1942, null).getInt(); + + ivyID = config.getBlock("Ivy ID", 1943, null).getInt(); + + mossID = config.getBlock("Moss ID", 1944, null).getInt(); + + planksID = config.getBlock("Planks ID", 1947, null).getInt(); + + woodenDoubleSlab1ID = config.getBlock("Wooden Double Slab 1 ID", 1948, null).getInt(); + woodenSingleSlab1ID = config.getBlock("Wooden Single Slab 1 ID", 1949, null).getInt(); + woodenDoubleSlab2ID = config.getBlock("Wooden Double Slab 2 ID", 1950, null).getInt(); + woodenSingleSlab2ID = config.getBlock("Wooden Single Slab 2 ID", 1951, null).getInt(); + + acaciaStairsID = config.getBlock("Acacia Stairs ID", 1952, null).getInt(); + cherryStairsID = config.getBlock("Cherry Stairs ID", 1953, null).getInt(); + darkStairsID = config.getBlock("Dark Stairs ID", 1954, null).getInt(); + firStairsID = config.getBlock("Fir Stairs ID", 1955, null).getInt(); + holyStairsID = config.getBlock("Holy Stairs ID", 1956, null).getInt(); + magicStairsID = config.getBlock("Magic Stairs ID", 1957, null).getInt(); + mangroveStairsID = config.getBlock("Mangrove Stairs ID", 1958, null).getInt(); + palmStairsID = config.getBlock("Palm Stairs ID", 1959, null).getInt(); + redwoodStairsID = config.getBlock("Redwood Stairs ID", 1960, null).getInt(); + willowStairsID = config.getBlock("Willow Stairs ID", 1961, null).getInt(); + + colourizedLeavesID = config.getBlock("Colourized Leaves ID", 1962, null).getInt(); + + crystalID = config.getBlock("Crystal ID", 1963, null).getInt(); + cloudID = config.getBlock("Cloud ID", 1964, null).getInt(); + + holyCobbleStairsID = config.getBlock("Skystone Cobble Stairs ID", 1965, null).getInt(); + holyBrickStairsID = config.getBlock("Skystone Brick Stairs ID", 1966, null).getInt(); + + mushroomsID = config.getBlock("Mushroom ID", 1967, null).getInt(); + + bonesID = config.getBlock("Bones ID", 1968, null).getInt(); + coralID = config.getBlock("Coral ID", 1969, null).getInt(); + + //1970, 1971, 1972 & 1973 used by Liquids + + logs4ID = config.getBlock("Log Block ID 4", 1974, null).getInt(); + + pineStairsID = config.getBlock("Pine Stairs ID", 1975, null).getInt(); + hellBarkStairsID = config.getBlock("Hell Bark Stairs ID", 1976, null).getInt(); + jacarandaStairsID = config.getBlock("Jacaranda ID", 1977, null).getInt(); + + glassID = config.getBlock("Glass ID", 1978, null).getInt(); + + altarID = config.getBlock("Altar ID", 1979, null).getInt(); + + puddleID = config.getBlock("Puddle ID", 1980, null).getInt(); + + graveID = config.getBlock("Grave ID", 1981, null).getInt(); + + // Get Item ID's + foodID = config.getItem("Food ID", 21003, null).getInt(); + + ancientStaffID = config.getItem("Ancient Staff ID", 21006).getInt(); + enderporterID = config.getItem("Enderporter ID", 21007).getInt(); + + miscItemsID = config.getItem("Misc Items ID", 21010).getInt(); + mudballID = config.getItem("Mud Ball ID", 21011).getInt(); + dartBlowerID = config.getItem("Dart Blower ID", 21012).getInt(); + dartID = config.getItem("Dart ID", 21013).getInt(); + + bopDiscID = config.getItem("Traversia Music Disc ID", 21019, null).getInt(); + bopDiscMudID = config.getItem("Muddy Music Disc ID", 21020, null).getInt(); + + swordMudID = config.getItem("Muddy Sword ID", 21060, null).getInt(); + shovelMudID = config.getItem("Muddy Shovel ID", 21061, null).getInt(); + pickaxeMudID = config.getItem("Muddy Pickaxe ID", 21062, null).getInt(); + axeMudID = config.getItem("Muddy Axe ID", 21063, null).getInt(); + hoeMudID = config.getItem("Muddy Hoe ID", 21064, null).getInt(); + helmetMudID = config.getItem("Muddy Helmet ID", 21065, null).getInt(); + chestplateMudID = config.getItem("Muddy Chestplate ID", 21066, null).getInt(); + leggingsMudID = config.getItem("Muddy Leggings ID", 21067, null).getInt(); + bootsMudID = config.getItem("Muddy Boots ID", 21068, null).getInt(); + + swordAmethystID = config.getItem("Amethyst Sword ID", 21069, null).getInt(); + shovelAmethystID = config.getItem("Amethyst Shovel ID", 21070, null).getInt(); + pickaxeAmethystID = config.getItem("Amethyst Pickaxe ID", 21071, null).getInt(); + axeAmethystID = config.getItem("Amethyst Axe ID", 21072, null).getInt(); + hoeAmethystID = config.getItem("Amethyst Hoe ID", 21073, null).getInt(); + helmetAmethystID = config.getItem("Amethyst Helmet ID", 21074, null).getInt(); + chestplateAmethystID = config.getItem("Amethyst Chestplate ID", 21075, null).getInt(); + leggingsAmethystID = config.getItem("Amethyst Leggings ID", 21076, null).getInt(); + bootsAmethystID = config.getItem("Amethyst Boots ID", 21077, null).getInt(); + + flowerBandID = config.getItem("Flower Band ID", 21078, null).getInt(); + + bopBucketID = config.getItem("Spring Water Bucket ID", 21079, null).getInt(); + + soulManipulatorID = config.getItem("Soul Manipulator ID", 21080).getInt(); + + scytheWoodID = config.getItem("Wood Scythe ID", 21081).getInt(); + scytheStoneID = config.getItem("Stone Scythe ID", 21082).getInt(); + scytheIronID = config.getItem("Iron Scythe ID", 21083).getInt(); + scytheGoldID = config.getItem("Gold Scythe ID", 21084).getInt(); + scytheDiamondID = config.getItem("Diamond Scythe ID", 21085).getInt(); + scytheMudID = config.getItem("Mud Scythe ID", 21086).getInt(); + scytheAmethystID = config.getItem("Amethyst Scythe ID", 21087).getInt(); + + //Liquid Ids + springWaterStillID = config.get("Liquid IDs", "Spring Water Still ID (ID before this must be free!)", 1971, null).getInt(); + liquidPoisonStillID = config.get("Liquid IDs", "Liquid Poison Still ID (ID before this must be free!)", 1973, null).getInt(); + + //Mob IDs + jungleSpiderID = config.get("Mob IDs", "Jungle Spider ID", 101, null).getInt(); + rosesterID = config.get("Mob IDs", "Rosester ID", 102, null).getInt(); + globID = config.get("Mob IDs", "Glob ID", 106, null).getInt(); + + //Projectile IDs + entityMudballID = config.get("Entity IDs", "Mudball ID", 103, null).getInt();; + entityDartID = config.get("Entity IDs", "Dart ID", 104, null).getInt();; + entityPoisonDartID = config.get("Entity IDs", "Poison Dart ID", 105, null).getInt();; + + FMLCommonHandler.instance().getFMLLogger().log(Level.INFO, "[BiomesOPlenty] Generating Biome ID's"); + + //23-79 ExtraBiomesXL + + savannaPlateauID = config.get("Biome IDs", "Savanna Plateau (Sub-Biome) ID", 39).getInt(); + fieldForestID = config.get("Biome IDs", "Forested Field (Sub-Biome) ID", 40).getInt(); + seasonalSpruceForestID = config.get("Biome IDs", "Seasonal Spruce Forest (Sub-Biome) ID", 41).getInt(); + alpsBaseID = config.get("Biome IDs", "Alps Forest (Sub-Biome) ID", 42).getInt(); + alpsForestID = config.get("Biome IDs", "Alps Mountainside (Sub-Biome) ID", 43).getInt(); + timberThinID = config.get("Biome IDs", "Thinned Timber (Sub-Biome) ID", 44).getInt(); + pastureThinID = config.get("Biome IDs", "Thinned Pasture (Sub-Biome) ID", 45).getInt(); + pastureMeadowID = config.get("Biome IDs", "Pasture Meadow (Sub-Biome) ID", 46).getInt(); + ominousWoodsThickID = config.get("Biome IDs", "Thick Ominous Woods (Sub-Biome) ID", 47).getInt(); + shrublandForestID = config.get("Biome IDs", "Thick Shrubland (Sub-Biome) ID", 48).getInt(); + canyonRavineID = config.get("Biome IDs", "Canyon Ravine (Sub-Biome) ID", 49).getInt(); + meadowForestID = config.get("Biome IDs", "Meadow Forest (Sub-Biome) ID", 50).getInt(); + + oceanCoralID = config.get("Biome IDs", "Coral Reef (Ocean) ID", 58).getInt(); + oceanKelpID = config.get("Biome IDs", "Kelp Forest (Ocean) ID", 59).getInt(); + + beachGravelID = config.get("Biome IDs", "Gravel Beach ID", 60).getInt(); + beachOvergrownID = config.get("Biome IDs", "Overgrown Beach ID", 61).getInt(); + + promisedLandForestID = config.get("Biome IDs", "Wonderous Woods (Promised Land) ID", 62).getInt(); + promisedLandPlainsID = config.get("Biome IDs", "Majestic Meadow (Promised Land) ID", 63).getInt(); + promisedLandSwampID = config.get("Biome IDs", "Blessed Bog (Promised Land) ID", 64).getInt(); + + netherBaseID = config.get("Biome IDs", "Nether Base (Nether) ID", 65).getInt(); + netherGardenID = config.get("Biome IDs", "Undergarden (Nether) ID", 66).getInt(); + netherDesertID = config.get("Biome IDs", "Corrupted Sands (Nether) ID", 67).getInt(); + netherLavaID = config.get("Biome IDs", "Phantasmagoric Inferno (Nether) ID", 68).getInt(); + netherBoneID = config.get("Biome IDs", "Boneyard (Nether) ID", 69).getInt(); + + //70-87 Twilight Forest + + //80-169 Better World Generation 4 + + alpsID = config.get("Biome IDs", "Alps ID", 170).getInt(); + arcticID = config.get("Biome IDs", "Arctic ID", 171).getInt(); + badlandsID = config.get("Biome IDs", "Badlands ID", 172).getInt(); + bambooForestID = config.get("Biome IDs", "Bamboo Forest ID", 173).getInt(); + bayouID = config.get("Biome IDs", "Bayou ID", 174).getInt(); + birchForestID = config.get("Biome IDs", "Birch Forest ID", 175).getInt(); + bogID = config.get("Biome IDs", "Bog ID", 176).getInt(); + borealForestID = config.get("Biome IDs", "Boreal Forest ID", 177).getInt(); + brushlandID = config.get("Biome IDs", "Brushland ID", 178).getInt(); + canyonID = config.get("Biome IDs", "Canyon ID", 179).getInt(); + chaparralID = config.get("Biome IDs", "Chaparral ID", 180).getInt(); + cherryBlossomGroveID = config.get("Biome IDs", "Cherry Blossom Grove ID", 181).getInt(); + coniferousForestID = config.get("Biome IDs", "Coniferous Forest ID", 182).getInt(); + coniferousForestSnowID = config.get("Biome IDs", "Coniferous Forest (Snow) ID", 183).getInt(); + cragID = config.get("Biome IDs", "Crag ID", 184).getInt(); + deadForestID = config.get("Biome IDs", "Dead Forest ID", 185).getInt(); + deadForestSnowID = config.get("Biome IDs", "Dead Forest (Snow) ID", 186).getInt(); + deadSwampID = config.get("Biome IDs", "Dead Swamp ID", 187).getInt(); + deadlandsID = config.get("Biome IDs", "Deadlands ID", 188).getInt(); + deciduousForestID = config.get("Biome IDs", "Deciduous Forest ID", 189).getInt(); + dunesID = config.get("Biome IDs", "Dunes ID", 190).getInt(); + fenID = config.get("Biome IDs", "Fen ID", 191).getInt(); + fieldID = config.get("Biome IDs", "Field ID", 192).getInt(); + frostForestID = config.get("Biome IDs", "Frost Forest ID", 193).getInt(); + fungiForestID = config.get("Biome IDs", "Fungi Forest ID", 194).getInt(); + gardenID = config.get("Biome IDs", "Garden ID", 195).getInt(); + glacierID = config.get("Biome IDs", "Glacier ID", 196).getInt(); + grasslandID = config.get("Biome IDs", "Grassland ID", 197).getInt(); + groveID = config.get("Biome IDs", "Grove ID", 198).getInt(); + heathlandID = config.get("Biome IDs", "Heathland ID", 199).getInt(); + highlandID = config.get("Biome IDs", "Highland ID", 200).getInt(); + hotSpringsID = config.get("Biome IDs", "Hot Springs ID", 201).getInt(); + icyHillsID = config.get("Biome IDs", "Icy Hills ID", 202).getInt(); + jadeCliffsID = config.get("Biome IDs", "Jade Cliffs ID", 203).getInt(); + lushDesertID = config.get("Biome IDs", "Lush Desert ID", 204).getInt(); + lushSwampID = config.get("Biome IDs", "Lush Swamp ID", 205).getInt(); + mangroveID = config.get("Biome IDs", "Mangrove ID", 206).getInt(); + + //207-209 left for Mo Creatures + + mapleWoodsID = config.get("Biome IDs", "Maple Woods ID", 210).getInt(); + marshID = config.get("Biome IDs", "Marsh ID", 211).getInt(); + meadowID = config.get("Biome IDs", "Meadow ID", 212).getInt(); + mesaID = config.get("Biome IDs", "Mesa ID", 213).getInt(); + moorID = config.get("Biome IDs", "Moor ID", 214).getInt(); + mountainID = config.get("Biome IDs", "Mountain ID", 215).getInt(); + mysticGroveID = config.get("Biome IDs", "Mystic Grove ID", 216).getInt(); + oasisID = config.get("Biome IDs", "Oasis ID", 217).getInt(); + ominousWoodsID = config.get("Biome IDs", "Ominous Woods ID", 218).getInt(); + orchardID = config.get("Biome IDs", "Orchard ID", 219).getInt(); + originValleyID = config.get("Biome IDs", "Origin Valley ID", 220).getInt(); + outbackID = config.get("Biome IDs", "Outback ID", 221).getInt(); + pastureID = config.get("Biome IDs", "Pasture ID", 222).getInt(); + polarID = config.get("Biome IDs", "Polar ID", 223).getInt(); + prairieID = config.get("Biome IDs", "Prairie ID", 224).getInt(); + quagmireID = config.get("Biome IDs", "Quagmire ID", 225).getInt(); + rainforestID = config.get("Biome IDs", "Rainforest ID", 226).getInt(); + redwoodForestID = config.get("Biome IDs", "Redwood Forest ID", 227).getInt(); + sacredSpringsID = config.get("Biome IDs", "Sacred Springs ID", 228).getInt(); + savannaID = config.get("Biome IDs", "Savanna ID", 229).getInt(); + scrublandID = config.get("Biome IDs", "Scrubland ID", 230).getInt(); + seasonalForestID = config.get("Biome IDs", "Seasonal Forest ID", 231).getInt(); + shieldID = config.get("Biome IDs", "Shield ID", 232).getInt(); + shoreID = config.get("Biome IDs", "Shore ID", 233).getInt(); + shrublandID = config.get("Biome IDs", "Shrubland ID", 234).getInt(); + sludgepitID = config.get("Biome IDs", "Sludgepit ID", 235).getInt(); + spruceWoodsID = config.get("Biome IDs", "Spruce Woods ID", 236).getInt(); + steppeID = config.get("Biome IDs", "Steppe ID", 237).getInt(); + temperateRainforestID = config.get("Biome IDs", "Temperate Rainforest ID", 238).getInt(); + thicketID = config.get("Biome IDs", "Thicket ID", 239).getInt(); + timberID = config.get("Biome IDs", "Timber ID", 240).getInt(); + tropicalRainforestID = config.get("Biome IDs", "Tropical Rainforest ID", 241).getInt(); + tropicsID = config.get("Biome IDs", "Tropics ID", 242).getInt(); + tundraID = config.get("Biome IDs", "Tundra ID", 243).getInt(); + volcanoID = config.get("Biome IDs", "Volcano ID", 244).getInt(); + wastelandID = config.get("Biome IDs", "Wasteland ID", 245).getInt(); + wetlandID = config.get("Biome IDs", "Wetland ID", 246).getInt(); + woodlandID = config.get("Biome IDs", "Woodland ID", 247).getInt(); + + plainsNewID = config.get("Biome IDs", "Plains (New) ID", 248).getInt(); + desertNewID = config.get("Biome IDs", "Desert (New) ID", 249).getInt(); + forestNewID = config.get("Biome IDs", "Forest (New) ID", 250).getInt(); + taigaNewID = config.get("Biome IDs", "Taiga (New) ID", 251).getInt(); + swamplandNewID = config.get("Biome IDs", "Swampland (New) ID", 252).getInt(); + extremeHillsNewID = config.get("Biome IDs", "Extreme Hills (New) ID", 253).getInt(); + jungleNewID = config.get("Biome IDs", "Jungle (New) ID", 254).getInt(); + + FMLCommonHandler.instance().getFMLLogger().log(Level.INFO, "[BiomesOPlenty] Generated Config!"); + } + catch (Exception e) + { + FMLLog.log(Level.SEVERE, e, "Biomes O Plenty has had a problem loading its configuration"); + } + finally + { + if (config.hasChanged()) + { + config.save(); + } + } + } + } + + public static class Misc + { + public static Configuration config; + + public static boolean skyColors; + public static boolean achievements; + public static boolean dungeonLoot; + public static boolean rainCreatesPuddles; + + public static boolean amethystTools; + public static boolean mudTools; + public static boolean altarCrafting; + public static boolean scytheCrafting; + public static boolean staffCrafting; + public static boolean enderporterCrafting; + public static boolean dartCrafting; + public static boolean flowerbandCrafting; + + public static int promisedLandSkyColor; + + public static void init(File configFile) + { + config = new Configuration(configFile); + + try + { + config.load(); + + achievements = config.get("Miscellanious Settings", "Add Biomes O\' Plenty Achievements", true).getBoolean(false); + dungeonLoot = config.get("Miscellanious Settings", "Add Custom Dungeon Loot", true).getBoolean(false); + rainCreatesPuddles = config.get("Miscellanious Settings", "Enable Puddles During Rain", true).getBoolean(true); + + amethystTools = config.get("Crafting Settings", "Enable Amethyst Tool/Armor Crafting", true).getBoolean(true); + mudTools = config.get("Crafting Settings", "Enable Mud Tool/Armor Crafting", true).getBoolean(true); + altarCrafting = config.get("Crafting Settings", "Enable Altar Items Crafting", true).getBoolean(true); + scytheCrafting = config.get("Crafting Settings", "Enable Scythe Crafting", true).getBoolean(true); + staffCrafting = config.get("Crafting Settings", "Enable Ancient Staff Crafting", true).getBoolean(true); + enderporterCrafting = config.get("Crafting Settings", "Enable Enderporter Crafting", true).getBoolean(true); + dartCrafting = config.get("Crafting Settings", "Enable Dartblower/Dart Crafting", true).getBoolean(true); + flowerbandCrafting = config.get("Crafting Settings", "Enable Flower Band Crafting", true).getBoolean(true); + + //Hard-Coded Colors + skyColors = config.get("Hard-Coded Colors", "Enable Sky Colors", true).getBoolean(false); + + promisedLandSkyColor = config.get("Hard-Coded Colors", "Promised Land Sky Color", 50175, null).getInt(); + + FMLCommonHandler.instance().getFMLLogger().log(Level.INFO, "[BiomesOPlenty] Generated Config!"); + } + catch (Exception e) + { + FMLLog.log(Level.SEVERE, e, "Biomes O Plenty has had a problem loading its configuration"); + } + finally + { + if (config.hasChanged()) { + config.save(); + } } } } diff --git a/src/minecraft/biomesoplenty/configuration/BOPCrafting.java b/src/minecraft/biomesoplenty/configuration/BOPCrafting.java index ebf28996d..f078d6edf 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPCrafting.java +++ b/src/minecraft/biomesoplenty/configuration/BOPCrafting.java @@ -158,7 +158,7 @@ public class BOPCrafting GameRegistry.addRecipe(new ItemStack(Block.stoneBrick, 1, 1), new Object[] {"MMM", "MSM", "MMM", 'M', Blocks.moss.get(), 'S', Block.stoneBrick}); //Scythes - if (BOPConfiguration.scytheCrafting) + if (BOPConfiguration.Misc.scytheCrafting) { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.scytheWood.get(), 1), new Object [] {" MM", "M S", " S", Character.valueOf('M'), "plankWood", Character.valueOf('S'), "stickWood" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.scytheStone.get(), 1), new Object [] {" MM", "M S", " S", Character.valueOf('M'), Block.cobblestone, Character.valueOf('S'), "stickWood" })); @@ -174,7 +174,7 @@ public class BOPCrafting } //Mud Tools and Armor - if (BOPConfiguration.mudTools) + if (BOPConfiguration.Misc.mudTools) { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.pickaxeMud.get(), 1), new Object [] {"###", " X ", " X ", Character.valueOf('#'), Items.mudball.get(), Character.valueOf('X'), "stickWood" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.shovelMud.get(), 1), new Object [] {"#", "X", "X", Character.valueOf('#'), Items.mudball.get(), Character.valueOf('X'), "stickWood"})); @@ -190,7 +190,7 @@ public class BOPCrafting } //Amethyst Tools and Armor - if (BOPConfiguration.amethystTools) + if (BOPConfiguration.Misc.amethystTools) { GameRegistry.addRecipe(new ItemStack(Items.pickaxeAmethyst.get(), 1), new Object [] {"###", " X ", " X ", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2), Character.valueOf('X'), Item.ingotIron}); GameRegistry.addRecipe(new ItemStack(Items.shovelAmethyst.get(), 1), new Object [] {"#", "X", "X", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2), Character.valueOf('X'), Item.ingotIron}); @@ -207,7 +207,7 @@ public class BOPCrafting } //Flower Bands - if (BOPConfiguration.flowerbandCrafting) + if (BOPConfiguration.Misc.flowerbandCrafting) { GameRegistry.addRecipe(new ItemStack(Items.flowerBand.get(), 1, 0), new Object [] {"CCC", "C C", "CCC", Character.valueOf('C'), new ItemStack(Blocks.flowers.get(), 1, 0)}); GameRegistry.addRecipe(new ItemStack(Items.flowerBand.get(), 1, 1), new Object [] {"CDC", "D D", "CDC", Character.valueOf('C'), new ItemStack(Blocks.flowers.get(), 1, 0), Character.valueOf('D'), new ItemStack(Blocks.flowers.get(), 1, 5)}); @@ -218,7 +218,7 @@ public class BOPCrafting //Other GameRegistry.addRecipe(new ItemStack(Item.wheat, 1), new Object[] {"###", '#', new ItemStack(Blocks.plants.get(),1,6)}); - if (BOPConfiguration.staffCrafting) + if (BOPConfiguration.Misc.staffCrafting) { GameRegistry.addRecipe(new ItemStack(Items.ancientStaff.get(), 1, 0), new Object[] {"T", "P", "H", 'T', new ItemStack(Items.ancientStaff.get(), 1, 3), 'P', new ItemStack(Items.ancientStaff.get(), 1, 2), 'H', new ItemStack(Items.ancientStaff.get(), 1, 1)}); GameRegistry.addRecipe(new ItemStack(Items.ancientStaff.get(), 1, 1), new Object[] {"ESE", "ETE", " E ", 'E', Block.whiteStone, 'T', new ItemStack(Items.miscItems.get(), 1, 13), 'S', new ItemStack(Items.miscItems.get(), 1, 15)}); @@ -227,13 +227,13 @@ public class BOPCrafting GameRegistry.addShapelessRecipe(new ItemStack(Items.ancientStaff.get(), 1, 0), new ItemStack(Items.ancientStaff.get(), 1, 4), new ItemStack(Item.netherStar, 1)); } - if (BOPConfiguration.enderporterCrafting) + if (BOPConfiguration.Misc.enderporterCrafting) { GameRegistry.addRecipe(new ItemStack(Items.enderporter.get(), 1, 0), new Object[] {"IOI", "OAO", "IOI", 'I', Item.eyeOfEnder, 'O', Block.obsidian, 'A', new ItemStack(Blocks.amethystOre.get(), 1, 1)}); GameRegistry.addRecipe(new ItemStack(Items.bopDiscMud.get(), 1), new Object[] {" M ", "MDM", " M ", 'M', Items.mudball.get(), 'D', Items.bopDisc.get()}); } - if (BOPConfiguration.altarCrafting) + if (BOPConfiguration.Misc.altarCrafting) { GameRegistry.addRecipe(new ItemStack(Items.miscItems.get(), 1, 16), new Object[] {"SBS", "GKG", "SBS", 'S', Block.slowSand, 'B', Item.blazePowder, 'G', Item.ghastTear, 'K', new ItemStack(Item.skull, 1, 1)}); GameRegistry.addRecipe(new ItemStack(Items.soulManipulator.get(), 1, 0), new Object[] {"G", "T", "B", 'G', Block.glass, 'T', Item.ghastTear, 'B', Item.blazeRod}); @@ -244,7 +244,7 @@ public class BOPCrafting } //Dart Blower - if (BOPConfiguration.dartCrafting) + if (BOPConfiguration.Misc.dartCrafting) { GameRegistry.addRecipe(new ItemStack(Items.dartBlower.get(), 1), new Object[] {"R R", "R R", "R R", Character.valueOf('R'), new ItemStack(Blocks.plants.get(), 1, 8)}); GameRegistry.addRecipe(new ItemStack(Items.dart.get(), 4, 0), new Object[] {"T", "R", "F", Character.valueOf('T'), new ItemStack(Blocks.plants.get(), 1, 5), Character.valueOf('R'), new ItemStack(Blocks.plants.get(), 1, 8), Character.valueOf('F'), Item.feather}); diff --git a/src/minecraft/biomesoplenty/configuration/BOPEntities.java b/src/minecraft/biomesoplenty/configuration/BOPEntities.java index c8c738667..6ad3858a2 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPEntities.java +++ b/src/minecraft/biomesoplenty/configuration/BOPEntities.java @@ -38,13 +38,13 @@ public class BOPEntities { public static void init() { - EntityRegistry.registerModEntity(EntityMudball.class, "MudBall", BOPConfiguration.entityMudballID, BiomesOPlenty.instance, 80, 3, true); - EntityRegistry.registerModEntity(EntityDart.class, "Dart", BOPConfiguration.entityDartID, BiomesOPlenty.instance, 80, 3, true); - EntityRegistry.registerModEntity(EntityPoisonDart.class, "PoisonDart", BOPConfiguration.entityPoisonDartID, BiomesOPlenty.instance, 80, 3, true); + EntityRegistry.registerModEntity(EntityMudball.class, "MudBall", BOPConfiguration.IDs.entityMudballID, BiomesOPlenty.instance, 80, 3, true); + EntityRegistry.registerModEntity(EntityDart.class, "Dart", BOPConfiguration.IDs.entityDartID, BiomesOPlenty.instance, 80, 3, true); + EntityRegistry.registerModEntity(EntityPoisonDart.class, "PoisonDart", BOPConfiguration.IDs.entityPoisonDartID, BiomesOPlenty.instance, 80, 3, true); - EntityRegistry.registerModEntity(EntityJungleSpider.class, "JungleSpider", BOPConfiguration.jungleSpiderID, BiomesOPlenty.instance, 80, 3, true); - EntityRegistry.registerModEntity(EntityRosester.class, "Rosester", BOPConfiguration.rosesterID, BiomesOPlenty.instance, 80, 3, true); - EntityRegistry.registerModEntity(EntityGlob.class, "Glob", BOPConfiguration.globID, BiomesOPlenty.instance, 80, 3, true); + EntityRegistry.registerModEntity(EntityJungleSpider.class, "JungleSpider", BOPConfiguration.IDs.jungleSpiderID, BiomesOPlenty.instance, 80, 3, true); + EntityRegistry.registerModEntity(EntityRosester.class, "Rosester", BOPConfiguration.IDs.rosesterID, BiomesOPlenty.instance, 80, 3, true); + EntityRegistry.registerModEntity(EntityGlob.class, "Glob", BOPConfiguration.IDs.globID, BiomesOPlenty.instance, 80, 3, true); registerEntityEgg(EntityJungleSpider.class, 5147192, 11013646); registerEntityEgg(EntityRosester.class, 14831439, 16756224); diff --git a/src/minecraft/biomesoplenty/configuration/BOPFluids.java b/src/minecraft/biomesoplenty/configuration/BOPFluids.java index 4765a60e5..6aafd50d9 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPFluids.java +++ b/src/minecraft/biomesoplenty/configuration/BOPFluids.java @@ -28,23 +28,23 @@ public class BOPFluids private static void registerFluids() { - Fluids.liquidPoisonFluid = Optional.of(new LiquidPoisonFluid("bop.liquidPoison").setBlockID(BOPConfiguration.liquidPoisonStillID)); + Fluids.liquidPoisonFluid = Optional.of(new LiquidPoisonFluid("bop.liquidPoison").setBlockID(BOPConfiguration.IDs.liquidPoisonStillID)); FluidRegistry.registerFluid(Fluids.liquidPoisonFluid.get()); - Fluids.springWaterFluid = Optional.of(new SpringWaterFluid("bop.springWater").setBlockID(BOPConfiguration.springWaterStillID)); + Fluids.springWaterFluid = Optional.of(new SpringWaterFluid("bop.springWater").setBlockID(BOPConfiguration.IDs.springWaterStillID)); FluidRegistry.registerFluid(Fluids.springWaterFluid.get()); } private static void initializeLiquids() { - Fluids.liquidPoison = Optional.of(new BlockFluidLiquidPoison(BOPConfiguration.liquidPoisonStillID, Fluids.liquidPoisonFluid.get(), Material.water).setUnlocalizedName("bop.liquidPoison")); + Fluids.liquidPoison = Optional.of(new BlockFluidLiquidPoison(BOPConfiguration.IDs.liquidPoisonStillID, Fluids.liquidPoisonFluid.get(), Material.water).setUnlocalizedName("bop.liquidPoison")); - Fluids.springWater = Optional.of(new BlockFluidSpringWater(BOPConfiguration.springWaterStillID, Fluids.springWaterFluid.get(), Material.water).setUnlocalizedName("bop.springWater")); + Fluids.springWater = Optional.of(new BlockFluidSpringWater(BOPConfiguration.IDs.springWaterStillID, Fluids.springWaterFluid.get(), Material.water).setUnlocalizedName("bop.springWater")); } private static void initializeContainers() { - Fluids.bopBucket = Optional.of((new ItemBOPBucket(BOPConfiguration.bopBucketID).setMaxStackSize(1).setUnlocalizedName("bop.bopBucket"))); + Fluids.bopBucket = Optional.of((new ItemBOPBucket(BOPConfiguration.IDs.bopBucketID).setMaxStackSize(1).setUnlocalizedName("bop.bopBucket"))); FluidContainerRegistry.registerFluidContainer(Fluids.liquidPoisonFluid.get(), new ItemStack(Fluids.bopBucket.get(), 1, 1), new ItemStack(Item.bucketEmpty)); FluidContainerRegistry.registerFluidContainer(Fluids.springWaterFluid.get(), new ItemStack(Fluids.bopBucket.get(), 1, 2), new ItemStack(Fluids.bopBucket.get(), 1, 0)); diff --git a/src/minecraft/biomesoplenty/configuration/BOPItems.java b/src/minecraft/biomesoplenty/configuration/BOPItems.java index c9c69ffa4..e19e781d5 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPItems.java +++ b/src/minecraft/biomesoplenty/configuration/BOPItems.java @@ -98,48 +98,48 @@ public class BOPItems { private static void initializeItems() { // Item declaration - Items.food = Optional.of(new ItemBOPFood(BOPConfiguration.foodID).setUnlocalizedName("bop.food")); - Items.miscItems = Optional.of(new ItemBOP(BOPConfiguration.miscItemsID).setUnlocalizedName("bop.miscItems")); - Items.mudball = Optional.of(new ItemBOPMudball(BOPConfiguration.mudballID).setUnlocalizedName("bop.mudball")); - Items.dartBlower = Optional.of(new ItemDartBlower(BOPConfiguration.dartBlowerID).setUnlocalizedName("bop.dartblower")); - Items.dart = Optional.of(new ItemDart(BOPConfiguration.dartID).setUnlocalizedName("bop.dart")); - Items.soulManipulator = Optional.of(new ItemSoulManipulator(BOPConfiguration.soulManipulatorID).setUnlocalizedName("bop.soulManipulator")); + Items.food = Optional.of(new ItemBOPFood(BOPConfiguration.IDs.foodID).setUnlocalizedName("bop.food")); + Items.miscItems = Optional.of(new ItemBOP(BOPConfiguration.IDs.miscItemsID).setUnlocalizedName("bop.miscItems")); + Items.mudball = Optional.of(new ItemBOPMudball(BOPConfiguration.IDs.mudballID).setUnlocalizedName("bop.mudball")); + Items.dartBlower = Optional.of(new ItemDartBlower(BOPConfiguration.IDs.dartBlowerID).setUnlocalizedName("bop.dartblower")); + Items.dart = Optional.of(new ItemDart(BOPConfiguration.IDs.dartID).setUnlocalizedName("bop.dart")); + Items.soulManipulator = Optional.of(new ItemSoulManipulator(BOPConfiguration.IDs.soulManipulatorID).setUnlocalizedName("bop.soulManipulator")); - Items.ancientStaff = Optional.of(new ItemBOPAncientStaff(BOPConfiguration.ancientStaffID).setUnlocalizedName("bop.ancientStaff")); + Items.ancientStaff = Optional.of(new ItemBOPAncientStaff(BOPConfiguration.IDs.ancientStaffID).setUnlocalizedName("bop.ancientStaff")); - Items.enderporter = Optional.of(new ItemEnderporter(BOPConfiguration.enderporterID).setUnlocalizedName("bop.enderporter")); + Items.enderporter = Optional.of(new ItemEnderporter(BOPConfiguration.IDs.enderporterID).setUnlocalizedName("bop.enderporter")); - Items.bopDisc = Optional.of(new ItemBOPRecord(BOPConfiguration.bopDiscID, "bopdisc").setUnlocalizedName("bop.bopDisc")); - Items.bopDiscMud = Optional.of(new ItemBOPRecordMud(BOPConfiguration.bopDiscMudID, "bopdiscmud").setUnlocalizedName("bop.bopDiscMud")); + Items.bopDisc = Optional.of(new ItemBOPRecord(BOPConfiguration.IDs.bopDiscID, "bopdisc").setUnlocalizedName("bop.bopDisc")); + Items.bopDiscMud = Optional.of(new ItemBOPRecordMud(BOPConfiguration.IDs.bopDiscMudID, "bopdiscmud").setUnlocalizedName("bop.bopDiscMud")); - Items.swordMud = Optional.of((new ItemBOPSword(BOPConfiguration.swordMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.swordMud")); - Items.shovelMud = Optional.of((new ItemBOPSpade(BOPConfiguration.shovelMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.shovelMud")); - Items.pickaxeMud = Optional.of((new ItemBOPPickaxe(BOPConfiguration.pickaxeMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.pickaxeMud")); - Items.axeMud = Optional.of((new ItemBOPAxe(BOPConfiguration.axeMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.hatchetMud")); - Items.hoeMud = Optional.of((new ItemBOPHoe(BOPConfiguration.hoeMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.hoeMud")); - Items.helmetMud = Optional.of((new ArmorMuddy(BOPConfiguration.helmetMudID, EnumArmorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 0)).setUnlocalizedName("bop.helmetMud")); - Items.chestplateMud = Optional.of((new ArmorMuddy(BOPConfiguration.chestplateMudID, EnumArmorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 1)).setUnlocalizedName("bop.chestplateMud")); - Items.leggingsMud = Optional.of((new ArmorMuddy(BOPConfiguration.leggingsMudID, EnumArmorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 2)).setUnlocalizedName("bop.leggingsMud")); - Items.bootsMud = Optional.of((new ArmorMuddy(BOPConfiguration.bootsMudID, EnumArmorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 3)).setUnlocalizedName("bop.bootsMud")); + Items.swordMud = Optional.of((new ItemBOPSword(BOPConfiguration.IDs.swordMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.swordMud")); + Items.shovelMud = Optional.of((new ItemBOPSpade(BOPConfiguration.IDs.shovelMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.shovelMud")); + Items.pickaxeMud = Optional.of((new ItemBOPPickaxe(BOPConfiguration.IDs.pickaxeMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.pickaxeMud")); + Items.axeMud = Optional.of((new ItemBOPAxe(BOPConfiguration.IDs.axeMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.hatchetMud")); + Items.hoeMud = Optional.of((new ItemBOPHoe(BOPConfiguration.IDs.hoeMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.hoeMud")); + Items.helmetMud = Optional.of((new ArmorMuddy(BOPConfiguration.IDs.helmetMudID, EnumArmorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 0)).setUnlocalizedName("bop.helmetMud")); + Items.chestplateMud = Optional.of((new ArmorMuddy(BOPConfiguration.IDs.chestplateMudID, EnumArmorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 1)).setUnlocalizedName("bop.chestplateMud")); + Items.leggingsMud = Optional.of((new ArmorMuddy(BOPConfiguration.IDs.leggingsMudID, EnumArmorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 2)).setUnlocalizedName("bop.leggingsMud")); + Items.bootsMud = Optional.of((new ArmorMuddy(BOPConfiguration.IDs.bootsMudID, EnumArmorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 3)).setUnlocalizedName("bop.bootsMud")); - Items.swordAmethyst = Optional.of((new ItemBOPSword(BOPConfiguration.swordAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.swordAmethyst")); - Items.shovelAmethyst = Optional.of((new ItemBOPSpade(BOPConfiguration.shovelAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.shovelAmethyst")); - Items.pickaxeAmethyst = Optional.of((new ItemBOPPickaxe(BOPConfiguration.pickaxeAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.pickaxeAmethyst")); - Items.axeAmethyst = Optional.of((new ItemBOPAxe(BOPConfiguration.axeAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.hatchetAmethyst")); - Items.hoeAmethyst = Optional.of((new ItemBOPHoe(BOPConfiguration.hoeAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.hoeAmethyst")); - Items.helmetAmethyst = Optional.of((new ArmorAmethyst(BOPConfiguration.helmetAmethystID, EnumArmorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 0)).setUnlocalizedName("bop.helmetAmethyst")); - Items.chestplateAmethyst = Optional.of((new ArmorAmethyst(BOPConfiguration.chestplateAmethystID, EnumArmorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 1)).setUnlocalizedName("bop.chestplateAmethyst")); - Items.leggingsAmethyst = Optional.of((new ArmorAmethyst(BOPConfiguration.leggingsAmethystID, EnumArmorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 2)).setUnlocalizedName("bop.leggingsAmethyst")); - Items.bootsAmethyst = Optional.of((new ArmorAmethyst(BOPConfiguration.bootsAmethystID, EnumArmorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 3)).setUnlocalizedName("bop.bootsAmethyst")); + Items.swordAmethyst = Optional.of((new ItemBOPSword(BOPConfiguration.IDs.swordAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.swordAmethyst")); + Items.shovelAmethyst = Optional.of((new ItemBOPSpade(BOPConfiguration.IDs.shovelAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.shovelAmethyst")); + Items.pickaxeAmethyst = Optional.of((new ItemBOPPickaxe(BOPConfiguration.IDs.pickaxeAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.pickaxeAmethyst")); + Items.axeAmethyst = Optional.of((new ItemBOPAxe(BOPConfiguration.IDs.axeAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.hatchetAmethyst")); + Items.hoeAmethyst = Optional.of((new ItemBOPHoe(BOPConfiguration.IDs.hoeAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.hoeAmethyst")); + Items.helmetAmethyst = Optional.of((new ArmorAmethyst(BOPConfiguration.IDs.helmetAmethystID, EnumArmorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 0)).setUnlocalizedName("bop.helmetAmethyst")); + Items.chestplateAmethyst = Optional.of((new ArmorAmethyst(BOPConfiguration.IDs.chestplateAmethystID, EnumArmorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 1)).setUnlocalizedName("bop.chestplateAmethyst")); + Items.leggingsAmethyst = Optional.of((new ArmorAmethyst(BOPConfiguration.IDs.leggingsAmethystID, EnumArmorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 2)).setUnlocalizedName("bop.leggingsAmethyst")); + Items.bootsAmethyst = Optional.of((new ArmorAmethyst(BOPConfiguration.IDs.bootsAmethystID, EnumArmorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 3)).setUnlocalizedName("bop.bootsAmethyst")); - Items.scytheWood = Optional.of((new ItemBOPScythe(BOPConfiguration.scytheWoodID, 2, EnumToolMaterial.WOOD, 0).setUnlocalizedName("bop.scytheWood"))); - Items.scytheStone = Optional.of((new ItemBOPScythe(BOPConfiguration.scytheStoneID, 2, EnumToolMaterial.STONE, 1).setUnlocalizedName("bop.scytheStone"))); - Items.scytheIron = Optional.of((new ItemBOPScythe(BOPConfiguration.scytheIronID, 2, EnumToolMaterial.IRON, 2).setUnlocalizedName("bop.scytheIron"))); - Items.scytheGold = Optional.of((new ItemBOPScythe(BOPConfiguration.scytheGoldID, 2, EnumToolMaterial.GOLD, 3).setUnlocalizedName("bop.scytheGold"))); - Items.scytheDiamond = Optional.of((new ItemBOPScythe(BOPConfiguration.scytheDiamondID, 2, EnumToolMaterial.EMERALD, 4).setUnlocalizedName("bop.scytheDiamond"))); - Items.scytheMud = Optional.of((new ItemBOPScythe(BOPConfiguration.scytheMudID, 2, EnumToolMaterialMud, 5).setUnlocalizedName("bop.scytheMud"))); - Items.scytheAmethyst = Optional.of((new ItemBOPScythe(BOPConfiguration.scytheAmethystID, 2, EnumToolMaterialAmethyst, 6).setUnlocalizedName("bop.scytheAmethyst"))); + Items.scytheWood = Optional.of((new ItemBOPScythe(BOPConfiguration.IDs.scytheWoodID, 2, EnumToolMaterial.WOOD, 0).setUnlocalizedName("bop.scytheWood"))); + Items.scytheStone = Optional.of((new ItemBOPScythe(BOPConfiguration.IDs.scytheStoneID, 2, EnumToolMaterial.STONE, 1).setUnlocalizedName("bop.scytheStone"))); + Items.scytheIron = Optional.of((new ItemBOPScythe(BOPConfiguration.IDs.scytheIronID, 2, EnumToolMaterial.IRON, 2).setUnlocalizedName("bop.scytheIron"))); + Items.scytheGold = Optional.of((new ItemBOPScythe(BOPConfiguration.IDs.scytheGoldID, 2, EnumToolMaterial.GOLD, 3).setUnlocalizedName("bop.scytheGold"))); + Items.scytheDiamond = Optional.of((new ItemBOPScythe(BOPConfiguration.IDs.scytheDiamondID, 2, EnumToolMaterial.EMERALD, 4).setUnlocalizedName("bop.scytheDiamond"))); + Items.scytheMud = Optional.of((new ItemBOPScythe(BOPConfiguration.IDs.scytheMudID, 2, EnumToolMaterialMud, 5).setUnlocalizedName("bop.scytheMud"))); + Items.scytheAmethyst = Optional.of((new ItemBOPScythe(BOPConfiguration.IDs.scytheAmethystID, 2, EnumToolMaterialAmethyst, 6).setUnlocalizedName("bop.scytheAmethyst"))); - Items.flowerBand = Optional.of((new ArmorFlowerBand(BOPConfiguration.flowerBandID, EnumArmorMaterialFlowerBand, BiomesOPlenty.proxy.addArmor("flowerBand"), 0)).setCreativeTab(BiomesOPlenty.tabBiomesOPlenty).setUnlocalizedName("bop.flowerBand")); + Items.flowerBand = Optional.of((new ArmorFlowerBand(BOPConfiguration.IDs.flowerBandID, EnumArmorMaterialFlowerBand, BiomesOPlenty.proxy.addArmor("flowerBand"), 0)).setCreativeTab(BiomesOPlenty.tabBiomesOPlenty).setUnlocalizedName("bop.flowerBand")); } } diff --git a/src/minecraft/biomesoplenty/configuration/BOPVanillaCompat.java b/src/minecraft/biomesoplenty/configuration/BOPVanillaCompat.java index c63422cea..1a1ae4dc8 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPVanillaCompat.java +++ b/src/minecraft/biomesoplenty/configuration/BOPVanillaCompat.java @@ -29,7 +29,7 @@ public class BOPVanillaCompat { strongholdCrossing = ChestGenHooks.getInfo(ChestGenHooks.STRONGHOLD_CROSSING); village = ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH); - if (BOPConfiguration.dungeonLoot == true) + if (BOPConfiguration.Misc.dungeonLoot == true) { dungeon.addItem(new WeightedRandomChestContent(new ItemStack(Items.bopDisc.get()), 1, 1, 2)); dungeon.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 10), 1, 2, 5)); diff --git a/src/minecraft/biomesoplenty/handlers/BOPCraftHandler.java b/src/minecraft/biomesoplenty/handlers/BOPCraftHandler.java index a3ffe14db..590f1401e 100644 --- a/src/minecraft/biomesoplenty/handlers/BOPCraftHandler.java +++ b/src/minecraft/biomesoplenty/handlers/BOPCraftHandler.java @@ -13,7 +13,7 @@ public class BOPCraftHandler implements ICraftingHandler @Override public void onCrafting(EntityPlayer var1, ItemStack var2, IInventory var3) { - if (var2.itemID == Items.flowerBand.get().itemID && BOPConfiguration.achievements) { + if (var2.itemID == Items.flowerBand.get().itemID && BOPConfiguration.Misc.achievements) { var1.addStat(AchievementHelper.achFlowerP, 1); } } diff --git a/src/minecraft/biomesoplenty/handlers/EntityEventHandler.java b/src/minecraft/biomesoplenty/handlers/EntityEventHandler.java index eaa6a2c8f..cd542a585 100644 --- a/src/minecraft/biomesoplenty/handlers/EntityEventHandler.java +++ b/src/minecraft/biomesoplenty/handlers/EntityEventHandler.java @@ -85,7 +85,7 @@ public class EntityEventHandler @ForgeSubscribe public void fallingFromPromisedLand(LivingHurtEvent event) { - if (event.source == DamageSource.outOfWorld && event.entityLiving.dimension == BOPConfiguration.promisedLandDimID) + if (event.source == DamageSource.outOfWorld && event.entityLiving.dimension == BOPConfiguration.IDs.promisedLandDimID) { event.setCanceled(true); diff --git a/src/minecraft/biomesoplenty/handlers/TickHandlerServer.java b/src/minecraft/biomesoplenty/handlers/TickHandlerServer.java index ab4514adf..1eb18b676 100644 --- a/src/minecraft/biomesoplenty/handlers/TickHandlerServer.java +++ b/src/minecraft/biomesoplenty/handlers/TickHandlerServer.java @@ -27,7 +27,7 @@ public class TickHandlerServer implements ITickHandler int rand = new Random().nextInt(); - if (BOPConfiguration.rainCreatesPuddles) + if (BOPConfiguration.Misc.rainCreatesPuddles) { while (iterator.hasNext()) { diff --git a/src/minecraft/biomesoplenty/helpers/AchievementHelper.java b/src/minecraft/biomesoplenty/helpers/AchievementHelper.java index dfd161de1..e056c55aa 100644 --- a/src/minecraft/biomesoplenty/helpers/AchievementHelper.java +++ b/src/minecraft/biomesoplenty/helpers/AchievementHelper.java @@ -363,7 +363,7 @@ public class AchievementHelper // Achievement checker private static void onItemPickup(EntityPlayer player, ItemStack item) { - if (BOPConfiguration.achievements) + if (BOPConfiguration.Misc.achievements) { if (item.itemID == Blocks.flowers.get().blockID || item.itemID == Block.plantRed.blockID || item.itemID == Block.plantYellow.blockID) { @@ -415,7 +415,7 @@ public class AchievementHelper @ForgeSubscribe public void chunkEntered(EntityEvent.EnteringChunk event) { - if (BOPConfiguration.achievements) + if (BOPConfiguration.Misc.achievements) { if (event.entity != null) { diff --git a/src/minecraft/biomesoplenty/helpers/Version.java b/src/minecraft/biomesoplenty/helpers/Version.java index 2fe5c6bf6..7c1a74284 100644 --- a/src/minecraft/biomesoplenty/helpers/Version.java +++ b/src/minecraft/biomesoplenty/helpers/Version.java @@ -46,7 +46,7 @@ public class Version implements Runnable { if (!isOutdated()) return false; - //Property property = BOPConfiguration.config.get("Vars", "Seen Version", VERSION); + //Property property = BOPConfiguration.Main.config.get("Vars", "Seen Version", VERSION); //String seenVersion = property.getString(); //if (recommendedVersion == null || recommendedVersion.equals(seenVersion)) @@ -54,7 +54,7 @@ public class Version implements Runnable { /*property.set(recommendedVersion); - BOPConfiguration.config.save();*/ + BOPConfiguration.Main.config.save();*/ return true; } @@ -64,7 +64,7 @@ public class Version implements Runnable { WorldType terrainType = world.getWorldInfo().getTerrainType(); WorldTypeBOP bopType = new WorldTypeBOP(); - Property property = BOPConfiguration.config.get("Vars", "Seen WorldType Msg", false); + Property property = BOPConfiguration.Main.config.get("Vars", "Seen WorldType Msg", false); String worldTypeProp = property.getString(); if (terrainType == null || property.getBoolean(false) == true) @@ -74,13 +74,13 @@ public class Version implements Runnable { { property.set(true); - BOPConfiguration.config.save(); + BOPConfiguration.Main.config.save(); return false; } property.set(true); - BOPConfiguration.config.save(); + BOPConfiguration.Main.config.save(); return true; } diff --git a/src/minecraft/biomesoplenty/integration/ForestryIntegration.java b/src/minecraft/biomesoplenty/integration/ForestryIntegration.java index 6e85c4638..8f099ffeb 100644 --- a/src/minecraft/biomesoplenty/integration/ForestryIntegration.java +++ b/src/minecraft/biomesoplenty/integration/ForestryIntegration.java @@ -33,221 +33,221 @@ public class ForestryIntegration private static void addClimateInfo() { //Hell - EnumTemperature.hellishBiomeIds.add(BOPConfiguration.netherBaseID); - EnumTemperature.hellishBiomeIds.add(BOPConfiguration.netherBoneID); - EnumTemperature.hellishBiomeIds.add(BOPConfiguration.netherDesertID); - EnumTemperature.hellishBiomeIds.add(BOPConfiguration.netherGardenID); - EnumTemperature.hellishBiomeIds.add(BOPConfiguration.netherLavaID); + EnumTemperature.hellishBiomeIds.add(BOPConfiguration.IDs.netherBaseID); + EnumTemperature.hellishBiomeIds.add(BOPConfiguration.IDs.netherBoneID); + EnumTemperature.hellishBiomeIds.add(BOPConfiguration.IDs.netherDesertID); + EnumTemperature.hellishBiomeIds.add(BOPConfiguration.IDs.netherGardenID); + EnumTemperature.hellishBiomeIds.add(BOPConfiguration.IDs.netherLavaID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.netherBaseID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.netherBoneID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.netherDesertID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.netherGardenID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.netherLavaID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.IDs.netherBaseID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.IDs.netherBoneID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.IDs.netherDesertID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.IDs.netherGardenID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.IDs.netherLavaID); //Hot - Arid //Desert Hives - EnumTemperature.hotBiomeIds.add(BOPConfiguration.badlandsID); - EnumTemperature.hotBiomeIds.add(BOPConfiguration.beachGravelID); - EnumTemperature.hotBiomeIds.add(BOPConfiguration.beachOvergrownID); - EnumTemperature.hotBiomeIds.add(BOPConfiguration.brushlandID); - EnumTemperature.hotBiomeIds.add(BOPConfiguration.deadlandsID); - EnumTemperature.hotBiomeIds.add(BOPConfiguration.dunesID); - EnumTemperature.hotBiomeIds.add(BOPConfiguration.mesaID); - EnumTemperature.hotBiomeIds.add(BOPConfiguration.steppeID); - EnumTemperature.hotBiomeIds.add(BOPConfiguration.volcanoID); - EnumTemperature.hotBiomeIds.add(BOPConfiguration.wastelandID); - EnumTemperature.hotBiomeIds.add(BOPConfiguration.promisedLandPlainsID); - EnumTemperature.hotBiomeIds.add(BOPConfiguration.deadForestID); - EnumTemperature.hotBiomeIds.add(BOPConfiguration.desertNewID); + EnumTemperature.hotBiomeIds.add(BOPConfiguration.IDs.badlandsID); + EnumTemperature.hotBiomeIds.add(BOPConfiguration.IDs.beachGravelID); + EnumTemperature.hotBiomeIds.add(BOPConfiguration.IDs.beachOvergrownID); + EnumTemperature.hotBiomeIds.add(BOPConfiguration.IDs.brushlandID); + EnumTemperature.hotBiomeIds.add(BOPConfiguration.IDs.deadlandsID); + EnumTemperature.hotBiomeIds.add(BOPConfiguration.IDs.dunesID); + EnumTemperature.hotBiomeIds.add(BOPConfiguration.IDs.mesaID); + EnumTemperature.hotBiomeIds.add(BOPConfiguration.IDs.steppeID); + EnumTemperature.hotBiomeIds.add(BOPConfiguration.IDs.volcanoID); + EnumTemperature.hotBiomeIds.add(BOPConfiguration.IDs.wastelandID); + EnumTemperature.hotBiomeIds.add(BOPConfiguration.IDs.promisedLandPlainsID); + EnumTemperature.hotBiomeIds.add(BOPConfiguration.IDs.deadForestID); + EnumTemperature.hotBiomeIds.add(BOPConfiguration.IDs.desertNewID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.badlandsID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.brushlandID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.deadlandsID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.dunesID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.mesaID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.steppeID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.volcanoID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.wastelandID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.promisedLandPlainsID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.deadForestID); - EnumHumidity.aridBiomeIds.add(BOPConfiguration.desertNewID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.IDs.badlandsID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.IDs.brushlandID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.IDs.deadlandsID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.IDs.dunesID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.IDs.mesaID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.IDs.steppeID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.IDs.volcanoID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.IDs.wastelandID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.IDs.promisedLandPlainsID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.IDs.deadForestID); + EnumHumidity.aridBiomeIds.add(BOPConfiguration.IDs.desertNewID); //Warm - Damp //Jungle Hives - EnumTemperature.warmBiomeIds.add(BOPConfiguration.bambooForestID); - EnumTemperature.warmBiomeIds.add(BOPConfiguration.hotSpringsID); - EnumTemperature.warmBiomeIds.add(BOPConfiguration.sacredSpringsID); - EnumTemperature.warmBiomeIds.add(BOPConfiguration.tropicalRainforestID); - EnumTemperature.warmBiomeIds.add(BOPConfiguration.promisedLandSwampID); - EnumTemperature.warmBiomeIds.add(BOPConfiguration.oasisID); - EnumTemperature.warmBiomeIds.add(BOPConfiguration.rainforestID); - EnumTemperature.warmBiomeIds.add(BOPConfiguration.tropicsID); - EnumTemperature.warmBiomeIds.add(BOPConfiguration.woodlandID); - EnumTemperature.warmBiomeIds.add(BOPConfiguration.jungleNewID); + EnumTemperature.warmBiomeIds.add(BOPConfiguration.IDs.bambooForestID); + EnumTemperature.warmBiomeIds.add(BOPConfiguration.IDs.hotSpringsID); + EnumTemperature.warmBiomeIds.add(BOPConfiguration.IDs.sacredSpringsID); + EnumTemperature.warmBiomeIds.add(BOPConfiguration.IDs.tropicalRainforestID); + EnumTemperature.warmBiomeIds.add(BOPConfiguration.IDs.promisedLandSwampID); + EnumTemperature.warmBiomeIds.add(BOPConfiguration.IDs.oasisID); + EnumTemperature.warmBiomeIds.add(BOPConfiguration.IDs.rainforestID); + EnumTemperature.warmBiomeIds.add(BOPConfiguration.IDs.tropicsID); + EnumTemperature.warmBiomeIds.add(BOPConfiguration.IDs.woodlandID); + EnumTemperature.warmBiomeIds.add(BOPConfiguration.IDs.jungleNewID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.bambooForestID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.hotSpringsID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.sacredSpringsID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.tropicalRainforestID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.promisedLandSwampID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.oasisID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.rainforestID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.tropicsID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.woodlandID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.jungleNewID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.bambooForestID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.hotSpringsID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.sacredSpringsID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.tropicalRainforestID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.promisedLandSwampID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.oasisID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.rainforestID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.tropicsID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.woodlandID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.jungleNewID); //Normal - Damp //Marshy Hives - EnumTemperature.normalBiomeIds.add(BOPConfiguration.bayouID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.bogID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.deadSwampID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.fungiForestID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.lushSwampID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.mangroveID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.marshID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.moorID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.mysticGroveID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.ominousWoodsID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.quagmireID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.sludgepitID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.wetlandID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.fenID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.swamplandNewID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.bayouID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.bogID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.deadSwampID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.fungiForestID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.lushSwampID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.mangroveID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.marshID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.moorID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.mysticGroveID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.ominousWoodsID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.quagmireID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.sludgepitID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.wetlandID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.fenID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.swamplandNewID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.bayouID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.bogID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.deadSwampID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.fungiForestID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.lushSwampID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.mangroveID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.marshID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.moorID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.mysticGroveID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.ominousWoodsID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.quagmireID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.sludgepitID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.wetlandID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.fenID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.swamplandNewID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.bayouID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.bogID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.deadSwampID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.fungiForestID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.lushSwampID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.mangroveID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.marshID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.moorID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.mysticGroveID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.ominousWoodsID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.quagmireID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.sludgepitID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.wetlandID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.fenID); + EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.swamplandNewID); //Normal //Forest and Meadows Hives - EnumTemperature.normalBiomeIds.add(BOPConfiguration.birchForestID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.borealForestID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.canyonID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.chaparralID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.cherryBlossomGroveID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.coniferousForestID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.deciduousForestID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.fieldID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.gardenID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.grasslandID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.groveID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.highlandID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.lushDesertID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.mapleWoodsID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.meadowID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.orchardID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.originValleyID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.pastureID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.prairieID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.redwoodForestID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.seasonalForestID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.shieldID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.shoreID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.spruceWoodsID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.temperateRainforestID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.heathlandID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.promisedLandForestID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.savannaID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.scrublandID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.cragID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.jadeCliffsID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.outbackID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.shrublandID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.thicketID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.timberID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.plainsNewID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.extremeHillsNewID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.forestNewID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.birchForestID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.borealForestID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.canyonID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.chaparralID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.cherryBlossomGroveID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.coniferousForestID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.deciduousForestID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.fieldID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.gardenID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.grasslandID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.groveID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.highlandID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.lushDesertID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.mapleWoodsID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.meadowID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.orchardID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.originValleyID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.pastureID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.prairieID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.redwoodForestID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.seasonalForestID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.shieldID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.shoreID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.spruceWoodsID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.temperateRainforestID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.heathlandID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.promisedLandForestID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.savannaID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.scrublandID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.cragID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.jadeCliffsID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.outbackID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.shrublandID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.thicketID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.timberID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.plainsNewID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.extremeHillsNewID); + EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.forestNewID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.beachGravelID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.beachOvergrownID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.birchForestID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.borealForestID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.canyonID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.chaparralID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.cherryBlossomGroveID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.coniferousForestID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.deciduousForestID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.fieldID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.gardenID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.grasslandID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.groveID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.highlandID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.lushDesertID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.mapleWoodsID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.meadowID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.orchardID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.originValleyID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.pastureID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.prairieID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.redwoodForestID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.seasonalForestID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.shieldID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.shoreID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.spruceWoodsID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.temperateRainforestID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.heathlandID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.promisedLandForestID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.savannaID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.scrublandID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.cragID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.jadeCliffsID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.outbackID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.shrublandID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.thicketID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.timberID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.plainsNewID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.extremeHillsNewID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.forestNewID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.beachGravelID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.beachOvergrownID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.birchForestID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.borealForestID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.canyonID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.chaparralID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.cherryBlossomGroveID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.coniferousForestID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.deciduousForestID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.fieldID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.gardenID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.grasslandID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.groveID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.highlandID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.lushDesertID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.mapleWoodsID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.meadowID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.orchardID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.originValleyID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.pastureID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.prairieID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.redwoodForestID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.seasonalForestID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.shieldID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.shoreID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.spruceWoodsID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.temperateRainforestID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.heathlandID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.promisedLandForestID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.savannaID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.scrublandID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.cragID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.jadeCliffsID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.outbackID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.shrublandID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.thicketID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.timberID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.plainsNewID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.extremeHillsNewID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.forestNewID); //Cold- Normal //Wintry Bees - EnumTemperature.coldBiomeIds.add(BOPConfiguration.tundraID); - EnumTemperature.coldBiomeIds.add(BOPConfiguration.arcticID); - EnumTemperature.coldBiomeIds.add(BOPConfiguration.deadForestSnowID); - EnumTemperature.coldBiomeIds.add(BOPConfiguration.mountainID); - EnumTemperature.coldBiomeIds.add(BOPConfiguration.taigaNewID); + EnumTemperature.coldBiomeIds.add(BOPConfiguration.IDs.tundraID); + EnumTemperature.coldBiomeIds.add(BOPConfiguration.IDs.arcticID); + EnumTemperature.coldBiomeIds.add(BOPConfiguration.IDs.deadForestSnowID); + EnumTemperature.coldBiomeIds.add(BOPConfiguration.IDs.mountainID); + EnumTemperature.coldBiomeIds.add(BOPConfiguration.IDs.taigaNewID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.arcticID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.tundraID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.deadForestSnowID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.mountainID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.taigaNewID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.arcticID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.tundraID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.deadForestSnowID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.mountainID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.taigaNewID); //Icy - Normal //Wintry Bees - EnumTemperature.icyBiomeIds.add(BOPConfiguration.alpsID); - EnumTemperature.icyBiomeIds.add(BOPConfiguration.coniferousForestSnowID); - EnumTemperature.icyBiomeIds.add(BOPConfiguration.frostForestID); - EnumTemperature.icyBiomeIds.add(BOPConfiguration.glacierID); - EnumTemperature.icyBiomeIds.add(BOPConfiguration.icyHillsID); - EnumTemperature.icyBiomeIds.add(BOPConfiguration.polarID); + EnumTemperature.icyBiomeIds.add(BOPConfiguration.IDs.alpsID); + EnumTemperature.icyBiomeIds.add(BOPConfiguration.IDs.coniferousForestSnowID); + EnumTemperature.icyBiomeIds.add(BOPConfiguration.IDs.frostForestID); + EnumTemperature.icyBiomeIds.add(BOPConfiguration.IDs.glacierID); + EnumTemperature.icyBiomeIds.add(BOPConfiguration.IDs.icyHillsID); + EnumTemperature.icyBiomeIds.add(BOPConfiguration.IDs.polarID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.alpsID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.coniferousForestSnowID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.frostForestID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.glacierID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.icyHillsID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.polarID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.alpsID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.coniferousForestSnowID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.frostForestID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.glacierID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.icyHillsID); + EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.polarID); } private static void addFermenterRecipes() diff --git a/src/minecraft/biomesoplenty/items/ItemBOPAncientStaff.java b/src/minecraft/biomesoplenty/items/ItemBOPAncientStaff.java index ffa643c8d..c12fb5fb6 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPAncientStaff.java +++ b/src/minecraft/biomesoplenty/items/ItemBOPAncientStaff.java @@ -93,7 +93,7 @@ public class ItemBOPAncientStaff extends Item @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (par3EntityPlayer.dimension == 0 || par3EntityPlayer.dimension == BOPConfiguration.promisedLandDimID) + if (par3EntityPlayer.dimension == 0 || par3EntityPlayer.dimension == BOPConfiguration.IDs.promisedLandDimID) { int i = MathHelper.floor_double(par3EntityPlayer.posX - 8); int j = 145; diff --git a/src/minecraft/biomesoplenty/world/ChunkProviderBOP.java b/src/minecraft/biomesoplenty/world/ChunkProviderBOP.java index d0ba76a2c..171b1a95f 100644 --- a/src/minecraft/biomesoplenty/world/ChunkProviderBOP.java +++ b/src/minecraft/biomesoplenty/world/ChunkProviderBOP.java @@ -247,7 +247,7 @@ public class ChunkProviderBOP implements IChunkProvider } else if (k1 >= b0 - 4 && k1 <= b0 + 1) { - if(biomegenbase.biomeID == BOPConfiguration.originValleyID) + if(biomegenbase.biomeID == BOPConfiguration.IDs.originValleyID) { if(gravelbeach) { diff --git a/src/minecraft/biomesoplenty/world/WorldProviderPromised.java b/src/minecraft/biomesoplenty/world/WorldProviderPromised.java index 134b53b7b..e46374a28 100644 --- a/src/minecraft/biomesoplenty/world/WorldProviderPromised.java +++ b/src/minecraft/biomesoplenty/world/WorldProviderPromised.java @@ -22,7 +22,7 @@ public class WorldProviderPromised extends WorldProvider { worldChunkMgr = new WorldChunkManagerPromised(worldObj); } - dimensionId = BOPConfiguration.promisedLandDimID; + dimensionId = BOPConfiguration.IDs.promisedLandDimID; } @Override diff --git a/src/minecraft/biomesoplenty/world/WorldTypeBOP.java b/src/minecraft/biomesoplenty/world/WorldTypeBOP.java index 63636dc3a..237ef28d6 100644 --- a/src/minecraft/biomesoplenty/world/WorldTypeBOP.java +++ b/src/minecraft/biomesoplenty/world/WorldTypeBOP.java @@ -17,307 +17,307 @@ public class WorldTypeBOP extends WorldType this.biomesForWorldType = super.getBiomesForWorldType(); this.removeAllBiomes(); - if (BOPConfiguration.alpsGen == true) + if (BOPConfiguration.BiomeGen.alpsGen == true) { addNewBiome(Biomes.alps); } - if (BOPConfiguration.arcticGen == true) + if (BOPConfiguration.BiomeGen.arcticGen == true) { addNewBiome(Biomes.arctic); } - if (BOPConfiguration.badlandsGen == true) + if (BOPConfiguration.BiomeGen.badlandsGen == true) { addNewBiome(Biomes.badlands); } - if (BOPConfiguration.bambooForestGen == true) + if (BOPConfiguration.BiomeGen.bambooForestGen == true) { addNewBiome(Biomes.bambooForest); } - if (BOPConfiguration.bayouGen == true) + if (BOPConfiguration.BiomeGen.bayouGen == true) { addNewBiome(Biomes.bayou); } - if (BOPConfiguration.birchForestGen == true) + if (BOPConfiguration.BiomeGen.birchForestGen == true) { addNewBiome(Biomes.birchForest); } - if (BOPConfiguration.bogGen == true) + if (BOPConfiguration.BiomeGen.bogGen == true) { addNewBiome(Biomes.bog); } - if (BOPConfiguration.borealForestGen == true) + if (BOPConfiguration.BiomeGen.borealForestGen == true) { addNewBiome(Biomes.borealForest); } - if (BOPConfiguration.brushlandGen == true) + if (BOPConfiguration.BiomeGen.brushlandGen == true) { addNewBiome(Biomes.brushland); } - if (BOPConfiguration.canyonGen == true) + if (BOPConfiguration.BiomeGen.canyonGen == true) { addNewBiome(Biomes.canyon); } - if (BOPConfiguration.chaparralGen == true) + if (BOPConfiguration.BiomeGen.chaparralGen == true) { addNewBiome(Biomes.chaparral); } - if (BOPConfiguration.cherryBlossomGroveGen == true) + if (BOPConfiguration.BiomeGen.cherryBlossomGroveGen == true) { addNewBiome(Biomes.cherryBlossomGrove); } - if (BOPConfiguration.coniferousForestGen == true) + if (BOPConfiguration.BiomeGen.coniferousForestGen == true) { addNewBiome(Biomes.coniferousForest); } - if (BOPConfiguration.coniferousForestSnowGen == true) + if (BOPConfiguration.BiomeGen.coniferousForestSnowGen == true) { addNewBiome(Biomes.coniferousForestSnow); } - if (BOPConfiguration.cragGen == true) + if (BOPConfiguration.BiomeGen.cragGen == true) { addNewBiome(Biomes.crag); } - if (BOPConfiguration.deadForestGen == true) + if (BOPConfiguration.BiomeGen.deadForestGen == true) { addNewBiome(Biomes.deadForest); } - if (BOPConfiguration.deadForestSnowGen == true) + if (BOPConfiguration.BiomeGen.deadForestSnowGen == true) { addNewBiome(Biomes.deadForestSnow); } - if (BOPConfiguration.deadSwampGen == true) + if (BOPConfiguration.BiomeGen.deadSwampGen == true) { addNewBiome(Biomes.deadSwamp); } - if (BOPConfiguration.deadlandsGen == true) + if (BOPConfiguration.BiomeGen.deadlandsGen == true) { addNewBiome(Biomes.deadlands); } - if (BOPConfiguration.deciduousForestGen == true) + if (BOPConfiguration.BiomeGen.deciduousForestGen == true) { addNewBiome(Biomes.deciduousForest); } - if (BOPConfiguration.dunesGen == true) + if (BOPConfiguration.BiomeGen.dunesGen == true) { addNewBiome(Biomes.dunes); } - if (BOPConfiguration.fenGen == true) + if (BOPConfiguration.BiomeGen.fenGen == true) { addNewBiome(Biomes.fen); } - if (BOPConfiguration.fieldGen == true) + if (BOPConfiguration.BiomeGen.fieldGen == true) { addNewBiome(Biomes.field); } - if (BOPConfiguration.frostForestGen == true) + if (BOPConfiguration.BiomeGen.frostForestGen == true) { addNewBiome(Biomes.frostForest); } - if (BOPConfiguration.fungiForestGen == true) + if (BOPConfiguration.BiomeGen.fungiForestGen == true) { addNewBiome(Biomes.fungiForest); } - if (BOPConfiguration.gardenGen == true) + if (BOPConfiguration.BiomeGen.gardenGen == true) { addNewBiome(Biomes.garden); } - if (BOPConfiguration.glacierGen == true) + if (BOPConfiguration.BiomeGen.glacierGen == true) { addNewBiome(Biomes.glacier); } - if (BOPConfiguration.grasslandGen == true) + if (BOPConfiguration.BiomeGen.grasslandGen == true) { addNewBiome(Biomes.grassland); } - if (BOPConfiguration.groveGen == true) + if (BOPConfiguration.BiomeGen.groveGen == true) { addNewBiome(Biomes.grove); } - if (BOPConfiguration.heathlandGen == true) + if (BOPConfiguration.BiomeGen.heathlandGen == true) { addNewBiome(Biomes.heathland); } - if (BOPConfiguration.highlandGen == true) + if (BOPConfiguration.BiomeGen.highlandGen == true) { addNewBiome(Biomes.highland); } - if (BOPConfiguration.hotSpringsGen == true) + if (BOPConfiguration.BiomeGen.hotSpringsGen == true) { addNewBiome(Biomes.hotSprings); } - if (BOPConfiguration.icyHillsGen == true) + if (BOPConfiguration.BiomeGen.icyHillsGen == true) { addNewBiome(Biomes.icyHills); } - if (BOPConfiguration.jadeCliffsGen == true) + if (BOPConfiguration.BiomeGen.jadeCliffsGen == true) { addNewBiome(Biomes.jadeCliffs); } - if (BOPConfiguration.lushDesertGen == true) + if (BOPConfiguration.BiomeGen.lushDesertGen == true) { addNewBiome(Biomes.lushDesert); } - if (BOPConfiguration.lushSwampGen == true) + if (BOPConfiguration.BiomeGen.lushSwampGen == true) { addNewBiome(Biomes.lushSwamp); } - if (BOPConfiguration.mangroveGen == true) + if (BOPConfiguration.BiomeGen.mangroveGen == true) { addNewBiome(Biomes.mangrove); } - if (BOPConfiguration.mapleWoodsGen == true) + if (BOPConfiguration.BiomeGen.mapleWoodsGen == true) { addNewBiome(Biomes.mapleWoods); } - if (BOPConfiguration.marshGen == true) + if (BOPConfiguration.BiomeGen.marshGen == true) { addNewBiome(Biomes.marsh); } - if (BOPConfiguration.meadowGen == true) + if (BOPConfiguration.BiomeGen.meadowGen == true) { addNewBiome(Biomes.meadow); } - if (BOPConfiguration.mesaGen == true) + if (BOPConfiguration.BiomeGen.mesaGen == true) { addNewBiome(Biomes.mesa); } - if (BOPConfiguration.moorGen == true) + if (BOPConfiguration.BiomeGen.moorGen == true) { addNewBiome(Biomes.moor); } - if (BOPConfiguration.mountainGen == true) + if (BOPConfiguration.BiomeGen.mountainGen == true) { addNewBiome(Biomes.mountain); } - if (BOPConfiguration.mysticGroveGen == true) + if (BOPConfiguration.BiomeGen.mysticGroveGen == true) { addNewBiome(Biomes.mysticGrove); } - if (BOPConfiguration.oasisGen == true) + if (BOPConfiguration.BiomeGen.oasisGen == true) { addNewBiome(Biomes.oasis); } - if (BOPConfiguration.ominousWoodsGen == true) + if (BOPConfiguration.BiomeGen.ominousWoodsGen == true) { addNewBiome(Biomes.ominousWoods); } - if (BOPConfiguration.orchardGen == true) + if (BOPConfiguration.BiomeGen.orchardGen == true) { addNewBiome(Biomes.orchard); } - if (BOPConfiguration.originValleyGen == true) + if (BOPConfiguration.BiomeGen.originValleyGen == true) { addNewBiome(Biomes.originValley); } - if (BOPConfiguration.outbackGen == true) + if (BOPConfiguration.BiomeGen.outbackGen == true) { addNewBiome(Biomes.outback); } - if (BOPConfiguration.pastureGen == true) + if (BOPConfiguration.BiomeGen.pastureGen == true) { addNewBiome(Biomes.pasture); } - if (BOPConfiguration.polarGen == true) + if (BOPConfiguration.BiomeGen.polarGen == true) { addNewBiome(Biomes.polar); } - if (BOPConfiguration.prairieGen == true) + if (BOPConfiguration.BiomeGen.prairieGen == true) { addNewBiome(Biomes.prairie); } - if (BOPConfiguration.quagmireGen == true) + if (BOPConfiguration.BiomeGen.quagmireGen == true) { addNewBiome(Biomes.quagmire); } - if (BOPConfiguration.rainforestGen == true) + if (BOPConfiguration.BiomeGen.rainforestGen == true) { addNewBiome(Biomes.rainforest); } - if (BOPConfiguration.redwoodForestGen == true) + if (BOPConfiguration.BiomeGen.redwoodForestGen == true) { addNewBiome(Biomes.redwoodForest); } - if (BOPConfiguration.sacredSpringsGen == true) + if (BOPConfiguration.BiomeGen.sacredSpringsGen == true) { addNewBiome(Biomes.sacredSprings); } - if (BOPConfiguration.savannaGen == true) + if (BOPConfiguration.BiomeGen.savannaGen == true) { addNewBiome(Biomes.savanna); } - if (BOPConfiguration.scrublandGen == true) + if (BOPConfiguration.BiomeGen.scrublandGen == true) { addNewBiome(Biomes.scrubland); } - if (BOPConfiguration.seasonalForestGen == true) + if (BOPConfiguration.BiomeGen.seasonalForestGen == true) { addNewBiome(Biomes.seasonalForest); } - if (BOPConfiguration.shieldGen == true) + if (BOPConfiguration.BiomeGen.shieldGen == true) { addNewBiome(Biomes.shield); } - if (BOPConfiguration.shrublandGen == true) + if (BOPConfiguration.BiomeGen.shrublandGen == true) { addNewBiome(Biomes.shrubland); } - if (BOPConfiguration.sludgepitGen == true) + if (BOPConfiguration.BiomeGen.sludgepitGen == true) { addNewBiome(Biomes.sludgepit); } - if (BOPConfiguration.spruceWoodsGen == true) + if (BOPConfiguration.BiomeGen.spruceWoodsGen == true) { addNewBiome(Biomes.spruceWoods); } - if (BOPConfiguration.steppeGen == true) + if (BOPConfiguration.BiomeGen.steppeGen == true) { addNewBiome(Biomes.steppe); } - if (BOPConfiguration.temperateRainforestGen == true) + if (BOPConfiguration.BiomeGen.temperateRainforestGen == true) { addNewBiome(Biomes.temperateRainforest); } - if (BOPConfiguration.thicketGen == true) + if (BOPConfiguration.BiomeGen.thicketGen == true) { addNewBiome(Biomes.thicket); } - if (BOPConfiguration.timberGen == true) + if (BOPConfiguration.BiomeGen.timberGen == true) { addNewBiome(Biomes.timber); } - if (BOPConfiguration.tropicalRainforestGen == true) + if (BOPConfiguration.BiomeGen.tropicalRainforestGen == true) { addNewBiome(Biomes.tropicalRainforest); } - if (BOPConfiguration.tropicsGen == true) + if (BOPConfiguration.BiomeGen.tropicsGen == true) { addNewBiome(Biomes.tropics); } - if (BOPConfiguration.tundraGen == true) + if (BOPConfiguration.BiomeGen.tundraGen == true) { addNewBiome(Biomes.tundra); } - if (BOPConfiguration.volcanoGen == true) + if (BOPConfiguration.BiomeGen.volcanoGen == true) { addNewBiome(Biomes.volcano); } - if (BOPConfiguration.wastelandGen == true) + if (BOPConfiguration.BiomeGen.wastelandGen == true) { addNewBiome(Biomes.wasteland); } - if (BOPConfiguration.wetlandGen == true) + if (BOPConfiguration.BiomeGen.wetlandGen == true) { addNewBiome(Biomes.wetland); } - if (BOPConfiguration.woodlandGen == true) + if (BOPConfiguration.BiomeGen.woodlandGen == true) { addNewBiome(Biomes.woodland); } - if (BOPConfiguration.plainsGen == true) + if (BOPConfiguration.BiomeGen.plainsGen == true) { - if (BOPConfiguration.vanillaEnhanced == true) + if (BOPConfiguration.TerrainGen.vanillaEnhanced == true) { addNewBiome(Biomes.plainsNew); } @@ -326,9 +326,9 @@ public class WorldTypeBOP extends WorldType this.addNewBiome(BiomeGenBase.plains); } } - if (BOPConfiguration.desertGen == true) + if (BOPConfiguration.BiomeGen.desertGen == true) { - if (BOPConfiguration.vanillaEnhanced == true) + if (BOPConfiguration.TerrainGen.vanillaEnhanced == true) { addNewBiome(Biomes.desertNew); } @@ -337,9 +337,9 @@ public class WorldTypeBOP extends WorldType this.addNewBiome(BiomeGenBase.desert); } } - if (BOPConfiguration.extremeHillsGen == true) + if (BOPConfiguration.BiomeGen.extremeHillsGen == true) { - if (BOPConfiguration.vanillaEnhanced == true) + if (BOPConfiguration.TerrainGen.vanillaEnhanced == true) { addNewBiome(Biomes.extremeHillsNew); } @@ -348,9 +348,9 @@ public class WorldTypeBOP extends WorldType this.addNewBiome(BiomeGenBase.extremeHills); } } - if (BOPConfiguration.forestGen == true) + if (BOPConfiguration.BiomeGen.forestGen == true) { - if (BOPConfiguration.vanillaEnhanced == true) + if (BOPConfiguration.TerrainGen.vanillaEnhanced == true) { addNewBiome(Biomes.forestNew); } @@ -359,9 +359,9 @@ public class WorldTypeBOP extends WorldType this.addNewBiome(BiomeGenBase.forest); } } - if (BOPConfiguration.taigaGen == true) + if (BOPConfiguration.BiomeGen.taigaGen == true) { - if (BOPConfiguration.vanillaEnhanced == true) + if (BOPConfiguration.TerrainGen.vanillaEnhanced == true) { addNewBiome(Biomes.taigaNew); } @@ -370,9 +370,9 @@ public class WorldTypeBOP extends WorldType this.addNewBiome(BiomeGenBase.taiga); } } - if (BOPConfiguration.swamplandGen == true) + if (BOPConfiguration.BiomeGen.swamplandGen == true) { - if (BOPConfiguration.vanillaEnhanced == true) + if (BOPConfiguration.TerrainGen.vanillaEnhanced == true) { addNewBiome(Biomes.swamplandNew); } @@ -381,9 +381,9 @@ public class WorldTypeBOP extends WorldType this.addNewBiome(BiomeGenBase.swampland); } } - if (BOPConfiguration.jungleGen == true) + if (BOPConfiguration.BiomeGen.jungleGen == true) { - if (BOPConfiguration.vanillaEnhanced == true) + if (BOPConfiguration.TerrainGen.vanillaEnhanced == true) { addNewBiome(Biomes.jungleNew); } diff --git a/src/minecraft/biomesoplenty/world/WorldTypeSize.java b/src/minecraft/biomesoplenty/world/WorldTypeSize.java index f03269672..e08f652ef 100644 --- a/src/minecraft/biomesoplenty/world/WorldTypeSize.java +++ b/src/minecraft/biomesoplenty/world/WorldTypeSize.java @@ -10,7 +10,7 @@ public class WorldTypeSize public void BiomeSize(WorldTypeEvent.BiomeSize event) { if (event.worldType.getWorldTypeName() == "BIOMESOP") { - event.newSize = (byte)BOPConfiguration.biomeSize; + event.newSize = (byte)BOPConfiguration.TerrainGen.biomeSize; } } diff --git a/src/minecraft/biomesoplenty/world/layer/BiomeLayerBiomes.java b/src/minecraft/biomesoplenty/world/layer/BiomeLayerBiomes.java index 0af243c69..26582b09e 100644 --- a/src/minecraft/biomesoplenty/world/layer/BiomeLayerBiomes.java +++ b/src/minecraft/biomesoplenty/world/layer/BiomeLayerBiomes.java @@ -44,28 +44,28 @@ public class BiomeLayerBiomes extends BiomeLayer } if (Biomes.netherGarden.isPresent()) { - if (BOPConfiguration.undergardenGen == true) + if (BOPConfiguration.BiomeGen.undergardenGen == true) { netherBiomes.add(Biomes.netherGarden.get()); } } if (Biomes.netherDesert.isPresent()) { - if (BOPConfiguration.corruptedSandsGen == true) + if (BOPConfiguration.BiomeGen.corruptedSandsGen == true) { netherBiomes.add(Biomes.netherDesert.get()); } } if (Biomes.netherLava.isPresent()) { - if (BOPConfiguration.phantasmagoricInfernoGen == true) + if (BOPConfiguration.BiomeGen.phantasmagoricInfernoGen == true) { netherBiomes.add(Biomes.netherLava.get()); } } if (Biomes.netherBone.isPresent()) { - if (BOPConfiguration.boneyardGen == true) + if (BOPConfiguration.BiomeGen.boneyardGen == true) { netherBiomes.add(Biomes.netherBone.get()); } diff --git a/src/minecraft/biomesoplenty/world/layer/BiomeLayerCreate.java b/src/minecraft/biomesoplenty/world/layer/BiomeLayerCreate.java index 942e2fbef..78cdb4938 100644 --- a/src/minecraft/biomesoplenty/world/layer/BiomeLayerCreate.java +++ b/src/minecraft/biomesoplenty/world/layer/BiomeLayerCreate.java @@ -1,7 +1,7 @@ package biomesoplenty.world.layer; -import biomesoplenty.configuration.BOPConfiguration; import net.minecraft.world.gen.layer.IntCache; +import biomesoplenty.configuration.BOPConfiguration; public class BiomeLayerCreate extends BiomeLayer { @@ -15,7 +15,7 @@ public class BiomeLayerCreate extends BiomeLayer { int[] var5 = IntCache.getIntCache(par3 * par4); - boolean ocean = BOPConfiguration.oceanGen; + boolean ocean = BOPConfiguration.BiomeGen.oceanGen; //boolean coral = Biomes.oceanCoral.isPresent(); //boolean kelp = Biomes.oceanKelp.isPresent(); diff --git a/src/minecraft/biomesoplenty/world/layer/BiomeLayerShore.java b/src/minecraft/biomesoplenty/world/layer/BiomeLayerShore.java index bd075ed35..bcc0aaef7 100644 --- a/src/minecraft/biomesoplenty/world/layer/BiomeLayerShore.java +++ b/src/minecraft/biomesoplenty/world/layer/BiomeLayerShore.java @@ -21,14 +21,14 @@ public class BiomeLayerShore extends BiomeLayer beachBiomes.add(BiomeGenBase.beach); if (Biomes.beachGravel.isPresent()) { - if (BOPConfiguration.gravelBeachGen == true) + if (BOPConfiguration.BiomeGen.gravelBeachGen == true) { beachBiomes.add(Biomes.beachGravel.get()); } } if (Biomes.beachOvergrown.isPresent()) { - if (BOPConfiguration.overgrownBeachGen == true) + if (BOPConfiguration.BiomeGen.overgrownBeachGen == true) { beachBiomes.add(Biomes.beachOvergrown.get()); } diff --git a/src/minecraft/biomesoplenty/worldgen/WorldGenBOPShrub.java b/src/minecraft/biomesoplenty/worldgen/WorldGenBOPShrub.java index 2c5cd44fb..f521ea97f 100644 --- a/src/minecraft/biomesoplenty/worldgen/WorldGenBOPShrub.java +++ b/src/minecraft/biomesoplenty/worldgen/WorldGenBOPShrub.java @@ -1,6 +1,7 @@ package biomesoplenty.worldgen; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; diff --git a/src/minecraft/biomesoplenty/worldgen/structure/BOPMapGenVillage.java b/src/minecraft/biomesoplenty/worldgen/structure/BOPMapGenVillage.java index 86d4ad908..37dba3f1b 100644 --- a/src/minecraft/biomesoplenty/worldgen/structure/BOPMapGenVillage.java +++ b/src/minecraft/biomesoplenty/worldgen/structure/BOPMapGenVillage.java @@ -27,8 +27,8 @@ public class BOPMapGenVillage extends MapGenStructure public BOPMapGenVillage() { terrainType = 0; - maxDistance = BOPConfiguration.villageDistance; - minDistance = BOPConfiguration.villageDistance / 4; + maxDistance = BOPConfiguration.TerrainGen.villageDistance; + minDistance = BOPConfiguration.TerrainGen.villageDistance / 4; villageSpawnBiomes = MapGenVillage.villageSpawnBiomes; }