Reorganising BOPBiome into BOPOverworldBiome

src/main/java/biomesoplenty/common/biome/BOPBiome.java

@@ -0,0 +1,334 @@
+/*******************************************************************************
+ * Copyright 2014-2017, the Biomes O' Plenty Team
+ *
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ *
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+package biomesoplenty.common.biome;
+
+import biomesoplenty.api.biome.BiomeOwner;
+import biomesoplenty.api.biome.IExtendedBiome;
+import biomesoplenty.api.config.IConfigObj;
+import biomesoplenty.api.enums.BOPClimates;
+import biomesoplenty.api.generation.GeneratorStage;
+import biomesoplenty.api.generation.IGenerator;
+import biomesoplenty.common.biome.overworld.BOPOverworldBiome;
+import biomesoplenty.common.init.ModBiomes;
+import biomesoplenty.common.world.GenerationManager;
+import biomesoplenty.core.BiomesOPlenty;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.biome.Biome;
+import net.minecraftforge.fml.common.registry.ForgeRegistries;
+
+import java.util.*;
+
+public abstract class BOPBiome extends Biome implements IExtendedBiome
+{
+    protected GenerationManager generationManager = new GenerationManager();
+    protected Map<BOPClimates, Integer> weightMap = new HashMap<BOPClimates, Integer>();
+
+    // defaults
+
+    // -1 indicates the defaults as set by Vanilla will be used for the below fields
+    public int skyColor = -1;
+    public int fogColor = -1;
+
+    /** 1.0 is the lowest possible amount of fog. 0.0 is the greatest.*/
+    public float fogDensity = 1.0F;
+
+    public boolean hasBiomeEssence = true;
+
+    public final ResourceLocation location;
+    public IConfigObj conf;
+
+    private BOPBiome(ResourceLocation idLoc, PropsBuilder defaultBuilder, IConfigObj conf)
+    {
+        super(configureBiomeProps(idLoc, defaultBuilder, conf));
+
+        this.location = idLoc;
+        this.conf = conf;
+
+        this.theBiomeDecorator.treesPerChunk = -999;
+        this.theBiomeDecorator.flowersPerChunk = -999;
+        this.theBiomeDecorator.grassPerChunk = -999;
+        this.theBiomeDecorator.sandPerChunk = -999;
+        this.theBiomeDecorator.sandPerChunk2 = -999;
+        //this.theBiomeDecorator.generateLakes = false;
+    }
+
+    protected BOPBiome(String idName, PropsBuilder defaultBuilder)
+    {
+        this(new ResourceLocation(BiomesOPlenty.MOD_ID, idName), defaultBuilder, ModBiomes.readConfigFile(idName));
+    }
+
+    public static BOPBiome.BiomeProps configureBiomeProps(ResourceLocation idLoc, BOPBiome.PropsBuilder defaultBuilder, IConfigObj conf)
+    {
+        // If there isn't a valid config file, don't use it to configure the biome
+        if (conf.isEmpty())
+            return defaultBuilder.build();
+
+        defaultBuilder.withTemperature(conf.getFloat("temperature"));
+        defaultBuilder.withRainfall(conf.getFloat("rainfall"));
+        defaultBuilder.withWaterColor(conf.getInt("waterColor"));
+
+        Boolean enableRain = conf.getBool("enableRain");
+        if (enableRain != null && !enableRain) defaultBuilder.withRainDisabled();
+
+        Boolean enableSnow = conf.getBool("enableSnow");
+        if (enableSnow != null && enableSnow) defaultBuilder.withSnowEnabled();
+
+        defaultBuilder.withBaseBiome(conf.getString("baseBiome"));
+        defaultBuilder.withGuiColour(conf.getInt("guiColour"));
+
+        return defaultBuilder.build();
+    }
+
+    @Override
+    public void configure(IConfigObj conf)
+    {
+        this.topBlock = conf.getBlockState("topBlock", this.topBlock);
+        this.fillerBlock = conf.getBlockState("fillerBlock", this.fillerBlock);
+
+        this.skyColor = conf.getInt("skyColor", this.skyColor);
+        this.fogColor = conf.getInt("fogColor", this.fogColor);
+        this.fogDensity = conf.getFloat("fogDensity", this.fogDensity);
+        this.hasBiomeEssence = conf.getBool("hasBiomeEssence", this.hasBiomeEssence);
+
+        // Allow weights to be overridden
+        IConfigObj confWeights = conf.getObject("weights");
+        if (confWeights != null)
+        {
+            for (BOPClimates climate : BOPClimates.values())
+            {
+                Integer weight = confWeights.getInt(climate.name().toLowerCase(), null);
+                if (weight == null) {continue;}
+                if (weight.intValue() < 1)
+                {
+                    this.weightMap.remove(climate);
+                }
+                else
+                {
+                    this.weightMap.put(climate, weight);
+                }
+            }
+        }
+
+        // Allow generators to be configured
+        IConfigObj confGenerators = conf.getObject("generators");
+        if (confGenerators != null)
+        {
+            for (String name : confGenerators.getKeys())
+            {
+                this.generationManager.configureWith(name, confGenerators.getObject(name));
+            }
+        }
+
+        // Allow spawnable entites to be configured
+        ArrayList<IConfigObj> confEntities = conf.getObjectArray("entities");
+        if (confEntities != null)
+        {
+            for (IConfigObj confEntity : confEntities)
+            {
+                String entityName = confEntity.getString("name");
+                EnumCreatureType creatureType = confEntity.getEnum("creatureType", EnumCreatureType.class);
+                if (entityName == null || creatureType == null) {continue;}
+
+                // Look for an entity class matching this name
+                // case insensitive, dot used as mod delimiter, no spaces or underscores
+                // eg  'villager', 'Zombie', 'SQUID', 'enderdragon', 'biomesoplenty.wasp' all ok
+                Class <? extends Entity> entityClazz = ForgeRegistries.ENTITIES.getValue(new ResourceLocation(entityName)).getEntityClass();
+                Class <? extends EntityLiving> livingClazz = null;
+                if (!(entityClazz.isAssignableFrom(EntityLiving.class))) {
+                    confEntity.addMessage("Entity " + entityName + " is not of type EntityLiving");
+                    continue;
+                }
+                else {
+                    livingClazz = (Class <? extends EntityLiving>)entityClazz;
+                }
+
+                if (livingClazz == null)
+                {
+                    confEntity.addMessage("No entity registered called " + entityName);
+                    continue;
+                }
+                if (!creatureType.getCreatureClass().isAssignableFrom(livingClazz))
+                {
+                    confEntity.addMessage("Entity " + entityName + " is not of type " + creatureType);
+                    continue;
+                }
+
+                List<SpawnListEntry> spawns = this.getSpawnableList(creatureType);
+                Integer weight = confEntity.getInt("weight");
+                if (weight != null && weight < 1)
+                {
+                    // weight was set to zero (or negative) so find and remove this spawn
+                    Iterator<SpawnListEntry> spawnIterator = spawns.iterator();
+                    while (spawnIterator.hasNext())
+                    {
+                        SpawnListEntry entry = spawnIterator.next();
+                        if (entry.entityClass == livingClazz)
+                        {
+                            spawnIterator.remove();
+                        }
+                    }
+                }
+                else
+                {
+                    // weight was positive, or omitted, so update an existing spawn or add a new spawn
+                    boolean foundIt = false;
+                    for (SpawnListEntry entry : spawns)
+                    {
+                        if (entry.entityClass == entityClazz)
+                        {
+                            // the entry already exists - adjust the params
+                            entry.itemWeight = confEntity.getInt("weight", entry.itemWeight);
+                            entry.minGroupCount = confEntity.getInt("minGroupCount", entry.minGroupCount);
+                            entry.maxGroupCount = confEntity.getInt("maxGroupCount", entry.maxGroupCount);
+                            foundIt = true;
+                        }
+                    }
+                    if (!foundIt)
+                    {
+                        // the entry does not exist - add it
+                        SpawnListEntry entry = new SpawnListEntry(livingClazz, confEntity.getInt("weight", 10), confEntity.getInt("minGroupCount", 4), confEntity.getInt("maxGroupCount", 4));
+                        spawns.add(entry);
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    public BiomeOwner getBiomeOwner()
+    {
+        return BiomeOwner.BIOMESOPLENTY;
+    }
+
+    @Override
+    public void addGenerator(String name, GeneratorStage stage, IGenerator generator)
+    {
+        this.generationManager.addGenerator(name, stage, generator);
+    }
+
+    public IGenerator getGenerator(String name)
+    {
+        return this.generationManager.getGenerator(name);
+    }
+
+    public void removeGenerator(String name)
+    {
+        this.generationManager.removeGenerator(name);
+    }
+
+    @Override
+    public GenerationManager getGenerationManager()
+    {
+        return this.generationManager;
+    }
+
+    @Override
+    public Map<BOPClimates, Integer> getWeightMap()
+    {
+        return this.weightMap;
+    }
+
+    @Override
+    public void addWeight(BOPClimates climate, int weight)
+    {
+        this.weightMap.put(climate, weight);
+    }
+
+    @Override
+    public void clearWeights()
+    {
+        this.weightMap.clear();
+    }
+
+    // whether or not a biome essence item corresponding to this biome should be able to drop from biome blocks
+    public boolean hasBiomeEssence()
+    {
+        return this.hasBiomeEssence;
+    }
+
+    public int getFogColor(BlockPos pos) { return this.fogColor; }
+
+    public float getFogDensity(BlockPos pos) { return this.fogDensity; }
+
+    @Override
+    public int getSkyColorByTemp(float temperature)
+    {
+        return (this.skyColor == -1) ? super.getSkyColorByTemp(temperature) : this.skyColor;
+    }
+
+    @Override
+    public Biome getBaseBiome()
+    {
+        return this;
+    }
+
+    @Override
+    public ResourceLocation getResourceLocation()
+    {
+        return this.location;
+    }
+
+    public static class PropsBuilder
+    {
+        private final String biomeName;
+
+        /**The colour of this biome as seen in guis**/
+        private int guiColour = 0xffffff;
+        private float baseHeight = 0.1F;
+        private float heightVariation = 0.2F;
+        private float temperature = 0.5F;
+        private float rainfall = 0.5F;
+        private int waterColor = 16777215;
+        private boolean enableSnow = false;
+        private boolean enableRain = true;
+        private String baseBiomeRegName;
+
+        public PropsBuilder(String name) { this.biomeName = name; }
+
+        public PropsBuilder withGuiColour(Integer colour) { if (colour != null) this.guiColour = colour; return this; }
+        public PropsBuilder withTemperature(Float temperature) { if (temperature != null) this.temperature = temperature; return this; }
+        public PropsBuilder withRainfall(Float rainfall) { if (rainfall != null) this.rainfall = rainfall; return this; }
+        public PropsBuilder withBaseHeight(Float baseHeight) { if (baseHeight != null) this.baseHeight = baseHeight; return this; }
+        public PropsBuilder withHeightVariation(Float heightVariation) { if (heightVariation != null) this.heightVariation = heightVariation; return this; }
+        public PropsBuilder withRainDisabled() { this.enableRain = false; return this; }
+        public PropsBuilder withSnowEnabled() { this.enableSnow = true; return this; }
+        public PropsBuilder withWaterColor(Integer waterColor) { if (waterColor != null) this.waterColor = waterColor; return this; }
+        public PropsBuilder withBaseBiome(String name) { if (name != null) this.baseBiomeRegName = name; return this; }
+
+        public BiomeProps build()
+        {
+            return new BiomeProps(this.biomeName, this.temperature, this.rainfall, this.baseHeight, this.heightVariation, this.enableRain, this.enableSnow, this.waterColor, this.baseBiomeRegName, this.guiColour);
+        }
+    }
+
+    public static class BiomeProps extends BiomeProperties
+    {
+        /**The colour of this biome as seen in guis**/
+        private int guiColour = 0xffffff;
+
+        private BiomeProps(String name, float temperature, float rainfall, float baseHeight, float heightVariation, boolean enableRain, boolean enableSnow, int waterColor, String baseBiomeRegName, int guiColour)
+        {
+            super(name);
+
+            this.setTemperature(temperature);
+            this.setRainfall(rainfall);
+            this.setBaseHeight(baseHeight);
+            this.setHeightVariation(heightVariation);
+            if (!enableRain) this.setRainDisabled();
+            if (enableSnow) this.setSnowEnabled();
+            this.setWaterColor(waterColor);
+            this.setBaseBiome(baseBiomeRegName);
+
+            this.guiColour = guiColour;
+        }
+    }
+}

src/main/java/biomesoplenty/common/biome/overworld/BOPOverworldBiome.java

@@ -54,7 +54,7 @@ import net.minecraft.world.biome.Biome;
 import net.minecraft.world.chunk.ChunkPrimer;
 import net.minecraftforge.fml.common.registry.ForgeRegistries;
 
-public class BOPBiome extends Biome implements IExtendedBiome
+public class BOPOverworldBiome extends Biome implements IExtendedBiome
 {
     private GenerationManager generationManager = new GenerationManager();
     private Map<BOPClimates, Integer> weightMap = new HashMap<BOPClimates, Integer>();
@@ -84,7 +84,7 @@ public class BOPBiome extends Biome implements IExtendedBiome
     public final ResourceLocation location;
     public IConfigObj conf;
     
-    private BOPBiome(ResourceLocation idLoc, PropsBuilder defaultBuilder, IConfigObj conf)
+    private BOPOverworldBiome(ResourceLocation idLoc, PropsBuilder defaultBuilder, IConfigObj conf)
     {
         super(configureBiomeProps(idLoc, defaultBuilder, conf));
 
@@ -108,7 +108,7 @@ public class BOPBiome extends Biome implements IExtendedBiome
         this.addGenerator("stone_formations", GeneratorStage.FLOWERS,(new GeneratorColumns.Builder()).amountPerChunk(30.0F).generationAttempts(32).placeOn(suitableStonePosition).with(BOPBlocks.stone_formations.getDefaultState()).minHeight(1).maxHeight(5).randomDirection(true).scatterYMethod(ScatterYMethod.BELOW_GROUND).create());
     }
     
-    public BOPBiome(String idName, PropsBuilder defaultBuilder)
+    public BOPOverworldBiome(String idName, PropsBuilder defaultBuilder)
     {
         this(new ResourceLocation(BiomesOPlenty.MOD_ID, idName), defaultBuilder, ModBiomes.readConfigFile(idName));
     }

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenAlps.java

@@ -18,7 +18,7 @@ import biomesoplenty.common.world.generator.GeneratorOreSingle;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Blocks;
 
-public class BiomeGenAlps extends BOPBiome
+public class BiomeGenAlps extends BOPOverworldBiome
 {
     public BiomeGenAlps()
     {

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBambooForest.java

@@ -42,7 +42,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.ChunkPrimer;
 
-public class BiomeGenBambooForest extends BOPBiome
+public class BiomeGenBambooForest extends BOPOverworldBiome
 {    
     
     public IBlockState usualTopBlock;

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBayou.java

@@ -41,7 +41,7 @@ import net.minecraft.entity.monster.EntitySlime;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
 
-public class BiomeGenBayou extends BOPBiome
+public class BiomeGenBayou extends BOPOverworldBiome
 {    
     
     public BiomeGenBayou()

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBog.java

@@ -43,7 +43,7 @@ import net.minecraft.entity.monster.EntitySlime;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
 
-public class BiomeGenBog extends BOPBiome
+public class BiomeGenBog extends BOPOverworldBiome
 {    
     
     public BiomeGenBog()
@@ -61,7 +61,7 @@ public class BiomeGenBog extends BOPBiome
         
         if (BOPBiomes.gravel_beach.isPresent())
         {
-        	this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+        	this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
         }
         
         this.addWeight(BOPClimates.COLD_SWAMP, 7);

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java

@@ -26,7 +26,7 @@ import net.minecraft.entity.passive.EntityWolf;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
 
-public class BiomeGenBorealForest extends BOPBiome
+public class BiomeGenBorealForest extends BOPOverworldBiome
 {    
     public BiomeGenBorealForest()
     {
@@ -41,7 +41,7 @@ public class BiomeGenBorealForest extends BOPBiome
         
         if (BOPBiomes.gravel_beach.isPresent())
         {
-        	this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+        	this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
         }
         
         this.spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 5, 4, 4));

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBrushland.java

@@ -27,7 +27,7 @@ import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
 
-public class BiomeGenBrushland extends BOPBiome
+public class BiomeGenBrushland extends BOPOverworldBiome
 {   
     
     public BiomeGenBrushland()

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenChaparral.java

@@ -33,7 +33,7 @@ import net.minecraft.entity.passive.EntityHorse;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
 
-public class BiomeGenChaparral extends BOPBiome
+public class BiomeGenChaparral extends BOPOverworldBiome
 {    
     public BiomeGenChaparral()
     {

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java

@@ -37,7 +37,7 @@ import net.minecraft.block.BlockTallGrass;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
  
-public class BiomeGenCherryBlossomGrove extends BOPBiome
+public class BiomeGenCherryBlossomGrove extends BOPOverworldBiome
 {
     public BiomeGenCherryBlossomGrove()
     {

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenColdDesert.java

@@ -31,7 +31,7 @@ import net.minecraft.world.World;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.chunk.ChunkPrimer;
 
-public class BiomeGenColdDesert extends BOPBiome
+public class BiomeGenColdDesert extends BOPOverworldBiome
 {    
     
 	public IBlockState usualTopBlock;

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java

@@ -28,7 +28,7 @@ import net.minecraft.block.BlockTallGrass;
 import net.minecraft.entity.passive.EntityWolf;
 import net.minecraft.init.Blocks;
 
-public class BiomeGenConiferousForest extends BOPBiome
+public class BiomeGenConiferousForest extends BOPOverworldBiome
 {
     
     public BiomeGenConiferousForest()
@@ -42,7 +42,7 @@ public class BiomeGenConiferousForest extends BOPBiome
         
         if (BOPBiomes.gravel_beach.isPresent())
         {
-        	this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+        	this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
         }
     
         this.addWeight(BOPClimates.BOREAL, 10);

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCoralReef.java

@@ -21,7 +21,7 @@ import biomesoplenty.common.world.generator.GeneratorOreSingle;
 import net.minecraft.init.Biomes;
 import net.minecraft.init.Blocks;
  
-public class BiomeGenCoralReef extends BOPBiome
+public class BiomeGenCoralReef extends BOPOverworldBiome
 {
     public BiomeGenCoralReef()
     {

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCrag.java

@@ -16,7 +16,7 @@ import biomesoplenty.api.generation.GeneratorStage;
 import biomesoplenty.common.world.generator.GeneratorOreSingle;
 import net.minecraft.init.Blocks;
 
-public class BiomeGenCrag extends BOPBiome
+public class BiomeGenCrag extends BOPOverworldBiome
 {    
     public BiomeGenCrag()
     {

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadForest.java

@@ -33,7 +33,7 @@ import net.minecraft.block.BlockTallGrass;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
 
-public class BiomeGenDeadForest extends BOPBiome
+public class BiomeGenDeadForest extends BOPOverworldBiome
 {    
     public BiomeGenDeadForest()
     {
@@ -50,7 +50,7 @@ public class BiomeGenDeadForest extends BOPBiome
         
         if (BOPBiomes.gravel_beach.isPresent())
         {
-        	this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+        	this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
         }
         
         this.addWeight(BOPClimates.BOREAL, 3);

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadSwamp.java

@@ -39,7 +39,7 @@ import net.minecraft.block.BlockTallGrass;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
 
-public class BiomeGenDeadSwamp extends BOPBiome
+public class BiomeGenDeadSwamp extends BOPOverworldBiome
 {
     
     public BiomeGenDeadSwamp()

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDummyTemplate.java

@@ -40,7 +40,7 @@ import net.minecraft.util.math.BlockPos;
 
 // This class is not intended to be used in the game
 // It just contains one of every common generator, so it can be used as a template when creating new biomes - just delete lines you don't want and adjust weightings
-public class BiomeGenDummyTemplate extends BOPBiome
+public class BiomeGenDummyTemplate extends BOPOverworldBiome
 {
 
     public BiomeGenDummyTemplate()

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java

@@ -30,7 +30,7 @@ import net.minecraft.block.BlockTallGrass;
 import net.minecraft.entity.passive.EntityOcelot;
 import net.minecraft.init.Blocks;
 
-public class BiomeGenEucalyptusForest extends BOPBiome
+public class BiomeGenEucalyptusForest extends BOPOverworldBiome
 {
     
     public BiomeGenEucalyptusForest()

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFen.java

@@ -44,7 +44,7 @@ import net.minecraft.block.BlockTallGrass;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
 
-public class BiomeGenFen extends BOPBiome
+public class BiomeGenFen extends BOPOverworldBiome
 {
         
     public BiomeGenFen()
@@ -63,7 +63,7 @@ public class BiomeGenFen extends BOPBiome
         
         if (BOPBiomes.gravel_beach.isPresent())
         {
-        	this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+        	this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
         }
 
         this.addWeight(BOPClimates.COLD_SWAMP, 7);

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerField.java

@@ -23,7 +23,7 @@ import net.minecraft.block.BlockFlower.EnumFlowerType;
 import net.minecraft.block.BlockTallGrass;
 import net.minecraft.util.math.BlockPos;
 
-public class BiomeGenFlowerField extends BOPBiome
+public class BiomeGenFlowerField extends BOPOverworldBiome
 {    
     public BiomeGenFlowerField()
     {

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerIsland.java

@@ -36,7 +36,7 @@ import net.minecraft.block.BlockTallGrass;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
 
-public class BiomeGenFlowerIsland extends BOPBiome
+public class BiomeGenFlowerIsland extends BOPOverworldBiome
 {
 
     public BiomeGenFlowerIsland()

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGlacier.java

@@ -18,7 +18,7 @@ import net.minecraft.entity.monster.EntityPolarBear;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.biome.Biome;
 
-public class BiomeGenGlacier extends BOPBiome
+public class BiomeGenGlacier extends BOPOverworldBiome
 {    
     
     public BiomeGenGlacier()

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrassland.java

@@ -33,7 +33,7 @@ import net.minecraft.entity.passive.EntityHorse;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
 
-public class BiomeGenGrassland extends BOPBiome {
+public class BiomeGenGrassland extends BOPOverworldBiome {
     
     public BiomeGenGrassland() {
 
@@ -47,7 +47,7 @@ public class BiomeGenGrassland extends BOPBiome {
         
         if (BOPBiomes.gravel_beach.isPresent())
         {
-        	this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+        	this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
         }
         
         this.canGenerateVillages = true;

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGravelBeach.java

@@ -13,7 +13,7 @@ import biomesoplenty.api.config.IBOPWorldSettings.GeneratorType;
 import biomesoplenty.common.world.generator.GeneratorWeighted;
 import net.minecraft.init.Blocks;
  
-public class BiomeGenGravelBeach extends BOPBiome
+public class BiomeGenGravelBeach extends BOPOverworldBiome
 {
     public BiomeGenGravelBeach()
     {

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrove.java

@@ -30,7 +30,7 @@ import net.minecraft.block.BlockPlanks;
 import net.minecraft.block.BlockTallGrass;
 import net.minecraft.util.math.BlockPos;
 
-public class BiomeGenGrove extends BOPBiome
+public class BiomeGenGrove extends BOPOverworldBiome
 {
     
     public BiomeGenGrove()

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHeathland.java

@@ -36,7 +36,7 @@ import net.minecraft.entity.passive.EntityHorse;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
 
-public class BiomeGenHeathland extends BOPBiome
+public class BiomeGenHeathland extends BOPOverworldBiome
 {    
     public BiomeGenHeathland()
     {

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHighland.java

@@ -23,7 +23,7 @@ import net.minecraft.block.BlockDoublePlant;
 import net.minecraft.block.BlockTallGrass;
 import net.minecraft.init.Blocks;
 
-public class BiomeGenHighland extends BOPBiome
+public class BiomeGenHighland extends BOPOverworldBiome
 {
         
     public BiomeGenHighland()

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenKelpForest.java

@@ -23,7 +23,7 @@ import biomesoplenty.common.world.generator.GeneratorOreSingle;
 import net.minecraft.init.Biomes;
 import net.minecraft.init.Blocks;
  
-public class BiomeGenKelpForest extends BOPBiome
+public class BiomeGenKelpForest extends BOPOverworldBiome
 {
     public BiomeGenKelpForest()
     {

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLandOfLakes.java

@@ -35,7 +35,7 @@ import net.minecraft.block.BlockTallGrass;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
 
-public class BiomeGenLandOfLakes extends BOPBiome
+public class BiomeGenLandOfLakes extends BOPOverworldBiome
 {
    
     // TODO: fog color / closeness? what's that?
@@ -58,7 +58,7 @@ public class BiomeGenLandOfLakes extends BOPBiome
         
         if (BOPBiomes.gravel_beach.isPresent())
         {
-        	this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+        	this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
         }
         
         this.spawnableWaterCreatureList.clear();       

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLavenderFields.java

@@ -31,7 +31,7 @@ import net.minecraft.block.BlockTallGrass;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
  
-public class BiomeGenLavenderFields extends BOPBiome
+public class BiomeGenLavenderFields extends BOPOverworldBiome
 {
     public BiomeGenLavenderFields()
     {

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushDesert.java

@@ -35,7 +35,7 @@ import net.minecraft.block.BlockPlanks;
 import net.minecraft.block.BlockTallGrass;
 import net.minecraft.init.Blocks;
 
-public class BiomeGenLushDesert extends BOPBiome
+public class BiomeGenLushDesert extends BOPOverworldBiome
 {
     public BiomeGenLushDesert()
     {

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushSwamp.java

@@ -41,7 +41,7 @@ import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.monster.EntitySlime;
 import net.minecraft.init.Blocks;
 
-public class BiomeGenLushSwamp extends BOPBiome
+public class BiomeGenLushSwamp extends BOPOverworldBiome
 {    
     
     public BiomeGenLushSwamp()

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMangrove.java

@@ -31,7 +31,7 @@ import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.ChunkPrimer;
  
-public class BiomeGenMangrove extends BOPBiome
+public class BiomeGenMangrove extends BOPOverworldBiome
 {
 	public IBlockState usualTopBlock;
     public IBlockState alternateTopBlock;

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java

@@ -22,7 +22,7 @@ import net.minecraft.block.BlockTallGrass;
 import net.minecraft.entity.passive.EntityWolf;
 import net.minecraft.init.Blocks;
 
-public class BiomeGenMapleWoods extends BOPBiome
+public class BiomeGenMapleWoods extends BOPOverworldBiome
 {    
     public BiomeGenMapleWoods()
     {
@@ -37,7 +37,7 @@ public class BiomeGenMapleWoods extends BOPBiome
         
         if (BOPBiomes.gravel_beach.isPresent())
         {
-        	this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+        	this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
         }
         
         this.spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 5, 4, 4));

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMarsh.java

@@ -32,7 +32,7 @@ import net.minecraft.block.BlockTallGrass;
 import net.minecraft.entity.monster.EntitySlime;
 import net.minecraft.init.Blocks;
 
-public class BiomeGenMarsh extends BOPBiome
+public class BiomeGenMarsh extends BOPOverworldBiome
 {
    
     // TODO: fog color / closeness? what's that?

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java

@@ -30,7 +30,7 @@ import net.minecraft.block.BlockTallGrass;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
 
-public class BiomeGenMeadow extends BOPBiome
+public class BiomeGenMeadow extends BOPOverworldBiome
 {    
     public BiomeGenMeadow()
     {
@@ -46,7 +46,7 @@ public class BiomeGenMeadow extends BOPBiome
         
         if (BOPBiomes.gravel_beach.isPresent())
         {
-        	this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+        	this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
         }
         
         this.spawnableCreatureList.add(new SpawnListEntry(EntitySnail.class, 6, 1, 2));

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMoor.java

@@ -33,7 +33,7 @@ import net.minecraft.block.BlockTallGrass;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
 
-public class BiomeGenMoor extends BOPBiome
+public class BiomeGenMoor extends BOPOverworldBiome
 {    
     
     public BiomeGenMoor()

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java

@@ -47,7 +47,7 @@ import net.minecraft.world.World;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.chunk.ChunkPrimer;
 
-public class BiomeGenMountain extends BOPBiome
+public class BiomeGenMountain extends BOPOverworldBiome
 {
     
     public static enum MountainType {PEAKS, FOOTHILLS}

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java

@@ -45,7 +45,7 @@ import net.minecraft.entity.monster.EntityWitch;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
 
-public class BiomeGenMysticGrove extends BOPBiome
+public class BiomeGenMysticGrove extends BOPOverworldBiome
 {    
     
     public BiomeGenMysticGrove()

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOasis.java

@@ -40,7 +40,7 @@ import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.ChunkPrimer;
  
-public class BiomeGenOasis extends BOPBiome
+public class BiomeGenOasis extends BOPOverworldBiome
 {
 	public IBlockState usualTopBlock;
     public IBlockState alternateTopBlock;

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java

@@ -36,7 +36,7 @@ import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
 
-public class BiomeGenOminousWoods extends BOPBiome
+public class BiomeGenOminousWoods extends BOPOverworldBiome
 {    
     
     public BiomeGenOminousWoods()

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOrchard.java

@@ -23,7 +23,7 @@ import net.minecraft.block.BlockTallGrass;
 import net.minecraft.entity.passive.EntityHorse;
 import net.minecraft.util.math.BlockPos;
 
-public class BiomeGenOrchard extends BOPBiome
+public class BiomeGenOrchard extends BOPOverworldBiome
 {
     public BiomeGenOrchard()
     {

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOriginIsland.java

@@ -31,7 +31,7 @@ import net.minecraft.entity.passive.EntitySheep;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.biome.Biome;
 
-public class BiomeGenOriginIsland extends BOPBiome
+public class BiomeGenOriginIsland extends BOPOverworldBiome
 {
     public BiomeGenOriginIsland()
     {

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOutback.java

@@ -31,7 +31,7 @@ import net.minecraft.block.BlockSand;
 import net.minecraft.block.BlockTallGrass;
 import net.minecraft.init.Blocks;
 
-public class BiomeGenOutback extends BOPBiome
+public class BiomeGenOutback extends BOPOverworldBiome
 {    
     public BiomeGenOutback()
     {

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOvergrownCliffs.java

@@ -27,7 +27,7 @@ import net.minecraft.block.BlockTallGrass;
 import net.minecraft.entity.passive.EntityOcelot;
 import net.minecraft.init.Blocks;
 
-public class BiomeGenOvergrownCliffs extends BOPBiome
+public class BiomeGenOvergrownCliffs extends BOPOverworldBiome
 {
     public BiomeGenOvergrownCliffs()
     {

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPrairie.java

@@ -27,7 +27,7 @@ import net.minecraft.entity.passive.EntityHorse;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
 
-public class BiomeGenPrairie extends BOPBiome
+public class BiomeGenPrairie extends BOPOverworldBiome
 {
     public BiomeGenPrairie()
     {

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenQuagmire.java

@@ -39,7 +39,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.ChunkPrimer;
 
-public class BiomeGenQuagmire extends BOPBiome
+public class BiomeGenQuagmire extends BOPOverworldBiome
 {    
     public IBlockState usualTopBlock;
     public IBlockState usualFillerBlock;

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRainforest.java

@@ -25,7 +25,7 @@ import net.minecraft.entity.passive.EntityOcelot;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
 
-public class BiomeGenRainforest extends BOPBiome
+public class BiomeGenRainforest extends BOPOverworldBiome
 {    
     public BiomeGenRainforest()
     {

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRedwoodForest.java

@@ -30,7 +30,7 @@ import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.ChunkPrimer;
 
-public class BiomeGenRedwoodForest extends BOPBiome
+public class BiomeGenRedwoodForest extends BOPOverworldBiome
 {
 	
     public IBlockState usualTopBlock;

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSacredSprings.java

@@ -29,7 +29,7 @@ import net.minecraft.entity.passive.EntityOcelot;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
 
-public class BiomeGenSacredSprings extends BOPBiome
+public class BiomeGenSacredSprings extends BOPOverworldBiome
 {
     public BiomeGenSacredSprings()
     {

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSeasonalForest.java

@@ -26,7 +26,7 @@ import net.minecraft.entity.passive.EntityWolf;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
 
-public class BiomeGenSeasonalForest extends BOPBiome
+public class BiomeGenSeasonalForest extends BOPOverworldBiome
 {    
     public BiomeGenSeasonalForest()
     {
@@ -41,7 +41,7 @@ public class BiomeGenSeasonalForest extends BOPBiome
         
         if (BOPBiomes.gravel_beach.isPresent())
         {
-        	this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+        	this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
         }
         
         this.spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 5, 4, 4));

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java

@@ -41,7 +41,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.ChunkPrimer;
 
-public class BiomeGenShield extends BOPBiome
+public class BiomeGenShield extends BOPOverworldBiome
 {    
     public IBlockState usualTopBlock;
     public IBlockState alternateTopBlock;
@@ -61,7 +61,7 @@ public class BiomeGenShield extends BOPBiome
         
         if (BOPBiomes.gravel_beach.isPresent())
         {
-        	this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+        	this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
         }
         
         this.addWeight(BOPClimates.BOREAL, 5);

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShrubland.java

@@ -29,7 +29,7 @@ import net.minecraft.entity.passive.EntityHorse;
 import net.minecraft.entity.passive.EntityLlama;
 import net.minecraft.init.Blocks;
 
-public class BiomeGenShrubland extends BOPBiome
+public class BiomeGenShrubland extends BOPOverworldBiome
 {
     
     public BiomeGenShrubland()
@@ -46,7 +46,7 @@ public class BiomeGenShrubland extends BOPBiome
         
         if (BOPBiomes.gravel_beach.isPresent())
         {
-        	this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+        	this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
         }
         
         this.spawnableCreatureList.add(new SpawnListEntry(EntityHorse.class, 5, 2, 6));

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyConiferousForest.java

@@ -24,7 +24,7 @@ import net.minecraft.block.BlockTallGrass;
 import net.minecraft.entity.passive.EntityWolf;
 import net.minecraft.init.Blocks;
 
-public class BiomeGenSnowyConiferousForest extends BOPBiome
+public class BiomeGenSnowyConiferousForest extends BOPOverworldBiome
 {
     
     public BiomeGenSnowyConiferousForest()

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyForest.java

@@ -31,7 +31,7 @@ import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
 
 
-public class BiomeGenSnowyForest extends BOPBiome
+public class BiomeGenSnowyForest extends BOPOverworldBiome
 {
     public BiomeGenSnowyForest()
     {

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSteppe.java

@@ -35,7 +35,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.ChunkPrimer;
 
-public class BiomeGenSteppe extends BOPBiome
+public class BiomeGenSteppe extends BOPOverworldBiome
 {
     public IBlockState usualTopBlock;
     public IBlockState alternateTopBlock;
@@ -59,7 +59,7 @@ public class BiomeGenSteppe extends BOPBiome
         
         if (BOPBiomes.gravel_beach.isPresent())
         {
-        	this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+        	this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
         }
         
         this.spawnableCreatureList.add(new SpawnListEntry(EntityHorse.class, 5, 2, 6));

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java

@@ -34,7 +34,7 @@ import net.minecraft.block.BlockTallGrass;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
 
-public class BiomeGenTemperateRainforest extends BOPBiome
+public class BiomeGenTemperateRainforest extends BOPOverworldBiome
 {
     
     public BiomeGenTemperateRainforest()
@@ -50,7 +50,7 @@ public class BiomeGenTemperateRainforest extends BOPBiome
         
         if (BOPBiomes.gravel_beach.isPresent())
         {
-        	this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+        	this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
         }
         
         this.spawnableCreatureList.add(new SpawnListEntry(EntitySnail.class, 6, 1, 2));

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalIsland.java

@@ -31,7 +31,7 @@ import net.minecraft.block.BlockPlanks;
 import net.minecraft.block.BlockTallGrass;
 import net.minecraft.init.Blocks;
  
-public class BiomeGenTropicalIsland extends BOPBiome
+public class BiomeGenTropicalIsland extends BOPOverworldBiome
 {
     public BiomeGenTropicalIsland()
     {

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalRainforest.java

@@ -29,7 +29,7 @@ import net.minecraft.entity.passive.EntityOcelot;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
 
-public class BiomeGenTropicalRainforest extends BOPBiome
+public class BiomeGenTropicalRainforest extends BOPOverworldBiome
 {
     
     public BiomeGenTropicalRainforest()

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java

@@ -32,7 +32,7 @@ import net.minecraft.block.BlockTallGrass;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
 
-public class BiomeGenTundra extends BOPBiome
+public class BiomeGenTundra extends BOPOverworldBiome
 {    
     public BiomeGenTundra()
     {
@@ -52,7 +52,7 @@ public class BiomeGenTundra extends BOPBiome
         
         if (BOPBiomes.gravel_beach.isPresent())
         {
-        	this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+        	this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
         }
         
         this.spawnableCreatureList.clear();

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenVolcanicIsland.java

@@ -21,7 +21,7 @@ import biomesoplenty.common.world.generator.GeneratorOreSingle;
 import biomesoplenty.common.world.generator.GeneratorSplotches;
 import net.minecraft.init.Blocks;
  
-public class BiomeGenVolcanicIsland extends BOPBiome
+public class BiomeGenVolcanicIsland extends BOPOverworldBiome
 {
     public BiomeGenVolcanicIsland()
     {

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java

@@ -30,7 +30,7 @@ import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
 
-public class BiomeGenWasteland extends BOPBiome
+public class BiomeGenWasteland extends BOPOverworldBiome
 {    
     
     public BiomeGenWasteland()

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java

@@ -45,7 +45,7 @@ import net.minecraft.entity.monster.EntitySlime;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
 
-public class BiomeGenWetland extends BOPBiome
+public class BiomeGenWetland extends BOPOverworldBiome
 {    
     
     public BiomeGenWetland()

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java

@@ -32,7 +32,7 @@ import net.minecraft.block.BlockTallGrass;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
 
-public class BiomeGenWoodland extends BOPBiome
+public class BiomeGenWoodland extends BOPOverworldBiome
 {
         
     public BiomeGenWoodland()
@@ -48,7 +48,7 @@ public class BiomeGenWoodland extends BOPBiome
         
         if (BOPBiomes.gravel_beach.isPresent())
         {
-        	this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+        	this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
         }
         
         this.spawnableCreatureList.add(new SpawnListEntry(EntitySnail.class, 6, 1, 2));

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenXericShrubland.java

@@ -36,7 +36,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.ChunkPrimer;
 
-public class BiomeGenXericShrubland extends BOPBiome
+public class BiomeGenXericShrubland extends BOPOverworldBiome
 {
 	public IBlockState usualTopBlock;
     public IBlockState alternateTopBlock;

src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForest.java

@@ -7,7 +7,7 @@ import biomesoplenty.api.enums.BOPFlowers;
 import biomesoplenty.api.enums.BOPGems;
 import biomesoplenty.api.enums.BOPPlants;
 import biomesoplenty.api.generation.GeneratorStage;
-import biomesoplenty.common.biome.overworld.BOPBiome;
+import biomesoplenty.common.biome.overworld.BOPOverworldBiome;
 import biomesoplenty.common.block.BlockBOPDoublePlant;
 import biomesoplenty.common.block.BlockBOPMushroom;
 import biomesoplenty.common.world.generator.GeneratorDoubleFlora;
@@ -25,7 +25,7 @@ public class BiomeExtBirchForest extends ExtendedBiomeWrapper
         
         if (BOPBiomes.gravel_beach.isPresent())
         {
-            this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+            this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
         }
         
         // grasses

src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtBirchForestHills.java

@@ -7,7 +7,7 @@ import biomesoplenty.api.enums.BOPFlowers;
 import biomesoplenty.api.enums.BOPGems;
 import biomesoplenty.api.enums.BOPPlants;
 import biomesoplenty.api.generation.GeneratorStage;
-import biomesoplenty.common.biome.overworld.BOPBiome;
+import biomesoplenty.common.biome.overworld.BOPOverworldBiome;
 import biomesoplenty.common.block.BlockBOPDoublePlant;
 import biomesoplenty.common.block.BlockBOPMushroom;
 import biomesoplenty.common.world.generator.GeneratorDoubleFlora;
@@ -25,7 +25,7 @@ public class BiomeExtBirchForestHills extends ExtendedBiomeWrapper
         
         if (BOPBiomes.gravel_beach.isPresent())
         {
-            this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+            this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
         }
         
         // grasses

src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForest.java

@@ -8,7 +8,7 @@ import biomesoplenty.api.enums.BOPGems;
 import biomesoplenty.api.enums.BOPPlants;
 import biomesoplenty.api.enums.BOPTrees;
 import biomesoplenty.api.generation.GeneratorStage;
-import biomesoplenty.common.biome.overworld.BOPBiome;
+import biomesoplenty.common.biome.overworld.BOPOverworldBiome;
 import biomesoplenty.common.block.BlockBOPDoublePlant;
 import biomesoplenty.common.block.BlockBOPMushroom;
 import biomesoplenty.common.world.generator.GeneratorDoubleFlora;
@@ -27,7 +27,7 @@ public class BiomeExtForest extends ExtendedBiomeWrapper
         
         if (BOPBiomes.gravel_beach.isPresent())
         {
-            this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+            this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
         }
         
         // trees

src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtForestHills.java

@@ -8,7 +8,7 @@ import biomesoplenty.api.enums.BOPGems;
 import biomesoplenty.api.enums.BOPPlants;
 import biomesoplenty.api.enums.BOPTrees;
 import biomesoplenty.api.generation.GeneratorStage;
-import biomesoplenty.common.biome.overworld.BOPBiome;
+import biomesoplenty.common.biome.overworld.BOPOverworldBiome;
 import biomesoplenty.common.block.BlockBOPDoublePlant;
 import biomesoplenty.common.block.BlockBOPMushroom;
 import biomesoplenty.common.world.generator.GeneratorDoubleFlora;
@@ -27,7 +27,7 @@ public class BiomeExtForestHills extends ExtendedBiomeWrapper
         
         if (BOPBiomes.gravel_beach.isPresent())
         {
-            this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+            this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
         }
         
         // trees

src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaiga.java

@@ -7,7 +7,7 @@ import biomesoplenty.api.enums.BOPFlowers;
 import biomesoplenty.api.enums.BOPGems;
 import biomesoplenty.api.enums.BOPPlants;
 import biomesoplenty.api.generation.GeneratorStage;
-import biomesoplenty.common.biome.overworld.BOPBiome;
+import biomesoplenty.common.biome.overworld.BOPOverworldBiome;
 import biomesoplenty.common.world.generator.GeneratorFlora;
 import biomesoplenty.common.world.generator.GeneratorGrass;
 import biomesoplenty.common.world.generator.GeneratorOreSingle;
@@ -22,7 +22,7 @@ public class BiomeExtMegaTaiga extends ExtendedBiomeWrapper
         
         if (BOPBiomes.gravel_beach.isPresent())
         {
-            this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+            this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
         }
         
         // grasses

src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtMegaTaigaHills.java

@@ -7,7 +7,7 @@ import biomesoplenty.api.enums.BOPFlowers;
 import biomesoplenty.api.enums.BOPGems;
 import biomesoplenty.api.enums.BOPPlants;
 import biomesoplenty.api.generation.GeneratorStage;
-import biomesoplenty.common.biome.overworld.BOPBiome;
+import biomesoplenty.common.biome.overworld.BOPOverworldBiome;
 import biomesoplenty.common.world.generator.GeneratorFlora;
 import biomesoplenty.common.world.generator.GeneratorGrass;
 import biomesoplenty.common.world.generator.GeneratorOreSingle;
@@ -22,7 +22,7 @@ public class BiomeExtMegaTaigaHills extends ExtendedBiomeWrapper
         
         if (BOPBiomes.gravel_beach.isPresent())
         {
-            this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+            this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
         }
         
         // grasses

src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaiga.java

@@ -7,7 +7,7 @@ import biomesoplenty.api.enums.BOPFlowers;
 import biomesoplenty.api.enums.BOPGems;
 import biomesoplenty.api.enums.BOPPlants;
 import biomesoplenty.api.generation.GeneratorStage;
-import biomesoplenty.common.biome.overworld.BOPBiome;
+import biomesoplenty.common.biome.overworld.BOPOverworldBiome;
 import biomesoplenty.common.world.generator.GeneratorFlora;
 import biomesoplenty.common.world.generator.GeneratorGrass;
 import biomesoplenty.common.world.generator.GeneratorOreSingle;
@@ -22,7 +22,7 @@ public class BiomeExtTaiga extends ExtendedBiomeWrapper
         
         if (BOPBiomes.gravel_beach.isPresent())
         {
-            this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+            this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
         }
         
         // grasses

src/main/java/biomesoplenty/common/biome/vanilla/BiomeExtTaigaHills.java

@@ -7,7 +7,7 @@ import biomesoplenty.api.enums.BOPFlowers;
 import biomesoplenty.api.enums.BOPGems;
 import biomesoplenty.api.enums.BOPPlants;
 import biomesoplenty.api.generation.GeneratorStage;
-import biomesoplenty.common.biome.overworld.BOPBiome;
+import biomesoplenty.common.biome.overworld.BOPOverworldBiome;
 import biomesoplenty.common.world.generator.GeneratorFlora;
 import biomesoplenty.common.world.generator.GeneratorGrass;
 import biomesoplenty.common.world.generator.GeneratorOreSingle;
@@ -22,7 +22,7 @@ public class BiomeExtTaigaHills extends ExtendedBiomeWrapper
         
         if (BOPBiomes.gravel_beach.isPresent())
         {
-            this.beachBiomeLocation = ((BOPBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+            this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
         }
         
         // grasses

src/main/java/biomesoplenty/common/block/BlockBOPBiomeBlock.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Random;
 
 import biomesoplenty.api.item.BOPItems;
-import biomesoplenty.common.biome.overworld.BOPBiome;
+import biomesoplenty.common.biome.BOPBiome;
 import biomesoplenty.common.util.biome.BiomeUtils;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;

src/main/java/biomesoplenty/common/handler/FogEventHandler.java

@@ -1,6 +1,6 @@
 package biomesoplenty.common.handler;
 
-import biomesoplenty.common.biome.overworld.BOPBiome;
+import biomesoplenty.common.biome.BOPBiome;
 import biomesoplenty.common.config.MiscConfigurationHandler;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;

src/main/java/biomesoplenty/common/init/ModBiomes.java

@@ -111,6 +111,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
+import biomesoplenty.common.biome.overworld.*;
 import biomesoplenty.common.world.WorldProviderBOPHell;
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableSet;
@@ -120,69 +121,7 @@ import biomesoplenty.api.biome.BOPBiomes;
 import biomesoplenty.api.biome.IExtendedBiome;
 import biomesoplenty.api.config.IConfigObj;
 import biomesoplenty.api.enums.BOPClimates;
-import biomesoplenty.common.biome.overworld.BOPBiome;
+import biomesoplenty.common.biome.BOPBiome;
-import biomesoplenty.common.biome.overworld.BiomeGenAlps;
-import biomesoplenty.common.biome.overworld.BiomeGenBambooForest;
-import biomesoplenty.common.biome.overworld.BiomeGenBayou;
-import biomesoplenty.common.biome.overworld.BiomeGenBog;
-import biomesoplenty.common.biome.overworld.BiomeGenBorealForest;
-import biomesoplenty.common.biome.overworld.BiomeGenBrushland;
-import biomesoplenty.common.biome.overworld.BiomeGenChaparral;
-import biomesoplenty.common.biome.overworld.BiomeGenCherryBlossomGrove;
-import biomesoplenty.common.biome.overworld.BiomeGenColdDesert;
-import biomesoplenty.common.biome.overworld.BiomeGenConiferousForest;
-import biomesoplenty.common.biome.overworld.BiomeGenCoralReef;
-import biomesoplenty.common.biome.overworld.BiomeGenCrag;
-import biomesoplenty.common.biome.overworld.BiomeGenDeadForest;
-import biomesoplenty.common.biome.overworld.BiomeGenDeadSwamp;
-import biomesoplenty.common.biome.overworld.BiomeGenEucalyptusForest;
-import biomesoplenty.common.biome.overworld.BiomeGenFen;
-import biomesoplenty.common.biome.overworld.BiomeGenFlowerField;
-import biomesoplenty.common.biome.overworld.BiomeGenFlowerIsland;
-import biomesoplenty.common.biome.overworld.BiomeGenGlacier;
-import biomesoplenty.common.biome.overworld.BiomeGenGrassland;
-import biomesoplenty.common.biome.overworld.BiomeGenGravelBeach;
-import biomesoplenty.common.biome.overworld.BiomeGenGrove;
-import biomesoplenty.common.biome.overworld.BiomeGenHeathland;
-import biomesoplenty.common.biome.overworld.BiomeGenHighland;
-import biomesoplenty.common.biome.overworld.BiomeGenKelpForest;
-import biomesoplenty.common.biome.overworld.BiomeGenLandOfLakes;
-import biomesoplenty.common.biome.overworld.BiomeGenLavenderFields;
-import biomesoplenty.common.biome.overworld.BiomeGenLushDesert;
-import biomesoplenty.common.biome.overworld.BiomeGenLushSwamp;
-import biomesoplenty.common.biome.overworld.BiomeGenMangrove;
-import biomesoplenty.common.biome.overworld.BiomeGenMapleWoods;
-import biomesoplenty.common.biome.overworld.BiomeGenMarsh;
-import biomesoplenty.common.biome.overworld.BiomeGenMeadow;
-import biomesoplenty.common.biome.overworld.BiomeGenMoor;
-import biomesoplenty.common.biome.overworld.BiomeGenMountain;
-import biomesoplenty.common.biome.overworld.BiomeGenMysticGrove;
-import biomesoplenty.common.biome.overworld.BiomeGenOasis;
-import biomesoplenty.common.biome.overworld.BiomeGenOminousWoods;
-import biomesoplenty.common.biome.overworld.BiomeGenOrchard;
-import biomesoplenty.common.biome.overworld.BiomeGenOriginIsland;
-import biomesoplenty.common.biome.overworld.BiomeGenOutback;
-import biomesoplenty.common.biome.overworld.BiomeGenOvergrownCliffs;
-import biomesoplenty.common.biome.overworld.BiomeGenPrairie;
-import biomesoplenty.common.biome.overworld.BiomeGenQuagmire;
-import biomesoplenty.common.biome.overworld.BiomeGenRainforest;
-import biomesoplenty.common.biome.overworld.BiomeGenRedwoodForest;
-import biomesoplenty.common.biome.overworld.BiomeGenSacredSprings;
-import biomesoplenty.common.biome.overworld.BiomeGenSeasonalForest;
-import biomesoplenty.common.biome.overworld.BiomeGenShield;
-import biomesoplenty.common.biome.overworld.BiomeGenShrubland;
-import biomesoplenty.common.biome.overworld.BiomeGenSnowyConiferousForest;
-import biomesoplenty.common.biome.overworld.BiomeGenSnowyForest;
-import biomesoplenty.common.biome.overworld.BiomeGenSteppe;
-import biomesoplenty.common.biome.overworld.BiomeGenTemperateRainforest;
-import biomesoplenty.common.biome.overworld.BiomeGenTropicalIsland;
-import biomesoplenty.common.biome.overworld.BiomeGenTropicalRainforest;
-import biomesoplenty.common.biome.overworld.BiomeGenTundra;
-import biomesoplenty.common.biome.overworld.BiomeGenVolcanicIsland;
-import biomesoplenty.common.biome.overworld.BiomeGenWasteland;
-import biomesoplenty.common.biome.overworld.BiomeGenWetland;
-import biomesoplenty.common.biome.overworld.BiomeGenWoodland;
-import biomesoplenty.common.biome.overworld.BiomeGenXericShrubland;
 import biomesoplenty.common.biome.vanilla.BiomeExtBirchForest;
 import biomesoplenty.common.biome.vanilla.BiomeExtBirchForestHills;
 import biomesoplenty.common.biome.vanilla.BiomeExtColdTaiga;
@@ -328,69 +267,69 @@ public class ModBiomes implements BOPBiomes.IBiomeRegistry
     {
         // beach biomes (normal biomes rely on these being registered first)
         
-        gravel_beach = registerBOPBiome(new BiomeGenGravelBeach());
+        gravel_beach = registerOverworldBiome(new BiomeGenGravelBeach());
         
         // normal biomes which have weights
-        alps = registerBOPBiome(new BiomeGenAlps());
+        alps = registerOverworldBiome(new BiomeGenAlps());
-        bamboo_forest = registerBOPBiome(new BiomeGenBambooForest());
+        bamboo_forest = registerOverworldBiome(new BiomeGenBambooForest());
-        bayou = registerBOPBiome(new BiomeGenBayou());
+        bayou = registerOverworldBiome(new BiomeGenBayou());
-        bog = registerBOPBiome(new BiomeGenBog());
+        bog = registerOverworldBiome(new BiomeGenBog());
-        boreal_forest = registerBOPBiome(new BiomeGenBorealForest());
+        boreal_forest = registerOverworldBiome(new BiomeGenBorealForest());
-        brushland = registerBOPBiome(new BiomeGenBrushland());
+        brushland = registerOverworldBiome(new BiomeGenBrushland());
-        chaparral = registerBOPBiome(new BiomeGenChaparral());
+        chaparral = registerOverworldBiome(new BiomeGenChaparral());
-        cherry_blossom_grove = registerBOPBiome(new BiomeGenCherryBlossomGrove());
+        cherry_blossom_grove = registerOverworldBiome(new BiomeGenCherryBlossomGrove());
-        cold_desert = registerBOPBiome(new BiomeGenColdDesert());
+        cold_desert = registerOverworldBiome(new BiomeGenColdDesert());
-        coniferous_forest = registerBOPBiome(new BiomeGenConiferousForest());
+        coniferous_forest = registerOverworldBiome(new BiomeGenConiferousForest());
-        crag = registerBOPBiome(new BiomeGenCrag());
+        crag = registerOverworldBiome(new BiomeGenCrag());
-        dead_forest = registerBOPBiome(new BiomeGenDeadForest());
+        dead_forest = registerOverworldBiome(new BiomeGenDeadForest());
-        dead_swamp = registerBOPBiome(new BiomeGenDeadSwamp());
+        dead_swamp = registerOverworldBiome(new BiomeGenDeadSwamp());
-        eucalyptus_forest = registerBOPBiome(new BiomeGenEucalyptusForest());
+        eucalyptus_forest = registerOverworldBiome(new BiomeGenEucalyptusForest());
-        fen = registerBOPBiome(new BiomeGenFen());
+        fen = registerOverworldBiome(new BiomeGenFen());
-        flower_field = registerBOPBiome(new BiomeGenFlowerField());
+        flower_field = registerOverworldBiome(new BiomeGenFlowerField());
-        grassland = registerBOPBiome(new BiomeGenGrassland());
+        grassland = registerOverworldBiome(new BiomeGenGrassland());
-        grove = registerBOPBiome(new BiomeGenGrove());
+        grove = registerOverworldBiome(new BiomeGenGrove());
-        heathland = registerBOPBiome(new BiomeGenHeathland());
+        heathland = registerOverworldBiome(new BiomeGenHeathland());
-        highland = registerBOPBiome(new BiomeGenHighland());
+        highland = registerOverworldBiome(new BiomeGenHighland());
-        land_of_lakes = registerBOPBiome(new BiomeGenLandOfLakes());
+        land_of_lakes = registerOverworldBiome(new BiomeGenLandOfLakes());
-        lavender_fields = registerBOPBiome(new BiomeGenLavenderFields());
+        lavender_fields = registerOverworldBiome(new BiomeGenLavenderFields());
-        lush_desert = registerBOPBiome(new BiomeGenLushDesert());
+        lush_desert = registerOverworldBiome(new BiomeGenLushDesert());
-        lush_swamp = registerBOPBiome(new BiomeGenLushSwamp());
+        lush_swamp = registerOverworldBiome(new BiomeGenLushSwamp());
-        maple_woods = registerBOPBiome(new BiomeGenMapleWoods());
+        maple_woods = registerOverworldBiome(new BiomeGenMapleWoods());
-        marsh = registerBOPBiome(new BiomeGenMarsh());
+        marsh = registerOverworldBiome(new BiomeGenMarsh());
-        meadow = registerBOPBiome(new BiomeGenMeadow());
+        meadow = registerOverworldBiome(new BiomeGenMeadow());
-        moor = registerBOPBiome(new BiomeGenMoor());
+        moor = registerOverworldBiome(new BiomeGenMoor());
-        mountain = registerBOPBiome(new BiomeGenMountain(BiomeGenMountain.MountainType.PEAKS));
+        mountain = registerOverworldBiome(new BiomeGenMountain(BiomeGenMountain.MountainType.PEAKS));
-        mystic_grove = registerBOPBiome(new BiomeGenMysticGrove());
+        mystic_grove = registerOverworldBiome(new BiomeGenMysticGrove());
-        ominous_woods = registerBOPBiome(new BiomeGenOminousWoods());
+        ominous_woods = registerOverworldBiome(new BiomeGenOminousWoods());
-        orchard = registerBOPBiome(new BiomeGenOrchard());
+        orchard = registerOverworldBiome(new BiomeGenOrchard());
-        outback = registerBOPBiome(new BiomeGenOutback());
+        outback = registerOverworldBiome(new BiomeGenOutback());
-        overgrown_cliffs = registerBOPBiome(new BiomeGenOvergrownCliffs());
+        overgrown_cliffs = registerOverworldBiome(new BiomeGenOvergrownCliffs());
-        prairie = registerBOPBiome(new BiomeGenPrairie());
+        prairie = registerOverworldBiome(new BiomeGenPrairie());
-        quagmire = registerBOPBiome(new BiomeGenQuagmire());
+        quagmire = registerOverworldBiome(new BiomeGenQuagmire());
-        rainforest = registerBOPBiome(new BiomeGenRainforest());
+        rainforest = registerOverworldBiome(new BiomeGenRainforest());
-        redwood_forest = registerBOPBiome(new BiomeGenRedwoodForest());
+        redwood_forest = registerOverworldBiome(new BiomeGenRedwoodForest());
-        sacred_springs = registerBOPBiome(new BiomeGenSacredSprings());
+        sacred_springs = registerOverworldBiome(new BiomeGenSacredSprings());
-        seasonal_forest = registerBOPBiome(new BiomeGenSeasonalForest());
+        seasonal_forest = registerOverworldBiome(new BiomeGenSeasonalForest());
-        shield = registerBOPBiome(new BiomeGenShield());
+        shield = registerOverworldBiome(new BiomeGenShield());
-        shrubland = registerBOPBiome(new BiomeGenShrubland());
+        shrubland = registerOverworldBiome(new BiomeGenShrubland());
-        snowy_coniferous_forest = registerBOPBiome(new BiomeGenSnowyConiferousForest());
+        snowy_coniferous_forest = registerOverworldBiome(new BiomeGenSnowyConiferousForest());
-        snowy_forest = registerBOPBiome(new BiomeGenSnowyForest());
+        snowy_forest = registerOverworldBiome(new BiomeGenSnowyForest());
-        steppe = registerBOPBiome(new BiomeGenSteppe());
+        steppe = registerOverworldBiome(new BiomeGenSteppe());
-        temperate_rainforest = registerBOPBiome(new BiomeGenTemperateRainforest());
+        temperate_rainforest = registerOverworldBiome(new BiomeGenTemperateRainforest());
-        tropical_rainforest = registerBOPBiome(new BiomeGenTropicalRainforest());
+        tropical_rainforest = registerOverworldBiome(new BiomeGenTropicalRainforest());
-        tundra = registerBOPBiome(new BiomeGenTundra());
+        tundra = registerOverworldBiome(new BiomeGenTundra());
-        wasteland = registerBOPBiome(new BiomeGenWasteland());
+        wasteland = registerOverworldBiome(new BiomeGenWasteland());
-        wetland = registerBOPBiome(new BiomeGenWetland());
+        wetland = registerOverworldBiome(new BiomeGenWetland());
-        woodland = registerBOPBiome(new BiomeGenWoodland());
+        woodland = registerOverworldBiome(new BiomeGenWoodland());
-        xeric_shrubland = registerBOPBiome(new BiomeGenXericShrubland());
+        xeric_shrubland = registerOverworldBiome(new BiomeGenXericShrubland());
         
         // edge-biomes, sub-biomes and mutated-biomes
         
-        mountain_foothills = registerBOPBiome(new BiomeGenMountain(BiomeGenMountain.MountainType.FOOTHILLS));
+        mountain_foothills = registerOverworldBiome(new BiomeGenMountain(BiomeGenMountain.MountainType.FOOTHILLS));
-        glacier = registerBOPBiome(new BiomeGenGlacier());
+        glacier = registerOverworldBiome(new BiomeGenGlacier());
-        oasis = registerBOPBiome(new BiomeGenOasis());
+        oasis = registerOverworldBiome(new BiomeGenOasis());
-        coral_reef = registerBOPBiome(new BiomeGenCoralReef());
+        coral_reef = registerOverworldBiome(new BiomeGenCoralReef());
-        kelp_forest = registerBOPBiome(new BiomeGenKelpForest());
+        kelp_forest = registerOverworldBiome(new BiomeGenKelpForest());
 
         setSubBiome(Optional.of(Biomes.ICE_PLAINS), BOPBiomes.glacier);
         setSubBiome(Optional.of(Biomes.DESERT), BOPBiomes.oasis);
@@ -399,11 +338,11 @@ public class ModBiomes implements BOPBiomes.IBiomeRegistry
 
         // island biomes
         
-        mangrove = registerBOPBiome(new BiomeGenMangrove());
+        mangrove = registerOverworldBiome(new BiomeGenMangrove());
-        origin_island = registerBOPBiome(new BiomeGenOriginIsland());
+        origin_island = registerOverworldBiome(new BiomeGenOriginIsland());
-        tropical_island = registerBOPBiome(new BiomeGenTropicalIsland());
+        tropical_island = registerOverworldBiome(new BiomeGenTropicalIsland());
-        volcanic_island = registerBOPBiome(new BiomeGenVolcanicIsland());
+        volcanic_island = registerOverworldBiome(new BiomeGenVolcanicIsland());
-        flower_island = registerBOPBiome(new BiomeGenFlowerIsland());
+        flower_island = registerOverworldBiome(new BiomeGenFlowerIsland());
     
         addIslandBiome(origin_island, 1);
         addIslandBiome(tropical_island, 3);
@@ -646,7 +585,7 @@ public class ModBiomes implements BOPBiomes.IBiomeRegistry
         return BOPBiomes.REG_INSTANCE.registerBiome(extendedBiome, idName);
     }
     
-    private static Optional<Biome> registerBOPBiome(BOPBiome biome)
+    private static Optional<Biome> registerOverworldBiome(BOPOverworldBiome biome)
     {
         String idName = biome.getResourceLocation().getResourcePath();
         Integer id = biomeIdMapConf.getInt(idName, null);

src/main/java/biomesoplenty/common/world/ChunkProviderGenerateBOP.java

@@ -26,7 +26,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 
-import biomesoplenty.common.biome.overworld.BOPBiome;
+import biomesoplenty.common.biome.overworld.BOPOverworldBiome;
 import biomesoplenty.common.util.biome.BiomeUtils;
 import net.minecraft.block.BlockFalling;
 import net.minecraft.block.state.IBlockState;
@@ -118,7 +118,7 @@ public class ChunkProviderGenerateBOP implements IChunkGenerator
         for (Biome biome : BiomeUtils.getRegisteredBiomes())
         {
             if (biome == null) {continue;}
-            this.biomeTerrainSettings.put(biome, (biome instanceof BOPBiome) ? ((BOPBiome)biome).terrainSettings : TerrainSettings.forVanillaBiome(biome));
+            this.biomeTerrainSettings.put(biome, (biome instanceof BOPOverworldBiome) ? ((BOPOverworldBiome)biome).terrainSettings : TerrainSettings.forVanillaBiome(biome));
         }
         
     }
@@ -345,7 +345,7 @@ public class ChunkProviderGenerateBOP implements IChunkGenerator
         
         // Rivers shouldn't be influenced by the neighbors
         Biome centerBiome = biomes[localX + 2 + (localZ + 2) * 10];
-        if (centerBiome == Biomes.RIVER || centerBiome == Biomes.FROZEN_RIVER || ((centerBiome instanceof BOPBiome) && ((BOPBiome)centerBiome).noNeighborTerrainInfuence))
+        if (centerBiome == Biomes.RIVER || centerBiome == Biomes.FROZEN_RIVER || ((centerBiome instanceof BOPOverworldBiome) && ((BOPOverworldBiome)centerBiome).noNeighborTerrainInfuence))
         {
             return this.biomeTerrainSettings.get(centerBiome);
         }

src/main/java/biomesoplenty/common/world/layer/GenLayerRiverMixBOP.java

@@ -10,7 +10,7 @@ package biomesoplenty.common.world.layer;
 
 import biomesoplenty.api.biome.BOPBiomes;
 import biomesoplenty.api.generation.BOPGenLayer;
-import biomesoplenty.common.biome.overworld.BOPBiome;
+import biomesoplenty.common.biome.overworld.BOPOverworldBiome;
 import net.minecraft.init.Biomes;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.gen.layer.GenLayer;
@@ -80,9 +80,9 @@ public class GenLayerRiverMixBOP extends BOPGenLayer
     {
     	Biome biome = Biome.getBiome(biomeId);
 
-    	if (biome != null && biome instanceof BOPBiome)
+    	if (biome != null && biome instanceof BOPOverworldBiome)
     	{
-    		BOPBiome bopBiome = (BOPBiome)biome;
+    		BOPOverworldBiome bopBiome = (BOPOverworldBiome)biome;
     		return bopBiome.canGenerateRivers;
     	}