From bf2fda08d416e57ae994e5a26c1e4cb826e79868 Mon Sep 17 00:00:00 2001 From: Adubbz Date: Sat, 14 Sep 2013 20:16:39 +1000 Subject: [PATCH] Some repackaging --- common/biomesoplenty/BiomesOPlenty.java | 10 +- .../biomes/BiomeDecoratorBOP.java | 388 +++--- .../biomes/BiomeGenAlpsBase.java | 2 +- .../biomes/BiomeGenAlpsForest.java | 2 +- .../biomes/BiomeGenAutumnHills.java | 6 +- .../biomes/BiomeGenBadlands.java | 4 +- .../biomes/BiomeGenBambooForest.java | 2 +- .../biomesoplenty/biomes/BiomeGenBayou.java | 10 +- .../biomes/BiomeGenBorealForest.java | 6 +- .../biomesoplenty/biomes/BiomeGenCanyon.java | 2 +- .../biomes/BiomeGenCanyonRavine.java | 2 +- .../biomes/BiomeGenCherryBlossomGrove.java | 4 +- .../biomes/BiomeGenConiferousForest.java | 16 +- .../biomes/BiomeGenConiferousForestSnow.java | 6 +- common/biomesoplenty/biomes/BiomeGenCrag.java | 4 +- .../biomes/BiomeGenDeadForest.java | 10 +- .../biomes/BiomeGenDeadForestSnow.java | 10 +- .../biomes/BiomeGenDeadSwamp.java | 6 +- .../biomes/BiomeGenDeadlands.java | 4 +- .../biomes/BiomeGenDeciduousForest.java | 2 +- common/biomesoplenty/biomes/BiomeGenFen.java | 6 +- .../biomes/BiomeGenFieldForest.java | 2 +- .../biomes/BiomeGenFrostForest.java | 4 +- .../biomes/BiomeGenFungiForest.java | 8 +- .../biomes/BiomeGenHotSprings.java | 4 +- .../biomes/BiomeGenIcyHills.java | 6 +- .../biomes/BiomeGenJadeCliffs.java | 6 +- .../biomes/BiomeGenLushDesert.java | 4 +- .../biomes/BiomeGenLushSwamp.java | 2 +- .../biomes/BiomeGenMangrove.java | 4 +- .../biomes/BiomeGenMapleWoods.java | 4 +- common/biomesoplenty/biomes/BiomeGenMesa.java | 4 +- common/biomesoplenty/biomes/BiomeGenMoor.java | 4 +- .../biomes/BiomeGenMountain.java | 10 +- .../biomes/BiomeGenMysticGrove.java | 17 +- .../biomesoplenty/biomes/BiomeGenOasis.java | 2 +- .../biomes/BiomeGenOminousWoods.java | 8 +- .../biomes/BiomeGenOminousWoodsThick.java | 10 +- .../biomesoplenty/biomes/BiomeGenOrchard.java | 2 +- .../biomes/BiomeGenOriginValley.java | 6 +- .../biomesoplenty/biomes/BiomeGenOutback.java | 2 +- .../biomes/BiomeGenOvergrownGreens.java | 4 +- .../biomes/BiomeGenQuagmire.java | 6 +- .../biomes/BiomeGenRainforest.java | 2 +- .../biomes/BiomeGenRedwoodForest.java | 12 +- .../biomes/BiomeGenSacredSprings.java | 4 +- .../biomesoplenty/biomes/BiomeGenSavanna.java | 2 +- .../biomes/BiomeGenSavannaPlateau.java | 2 +- .../biomes/BiomeGenSeasonalForest.java | 12 +- .../biomes/BiomeGenSeasonalSpruceForest.java | 12 +- .../biomesoplenty/biomes/BiomeGenShield.java | 6 +- .../biomes/BiomeGenSilkglades.java | 10 +- .../biomes/BiomeGenSludgepit.java | 4 +- .../biomes/BiomeGenSpruceWoods.java | 2 +- .../biomes/BiomeGenTemperateRainforest.java | 6 +- .../biomesoplenty/biomes/BiomeGenTimber.java | 2 +- .../biomes/BiomeGenTimberThin.java | 2 +- .../biomes/BiomeGenTropicalRainforest.java | 8 +- .../biomesoplenty/biomes/BiomeGenTropics.java | 8 +- .../biomesoplenty/biomes/BiomeGenVolcano.java | 4 +- .../biomes/BiomeGenWasteland.java | 6 +- .../biomesoplenty/biomes/BiomeGenWetland.java | 4 +- .../{ => beach}/BiomeGenBeachGravel.java | 2 +- .../{ => beach}/BiomeGenBeachOvergrown.java | 3 +- .../{ => nether}/BiomeGenNetherBase.java | 3 +- .../{ => nether}/BiomeGenNetherBone.java | 3 +- .../{ => nether}/BiomeGenNetherDesert.java | 3 +- .../{ => nether}/BiomeGenNetherGarden.java | 3 +- .../{ => nether}/BiomeGenNetherLava.java | 3 +- .../{ => ocean}/BiomeGenOceanAbyss.java | 3 +- .../{ => ocean}/BiomeGenOceanCoral.java | 3 +- .../biomes/{ => ocean}/BiomeGenOceanKelp.java | 3 +- .../BiomeGenPromisedLandForest.java | 13 +- .../BiomeGenPromisedLandPlains.java | 9 +- .../BiomeGenPromisedLandSwamp.java | 13 +- .../{ => vanilla}/BiomeGenDesertNew.java | 7 +- .../{ => vanilla}/BiomeGenForestNew.java | 3 +- .../{ => vanilla}/BiomeGenHillsNew.java | 5 +- .../{ => vanilla}/BiomeGenJungleNew.java | 7 +- .../{ => vanilla}/BiomeGenPlainsNew.java | 3 +- .../{ => vanilla}/BiomeGenSwampNew.java | 9 +- .../{ => vanilla}/BiomeGenTaigaNew.java | 3 +- .../blocks/BlockBOPColorizedSapling.java | 14 +- .../biomesoplenty/blocks/BlockBOPSapling.java | 34 +- .../blocks/BlockPromisedPortal.java | 6 +- .../configuration/BOPBiomes.java | 761 ++++++----- .../configuration/BOPBlocks.java | 143 +- .../configuration/BOPConfiguration.java | 1207 ----------------- .../configuration/BOPCrafting.java | 17 +- .../configuration/BOPEntities.java | 15 +- .../configuration/BOPFluids.java | 11 +- .../biomesoplenty/configuration/BOPItems.java | 77 +- .../configuration/BOPVanillaCompat.java | 3 +- .../configfile/BOPConfiguration.java | 27 + .../configfile/BOPConfigurationBiomeGen.java | 238 ++++ .../configfile/BOPConfigurationIDs.java | 615 +++++++++ .../configfile/BOPConfigurationMain.java | 48 + .../configfile/BOPConfigurationMisc.java | 71 + .../BOPConfigurationTerrainGen.java | 243 ++++ .../fluids/BlockFluidSpringWater.java | 4 +- .../handlers/EntityEventHandler.java | 4 +- .../handlers/TickHandlerServer.java | 4 +- .../helpers/AchievementHelper.java | 4 +- common/biomesoplenty/helpers/Version.java | 8 +- .../integration/ForestryIntegration.java | 394 +++--- .../items/ItemBOPAncientStaff.java | 4 +- .../biomesoplenty/world/ChunkProviderBOP.java | 7 +- .../world/WorldProviderPromised.java | 4 +- common/biomesoplenty/world/WorldTypeBOP.java | 185 +-- common/biomesoplenty/world/WorldTypeSize.java | 8 +- .../world/layer/BiomeLayerBiomes.java | 10 +- .../world/layer/BiomeLayerCreate.java | 4 +- .../world/layer/BiomeLayerShore.java | 6 +- .../{ => realtree}/WorldGenRealMagic.java | 2 +- .../{ => realtree}/WorldGenRealPineTree.java | 2 +- .../{ => realtree}/WorldGenRealPineTree2.java | 2 +- .../{ => realtree}/WorldGenRealRedwood.java | 2 +- .../{ => realtree}/WorldGenRealRedwood2.java | 2 +- .../worldgen/structure/BOPMapGenVillage.java | 6 +- .../worldgen/{ => tree}/WorldGenAcacia.java | 2 +- .../worldgen/{ => tree}/WorldGenApple.java | 2 +- .../worldgen/{ => tree}/WorldGenAutumn.java | 2 +- .../worldgen/{ => tree}/WorldGenAutumn2.java | 2 +- .../{ => tree}/WorldGenAutumn2Big.java | 2 +- .../{ => tree}/WorldGenBambooTree.java | 2 +- .../{ => tree}/WorldGenBambooTree2.java | 2 +- .../worldgen/{ => tree}/WorldGenBayou1.java | 2 +- .../worldgen/{ => tree}/WorldGenBayou2.java | 2 +- .../worldgen/{ => tree}/WorldGenBayou3.java | 2 +- .../{ => tree}/WorldGenBirchWillow.java | 2 +- .../{ => tree}/WorldGenCanyonTree.java | 2 +- .../worldgen/{ => tree}/WorldGenCherry1.java | 2 +- .../worldgen/{ => tree}/WorldGenCherry2.java | 2 +- .../worldgen/{ => tree}/WorldGenDeadTree.java | 2 +- .../{ => tree}/WorldGenDeadTree2.java | 2 +- .../{ => tree}/WorldGenDeadTree3.java | 2 +- .../{ => tree}/WorldGenDeciduous.java | 2 +- .../{ => tree}/WorldGenDeciduous2.java | 2 +- .../worldgen/{ => tree}/WorldGenFen1.java | 2 +- .../worldgen/{ => tree}/WorldGenFen2.java | 2 +- .../worldgen/{ => tree}/WorldGenFir1.java | 2 +- .../worldgen/{ => tree}/WorldGenFir2.java | 2 +- .../worldgen/{ => tree}/WorldGenFir3.java | 2 +- .../worldgen/{ => tree}/WorldGenIceTree.java | 2 +- .../{ => tree}/WorldGenJacaranda.java | 2 +- .../{ => tree}/WorldGenLargeTree.java | 2 +- .../worldgen/{ => tree}/WorldGenMangrove.java | 2 +- .../{ => tree}/WorldGenMangrove2.java | 2 +- .../worldgen/{ => tree}/WorldGenMaple.java | 2 +- .../worldgen/{ => tree}/WorldGenMapleBig.java | 2 +- .../worldgen/{ => tree}/WorldGenMystic1.java | 2 +- .../worldgen/{ => tree}/WorldGenMystic2.java | 2 +- .../worldgen/{ => tree}/WorldGenMystic3.java | 2 +- .../worldgen/{ => tree}/WorldGenOminous1.java | 2 +- .../worldgen/{ => tree}/WorldGenOminous2.java | 2 +- .../worldgen/{ => tree}/WorldGenOminous3.java | 2 +- .../worldgen/{ => tree}/WorldGenOminous4.java | 2 +- .../{ => tree}/WorldGenOriginTree.java | 2 +- .../{ => tree}/WorldGenOutbackTree.java | 2 +- .../{ => tree}/WorldGenOvergrownTree.java | 2 +- .../{ => tree}/WorldGenPalmTree1.java | 2 +- .../{ => tree}/WorldGenPalmTree3.java | 2 +- .../{ => tree}/WorldGenPersimmon.java | 2 +- .../worldgen/{ => tree}/WorldGenPineTree.java | 2 +- .../{ => tree}/WorldGenPromisedTree.java | 2 +- .../{ => tree}/WorldGenPromisedTree2.java | 2 +- .../{ => tree}/WorldGenPromisedTree3.java | 2 +- .../{ => tree}/WorldGenPromisedWillow.java | 2 +- .../WorldGenPromisedWillowTree.java | 2 +- .../{ => tree}/WorldGenRainforest1.java | 2 +- .../{ => tree}/WorldGenRainforest2.java | 2 +- .../{ => tree}/WorldGenRainforestTree1.java | 2 +- .../{ => tree}/WorldGenRedwoodTree.java | 2 +- .../{ => tree}/WorldGenRedwoodTree2.java | 2 +- .../{ => tree}/WorldGenSwampTall.java | 2 +- .../worldgen/{ => tree}/WorldGenTaiga10.java | 2 +- .../worldgen/{ => tree}/WorldGenTaiga3.java | 2 +- .../worldgen/{ => tree}/WorldGenTaiga4.java | 2 +- .../worldgen/{ => tree}/WorldGenTaiga5.java | 2 +- .../worldgen/{ => tree}/WorldGenTaiga6.java | 2 +- .../worldgen/{ => tree}/WorldGenTaiga7.java | 2 +- .../worldgen/{ => tree}/WorldGenTaiga8.java | 2 +- .../worldgen/{ => tree}/WorldGenTaiga9.java | 2 +- .../{ => tree}/WorldGenTemperate.java | 2 +- .../{ => tree}/WorldGenThickTree.java | 2 +- .../{ => tree}/WorldGenThickTree2.java | 2 +- .../{ => tree}/WorldGenThickTree3.java | 2 +- .../worldgen/{ => tree}/WorldGenWillow.java | 2 +- 188 files changed, 2624 insertions(+), 2536 deletions(-) rename common/biomesoplenty/biomes/{ => beach}/BiomeGenBeachGravel.java (93%) rename common/biomesoplenty/biomes/{ => beach}/BiomeGenBeachOvergrown.java (93%) rename common/biomesoplenty/biomes/{ => nether}/BiomeGenNetherBase.java (92%) rename common/biomesoplenty/biomes/{ => nether}/BiomeGenNetherBone.java (93%) rename common/biomesoplenty/biomes/{ => nether}/BiomeGenNetherDesert.java (93%) rename common/biomesoplenty/biomes/{ => nether}/BiomeGenNetherGarden.java (95%) rename common/biomesoplenty/biomes/{ => nether}/BiomeGenNetherLava.java (96%) rename common/biomesoplenty/biomes/{ => ocean}/BiomeGenOceanAbyss.java (92%) rename common/biomesoplenty/biomes/{ => ocean}/BiomeGenOceanCoral.java (93%) rename common/biomesoplenty/biomes/{ => ocean}/BiomeGenOceanKelp.java (93%) rename common/biomesoplenty/biomes/{ => promisedland}/BiomeGenPromisedLandForest.java (91%) rename common/biomesoplenty/biomes/{ => promisedland}/BiomeGenPromisedLandPlains.java (93%) rename common/biomesoplenty/biomes/{ => promisedland}/BiomeGenPromisedLandSwamp.java (90%) rename common/biomesoplenty/biomes/{ => vanilla}/BiomeGenDesertNew.java (92%) rename common/biomesoplenty/biomes/{ => vanilla}/BiomeGenForestNew.java (96%) rename common/biomesoplenty/biomes/{ => vanilla}/BiomeGenHillsNew.java (92%) rename common/biomesoplenty/biomes/{ => vanilla}/BiomeGenJungleNew.java (95%) rename common/biomesoplenty/biomes/{ => vanilla}/BiomeGenPlainsNew.java (95%) rename common/biomesoplenty/biomes/{ => vanilla}/BiomeGenSwampNew.java (93%) rename common/biomesoplenty/biomes/{ => vanilla}/BiomeGenTaigaNew.java (96%) delete mode 100644 common/biomesoplenty/configuration/BOPConfiguration.java create mode 100644 common/biomesoplenty/configuration/configfile/BOPConfiguration.java create mode 100644 common/biomesoplenty/configuration/configfile/BOPConfigurationBiomeGen.java create mode 100644 common/biomesoplenty/configuration/configfile/BOPConfigurationIDs.java create mode 100644 common/biomesoplenty/configuration/configfile/BOPConfigurationMain.java create mode 100644 common/biomesoplenty/configuration/configfile/BOPConfigurationMisc.java create mode 100644 common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java rename common/biomesoplenty/worldgen/{ => realtree}/WorldGenRealMagic.java (99%) rename common/biomesoplenty/worldgen/{ => realtree}/WorldGenRealPineTree.java (99%) rename common/biomesoplenty/worldgen/{ => realtree}/WorldGenRealPineTree2.java (99%) rename common/biomesoplenty/worldgen/{ => realtree}/WorldGenRealRedwood.java (99%) rename common/biomesoplenty/worldgen/{ => realtree}/WorldGenRealRedwood2.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenAcacia.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenApple.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenAutumn.java (98%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenAutumn2.java (98%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenAutumn2Big.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenBambooTree.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenBambooTree2.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenBayou1.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenBayou2.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenBayou3.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenBirchWillow.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenCanyonTree.java (98%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenCherry1.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenCherry2.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenDeadTree.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenDeadTree2.java (98%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenDeadTree3.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenDeciduous.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenDeciduous2.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenFen1.java (98%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenFen2.java (98%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenFir1.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenFir2.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenFir3.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenIceTree.java (98%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenJacaranda.java (98%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenLargeTree.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenMangrove.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenMangrove2.java (97%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenMaple.java (98%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenMapleBig.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenMystic1.java (98%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenMystic2.java (98%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenMystic3.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenOminous1.java (98%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenOminous2.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenOminous3.java (98%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenOminous4.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenOriginTree.java (98%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenOutbackTree.java (97%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenOvergrownTree.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenPalmTree1.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenPalmTree3.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenPersimmon.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenPineTree.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenPromisedTree.java (98%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenPromisedTree2.java (98%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenPromisedTree3.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenPromisedWillow.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenPromisedWillowTree.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenRainforest1.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenRainforest2.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenRainforestTree1.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenRedwoodTree.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenRedwoodTree2.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenSwampTall.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenTaiga10.java (98%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenTaiga3.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenTaiga4.java (98%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenTaiga5.java (98%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenTaiga6.java (98%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenTaiga7.java (98%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenTaiga8.java (98%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenTaiga9.java (98%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenTemperate.java (98%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenThickTree.java (99%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenThickTree2.java (98%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenThickTree3.java (98%) rename common/biomesoplenty/worldgen/{ => tree}/WorldGenWillow.java (99%) diff --git a/common/biomesoplenty/BiomesOPlenty.java b/common/biomesoplenty/BiomesOPlenty.java index f3d5bd051..6e296f42a 100644 --- a/common/biomesoplenty/BiomesOPlenty.java +++ b/common/biomesoplenty/BiomesOPlenty.java @@ -5,13 +5,15 @@ import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.MinecraftForge; import biomesoplenty.configuration.BOPBiomes; import biomesoplenty.configuration.BOPBlocks; -import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.configuration.BOPCrafting; import biomesoplenty.configuration.BOPEntities; import biomesoplenty.configuration.BOPFluids; import biomesoplenty.configuration.BOPItems; import biomesoplenty.configuration.BOPPotions; import biomesoplenty.configuration.BOPVanillaCompat; +import biomesoplenty.configuration.configfile.BOPConfiguration; +import biomesoplenty.configuration.configfile.BOPConfigurationIDs; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; import biomesoplenty.handlers.BOPCraftHandler; import biomesoplenty.handlers.BonemealHandler; import biomesoplenty.handlers.BreakSpeedHandler; @@ -79,7 +81,7 @@ public class BiomesOPlenty } // Achievement declaration - if (BOPConfiguration.Misc.achievements) + if (BOPConfigurationMisc.achievements) { AchievementHelper.init(); } @@ -115,8 +117,8 @@ public class BiomesOPlenty // DimensionManager.unregisterProviderType(-1); // DimensionManager.registerProviderType(-1, WorldProviderBOPhell.class, true); // } - DimensionManager.registerProviderType(BOPConfiguration.IDs.promisedLandDimID, WorldProviderPromised.class, false); - DimensionManager.registerDimension(BOPConfiguration.IDs.promisedLandDimID, BOPConfiguration.IDs.promisedLandDimID); + DimensionManager.registerProviderType(BOPConfigurationIDs.promisedLandDimID, WorldProviderPromised.class, false); + DimensionManager.registerDimension(BOPConfigurationIDs.promisedLandDimID, BOPConfigurationIDs.promisedLandDimID); BOPCrossIntegration.init(); } diff --git a/common/biomesoplenty/biomes/BiomeDecoratorBOP.java b/common/biomesoplenty/biomes/BiomeDecoratorBOP.java index cd11e6658..5fa6ffa31 100644 --- a/common/biomesoplenty/biomes/BiomeDecoratorBOP.java +++ b/common/biomesoplenty/biomes/BiomeDecoratorBOP.java @@ -44,7 +44,7 @@ import net.minecraftforge.event.terraingen.OreGenEvent; import net.minecraftforge.event.terraingen.TerrainGen; import biomesoplenty.api.Blocks; import biomesoplenty.api.Fluids; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.configuration.configfile.BOPConfigurationTerrainGen; import biomesoplenty.worldgen.WorldGenAlgae; import biomesoplenty.worldgen.WorldGenAsh; import biomesoplenty.worldgen.WorldGenBOPBush; @@ -67,8 +67,8 @@ import biomesoplenty.worldgen.WorldGenCrystal1; import biomesoplenty.worldgen.WorldGenCrystal2; import biomesoplenty.worldgen.WorldGenDesertCactus; import biomesoplenty.worldgen.WorldGenDriedDirt; -import biomesoplenty.worldgen.WorldGenGravel; import biomesoplenty.worldgen.WorldGenGrave; +import biomesoplenty.worldgen.WorldGenGravel; import biomesoplenty.worldgen.WorldGenHighCattail; import biomesoplenty.worldgen.WorldGenHighGrass; import biomesoplenty.worldgen.WorldGenKelp; @@ -85,7 +85,6 @@ import biomesoplenty.worldgen.WorldGenOasis; import biomesoplenty.worldgen.WorldGenOutback; import biomesoplenty.worldgen.WorldGenPit; import biomesoplenty.worldgen.WorldGenPotatoes; -import biomesoplenty.worldgen.WorldGenPromisedWillow; import biomesoplenty.worldgen.WorldGenPumpkinAlt; import biomesoplenty.worldgen.WorldGenQuagmire; import biomesoplenty.worldgen.WorldGenQuicksand; @@ -97,281 +96,282 @@ import biomesoplenty.worldgen.WorldGenSponge; import biomesoplenty.worldgen.WorldGenSprout; import biomesoplenty.worldgen.WorldGenSteppe; import biomesoplenty.worldgen.WorldGenSunflower; +import biomesoplenty.worldgen.tree.WorldGenPromisedWillow; public class BiomeDecoratorBOP extends BiomeDecorator { /** The world the BiomeDecorator is currently decorating */ - protected World currentWorld; + public World currentWorld; /** The Biome Decorator's random number generator. */ - protected Random randomGenerator; + public Random randomGenerator; /** The X-coordinate of the chunk currently being decorated */ - protected int chunk_X; + public int chunk_X; /** The Z-coordinate of the chunk currently being decorated */ - protected int chunk_Z; + public int chunk_Z; /** The biome generator object. */ - protected BiomeGenBase biome; + public BiomeGenBase biome; /** The clay generator. */ - protected WorldGenerator clayGen = new WorldGenClay(4); + public WorldGenerator clayGen = new WorldGenClay(4); /** The sand generator. */ - protected WorldGenerator sandGen; - protected WorldGenerator mudGen; - protected WorldGenerator oasesGen; + public WorldGenerator sandGen; + public WorldGenerator mudGen; + public WorldGenerator oasesGen; /** The gravel generator. */ - protected WorldGenerator gravelAsSandGen; + public WorldGenerator gravelAsSandGen; /** The dirt generator. */ - protected WorldGenerator dirtGen; - protected WorldGenerator gravelGen; - protected WorldGenerator gravelShoreGen; - protected WorldGenerator ashGen; - protected WorldGenerator grassMesaGen; - protected WorldGenerator sandMesaGen; - protected WorldGenerator myceliumGen; - protected WorldGenerator sandInGrassGen; - protected WorldGenerator stoneInGrassGen; - protected WorldGenerator stoneInGrassGen2; - protected WorldGenerator sandInStoneGen; - protected WorldGenerator driedDirtInSandGen; - protected WorldGenerator clayInClayGen; - protected WorldGenerator clayInClay2Gen; - protected WorldGenerator clayInStoneGen; - protected WorldGenerator clayInStone2Gen; - protected WorldGenerator quagmireGen; - protected WorldGenerator quicksandGen; - protected WorldGenerator spongeGen; - protected WorldGenerator canyonGen; - protected WorldGenerator cloudGen; - protected WorldGenerator coalGen; - protected WorldGenerator ironGen; + public WorldGenerator dirtGen; + public WorldGenerator gravelGen; + public WorldGenerator gravelShoreGen; + public WorldGenerator ashGen; + public WorldGenerator grassMesaGen; + public WorldGenerator sandMesaGen; + public WorldGenerator myceliumGen; + public WorldGenerator sandInGrassGen; + public WorldGenerator stoneInGrassGen; + public WorldGenerator stoneInGrassGen2; + public WorldGenerator sandInStoneGen; + public WorldGenerator driedDirtInSandGen; + public WorldGenerator clayInClayGen; + public WorldGenerator clayInClay2Gen; + public WorldGenerator clayInStoneGen; + public WorldGenerator clayInStone2Gen; + public WorldGenerator quagmireGen; + public WorldGenerator quicksandGen; + public WorldGenerator spongeGen; + public WorldGenerator canyonGen; + public WorldGenerator cloudGen; + public WorldGenerator coalGen; + public WorldGenerator ironGen; /** Field that holds gold WorldGenMinable */ - protected WorldGenerator goldGen; + public WorldGenerator goldGen; /** Field that holds redstone WorldGenMinable */ - protected WorldGenerator redstoneGen; + public WorldGenerator redstoneGen; /** Field that holds diamond WorldGenMinable */ - protected WorldGenerator diamondGen; + public WorldGenerator diamondGen; /** Field that holds Lapis WorldGenMinable */ - protected WorldGenerator lapisGen; + public WorldGenerator lapisGen; /** Field that holds one of the plantYellow WorldGenFlowers */ - protected WorldGenerator plantYellowGen; - protected WorldGenerator dandelionGen; + public WorldGenerator plantYellowGen; + public WorldGenerator dandelionGen; /** Field that holds one of the plantRed WorldGenFlowers */ - protected WorldGenerator plantRedGen; - protected WorldGenerator plantWhiteGen; - protected WorldGenerator plantBlueGen; - protected WorldGenerator plantPurpleGen; - protected WorldGenerator plantPinkGen; - protected WorldGenerator plantOrangeGen; - protected WorldGenerator plantTinyGen; - protected WorldGenerator plantGlowGen; - protected WorldGenerator plantDeadGen; - protected WorldGenerator plantDesertGen; - protected WorldGenerator cattailGen; - protected WorldGenerator highCattailGen; - protected WorldGenerator outbackGen; - protected WorldGenerator smolderingGrassGen; - protected WorldGenerator canyonGrassGen; - protected WorldGenerator netherGrassGen; - protected WorldGenerator netherWartGen; - protected WorldGenerator steppeGen; - protected WorldGenerator cobwebGen; - protected WorldGenerator thornGen; - protected WorldGenerator toadstoolGen; - protected WorldGenerator portobelloGen; - protected WorldGenerator blueMilkGen; - protected WorldGenerator glowshroomGen; - protected WorldGenerator highGrassGen; - protected WorldGenerator carrotGen; - protected WorldGenerator potatoGen; - protected WorldGenerator sproutGen; - protected WorldGenerator bushGen; - protected WorldGenerator berryBushGen; - protected WorldGenerator tinyCactusGen; - protected WorldGenerator aloeGen; - protected WorldGenerator deathbloomGen; - protected WorldGenerator hydrangeaGen; - protected WorldGenerator violetGen; - protected WorldGenerator duneGrassGen; - protected WorldGenerator holyTallGrassGen; - protected WorldGenerator desertSproutsGen; - protected WorldGenerator promisedWillowGen; - protected WorldGenerator netherVineGen; - protected WorldGenerator poisonIvyGen; - protected WorldGenerator sunflowerGen; - protected WorldGenerator rainbowflowerGen; - protected WorldGenerator crystalGen; - protected WorldGenerator crystalGen2; - protected WorldGenerator kelpGen; - protected WorldGenerator shortKelpGen; - protected WorldGenerator graveGen; - protected WorldGenerator pumpkinAltGen; - protected WorldGenerator coralGen; + public WorldGenerator plantRedGen; + public WorldGenerator plantWhiteGen; + public WorldGenerator plantBlueGen; + public WorldGenerator plantPurpleGen; + public WorldGenerator plantPinkGen; + public WorldGenerator plantOrangeGen; + public WorldGenerator plantTinyGen; + public WorldGenerator plantGlowGen; + public WorldGenerator plantDeadGen; + public WorldGenerator plantDesertGen; + public WorldGenerator cattailGen; + public WorldGenerator highCattailGen; + public WorldGenerator outbackGen; + public WorldGenerator smolderingGrassGen; + public WorldGenerator canyonGrassGen; + public WorldGenerator netherGrassGen; + public WorldGenerator netherWartGen; + public WorldGenerator steppeGen; + public WorldGenerator cobwebGen; + public WorldGenerator thornGen; + public WorldGenerator toadstoolGen; + public WorldGenerator portobelloGen; + public WorldGenerator blueMilkGen; + public WorldGenerator glowshroomGen; + public WorldGenerator highGrassGen; + public WorldGenerator carrotGen; + public WorldGenerator potatoGen; + public WorldGenerator sproutGen; + public WorldGenerator bushGen; + public WorldGenerator berryBushGen; + public WorldGenerator tinyCactusGen; + public WorldGenerator aloeGen; + public WorldGenerator deathbloomGen; + public WorldGenerator hydrangeaGen; + public WorldGenerator violetGen; + public WorldGenerator duneGrassGen; + public WorldGenerator holyTallGrassGen; + public WorldGenerator desertSproutsGen; + public WorldGenerator promisedWillowGen; + public WorldGenerator netherVineGen; + public WorldGenerator poisonIvyGen; + public WorldGenerator sunflowerGen; + public WorldGenerator rainbowflowerGen; + public WorldGenerator crystalGen; + public WorldGenerator crystalGen2; + public WorldGenerator kelpGen; + public WorldGenerator shortKelpGen; + public WorldGenerator graveGen; + public WorldGenerator pumpkinAltGen; + public WorldGenerator coralGen; - protected WorldGenerator boneSpineGen; - protected WorldGenerator boneSpine2Gen; + public WorldGenerator boneSpineGen; + public WorldGenerator boneSpine2Gen; /** Field that holds mushroomBrown WorldGenFlowers */ - protected WorldGenerator mushroomBrownGen; + public WorldGenerator mushroomBrownGen; /** Field that holds mushroomRed WorldGenFlowers */ - protected WorldGenerator mushroomRedGen; + public WorldGenerator mushroomRedGen; /** Field that holds big mushroom generator */ - protected WorldGenerator bigMushroomGen; + public WorldGenerator bigMushroomGen; /** Field that holds WorldGenReed */ - protected WorldGenerator reedGen; - protected WorldGenerator reedBOPGen; + public WorldGenerator reedGen; + public WorldGenerator reedBOPGen; /** Field that holds WorldGenCactus */ - protected WorldGenerator cactusGen; - protected WorldGenerator desertCactusGen; + public WorldGenerator cactusGen; + public WorldGenerator desertCactusGen; /** The water lily generation! */ - protected WorldGenerator waterlilyGen; - protected WorldGenerator lilyflowerGen; - protected WorldGenerator algaeGen; - protected WorldGenerator pitGen; + public WorldGenerator waterlilyGen; + public WorldGenerator lilyflowerGen; + public WorldGenerator algaeGen; + public WorldGenerator pitGen; /** Amount of waterlilys per chunk. */ - protected int waterlilyPerChunk; - protected int lilyflowersPerChunk; - protected int algaePerChunk; - protected int crystalsPerChunk; - protected int crystals2PerChunk; + public int waterlilyPerChunk; + public int lilyflowersPerChunk; + public int algaePerChunk; + public int crystalsPerChunk; + public int crystals2PerChunk; /** * The number of trees to attempt to generate per chunk. Up to 10 in forests, none in deserts. */ - //protected int treesPerChunk; fix for bigtrees mod compatibility -ted80 + //public int treesPerChunk; fix for bigtrees mod compatibility -ted80 /** * The number of yellow flower patches to generate per chunk. The game generates much less than this number, since * it attempts to generate them at a random altitude. */ - protected int flowersPerChunk; - protected int whiteFlowersPerChunk; - protected int blueFlowersPerChunk; - protected int purpleFlowersPerChunk; - protected int pinkFlowersPerChunk; - protected int orangeFlowersPerChunk; - protected int tinyFlowersPerChunk; - protected int glowFlowersPerChunk; - protected int deadGrassPerChunk; - protected int desertGrassPerChunk; - protected int cattailsPerChunk; - protected int highCattailsPerChunk; - protected int carrotsPerChunk; - protected int potatoesPerChunk; - protected int thornsPerChunk; - protected int toadstoolsPerChunk; - protected int portobellosPerChunk; - protected int blueMilksPerChunk; - protected int glowshroomsPerChunk; - protected int sproutsPerChunk; - protected int bushesPerChunk; - protected int berryBushesPerChunk; - protected int tinyCactiPerChunk; - protected int aloePerChunk; - protected int deathbloomsPerChunk; - protected int hydrangeasPerChunk; - protected int violetsPerChunk; - protected int duneGrassPerChunk; - protected int holyTallGrassPerChunk; - protected int desertSproutsPerChunk; - protected int promisedWillowPerChunk; - protected int netherVinesPerChunk; - protected int poisonIvyPerChunk; - protected int sunflowersPerChunk; - protected int rainbowflowersPerChunk; - protected int cobwebsPerChunk; - protected int kelpPerChunk; - protected int kelpThickPerChunk; - protected int shortKelpPerChunk; - protected int gravesPerChunk; - protected int pumpkinsPerChunk; - protected int coralPerChunk; + public int flowersPerChunk; + public int whiteFlowersPerChunk; + public int blueFlowersPerChunk; + public int purpleFlowersPerChunk; + public int pinkFlowersPerChunk; + public int orangeFlowersPerChunk; + public int tinyFlowersPerChunk; + public int glowFlowersPerChunk; + public int deadGrassPerChunk; + public int desertGrassPerChunk; + public int cattailsPerChunk; + public int highCattailsPerChunk; + public int carrotsPerChunk; + public int potatoesPerChunk; + public int thornsPerChunk; + public int toadstoolsPerChunk; + public int portobellosPerChunk; + public int blueMilksPerChunk; + public int glowshroomsPerChunk; + public int sproutsPerChunk; + public int bushesPerChunk; + public int berryBushesPerChunk; + public int tinyCactiPerChunk; + public int aloePerChunk; + public int deathbloomsPerChunk; + public int hydrangeasPerChunk; + public int violetsPerChunk; + public int duneGrassPerChunk; + public int holyTallGrassPerChunk; + public int desertSproutsPerChunk; + public int promisedWillowPerChunk; + public int netherVinesPerChunk; + public int poisonIvyPerChunk; + public int sunflowersPerChunk; + public int rainbowflowersPerChunk; + public int cobwebsPerChunk; + public int kelpPerChunk; + public int kelpThickPerChunk; + public int shortKelpPerChunk; + public int gravesPerChunk; + public int pumpkinsPerChunk; + public int coralPerChunk; - protected int boneSpinesPerChunk; - protected int boneSpines2PerChunk; + public int boneSpinesPerChunk; + public int boneSpines2PerChunk; /** The amount of tall grass to generate per chunk. */ - protected int grassPerChunk; - protected int outbackPerChunk; - protected int smolderingGrassPerChunk; - protected int netherGrassPerChunk; - protected int netherWartPerChunk; - protected int canyonGrassPerChunk; - protected int steppePerChunk; - protected int highGrassPerChunk; + public int grassPerChunk; + public int outbackPerChunk; + public int smolderingGrassPerChunk; + public int netherGrassPerChunk; + public int netherWartPerChunk; + public int canyonGrassPerChunk; + public int steppePerChunk; + public int highGrassPerChunk; /** * The number of dead bushes to generate per chunk. Used in deserts and swamps. */ - protected int deadBushPerChunk; + public int deadBushPerChunk; /** * The number of extra mushroom patches per chunk. It generates 1/4 this number in brown mushroom patches, and 1/8 * this number in red mushroom patches. These mushrooms go beyond the default base number of mushrooms. */ - protected int mushroomsPerChunk; + public int mushroomsPerChunk; /** * The number of reeds to generate per chunk. Reeds won't generate if the randomly selected placement is unsuitable. */ - protected int reedsPerChunk; - protected int reedsBOPPerChunk; + public int reedsPerChunk; + public int reedsBOPPerChunk; /** * The number of cactus plants to generate per chunk. Cacti only work on sand. */ - protected int cactiPerChunk; - protected int desertCactiPerChunk; + public int cactiPerChunk; + public int desertCactiPerChunk; /** * The number of sand patches to generate per chunk. Sand patches only generate when part of it is underwater. */ - protected int sandPerChunk; - protected int oasesPerChunk; - protected int mudPerChunk; - protected int gravelPerChunk; + public int sandPerChunk; + public int oasesPerChunk; + public int mudPerChunk; + public int gravelPerChunk; /** * The number of sand patches to generate per chunk. Sand patches only generate when part of it is underwater. There * appear to be two separate fields for this. */ - protected int sandPerChunk2; - protected int oasesPerChunk2; - protected int mudPerChunk2; - protected int gravelPerChunk2; + public int sandPerChunk2; + public int oasesPerChunk2; + public int mudPerChunk2; + public int gravelPerChunk2; /** * The number of clay patches to generate per chunk. Only generates when part of it is underwater. */ - protected int clayPerChunk; + public int clayPerChunk; /** Amount of big mushrooms per chunk */ - protected int bigMushroomsPerChunk; - protected int rosesPerChunk; - protected int pondsPerChunk; - protected int waterLakesPerChunk; - protected int lavaLakesPerChunk; - protected int netherLavaPerChunk; - protected int hotSpringsPerChunk; - protected int poisonWaterPerChunk; + public int bigMushroomsPerChunk; + public int rosesPerChunk; + public int pondsPerChunk; + public int waterLakesPerChunk; + public int lavaLakesPerChunk; + public int netherLavaPerChunk; + public int hotSpringsPerChunk; + public int poisonWaterPerChunk; /** True if decorator should generate surface lava & water */ public boolean generateLakes; @@ -669,7 +669,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator for (var2 = 0; var2 < hotSpringsPerChunk; ++var2) { - if (BOPConfiguration.TerrainGen.springWaterGen) + if (BOPConfigurationTerrainGen.springWaterGen) { var3 = chunk_X + randomGenerator.nextInt(16) + 8; var4 = randomGenerator.nextInt(randomGenerator.nextInt(randomGenerator.nextInt(112) + 8) + 8); @@ -682,7 +682,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator { int var9999 = randomGenerator.nextInt(96); - if (BOPConfiguration.TerrainGen.springWaterGen) + if (BOPConfigurationTerrainGen.springWaterGen) { if (var9999 == 1) { @@ -696,7 +696,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator for (var2 = 0; var2 < poisonWaterPerChunk; ++var2) { - if (BOPConfiguration.TerrainGen.poisonWaterGen) + if (BOPConfigurationTerrainGen.poisonWaterGen) { var3 = chunk_X + randomGenerator.nextInt(16) + 8; var4 = randomGenerator.nextInt(randomGenerator.nextInt(randomGenerator.nextInt(112) + 8) + 8); @@ -709,7 +709,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator { int var9998 = randomGenerator.nextInt(32); - if (BOPConfiguration.TerrainGen.poisonWaterGen) + if (BOPConfigurationTerrainGen.poisonWaterGen) { if (var9998 == 1) { @@ -798,7 +798,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator if (generateQuicksand) { - if (BOPConfiguration.TerrainGen.quicksandGen) + if (BOPConfigurationTerrainGen.quicksandGen) { this.genStandardOre1(5, quicksandGen, 64, 128); } @@ -1173,7 +1173,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator for (var2 = 0; var2 < poisonIvyPerChunk; ++var2) { - if (BOPConfiguration.TerrainGen.poisonIvyGen) + if (BOPConfigurationTerrainGen.poisonIvyGen) { var3 = chunk_X + randomGenerator.nextInt(16) + 8; var4 = randomGenerator.nextInt(256); @@ -1379,7 +1379,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator for (var2 = 0; var2 < thornsPerChunk; ++var2) { - if (BOPConfiguration.TerrainGen.thornGen) + if (BOPConfigurationTerrainGen.thornGen) { var3 = chunk_X + randomGenerator.nextInt(16) + 8; var4 = randomGenerator.nextInt(256); @@ -1475,7 +1475,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator var3 = randomGenerator.nextInt(256); var4 = chunk_Z + randomGenerator.nextInt(16) + 8; - if (BOPConfiguration.TerrainGen.pumpkinGen) + if (BOPConfigurationTerrainGen.pumpkinGen) { (new WorldGenBOPPumpkin()).generate(currentWorld, randomGenerator, var2, var3, var4); } diff --git a/common/biomesoplenty/biomes/BiomeGenAlpsBase.java b/common/biomesoplenty/biomes/BiomeGenAlpsBase.java index 4be4e96d7..e1ef9bd7a 100644 --- a/common/biomesoplenty/biomes/BiomeGenAlpsBase.java +++ b/common/biomesoplenty/biomes/BiomeGenAlpsBase.java @@ -8,7 +8,7 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenTaiga2; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.worldgen.WorldGenTaiga5; +import biomesoplenty.worldgen.tree.WorldGenTaiga5; public class BiomeGenAlpsBase extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenAlpsForest.java b/common/biomesoplenty/biomes/BiomeGenAlpsForest.java index b53458312..812501445 100644 --- a/common/biomesoplenty/biomes/BiomeGenAlpsForest.java +++ b/common/biomesoplenty/biomes/BiomeGenAlpsForest.java @@ -7,7 +7,7 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.worldgen.WorldGenTaiga6; +import biomesoplenty.worldgen.tree.WorldGenTaiga6; public class BiomeGenAlpsForest extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenAutumnHills.java b/common/biomesoplenty/biomes/BiomeGenAutumnHills.java index 7805e6997..d44ba6246 100644 --- a/common/biomesoplenty/biomes/BiomeGenAutumnHills.java +++ b/common/biomesoplenty/biomes/BiomeGenAutumnHills.java @@ -7,9 +7,9 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.worldgen.WorldGenDeadTree; -import biomesoplenty.worldgen.WorldGenPersimmon; -import biomesoplenty.worldgen.WorldGenTaiga4; +import biomesoplenty.worldgen.tree.WorldGenDeadTree; +import biomesoplenty.worldgen.tree.WorldGenPersimmon; +import biomesoplenty.worldgen.tree.WorldGenTaiga4; public class BiomeGenAutumnHills extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenBadlands.java b/common/biomesoplenty/biomes/BiomeGenBadlands.java index fcc19c63a..bdd150e57 100644 --- a/common/biomesoplenty/biomes/BiomeGenBadlands.java +++ b/common/biomesoplenty/biomes/BiomeGenBadlands.java @@ -7,7 +7,7 @@ import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; public class BiomeGenBadlands extends BiomeGenBase { @@ -58,7 +58,7 @@ public class BiomeGenBadlands extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.Misc.skyColors) + if (BOPConfigurationMisc.skyColors) return 9814727; else { diff --git a/common/biomesoplenty/biomes/BiomeGenBambooForest.java b/common/biomesoplenty/biomes/BiomeGenBambooForest.java index f266a6c36..0d5edad9e 100644 --- a/common/biomesoplenty/biomes/BiomeGenBambooForest.java +++ b/common/biomesoplenty/biomes/BiomeGenBambooForest.java @@ -9,7 +9,7 @@ import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.worldgen.WorldGenBambooTree; +import biomesoplenty.worldgen.tree.WorldGenBambooTree; public class BiomeGenBambooForest extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenBayou.java b/common/biomesoplenty/biomes/BiomeGenBayou.java index be8e976e3..9db989090 100644 --- a/common/biomesoplenty/biomes/BiomeGenBayou.java +++ b/common/biomesoplenty/biomes/BiomeGenBayou.java @@ -10,11 +10,11 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPConfiguration; -import biomesoplenty.worldgen.WorldGenBayou1; -import biomesoplenty.worldgen.WorldGenBayou2; -import biomesoplenty.worldgen.WorldGenBayou3; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; import biomesoplenty.worldgen.WorldGenMoss; +import biomesoplenty.worldgen.tree.WorldGenBayou1; +import biomesoplenty.worldgen.tree.WorldGenBayou2; +import biomesoplenty.worldgen.tree.WorldGenBayou3; public class BiomeGenBayou extends BiomeGenBase { @@ -108,7 +108,7 @@ public class BiomeGenBayou extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.Misc.skyColors) + if (BOPConfigurationMisc.skyColors) return 11322556; else { diff --git a/common/biomesoplenty/biomes/BiomeGenBorealForest.java b/common/biomesoplenty/biomes/BiomeGenBorealForest.java index bf53fb2f5..c67231a3c 100644 --- a/common/biomesoplenty/biomes/BiomeGenBorealForest.java +++ b/common/biomesoplenty/biomes/BiomeGenBorealForest.java @@ -10,9 +10,9 @@ import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; -import biomesoplenty.worldgen.WorldGenAutumn; -import biomesoplenty.worldgen.WorldGenRainforestTree1; -import biomesoplenty.worldgen.WorldGenTaiga10; +import biomesoplenty.worldgen.tree.WorldGenAutumn; +import biomesoplenty.worldgen.tree.WorldGenRainforestTree1; +import biomesoplenty.worldgen.tree.WorldGenTaiga10; public class BiomeGenBorealForest extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenCanyon.java b/common/biomesoplenty/biomes/BiomeGenCanyon.java index 04e315bb4..95088e632 100644 --- a/common/biomesoplenty/biomes/BiomeGenCanyon.java +++ b/common/biomesoplenty/biomes/BiomeGenCanyon.java @@ -8,7 +8,7 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; import biomesoplenty.worldgen.WorldGenCanyonShrub; -import biomesoplenty.worldgen.WorldGenPineTree; +import biomesoplenty.worldgen.tree.WorldGenPineTree; public class BiomeGenCanyon extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenCanyonRavine.java b/common/biomesoplenty/biomes/BiomeGenCanyonRavine.java index 1f95cdd43..a933cfb15 100644 --- a/common/biomesoplenty/biomes/BiomeGenCanyonRavine.java +++ b/common/biomesoplenty/biomes/BiomeGenCanyonRavine.java @@ -8,7 +8,7 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; import biomesoplenty.worldgen.WorldGenCanyonShrub; -import biomesoplenty.worldgen.WorldGenPineTree; +import biomesoplenty.worldgen.tree.WorldGenPineTree; public class BiomeGenCanyonRavine extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenCherryBlossomGrove.java b/common/biomesoplenty/biomes/BiomeGenCherryBlossomGrove.java index f2c794d28..8504aa287 100644 --- a/common/biomesoplenty/biomes/BiomeGenCherryBlossomGrove.java +++ b/common/biomesoplenty/biomes/BiomeGenCherryBlossomGrove.java @@ -6,8 +6,8 @@ import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; -import biomesoplenty.worldgen.WorldGenCherry1; -import biomesoplenty.worldgen.WorldGenCherry2; +import biomesoplenty.worldgen.tree.WorldGenCherry1; +import biomesoplenty.worldgen.tree.WorldGenCherry2; public class BiomeGenCherryBlossomGrove extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenConiferousForest.java b/common/biomesoplenty/biomes/BiomeGenConiferousForest.java index 65411ce10..347db0440 100644 --- a/common/biomesoplenty/biomes/BiomeGenConiferousForest.java +++ b/common/biomesoplenty/biomes/BiomeGenConiferousForest.java @@ -10,13 +10,13 @@ import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPConfiguration; -import biomesoplenty.worldgen.WorldGenFir1; -import biomesoplenty.worldgen.WorldGenFir2; -import biomesoplenty.worldgen.WorldGenFir3; -import biomesoplenty.worldgen.WorldGenTaiga3; -import biomesoplenty.worldgen.WorldGenTaiga4; -import biomesoplenty.worldgen.WorldGenTaiga9; +import biomesoplenty.configuration.configfile.BOPConfigurationMain; +import biomesoplenty.worldgen.tree.WorldGenFir1; +import biomesoplenty.worldgen.tree.WorldGenFir2; +import biomesoplenty.worldgen.tree.WorldGenFir3; +import biomesoplenty.worldgen.tree.WorldGenTaiga3; +import biomesoplenty.worldgen.tree.WorldGenTaiga4; +import biomesoplenty.worldgen.tree.WorldGenTaiga9; public class BiomeGenConiferousForest extends BiomeGenBase { @@ -43,7 +43,7 @@ public class BiomeGenConiferousForest extends BiomeGenBase @Override public WorldGenerator getRandomWorldGenForTrees(Random par1Random) { - if (BOPConfiguration.Main.realisticTrees) + if (BOPConfigurationMain.realisticTrees) { return par1Random.nextInt(5) == 0 ? new WorldGenFir1() : (par1Random.nextInt(3) == 0 ? new WorldGenFir2() : new WorldGenFir3()); } diff --git a/common/biomesoplenty/biomes/BiomeGenConiferousForestSnow.java b/common/biomesoplenty/biomes/BiomeGenConiferousForestSnow.java index 1d6b7752f..d976781e0 100644 --- a/common/biomesoplenty/biomes/BiomeGenConiferousForestSnow.java +++ b/common/biomesoplenty/biomes/BiomeGenConiferousForestSnow.java @@ -8,9 +8,9 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.worldgen.WorldGenTaiga3; -import biomesoplenty.worldgen.WorldGenTaiga4; -import biomesoplenty.worldgen.WorldGenTaiga9; +import biomesoplenty.worldgen.tree.WorldGenTaiga3; +import biomesoplenty.worldgen.tree.WorldGenTaiga4; +import biomesoplenty.worldgen.tree.WorldGenTaiga9; public class BiomeGenConiferousForestSnow extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenCrag.java b/common/biomesoplenty/biomes/BiomeGenCrag.java index be929cfd4..b6761b01f 100644 --- a/common/biomesoplenty/biomes/BiomeGenCrag.java +++ b/common/biomesoplenty/biomes/BiomeGenCrag.java @@ -7,7 +7,7 @@ import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; public class BiomeGenCrag extends BiomeGenBase { @@ -52,7 +52,7 @@ public class BiomeGenCrag extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.Misc.skyColors) + if (BOPConfigurationMisc.skyColors) return 4944498; else { diff --git a/common/biomesoplenty/biomes/BiomeGenDeadForest.java b/common/biomesoplenty/biomes/BiomeGenDeadForest.java index 28ddd6976..84c1bf9ae 100644 --- a/common/biomesoplenty/biomes/BiomeGenDeadForest.java +++ b/common/biomesoplenty/biomes/BiomeGenDeadForest.java @@ -8,10 +8,10 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPConfiguration; -import biomesoplenty.worldgen.WorldGenDeadTree; -import biomesoplenty.worldgen.WorldGenDeadTree2; -import biomesoplenty.worldgen.WorldGenTaiga5; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; +import biomesoplenty.worldgen.tree.WorldGenDeadTree; +import biomesoplenty.worldgen.tree.WorldGenDeadTree2; +import biomesoplenty.worldgen.tree.WorldGenTaiga5; public class BiomeGenDeadForest extends BiomeGenBase { @@ -68,7 +68,7 @@ public class BiomeGenDeadForest extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.Misc.skyColors) + if (BOPConfigurationMisc.skyColors) return 9873591; else { diff --git a/common/biomesoplenty/biomes/BiomeGenDeadForestSnow.java b/common/biomesoplenty/biomes/BiomeGenDeadForestSnow.java index 6c077841c..c60d877fd 100644 --- a/common/biomesoplenty/biomes/BiomeGenDeadForestSnow.java +++ b/common/biomesoplenty/biomes/BiomeGenDeadForestSnow.java @@ -9,10 +9,10 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPConfiguration; -import biomesoplenty.worldgen.WorldGenDeadTree; -import biomesoplenty.worldgen.WorldGenDeadTree2; -import biomesoplenty.worldgen.WorldGenTaiga5; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; +import biomesoplenty.worldgen.tree.WorldGenDeadTree; +import biomesoplenty.worldgen.tree.WorldGenDeadTree2; +import biomesoplenty.worldgen.tree.WorldGenTaiga5; public class BiomeGenDeadForestSnow extends BiomeGenBase { @@ -90,7 +90,7 @@ public class BiomeGenDeadForestSnow extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.Misc.skyColors) + if (BOPConfigurationMisc.skyColors) return 9873591; else { diff --git a/common/biomesoplenty/biomes/BiomeGenDeadSwamp.java b/common/biomesoplenty/biomes/BiomeGenDeadSwamp.java index 9ee6ae41e..2ac440355 100644 --- a/common/biomesoplenty/biomes/BiomeGenDeadSwamp.java +++ b/common/biomesoplenty/biomes/BiomeGenDeadSwamp.java @@ -9,8 +9,8 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPConfiguration; -import biomesoplenty.worldgen.WorldGenDeadTree; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; +import biomesoplenty.worldgen.tree.WorldGenDeadTree; public class BiomeGenDeadSwamp extends BiomeGenBase { @@ -95,7 +95,7 @@ public class BiomeGenDeadSwamp extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.Misc.skyColors) + if (BOPConfigurationMisc.skyColors) return 6451816; else { diff --git a/common/biomesoplenty/biomes/BiomeGenDeadlands.java b/common/biomesoplenty/biomes/BiomeGenDeadlands.java index 038e585d8..9ab450dab 100644 --- a/common/biomesoplenty/biomes/BiomeGenDeadlands.java +++ b/common/biomesoplenty/biomes/BiomeGenDeadlands.java @@ -12,7 +12,7 @@ import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenMinable; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; import biomesoplenty.worldgen.WorldGenDeadlands; public class BiomeGenDeadlands extends BiomeGenBase @@ -78,7 +78,7 @@ public class BiomeGenDeadlands extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.Misc.skyColors) + if (BOPConfigurationMisc.skyColors) return 4464929; else { diff --git a/common/biomesoplenty/biomes/BiomeGenDeciduousForest.java b/common/biomesoplenty/biomes/BiomeGenDeciduousForest.java index 3b1d6c6f7..f140f88b1 100644 --- a/common/biomesoplenty/biomes/BiomeGenDeciduousForest.java +++ b/common/biomesoplenty/biomes/BiomeGenDeciduousForest.java @@ -9,7 +9,7 @@ import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.worldgen.WorldGenDeciduous; +import biomesoplenty.worldgen.tree.WorldGenDeciduous; public class BiomeGenDeciduousForest extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenFen.java b/common/biomesoplenty/biomes/BiomeGenFen.java index 364c6786b..3ff5dc44a 100644 --- a/common/biomesoplenty/biomes/BiomeGenFen.java +++ b/common/biomesoplenty/biomes/BiomeGenFen.java @@ -10,10 +10,10 @@ import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.worldgen.WorldGenDeadTree; -import biomesoplenty.worldgen.WorldGenFen1; -import biomesoplenty.worldgen.WorldGenFen2; import biomesoplenty.worldgen.WorldGenMoss; +import biomesoplenty.worldgen.tree.WorldGenDeadTree; +import biomesoplenty.worldgen.tree.WorldGenFen1; +import biomesoplenty.worldgen.tree.WorldGenFen2; public class BiomeGenFen extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenFieldForest.java b/common/biomesoplenty/biomes/BiomeGenFieldForest.java index fdec4627a..1d151f5e9 100644 --- a/common/biomesoplenty/biomes/BiomeGenFieldForest.java +++ b/common/biomesoplenty/biomes/BiomeGenFieldForest.java @@ -9,7 +9,7 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.worldgen.WorldGenPineTree; +import biomesoplenty.worldgen.tree.WorldGenPineTree; public class BiomeGenFieldForest extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenFrostForest.java b/common/biomesoplenty/biomes/BiomeGenFrostForest.java index ff093ac0b..8cdd8f7a9 100644 --- a/common/biomesoplenty/biomes/BiomeGenFrostForest.java +++ b/common/biomesoplenty/biomes/BiomeGenFrostForest.java @@ -8,7 +8,7 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; public class BiomeGenFrostForest extends BiomeGenBase { @@ -79,7 +79,7 @@ public class BiomeGenFrostForest extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.Misc.skyColors) + if (BOPConfigurationMisc.skyColors) return 13557994; else { diff --git a/common/biomesoplenty/biomes/BiomeGenFungiForest.java b/common/biomesoplenty/biomes/BiomeGenFungiForest.java index d585a418b..a065d7d96 100644 --- a/common/biomesoplenty/biomes/BiomeGenFungiForest.java +++ b/common/biomesoplenty/biomes/BiomeGenFungiForest.java @@ -11,11 +11,11 @@ import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; import biomesoplenty.worldgen.WorldGenFungi; import biomesoplenty.worldgen.WorldGenMoss; -import biomesoplenty.worldgen.WorldGenThickTree2; -import biomesoplenty.worldgen.WorldGenThickTree3; +import biomesoplenty.worldgen.tree.WorldGenThickTree2; +import biomesoplenty.worldgen.tree.WorldGenThickTree3; public class BiomeGenFungiForest extends BiomeGenBase { @@ -109,7 +109,7 @@ public class BiomeGenFungiForest extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.Misc.skyColors) + if (BOPConfigurationMisc.skyColors) return 5888980; else { diff --git a/common/biomesoplenty/biomes/BiomeGenHotSprings.java b/common/biomesoplenty/biomes/BiomeGenHotSprings.java index b637bdf39..e3eaf65c5 100644 --- a/common/biomesoplenty/biomes/BiomeGenHotSprings.java +++ b/common/biomesoplenty/biomes/BiomeGenHotSprings.java @@ -7,8 +7,8 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.worldgen.WorldGenPineTree; -import biomesoplenty.worldgen.WorldGenTaiga6; +import biomesoplenty.worldgen.tree.WorldGenPineTree; +import biomesoplenty.worldgen.tree.WorldGenTaiga6; public class BiomeGenHotSprings extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenIcyHills.java b/common/biomesoplenty/biomes/BiomeGenIcyHills.java index 675fde74c..6ddb761fe 100644 --- a/common/biomesoplenty/biomes/BiomeGenIcyHills.java +++ b/common/biomesoplenty/biomes/BiomeGenIcyHills.java @@ -10,8 +10,8 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPConfiguration; -import biomesoplenty.worldgen.WorldGenIceTree; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; +import biomesoplenty.worldgen.tree.WorldGenIceTree; public class BiomeGenIcyHills extends BiomeGenBase { @@ -67,7 +67,7 @@ public class BiomeGenIcyHills extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.Misc.skyColors) + if (BOPConfigurationMisc.skyColors) return 16777215; else { diff --git a/common/biomesoplenty/biomes/BiomeGenJadeCliffs.java b/common/biomesoplenty/biomes/BiomeGenJadeCliffs.java index bee03e220..da6a182c0 100644 --- a/common/biomesoplenty/biomes/BiomeGenJadeCliffs.java +++ b/common/biomesoplenty/biomes/BiomeGenJadeCliffs.java @@ -8,8 +8,8 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenerator; -import biomesoplenty.configuration.BOPConfiguration; -import biomesoplenty.worldgen.WorldGenPineTree; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; +import biomesoplenty.worldgen.tree.WorldGenPineTree; public class BiomeGenJadeCliffs extends BiomeGenBase { @@ -60,7 +60,7 @@ public class BiomeGenJadeCliffs extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.Misc.skyColors) + if (BOPConfigurationMisc.skyColors) return 12045485; else { diff --git a/common/biomesoplenty/biomes/BiomeGenLushDesert.java b/common/biomesoplenty/biomes/BiomeGenLushDesert.java index 30e6a9384..e340c36f6 100644 --- a/common/biomesoplenty/biomes/BiomeGenLushDesert.java +++ b/common/biomesoplenty/biomes/BiomeGenLushDesert.java @@ -10,8 +10,8 @@ import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.worldgen.WorldGenAcacia; -import biomesoplenty.worldgen.WorldGenDeadTree3; +import biomesoplenty.worldgen.tree.WorldGenAcacia; +import biomesoplenty.worldgen.tree.WorldGenDeadTree3; public class BiomeGenLushDesert extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenLushSwamp.java b/common/biomesoplenty/biomes/BiomeGenLushSwamp.java index d757f9a1d..5b4e74d5d 100644 --- a/common/biomesoplenty/biomes/BiomeGenLushSwamp.java +++ b/common/biomesoplenty/biomes/BiomeGenLushSwamp.java @@ -9,7 +9,7 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.worldgen.WorldGenSwampTall; +import biomesoplenty.worldgen.tree.WorldGenSwampTall; public class BiomeGenLushSwamp extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenMangrove.java b/common/biomesoplenty/biomes/BiomeGenMangrove.java index e2f3e843a..b57ccb534 100644 --- a/common/biomesoplenty/biomes/BiomeGenMangrove.java +++ b/common/biomesoplenty/biomes/BiomeGenMangrove.java @@ -7,8 +7,8 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.worldgen.WorldGenMangrove; -import biomesoplenty.worldgen.WorldGenMangrove2; +import biomesoplenty.worldgen.tree.WorldGenMangrove; +import biomesoplenty.worldgen.tree.WorldGenMangrove2; public class BiomeGenMangrove extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenMapleWoods.java b/common/biomesoplenty/biomes/BiomeGenMapleWoods.java index 87449fffb..6703ef035 100644 --- a/common/biomesoplenty/biomes/BiomeGenMapleWoods.java +++ b/common/biomesoplenty/biomes/BiomeGenMapleWoods.java @@ -6,8 +6,8 @@ import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; -import biomesoplenty.worldgen.WorldGenMaple; -import biomesoplenty.worldgen.WorldGenTaiga5; +import biomesoplenty.worldgen.tree.WorldGenMaple; +import biomesoplenty.worldgen.tree.WorldGenTaiga5; public class BiomeGenMapleWoods extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenMesa.java b/common/biomesoplenty/biomes/BiomeGenMesa.java index c561f9cf0..96e260c68 100644 --- a/common/biomesoplenty/biomes/BiomeGenMesa.java +++ b/common/biomesoplenty/biomes/BiomeGenMesa.java @@ -9,7 +9,7 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; public class BiomeGenMesa extends BiomeGenBase { @@ -57,7 +57,7 @@ public class BiomeGenMesa extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.Misc.skyColors) + if (BOPConfigurationMisc.skyColors) return 15898486; else { diff --git a/common/biomesoplenty/biomes/BiomeGenMoor.java b/common/biomesoplenty/biomes/BiomeGenMoor.java index b9d3f8d6e..e393c9245 100644 --- a/common/biomesoplenty/biomes/BiomeGenMoor.java +++ b/common/biomesoplenty/biomes/BiomeGenMoor.java @@ -9,7 +9,7 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; public class BiomeGenMoor extends BiomeGenBase { @@ -99,7 +99,7 @@ public class BiomeGenMoor extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.Misc.skyColors) + if (BOPConfigurationMisc.skyColors) return 10536403; else { diff --git a/common/biomesoplenty/biomes/BiomeGenMountain.java b/common/biomesoplenty/biomes/BiomeGenMountain.java index 859df1512..cb1ebd662 100644 --- a/common/biomesoplenty/biomes/BiomeGenMountain.java +++ b/common/biomesoplenty/biomes/BiomeGenMountain.java @@ -6,10 +6,10 @@ import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; -import biomesoplenty.configuration.BOPConfiguration; -import biomesoplenty.worldgen.WorldGenPineTree; -import biomesoplenty.worldgen.WorldGenRealPineTree; -import biomesoplenty.worldgen.WorldGenRealPineTree2; +import biomesoplenty.configuration.configfile.BOPConfigurationMain; +import biomesoplenty.worldgen.realtree.WorldGenRealPineTree; +import biomesoplenty.worldgen.realtree.WorldGenRealPineTree2; +import biomesoplenty.worldgen.tree.WorldGenPineTree; public class BiomeGenMountain extends BiomeGenBase { @@ -31,7 +31,7 @@ public class BiomeGenMountain extends BiomeGenBase @Override public WorldGenerator getRandomWorldGenForTrees(Random par1Random) { - if (BOPConfiguration.Main.realisticTrees) + if (BOPConfigurationMain.realisticTrees) { return par1Random.nextInt(4) == 0 ? new WorldGenRealPineTree2() : (par1Random.nextInt(6) == 0 ? new WorldGenRealPineTree() : worldGeneratorTrees); } diff --git a/common/biomesoplenty/biomes/BiomeGenMysticGrove.java b/common/biomesoplenty/biomes/BiomeGenMysticGrove.java index c4ad31c65..fc121d248 100644 --- a/common/biomesoplenty/biomes/BiomeGenMysticGrove.java +++ b/common/biomesoplenty/biomes/BiomeGenMysticGrove.java @@ -9,11 +9,12 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; -import biomesoplenty.configuration.BOPConfiguration; -import biomesoplenty.worldgen.WorldGenMystic1; -import biomesoplenty.worldgen.WorldGenMystic2; -import biomesoplenty.worldgen.WorldGenRealMagic; -import biomesoplenty.worldgen.WorldGenSwampTall; +import biomesoplenty.configuration.configfile.BOPConfigurationMain; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; +import biomesoplenty.worldgen.realtree.WorldGenRealMagic; +import biomesoplenty.worldgen.tree.WorldGenMystic1; +import biomesoplenty.worldgen.tree.WorldGenMystic2; +import biomesoplenty.worldgen.tree.WorldGenSwampTall; public class BiomeGenMysticGrove extends BiomeGenBase { @@ -25,7 +26,7 @@ public class BiomeGenMysticGrove extends BiomeGenBase super(par1); theBiomeDecorator = new BiomeDecoratorBOP(this); customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator; - if (BOPConfiguration.Main.realisticTrees) + if (BOPConfigurationMain.realisticTrees) { customBiomeDecorator.treesPerChunk = 1; } @@ -61,7 +62,7 @@ public class BiomeGenMysticGrove extends BiomeGenBase @Override public WorldGenerator getRandomWorldGenForTrees(Random par1Random) { - if (BOPConfiguration.Main.realisticTrees) + if (BOPConfigurationMain.realisticTrees) { return new WorldGenRealMagic(); } @@ -102,7 +103,7 @@ public class BiomeGenMysticGrove extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.Misc.skyColors) + if (BOPConfigurationMisc.skyColors) return 16751558; else { diff --git a/common/biomesoplenty/biomes/BiomeGenOasis.java b/common/biomesoplenty/biomes/BiomeGenOasis.java index 76252781e..e70803450 100644 --- a/common/biomesoplenty/biomes/BiomeGenOasis.java +++ b/common/biomesoplenty/biomes/BiomeGenOasis.java @@ -7,7 +7,7 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.worldgen.WorldGenPalmTree3; +import biomesoplenty.worldgen.tree.WorldGenPalmTree3; public class BiomeGenOasis extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenOminousWoods.java b/common/biomesoplenty/biomes/BiomeGenOminousWoods.java index ebcf14fb6..c688b3c51 100644 --- a/common/biomesoplenty/biomes/BiomeGenOminousWoods.java +++ b/common/biomesoplenty/biomes/BiomeGenOminousWoods.java @@ -11,9 +11,9 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; -import biomesoplenty.configuration.BOPConfiguration; -import biomesoplenty.worldgen.WorldGenOminous1; -import biomesoplenty.worldgen.WorldGenOminous2; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; +import biomesoplenty.worldgen.tree.WorldGenOminous1; +import biomesoplenty.worldgen.tree.WorldGenOminous2; public class BiomeGenOminousWoods extends BiomeGenBase { @@ -88,7 +88,7 @@ public class BiomeGenOminousWoods extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.Misc.skyColors) + if (BOPConfigurationMisc.skyColors) return 5069168; else { diff --git a/common/biomesoplenty/biomes/BiomeGenOminousWoodsThick.java b/common/biomesoplenty/biomes/BiomeGenOminousWoodsThick.java index 50574836d..561ef9472 100644 --- a/common/biomesoplenty/biomes/BiomeGenOminousWoodsThick.java +++ b/common/biomesoplenty/biomes/BiomeGenOminousWoodsThick.java @@ -12,10 +12,10 @@ import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPConfiguration; -import biomesoplenty.worldgen.WorldGenOminous1; -import biomesoplenty.worldgen.WorldGenOminous3; -import biomesoplenty.worldgen.WorldGenOminous4; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; +import biomesoplenty.worldgen.tree.WorldGenOminous1; +import biomesoplenty.worldgen.tree.WorldGenOminous3; +import biomesoplenty.worldgen.tree.WorldGenOminous4; public class BiomeGenOminousWoodsThick extends BiomeGenBase { @@ -92,7 +92,7 @@ public class BiomeGenOminousWoodsThick extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.Misc.skyColors) + if (BOPConfigurationMisc.skyColors) return 5069168; else { diff --git a/common/biomesoplenty/biomes/BiomeGenOrchard.java b/common/biomesoplenty/biomes/BiomeGenOrchard.java index cd3dc8a6f..01c4f8be8 100644 --- a/common/biomesoplenty/biomes/BiomeGenOrchard.java +++ b/common/biomesoplenty/biomes/BiomeGenOrchard.java @@ -9,7 +9,7 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.worldgen.WorldGenApple; +import biomesoplenty.worldgen.tree.WorldGenApple; public class BiomeGenOrchard extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenOriginValley.java b/common/biomesoplenty/biomes/BiomeGenOriginValley.java index 1b497737c..1f4387f3d 100644 --- a/common/biomesoplenty/biomes/BiomeGenOriginValley.java +++ b/common/biomesoplenty/biomes/BiomeGenOriginValley.java @@ -6,8 +6,8 @@ import java.util.Random; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPConfiguration; -import biomesoplenty.worldgen.WorldGenOriginTree; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; +import biomesoplenty.worldgen.tree.WorldGenOriginTree; public class BiomeGenOriginValley extends BiomeGenBase { @@ -60,7 +60,7 @@ public class BiomeGenOriginValley extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.Misc.skyColors) + if (BOPConfigurationMisc.skyColors) return 8441086; else { diff --git a/common/biomesoplenty/biomes/BiomeGenOutback.java b/common/biomesoplenty/biomes/BiomeGenOutback.java index 5fe922d77..103443015 100644 --- a/common/biomesoplenty/biomes/BiomeGenOutback.java +++ b/common/biomesoplenty/biomes/BiomeGenOutback.java @@ -8,7 +8,7 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; import biomesoplenty.worldgen.WorldGenOutbackShrub; -import biomesoplenty.worldgen.WorldGenOutbackTree; +import biomesoplenty.worldgen.tree.WorldGenOutbackTree; public class BiomeGenOutback extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenOvergrownGreens.java b/common/biomesoplenty/biomes/BiomeGenOvergrownGreens.java index d0cf616da..dbd9be5c8 100644 --- a/common/biomesoplenty/biomes/BiomeGenOvergrownGreens.java +++ b/common/biomesoplenty/biomes/BiomeGenOvergrownGreens.java @@ -9,8 +9,8 @@ import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; import biomesoplenty.worldgen.WorldGenIvy; -import biomesoplenty.worldgen.WorldGenLargeTree; -import biomesoplenty.worldgen.WorldGenOvergrownTree; +import biomesoplenty.worldgen.tree.WorldGenLargeTree; +import biomesoplenty.worldgen.tree.WorldGenOvergrownTree; public class BiomeGenOvergrownGreens extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenQuagmire.java b/common/biomesoplenty/biomes/BiomeGenQuagmire.java index 0e557e476..b3e0d7d3d 100644 --- a/common/biomesoplenty/biomes/BiomeGenQuagmire.java +++ b/common/biomesoplenty/biomes/BiomeGenQuagmire.java @@ -8,8 +8,8 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPConfiguration; -import biomesoplenty.worldgen.WorldGenDeadTree; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; +import biomesoplenty.worldgen.tree.WorldGenDeadTree; public class BiomeGenQuagmire extends BiomeGenBase { @@ -86,7 +86,7 @@ public class BiomeGenQuagmire extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.Misc.skyColors) + if (BOPConfigurationMisc.skyColors) return 12436670; else { diff --git a/common/biomesoplenty/biomes/BiomeGenRainforest.java b/common/biomesoplenty/biomes/BiomeGenRainforest.java index 3394257c2..f94d19d2b 100644 --- a/common/biomesoplenty/biomes/BiomeGenRainforest.java +++ b/common/biomesoplenty/biomes/BiomeGenRainforest.java @@ -11,7 +11,7 @@ import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; import biomesoplenty.entities.EntityJungleSpider; -import biomesoplenty.worldgen.WorldGenRainforestTree1; +import biomesoplenty.worldgen.tree.WorldGenRainforestTree1; public class BiomeGenRainforest extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenRedwoodForest.java b/common/biomesoplenty/biomes/BiomeGenRedwoodForest.java index 8824660e9..68bacbb04 100644 --- a/common/biomesoplenty/biomes/BiomeGenRedwoodForest.java +++ b/common/biomesoplenty/biomes/BiomeGenRedwoodForest.java @@ -8,11 +8,11 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; -import biomesoplenty.configuration.BOPConfiguration; -import biomesoplenty.worldgen.WorldGenRealRedwood; -import biomesoplenty.worldgen.WorldGenRealRedwood2; -import biomesoplenty.worldgen.WorldGenRedwoodTree; -import biomesoplenty.worldgen.WorldGenRedwoodTree2; +import biomesoplenty.configuration.configfile.BOPConfigurationMain; +import biomesoplenty.worldgen.realtree.WorldGenRealRedwood; +import biomesoplenty.worldgen.realtree.WorldGenRealRedwood2; +import biomesoplenty.worldgen.tree.WorldGenRedwoodTree; +import biomesoplenty.worldgen.tree.WorldGenRedwoodTree2; public class BiomeGenRedwoodForest extends BiomeGenBase { @@ -36,7 +36,7 @@ public class BiomeGenRedwoodForest extends BiomeGenBase @Override public WorldGenerator getRandomWorldGenForTrees(Random par1Random) { - if (BOPConfiguration.Main.realisticTrees) + if (BOPConfigurationMain.realisticTrees) { return par1Random.nextInt(4) == 0 ? new WorldGenRealRedwood() : (par1Random.nextInt(2) == 0 ? new WorldGenShrub(0,0) : new WorldGenRealRedwood2()); } diff --git a/common/biomesoplenty/biomes/BiomeGenSacredSprings.java b/common/biomesoplenty/biomes/BiomeGenSacredSprings.java index ce9126800..41a35af0b 100644 --- a/common/biomesoplenty/biomes/BiomeGenSacredSprings.java +++ b/common/biomesoplenty/biomes/BiomeGenSacredSprings.java @@ -10,7 +10,7 @@ import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; import biomesoplenty.entities.EntityJungleSpider; public class BiomeGenSacredSprings extends BiomeGenBase @@ -100,7 +100,7 @@ public class BiomeGenSacredSprings extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.Misc.skyColors) + if (BOPConfigurationMisc.skyColors) return 1995007; else { diff --git a/common/biomesoplenty/biomes/BiomeGenSavanna.java b/common/biomesoplenty/biomes/BiomeGenSavanna.java index 414108237..e6a080787 100644 --- a/common/biomesoplenty/biomes/BiomeGenSavanna.java +++ b/common/biomesoplenty/biomes/BiomeGenSavanna.java @@ -9,7 +9,7 @@ import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.worldgen.WorldGenAcacia; +import biomesoplenty.worldgen.tree.WorldGenAcacia; public class BiomeGenSavanna extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenSavannaPlateau.java b/common/biomesoplenty/biomes/BiomeGenSavannaPlateau.java index 9344ff697..1e4d333b0 100644 --- a/common/biomesoplenty/biomes/BiomeGenSavannaPlateau.java +++ b/common/biomesoplenty/biomes/BiomeGenSavannaPlateau.java @@ -9,7 +9,7 @@ import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.worldgen.WorldGenAcacia; +import biomesoplenty.worldgen.tree.WorldGenAcacia; public class BiomeGenSavannaPlateau extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenSeasonalForest.java b/common/biomesoplenty/biomes/BiomeGenSeasonalForest.java index 0c5d965f4..19a8efe73 100644 --- a/common/biomesoplenty/biomes/BiomeGenSeasonalForest.java +++ b/common/biomesoplenty/biomes/BiomeGenSeasonalForest.java @@ -10,12 +10,12 @@ import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.worldgen.WorldGenAutumn; -import biomesoplenty.worldgen.WorldGenAutumn2; -import biomesoplenty.worldgen.WorldGenAutumn2Big; -import biomesoplenty.worldgen.WorldGenDeadTree2; -import biomesoplenty.worldgen.WorldGenMaple; -import biomesoplenty.worldgen.WorldGenMapleBig; +import biomesoplenty.worldgen.tree.WorldGenAutumn; +import biomesoplenty.worldgen.tree.WorldGenAutumn2; +import biomesoplenty.worldgen.tree.WorldGenAutumn2Big; +import biomesoplenty.worldgen.tree.WorldGenDeadTree2; +import biomesoplenty.worldgen.tree.WorldGenMaple; +import biomesoplenty.worldgen.tree.WorldGenMapleBig; public class BiomeGenSeasonalForest extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenSeasonalSpruceForest.java b/common/biomesoplenty/biomes/BiomeGenSeasonalSpruceForest.java index 16d824970..df3ef931b 100644 --- a/common/biomesoplenty/biomes/BiomeGenSeasonalSpruceForest.java +++ b/common/biomesoplenty/biomes/BiomeGenSeasonalSpruceForest.java @@ -10,12 +10,12 @@ import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.worldgen.WorldGenAutumn; -import biomesoplenty.worldgen.WorldGenAutumn2; -import biomesoplenty.worldgen.WorldGenDeadTree2; -import biomesoplenty.worldgen.WorldGenMaple; -import biomesoplenty.worldgen.WorldGenTaiga10; -import biomesoplenty.worldgen.WorldGenTaiga5; +import biomesoplenty.worldgen.tree.WorldGenAutumn; +import biomesoplenty.worldgen.tree.WorldGenAutumn2; +import biomesoplenty.worldgen.tree.WorldGenDeadTree2; +import biomesoplenty.worldgen.tree.WorldGenMaple; +import biomesoplenty.worldgen.tree.WorldGenTaiga10; +import biomesoplenty.worldgen.tree.WorldGenTaiga5; public class BiomeGenSeasonalSpruceForest extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenShield.java b/common/biomesoplenty/biomes/BiomeGenShield.java index da81369d8..521d6128c 100644 --- a/common/biomesoplenty/biomes/BiomeGenShield.java +++ b/common/biomesoplenty/biomes/BiomeGenShield.java @@ -7,9 +7,9 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenShrub; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.worldgen.WorldGenMoss; -import biomesoplenty.worldgen.WorldGenPineTree; -import biomesoplenty.worldgen.WorldGenTaiga5; -import biomesoplenty.worldgen.WorldGenTaiga9; +import biomesoplenty.worldgen.tree.WorldGenPineTree; +import biomesoplenty.worldgen.tree.WorldGenTaiga5; +import biomesoplenty.worldgen.tree.WorldGenTaiga9; public class BiomeGenShield extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenSilkglades.java b/common/biomesoplenty/biomes/BiomeGenSilkglades.java index 40e8c0ce7..ae72a4c67 100644 --- a/common/biomesoplenty/biomes/BiomeGenSilkglades.java +++ b/common/biomesoplenty/biomes/BiomeGenSilkglades.java @@ -11,11 +11,11 @@ import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPConfiguration; -import biomesoplenty.worldgen.WorldGenBirchWillow; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; import biomesoplenty.worldgen.WorldGenCobwebNest; -import biomesoplenty.worldgen.WorldGenDeadTree; -import biomesoplenty.worldgen.WorldGenWillow; +import biomesoplenty.worldgen.tree.WorldGenBirchWillow; +import biomesoplenty.worldgen.tree.WorldGenDeadTree; +import biomesoplenty.worldgen.tree.WorldGenWillow; public class BiomeGenSilkglades extends BiomeGenBase { @@ -106,7 +106,7 @@ public class BiomeGenSilkglades extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.Misc.skyColors) + if (BOPConfigurationMisc.skyColors) return 13553096; else { diff --git a/common/biomesoplenty/biomes/BiomeGenSludgepit.java b/common/biomesoplenty/biomes/BiomeGenSludgepit.java index ef83f81cf..01ecc90ef 100644 --- a/common/biomesoplenty/biomes/BiomeGenSludgepit.java +++ b/common/biomesoplenty/biomes/BiomeGenSludgepit.java @@ -11,7 +11,7 @@ import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; import biomesoplenty.worldgen.WorldGenBog1; import biomesoplenty.worldgen.WorldGenBog2; @@ -103,7 +103,7 @@ public class BiomeGenSludgepit extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.Misc.skyColors) + if (BOPConfigurationMisc.skyColors) return 7039816; else { diff --git a/common/biomesoplenty/biomes/BiomeGenSpruceWoods.java b/common/biomesoplenty/biomes/BiomeGenSpruceWoods.java index 81d1ed65b..bdf113111 100644 --- a/common/biomesoplenty/biomes/BiomeGenSpruceWoods.java +++ b/common/biomesoplenty/biomes/BiomeGenSpruceWoods.java @@ -9,7 +9,7 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTaiga2; import net.minecraft.world.gen.feature.WorldGenerator; -import biomesoplenty.worldgen.WorldGenTaiga5; +import biomesoplenty.worldgen.tree.WorldGenTaiga5; public class BiomeGenSpruceWoods extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenTemperateRainforest.java b/common/biomesoplenty/biomes/BiomeGenTemperateRainforest.java index efee6fea2..6b6859a79 100644 --- a/common/biomesoplenty/biomes/BiomeGenTemperateRainforest.java +++ b/common/biomesoplenty/biomes/BiomeGenTemperateRainforest.java @@ -10,9 +10,9 @@ import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; import biomesoplenty.worldgen.WorldGenMoss; -import biomesoplenty.worldgen.WorldGenTemperate; -import biomesoplenty.worldgen.WorldGenThickTree; -import biomesoplenty.worldgen.WorldGenWillow; +import biomesoplenty.worldgen.tree.WorldGenTemperate; +import biomesoplenty.worldgen.tree.WorldGenThickTree; +import biomesoplenty.worldgen.tree.WorldGenWillow; public class BiomeGenTemperateRainforest extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenTimber.java b/common/biomesoplenty/biomes/BiomeGenTimber.java index ffbe5eb50..73bb1ed1b 100644 --- a/common/biomesoplenty/biomes/BiomeGenTimber.java +++ b/common/biomesoplenty/biomes/BiomeGenTimber.java @@ -10,7 +10,7 @@ import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; import biomesoplenty.worldgen.WorldGenChaparral2; import biomesoplenty.worldgen.WorldGenChaparral3; -import biomesoplenty.worldgen.WorldGenDeciduous2; +import biomesoplenty.worldgen.tree.WorldGenDeciduous2; public class BiomeGenTimber extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenTimberThin.java b/common/biomesoplenty/biomes/BiomeGenTimberThin.java index 2234b89ab..9200d623c 100644 --- a/common/biomesoplenty/biomes/BiomeGenTimberThin.java +++ b/common/biomesoplenty/biomes/BiomeGenTimberThin.java @@ -10,7 +10,7 @@ import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; import biomesoplenty.worldgen.WorldGenChaparral2; import biomesoplenty.worldgen.WorldGenChaparral3; -import biomesoplenty.worldgen.WorldGenDeciduous2; +import biomesoplenty.worldgen.tree.WorldGenDeciduous2; public class BiomeGenTimberThin extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenTropicalRainforest.java b/common/biomesoplenty/biomes/BiomeGenTropicalRainforest.java index 9ac2fe868..541fa6358 100644 --- a/common/biomesoplenty/biomes/BiomeGenTropicalRainforest.java +++ b/common/biomesoplenty/biomes/BiomeGenTropicalRainforest.java @@ -10,10 +10,10 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; import biomesoplenty.entities.EntityJungleSpider; -import biomesoplenty.worldgen.WorldGenRainforest1; -import biomesoplenty.worldgen.WorldGenRainforest2; +import biomesoplenty.worldgen.tree.WorldGenRainforest1; +import biomesoplenty.worldgen.tree.WorldGenRainforest2; public class BiomeGenTropicalRainforest extends BiomeGenBase { @@ -95,7 +95,7 @@ public class BiomeGenTropicalRainforest extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.Misc.skyColors) + if (BOPConfigurationMisc.skyColors) return 12971089; else { diff --git a/common/biomesoplenty/biomes/BiomeGenTropics.java b/common/biomesoplenty/biomes/BiomeGenTropics.java index ff1df80b3..061d0c885 100644 --- a/common/biomesoplenty/biomes/BiomeGenTropics.java +++ b/common/biomesoplenty/biomes/BiomeGenTropics.java @@ -9,10 +9,10 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; import biomesoplenty.entities.EntityJungleSpider; -import biomesoplenty.worldgen.WorldGenPalmTree1; -import biomesoplenty.worldgen.WorldGenPalmTree3; +import biomesoplenty.worldgen.tree.WorldGenPalmTree1; +import biomesoplenty.worldgen.tree.WorldGenPalmTree3; public class BiomeGenTropics extends BiomeGenBase { @@ -72,7 +72,7 @@ public class BiomeGenTropics extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.Misc.skyColors) + if (BOPConfigurationMisc.skyColors) return 3333631; else { diff --git a/common/biomesoplenty/biomes/BiomeGenVolcano.java b/common/biomesoplenty/biomes/BiomeGenVolcano.java index f40cdfdf5..7f3cdbbf7 100644 --- a/common/biomesoplenty/biomes/BiomeGenVolcano.java +++ b/common/biomesoplenty/biomes/BiomeGenVolcano.java @@ -6,7 +6,7 @@ import java.util.Random; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; import biomesoplenty.worldgen.WorldGenVolcano; public class BiomeGenVolcano extends BiomeGenBase @@ -43,7 +43,7 @@ public class BiomeGenVolcano extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.Misc.skyColors) + if (BOPConfigurationMisc.skyColors) return 8026746; else { diff --git a/common/biomesoplenty/biomes/BiomeGenWasteland.java b/common/biomesoplenty/biomes/BiomeGenWasteland.java index 318ee48b6..db1da8051 100644 --- a/common/biomesoplenty/biomes/BiomeGenWasteland.java +++ b/common/biomesoplenty/biomes/BiomeGenWasteland.java @@ -6,10 +6,10 @@ import java.util.Random; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPConfiguration; -import biomesoplenty.worldgen.WorldGenDeadTree3; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; import biomesoplenty.worldgen.WorldGenWasteland; import biomesoplenty.worldgen.WorldGenWasteland2; +import biomesoplenty.worldgen.tree.WorldGenDeadTree3; public class BiomeGenWasteland extends BiomeGenBase { @@ -63,7 +63,7 @@ public class BiomeGenWasteland extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.Misc.skyColors) + if (BOPConfigurationMisc.skyColors) return 10465942; else { diff --git a/common/biomesoplenty/biomes/BiomeGenWetland.java b/common/biomesoplenty/biomes/BiomeGenWetland.java index ba2804c68..51dd5ab95 100644 --- a/common/biomesoplenty/biomes/BiomeGenWetland.java +++ b/common/biomesoplenty/biomes/BiomeGenWetland.java @@ -11,8 +11,8 @@ import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; import biomesoplenty.worldgen.WorldGenMoss; -import biomesoplenty.worldgen.WorldGenTaiga5; -import biomesoplenty.worldgen.WorldGenWillow; +import biomesoplenty.worldgen.tree.WorldGenTaiga5; +import biomesoplenty.worldgen.tree.WorldGenWillow; public class BiomeGenWetland extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenBeachGravel.java b/common/biomesoplenty/biomes/beach/BiomeGenBeachGravel.java similarity index 93% rename from common/biomesoplenty/biomes/BiomeGenBeachGravel.java rename to common/biomesoplenty/biomes/beach/BiomeGenBeachGravel.java index 365211c8c..21b069fb0 100644 --- a/common/biomesoplenty/biomes/BiomeGenBeachGravel.java +++ b/common/biomesoplenty/biomes/beach/BiomeGenBeachGravel.java @@ -1,4 +1,4 @@ -package biomesoplenty.biomes; +package biomesoplenty.biomes.beach; import net.minecraft.block.Block; import net.minecraft.world.biome.BiomeGenBase; diff --git a/common/biomesoplenty/biomes/BiomeGenBeachOvergrown.java b/common/biomesoplenty/biomes/beach/BiomeGenBeachOvergrown.java similarity index 93% rename from common/biomesoplenty/biomes/BiomeGenBeachOvergrown.java rename to common/biomesoplenty/biomes/beach/BiomeGenBeachOvergrown.java index 888712c4a..0b5be5755 100644 --- a/common/biomesoplenty/biomes/BiomeGenBeachOvergrown.java +++ b/common/biomesoplenty/biomes/beach/BiomeGenBeachOvergrown.java @@ -1,10 +1,11 @@ -package biomesoplenty.biomes; +package biomesoplenty.biomes.beach; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; +import biomesoplenty.biomes.BiomeDecoratorBOP; import biomesoplenty.worldgen.WorldGenChaparral2; import biomesoplenty.worldgen.WorldGenChaparral3; diff --git a/common/biomesoplenty/biomes/BiomeGenNetherBase.java b/common/biomesoplenty/biomes/nether/BiomeGenNetherBase.java similarity index 92% rename from common/biomesoplenty/biomes/BiomeGenNetherBase.java rename to common/biomesoplenty/biomes/nether/BiomeGenNetherBase.java index 43427d47d..bca6675c0 100644 --- a/common/biomesoplenty/biomes/BiomeGenNetherBase.java +++ b/common/biomesoplenty/biomes/nether/BiomeGenNetherBase.java @@ -1,5 +1,6 @@ -package biomesoplenty.biomes; +package biomesoplenty.biomes.nether; +import biomesoplenty.biomes.BiomeDecoratorBOP; import net.minecraft.block.Block; import net.minecraft.entity.monster.EntityGhast; import net.minecraft.entity.monster.EntityMagmaCube; diff --git a/common/biomesoplenty/biomes/BiomeGenNetherBone.java b/common/biomesoplenty/biomes/nether/BiomeGenNetherBone.java similarity index 93% rename from common/biomesoplenty/biomes/BiomeGenNetherBone.java rename to common/biomesoplenty/biomes/nether/BiomeGenNetherBone.java index c7287ed1f..dc0097c3c 100644 --- a/common/biomesoplenty/biomes/BiomeGenNetherBone.java +++ b/common/biomesoplenty/biomes/nether/BiomeGenNetherBone.java @@ -1,5 +1,6 @@ -package biomesoplenty.biomes; +package biomesoplenty.biomes.nether; +import biomesoplenty.biomes.BiomeDecoratorBOP; import net.minecraft.block.Block; import net.minecraft.entity.monster.EntityGhast; import net.minecraft.entity.monster.EntityMagmaCube; diff --git a/common/biomesoplenty/biomes/BiomeGenNetherDesert.java b/common/biomesoplenty/biomes/nether/BiomeGenNetherDesert.java similarity index 93% rename from common/biomesoplenty/biomes/BiomeGenNetherDesert.java rename to common/biomesoplenty/biomes/nether/BiomeGenNetherDesert.java index 8555ee380..7ffe8c357 100644 --- a/common/biomesoplenty/biomes/BiomeGenNetherDesert.java +++ b/common/biomesoplenty/biomes/nether/BiomeGenNetherDesert.java @@ -1,5 +1,6 @@ -package biomesoplenty.biomes; +package biomesoplenty.biomes.nether; +import biomesoplenty.biomes.BiomeDecoratorBOP; import net.minecraft.block.Block; import net.minecraft.entity.monster.EntityGhast; import net.minecraft.entity.monster.EntityMagmaCube; diff --git a/common/biomesoplenty/biomes/BiomeGenNetherGarden.java b/common/biomesoplenty/biomes/nether/BiomeGenNetherGarden.java similarity index 95% rename from common/biomesoplenty/biomes/BiomeGenNetherGarden.java rename to common/biomesoplenty/biomes/nether/BiomeGenNetherGarden.java index 322b52f05..43894089d 100644 --- a/common/biomesoplenty/biomes/BiomeGenNetherGarden.java +++ b/common/biomesoplenty/biomes/nether/BiomeGenNetherGarden.java @@ -1,4 +1,4 @@ -package biomesoplenty.biomes; +package biomesoplenty.biomes.nether; import java.util.Random; @@ -9,6 +9,7 @@ import net.minecraft.entity.monster.EntityPigZombie; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenerator; +import biomesoplenty.biomes.BiomeDecoratorBOP; import biomesoplenty.worldgen.WorldGenNetherMushroom; public class BiomeGenNetherGarden extends BiomeGenBase diff --git a/common/biomesoplenty/biomes/BiomeGenNetherLava.java b/common/biomesoplenty/biomes/nether/BiomeGenNetherLava.java similarity index 96% rename from common/biomesoplenty/biomes/BiomeGenNetherLava.java rename to common/biomesoplenty/biomes/nether/BiomeGenNetherLava.java index 9c984f649..d0010b874 100644 --- a/common/biomesoplenty/biomes/BiomeGenNetherLava.java +++ b/common/biomesoplenty/biomes/nether/BiomeGenNetherLava.java @@ -1,4 +1,4 @@ -package biomesoplenty.biomes; +package biomesoplenty.biomes.nether; import java.util.Random; @@ -11,6 +11,7 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenFire; import net.minecraft.world.gen.feature.WorldGenerator; +import biomesoplenty.biomes.BiomeDecoratorBOP; import biomesoplenty.worldgen.WorldGenLavaSpring; public class BiomeGenNetherLava extends BiomeGenBase diff --git a/common/biomesoplenty/biomes/BiomeGenOceanAbyss.java b/common/biomesoplenty/biomes/ocean/BiomeGenOceanAbyss.java similarity index 92% rename from common/biomesoplenty/biomes/BiomeGenOceanAbyss.java rename to common/biomesoplenty/biomes/ocean/BiomeGenOceanAbyss.java index 248fedd76..ec5af62d3 100644 --- a/common/biomesoplenty/biomes/BiomeGenOceanAbyss.java +++ b/common/biomesoplenty/biomes/ocean/BiomeGenOceanAbyss.java @@ -1,4 +1,4 @@ -package biomesoplenty.biomes; +package biomesoplenty.biomes.ocean; import java.util.Random; @@ -6,6 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.Blocks; +import biomesoplenty.biomes.BiomeDecoratorBOP; public class BiomeGenOceanAbyss extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenOceanCoral.java b/common/biomesoplenty/biomes/ocean/BiomeGenOceanCoral.java similarity index 93% rename from common/biomesoplenty/biomes/BiomeGenOceanCoral.java rename to common/biomesoplenty/biomes/ocean/BiomeGenOceanCoral.java index 0d087ef4f..758c812f8 100644 --- a/common/biomesoplenty/biomes/BiomeGenOceanCoral.java +++ b/common/biomesoplenty/biomes/ocean/BiomeGenOceanCoral.java @@ -1,4 +1,4 @@ -package biomesoplenty.biomes; +package biomesoplenty.biomes.ocean; import java.util.Random; @@ -6,6 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.Blocks; +import biomesoplenty.biomes.BiomeDecoratorBOP; public class BiomeGenOceanCoral extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenOceanKelp.java b/common/biomesoplenty/biomes/ocean/BiomeGenOceanKelp.java similarity index 93% rename from common/biomesoplenty/biomes/BiomeGenOceanKelp.java rename to common/biomesoplenty/biomes/ocean/BiomeGenOceanKelp.java index b43f28100..b65d9e70b 100644 --- a/common/biomesoplenty/biomes/BiomeGenOceanKelp.java +++ b/common/biomesoplenty/biomes/ocean/BiomeGenOceanKelp.java @@ -1,4 +1,4 @@ -package biomesoplenty.biomes; +package biomesoplenty.biomes.ocean; import java.util.Random; @@ -6,6 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import biomesoplenty.api.Blocks; +import biomesoplenty.biomes.BiomeDecoratorBOP; public class BiomeGenOceanKelp extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenPromisedLandForest.java b/common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandForest.java similarity index 91% rename from common/biomesoplenty/biomes/BiomeGenPromisedLandForest.java rename to common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandForest.java index b6e1ffe0d..41a0ad199 100644 --- a/common/biomesoplenty/biomes/BiomeGenPromisedLandForest.java +++ b/common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandForest.java @@ -1,4 +1,4 @@ -package biomesoplenty.biomes; +package biomesoplenty.biomes.promisedland; import java.awt.Color; import java.util.Random; @@ -8,11 +8,12 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.biomes.BiomeDecoratorBOP; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; import biomesoplenty.worldgen.WorldGenPromisedShrub; -import biomesoplenty.worldgen.WorldGenPromisedTree; -import biomesoplenty.worldgen.WorldGenPromisedTree2; import biomesoplenty.worldgen.WorldGenWaterSpring; +import biomesoplenty.worldgen.tree.WorldGenPromisedTree; +import biomesoplenty.worldgen.tree.WorldGenPromisedTree2; public class BiomeGenPromisedLandForest extends BiomeGenBase { @@ -110,8 +111,8 @@ public class BiomeGenPromisedLandForest extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.Misc.skyColors) - return BOPConfiguration.Misc.promisedLandSkyColor; + if (BOPConfigurationMisc.skyColors) + return BOPConfigurationMisc.promisedLandSkyColor; else { par1 /= 3.0F; diff --git a/common/biomesoplenty/biomes/BiomeGenPromisedLandPlains.java b/common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandPlains.java similarity index 93% rename from common/biomesoplenty/biomes/BiomeGenPromisedLandPlains.java rename to common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandPlains.java index 2d42d2bdb..ce243da5f 100644 --- a/common/biomesoplenty/biomes/BiomeGenPromisedLandPlains.java +++ b/common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandPlains.java @@ -1,4 +1,4 @@ -package biomesoplenty.biomes; +package biomesoplenty.biomes.promisedland; import java.awt.Color; import java.util.Random; @@ -8,7 +8,8 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.biomes.BiomeDecoratorBOP; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; import biomesoplenty.worldgen.WorldGenPromisedBush; import biomesoplenty.worldgen.WorldGenWaterSpring; @@ -105,8 +106,8 @@ public class BiomeGenPromisedLandPlains extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.Misc.skyColors) - return BOPConfiguration.Misc.promisedLandSkyColor; + if (BOPConfigurationMisc.skyColors) + return BOPConfigurationMisc.promisedLandSkyColor; else { par1 /= 3.0F; diff --git a/common/biomesoplenty/biomes/BiomeGenPromisedLandSwamp.java b/common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandSwamp.java similarity index 90% rename from common/biomesoplenty/biomes/BiomeGenPromisedLandSwamp.java rename to common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandSwamp.java index 9db4eba68..8d9173f23 100644 --- a/common/biomesoplenty/biomes/BiomeGenPromisedLandSwamp.java +++ b/common/biomesoplenty/biomes/promisedland/BiomeGenPromisedLandSwamp.java @@ -1,4 +1,4 @@ -package biomesoplenty.biomes; +package biomesoplenty.biomes.promisedland; import java.awt.Color; import java.util.Random; @@ -8,10 +8,11 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPConfiguration; -import biomesoplenty.worldgen.WorldGenPromisedTree; -import biomesoplenty.worldgen.WorldGenPromisedWillowTree; +import biomesoplenty.biomes.BiomeDecoratorBOP; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; import biomesoplenty.worldgen.WorldGenWaterSpring; +import biomesoplenty.worldgen.tree.WorldGenPromisedTree; +import biomesoplenty.worldgen.tree.WorldGenPromisedWillowTree; public class BiomeGenPromisedLandSwamp extends BiomeGenBase { @@ -110,8 +111,8 @@ public class BiomeGenPromisedLandSwamp extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.Misc.skyColors) - return BOPConfiguration.Misc.promisedLandSkyColor; + if (BOPConfigurationMisc.skyColors) + return BOPConfigurationMisc.promisedLandSkyColor; else { par1 /= 3.0F; diff --git a/common/biomesoplenty/biomes/BiomeGenDesertNew.java b/common/biomesoplenty/biomes/vanilla/BiomeGenDesertNew.java similarity index 92% rename from common/biomesoplenty/biomes/BiomeGenDesertNew.java rename to common/biomesoplenty/biomes/vanilla/BiomeGenDesertNew.java index bbce35a69..a444a81e9 100644 --- a/common/biomesoplenty/biomes/BiomeGenDesertNew.java +++ b/common/biomesoplenty/biomes/vanilla/BiomeGenDesertNew.java @@ -1,4 +1,4 @@ -package biomesoplenty.biomes; +package biomesoplenty.biomes.vanilla; import java.awt.Color; import java.util.Random; @@ -8,7 +8,8 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenDesertWells; import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.biomes.BiomeDecoratorBOP; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; public class BiomeGenDesertNew extends BiomeGenBase { @@ -67,7 +68,7 @@ public class BiomeGenDesertNew extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.Misc.skyColors) + if (BOPConfigurationMisc.skyColors) return 13877903; else { diff --git a/common/biomesoplenty/biomes/BiomeGenForestNew.java b/common/biomesoplenty/biomes/vanilla/BiomeGenForestNew.java similarity index 96% rename from common/biomesoplenty/biomes/BiomeGenForestNew.java rename to common/biomesoplenty/biomes/vanilla/BiomeGenForestNew.java index dc4a5124c..d231e3b49 100644 --- a/common/biomesoplenty/biomes/BiomeGenForestNew.java +++ b/common/biomesoplenty/biomes/vanilla/BiomeGenForestNew.java @@ -1,4 +1,4 @@ -package biomesoplenty.biomes; +package biomesoplenty.biomes.vanilla; import java.util.Random; @@ -8,6 +8,7 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenerator; +import biomesoplenty.biomes.BiomeDecoratorBOP; import biomesoplenty.worldgen.WorldGenMoss; public class BiomeGenForestNew extends BiomeGenBase diff --git a/common/biomesoplenty/biomes/BiomeGenHillsNew.java b/common/biomesoplenty/biomes/vanilla/BiomeGenHillsNew.java similarity index 92% rename from common/biomesoplenty/biomes/BiomeGenHillsNew.java rename to common/biomesoplenty/biomes/vanilla/BiomeGenHillsNew.java index 8db5b0ac1..3757cc287 100644 --- a/common/biomesoplenty/biomes/BiomeGenHillsNew.java +++ b/common/biomesoplenty/biomes/vanilla/BiomeGenHillsNew.java @@ -1,4 +1,4 @@ -package biomesoplenty.biomes; +package biomesoplenty.biomes.vanilla; import java.util.Random; @@ -7,7 +7,8 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenMinable; import net.minecraft.world.gen.feature.WorldGenerator; -import biomesoplenty.worldgen.WorldGenJacaranda; +import biomesoplenty.biomes.BiomeDecoratorBOP; +import biomesoplenty.worldgen.tree.WorldGenJacaranda; public class BiomeGenHillsNew extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenJungleNew.java b/common/biomesoplenty/biomes/vanilla/BiomeGenJungleNew.java similarity index 95% rename from common/biomesoplenty/biomes/BiomeGenJungleNew.java rename to common/biomesoplenty/biomes/vanilla/BiomeGenJungleNew.java index 995e5318f..9dea8109e 100644 --- a/common/biomesoplenty/biomes/BiomeGenJungleNew.java +++ b/common/biomesoplenty/biomes/vanilla/BiomeGenJungleNew.java @@ -1,4 +1,4 @@ -package biomesoplenty.biomes; +package biomesoplenty.biomes.vanilla; import java.awt.Color; import java.util.Random; @@ -16,7 +16,8 @@ import net.minecraft.world.gen.feature.WorldGenTrees; import net.minecraft.world.gen.feature.WorldGenVines; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.biomes.BiomeDecoratorBOP; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; import biomesoplenty.entities.EntityJungleSpider; public class BiomeGenJungleNew extends BiomeGenBase @@ -115,7 +116,7 @@ public class BiomeGenJungleNew extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.Misc.skyColors) + if (BOPConfigurationMisc.skyColors) return 9225359; else { diff --git a/common/biomesoplenty/biomes/BiomeGenPlainsNew.java b/common/biomesoplenty/biomes/vanilla/BiomeGenPlainsNew.java similarity index 95% rename from common/biomesoplenty/biomes/BiomeGenPlainsNew.java rename to common/biomesoplenty/biomes/vanilla/BiomeGenPlainsNew.java index c066bcc8a..b150e6dd4 100644 --- a/common/biomesoplenty/biomes/BiomeGenPlainsNew.java +++ b/common/biomesoplenty/biomes/vanilla/BiomeGenPlainsNew.java @@ -1,4 +1,4 @@ -package biomesoplenty.biomes; +package biomesoplenty.biomes.vanilla; import java.util.Random; @@ -10,6 +10,7 @@ import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; +import biomesoplenty.biomes.BiomeDecoratorBOP; public class BiomeGenPlainsNew extends BiomeGenBase { diff --git a/common/biomesoplenty/biomes/BiomeGenSwampNew.java b/common/biomesoplenty/biomes/vanilla/BiomeGenSwampNew.java similarity index 93% rename from common/biomesoplenty/biomes/BiomeGenSwampNew.java rename to common/biomesoplenty/biomes/vanilla/BiomeGenSwampNew.java index 29bd6295f..8f5d01757 100644 --- a/common/biomesoplenty/biomes/BiomeGenSwampNew.java +++ b/common/biomesoplenty/biomes/vanilla/BiomeGenSwampNew.java @@ -1,4 +1,4 @@ -package biomesoplenty.biomes; +package biomesoplenty.biomes.vanilla; import java.awt.Color; import java.util.Random; @@ -12,10 +12,11 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.biomes.BiomeDecoratorBOP; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; import biomesoplenty.worldgen.WorldGenLog; import biomesoplenty.worldgen.WorldGenMoss; -import biomesoplenty.worldgen.WorldGenWillow; +import biomesoplenty.worldgen.tree.WorldGenWillow; public class BiomeGenSwampNew extends BiomeGenBase { @@ -108,7 +109,7 @@ public class BiomeGenSwampNew extends BiomeGenBase @Override public int getSkyColorByTemp(float par1) { - if (BOPConfiguration.Misc.skyColors) + if (BOPConfigurationMisc.skyColors) return 4149332; else { diff --git a/common/biomesoplenty/biomes/BiomeGenTaigaNew.java b/common/biomesoplenty/biomes/vanilla/BiomeGenTaigaNew.java similarity index 96% rename from common/biomesoplenty/biomes/BiomeGenTaigaNew.java rename to common/biomesoplenty/biomes/vanilla/BiomeGenTaigaNew.java index fef063912..95fb73900 100644 --- a/common/biomesoplenty/biomes/BiomeGenTaigaNew.java +++ b/common/biomesoplenty/biomes/vanilla/BiomeGenTaigaNew.java @@ -1,4 +1,4 @@ -package biomesoplenty.biomes; +package biomesoplenty.biomes.vanilla; import java.util.Random; @@ -12,6 +12,7 @@ import net.minecraft.world.gen.feature.WorldGenTaiga2; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; import biomesoplenty.api.Blocks; +import biomesoplenty.biomes.BiomeDecoratorBOP; public class BiomeGenTaigaNew extends BiomeGenBase { diff --git a/common/biomesoplenty/blocks/BlockBOPColorizedSapling.java b/common/biomesoplenty/blocks/BlockBOPColorizedSapling.java index 0e5a7fabb..9a1dd2afb 100644 --- a/common/biomesoplenty/blocks/BlockBOPColorizedSapling.java +++ b/common/biomesoplenty/blocks/BlockBOPColorizedSapling.java @@ -13,14 +13,14 @@ import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraftforge.common.ForgeDirection; import biomesoplenty.BiomesOPlenty; -import biomesoplenty.worldgen.WorldGenAcacia; -import biomesoplenty.worldgen.WorldGenMangrove; import biomesoplenty.worldgen.WorldGenNetherBush; -import biomesoplenty.worldgen.WorldGenPalmTree1; -import biomesoplenty.worldgen.WorldGenPalmTree3; -import biomesoplenty.worldgen.WorldGenPineTree; -import biomesoplenty.worldgen.WorldGenRedwoodTree2; -import biomesoplenty.worldgen.WorldGenWillow; +import biomesoplenty.worldgen.tree.WorldGenAcacia; +import biomesoplenty.worldgen.tree.WorldGenMangrove; +import biomesoplenty.worldgen.tree.WorldGenPalmTree1; +import biomesoplenty.worldgen.tree.WorldGenPalmTree3; +import biomesoplenty.worldgen.tree.WorldGenPineTree; +import biomesoplenty.worldgen.tree.WorldGenRedwoodTree2; +import biomesoplenty.worldgen.tree.WorldGenWillow; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/common/biomesoplenty/blocks/BlockBOPSapling.java b/common/biomesoplenty/blocks/BlockBOPSapling.java index 7d2ae4de7..b30be5c5d 100644 --- a/common/biomesoplenty/blocks/BlockBOPSapling.java +++ b/common/biomesoplenty/blocks/BlockBOPSapling.java @@ -14,24 +14,24 @@ import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraftforge.common.ForgeDirection; import biomesoplenty.BiomesOPlenty; import biomesoplenty.api.Blocks; -import biomesoplenty.worldgen.WorldGenApple; -import biomesoplenty.worldgen.WorldGenAutumn; -import biomesoplenty.worldgen.WorldGenAutumn2; -import biomesoplenty.worldgen.WorldGenBambooTree; -import biomesoplenty.worldgen.WorldGenBambooTree2; -import biomesoplenty.worldgen.WorldGenCherry1; -import biomesoplenty.worldgen.WorldGenCherry2; -import biomesoplenty.worldgen.WorldGenDeadTree2; -import biomesoplenty.worldgen.WorldGenJacaranda; -import biomesoplenty.worldgen.WorldGenMaple; -import biomesoplenty.worldgen.WorldGenMystic2; import biomesoplenty.worldgen.WorldGenNetherBush; -import biomesoplenty.worldgen.WorldGenOminous1; -import biomesoplenty.worldgen.WorldGenOminous2; -import biomesoplenty.worldgen.WorldGenOriginTree; -import biomesoplenty.worldgen.WorldGenPersimmon; -import biomesoplenty.worldgen.WorldGenPromisedTree; -import biomesoplenty.worldgen.WorldGenTaiga9; +import biomesoplenty.worldgen.tree.WorldGenApple; +import biomesoplenty.worldgen.tree.WorldGenAutumn; +import biomesoplenty.worldgen.tree.WorldGenAutumn2; +import biomesoplenty.worldgen.tree.WorldGenBambooTree; +import biomesoplenty.worldgen.tree.WorldGenBambooTree2; +import biomesoplenty.worldgen.tree.WorldGenCherry1; +import biomesoplenty.worldgen.tree.WorldGenCherry2; +import biomesoplenty.worldgen.tree.WorldGenDeadTree2; +import biomesoplenty.worldgen.tree.WorldGenJacaranda; +import biomesoplenty.worldgen.tree.WorldGenMaple; +import biomesoplenty.worldgen.tree.WorldGenMystic2; +import biomesoplenty.worldgen.tree.WorldGenOminous1; +import biomesoplenty.worldgen.tree.WorldGenOminous2; +import biomesoplenty.worldgen.tree.WorldGenOriginTree; +import biomesoplenty.worldgen.tree.WorldGenPersimmon; +import biomesoplenty.worldgen.tree.WorldGenPromisedTree; +import biomesoplenty.worldgen.tree.WorldGenTaiga9; public class BlockBOPSapling extends BlockSapling { diff --git a/common/biomesoplenty/blocks/BlockPromisedPortal.java b/common/biomesoplenty/blocks/BlockPromisedPortal.java index f27327431..45df5a1e2 100644 --- a/common/biomesoplenty/blocks/BlockPromisedPortal.java +++ b/common/biomesoplenty/blocks/BlockPromisedPortal.java @@ -8,7 +8,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.configuration.configfile.BOPConfigurationIDs; import biomesoplenty.helpers.TeleporterPromised; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -77,9 +77,9 @@ public class BlockPromisedPortal extends Block if (par5Entity instanceof EntityPlayerMP) { EntityPlayerMP thePlayer = (EntityPlayerMP) par5Entity; - if (par5Entity.dimension != BOPConfiguration.IDs.promisedLandDimID) + if (par5Entity.dimension != BOPConfigurationIDs.promisedLandDimID) { - thePlayer.mcServer.getConfigurationManager().transferPlayerToDimension(thePlayer, BOPConfiguration.IDs.promisedLandDimID, new TeleporterPromised(thePlayer.mcServer.worldServerForDimension(BOPConfiguration.IDs.promisedLandDimID))); + thePlayer.mcServer.getConfigurationManager().transferPlayerToDimension(thePlayer, BOPConfigurationIDs.promisedLandDimID, new TeleporterPromised(thePlayer.mcServer.worldServerForDimension(BOPConfigurationIDs.promisedLandDimID))); } else { diff --git a/common/biomesoplenty/configuration/BOPBiomes.java b/common/biomesoplenty/configuration/BOPBiomes.java index 8f3ff2227..429273282 100644 --- a/common/biomesoplenty/configuration/BOPBiomes.java +++ b/common/biomesoplenty/configuration/BOPBiomes.java @@ -11,6 +11,29 @@ import net.minecraftforge.common.BiomeDictionary.Type; import net.minecraftforge.common.BiomeManager; import biomesoplenty.api.Biomes; import biomesoplenty.biomes.*; +import biomesoplenty.biomes.beach.BiomeGenBeachGravel; +import biomesoplenty.biomes.beach.BiomeGenBeachOvergrown; +import biomesoplenty.biomes.nether.BiomeGenNetherBase; +import biomesoplenty.biomes.nether.BiomeGenNetherBone; +import biomesoplenty.biomes.nether.BiomeGenNetherDesert; +import biomesoplenty.biomes.nether.BiomeGenNetherGarden; +import biomesoplenty.biomes.nether.BiomeGenNetherLava; +import biomesoplenty.biomes.ocean.BiomeGenOceanAbyss; +import biomesoplenty.biomes.ocean.BiomeGenOceanCoral; +import biomesoplenty.biomes.ocean.BiomeGenOceanKelp; +import biomesoplenty.biomes.promisedland.BiomeGenPromisedLandForest; +import biomesoplenty.biomes.promisedland.BiomeGenPromisedLandPlains; +import biomesoplenty.biomes.promisedland.BiomeGenPromisedLandSwamp; +import biomesoplenty.biomes.vanilla.BiomeGenDesertNew; +import biomesoplenty.biomes.vanilla.BiomeGenForestNew; +import biomesoplenty.biomes.vanilla.BiomeGenHillsNew; +import biomesoplenty.biomes.vanilla.BiomeGenJungleNew; +import biomesoplenty.biomes.vanilla.BiomeGenPlainsNew; +import biomesoplenty.biomes.vanilla.BiomeGenSwampNew; +import biomesoplenty.biomes.vanilla.BiomeGenTaigaNew; +import biomesoplenty.configuration.configfile.BOPConfigurationBiomeGen; +import biomesoplenty.configuration.configfile.BOPConfigurationIDs; +import biomesoplenty.configuration.configfile.BOPConfigurationTerrainGen; import biomesoplenty.world.WorldTypeBOP; import com.google.common.base.Optional; @@ -65,134 +88,134 @@ public class BOPBiomes { private static void initializeBiomes() { - Biomes.alps = Optional.of((new BiomeGenAlps(BOPConfiguration.IDs.alpsID)).setColor(353825).setBiomeName("Alps").func_76733_a(5159473).setTemperatureRainfall(0.0F, 0.5F).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.5F).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.5F).setMinMaxHeight(0.2F, 0.2F)); - Biomes.autumnHills = Optional.of((new BiomeGenAutumnHills(BOPConfiguration.IDs.autumnHillsID)).setColor(522674).setBiomeName("Autumn Hills").func_76733_a(9154376).setMinMaxHeight(0.5F, 0.8F).setTemperatureRainfall(0.5F, 0.2F)); - Biomes.badlands = Optional.of((new BiomeGenBadlands(BOPConfiguration.IDs.badlandsID)).setColor(16421912).setBiomeName("Badlands").setTemperatureRainfall(2.0F, 0.05F).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.alps = Optional.of((new BiomeGenAlps(BOPConfigurationIDs.alpsID)).setColor(353825).setBiomeName("Alps").func_76733_a(5159473).setTemperatureRainfall(0.0F, 0.5F).setMinMaxHeight(2.0F, 3.0F)); + Biomes.alpsForest = Optional.of((new BiomeGenAlpsForest(BOPConfigurationIDs.alpsForestID)).setColor(353825).setBiomeName("Alps Mountainside").func_76733_a(5159473).setTemperatureRainfall(0.0F, 0.5F).setMinMaxHeight(1.0F, 2.0F)); + Biomes.alpsBase = Optional.of((new BiomeGenAlpsBase(BOPConfigurationIDs.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(BOPConfigurationIDs.arcticID)).setColor(14090235).setBiomeName("Arctic").setEnableSnow().setTemperatureRainfall(0.05F, 0.5F).setMinMaxHeight(0.2F, 0.2F)); + Biomes.autumnHills = Optional.of((new BiomeGenAutumnHills(BOPConfigurationIDs.autumnHillsID)).setColor(522674).setBiomeName("Autumn Hills").func_76733_a(9154376).setMinMaxHeight(0.5F, 0.8F).setTemperatureRainfall(0.5F, 0.2F)); + Biomes.badlands = Optional.of((new BiomeGenBadlands(BOPConfigurationIDs.badlandsID)).setColor(16421912).setBiomeName("Badlands").setTemperatureRainfall(2.0F, 0.05F).setMinMaxHeight(0.3F, 0.9F)); + Biomes.bambooForest = Optional.of((new BiomeGenBambooForest(BOPConfigurationIDs.bambooForestID)).setColor(112).setBiomeName("Bamboo Forest").setMinMaxHeight(0.2F, 0.4F).setTemperatureRainfall(1.2F, 0.9F)); + Biomes.bayou = Optional.of((new BiomeGenBayou(BOPConfigurationIDs.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.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.beachGravel = Optional.of((new BiomeGenBeachGravel(BOPConfigurationIDs.beachGravelID)).setColor(16440917).setBiomeName("Gravel Beach").setTemperatureRainfall(0.2F, 0.8F).setMinMaxHeight(0.0F, 0.1F)); + Biomes.beachOvergrown = Optional.of((new BiomeGenBeachOvergrown(BOPConfigurationIDs.beachOvergrownID)).setColor(16440917).setBiomeName("Overgrown Beach").setTemperatureRainfall(0.8F, 0.5F).setMinMaxHeight(0.0F, 0.1F)); - 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.3F, 0.3F).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.05F).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.5F).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.05F)); - 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.05F).setMinMaxHeight(0.5F, 1.3F)); - Biomes.fen = Optional.of((new BiomeGenFen(BOPConfiguration.IDs.fenID)).setColor(9286496).setBiomeName("Fen").setTemperatureRainfall(0.4F, 0.05F).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.5F).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, 0.8F).setTemperatureRainfall(0.0F, 0.5F)); - Biomes.grassland = Optional.of((new BiomeGenGrassland(BOPConfiguration.IDs.grasslandID)).setColor(9286496).setBiomeName("Grassland").setTemperatureRainfall(0.7F, 0.7F).setMinMaxHeight(0.2F, 0.5F)); - 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.5F).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.05F).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.05F).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.0F, 1.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.birchForest = Optional.of((new BiomeGenBirchForest(BOPConfigurationIDs.birchForestID)).setColor(353825).setBiomeName("Birch Forest").func_76733_a(5159473).setTemperatureRainfall(0.4F, 0.3F)); + Biomes.bog = Optional.of((new BiomeGenBog(BOPConfigurationIDs.bogID)).setColor(522674).setBiomeName("Bog").func_76733_a(9154376).setMinMaxHeight(0.3F, 0.3F).setTemperatureRainfall(0.8F, 0.9F)); + Biomes.borealForest = Optional.of((new BiomeGenBorealForest(BOPConfigurationIDs.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(BOPConfigurationIDs.brushlandID)).setColor(16421912).setBiomeName("Brushland").setTemperatureRainfall(2.0F, 0.05F).setMinMaxHeight(0.3F, 0.3F)); + Biomes.canyon = Optional.of((new BiomeGenCanyon(BOPConfigurationIDs.canyonID)).setColor(9286496).setBiomeName("Canyon").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(1.5F, 2.0F)); + Biomes.canyonRavine = Optional.of((new BiomeGenCanyonRavine(BOPConfigurationIDs.canyonRavineID)).setColor(9286496).setBiomeName("Canyon Ravine").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.3F, 0.4F)); + Biomes.chaparral = Optional.of((new BiomeGenChaparral(BOPConfigurationIDs.chaparralID)).setColor(9286496).setBiomeName("Chaparral").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.3F, 0.6F)); + Biomes.cherryBlossomGrove = Optional.of((new BiomeGenCherryBlossomGrove(BOPConfigurationIDs.cherryBlossomGroveID)).setColor(9286496).setBiomeName("Cherry Blossom Grove").setMinMaxHeight(0.3F, 0.4F).setTemperatureRainfall(0.7F, 0.8F)); + Biomes.coniferousForest = Optional.of((new BiomeGenConiferousForest(BOPConfigurationIDs.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(BOPConfigurationIDs.coniferousForestSnowID)).setColor(14090235).setBiomeName("Snowy Coniferous Forest").setTemperatureRainfall(0.0F, 0.5F).setMinMaxHeight(0.2F, 0.7F)); + Biomes.crag = Optional.of((new BiomeGenCrag(BOPConfigurationIDs.cragID)).setColor(9286496).setBiomeName("Crag").setMinMaxHeight(2.0F, 3.0F).setTemperatureRainfall(0.4F, 0.2F)); + Biomes.deadForest = Optional.of((new BiomeGenDeadForest(BOPConfigurationIDs.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(BOPConfigurationIDs.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(BOPConfigurationIDs.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(BOPConfigurationIDs.deadlandsID)).setColor(522674).setBiomeName("Deadlands").setDisableRain().func_76733_a(9154376).setMinMaxHeight(0.1F, 0.5F).setTemperatureRainfall(2.0F, 0.05F)); + Biomes.deciduousForest = Optional.of((new BiomeGenDeciduousForest(BOPConfigurationIDs.deciduousForestID)).setColor(353825).setBiomeName("Deciduous Forest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F)); + Biomes.dunes = Optional.of((new BiomeGenDunes(BOPConfigurationIDs.dunesID)).setColor(13786898).setBiomeName("Dunes").setDisableRain().setTemperatureRainfall(2.0F, 0.05F).setMinMaxHeight(0.5F, 1.3F)); + Biomes.fen = Optional.of((new BiomeGenFen(BOPConfigurationIDs.fenID)).setColor(9286496).setBiomeName("Fen").setTemperatureRainfall(0.4F, 0.05F).setMinMaxHeight(0.2F, 0.4F)); + Biomes.field = Optional.of((new BiomeGenField(BOPConfigurationIDs.fieldID)).setColor(9286496).setBiomeName("Field").setTemperatureRainfall(0.6F, 0.7F).setMinMaxHeight(0.3F, 0.3F)); + Biomes.fieldForest = Optional.of((new BiomeGenFieldForest(BOPConfigurationIDs.fieldForestID)).setColor(9286496).setBiomeName("Forested Field").setTemperatureRainfall(0.6F, 0.7F).setMinMaxHeight(0.3F, 0.3F)); + Biomes.frostForest = Optional.of((new BiomeGenFrostForest(BOPConfigurationIDs.frostForestID)).setColor(14090235).setBiomeName("Frost Forest").setEnableSnow().setTemperatureRainfall(0.0F, 0.5F).setMinMaxHeight(0.3F, 0.4F)); + Biomes.fungiForest = Optional.of((new BiomeGenFungiForest(BOPConfigurationIDs.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(BOPConfigurationIDs.gardenID)).setColor(9286496).setBiomeName("Garden").setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(0.3F, 0.4F)); + Biomes.glacier = Optional.of((new BiomeGenGlacier(BOPConfigurationIDs.glacierID)).setColor(6316128).setBiomeName("Glacier").setEnableSnow().setMinMaxHeight(0.4F, 0.8F).setTemperatureRainfall(0.0F, 0.5F)); + Biomes.grassland = Optional.of((new BiomeGenGrassland(BOPConfigurationIDs.grasslandID)).setColor(9286496).setBiomeName("Grassland").setTemperatureRainfall(0.7F, 0.7F).setMinMaxHeight(0.2F, 0.5F)); + Biomes.grove = Optional.of((new BiomeGenGrove(BOPConfigurationIDs.groveID)).setColor(9286496).setBiomeName("Grove").setTemperatureRainfall(0.4F, 0.8F).setMinMaxHeight(0.3F, 0.4F)); + Biomes.heathland = Optional.of((new BiomeGenHeathland(BOPConfigurationIDs.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(BOPConfigurationIDs.highlandID)).setColor(6316128).setBiomeName("Highland").setMinMaxHeight(0.9F, 1.9F).setTemperatureRainfall(0.5F, 0.5F)); + Biomes.hotSprings = Optional.of((new BiomeGenHotSprings(BOPConfigurationIDs.hotSpringsID)).setColor(10486015).setBiomeName("Hot Springs").setMinMaxHeight(0.2F, 0.5F).setTemperatureRainfall(0.5F, 0.7F)); + Biomes.icyHills = Optional.of((new BiomeGenIcyHills(BOPConfigurationIDs.icyHillsID)).setColor(14090235).setBiomeName("Icy Hills").setEnableSnow().setTemperatureRainfall(0.0F, 0.5F).setMinMaxHeight(0.3F, 0.8F)); + Biomes.jadeCliffs = Optional.of((new BiomeGenJadeCliffs(BOPConfigurationIDs.jadeCliffsID)).setColor(14090235).setBiomeName("Jade Cliffs").setTemperatureRainfall(0.5F, 0.1F).setMinMaxHeight(0.5F, 1.5F)); + Biomes.lushDesert = Optional.of((new BiomeGenLushDesert(BOPConfigurationIDs.lushDesertID)).setColor(16421912).setBiomeName("Lush Desert").setTemperatureRainfall(0.8F, 0.2F).setMinMaxHeight(0.2F, 0.9F)); + Biomes.lushSwamp = Optional.of((new BiomeGenLushSwamp(BOPConfigurationIDs.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(BOPConfigurationIDs.mangroveID)).setColor(16440917).setBiomeName("Mangrove").setMinMaxHeight(0.1F, 0.3F).setTemperatureRainfall(0.8F, 0.9F)); + Biomes.mapleWoods = Optional.of((new BiomeGenMapleWoods(BOPConfigurationIDs.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(BOPConfigurationIDs.marshID)).setColor(10486015).setBiomeName("Marsh").setMinMaxHeight(-0.5F, 0.05F).setTemperatureRainfall(0.5F, 0.9F)); + Biomes.meadow = Optional.of((new BiomeGenMeadow(BOPConfigurationIDs.meadowID)).setColor(9286496).setBiomeName("Meadow").setTemperatureRainfall(0.7F, 0.7F)); + Biomes.meadowForest = Optional.of((new BiomeGenMeadowForest(BOPConfigurationIDs.meadowForestID)).setColor(9286496).setBiomeName("Meadow Forest").setTemperatureRainfall(0.7F, 0.7F)); + Biomes.mesa = Optional.of((new BiomeGenMesa(BOPConfigurationIDs.mesaID)).setColor(16421912).setBiomeName("Mesa").setDisableRain().setTemperatureRainfall(2.0F, 0.05F).setMinMaxHeight(0.4F, 2.0F)); + Biomes.moor = Optional.of((new BiomeGenMoor(BOPConfigurationIDs.moorID)).setColor(16421912).setBiomeName("Moor").setTemperatureRainfall(0.5F, 1.0F).setMinMaxHeight(0.7F, 0.8F)); + Biomes.mountain = Optional.of((new BiomeGenMountain(BOPConfigurationIDs.mountainID)).setColor(14090235).setBiomeName("Mountain").setTemperatureRainfall(0.5F, 0.1F).setMinMaxHeight(1.0F, 1.5F)); + Biomes.mysticGrove = Optional.of((new BiomeGenMysticGrove(BOPConfigurationIDs.mysticGroveID)).setColor(353825).setBiomeName("Mystic Grove").setDisableRain().func_76733_a(5159473).setTemperatureRainfall(0.9F, 1.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.netherBase = Optional.of((new BiomeGenNetherBase(BOPConfigurationIDs.netherBaseID)).setColor(16711680).setBiomeName("Nether").setDisableRain().setTemperatureRainfall(2.0F, 0.0F)); + Biomes.netherGarden = Optional.of((new BiomeGenNetherGarden(BOPConfigurationIDs.netherGardenID)).setColor(16711680).setBiomeName("Undergarden").setDisableRain().setTemperatureRainfall(2.0F, 0.0F)); + Biomes.netherDesert = Optional.of((new BiomeGenNetherDesert(BOPConfigurationIDs.netherDesertID)).setColor(16711680).setBiomeName("Corrupted Sands").setDisableRain().setTemperatureRainfall(2.0F, 0.0F)); + Biomes.netherLava = Optional.of((new BiomeGenNetherLava(BOPConfigurationIDs.netherLavaID)).setColor(16711680).setBiomeName("Phantasmagoric Inferno").setDisableRain().setTemperatureRainfall(2.0F, 0.0F)); + Biomes.netherBone = Optional.of((new BiomeGenNetherBone(BOPConfigurationIDs.netherBoneID)).setColor(16711680).setBiomeName("Boneyard").setDisableRain().setTemperatureRainfall(2.0F, 0.0F)); - Biomes.oasis = Optional.of((new BiomeGenOasis(BOPConfiguration.IDs.oasisID)).setColor(16421912).setBiomeName("Oasis").setTemperatureRainfall(0.9F, 0.7F).setMinMaxHeight(0.3F, 0.4F)); + Biomes.oasis = Optional.of((new BiomeGenOasis(BOPConfigurationIDs.oasisID)).setColor(16421912).setBiomeName("Oasis").setTemperatureRainfall(0.9F, 0.7F).setMinMaxHeight(0.3F, 0.4F)); - Biomes.oceanAbyss = Optional.of((new BiomeGenOceanAbyss(BOPConfiguration.IDs.oceanAbyssID)).setColor(10486015).setBiomeName("Oceanic Abyss").setMinMaxHeight(-1.65F, 0.0F).setTemperatureRainfall(0.5F, 0.9F)); - Biomes.oceanCoral = Optional.of((new BiomeGenOceanCoral(BOPConfiguration.IDs.oceanCoralID)).setColor(10486015).setBiomeName("Coral Reef").setMinMaxHeight(-0.1F, 0.4F).setTemperatureRainfall(0.5F, 0.9F)); - Biomes.oceanKelp = Optional.of((new BiomeGenOceanKelp(BOPConfiguration.IDs.oceanKelpID)).setColor(10486015).setBiomeName("Kelp Forest").setMinMaxHeight(-0.7F, 0.2F).setTemperatureRainfall(0.5F, 0.9F)); + Biomes.oceanAbyss = Optional.of((new BiomeGenOceanAbyss(BOPConfigurationIDs.oceanAbyssID)).setColor(10486015).setBiomeName("Oceanic Abyss").setMinMaxHeight(-1.65F, 0.0F).setTemperatureRainfall(0.5F, 0.9F)); + Biomes.oceanCoral = Optional.of((new BiomeGenOceanCoral(BOPConfigurationIDs.oceanCoralID)).setColor(10486015).setBiomeName("Coral Reef").setMinMaxHeight(-0.1F, 0.4F).setTemperatureRainfall(0.5F, 0.9F)); + Biomes.oceanKelp = Optional.of((new BiomeGenOceanKelp(BOPConfigurationIDs.oceanKelpID)).setColor(10486015).setBiomeName("Kelp Forest").setMinMaxHeight(-0.7F, 0.2F).setTemperatureRainfall(0.5F, 0.9F)); - 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.05F).setMinMaxHeight(0.3F, 0.4F)); - Biomes.overgrownGreens = Optional.of((new BiomeGenOvergrownGreens(BOPConfiguration.IDs.overgrownGreensID)).setColor(353825).setBiomeName("Overgrown Greens").func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.8F).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.5F)); - 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.ominousWoods = Optional.of((new BiomeGenOminousWoods(BOPConfigurationIDs.ominousWoodsID)).setColor(353825).setBiomeName("Ominous Woods").setDisableRain().func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.9F)); + Biomes.ominousWoodsThick = Optional.of((new BiomeGenOminousWoodsThick(BOPConfigurationIDs.ominousWoodsThickID)).setColor(353825).setBiomeName("Thick Ominous Woods").setDisableRain().func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.9F)); + Biomes.orchard = Optional.of((new BiomeGenOrchard(BOPConfigurationIDs.orchardID)).setColor(9286496).setBiomeName("Orchard").setTemperatureRainfall(0.8F, 0.4F)); + Biomes.originValley = Optional.of((new BiomeGenOriginValley(BOPConfigurationIDs.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(BOPConfigurationIDs.outbackID)).setColor(9286496).setBiomeName("Outback").setTemperatureRainfall(0.8F, 0.05F).setMinMaxHeight(0.3F, 0.4F)); + Biomes.overgrownGreens = Optional.of((new BiomeGenOvergrownGreens(BOPConfigurationIDs.overgrownGreensID)).setColor(353825).setBiomeName("Overgrown Greens").func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.8F).setMinMaxHeight(0.3F, 0.4F)); + Biomes.pasture = Optional.of((new BiomeGenPasture(BOPConfigurationIDs.pastureID)).setColor(9286496).setBiomeName("Pasture").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.3F, 0.4F)); + Biomes.pastureMeadow = Optional.of((new BiomeGenPastureMeadow(BOPConfigurationIDs.pastureMeadowID)).setColor(9286496).setBiomeName("Pasture Meadow").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.3F, 0.4F)); + Biomes.pastureThin = Optional.of((new BiomeGenPastureThin(BOPConfigurationIDs.pastureThinID)).setColor(9286496).setBiomeName("Thinned Pasture").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.3F, 0.4F)); + Biomes.polar = Optional.of((new BiomeGenPolar(BOPConfigurationIDs.polarID)).setColor(6316128).setBiomeName("Polar").setMinMaxHeight(-0.5F, 0.0F).setTemperatureRainfall(0.0F, 0.5F)); + Biomes.prairie = Optional.of((new BiomeGenPrairie(BOPConfigurationIDs.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.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.promisedLandForest = Optional.of((new BiomeGenPromisedLandForest(BOPConfigurationIDs.promisedLandForestID)).setColor(112).setBiomeName("Wonderous Woods").setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.1F, 2.0F)); + Biomes.promisedLandPlains = Optional.of((new BiomeGenPromisedLandPlains(BOPConfigurationIDs.promisedLandPlainsID)).setColor(112).setBiomeName("Majestic Meadow").setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.1F, 2.0F)); + Biomes.promisedLandSwamp = Optional.of((new BiomeGenPromisedLandSwamp(BOPConfigurationIDs.promisedLandSwampID)).setColor(112).setBiomeName("Blessed Bog").setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.1F, 2.0F)); - 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.05F).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.2F, 0.2F).setTemperatureRainfall(0.6F, 0.05F)); - Biomes.shrublandForest = Optional.of((new BiomeGenShrublandForest(BOPConfiguration.IDs.shrublandForestID)).setColor(9286496).setBiomeName("Thick Shrubland").setMinMaxHeight(0.2F, 0.2F).setTemperatureRainfall(0.6F, 0.05F)); - Biomes.silkglades = Optional.of((new BiomeGenSilkglades(BOPConfiguration.IDs.silkgladesID)).setColor(522674).setBiomeName("Silkglades").func_76733_a(9154376).setMinMaxHeight(0.3F, 0.3F).setTemperatureRainfall(0.5F, 0.9F)); - 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.05F).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.1F, 0.3F)); - Biomes.volcano = Optional.of((new BiomeGenVolcano(BOPConfiguration.IDs.volcanoID)).setColor(9286496).setBiomeName("Volcano").setDisableRain().setMinMaxHeight(0.6F, 0.9F).setTemperatureRainfall(2.0F, 0.05F)); - Biomes.wasteland = Optional.of((new BiomeGenWasteland(BOPConfiguration.IDs.wastelandID)).setColor(16421912).setBiomeName("Wasteland").setDisableRain().setTemperatureRainfall(2.0F, 0.05F).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.quagmire = Optional.of((new BiomeGenQuagmire(BOPConfigurationIDs.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(BOPConfigurationIDs.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(BOPConfigurationIDs.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(BOPConfigurationIDs.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(BOPConfigurationIDs.savannaID)).setColor(9286496).setBiomeName("Savanna").setTemperatureRainfall(1.5F, 0.1F).setMinMaxHeight(0.3F, 0.4F)); + Biomes.savannaPlateau = Optional.of((new BiomeGenSavannaPlateau(BOPConfigurationIDs.savannaPlateauID)).setColor(9286496).setBiomeName("Savanna Plateau").setTemperatureRainfall(1.5F, 0.1F).setMinMaxHeight(0.9F, 0.9F)); + Biomes.scrubland = Optional.of((new BiomeGenScrubland(BOPConfigurationIDs.scrublandID)).setColor(9286496).setBiomeName("Scrubland").setTemperatureRainfall(1.2F, 0.05F).setMinMaxHeight(0.3F, 0.5F)); + Biomes.seasonalForest = Optional.of((new BiomeGenSeasonalForest(BOPConfigurationIDs.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(BOPConfigurationIDs.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(BOPConfigurationIDs.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(BOPConfigurationIDs.shoreID)).setColor(9286496).setBiomeName("Shore").setMinMaxHeight(-1.0F, 0.4F).setTemperatureRainfall(0.8F, 0.4F)); + Biomes.shrubland = Optional.of((new BiomeGenShrubland(BOPConfigurationIDs.shrublandID)).setColor(9286496).setBiomeName("Shrubland").setMinMaxHeight(0.2F, 0.2F).setTemperatureRainfall(0.6F, 0.05F)); + Biomes.shrublandForest = Optional.of((new BiomeGenShrublandForest(BOPConfigurationIDs.shrublandForestID)).setColor(9286496).setBiomeName("Thick Shrubland").setMinMaxHeight(0.2F, 0.2F).setTemperatureRainfall(0.6F, 0.05F)); + Biomes.silkglades = Optional.of((new BiomeGenSilkglades(BOPConfigurationIDs.silkgladesID)).setColor(522674).setBiomeName("Silkglades").func_76733_a(9154376).setMinMaxHeight(0.3F, 0.3F).setTemperatureRainfall(0.5F, 0.9F)); + Biomes.sludgepit = Optional.of((new BiomeGenSludgepit(BOPConfigurationIDs.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(BOPConfigurationIDs.spruceWoodsID)).setColor(353825).setBiomeName("Spruce Woods").func_76733_a(5159473).setTemperatureRainfall(0.6F, 0.7F)); + Biomes.steppe = Optional.of((new BiomeGenSteppe(BOPConfigurationIDs.steppeID)).setColor(9286496).setBiomeName("Steppe").setTemperatureRainfall(2.0F, 0.05F).setMinMaxHeight(0.3F, 0.4F)); + Biomes.temperateRainforest = Optional.of((new BiomeGenTemperateRainforest(BOPConfigurationIDs.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(BOPConfigurationIDs.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(BOPConfigurationIDs.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(BOPConfigurationIDs.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(BOPConfigurationIDs.tropicalRainforestID)).setColor(9286496).setBiomeName("Tropical Rainforest").setTemperatureRainfall(1.2F, 0.9F).setMinMaxHeight(0.3F, 0.7F)); + Biomes.tropics = Optional.of((new BiomeGenTropics(BOPConfigurationIDs.tropicsID)).setColor(9286496).setBiomeName("Tropics").setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.1F, 1.5F)); + Biomes.tundra = Optional.of((new BiomeGenTundra(BOPConfigurationIDs.tundraID)).setColor(14090235).setBiomeName("Tundra").setTemperatureRainfall(0.2F, 0.8F).setMinMaxHeight(0.1F, 0.3F)); + Biomes.volcano = Optional.of((new BiomeGenVolcano(BOPConfigurationIDs.volcanoID)).setColor(9286496).setBiomeName("Volcano").setDisableRain().setMinMaxHeight(0.6F, 0.9F).setTemperatureRainfall(2.0F, 0.05F)); + Biomes.wasteland = Optional.of((new BiomeGenWasteland(BOPConfigurationIDs.wastelandID)).setColor(16421912).setBiomeName("Wasteland").setDisableRain().setTemperatureRainfall(2.0F, 0.05F).setMinMaxHeight(0.3F, 0.4F)); + Biomes.wetland = Optional.of((new BiomeGenWetland(BOPConfigurationIDs.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(BOPConfigurationIDs.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.IDs.plainsNewID)).setColor(9286496).setBiomeName("Plains").setTemperatureRainfall(0.8F, 0.4F)); + Biomes.plainsNew = Optional.of((new BiomeGenPlainsNew(BOPConfigurationIDs.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.05F).setMinMaxHeight(0.2F, 0.3F)); + Biomes.desertNew = Optional.of((new BiomeGenDesertNew(BOPConfigurationIDs.desertNewID)).setColor(16421912).setBiomeName("Desert").setDisableRain().setTemperatureRainfall(2.0F, 0.05F).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.extremeHillsNew = Optional.of((new BiomeGenHillsNew(BOPConfigurationIDs.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.forestHillsNew = Optional.of((new BiomeGenForestNew(BOPConfiguration.IDs.forestHillsNewID)).setColor(353825).setBiomeName("ForestHills").func_76733_a(5159473).setMinMaxHeight(0.8F, 1.0F).setTemperatureRainfall(0.7F, 0.8F)); + Biomes.forestNew = Optional.of((new BiomeGenForestNew(BOPConfigurationIDs.forestNewID)).setColor(353825).setBiomeName("Forest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F)); + Biomes.forestHillsNew = Optional.of((new BiomeGenForestNew(BOPConfigurationIDs.forestHillsNewID)).setColor(353825).setBiomeName("ForestHills").func_76733_a(5159473).setMinMaxHeight(0.8F, 1.0F).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.taigaHillsNew = Optional.of((new BiomeGenTaigaNew(BOPConfiguration.IDs.taigaHillsNewID)).setColor(747097).setBiomeName("TaigaHills").func_76733_a(5159473).setEnableSnow().setTemperatureRainfall(0.05F, 0.8F).setMinMaxHeight(0.8F, 1.0F)); + Biomes.taigaNew = Optional.of((new BiomeGenTaigaNew(BOPConfigurationIDs.taigaNewID)).setColor(747097).setBiomeName("Taiga").func_76733_a(5159473).setEnableSnow().setTemperatureRainfall(0.05F, 0.8F).setMinMaxHeight(0.3F, 0.5F)); + Biomes.taigaHillsNew = Optional.of((new BiomeGenTaigaNew(BOPConfigurationIDs.taigaHillsNewID)).setColor(747097).setBiomeName("TaigaHills").func_76733_a(5159473).setEnableSnow().setTemperatureRainfall(0.05F, 0.8F).setMinMaxHeight(0.8F, 1.0F)); - 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.swamplandNew = Optional.of((new BiomeGenSwampNew(BOPConfigurationIDs.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)); - Biomes.jungleHillsNew = Optional.of((new BiomeGenJungleNew(BOPConfiguration.IDs.jungleHillsNewID)).setColor(5470985).setBiomeName("JungleHills").func_76733_a(5470985).setTemperatureRainfall(1.2F, 0.9F).setMinMaxHeight(0.9F, 1.2F)); + Biomes.jungleNew = Optional.of((new BiomeGenJungleNew(BOPConfigurationIDs.jungleNewID)).setColor(5470985).setBiomeName("Jungle").func_76733_a(5470985).setTemperatureRainfall(1.2F, 0.9F).setMinMaxHeight(0.4F, 0.5F)); + Biomes.jungleHillsNew = Optional.of((new BiomeGenJungleNew(BOPConfigurationIDs.jungleHillsNewID)).setColor(5470985).setBiomeName("JungleHills").func_76733_a(5470985).setTemperatureRainfall(1.2F, 0.9F).setMinMaxHeight(0.9F, 1.2F)); } private static void addToBiomeDictionary() @@ -409,79 +432,79 @@ public class BOPBiomes { private static void addVillageBiomes() { - addVillageBiome(Biomes.alps, BOPConfiguration.TerrainGen.alpsVillage); - addVillageBiome(Biomes.arctic, BOPConfiguration.TerrainGen.arcticVillage); - addVillageBiome(Biomes.autumnHills, BOPConfiguration.TerrainGen.autumnHillsVillage); - 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.overgrownGreens, BOPConfiguration.TerrainGen.overgrownGreensVillage); - 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.alps, BOPConfigurationTerrainGen.alpsVillage); + addVillageBiome(Biomes.arctic, BOPConfigurationTerrainGen.arcticVillage); + addVillageBiome(Biomes.autumnHills, BOPConfigurationTerrainGen.autumnHillsVillage); + addVillageBiome(Biomes.badlands, BOPConfigurationTerrainGen.badlandsVillage); + addVillageBiome(Biomes.bambooForest, BOPConfigurationTerrainGen.bambooForestVillage); + addVillageBiome(Biomes.bayou, BOPConfigurationTerrainGen.bayouVillage); + addVillageBiome(Biomes.birchForest, BOPConfigurationTerrainGen.birchForestVillage); + addVillageBiome(Biomes.bog, BOPConfigurationTerrainGen.bogVillage); + addVillageBiome(Biomes.borealForest, BOPConfigurationTerrainGen.borealForestVillage); + addVillageBiome(Biomes.brushland, BOPConfigurationTerrainGen.brushlandVillage); + addVillageBiome(Biomes.canyon, BOPConfigurationTerrainGen.canyonVillage); + addVillageBiome(Biomes.chaparral, BOPConfigurationTerrainGen.chaparralVillage); + addVillageBiome(Biomes.cherryBlossomGrove, BOPConfigurationTerrainGen.cherryBlossomGroveVillage); + addVillageBiome(Biomes.coniferousForest, BOPConfigurationTerrainGen.coniferousForestVillage); + addVillageBiome(Biomes.coniferousForestSnow, BOPConfigurationTerrainGen.coniferousForestSnowVillage); + addVillageBiome(Biomes.deadForest, BOPConfigurationTerrainGen.deadForestVillage); + addVillageBiome(Biomes.deadForestSnow, BOPConfigurationTerrainGen.deadForestSnowVillage); + addVillageBiome(Biomes.deadSwamp, BOPConfigurationTerrainGen.deadSwampVillage); + addVillageBiome(Biomes.deciduousForest, BOPConfigurationTerrainGen.deciduousForestVillage); + addVillageBiome(Biomes.dunes, BOPConfigurationTerrainGen.dunesVillage); + addVillageBiome(Biomes.fen, BOPConfigurationTerrainGen.fenVillage); + addVillageBiome(Biomes.field, BOPConfigurationTerrainGen.fieldVillage); + addVillageBiome(Biomes.frostForest, BOPConfigurationTerrainGen.frostForestVillage); + addVillageBiome(Biomes.glacier, BOPConfigurationTerrainGen.glacierVillage); + addVillageBiome(Biomes.grassland, BOPConfigurationTerrainGen.grasslandVillage); + addVillageBiome(Biomes.grove, BOPConfigurationTerrainGen.groveVillage); + addVillageBiome(Biomes.heathland, BOPConfigurationTerrainGen.heathlandVillage); + addVillageBiome(Biomes.highland, BOPConfigurationTerrainGen.highlandVillage); + addVillageBiome(Biomes.hotSprings, BOPConfigurationTerrainGen.hotSpringsVillage); + addVillageBiome(Biomes.jadeCliffs, BOPConfigurationTerrainGen.jadeCliffsVillage); + addVillageBiome(Biomes.lushDesert, BOPConfigurationTerrainGen.lushDesertVillage); + addVillageBiome(Biomes.lushSwamp, BOPConfigurationTerrainGen.lushSwampVillage); + addVillageBiome(Biomes.mangrove, BOPConfigurationTerrainGen.mangroveVillage); + addVillageBiome(Biomes.mapleWoods, BOPConfigurationTerrainGen.mapleWoodsVillage); + addVillageBiome(Biomes.marsh, BOPConfigurationTerrainGen.marshVillage); + addVillageBiome(Biomes.meadow, BOPConfigurationTerrainGen.meadowVillage); + addVillageBiome(Biomes.mesa, BOPConfigurationTerrainGen.mesaVillage); + addVillageBiome(Biomes.moor, BOPConfigurationTerrainGen.moorVillage); + addVillageBiome(Biomes.mountain, BOPConfigurationTerrainGen.mountainVillage); + addVillageBiome(Biomes.oasis, BOPConfigurationTerrainGen.oasisVillage); + addVillageBiome(Biomes.orchard, BOPConfigurationTerrainGen.orchardVillage); + addVillageBiome(Biomes.outback, BOPConfigurationTerrainGen.outbackVillage); + addVillageBiome(Biomes.overgrownGreens, BOPConfigurationTerrainGen.overgrownGreensVillage); + addVillageBiome(Biomes.pasture, BOPConfigurationTerrainGen.pastureVillage); + addVillageBiome(Biomes.polar, BOPConfigurationTerrainGen.polarVillage); + addVillageBiome(Biomes.prairie, BOPConfigurationTerrainGen.prairieVillage); + addVillageBiome(Biomes.quagmire, BOPConfigurationTerrainGen.quagmireVillage); + addVillageBiome(Biomes.rainforest, BOPConfigurationTerrainGen.rainforestVillage); + addVillageBiome(Biomes.redwoodForest, BOPConfigurationTerrainGen.redwoodForestVillage); + addVillageBiome(Biomes.savanna, BOPConfigurationTerrainGen.savannaVillage); + addVillageBiome(Biomes.scrubland, BOPConfigurationTerrainGen.scrublandVillage); + addVillageBiome(Biomes.seasonalForest, BOPConfigurationTerrainGen.seasonalForestVillage); + addVillageBiome(Biomes.shield, BOPConfigurationTerrainGen.shieldVillage); + addVillageBiome(Biomes.shrubland, BOPConfigurationTerrainGen.shrublandVillage); + addVillageBiome(Biomes.sludgepit, BOPConfigurationTerrainGen.sludgepitVillage); + addVillageBiome(Biomes.spruceWoods, BOPConfigurationTerrainGen.spruceWoodsVillage); + addVillageBiome(Biomes.temperateRainforest, BOPConfigurationTerrainGen.temperateRainforestVillage); + addVillageBiome(Biomes.thicket, BOPConfigurationTerrainGen.thicketVillage); + addVillageBiome(Biomes.timber, BOPConfigurationTerrainGen.timberVillage); + addVillageBiome(Biomes.tropicalRainforest, BOPConfigurationTerrainGen.tropicalRainforestVillage); + addVillageBiome(Biomes.tropics, BOPConfigurationTerrainGen.tropicsVillage); + addVillageBiome(Biomes.tundra, BOPConfigurationTerrainGen.tundraVillage); + addVillageBiome(Biomes.volcano, BOPConfigurationTerrainGen.volcanoVillage); + addVillageBiome(Biomes.wetland, BOPConfigurationTerrainGen.wetlandVillage); + addVillageBiome(Biomes.woodland, BOPConfigurationTerrainGen.woodlandVillage); - 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); + addVillageBiome(Biomes.plainsNew, BOPConfigurationTerrainGen.plainsVillage); + addVillageBiome(Biomes.desertNew, BOPConfigurationTerrainGen.desertVillage); + addVillageBiome(Biomes.forestNew, BOPConfigurationTerrainGen.forestVillage); + addVillageBiome(Biomes.extremeHillsNew, BOPConfigurationTerrainGen.extremeHillsVillage); + addVillageBiome(Biomes.taigaNew, BOPConfigurationTerrainGen.taigaVillage); + addVillageBiome(Biomes.swamplandNew, BOPConfigurationTerrainGen.swamplandVillage); + addVillageBiome(Biomes.jungleNew, BOPConfigurationTerrainGen.jungleVillage); } private static void addStrongholdBiomes() @@ -574,323 +597,323 @@ public class BOPBiomes { private static void registerBiomes() { - if (BOPConfiguration.TerrainGen.addToDefault) + if (BOPConfigurationTerrainGen.addToDefault) { - if (BOPConfiguration.BiomeGen.alpsGen) { + if (BOPConfigurationBiomeGen.alpsGen) { registerBiome(Biomes.alps); } - if (BOPConfiguration.BiomeGen.arcticGen) { + if (BOPConfigurationBiomeGen.arcticGen) { registerBiome(Biomes.arctic); } - if (BOPConfiguration.BiomeGen.autumnHillsGen) { + if (BOPConfigurationBiomeGen.autumnHillsGen) { registerBiome(Biomes.autumnHills); } - if (BOPConfiguration.BiomeGen.badlandsGen) { + if (BOPConfigurationBiomeGen.badlandsGen) { registerBiome(Biomes.badlands); } - if (BOPConfiguration.BiomeGen.bambooForestGen) { + if (BOPConfigurationBiomeGen.bambooForestGen) { registerBiome(Biomes.bambooForest); } - if (BOPConfiguration.BiomeGen.bayouGen) { + if (BOPConfigurationBiomeGen.bayouGen) { registerBiome(Biomes.bayou); } - if (BOPConfiguration.BiomeGen.birchForestGen) { + if (BOPConfigurationBiomeGen.birchForestGen) { registerBiome(Biomes.birchForest); } - if (BOPConfiguration.BiomeGen.bogGen) { + if (BOPConfigurationBiomeGen.bogGen) { registerBiome(Biomes.bog); } - if (BOPConfiguration.BiomeGen.borealForestGen) { + if (BOPConfigurationBiomeGen.borealForestGen) { registerBiome(Biomes.borealForest); } - if (BOPConfiguration.BiomeGen.brushlandGen) { + if (BOPConfigurationBiomeGen.brushlandGen) { registerBiome(Biomes.brushland); } - if (BOPConfiguration.BiomeGen.canyonGen) { + if (BOPConfigurationBiomeGen.canyonGen) { registerBiome(Biomes.canyon); } - if (BOPConfiguration.BiomeGen.chaparralGen) { + if (BOPConfigurationBiomeGen.chaparralGen) { registerBiome(Biomes.chaparral); } - if (BOPConfiguration.BiomeGen.cherryBlossomGroveGen) { + if (BOPConfigurationBiomeGen.cherryBlossomGroveGen) { registerBiome(Biomes.cherryBlossomGrove); } - if (BOPConfiguration.BiomeGen.coniferousForestGen) { + if (BOPConfigurationBiomeGen.coniferousForestGen) { registerBiome(Biomes.coniferousForest); } - if (BOPConfiguration.BiomeGen.coniferousForestSnowGen) { + if (BOPConfigurationBiomeGen.coniferousForestSnowGen) { registerBiome(Biomes.coniferousForestSnow); } - if (BOPConfiguration.BiomeGen.cragGen) { + if (BOPConfigurationBiomeGen.cragGen) { registerBiome(Biomes.crag); } - if (BOPConfiguration.BiomeGen.deadForestGen) { + if (BOPConfigurationBiomeGen.deadForestGen) { registerBiome(Biomes.deadForest); } - if (BOPConfiguration.BiomeGen.deadForestSnowGen) { + if (BOPConfigurationBiomeGen.deadForestSnowGen) { registerBiome(Biomes.deadForestSnow); } - if (BOPConfiguration.BiomeGen.deadSwampGen) { + if (BOPConfigurationBiomeGen.deadSwampGen) { registerBiome(Biomes.deadSwamp); } - if (BOPConfiguration.BiomeGen.deadlandsGen) { + if (BOPConfigurationBiomeGen.deadlandsGen) { registerBiome(Biomes.deadlands); } - if (BOPConfiguration.BiomeGen.deciduousForestGen) { + if (BOPConfigurationBiomeGen.deciduousForestGen) { registerBiome(Biomes.deciduousForest); } - if (BOPConfiguration.BiomeGen.dunesGen) { + if (BOPConfigurationBiomeGen.dunesGen) { registerBiome(Biomes.dunes); } - if (BOPConfiguration.BiomeGen.fenGen) { + if (BOPConfigurationBiomeGen.fenGen) { registerBiome(Biomes.fen); } - if (BOPConfiguration.BiomeGen.fieldGen) { + if (BOPConfigurationBiomeGen.fieldGen) { registerBiome(Biomes.field); } - if (BOPConfiguration.BiomeGen.frostForestGen) { + if (BOPConfigurationBiomeGen.frostForestGen) { registerBiome(Biomes.frostForest); } - if (BOPConfiguration.BiomeGen.fungiForestGen) { + if (BOPConfigurationBiomeGen.fungiForestGen) { registerBiome(Biomes.fungiForest); } - if (BOPConfiguration.BiomeGen.gardenGen) { + if (BOPConfigurationBiomeGen.gardenGen) { registerBiome(Biomes.garden); } - if (BOPConfiguration.BiomeGen.glacierGen) { + if (BOPConfigurationBiomeGen.glacierGen) { registerBiome(Biomes.glacier); } - if (BOPConfiguration.BiomeGen.grasslandGen) { + if (BOPConfigurationBiomeGen.grasslandGen) { registerBiome(Biomes.grassland); } - if (BOPConfiguration.BiomeGen.groveGen) { + if (BOPConfigurationBiomeGen.groveGen) { registerBiome(Biomes.grove); } - if (BOPConfiguration.BiomeGen.heathlandGen) { + if (BOPConfigurationBiomeGen.heathlandGen) { registerBiome(Biomes.heathland); } - if (BOPConfiguration.BiomeGen.highlandGen) { + if (BOPConfigurationBiomeGen.highlandGen) { registerBiome(Biomes.highland); } - if (BOPConfiguration.BiomeGen.hotSpringsGen) { + if (BOPConfigurationBiomeGen.hotSpringsGen) { registerBiome(Biomes.hotSprings); } - if (BOPConfiguration.BiomeGen.icyHillsGen) { + if (BOPConfigurationBiomeGen.icyHillsGen) { registerBiome(Biomes.icyHills); } - if (BOPConfiguration.BiomeGen.jadeCliffsGen) { + if (BOPConfigurationBiomeGen.jadeCliffsGen) { registerBiome(Biomes.jadeCliffs); } - if (BOPConfiguration.BiomeGen.lushDesertGen) { + if (BOPConfigurationBiomeGen.lushDesertGen) { registerBiome(Biomes.lushDesert); } - if (BOPConfiguration.BiomeGen.lushSwampGen) { + if (BOPConfigurationBiomeGen.lushSwampGen) { registerBiome(Biomes.lushSwamp); } - if (BOPConfiguration.BiomeGen.mangroveGen) { + if (BOPConfigurationBiomeGen.mangroveGen) { registerBiome(Biomes.mangrove); } - if (BOPConfiguration.BiomeGen.mapleWoodsGen) { + if (BOPConfigurationBiomeGen.mapleWoodsGen) { registerBiome(Biomes.mapleWoods); } - if (BOPConfiguration.BiomeGen.marshGen) { + if (BOPConfigurationBiomeGen.marshGen) { registerBiome(Biomes.marsh); } - if (BOPConfiguration.BiomeGen.meadowGen) { + if (BOPConfigurationBiomeGen.meadowGen) { registerBiome(Biomes.meadow); } - if (BOPConfiguration.BiomeGen.mesaGen) { + if (BOPConfigurationBiomeGen.mesaGen) { registerBiome(Biomes.mesa); } - if (BOPConfiguration.BiomeGen.moorGen) { + if (BOPConfigurationBiomeGen.moorGen) { registerBiome(Biomes.moor); } - if (BOPConfiguration.BiomeGen.mountainGen) { + if (BOPConfigurationBiomeGen.mountainGen) { registerBiome(Biomes.mountain); } // if (BOPConfiguration.BiomeGen.mushroomIslandGen) // GameRegistry.addBiome(BiomeGenBase.mushroomIsland); - if (BOPConfiguration.BiomeGen.mysticGroveGen) { + if (BOPConfigurationBiomeGen.mysticGroveGen) { registerBiome(Biomes.mysticGrove); } - if (BOPConfiguration.BiomeGen.oasisGen) { + if (BOPConfigurationBiomeGen.oasisGen) { registerBiome(Biomes.oasis); } - if (BOPConfiguration.BiomeGen.ominousWoodsGen) { + if (BOPConfigurationBiomeGen.ominousWoodsGen) { registerBiome(Biomes.ominousWoods); } - if (BOPConfiguration.BiomeGen.orchardGen) { + if (BOPConfigurationBiomeGen.orchardGen) { registerBiome(Biomes.orchard); } - if (BOPConfiguration.BiomeGen.originValleyGen) { + if (BOPConfigurationBiomeGen.originValleyGen) { registerBiome(Biomes.originValley); } - if (BOPConfiguration.BiomeGen.outbackGen) { + if (BOPConfigurationBiomeGen.outbackGen) { registerBiome(Biomes.outback); } - if (BOPConfiguration.BiomeGen.overgrownGreensGen) { + if (BOPConfigurationBiomeGen.overgrownGreensGen) { registerBiome(Biomes.overgrownGreens); } - if (BOPConfiguration.BiomeGen.pastureGen) { + if (BOPConfigurationBiomeGen.pastureGen) { registerBiome(Biomes.pasture); } - if (BOPConfiguration.BiomeGen.polarGen) { + if (BOPConfigurationBiomeGen.polarGen) { registerBiome(Biomes.polar); } - if (BOPConfiguration.BiomeGen.prairieGen) { + if (BOPConfigurationBiomeGen.prairieGen) { registerBiome(Biomes.prairie); } - if (BOPConfiguration.BiomeGen.quagmireGen) { + if (BOPConfigurationBiomeGen.quagmireGen) { registerBiome(Biomes.quagmire); } - if (BOPConfiguration.BiomeGen.rainforestGen) { + if (BOPConfigurationBiomeGen.rainforestGen) { registerBiome(Biomes.rainforest); } - if (BOPConfiguration.BiomeGen.redwoodForestGen) { + if (BOPConfigurationBiomeGen.redwoodForestGen) { registerBiome(Biomes.redwoodForest); } - if (BOPConfiguration.BiomeGen.sacredSpringsGen) { + if (BOPConfigurationBiomeGen.sacredSpringsGen) { registerBiome(Biomes.sacredSprings); } - if (BOPConfiguration.BiomeGen.savannaGen) { + if (BOPConfigurationBiomeGen.savannaGen) { registerBiome(Biomes.savanna); } - if (BOPConfiguration.BiomeGen.scrublandGen) { + if (BOPConfigurationBiomeGen.scrublandGen) { registerBiome(Biomes.scrubland); } - if (BOPConfiguration.BiomeGen.seasonalForestGen) { + if (BOPConfigurationBiomeGen.seasonalForestGen) { registerBiome(Biomes.seasonalForest); } - if (BOPConfiguration.BiomeGen.shieldGen) { + if (BOPConfigurationBiomeGen.shieldGen) { registerBiome(Biomes.shield); } - if (BOPConfiguration.BiomeGen.shrublandGen) { + if (BOPConfigurationBiomeGen.shrublandGen) { registerBiome(Biomes.shrubland); } - if (BOPConfiguration.BiomeGen.silkgladesGen) { + if (BOPConfigurationBiomeGen.silkgladesGen) { registerBiome(Biomes.silkglades); } - if (BOPConfiguration.BiomeGen.sludgepitGen) { + if (BOPConfigurationBiomeGen.sludgepitGen) { registerBiome(Biomes.sludgepit); } - if (BOPConfiguration.BiomeGen.spruceWoodsGen) { + if (BOPConfigurationBiomeGen.spruceWoodsGen) { registerBiome(Biomes.spruceWoods); } - if (BOPConfiguration.BiomeGen.steppeGen) { + if (BOPConfigurationBiomeGen.steppeGen) { registerBiome(Biomes.steppe); } - if (BOPConfiguration.BiomeGen.temperateRainforestGen) { + if (BOPConfigurationBiomeGen.temperateRainforestGen) { registerBiome(Biomes.temperateRainforest); } - if (BOPConfiguration.BiomeGen.thicketGen) { + if (BOPConfigurationBiomeGen.thicketGen) { registerBiome(Biomes.thicket); } - if (BOPConfiguration.BiomeGen.timberGen) { + if (BOPConfigurationBiomeGen.timberGen) { registerBiome(Biomes.timber); } - if (BOPConfiguration.BiomeGen.tropicalRainforestGen) { + if (BOPConfigurationBiomeGen.tropicalRainforestGen) { registerBiome(Biomes.tropicalRainforest); } - if (BOPConfiguration.BiomeGen.tropicsGen) { + if (BOPConfigurationBiomeGen.tropicsGen) { registerBiome(Biomes.tropics); } - if (BOPConfiguration.BiomeGen.tundraGen) { + if (BOPConfigurationBiomeGen.tundraGen) { registerBiome(Biomes.tundra); } - if (BOPConfiguration.BiomeGen.volcanoGen) { + if (BOPConfigurationBiomeGen.volcanoGen) { registerBiome(Biomes.volcano); } - if (BOPConfiguration.BiomeGen.wastelandGen) { + if (BOPConfigurationBiomeGen.wastelandGen) { registerBiome(Biomes.wasteland); } - if (BOPConfiguration.BiomeGen.wetlandGen) { + if (BOPConfigurationBiomeGen.wetlandGen) { registerBiome(Biomes.wetland); } - if (BOPConfiguration.BiomeGen.woodlandGen) { + if (BOPConfigurationBiomeGen.woodlandGen) { registerBiome(Biomes.woodland); } // Vanilla biomes generation - if (BOPConfiguration.BiomeGen.plainsGen) + if (BOPConfigurationBiomeGen.plainsGen) { - if (BOPConfiguration.TerrainGen.vanillaEnhanced) + if (BOPConfigurationTerrainGen.vanillaEnhanced) { registerBiome(Biomes.plainsNew); GameRegistry.removeBiome(BiomeGenBase.plains); @@ -899,9 +922,9 @@ public class BOPBiomes { GameRegistry.removeBiome(BiomeGenBase.plains); } - if (BOPConfiguration.BiomeGen.desertGen) + if (BOPConfigurationBiomeGen.desertGen) { - if (BOPConfiguration.TerrainGen.vanillaEnhanced) + if (BOPConfigurationTerrainGen.vanillaEnhanced) { registerBiome(Biomes.desertNew); GameRegistry.removeBiome(BiomeGenBase.desert); @@ -910,9 +933,9 @@ public class BOPBiomes { GameRegistry.removeBiome(BiomeGenBase.desert); } - if (BOPConfiguration.BiomeGen.extremeHillsGen) + if (BOPConfigurationBiomeGen.extremeHillsGen) { - if (BOPConfiguration.TerrainGen.vanillaEnhanced) + if (BOPConfigurationTerrainGen.vanillaEnhanced) { registerBiome(Biomes.extremeHillsNew); GameRegistry.removeBiome(BiomeGenBase.extremeHills); @@ -921,9 +944,9 @@ public class BOPBiomes { GameRegistry.removeBiome(BiomeGenBase.extremeHills); } - if (BOPConfiguration.BiomeGen.forestGen) + if (BOPConfigurationBiomeGen.forestGen) { - if (BOPConfiguration.TerrainGen.vanillaEnhanced) + if (BOPConfigurationTerrainGen.vanillaEnhanced) { registerBiome(Biomes.forestNew); GameRegistry.removeBiome(BiomeGenBase.forest); @@ -932,9 +955,9 @@ public class BOPBiomes { GameRegistry.removeBiome(BiomeGenBase.forest); } - if (BOPConfiguration.BiomeGen.taigaGen) + if (BOPConfigurationBiomeGen.taigaGen) { - if (BOPConfiguration.TerrainGen.vanillaEnhanced) + if (BOPConfigurationTerrainGen.vanillaEnhanced) { registerBiome(Biomes.taigaNew); GameRegistry.removeBiome(BiomeGenBase.taiga); @@ -943,9 +966,9 @@ public class BOPBiomes { GameRegistry.removeBiome(BiomeGenBase.taiga); } - if (BOPConfiguration.BiomeGen.swamplandGen) + if (BOPConfigurationBiomeGen.swamplandGen) { - if (BOPConfiguration.TerrainGen.vanillaEnhanced) + if (BOPConfigurationTerrainGen.vanillaEnhanced) { registerBiome(Biomes.swamplandNew); GameRegistry.removeBiome(BiomeGenBase.swampland); @@ -954,9 +977,9 @@ public class BOPBiomes { GameRegistry.removeBiome(BiomeGenBase.swampland); } - if (BOPConfiguration.BiomeGen.jungleGen) + if (BOPConfigurationBiomeGen.jungleGen) { - if (BOPConfiguration.TerrainGen.vanillaEnhanced) + if (BOPConfigurationTerrainGen.vanillaEnhanced) { registerBiome(Biomes.jungleNew); GameRegistry.removeBiome(BiomeGenBase.jungle); @@ -969,318 +992,318 @@ public class BOPBiomes { private static void addBiomes() { - if (BOPConfiguration.BiomeGen.alpsGen) { + if (BOPConfigurationBiomeGen.alpsGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.alps); } - if (BOPConfiguration.BiomeGen.arcticGen) { + if (BOPConfigurationBiomeGen.arcticGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.arctic); } - if (BOPConfiguration.BiomeGen.autumnHillsGen) { + if (BOPConfigurationBiomeGen.autumnHillsGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.autumnHills); } - if (BOPConfiguration.BiomeGen.badlandsGen) { + if (BOPConfigurationBiomeGen.badlandsGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.badlands); } - if (BOPConfiguration.BiomeGen.bambooForestGen) { + if (BOPConfigurationBiomeGen.bambooForestGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.bambooForest); } - if (BOPConfiguration.BiomeGen.bayouGen) { + if (BOPConfigurationBiomeGen.bayouGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.bayou); } - if (BOPConfiguration.BiomeGen.birchForestGen) { + if (BOPConfigurationBiomeGen.birchForestGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.birchForest); } - if (BOPConfiguration.BiomeGen.bogGen) { + if (BOPConfigurationBiomeGen.bogGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.bog); } - if (BOPConfiguration.BiomeGen.borealForestGen) { + if (BOPConfigurationBiomeGen.borealForestGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.borealForest); } - if (BOPConfiguration.BiomeGen.brushlandGen) { + if (BOPConfigurationBiomeGen.brushlandGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.brushland); } - if (BOPConfiguration.BiomeGen.canyonGen) { + if (BOPConfigurationBiomeGen.canyonGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.canyon); } - if (BOPConfiguration.BiomeGen.chaparralGen) { + if (BOPConfigurationBiomeGen.chaparralGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.chaparral); } - if (BOPConfiguration.BiomeGen.cherryBlossomGroveGen) { + if (BOPConfigurationBiomeGen.cherryBlossomGroveGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.cherryBlossomGrove); } - if (BOPConfiguration.BiomeGen.coniferousForestGen) { + if (BOPConfigurationBiomeGen.coniferousForestGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.coniferousForest); } - if (BOPConfiguration.BiomeGen.coniferousForestSnowGen) { + if (BOPConfigurationBiomeGen.coniferousForestSnowGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.coniferousForestSnow); } - if (BOPConfiguration.BiomeGen.cragGen) { + if (BOPConfigurationBiomeGen.cragGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.crag); } - if (BOPConfiguration.BiomeGen.deadForestGen) { + if (BOPConfigurationBiomeGen.deadForestGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.deadForest); } - if (BOPConfiguration.BiomeGen.deadForestSnowGen) { + if (BOPConfigurationBiomeGen.deadForestSnowGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.deadForestSnow); } - if (BOPConfiguration.BiomeGen.deadSwampGen) { + if (BOPConfigurationBiomeGen.deadSwampGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.deadSwamp); } - if (BOPConfiguration.BiomeGen.deadlandsGen) { + if (BOPConfigurationBiomeGen.deadlandsGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.deadlands); } - if (BOPConfiguration.BiomeGen.deciduousForestGen) { + if (BOPConfigurationBiomeGen.deciduousForestGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.deciduousForest); } - if (BOPConfiguration.BiomeGen.dunesGen) { + if (BOPConfigurationBiomeGen.dunesGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.dunes); } - if (BOPConfiguration.BiomeGen.fenGen) { + if (BOPConfigurationBiomeGen.fenGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.fen); } - if (BOPConfiguration.BiomeGen.fieldGen) { + if (BOPConfigurationBiomeGen.fieldGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.field); } - if (BOPConfiguration.BiomeGen.frostForestGen) { + if (BOPConfigurationBiomeGen.frostForestGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.frostForest); } - if (BOPConfiguration.BiomeGen.fungiForestGen) { + if (BOPConfigurationBiomeGen.fungiForestGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.fungiForest); } - if (BOPConfiguration.BiomeGen.gardenGen) { + if (BOPConfigurationBiomeGen.gardenGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.garden); } - if (BOPConfiguration.BiomeGen.glacierGen) { + if (BOPConfigurationBiomeGen.glacierGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.glacier); } - if (BOPConfiguration.BiomeGen.grasslandGen) { + if (BOPConfigurationBiomeGen.grasslandGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.grassland); } - if (BOPConfiguration.BiomeGen.groveGen) { + if (BOPConfigurationBiomeGen.groveGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.grove); } - if (BOPConfiguration.BiomeGen.heathlandGen) { + if (BOPConfigurationBiomeGen.heathlandGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.heathland); } - if (BOPConfiguration.BiomeGen.highlandGen) { + if (BOPConfigurationBiomeGen.highlandGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.highland); } - if (BOPConfiguration.BiomeGen.hotSpringsGen) { + if (BOPConfigurationBiomeGen.hotSpringsGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.hotSprings); } - if (BOPConfiguration.BiomeGen.icyHillsGen) { + if (BOPConfigurationBiomeGen.icyHillsGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.icyHills); } - if (BOPConfiguration.BiomeGen.jadeCliffsGen) { + if (BOPConfigurationBiomeGen.jadeCliffsGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.jadeCliffs); } - if (BOPConfiguration.BiomeGen.lushDesertGen) { + if (BOPConfigurationBiomeGen.lushDesertGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.lushDesert); } - if (BOPConfiguration.BiomeGen.lushSwampGen) { + if (BOPConfigurationBiomeGen.lushSwampGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.lushSwamp); } - if (BOPConfiguration.BiomeGen.mangroveGen) { + if (BOPConfigurationBiomeGen.mangroveGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.mangrove); } - if (BOPConfiguration.BiomeGen.mapleWoodsGen) { + if (BOPConfigurationBiomeGen.mapleWoodsGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.mapleWoods); } - if (BOPConfiguration.BiomeGen.marshGen) { + if (BOPConfigurationBiomeGen.marshGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.marsh); } - if (BOPConfiguration.BiomeGen.meadowGen) { + if (BOPConfigurationBiomeGen.meadowGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.meadow); } - if (BOPConfiguration.BiomeGen.mesaGen) { + if (BOPConfigurationBiomeGen.mesaGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.mesa); } - if (BOPConfiguration.BiomeGen.moorGen) { + if (BOPConfigurationBiomeGen.moorGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.moor); } - if (BOPConfiguration.BiomeGen.mountainGen) { + if (BOPConfigurationBiomeGen.mountainGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.mountain); } - if (BOPConfiguration.BiomeGen.mysticGroveGen) { + if (BOPConfigurationBiomeGen.mysticGroveGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.mysticGrove); } - if (BOPConfiguration.BiomeGen.oasisGen) { + if (BOPConfigurationBiomeGen.oasisGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.oasis); } - if (BOPConfiguration.BiomeGen.ominousWoodsGen) { + if (BOPConfigurationBiomeGen.ominousWoodsGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.ominousWoods); } - if (BOPConfiguration.BiomeGen.orchardGen) { + if (BOPConfigurationBiomeGen.orchardGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.orchard); } - if (BOPConfiguration.BiomeGen.originValleyGen) { + if (BOPConfigurationBiomeGen.originValleyGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.originValley); } - if (BOPConfiguration.BiomeGen.outbackGen) { + if (BOPConfigurationBiomeGen.outbackGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.outback); } - if (BOPConfiguration.BiomeGen.overgrownGreensGen) { + if (BOPConfigurationBiomeGen.overgrownGreensGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.overgrownGreens); } - if (BOPConfiguration.BiomeGen.pastureGen) { + if (BOPConfigurationBiomeGen.pastureGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.pasture); } - if (BOPConfiguration.BiomeGen.polarGen) { + if (BOPConfigurationBiomeGen.polarGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.polar); } - if (BOPConfiguration.BiomeGen.prairieGen) { + if (BOPConfigurationBiomeGen.prairieGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.prairie); } - if (BOPConfiguration.BiomeGen.quagmireGen) { + if (BOPConfigurationBiomeGen.quagmireGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.quagmire); } - if (BOPConfiguration.BiomeGen.rainforestGen) { + if (BOPConfigurationBiomeGen.rainforestGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.rainforest); } - if (BOPConfiguration.BiomeGen.redwoodForestGen) { + if (BOPConfigurationBiomeGen.redwoodForestGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.redwoodForest); } - if (BOPConfiguration.BiomeGen.sacredSpringsGen) { + if (BOPConfigurationBiomeGen.sacredSpringsGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.sacredSprings); } - if (BOPConfiguration.BiomeGen.savannaGen) { + if (BOPConfigurationBiomeGen.savannaGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.savanna); } - if (BOPConfiguration.BiomeGen.scrublandGen) { + if (BOPConfigurationBiomeGen.scrublandGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.scrubland); } - if (BOPConfiguration.BiomeGen.seasonalForestGen) { + if (BOPConfigurationBiomeGen.seasonalForestGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.seasonalForest); } - if (BOPConfiguration.BiomeGen.shieldGen) { + if (BOPConfigurationBiomeGen.shieldGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.shield); } - if (BOPConfiguration.BiomeGen.shrublandGen) { + if (BOPConfigurationBiomeGen.shrublandGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.shrubland); } - if (BOPConfiguration.BiomeGen.silkgladesGen) { + if (BOPConfigurationBiomeGen.silkgladesGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.silkglades); } - if (BOPConfiguration.BiomeGen.sludgepitGen) { + if (BOPConfigurationBiomeGen.sludgepitGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.sludgepit); } - if (BOPConfiguration.BiomeGen.spruceWoodsGen) { + if (BOPConfigurationBiomeGen.spruceWoodsGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.spruceWoods); } - if (BOPConfiguration.BiomeGen.steppeGen) { + if (BOPConfigurationBiomeGen.steppeGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.steppe); } - if (BOPConfiguration.BiomeGen.temperateRainforestGen) { + if (BOPConfigurationBiomeGen.temperateRainforestGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.temperateRainforest); } - if (BOPConfiguration.BiomeGen.thicketGen) { + if (BOPConfigurationBiomeGen.thicketGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.thicket); } - if (BOPConfiguration.BiomeGen.timberGen) { + if (BOPConfigurationBiomeGen.timberGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.timber); } - if (BOPConfiguration.BiomeGen.tropicalRainforestGen) { + if (BOPConfigurationBiomeGen.tropicalRainforestGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.tropicalRainforest); } - if (BOPConfiguration.BiomeGen.tropicsGen) { + if (BOPConfigurationBiomeGen.tropicsGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.tropics); } - if (BOPConfiguration.BiomeGen.tundraGen) { + if (BOPConfigurationBiomeGen.tundraGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.tundra); } - if (BOPConfiguration.BiomeGen.volcanoGen) { + if (BOPConfigurationBiomeGen.volcanoGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.volcano); } - if (BOPConfiguration.BiomeGen.wastelandGen) { + if (BOPConfigurationBiomeGen.wastelandGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.wasteland); } - if (BOPConfiguration.BiomeGen.wetlandGen) { + if (BOPConfigurationBiomeGen.wetlandGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.wetland); } - if (BOPConfiguration.BiomeGen.woodlandGen) { + if (BOPConfigurationBiomeGen.woodlandGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.woodland); } // Vanilla biomes generation - if (BOPConfiguration.BiomeGen.plainsGen) + if (BOPConfigurationBiomeGen.plainsGen) { - if (BOPConfiguration.TerrainGen.vanillaEnhanced) + if (BOPConfigurationTerrainGen.vanillaEnhanced) { addBiomeToWorldTypes(getWorldTypes(), Biomes.plainsNew); removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.plains); @@ -1289,9 +1312,9 @@ public class BOPBiomes { removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.plains); } - if (BOPConfiguration.BiomeGen.desertGen) + if (BOPConfigurationBiomeGen.desertGen) { - if (BOPConfiguration.TerrainGen.vanillaEnhanced) + if (BOPConfigurationTerrainGen.vanillaEnhanced) { addBiomeToWorldTypes(getWorldTypes(), Biomes.desertNew); removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.desert); @@ -1300,9 +1323,9 @@ public class BOPBiomes { removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.desert); } - if (BOPConfiguration.BiomeGen.extremeHillsGen) + if (BOPConfigurationBiomeGen.extremeHillsGen) { - if (BOPConfiguration.TerrainGen.vanillaEnhanced) + if (BOPConfigurationTerrainGen.vanillaEnhanced) { addBiomeToWorldTypes(getWorldTypes(), Biomes.extremeHillsNew); removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.extremeHills); @@ -1311,9 +1334,9 @@ public class BOPBiomes { removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.extremeHills); } - if (BOPConfiguration.BiomeGen.forestGen) + if (BOPConfigurationBiomeGen.forestGen) { - if (BOPConfiguration.TerrainGen.vanillaEnhanced) + if (BOPConfigurationTerrainGen.vanillaEnhanced) { addBiomeToWorldTypes(getWorldTypes(), Biomes.forestNew); removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.forest); @@ -1322,9 +1345,9 @@ public class BOPBiomes { removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.forest); } - if (BOPConfiguration.BiomeGen.taigaGen) + if (BOPConfigurationBiomeGen.taigaGen) { - if (BOPConfiguration.TerrainGen.vanillaEnhanced) + if (BOPConfigurationTerrainGen.vanillaEnhanced) { addBiomeToWorldTypes(getWorldTypes(), Biomes.taigaNew); removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.taiga); @@ -1333,9 +1356,9 @@ public class BOPBiomes { removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.taiga); } - if (BOPConfiguration.BiomeGen.swamplandGen) + if (BOPConfigurationBiomeGen.swamplandGen) { - if (BOPConfiguration.TerrainGen.vanillaEnhanced) + if (BOPConfigurationTerrainGen.vanillaEnhanced) { addBiomeToWorldTypes(getWorldTypes(), Biomes.swamplandNew); removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.swampland); @@ -1344,9 +1367,9 @@ public class BOPBiomes { removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.swampland); } - if (BOPConfiguration.BiomeGen.jungleGen) + if (BOPConfigurationBiomeGen.jungleGen) { - if (BOPConfiguration.TerrainGen.vanillaEnhanced) + if (BOPConfigurationTerrainGen.vanillaEnhanced) { addBiomeToWorldTypes(getWorldTypes(), Biomes.jungleNew); removeBiomeFromWorldTypes(getWorldTypes(), BiomeGenBase.jungle); @@ -1358,7 +1381,7 @@ public class BOPBiomes { public static Set getWorldTypes() { if (worldTypes.isEmpty()) { - if (BOPConfiguration.TerrainGen.addToDefault) + if (BOPConfigurationTerrainGen.addToDefault) { worldTypes.add(WorldType.DEFAULT); worldTypes.add(WorldType.LARGE_BIOMES); diff --git a/common/biomesoplenty/configuration/BOPBlocks.java b/common/biomesoplenty/configuration/BOPBlocks.java index 0b320f4ee..3cbd58fb6 100644 --- a/common/biomesoplenty/configuration/BOPBlocks.java +++ b/common/biomesoplenty/configuration/BOPBlocks.java @@ -47,6 +47,7 @@ import biomesoplenty.blocks.BlockPromisedPortal; import biomesoplenty.blocks.BlockPuddle; import biomesoplenty.blocks.BlockTreeMoss; import biomesoplenty.blocks.BlockWillow; +import biomesoplenty.configuration.configfile.BOPConfigurationIDs; import biomesoplenty.itemblocks.ItemBlockAltar; import biomesoplenty.itemblocks.ItemBlockAppleLeaves; import biomesoplenty.itemblocks.ItemBlockBamboo; @@ -121,88 +122,88 @@ public class BOPBlocks private static void initializeBlocks() { // Block declaration - 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.leavesFruit2 = Optional.of((new BlockBOPPersimmonLeaves(BOPConfiguration.IDs.leavesFruit2ID)).setUnlocalizedName("bop.leavesFruit2")); - 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)).setHardness(1.0F).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)).setHardness(1.6F).setUnlocalizedName("bop.redCobbleStairs")); - Blocks.redBricksStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.redBrickStairsID, Blocks.redRock.get(), Category.RED_BRICKS)).setHardness(1.1F).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)).setHardness(1.6F).setUnlocalizedName("bop.holyCobbleStairs")); - Blocks.holyBricksStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.IDs.holyBrickStairsID, Blocks.holyStone.get(), Category.HOLY_BRICKS)).setHardness(1.1F).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.mud = Optional.of((new BlockMud(BOPConfigurationIDs.mudID)).setHardness(0.6F).setStepSound(Block.soundSandFootstep).setUnlocalizedName("bop.mud")); + Blocks.driedDirt = Optional.of(new BlockBOPGeneric(BOPConfigurationIDs.driedDirtID, Material.rock, BlockType.DRIED_DIRT).setUnlocalizedName("bop.generic")); + Blocks.redRock = Optional.of((new BlockBOPRedRock(BOPConfigurationIDs.redRockID)).setUnlocalizedName("bop.redRocks")); + Blocks.ash = Optional.of((new BlockAsh(BOPConfigurationIDs.ashID)).setHardness(0.4F).setStepSound(Block.soundSandFootstep).setUnlocalizedName("bop.ash")); + Blocks.plants = Optional.of((new BlockBOPPlant(BOPConfigurationIDs.plantsID)).setUnlocalizedName("bop.plants")); + Blocks.flowers = Optional.of((new BlockBOPFlower(BOPConfigurationIDs.flowersID)).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.flowers")); + Blocks.mushrooms = Optional.of((new BlockBOPMushroom(BOPConfigurationIDs.mushroomsID)).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.mushrooms")); + Blocks.coral = Optional.of((new BlockBOPCoral(BOPConfigurationIDs.coralID)).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.coral")); + Blocks.willow = Optional.of((new BlockWillow(BOPConfigurationIDs.willowID)).setHardness(0.2F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.willow")); + Blocks.ivy = Optional.of((new BlockIvy(BOPConfigurationIDs.ivyID)).setHardness(0.2F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.ivy")); + Blocks.leaves1 = Optional.of((new BlockBOPLeaves(BOPConfigurationIDs.leaves1ID, LeafCategory.CAT1)).setUnlocalizedName("bop.leaves1")); + Blocks.leaves2 = Optional.of((new BlockBOPLeaves(BOPConfigurationIDs.leaves2ID, LeafCategory.CAT2)).setUnlocalizedName("bop.leaves2")); + Blocks.foliage = Optional.of((new BlockBOPFoliage(BOPConfigurationIDs.foliageID)).setUnlocalizedName("bop.foliage")); + Blocks.ashStone = Optional.of(new BlockBOPGeneric(BOPConfigurationIDs.ashStoneID, Material.rock, BlockType.ASH_STONE)); + Blocks.hardIce = Optional.of(new BlockBOPGeneric(BOPConfigurationIDs.hardIceID, Material.rock, BlockType.HARD_ICE)); + Blocks.leavesFruit = Optional.of((new BlockBOPAppleLeaves(BOPConfigurationIDs.leavesFruitID)).setUnlocalizedName("bop.leavesFruit")); + Blocks.leavesFruit2 = Optional.of((new BlockBOPPersimmonLeaves(BOPConfigurationIDs.leavesFruit2ID)).setUnlocalizedName("bop.leavesFruit2")); + Blocks.bamboo = Optional.of(new BlockBamboo(BOPConfigurationIDs.bambooID).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.bamboo")); + Blocks.mudBrick = Optional.of(new BlockBOPGeneric(BOPConfigurationIDs.mudBrickBlockID, Material.rock, BlockType.MUD_BRICK)); + Blocks.mudBricksStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.mudBrickStairsID, Blocks.redRock.get(), Category.MUD_BRICKS)).setHardness(1.0F).setUnlocalizedName("bop.mudBricksStairs")); + Blocks.stoneDoubleSlab = Optional.of((BlockHalfSlab)(new BlockBOPSlab(BOPConfigurationIDs.stoneDoubleSlabID, true, Material.rock, SlabCategory.STONE)).setUnlocalizedName("bop.stoneDoubleSlab")); + Blocks.stoneSingleSlab = Optional.of((BlockHalfSlab)(new BlockBOPSlab(BOPConfigurationIDs.stoneSingleSlabID, false, Material.rock, SlabCategory.STONE)).setUnlocalizedName("bop.stoneSingleSlab")); + Blocks.originGrass = Optional.of((new BlockOriginGrass(BOPConfigurationIDs.originGrassID)).setHardness(0.6F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.originGrass")); + Blocks.longGrass = Optional.of((new BlockLongGrass(BOPConfigurationIDs.longGrassID)).setHardness(0.6F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.longGrass")); + Blocks.treeMoss = Optional.of((new BlockTreeMoss(BOPConfigurationIDs.treeMossID)).setHardness(0.2F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.treeMoss")); + Blocks.logs1 = Optional.of((new BlockBOPLog(BOPConfigurationIDs.logs1ID,LogCategory.CAT1)).setUnlocalizedName("bop.wood1")); + Blocks.logs2 = Optional.of((new BlockBOPLog(BOPConfigurationIDs.logs2ID,LogCategory.CAT2)).setUnlocalizedName("bop.wood2")); + Blocks.logs3 = Optional.of((new BlockBOPLog(BOPConfigurationIDs.logs3ID,LogCategory.CAT3)).setUnlocalizedName("bop.wood3")); + Blocks.logs4 = Optional.of((new BlockBOPLog(BOPConfigurationIDs.logs4ID,LogCategory.CAT4)).setUnlocalizedName("bop.wood4")); + Blocks.petals = Optional.of((new BlockBOPPetals(BOPConfigurationIDs.petalsID)).setUnlocalizedName("bop.petals")); + Blocks.saplings = Optional.of((new BlockBOPSapling(BOPConfigurationIDs.saplingsID)).setUnlocalizedName("bop.saplings")); + Blocks.colorizedSaplings = Optional.of((new BlockBOPColorizedSapling(BOPConfigurationIDs.colourizedSaplingsID)).setUnlocalizedName("bop.colorizedSaplings")); + Blocks.redCobbleStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.redCobbleStairsID, Blocks.redRock.get(), Category.RED_COBBLE)).setHardness(1.6F).setUnlocalizedName("bop.redCobbleStairs")); + Blocks.redBricksStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.redBrickStairsID, Blocks.redRock.get(), Category.RED_BRICKS)).setHardness(1.1F).setUnlocalizedName("bop.redBricksStairs")); + Blocks.hardSand = Optional.of(new BlockBOPGeneric(BOPConfigurationIDs.hardSandID, Material.sand, BlockType.HARD_SAND)); + Blocks.hardDirt = Optional.of(new BlockBOPGeneric(BOPConfigurationIDs.hardDirtID, Material.rock, BlockType.HARD_DIRT)); + Blocks.holyGrass = Optional.of(new BlockBOPGrass(BOPConfigurationIDs.holyGrassID).setUnlocalizedName("bop.holyGrass")); + Blocks.holyDirt = Optional.of(new BlockBOPGeneric(BOPConfigurationIDs.holyDirtID, Material.sand, BlockType.HOLY_DIRT)); + Blocks.holyStone = Optional.of((new BlockBOPSkystone(BOPConfigurationIDs.holyStoneID)).setUnlocalizedName("bop.holyStone")); + Blocks.holyCobbleStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.holyCobbleStairsID, Blocks.holyStone.get(), Category.HOLY_COBBLE)).setHardness(1.6F).setUnlocalizedName("bop.holyCobbleStairs")); + Blocks.holyBricksStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.holyBrickStairsID, Blocks.holyStone.get(), Category.HOLY_BRICKS)).setHardness(1.1F).setUnlocalizedName("bop.holyBricksStairs")); + Blocks.crystal = Optional.of(new BlockBOPGeneric(BOPConfigurationIDs.crystalID, Material.glass, BlockType.CRYSTAL)); + Blocks.promisedPortal = Optional.of(new BlockPromisedPortal(BOPConfigurationIDs.promisedLandPortalID).setUnlocalizedName("bop.promisedPortal").setBlockUnbreakable().setResistance(6000000.0F).setLightValue(1.0F)); - Blocks.amethystOre = Optional.of(new BlockBOPAmethyst(BOPConfiguration.IDs.amethystOreID, Material.rock).setUnlocalizedName("bop.amethystOre")); + Blocks.amethystOre = Optional.of(new BlockBOPAmethyst(BOPConfigurationIDs.amethystOreID, Material.rock).setUnlocalizedName("bop.amethystOre")); - Blocks.moss = Optional.of((new BlockMoss(BOPConfiguration.IDs.mossID)).setHardness(0.2F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.moss")); + Blocks.moss = Optional.of((new BlockMoss(BOPConfigurationIDs.mossID)).setHardness(0.2F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.moss")); - Blocks.cragRock = Optional.of(new BlockBOPGeneric(BOPConfiguration.IDs.cragRockID, Material.rock, BlockType.CRAG_ROCK)); + Blocks.cragRock = Optional.of(new BlockBOPGeneric(BOPConfigurationIDs.cragRockID, Material.rock, BlockType.CRAG_ROCK)); - Blocks.cloud = Optional.of((new BlockCloud(BOPConfiguration.IDs.cloudID)).setHardness(0.1F).setLightOpacity(3).setStepSound(Block.soundClothFootstep).setUnlocalizedName("bop.cloud")); + Blocks.cloud = Optional.of((new BlockCloud(BOPConfigurationIDs.cloudID)).setHardness(0.1F).setLightOpacity(3).setStepSound(Block.soundClothFootstep).setUnlocalizedName("bop.cloud")); - Blocks.bones = Optional.of((new BlockBones(BOPConfiguration.IDs.bonesID)).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("bop.bones")); + Blocks.bones = Optional.of((new BlockBones(BOPConfigurationIDs.bonesID)).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("bop.bones")); - Blocks.glass = Optional.of((new BlockBOPGlass(BOPConfiguration.IDs.glassID)).setStepSound(Block.soundGlassFootstep).setUnlocalizedName("bop.glass")); + Blocks.glass = Optional.of((new BlockBOPGlass(BOPConfigurationIDs.glassID)).setStepSound(Block.soundGlassFootstep).setUnlocalizedName("bop.glass")); - Blocks.altar = Optional.of((new BlockAltar(BOPConfiguration.IDs.altarID)).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("bop.altar")); + Blocks.altar = Optional.of((new BlockAltar(BOPConfigurationIDs.altarID)).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("bop.altar")); - Blocks.puddle = Optional.of((new BlockPuddle(BOPConfiguration.IDs.puddleID)).setHardness(0.6F).setStepSound(Block.soundGravelFootstep).setUnlocalizedName("bop.puddle")); - Blocks.grave = Optional.of((new BlockGrave(BOPConfiguration.IDs.graveID)).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("bop.grave")); + Blocks.puddle = Optional.of((new BlockPuddle(BOPConfigurationIDs.puddleID)).setHardness(0.6F).setStepSound(Block.soundGravelFootstep).setUnlocalizedName("bop.puddle")); + Blocks.grave = Optional.of((new BlockGrave(BOPConfigurationIDs.graveID)).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("bop.grave")); - Blocks.planks = Optional.of((new BlockBOPPlank(BOPConfiguration.IDs.planksID)).setResistance(5.0F).setStepSound(Block.soundWoodFootstep).setUnlocalizedName("bop.planks")); + Blocks.planks = Optional.of((new BlockBOPPlank(BOPConfigurationIDs.planksID)).setResistance(5.0F).setStepSound(Block.soundWoodFootstep).setUnlocalizedName("bop.planks")); - 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.woodenDoubleSlab1 = Optional.of((BlockHalfSlab)(new BlockBOPSlab(BOPConfigurationIDs.woodenDoubleSlab1ID, true, Material.wood, SlabCategory.WOOD1)).setUnlocalizedName("bop.woodenDoubleSlab1")); + Blocks.woodenSingleSlab1 = Optional.of((BlockHalfSlab)(new BlockBOPSlab(BOPConfigurationIDs.woodenSingleSlab1ID, false, Material.wood, SlabCategory.WOOD1)).setUnlocalizedName("bop.woodenSingleSlab1")); + Blocks.woodenDoubleSlab2 = Optional.of((BlockHalfSlab)(new BlockBOPSlab(BOPConfigurationIDs.woodenDoubleSlab2ID, true, Material.wood, SlabCategory.WOOD2)).setUnlocalizedName("bop.woodenDoubleSlab2")); + Blocks.woodenSingleSlab2 = Optional.of((BlockHalfSlab)(new BlockBOPSlab(BOPConfigurationIDs.woodenSingleSlab2ID, false, Material.wood, SlabCategory.WOOD2)).setUnlocalizedName("bop.woodenSingleSlab2")); - 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")); + Blocks.acaciaStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.acaciaStairsID, Blocks.planks.get(), Category.ACACIA)).setUnlocalizedName("bop.acaciaStairs")); + Blocks.cherryStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.cherryStairsID, Blocks.planks.get(), Category.CHERRY)).setUnlocalizedName("bop.cherryStairs")); + Blocks.darkStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.darkStairsID, Blocks.planks.get(), Category.DARK)).setUnlocalizedName("bop.darkStairs")); + Blocks.firStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.firStairsID, Blocks.planks.get(), Category.FIR)).setUnlocalizedName("bop.firStairs")); + Blocks.holyStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.holyStairsID, Blocks.planks.get(), Category.HOLY)).setUnlocalizedName("bop.holyStairs")); + Blocks.magicStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.magicStairsID, Blocks.planks.get(), Category.MAGIC)).setUnlocalizedName("bop.magicStairs")); + Blocks.mangroveStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.mangroveStairsID, Blocks.planks.get(), Category.MANGROVE)).setUnlocalizedName("bop.mangroveStairs")); + Blocks.palmStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.palmStairsID, Blocks.planks.get(), Category.PALM)).setUnlocalizedName("bop.palmStairs")); + Blocks.redwoodStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.redwoodStairsID, Blocks.planks.get(), Category.REDWOOD)).setUnlocalizedName("bop.redwoodStairs")); + Blocks.willowStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.willowStairsID, Blocks.planks.get(), Category.WILLOW)).setUnlocalizedName("bop.willowStairs")); + Blocks.pineStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.pineStairsID, Blocks.planks.get(), Category.PINE)).setUnlocalizedName("bop.pineStairs")); + Blocks.hellBarkStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.hellBarkStairsID, Blocks.planks.get(), Category.HELL_BARK)).setUnlocalizedName("bop.hellBarkStairs")); + Blocks.jacarandaStairs = Optional.of((new BlockBOPStairs(BOPConfigurationIDs.jacarandaStairsID, Blocks.planks.get(), Category.JACARANDA)).setUnlocalizedName("bop.jacarandaStairs")); + Blocks.leavesColorized = Optional.of((new BlockBOPColorizedLeaves(BOPConfigurationIDs.colourizedLeavesID)).setUnlocalizedName("bop.leavesColorized")); } private static void registerBlocks() diff --git a/common/biomesoplenty/configuration/BOPConfiguration.java b/common/biomesoplenty/configuration/BOPConfiguration.java deleted file mode 100644 index 2f301d191..000000000 --- a/common/biomesoplenty/configuration/BOPConfiguration.java +++ /dev/null @@ -1,1207 +0,0 @@ -package biomesoplenty.configuration; - -import java.io.File; -import java.util.logging.Level; - -import net.minecraftforge.common.Configuration; -import net.minecraftforge.common.Property; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.FMLLog; - -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 void init(String configpath) - { - 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"); - - 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 = new Configuration(configFile); - - try - { - config.load(); - - //realisticTrees = config.get("Biome Settings", "Realistic Trees", true).getBoolean(true); - realisticTrees = false; - - seenVersion = config.get("Vars", "Seen Version", "null"); - seenWorldTypeMsg = config.get("Vars", "Seen WorldType Msg", false); - - FMLCommonHandler.instance().getFMLLogger().log(Level.INFO, "[BiomesOPlenty] Generated Main 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 BiomeGen - { - public static Configuration config; - - public static boolean alpsGen; - public static boolean arcticGen; - public static boolean autumnHillsGen; - 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 overgrownGreensGen; - 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 silkgladesGen; - 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) - { - 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); - autumnHillsGen = config.get("Biomes To Generate", "AutumnHills", false).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); - 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); - overgrownGreensGen = config.get("Biomes To Generate", "OvergrownGreens", false).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); - silkgladesGen = config.get("Biomes To Generate", "Silkglades", false).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); - oceanGen = config.get("Vanilla Biomes To Generate", "Ocean", true).getBoolean(false); - 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 Biome Gen 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 TerrainGen - { - public static Configuration config; - - public static double biomeSize; - public static boolean addToDefault; - public static boolean vanillaEnhanced; - public static boolean netherOverride; - public static boolean pumpkinGen; - public static boolean poisonIvyGen; - public static boolean thornGen; - public static boolean springWaterGen; - public static boolean poisonWaterGen; - public static boolean quicksandGen; - public static boolean exposedStone; - - public static int villageDistance; - - // Village biomes - public static boolean alpsVillage; - public static boolean arcticVillage; - public static boolean autumnHillsVillage; - public static boolean badlandsVillage; - public static boolean bambooForestVillage; - public static boolean bayouVillage; - public static boolean birchForestVillage; - public static boolean bogVillage; - public static boolean borealForestVillage; - public static boolean brushlandVillage; - public static boolean canyonVillage; - public static boolean chaparralVillage; - public static boolean cherryBlossomGroveVillage; - public static boolean coniferousForestVillage; - public static boolean coniferousForestSnowVillage; - public static boolean cragVillage; - public static boolean deadForestVillage; - public static boolean deadForestSnowVillage; - public static boolean deadSwampVillage; - public static boolean deadlandsVillage; - public static boolean deciduousForestVillage; - public static boolean 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 overgrownGreensVillage; - public static boolean pastureVillage; - public static boolean polarVillage; - public static boolean prairieVillage; - public static boolean quagmireVillage; - public static boolean rainforestVillage; - public static boolean redwoodForestVillage; - public static boolean sacredSpringsVillage; - public static boolean savannaVillage; - public static boolean scrublandVillage; - public static boolean seasonalForestVillage; - public static boolean shieldVillage; - public static boolean shrublandVillage; - public static boolean silkgladesVillage; - public static boolean sludgepitVillage; - public static boolean spruceWoodsVillage; - public static boolean steppeVillage; - public static boolean temperateRainforestVillage; - public static boolean thicketVillage; - public static boolean timberVillage; - public static boolean tropicalRainforestVillage; - public static boolean tropicsVillage; - public static boolean tundraVillage; - public static boolean volcanoVillage; - public static boolean wastelandVillage; - public static boolean wetlandVillage; - public static boolean woodlandVillage; - public static boolean plainsVillage; - public static boolean desertVillage; - public static boolean extremeHillsVillage; - public static boolean forestVillage; - public static boolean taigaVillage; - public static boolean swamplandVillage; - public static boolean jungleVillage; - - public static void init(File configFile) - { - config = new Configuration(configFile); - - try - { - config.load(); - - biomeSize = config.get("Biomes O\' Plenty World Type Settings", "Biome Size", 4.0, "Default World Type has 4. Large Biomes World Type has 6.").getDouble(4.0); - 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); - pumpkinGen = config.get("Decoration Settings", "Generate Pumpkins Without Faces", true).getBoolean(true); - poisonIvyGen = config.get("Decoration Settings", "Generate Poison Ivy", true).getBoolean(true); - thornGen = config.get("Decoration Settings", "Generate Thorns", true).getBoolean(true); - springWaterGen = config.get("Decoration Settings", "Generate Hot Springs", true).getBoolean(true); - poisonWaterGen = config.get("Decoration Settings", "Generate Poison Pools", true).getBoolean(true); - quicksandGen = config.get("Decoration Settings", "Generate Quicksand", true).getBoolean(true); - exposedStone = config.get("Decoration Settings", "Generate Sections Of Exposed Stone", 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", true).getBoolean(false); - autumnHillsVillage = config.get("Allow Villages", "AutumnHills", false).getBoolean(false); - badlandsVillage = config.get("Allow Villages", "Badlands", false).getBoolean(false); - bambooForestVillage = config.get("Allow Villages", "BambooForest", false).getBoolean(false); - bayouVillage = config.get("Allow Villages", "Bayou", false).getBoolean(false); - birchForestVillage = config.get("Allow Villages", "BirchForest", false).getBoolean(false); - bogVillage = config.get("Allow Villages", "Bog", false).getBoolean(false); - borealForestVillage = config.get("Allow Villages", "BorealForest", false).getBoolean(false); - brushlandVillage = config.get("Allow Villages", "Brushland", true).getBoolean(false); - canyonVillage = config.get("Allow Villages", "Canyon", false).getBoolean(false); - chaparralVillage = config.get("Allow Villages", "Chaparral", true).getBoolean(false); - cherryBlossomGroveVillage = config.get("Allow Villages", "CherryBlossomGrove", false).getBoolean(false); - coniferousForestVillage = config.get("Allow Villages", "ConiferousForest", false).getBoolean(false); - coniferousForestSnowVillage = config.get("Allow Villages", "ConiferousForestSnow", false).getBoolean(false); - cragVillage = config.get("Allow Villages", "Crag", false).getBoolean(false); - deadForestVillage = config.get("Allow Villages", "DeadForest", false).getBoolean(false); - deadForestSnowVillage = config.get("Allow Villages", "DeadForestSnow", false).getBoolean(false); - deadSwampVillage = config.get("Allow Villages", "DeadSwamp", false).getBoolean(false); - deadlandsVillage = config.get("Allow Villages", "Deadlands", false).getBoolean(false); - deciduousForestVillage = config.get("Allow Villages", "DeciduousForest", false).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", false).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", false).getBoolean(false); - lushSwampVillage = config.get("Allow Villages", "LushSwamp", false).getBoolean(false); - mangroveVillage = config.get("Allow Villages", "Mangrove", false).getBoolean(false); - mapleWoodsVillage = config.get("Allow Villages", "MapleWoods", false).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", false).getBoolean(false); - ominousWoodsVillage = config.get("Allow Villages", "OminousWoods", false).getBoolean(false); - orchardVillage = config.get("Allow Villages", "Orchard", false).getBoolean(false); - originValleyVillage = config.get("Allow Villages", "OriginValley", false).getBoolean(false); - outbackVillage = config.get("Allow Villages", "Outback", true).getBoolean(false); - overgrownGreensVillage = config.get("Allow Villages", "OvergrownGreens", true).getBoolean(false); - pastureVillage = config.get("Allow Villages", "Pasture", false).getBoolean(false); - polarVillage = config.get("Allow Villages", "Polar", false).getBoolean(false); - prairieVillage = config.get("Allow Villages", "Prairie", true).getBoolean(false); - quagmireVillage = config.get("Allow Villages", "Quagmire", false).getBoolean(false); - rainforestVillage = config.get("Allow Villages", "Rainforest", false).getBoolean(false); - redwoodForestVillage = config.get("Allow Villages", "RedwoodForest", false).getBoolean(false); - sacredSpringsVillage = config.get("Allow Villages", "SacredSprings", false).getBoolean(false); - savannaVillage = config.get("Allow Villages", "Savanna", true).getBoolean(false); - scrublandVillage = config.get("Allow Villages", "Scrubland", true).getBoolean(false); - seasonalForestVillage = config.get("Allow Villages", "SeasonalForest", false).getBoolean(false); - shieldVillage = config.get("Allow Villages", "Shield", false).getBoolean(false); - shrublandVillage = config.get("Allow Villages", "Shrubland", true).getBoolean(false); - silkgladesVillage = config.get("Allow Villages", "Silkgladess", false).getBoolean(false); - sludgepitVillage = config.get("Allow Villages", "Sludgepit", false).getBoolean(false); - spruceWoodsVillage = config.get("Allow Villages", "SpruceWoods", false).getBoolean(false); - steppeVillage = config.get("Allow Villages", "Steppe", true).getBoolean(false); - temperateRainforestVillage = config.get("Allow Villages", "TemperateRainforest", false).getBoolean(false); - thicketVillage = config.get("Allow Villages", "Thicket", false).getBoolean(false); - timberVillage = config.get("Allow Villages", "Timber", 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", false).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", false).getBoolean(false); - jungleVillage = config.get("Allow Villages", "Jungle", false).getBoolean(false); - plainsVillage = config.get("Allow Villages", "Plains", true).getBoolean(true); - swamplandVillage = config.get("Allow Villages", "Swampland", false).getBoolean(false); - taigaVillage = config.get("Allow Villages", "Taiga", false).getBoolean(false); - - FMLCommonHandler.instance().getFMLLogger().log(Level.INFO, "[BiomesOPlenty] Generated Terrain Gen Config!"); - } - 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 leavesFruit2ID; - 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; - public static int wadingBootsID; - public static int flippersID; - - //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 autumnHillsID; - 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 oceanAbyssID; - 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 overgrownGreensID; - 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 silkgladesID; - 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 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 int phantomID; - - 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(); - - leavesFruit2ID = config.getBlock("Fruit Leaf Block 2 ID", 1982, 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(); - - wadingBootsID = config.getItem("Wading Boots ID", 21088).getInt(); - flippersID = config.getItem("Flippers ID", 21089).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(); - phantomID = config.get("Mob IDs", "Phantom ID", 107, 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 - - autumnHillsID = config.get("Biome IDs", "Autumn Hills ID", 33).getInt(); - overgrownGreensID = config.get("Biome IDs", "Overgrown Greens ID", 34).getInt(); - forestHillsNewID = config.get("Biome IDs", "Forest Hills (Sub-Biome) ID", 35).getInt(); - taigaHillsNewID = config.get("Biome IDs", "Taiga Hills (Sub-Biome) ID", 36).getInt(); - jungleHillsNewID = config.get("Biome IDs", "Jungle Hills (Sub-Biome) ID", 37).getInt(); - silkgladesID = config.get("Biome IDs", "Silkglades ID", 38).getInt(); - 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(); - - oceanAbyssID = config.get("Biome IDs", "Oceanic Abyss (Ocean) ID", 57).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-159 Better World Generation 4 - - //160-161 BuildCraft Oil Fields - - //162-169 Thaumcraft - - 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 IDs 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 boolean hotSpringsRegeneration; - - 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); - hotSpringsRegeneration = config.get("Miscellanious Settings", "Enable Spring Water Regeneration Effect", 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 Misc 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/common/biomesoplenty/configuration/BOPCrafting.java b/common/biomesoplenty/configuration/BOPCrafting.java index cc68652ae..c125f54be 100644 --- a/common/biomesoplenty/configuration/BOPCrafting.java +++ b/common/biomesoplenty/configuration/BOPCrafting.java @@ -10,6 +10,7 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import biomesoplenty.api.Blocks; import biomesoplenty.api.Fluids; import biomesoplenty.api.Items; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; import biomesoplenty.helpers.FurnaceFuel; import cpw.mods.fml.common.registry.GameRegistry; @@ -158,7 +159,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.Misc.scytheCrafting) + if (BOPConfigurationMisc.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 +175,7 @@ public class BOPCrafting } //Mud Tools and Armor - if (BOPConfiguration.Misc.mudTools) + if (BOPConfigurationMisc.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 +191,7 @@ public class BOPCrafting } //Amethyst Tools and Armor - if (BOPConfiguration.Misc.amethystTools) + if (BOPConfigurationMisc.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 +208,7 @@ public class BOPCrafting } //Flower Bands - if (BOPConfiguration.Misc.flowerbandCrafting) + if (BOPConfigurationMisc.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 +219,7 @@ public class BOPCrafting //Other GameRegistry.addRecipe(new ItemStack(Item.wheat, 1), new Object[] {"###", '#', new ItemStack(Blocks.plants.get(),1,6)}); - if (BOPConfiguration.Misc.staffCrafting) + if (BOPConfigurationMisc.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 +228,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.Misc.enderporterCrafting) + if (BOPConfigurationMisc.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.Misc.altarCrafting) + if (BOPConfigurationMisc.altarCrafting) { GameRegistry.addRecipe(new ItemStack(Items.soulManipulator.get(), 1, 0), new Object[] {"G", "T", "B", 'G', Block.glass, 'T', Item.ghastTear, 'B', Item.blazeRod}); GameRegistry.addRecipe(new ItemStack(Items.soulManipulator.get(), 1, 1), new Object[] {"TSA", "PMS", "APT", 'S', new ItemStack(Items.miscItems.get(), 1, 16), 'A', Block.slowSand, 'T', Item.ghastTear, 'P', Item.blazePowder, 'M', new ItemStack(Items.soulManipulator.get(), 1, 0)}); @@ -243,7 +244,7 @@ public class BOPCrafting } //Dart Blower - if (BOPConfiguration.Misc.dartCrafting) + if (BOPConfigurationMisc.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/common/biomesoplenty/configuration/BOPEntities.java b/common/biomesoplenty/configuration/BOPEntities.java index 867a32fff..1b6a3ea8b 100644 --- a/common/biomesoplenty/configuration/BOPEntities.java +++ b/common/biomesoplenty/configuration/BOPEntities.java @@ -6,6 +6,7 @@ import net.minecraft.entity.EntityList; import net.minecraft.entity.EnumCreatureType; import biomesoplenty.BiomesOPlenty; import biomesoplenty.api.Biomes; +import biomesoplenty.configuration.configfile.BOPConfigurationIDs; import biomesoplenty.entities.EntityGlob; import biomesoplenty.entities.EntityJungleSpider; import biomesoplenty.entities.EntityPhantom; @@ -39,14 +40,14 @@ public class BOPEntities { public static void init() { - 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(EntityMudball.class, "MudBall", BOPConfigurationIDs.entityMudballID, BiomesOPlenty.instance, 80, 3, true); + EntityRegistry.registerModEntity(EntityDart.class, "Dart", BOPConfigurationIDs.entityDartID, BiomesOPlenty.instance, 80, 3, true); + EntityRegistry.registerModEntity(EntityPoisonDart.class, "PoisonDart", BOPConfigurationIDs.entityPoisonDartID, 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); - EntityRegistry.registerModEntity(EntityPhantom.class, "Phantom", BOPConfiguration.IDs.phantomID, BiomesOPlenty.instance, 80, 3, true); + EntityRegistry.registerModEntity(EntityJungleSpider.class, "JungleSpider", BOPConfigurationIDs.jungleSpiderID, BiomesOPlenty.instance, 80, 3, true); + EntityRegistry.registerModEntity(EntityRosester.class, "Rosester", BOPConfigurationIDs.rosesterID, BiomesOPlenty.instance, 80, 3, true); + EntityRegistry.registerModEntity(EntityGlob.class, "Glob", BOPConfigurationIDs.globID, BiomesOPlenty.instance, 80, 3, true); + EntityRegistry.registerModEntity(EntityPhantom.class, "Phantom", BOPConfigurationIDs.phantomID, BiomesOPlenty.instance, 80, 3, true); registerEntityEgg(EntityJungleSpider.class, 5147192, 11013646); registerEntityEgg(EntityRosester.class, 14831439, 16756224); diff --git a/common/biomesoplenty/configuration/BOPFluids.java b/common/biomesoplenty/configuration/BOPFluids.java index 6aafd50d9..b6088fe8b 100644 --- a/common/biomesoplenty/configuration/BOPFluids.java +++ b/common/biomesoplenty/configuration/BOPFluids.java @@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import biomesoplenty.api.Fluids; +import biomesoplenty.configuration.configfile.BOPConfigurationIDs; import biomesoplenty.fluids.BlockFluidLiquidPoison; import biomesoplenty.fluids.BlockFluidSpringWater; import biomesoplenty.fluids.LiquidPoisonFluid; @@ -28,23 +29,23 @@ public class BOPFluids private static void registerFluids() { - Fluids.liquidPoisonFluid = Optional.of(new LiquidPoisonFluid("bop.liquidPoison").setBlockID(BOPConfiguration.IDs.liquidPoisonStillID)); + Fluids.liquidPoisonFluid = Optional.of(new LiquidPoisonFluid("bop.liquidPoison").setBlockID(BOPConfigurationIDs.liquidPoisonStillID)); FluidRegistry.registerFluid(Fluids.liquidPoisonFluid.get()); - Fluids.springWaterFluid = Optional.of(new SpringWaterFluid("bop.springWater").setBlockID(BOPConfiguration.IDs.springWaterStillID)); + Fluids.springWaterFluid = Optional.of(new SpringWaterFluid("bop.springWater").setBlockID(BOPConfigurationIDs.springWaterStillID)); FluidRegistry.registerFluid(Fluids.springWaterFluid.get()); } private static void initializeLiquids() { - Fluids.liquidPoison = Optional.of(new BlockFluidLiquidPoison(BOPConfiguration.IDs.liquidPoisonStillID, Fluids.liquidPoisonFluid.get(), Material.water).setUnlocalizedName("bop.liquidPoison")); + Fluids.liquidPoison = Optional.of(new BlockFluidLiquidPoison(BOPConfigurationIDs.liquidPoisonStillID, Fluids.liquidPoisonFluid.get(), Material.water).setUnlocalizedName("bop.liquidPoison")); - Fluids.springWater = Optional.of(new BlockFluidSpringWater(BOPConfiguration.IDs.springWaterStillID, Fluids.springWaterFluid.get(), Material.water).setUnlocalizedName("bop.springWater")); + Fluids.springWater = Optional.of(new BlockFluidSpringWater(BOPConfigurationIDs.springWaterStillID, Fluids.springWaterFluid.get(), Material.water).setUnlocalizedName("bop.springWater")); } private static void initializeContainers() { - Fluids.bopBucket = Optional.of((new ItemBOPBucket(BOPConfiguration.IDs.bopBucketID).setMaxStackSize(1).setUnlocalizedName("bop.bopBucket"))); + Fluids.bopBucket = Optional.of((new ItemBOPBucket(BOPConfigurationIDs.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/common/biomesoplenty/configuration/BOPItems.java b/common/biomesoplenty/configuration/BOPItems.java index fc90f6f74..4e4051ab2 100644 --- a/common/biomesoplenty/configuration/BOPItems.java +++ b/common/biomesoplenty/configuration/BOPItems.java @@ -15,6 +15,7 @@ import biomesoplenty.armor.ArmorFlippers; import biomesoplenty.armor.ArmorFlowerBand; import biomesoplenty.armor.ArmorMuddy; import biomesoplenty.armor.ArmorWadingBoots; +import biomesoplenty.configuration.configfile.BOPConfigurationIDs; import biomesoplenty.items.ItemBOP; import biomesoplenty.items.ItemBOPAncientStaff; import biomesoplenty.items.ItemBOPAxe; @@ -104,50 +105,50 @@ public class BOPItems { private static void initializeItems() { // Item declaration - 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.food = Optional.of(new ItemBOPFood(BOPConfigurationIDs.foodID).setUnlocalizedName("bop.food")); + Items.miscItems = Optional.of(new ItemBOP(BOPConfigurationIDs.miscItemsID).setUnlocalizedName("bop.miscItems")); + Items.mudball = Optional.of(new ItemBOPMudball(BOPConfigurationIDs.mudballID).setUnlocalizedName("bop.mudball")); + Items.dartBlower = Optional.of(new ItemDartBlower(BOPConfigurationIDs.dartBlowerID).setUnlocalizedName("bop.dartblower")); + Items.dart = Optional.of(new ItemDart(BOPConfigurationIDs.dartID).setUnlocalizedName("bop.dart")); + Items.soulManipulator = Optional.of(new ItemSoulManipulator(BOPConfigurationIDs.soulManipulatorID).setUnlocalizedName("bop.soulManipulator")); - Items.ancientStaff = Optional.of(new ItemBOPAncientStaff(BOPConfiguration.IDs.ancientStaffID).setUnlocalizedName("bop.ancientStaff")); + Items.ancientStaff = Optional.of(new ItemBOPAncientStaff(BOPConfigurationIDs.ancientStaffID).setUnlocalizedName("bop.ancientStaff")); - Items.enderporter = Optional.of(new ItemEnderporter(BOPConfiguration.IDs.enderporterID).setUnlocalizedName("bop.enderporter")); + Items.enderporter = Optional.of(new ItemEnderporter(BOPConfigurationIDs.enderporterID).setUnlocalizedName("bop.enderporter")); - 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.bopDisc = Optional.of(new ItemBOPRecord(BOPConfigurationIDs.bopDiscID, "bopdisc").setUnlocalizedName("bop.bopDisc")); + Items.bopDiscMud = Optional.of(new ItemBOPRecordMud(BOPConfigurationIDs.bopDiscMudID, "bopdiscmud").setUnlocalizedName("bop.bopDiscMud")); - 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.swordMud = Optional.of((new ItemBOPSword(BOPConfigurationIDs.swordMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.swordMud")); + Items.shovelMud = Optional.of((new ItemBOPSpade(BOPConfigurationIDs.shovelMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.shovelMud")); + Items.pickaxeMud = Optional.of((new ItemBOPPickaxe(BOPConfigurationIDs.pickaxeMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.pickaxeMud")); + Items.axeMud = Optional.of((new ItemBOPAxe(BOPConfigurationIDs.axeMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.hatchetMud")); + Items.hoeMud = Optional.of((new ItemBOPHoe(BOPConfigurationIDs.hoeMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.hoeMud")); + Items.helmetMud = Optional.of((new ArmorMuddy(BOPConfigurationIDs.helmetMudID, EnumArmorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 0)).setUnlocalizedName("bop.helmetMud")); + Items.chestplateMud = Optional.of((new ArmorMuddy(BOPConfigurationIDs.chestplateMudID, EnumArmorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 1)).setUnlocalizedName("bop.chestplateMud")); + Items.leggingsMud = Optional.of((new ArmorMuddy(BOPConfigurationIDs.leggingsMudID, EnumArmorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 2)).setUnlocalizedName("bop.leggingsMud")); + Items.bootsMud = Optional.of((new ArmorMuddy(BOPConfigurationIDs.bootsMudID, EnumArmorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 3)).setUnlocalizedName("bop.bootsMud")); - 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.swordAmethyst = Optional.of((new ItemBOPSword(BOPConfigurationIDs.swordAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.swordAmethyst")); + Items.shovelAmethyst = Optional.of((new ItemBOPSpade(BOPConfigurationIDs.shovelAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.shovelAmethyst")); + Items.pickaxeAmethyst = Optional.of((new ItemBOPPickaxe(BOPConfigurationIDs.pickaxeAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.pickaxeAmethyst")); + Items.axeAmethyst = Optional.of((new ItemBOPAxe(BOPConfigurationIDs.axeAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.hatchetAmethyst")); + Items.hoeAmethyst = Optional.of((new ItemBOPHoe(BOPConfigurationIDs.hoeAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.hoeAmethyst")); + Items.helmetAmethyst = Optional.of((new ArmorAmethyst(BOPConfigurationIDs.helmetAmethystID, EnumArmorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 0)).setUnlocalizedName("bop.helmetAmethyst")); + Items.chestplateAmethyst = Optional.of((new ArmorAmethyst(BOPConfigurationIDs.chestplateAmethystID, EnumArmorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 1)).setUnlocalizedName("bop.chestplateAmethyst")); + Items.leggingsAmethyst = Optional.of((new ArmorAmethyst(BOPConfigurationIDs.leggingsAmethystID, EnumArmorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 2)).setUnlocalizedName("bop.leggingsAmethyst")); + Items.bootsAmethyst = Optional.of((new ArmorAmethyst(BOPConfigurationIDs.bootsAmethystID, EnumArmorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 3)).setUnlocalizedName("bop.bootsAmethyst")); - 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.scytheWood = Optional.of((new ItemBOPScythe(BOPConfigurationIDs.scytheWoodID, 2, EnumToolMaterial.WOOD, 0).setUnlocalizedName("bop.scytheWood"))); + Items.scytheStone = Optional.of((new ItemBOPScythe(BOPConfigurationIDs.scytheStoneID, 2, EnumToolMaterial.STONE, 1).setUnlocalizedName("bop.scytheStone"))); + Items.scytheIron = Optional.of((new ItemBOPScythe(BOPConfigurationIDs.scytheIronID, 2, EnumToolMaterial.IRON, 2).setUnlocalizedName("bop.scytheIron"))); + Items.scytheGold = Optional.of((new ItemBOPScythe(BOPConfigurationIDs.scytheGoldID, 2, EnumToolMaterial.GOLD, 3).setUnlocalizedName("bop.scytheGold"))); + Items.scytheDiamond = Optional.of((new ItemBOPScythe(BOPConfigurationIDs.scytheDiamondID, 2, EnumToolMaterial.EMERALD, 4).setUnlocalizedName("bop.scytheDiamond"))); + Items.scytheMud = Optional.of((new ItemBOPScythe(BOPConfigurationIDs.scytheMudID, 2, EnumToolMaterialMud, 5).setUnlocalizedName("bop.scytheMud"))); + Items.scytheAmethyst = Optional.of((new ItemBOPScythe(BOPConfigurationIDs.scytheAmethystID, 2, EnumToolMaterialAmethyst, 6).setUnlocalizedName("bop.scytheAmethyst"))); - Items.flowerBand = Optional.of((new ArmorFlowerBand(BOPConfiguration.IDs.flowerBandID, EnumArmorMaterialFlowerBand, BiomesOPlenty.proxy.addArmor("flowerBand"), 0)).setCreativeTab(BiomesOPlenty.tabBiomesOPlenty).setUnlocalizedName("bop.flowerBand")); - Items.wadingBoots = Optional.of((new ArmorWadingBoots(BOPConfiguration.IDs.wadingBootsID, EnumArmorMaterialWadingBoots, BiomesOPlenty.proxy.addArmor("wadingBoots"), 3)).setCreativeTab(BiomesOPlenty.tabBiomesOPlenty).setUnlocalizedName("bop.wadingBoots")); - Items.flippers = Optional.of((new ArmorFlippers(BOPConfiguration.IDs.flippersID, EnumArmorMaterialFlippers, BiomesOPlenty.proxy.addArmor("flippers"), 3)).setCreativeTab(BiomesOPlenty.tabBiomesOPlenty).setUnlocalizedName("bop.flippers")); + Items.flowerBand = Optional.of((new ArmorFlowerBand(BOPConfigurationIDs.flowerBandID, EnumArmorMaterialFlowerBand, BiomesOPlenty.proxy.addArmor("flowerBand"), 0)).setCreativeTab(BiomesOPlenty.tabBiomesOPlenty).setUnlocalizedName("bop.flowerBand")); + Items.wadingBoots = Optional.of((new ArmorWadingBoots(BOPConfigurationIDs.wadingBootsID, EnumArmorMaterialWadingBoots, BiomesOPlenty.proxy.addArmor("wadingBoots"), 3)).setCreativeTab(BiomesOPlenty.tabBiomesOPlenty).setUnlocalizedName("bop.wadingBoots")); + Items.flippers = Optional.of((new ArmorFlippers(BOPConfigurationIDs.flippersID, EnumArmorMaterialFlippers, BiomesOPlenty.proxy.addArmor("flippers"), 3)).setCreativeTab(BiomesOPlenty.tabBiomesOPlenty).setUnlocalizedName("bop.flippers")); } } diff --git a/common/biomesoplenty/configuration/BOPVanillaCompat.java b/common/biomesoplenty/configuration/BOPVanillaCompat.java index 23002a5db..71c43402d 100644 --- a/common/biomesoplenty/configuration/BOPVanillaCompat.java +++ b/common/biomesoplenty/configuration/BOPVanillaCompat.java @@ -6,6 +6,7 @@ import net.minecraft.util.WeightedRandomChestContent; import net.minecraftforge.common.ChestGenHooks; import biomesoplenty.api.Blocks; import biomesoplenty.api.Items; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; import biomesoplenty.entities.projectiles.DispenserBehaviorDart; import biomesoplenty.entities.projectiles.DispenserBehaviorMudball; @@ -29,7 +30,7 @@ public class BOPVanillaCompat { strongholdCrossing = ChestGenHooks.getInfo(ChestGenHooks.STRONGHOLD_CROSSING); village = ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH); - if (BOPConfiguration.Misc.dungeonLoot == true) + if (BOPConfigurationMisc.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/common/biomesoplenty/configuration/configfile/BOPConfiguration.java b/common/biomesoplenty/configuration/configfile/BOPConfiguration.java new file mode 100644 index 000000000..5a699d38b --- /dev/null +++ b/common/biomesoplenty/configuration/configfile/BOPConfiguration.java @@ -0,0 +1,27 @@ +package biomesoplenty.configuration.configfile; + +import java.io.File; + +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 void init(String configpath) + { + 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"); + + BOPConfigurationMain.init(mainConfigFile); + BOPConfigurationBiomeGen.init(biomeGenConfigFile); + BOPConfigurationTerrainGen.init(terrainGenConfigFile); + BOPConfigurationIDs.init(idConfigFile); + BOPConfigurationMisc.init(miscConfigFile); + } +} diff --git a/common/biomesoplenty/configuration/configfile/BOPConfigurationBiomeGen.java b/common/biomesoplenty/configuration/configfile/BOPConfigurationBiomeGen.java new file mode 100644 index 000000000..c3ca1accb --- /dev/null +++ b/common/biomesoplenty/configuration/configfile/BOPConfigurationBiomeGen.java @@ -0,0 +1,238 @@ +package biomesoplenty.configuration.configfile; + +import java.io.File; +import java.util.logging.Level; + +import net.minecraftforge.common.Configuration; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.FMLLog; + +public class BOPConfigurationBiomeGen +{ + public static Configuration config; + + public static boolean alpsGen; + public static boolean arcticGen; + public static boolean autumnHillsGen; + 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 overgrownGreensGen; + 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 silkgladesGen; + 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) + { + 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); + autumnHillsGen = config.get("Biomes To Generate", "AutumnHills", false).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); + 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); + overgrownGreensGen = config.get("Biomes To Generate", "OvergrownGreens", false).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); + silkgladesGen = config.get("Biomes To Generate", "Silkglades", false).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); + oceanGen = config.get("Vanilla Biomes To Generate", "Ocean", true).getBoolean(false); + 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 Biome Gen 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(); + } + } + } +} \ No newline at end of file diff --git a/common/biomesoplenty/configuration/configfile/BOPConfigurationIDs.java b/common/biomesoplenty/configuration/configfile/BOPConfigurationIDs.java new file mode 100644 index 000000000..64ddf686a --- /dev/null +++ b/common/biomesoplenty/configuration/configfile/BOPConfigurationIDs.java @@ -0,0 +1,615 @@ +package biomesoplenty.configuration.configfile; + +import java.io.File; +import java.util.logging.Level; + +import net.minecraftforge.common.Configuration; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.FMLLog; + +public class BOPConfigurationIDs +{ + 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 leavesFruit2ID; + 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; + public static int wadingBootsID; + public static int flippersID; + + //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 autumnHillsID; + 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 oceanAbyssID; + 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 overgrownGreensID; + 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 silkgladesID; + 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 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 int phantomID; + + 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(); + + leavesFruit2ID = config.getBlock("Fruit Leaf Block 2 ID", 1982, 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(); + + wadingBootsID = config.getItem("Wading Boots ID", 21088).getInt(); + flippersID = config.getItem("Flippers ID", 21089).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(); + phantomID = config.get("Mob IDs", "Phantom ID", 107, 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 + + autumnHillsID = config.get("Biome IDs", "Autumn Hills ID", 33).getInt(); + overgrownGreensID = config.get("Biome IDs", "Overgrown Greens ID", 34).getInt(); + forestHillsNewID = config.get("Biome IDs", "Forest Hills (Sub-Biome) ID", 35).getInt(); + taigaHillsNewID = config.get("Biome IDs", "Taiga Hills (Sub-Biome) ID", 36).getInt(); + jungleHillsNewID = config.get("Biome IDs", "Jungle Hills (Sub-Biome) ID", 37).getInt(); + silkgladesID = config.get("Biome IDs", "Silkglades ID", 38).getInt(); + 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(); + + oceanAbyssID = config.get("Biome IDs", "Oceanic Abyss (Ocean) ID", 57).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-159 Better World Generation 4 + + //160-161 BuildCraft Oil Fields + + //162-169 Thaumcraft + + 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 IDs 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(); + } + } + } +} \ No newline at end of file diff --git a/common/biomesoplenty/configuration/configfile/BOPConfigurationMain.java b/common/biomesoplenty/configuration/configfile/BOPConfigurationMain.java new file mode 100644 index 000000000..8b2682ae0 --- /dev/null +++ b/common/biomesoplenty/configuration/configfile/BOPConfigurationMain.java @@ -0,0 +1,48 @@ +package biomesoplenty.configuration.configfile; + +import java.io.File; +import java.util.logging.Level; + +import net.minecraftforge.common.Configuration; +import net.minecraftforge.common.Property; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.FMLLog; + +public class BOPConfigurationMain +{ + 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 = new Configuration(configFile); + + try + { + config.load(); + + //realisticTrees = config.get("Biome Settings", "Realistic Trees", true).getBoolean(true); + realisticTrees = false; + + seenVersion = config.get("Vars", "Seen Version", "null"); + seenWorldTypeMsg = config.get("Vars", "Seen WorldType Msg", false); + + FMLCommonHandler.instance().getFMLLogger().log(Level.INFO, "[BiomesOPlenty] Generated Main 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(); + } + } + } +} \ No newline at end of file diff --git a/common/biomesoplenty/configuration/configfile/BOPConfigurationMisc.java b/common/biomesoplenty/configuration/configfile/BOPConfigurationMisc.java new file mode 100644 index 000000000..15120e084 --- /dev/null +++ b/common/biomesoplenty/configuration/configfile/BOPConfigurationMisc.java @@ -0,0 +1,71 @@ +package biomesoplenty.configuration.configfile; + +import java.io.File; +import java.util.logging.Level; + +import net.minecraftforge.common.Configuration; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.FMLLog; + +public class BOPConfigurationMisc +{ + 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 boolean hotSpringsRegeneration; + + 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); + hotSpringsRegeneration = config.get("Miscellanious Settings", "Enable Spring Water Regeneration Effect", 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 Misc 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(); + } + } + } +} \ No newline at end of file diff --git a/common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java b/common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java new file mode 100644 index 000000000..dfcfd24ef --- /dev/null +++ b/common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java @@ -0,0 +1,243 @@ +package biomesoplenty.configuration.configfile; + +import java.io.File; +import java.util.logging.Level; + +import net.minecraftforge.common.Configuration; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.FMLLog; + +public class BOPConfigurationTerrainGen +{ + public static Configuration config; + + public static double biomeSize; + public static boolean addToDefault; + public static boolean vanillaEnhanced; + public static boolean netherOverride; + public static boolean pumpkinGen; + public static boolean poisonIvyGen; + public static boolean thornGen; + public static boolean springWaterGen; + public static boolean poisonWaterGen; + public static boolean quicksandGen; + public static boolean exposedStone; + + public static int villageDistance; + + // Village biomes + public static boolean alpsVillage; + public static boolean arcticVillage; + public static boolean autumnHillsVillage; + public static boolean badlandsVillage; + public static boolean bambooForestVillage; + public static boolean bayouVillage; + public static boolean birchForestVillage; + public static boolean bogVillage; + public static boolean borealForestVillage; + public static boolean brushlandVillage; + public static boolean canyonVillage; + public static boolean chaparralVillage; + public static boolean cherryBlossomGroveVillage; + public static boolean coniferousForestVillage; + public static boolean coniferousForestSnowVillage; + public static boolean cragVillage; + public static boolean deadForestVillage; + public static boolean deadForestSnowVillage; + public static boolean deadSwampVillage; + public static boolean deadlandsVillage; + public static boolean deciduousForestVillage; + public static boolean 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 overgrownGreensVillage; + public static boolean pastureVillage; + public static boolean polarVillage; + public static boolean prairieVillage; + public static boolean quagmireVillage; + public static boolean rainforestVillage; + public static boolean redwoodForestVillage; + public static boolean sacredSpringsVillage; + public static boolean savannaVillage; + public static boolean scrublandVillage; + public static boolean seasonalForestVillage; + public static boolean shieldVillage; + public static boolean shrublandVillage; + public static boolean silkgladesVillage; + public static boolean sludgepitVillage; + public static boolean spruceWoodsVillage; + public static boolean steppeVillage; + public static boolean temperateRainforestVillage; + public static boolean thicketVillage; + public static boolean timberVillage; + public static boolean tropicalRainforestVillage; + public static boolean tropicsVillage; + public static boolean tundraVillage; + public static boolean volcanoVillage; + public static boolean wastelandVillage; + public static boolean wetlandVillage; + public static boolean woodlandVillage; + public static boolean plainsVillage; + public static boolean desertVillage; + public static boolean extremeHillsVillage; + public static boolean forestVillage; + public static boolean taigaVillage; + public static boolean swamplandVillage; + public static boolean jungleVillage; + + public static void init(File configFile) + { + config = new Configuration(configFile); + + try + { + config.load(); + + biomeSize = config.get("Biomes O\' Plenty World Type Settings", "Biome Size", 4.0, "Default World Type has 4. Large Biomes World Type has 6.").getDouble(4.0); + 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); + pumpkinGen = config.get("Decoration Settings", "Generate Pumpkins Without Faces", true).getBoolean(true); + poisonIvyGen = config.get("Decoration Settings", "Generate Poison Ivy", true).getBoolean(true); + thornGen = config.get("Decoration Settings", "Generate Thorns", true).getBoolean(true); + springWaterGen = config.get("Decoration Settings", "Generate Hot Springs", true).getBoolean(true); + poisonWaterGen = config.get("Decoration Settings", "Generate Poison Pools", true).getBoolean(true); + quicksandGen = config.get("Decoration Settings", "Generate Quicksand", true).getBoolean(true); + exposedStone = config.get("Decoration Settings", "Generate Sections Of Exposed Stone", 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", true).getBoolean(false); + autumnHillsVillage = config.get("Allow Villages", "AutumnHills", false).getBoolean(false); + badlandsVillage = config.get("Allow Villages", "Badlands", false).getBoolean(false); + bambooForestVillage = config.get("Allow Villages", "BambooForest", false).getBoolean(false); + bayouVillage = config.get("Allow Villages", "Bayou", false).getBoolean(false); + birchForestVillage = config.get("Allow Villages", "BirchForest", false).getBoolean(false); + bogVillage = config.get("Allow Villages", "Bog", false).getBoolean(false); + borealForestVillage = config.get("Allow Villages", "BorealForest", false).getBoolean(false); + brushlandVillage = config.get("Allow Villages", "Brushland", true).getBoolean(false); + canyonVillage = config.get("Allow Villages", "Canyon", false).getBoolean(false); + chaparralVillage = config.get("Allow Villages", "Chaparral", true).getBoolean(false); + cherryBlossomGroveVillage = config.get("Allow Villages", "CherryBlossomGrove", false).getBoolean(false); + coniferousForestVillage = config.get("Allow Villages", "ConiferousForest", false).getBoolean(false); + coniferousForestSnowVillage = config.get("Allow Villages", "ConiferousForestSnow", false).getBoolean(false); + cragVillage = config.get("Allow Villages", "Crag", false).getBoolean(false); + deadForestVillage = config.get("Allow Villages", "DeadForest", false).getBoolean(false); + deadForestSnowVillage = config.get("Allow Villages", "DeadForestSnow", false).getBoolean(false); + deadSwampVillage = config.get("Allow Villages", "DeadSwamp", false).getBoolean(false); + deadlandsVillage = config.get("Allow Villages", "Deadlands", false).getBoolean(false); + deciduousForestVillage = config.get("Allow Villages", "DeciduousForest", false).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", false).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", false).getBoolean(false); + lushSwampVillage = config.get("Allow Villages", "LushSwamp", false).getBoolean(false); + mangroveVillage = config.get("Allow Villages", "Mangrove", false).getBoolean(false); + mapleWoodsVillage = config.get("Allow Villages", "MapleWoods", false).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", false).getBoolean(false); + ominousWoodsVillage = config.get("Allow Villages", "OminousWoods", false).getBoolean(false); + orchardVillage = config.get("Allow Villages", "Orchard", false).getBoolean(false); + originValleyVillage = config.get("Allow Villages", "OriginValley", false).getBoolean(false); + outbackVillage = config.get("Allow Villages", "Outback", true).getBoolean(false); + overgrownGreensVillage = config.get("Allow Villages", "OvergrownGreens", true).getBoolean(false); + pastureVillage = config.get("Allow Villages", "Pasture", false).getBoolean(false); + polarVillage = config.get("Allow Villages", "Polar", false).getBoolean(false); + prairieVillage = config.get("Allow Villages", "Prairie", true).getBoolean(false); + quagmireVillage = config.get("Allow Villages", "Quagmire", false).getBoolean(false); + rainforestVillage = config.get("Allow Villages", "Rainforest", false).getBoolean(false); + redwoodForestVillage = config.get("Allow Villages", "RedwoodForest", false).getBoolean(false); + sacredSpringsVillage = config.get("Allow Villages", "SacredSprings", false).getBoolean(false); + savannaVillage = config.get("Allow Villages", "Savanna", true).getBoolean(false); + scrublandVillage = config.get("Allow Villages", "Scrubland", true).getBoolean(false); + seasonalForestVillage = config.get("Allow Villages", "SeasonalForest", false).getBoolean(false); + shieldVillage = config.get("Allow Villages", "Shield", false).getBoolean(false); + shrublandVillage = config.get("Allow Villages", "Shrubland", true).getBoolean(false); + silkgladesVillage = config.get("Allow Villages", "Silkgladess", false).getBoolean(false); + sludgepitVillage = config.get("Allow Villages", "Sludgepit", false).getBoolean(false); + spruceWoodsVillage = config.get("Allow Villages", "SpruceWoods", false).getBoolean(false); + steppeVillage = config.get("Allow Villages", "Steppe", true).getBoolean(false); + temperateRainforestVillage = config.get("Allow Villages", "TemperateRainforest", false).getBoolean(false); + thicketVillage = config.get("Allow Villages", "Thicket", false).getBoolean(false); + timberVillage = config.get("Allow Villages", "Timber", 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", false).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", false).getBoolean(false); + jungleVillage = config.get("Allow Villages", "Jungle", false).getBoolean(false); + plainsVillage = config.get("Allow Villages", "Plains", true).getBoolean(true); + swamplandVillage = config.get("Allow Villages", "Swampland", false).getBoolean(false); + taigaVillage = config.get("Allow Villages", "Taiga", false).getBoolean(false); + + FMLCommonHandler.instance().getFMLLogger().log(Level.INFO, "[BiomesOPlenty] Generated Terrain Gen Config!"); + } + catch (Exception e) + { + FMLLog.log(Level.SEVERE, e, "Biomes O Plenty has had a problem loading its configuration"); + } + finally + { + if (config.hasChanged()) { + config.save(); + } + } + } +} \ No newline at end of file diff --git a/common/biomesoplenty/fluids/BlockFluidSpringWater.java b/common/biomesoplenty/fluids/BlockFluidSpringWater.java index 3ea4dde27..668f95bb0 100644 --- a/common/biomesoplenty/fluids/BlockFluidSpringWater.java +++ b/common/biomesoplenty/fluids/BlockFluidSpringWater.java @@ -18,7 +18,7 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import biomesoplenty.BiomesOPlenty; import biomesoplenty.api.Fluids; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -75,7 +75,7 @@ public class BlockFluidSpringWater extends BlockFluidClassic { int meta = world.getBlockMetadata(x, y, z); - if (!world.isRemote && BOPConfiguration.Misc.hotSpringsRegeneration) + if (!world.isRemote && BOPConfigurationMisc.hotSpringsRegeneration) { if (entity instanceof EntityLivingBase) { diff --git a/common/biomesoplenty/handlers/EntityEventHandler.java b/common/biomesoplenty/handlers/EntityEventHandler.java index cd542a585..b08a81d82 100644 --- a/common/biomesoplenty/handlers/EntityEventHandler.java +++ b/common/biomesoplenty/handlers/EntityEventHandler.java @@ -27,7 +27,7 @@ import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.event.entity.player.EntityInteractEvent; import biomesoplenty.api.Blocks; import biomesoplenty.api.Items; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.configuration.configfile.BOPConfigurationIDs; import biomesoplenty.entities.ai.EntityAITemptArmour; import biomesoplenty.helpers.AchievementHelper; import biomesoplenty.helpers.TeleporterPromised; @@ -85,7 +85,7 @@ public class EntityEventHandler @ForgeSubscribe public void fallingFromPromisedLand(LivingHurtEvent event) { - if (event.source == DamageSource.outOfWorld && event.entityLiving.dimension == BOPConfiguration.IDs.promisedLandDimID) + if (event.source == DamageSource.outOfWorld && event.entityLiving.dimension == BOPConfigurationIDs.promisedLandDimID) { event.setCanceled(true); diff --git a/common/biomesoplenty/handlers/TickHandlerServer.java b/common/biomesoplenty/handlers/TickHandlerServer.java index d80ec813f..6301b8448 100644 --- a/common/biomesoplenty/handlers/TickHandlerServer.java +++ b/common/biomesoplenty/handlers/TickHandlerServer.java @@ -12,7 +12,7 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.common.ForgeDirection; import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; import cpw.mods.fml.common.ITickHandler; import cpw.mods.fml.common.TickType; @@ -27,7 +27,7 @@ public class TickHandlerServer implements ITickHandler int rand = new Random().nextInt(); - if (BOPConfiguration.Misc.rainCreatesPuddles) + if (BOPConfigurationMisc.rainCreatesPuddles) { while (iterator.hasNext()) { diff --git a/common/biomesoplenty/helpers/AchievementHelper.java b/common/biomesoplenty/helpers/AchievementHelper.java index ded407648..20f0852b5 100644 --- a/common/biomesoplenty/helpers/AchievementHelper.java +++ b/common/biomesoplenty/helpers/AchievementHelper.java @@ -16,7 +16,7 @@ import biomesoplenty.api.Biomes; import biomesoplenty.api.Blocks; import biomesoplenty.api.Fluids; import biomesoplenty.api.Items; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.configuration.configfile.BOPConfigurationMisc; import cpw.mods.fml.common.registry.LanguageRegistry; public class AchievementHelper @@ -329,7 +329,7 @@ public class AchievementHelper @ForgeSubscribe public void chunkEntered(EntityEvent.EnteringChunk event) { - if (BOPConfiguration.Misc.achievements) + if (BOPConfigurationMisc.achievements) { if (event.entity != null) { diff --git a/common/biomesoplenty/helpers/Version.java b/common/biomesoplenty/helpers/Version.java index 7c1a74284..832b9c36f 100644 --- a/common/biomesoplenty/helpers/Version.java +++ b/common/biomesoplenty/helpers/Version.java @@ -9,7 +9,7 @@ import java.util.logging.Level; import net.minecraft.world.World; import net.minecraft.world.WorldType; import net.minecraftforge.common.Property; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.configuration.configfile.BOPConfigurationMain; import biomesoplenty.world.WorldTypeBOP; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; @@ -64,7 +64,7 @@ public class Version implements Runnable { WorldType terrainType = world.getWorldInfo().getTerrainType(); WorldTypeBOP bopType = new WorldTypeBOP(); - Property property = BOPConfiguration.Main.config.get("Vars", "Seen WorldType Msg", false); + Property property = BOPConfigurationMain.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.Main.config.save(); + BOPConfigurationMain.config.save(); return false; } property.set(true); - BOPConfiguration.Main.config.save(); + BOPConfigurationMain.config.save(); return true; } diff --git a/common/biomesoplenty/integration/ForestryIntegration.java b/common/biomesoplenty/integration/ForestryIntegration.java index bd175a9de..89f36b5ff 100644 --- a/common/biomesoplenty/integration/ForestryIntegration.java +++ b/common/biomesoplenty/integration/ForestryIntegration.java @@ -6,7 +6,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import biomesoplenty.api.Blocks; import biomesoplenty.api.Items; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.configuration.configfile.BOPConfigurationIDs; import forestry.api.apiculture.FlowerManager; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; @@ -33,231 +33,231 @@ public class ForestryIntegration private static void addClimateInfo() { //Hell - 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); + EnumTemperature.hellishBiomeIds.add(BOPConfigurationIDs.netherBaseID); + EnumTemperature.hellishBiomeIds.add(BOPConfigurationIDs.netherBoneID); + EnumTemperature.hellishBiomeIds.add(BOPConfigurationIDs.netherDesertID); + EnumTemperature.hellishBiomeIds.add(BOPConfigurationIDs.netherGardenID); + EnumTemperature.hellishBiomeIds.add(BOPConfigurationIDs.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); + EnumHumidity.aridBiomeIds.add(BOPConfigurationIDs.netherBaseID); + EnumHumidity.aridBiomeIds.add(BOPConfigurationIDs.netherBoneID); + EnumHumidity.aridBiomeIds.add(BOPConfigurationIDs.netherDesertID); + EnumHumidity.aridBiomeIds.add(BOPConfigurationIDs.netherGardenID); + EnumHumidity.aridBiomeIds.add(BOPConfigurationIDs.netherLavaID); //Hot - Arid //Desert Hives - 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); + EnumTemperature.hotBiomeIds.add(BOPConfigurationIDs.badlandsID); + EnumTemperature.hotBiomeIds.add(BOPConfigurationIDs.beachGravelID); + EnumTemperature.hotBiomeIds.add(BOPConfigurationIDs.beachOvergrownID); + EnumTemperature.hotBiomeIds.add(BOPConfigurationIDs.brushlandID); + EnumTemperature.hotBiomeIds.add(BOPConfigurationIDs.deadlandsID); + EnumTemperature.hotBiomeIds.add(BOPConfigurationIDs.dunesID); + EnumTemperature.hotBiomeIds.add(BOPConfigurationIDs.mesaID); + EnumTemperature.hotBiomeIds.add(BOPConfigurationIDs.steppeID); + EnumTemperature.hotBiomeIds.add(BOPConfigurationIDs.volcanoID); + EnumTemperature.hotBiomeIds.add(BOPConfigurationIDs.wastelandID); + EnumTemperature.hotBiomeIds.add(BOPConfigurationIDs.promisedLandPlainsID); + EnumTemperature.hotBiomeIds.add(BOPConfigurationIDs.deadForestID); + EnumTemperature.hotBiomeIds.add(BOPConfigurationIDs.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); + EnumHumidity.aridBiomeIds.add(BOPConfigurationIDs.badlandsID); + EnumHumidity.aridBiomeIds.add(BOPConfigurationIDs.brushlandID); + EnumHumidity.aridBiomeIds.add(BOPConfigurationIDs.deadlandsID); + EnumHumidity.aridBiomeIds.add(BOPConfigurationIDs.dunesID); + EnumHumidity.aridBiomeIds.add(BOPConfigurationIDs.mesaID); + EnumHumidity.aridBiomeIds.add(BOPConfigurationIDs.steppeID); + EnumHumidity.aridBiomeIds.add(BOPConfigurationIDs.volcanoID); + EnumHumidity.aridBiomeIds.add(BOPConfigurationIDs.wastelandID); + EnumHumidity.aridBiomeIds.add(BOPConfigurationIDs.promisedLandPlainsID); + EnumHumidity.aridBiomeIds.add(BOPConfigurationIDs.deadForestID); + EnumHumidity.aridBiomeIds.add(BOPConfigurationIDs.desertNewID); //Warm - Damp //Jungle Hives - 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); - EnumTemperature.warmBiomeIds.add(BOPConfiguration.IDs.jungleHillsNewID); - EnumTemperature.warmBiomeIds.add(BOPConfiguration.IDs.overgrownGreensID); + EnumTemperature.warmBiomeIds.add(BOPConfigurationIDs.bambooForestID); + EnumTemperature.warmBiomeIds.add(BOPConfigurationIDs.hotSpringsID); + EnumTemperature.warmBiomeIds.add(BOPConfigurationIDs.sacredSpringsID); + EnumTemperature.warmBiomeIds.add(BOPConfigurationIDs.tropicalRainforestID); + EnumTemperature.warmBiomeIds.add(BOPConfigurationIDs.promisedLandSwampID); + EnumTemperature.warmBiomeIds.add(BOPConfigurationIDs.oasisID); + EnumTemperature.warmBiomeIds.add(BOPConfigurationIDs.rainforestID); + EnumTemperature.warmBiomeIds.add(BOPConfigurationIDs.tropicsID); + EnumTemperature.warmBiomeIds.add(BOPConfigurationIDs.woodlandID); + EnumTemperature.warmBiomeIds.add(BOPConfigurationIDs.jungleNewID); + EnumTemperature.warmBiomeIds.add(BOPConfigurationIDs.jungleHillsNewID); + EnumTemperature.warmBiomeIds.add(BOPConfigurationIDs.overgrownGreensID); - 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); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.jungleHillsNewID); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.overgrownGreensID); + EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.bambooForestID); + EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.hotSpringsID); + EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.sacredSpringsID); + EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.tropicalRainforestID); + EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.promisedLandSwampID); + EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.oasisID); + EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.rainforestID); + EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.tropicsID); + EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.woodlandID); + EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.jungleNewID); + EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.jungleHillsNewID); + EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.overgrownGreensID); //Normal - Damp //Marshy Hives - 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); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.silkgladesID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.bayouID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.bogID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.deadSwampID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.fungiForestID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.lushSwampID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.mangroveID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.marshID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.moorID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.mysticGroveID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.ominousWoodsID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.quagmireID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.sludgepitID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.wetlandID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.fenID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.swamplandNewID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.silkgladesID); - 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); - EnumHumidity.dampBiomeIds.add(BOPConfiguration.IDs.silkgladesID); + EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.bayouID); + EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.bogID); + EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.deadSwampID); + EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.fungiForestID); + EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.lushSwampID); + EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.mangroveID); + EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.marshID); + EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.moorID); + EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.mysticGroveID); + EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.ominousWoodsID); + EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.quagmireID); + EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.sludgepitID); + EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.wetlandID); + EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.fenID); + EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.swamplandNewID); + EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.silkgladesID); //Normal //Forest and Meadows Hives - 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); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.forestHillsNewID); - EnumTemperature.normalBiomeIds.add(BOPConfiguration.IDs.autumnHillsID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.birchForestID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.borealForestID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.canyonID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.chaparralID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.cherryBlossomGroveID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.coniferousForestID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.deciduousForestID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.fieldID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.gardenID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.grasslandID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.groveID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.highlandID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.lushDesertID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.mapleWoodsID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.meadowID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.orchardID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.originValleyID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.pastureID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.prairieID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.redwoodForestID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.seasonalForestID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.shieldID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.shoreID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.spruceWoodsID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.temperateRainforestID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.heathlandID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.promisedLandForestID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.savannaID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.scrublandID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.cragID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.jadeCliffsID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.outbackID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.shrublandID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.thicketID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.timberID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.plainsNewID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.extremeHillsNewID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.forestNewID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.forestHillsNewID); + EnumTemperature.normalBiomeIds.add(BOPConfigurationIDs.autumnHillsID); - 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); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.forestHillsNewID); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.autumnHillsID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.beachGravelID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.beachOvergrownID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.birchForestID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.borealForestID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.canyonID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.chaparralID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.cherryBlossomGroveID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.coniferousForestID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.deciduousForestID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.fieldID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.gardenID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.grasslandID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.groveID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.highlandID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.lushDesertID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.mapleWoodsID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.meadowID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.orchardID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.originValleyID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.pastureID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.prairieID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.redwoodForestID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.seasonalForestID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.shieldID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.shoreID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.spruceWoodsID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.temperateRainforestID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.heathlandID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.promisedLandForestID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.savannaID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.scrublandID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.cragID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.jadeCliffsID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.outbackID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.shrublandID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.thicketID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.timberID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.plainsNewID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.extremeHillsNewID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.forestNewID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.forestHillsNewID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.autumnHillsID); //Cold- Normal //Wintry Bees - 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); - EnumTemperature.coldBiomeIds.add(BOPConfiguration.IDs.taigaHillsNewID); + EnumTemperature.coldBiomeIds.add(BOPConfigurationIDs.tundraID); + EnumTemperature.coldBiomeIds.add(BOPConfigurationIDs.arcticID); + EnumTemperature.coldBiomeIds.add(BOPConfigurationIDs.deadForestSnowID); + EnumTemperature.coldBiomeIds.add(BOPConfigurationIDs.mountainID); + EnumTemperature.coldBiomeIds.add(BOPConfigurationIDs.taigaNewID); + EnumTemperature.coldBiomeIds.add(BOPConfigurationIDs.taigaHillsNewID); - 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); - EnumHumidity.normalBiomeIds.add(BOPConfiguration.IDs.taigaHillsNewID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.arcticID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.tundraID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.deadForestSnowID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.mountainID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.taigaNewID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.taigaHillsNewID); //Icy - Normal //Wintry Bees - 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); + EnumTemperature.icyBiomeIds.add(BOPConfigurationIDs.alpsID); + EnumTemperature.icyBiomeIds.add(BOPConfigurationIDs.coniferousForestSnowID); + EnumTemperature.icyBiomeIds.add(BOPConfigurationIDs.frostForestID); + EnumTemperature.icyBiomeIds.add(BOPConfigurationIDs.glacierID); + EnumTemperature.icyBiomeIds.add(BOPConfigurationIDs.icyHillsID); + EnumTemperature.icyBiomeIds.add(BOPConfigurationIDs.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); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.alpsID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.coniferousForestSnowID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.frostForestID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.glacierID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.icyHillsID); + EnumHumidity.normalBiomeIds.add(BOPConfigurationIDs.polarID); } private static void addFermenterRecipes() diff --git a/common/biomesoplenty/items/ItemBOPAncientStaff.java b/common/biomesoplenty/items/ItemBOPAncientStaff.java index c12fb5fb6..1f107b3cb 100644 --- a/common/biomesoplenty/items/ItemBOPAncientStaff.java +++ b/common/biomesoplenty/items/ItemBOPAncientStaff.java @@ -13,7 +13,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import biomesoplenty.BiomesOPlenty; import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.configuration.configfile.BOPConfigurationIDs; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -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.IDs.promisedLandDimID) + if (par3EntityPlayer.dimension == 0 || par3EntityPlayer.dimension == BOPConfigurationIDs.promisedLandDimID) { int i = MathHelper.floor_double(par3EntityPlayer.posX - 8); int j = 145; diff --git a/common/biomesoplenty/world/ChunkProviderBOP.java b/common/biomesoplenty/world/ChunkProviderBOP.java index 7db670d00..e5497970a 100644 --- a/common/biomesoplenty/world/ChunkProviderBOP.java +++ b/common/biomesoplenty/world/ChunkProviderBOP.java @@ -38,7 +38,8 @@ import net.minecraftforge.event.terraingen.ChunkProviderEvent; import net.minecraftforge.event.terraingen.PopulateChunkEvent; import net.minecraftforge.event.terraingen.TerrainGen; import biomesoplenty.api.Biomes; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.configuration.configfile.BOPConfigurationIDs; +import biomesoplenty.configuration.configfile.BOPConfigurationTerrainGen; import biomesoplenty.world.map.MapGenCavesBOP; import biomesoplenty.world.map.MapGenRavineBOP; import biomesoplenty.world.noise.NoiseOctaves; @@ -242,7 +243,7 @@ public class ChunkProviderBOP implements IChunkProvider { if (i1 <= 0) { - if (BOPConfiguration.TerrainGen.exposedStone) + if (BOPConfigurationTerrainGen.exposedStone) { b1 = 0; b2 = (byte)Block.stone.blockID; @@ -255,7 +256,7 @@ public class ChunkProviderBOP implements IChunkProvider } else if (k1 >= b0 - 4 && k1 <= b0 + 1) { - if(biomegenbase.biomeID == BOPConfiguration.IDs.originValleyID) + if(biomegenbase.biomeID == BOPConfigurationIDs.originValleyID) { if(gravelbeach) { diff --git a/common/biomesoplenty/world/WorldProviderPromised.java b/common/biomesoplenty/world/WorldProviderPromised.java index e46374a28..377d22d0d 100644 --- a/common/biomesoplenty/world/WorldProviderPromised.java +++ b/common/biomesoplenty/world/WorldProviderPromised.java @@ -7,7 +7,7 @@ import net.minecraft.world.WorldProvider; import net.minecraft.world.chunk.IChunkProvider; import biomesoplenty.api.Biomes; import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.configuration.configfile.BOPConfigurationIDs; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -22,7 +22,7 @@ public class WorldProviderPromised extends WorldProvider { worldChunkMgr = new WorldChunkManagerPromised(worldObj); } - dimensionId = BOPConfiguration.IDs.promisedLandDimID; + dimensionId = BOPConfigurationIDs.promisedLandDimID; } @Override diff --git a/common/biomesoplenty/world/WorldTypeBOP.java b/common/biomesoplenty/world/WorldTypeBOP.java index 444f1eb39..00ff49ea9 100644 --- a/common/biomesoplenty/world/WorldTypeBOP.java +++ b/common/biomesoplenty/world/WorldTypeBOP.java @@ -6,7 +6,8 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.WorldChunkManager; import net.minecraft.world.chunk.IChunkProvider; import biomesoplenty.api.Biomes; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.configuration.configfile.BOPConfigurationBiomeGen; +import biomesoplenty.configuration.configfile.BOPConfigurationTerrainGen; import com.google.common.base.Optional; @@ -17,319 +18,319 @@ public class WorldTypeBOP extends WorldType this.biomesForWorldType = super.getBiomesForWorldType(); this.removeAllBiomes(); - if (BOPConfiguration.BiomeGen.alpsGen == true) + if (BOPConfigurationBiomeGen.alpsGen == true) { addNewBiome(Biomes.alps); } - if (BOPConfiguration.BiomeGen.arcticGen == true) + if (BOPConfigurationBiomeGen.arcticGen == true) { addNewBiome(Biomes.arctic); } - if (BOPConfiguration.BiomeGen.autumnHillsGen == true) + if (BOPConfigurationBiomeGen.autumnHillsGen == true) { addNewBiome(Biomes.autumnHills); } - if (BOPConfiguration.BiomeGen.badlandsGen == true) + if (BOPConfigurationBiomeGen.badlandsGen == true) { addNewBiome(Biomes.badlands); } - if (BOPConfiguration.BiomeGen.bambooForestGen == true) + if (BOPConfigurationBiomeGen.bambooForestGen == true) { addNewBiome(Biomes.bambooForest); } - if (BOPConfiguration.BiomeGen.bayouGen == true) + if (BOPConfigurationBiomeGen.bayouGen == true) { addNewBiome(Biomes.bayou); } - if (BOPConfiguration.BiomeGen.birchForestGen == true) + if (BOPConfigurationBiomeGen.birchForestGen == true) { addNewBiome(Biomes.birchForest); } - if (BOPConfiguration.BiomeGen.bogGen == true) + if (BOPConfigurationBiomeGen.bogGen == true) { addNewBiome(Biomes.bog); } - if (BOPConfiguration.BiomeGen.borealForestGen == true) + if (BOPConfigurationBiomeGen.borealForestGen == true) { addNewBiome(Biomes.borealForest); } - if (BOPConfiguration.BiomeGen.brushlandGen == true) + if (BOPConfigurationBiomeGen.brushlandGen == true) { addNewBiome(Biomes.brushland); } - if (BOPConfiguration.BiomeGen.canyonGen == true) + if (BOPConfigurationBiomeGen.canyonGen == true) { addNewBiome(Biomes.canyon); } - if (BOPConfiguration.BiomeGen.chaparralGen == true) + if (BOPConfigurationBiomeGen.chaparralGen == true) { addNewBiome(Biomes.chaparral); } - if (BOPConfiguration.BiomeGen.cherryBlossomGroveGen == true) + if (BOPConfigurationBiomeGen.cherryBlossomGroveGen == true) { addNewBiome(Biomes.cherryBlossomGrove); } - if (BOPConfiguration.BiomeGen.coniferousForestGen == true) + if (BOPConfigurationBiomeGen.coniferousForestGen == true) { addNewBiome(Biomes.coniferousForest); } - if (BOPConfiguration.BiomeGen.coniferousForestSnowGen == true) + if (BOPConfigurationBiomeGen.coniferousForestSnowGen == true) { addNewBiome(Biomes.coniferousForestSnow); } - if (BOPConfiguration.BiomeGen.cragGen == true) + if (BOPConfigurationBiomeGen.cragGen == true) { addNewBiome(Biomes.crag); } - if (BOPConfiguration.BiomeGen.deadForestGen == true) + if (BOPConfigurationBiomeGen.deadForestGen == true) { addNewBiome(Biomes.deadForest); } - if (BOPConfiguration.BiomeGen.deadForestSnowGen == true) + if (BOPConfigurationBiomeGen.deadForestSnowGen == true) { addNewBiome(Biomes.deadForestSnow); } - if (BOPConfiguration.BiomeGen.deadSwampGen == true) + if (BOPConfigurationBiomeGen.deadSwampGen == true) { addNewBiome(Biomes.deadSwamp); } - if (BOPConfiguration.BiomeGen.deadlandsGen == true) + if (BOPConfigurationBiomeGen.deadlandsGen == true) { addNewBiome(Biomes.deadlands); } - if (BOPConfiguration.BiomeGen.deciduousForestGen == true) + if (BOPConfigurationBiomeGen.deciduousForestGen == true) { addNewBiome(Biomes.deciduousForest); } - if (BOPConfiguration.BiomeGen.dunesGen == true) + if (BOPConfigurationBiomeGen.dunesGen == true) { addNewBiome(Biomes.dunes); } - if (BOPConfiguration.BiomeGen.fenGen == true) + if (BOPConfigurationBiomeGen.fenGen == true) { addNewBiome(Biomes.fen); } - if (BOPConfiguration.BiomeGen.fieldGen == true) + if (BOPConfigurationBiomeGen.fieldGen == true) { addNewBiome(Biomes.field); } - if (BOPConfiguration.BiomeGen.frostForestGen == true) + if (BOPConfigurationBiomeGen.frostForestGen == true) { addNewBiome(Biomes.frostForest); } - if (BOPConfiguration.BiomeGen.fungiForestGen == true) + if (BOPConfigurationBiomeGen.fungiForestGen == true) { addNewBiome(Biomes.fungiForest); } - if (BOPConfiguration.BiomeGen.gardenGen == true) + if (BOPConfigurationBiomeGen.gardenGen == true) { addNewBiome(Biomes.garden); } - if (BOPConfiguration.BiomeGen.glacierGen == true) + if (BOPConfigurationBiomeGen.glacierGen == true) { addNewBiome(Biomes.glacier); } - if (BOPConfiguration.BiomeGen.grasslandGen == true) + if (BOPConfigurationBiomeGen.grasslandGen == true) { addNewBiome(Biomes.grassland); } - if (BOPConfiguration.BiomeGen.groveGen == true) + if (BOPConfigurationBiomeGen.groveGen == true) { addNewBiome(Biomes.grove); } - if (BOPConfiguration.BiomeGen.heathlandGen == true) + if (BOPConfigurationBiomeGen.heathlandGen == true) { addNewBiome(Biomes.heathland); } - if (BOPConfiguration.BiomeGen.highlandGen == true) + if (BOPConfigurationBiomeGen.highlandGen == true) { addNewBiome(Biomes.highland); } - if (BOPConfiguration.BiomeGen.hotSpringsGen == true) + if (BOPConfigurationBiomeGen.hotSpringsGen == true) { addNewBiome(Biomes.hotSprings); } - if (BOPConfiguration.BiomeGen.icyHillsGen == true) + if (BOPConfigurationBiomeGen.icyHillsGen == true) { addNewBiome(Biomes.icyHills); } - if (BOPConfiguration.BiomeGen.jadeCliffsGen == true) + if (BOPConfigurationBiomeGen.jadeCliffsGen == true) { addNewBiome(Biomes.jadeCliffs); } - if (BOPConfiguration.BiomeGen.lushDesertGen == true) + if (BOPConfigurationBiomeGen.lushDesertGen == true) { addNewBiome(Biomes.lushDesert); } - if (BOPConfiguration.BiomeGen.lushSwampGen == true) + if (BOPConfigurationBiomeGen.lushSwampGen == true) { addNewBiome(Biomes.lushSwamp); } - if (BOPConfiguration.BiomeGen.mangroveGen == true) + if (BOPConfigurationBiomeGen.mangroveGen == true) { addNewBiome(Biomes.mangrove); } - if (BOPConfiguration.BiomeGen.mapleWoodsGen == true) + if (BOPConfigurationBiomeGen.mapleWoodsGen == true) { addNewBiome(Biomes.mapleWoods); } - if (BOPConfiguration.BiomeGen.marshGen == true) + if (BOPConfigurationBiomeGen.marshGen == true) { addNewBiome(Biomes.marsh); } - if (BOPConfiguration.BiomeGen.meadowGen == true) + if (BOPConfigurationBiomeGen.meadowGen == true) { addNewBiome(Biomes.meadow); } - if (BOPConfiguration.BiomeGen.mesaGen == true) + if (BOPConfigurationBiomeGen.mesaGen == true) { addNewBiome(Biomes.mesa); } - if (BOPConfiguration.BiomeGen.moorGen == true) + if (BOPConfigurationBiomeGen.moorGen == true) { addNewBiome(Biomes.moor); } - if (BOPConfiguration.BiomeGen.mountainGen == true) + if (BOPConfigurationBiomeGen.mountainGen == true) { addNewBiome(Biomes.mountain); } - if (BOPConfiguration.BiomeGen.mysticGroveGen == true) + if (BOPConfigurationBiomeGen.mysticGroveGen == true) { addNewBiome(Biomes.mysticGrove); } - if (BOPConfiguration.BiomeGen.oasisGen == true) + if (BOPConfigurationBiomeGen.oasisGen == true) { addNewBiome(Biomes.oasis); } - if (BOPConfiguration.BiomeGen.ominousWoodsGen == true) + if (BOPConfigurationBiomeGen.ominousWoodsGen == true) { addNewBiome(Biomes.ominousWoods); } - if (BOPConfiguration.BiomeGen.orchardGen == true) + if (BOPConfigurationBiomeGen.orchardGen == true) { addNewBiome(Biomes.orchard); } - if (BOPConfiguration.BiomeGen.originValleyGen == true) + if (BOPConfigurationBiomeGen.originValleyGen == true) { addNewBiome(Biomes.originValley); } - if (BOPConfiguration.BiomeGen.outbackGen == true) + if (BOPConfigurationBiomeGen.outbackGen == true) { addNewBiome(Biomes.outback); } - if (BOPConfiguration.BiomeGen.overgrownGreensGen == true) + if (BOPConfigurationBiomeGen.overgrownGreensGen == true) { addNewBiome(Biomes.overgrownGreens); } - if (BOPConfiguration.BiomeGen.pastureGen == true) + if (BOPConfigurationBiomeGen.pastureGen == true) { addNewBiome(Biomes.pasture); } - if (BOPConfiguration.BiomeGen.polarGen == true) + if (BOPConfigurationBiomeGen.polarGen == true) { addNewBiome(Biomes.polar); } - if (BOPConfiguration.BiomeGen.prairieGen == true) + if (BOPConfigurationBiomeGen.prairieGen == true) { addNewBiome(Biomes.prairie); } - if (BOPConfiguration.BiomeGen.quagmireGen == true) + if (BOPConfigurationBiomeGen.quagmireGen == true) { addNewBiome(Biomes.quagmire); } - if (BOPConfiguration.BiomeGen.rainforestGen == true) + if (BOPConfigurationBiomeGen.rainforestGen == true) { addNewBiome(Biomes.rainforest); } - if (BOPConfiguration.BiomeGen.redwoodForestGen == true) + if (BOPConfigurationBiomeGen.redwoodForestGen == true) { addNewBiome(Biomes.redwoodForest); } - if (BOPConfiguration.BiomeGen.sacredSpringsGen == true) + if (BOPConfigurationBiomeGen.sacredSpringsGen == true) { addNewBiome(Biomes.sacredSprings); } - if (BOPConfiguration.BiomeGen.savannaGen == true) + if (BOPConfigurationBiomeGen.savannaGen == true) { addNewBiome(Biomes.savanna); } - if (BOPConfiguration.BiomeGen.scrublandGen == true) + if (BOPConfigurationBiomeGen.scrublandGen == true) { addNewBiome(Biomes.scrubland); } - if (BOPConfiguration.BiomeGen.seasonalForestGen == true) + if (BOPConfigurationBiomeGen.seasonalForestGen == true) { addNewBiome(Biomes.seasonalForest); } - if (BOPConfiguration.BiomeGen.shieldGen == true) + if (BOPConfigurationBiomeGen.shieldGen == true) { addNewBiome(Biomes.shield); } - if (BOPConfiguration.BiomeGen.shrublandGen == true) + if (BOPConfigurationBiomeGen.shrublandGen == true) { addNewBiome(Biomes.shrubland); } - if (BOPConfiguration.BiomeGen.silkgladesGen == true) + if (BOPConfigurationBiomeGen.silkgladesGen == true) { addNewBiome(Biomes.silkglades); } - if (BOPConfiguration.BiomeGen.sludgepitGen == true) + if (BOPConfigurationBiomeGen.sludgepitGen == true) { addNewBiome(Biomes.sludgepit); } - if (BOPConfiguration.BiomeGen.spruceWoodsGen == true) + if (BOPConfigurationBiomeGen.spruceWoodsGen == true) { addNewBiome(Biomes.spruceWoods); } - if (BOPConfiguration.BiomeGen.steppeGen == true) + if (BOPConfigurationBiomeGen.steppeGen == true) { addNewBiome(Biomes.steppe); } - if (BOPConfiguration.BiomeGen.temperateRainforestGen == true) + if (BOPConfigurationBiomeGen.temperateRainforestGen == true) { addNewBiome(Biomes.temperateRainforest); } - if (BOPConfiguration.BiomeGen.thicketGen == true) + if (BOPConfigurationBiomeGen.thicketGen == true) { addNewBiome(Biomes.thicket); } - if (BOPConfiguration.BiomeGen.timberGen == true) + if (BOPConfigurationBiomeGen.timberGen == true) { addNewBiome(Biomes.timber); } - if (BOPConfiguration.BiomeGen.tropicalRainforestGen == true) + if (BOPConfigurationBiomeGen.tropicalRainforestGen == true) { addNewBiome(Biomes.tropicalRainforest); } - if (BOPConfiguration.BiomeGen.tropicsGen == true) + if (BOPConfigurationBiomeGen.tropicsGen == true) { addNewBiome(Biomes.tropics); } - if (BOPConfiguration.BiomeGen.tundraGen == true) + if (BOPConfigurationBiomeGen.tundraGen == true) { addNewBiome(Biomes.tundra); } - if (BOPConfiguration.BiomeGen.volcanoGen == true) + if (BOPConfigurationBiomeGen.volcanoGen == true) { addNewBiome(Biomes.volcano); } - if (BOPConfiguration.BiomeGen.wastelandGen == true) + if (BOPConfigurationBiomeGen.wastelandGen == true) { addNewBiome(Biomes.wasteland); } - if (BOPConfiguration.BiomeGen.wetlandGen == true) + if (BOPConfigurationBiomeGen.wetlandGen == true) { addNewBiome(Biomes.wetland); } - if (BOPConfiguration.BiomeGen.woodlandGen == true) + if (BOPConfigurationBiomeGen.woodlandGen == true) { addNewBiome(Biomes.woodland); } - if (BOPConfiguration.BiomeGen.plainsGen == true) + if (BOPConfigurationBiomeGen.plainsGen == true) { - if (BOPConfiguration.TerrainGen.vanillaEnhanced == true) + if (BOPConfigurationTerrainGen.vanillaEnhanced == true) { addNewBiome(Biomes.plainsNew); } @@ -338,9 +339,9 @@ public class WorldTypeBOP extends WorldType this.addNewBiome(BiomeGenBase.plains); } } - if (BOPConfiguration.BiomeGen.desertGen == true) + if (BOPConfigurationBiomeGen.desertGen == true) { - if (BOPConfiguration.TerrainGen.vanillaEnhanced == true) + if (BOPConfigurationTerrainGen.vanillaEnhanced == true) { addNewBiome(Biomes.desertNew); } @@ -349,9 +350,9 @@ public class WorldTypeBOP extends WorldType this.addNewBiome(BiomeGenBase.desert); } } - if (BOPConfiguration.BiomeGen.extremeHillsGen == true) + if (BOPConfigurationBiomeGen.extremeHillsGen == true) { - if (BOPConfiguration.TerrainGen.vanillaEnhanced == true) + if (BOPConfigurationTerrainGen.vanillaEnhanced == true) { addNewBiome(Biomes.extremeHillsNew); } @@ -360,9 +361,9 @@ public class WorldTypeBOP extends WorldType this.addNewBiome(BiomeGenBase.extremeHills); } } - if (BOPConfiguration.BiomeGen.forestGen == true) + if (BOPConfigurationBiomeGen.forestGen == true) { - if (BOPConfiguration.TerrainGen.vanillaEnhanced == true) + if (BOPConfigurationTerrainGen.vanillaEnhanced == true) { addNewBiome(Biomes.forestNew); } @@ -371,9 +372,9 @@ public class WorldTypeBOP extends WorldType this.addNewBiome(BiomeGenBase.forest); } } - if (BOPConfiguration.BiomeGen.taigaGen == true) + if (BOPConfigurationBiomeGen.taigaGen == true) { - if (BOPConfiguration.TerrainGen.vanillaEnhanced == true) + if (BOPConfigurationTerrainGen.vanillaEnhanced == true) { addNewBiome(Biomes.taigaNew); } @@ -382,9 +383,9 @@ public class WorldTypeBOP extends WorldType this.addNewBiome(BiomeGenBase.taiga); } } - if (BOPConfiguration.BiomeGen.swamplandGen == true) + if (BOPConfigurationBiomeGen.swamplandGen == true) { - if (BOPConfiguration.TerrainGen.vanillaEnhanced == true) + if (BOPConfigurationTerrainGen.vanillaEnhanced == true) { addNewBiome(Biomes.swamplandNew); } @@ -393,9 +394,9 @@ public class WorldTypeBOP extends WorldType this.addNewBiome(BiomeGenBase.swampland); } } - if (BOPConfiguration.BiomeGen.jungleGen == true) + if (BOPConfigurationBiomeGen.jungleGen == true) { - if (BOPConfiguration.TerrainGen.vanillaEnhanced == true) + if (BOPConfigurationTerrainGen.vanillaEnhanced == true) { addNewBiome(Biomes.jungleNew); } diff --git a/common/biomesoplenty/world/WorldTypeSize.java b/common/biomesoplenty/world/WorldTypeSize.java index 808a514d7..bfff6fcf7 100644 --- a/common/biomesoplenty/world/WorldTypeSize.java +++ b/common/biomesoplenty/world/WorldTypeSize.java @@ -4,7 +4,7 @@ import net.minecraft.world.WorldProviderHell; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.terraingen.WorldTypeEvent; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.configuration.configfile.BOPConfigurationTerrainGen; public class WorldTypeSize { @@ -12,15 +12,15 @@ public class WorldTypeSize public void BiomeSize(WorldTypeEvent.BiomeSize event) { if (event.worldType.getWorldTypeName() == "BIOMESOP") { - event.newSize = (byte)BOPConfiguration.TerrainGen.biomeSize; + event.newSize = (byte)BOPConfigurationTerrainGen.biomeSize; - if (BOPConfiguration.TerrainGen.netherOverride) + if (BOPConfigurationTerrainGen.netherOverride) { DimensionManager.unregisterProviderType(-1); DimensionManager.registerProviderType(-1, WorldProviderBOPhell.class, true); } } - else if (BOPConfiguration.TerrainGen.netherOverride && BOPConfiguration.TerrainGen.addToDefault) + else if (BOPConfigurationTerrainGen.netherOverride && BOPConfigurationTerrainGen.addToDefault) { DimensionManager.unregisterProviderType(-1); DimensionManager.registerProviderType(-1, WorldProviderBOPhell.class, true); diff --git a/common/biomesoplenty/world/layer/BiomeLayerBiomes.java b/common/biomesoplenty/world/layer/BiomeLayerBiomes.java index 41a4fcfd3..941cecedd 100644 --- a/common/biomesoplenty/world/layer/BiomeLayerBiomes.java +++ b/common/biomesoplenty/world/layer/BiomeLayerBiomes.java @@ -6,7 +6,7 @@ import net.minecraft.world.WorldType; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.layer.IntCache; import biomesoplenty.api.Biomes; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.configuration.configfile.BOPConfigurationBiomeGen; public class BiomeLayerBiomes extends BiomeLayer { @@ -48,28 +48,28 @@ public class BiomeLayerBiomes extends BiomeLayer } if (Biomes.netherGarden.isPresent()) { - if (BOPConfiguration.BiomeGen.undergardenGen == true) + if (BOPConfigurationBiomeGen.undergardenGen == true) { netherBiomes.add(Biomes.netherGarden.get()); } } if (Biomes.netherDesert.isPresent()) { - if (BOPConfiguration.BiomeGen.corruptedSandsGen == true) + if (BOPConfigurationBiomeGen.corruptedSandsGen == true) { netherBiomes.add(Biomes.netherDesert.get()); } } if (Biomes.netherLava.isPresent()) { - if (BOPConfiguration.BiomeGen.phantasmagoricInfernoGen == true) + if (BOPConfigurationBiomeGen.phantasmagoricInfernoGen == true) { netherBiomes.add(Biomes.netherLava.get()); } } if (Biomes.netherBone.isPresent()) { - if (BOPConfiguration.BiomeGen.boneyardGen == true) + if (BOPConfigurationBiomeGen.boneyardGen == true) { netherBiomes.add(Biomes.netherBone.get()); } diff --git a/common/biomesoplenty/world/layer/BiomeLayerCreate.java b/common/biomesoplenty/world/layer/BiomeLayerCreate.java index c34c674f0..d1a40b3e7 100644 --- a/common/biomesoplenty/world/layer/BiomeLayerCreate.java +++ b/common/biomesoplenty/world/layer/BiomeLayerCreate.java @@ -1,7 +1,7 @@ package biomesoplenty.world.layer; import net.minecraft.world.gen.layer.IntCache; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.configuration.configfile.BOPConfigurationBiomeGen; import biomesoplenty.api.Biomes; public class BiomeLayerCreate extends BiomeLayer @@ -16,7 +16,7 @@ public class BiomeLayerCreate extends BiomeLayer { int[] var5 = IntCache.getIntCache(par3 * par4); - boolean ocean = BOPConfiguration.BiomeGen.oceanGen; + boolean ocean = BOPConfigurationBiomeGen.oceanGen; boolean abyss = Biomes.oceanAbyss.isPresent(); boolean coral = Biomes.oceanCoral.isPresent(); boolean kelp = Biomes.oceanKelp.isPresent(); diff --git a/common/biomesoplenty/world/layer/BiomeLayerShore.java b/common/biomesoplenty/world/layer/BiomeLayerShore.java index d4b7d7768..ca28c61dc 100644 --- a/common/biomesoplenty/world/layer/BiomeLayerShore.java +++ b/common/biomesoplenty/world/layer/BiomeLayerShore.java @@ -5,7 +5,7 @@ import java.util.ArrayList; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.layer.IntCache; import biomesoplenty.api.Biomes; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.configuration.configfile.BOPConfigurationBiomeGen; public class BiomeLayerShore extends BiomeLayer { @@ -21,14 +21,14 @@ public class BiomeLayerShore extends BiomeLayer beachBiomes.add(BiomeGenBase.beach); if (Biomes.beachGravel.isPresent()) { - if (BOPConfiguration.BiomeGen.gravelBeachGen == true) + if (BOPConfigurationBiomeGen.gravelBeachGen == true) { beachBiomes.add(Biomes.beachGravel.get()); } } if (Biomes.beachOvergrown.isPresent()) { - if (BOPConfiguration.BiomeGen.overgrownBeachGen == true) + if (BOPConfigurationBiomeGen.overgrownBeachGen == true) { beachBiomes.add(Biomes.beachOvergrown.get()); } diff --git a/common/biomesoplenty/worldgen/WorldGenRealMagic.java b/common/biomesoplenty/worldgen/realtree/WorldGenRealMagic.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenRealMagic.java rename to common/biomesoplenty/worldgen/realtree/WorldGenRealMagic.java index 396d4d936..60461b4f9 100644 --- a/common/biomesoplenty/worldgen/WorldGenRealMagic.java +++ b/common/biomesoplenty/worldgen/realtree/WorldGenRealMagic.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.realtree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenRealPineTree.java b/common/biomesoplenty/worldgen/realtree/WorldGenRealPineTree.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenRealPineTree.java rename to common/biomesoplenty/worldgen/realtree/WorldGenRealPineTree.java index dee5857f9..90706a24e 100644 --- a/common/biomesoplenty/worldgen/WorldGenRealPineTree.java +++ b/common/biomesoplenty/worldgen/realtree/WorldGenRealPineTree.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.realtree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenRealPineTree2.java b/common/biomesoplenty/worldgen/realtree/WorldGenRealPineTree2.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenRealPineTree2.java rename to common/biomesoplenty/worldgen/realtree/WorldGenRealPineTree2.java index 7b4bf8ac4..e03b38bd5 100644 --- a/common/biomesoplenty/worldgen/WorldGenRealPineTree2.java +++ b/common/biomesoplenty/worldgen/realtree/WorldGenRealPineTree2.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.realtree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenRealRedwood.java b/common/biomesoplenty/worldgen/realtree/WorldGenRealRedwood.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenRealRedwood.java rename to common/biomesoplenty/worldgen/realtree/WorldGenRealRedwood.java index 8482a7e38..3d78e7b22 100644 --- a/common/biomesoplenty/worldgen/WorldGenRealRedwood.java +++ b/common/biomesoplenty/worldgen/realtree/WorldGenRealRedwood.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.realtree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenRealRedwood2.java b/common/biomesoplenty/worldgen/realtree/WorldGenRealRedwood2.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenRealRedwood2.java rename to common/biomesoplenty/worldgen/realtree/WorldGenRealRedwood2.java index 2a83b1f3f..2004d490a 100644 --- a/common/biomesoplenty/worldgen/WorldGenRealRedwood2.java +++ b/common/biomesoplenty/worldgen/realtree/WorldGenRealRedwood2.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.realtree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/structure/BOPMapGenVillage.java b/common/biomesoplenty/worldgen/structure/BOPMapGenVillage.java index 37dba3f1b..7c2b9f09b 100644 --- a/common/biomesoplenty/worldgen/structure/BOPMapGenVillage.java +++ b/common/biomesoplenty/worldgen/structure/BOPMapGenVillage.java @@ -12,7 +12,7 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.structure.MapGenStructure; import net.minecraft.world.gen.structure.MapGenVillage; import net.minecraft.world.gen.structure.StructureStart; -import biomesoplenty.configuration.BOPConfiguration; +import biomesoplenty.configuration.configfile.BOPConfigurationTerrainGen; public class BOPMapGenVillage extends MapGenStructure { @@ -27,8 +27,8 @@ public class BOPMapGenVillage extends MapGenStructure public BOPMapGenVillage() { terrainType = 0; - maxDistance = BOPConfiguration.TerrainGen.villageDistance; - minDistance = BOPConfiguration.TerrainGen.villageDistance / 4; + maxDistance = BOPConfigurationTerrainGen.villageDistance; + minDistance = BOPConfigurationTerrainGen.villageDistance / 4; villageSpawnBiomes = MapGenVillage.villageSpawnBiomes; } diff --git a/common/biomesoplenty/worldgen/WorldGenAcacia.java b/common/biomesoplenty/worldgen/tree/WorldGenAcacia.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenAcacia.java rename to common/biomesoplenty/worldgen/tree/WorldGenAcacia.java index 105e4c64e..fe54b5232 100644 --- a/common/biomesoplenty/worldgen/WorldGenAcacia.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenAcacia.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenApple.java b/common/biomesoplenty/worldgen/tree/WorldGenApple.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenApple.java rename to common/biomesoplenty/worldgen/tree/WorldGenApple.java index f7225e846..2a623700e 100644 --- a/common/biomesoplenty/worldgen/WorldGenApple.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenApple.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenAutumn.java b/common/biomesoplenty/worldgen/tree/WorldGenAutumn.java similarity index 98% rename from common/biomesoplenty/worldgen/WorldGenAutumn.java rename to common/biomesoplenty/worldgen/tree/WorldGenAutumn.java index f99692716..de51e64ae 100644 --- a/common/biomesoplenty/worldgen/WorldGenAutumn.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenAutumn.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenAutumn2.java b/common/biomesoplenty/worldgen/tree/WorldGenAutumn2.java similarity index 98% rename from common/biomesoplenty/worldgen/WorldGenAutumn2.java rename to common/biomesoplenty/worldgen/tree/WorldGenAutumn2.java index 0fa70711a..7e2ea43cb 100644 --- a/common/biomesoplenty/worldgen/WorldGenAutumn2.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenAutumn2.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenAutumn2Big.java b/common/biomesoplenty/worldgen/tree/WorldGenAutumn2Big.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenAutumn2Big.java rename to common/biomesoplenty/worldgen/tree/WorldGenAutumn2Big.java index 9b354bc1f..533b5c0c1 100644 --- a/common/biomesoplenty/worldgen/WorldGenAutumn2Big.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenAutumn2Big.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenBambooTree.java b/common/biomesoplenty/worldgen/tree/WorldGenBambooTree.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenBambooTree.java rename to common/biomesoplenty/worldgen/tree/WorldGenBambooTree.java index 73461d98c..0ce925080 100644 --- a/common/biomesoplenty/worldgen/WorldGenBambooTree.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenBambooTree.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenBambooTree2.java b/common/biomesoplenty/worldgen/tree/WorldGenBambooTree2.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenBambooTree2.java rename to common/biomesoplenty/worldgen/tree/WorldGenBambooTree2.java index e4f2cd532..278aa6ff0 100644 --- a/common/biomesoplenty/worldgen/WorldGenBambooTree2.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenBambooTree2.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenBayou1.java b/common/biomesoplenty/worldgen/tree/WorldGenBayou1.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenBayou1.java rename to common/biomesoplenty/worldgen/tree/WorldGenBayou1.java index 88643ba82..7492c4429 100644 --- a/common/biomesoplenty/worldgen/WorldGenBayou1.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenBayou1.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenBayou2.java b/common/biomesoplenty/worldgen/tree/WorldGenBayou2.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenBayou2.java rename to common/biomesoplenty/worldgen/tree/WorldGenBayou2.java index 5a047bb2f..7bd3a39d8 100644 --- a/common/biomesoplenty/worldgen/WorldGenBayou2.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenBayou2.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenBayou3.java b/common/biomesoplenty/worldgen/tree/WorldGenBayou3.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenBayou3.java rename to common/biomesoplenty/worldgen/tree/WorldGenBayou3.java index 4ab0487fe..a242709a3 100644 --- a/common/biomesoplenty/worldgen/WorldGenBayou3.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenBayou3.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenBirchWillow.java b/common/biomesoplenty/worldgen/tree/WorldGenBirchWillow.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenBirchWillow.java rename to common/biomesoplenty/worldgen/tree/WorldGenBirchWillow.java index 1581b1a9f..d3b12e0da 100644 --- a/common/biomesoplenty/worldgen/WorldGenBirchWillow.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenBirchWillow.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenCanyonTree.java b/common/biomesoplenty/worldgen/tree/WorldGenCanyonTree.java similarity index 98% rename from common/biomesoplenty/worldgen/WorldGenCanyonTree.java rename to common/biomesoplenty/worldgen/tree/WorldGenCanyonTree.java index 5f447fb9f..7c223ae66 100644 --- a/common/biomesoplenty/worldgen/WorldGenCanyonTree.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenCanyonTree.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenCherry1.java b/common/biomesoplenty/worldgen/tree/WorldGenCherry1.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenCherry1.java rename to common/biomesoplenty/worldgen/tree/WorldGenCherry1.java index f93aab0ff..c35a6c2e0 100644 --- a/common/biomesoplenty/worldgen/WorldGenCherry1.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenCherry1.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenCherry2.java b/common/biomesoplenty/worldgen/tree/WorldGenCherry2.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenCherry2.java rename to common/biomesoplenty/worldgen/tree/WorldGenCherry2.java index 3aef1a74f..add90bcf4 100644 --- a/common/biomesoplenty/worldgen/WorldGenCherry2.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenCherry2.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenDeadTree.java b/common/biomesoplenty/worldgen/tree/WorldGenDeadTree.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenDeadTree.java rename to common/biomesoplenty/worldgen/tree/WorldGenDeadTree.java index b94fb8ef3..993bea69b 100644 --- a/common/biomesoplenty/worldgen/WorldGenDeadTree.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenDeadTree.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenDeadTree2.java b/common/biomesoplenty/worldgen/tree/WorldGenDeadTree2.java similarity index 98% rename from common/biomesoplenty/worldgen/WorldGenDeadTree2.java rename to common/biomesoplenty/worldgen/tree/WorldGenDeadTree2.java index 858ee0241..4e54f4572 100644 --- a/common/biomesoplenty/worldgen/WorldGenDeadTree2.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenDeadTree2.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenDeadTree3.java b/common/biomesoplenty/worldgen/tree/WorldGenDeadTree3.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenDeadTree3.java rename to common/biomesoplenty/worldgen/tree/WorldGenDeadTree3.java index 5f59959a7..8f433a230 100644 --- a/common/biomesoplenty/worldgen/WorldGenDeadTree3.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenDeadTree3.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenDeciduous.java b/common/biomesoplenty/worldgen/tree/WorldGenDeciduous.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenDeciduous.java rename to common/biomesoplenty/worldgen/tree/WorldGenDeciduous.java index 8cf3a3f77..ca0d12c75 100644 --- a/common/biomesoplenty/worldgen/WorldGenDeciduous.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenDeciduous.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenDeciduous2.java b/common/biomesoplenty/worldgen/tree/WorldGenDeciduous2.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenDeciduous2.java rename to common/biomesoplenty/worldgen/tree/WorldGenDeciduous2.java index b13d202e5..9b5d83d26 100644 --- a/common/biomesoplenty/worldgen/WorldGenDeciduous2.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenDeciduous2.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenFen1.java b/common/biomesoplenty/worldgen/tree/WorldGenFen1.java similarity index 98% rename from common/biomesoplenty/worldgen/WorldGenFen1.java rename to common/biomesoplenty/worldgen/tree/WorldGenFen1.java index 540dfd3ea..ca0928a24 100644 --- a/common/biomesoplenty/worldgen/WorldGenFen1.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenFen1.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenFen2.java b/common/biomesoplenty/worldgen/tree/WorldGenFen2.java similarity index 98% rename from common/biomesoplenty/worldgen/WorldGenFen2.java rename to common/biomesoplenty/worldgen/tree/WorldGenFen2.java index ad24af8fe..553358d3d 100644 --- a/common/biomesoplenty/worldgen/WorldGenFen2.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenFen2.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenFir1.java b/common/biomesoplenty/worldgen/tree/WorldGenFir1.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenFir1.java rename to common/biomesoplenty/worldgen/tree/WorldGenFir1.java index 896c3b5db..2d6d56d43 100644 --- a/common/biomesoplenty/worldgen/WorldGenFir1.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenFir1.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenFir2.java b/common/biomesoplenty/worldgen/tree/WorldGenFir2.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenFir2.java rename to common/biomesoplenty/worldgen/tree/WorldGenFir2.java index 3263ca9db..4c0043488 100644 --- a/common/biomesoplenty/worldgen/WorldGenFir2.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenFir2.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenFir3.java b/common/biomesoplenty/worldgen/tree/WorldGenFir3.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenFir3.java rename to common/biomesoplenty/worldgen/tree/WorldGenFir3.java index 5c23579f7..c834acc59 100644 --- a/common/biomesoplenty/worldgen/WorldGenFir3.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenFir3.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenIceTree.java b/common/biomesoplenty/worldgen/tree/WorldGenIceTree.java similarity index 98% rename from common/biomesoplenty/worldgen/WorldGenIceTree.java rename to common/biomesoplenty/worldgen/tree/WorldGenIceTree.java index 86dbbd930..a534f7e48 100644 --- a/common/biomesoplenty/worldgen/WorldGenIceTree.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenIceTree.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenJacaranda.java b/common/biomesoplenty/worldgen/tree/WorldGenJacaranda.java similarity index 98% rename from common/biomesoplenty/worldgen/WorldGenJacaranda.java rename to common/biomesoplenty/worldgen/tree/WorldGenJacaranda.java index 5e69c6268..7bfb1397f 100644 --- a/common/biomesoplenty/worldgen/WorldGenJacaranda.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenJacaranda.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenLargeTree.java b/common/biomesoplenty/worldgen/tree/WorldGenLargeTree.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenLargeTree.java rename to common/biomesoplenty/worldgen/tree/WorldGenLargeTree.java index 7bfca7087..6c42a831d 100644 --- a/common/biomesoplenty/worldgen/WorldGenLargeTree.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenLargeTree.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenMangrove.java b/common/biomesoplenty/worldgen/tree/WorldGenMangrove.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenMangrove.java rename to common/biomesoplenty/worldgen/tree/WorldGenMangrove.java index 6f2441256..fb3a4ef26 100644 --- a/common/biomesoplenty/worldgen/WorldGenMangrove.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenMangrove.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenMangrove2.java b/common/biomesoplenty/worldgen/tree/WorldGenMangrove2.java similarity index 97% rename from common/biomesoplenty/worldgen/WorldGenMangrove2.java rename to common/biomesoplenty/worldgen/tree/WorldGenMangrove2.java index a91399968..cc07617df 100644 --- a/common/biomesoplenty/worldgen/WorldGenMangrove2.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenMangrove2.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenMaple.java b/common/biomesoplenty/worldgen/tree/WorldGenMaple.java similarity index 98% rename from common/biomesoplenty/worldgen/WorldGenMaple.java rename to common/biomesoplenty/worldgen/tree/WorldGenMaple.java index 08cc9dca2..44acf588d 100644 --- a/common/biomesoplenty/worldgen/WorldGenMaple.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenMaple.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenMapleBig.java b/common/biomesoplenty/worldgen/tree/WorldGenMapleBig.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenMapleBig.java rename to common/biomesoplenty/worldgen/tree/WorldGenMapleBig.java index fe619cfe4..2616e7b47 100644 --- a/common/biomesoplenty/worldgen/WorldGenMapleBig.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenMapleBig.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenMystic1.java b/common/biomesoplenty/worldgen/tree/WorldGenMystic1.java similarity index 98% rename from common/biomesoplenty/worldgen/WorldGenMystic1.java rename to common/biomesoplenty/worldgen/tree/WorldGenMystic1.java index 79c078812..011b18141 100644 --- a/common/biomesoplenty/worldgen/WorldGenMystic1.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenMystic1.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenMystic2.java b/common/biomesoplenty/worldgen/tree/WorldGenMystic2.java similarity index 98% rename from common/biomesoplenty/worldgen/WorldGenMystic2.java rename to common/biomesoplenty/worldgen/tree/WorldGenMystic2.java index 077210cbe..140a8b532 100644 --- a/common/biomesoplenty/worldgen/WorldGenMystic2.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenMystic2.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenMystic3.java b/common/biomesoplenty/worldgen/tree/WorldGenMystic3.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenMystic3.java rename to common/biomesoplenty/worldgen/tree/WorldGenMystic3.java index 8d98df88e..4b24b253e 100644 --- a/common/biomesoplenty/worldgen/WorldGenMystic3.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenMystic3.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenOminous1.java b/common/biomesoplenty/worldgen/tree/WorldGenOminous1.java similarity index 98% rename from common/biomesoplenty/worldgen/WorldGenOminous1.java rename to common/biomesoplenty/worldgen/tree/WorldGenOminous1.java index a87cf410f..ad6935aa6 100644 --- a/common/biomesoplenty/worldgen/WorldGenOminous1.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenOminous1.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenOminous2.java b/common/biomesoplenty/worldgen/tree/WorldGenOminous2.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenOminous2.java rename to common/biomesoplenty/worldgen/tree/WorldGenOminous2.java index 47224420c..cafc13739 100644 --- a/common/biomesoplenty/worldgen/WorldGenOminous2.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenOminous2.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenOminous3.java b/common/biomesoplenty/worldgen/tree/WorldGenOminous3.java similarity index 98% rename from common/biomesoplenty/worldgen/WorldGenOminous3.java rename to common/biomesoplenty/worldgen/tree/WorldGenOminous3.java index db5c4d081..d3f33b5dd 100644 --- a/common/biomesoplenty/worldgen/WorldGenOminous3.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenOminous3.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenOminous4.java b/common/biomesoplenty/worldgen/tree/WorldGenOminous4.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenOminous4.java rename to common/biomesoplenty/worldgen/tree/WorldGenOminous4.java index ed6ffc77e..008032137 100644 --- a/common/biomesoplenty/worldgen/WorldGenOminous4.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenOminous4.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenOriginTree.java b/common/biomesoplenty/worldgen/tree/WorldGenOriginTree.java similarity index 98% rename from common/biomesoplenty/worldgen/WorldGenOriginTree.java rename to common/biomesoplenty/worldgen/tree/WorldGenOriginTree.java index 42d75d53e..6bfa40e27 100644 --- a/common/biomesoplenty/worldgen/WorldGenOriginTree.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenOriginTree.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenOutbackTree.java b/common/biomesoplenty/worldgen/tree/WorldGenOutbackTree.java similarity index 97% rename from common/biomesoplenty/worldgen/WorldGenOutbackTree.java rename to common/biomesoplenty/worldgen/tree/WorldGenOutbackTree.java index ed0859ec4..3bbae977f 100644 --- a/common/biomesoplenty/worldgen/WorldGenOutbackTree.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenOutbackTree.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenOvergrownTree.java b/common/biomesoplenty/worldgen/tree/WorldGenOvergrownTree.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenOvergrownTree.java rename to common/biomesoplenty/worldgen/tree/WorldGenOvergrownTree.java index c49608fe0..116b47917 100644 --- a/common/biomesoplenty/worldgen/WorldGenOvergrownTree.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenOvergrownTree.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenPalmTree1.java b/common/biomesoplenty/worldgen/tree/WorldGenPalmTree1.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenPalmTree1.java rename to common/biomesoplenty/worldgen/tree/WorldGenPalmTree1.java index 5cba8b91b..8a8e9c302 100644 --- a/common/biomesoplenty/worldgen/WorldGenPalmTree1.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenPalmTree1.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenPalmTree3.java b/common/biomesoplenty/worldgen/tree/WorldGenPalmTree3.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenPalmTree3.java rename to common/biomesoplenty/worldgen/tree/WorldGenPalmTree3.java index d4fef5782..3a8e9f61f 100644 --- a/common/biomesoplenty/worldgen/WorldGenPalmTree3.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenPalmTree3.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenPersimmon.java b/common/biomesoplenty/worldgen/tree/WorldGenPersimmon.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenPersimmon.java rename to common/biomesoplenty/worldgen/tree/WorldGenPersimmon.java index 61c707ac3..1de9ce622 100644 --- a/common/biomesoplenty/worldgen/WorldGenPersimmon.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenPersimmon.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenPineTree.java b/common/biomesoplenty/worldgen/tree/WorldGenPineTree.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenPineTree.java rename to common/biomesoplenty/worldgen/tree/WorldGenPineTree.java index 81b39cfaa..c48549ab9 100644 --- a/common/biomesoplenty/worldgen/WorldGenPineTree.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenPineTree.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenPromisedTree.java b/common/biomesoplenty/worldgen/tree/WorldGenPromisedTree.java similarity index 98% rename from common/biomesoplenty/worldgen/WorldGenPromisedTree.java rename to common/biomesoplenty/worldgen/tree/WorldGenPromisedTree.java index 6f9173392..3dd9de72d 100644 --- a/common/biomesoplenty/worldgen/WorldGenPromisedTree.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenPromisedTree.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenPromisedTree2.java b/common/biomesoplenty/worldgen/tree/WorldGenPromisedTree2.java similarity index 98% rename from common/biomesoplenty/worldgen/WorldGenPromisedTree2.java rename to common/biomesoplenty/worldgen/tree/WorldGenPromisedTree2.java index d98773b08..cd393475b 100644 --- a/common/biomesoplenty/worldgen/WorldGenPromisedTree2.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenPromisedTree2.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenPromisedTree3.java b/common/biomesoplenty/worldgen/tree/WorldGenPromisedTree3.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenPromisedTree3.java rename to common/biomesoplenty/worldgen/tree/WorldGenPromisedTree3.java index 90be39e0c..9b466511b 100644 --- a/common/biomesoplenty/worldgen/WorldGenPromisedTree3.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenPromisedTree3.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenPromisedWillow.java b/common/biomesoplenty/worldgen/tree/WorldGenPromisedWillow.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenPromisedWillow.java rename to common/biomesoplenty/worldgen/tree/WorldGenPromisedWillow.java index 62da944f8..779c03ac9 100644 --- a/common/biomesoplenty/worldgen/WorldGenPromisedWillow.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenPromisedWillow.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenPromisedWillowTree.java b/common/biomesoplenty/worldgen/tree/WorldGenPromisedWillowTree.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenPromisedWillowTree.java rename to common/biomesoplenty/worldgen/tree/WorldGenPromisedWillowTree.java index 415fc4299..f49358e09 100644 --- a/common/biomesoplenty/worldgen/WorldGenPromisedWillowTree.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenPromisedWillowTree.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenRainforest1.java b/common/biomesoplenty/worldgen/tree/WorldGenRainforest1.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenRainforest1.java rename to common/biomesoplenty/worldgen/tree/WorldGenRainforest1.java index 5fbb4454b..e5f9ddc74 100644 --- a/common/biomesoplenty/worldgen/WorldGenRainforest1.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenRainforest1.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenRainforest2.java b/common/biomesoplenty/worldgen/tree/WorldGenRainforest2.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenRainforest2.java rename to common/biomesoplenty/worldgen/tree/WorldGenRainforest2.java index 75211af03..c57e77510 100644 --- a/common/biomesoplenty/worldgen/WorldGenRainforest2.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenRainforest2.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenRainforestTree1.java b/common/biomesoplenty/worldgen/tree/WorldGenRainforestTree1.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenRainforestTree1.java rename to common/biomesoplenty/worldgen/tree/WorldGenRainforestTree1.java index f09ed442c..5ee32ba21 100644 --- a/common/biomesoplenty/worldgen/WorldGenRainforestTree1.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenRainforestTree1.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenRedwoodTree.java b/common/biomesoplenty/worldgen/tree/WorldGenRedwoodTree.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenRedwoodTree.java rename to common/biomesoplenty/worldgen/tree/WorldGenRedwoodTree.java index 3993c85e8..03704e864 100644 --- a/common/biomesoplenty/worldgen/WorldGenRedwoodTree.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenRedwoodTree.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenRedwoodTree2.java b/common/biomesoplenty/worldgen/tree/WorldGenRedwoodTree2.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenRedwoodTree2.java rename to common/biomesoplenty/worldgen/tree/WorldGenRedwoodTree2.java index 21767f3b3..e8694c199 100644 --- a/common/biomesoplenty/worldgen/WorldGenRedwoodTree2.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenRedwoodTree2.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenSwampTall.java b/common/biomesoplenty/worldgen/tree/WorldGenSwampTall.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenSwampTall.java rename to common/biomesoplenty/worldgen/tree/WorldGenSwampTall.java index 3401c90c4..8cb295cf8 100644 --- a/common/biomesoplenty/worldgen/WorldGenSwampTall.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenSwampTall.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenTaiga10.java b/common/biomesoplenty/worldgen/tree/WorldGenTaiga10.java similarity index 98% rename from common/biomesoplenty/worldgen/WorldGenTaiga10.java rename to common/biomesoplenty/worldgen/tree/WorldGenTaiga10.java index 675a77640..4e8b6859c 100644 --- a/common/biomesoplenty/worldgen/WorldGenTaiga10.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenTaiga10.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenTaiga3.java b/common/biomesoplenty/worldgen/tree/WorldGenTaiga3.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenTaiga3.java rename to common/biomesoplenty/worldgen/tree/WorldGenTaiga3.java index 61a750d32..5b158728f 100644 --- a/common/biomesoplenty/worldgen/WorldGenTaiga3.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenTaiga3.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenTaiga4.java b/common/biomesoplenty/worldgen/tree/WorldGenTaiga4.java similarity index 98% rename from common/biomesoplenty/worldgen/WorldGenTaiga4.java rename to common/biomesoplenty/worldgen/tree/WorldGenTaiga4.java index 7bb888ffa..d75b17484 100644 --- a/common/biomesoplenty/worldgen/WorldGenTaiga4.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenTaiga4.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenTaiga5.java b/common/biomesoplenty/worldgen/tree/WorldGenTaiga5.java similarity index 98% rename from common/biomesoplenty/worldgen/WorldGenTaiga5.java rename to common/biomesoplenty/worldgen/tree/WorldGenTaiga5.java index 387503a21..034ed4668 100644 --- a/common/biomesoplenty/worldgen/WorldGenTaiga5.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenTaiga5.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenTaiga6.java b/common/biomesoplenty/worldgen/tree/WorldGenTaiga6.java similarity index 98% rename from common/biomesoplenty/worldgen/WorldGenTaiga6.java rename to common/biomesoplenty/worldgen/tree/WorldGenTaiga6.java index 633f6195d..1c771f1f8 100644 --- a/common/biomesoplenty/worldgen/WorldGenTaiga6.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenTaiga6.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenTaiga7.java b/common/biomesoplenty/worldgen/tree/WorldGenTaiga7.java similarity index 98% rename from common/biomesoplenty/worldgen/WorldGenTaiga7.java rename to common/biomesoplenty/worldgen/tree/WorldGenTaiga7.java index be7ae4e90..3a4719a25 100644 --- a/common/biomesoplenty/worldgen/WorldGenTaiga7.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenTaiga7.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenTaiga8.java b/common/biomesoplenty/worldgen/tree/WorldGenTaiga8.java similarity index 98% rename from common/biomesoplenty/worldgen/WorldGenTaiga8.java rename to common/biomesoplenty/worldgen/tree/WorldGenTaiga8.java index 1cfdc7f65..1dc730df6 100644 --- a/common/biomesoplenty/worldgen/WorldGenTaiga8.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenTaiga8.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenTaiga9.java b/common/biomesoplenty/worldgen/tree/WorldGenTaiga9.java similarity index 98% rename from common/biomesoplenty/worldgen/WorldGenTaiga9.java rename to common/biomesoplenty/worldgen/tree/WorldGenTaiga9.java index d1aa574fe..2e47c1b38 100644 --- a/common/biomesoplenty/worldgen/WorldGenTaiga9.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenTaiga9.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenTemperate.java b/common/biomesoplenty/worldgen/tree/WorldGenTemperate.java similarity index 98% rename from common/biomesoplenty/worldgen/WorldGenTemperate.java rename to common/biomesoplenty/worldgen/tree/WorldGenTemperate.java index 4f49a4266..ab2cddb53 100644 --- a/common/biomesoplenty/worldgen/WorldGenTemperate.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenTemperate.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenThickTree.java b/common/biomesoplenty/worldgen/tree/WorldGenThickTree.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenThickTree.java rename to common/biomesoplenty/worldgen/tree/WorldGenThickTree.java index 924f0ba8f..fed0807e5 100644 --- a/common/biomesoplenty/worldgen/WorldGenThickTree.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenThickTree.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenThickTree2.java b/common/biomesoplenty/worldgen/tree/WorldGenThickTree2.java similarity index 98% rename from common/biomesoplenty/worldgen/WorldGenThickTree2.java rename to common/biomesoplenty/worldgen/tree/WorldGenThickTree2.java index e795e968a..c5b6636de 100644 --- a/common/biomesoplenty/worldgen/WorldGenThickTree2.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenThickTree2.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenThickTree3.java b/common/biomesoplenty/worldgen/tree/WorldGenThickTree3.java similarity index 98% rename from common/biomesoplenty/worldgen/WorldGenThickTree3.java rename to common/biomesoplenty/worldgen/tree/WorldGenThickTree3.java index 81697a177..604fc9878 100644 --- a/common/biomesoplenty/worldgen/WorldGenThickTree3.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenThickTree3.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random; diff --git a/common/biomesoplenty/worldgen/WorldGenWillow.java b/common/biomesoplenty/worldgen/tree/WorldGenWillow.java similarity index 99% rename from common/biomesoplenty/worldgen/WorldGenWillow.java rename to common/biomesoplenty/worldgen/tree/WorldGenWillow.java index a87e3e6ab..913d4628d 100644 --- a/common/biomesoplenty/worldgen/WorldGenWillow.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenWillow.java @@ -1,4 +1,4 @@ -package biomesoplenty.worldgen; +package biomesoplenty.worldgen.tree; import java.util.Random;