From 794b53ae553f5aaf60a23cc1d104d98e700958c8 Mon Sep 17 00:00:00 2001 From: Amnet Date: Tue, 9 Apr 2013 23:26:24 +0200 Subject: [PATCH] Beginnings of an API - Biomes done --- .../tdwp_ftw/biomesop/api/Biomes.java | 89 ++ .../biomesop/declarations/BOPBiomes.java | 851 +++++++++--------- .../helpers/WorldChunkManagerPromised.java | 23 +- .../helpers/WorldProviderPromised.java | 28 +- .../tdwp_ftw/biomesop/mod_BiomesOPlenty.java | 7 +- .../biomesop/worldtype/WTBiomesOP.java | 167 ++-- .../worldtype/WorldChunkManagerBOP.java | 123 +-- 7 files changed, 706 insertions(+), 582 deletions(-) create mode 100644 src/minecraft/tdwp_ftw/biomesop/api/Biomes.java diff --git a/src/minecraft/tdwp_ftw/biomesop/api/Biomes.java b/src/minecraft/tdwp_ftw/biomesop/api/Biomes.java new file mode 100644 index 000000000..e6001947e --- /dev/null +++ b/src/minecraft/tdwp_ftw/biomesop/api/Biomes.java @@ -0,0 +1,89 @@ +package tdwp_ftw.biomesop.api; + +import net.minecraft.world.biome.BiomeGenBase; + +import com.google.common.base.Optional; + +public class Biomes +{ + public static Optional alps = Optional.absent(); + public static Optional arctic = Optional.absent(); + public static Optional badlands = Optional.absent(); + public static Optional bambooForest = Optional.absent(); + public static Optional bayou = Optional.absent(); + public static Optional birchForest = Optional.absent(); + public static Optional bog = Optional.absent(); + public static Optional borealForest = Optional.absent(); + public static Optional canyon = Optional.absent(); + public static Optional chaparral = Optional.absent(); + public static Optional cherryBlossomGrove = Optional.absent(); + public static Optional coniferousForest = Optional.absent(); + public static Optional crag = Optional.absent(); + public static Optional deadForest = Optional.absent(); + public static Optional deadSwamp = Optional.absent(); + public static Optional deadlands = Optional.absent(); + public static Optional deciduousForest = Optional.absent(); + public static Optional drylands = Optional.absent(); + public static Optional dunes = Optional.absent(); + public static Optional fen = Optional.absent(); + public static Optional field = Optional.absent(); + public static Optional frostForest = Optional.absent(); + public static Optional fungiForest = Optional.absent(); + public static Optional garden = Optional.absent(); + public static Optional glacier = Optional.absent(); + public static Optional grassland = Optional.absent(); + public static Optional grove = Optional.absent(); + public static Optional heathland = Optional.absent(); + public static Optional highland = Optional.absent(); + public static Optional iceSheet = Optional.absent(); + public static Optional icyHills = Optional.absent(); + public static Optional jadeCliffs = Optional.absent(); + public static Optional lushDesert = Optional.absent(); + public static Optional lushSwamp = Optional.absent(); + public static Optional mangrove = Optional.absent(); + public static Optional mapleWoods = Optional.absent(); + public static Optional marsh = Optional.absent(); + public static Optional meadow = Optional.absent(); + public static Optional mesa = Optional.absent(); + public static Optional moor = Optional.absent(); + public static Optional mountain = Optional.absent(); + public static Optional mysticGrove = Optional.absent(); + public static Optional oasis = Optional.absent(); + public static Optional ominousWoods = Optional.absent(); + public static Optional orchard = Optional.absent(); + public static Optional originValley = Optional.absent(); + public static Optional outback = Optional.absent(); + public static Optional pasture = Optional.absent(); + public static Optional prairie = Optional.absent(); + public static Optional promisedLand = Optional.absent(); + public static Optional quagmire = Optional.absent(); + public static Optional rainforest = Optional.absent(); + public static Optional redwoodForest = Optional.absent(); + public static Optional sacredSprings = Optional.absent(); + public static Optional savanna = Optional.absent(); + public static Optional scrubland = Optional.absent(); + public static Optional seasonalForest = Optional.absent(); + public static Optional shield = Optional.absent(); + public static Optional shore = Optional.absent(); + public static Optional shrubland = Optional.absent(); + public static Optional snowyWoods = Optional.absent(); + public static Optional spruceWoods = Optional.absent(); + public static Optional steppe = Optional.absent(); + public static Optional swampwoods = Optional.absent(); + public static Optional temperateRainforest = Optional.absent(); + public static Optional thicket = Optional.absent(); + public static Optional tropicalRainforest = Optional.absent(); + public static Optional tropics = Optional.absent(); + public static Optional tundra = Optional.absent(); + public static Optional volcano = Optional.absent(); + public static Optional wasteland = Optional.absent(); + public static Optional wetland = Optional.absent(); + public static Optional woodland = Optional.absent(); + public static Optional plainsNew = Optional.absent(); + public static Optional desertNew = Optional.absent(); + public static Optional extremeHillsNew = Optional.absent(); + public static Optional forestNew = Optional.absent(); + public static Optional taigaNew = Optional.absent(); + public static Optional swamplandNew = Optional.absent(); + public static Optional jungleNew = Optional.absent(); +} diff --git a/src/minecraft/tdwp_ftw/biomesop/declarations/BOPBiomes.java b/src/minecraft/tdwp_ftw/biomesop/declarations/BOPBiomes.java index ab47586c0..7d5d422a3 100644 --- a/src/minecraft/tdwp_ftw/biomesop/declarations/BOPBiomes.java +++ b/src/minecraft/tdwp_ftw/biomesop/declarations/BOPBiomes.java @@ -2,7 +2,7 @@ package tdwp_ftw.biomesop.declarations; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.BiomeManager; -import tdwp_ftw.biomesop.mod_BiomesOPlenty; +import tdwp_ftw.biomesop.api.Biomes; import tdwp_ftw.biomesop.biomes.BiomeGenAlps; import tdwp_ftw.biomesop.biomes.BiomeGenArctic; import tdwp_ftw.biomesop.biomes.BiomeGenBadlands; @@ -84,177 +84,180 @@ import tdwp_ftw.biomesop.biomes.BiomeGenWasteland; import tdwp_ftw.biomesop.biomes.BiomeGenWetland; import tdwp_ftw.biomesop.biomes.BiomeGenWoodland; import tdwp_ftw.biomesop.worldtype.WTBiomesOP; + +import com.google.common.base.Optional; + import cpw.mods.fml.common.registry.GameRegistry; public class BOPBiomes { // Biome declaration - public static BiomeGenBase alps; - public static BiomeGenBase arctic; - public static BiomeGenBase badlands; - public static BiomeGenBase bambooForest; - public static BiomeGenBase bayou; - public static BiomeGenBase birchForest; - public static BiomeGenBase bog; - public static BiomeGenBase borealForest; - public static BiomeGenBase canyon; - public static BiomeGenBase chaparral; - public static BiomeGenBase cherryBlossomGrove; - public static BiomeGenBase coniferousForest; - public static BiomeGenBase crag; - public static BiomeGenBase deadForest; - public static BiomeGenBase deadSwamp; - public static BiomeGenBase deadlands; - public static BiomeGenBase deciduousForest; - public static BiomeGenBase drylands; - public static BiomeGenBase dunes; - public static BiomeGenBase fen; - public static BiomeGenBase field; - public static BiomeGenBase frostForest; - public static BiomeGenBase fungiForest; - public static BiomeGenBase garden; - public static BiomeGenBase glacier; - public static BiomeGenBase grassland; - public static BiomeGenBase grove; - public static BiomeGenBase heathland; - public static BiomeGenBase highland; - public static BiomeGenBase iceSheet; - public static BiomeGenBase icyHills; - public static BiomeGenBase jadeCliffs; - public static BiomeGenBase lushDesert; - public static BiomeGenBase lushSwamp; - public static BiomeGenBase mangrove; - public static BiomeGenBase mapleWoods; - public static BiomeGenBase marsh; - public static BiomeGenBase meadow; - public static BiomeGenBase mesa; - public static BiomeGenBase moor; - public static BiomeGenBase mountain; - public static BiomeGenBase mysticGrove; - public static BiomeGenBase oasis; - public static BiomeGenBase ominousWoods; - public static BiomeGenBase orchard; - public static BiomeGenBase originValley; - public static BiomeGenBase outback; - public static BiomeGenBase pasture; - public static BiomeGenBase prairie; - public static BiomeGenBase promisedLand; - public static BiomeGenBase quagmire; - public static BiomeGenBase rainforest; - public static BiomeGenBase redwoodForest; - public static BiomeGenBase sacredSprings; - public static BiomeGenBase savanna; - public static BiomeGenBase scrubland; - public static BiomeGenBase seasonalForest; - public static BiomeGenBase shield; - public static BiomeGenBase shore; - public static BiomeGenBase shrubland; - public static BiomeGenBase snowyWoods; - public static BiomeGenBase spruceWoods; - public static BiomeGenBase steppe; - public static BiomeGenBase swampwoods; - public static BiomeGenBase temperateRainforest; - public static BiomeGenBase thicket; - public static BiomeGenBase tropicalRainforest; - public static BiomeGenBase tropics; - public static BiomeGenBase tundra; - public static BiomeGenBase volcano; - public static BiomeGenBase wasteland; - public static BiomeGenBase wetland; - public static BiomeGenBase woodland; - public static BiomeGenBase plainsNew; - public static BiomeGenBase desertNew; - public static BiomeGenBase extremeHillsNew; - public static BiomeGenBase forestNew; - public static BiomeGenBase taigaNew; - public static BiomeGenBase swamplandNew; - public static BiomeGenBase jungleNew; +// public static BiomeGenBase alps; +// public static BiomeGenBase arctic; +// public static BiomeGenBase badlands; +// public static BiomeGenBase bambooForest; +// public static BiomeGenBase bayou; +// public static BiomeGenBase birchForest; +// public static BiomeGenBase bog; +// public static BiomeGenBase borealForest; +// public static BiomeGenBase canyon; +// public static BiomeGenBase chaparral; +// public static BiomeGenBase cherryBlossomGrove; +// public static BiomeGenBase coniferousForest; +// public static BiomeGenBase crag; +// public static BiomeGenBase deadForest; +// public static BiomeGenBase deadSwamp; +// public static BiomeGenBase deadlands; +// public static BiomeGenBase deciduousForest; +// public static BiomeGenBase drylands; +// public static BiomeGenBase dunes; +// public static BiomeGenBase fen; +// public static BiomeGenBase field; +// public static BiomeGenBase frostForest; +// public static BiomeGenBase fungiForest; +// public static BiomeGenBase garden; +// public static BiomeGenBase glacier; +// public static BiomeGenBase grassland; +// public static BiomeGenBase grove; +// public static BiomeGenBase heathland; +// public static BiomeGenBase highland; +// public static BiomeGenBase iceSheet; +// public static BiomeGenBase icyHills; +// public static BiomeGenBase jadeCliffs; +// public static BiomeGenBase lushDesert; +// public static BiomeGenBase lushSwamp; +// public static BiomeGenBase mangrove; +// public static BiomeGenBase mapleWoods; +// public static BiomeGenBase marsh; +// public static BiomeGenBase meadow; +// public static BiomeGenBase mesa; +// public static BiomeGenBase moor; +// public static BiomeGenBase mountain; +// public static BiomeGenBase mysticGrove; +// public static BiomeGenBase oasis; +// public static BiomeGenBase ominousWoods; +// public static BiomeGenBase orchard; +// public static BiomeGenBase originValley; +// public static BiomeGenBase outback; +// public static BiomeGenBase pasture; +// public static BiomeGenBase prairie; +// public static BiomeGenBase promisedLand; +// public static BiomeGenBase quagmire; +// public static BiomeGenBase rainforest; +// public static BiomeGenBase redwoodForest; +// public static BiomeGenBase sacredSprings; +// public static BiomeGenBase savanna; +// public static BiomeGenBase scrubland; +// public static BiomeGenBase seasonalForest; +// public static BiomeGenBase shield; +// public static BiomeGenBase shore; +// public static BiomeGenBase shrubland; +// public static BiomeGenBase snowyWoods; +// public static BiomeGenBase spruceWoods; +// public static BiomeGenBase steppe; +// public static BiomeGenBase swampwoods; +// public static BiomeGenBase temperateRainforest; +// public static BiomeGenBase thicket; +// public static BiomeGenBase tropicalRainforest; +// public static BiomeGenBase tropics; +// public static BiomeGenBase tundra; +// public static BiomeGenBase volcano; +// public static BiomeGenBase wasteland; +// public static BiomeGenBase wetland; +// public static BiomeGenBase woodland; +// public static BiomeGenBase plainsNew; +// public static BiomeGenBase desertNew; +// public static BiomeGenBase extremeHillsNew; +// public static BiomeGenBase forestNew; +// public static BiomeGenBase taigaNew; +// public static BiomeGenBase swamplandNew; +// public static BiomeGenBase jungleNew; public static WTBiomesOP WTBiomesOP; public static void init() { // Initialize biomes - alps = (new BiomeGenAlps(BOPConfiguration.alpsID)).setColor(353825).setBiomeName("Alps").func_76733_a(5159473).setTemperatureRainfall(0.0F, 0.0F).setMinMaxHeight(5.0F, 5.0F); - arctic = (new BiomeGenArctic(BOPConfiguration.arcticID)).setColor(14090235).setBiomeName("Arctic").setTemperatureRainfall(0.0F, 0.0F).setMinMaxHeight(0.1F, 0.7F); - badlands = (new BiomeGenBadlands(BOPConfiguration.badlandsID)).setColor(16421912).setBiomeName("Badlands").setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.3F, 0.9F); - bambooForest = (new BiomeGenBambooForest(BOPConfiguration.bambooForestID)).setColor(112).setBiomeName("Bamboo Forest").setMinMaxHeight(0.0F, 0.3F); - bayou = (new BiomeGenBayou(BOPConfiguration.bayouID)).setColor(522674).setBiomeName("Bayou").func_76733_a(9154376).setMinMaxHeight(-0.3F, 0.2F); - birchForest = (new BiomeGenBirchForest(BOPConfiguration.birchForestID)).setColor(353825).setBiomeName("Birch Forest").func_76733_a(5159473).setTemperatureRainfall(0.4F, 0.3F); - bog = (new BiomeGenBog(BOPConfiguration.bogID)).setColor(522674).setBiomeName("Bog").func_76733_a(9154376).setMinMaxHeight(-0.3F, -0.1F).setTemperatureRainfall(0.8F, 0.9F); - borealForest = (new BiomeGenBorealForest(BOPConfiguration.borealForestID)).setColor(353825).setBiomeName("Boreal Forest").func_76733_a(5159473).setMinMaxHeight(0.0F, 1.0F).setTemperatureRainfall(0.6F, 0.7F); - canyon = (new BiomeGenCanyon(BOPConfiguration.canyonID)).setColor(9286496).setBiomeName("Canyon").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(3.0F, 5.0F); - chaparral = (new BiomeGenChaparral(BOPConfiguration.chaparralID)).setColor(9286496).setBiomeName("Chaparral").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.3F, 0.6F); - cherryBlossomGrove = (new BiomeGenCherryBlossomGrove(BOPConfiguration.cherryBlossomGroveID)).setColor(9286496).setBiomeName("Cherry Blossom Grove").setMinMaxHeight(0.1F, 0.2F); - coniferousForest = (new BiomeGenConiferousForest(BOPConfiguration.coniferousForestID)).setColor(747097).setBiomeName("Coniferous Forest").func_76733_a(5159473).setTemperatureRainfall(0.3F, 0.4F).setMinMaxHeight(0.1F, 0.8F); - crag = (new BiomeGenCrag(BOPConfiguration.cragID)).setColor(9286496).setBiomeName("Crag").setMinMaxHeight(0.0F, 9.9F); - deadForest = (new BiomeGenDeadForest(BOPConfiguration.deadForestID)).setColor(522674).setBiomeName("Dead Forest").func_76733_a(9154376).setMinMaxHeight(0.2F, 0.7F); - deadSwamp = (new BiomeGenDeadSwamp(BOPConfiguration.deadSwampID)).setColor(522674).setBiomeName("Dead Swamp").func_76733_a(9154376).setMinMaxHeight(-0.2F, 0.1F).setTemperatureRainfall(0.8F, 0.9F); - deadlands = (new BiomeGenDeadlands(BOPConfiguration.deadlandsID)).setColor(522674).setBiomeName("Deadlands").setDisableRain().func_76733_a(9154376).setMinMaxHeight(0.1F, 0.5F); - deciduousForest = (new BiomeGenDeciduousForest(BOPConfiguration.deciduousForestID)).setColor(353825).setBiomeName("Deciduous Forest").func_76733_a(5159473); - drylands = (new BiomeGenDrylands(BOPConfiguration.drylandsID)).setColor(16421912).setBiomeName("Drylands").setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.0F, 0.5F); - dunes = (new BiomeGenDunes(BOPConfiguration.dunesID)).setColor(13786898).setBiomeName("Dunes").setDisableRain().setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.5F, 1.3F); - fen = (new BiomeGenFen(BOPConfiguration.fenID)).setColor(9286496).setBiomeName("Fen").setTemperatureRainfall(0.4F, 0.0F).setMinMaxHeight(-0.2F, 0.1F); - field = (new BiomeGenField(BOPConfiguration.fieldID)).setColor(9286496).setBiomeName("Field").setTemperatureRainfall(0.4F, 0.8F).setMinMaxHeight(0.0F, 0.1F); - frostForest = (new BiomeGenFrostForest(BOPConfiguration.frostForestID)).setColor(14090235).setBiomeName("Frost Forest").setEnableSnow().setTemperatureRainfall(0.0F, 0.0F).setMinMaxHeight(0.1F, 0.4F); - fungiForest = (new BiomeGenFungiForest(BOPConfiguration.fungiForestID)).setColor(747097).setBiomeName("Fungi Forest").func_76733_a(5159473).setTemperatureRainfall(0.9F, 1.0F).setMinMaxHeight(0.0F, 0.4F); - garden = (new BiomeGenGarden(BOPConfiguration.gardenID)).setColor(9286496).setBiomeName("Garden").setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(0.1F, 0.2F); - glacier = (new BiomeGenGlacier(BOPConfiguration.glacierID)).setColor(6316128).setBiomeName("Glacier").setEnableSnow().setMinMaxHeight(0.4F, 1.0F).setTemperatureRainfall(0.0F, 0.0F); - grassland = (new BiomeGenGrassland(BOPConfiguration.grasslandID)).setColor(9286496).setBiomeName("Grassland").setTemperatureRainfall(0.7F, 0.7F).setMinMaxHeight(0.2F, 0.2F); - grove = (new BiomeGenGrove(BOPConfiguration.groveID)).setColor(9286496).setBiomeName("Grove").setTemperatureRainfall(0.4F, 0.8F).setMinMaxHeight(0.0F, 0.1F); - heathland = (new BiomeGenHeathland(BOPConfiguration.heathlandID)).setColor(353825).setBiomeName("Heathland").func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.1F).setMinMaxHeight(0.1F, 0.3F); - highland = (new BiomeGenHighland(BOPConfiguration.highlandID)).setColor(6316128).setBiomeName("Highland").setMinMaxHeight(0.9F, 1.9F).setTemperatureRainfall(0.5F, 0.5F); - iceSheet = (new BiomeGenIceSheet(BOPConfiguration.iceSheetID)).setColor(6316128).setBiomeName("Ice Sheet").setEnableSnow().setMinMaxHeight(0.1F, 0.2F).setTemperatureRainfall(0.0F, 0.0F); - icyHills = (new BiomeGenIcyHills(BOPConfiguration.icyHillsID)).setColor(14090235).setBiomeName("Icy Hills").setEnableSnow().setTemperatureRainfall(0.0F, 0.0F).setMinMaxHeight(-0.2F, 0.5F); - jadeCliffs = (new BiomeGenJadeCliffs(BOPConfiguration.jadeCliffsID)).setColor(14090235).setBiomeName("Jade Cliffs").setTemperatureRainfall(0.5F, 0.1F).setMinMaxHeight(0.1F, 2.0F); - lushDesert = (new BiomeGenLushDesert(BOPConfiguration.lushDesertID)).setColor(16421912).setBiomeName("Lush Desert").setTemperatureRainfall(0.8F, 0.3F).setMinMaxHeight(0.2F, 0.8F); - lushSwamp = (new BiomeGenLushSwamp(BOPConfiguration.lushSwampID)).setColor(522674).setBiomeName("Lush Swamp").func_76733_a(9154376).setMinMaxHeight(-0.2F, 0.1F).setTemperatureRainfall(0.7F, 1.0F); - mangrove = (new BiomeGenMangrove(BOPConfiguration.mangroveID)).setColor(16440917).setBiomeName("Mangrove").setMinMaxHeight(-0.4F, -0.1F); - mapleWoods = (new BiomeGenMapleWoods(BOPConfiguration.mapleWoodsID)).setColor(747097).setBiomeName("Maple Woods").func_76733_a(5159473).setTemperatureRainfall(0.2F, 0.8F).setMinMaxHeight(0.1F, 0.6F); - marsh = (new BiomeGenMarsh(BOPConfiguration.marshID)).setColor(10486015).setBiomeName("Marsh").setMinMaxHeight(-0.5F, 0.0F); - meadow = (new BiomeGenMeadow(BOPConfiguration.meadowID)).setColor(9286496).setBiomeName("Meadow").setTemperatureRainfall(0.7F, 0.7F); - mesa = (new BiomeGenMesa(BOPConfiguration.mesaID)).setColor(16421912).setBiomeName("Mesa").setDisableRain().setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.8F, 1.0F); - moor = (new BiomeGenMoor(BOPConfiguration.moorID)).setColor(16421912).setBiomeName("Moor").setTemperatureRainfall(0.5F, 1.0F).setMinMaxHeight(0.7F, 0.8F); - mountain = (new BiomeGenMountain(BOPConfiguration.mountainID)).setColor(14090235).setBiomeName("Mountain").setTemperatureRainfall(0.5F, 0.1F).setMinMaxHeight(1.2F, 1.2F); - mysticGrove = (new BiomeGenMysticGrove(BOPConfiguration.mysticGroveID)).setColor(353825).setBiomeName("Mystic Grove").setDisableRain().func_76733_a(5159473).setTemperatureRainfall(0.9F, 1.0F); - oasis = (new BiomeGenOasis(BOPConfiguration.oasisID)).setColor(16421912).setBiomeName("Oasis").setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.1F, 0.2F); - ominousWoods = (new BiomeGenOminousWoods(BOPConfiguration.ominousWoodsID)).setColor(353825).setBiomeName("Ominous Woods").setDisableRain().func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.9F); - orchard = (new BiomeGenOrchard(BOPConfiguration.orchardID)).setColor(9286496).setBiomeName("Orchard").setTemperatureRainfall(0.8F, 0.4F); - originValley = (new BiomeGenOriginValley(BOPConfiguration.originValleyID)).setColor(353825).setBiomeName("Origin Valley").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(-0.1F, 0.6F); - outback = (new BiomeGenOutback(BOPConfiguration.outbackID)).setColor(9286496).setBiomeName("Outback").setTemperatureRainfall(0.8F, 0.0F).setMinMaxHeight(0.1F, 0.1F); - pasture = (new BiomeGenPasture(BOPConfiguration.pastureID)).setColor(9286496).setBiomeName("Pasture").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.1F, 0.2F); - prairie = (new BiomeGenPrairie(BOPConfiguration.prairieID)).setColor(353825).setBiomeName("Prairie").func_76733_a(5159473).setTemperatureRainfall(0.9F, 0.6F).setMinMaxHeight(0.1F, 0.1F); - promisedLand = (new BiomeGenPromisedLand(BOPConfiguration.promisedLandID)).setColor(112).setBiomeName("Promised Land").setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.1F, 2.0F); - quagmire = (new BiomeGenQuagmire(BOPConfiguration.quagmireID)).setColor(522674).setBiomeName("Quagmire").func_76733_a(9154376).setMinMaxHeight(-0.1F, 0.3F).setTemperatureRainfall(0.8F, 0.9F); - rainforest = (new BiomeGenRainforest(BOPConfiguration.rainforestID)).setColor(5470985).setBiomeName("Rainforest").func_76733_a(5470985).setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.7F, 1.8F); - redwoodForest = (new BiomeGenRedwoodForest(BOPConfiguration.redwoodForestID)).setColor(747097).setBiomeName("Redwood Forest").func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.0F, 0.4F); - sacredSprings = (new BiomeGenSacredSprings(BOPConfiguration.sacredSpringsID)).setColor(522674).setBiomeName("Sacred Springs").func_76733_a(9154376).setMinMaxHeight(0.0F, 1.2F).setTemperatureRainfall(0.8F, 0.9F); - savanna = (new BiomeGenSavanna(BOPConfiguration.savannaID)).setColor(9286496).setBiomeName("Savanna").setTemperatureRainfall(2.0F, 0.1F).setMinMaxHeight(0.1F, 0.1F); - scrubland = (new BiomeGenScrubland(BOPConfiguration.scrublandID)).setColor(9286496).setBiomeName("Scrubland").setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.1F, 0.3F); - seasonalForest = (new BiomeGenSeasonalForest(BOPConfiguration.seasonalForestID)).setColor(353825).setBiomeName("Seasonal Forest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(0.2F, 0.7F); - shield = (new BiomeGenShield(BOPConfiguration.shieldID)).setColor(522674).setBiomeName("Shield").func_76733_a(9154376).setMinMaxHeight(-0.2F, 0.4F).setTemperatureRainfall(0.5F, 0.8F); - shore = (new BiomeGenShore(BOPConfiguration.shoreID)).setColor(9286496).setBiomeName("Shore").setMinMaxHeight(-1.0F, 0.4F); - shrubland = (new BiomeGenShrubland(BOPConfiguration.shrublandID)).setColor(9286496).setBiomeName("Shrubland").setMinMaxHeight(0.1F, 0.2F).setTemperatureRainfall(0.6F, 0.0F); - snowyWoods = (new BiomeGenSnowyWoods(BOPConfiguration.snowyWoodsID)).setColor(522674).setBiomeName("Snowy Woods").func_76733_a(9154376).setEnableSnow().setTemperatureRainfall(0.05F, 0.8F).setMinMaxHeight(0.2F, 0.7F); - spruceWoods = (new BiomeGenSpruceWoods(BOPConfiguration.spruceWoodsID)).setColor(353825).setBiomeName("Spruce Woods").func_76733_a(5159473).setTemperatureRainfall(0.6F, 0.7F); - steppe = (new BiomeGenSteppe(BOPConfiguration.steppeID)).setColor(9286496).setBiomeName("Steppe").setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.1F, 0.2F); - swampwoods = (new BiomeGenSwampwoods(BOPConfiguration.swampwoodsID)).setColor(522674).setBiomeName("Swampwoods").func_76733_a(9154376).setMinMaxHeight(-0.2F, 0.2F).setTemperatureRainfall(0.8F, 0.9F); - temperateRainforest = (new BiomeGenTemperateRainforest(BOPConfiguration.temperateRainforestID)).setColor(353825).setBiomeName("Temperate Rainforest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(0.2F, 1.2F); - thicket = (new BiomeGenThicket(BOPConfiguration.thicketID)).setColor(353825).setBiomeName("Thicket").func_76733_a(5159473).setTemperatureRainfall(0.6F, 0.2F).setMinMaxHeight(0.0F, 0.2F); - tropicalRainforest = (new BiomeGenTropicalRainforest(BOPConfiguration.tropicalRainforestID)).setColor(9286496).setBiomeName("Tropical Rainforest").setTemperatureRainfall(1.2F, 0.9F).setMinMaxHeight(0.3F, 0.7F); - tropics = (new BiomeGenTropics(BOPConfiguration.tropicsID)).setColor(9286496).setBiomeName("Tropics").setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.1F, 0.8F); - tundra = (new BiomeGenTundra(BOPConfiguration.tundraID)).setColor(14090235).setBiomeName("Tundra").setEnableSnow().setTemperatureRainfall(0.0F, 0.0F).setMinMaxHeight(-0.2F, 0.0F); - volcano = (new BiomeGenVolcano(BOPConfiguration.volcanoID)).setColor(9286496).setBiomeName("Volcano").setDisableRain().setMinMaxHeight(0.6F, 0.9F); - wasteland = (new BiomeGenWasteland(BOPConfiguration.wastelandID)).setColor(16421912).setBiomeName("Wasteland").setDisableRain().setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.0F, 0.0F); - wetland = (new BiomeGenWetland(BOPConfiguration.wetlandID)).setColor(522674).setBiomeName("Wetland").func_76733_a(9154376).setMinMaxHeight(-0.2F, 0.4F).setTemperatureRainfall(0.8F, 0.9F); - woodland = (new BiomeGenWoodland(BOPConfiguration.woodlandID)).setColor(353825).setBiomeName("Woodland").func_76733_a(5159473).setTemperatureRainfall(2.0F, 0.2F).setMinMaxHeight(0.1F, 0.2F); - plainsNew = (new BiomeGenPlainsNew(BOPConfiguration.plainsNewID)).setColor(9286496).setBiomeName("Plains").setTemperatureRainfall(0.8F, 0.4F); - desertNew = (new BiomeGenDesertNew(BOPConfiguration.desertNewID)).setColor(16421912).setBiomeName("Desert").setDisableRain().setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.1F, 0.2F); - extremeHillsNew = (new BiomeGenHillsNew(BOPConfiguration.extremeHillsNewID)).setColor(6316128).setBiomeName("Extreme Hills").setMinMaxHeight(0.3F, 1.5F).setTemperatureRainfall(0.2F, 0.3F); - forestNew = (new BiomeGenForestNew(BOPConfiguration.forestNewID)).setColor(353825).setBiomeName("Forest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F); - taigaNew = (new BiomeGenTaigaNew(BOPConfiguration.taigaNewID)).setColor(747097).setBiomeName("Taiga").func_76733_a(5159473).setEnableSnow().setTemperatureRainfall(0.05F, 0.8F).setMinMaxHeight(0.1F, 0.4F); - swamplandNew = (new BiomeGenSwampNew(BOPConfiguration.swamplandNewID)).setColor(522674).setBiomeName("Swampland").func_76733_a(9154376).setMinMaxHeight(-0.2F, 0.1F).setTemperatureRainfall(0.8F, 0.9F); - jungleNew = (new BiomeGenJungleNew(BOPConfiguration.jungleNewID)).setColor(5470985).setBiomeName("Jungle").func_76733_a(5470985).setTemperatureRainfall(1.2F, 0.9F).setMinMaxHeight(0.2F, 0.4F); + 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)); + Biomes.bayou = Optional.of((new BiomeGenBayou(BOPConfiguration.bayouID)).setColor(522674).setBiomeName("Bayou").func_76733_a(9154376).setMinMaxHeight(-0.3F, 0.2F)); + 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)); + 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)); + Biomes.deadForest = Optional.of((new BiomeGenDeadForest(BOPConfiguration.deadForestID)).setColor(522674).setBiomeName("Dead Forest").func_76733_a(9154376).setMinMaxHeight(0.2F, 0.7F)); + 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)); + Biomes.deciduousForest = Optional.of((new BiomeGenDeciduousForest(BOPConfiguration.deciduousForestID)).setColor(353825).setBiomeName("Deciduous Forest").func_76733_a(5159473)); + 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)); + 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)); + 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(0.8F, 0.9F)); + Biomes.savanna = Optional.of((new BiomeGenSavanna(BOPConfiguration.savannaID)).setColor(9286496).setBiomeName("Savanna").setTemperatureRainfall(2.0F, 0.1F).setMinMaxHeight(0.1F, 0.1F)); + Biomes.scrubland = Optional.of((new BiomeGenScrubland(BOPConfiguration.scrublandID)).setColor(9286496).setBiomeName("Scrubland").setTemperatureRainfall(2.0F, 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)); + 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.0F, 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)); + 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(2.0F, 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 new world type @@ -262,349 +265,349 @@ public class BOPBiomes { //Spawning - BiomeManager.addSpawnBiome(alps); - BiomeManager.addSpawnBiome(arctic); - BiomeManager.addSpawnBiome(badlands); - BiomeManager.addSpawnBiome(bambooForest); - BiomeManager.addSpawnBiome(bayou); - BiomeManager.addSpawnBiome(birchForest); - BiomeManager.addSpawnBiome(bog); - BiomeManager.addSpawnBiome(borealForest); - BiomeManager.addSpawnBiome(canyon); - BiomeManager.addSpawnBiome(chaparral); - BiomeManager.addSpawnBiome(cherryBlossomGrove); - BiomeManager.addSpawnBiome(coniferousForest); - BiomeManager.addSpawnBiome(deadForest); - BiomeManager.addSpawnBiome(deadSwamp); - BiomeManager.addSpawnBiome(deciduousForest); - BiomeManager.addSpawnBiome(drylands); - BiomeManager.addSpawnBiome(dunes); - BiomeManager.addSpawnBiome(fen); - BiomeManager.addSpawnBiome(field); - BiomeManager.addSpawnBiome(frostForest); - BiomeManager.addSpawnBiome(glacier); - BiomeManager.addSpawnBiome(grassland); - BiomeManager.addSpawnBiome(grove); - BiomeManager.addSpawnBiome(heathland); - BiomeManager.addSpawnBiome(highland); - BiomeManager.addSpawnBiome(iceSheet); - BiomeManager.addSpawnBiome(jadeCliffs); - BiomeManager.addSpawnBiome(lushDesert); - BiomeManager.addSpawnBiome(lushSwamp); - BiomeManager.addSpawnBiome(mangrove); - BiomeManager.addSpawnBiome(mapleWoods); - BiomeManager.addSpawnBiome(marsh); - BiomeManager.addSpawnBiome(meadow); - BiomeManager.addSpawnBiome(mesa); - BiomeManager.addSpawnBiome(moor); - BiomeManager.addSpawnBiome(mountain); - BiomeManager.addSpawnBiome(oasis); - BiomeManager.addSpawnBiome(orchard); - BiomeManager.addSpawnBiome(outback); - BiomeManager.addSpawnBiome(pasture); - BiomeManager.addSpawnBiome(prairie); - BiomeManager.addSpawnBiome(quagmire); - BiomeManager.addSpawnBiome(rainforest); - BiomeManager.addSpawnBiome(redwoodForest); - BiomeManager.addSpawnBiome(savanna); - BiomeManager.addSpawnBiome(scrubland); - BiomeManager.addSpawnBiome(seasonalForest); - BiomeManager.addSpawnBiome(shield); - BiomeManager.addSpawnBiome(shrubland); - BiomeManager.addSpawnBiome(snowyWoods); - BiomeManager.addSpawnBiome(spruceWoods); - BiomeManager.addSpawnBiome(swampwoods); - BiomeManager.addSpawnBiome(temperateRainforest); - BiomeManager.addSpawnBiome(thicket); - BiomeManager.addSpawnBiome(tropicalRainforest); - BiomeManager.addSpawnBiome(tropics); - BiomeManager.addSpawnBiome(tundra); - BiomeManager.addSpawnBiome(volcano); - BiomeManager.addSpawnBiome(wetland); - BiomeManager.addSpawnBiome(woodland); - BiomeManager.addSpawnBiome(plainsNew); - BiomeManager.addSpawnBiome(desertNew); - BiomeManager.addSpawnBiome(forestNew); - BiomeManager.addSpawnBiome(extremeHillsNew); - BiomeManager.addSpawnBiome(taigaNew); - BiomeManager.addSpawnBiome(swamplandNew); - BiomeManager.addSpawnBiome(jungleNew); + 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); //Village spawning - BiomeManager.addVillageBiome(arctic, true); - BiomeManager.addVillageBiome(bayou, true); - BiomeManager.addVillageBiome(birchForest, true); - BiomeManager.addVillageBiome(chaparral, true); - BiomeManager.addVillageBiome(coniferousForest, true); - BiomeManager.addVillageBiome(deadForest, true); - BiomeManager.addVillageBiome(field, true); - BiomeManager.addVillageBiome(frostForest, true); - BiomeManager.addVillageBiome(grassland, true); - BiomeManager.addVillageBiome(grove, true); - BiomeManager.addVillageBiome(heathland, true); - BiomeManager.addVillageBiome(lushSwamp, true); - BiomeManager.addVillageBiome(mapleWoods, true); - BiomeManager.addVillageBiome(orchard, true); - BiomeManager.addVillageBiome(prairie, true); - BiomeManager.addVillageBiome(redwoodForest, true); - BiomeManager.addVillageBiome(savanna, true); - BiomeManager.addVillageBiome(scrubland, true); - BiomeManager.addVillageBiome(shield, true); - BiomeManager.addVillageBiome(shrubland, true); - BiomeManager.addVillageBiome(snowyWoods, true); - BiomeManager.addVillageBiome(spruceWoods, true); - BiomeManager.addVillageBiome(tropicalRainforest, true); - BiomeManager.addVillageBiome(woodland, true); - BiomeManager.addVillageBiome(plainsNew, true); - BiomeManager.addVillageBiome(desertNew, true); - BiomeManager.addVillageBiome(forestNew, true); - BiomeManager.addVillageBiome(taigaNew, true); - BiomeManager.addVillageBiome(swamplandNew, true); + 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); //Stronghold spawning - BiomeManager.addStrongholdBiome(alps); - BiomeManager.addStrongholdBiome(arctic); - BiomeManager.addStrongholdBiome(badlands); - BiomeManager.addStrongholdBiome(bambooForest); - BiomeManager.addStrongholdBiome(bayou); - BiomeManager.addStrongholdBiome(birchForest); - BiomeManager.addStrongholdBiome(bog); - BiomeManager.addStrongholdBiome(borealForest); - BiomeManager.addStrongholdBiome(canyon); - BiomeManager.addStrongholdBiome(chaparral); - BiomeManager.addStrongholdBiome(cherryBlossomGrove); - BiomeManager.addStrongholdBiome(coniferousForest); - BiomeManager.addStrongholdBiome(crag); - BiomeManager.addStrongholdBiome(deadForest); - BiomeManager.addStrongholdBiome(deadSwamp); - BiomeManager.addStrongholdBiome(deadlands); - BiomeManager.addStrongholdBiome(deciduousForest); - BiomeManager.addStrongholdBiome(drylands); - BiomeManager.addStrongholdBiome(dunes); - BiomeManager.addStrongholdBiome(fen); - BiomeManager.addStrongholdBiome(field); - BiomeManager.addStrongholdBiome(frostForest); - BiomeManager.addStrongholdBiome(fungiForest); - BiomeManager.addStrongholdBiome(garden); - BiomeManager.addStrongholdBiome(glacier); - BiomeManager.addStrongholdBiome(grassland); - BiomeManager.addStrongholdBiome(grove); - BiomeManager.addStrongholdBiome(heathland); - BiomeManager.addStrongholdBiome(highland); - BiomeManager.addStrongholdBiome(iceSheet); - BiomeManager.addStrongholdBiome(icyHills); - BiomeManager.addStrongholdBiome(jadeCliffs); - BiomeManager.addStrongholdBiome(lushDesert); - BiomeManager.addStrongholdBiome(lushSwamp); - BiomeManager.addStrongholdBiome(mangrove); - BiomeManager.addStrongholdBiome(mapleWoods); - BiomeManager.addStrongholdBiome(marsh); - BiomeManager.addStrongholdBiome(meadow); - BiomeManager.addStrongholdBiome(mesa); - BiomeManager.addStrongholdBiome(moor); - BiomeManager.addStrongholdBiome(mountain); - BiomeManager.addStrongholdBiome(mysticGrove); - BiomeManager.addStrongholdBiome(oasis); - BiomeManager.addStrongholdBiome(ominousWoods); - BiomeManager.addStrongholdBiome(orchard); - BiomeManager.addStrongholdBiome(outback); - BiomeManager.addStrongholdBiome(pasture); - BiomeManager.addStrongholdBiome(prairie); - BiomeManager.addStrongholdBiome(quagmire); - BiomeManager.addStrongholdBiome(rainforest); - BiomeManager.addStrongholdBiome(redwoodForest); - BiomeManager.addStrongholdBiome(sacredSprings); - BiomeManager.addStrongholdBiome(savanna); - BiomeManager.addStrongholdBiome(scrubland); - BiomeManager.addStrongholdBiome(seasonalForest); - BiomeManager.addStrongholdBiome(shield); - BiomeManager.addStrongholdBiome(shrubland); - BiomeManager.addStrongholdBiome(snowyWoods); - BiomeManager.addStrongholdBiome(spruceWoods); - BiomeManager.addStrongholdBiome(steppe); - BiomeManager.addStrongholdBiome(swampwoods); - BiomeManager.addStrongholdBiome(temperateRainforest); - BiomeManager.addStrongholdBiome(thicket); - BiomeManager.addStrongholdBiome(tropicalRainforest); - BiomeManager.addStrongholdBiome(tropics); - BiomeManager.addStrongholdBiome(tundra); - BiomeManager.addStrongholdBiome(volcano); - BiomeManager.addStrongholdBiome(wasteland); - BiomeManager.addStrongholdBiome(wetland); - BiomeManager.addStrongholdBiome(woodland); - BiomeManager.addStrongholdBiome(plainsNew); - BiomeManager.addStrongholdBiome(desertNew); - BiomeManager.addStrongholdBiome(forestNew); - BiomeManager.addStrongholdBiome(extremeHillsNew); - BiomeManager.addStrongholdBiome(taigaNew); - BiomeManager.addStrongholdBiome(swamplandNew); - BiomeManager.addStrongholdBiome(jungleNew); + 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); if (BOPConfiguration.addToDefault == true) { if (BOPConfiguration.alpsGen == true) { - GameRegistry.addBiome(alps); + registerBiome(Biomes.alps); } if (BOPConfiguration.arcticGen == true) { - GameRegistry.addBiome(arctic); + registerBiome(Biomes.arctic); } if (BOPConfiguration.badlandsGen == true) { - GameRegistry.addBiome(badlands); + registerBiome(Biomes.badlands); } if (BOPConfiguration.bambooForestGen == true) { - GameRegistry.addBiome(bambooForest); + registerBiome(Biomes.bambooForest); } if (BOPConfiguration.bayouGen == true) { - GameRegistry.addBiome(bayou); + registerBiome(Biomes.bayou); } if (BOPConfiguration.birchForestGen == true) { - GameRegistry.addBiome(birchForest); + registerBiome(Biomes.birchForest); } if (BOPConfiguration.bogGen == true) { - GameRegistry.addBiome(bog); + registerBiome(Biomes.bog); } if (BOPConfiguration.borealForestGen == true) { - GameRegistry.addBiome(borealForest); + registerBiome(Biomes.borealForest); } if (BOPConfiguration.canyonGen == true) { - GameRegistry.addBiome(canyon); + registerBiome(Biomes.canyon); } if (BOPConfiguration.chaparralGen == true) { - GameRegistry.addBiome(chaparral); + registerBiome(Biomes.chaparral); } if (BOPConfiguration.cherryBlossomGroveGen == true) { - GameRegistry.addBiome(cherryBlossomGrove); + registerBiome(Biomes.cherryBlossomGrove); } if (BOPConfiguration.coniferousForestGen == true) { - GameRegistry.addBiome(coniferousForest); + registerBiome(Biomes.coniferousForest); } if (BOPConfiguration.cragGen == true) { - GameRegistry.addBiome(crag); + registerBiome(Biomes.crag); } if (BOPConfiguration.deadForestGen == true) { - GameRegistry.addBiome(deadForest); + registerBiome(Biomes.deadForest); } if (BOPConfiguration.deadSwampGen == true) { - GameRegistry.addBiome(deadSwamp); + registerBiome(Biomes.deadSwamp); } if (BOPConfiguration.deadlandsGen == true) { - GameRegistry.addBiome(deadlands); + registerBiome(Biomes.deadlands); } if (BOPConfiguration.deciduousForestGen == true) { - GameRegistry.addBiome(deciduousForest); + registerBiome(Biomes.deciduousForest); } if (BOPConfiguration.drylandsGen == true) { - GameRegistry.addBiome(drylands); + registerBiome(Biomes.drylands); } if (BOPConfiguration.dunesGen == true) { - GameRegistry.addBiome(dunes); + registerBiome(Biomes.dunes); } if (BOPConfiguration.fenGen == true) { - GameRegistry.addBiome(fen); + registerBiome(Biomes.fen); } if (BOPConfiguration.fieldGen == true) { - GameRegistry.addBiome(field); + registerBiome(Biomes.field); } if (BOPConfiguration.frostForestGen == true) { - GameRegistry.addBiome(frostForest); + registerBiome(Biomes.frostForest); } if (BOPConfiguration.fungiForestGen == true) { - GameRegistry.addBiome(fungiForest); + registerBiome(Biomes.fungiForest); } if (BOPConfiguration.gardenGen == true) { - GameRegistry.addBiome(garden); + registerBiome(Biomes.garden); } if (BOPConfiguration.glacierGen == true) { - GameRegistry.addBiome(glacier); + registerBiome(Biomes.glacier); } if (BOPConfiguration.grasslandGen == true) { - GameRegistry.addBiome(grassland); + registerBiome(Biomes.grassland); } if (BOPConfiguration.groveGen == true) { - GameRegistry.addBiome(grove); + registerBiome(Biomes.grove); } if (BOPConfiguration.heathlandGen == true) { - GameRegistry.addBiome(heathland); + registerBiome(Biomes.heathland); } if (BOPConfiguration.highlandGen == true) { - GameRegistry.addBiome(highland); + registerBiome(Biomes.highland); } if (BOPConfiguration.iceSheetGen == true) { - GameRegistry.addBiome(iceSheet); + registerBiome(Biomes.iceSheet); } if (BOPConfiguration.icyHillsGen == true) { - GameRegistry.addBiome(icyHills); + registerBiome(Biomes.icyHills); } if (BOPConfiguration.jadeCliffsGen == true) { - GameRegistry.addBiome(jadeCliffs); + registerBiome(Biomes.jadeCliffs); } if (BOPConfiguration.lushDesertGen == true) { - GameRegistry.addBiome(lushDesert); + registerBiome(Biomes.lushDesert); } if (BOPConfiguration.lushSwampGen == true) { - GameRegistry.addBiome(lushSwamp); + registerBiome(Biomes.lushSwamp); } if (BOPConfiguration.mangroveGen == true) { - GameRegistry.addBiome(mangrove); + registerBiome(Biomes.mangrove); } if (BOPConfiguration.mapleWoodsGen == true) { - GameRegistry.addBiome(mapleWoods); + registerBiome(Biomes.mapleWoods); } if (BOPConfiguration.marshGen == true) { - GameRegistry.addBiome(marsh); + registerBiome(Biomes.marsh); } if (BOPConfiguration.meadowGen == true) { - GameRegistry.addBiome(meadow); + registerBiome(Biomes.meadow); } if (BOPConfiguration.mesaGen == true) { - GameRegistry.addBiome(mesa); + registerBiome(Biomes.mesa); } if (BOPConfiguration.moorGen == true) { - GameRegistry.addBiome(moor); + registerBiome(Biomes.moor); } if (BOPConfiguration.mountainGen == true) { - GameRegistry.addBiome(mountain); + registerBiome(Biomes.mountain); } if (BOPConfiguration.mushroomIslandGen == true) { @@ -612,129 +615,129 @@ public class BOPBiomes { } if (BOPConfiguration.mysticGroveGen == true) { - GameRegistry.addBiome(mysticGrove); + registerBiome(Biomes.mysticGrove); } if (BOPConfiguration.oasisGen == true) { - GameRegistry.addBiome(oasis); + registerBiome(Biomes.oasis); } if (BOPConfiguration.ominousWoodsGen == true) { - GameRegistry.addBiome(ominousWoods); + registerBiome(Biomes.ominousWoods); } if (BOPConfiguration.orchardGen == true) { - GameRegistry.addBiome(orchard); + registerBiome(Biomes.orchard); } if (BOPConfiguration.originValleyGen == true) { - GameRegistry.addBiome(originValley); + registerBiome(Biomes.originValley); } if (BOPConfiguration.outbackGen == true) { - GameRegistry.addBiome(outback); + registerBiome(Biomes.outback); } if (BOPConfiguration.pastureGen == true) { - GameRegistry.addBiome(pasture); + registerBiome(Biomes.pasture); } if (BOPConfiguration.prairieGen == true) { - GameRegistry.addBiome(prairie); + registerBiome(Biomes.prairie); } if (BOPConfiguration.quagmireGen == true) { - GameRegistry.addBiome(quagmire); + registerBiome(Biomes.quagmire); } if (BOPConfiguration.rainforestGen == true) { - GameRegistry.addBiome(rainforest); + registerBiome(Biomes.rainforest); } if (BOPConfiguration.redwoodForestGen == true) { - GameRegistry.addBiome(redwoodForest); + registerBiome(Biomes.redwoodForest); } if (BOPConfiguration.sacredSpringsGen == true) { - GameRegistry.addBiome(sacredSprings); + registerBiome(Biomes.sacredSprings); } if (BOPConfiguration.savannaGen == true) { - GameRegistry.addBiome(savanna); + registerBiome(Biomes.savanna); } if (BOPConfiguration.scrublandGen == true) { - GameRegistry.addBiome(scrubland); + registerBiome(Biomes.scrubland); } if (BOPConfiguration.seasonalForestGen == true) { - GameRegistry.addBiome(seasonalForest); + registerBiome(Biomes.seasonalForest); } if (BOPConfiguration.shieldGen == true) { - GameRegistry.addBiome(shield); + registerBiome(Biomes.shield); } if (BOPConfiguration.shrublandGen == true) { - GameRegistry.addBiome(shrubland); + registerBiome(Biomes.shrubland); } if (BOPConfiguration.snowyWoodsGen == true) { - GameRegistry.addBiome(snowyWoods); + registerBiome(Biomes.snowyWoods); } if (BOPConfiguration.spruceWoodsGen == true) { - GameRegistry.addBiome(spruceWoods); + registerBiome(Biomes.spruceWoods); } if (BOPConfiguration.steppeGen == true) { - GameRegistry.addBiome(steppe); + registerBiome(Biomes.steppe); } if (BOPConfiguration.swampwoodsGen == true) { - GameRegistry.addBiome(swampwoods); + registerBiome(Biomes.swampwoods); } if (BOPConfiguration.temperateRainforestGen == true) { - GameRegistry.addBiome(temperateRainforest); + registerBiome(Biomes.temperateRainforest); } if (BOPConfiguration.thicketGen == true) { - GameRegistry.addBiome(thicket); + registerBiome(Biomes.thicket); } if (BOPConfiguration.tropicalRainforestGen == true) { - GameRegistry.addBiome(tropicalRainforest); + registerBiome(Biomes.tropicalRainforest); } if (BOPConfiguration.tropicsGen == true) { - GameRegistry.addBiome(tropics); + registerBiome(Biomes.tropics); } if (BOPConfiguration.tundraGen == true) { - GameRegistry.addBiome(tundra); + registerBiome(Biomes.tundra); } if (BOPConfiguration.volcanoGen == true) { - GameRegistry.addBiome(volcano); + registerBiome(Biomes.volcano); } if (BOPConfiguration.wastelandGen == true) { - GameRegistry.addBiome(wasteland); + registerBiome(Biomes.wasteland); } if (BOPConfiguration.wetlandGen == true) { - GameRegistry.addBiome(wetland); + registerBiome(Biomes.wetland); } if (BOPConfiguration.woodlandGen == true) { - GameRegistry.addBiome(woodland); + registerBiome(Biomes.woodland); } if (BOPConfiguration.plainsGen == true) { if (BOPConfiguration.vanillaEnhanced == true) { - GameRegistry.addBiome(plainsNew); + registerBiome(Biomes.plainsNew); GameRegistry.removeBiome(BiomeGenBase.plains); } } @@ -742,7 +745,7 @@ public class BOPBiomes { { if (BOPConfiguration.vanillaEnhanced == true) { - GameRegistry.addBiome(desertNew); + registerBiome(Biomes.desertNew); GameRegistry.removeBiome(BiomeGenBase.desert); } } @@ -750,7 +753,7 @@ public class BOPBiomes { { if (BOPConfiguration.vanillaEnhanced == true) { - GameRegistry.addBiome(extremeHillsNew); + registerBiome(Biomes.extremeHillsNew); GameRegistry.removeBiome(BiomeGenBase.extremeHills); } } @@ -758,7 +761,7 @@ public class BOPBiomes { { if (BOPConfiguration.vanillaEnhanced == true) { - GameRegistry.addBiome(forestNew); + registerBiome(Biomes.forestNew); GameRegistry.removeBiome(BiomeGenBase.forest); } } @@ -766,7 +769,7 @@ public class BOPBiomes { { if (BOPConfiguration.vanillaEnhanced == true) { - GameRegistry.addBiome(taigaNew); + registerBiome(Biomes.taigaNew); GameRegistry.removeBiome(BiomeGenBase.taiga); } } @@ -774,7 +777,7 @@ public class BOPBiomes { { if (BOPConfiguration.vanillaEnhanced == true) { - GameRegistry.addBiome(swamplandNew); + registerBiome(Biomes.swamplandNew); GameRegistry.removeBiome(BiomeGenBase.swampland); } } @@ -782,10 +785,34 @@ public class BOPBiomes { { if (BOPConfiguration.vanillaEnhanced == true) { - GameRegistry.addBiome(jungleNew); + registerBiome(Biomes.jungleNew); GameRegistry.removeBiome(BiomeGenBase.jungle); } } } } + + private static void addSpawnBiome(Optional biome) + { + if (biome.isPresent()) + BiomeManager.addSpawnBiome(biome.get()); + } + + private static void addVillageBiome(Optional biome) + { + if (biome.isPresent()) + BiomeManager.addVillageBiome(biome.get(), true); + } + + private static void addStrongholdBiome(Optional biome) + { + if (biome.isPresent()) + BiomeManager.addStrongholdBiome(biome.get()); + } + + private static void registerBiome(Optional biome) + { + if (biome.isPresent()) + GameRegistry.addBiome(biome.get()); + } } diff --git a/src/minecraft/tdwp_ftw/biomesop/helpers/WorldChunkManagerPromised.java b/src/minecraft/tdwp_ftw/biomesop/helpers/WorldChunkManagerPromised.java index 3cfa8e16e..99cbbf677 100644 --- a/src/minecraft/tdwp_ftw/biomesop/helpers/WorldChunkManagerPromised.java +++ b/src/minecraft/tdwp_ftw/biomesop/helpers/WorldChunkManagerPromised.java @@ -1,31 +1,26 @@ package tdwp_ftw.biomesop.helpers; -import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBiomes; -import tdwp_ftw.biomesop.helpers.BiomeCachePromised; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Random; + import net.minecraft.world.ChunkPosition; import net.minecraft.world.World; import net.minecraft.world.WorldType; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.WorldChunkManager; import net.minecraft.world.gen.layer.GenLayer; import net.minecraft.world.gen.layer.IntCache; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.biome.BiomeCache; -import net.minecraft.world.biome.WorldChunkManager; - -import net.minecraftforge.common.*; -import net.minecraftforge.event.terraingen.*; -import static net.minecraft.world.biome.BiomeGenBase.*; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.terraingen.WorldTypeEvent; +import tdwp_ftw.biomesop.api.Biomes; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class WorldChunkManagerPromised extends WorldChunkManager { - public static ArrayList allowedBiomes = new ArrayList(Arrays.asList(BOPBiomes.promisedLand)); + public static ArrayList allowedBiomes = new ArrayList(Arrays.asList(Biomes.promisedLand.get())); private GenLayer genBiomes; /** A GenLayer containing the indices into BiomeGenBase.biomeList[] */ diff --git a/src/minecraft/tdwp_ftw/biomesop/helpers/WorldProviderPromised.java b/src/minecraft/tdwp_ftw/biomesop/helpers/WorldProviderPromised.java index 582d6bba8..95233a09e 100644 --- a/src/minecraft/tdwp_ftw/biomesop/helpers/WorldProviderPromised.java +++ b/src/minecraft/tdwp_ftw/biomesop/helpers/WorldProviderPromised.java @@ -1,29 +1,25 @@ package tdwp_ftw.biomesop.helpers; -import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBiomes; -import tdwp_ftw.biomesop.declarations.BOPBlocks; -import tdwp_ftw.biomesop.declarations.BOPConfiguration; -//import tdwp_ftw.biomesop.helpers.WorldChunkManagerPromised; - -import net.minecraft.block.Block; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.util.ChunkCoordinates; -import net.minecraft.world.WorldProvider; -import net.minecraft.world.gen.ChunkProviderHell; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.biome.WorldChunkManagerHell; -import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.util.MathHelper; import net.minecraft.util.Vec3; +import net.minecraft.world.World; +import net.minecraft.world.WorldProvider; +import net.minecraft.world.biome.WorldChunkManagerHell; +import net.minecraft.world.chunk.IChunkProvider; +import tdwp_ftw.biomesop.api.Biomes; +import tdwp_ftw.biomesop.declarations.BOPBlocks; +import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +//import tdwp_ftw.biomesop.helpers.WorldChunkManagerPromised; public class WorldProviderPromised extends WorldProvider { public void registerWorldChunkManager() { - this.worldChunkMgr = new WorldChunkManagerHell(BOPBiomes.promisedLand, 0.8F, 0.1F); + if (Biomes.promisedLand.isPresent()) + this.worldChunkMgr = new WorldChunkManagerHell(Biomes.promisedLand.get(), 0.8F, 0.1F); //this.worldChunkMgr = new WorldChunkManagerPromised(worldObj); this.dimensionId = BOPConfiguration.promisedLandDimID; } diff --git a/src/minecraft/tdwp_ftw/biomesop/mod_BiomesOPlenty.java b/src/minecraft/tdwp_ftw/biomesop/mod_BiomesOPlenty.java index f30484dc4..121417c06 100644 --- a/src/minecraft/tdwp_ftw/biomesop/mod_BiomesOPlenty.java +++ b/src/minecraft/tdwp_ftw/biomesop/mod_BiomesOPlenty.java @@ -23,6 +23,7 @@ import net.minecraftforge.common.AchievementPage; import net.minecraftforge.common.ChestGenHooks; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.MinecraftForge; +import tdwp_ftw.biomesop.api.Biomes; import tdwp_ftw.biomesop.declarations.BOPBiomes; import tdwp_ftw.biomesop.declarations.BOPBlocks; import tdwp_ftw.biomesop.declarations.BOPConfiguration; @@ -162,12 +163,14 @@ public class mod_BiomesOPlenty EntityRegistry.registerModEntity(EntityJungleSpider.class, "JungleSpider", BOPConfiguration.jungleSpiderID, this, 80, 3, true); LanguageRegistry.instance().addStringLocalization("entity.BiomesOPlenty.JungleSpider.name", "en_US", "Jungle Spider"); - EntityRegistry.addSpawn(EntityJungleSpider.class, 8, 1, 3, EnumCreatureType.monster, BOPBiomes.jungleNew, BOPBiomes.tropicalRainforest, BOPBiomes.oasis, BOPBiomes.tropics); + if (Biomes.jungleNew.isPresent() && Biomes.tropicalRainforest.isPresent() && Biomes.oasis.isPresent() && Biomes.tropics.isPresent()) + EntityRegistry.addSpawn(EntityJungleSpider.class, 8, 1, 3, EnumCreatureType.monster, Biomes.jungleNew.get(), Biomes.tropicalRainforest.get(), Biomes.oasis.get(), Biomes.tropics.get()); registerEntityEgg(EntityJungleSpider.class, 5147192, 11013646); EntityRegistry.registerModEntity(EntityRosester.class, "Rosester", BOPConfiguration.rosesterID, this, 80, 3, true); LanguageRegistry.instance().addStringLocalization("entity.BiomesOPlenty.Rosester.name", "en_US", "Rosester"); - EntityRegistry.addSpawn(EntityRosester.class, 10, 2, 4, EnumCreatureType.creature, BOPBiomes.garden); + if (Biomes.garden.isPresent()) + EntityRegistry.addSpawn(EntityRosester.class, 10, 2, 4, EnumCreatureType.creature, Biomes.garden.get()); registerEntityEgg(EntityRosester.class, 14831439, 16756224); EntityRegistry.registerModEntity(EntityMudball.class, "MudBall", EntityRegistry.findGlobalUniqueEntityId(), this, 80, 3, true); diff --git a/src/minecraft/tdwp_ftw/biomesop/worldtype/WTBiomesOP.java b/src/minecraft/tdwp_ftw/biomesop/worldtype/WTBiomesOP.java index 09ddc161e..7c833e198 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldtype/WTBiomesOP.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldtype/WTBiomesOP.java @@ -1,10 +1,11 @@ package tdwp_ftw.biomesop.worldtype; import net.minecraft.world.biome.BiomeGenBase; -import tdwp_ftw.biomesop.mod_BiomesOPlenty; -import tdwp_ftw.biomesop.declarations.BOPBiomes; +import tdwp_ftw.biomesop.api.Biomes; import tdwp_ftw.biomesop.declarations.BOPConfiguration; +import com.google.common.base.Optional; + public class WTBiomesOP extends WorldTypeBase { public WTBiomesOP() { @@ -20,167 +21,167 @@ public class WTBiomesOP extends WorldTypeBase if (BOPConfiguration.alpsGen == true) { - this.addNewBiome(BOPBiomes.alps); + addNewBiome(Biomes.alps); } if (BOPConfiguration.arcticGen == true) { - this.addNewBiome(BOPBiomes.arctic); + addNewBiome(Biomes.arctic); } if (BOPConfiguration.badlandsGen == true) { - this.addNewBiome(BOPBiomes.badlands); + addNewBiome(Biomes.badlands); } if (BOPConfiguration.bambooForestGen == true) { - this.addNewBiome(BOPBiomes.bambooForest); + addNewBiome(Biomes.bambooForest); } if (BOPConfiguration.bayouGen == true) { - this.addNewBiome(BOPBiomes.bayou); + addNewBiome(Biomes.bayou); } if (BOPConfiguration.birchForestGen == true) { - this.addNewBiome(BOPBiomes.birchForest); + addNewBiome(Biomes.birchForest); } if (BOPConfiguration.bogGen == true) { - this.addNewBiome(BOPBiomes.bog); + addNewBiome(Biomes.bog); } if (BOPConfiguration.borealForestGen == true) { - this.addNewBiome(BOPBiomes.borealForest); + addNewBiome(Biomes.borealForest); } if (BOPConfiguration.canyonGen == true) { - this.addNewBiome(BOPBiomes.canyon); + addNewBiome(Biomes.canyon); } if (BOPConfiguration.chaparralGen == true) { - this.addNewBiome(BOPBiomes.chaparral); + addNewBiome(Biomes.chaparral); } if (BOPConfiguration.cherryBlossomGroveGen == true) { - this.addNewBiome(BOPBiomes.cherryBlossomGrove); + addNewBiome(Biomes.cherryBlossomGrove); } if (BOPConfiguration.coniferousForestGen == true) { - this.addNewBiome(BOPBiomes.coniferousForest); + addNewBiome(Biomes.coniferousForest); } if (BOPConfiguration.cragGen == true) { - this.addNewBiome(BOPBiomes.crag); + addNewBiome(Biomes.crag); } if (BOPConfiguration.deadForestGen == true) { - this.addNewBiome(BOPBiomes.deadForest); + addNewBiome(Biomes.deadForest); } if (BOPConfiguration.deadSwampGen == true) { - this.addNewBiome(BOPBiomes.deadSwamp); + addNewBiome(Biomes.deadSwamp); } if (BOPConfiguration.deadlandsGen == true) { - this.addNewBiome(BOPBiomes.deadlands); + addNewBiome(Biomes.deadlands); } if (BOPConfiguration.deciduousForestGen == true) { - this.addNewBiome(BOPBiomes.deciduousForest); + addNewBiome(Biomes.deciduousForest); } if (BOPConfiguration.drylandsGen == true) { - this.addNewBiome(BOPBiomes.drylands); + addNewBiome(Biomes.drylands); } if (BOPConfiguration.dunesGen == true) { - this.addNewBiome(BOPBiomes.dunes); + addNewBiome(Biomes.dunes); } if (BOPConfiguration.fenGen == true) { - this.addNewBiome(BOPBiomes.fen); + addNewBiome(Biomes.fen); } if (BOPConfiguration.fieldGen == true) { - this.addNewBiome(BOPBiomes.field); + addNewBiome(Biomes.field); } if (BOPConfiguration.frostForestGen == true) { - this.addNewBiome(BOPBiomes.frostForest); + addNewBiome(Biomes.frostForest); } if (BOPConfiguration.fungiForestGen == true) { - this.addNewBiome(BOPBiomes.fungiForest); + addNewBiome(Biomes.fungiForest); } if (BOPConfiguration.gardenGen == true) { - this.addNewBiome(BOPBiomes.garden); + addNewBiome(Biomes.garden); } if (BOPConfiguration.glacierGen == true) { - this.addNewBiome(BOPBiomes.glacier); + addNewBiome(Biomes.glacier); } if (BOPConfiguration.grasslandGen == true) { - this.addNewBiome(BOPBiomes.grassland); + addNewBiome(Biomes.grassland); } if (BOPConfiguration.groveGen == true) { - this.addNewBiome(BOPBiomes.grove); + addNewBiome(Biomes.grove); } if (BOPConfiguration.heathlandGen == true) { - this.addNewBiome(BOPBiomes.heathland); + addNewBiome(Biomes.heathland); } if (BOPConfiguration.highlandGen == true) { - this.addNewBiome(BOPBiomes.highland); + addNewBiome(Biomes.highland); } if (BOPConfiguration.iceSheetGen == true) { - this.addNewBiome(BOPBiomes.iceSheet); + addNewBiome(Biomes.iceSheet); } if (BOPConfiguration.icyHillsGen == true) { - this.addNewBiome(BOPBiomes.icyHills); + addNewBiome(Biomes.icyHills); } if (BOPConfiguration.jadeCliffsGen == true) { - this.addNewBiome(BOPBiomes.jadeCliffs); + addNewBiome(Biomes.jadeCliffs); } if (BOPConfiguration.lushDesertGen == true) { - this.addNewBiome(BOPBiomes.lushDesert); + addNewBiome(Biomes.lushDesert); } if (BOPConfiguration.lushSwampGen == true) { - this.addNewBiome(BOPBiomes.lushSwamp); + addNewBiome(Biomes.lushSwamp); } if (BOPConfiguration.mangroveGen == true) { - this.addNewBiome(BOPBiomes.mangrove); + addNewBiome(Biomes.mangrove); } if (BOPConfiguration.mapleWoodsGen == true) { - this.addNewBiome(BOPBiomes.mapleWoods); + addNewBiome(Biomes.mapleWoods); } if (BOPConfiguration.marshGen == true) { - this.addNewBiome(BOPBiomes.marsh); + addNewBiome(Biomes.marsh); } if (BOPConfiguration.meadowGen == true) { - this.addNewBiome(BOPBiomes.meadow); + addNewBiome(Biomes.meadow); } if (BOPConfiguration.mesaGen == true) { - this.addNewBiome(BOPBiomes.mesa); + addNewBiome(Biomes.mesa); } if (BOPConfiguration.moorGen == true) { - this.addNewBiome(BOPBiomes.moor); + addNewBiome(Biomes.moor); } if (BOPConfiguration.mountainGen == true) { - this.addNewBiome(BOPBiomes.mountain); + addNewBiome(Biomes.mountain); } if (BOPConfiguration.mushroomIslandGen == true) { @@ -188,123 +189,123 @@ public class WTBiomesOP extends WorldTypeBase } if (BOPConfiguration.mysticGroveGen == true) { - this.addNewBiome(BOPBiomes.mysticGrove); + addNewBiome(Biomes.mysticGrove); } if (BOPConfiguration.oasisGen == true) { - this.addNewBiome(BOPBiomes.oasis); + addNewBiome(Biomes.oasis); } if (BOPConfiguration.ominousWoodsGen == true) { - this.addNewBiome(BOPBiomes.ominousWoods); + addNewBiome(Biomes.ominousWoods); } if (BOPConfiguration.orchardGen == true) { - this.addNewBiome(BOPBiomes.orchard); + addNewBiome(Biomes.orchard); } if (BOPConfiguration.originValleyGen == true) { - this.addNewBiome(BOPBiomes.originValley); + addNewBiome(Biomes.originValley); } if (BOPConfiguration.outbackGen == true) { - this.addNewBiome(BOPBiomes.outback); + addNewBiome(Biomes.outback); } if (BOPConfiguration.pastureGen == true) { - this.addNewBiome(BOPBiomes.pasture); + addNewBiome(Biomes.pasture); } if (BOPConfiguration.prairieGen == true) { - this.addNewBiome(BOPBiomes.prairie); + addNewBiome(Biomes.prairie); } if (BOPConfiguration.quagmireGen == true) { - this.addNewBiome(BOPBiomes.quagmire); + addNewBiome(Biomes.quagmire); } if (BOPConfiguration.rainforestGen == true) { - this.addNewBiome(BOPBiomes.rainforest); + addNewBiome(Biomes.rainforest); } if (BOPConfiguration.redwoodForestGen == true) { - this.addNewBiome(BOPBiomes.redwoodForest); + addNewBiome(Biomes.redwoodForest); } if (BOPConfiguration.sacredSpringsGen == true) { - this.addNewBiome(BOPBiomes.sacredSprings); + addNewBiome(Biomes.sacredSprings); } if (BOPConfiguration.savannaGen == true) { - this.addNewBiome(BOPBiomes.savanna); + addNewBiome(Biomes.savanna); } if (BOPConfiguration.scrublandGen == true) { - this.addNewBiome(BOPBiomes.scrubland); + addNewBiome(Biomes.scrubland); } if (BOPConfiguration.seasonalForestGen == true) { - this.addNewBiome(BOPBiomes.seasonalForest); + addNewBiome(Biomes.seasonalForest); } if (BOPConfiguration.shieldGen == true) { - this.addNewBiome(BOPBiomes.shield); + addNewBiome(Biomes.shield); } if (BOPConfiguration.shrublandGen == true) { - this.addNewBiome(BOPBiomes.shrubland); + addNewBiome(Biomes.shrubland); } if (BOPConfiguration.snowyWoodsGen == true) { - this.addNewBiome(BOPBiomes.snowyWoods); + addNewBiome(Biomes.snowyWoods); } if (BOPConfiguration.spruceWoodsGen == true) { - this.addNewBiome(BOPBiomes.spruceWoods); + addNewBiome(Biomes.spruceWoods); } if (BOPConfiguration.steppeGen == true) { - this.addNewBiome(BOPBiomes.steppe); + addNewBiome(Biomes.steppe); } if (BOPConfiguration.swampwoodsGen == true) { - this.addNewBiome(BOPBiomes.swampwoods); + addNewBiome(Biomes.swampwoods); } if (BOPConfiguration.temperateRainforestGen == true) { - this.addNewBiome(BOPBiomes.temperateRainforest); + addNewBiome(Biomes.temperateRainforest); } if (BOPConfiguration.thicketGen == true) { - this.addNewBiome(BOPBiomes.thicket); + addNewBiome(Biomes.thicket); } if (BOPConfiguration.tropicalRainforestGen == true) { - this.addNewBiome(BOPBiomes.tropicalRainforest); + addNewBiome(Biomes.tropicalRainforest); } if (BOPConfiguration.tropicsGen == true) { - this.addNewBiome(BOPBiomes.tropics); + addNewBiome(Biomes.tropics); } if (BOPConfiguration.tundraGen == true) { - this.addNewBiome(BOPBiomes.tundra); + addNewBiome(Biomes.tundra); } if (BOPConfiguration.volcanoGen == true) { - this.addNewBiome(BOPBiomes.volcano); + addNewBiome(Biomes.volcano); } if (BOPConfiguration.wastelandGen == true) { - this.addNewBiome(BOPBiomes.wasteland); + addNewBiome(Biomes.wasteland); } if (BOPConfiguration.wetlandGen == true) { - this.addNewBiome(BOPBiomes.wetland); + addNewBiome(Biomes.wetland); } if (BOPConfiguration.woodlandGen == true) { - this.addNewBiome(BOPBiomes.woodland); + addNewBiome(Biomes.woodland); } @@ -312,7 +313,7 @@ public class WTBiomesOP extends WorldTypeBase { if (BOPConfiguration.vanillaEnhanced == true) { - this.addNewBiome(BOPBiomes.plainsNew); + addNewBiome(Biomes.plainsNew); } else { @@ -323,7 +324,7 @@ public class WTBiomesOP extends WorldTypeBase { if (BOPConfiguration.vanillaEnhanced == true) { - this.addNewBiome(BOPBiomes.desertNew); + addNewBiome(Biomes.desertNew); } else { @@ -334,7 +335,7 @@ public class WTBiomesOP extends WorldTypeBase { if (BOPConfiguration.vanillaEnhanced == true) { - this.addNewBiome(BOPBiomes.extremeHillsNew); + addNewBiome(Biomes.extremeHillsNew); } else { @@ -345,7 +346,7 @@ public class WTBiomesOP extends WorldTypeBase { if (BOPConfiguration.vanillaEnhanced == true) { - this.addNewBiome(BOPBiomes.forestNew); + addNewBiome(Biomes.forestNew); } else { @@ -356,7 +357,7 @@ public class WTBiomesOP extends WorldTypeBase { if (BOPConfiguration.vanillaEnhanced == true) { - this.addNewBiome(BOPBiomes.taigaNew); + addNewBiome(Biomes.taigaNew); } else { @@ -367,7 +368,7 @@ public class WTBiomesOP extends WorldTypeBase { if (BOPConfiguration.vanillaEnhanced == true) { - this.addNewBiome(BOPBiomes.swamplandNew); + addNewBiome(Biomes.swamplandNew); } else { @@ -378,7 +379,7 @@ public class WTBiomesOP extends WorldTypeBase { if (BOPConfiguration.vanillaEnhanced == true) { - this.addNewBiome(BOPBiomes.jungleNew); + addNewBiome(Biomes.jungleNew); } else { @@ -386,4 +387,10 @@ public class WTBiomesOP extends WorldTypeBase } } } + + public void addNewBiome(Optional biome) + { + if (biome.isPresent()) + this.addNewBiome(biome.get()); + } } diff --git a/src/minecraft/tdwp_ftw/biomesop/worldtype/WorldChunkManagerBOP.java b/src/minecraft/tdwp_ftw/biomesop/worldtype/WorldChunkManagerBOP.java index bab7d1d32..2e6bc92d5 100644 --- a/src/minecraft/tdwp_ftw/biomesop/worldtype/WorldChunkManagerBOP.java +++ b/src/minecraft/tdwp_ftw/biomesop/worldtype/WorldChunkManagerBOP.java @@ -4,8 +4,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import tdwp_ftw.biomesop.declarations.BOPBiomes; - import net.minecraft.world.ChunkPosition; import net.minecraft.world.World; import net.minecraft.world.WorldType; @@ -14,6 +12,9 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.WorldChunkManager; import net.minecraft.world.gen.layer.GenLayer; import net.minecraft.world.gen.layer.IntCache; +import tdwp_ftw.biomesop.api.Biomes; + +import com.google.common.base.Optional; public class WorldChunkManagerBOP extends WorldChunkManager { @@ -26,12 +27,12 @@ public class WorldChunkManagerBOP extends WorldChunkManager private BiomeCache biomeCache; /** A list of biomes that the player can spawn in. */ - private List biomesToSpawnIn; + private List biomesToSpawnIn; protected WorldChunkManagerBOP() { this.biomeCache = new BiomeCache(this); - this.biomesToSpawnIn = new ArrayList(); + this.biomesToSpawnIn = new ArrayList(); this.biomesToSpawnIn.add(BiomeGenBase.forest); this.biomesToSpawnIn.add(BiomeGenBase.plains); this.biomesToSpawnIn.add(BiomeGenBase.taiga); @@ -40,60 +41,60 @@ public class WorldChunkManagerBOP extends WorldChunkManager this.biomesToSpawnIn.add(BiomeGenBase.jungle); this.biomesToSpawnIn.add(BiomeGenBase.jungleHills); - this.biomesToSpawnIn.add(BOPBiomes.alps); - this.biomesToSpawnIn.add(BOPBiomes.arctic); - this.biomesToSpawnIn.add(BOPBiomes.badlands); - this.biomesToSpawnIn.add(BOPBiomes.bambooForest); - this.biomesToSpawnIn.add(BOPBiomes.bayou); - this.biomesToSpawnIn.add(BOPBiomes.birchForest); - this.biomesToSpawnIn.add(BOPBiomes.bog); - this.biomesToSpawnIn.add(BOPBiomes.borealForest); - this.biomesToSpawnIn.add(BOPBiomes.chaparral); - this.biomesToSpawnIn.add(BOPBiomes.cherryBlossomGrove); - this.biomesToSpawnIn.add(BOPBiomes.coniferousForest); - this.biomesToSpawnIn.add(BOPBiomes.crag); - this.biomesToSpawnIn.add(BOPBiomes.deadForest); - this.biomesToSpawnIn.add(BOPBiomes.deciduousForest); - this.biomesToSpawnIn.add(BOPBiomes.drylands); - this.biomesToSpawnIn.add(BOPBiomes.dunes); - this.biomesToSpawnIn.add(BOPBiomes.frostForest); - this.biomesToSpawnIn.add(BOPBiomes.glacier); - this.biomesToSpawnIn.add(BOPBiomes.grassland); - this.biomesToSpawnIn.add(BOPBiomes.grove); - this.biomesToSpawnIn.add(BOPBiomes.heathland); - this.biomesToSpawnIn.add(BOPBiomes.highland); - this.biomesToSpawnIn.add(BOPBiomes.lushDesert); - this.biomesToSpawnIn.add(BOPBiomes.lushSwamp); - this.biomesToSpawnIn.add(BOPBiomes.mangrove); - this.biomesToSpawnIn.add(BOPBiomes.mapleWoods); - this.biomesToSpawnIn.add(BOPBiomes.marsh); - this.biomesToSpawnIn.add(BOPBiomes.meadow); - this.biomesToSpawnIn.add(BOPBiomes.mesa); - this.biomesToSpawnIn.add(BOPBiomes.mountain); - this.biomesToSpawnIn.add(BOPBiomes.oasis); - this.biomesToSpawnIn.add(BOPBiomes.orchard); - this.biomesToSpawnIn.add(BOPBiomes.pasture); - this.biomesToSpawnIn.add(BOPBiomes.prairie); - this.biomesToSpawnIn.add(BOPBiomes.quagmire); - this.biomesToSpawnIn.add(BOPBiomes.rainforest); - this.biomesToSpawnIn.add(BOPBiomes.redwoodForest); - this.biomesToSpawnIn.add(BOPBiomes.savanna); - this.biomesToSpawnIn.add(BOPBiomes.scrubland); - this.biomesToSpawnIn.add(BOPBiomes.seasonalForest); - this.biomesToSpawnIn.add(BOPBiomes.shrubland); - this.biomesToSpawnIn.add(BOPBiomes.steppe); - this.biomesToSpawnIn.add(BOPBiomes.temperateRainforest); - this.biomesToSpawnIn.add(BOPBiomes.tropicalRainforest); - this.biomesToSpawnIn.add(BOPBiomes.tropics); - this.biomesToSpawnIn.add(BOPBiomes.tundra); - this.biomesToSpawnIn.add(BOPBiomes.volcano); - this.biomesToSpawnIn.add(BOPBiomes.wetland); - this.biomesToSpawnIn.add(BOPBiomes.woodland); + addSpawnBiomes(Biomes.alps); + addSpawnBiomes(Biomes.arctic); + addSpawnBiomes(Biomes.badlands); + addSpawnBiomes(Biomes.bambooForest); + addSpawnBiomes(Biomes.bayou); + addSpawnBiomes(Biomes.birchForest); + addSpawnBiomes(Biomes.bog); + addSpawnBiomes(Biomes.borealForest); + addSpawnBiomes(Biomes.chaparral); + addSpawnBiomes(Biomes.cherryBlossomGrove); + addSpawnBiomes(Biomes.coniferousForest); + addSpawnBiomes(Biomes.crag); + addSpawnBiomes(Biomes.deadForest); + addSpawnBiomes(Biomes.deciduousForest); + addSpawnBiomes(Biomes.drylands); + addSpawnBiomes(Biomes.dunes); + addSpawnBiomes(Biomes.frostForest); + addSpawnBiomes(Biomes.glacier); + addSpawnBiomes(Biomes.grassland); + addSpawnBiomes(Biomes.grove); + addSpawnBiomes(Biomes.heathland); + addSpawnBiomes(Biomes.highland); + addSpawnBiomes(Biomes.lushDesert); + addSpawnBiomes(Biomes.lushSwamp); + addSpawnBiomes(Biomes.mangrove); + addSpawnBiomes(Biomes.mapleWoods); + addSpawnBiomes(Biomes.marsh); + addSpawnBiomes(Biomes.meadow); + addSpawnBiomes(Biomes.mesa); + addSpawnBiomes(Biomes.mountain); + addSpawnBiomes(Biomes.oasis); + addSpawnBiomes(Biomes.orchard); + addSpawnBiomes(Biomes.pasture); + addSpawnBiomes(Biomes.prairie); + addSpawnBiomes(Biomes.quagmire); + addSpawnBiomes(Biomes.rainforest); + addSpawnBiomes(Biomes.redwoodForest); + addSpawnBiomes(Biomes.savanna); + addSpawnBiomes(Biomes.scrubland); + addSpawnBiomes(Biomes.seasonalForest); + addSpawnBiomes(Biomes.shrubland); + addSpawnBiomes(Biomes.steppe); + addSpawnBiomes(Biomes.temperateRainforest); + addSpawnBiomes(Biomes.tropicalRainforest); + addSpawnBiomes(Biomes.tropics); + addSpawnBiomes(Biomes.tundra); + addSpawnBiomes(Biomes.volcano); + addSpawnBiomes(Biomes.wetland); + addSpawnBiomes(Biomes.woodland); - this.biomesToSpawnIn.add(BOPBiomes.forestNew); - this.biomesToSpawnIn.add(BOPBiomes.plainsNew); - this.biomesToSpawnIn.add(BOPBiomes.taigaNew); - this.biomesToSpawnIn.add(BOPBiomes.jungleNew); + addSpawnBiomes(Biomes.forestNew); + addSpawnBiomes(Biomes.plainsNew); + addSpawnBiomes(Biomes.taigaNew); + addSpawnBiomes(Biomes.jungleNew); } public WorldChunkManagerBOP(long par1, WorldType par3WorldType) @@ -112,7 +113,7 @@ public class WorldChunkManagerBOP extends WorldChunkManager /** * Gets the list of valid biomes for the player to spawn in. */ - public List getBiomesToSpawnIn() + public List getBiomesToSpawnIn() { return this.biomesToSpawnIn; } @@ -321,4 +322,10 @@ public class WorldChunkManagerBOP extends WorldChunkManager { this.biomeCache.cleanupCache(); } + + private void addSpawnBiomes(Optional biome) + { + if (biome.isPresent()) + this.biomesToSpawnIn.add(biome.get()); + } }