From c853d692a1616575e46a78fab5f2dfcef4fa07c4 Mon Sep 17 00:00:00 2001 From: Amnet Date: Tue, 23 Apr 2013 12:35:29 +0200 Subject: [PATCH] Cleaned up configuration. Some refactoting. --- .../biomesoplenty/BiomesOPlenty.java | 2 +- .../biomesoplenty/blocks/BlockBOPSapling.java | 4 +- .../configuration/BOPBiomes.java | 1327 ++++++++--------- .../configuration/BOPConfiguration.java | 124 +- .../biomesoplenty/configuration/BOPItems.java | 2 +- .../biomesoplenty/worldtype/WTBiomesOP.java | 4 - .../worldtype/WorldTypeBase.java | 5 - 7 files changed, 697 insertions(+), 771 deletions(-) diff --git a/src/minecraft/biomesoplenty/BiomesOPlenty.java b/src/minecraft/biomesoplenty/BiomesOPlenty.java index 147cbb105..38285b3e0 100644 --- a/src/minecraft/biomesoplenty/BiomesOPlenty.java +++ b/src/minecraft/biomesoplenty/BiomesOPlenty.java @@ -113,7 +113,7 @@ public class BiomesOPlenty public void load(FMLInitializationEvent event) { LanguageRegistry.instance().addStringLocalization("itemGroup.tabBiomesOPlenty", "en_US", "Biomes O\' Plenty"); - LanguageRegistry.instance().addStringLocalization("generator.BIOMESOP", "en_US", "Biomes O\' Plenty"); + //LanguageRegistry.instance().addStringLocalization("generator.BIOMESOP", "en_US", "Biomes O\' Plenty"); // Add helpers for compatibility MinecraftForge.TERRAIN_GEN_BUS.register(new WorldTypeSize()); diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPSapling.java b/src/minecraft/biomesoplenty/blocks/BlockBOPSapling.java index 525c1e675..abc94c03d 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPSapling.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPSapling.java @@ -27,8 +27,6 @@ import biomesoplenty.worldgen.WorldGenOminous2; import biomesoplenty.worldgen.WorldGenOriginTree; import biomesoplenty.worldgen.WorldGenPromisedTree; import biomesoplenty.worldgen.WorldGenTaiga9; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockBOPSapling extends BlockSapling { @@ -76,7 +74,7 @@ public class BlockBOPSapling extends BlockSapling int meta = world.getBlockMetadata(x, y, z) & TYPES; Object obj = null; int rnd = random.nextInt(8); - System.out.println(meta); + if (obj == null) { switch (meta) diff --git a/src/minecraft/biomesoplenty/configuration/BOPBiomes.java b/src/minecraft/biomesoplenty/configuration/BOPBiomes.java index b4d9b13cc..a82833bb2 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPBiomes.java +++ b/src/minecraft/biomesoplenty/configuration/BOPBiomes.java @@ -28,697 +28,662 @@ public class BOPBiomes { public static void init() { - // Initialize biomes - Biomes.alps = Optional.of((new BiomeGenAlps(BOPConfiguration.alpsID)).setColor(353825).setBiomeName("Alps").func_76733_a(5159473).setTemperatureRainfall(0.0F, 0.0F).setMinMaxHeight(5.0F, 5.0F)); - Biomes.arctic = Optional.of((new BiomeGenArctic(BOPConfiguration.arcticID)).setColor(14090235).setBiomeName("Arctic").setTemperatureRainfall(0.0F, 0.0F).setMinMaxHeight(0.1F, 0.7F)); - Biomes.badlands = Optional.of((new BiomeGenBadlands(BOPConfiguration.badlandsID)).setColor(16421912).setBiomeName("Badlands").setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.3F, 0.9F)); - Biomes.bambooForest = Optional.of((new BiomeGenBambooForest(BOPConfiguration.bambooForestID)).setColor(112).setBiomeName("Bamboo Forest").setMinMaxHeight(0.0F, 0.3F).setTemperatureRainfall(1.2F, 0.9F)); - Biomes.bayou = Optional.of((new BiomeGenBayou(BOPConfiguration.bayouID)).setColor(522674).setBiomeName("Bayou").func_76733_a(9154376).setMinMaxHeight(-0.3F, 0.2F).setTemperatureRainfall(0.5F, 0.9F)); - Biomes.birchForest = Optional.of((new BiomeGenBirchForest(BOPConfiguration.birchForestID)).setColor(353825).setBiomeName("Birch Forest").func_76733_a(5159473).setTemperatureRainfall(0.4F, 0.3F)); - Biomes.bog = Optional.of((new BiomeGenBog(BOPConfiguration.bogID)).setColor(522674).setBiomeName("Bog").func_76733_a(9154376).setMinMaxHeight(-0.3F, -0.1F).setTemperatureRainfall(0.8F, 0.9F)); - Biomes.borealForest = Optional.of((new BiomeGenBorealForest(BOPConfiguration.borealForestID)).setColor(353825).setBiomeName("Boreal Forest").func_76733_a(5159473).setMinMaxHeight(0.0F, 1.0F).setTemperatureRainfall(0.6F, 0.7F)); - Biomes.canyon = Optional.of((new BiomeGenCanyon(BOPConfiguration.canyonID)).setColor(9286496).setBiomeName("Canyon").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(3.0F, 5.0F)); - Biomes.chaparral = Optional.of((new BiomeGenChaparral(BOPConfiguration.chaparralID)).setColor(9286496).setBiomeName("Chaparral").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.3F, 0.6F)); - Biomes.cherryBlossomGrove = Optional.of((new BiomeGenCherryBlossomGrove(BOPConfiguration.cherryBlossomGroveID)).setColor(9286496).setBiomeName("Cherry Blossom Grove").setMinMaxHeight(0.1F, 0.2F).setTemperatureRainfall(0.7F, 0.8F)); - Biomes.coniferousForest = Optional.of((new BiomeGenConiferousForest(BOPConfiguration.coniferousForestID)).setColor(747097).setBiomeName("Coniferous Forest").func_76733_a(5159473).setTemperatureRainfall(0.3F, 0.4F).setMinMaxHeight(0.1F, 0.8F)); - Biomes.crag = Optional.of((new BiomeGenCrag(BOPConfiguration.cragID)).setColor(9286496).setBiomeName("Crag").setMinMaxHeight(0.0F, 9.9F).setTemperatureRainfall(0.4F, 0.2F)); - Biomes.deadForest = Optional.of((new BiomeGenDeadForest(BOPConfiguration.deadForestID)).setColor(522674).setBiomeName("Dead Forest").func_76733_a(9154376).setMinMaxHeight(0.2F, 0.7F).setTemperatureRainfall(1.2F, 0.1F)); - Biomes.deadSwamp = Optional.of((new BiomeGenDeadSwamp(BOPConfiguration.deadSwampID)).setColor(522674).setBiomeName("Dead Swamp").func_76733_a(9154376).setMinMaxHeight(-0.2F, 0.1F).setTemperatureRainfall(0.8F, 0.9F)); - Biomes.deadlands = Optional.of((new BiomeGenDeadlands(BOPConfiguration.deadlandsID)).setColor(522674).setBiomeName("Deadlands").setDisableRain().func_76733_a(9154376).setMinMaxHeight(0.1F, 0.5F).setTemperatureRainfall(2.0F, 0.0F)); - Biomes.deciduousForest = Optional.of((new BiomeGenDeciduousForest(BOPConfiguration.deciduousForestID)).setColor(353825).setBiomeName("Deciduous Forest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F)); - Biomes.drylands = Optional.of((new BiomeGenDrylands(BOPConfiguration.drylandsID)).setColor(16421912).setBiomeName("Drylands").setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.0F, 0.5F)); - Biomes.dunes = Optional.of((new BiomeGenDunes(BOPConfiguration.dunesID)).setColor(13786898).setBiomeName("Dunes").setDisableRain().setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.5F, 1.3F)); - Biomes.fen = Optional.of((new BiomeGenFen(BOPConfiguration.fenID)).setColor(9286496).setBiomeName("Fen").setTemperatureRainfall(0.4F, 0.0F).setMinMaxHeight(-0.2F, 0.1F)); - Biomes.field = Optional.of((new BiomeGenField(BOPConfiguration.fieldID)).setColor(9286496).setBiomeName("Field").setTemperatureRainfall(0.4F, 0.8F).setMinMaxHeight(0.0F, 0.1F)); - Biomes.frostForest = Optional.of((new BiomeGenFrostForest(BOPConfiguration.frostForestID)).setColor(14090235).setBiomeName("Frost Forest").setEnableSnow().setTemperatureRainfall(0.0F, 0.0F).setMinMaxHeight(0.1F, 0.4F)); - Biomes.fungiForest = Optional.of((new BiomeGenFungiForest(BOPConfiguration.fungiForestID)).setColor(747097).setBiomeName("Fungi Forest").func_76733_a(5159473).setTemperatureRainfall(0.9F, 1.0F).setMinMaxHeight(0.0F, 0.4F)); - Biomes.garden = Optional.of((new BiomeGenGarden(BOPConfiguration.gardenID)).setColor(9286496).setBiomeName("Garden").setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(0.1F, 0.2F)); - Biomes.glacier = Optional.of((new BiomeGenGlacier(BOPConfiguration.glacierID)).setColor(6316128).setBiomeName("Glacier").setEnableSnow().setMinMaxHeight(0.4F, 1.0F).setTemperatureRainfall(0.0F, 0.0F)); - Biomes.grassland = Optional.of((new BiomeGenGrassland(BOPConfiguration.grasslandID)).setColor(9286496).setBiomeName("Grassland").setTemperatureRainfall(0.7F, 0.7F).setMinMaxHeight(0.2F, 0.2F)); - Biomes.grove = Optional.of((new BiomeGenGrove(BOPConfiguration.groveID)).setColor(9286496).setBiomeName("Grove").setTemperatureRainfall(0.4F, 0.8F).setMinMaxHeight(0.0F, 0.1F)); - Biomes.heathland = Optional.of((new BiomeGenHeathland(BOPConfiguration.heathlandID)).setColor(353825).setBiomeName("Heathland").func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.1F).setMinMaxHeight(0.1F, 0.3F)); - Biomes.highland = Optional.of((new BiomeGenHighland(BOPConfiguration.highlandID)).setColor(6316128).setBiomeName("Highland").setMinMaxHeight(0.9F, 1.9F).setTemperatureRainfall(0.5F, 0.5F)); - Biomes.iceSheet = Optional.of((new BiomeGenIceSheet(BOPConfiguration.iceSheetID)).setColor(6316128).setBiomeName("Ice Sheet").setEnableSnow().setMinMaxHeight(0.1F, 0.2F).setTemperatureRainfall(0.0F, 0.0F)); - Biomes.icyHills = Optional.of((new BiomeGenIcyHills(BOPConfiguration.icyHillsID)).setColor(14090235).setBiomeName("Icy Hills").setEnableSnow().setTemperatureRainfall(0.0F, 0.0F).setMinMaxHeight(-0.2F, 0.5F)); - Biomes.jadeCliffs = Optional.of((new BiomeGenJadeCliffs(BOPConfiguration.jadeCliffsID)).setColor(14090235).setBiomeName("Jade Cliffs").setTemperatureRainfall(0.5F, 0.1F).setMinMaxHeight(0.1F, 2.0F)); - Biomes.lushDesert = Optional.of((new BiomeGenLushDesert(BOPConfiguration.lushDesertID)).setColor(16421912).setBiomeName("Lush Desert").setTemperatureRainfall(0.8F, 0.3F).setMinMaxHeight(0.2F, 0.8F)); - Biomes.lushSwamp = Optional.of((new BiomeGenLushSwamp(BOPConfiguration.lushSwampID)).setColor(522674).setBiomeName("Lush Swamp").func_76733_a(9154376).setMinMaxHeight(-0.2F, 0.1F).setTemperatureRainfall(0.7F, 1.0F)); - Biomes.mangrove = Optional.of((new BiomeGenMangrove(BOPConfiguration.mangroveID)).setColor(16440917).setBiomeName("Mangrove").setMinMaxHeight(-0.4F, -0.1F).setTemperatureRainfall(0.8F, 0.9F)); - Biomes.mapleWoods = Optional.of((new BiomeGenMapleWoods(BOPConfiguration.mapleWoodsID)).setColor(747097).setBiomeName("Maple Woods").func_76733_a(5159473).setTemperatureRainfall(0.2F, 0.8F).setMinMaxHeight(0.1F, 0.6F)); - Biomes.marsh = Optional.of((new BiomeGenMarsh(BOPConfiguration.marshID)).setColor(10486015).setBiomeName("Marsh").setMinMaxHeight(-0.5F, 0.0F).setTemperatureRainfall(0.5F, 0.9F)); - Biomes.meadow = Optional.of((new BiomeGenMeadow(BOPConfiguration.meadowID)).setColor(9286496).setBiomeName("Meadow").setTemperatureRainfall(0.7F, 0.7F)); - Biomes.mesa = Optional.of((new BiomeGenMesa(BOPConfiguration.mesaID)).setColor(16421912).setBiomeName("Mesa").setDisableRain().setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.8F, 1.0F)); - Biomes.moor = Optional.of((new BiomeGenMoor(BOPConfiguration.moorID)).setColor(16421912).setBiomeName("Moor").setTemperatureRainfall(0.5F, 1.0F).setMinMaxHeight(0.7F, 0.8F)); - Biomes.mountain = Optional.of((new BiomeGenMountain(BOPConfiguration.mountainID)).setColor(14090235).setBiomeName("Mountain").setTemperatureRainfall(0.5F, 0.1F).setMinMaxHeight(1.2F, 1.2F)); - Biomes.mysticGrove = Optional.of((new BiomeGenMysticGrove(BOPConfiguration.mysticGroveID)).setColor(353825).setBiomeName("Mystic Grove").setDisableRain().func_76733_a(5159473).setTemperatureRainfall(0.9F, 1.0F)); - Biomes.oasis = Optional.of((new BiomeGenOasis(BOPConfiguration.oasisID)).setColor(16421912).setBiomeName("Oasis").setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.1F, 0.2F)); - Biomes.ominousWoods = Optional.of((new BiomeGenOminousWoods(BOPConfiguration.ominousWoodsID)).setColor(353825).setBiomeName("Ominous Woods").setDisableRain().func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.9F)); - Biomes.orchard = Optional.of((new BiomeGenOrchard(BOPConfiguration.orchardID)).setColor(9286496).setBiomeName("Orchard").setTemperatureRainfall(0.8F, 0.4F)); - Biomes.originValley = Optional.of((new BiomeGenOriginValley(BOPConfiguration.originValleyID)).setColor(353825).setBiomeName("Origin Valley").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(-0.1F, 0.6F)); - Biomes.outback = Optional.of((new BiomeGenOutback(BOPConfiguration.outbackID)).setColor(9286496).setBiomeName("Outback").setTemperatureRainfall(0.8F, 0.0F).setMinMaxHeight(0.1F, 0.1F)); - Biomes.pasture = Optional.of((new BiomeGenPasture(BOPConfiguration.pastureID)).setColor(9286496).setBiomeName("Pasture").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.1F, 0.2F)); - Biomes.prairie = Optional.of((new BiomeGenPrairie(BOPConfiguration.prairieID)).setColor(353825).setBiomeName("Prairie").func_76733_a(5159473).setTemperatureRainfall(0.9F, 0.6F).setMinMaxHeight(0.1F, 0.1F)); - Biomes.promisedLand = Optional.of((new BiomeGenPromisedLand(BOPConfiguration.promisedLandID)).setColor(112).setBiomeName("Promised Land").setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.1F, 2.0F)); - Biomes.quagmire = Optional.of((new BiomeGenQuagmire(BOPConfiguration.quagmireID)).setColor(522674).setBiomeName("Quagmire").func_76733_a(9154376).setMinMaxHeight(-0.1F, 0.3F).setTemperatureRainfall(0.8F, 0.9F)); - Biomes.rainforest = Optional.of((new BiomeGenRainforest(BOPConfiguration.rainforestID)).setColor(5470985).setBiomeName("Rainforest").func_76733_a(5470985).setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.7F, 1.8F)); - Biomes.redwoodForest = Optional.of((new BiomeGenRedwoodForest(BOPConfiguration.redwoodForestID)).setColor(747097).setBiomeName("Redwood Forest").func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.0F, 0.4F)); - Biomes.sacredSprings = Optional.of((new BiomeGenSacredSprings(BOPConfiguration.sacredSpringsID)).setColor(522674).setBiomeName("Sacred Springs").func_76733_a(9154376).setMinMaxHeight(0.0F, 1.2F).setTemperatureRainfall(1.2F, 0.9F)); - Biomes.savanna = Optional.of((new BiomeGenSavanna(BOPConfiguration.savannaID)).setColor(9286496).setBiomeName("Savanna").setTemperatureRainfall(1.5F, 0.1F).setMinMaxHeight(0.1F, 0.1F)); - Biomes.scrubland = Optional.of((new BiomeGenScrubland(BOPConfiguration.scrublandID)).setColor(9286496).setBiomeName("Scrubland").setTemperatureRainfall(1.2F, 0.0F).setMinMaxHeight(0.1F, 0.3F)); - Biomes.seasonalForest = Optional.of((new BiomeGenSeasonalForest(BOPConfiguration.seasonalForestID)).setColor(353825).setBiomeName("Seasonal Forest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(0.2F, 0.7F)); - Biomes.shield = Optional.of((new BiomeGenShield(BOPConfiguration.shieldID)).setColor(522674).setBiomeName("Shield").func_76733_a(9154376).setMinMaxHeight(-0.2F, 0.4F).setTemperatureRainfall(0.5F, 0.8F)); - Biomes.shore = Optional.of((new BiomeGenShore(BOPConfiguration.shoreID)).setColor(9286496).setBiomeName("Shore").setMinMaxHeight(-1.0F, 0.4F).setTemperatureRainfall(0.8F, 0.4F)); - Biomes.shrubland = Optional.of((new BiomeGenShrubland(BOPConfiguration.shrublandID)).setColor(9286496).setBiomeName("Shrubland").setMinMaxHeight(0.1F, 0.2F).setTemperatureRainfall(0.6F, 0.0F)); - Biomes.snowyWoods = Optional.of((new BiomeGenSnowyWoods(BOPConfiguration.snowyWoodsID)).setColor(522674).setBiomeName("Snowy Woods").func_76733_a(9154376).setEnableSnow().setTemperatureRainfall(0.05F, 0.8F).setMinMaxHeight(0.2F, 0.7F)); - Biomes.spruceWoods = Optional.of((new BiomeGenSpruceWoods(BOPConfiguration.spruceWoodsID)).setColor(353825).setBiomeName("Spruce Woods").func_76733_a(5159473).setTemperatureRainfall(0.6F, 0.7F)); - Biomes.steppe = Optional.of((new BiomeGenSteppe(BOPConfiguration.steppeID)).setColor(9286496).setBiomeName("Steppe").setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.1F, 0.2F)); - Biomes.swampwoods = Optional.of((new BiomeGenSwampwoods(BOPConfiguration.swampwoodsID)).setColor(522674).setBiomeName("Swampwoods").func_76733_a(9154376).setMinMaxHeight(-0.2F, 0.2F).setTemperatureRainfall(0.8F, 0.9F)); - Biomes.temperateRainforest = Optional.of((new BiomeGenTemperateRainforest(BOPConfiguration.temperateRainforestID)).setColor(353825).setBiomeName("Temperate Rainforest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(0.2F, 1.2F)); - Biomes.thicket = Optional.of((new BiomeGenThicket(BOPConfiguration.thicketID)).setColor(353825).setBiomeName("Thicket").func_76733_a(5159473).setTemperatureRainfall(0.6F, 0.2F).setMinMaxHeight(0.0F, 0.2F)); - Biomes.tropicalRainforest = Optional.of((new BiomeGenTropicalRainforest(BOPConfiguration.tropicalRainforestID)).setColor(9286496).setBiomeName("Tropical Rainforest").setTemperatureRainfall(1.2F, 0.9F).setMinMaxHeight(0.3F, 0.7F)); - Biomes.tropics = Optional.of((new BiomeGenTropics(BOPConfiguration.tropicsID)).setColor(9286496).setBiomeName("Tropics").setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.1F, 0.8F)); - Biomes.tundra = Optional.of((new BiomeGenTundra(BOPConfiguration.tundraID)).setColor(14090235).setBiomeName("Tundra").setEnableSnow().setTemperatureRainfall(0.05F, 0.0F).setMinMaxHeight(-0.2F, 0.0F)); - Biomes.volcano = Optional.of((new BiomeGenVolcano(BOPConfiguration.volcanoID)).setColor(9286496).setBiomeName("Volcano").setDisableRain().setMinMaxHeight(0.6F, 0.9F).setTemperatureRainfall(2.0F, 0.0F)); - Biomes.wasteland = Optional.of((new BiomeGenWasteland(BOPConfiguration.wastelandID)).setColor(16421912).setBiomeName("Wasteland").setDisableRain().setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.0F, 0.0F)); - Biomes.wetland = Optional.of((new BiomeGenWetland(BOPConfiguration.wetlandID)).setColor(522674).setBiomeName("Wetland").func_76733_a(9154376).setMinMaxHeight(-0.2F, 0.4F).setTemperatureRainfall(0.8F, 0.9F)); - Biomes.woodland = Optional.of((new BiomeGenWoodland(BOPConfiguration.woodlandID)).setColor(353825).setBiomeName("Woodland").func_76733_a(5159473).setTemperatureRainfall(1.7F, 0.2F).setMinMaxHeight(0.1F, 0.2F)); - Biomes.plainsNew = Optional.of((new BiomeGenPlainsNew(BOPConfiguration.plainsNewID)).setColor(9286496).setBiomeName("Plains").setTemperatureRainfall(0.8F, 0.4F)); - Biomes.desertNew = Optional.of((new BiomeGenDesertNew(BOPConfiguration.desertNewID)).setColor(16421912).setBiomeName("Desert").setDisableRain().setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.1F, 0.2F)); - Biomes.extremeHillsNew = Optional.of((new BiomeGenHillsNew(BOPConfiguration.extremeHillsNewID)).setColor(6316128).setBiomeName("Extreme Hills").setMinMaxHeight(0.3F, 1.5F).setTemperatureRainfall(0.2F, 0.3F)); - Biomes.forestNew = Optional.of((new BiomeGenForestNew(BOPConfiguration.forestNewID)).setColor(353825).setBiomeName("Forest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F)); - Biomes.taigaNew = Optional.of((new BiomeGenTaigaNew(BOPConfiguration.taigaNewID)).setColor(747097).setBiomeName("Taiga").func_76733_a(5159473).setEnableSnow().setTemperatureRainfall(0.05F, 0.8F).setMinMaxHeight(0.1F, 0.4F)); - Biomes.swamplandNew = Optional.of((new BiomeGenSwampNew(BOPConfiguration.swamplandNewID)).setColor(522674).setBiomeName("Swampland").func_76733_a(9154376).setMinMaxHeight(-0.2F, 0.1F).setTemperatureRainfall(0.8F, 0.9F)); - Biomes.jungleNew = Optional.of((new BiomeGenJungleNew(BOPConfiguration.jungleNewID)).setColor(5470985).setBiomeName("Jungle").func_76733_a(5470985).setTemperatureRainfall(1.2F, 0.9F).setMinMaxHeight(0.2F, 0.4F)); - + // Initialize biomes + initializeBiomes(); + //Initialize new world type - WTBiomesOP = new WTBiomesOP(); + //WTBiomesOP = new WTBiomesOP(); //Biome Dictionary - BiomeDictionary.registerBiomeType(Biomes.alps.get(), Type.FROZEN, Type.MOUNTAIN); - BiomeDictionary.registerBiomeType(Biomes.arctic.get(), Type.FROZEN, Type.FOREST, Type.HILLS); - BiomeDictionary.registerBiomeType(Biomes.badlands.get(), Type.DESERT, Type.WASTELAND); - BiomeDictionary.registerBiomeType(Biomes.bambooForest.get(), Type.JUNGLE); - BiomeDictionary.registerBiomeType(Biomes.bayou.get(), Type.SWAMP); - BiomeDictionary.registerBiomeType(Biomes.birchForest.get(), Type.FOREST); - BiomeDictionary.registerBiomeType(Biomes.bog.get(), Type.SWAMP); - BiomeDictionary.registerBiomeType(Biomes.borealForest.get(), Type.FOREST); - BiomeDictionary.registerBiomeType(Biomes.canyon.get(), Type.DESERT, Type.MOUNTAIN, Type.HILLS); - BiomeDictionary.registerBiomeType(Biomes.chaparral.get(), Type.PLAINS); - BiomeDictionary.registerBiomeType(Biomes.cherryBlossomGrove.get(), Type.MAGICAL, Type.FOREST); - BiomeDictionary.registerBiomeType(Biomes.coniferousForest.get(), Type.FOREST, Type.HILLS); - BiomeDictionary.registerBiomeType(Biomes.crag.get(), Type.WASTELAND, Type.MOUNTAIN); - BiomeDictionary.registerBiomeType(Biomes.deadForest.get(), Type.WASTELAND, Type.FOREST); - BiomeDictionary.registerBiomeType(Biomes.deadlands.get(), Type.WASTELAND, Type.NETHER); - BiomeDictionary.registerBiomeType(Biomes.deadSwamp.get(), Type.SWAMP); - BiomeDictionary.registerBiomeType(Biomes.deciduousForest.get(), Type.FOREST, Type.HILLS); - BiomeDictionary.registerBiomeType(Biomes.drylands.get(), Type.DESERT); - BiomeDictionary.registerBiomeType(Biomes.dunes.get(), Type.BEACH, Type.DESERT); - BiomeDictionary.registerBiomeType(Biomes.fen.get(), Type.FOREST, Type.SWAMP); - BiomeDictionary.registerBiomeType(Biomes.field.get(), Type.PLAINS); - BiomeDictionary.registerBiomeType(Biomes.frostForest.get(), Type.FROZEN, Type.FOREST); - BiomeDictionary.registerBiomeType(Biomes.fungiForest.get(), Type.MAGICAL, Type.MUSHROOM, Type.FOREST, Type.SWAMP); - BiomeDictionary.registerBiomeType(Biomes.garden.get(), Type.MAGICAL, Type.PLAINS); - BiomeDictionary.registerBiomeType(Biomes.glacier.get(), Type.FROZEN, Type.HILLS); - BiomeDictionary.registerBiomeType(Biomes.grassland.get(), Type.PLAINS); - BiomeDictionary.registerBiomeType(Biomes.grove.get(), Type.FOREST); - BiomeDictionary.registerBiomeType(Biomes.heathland.get(), Type.PLAINS); - BiomeDictionary.registerBiomeType(Biomes.highland.get(), Type.HILLS, Type.MOUNTAIN); - BiomeDictionary.registerBiomeType(Biomes.iceSheet.get(), Type.FROZEN, Type.WASTELAND); - BiomeDictionary.registerBiomeType(Biomes.icyHills.get(), Type.FROZEN, Type.HILLS); - BiomeDictionary.registerBiomeType(Biomes.jadeCliffs.get(), Type.FOREST, Type.MOUNTAIN); - BiomeDictionary.registerBiomeType(Biomes.lushDesert.get(), Type.DESERT, Type.PLAINS); - BiomeDictionary.registerBiomeType(Biomes.lushSwamp.get(), Type.SWAMP); - BiomeDictionary.registerBiomeType(Biomes.mangrove.get(), Type.WATER); - BiomeDictionary.registerBiomeType(Biomes.mapleWoods.get(), Type.FOREST); - BiomeDictionary.registerBiomeType(Biomes.marsh.get(), Type.SWAMP, Type.WATER); - BiomeDictionary.registerBiomeType(Biomes.meadow.get(), Type.FOREST, Type.PLAINS); - BiomeDictionary.registerBiomeType(Biomes.mesa.get(), Type.DESERT, Type.WASTELAND); - BiomeDictionary.registerBiomeType(Biomes.moor.get(), Type.PLAINS, Type.HILLS); - BiomeDictionary.registerBiomeType(Biomes.mountain.get(), Type.MOUNTAIN, Type.HILLS); - BiomeDictionary.registerBiomeType(Biomes.mysticGrove.get(), Type.MAGICAL, Type.FOREST); - BiomeDictionary.registerBiomeType(Biomes.oasis.get(), Type.DESERT, Type.PLAINS); - BiomeDictionary.registerBiomeType(Biomes.ominousWoods.get(), Type.NETHER, Type.MAGICAL); - BiomeDictionary.registerBiomeType(Biomes.orchard.get(), Type.FOREST, Type.PLAINS); - BiomeDictionary.registerBiomeType(Biomes.outback.get(), Type.DESERT, Type.PLAINS); - BiomeDictionary.registerBiomeType(Biomes.pasture.get(), Type.PLAINS); - BiomeDictionary.registerBiomeType(Biomes.prairie.get(), Type.PLAINS); - BiomeDictionary.registerBiomeType(Biomes.promisedLand.get(), Type.FOREST, Type.MAGICAL); - BiomeDictionary.registerBiomeType(Biomes.quagmire.get(), Type.WASTELAND); - BiomeDictionary.registerBiomeType(Biomes.rainforest.get(), Type.JUNGLE, Type.HILLS, Type.FOREST); - BiomeDictionary.registerBiomeType(Biomes.redwoodForest.get(), Type.FOREST); - BiomeDictionary.registerBiomeType(Biomes.sacredSprings.get(), Type.MOUNTAIN, Type.FOREST); - BiomeDictionary.registerBiomeType(Biomes.savanna.get(), Type.DESERT); - BiomeDictionary.registerBiomeType(Biomes.scrubland.get(), Type.DESERT, Type.PLAINS); - BiomeDictionary.registerBiomeType(Biomes.seasonalForest.get(), Type.FOREST); - BiomeDictionary.registerBiomeType(Biomes.shield.get(), Type.FOREST); - BiomeDictionary.registerBiomeType(Biomes.shrubland.get(), Type.PLAINS); - BiomeDictionary.registerBiomeType(Biomes.snowyWoods.get(), Type.FROZEN); - BiomeDictionary.registerBiomeType(Biomes.spruceWoods.get(), Type.FOREST); - BiomeDictionary.registerBiomeType(Biomes.steppe.get(), Type.PLAINS, Type.WASTELAND); - BiomeDictionary.registerBiomeType(Biomes.swampwoods.get(), Type.SWAMP, Type.FOREST); - BiomeDictionary.registerBiomeType(Biomes.temperateRainforest.get(), Type.FOREST, Type.HILLS); - BiomeDictionary.registerBiomeType(Biomes.thicket.get(), Type.PLAINS, Type.FOREST); - BiomeDictionary.registerBiomeType(Biomes.tropicalRainforest.get(), Type.JUNGLE); - BiomeDictionary.registerBiomeType(Biomes.tropics.get(), Type.JUNGLE); - BiomeDictionary.registerBiomeType(Biomes.tundra.get(), Type.FROZEN); - BiomeDictionary.registerBiomeType(Biomes.volcano.get(), Type.WASTELAND, Type.MOUNTAIN, Type.NETHER); - BiomeDictionary.registerBiomeType(Biomes.wasteland.get(), Type.WASTELAND); - BiomeDictionary.registerBiomeType(Biomes.wetland.get(), Type.SWAMP); - BiomeDictionary.registerBiomeType(Biomes.woodland.get(), Type.FOREST); - BiomeDictionary.registerBiomeType(Biomes.plainsNew.get(), Type.PLAINS); - BiomeDictionary.registerBiomeType(Biomes.desertNew.get(), Type.DESERT); - BiomeDictionary.registerBiomeType(Biomes.forestNew.get(), Type.FOREST); - BiomeDictionary.registerBiomeType(Biomes.extremeHillsNew.get(), Type.HILLS, Type.MOUNTAIN); - BiomeDictionary.registerBiomeType(Biomes.taigaNew.get(), Type.FROZEN); - BiomeDictionary.registerBiomeType(Biomes.swamplandNew.get(), Type.SWAMP); - BiomeDictionary.registerBiomeType(Biomes.jungleNew.get(), Type.JUNGLE); + addToBiomeDictionary(); //Spawning - addSpawnBiome(Biomes.alps); - addSpawnBiome(Biomes.arctic); - addSpawnBiome(Biomes.badlands); - addSpawnBiome(Biomes.bambooForest); - addSpawnBiome(Biomes.bayou); - addSpawnBiome(Biomes.birchForest); - addSpawnBiome(Biomes.bog); - addSpawnBiome(Biomes.borealForest); - addSpawnBiome(Biomes.canyon); - addSpawnBiome(Biomes.chaparral); - addSpawnBiome(Biomes.cherryBlossomGrove); - addSpawnBiome(Biomes.coniferousForest); - addSpawnBiome(Biomes.deadForest); - addSpawnBiome(Biomes.deadSwamp); - addSpawnBiome(Biomes.deciduousForest); - addSpawnBiome(Biomes.drylands); - addSpawnBiome(Biomes.dunes); - addSpawnBiome(Biomes.fen); - addSpawnBiome(Biomes.field); - addSpawnBiome(Biomes.frostForest); - addSpawnBiome(Biomes.glacier); - addSpawnBiome(Biomes.grassland); - addSpawnBiome(Biomes.grove); - addSpawnBiome(Biomes.heathland); - addSpawnBiome(Biomes.highland); - addSpawnBiome(Biomes.iceSheet); - addSpawnBiome(Biomes.jadeCliffs); - addSpawnBiome(Biomes.lushDesert); - addSpawnBiome(Biomes.lushSwamp); - addSpawnBiome(Biomes.mangrove); - addSpawnBiome(Biomes.mapleWoods); - addSpawnBiome(Biomes.marsh); - addSpawnBiome(Biomes.meadow); - addSpawnBiome(Biomes.mesa); - addSpawnBiome(Biomes.moor); - addSpawnBiome(Biomes.mountain); - addSpawnBiome(Biomes.oasis); - addSpawnBiome(Biomes.orchard); - addSpawnBiome(Biomes.outback); - addSpawnBiome(Biomes.pasture); - addSpawnBiome(Biomes.prairie); - addSpawnBiome(Biomes.quagmire); - addSpawnBiome(Biomes.rainforest); - addSpawnBiome(Biomes.redwoodForest); - addSpawnBiome(Biomes.savanna); - addSpawnBiome(Biomes.scrubland); - addSpawnBiome(Biomes.seasonalForest); - addSpawnBiome(Biomes.shield); - addSpawnBiome(Biomes.shrubland); - addSpawnBiome(Biomes.snowyWoods); - addSpawnBiome(Biomes.spruceWoods); - addSpawnBiome(Biomes.swampwoods); - addSpawnBiome(Biomes.temperateRainforest); - addSpawnBiome(Biomes.thicket); - addSpawnBiome(Biomes.tropicalRainforest); - addSpawnBiome(Biomes.tropics); - addSpawnBiome(Biomes.tundra); - addSpawnBiome(Biomes.volcano); - addSpawnBiome(Biomes.wetland); - addSpawnBiome(Biomes.woodland); - addSpawnBiome(Biomes.plainsNew); - addSpawnBiome(Biomes.desertNew); - addSpawnBiome(Biomes.forestNew); - addSpawnBiome(Biomes.extremeHillsNew); - addSpawnBiome(Biomes.taigaNew); - addSpawnBiome(Biomes.swamplandNew); - addSpawnBiome(Biomes.jungleNew); + addSpawnBiomes(); //Village spawning - addVillageBiome(Biomes.arctic); - addVillageBiome(Biomes.bayou); - addVillageBiome(Biomes.birchForest); - addVillageBiome(Biomes.chaparral); - addVillageBiome(Biomes.coniferousForest); - addVillageBiome(Biomes.deadForest); - addVillageBiome(Biomes.field); - addVillageBiome(Biomes.frostForest); - addVillageBiome(Biomes.grassland); - addVillageBiome(Biomes.grove); - addVillageBiome(Biomes.heathland); - addVillageBiome(Biomes.lushSwamp); - addVillageBiome(Biomes.mapleWoods); - addVillageBiome(Biomes.orchard); - addVillageBiome(Biomes.prairie); - addVillageBiome(Biomes.redwoodForest); - addVillageBiome(Biomes.savanna); - addVillageBiome(Biomes.scrubland); - addVillageBiome(Biomes.shield); - addVillageBiome(Biomes.shrubland); - addVillageBiome(Biomes.snowyWoods); - addVillageBiome(Biomes.spruceWoods); - addVillageBiome(Biomes.tropicalRainforest); - addVillageBiome(Biomes.woodland); - addVillageBiome(Biomes.plainsNew); - addVillageBiome(Biomes.desertNew); - addVillageBiome(Biomes.forestNew); - addVillageBiome(Biomes.taigaNew); - addVillageBiome(Biomes.swamplandNew); + addVillageBiomes(); //Stronghold spawning - addStrongholdBiome(Biomes.alps); - addStrongholdBiome(Biomes.arctic); - addStrongholdBiome(Biomes.badlands); - addStrongholdBiome(Biomes.bambooForest); - addStrongholdBiome(Biomes.bayou); - addStrongholdBiome(Biomes.birchForest); - addStrongholdBiome(Biomes.bog); - addStrongholdBiome(Biomes.borealForest); - addStrongholdBiome(Biomes.canyon); - addStrongholdBiome(Biomes.chaparral); - addStrongholdBiome(Biomes.cherryBlossomGrove); - addStrongholdBiome(Biomes.coniferousForest); - addStrongholdBiome(Biomes.crag); - addStrongholdBiome(Biomes.deadForest); - addStrongholdBiome(Biomes.deadSwamp); - addStrongholdBiome(Biomes.deadlands); - addStrongholdBiome(Biomes.deciduousForest); - addStrongholdBiome(Biomes.drylands); - addStrongholdBiome(Biomes.dunes); - addStrongholdBiome(Biomes.fen); - addStrongholdBiome(Biomes.field); - addStrongholdBiome(Biomes.frostForest); - addStrongholdBiome(Biomes.fungiForest); - addStrongholdBiome(Biomes.garden); - addStrongholdBiome(Biomes.glacier); - addStrongholdBiome(Biomes.grassland); - addStrongholdBiome(Biomes.grove); - addStrongholdBiome(Biomes.heathland); - addStrongholdBiome(Biomes.highland); - addStrongholdBiome(Biomes.iceSheet); - addStrongholdBiome(Biomes.icyHills); - addStrongholdBiome(Biomes.jadeCliffs); - addStrongholdBiome(Biomes.lushDesert); - addStrongholdBiome(Biomes.lushSwamp); - addStrongholdBiome(Biomes.mangrove); - addStrongholdBiome(Biomes.mapleWoods); - addStrongholdBiome(Biomes.marsh); - addStrongholdBiome(Biomes.meadow); - addStrongholdBiome(Biomes.mesa); - addStrongholdBiome(Biomes.moor); - addStrongholdBiome(Biomes.mountain); - addStrongholdBiome(Biomes.mysticGrove); - addStrongholdBiome(Biomes.oasis); - addStrongholdBiome(Biomes.ominousWoods); - addStrongholdBiome(Biomes.orchard); - addStrongholdBiome(Biomes.outback); - addStrongholdBiome(Biomes.pasture); - addStrongholdBiome(Biomes.prairie); - addStrongholdBiome(Biomes.quagmire); - addStrongholdBiome(Biomes.rainforest); - addStrongholdBiome(Biomes.redwoodForest); - addStrongholdBiome(Biomes.sacredSprings); - addStrongholdBiome(Biomes.savanna); - addStrongholdBiome(Biomes.scrubland); - addStrongholdBiome(Biomes.seasonalForest); - addStrongholdBiome(Biomes.shield); - addStrongholdBiome(Biomes.shrubland); - addStrongholdBiome(Biomes.snowyWoods); - addStrongholdBiome(Biomes.spruceWoods); - addStrongholdBiome(Biomes.steppe); - addStrongholdBiome(Biomes.swampwoods); - addStrongholdBiome(Biomes.temperateRainforest); - addStrongholdBiome(Biomes.thicket); - addStrongholdBiome(Biomes.tropicalRainforest); - addStrongholdBiome(Biomes.tropics); - addStrongholdBiome(Biomes.tundra); - addStrongholdBiome(Biomes.volcano); - addStrongholdBiome(Biomes.wasteland); - addStrongholdBiome(Biomes.wetland); - addStrongholdBiome(Biomes.woodland); - addStrongholdBiome(Biomes.plainsNew); - addStrongholdBiome(Biomes.desertNew); - addStrongholdBiome(Biomes.forestNew); - addStrongholdBiome(Biomes.extremeHillsNew); - addStrongholdBiome(Biomes.taigaNew); - addStrongholdBiome(Biomes.swamplandNew); - addStrongholdBiome(Biomes.jungleNew); + addStrongholdBiomes(); - if (BOPConfiguration.addToDefault == true) - { - if (BOPConfiguration.alpsGen == true) - { - registerBiome(Biomes.alps); - } - if (BOPConfiguration.arcticGen == true) - { - registerBiome(Biomes.arctic); - } - if (BOPConfiguration.badlandsGen == true) - { - registerBiome(Biomes.badlands); - } - if (BOPConfiguration.bambooForestGen == true) - { - registerBiome(Biomes.bambooForest); - } - if (BOPConfiguration.bayouGen == true) - { - registerBiome(Biomes.bayou); - } - if (BOPConfiguration.birchForestGen == true) - { - registerBiome(Biomes.birchForest); - } - if (BOPConfiguration.bogGen == true) - { - registerBiome(Biomes.bog); - } - if (BOPConfiguration.borealForestGen == true) - { - registerBiome(Biomes.borealForest); - } - if (BOPConfiguration.canyonGen == true) - { - registerBiome(Biomes.canyon); - } - if (BOPConfiguration.chaparralGen == true) - { - registerBiome(Biomes.chaparral); - } - if (BOPConfiguration.cherryBlossomGroveGen == true) - { - registerBiome(Biomes.cherryBlossomGrove); - } - if (BOPConfiguration.coniferousForestGen == true) - { - registerBiome(Biomes.coniferousForest); - } - if (BOPConfiguration.cragGen == true) - { - registerBiome(Biomes.crag); - } - if (BOPConfiguration.deadForestGen == true) - { - registerBiome(Biomes.deadForest); - } - if (BOPConfiguration.deadSwampGen == true) - { - registerBiome(Biomes.deadSwamp); - } - if (BOPConfiguration.deadlandsGen == true) - { - registerBiome(Biomes.deadlands); - } - if (BOPConfiguration.deciduousForestGen == true) - { - registerBiome(Biomes.deciduousForest); - } - if (BOPConfiguration.drylandsGen == true) - { - registerBiome(Biomes.drylands); - } - if (BOPConfiguration.dunesGen == true) - { - registerBiome(Biomes.dunes); - } - if (BOPConfiguration.fenGen == true) - { - registerBiome(Biomes.fen); - } - if (BOPConfiguration.fieldGen == true) - { - registerBiome(Biomes.field); - } - if (BOPConfiguration.frostForestGen == true) - { - registerBiome(Biomes.frostForest); - } - if (BOPConfiguration.fungiForestGen == true) - { - registerBiome(Biomes.fungiForest); - } - if (BOPConfiguration.gardenGen == true) - { - registerBiome(Biomes.garden); - } - if (BOPConfiguration.glacierGen == true) - { - registerBiome(Biomes.glacier); - } - if (BOPConfiguration.grasslandGen == true) - { - registerBiome(Biomes.grassland); - } - if (BOPConfiguration.groveGen == true) - { - registerBiome(Biomes.grove); - } - if (BOPConfiguration.heathlandGen == true) - { - registerBiome(Biomes.heathland); - } - if (BOPConfiguration.highlandGen == true) - { - registerBiome(Biomes.highland); - } - if (BOPConfiguration.iceSheetGen == true) - { - registerBiome(Biomes.iceSheet); - } - if (BOPConfiguration.icyHillsGen == true) - { - registerBiome(Biomes.icyHills); - } - if (BOPConfiguration.jadeCliffsGen == true) - { - registerBiome(Biomes.jadeCliffs); - } - if (BOPConfiguration.lushDesertGen == true) - { - registerBiome(Biomes.lushDesert); - } - if (BOPConfiguration.lushSwampGen == true) - { - registerBiome(Biomes.lushSwamp); - } - if (BOPConfiguration.mangroveGen == true) - { - registerBiome(Biomes.mangrove); - } - if (BOPConfiguration.mapleWoodsGen == true) - { - registerBiome(Biomes.mapleWoods); - } - if (BOPConfiguration.marshGen == true) - { - registerBiome(Biomes.marsh); - } - if (BOPConfiguration.meadowGen == true) - { - registerBiome(Biomes.meadow); - } - if (BOPConfiguration.mesaGen == true) - { - registerBiome(Biomes.mesa); - } - if (BOPConfiguration.moorGen == true) - { - registerBiome(Biomes.moor); - } - if (BOPConfiguration.mountainGen == true) - { - registerBiome(Biomes.mountain); - } - if (BOPConfiguration.mushroomIslandGen == true) - { - GameRegistry.addBiome(BiomeGenBase.mushroomIsland); - } - if (BOPConfiguration.mysticGroveGen == true) - { - registerBiome(Biomes.mysticGrove); - } - if (BOPConfiguration.oasisGen == true) - { - registerBiome(Biomes.oasis); - } - if (BOPConfiguration.ominousWoodsGen == true) - { - registerBiome(Biomes.ominousWoods); - } - if (BOPConfiguration.orchardGen == true) - { - registerBiome(Biomes.orchard); - } - if (BOPConfiguration.originValleyGen == true) - { - registerBiome(Biomes.originValley); - } - if (BOPConfiguration.outbackGen == true) - { - registerBiome(Biomes.outback); - } - if (BOPConfiguration.pastureGen == true) - { - registerBiome(Biomes.pasture); - } - if (BOPConfiguration.prairieGen == true) - { - registerBiome(Biomes.prairie); - } - if (BOPConfiguration.quagmireGen == true) - { - registerBiome(Biomes.quagmire); - } - if (BOPConfiguration.rainforestGen == true) - { - registerBiome(Biomes.rainforest); - } - if (BOPConfiguration.redwoodForestGen == true) - { - registerBiome(Biomes.redwoodForest); - } - if (BOPConfiguration.sacredSpringsGen == true) - { - registerBiome(Biomes.sacredSprings); - } - if (BOPConfiguration.savannaGen == true) - { - registerBiome(Biomes.savanna); - } - if (BOPConfiguration.scrublandGen == true) - { - registerBiome(Biomes.scrubland); - } - if (BOPConfiguration.seasonalForestGen == true) - { - registerBiome(Biomes.seasonalForest); - } - if (BOPConfiguration.shieldGen == true) - { - registerBiome(Biomes.shield); - } - if (BOPConfiguration.shrublandGen == true) - { - registerBiome(Biomes.shrubland); - } - if (BOPConfiguration.snowyWoodsGen == true) - { - registerBiome(Biomes.snowyWoods); - } - if (BOPConfiguration.spruceWoodsGen == true) - { - registerBiome(Biomes.spruceWoods); - } - if (BOPConfiguration.steppeGen == true) - { - registerBiome(Biomes.steppe); - } - if (BOPConfiguration.swampwoodsGen == true) - { - registerBiome(Biomes.swampwoods); - } - if (BOPConfiguration.temperateRainforestGen == true) - { - registerBiome(Biomes.temperateRainforest); - } - if (BOPConfiguration.thicketGen == true) - { - registerBiome(Biomes.thicket); - } - if (BOPConfiguration.tropicalRainforestGen == true) - { - registerBiome(Biomes.tropicalRainforest); - } - if (BOPConfiguration.tropicsGen == true) - { - registerBiome(Biomes.tropics); - } - if (BOPConfiguration.tundraGen == true) - { - registerBiome(Biomes.tundra); - } - if (BOPConfiguration.volcanoGen == true) - { - registerBiome(Biomes.volcano); - } - if (BOPConfiguration.wastelandGen == true) - { - registerBiome(Biomes.wasteland); - } - if (BOPConfiguration.wetlandGen == true) - { - registerBiome(Biomes.wetland); - } - if (BOPConfiguration.woodlandGen == true) - { - registerBiome(Biomes.woodland); - } - if (BOPConfiguration.plainsGen == true) - { - if (BOPConfiguration.vanillaEnhanced == true) - { - registerBiome(Biomes.plainsNew); - GameRegistry.removeBiome(BiomeGenBase.plains); - } - } - if (BOPConfiguration.desertGen == true) - { - if (BOPConfiguration.vanillaEnhanced == true) - { - registerBiome(Biomes.desertNew); - GameRegistry.removeBiome(BiomeGenBase.desert); - } - } - if (BOPConfiguration.extremeHillsGen == true) - { - if (BOPConfiguration.vanillaEnhanced == true) - { - registerBiome(Biomes.extremeHillsNew); - GameRegistry.removeBiome(BiomeGenBase.extremeHills); - } - } - if (BOPConfiguration.forestGen == true) - { - if (BOPConfiguration.vanillaEnhanced == true) - { - registerBiome(Biomes.forestNew); - GameRegistry.removeBiome(BiomeGenBase.forest); - } - } - if (BOPConfiguration.taigaGen == true) - { - if (BOPConfiguration.vanillaEnhanced == true) - { - registerBiome(Biomes.taigaNew); - GameRegistry.removeBiome(BiomeGenBase.taiga); - } - } - if (BOPConfiguration.swamplandGen == true) - { - if (BOPConfiguration.vanillaEnhanced == true) - { - registerBiome(Biomes.swamplandNew); - GameRegistry.removeBiome(BiomeGenBase.swampland); - } - } - if (BOPConfiguration.jungleGen == true) - { - if (BOPConfiguration.vanillaEnhanced == true) - { - registerBiome(Biomes.jungleNew); - GameRegistry.removeBiome(BiomeGenBase.jungle); - } - } - } + registerBiomes(); + } + + private static void initializeBiomes() + { + Biomes.alps = Optional.of((new BiomeGenAlps(BOPConfiguration.alpsID)).setColor(353825).setBiomeName("Alps").func_76733_a(5159473).setTemperatureRainfall(0.0F, 0.0F).setMinMaxHeight(5.0F, 5.0F)); + Biomes.arctic = Optional.of((new BiomeGenArctic(BOPConfiguration.arcticID)).setColor(14090235).setBiomeName("Arctic").setTemperatureRainfall(0.0F, 0.0F).setMinMaxHeight(0.1F, 0.7F)); + Biomes.badlands = Optional.of((new BiomeGenBadlands(BOPConfiguration.badlandsID)).setColor(16421912).setBiomeName("Badlands").setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.3F, 0.9F)); + Biomes.bambooForest = Optional.of((new BiomeGenBambooForest(BOPConfiguration.bambooForestID)).setColor(112).setBiomeName("Bamboo Forest").setMinMaxHeight(0.0F, 0.3F).setTemperatureRainfall(1.2F, 0.9F)); + Biomes.bayou = Optional.of((new BiomeGenBayou(BOPConfiguration.bayouID)).setColor(522674).setBiomeName("Bayou").func_76733_a(9154376).setMinMaxHeight(-0.3F, 0.2F).setTemperatureRainfall(0.5F, 0.9F)); + Biomes.birchForest = Optional.of((new BiomeGenBirchForest(BOPConfiguration.birchForestID)).setColor(353825).setBiomeName("Birch Forest").func_76733_a(5159473).setTemperatureRainfall(0.4F, 0.3F)); + Biomes.bog = Optional.of((new BiomeGenBog(BOPConfiguration.bogID)).setColor(522674).setBiomeName("Bog").func_76733_a(9154376).setMinMaxHeight(-0.3F, -0.1F).setTemperatureRainfall(0.8F, 0.9F)); + Biomes.borealForest = Optional.of((new BiomeGenBorealForest(BOPConfiguration.borealForestID)).setColor(353825).setBiomeName("Boreal Forest").func_76733_a(5159473).setMinMaxHeight(0.0F, 1.0F).setTemperatureRainfall(0.6F, 0.7F)); + Biomes.canyon = Optional.of((new BiomeGenCanyon(BOPConfiguration.canyonID)).setColor(9286496).setBiomeName("Canyon").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(3.0F, 5.0F)); + Biomes.chaparral = Optional.of((new BiomeGenChaparral(BOPConfiguration.chaparralID)).setColor(9286496).setBiomeName("Chaparral").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.3F, 0.6F)); + Biomes.cherryBlossomGrove = Optional.of((new BiomeGenCherryBlossomGrove(BOPConfiguration.cherryBlossomGroveID)).setColor(9286496).setBiomeName("Cherry Blossom Grove").setMinMaxHeight(0.1F, 0.2F).setTemperatureRainfall(0.7F, 0.8F)); + Biomes.coniferousForest = Optional.of((new BiomeGenConiferousForest(BOPConfiguration.coniferousForestID)).setColor(747097).setBiomeName("Coniferous Forest").func_76733_a(5159473).setTemperatureRainfall(0.3F, 0.4F).setMinMaxHeight(0.1F, 0.8F)); + Biomes.crag = Optional.of((new BiomeGenCrag(BOPConfiguration.cragID)).setColor(9286496).setBiomeName("Crag").setMinMaxHeight(0.0F, 9.9F).setTemperatureRainfall(0.4F, 0.2F)); + Biomes.deadForest = Optional.of((new BiomeGenDeadForest(BOPConfiguration.deadForestID)).setColor(522674).setBiomeName("Dead Forest").func_76733_a(9154376).setMinMaxHeight(0.2F, 0.7F).setTemperatureRainfall(1.2F, 0.1F)); + Biomes.deadSwamp = Optional.of((new BiomeGenDeadSwamp(BOPConfiguration.deadSwampID)).setColor(522674).setBiomeName("Dead Swamp").func_76733_a(9154376).setMinMaxHeight(-0.2F, 0.1F).setTemperatureRainfall(0.8F, 0.9F)); + Biomes.deadlands = Optional.of((new BiomeGenDeadlands(BOPConfiguration.deadlandsID)).setColor(522674).setBiomeName("Deadlands").setDisableRain().func_76733_a(9154376).setMinMaxHeight(0.1F, 0.5F).setTemperatureRainfall(2.0F, 0.0F)); + Biomes.deciduousForest = Optional.of((new BiomeGenDeciduousForest(BOPConfiguration.deciduousForestID)).setColor(353825).setBiomeName("Deciduous Forest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F)); + Biomes.drylands = Optional.of((new BiomeGenDrylands(BOPConfiguration.drylandsID)).setColor(16421912).setBiomeName("Drylands").setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.0F, 0.5F)); + Biomes.dunes = Optional.of((new BiomeGenDunes(BOPConfiguration.dunesID)).setColor(13786898).setBiomeName("Dunes").setDisableRain().setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.5F, 1.3F)); + Biomes.fen = Optional.of((new BiomeGenFen(BOPConfiguration.fenID)).setColor(9286496).setBiomeName("Fen").setTemperatureRainfall(0.4F, 0.0F).setMinMaxHeight(-0.2F, 0.1F)); + Biomes.field = Optional.of((new BiomeGenField(BOPConfiguration.fieldID)).setColor(9286496).setBiomeName("Field").setTemperatureRainfall(0.4F, 0.8F).setMinMaxHeight(0.0F, 0.1F)); + Biomes.frostForest = Optional.of((new BiomeGenFrostForest(BOPConfiguration.frostForestID)).setColor(14090235).setBiomeName("Frost Forest").setEnableSnow().setTemperatureRainfall(0.0F, 0.0F).setMinMaxHeight(0.1F, 0.4F)); + Biomes.fungiForest = Optional.of((new BiomeGenFungiForest(BOPConfiguration.fungiForestID)).setColor(747097).setBiomeName("Fungi Forest").func_76733_a(5159473).setTemperatureRainfall(0.9F, 1.0F).setMinMaxHeight(0.0F, 0.4F)); + Biomes.garden = Optional.of((new BiomeGenGarden(BOPConfiguration.gardenID)).setColor(9286496).setBiomeName("Garden").setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(0.1F, 0.2F)); + Biomes.glacier = Optional.of((new BiomeGenGlacier(BOPConfiguration.glacierID)).setColor(6316128).setBiomeName("Glacier").setEnableSnow().setMinMaxHeight(0.4F, 1.0F).setTemperatureRainfall(0.0F, 0.0F)); + Biomes.grassland = Optional.of((new BiomeGenGrassland(BOPConfiguration.grasslandID)).setColor(9286496).setBiomeName("Grassland").setTemperatureRainfall(0.7F, 0.7F).setMinMaxHeight(0.2F, 0.2F)); + Biomes.grove = Optional.of((new BiomeGenGrove(BOPConfiguration.groveID)).setColor(9286496).setBiomeName("Grove").setTemperatureRainfall(0.4F, 0.8F).setMinMaxHeight(0.0F, 0.1F)); + Biomes.heathland = Optional.of((new BiomeGenHeathland(BOPConfiguration.heathlandID)).setColor(353825).setBiomeName("Heathland").func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.1F).setMinMaxHeight(0.1F, 0.3F)); + Biomes.highland = Optional.of((new BiomeGenHighland(BOPConfiguration.highlandID)).setColor(6316128).setBiomeName("Highland").setMinMaxHeight(0.9F, 1.9F).setTemperatureRainfall(0.5F, 0.5F)); + Biomes.iceSheet = Optional.of((new BiomeGenIceSheet(BOPConfiguration.iceSheetID)).setColor(6316128).setBiomeName("Ice Sheet").setEnableSnow().setMinMaxHeight(0.1F, 0.2F).setTemperatureRainfall(0.0F, 0.0F)); + Biomes.icyHills = Optional.of((new BiomeGenIcyHills(BOPConfiguration.icyHillsID)).setColor(14090235).setBiomeName("Icy Hills").setEnableSnow().setTemperatureRainfall(0.0F, 0.0F).setMinMaxHeight(-0.2F, 0.5F)); + Biomes.jadeCliffs = Optional.of((new BiomeGenJadeCliffs(BOPConfiguration.jadeCliffsID)).setColor(14090235).setBiomeName("Jade Cliffs").setTemperatureRainfall(0.5F, 0.1F).setMinMaxHeight(0.1F, 2.0F)); + Biomes.lushDesert = Optional.of((new BiomeGenLushDesert(BOPConfiguration.lushDesertID)).setColor(16421912).setBiomeName("Lush Desert").setTemperatureRainfall(0.8F, 0.3F).setMinMaxHeight(0.2F, 0.8F)); + Biomes.lushSwamp = Optional.of((new BiomeGenLushSwamp(BOPConfiguration.lushSwampID)).setColor(522674).setBiomeName("Lush Swamp").func_76733_a(9154376).setMinMaxHeight(-0.2F, 0.1F).setTemperatureRainfall(0.7F, 1.0F)); + Biomes.mangrove = Optional.of((new BiomeGenMangrove(BOPConfiguration.mangroveID)).setColor(16440917).setBiomeName("Mangrove").setMinMaxHeight(-0.4F, -0.1F).setTemperatureRainfall(0.8F, 0.9F)); + Biomes.mapleWoods = Optional.of((new BiomeGenMapleWoods(BOPConfiguration.mapleWoodsID)).setColor(747097).setBiomeName("Maple Woods").func_76733_a(5159473).setTemperatureRainfall(0.2F, 0.8F).setMinMaxHeight(0.1F, 0.6F)); + Biomes.marsh = Optional.of((new BiomeGenMarsh(BOPConfiguration.marshID)).setColor(10486015).setBiomeName("Marsh").setMinMaxHeight(-0.5F, 0.0F).setTemperatureRainfall(0.5F, 0.9F)); + Biomes.meadow = Optional.of((new BiomeGenMeadow(BOPConfiguration.meadowID)).setColor(9286496).setBiomeName("Meadow").setTemperatureRainfall(0.7F, 0.7F)); + Biomes.mesa = Optional.of((new BiomeGenMesa(BOPConfiguration.mesaID)).setColor(16421912).setBiomeName("Mesa").setDisableRain().setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.8F, 1.0F)); + Biomes.moor = Optional.of((new BiomeGenMoor(BOPConfiguration.moorID)).setColor(16421912).setBiomeName("Moor").setTemperatureRainfall(0.5F, 1.0F).setMinMaxHeight(0.7F, 0.8F)); + Biomes.mountain = Optional.of((new BiomeGenMountain(BOPConfiguration.mountainID)).setColor(14090235).setBiomeName("Mountain").setTemperatureRainfall(0.5F, 0.1F).setMinMaxHeight(1.2F, 1.2F)); + Biomes.mysticGrove = Optional.of((new BiomeGenMysticGrove(BOPConfiguration.mysticGroveID)).setColor(353825).setBiomeName("Mystic Grove").setDisableRain().func_76733_a(5159473).setTemperatureRainfall(0.9F, 1.0F)); + Biomes.oasis = Optional.of((new BiomeGenOasis(BOPConfiguration.oasisID)).setColor(16421912).setBiomeName("Oasis").setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.1F, 0.2F)); + Biomes.ominousWoods = Optional.of((new BiomeGenOminousWoods(BOPConfiguration.ominousWoodsID)).setColor(353825).setBiomeName("Ominous Woods").setDisableRain().func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.9F)); + Biomes.orchard = Optional.of((new BiomeGenOrchard(BOPConfiguration.orchardID)).setColor(9286496).setBiomeName("Orchard").setTemperatureRainfall(0.8F, 0.4F)); + Biomes.originValley = Optional.of((new BiomeGenOriginValley(BOPConfiguration.originValleyID)).setColor(353825).setBiomeName("Origin Valley").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(-0.1F, 0.6F)); + Biomes.outback = Optional.of((new BiomeGenOutback(BOPConfiguration.outbackID)).setColor(9286496).setBiomeName("Outback").setTemperatureRainfall(0.8F, 0.0F).setMinMaxHeight(0.1F, 0.1F)); + Biomes.pasture = Optional.of((new BiomeGenPasture(BOPConfiguration.pastureID)).setColor(9286496).setBiomeName("Pasture").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.1F, 0.2F)); + Biomes.prairie = Optional.of((new BiomeGenPrairie(BOPConfiguration.prairieID)).setColor(353825).setBiomeName("Prairie").func_76733_a(5159473).setTemperatureRainfall(0.9F, 0.6F).setMinMaxHeight(0.1F, 0.1F)); + Biomes.promisedLand = Optional.of((new BiomeGenPromisedLand(BOPConfiguration.promisedLandID)).setColor(112).setBiomeName("Promised Land").setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.1F, 2.0F)); + Biomes.quagmire = Optional.of((new BiomeGenQuagmire(BOPConfiguration.quagmireID)).setColor(522674).setBiomeName("Quagmire").func_76733_a(9154376).setMinMaxHeight(-0.1F, 0.3F).setTemperatureRainfall(0.8F, 0.9F)); + Biomes.rainforest = Optional.of((new BiomeGenRainforest(BOPConfiguration.rainforestID)).setColor(5470985).setBiomeName("Rainforest").func_76733_a(5470985).setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.7F, 1.8F)); + Biomes.redwoodForest = Optional.of((new BiomeGenRedwoodForest(BOPConfiguration.redwoodForestID)).setColor(747097).setBiomeName("Redwood Forest").func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.0F, 0.4F)); + Biomes.sacredSprings = Optional.of((new BiomeGenSacredSprings(BOPConfiguration.sacredSpringsID)).setColor(522674).setBiomeName("Sacred Springs").func_76733_a(9154376).setMinMaxHeight(0.0F, 1.2F).setTemperatureRainfall(1.2F, 0.9F)); + Biomes.savanna = Optional.of((new BiomeGenSavanna(BOPConfiguration.savannaID)).setColor(9286496).setBiomeName("Savanna").setTemperatureRainfall(1.5F, 0.1F).setMinMaxHeight(0.1F, 0.1F)); + Biomes.scrubland = Optional.of((new BiomeGenScrubland(BOPConfiguration.scrublandID)).setColor(9286496).setBiomeName("Scrubland").setTemperatureRainfall(1.2F, 0.0F).setMinMaxHeight(0.1F, 0.3F)); + Biomes.seasonalForest = Optional.of((new BiomeGenSeasonalForest(BOPConfiguration.seasonalForestID)).setColor(353825).setBiomeName("Seasonal Forest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(0.2F, 0.7F)); + Biomes.shield = Optional.of((new BiomeGenShield(BOPConfiguration.shieldID)).setColor(522674).setBiomeName("Shield").func_76733_a(9154376).setMinMaxHeight(-0.2F, 0.4F).setTemperatureRainfall(0.5F, 0.8F)); + Biomes.shore = Optional.of((new BiomeGenShore(BOPConfiguration.shoreID)).setColor(9286496).setBiomeName("Shore").setMinMaxHeight(-1.0F, 0.4F).setTemperatureRainfall(0.8F, 0.4F)); + Biomes.shrubland = Optional.of((new BiomeGenShrubland(BOPConfiguration.shrublandID)).setColor(9286496).setBiomeName("Shrubland").setMinMaxHeight(0.1F, 0.2F).setTemperatureRainfall(0.6F, 0.0F)); + Biomes.snowyWoods = Optional.of((new BiomeGenSnowyWoods(BOPConfiguration.snowyWoodsID)).setColor(522674).setBiomeName("Snowy Woods").func_76733_a(9154376).setEnableSnow().setTemperatureRainfall(0.05F, 0.8F).setMinMaxHeight(0.2F, 0.7F)); + Biomes.spruceWoods = Optional.of((new BiomeGenSpruceWoods(BOPConfiguration.spruceWoodsID)).setColor(353825).setBiomeName("Spruce Woods").func_76733_a(5159473).setTemperatureRainfall(0.6F, 0.7F)); + Biomes.steppe = Optional.of((new BiomeGenSteppe(BOPConfiguration.steppeID)).setColor(9286496).setBiomeName("Steppe").setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.1F, 0.2F)); + Biomes.swampwoods = Optional.of((new BiomeGenSwampwoods(BOPConfiguration.swampwoodsID)).setColor(522674).setBiomeName("Swampwoods").func_76733_a(9154376).setMinMaxHeight(-0.2F, 0.2F).setTemperatureRainfall(0.8F, 0.9F)); + Biomes.temperateRainforest = Optional.of((new BiomeGenTemperateRainforest(BOPConfiguration.temperateRainforestID)).setColor(353825).setBiomeName("Temperate Rainforest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(0.2F, 1.2F)); + Biomes.thicket = Optional.of((new BiomeGenThicket(BOPConfiguration.thicketID)).setColor(353825).setBiomeName("Thicket").func_76733_a(5159473).setTemperatureRainfall(0.6F, 0.2F).setMinMaxHeight(0.0F, 0.2F)); + Biomes.tropicalRainforest = Optional.of((new BiomeGenTropicalRainforest(BOPConfiguration.tropicalRainforestID)).setColor(9286496).setBiomeName("Tropical Rainforest").setTemperatureRainfall(1.2F, 0.9F).setMinMaxHeight(0.3F, 0.7F)); + Biomes.tropics = Optional.of((new BiomeGenTropics(BOPConfiguration.tropicsID)).setColor(9286496).setBiomeName("Tropics").setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.1F, 0.8F)); + Biomes.tundra = Optional.of((new BiomeGenTundra(BOPConfiguration.tundraID)).setColor(14090235).setBiomeName("Tundra").setEnableSnow().setTemperatureRainfall(0.05F, 0.0F).setMinMaxHeight(-0.2F, 0.0F)); + Biomes.volcano = Optional.of((new BiomeGenVolcano(BOPConfiguration.volcanoID)).setColor(9286496).setBiomeName("Volcano").setDisableRain().setMinMaxHeight(0.6F, 0.9F).setTemperatureRainfall(2.0F, 0.0F)); + Biomes.wasteland = Optional.of((new BiomeGenWasteland(BOPConfiguration.wastelandID)).setColor(16421912).setBiomeName("Wasteland").setDisableRain().setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.0F, 0.0F)); + Biomes.wetland = Optional.of((new BiomeGenWetland(BOPConfiguration.wetlandID)).setColor(522674).setBiomeName("Wetland").func_76733_a(9154376).setMinMaxHeight(-0.2F, 0.4F).setTemperatureRainfall(0.8F, 0.9F)); + Biomes.woodland = Optional.of((new BiomeGenWoodland(BOPConfiguration.woodlandID)).setColor(353825).setBiomeName("Woodland").func_76733_a(5159473).setTemperatureRainfall(1.7F, 0.2F).setMinMaxHeight(0.1F, 0.2F)); + Biomes.plainsNew = Optional.of((new BiomeGenPlainsNew(BOPConfiguration.plainsNewID)).setColor(9286496).setBiomeName("Plains").setTemperatureRainfall(0.8F, 0.4F)); + Biomes.desertNew = Optional.of((new BiomeGenDesertNew(BOPConfiguration.desertNewID)).setColor(16421912).setBiomeName("Desert").setDisableRain().setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.1F, 0.2F)); + Biomes.extremeHillsNew = Optional.of((new BiomeGenHillsNew(BOPConfiguration.extremeHillsNewID)).setColor(6316128).setBiomeName("Extreme Hills").setMinMaxHeight(0.3F, 1.5F).setTemperatureRainfall(0.2F, 0.3F)); + Biomes.forestNew = Optional.of((new BiomeGenForestNew(BOPConfiguration.forestNewID)).setColor(353825).setBiomeName("Forest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F)); + Biomes.taigaNew = Optional.of((new BiomeGenTaigaNew(BOPConfiguration.taigaNewID)).setColor(747097).setBiomeName("Taiga").func_76733_a(5159473).setEnableSnow().setTemperatureRainfall(0.05F, 0.8F).setMinMaxHeight(0.1F, 0.4F)); + Biomes.swamplandNew = Optional.of((new BiomeGenSwampNew(BOPConfiguration.swamplandNewID)).setColor(522674).setBiomeName("Swampland").func_76733_a(9154376).setMinMaxHeight(-0.2F, 0.1F).setTemperatureRainfall(0.8F, 0.9F)); + Biomes.jungleNew = Optional.of((new BiomeGenJungleNew(BOPConfiguration.jungleNewID)).setColor(5470985).setBiomeName("Jungle").func_76733_a(5470985).setTemperatureRainfall(1.2F, 0.9F).setMinMaxHeight(0.2F, 0.4F)); + } + + private static void addToBiomeDictionary() + { + BiomeDictionary.registerBiomeType(Biomes.alps.get(), Type.FROZEN, Type.MOUNTAIN); + BiomeDictionary.registerBiomeType(Biomes.arctic.get(), Type.FROZEN, Type.FOREST, Type.HILLS); + BiomeDictionary.registerBiomeType(Biomes.badlands.get(), Type.DESERT, Type.WASTELAND); + BiomeDictionary.registerBiomeType(Biomes.bambooForest.get(), Type.JUNGLE); + BiomeDictionary.registerBiomeType(Biomes.bayou.get(), Type.SWAMP); + BiomeDictionary.registerBiomeType(Biomes.birchForest.get(), Type.FOREST); + BiomeDictionary.registerBiomeType(Biomes.bog.get(), Type.SWAMP); + BiomeDictionary.registerBiomeType(Biomes.borealForest.get(), Type.FOREST); + BiomeDictionary.registerBiomeType(Biomes.canyon.get(), Type.DESERT, Type.MOUNTAIN, Type.HILLS); + BiomeDictionary.registerBiomeType(Biomes.chaparral.get(), Type.PLAINS); + BiomeDictionary.registerBiomeType(Biomes.cherryBlossomGrove.get(), Type.MAGICAL, Type.FOREST); + BiomeDictionary.registerBiomeType(Biomes.coniferousForest.get(), Type.FOREST, Type.HILLS); + BiomeDictionary.registerBiomeType(Biomes.crag.get(), Type.WASTELAND, Type.MOUNTAIN); + BiomeDictionary.registerBiomeType(Biomes.deadForest.get(), Type.WASTELAND, Type.FOREST); + BiomeDictionary.registerBiomeType(Biomes.deadlands.get(), Type.WASTELAND, Type.NETHER); + BiomeDictionary.registerBiomeType(Biomes.deadSwamp.get(), Type.SWAMP); + BiomeDictionary.registerBiomeType(Biomes.deciduousForest.get(), Type.FOREST, Type.HILLS); + BiomeDictionary.registerBiomeType(Biomes.drylands.get(), Type.DESERT); + BiomeDictionary.registerBiomeType(Biomes.dunes.get(), Type.BEACH, Type.DESERT); + BiomeDictionary.registerBiomeType(Biomes.fen.get(), Type.FOREST, Type.SWAMP); + BiomeDictionary.registerBiomeType(Biomes.field.get(), Type.PLAINS); + BiomeDictionary.registerBiomeType(Biomes.frostForest.get(), Type.FROZEN, Type.FOREST); + BiomeDictionary.registerBiomeType(Biomes.fungiForest.get(), Type.MAGICAL, Type.MUSHROOM, Type.FOREST, Type.SWAMP); + BiomeDictionary.registerBiomeType(Biomes.garden.get(), Type.MAGICAL, Type.PLAINS); + BiomeDictionary.registerBiomeType(Biomes.glacier.get(), Type.FROZEN, Type.HILLS); + BiomeDictionary.registerBiomeType(Biomes.grassland.get(), Type.PLAINS); + BiomeDictionary.registerBiomeType(Biomes.grove.get(), Type.FOREST); + BiomeDictionary.registerBiomeType(Biomes.heathland.get(), Type.PLAINS); + BiomeDictionary.registerBiomeType(Biomes.highland.get(), Type.HILLS, Type.MOUNTAIN); + BiomeDictionary.registerBiomeType(Biomes.iceSheet.get(), Type.FROZEN, Type.WASTELAND); + BiomeDictionary.registerBiomeType(Biomes.icyHills.get(), Type.FROZEN, Type.HILLS); + BiomeDictionary.registerBiomeType(Biomes.jadeCliffs.get(), Type.FOREST, Type.MOUNTAIN); + BiomeDictionary.registerBiomeType(Biomes.lushDesert.get(), Type.DESERT, Type.PLAINS); + BiomeDictionary.registerBiomeType(Biomes.lushSwamp.get(), Type.SWAMP); + BiomeDictionary.registerBiomeType(Biomes.mangrove.get(), Type.WATER); + BiomeDictionary.registerBiomeType(Biomes.mapleWoods.get(), Type.FOREST); + BiomeDictionary.registerBiomeType(Biomes.marsh.get(), Type.SWAMP, Type.WATER); + BiomeDictionary.registerBiomeType(Biomes.meadow.get(), Type.FOREST, Type.PLAINS); + BiomeDictionary.registerBiomeType(Biomes.mesa.get(), Type.DESERT, Type.WASTELAND); + BiomeDictionary.registerBiomeType(Biomes.moor.get(), Type.PLAINS, Type.HILLS); + BiomeDictionary.registerBiomeType(Biomes.mountain.get(), Type.MOUNTAIN, Type.HILLS); + BiomeDictionary.registerBiomeType(Biomes.mysticGrove.get(), Type.MAGICAL, Type.FOREST); + BiomeDictionary.registerBiomeType(Biomes.oasis.get(), Type.DESERT, Type.PLAINS); + BiomeDictionary.registerBiomeType(Biomes.ominousWoods.get(), Type.NETHER, Type.MAGICAL); + BiomeDictionary.registerBiomeType(Biomes.orchard.get(), Type.FOREST, Type.PLAINS); + BiomeDictionary.registerBiomeType(Biomes.outback.get(), Type.DESERT, Type.PLAINS); + BiomeDictionary.registerBiomeType(Biomes.pasture.get(), Type.PLAINS); + BiomeDictionary.registerBiomeType(Biomes.prairie.get(), Type.PLAINS); + BiomeDictionary.registerBiomeType(Biomes.promisedLand.get(), Type.FOREST, Type.MAGICAL); + BiomeDictionary.registerBiomeType(Biomes.quagmire.get(), Type.WASTELAND); + BiomeDictionary.registerBiomeType(Biomes.rainforest.get(), Type.JUNGLE, Type.HILLS, Type.FOREST); + BiomeDictionary.registerBiomeType(Biomes.redwoodForest.get(), Type.FOREST); + BiomeDictionary.registerBiomeType(Biomes.sacredSprings.get(), Type.MOUNTAIN, Type.FOREST); + BiomeDictionary.registerBiomeType(Biomes.savanna.get(), Type.DESERT); + BiomeDictionary.registerBiomeType(Biomes.scrubland.get(), Type.DESERT, Type.PLAINS); + BiomeDictionary.registerBiomeType(Biomes.seasonalForest.get(), Type.FOREST); + BiomeDictionary.registerBiomeType(Biomes.shield.get(), Type.FOREST); + BiomeDictionary.registerBiomeType(Biomes.shrubland.get(), Type.PLAINS); + BiomeDictionary.registerBiomeType(Biomes.snowyWoods.get(), Type.FROZEN); + BiomeDictionary.registerBiomeType(Biomes.spruceWoods.get(), Type.FOREST); + BiomeDictionary.registerBiomeType(Biomes.steppe.get(), Type.PLAINS, Type.WASTELAND); + BiomeDictionary.registerBiomeType(Biomes.swampwoods.get(), Type.SWAMP, Type.FOREST); + BiomeDictionary.registerBiomeType(Biomes.temperateRainforest.get(), Type.FOREST, Type.HILLS); + BiomeDictionary.registerBiomeType(Biomes.thicket.get(), Type.PLAINS, Type.FOREST); + BiomeDictionary.registerBiomeType(Biomes.tropicalRainforest.get(), Type.JUNGLE); + BiomeDictionary.registerBiomeType(Biomes.tropics.get(), Type.JUNGLE); + BiomeDictionary.registerBiomeType(Biomes.tundra.get(), Type.FROZEN); + BiomeDictionary.registerBiomeType(Biomes.volcano.get(), Type.WASTELAND, Type.MOUNTAIN, Type.NETHER); + BiomeDictionary.registerBiomeType(Biomes.wasteland.get(), Type.WASTELAND); + BiomeDictionary.registerBiomeType(Biomes.wetland.get(), Type.SWAMP); + BiomeDictionary.registerBiomeType(Biomes.woodland.get(), Type.FOREST); + BiomeDictionary.registerBiomeType(Biomes.plainsNew.get(), Type.PLAINS); + BiomeDictionary.registerBiomeType(Biomes.desertNew.get(), Type.DESERT); + BiomeDictionary.registerBiomeType(Biomes.forestNew.get(), Type.FOREST); + BiomeDictionary.registerBiomeType(Biomes.extremeHillsNew.get(), Type.HILLS, Type.MOUNTAIN); + BiomeDictionary.registerBiomeType(Biomes.taigaNew.get(), Type.FROZEN); + BiomeDictionary.registerBiomeType(Biomes.swamplandNew.get(), Type.SWAMP); + BiomeDictionary.registerBiomeType(Biomes.jungleNew.get(), Type.JUNGLE); + } + + private static void addSpawnBiomes() + { + addSpawnBiome(Biomes.alps); + addSpawnBiome(Biomes.arctic); + addSpawnBiome(Biomes.badlands); + addSpawnBiome(Biomes.bambooForest); + addSpawnBiome(Biomes.bayou); + addSpawnBiome(Biomes.birchForest); + addSpawnBiome(Biomes.bog); + addSpawnBiome(Biomes.borealForest); + addSpawnBiome(Biomes.canyon); + addSpawnBiome(Biomes.chaparral); + addSpawnBiome(Biomes.cherryBlossomGrove); + addSpawnBiome(Biomes.coniferousForest); + addSpawnBiome(Biomes.deadForest); + addSpawnBiome(Biomes.deadSwamp); + addSpawnBiome(Biomes.deciduousForest); + addSpawnBiome(Biomes.drylands); + addSpawnBiome(Biomes.dunes); + addSpawnBiome(Biomes.fen); + addSpawnBiome(Biomes.field); + addSpawnBiome(Biomes.frostForest); + addSpawnBiome(Biomes.glacier); + addSpawnBiome(Biomes.grassland); + addSpawnBiome(Biomes.grove); + addSpawnBiome(Biomes.heathland); + addSpawnBiome(Biomes.highland); + addSpawnBiome(Biomes.iceSheet); + addSpawnBiome(Biomes.jadeCliffs); + addSpawnBiome(Biomes.lushDesert); + addSpawnBiome(Biomes.lushSwamp); + addSpawnBiome(Biomes.mangrove); + addSpawnBiome(Biomes.mapleWoods); + addSpawnBiome(Biomes.marsh); + addSpawnBiome(Biomes.meadow); + addSpawnBiome(Biomes.mesa); + addSpawnBiome(Biomes.moor); + addSpawnBiome(Biomes.mountain); + addSpawnBiome(Biomes.oasis); + addSpawnBiome(Biomes.orchard); + addSpawnBiome(Biomes.outback); + addSpawnBiome(Biomes.pasture); + addSpawnBiome(Biomes.prairie); + addSpawnBiome(Biomes.quagmire); + addSpawnBiome(Biomes.rainforest); + addSpawnBiome(Biomes.redwoodForest); + addSpawnBiome(Biomes.savanna); + addSpawnBiome(Biomes.scrubland); + addSpawnBiome(Biomes.seasonalForest); + addSpawnBiome(Biomes.shield); + addSpawnBiome(Biomes.shrubland); + addSpawnBiome(Biomes.snowyWoods); + addSpawnBiome(Biomes.spruceWoods); + addSpawnBiome(Biomes.swampwoods); + addSpawnBiome(Biomes.temperateRainforest); + addSpawnBiome(Biomes.thicket); + addSpawnBiome(Biomes.tropicalRainforest); + addSpawnBiome(Biomes.tropics); + addSpawnBiome(Biomes.tundra); + addSpawnBiome(Biomes.volcano); + addSpawnBiome(Biomes.wetland); + addSpawnBiome(Biomes.woodland); + addSpawnBiome(Biomes.plainsNew); + addSpawnBiome(Biomes.desertNew); + addSpawnBiome(Biomes.forestNew); + addSpawnBiome(Biomes.extremeHillsNew); + addSpawnBiome(Biomes.taigaNew); + addSpawnBiome(Biomes.swamplandNew); + addSpawnBiome(Biomes.jungleNew); + } + + private static void addVillageBiomes() + { + addVillageBiome(Biomes.arctic); + addVillageBiome(Biomes.bayou); + addVillageBiome(Biomes.birchForest); + addVillageBiome(Biomes.chaparral); + addVillageBiome(Biomes.coniferousForest); + addVillageBiome(Biomes.deadForest); + addVillageBiome(Biomes.field); + addVillageBiome(Biomes.frostForest); + addVillageBiome(Biomes.grassland); + addVillageBiome(Biomes.grove); + addVillageBiome(Biomes.heathland); + addVillageBiome(Biomes.lushSwamp); + addVillageBiome(Biomes.mapleWoods); + addVillageBiome(Biomes.orchard); + addVillageBiome(Biomes.prairie); + addVillageBiome(Biomes.redwoodForest); + addVillageBiome(Biomes.savanna); + addVillageBiome(Biomes.scrubland); + addVillageBiome(Biomes.shield); + addVillageBiome(Biomes.shrubland); + addVillageBiome(Biomes.snowyWoods); + addVillageBiome(Biomes.spruceWoods); + addVillageBiome(Biomes.tropicalRainforest); + addVillageBiome(Biomes.woodland); + addVillageBiome(Biomes.plainsNew); + addVillageBiome(Biomes.desertNew); + addVillageBiome(Biomes.forestNew); + addVillageBiome(Biomes.taigaNew); + addVillageBiome(Biomes.swamplandNew); + } + + private static void addStrongholdBiomes() + { + addStrongholdBiome(Biomes.alps); + addStrongholdBiome(Biomes.arctic); + addStrongholdBiome(Biomes.badlands); + addStrongholdBiome(Biomes.bambooForest); + addStrongholdBiome(Biomes.bayou); + addStrongholdBiome(Biomes.birchForest); + addStrongholdBiome(Biomes.bog); + addStrongholdBiome(Biomes.borealForest); + addStrongholdBiome(Biomes.canyon); + addStrongholdBiome(Biomes.chaparral); + addStrongholdBiome(Biomes.cherryBlossomGrove); + addStrongholdBiome(Biomes.coniferousForest); + addStrongholdBiome(Biomes.crag); + addStrongholdBiome(Biomes.deadForest); + addStrongholdBiome(Biomes.deadSwamp); + addStrongholdBiome(Biomes.deadlands); + addStrongholdBiome(Biomes.deciduousForest); + addStrongholdBiome(Biomes.drylands); + addStrongholdBiome(Biomes.dunes); + addStrongholdBiome(Biomes.fen); + addStrongholdBiome(Biomes.field); + addStrongholdBiome(Biomes.frostForest); + addStrongholdBiome(Biomes.fungiForest); + addStrongholdBiome(Biomes.garden); + addStrongholdBiome(Biomes.glacier); + addStrongholdBiome(Biomes.grassland); + addStrongholdBiome(Biomes.grove); + addStrongholdBiome(Biomes.heathland); + addStrongholdBiome(Biomes.highland); + addStrongholdBiome(Biomes.iceSheet); + addStrongholdBiome(Biomes.icyHills); + addStrongholdBiome(Biomes.jadeCliffs); + addStrongholdBiome(Biomes.lushDesert); + addStrongholdBiome(Biomes.lushSwamp); + addStrongholdBiome(Biomes.mangrove); + addStrongholdBiome(Biomes.mapleWoods); + addStrongholdBiome(Biomes.marsh); + addStrongholdBiome(Biomes.meadow); + addStrongholdBiome(Biomes.mesa); + addStrongholdBiome(Biomes.moor); + addStrongholdBiome(Biomes.mountain); + addStrongholdBiome(Biomes.mysticGrove); + addStrongholdBiome(Biomes.oasis); + addStrongholdBiome(Biomes.ominousWoods); + addStrongholdBiome(Biomes.orchard); + addStrongholdBiome(Biomes.outback); + addStrongholdBiome(Biomes.pasture); + addStrongholdBiome(Biomes.prairie); + addStrongholdBiome(Biomes.quagmire); + addStrongholdBiome(Biomes.rainforest); + addStrongholdBiome(Biomes.redwoodForest); + addStrongholdBiome(Biomes.sacredSprings); + addStrongholdBiome(Biomes.savanna); + addStrongholdBiome(Biomes.scrubland); + addStrongholdBiome(Biomes.seasonalForest); + addStrongholdBiome(Biomes.shield); + addStrongholdBiome(Biomes.shrubland); + addStrongholdBiome(Biomes.snowyWoods); + addStrongholdBiome(Biomes.spruceWoods); + addStrongholdBiome(Biomes.steppe); + addStrongholdBiome(Biomes.swampwoods); + addStrongholdBiome(Biomes.temperateRainforest); + addStrongholdBiome(Biomes.thicket); + addStrongholdBiome(Biomes.tropicalRainforest); + addStrongholdBiome(Biomes.tropics); + addStrongholdBiome(Biomes.tundra); + addStrongholdBiome(Biomes.volcano); + addStrongholdBiome(Biomes.wasteland); + addStrongholdBiome(Biomes.wetland); + addStrongholdBiome(Biomes.woodland); + addStrongholdBiome(Biomes.plainsNew); + addStrongholdBiome(Biomes.desertNew); + addStrongholdBiome(Biomes.forestNew); + addStrongholdBiome(Biomes.extremeHillsNew); + addStrongholdBiome(Biomes.taigaNew); + addStrongholdBiome(Biomes.swamplandNew); + addStrongholdBiome(Biomes.jungleNew); + } + + private static void registerBiomes() + { + if (BOPConfiguration.addToDefault) + { + if (BOPConfiguration.alpsGen) + registerBiome(Biomes.alps); + + if (BOPConfiguration.arcticGen) + registerBiome(Biomes.arctic); + + if (BOPConfiguration.badlandsGen) + registerBiome(Biomes.badlands); + + if (BOPConfiguration.bambooForestGen) + registerBiome(Biomes.bambooForest); + + if (BOPConfiguration.bayouGen) + registerBiome(Biomes.bayou); + + if (BOPConfiguration.birchForestGen) + registerBiome(Biomes.birchForest); + + if (BOPConfiguration.bogGen) + registerBiome(Biomes.bog); + + if (BOPConfiguration.borealForestGen) + registerBiome(Biomes.borealForest); + + if (BOPConfiguration.canyonGen) + registerBiome(Biomes.canyon); + + if (BOPConfiguration.chaparralGen) + registerBiome(Biomes.chaparral); + + if (BOPConfiguration.cherryBlossomGroveGen) + registerBiome(Biomes.cherryBlossomGrove); + + if (BOPConfiguration.coniferousForestGen) + registerBiome(Biomes.coniferousForest); + + if (BOPConfiguration.cragGen) + registerBiome(Biomes.crag); + + if (BOPConfiguration.deadForestGen) + registerBiome(Biomes.deadForest); + + if (BOPConfiguration.deadSwampGen) + registerBiome(Biomes.deadSwamp); + + if (BOPConfiguration.deadlandsGen) + registerBiome(Biomes.deadlands); + + if (BOPConfiguration.deciduousForestGen) + registerBiome(Biomes.deciduousForest); + + if (BOPConfiguration.drylandsGen) + registerBiome(Biomes.drylands); + + if (BOPConfiguration.dunesGen) + registerBiome(Biomes.dunes); + + if (BOPConfiguration.fenGen) + registerBiome(Biomes.fen); + + if (BOPConfiguration.fieldGen) + registerBiome(Biomes.field); + + if (BOPConfiguration.frostForestGen) + registerBiome(Biomes.frostForest); + + if (BOPConfiguration.fungiForestGen) + registerBiome(Biomes.fungiForest); + + if (BOPConfiguration.gardenGen) + registerBiome(Biomes.garden); + + if (BOPConfiguration.glacierGen) + registerBiome(Biomes.glacier); + + if (BOPConfiguration.grasslandGen) + registerBiome(Biomes.grassland); + + if (BOPConfiguration.groveGen) + registerBiome(Biomes.grove); + + if (BOPConfiguration.heathlandGen) + registerBiome(Biomes.heathland); + + if (BOPConfiguration.highlandGen) + registerBiome(Biomes.highland); + + if (BOPConfiguration.iceSheetGen) + registerBiome(Biomes.iceSheet); + + if (BOPConfiguration.icyHillsGen) + registerBiome(Biomes.icyHills); + + if (BOPConfiguration.jadeCliffsGen) + registerBiome(Biomes.jadeCliffs); + + if (BOPConfiguration.lushDesertGen) + registerBiome(Biomes.lushDesert); + + if (BOPConfiguration.lushSwampGen) + registerBiome(Biomes.lushSwamp); + + if (BOPConfiguration.mangroveGen) + registerBiome(Biomes.mangrove); + + if (BOPConfiguration.mapleWoodsGen) + registerBiome(Biomes.mapleWoods); + + if (BOPConfiguration.marshGen) + registerBiome(Biomes.marsh); + + if (BOPConfiguration.meadowGen) + registerBiome(Biomes.meadow); + + if (BOPConfiguration.mesaGen) + registerBiome(Biomes.mesa); + + if (BOPConfiguration.moorGen) + registerBiome(Biomes.moor); + + if (BOPConfiguration.mountainGen) + registerBiome(Biomes.mountain); + + if (BOPConfiguration.mushroomIslandGen) + GameRegistry.addBiome(BiomeGenBase.mushroomIsland); + + if (BOPConfiguration.mysticGroveGen) + registerBiome(Biomes.mysticGrove); + + if (BOPConfiguration.oasisGen) + registerBiome(Biomes.oasis); + + if (BOPConfiguration.ominousWoodsGen) + registerBiome(Biomes.ominousWoods); + + if (BOPConfiguration.orchardGen) + registerBiome(Biomes.orchard); + + if (BOPConfiguration.originValleyGen) + registerBiome(Biomes.originValley); + + if (BOPConfiguration.outbackGen) + registerBiome(Biomes.outback); + + if (BOPConfiguration.pastureGen) + registerBiome(Biomes.pasture); + + if (BOPConfiguration.prairieGen) + registerBiome(Biomes.prairie); + + if (BOPConfiguration.quagmireGen) + registerBiome(Biomes.quagmire); + + if (BOPConfiguration.rainforestGen) + registerBiome(Biomes.rainforest); + + if (BOPConfiguration.redwoodForestGen) + registerBiome(Biomes.redwoodForest); + + if (BOPConfiguration.sacredSpringsGen) + registerBiome(Biomes.sacredSprings); + + if (BOPConfiguration.savannaGen) + registerBiome(Biomes.savanna); + + if (BOPConfiguration.scrublandGen) + registerBiome(Biomes.scrubland); + + if (BOPConfiguration.seasonalForestGen) + registerBiome(Biomes.seasonalForest); + + if (BOPConfiguration.shieldGen) + registerBiome(Biomes.shield); + + if (BOPConfiguration.shrublandGen) + registerBiome(Biomes.shrubland); + + if (BOPConfiguration.snowyWoodsGen) + registerBiome(Biomes.snowyWoods); + + if (BOPConfiguration.spruceWoodsGen) + registerBiome(Biomes.spruceWoods); + + if (BOPConfiguration.steppeGen) + registerBiome(Biomes.steppe); + + if (BOPConfiguration.swampwoodsGen) + registerBiome(Biomes.swampwoods); + + if (BOPConfiguration.temperateRainforestGen) + registerBiome(Biomes.temperateRainforest); + + if (BOPConfiguration.thicketGen) + registerBiome(Biomes.thicket); + + if (BOPConfiguration.tropicalRainforestGen) + registerBiome(Biomes.tropicalRainforest); + + if (BOPConfiguration.tropicsGen) + registerBiome(Biomes.tropics); + + if (BOPConfiguration.tundraGen) + registerBiome(Biomes.tundra); + + if (BOPConfiguration.volcanoGen) + registerBiome(Biomes.volcano); + + if (BOPConfiguration.wastelandGen) + registerBiome(Biomes.wasteland); + + if (BOPConfiguration.wetlandGen) + registerBiome(Biomes.wetland); + + if (BOPConfiguration.woodlandGen) + registerBiome(Biomes.woodland); + + // Vanilla biomes generation + if (BOPConfiguration.plainsGen) + if (BOPConfiguration.vanillaEnhanced) + { + registerBiome(Biomes.plainsNew); + GameRegistry.removeBiome(BiomeGenBase.plains); + } + else + GameRegistry.removeBiome(BiomeGenBase.plains); + + if (BOPConfiguration.desertGen) + if (BOPConfiguration.vanillaEnhanced) + { + registerBiome(Biomes.desertNew); + GameRegistry.removeBiome(BiomeGenBase.desert); + } + else + GameRegistry.removeBiome(BiomeGenBase.desert); + + if (BOPConfiguration.extremeHillsGen) + if (BOPConfiguration.vanillaEnhanced) + { + registerBiome(Biomes.extremeHillsNew); + GameRegistry.removeBiome(BiomeGenBase.extremeHills); + } + else + GameRegistry.removeBiome(BiomeGenBase.extremeHills); + + if (BOPConfiguration.forestGen) + if (BOPConfiguration.vanillaEnhanced) + { + registerBiome(Biomes.forestNew); + GameRegistry.removeBiome(BiomeGenBase.forest); + } + else + GameRegistry.removeBiome(BiomeGenBase.forest); + + if (BOPConfiguration.taigaGen) + if (BOPConfiguration.vanillaEnhanced) + { + registerBiome(Biomes.taigaNew); + GameRegistry.removeBiome(BiomeGenBase.taiga); + } + else + GameRegistry.removeBiome(BiomeGenBase.taiga); + + if (BOPConfiguration.swamplandGen) + if (BOPConfiguration.vanillaEnhanced) + { + registerBiome(Biomes.swamplandNew); + GameRegistry.removeBiome(BiomeGenBase.swampland); + } + else + GameRegistry.removeBiome(BiomeGenBase.swampland); + + if (BOPConfiguration.jungleGen) + if (BOPConfiguration.vanillaEnhanced) + { + registerBiome(Biomes.jungleNew); + GameRegistry.removeBiome(BiomeGenBase.jungle); + } + else + GameRegistry.removeBiome(BiomeGenBase.jungle); + } } private static void addSpawnBiome(Optional biome) diff --git a/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java b/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java index 483c320ae..f4217b455 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java +++ b/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java @@ -4,8 +4,6 @@ import java.io.File; import java.util.logging.Level; import net.minecraftforge.common.Configuration; -import biomesoplenty.BiomesOPlenty; -import biomesoplenty.ClientProxy; import cpw.mods.fml.common.FMLLog; public class BOPConfiguration { @@ -18,6 +16,7 @@ public class BOPConfiguration { public static boolean addToDefault; public static boolean achievements; public static boolean vanillaEnhanced; + public static int promisedLandDimID; public static boolean alpsGen; @@ -93,8 +92,7 @@ public class BOPConfiguration { public static boolean wetlandGen; public static boolean woodlandGen; - public static boolean oceanGen; - + // Vanilla biomes public static boolean plainsGen; public static boolean desertGen; public static boolean extremeHillsGen; @@ -173,24 +171,15 @@ public class BOPConfiguration { public static int colourizedLeavesID; public static int shroomPowderID; - public static int mudBallID; - public static int mudBrickID; - public static int cattailItemID; - public static int bambooItemID; - public static int barleyItemID; - public static int shortGrassItemID; - public static int mediumGrassItemID; - public static int bushItemID; - public static int sproutItemID; - public static int mossItemID; - public static int ashesID; + public static int ancientStaffID; - public static int ancientStaffHandleID; - public static int ancientStaffPoleID; - public static int ancientStaffTopperID; public static int enderporterID; + public static int bopDiscID; public static int bopDiscMudID; + + public static int miscItemsID; + public static int swordMudID; public static int shovelMudID; public static int pickaxeMudID; @@ -200,7 +189,8 @@ public class BOPConfiguration { public static int chestplateMudID; public static int leggingsMudID; public static int bootsMudID; - public static int amethystID; + + public static int swordAmethystID; public static int shovelAmethystID; public static int pickaxeAmethystID; @@ -313,8 +303,6 @@ public class BOPConfiguration { public static void init(File configFile) { - boolean isClient = BiomesOPlenty.proxy instanceof ClientProxy; - config = new Configuration(configFile); try @@ -323,18 +311,11 @@ public class BOPConfiguration { skyColors = true; biomeSize = config.get("Biome Settings", "Biome Size", 4, null).getInt(); - achievements = config.get("Achievement Settings", "Add Biomes O Plenty Achievemnets", true).getBoolean(false); + achievements = config.get("Achievement Settings", "Add Biomes O\' Plenty Achievements", true).getBoolean(false); vanillaEnhanced = config.get("Biome Settings", "Enhanced Vanilla Biomes", true).getBoolean(false); promisedLandDimID = config.get("Dimension Settings", "Promised Land Dimension ID", 20, null).getInt(); - if (!isClient) - { - addToDefault = config.get("Biome Settings", "Add Biomes To Default World", true).getBoolean(false); - } - else - { - addToDefault = config.get("Biome Settings", "Add Biomes To Default World", false).getBoolean(false); - } + addToDefault = config.get("Biome Settings", "Add Biomes To Default World", true).getBoolean(true); alpsGen = config.get("Biomes To Generate", "Alps", true).getBoolean(false); arcticGen = config.get("Biomes To Generate", "Arctic", true).getBoolean(false); @@ -353,13 +334,10 @@ public class BOPConfiguration { 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); - desertGen = config.get("Biomes To Generate", "Desert", true).getBoolean(false); drylandsGen = config.get("Biomes To Generate", "Drylands", true).getBoolean(false); dunesGen = config.get("Biomes To Generate", "Dunes", true).getBoolean(false); - extremeHillsGen = config.get("Biomes To Generate", "ExtremeHills", true).getBoolean(false); fenGen = config.get("Biomes To Generate", "Fen", true).getBoolean(false); fieldGen = config.get("Biomes To Generate", "Field", true).getBoolean(false); - forestGen = config.get("Biomes To Generate", "Forest", 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); @@ -371,7 +349,6 @@ public class BOPConfiguration { iceSheetGen = config.get("Biomes To Generate", "IcySheet", true).getBoolean(false); icyHillsGen = config.get("Biomes To Generate", "IcyHills", true).getBoolean(false); jadeCliffsGen = config.get("Biomes To Generate", "JadeCliffs", true).getBoolean(false); - jungleGen = config.get("Biomes To Generate", "Jungle", 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); @@ -389,7 +366,6 @@ public class BOPConfiguration { originValleyGen = config.get("Biomes To Generate", "OriginValley", true).getBoolean(false); outbackGen = config.get("Biomes To Generate", "Outback", true).getBoolean(false); pastureGen = config.get("Biomes To Generate", "Pasture", true).getBoolean(false); - plainsGen = config.get("Biomes To Generate", "Plains", 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); @@ -403,9 +379,7 @@ public class BOPConfiguration { snowyWoodsGen = config.get("Biomes To Generate", "SnowyWoods", true).getBoolean(false); spruceWoodsGen = config.get("Biomes To Generate", "SpruceWoods", true).getBoolean(false); steppeGen = config.get("Biomes To Generate", "Steppe", true).getBoolean(false); - swamplandGen = config.get("Biomes To Generate", "Swampland", true).getBoolean(false); swampwoodsGen = config.get("Biomes To Generate", "Swampwoods", true).getBoolean(false); - taigaGen = config.get("Biomes To Generate", "Taiga", true).getBoolean(false); temperateRainforestGen = config.get("Biomes To Generate", "TemperateRainforest", true).getBoolean(false); thicketGen = config.get("Biomes To Generate", "Thicket", true).getBoolean(false); tropicalRainforestGen = config.get("Biomes To Generate", "TropicalRainforest", true).getBoolean(false); @@ -416,7 +390,14 @@ public class BOPConfiguration { wetlandGen = config.get("Biomes To Generate", "Wetland", true).getBoolean(false); woodlandGen = config.get("Biomes To Generate", "Woodland", true).getBoolean(false); - oceanGen = config.get("Vanilla Biomes To Generate", "Ocean", true).getBoolean(false); + // Vanilla biomes + desertGen = config.get("Vanilla Biomes To Generate", "Desert", true).getBoolean(true); + extremeHillsGen = config.get("Vanilla Biomes To Generate", "ExtremeHills", true).getBoolean(true); + forestGen = config.get("Vanilla Biomes To Generate", "Forest", true).getBoolean(true); + jungleGen = config.get("Vanilla Biomes To Generate", "Jungle", true).getBoolean(true); + plainsGen = config.get("Vanilla Biomes To Generate", "Plains", true).getBoolean(true); + swamplandGen = config.get("Vanilla Biomes To Generate", "Swampland", true).getBoolean(true); + taigaGen = config.get("Vanilla Biomes To Generate", "Taiga", true).getBoolean(true); // Get Terrain Block ID's mudID = config.getTerrainBlock("Terrain Block IDs", "Mud ID", 160, null).getInt(); @@ -490,44 +471,35 @@ public class BOPConfiguration { colourizedLeavesID = config.getBlock("Colourized Leaves ID", 1962, null).getInt(); // Get Item ID's - shroomPowderID = config.getItem("Shroom Powder ID", 1001, null).getInt(); - mudBallID = config.getItem("Mud Ball ID", 1002, null).getInt(); - mudBrickID = config.getItem("Mud Brick ID", 1003, null).getInt(); - bambooItemID = config.getItem("Bamboo ID", 1004).getInt(); - cattailItemID = config.getItem("Cattail ID", 1005).getInt(); - ancientStaffID = config.getItem("Ancient Staff ID", 1006).getInt(); - enderporterID = config.getItem("Enderporter ID", 1007).getInt(); - ashesID = config.getItem("Pile of Ashes ID", 1008, null).getInt(); - barleyItemID = config.getItem("Barley ID", 1009).getInt(); - amethystID = config.getItem("Amethyst ID", 1010).getInt(); - ancientStaffHandleID = config.getItem("Ancient Staff Handle ID", 1011, null).getInt(); - ancientStaffPoleID = config.getItem("Ancient Staff Pole ID", 1012, null).getInt(); - ancientStaffTopperID = config.getItem("Ancient Staff Topper ID", 1013, null).getInt(); - shortGrassItemID = config.getItem("Short Grass (Item) ID", 1014, null).getInt(); - mediumGrassItemID = config.getItem("Medium Grass (Item) ID", 1015, null).getInt(); - bushItemID = config.getItem("Bush (Item) ID", 1016, null).getInt(); - sproutItemID = config.getItem("Sprout (Item) ID", 1017, null).getInt(); - mossItemID = config.getItem("Moss (Item) ID", 1018, null).getInt(); - bopDiscID = config.getItem("Traversia Music Disc ID", 1019, null).getInt(); - bopDiscMudID = config.getItem("Muddy Music Disc ID", 1020, null).getInt(); - swordMudID = config.getItem("Muddy Sword ID", 1060, null).getInt(); - shovelMudID = config.getItem("Muddy Shovel ID", 1061, null).getInt(); - pickaxeMudID = config.getItem("Muddy Pickaxe ID", 1062, null).getInt(); - axeMudID = config.getItem("Muddy Axe ID", 1063, null).getInt(); - hoeMudID = config.getItem("Muddy Hoe ID", 1064, null).getInt(); - helmetMudID = config.getItem("Muddy Helmet ID", 1065, null).getInt(); - chestplateMudID = config.getItem("Muddy Chestplate ID", 1066, null).getInt(); - leggingsMudID = config.getItem("Muddy Leggings ID", 1067, null).getInt(); - bootsMudID = config.getItem("Muddy Boots ID", 1068, null).getInt(); - swordAmethystID = config.getItem("Amethyst Sword ID", 1069, null).getInt(); - shovelAmethystID = config.getItem("Amethyst Shovel ID", 1070, null).getInt(); - pickaxeAmethystID = config.getItem("Amethyst Pickaxe ID", 1071, null).getInt(); - axeAmethystID = config.getItem("Amethyst Axe ID", 1072, null).getInt(); - hoeAmethystID = config.getItem("Amethyst Hoe ID", 1073, null).getInt(); - helmetAmethystID = config.getItem("Amethyst Helmet ID", 1074, null).getInt(); - chestplateAmethystID = config.getItem("Amethyst Chestplate ID", 1075, null).getInt(); - leggingsAmethystID = config.getItem("Amethyst Leggings ID", 1076, null).getInt(); - bootsAmethystID = config.getItem("Amethyst Boots ID", 1077, null).getInt(); + shroomPowderID = config.getItem("Shroom Powder ID", 21001, 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(); + + 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(); //Mob IDs jungleSpiderID = config.get("Mob IDs", "Jungle Spider ID", 101, null).getInt(); diff --git a/src/minecraft/biomesoplenty/configuration/BOPItems.java b/src/minecraft/biomesoplenty/configuration/BOPItems.java index b29700bcc..6203cdeb3 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPItems.java +++ b/src/minecraft/biomesoplenty/configuration/BOPItems.java @@ -100,7 +100,7 @@ public class BOPItems { { // Item declaration Items.shroomPowder = Optional.of(new ItemShroomPowder(BOPConfiguration.shroomPowderID, 1, 0.5F, false)); - Items.miscItems = Optional.of(new ItemBOP(BOPConfiguration.amethystID)); + Items.miscItems = Optional.of(new ItemBOP(BOPConfiguration.miscItemsID)); Items.ancientStaff = Optional.of(new ItemBOPAncientStaff(BOPConfiguration.ancientStaffID)); diff --git a/src/minecraft/biomesoplenty/worldtype/WTBiomesOP.java b/src/minecraft/biomesoplenty/worldtype/WTBiomesOP.java index 07105de0b..75d16763f 100644 --- a/src/minecraft/biomesoplenty/worldtype/WTBiomesOP.java +++ b/src/minecraft/biomesoplenty/worldtype/WTBiomesOP.java @@ -19,10 +19,6 @@ public class WTBiomesOP extends WorldTypeBase this.removeBiome(BiomeGenBase.taiga); this.removeBiome(BiomeGenBase.swampland); this.removeBiome(BiomeGenBase.jungle); - if (BOPConfiguration.oceanGen) - { - this.removeBiome(BiomeGenBase.ocean); - } if (BOPConfiguration.alpsGen == true) { diff --git a/src/minecraft/biomesoplenty/worldtype/WorldTypeBase.java b/src/minecraft/biomesoplenty/worldtype/WorldTypeBase.java index a6ccd6eca..db19ec6f2 100644 --- a/src/minecraft/biomesoplenty/worldtype/WorldTypeBase.java +++ b/src/minecraft/biomesoplenty/worldtype/WorldTypeBase.java @@ -1,6 +1,5 @@ package biomesoplenty.worldtype; -import biomesoplenty.configuration.BOPConfiguration; import net.minecraft.world.World; import net.minecraft.world.WorldType; import net.minecraft.world.biome.BiomeGenBase; @@ -33,9 +32,5 @@ public class WorldTypeBase extends WorldType this.removeBiome(BiomeGenBase.taiga); this.removeBiome(BiomeGenBase.swampland); this.removeBiome(BiomeGenBase.jungle); - if (BOPConfiguration.oceanGen) - { - this.removeBiome(BiomeGenBase.ocean); - } } }