Rewrote decoration. Don't try this at home.

src/main/java/biomesoplenty/BiomesOPlenty.java

@@ -11,7 +11,7 @@ import biomesoplenty.common.integration.TreecapitatorIntegration;
 import biomesoplenty.common.network.PacketPipeline;
 import biomesoplenty.common.utils.BOPModInfo;
 import biomesoplenty.common.world.WorldTypeBOP;
-import biomesoplenty.common.world.decoration.BiomeTweaker;
+import biomesoplenty.common.world.generation.WorldGenFieldAssociation;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.Mod.Instance;
@@ -52,10 +52,10 @@ public class BiomesOPlenty
         BOPItems.init();
         BOPFluids.init();
         BOPCrafting.init();
+        WorldGenFieldAssociation.init();
         BOPBiomes.init();
         BOPConfigurationVillages.init(BOPConfiguration.villagesConfigFile);
         BOPConfigurationStrongholds.init(BOPConfiguration.strongholdsConfigFile);
-        BiomeTweaker.init();
         BOPEntities.init();
         BOPVanillaCompat.init();
         

src/main/java/biomesoplenty/api/BOPObfuscationHelper.java

@@ -0,0 +1,35 @@
+package biomesoplenty.api;
+
+public class BOPObfuscationHelper 
+{
+	//BiomeGenBase
+	public static final String[] birchForest = new String[] { "birchForest", "field_150583_P" };
+	public static final String[] birchForestHills = new String[] { "birchForestHills", "field_150582_Q" };
+	public static final String[] coldTaiga = new String[] { "coldTaiga", "field_150584_S" };
+	public static final String[] coldTaigaHills = new String[] { "coldTaigaHills", "field_150579_T" };
+	public static final String[] desert = new String[] { "desert", "field_76769_d" };
+	public static final String[] desertHills = new String[] { "desertHills", "field_76786_s" };
+	public static final String[] extremeHills = new String[] { "extremeHills", "field_76770_e" };
+	public static final String[] extremeHillsEdge = new String[] { "extremeHillsEdge", "field_76783_v" };
+	public static final String[] forest = new String[] { "forest", "field_76767_f" };
+	public static final String[] forestHills = new String[] { "forestHills", "field_76785_t" };
+	public static final String[] icePlains = new String[] { "icePlains", "field_76774_n" };
+	public static final String[] jungle = new String[] { "jungle", "field_76782_w" };
+	public static final String[] jungleEdge = new String[] { "jungleEdge", "field_150574_L" };
+	public static final String[] jungleHills = new String[] { "jungleHills", "field_76792_x" };
+	public static final String[] mesa = new String[] { "mesa", "field_150589_Z" };
+	public static final String[] mesaPlateau = new String[] { "mesaPlateau", "field_150608_ab" };
+	public static final String[] mesaPlateau_F = new String[] { "mesaPlateau_F", "field_150607_aa" };
+	public static final String[] mushroomIsland = new String[] { "mushroomIsland", "field_76789_p" };
+	public static final String[] mushroomIslandShore = new String[] { "mushroomIslandShore", "field_76788_q" };
+	public static final String[] ocean = new String[] { "ocean", "field_76771_b" };
+	public static final String[] plains = new String[] { "plains", "field_76772_c" };
+	public static final String[] savanna = new String[] { "savanna", "field_150588_X" };
+	public static final String[] savannaPlateau = new String[] { "savannaPlateau", "field_150587_Y" };
+	public static final String[] swampland = new String[] { "swampland", "field_76780_h" };
+	public static final String[] taiga = new String[] { "taiga", "field_76768_g" };
+	public static final String[] taigaHills = new String[] { "taigaHills", "field_76784_u" };
+	public static final String[] river = new String[] { "river", "field_76781_i" };
+	public static final String[] roofedForest = new String[] { "roofedForest", "field_150585_R" };
+	public static final String[] hell = new String[] { "hell", "field_76778_j" };
+}

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

@@ -0,0 +1,46 @@
+package biomesoplenty.api.biome;
+
+import java.util.List;
+import java.util.Random;
+
+import cpw.mods.fml.relauncher.ReflectionHelper;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase;
+
+public class BOPBiome<T extends BOPBiomeDecorator> extends BiomeGenBase
+{
+	public final T theBiomeDecorator;
+	
+	public BOPBiome(int biomeID, Class<T> clazz, boolean register) 
+	{
+		super(biomeID, register);
+		
+		try 
+		{
+			this.theBiomeDecorator = clazz.newInstance();
+		} 
+		catch (InstantiationException | IllegalAccessException e) 
+		{
+			throw new RuntimeException();
+		} 
+		
+		this.flowers.clear();
+		this.addDefaultFlowers();
+
+		this.theBiomeDecorator.flowersPerChunk = 0;
+		this.theBiomeDecorator.grassPerChunk = 0;
+	}
+	
+	public BOPBiome(int biomeID, Class<T> clazz)
+	{
+		this(biomeID, clazz, true);
+	}
+	
+	//TODO: Wrap tree method
+	
+    @Override
+	public void decorate(World world, Random random, int chunkX, int chunkZ)
+    {
+        this.theBiomeDecorator.decorateChunk(world, random, this, chunkX, chunkZ);
+    }
+}

src/main/java/biomesoplenty/api/biome/BOPBiomeDecorator.java

@@ -0,0 +1,113 @@
+package biomesoplenty.api.biome;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+
+import biomesoplenty.common.world.generation.IBOPWorldGenerator;
+import biomesoplenty.common.world.generation.WorldGenFieldAssociation;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeDecorator;
+import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.gen.feature.WorldGenerator;
+import net.minecraftforge.event.terraingen.DecorateBiomeEvent;
+import net.minecraftforge.event.terraingen.TerrainGen;
+import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.*;
+
+public class BOPBiomeDecorator<T extends BiomeFeatures> extends BiomeDecorator
+{
+    public T bopFeatures;
+    
+    public BOPBiomeDecorator(Class<T> biomeFeaturesClass)
+    {
+    	super();
+    	
+		try 
+		{
+			this.bopFeatures = biomeFeaturesClass.newInstance();
+		} 
+		catch (InstantiationException | IllegalAccessException e) 
+		{
+			throw new RuntimeException();
+		} 
+    }
+    
+    @Override
+	public void decorateChunk(World world, Random random, BiomeGenBase biome, int chunkX, int chunkZ)
+    {
+        if (this.currentWorld != null)
+        {
+            return;
+        }
+        else
+        {
+            this.currentWorld = world;
+            this.randomGenerator = random;
+            this.chunk_X = chunkX;
+            this.chunk_Z = chunkZ;
+            this.genDecorations(biome);
+            this.currentWorld = null;
+            this.randomGenerator = null;
+        }
+    }
+    
+    @Override
+    protected void genDecorations(BiomeGenBase biome)
+    {
+    	super.genDecorations(biome);
+    	
+    	BOPBiome bopBiome = (BOPBiome)biome;
+    	
+    	for (String featureName : bopFeatures.getFeatureNames())
+    	{
+            if (featureName.equals("bopFlowersPerChunk"))
+            {
+                if (!TerrainGen.decorate(currentWorld, randomGenerator, chunk_X, chunk_Z, FLOWERS)) continue;
+            }
+            else if (featureName.equals("bopGrassPerChunk"))
+            {
+                if (!TerrainGen.decorate(currentWorld, randomGenerator, chunk_X, chunk_Z, GRASS)) continue;
+            }
+
+            WorldGenFieldAssociation.WorldFeature worldFeature = WorldGenFieldAssociation.getAssociatedFeature(featureName);
+
+            if (worldFeature != null)
+            {
+                IBOPWorldGenerator worldGenerator = worldFeature.getBOPWorldGenerator();
+
+                if (worldGenerator != null)
+                {
+                    worldGenerator.setupGeneration(currentWorld, randomGenerator, bopBiome, featureName, chunk_X, chunk_Z);
+                }
+            }
+    	}
+    }
+    
+    public static <T extends WorldGenerator> T getRandomWeightedWorldGenerator(HashMap<T, ? extends Number> worldGeneratorMap)
+    {
+        double completeWeight = 0D;
+
+        for (Number weight : worldGeneratorMap.values())
+        {
+            completeWeight += Double.parseDouble(weight.toString());
+        }
+
+        double random = Math.random() * completeWeight;
+        double countWeight = 0D;
+
+        for (Map.Entry<T, ? extends Number> entry : worldGeneratorMap.entrySet())
+        {
+            countWeight += Double.parseDouble(entry.getValue().toString());
+
+            if (countWeight >= random) return entry.getKey();
+        }
+
+        return null;
+    }
+
+    protected int nextInt(int i) 
+    {
+        if (i <= 1) return 0;
+        return this.randomGenerator.nextInt(i);
+	}
+}

src/main/java/biomesoplenty/api/biome/BOPInheritedBiome.java

@@ -0,0 +1,87 @@
+package biomesoplenty.api.biome;
+
+import java.util.Random;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.gen.feature.WorldGenAbstractTree;
+
+public class BOPInheritedBiome<T extends BOPBiomeDecorator> extends BOPOverriddenBiome<T>
+{
+	protected BiomeGenBase inheritedBiome;
+	
+	public BOPInheritedBiome(int biomeID, Class<T> clazz, BiomeGenBase inheritedBiome) 
+	{
+		super(biomeID, clazz);
+		
+		this.inheritedBiome = inheritedBiome;
+		
+        this.func_150557_a(inheritedBiome.color, true);
+        this.biomeName = inheritedBiome.biomeName;
+        this.topBlock = inheritedBiome.topBlock;
+        this.fillerBlock = inheritedBiome.fillerBlock;
+        this.field_76754_C = inheritedBiome.field_76754_C;
+        this.rootHeight = inheritedBiome.rootHeight;
+        this.heightVariation = inheritedBiome.heightVariation;
+        this.temperature = inheritedBiome.temperature;
+        this.rainfall = inheritedBiome.rainfall;
+        this.waterColorMultiplier = inheritedBiome.waterColorMultiplier;
+        this.enableSnow = inheritedBiome.getEnableSnow();
+        this.enableRain = inheritedBiome.canSpawnLightningBolt();
+        this.spawnableCreatureList = inheritedBiome.getSpawnableList(EnumCreatureType.creature);
+        this.spawnableMonsterList = inheritedBiome.getSpawnableList(EnumCreatureType.monster);
+        this.spawnableCaveCreatureList = inheritedBiome.getSpawnableList(EnumCreatureType.ambient);
+        this.spawnableWaterCreatureList = inheritedBiome.getSpawnableList(EnumCreatureType.waterCreature);
+	}
+
+    @Override
+	public void decorate(World world, Random random, int chunkX, int chunkZ)
+    {
+    	this.inheritedBiome.theBiomeDecorator.decorateChunk(world, random, this.inheritedBiome, chunkX, chunkZ);
+        this.theBiomeDecorator.decorateChunk(world, random, this, chunkX, chunkZ);
+    }
+	
+	@Override
+	public void genTerrainBlocks(World world, Random random, Block[] blockArray, byte[] metaArray, int chunkX, int chunkZ, double noise)
+	{
+		this.inheritedBiome.genTerrainBlocks(world, random, blockArray, metaArray, chunkX, chunkZ, noise);
+	}
+	
+    @Override
+	public float getSpawningChance()
+    {
+        return this.inheritedBiome.getSpawningChance();
+    }
+
+    @Override
+	public WorldGenAbstractTree func_150567_a(Random random)
+    {
+        return this.inheritedBiome.func_150567_a(random);
+    }
+	
+    @Override
+	public int getBiomeGrassColor(int x, int y, int z)
+    {
+    	return this.inheritedBiome.getBiomeGrassColor(x, y, z);
+    }
+
+    @Override
+	public int getBiomeFoliageColor(int x, int y, int z)
+    {
+        return this.inheritedBiome.getBiomeFoliageColor(x, y, z);
+    }
+    
+    @Override
+	public boolean isEqualTo(BiomeGenBase biome)
+    {
+        return this.inheritedBiome.isEqualTo(biome);
+    }
+	
+    @Override
+	public BiomeGenBase.TempCategory getTempCategory()
+    {
+        return this.inheritedBiome.getTempCategory();
+    }
+}

src/main/java/biomesoplenty/api/biome/BOPOverriddenBiome.java

@@ -0,0 +1,9 @@
+package biomesoplenty.api.biome;
+
+public class BOPOverriddenBiome<T extends BOPBiomeDecorator> extends BOPBiome<T> 
+{
+	public BOPOverriddenBiome(int biomeID, Class<T> clazz) 
+	{
+		super(biomeID, clazz, false);
+	}
+}

src/main/java/biomesoplenty/api/biome/BiomeFeatures.java

@@ -0,0 +1,63 @@
+package biomesoplenty.api.biome;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import net.minecraft.world.gen.feature.WorldGenerator;
+import biomesoplenty.api.exception.FeatureExistsException;
+import biomesoplenty.api.exception.NoSuchFeatureException;
+
+public class BiomeFeatures 
+{
+    public HashMap<WorldGenerator, Double> weightedGrassGen = new HashMap<WorldGenerator, Double>();
+    public HashMap<WorldGenerator, Integer> weightedFlowerGen = new HashMap<WorldGenerator, Integer>();
+	
+    private ArrayList<String> features = new ArrayList<String>();
+	
+    @BiomeFeature public int bopFlowersPerChunk = 0;
+    @BiomeFeature public int bopGrassPerChunk = 0;
+	
+    public BiomeFeatures()
+    {
+    	for (Field field : this.getClass().getFields())
+    	{
+    		if (field.isAnnotationPresent(BiomeFeature.class))
+    		{
+    			if (!features.contains(field.getName()))
+    			{
+    				features.add(field.getName());
+    			}
+    			else throw new FeatureExistsException(field.getName());
+    		}
+    	}
+    }
+    
+    public Object getFeature(String featureName)
+    {
+    	try 
+    	{
+			return this.getClass().getField(featureName).get(this);
+		} 
+    	catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) 
+		{
+			throw new NoSuchFeatureException(featureName);
+		}
+    }
+	
+    public ArrayList<String> getFeatureNames()
+    {
+        return features;
+    }
+	
+	@Retention(RetentionPolicy.RUNTIME)
+	@Target(ElementType.FIELD)
+	protected @interface BiomeFeature
+	{
+		
+	}
+}

src/main/java/biomesoplenty/api/exception/FeatureExistsException.java

@@ -0,0 +1,9 @@
+package biomesoplenty.api.exception;
+
+public class FeatureExistsException extends RuntimeException
+{
+    public FeatureExistsException(String name)
+    {
+        super("Feature " + name + " already exists!");
+    }
+}

src/main/java/biomesoplenty/api/exception/NoSuchFeatureException.java

@@ -0,0 +1,9 @@
+package biomesoplenty.api.exception;
+
+public class NoSuchFeatureException extends RuntimeException
+{
+    public NoSuchFeatureException(String name)
+    {
+        super("Feature " + name + " does not exist!");
+    }
+}

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

@@ -0,0 +1,14 @@
+package biomesoplenty.common.biome;
+
+import net.minecraft.world.biome.BiomeGenBase;
+import biomesoplenty.api.biome.BOPInheritedBiome;
+import biomesoplenty.common.biome.decoration.BOPNetherBiomeDecorator;
+import biomesoplenty.common.biome.decoration.BOPOverworldBiomeDecorator;
+
+public class BOPInheritedNetherBiome extends BOPInheritedBiome<BOPNetherBiomeDecorator>
+{
+	public BOPInheritedNetherBiome(int biomeID, BiomeGenBase inheritedBiome) 
+	{
+		super(biomeID, BOPNetherBiomeDecorator.class, inheritedBiome);
+	}
+}

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

@@ -0,0 +1,13 @@
+package biomesoplenty.common.biome;
+
+import net.minecraft.world.biome.BiomeGenBase;
+import biomesoplenty.api.biome.BOPInheritedBiome;
+import biomesoplenty.common.biome.decoration.BOPOverworldBiomeDecorator;
+
+public class BOPInheritedOverworldBiome extends BOPInheritedBiome<BOPOverworldBiomeDecorator>
+{
+	public BOPInheritedOverworldBiome(int biomeID, BiomeGenBase inheritedBiome) 
+	{
+		super(biomeID, BOPOverworldBiomeDecorator.class, inheritedBiome);
+	}
+}

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

@@ -1,14 +1,19 @@
-package biomesoplenty.common.biomes;
+package biomesoplenty.common.biome;
 
+import java.util.Random;
+
+import biomesoplenty.api.biome.BOPBiome;
+import biomesoplenty.common.biome.decoration.BOPNetherBiomeDecorator;
 import net.minecraft.entity.monster.EntityGhast;
 import net.minecraft.entity.monster.EntityMagmaCube;
 import net.minecraft.entity.monster.EntityPigZombie;
+import net.minecraft.world.World;
 
-public class BOPNetherBiome extends BOPBiome
+public class BOPNetherBiome extends BOPBiome<BOPNetherBiomeDecorator>
 {
     public BOPNetherBiome(int id)
     {
-        super(id);
+        super(id, BOPNetherBiomeDecorator.class);
 
         this.setDisableRain();
         this.setTemperatureRainfall(2.0F, 0.0F);
@@ -21,10 +26,5 @@ public class BOPNetherBiome extends BOPBiome
         this.spawnableMonsterList.add(new SpawnListEntry(EntityGhast.class, 50, 4, 4));
         this.spawnableMonsterList.add(new SpawnListEntry(EntityPigZombie.class, 100, 4, 4));
         this.spawnableMonsterList.add(new SpawnListEntry(EntityMagmaCube.class, 1, 4, 4));
-
-        this.bopWorldFeatures.setFeature("stalagmitesPerChunk", 0);
-        this.bopWorldFeatures.setFeature("stalactitesPerChunk", 0);
-        this.bopWorldFeatures.setFeature("minersDelightPerChunk", 0);
-        this.bopWorldFeatures.setFeature("rootsPerChunk", 0);
     }
 }

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

@@ -1,9 +1,9 @@
-package biomesoplenty.common.biomes;
+package biomesoplenty.common.biome;
 
 import net.minecraft.world.biome.BiomeGenBase;
 import biomesoplenty.common.world.BOPBiomeManager;
 
-public abstract class BOPOceanBiome extends BOPSubBiome
+public class BOPOceanBiome extends BOPSubBiome
 {
 	public BOPOceanBiome(int biomeID) 
 	{

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

@@ -0,0 +1,12 @@
+package biomesoplenty.common.biome;
+
+import biomesoplenty.api.biome.BOPBiome;
+import biomesoplenty.common.biome.decoration.BOPOverworldBiomeDecorator;
+
+public class BOPOverworldBiome extends BOPBiome<BOPOverworldBiomeDecorator>
+{
+	public BOPOverworldBiome(int biomeID) 
+	{
+		super(biomeID, BOPOverworldBiomeDecorator.class);
+	}
+}

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

@@ -1,11 +1,6 @@
-package biomesoplenty.common.biomes;
+package biomesoplenty.common.biome;
 
-import java.util.ArrayList;
+public class BOPSubBiome extends BOPOverworldBiome
-import java.util.List;
-
-import biomesoplenty.common.world.layer.GenLayerSubBiome;
-
-public abstract class BOPSubBiome extends BOPBiome
 {
 	 /**Smaller numbers zoom in the noise field (biomes are less common)*/
 	public double zoom;

src/main/java/biomesoplenty/common/biome/decoration/BOPNetherBiomeDecorator.java

@@ -0,0 +1,101 @@
+package biomesoplenty.common.biome.decoration;
+
+import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.BIG_SHROOM;
+import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.CACTUS;
+import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.CLAY;
+import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.DEAD_BUSH;
+import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.FLOWERS;
+import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.GRASS;
+import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.LAKE;
+import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.LILYPAD;
+import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.PUMPKIN;
+import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.REED;
+import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.SAND;
+import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.SAND_PASS2;
+import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.SHROOM;
+import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.TREE;
+import net.minecraft.block.BlockFlower;
+import net.minecraft.block.material.Material;
+import net.minecraft.init.Blocks;
+import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.gen.feature.WorldGenAbstractTree;
+import net.minecraft.world.gen.feature.WorldGenDeadBush;
+import net.minecraft.world.gen.feature.WorldGenLiquids;
+import net.minecraft.world.gen.feature.WorldGenPumpkin;
+import net.minecraft.world.gen.feature.WorldGenerator;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.terraingen.DecorateBiomeEvent;
+import net.minecraftforge.event.terraingen.TerrainGen;
+import biomesoplenty.api.biome.BOPBiome;
+import biomesoplenty.api.biome.BOPBiomeDecorator;
+import biomesoplenty.common.world.generation.IBOPWorldGenerator;
+import biomesoplenty.common.world.generation.WorldGenFieldAssociation;
+
+public class BOPNetherBiomeDecorator extends BOPBiomeDecorator<NetherBiomeFeatures>
+{
+	public BOPNetherBiomeDecorator() 
+	{
+		super(NetherBiomeFeatures.class);
+	}
+    
+    @Override
+    protected void genDecorations(BiomeGenBase biome)
+    {
+    	BOPBiome bopBiome = (BOPBiome)biome;
+    	
+        MinecraftForge.EVENT_BUS.post(new DecorateBiomeEvent.Pre(currentWorld, randomGenerator, chunk_X, chunk_Z));
+
+        int i;
+        int x;
+        int y;
+        int z;
+        int perChunk = this.treesPerChunk;
+
+        if (this.randomGenerator.nextInt(10) == 0)
+        {
+            ++perChunk;
+        }
+
+        boolean doGen = TerrainGen.decorate(currentWorld, randomGenerator, chunk_X, chunk_Z, TREE);
+        
+        for (i = 0; doGen && i < perChunk; ++i)
+        {
+            x = this.chunk_X + this.randomGenerator.nextInt(16) + 8;
+            z = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
+            y = this.nextInt(128);
+            WorldGenAbstractTree worldgenabstracttree = biome.func_150567_a(this.randomGenerator);
+            worldgenabstracttree.setScale(1.0D, 1.0D, 1.0D);
+
+            if (worldgenabstracttree.generate(this.currentWorld, this.randomGenerator, x, y, z))
+            {
+                worldgenabstracttree.func_150524_b(this.currentWorld, this.randomGenerator, x, y, z);
+            }
+        }
+
+    	for (String featureName : bopFeatures.getFeatureNames())
+    	{
+            if (featureName.equals("bopFlowersPerChunk"))
+            {
+                if (!TerrainGen.decorate(currentWorld, randomGenerator, chunk_X, chunk_Z, FLOWERS)) continue;
+            }
+            else if (featureName.equals("bopGrassPerChunk"))
+            {
+                if (!TerrainGen.decorate(currentWorld, randomGenerator, chunk_X, chunk_Z, GRASS)) continue;
+            }
+
+            WorldGenFieldAssociation.WorldFeature worldFeature = WorldGenFieldAssociation.getAssociatedFeature(featureName);
+
+            if (worldFeature != null)
+            {
+                IBOPWorldGenerator worldGenerator = worldFeature.getBOPWorldGenerator();
+
+                if (worldGenerator != null)
+                {
+                    worldGenerator.setupGeneration(currentWorld, randomGenerator, bopBiome, featureName, chunk_X, chunk_Z);
+                }
+            }
+    	}
+
+        MinecraftForge.EVENT_BUS.post(new DecorateBiomeEvent.Post(currentWorld, randomGenerator, chunk_X, chunk_Z));
+    }
+}

src/main/java/biomesoplenty/common/biome/decoration/BOPOverworldBiomeDecorator.java

@@ -0,0 +1,12 @@
+package biomesoplenty.common.biome.decoration;
+
+import biomesoplenty.api.biome.BOPBiome;
+import biomesoplenty.api.biome.BOPBiomeDecorator;
+
+public class BOPOverworldBiomeDecorator extends BOPBiomeDecorator<OverworldBiomeFeatures>
+{
+	public BOPOverworldBiomeDecorator() 
+	{
+		super(OverworldBiomeFeatures.class);
+	}
+}

src/main/java/biomesoplenty/common/biome/decoration/BiomeFeaturesBase.java

@@ -0,0 +1,14 @@
+package biomesoplenty.common.biome.decoration;
+
+import biomesoplenty.api.biome.BiomeFeatures;
+
+public class BiomeFeaturesBase extends BiomeFeatures
+{
+    @BiomeFeature public boolean generateAsh = false;
+	
+	@BiomeFeature public int thornsPerChunk = 0;
+    @BiomeFeature public int smolderingGrassPerChunk = 0;
+    @BiomeFeature public int toadstoolsPerChunk = 0;
+    @BiomeFeature public int glowshroomsPerChunk = 0;
+    @BiomeFeature public int bopBigMushroomsPerChunk = 0;
+}

src/main/java/biomesoplenty/common/biome/decoration/NetherBiomeFeatures.java

@@ -0,0 +1,14 @@
+package biomesoplenty.common.biome.decoration;
+
+import biomesoplenty.api.biome.BiomeFeatures;
+
+public class NetherBiomeFeatures extends BiomeFeaturesBase
+{
+    @BiomeFeature public int waspHivesPerChunk = 0;
+    @BiomeFeature public int boneSpinesUpPerChunk = 0;
+    @BiomeFeature public int boneSpinesDownPerChunk = 0;
+    @BiomeFeature public int netherLavaLakesPerChunk = 0;
+    @BiomeFeature public int netherVinesPerChunk = 0;
+    @BiomeFeature public int netherrackSplatterPerChunk = 0;
+    @BiomeFeature public int gravesPerChunk = 0;
+}

src/main/java/biomesoplenty/common/biome/decoration/OverworldBiomeFeatures.java

@@ -0,0 +1,76 @@
+package biomesoplenty.common.biome.decoration;
+
+import biomesoplenty.api.biome.BiomeFeatures;
+
+public class OverworldBiomeFeatures extends BiomeFeaturesBase
+{
+    @BiomeFeature public boolean generatePumpkins = true;
+    @BiomeFeature public boolean generateQuicksand = false;
+    @BiomeFeature public boolean generateCanyon = false;
+    @BiomeFeature public boolean generateStoneInGrass = false;
+    @BiomeFeature public boolean generateStoneInGrass2 = false;
+    @BiomeFeature public boolean generateGrass = false;
+    @BiomeFeature public boolean generateSand = false;
+    @BiomeFeature public boolean generateQuagmire = false;
+    @BiomeFeature public boolean generateMelons = false;
+    @BiomeFeature public boolean generateMycelium = false;
+    @BiomeFeature public boolean generateSponge = false;
+
+    @BiomeFeature public int waterSpringsPerChunk = 50;
+    @BiomeFeature public int lavaSpringsPerChunk = 20;
+
+    @BiomeFeature public int waterLakesPerChunk = 0;
+    @BiomeFeature public int lavaLakesPerChunk = 0;
+    @BiomeFeature public int poisonLakesPerChunk = 0;
+
+    @BiomeFeature public int mudPerChunk = 0;
+    @BiomeFeature public int riverCanePerChunk = 0;
+    @BiomeFeature public int shrubsPerChunk = 0;
+    @BiomeFeature public int bushesPerChunk = 0;
+    @BiomeFeature public int cloverPatchesPerChunk = 0;
+    @BiomeFeature public int leafPilesPerChunk = 0;
+    @BiomeFeature public int deadLeafPilesPerChunk = 0;
+    @BiomeFeature public int lavenderPerChunk = 0;
+    @BiomeFeature public int stalagmitesPerChunk = 3;
+    @BiomeFeature public int stalactitesPerChunk = 6;
+    @BiomeFeature public int desertSproutsPerChunk = 0;
+    @BiomeFeature public int bromeliadsPerChunk = 0;
+    @BiomeFeature public int waterReedsPerChunk = 0;
+    @BiomeFeature public int wildCarrotsPerChunk = 0;
+    @BiomeFeature public int poisonIvyPerChunk = 0;
+    @BiomeFeature public int berryBushesPerChunk = 0;
+    @BiomeFeature public int portobellosPerChunk = 0;
+    @BiomeFeature public int koruPerChunk = 0;
+    @BiomeFeature public int blueMilksPerChunk = 0;
+    @BiomeFeature public int cattailsPerChunk = 0;
+    @BiomeFeature public int highCattailsPerChunk = 0;
+    @BiomeFeature public int algaePerChunk = 0;
+    @BiomeFeature public int sproutsPerChunk = 0;
+    @BiomeFeature public int tinyCactiPerChunk = 0;
+    @BiomeFeature public int oasesPerChunk = 0;
+    @BiomeFeature public int minersDelightPerChunk = 2;
+    @BiomeFeature public int rootsPerChunk = 9;
+    @BiomeFeature public int grassSplatterPerChunk = 0;
+    @BiomeFeature public int rockpilesPerChunk = 0;
+    @BiomeFeature public int logsPerChunk = 0;
+    @BiomeFeature public int lavaSpoutsPerChunk = 0;
+    @BiomeFeature public int cobwebsPerChunk = 0;
+    @BiomeFeature public int cobwebNestsPerChunk = 0;
+    @BiomeFeature public int wasteland1PerChunk = 0;
+    @BiomeFeature public int wasteland2PerChunk = 0;
+    @BiomeFeature public int wasteland3PerChunk = 0;
+    @BiomeFeature public int wasteland4PerChunk = 0;
+    @BiomeFeature public int wastelandRockPilesPerChunk = 0;
+    @BiomeFeature public int sandSplatterPerChunk = 0;
+    @BiomeFeature public int gravelSplatterPerChunk = 0;
+    @BiomeFeature public int redSandSplatterPerChunk = 0;
+    @BiomeFeature public int dirtSplatterPerChunk = 0;
+    @BiomeFeature public int sandstoneSpikesPerChunk = 0;
+    
+    //Ocean Features
+    @BiomeFeature public int seaweedPerChunk = 0;
+    @BiomeFeature public int coralPerChunk = 0;
+    @BiomeFeature public int kelpPerChunk = 0;
+    @BiomeFeature public int kelpThickPerChunk = 0;
+    @BiomeFeature public int shortKelpPerChunk = 0;
+}

src/main/java/biomesoplenty/common/biome/nether/BiomeGenBoneyard.java

@@ -0,0 +1,22 @@
+package biomesoplenty.common.biome.nether;
+
+import net.minecraft.init.Blocks;
+import biomesoplenty.common.biome.BOPNetherBiome;
+
+public class BiomeGenBoneyard extends BOPNetherBiome
+{
+    public BiomeGenBoneyard(int id)
+    {
+        super(id);
+        
+        this.setColor(15657658);
+        
+        this.topBlock = Blocks.netherrack;
+        this.fillerBlock = Blocks.netherrack;
+        
+        this.theBiomeDecorator.bopFeatures.boneSpinesUpPerChunk = 9;
+        this.theBiomeDecorator.bopFeatures.boneSpinesDownPerChunk = 12;
+        this.theBiomeDecorator.bopFeatures.gravesPerChunk = 1;
+        this.theBiomeDecorator.bopFeatures.waspHivesPerChunk = 1;
+    }
+}

src/main/java/biomesoplenty/common/biome/nether/BiomeGenCorruptedSands.java

@@ -1,7 +1,7 @@
-package biomesoplenty.common.biomes.nether;
+package biomesoplenty.common.biome.nether;
 
 import net.minecraft.init.Blocks;
-import biomesoplenty.common.biomes.BOPNetherBiome;
+import biomesoplenty.common.biome.BOPNetherBiome;
 
 public class BiomeGenCorruptedSands extends BOPNetherBiome
 {
@@ -14,8 +14,8 @@ public class BiomeGenCorruptedSands extends BOPNetherBiome
         this.topBlock = Blocks.soul_sand;
         this.fillerBlock = Blocks.soul_sand;
         
-        this.bopWorldFeatures.setFeature("thornsPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.thornsPerChunk = 10;
-        this.bopWorldFeatures.setFeature("gravesPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.gravesPerChunk = 1;
-        this.bopWorldFeatures.setFeature("waspHivesPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.waspHivesPerChunk = 1;
     }
 }

src/main/java/biomesoplenty/common/biome/nether/BiomeGenPhantasmagoricInferno.java

@@ -0,0 +1,28 @@
+package biomesoplenty.common.biome.nether;
+
+import net.minecraft.world.gen.feature.WorldGenFire;
+import biomesoplenty.api.content.BOPCBlocks;
+import biomesoplenty.common.biome.BOPNetherBiome;
+
+public class BiomeGenPhantasmagoricInferno extends BOPNetherBiome
+{
+    public BiomeGenPhantasmagoricInferno(int id)
+    {
+        super(id);
+
+        this.setColor(14247446);
+
+        this.topBlock = BOPCBlocks.ash;
+        this.fillerBlock = BOPCBlocks.ash;
+
+        this.theBiomeDecorator.bopFeatures.netherLavaLakesPerChunk = 20;
+        this.theBiomeDecorator.bopFeatures.smolderingGrassPerChunk = 30;
+        this.theBiomeDecorator.bopFeatures.gravesPerChunk = 1;
+        this.theBiomeDecorator.bopFeatures.waspHivesPerChunk = 1;
+        this.theBiomeDecorator.bopFeatures.generateAsh = true;
+                               
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 8;
+        
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenFire(), 1D);
+    }
+}

src/main/java/biomesoplenty/common/biome/nether/BiomeGenUndergarden.java

@@ -0,0 +1,49 @@
+package biomesoplenty.common.biome.nether;
+
+import java.util.Random;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.world.gen.feature.WorldGenAbstractTree;
+import biomesoplenty.api.content.BOPCBlocks;
+import biomesoplenty.common.biome.BOPNetherBiome;
+import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
+import biomesoplenty.common.world.features.trees.WorldGenMiniShrub;
+
+public class BiomeGenUndergarden extends BOPNetherBiome
+{
+    public BiomeGenUndergarden(int id)
+    {
+        super(id);
+        
+        this.setColor(15657658);
+        
+        this.topBlock = BOPCBlocks.overgrownNetherrack;
+        this.fillerBlock = Blocks.netherrack;
+        
+        this.theBiomeDecorator.treesPerChunk = 50;
+        
+        this.theBiomeDecorator.bopFeatures.netherVinesPerChunk = 20;
+        this.theBiomeDecorator.bopFeatures.netherrackSplatterPerChunk = 45;
+        this.theBiomeDecorator.bopFeatures.bopBigMushroomsPerChunk = 30;
+        this.theBiomeDecorator.bopFeatures.gravesPerChunk = 1;
+        this.theBiomeDecorator.bopFeatures.waspHivesPerChunk = 1;
+        this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 10;
+        this.theBiomeDecorator.bopFeatures.glowshroomsPerChunk = 5;
+                               
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 50;
+		
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 0), 0.25D);
+		this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+    }
+    
+	@Override
+	//TODO:						getRandomWorldGenForTrees()
+	public WorldGenAbstractTree func_150567_a(Random random)
+	{
+		return new WorldGenMiniShrub(BOPCBlocks.logs4, BOPCBlocks.leaves4, 1, 0, BOPCBlocks.overgrownNetherrack);
+	}
+}

src/main/java/biomesoplenty/common/biome/nether/BiomeGenVisceralHeap.java

@@ -1,7 +1,7 @@
-package biomesoplenty.common.biomes.nether;
+package biomesoplenty.common.biome.nether;
 
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPNetherBiome;
+import biomesoplenty.common.biome.BOPNetherBiome;
 
 public class BiomeGenVisceralHeap extends BOPNetherBiome
 {
@@ -14,7 +14,7 @@ public class BiomeGenVisceralHeap extends BOPNetherBiome
         this.topBlock = BOPCBlocks.flesh;
         this.fillerBlock = BOPCBlocks.flesh;
 
-        this.bopWorldFeatures.setFeature("gravesPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.gravesPerChunk = 1;
-        this.bopWorldFeatures.setFeature("waspHivesPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.waspHivesPerChunk = 1;
     }
 }

src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPBirchForest.java

@@ -0,0 +1,40 @@
+package biomesoplenty.common.biome.overridden;
+
+import java.util.Random;
+
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.gen.feature.WorldGenAbstractTree;
+import net.minecraft.world.gen.feature.WorldGenMinable;
+import net.minecraft.world.gen.feature.WorldGenTaiga2;
+import net.minecraft.world.gen.feature.WorldGenerator;
+import biomesoplenty.api.biome.BOPInheritedBiome;
+import biomesoplenty.api.content.BOPCBlocks;
+import biomesoplenty.common.biome.BOPInheritedOverworldBiome;
+import biomesoplenty.common.world.features.WorldGenBOPFlora;
+import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
+
+public class BiomeGenBOPBirchForest extends BOPInheritedOverworldBiome
+{
+	public BiomeGenBOPBirchForest(int biomeID, BiomeGenBase inheritedBiome) 
+	{
+		super(biomeID, inheritedBiome);
+
+        this.theBiomeDecorator.bopFeatures.poisonIvyPerChunk = 3;
+        this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 15;
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 4;
+        this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 2;
+             
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5;
+             
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 0), 10);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 1), 15);
+             
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.25D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.25D);
+	}
+}

src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPDesert.java

@@ -0,0 +1,15 @@
+package biomesoplenty.common.biome.overridden;
+
+import net.minecraft.world.biome.BiomeGenBase;
+import biomesoplenty.common.biome.BOPInheritedOverworldBiome;
+
+public class BiomeGenBOPDesert extends BOPInheritedOverworldBiome
+{
+	public BiomeGenBOPDesert(int biomeID, BiomeGenBase inheritedBiome)
+	{
+		super(biomeID, inheritedBiome);
+		
+        this.theBiomeDecorator.bopFeatures.tinyCactiPerChunk = 10;
+        this.theBiomeDecorator.bopFeatures.generateQuicksand = true;
+	}
+}

src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPExtremeHills.java

@@ -0,0 +1,39 @@
+package biomesoplenty.common.biome.overridden;
+
+import java.util.Random;
+
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.gen.feature.WorldGenAbstractTree;
+import net.minecraft.world.gen.feature.WorldGenMinable;
+import net.minecraft.world.gen.feature.WorldGenTaiga2;
+import net.minecraft.world.gen.feature.WorldGenerator;
+import biomesoplenty.api.biome.BOPInheritedBiome;
+import biomesoplenty.api.content.BOPCBlocks;
+import biomesoplenty.common.biome.BOPInheritedOverworldBiome;
+import biomesoplenty.common.world.features.WorldGenBOPFlora;
+import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
+
+public class BiomeGenBOPExtremeHills extends BOPInheritedOverworldBiome
+{
+	public BiomeGenBOPExtremeHills(int biomeID, BiomeGenBase inheritedBiome) 
+	{
+		super(biomeID, inheritedBiome);
+
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 1;
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 3;
+        this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 1;
+
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 3;
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5;
+
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 8), 8);
+
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+	}
+}

src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPForest.java

@@ -0,0 +1,38 @@
+package biomesoplenty.common.biome.overridden;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.world.biome.BiomeGenBase;
+import biomesoplenty.api.content.BOPCBlocks;
+import biomesoplenty.common.biome.BOPInheritedOverworldBiome;
+import biomesoplenty.common.world.features.WorldGenBOPFlora;
+import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
+
+public class BiomeGenBOPForest extends BOPInheritedOverworldBiome
+{
+	public BiomeGenBOPForest(int biomeID, BiomeGenBase inheritedBiome)
+	{
+		super(biomeID, inheritedBiome);
+		
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 15;
+        this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 5;
+        this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 5;
+        this.theBiomeDecorator.bopFeatures.riverCanePerChunk = 5;
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 2;
+        this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 6;
+        this.theBiomeDecorator.bopFeatures.poisonIvyPerChunk = 1;
+        this.theBiomeDecorator.bopFeatures.bushesPerChunk = 2;
+        this.theBiomeDecorator.bopFeatures.berryBushesPerChunk = 1;
+        this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 2;
+             
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 5;
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5;
+             
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 4), 8);
+             
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+	}
+}

src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPHell.java

@@ -0,0 +1,25 @@
+package biomesoplenty.common.biome.overridden;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.world.biome.BiomeGenBase;
+import biomesoplenty.api.content.BOPCBlocks;
+import biomesoplenty.common.biome.BOPInheritedNetherBiome;
+import biomesoplenty.common.world.features.WorldGenBOPFlora;
+
+public class BiomeGenBOPHell extends BOPInheritedNetherBiome
+{
+	public BiomeGenBOPHell(int biomeID, BiomeGenBase inheritedBiome) 
+	{
+		super(biomeID, inheritedBiome);
+		
+		this.topBlock = Blocks.netherrack;
+		this.fillerBlock = Blocks.netherrack;
+		
+        this.theBiomeDecorator.bopFeatures.gravesPerChunk = 1;
+        this.theBiomeDecorator.bopFeatures.waspHivesPerChunk = 1;
+        
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 4;
+        
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers2, 2), 10);
+	}
+}

src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPIcePlains.java

@@ -0,0 +1,19 @@
+package biomesoplenty.common.biome.overridden;
+
+import net.minecraft.world.biome.BiomeGenBase;
+import biomesoplenty.api.content.BOPCBlocks;
+import biomesoplenty.common.biome.BOPInheritedOverworldBiome;
+import biomesoplenty.common.world.features.WorldGenBOPFlora;
+
+public class BiomeGenBOPIcePlains extends BOPInheritedOverworldBiome
+{
+	public BiomeGenBOPIcePlains(int biomeID, BiomeGenBase inheritedBiome)
+	{
+		super(biomeID, inheritedBiome);
+		
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 1;
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5;
+
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 8), 8);
+	}
+}

src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPJungle.java

@@ -0,0 +1,32 @@
+package biomesoplenty.common.biome.overridden;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.world.biome.BiomeGenBase;
+import biomesoplenty.api.content.BOPCBlocks;
+import biomesoplenty.common.biome.BOPInheritedOverworldBiome;
+import biomesoplenty.common.world.features.WorldGenBOPFlora;
+import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
+
+public class BiomeGenBOPJungle extends BOPInheritedOverworldBiome
+{
+	public BiomeGenBOPJungle(int biomeID, BiomeGenBase inheritedBiome)
+	{
+		super(biomeID, inheritedBiome);
+		
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 10;
+        this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 15;
+        this.theBiomeDecorator.bopFeatures.poisonIvyPerChunk = 1;
+             
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 10;
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5;
+             
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 5), 12);
+             
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+	}
+}

src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPMesa.java

@@ -0,0 +1,33 @@
+package biomesoplenty.common.biome.overridden;
+
+import java.util.Random;
+
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.gen.feature.WorldGenAbstractTree;
+import net.minecraft.world.gen.feature.WorldGenMinable;
+import net.minecraft.world.gen.feature.WorldGenTaiga2;
+import net.minecraft.world.gen.feature.WorldGenerator;
+import biomesoplenty.api.biome.BOPInheritedBiome;
+import biomesoplenty.api.content.BOPCBlocks;
+import biomesoplenty.common.biome.BOPInheritedOverworldBiome;
+import biomesoplenty.common.world.features.WorldGenBOPFlora;
+import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
+
+public class BiomeGenBOPMesa extends BOPInheritedOverworldBiome
+{
+	public BiomeGenBOPMesa(int biomeID, BiomeGenBase inheritedBiome) 
+	{
+		super(biomeID, inheritedBiome);
+
+        this.theBiomeDecorator.bopFeatures.tinyCactiPerChunk = 10;
+        this.theBiomeDecorator.bopFeatures.bromeliadsPerChunk = 10;
+                               
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5;
+                               
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.plants, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+	}
+}

src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPMushroomIsland.java

@@ -0,0 +1,16 @@
+package biomesoplenty.common.biome.overridden;
+
+import net.minecraft.world.biome.BiomeGenBase;
+import biomesoplenty.common.biome.BOPInheritedOverworldBiome;
+
+public class BiomeGenBOPMushroomIsland extends BOPInheritedOverworldBiome
+{
+	public BiomeGenBOPMushroomIsland(int biomeID, BiomeGenBase inheritedBiome)
+	{
+		super(biomeID, inheritedBiome);
+        
+        this.theBiomeDecorator.bopFeatures.blueMilksPerChunk = 2;
+        this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 8;
+        this.theBiomeDecorator.bopFeatures.portobellosPerChunk = 6;
+	}
+}

src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPOcean.java

@@ -0,0 +1,14 @@
+package biomesoplenty.common.biome.overridden;
+
+import net.minecraft.world.biome.BiomeGenBase;
+import biomesoplenty.common.biome.BOPInheritedOverworldBiome;
+
+public class BiomeGenBOPOcean extends BOPInheritedOverworldBiome
+{
+	public BiomeGenBOPOcean(int biomeID, BiomeGenBase inheritedBiome) 
+	{
+		super(biomeID, inheritedBiome);
+		
+        this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 20;
+	}
+}

src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPPlains.java

@@ -0,0 +1,28 @@
+package biomesoplenty.common.biome.overridden;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.world.biome.BiomeGenBase;
+import biomesoplenty.api.content.BOPCBlocks;
+import biomesoplenty.common.biome.BOPInheritedOverworldBiome;
+import biomesoplenty.common.world.features.WorldGenBOPFlora;
+import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
+
+public class BiomeGenBOPPlains extends BOPInheritedOverworldBiome
+{
+	public BiomeGenBOPPlains(int biomeID, BiomeGenBase inheritedBiome) 
+	{
+		super(biomeID, inheritedBiome);
+		
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 8;
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5;
+
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 0), 10);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 9), 5);
+
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+	}
+}

src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPRiver.java

@@ -0,0 +1,16 @@
+package biomesoplenty.common.biome.overridden;
+
+import net.minecraft.world.biome.BiomeGenBase;
+import biomesoplenty.common.biome.BOPInheritedOverworldBiome;
+
+public class BiomeGenBOPRiver extends BOPInheritedOverworldBiome
+{
+	public BiomeGenBOPRiver(int biomeID, BiomeGenBase inheritedBiome) 
+	{
+		super(biomeID, inheritedBiome);
+        
+		this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 5;
+		this.theBiomeDecorator.bopFeatures.riverCanePerChunk = 10;
+		this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 4;
+	}
+}

src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPRoofedForest.java

@@ -0,0 +1,30 @@
+package biomesoplenty.common.biome.overridden;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.world.biome.BiomeGenBase;
+import biomesoplenty.api.content.BOPCBlocks;
+import biomesoplenty.common.biome.BOPInheritedOverworldBiome;
+import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
+
+public class BiomeGenBOPRoofedForest extends BOPInheritedOverworldBiome
+{
+	public BiomeGenBOPRoofedForest(int biomeID, BiomeGenBase inheritedBiome)
+	{
+		super(biomeID, inheritedBiome);
+		
+        this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 1;
+        this.theBiomeDecorator.bopFeatures.blueMilksPerChunk = 1;
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 8;
+        this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 4;
+        this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 2;
+
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5;
+
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.25D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.25D);
+	}
+}

src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPSavanna.java

@@ -0,0 +1,31 @@
+package biomesoplenty.common.biome.overridden;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.world.biome.BiomeGenBase;
+import biomesoplenty.api.content.BOPCBlocks;
+import biomesoplenty.common.biome.BOPInheritedOverworldBiome;
+import biomesoplenty.common.world.features.WorldGenBOPFlora;
+import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
+
+public class BiomeGenBOPSavanna extends BOPInheritedOverworldBiome
+{
+	public BiomeGenBOPSavanna(int biomeID, BiomeGenBase inheritedBiome)
+	{
+		super(biomeID, inheritedBiome);
+		
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 10;
+        this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 5;
+        this.theBiomeDecorator.bopFeatures.bushesPerChunk = 3;
+        this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 5;
+             
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 10;
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 20;
+             
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 7), 8);
+             
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+	}
+}

src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPSwamp.java

@@ -0,0 +1,47 @@
+package biomesoplenty.common.biome.overridden;
+
+import java.util.Random;
+
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.gen.feature.WorldGenAbstractTree;
+import net.minecraft.world.gen.feature.WorldGenMinable;
+import net.minecraft.world.gen.feature.WorldGenTaiga2;
+import net.minecraft.world.gen.feature.WorldGenerator;
+import biomesoplenty.api.biome.BOPInheritedBiome;
+import biomesoplenty.api.content.BOPCBlocks;
+import biomesoplenty.common.biome.BOPInheritedOverworldBiome;
+import biomesoplenty.common.world.features.WorldGenBOPFlora;
+import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
+
+public class BiomeGenBOPSwamp extends BOPInheritedOverworldBiome
+{
+	public BiomeGenBOPSwamp(int biomeID, BiomeGenBase inheritedBiome) 
+	{
+		super(biomeID, inheritedBiome);
+
+		this.theBiomeDecorator.bopFeatures.mudPerChunk = 3;
+		this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 10;
+		this.theBiomeDecorator.bopFeatures.cattailsPerChunk = 10;
+		this.theBiomeDecorator.bopFeatures.highCattailsPerChunk = 5;
+		this.theBiomeDecorator.bopFeatures.algaePerChunk = 3;
+		this.theBiomeDecorator.bopFeatures.koruPerChunk = 25;
+		this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 5;
+		this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 1;
+		this.theBiomeDecorator.bopFeatures.blueMilksPerChunk = 1;
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 2;
+        this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 4;
+             
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5;
+             
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 1), 15);
+             
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+	}
+}

src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPTaiga.java

@@ -0,0 +1,22 @@
+package biomesoplenty.common.biome.overridden;
+
+import net.minecraft.world.biome.BiomeGenBase;
+import biomesoplenty.api.content.BOPCBlocks;
+import biomesoplenty.common.biome.BOPInheritedOverworldBiome;
+import biomesoplenty.common.world.features.WorldGenBOPFlora;
+
+public class BiomeGenBOPTaiga extends BOPInheritedOverworldBiome
+{
+	public BiomeGenBOPTaiga(int biomeID, BiomeGenBase inheritedBiome)
+	{
+		super(biomeID, inheritedBiome);
+		
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 2;
+        this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 4;
+
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 2;
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5;
+
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 8), 8);
+	}
+}

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

@@ -1,13 +1,13 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 
-public class BiomeGenAlps extends BOPBiome
+public class BiomeGenAlps extends BOPOverworldBiome
 {
 	private static final Height biomeHeight = new Height(8.0F, 0.025F);
 	
@@ -41,12 +41,10 @@ public class BiomeGenAlps extends BOPBiome
             int y = random.nextInt(28) + 4;
             int z = chunkZ + random.nextInt(16);
             
-            //TODO:             getBlock()
             Block block = world.getBlock(x, y, z);
 
             if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone))
             {
-                //TODO: setBlock()
                 world.setBlock(x, y, z, Blocks.emerald_ore, 0, 2);
             }
         }

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

@@ -1,4 +1,4 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
@@ -6,9 +6,9 @@ import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 
-public class BiomeGenArctic extends BOPBiome
+public class BiomeGenArctic extends BOPOverworldBiome
 {
 	private static final Height biomeHeight = new Height(0F, 0F);
 	
@@ -16,10 +16,8 @@ public class BiomeGenArctic extends BOPBiome
 	{
 		super(id);
 		
-        //TODO: setHeight()
         this.setHeight(biomeHeight);
         this.setEnableSnow();
-        //TODO:	setColor()
         this.setColor(14540253);
         this.setTemperatureRainfall(0.05F, 0.5F);
 		
@@ -44,26 +42,22 @@ public class BiomeGenArctic extends BOPBiome
 			int y = random.nextInt(28) + 4;
 			int z = chunkZ + random.nextInt(16);
 			
-			//TODO:				getBlock()
 			Block block = world.getBlock(x, y, z);
 
 			if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone))
 			{
-				//TODO:	setBlock()
 				world.setBlock(x, y, z, BOPCBlocks.gemOre, 8, 2);
 			}
 		}
 	}
 
 	@Override
-	//TODO:		getBiomeGrassColor()
 	public int getBiomeGrassColor(int x, int y, int z)
 	{
 		return 11176526;
 	}
 
 	@Override
-	//TODO:		getBiomeFoliageColor()
 	public int getBiomeFoliageColor(int x, int y, int z)
 	{
 		return 11903827;

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

@@ -1,4 +1,4 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
@@ -10,11 +10,11 @@ import net.minecraft.world.gen.feature.WorldGenShrub;
 import net.minecraft.world.gen.feature.WorldGenTallGrass;
 import net.minecraft.world.gen.feature.WorldGenerator;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora;
 import biomesoplenty.common.world.features.trees.WorldGenBulbTree;
 
-public class BiomeGenBambooForest extends BOPBiome
+public class BiomeGenBambooForest extends BOPOverworldBiome
 {
 	private static final Height biomeHeight = new Height(0.1F, 0.3F);
 	
@@ -30,13 +30,13 @@ public class BiomeGenBambooForest extends BOPBiome
         this.theBiomeDecorator.grassPerChunk = 5;
         this.theBiomeDecorator.flowersPerChunk = -999;
 
-		this.bopWorldFeatures.setFeature("riverCanePerChunk", 6);
+		this.theBiomeDecorator.bopFeatures.riverCanePerChunk = 6;
-		this.bopWorldFeatures.setFeature("shrubsPerChunk", 6);
+		this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 6;
-		this.bopWorldFeatures.setFeature("bushesPerChunk", 5);
+		this.theBiomeDecorator.bopFeatures.bushesPerChunk = 5;
-		this.bopWorldFeatures.setFeature("leafPilesPerChunk", 15);
+		this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 15;
-		this.bopWorldFeatures.setFeature("algaePerChunk", 2);
+		this.theBiomeDecorator.bopFeatures.algaePerChunk = 2;
 
-		this.bopWorldFeatures.setFeature("generatePumpkins", false);
+		this.theBiomeDecorator.bopFeatures.generatePumpkins = false;
 	}
 
 	@Override

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

@@ -1,4 +1,4 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
@@ -6,9 +6,11 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.monster.EntitySlime;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
+import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.configuration.BOPConfigurationMisc;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.WorldGenMoss;
@@ -16,7 +18,7 @@ import biomesoplenty.common.world.features.trees.WorldGenBayou1;
 import biomesoplenty.common.world.features.trees.WorldGenBayou2;
 import biomesoplenty.common.world.features.trees.WorldGenBayou3;
 
-public class BiomeGenBayou extends BOPBiome
+public class BiomeGenBayou extends BOPOverworldBiome
 {
     private static final Height biomeHeight = new Height(-0.1F, 0.1F);
 
@@ -41,25 +43,25 @@ public class BiomeGenBayou extends BOPBiome
 		this.theBiomeDecorator.sandPerChunk = -999;
 		this.theBiomeDecorator.sandPerChunk2 = -999;
 
-        this.bopWorldFeatures.setFeature("waterLakesPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.waterLakesPerChunk = 5;
-        this.bopWorldFeatures.setFeature("mudPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.mudPerChunk = 1;
-        this.bopWorldFeatures.setFeature("toadstoolsPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 2;
-        this.bopWorldFeatures.setFeature("cattailsPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.cattailsPerChunk = 1;
-        this.bopWorldFeatures.setFeature("highCattailsPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.highCattailsPerChunk = 1;
-        this.bopWorldFeatures.setFeature("algaePerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.algaePerChunk = 1;
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 2;
-        this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4);
+        this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 4;
-        this.bopWorldFeatures.setFeature("koruPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.koruPerChunk = 1;
-        this.bopWorldFeatures.setFeature("seaweedPerChunk", 15);
+        this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 15;
-        this.bopWorldFeatures.setFeature("leafPilesPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 5;
-        this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 10;
-        this.bopWorldFeatures.setFeature("generatePumpkins", false);
+        this.theBiomeDecorator.bopFeatures.generatePumpkins = false;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 15);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 15;
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
 	}
 
 	@Override

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

@@ -1,18 +1,19 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.trees.WorldGenBogBush;
 import biomesoplenty.common.world.features.trees.WorldGenCypress;
 
-public class BiomeGenBog extends BOPBiome
+public class BiomeGenBog extends BOPOverworldBiome
 {
     private static final Height biomeHeight = new Height(0.1F, 0.2F);
     
@@ -34,27 +35,27 @@ public class BiomeGenBog extends BOPBiome
         this.theBiomeDecorator.sandPerChunk = -999;
         this.theBiomeDecorator.sandPerChunk2 = -999;
 
-        this.bopWorldFeatures.setFeature("bushesPerChunk", 6);
+        this.theBiomeDecorator.bopFeatures.bushesPerChunk = 6;
-        this.bopWorldFeatures.setFeature("mudPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.mudPerChunk = 2;
-        this.bopWorldFeatures.setFeature("algaePerChunk", 3);
+        this.theBiomeDecorator.bopFeatures.algaePerChunk = 3;
-        this.bopWorldFeatures.setFeature("riverCanePerChunk", 8);
+        this.theBiomeDecorator.bopFeatures.riverCanePerChunk = 8;
-        this.bopWorldFeatures.setFeature("blueMilksPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.blueMilksPerChunk = 1;
-        this.bopWorldFeatures.setFeature("waterLakesPerChunk", 6);
+        this.theBiomeDecorator.bopFeatures.waterLakesPerChunk = 6;
-        this.bopWorldFeatures.setFeature("poisonLakesPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.poisonLakesPerChunk = 2;
-        this.bopWorldFeatures.setFeature("waterReedsPerChunk", 8);
+        this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 8;
-        this.bopWorldFeatures.setFeature("koruPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.koruPerChunk = 1;
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 10;
-        this.bopWorldFeatures.setFeature("leafPilesPerChunk", 15);
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 15;
-        this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 8);
+        this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 8;
-        this.bopWorldFeatures.setFeature("seaweedPerChunk", 15);
+        this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 15;
-        this.bopWorldFeatures.setFeature("generatePumpkins", false);
+        this.theBiomeDecorator.bopFeatures.generatePumpkins = false;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5;
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 1D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
     }
 
 	@Override

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

@@ -1,4 +1,4 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
@@ -6,16 +6,18 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.passive.EntityWolf;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
+import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import net.minecraft.world.gen.feature.WorldGenShrub;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2;
 import biomesoplenty.common.world.features.trees.WorldGenOriginalTree;
 
-public class BiomeGenBorealForest extends BOPBiome
+public class BiomeGenBorealForest extends BOPOverworldBiome
 {
 	private static final Height biomeHeight = new Height(0.2F, 0.4F);
 	
@@ -32,20 +34,20 @@ public class BiomeGenBorealForest extends BOPBiome
 		this.theBiomeDecorator.treesPerChunk = 20;
 		this.theBiomeDecorator.grassPerChunk = 50;
 
-        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 5;
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 10;
-        this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4);
+        this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 4;
-        this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 10;
-        this.bopWorldFeatures.setFeature("algaePerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.algaePerChunk = 2;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 50);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 50;
 
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(4, 5), 10);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(4, 5), 10);
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 2D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 2D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
 	}
 
 	@Override

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

@@ -1,20 +1,21 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPFlora;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.trees.WorldGenBrush1;
 import biomesoplenty.common.world.features.trees.WorldGenBrush2;
 import biomesoplenty.common.world.features.trees.WorldGenMiniShrub;
 
-public class BiomeGenBrushland extends BOPBiome
+public class BiomeGenBrushland extends BOPOverworldBiome
 {
 	private static final Height biomeHeight = new Height(0.1F, 0.2F);
 	
@@ -30,19 +31,19 @@ public class BiomeGenBrushland extends BOPBiome
 		this.theBiomeDecorator.grassPerChunk = 6;
 		this.theBiomeDecorator.flowersPerChunk = -999;
 
-        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 5;
-        this.bopWorldFeatures.setFeature("thornsPerChunk", 4);
+        this.theBiomeDecorator.bopFeatures.thornsPerChunk = 4;
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 30);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 30;
-        this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 2;
-        this.bopWorldFeatures.setFeature("generateQuicksand", true);
+        this.theBiomeDecorator.bopFeatures.generateQuicksand = true;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 6);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 6;
 
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 5);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 5);
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
 	}
 
 	@Override

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

@@ -1,18 +1,19 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.trees.WorldGenBOPShrub;
 import biomesoplenty.common.world.features.trees.WorldGenPineTree;
 
-public class BiomeGenCanyon extends BOPBiome
+public class BiomeGenCanyon extends BOPOverworldBiome
 {
 	private static final Height biomeHeight = new Height(5.0F, 0.025F);
 
@@ -34,14 +35,14 @@ public class BiomeGenCanyon extends BOPBiome
 		this.theBiomeDecorator.treesPerChunk = 3;
 		this.theBiomeDecorator.flowersPerChunk = -999;
 
-        this.bopWorldFeatures.setFeature("bromeliadsPerChunk", 3);
+        this.theBiomeDecorator.bopFeatures.bromeliadsPerChunk = 3;
-        this.bopWorldFeatures.setFeature("grassSplatterPerChunk", 4);
+        this.theBiomeDecorator.bopFeatures.grassSplatterPerChunk = 4;
-        this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4);
+        this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 4;
-        this.bopWorldFeatures.setFeature("generatePumpkins", false);
+        this.theBiomeDecorator.bopFeatures.generatePumpkins = false;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5;
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 1D);
 	}
 
 	@Override

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

@@ -1,4 +1,4 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
@@ -6,16 +6,18 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.passive.EntityHorse;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
+import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.trees.WorldGenBOPShrub;
 import biomesoplenty.common.world.features.trees.WorldGenChaparral3;
 import biomesoplenty.common.world.features.trees.WorldGenMiniShrub;
 
-public class BiomeGenChaparral extends BOPBiome
+public class BiomeGenChaparral extends BOPOverworldBiome
 {
     private static final Height biomeHeight = new Height(0.2F, 0.3F);
 
@@ -34,26 +36,26 @@ public class BiomeGenChaparral extends BOPBiome
 		this.theBiomeDecorator.treesPerChunk = 8;
 		this.theBiomeDecorator.grassPerChunk = 20;
 
-        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 5;
-        this.bopWorldFeatures.setFeature("bushesPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.bushesPerChunk = 10;
-        this.bopWorldFeatures.setFeature("berryBushesPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.berryBushesPerChunk = 2;
-        this.bopWorldFeatures.setFeature("generateStoneInGrass", true);
+        this.theBiomeDecorator.bopFeatures.generateStoneInGrass = true;
-        this.bopWorldFeatures.setFeature("wildCarrotsPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.wildCarrotsPerChunk = 1;
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 10;
-        this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 2;
-        this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 10;
-        this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 5;
-        this.bopWorldFeatures.setFeature("generatePumpkins", false);
+        this.theBiomeDecorator.bopFeatures.generatePumpkins = false;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 20);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 20;
 
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(4, 5), 8);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(4, 5), 8);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(1, 5), 4);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(1, 5), 4);
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
     }
     
     @Override

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

@@ -1,19 +1,20 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora;
 import biomesoplenty.common.world.features.WorldGenBOPFlora;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.trees.WorldGenBOPBigTree;
 
-public class BiomeGenCherryBlossomGrove extends BOPBiome
+public class BiomeGenCherryBlossomGrove extends BOPOverworldBiome
 {
 	private static final Height biomeHeight = new Height(0.1F, 0.2F);
 
@@ -31,23 +32,23 @@ public class BiomeGenCherryBlossomGrove extends BOPBiome
 		this.theBiomeDecorator.grassPerChunk = 15;
 		this.theBiomeDecorator.flowersPerChunk = -999;
 
-        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 10;
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 2;
-        this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 15);
+        this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 15;
-        this.bopWorldFeatures.setFeature("leafPilesPerChunk", 15);
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 15;
-        this.bopWorldFeatures.setFeature("generatePumpkins", false);
+        this.theBiomeDecorator.bopFeatures.generatePumpkins = false;
-        this.bopWorldFeatures.setFeature("algaePerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.algaePerChunk = 2;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 15);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 15;
 
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 6), 12);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 6), 12);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 9), 8);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 9), 8);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 0), 6);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 0), 6);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(1, 5), 4);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(1, 5), 4);
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
 	}
 
 	@Override

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

@@ -1,4 +1,4 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
@@ -6,16 +6,18 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.passive.EntityWolf;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
+import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora;
 import biomesoplenty.common.world.features.WorldGenBOPFlora;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2;
 import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga3;
 
-public class BiomeGenConiferousForest extends BOPBiome
+public class BiomeGenConiferousForest extends BOPOverworldBiome
 {
     private static final Height biomeHeight = new Height(0.1F, 0.3F);
 
@@ -38,29 +40,29 @@ public class BiomeGenConiferousForest extends BOPBiome
 		this.theBiomeDecorator.sandPerChunk = -999;
 		this.theBiomeDecorator.sandPerChunk2 = -999;
 
-        this.bopWorldFeatures.setFeature("toadstoolsPerChunk", 3);
+        this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 3;
-        this.bopWorldFeatures.setFeature("blueMilksPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.blueMilksPerChunk = 1;
-        this.bopWorldFeatures.setFeature("poisonIvyPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.poisonIvyPerChunk = 1;
-        this.bopWorldFeatures.setFeature("berryBushesPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.berryBushesPerChunk = 1;
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 8);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 8;
-        this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 2;
-        this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 10;
-        this.bopWorldFeatures.setFeature("leafPilesPerChunk", 4);
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 4;
-        this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 8);
+        this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 8;
-        this.bopWorldFeatures.setFeature("seaweedPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 5;
-        this.bopWorldFeatures.setFeature("algaePerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.algaePerChunk = 2;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 10;
-        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 25);
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 25;
         
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers2, 5), 15);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers2, 5), 15);
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 1D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(3, 64), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(3, 64), 0.5D);
 	}
 
 	@Override

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

@@ -1,20 +1,21 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora;
 import biomesoplenty.common.world.features.WorldGenBOPFlora;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2;
 import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga3;
 
-public class BiomeGenConiferousForestSnow extends BOPBiome
+public class BiomeGenConiferousForestSnow extends BOPOverworldBiome
 {
     private static final Height biomeHeight = new Height(0.1F, 0.3F);
     
@@ -38,20 +39,20 @@ public class BiomeGenConiferousForestSnow extends BOPBiome
         this.theBiomeDecorator.sandPerChunk = -999;
         this.theBiomeDecorator.sandPerChunk2 = -999;
 
-        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 3);
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 3;
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 4);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 4;
-        this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 8);
+        this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 8;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5;
 
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 8), 8);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 8), 8);
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 1D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.25D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.25D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(3, 64), 0.25D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(3, 64), 0.25D);
     }
 
 	@Override

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

@@ -1,16 +1,16 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
-import biomesoplenty.api.BOPBlockHelper;
+import net.minecraft.world.biome.BiomeGenBase.Height;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.configuration.BOPConfigurationMisc;
 
-public class BiomeGenCrag extends BOPBiome
+public class BiomeGenCrag extends BOPOverworldBiome
 {
 	private static final Height biomeHeight = new Height(2.0F, 3.0F);
 	

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

@@ -1,20 +1,21 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.configuration.BOPConfigurationMisc;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2;
 import biomesoplenty.common.world.features.trees.WorldGenDeadTree;
 import biomesoplenty.common.world.features.trees.WorldGenOriginalTree;
 
-public class BiomeGenDeadForest extends BOPBiome
+public class BiomeGenDeadForest extends BOPOverworldBiome
 {
 	private static final Height biomeHeight = new Height(0.1F, 0.3F);
 
@@ -32,17 +33,17 @@ public class BiomeGenDeadForest extends BOPBiome
 		this.theBiomeDecorator.flowersPerChunk = -999;
 		this.theBiomeDecorator.reedsPerChunk = -999;
 
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 2;
-        this.bopWorldFeatures.setFeature("thornsPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.thornsPerChunk = 2;
-        this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 2;
-        this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 20);
+        this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 20;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 1;
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 0), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 0), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
 	}
 
 	@Override

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

@@ -1,19 +1,20 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.configuration.BOPConfigurationMisc;
 import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.trees.WorldGenDeadTree;
 
-public class BiomeGenDeadSwamp extends BOPBiome
+public class BiomeGenDeadSwamp extends BOPOverworldBiome
 {
     private static final Height biomeHeight = new Height(0.0F, 0.1F);
     
@@ -39,19 +40,19 @@ public class BiomeGenDeadSwamp extends BOPBiome
 		this.theBiomeDecorator.sandPerChunk = -999;
 		this.theBiomeDecorator.sandPerChunk2 = -999;
 
-        this.bopWorldFeatures.setFeature("mudPerChunk", 3);
+        this.theBiomeDecorator.bopFeatures.mudPerChunk = 3;
-        this.bopWorldFeatures.setFeature("riverCanePerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.riverCanePerChunk = 2;
-        this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4);
+        this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 4;
-        this.bopWorldFeatures.setFeature("koruPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.koruPerChunk = 1;
-        this.bopWorldFeatures.setFeature("seaweedPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 5;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 25);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 25;
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 1D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(2), 0.25D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(2), 0.25D);
 	}
 
     @Override

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

@@ -1,4 +1,4 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
@@ -8,11 +8,11 @@ import net.minecraft.world.World;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import net.minecraft.world.gen.feature.WorldGenShrub;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.trees.WorldGenBulbTree;
 
-public class BiomeGenDeciduousForest extends BOPBiome
+public class BiomeGenDeciduousForest extends BOPOverworldBiome
 {
 	//private static final Height biomeHeight = new Height(); Not set?
 	
@@ -29,23 +29,23 @@ public class BiomeGenDeciduousForest extends BOPBiome
 		this.theBiomeDecorator.grassPerChunk = 10;
 		this.theBiomeDecorator.flowersPerChunk = -999;
 
-        this.bopWorldFeatures.setFeature("toadstoolsPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 1;
-        this.bopWorldFeatures.setFeature("bushesPerChunk", 8);
+        this.theBiomeDecorator.bopFeatures.bushesPerChunk = 8;
-        this.bopWorldFeatures.setFeature("berryBushesPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.berryBushesPerChunk = 2;
-        this.bopWorldFeatures.setFeature("blueMilksPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.blueMilksPerChunk = 2;
-        this.bopWorldFeatures.setFeature("poisonIvyPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.poisonIvyPerChunk = 1;
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 10;
-        this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 2;
-        this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 10;
-        this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 10;
-        this.bopWorldFeatures.setFeature("algaePerChunk", 3);
+        this.theBiomeDecorator.bopFeatures.algaePerChunk = 3;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 10;
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 1D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
 	}
 
 	@Override

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

@@ -1,4 +1,4 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
@@ -6,9 +6,11 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.monster.EntitySlime;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
+import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora;
 import biomesoplenty.common.world.features.WorldGenBOPFlora;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
@@ -17,7 +19,7 @@ import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga1;
 import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2;
 import biomesoplenty.common.world.features.trees.WorldGenDeadTree;
 
-public class BiomeGenFen extends BOPBiome
+public class BiomeGenFen extends BOPOverworldBiome
 {
     private static final Height biomeHeight = new Height(0.1F, 0.3F);
     
@@ -37,31 +39,31 @@ public class BiomeGenFen extends BOPBiome
 		this.theBiomeDecorator.sandPerChunk = -999;
 		this.theBiomeDecorator.sandPerChunk2 = -999;
 
-        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 5;
-        this.bopWorldFeatures.setFeature("cattailsPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.cattailsPerChunk = 1;
-        this.bopWorldFeatures.setFeature("highCattailsPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.highCattailsPerChunk = 1;
-        this.bopWorldFeatures.setFeature("waterSpringsPerChunk", 99);
+        this.theBiomeDecorator.bopFeatures.waterSpringsPerChunk = 99;
-        this.bopWorldFeatures.setFeature("toadstoolsPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 2;
-        this.bopWorldFeatures.setFeature("mudPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.mudPerChunk = 1;
-        this.bopWorldFeatures.setFeature("riverCanePerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.riverCanePerChunk = 5;
-        this.bopWorldFeatures.setFeature("algaePerChunk", 3);
+        this.theBiomeDecorator.bopFeatures.algaePerChunk = 3;
-        this.bopWorldFeatures.setFeature("portobellosPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.portobellosPerChunk = 1;
-        this.bopWorldFeatures.setFeature("waterReedsPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 10;
-        this.bopWorldFeatures.setFeature("koruPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.koruPerChunk = 1;
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 7);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 7;
-        this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 10;
-        this.bopWorldFeatures.setFeature("seaweedPerChunk", 15);
+        this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 15;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 15);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 15;
 
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 6);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 6);
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 1D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(2), 0.25D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(2), 0.25D);
 	}
 
 	@Override

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

@@ -1,17 +1,18 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPFlora;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class BiomeGenFlowerField extends BOPBiome
+public class BiomeGenFlowerField extends BOPOverworldBiome
 {
 	private static final Height biomeHeight = new Height(0.1F, 0.1F);
 
@@ -25,12 +26,12 @@ public class BiomeGenFlowerField extends BOPBiome
 		
 		this.theBiomeDecorator.treesPerChunk = -999;
 
-        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 999);
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 999;
 
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 7), 10);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 7), 10);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 6), 10);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 6), 10);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 5), 10);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 5), 10);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 4), 10);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 4), 10);
 	}
 	
 	@Override

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

@@ -1,18 +1,19 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import net.minecraft.world.gen.feature.WorldGenTallGrass;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.configuration.BOPConfigurationMisc;
 import biomesoplenty.common.world.features.WorldGenBOPFlora;
 
-public class BiomeGenFrostForest extends BOPBiome
+public class BiomeGenFrostForest extends BOPOverworldBiome
 {
 	private static final Height biomeHeight = new Height(0.1F, 0.2F);
 	
@@ -30,20 +31,20 @@ public class BiomeGenFrostForest extends BOPBiome
 		this.theBiomeDecorator.flowersPerChunk = -999;
 		this.theBiomeDecorator.mushroomsPerChunk = -999;
 
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 1;
-        this.bopWorldFeatures.setFeature("leafPilesPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 2;
-        this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 4);
+        this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 4;
-        this.bopWorldFeatures.setFeature("generatePumpkins", false);
+        this.theBiomeDecorator.bopFeatures.generatePumpkins = false;
 
-        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 3);
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 3;
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 1;
 
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers2, 7), 8);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers2, 7), 8);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 8), 8);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 8), 8);
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(Blocks.tallgrass, 1), 1D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 11), 0.5D);
 	}
 
 	@Override

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

@@ -1,4 +1,4 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
@@ -6,10 +6,12 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.passive.EntityMooshroom;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
+import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import net.minecraft.world.gen.feature.WorldGenShrub;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.configuration.BOPConfigurationMisc;
 import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora;
 import biomesoplenty.common.world.features.WorldGenBOPFlora;
@@ -17,7 +19,7 @@ import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.WorldGenMoss;
 import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga3;
 
-public class BiomeGenFungiForest extends BOPBiome
+public class BiomeGenFungiForest extends BOPOverworldBiome
 {
     private static final Height biomeHeight = new Height(0.2F, 0.5F);
 	
@@ -39,28 +41,28 @@ public class BiomeGenFungiForest extends BOPBiome
 		this.theBiomeDecorator.mushroomsPerChunk = 8;
 		this.theBiomeDecorator.bigMushroomsPerChunk = 8;
 		
-        this.bopWorldFeatures.setFeature("sproutsPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.sproutsPerChunk = 2;
-		this.bopWorldFeatures.setFeature("bushesPerChunk", 1);
+		this.theBiomeDecorator.bopFeatures.bushesPerChunk = 1;
-        this.bopWorldFeatures.setFeature("toadstoolsPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 5;
-        this.bopWorldFeatures.setFeature("portobellosPerChunk", 7);
+        this.theBiomeDecorator.bopFeatures.portobellosPerChunk = 7;
-        this.bopWorldFeatures.setFeature("blueMilksPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.blueMilksPerChunk = 2;
-        this.bopWorldFeatures.setFeature("glowshroomsPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.glowshroomsPerChunk = 1;
-		this.bopWorldFeatures.setFeature("riverCanePerChunk", 1);
+		this.theBiomeDecorator.bopFeatures.riverCanePerChunk = 1;
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 1;
-        this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 20);
+        this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 20;
-        this.bopWorldFeatures.setFeature("generateMycelium", true);
+        this.theBiomeDecorator.bopFeatures.generateMycelium = true;
 		
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 12);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 12;
-        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 3);
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 3;
         
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 4), 8);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 4), 8);
         
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 2D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 2D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(2), 0.25D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(2), 0.25D);
 	}
 
 	@Override

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

@@ -1,21 +1,23 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
+import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import net.minecraft.world.gen.feature.WorldGenShrub;
 import net.minecraft.world.gen.feature.WorldGenTallGrass;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.entities.EntityRosester;
 import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora;
 import biomesoplenty.common.world.features.WorldGenBOPFlora;
 import biomesoplenty.common.world.features.trees.WorldGenGiantFlower;
 
-public class BiomeGenGarden extends BOPBiome
+public class BiomeGenGarden extends BOPOverworldBiome
 {
     private static final Height biomeHeight = new Height(0.1F, 0.1F);
 	
@@ -35,24 +37,24 @@ public class BiomeGenGarden extends BOPBiome
 		this.theBiomeDecorator.sandPerChunk = -999;
 		this.theBiomeDecorator.sandPerChunk2 = -999;
 		
-        this.bopWorldFeatures.setFeature("sproutsPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.sproutsPerChunk = 2;
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 10;
-        this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4);
+        this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 4;
-        this.bopWorldFeatures.setFeature("generateMelons", true);
+        this.theBiomeDecorator.bopFeatures.generateMelons = true;
 		
-        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 20);
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 20;
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 25);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 25;
         
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 0), 15);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 0), 15);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 9), 20);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 9), 20);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 4), 8);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 4), 8);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(0, 3), 2);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(0, 3), 2);
         
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(Blocks.tallgrass, 1), 1D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 1), 0.25D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 1), 0.25D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 2), 0.25D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 2), 0.25D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(2), 0.75D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(2), 0.75D);
 	}
 
 	@Override

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

@@ -1,4 +1,4 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
@@ -10,11 +10,13 @@ import net.minecraft.entity.passive.EntityPig;
 import net.minecraft.entity.passive.EntitySheep;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
+import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
 import net.minecraft.world.gen.feature.WorldGenTallGrass;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 
-public class BiomeGenGrassland extends BOPBiome
+public class BiomeGenGrassland extends BOPOverworldBiome
 {
 	private static final Height biomeHeight = new Height(0.1F, 0.2F);
 	
@@ -40,19 +42,19 @@ public class BiomeGenGrassland extends BOPBiome
 		this.theBiomeDecorator.reedsPerChunk = 35;
 		this.theBiomeDecorator.mushroomsPerChunk = 20;
 
-        this.bopWorldFeatures.setFeature("waterLakesPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.waterLakesPerChunk = 5;
-        this.bopWorldFeatures.setFeature("portobellosPerChunk", 3);
+        this.theBiomeDecorator.bopFeatures.portobellosPerChunk = 3;
-        this.bopWorldFeatures.setFeature("riverCanePerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.riverCanePerChunk = 5;
-        this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 2;
-        this.bopWorldFeatures.setFeature("generatePumpkins", false);
+        this.theBiomeDecorator.bopFeatures.generatePumpkins = false;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 3);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 3;
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 1), 0.25D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 1), 0.25D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 2), 0.25D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 2), 0.25D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 11), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(Blocks.tallgrass, 1), 1D);
 	}
 	
 	@Override

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

@@ -1,13 +1,14 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora;
 import biomesoplenty.common.world.features.WorldGenBOPFlora;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
@@ -15,7 +16,7 @@ import biomesoplenty.common.world.features.trees.WorldGenMiniShrub;
 import biomesoplenty.common.world.features.trees.WorldGenPoplar;
 import biomesoplenty.common.world.features.trees.WorldGenPoplar2;
 
-public class BiomeGenGrove extends BOPBiome
+public class BiomeGenGrove extends BOPOverworldBiome
 {
     private static final Height biomeHeight = new Height(0.1F, 0.2F);
 
@@ -33,24 +34,24 @@ public class BiomeGenGrove extends BOPBiome
 		this.theBiomeDecorator.flowersPerChunk = 5;
 		this.theBiomeDecorator.grassPerChunk = 8;
 
-        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 50);
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 50;
-        this.bopWorldFeatures.setFeature("sproutsPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.sproutsPerChunk = 1;
-        this.bopWorldFeatures.setFeature("berryBushesPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.berryBushesPerChunk = 2;
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 3);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 3;
-        this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 20);
+        this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 20;
-        this.bopWorldFeatures.setFeature("leafPilesPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 5;
-        this.bopWorldFeatures.setFeature("generatePumpkins", false);
+        this.theBiomeDecorator.bopFeatures.generatePumpkins = false;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 8);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 8;
 
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 0), 16);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 0), 16);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 9), 6);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 9), 6);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(5, 3), 4);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(5, 3), 4);
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 1D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
 	}
 
 	@Override

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

@@ -1,4 +1,4 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
@@ -6,16 +6,18 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.passive.EntityHorse;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
+import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import net.minecraft.world.gen.feature.WorldGenShrub;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora;
 import biomesoplenty.common.world.features.WorldGenBOPFlora;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.trees.WorldGenBOPShrub;
 
-public class BiomeGenHeathland extends BOPBiome
+public class BiomeGenHeathland extends BOPOverworldBiome
 {
     private static final Height biomeHeight = new Height(0.1F, 0.2F);
 
@@ -35,22 +37,22 @@ public class BiomeGenHeathland extends BOPBiome
 		this.theBiomeDecorator.grassPerChunk = 10;
 	    this.theBiomeDecorator.deadBushPerChunk = 2;
 
-        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 20);
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 20;
-        this.bopWorldFeatures.setFeature("berryBushesPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.berryBushesPerChunk = 1;
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 5;
-        this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 10;
-        this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 5;
-        this.bopWorldFeatures.setFeature("generatePumpkins", false);
+        this.theBiomeDecorator.bopFeatures.generatePumpkins = false;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 10;
 
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 7), 8);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 7), 8);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 6);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 6);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(1, 5), 4);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(1, 5), 4);
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
 	}
 	
     @Override

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

@@ -1,16 +1,17 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 
-public class BiomeGenHighland extends BOPBiome
+public class BiomeGenHighland extends BOPOverworldBiome
 {
 	private static final Height biomeHeight = new Height(2.5F, 0.5F);
 
@@ -25,15 +26,15 @@ public class BiomeGenHighland extends BOPBiome
 		this.theBiomeDecorator.treesPerChunk = -999;
 		this.theBiomeDecorator.grassPerChunk = 99;
 
-        this.bopWorldFeatures.setFeature("wildCarrotsPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.wildCarrotsPerChunk = 1;
-        this.bopWorldFeatures.setFeature("rockpilesPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.rockpilesPerChunk = 1;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 99);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 99;
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.25D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.25D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.25D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.25D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(2), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(2), 1D);
 	}
 	
 	@Override

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

@@ -1,21 +1,22 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import net.minecraft.world.gen.feature.WorldGenShrub;
 import net.minecraft.world.gen.feature.WorldGenTallGrass;
 import net.minecraft.world.gen.feature.WorldGenerator;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.configuration.BOPConfigurationMisc;
 import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora;
 import biomesoplenty.common.world.features.trees.WorldGenPineTree;
 
-public class BiomeGenJadeCliffs extends BOPBiome
+public class BiomeGenJadeCliffs extends BOPOverworldBiome
 {
 	private static final Height biomeHeight = new Height(0.5F, 1.0F);
 	
@@ -30,14 +31,14 @@ public class BiomeGenJadeCliffs extends BOPBiome
 		this.theBiomeDecorator.treesPerChunk = 12;
 		this.theBiomeDecorator.grassPerChunk = 3;
 
-        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 3);
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 3;
-        this.bopWorldFeatures.setFeature("wildCarrotsPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.wildCarrotsPerChunk = 1;
-        this.bopWorldFeatures.setFeature("leafPilesPerChunk", 4);
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 4;
-        this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 2;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 3);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 3;
 
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(1, 5), 6);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(1, 5), 6);
 	}
 	
 	@Override

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

@@ -1,18 +1,19 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import net.minecraft.world.gen.feature.WorldGenTallGrass;
 import net.minecraft.world.gen.feature.WorldGenerator;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.trees.WorldGenOriginalTree;
 
-public class BiomeGenLavenderFields extends BOPBiome
+public class BiomeGenLavenderFields extends BOPOverworldBiome
 {
 	private static final Height biomeHeight = new Height(0.1F, 0.1F);
 	
@@ -28,7 +29,7 @@ public class BiomeGenLavenderFields extends BOPBiome
 		this.theBiomeDecorator.flowersPerChunk = -999;
 		this.theBiomeDecorator.grassPerChunk = 20;
 
-        this.bopWorldFeatures.setFeature("lavenderPerChunk", 999);
+        this.theBiomeDecorator.bopFeatures.lavenderPerChunk = 999;
 	}
 	
 	@Override

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

@@ -1,4 +1,4 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
@@ -6,17 +6,19 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.passive.EntityHorse;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
+import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import net.minecraft.world.gen.feature.WorldGenShrub;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora;
 import biomesoplenty.common.world.features.WorldGenBOPFlora;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.trees.WorldGenCypress;
 import biomesoplenty.common.world.features.trees.WorldGenDeadTree;
 
-public class BiomeGenLushDesert extends BOPBiome
+public class BiomeGenLushDesert extends BOPOverworldBiome
 {
     private static final Height biomeHeight = new Height(0.2F, 0.5F);
     
@@ -40,27 +42,27 @@ public class BiomeGenLushDesert extends BOPBiome
         this.theBiomeDecorator.cactiPerChunk = 20;
         this.theBiomeDecorator.deadBushPerChunk = 2;
 
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 10;
-        this.bopWorldFeatures.setFeature("oasesPerChunk", 999);
+        this.theBiomeDecorator.bopFeatures.oasesPerChunk = 999;
-        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 5;
-        this.bopWorldFeatures.setFeature("tinyCactiPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.tinyCactiPerChunk = 5;
-        this.bopWorldFeatures.setFeature("waterLakesPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.waterLakesPerChunk = 5;
-        this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4);
+        this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 4;
-        this.bopWorldFeatures.setFeature("bromeliadsPerChunk", 3);
+        this.theBiomeDecorator.bopFeatures.bromeliadsPerChunk = 3;
-        this.bopWorldFeatures.setFeature("leafPilesPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 2;
-        this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 4);
+        this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 4;
-        this.bopWorldFeatures.setFeature("generateSand", true);
+        this.theBiomeDecorator.bopFeatures.generateSand = true;
-        this.bopWorldFeatures.setFeature("generatePumpkins", false);
+        this.theBiomeDecorator.bopFeatures.generatePumpkins = false;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 8);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 8;
 
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(4, 5), 4);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(4, 5), 4);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 7), 8);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 7), 8);
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.plants, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.plants, 1), 1D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
     }
 
     @Override

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

@@ -1,4 +1,4 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
@@ -6,14 +6,16 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.monster.EntitySlime;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
+import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPFlora;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.trees.WorldGenBOPSwampTree;
 
-public class BiomeGenLushSwamp extends BOPBiome
+public class BiomeGenLushSwamp extends BOPOverworldBiome
 {
     private static final Height biomeHeight = new Height(0.0F, 0.1F);
 
@@ -32,28 +34,28 @@ public class BiomeGenLushSwamp extends BOPBiome
 		this.theBiomeDecorator.mushroomsPerChunk = 8;
 		this.theBiomeDecorator.reedsPerChunk = 16;
 
-        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 1;
-        this.bopWorldFeatures.setFeature("cattailsPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.cattailsPerChunk = 10;
-        this.bopWorldFeatures.setFeature("highCattailsPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.highCattailsPerChunk = 5;
-        this.bopWorldFeatures.setFeature("riverCanePerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.riverCanePerChunk = 5;
-        this.bopWorldFeatures.setFeature("algaePerChunk", 3);
+        this.theBiomeDecorator.bopFeatures.algaePerChunk = 3;
-        this.bopWorldFeatures.setFeature("poisonLakesPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.poisonLakesPerChunk = 2;
-        this.bopWorldFeatures.setFeature("wildCarrotsPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.wildCarrotsPerChunk = 1;
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 5;
-        this.bopWorldFeatures.setFeature("koruPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.koruPerChunk = 1;
-        this.bopWorldFeatures.setFeature("waterReedsPerChunk", 6);
+        this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 6;
-        this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 10;
-        this.bopWorldFeatures.setFeature("seaweedPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 10;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 4);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 4;
 
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 4), 8);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 4), 8);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 4);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 4);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 6);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 6);
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
     }
 
     @Override

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

@@ -1,19 +1,20 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPFlora;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2;
 import biomesoplenty.common.world.features.trees.WorldGenOriginalTree;
 
-public class BiomeGenMapleWoods extends BOPBiome
+public class BiomeGenMapleWoods extends BOPOverworldBiome
 {
     private static final Height biomeHeight = new Height(0.1F, 0.3F);
     
@@ -28,18 +29,18 @@ public class BiomeGenMapleWoods extends BOPBiome
 		this.theBiomeDecorator.treesPerChunk = 9;
 		this.theBiomeDecorator.grassPerChunk = 1;
 
-        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 2;
-        this.bopWorldFeatures.setFeature("poisonIvyPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.poisonIvyPerChunk = 1;
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 2;
-        this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 8);
+        this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 8;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 1;
 
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 8), 1);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 8), 1);
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
 	}
 
 	@Override

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

@@ -1,4 +1,4 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
@@ -6,12 +6,14 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.monster.EntitySlime;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
+import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 
-public class BiomeGenMarsh extends BOPBiome
+public class BiomeGenMarsh extends BOPOverworldBiome
 {
 	private static final Height biomeHeight = new Height(0.1F, 0.1F);
 	
@@ -36,20 +38,20 @@ public class BiomeGenMarsh extends BOPBiome
 		this.theBiomeDecorator.sandPerChunk = -999;
 		this.theBiomeDecorator.sandPerChunk2 = -999;
 
-        this.bopWorldFeatures.setFeature("koruPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.koruPerChunk = 1;
-        this.bopWorldFeatures.setFeature("mudPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.mudPerChunk = 1;
-        this.bopWorldFeatures.setFeature("waterLakesPerChunk", 100);
+        this.theBiomeDecorator.bopFeatures.waterLakesPerChunk = 100;
-        this.bopWorldFeatures.setFeature("waterReedsPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 10;
-        this.bopWorldFeatures.setFeature("seaweedPerChunk", 15);
+        this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 15;
-        this.bopWorldFeatures.setFeature("algaePerChunk", 3);
+        this.theBiomeDecorator.bopFeatures.algaePerChunk = 3;
-        this.bopWorldFeatures.setFeature("generatePumpkins", false);
+        this.theBiomeDecorator.bopFeatures.generatePumpkins = false;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 50);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 50;
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(2), 0.25D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(2), 0.25D);
 	}
 
 	@Override

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

@@ -1,4 +1,4 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
@@ -6,16 +6,17 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.passive.EntityHorse;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora;
 import biomesoplenty.common.world.features.WorldGenBOPFlora;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.trees.WorldGenBOPShrub;
 import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2;
 
-public class BiomeGenMeadow extends BOPBiome
+public class BiomeGenMeadow extends BOPOverworldBiome
 {
 	public BiomeGenMeadow(int id)
 	{
@@ -34,25 +35,25 @@ public class BiomeGenMeadow extends BOPBiome
 		this.theBiomeDecorator.mushroomsPerChunk = 2;
 		this.theBiomeDecorator.flowersPerChunk = 10;
 
-        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 14);
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 14;
-        this.bopWorldFeatures.setFeature("wildCarrotsPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.wildCarrotsPerChunk = 1;
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 5;
-        this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 15);
+        this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 15;
-        this.bopWorldFeatures.setFeature("seaweedPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 5;
-        this.bopWorldFeatures.setFeature("generatePumpkins", false);
+        this.theBiomeDecorator.bopFeatures.generatePumpkins = false;
-        this.bopWorldFeatures.setFeature("algaePerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.algaePerChunk = 2;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 10;
 
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 0), 10);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 0), 10);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 4), 8);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 4), 8);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(5, 3), 5);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(5, 3), 5);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(1, 5), 4);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(1, 5), 4);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(0, 3), 2);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(0, 3), 2);
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
 	}
 	
     @Override

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

@@ -1,17 +1,18 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.configuration.BOPConfigurationMisc;
 import biomesoplenty.common.world.features.WorldGenBOPFlora;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 
-public class BiomeGenMoor extends BOPBiome
+public class BiomeGenMoor extends BOPOverworldBiome
 {
     private static final Height biomeHeight = new Height(1.5F, 0.025F);
     
@@ -37,22 +38,22 @@ public class BiomeGenMoor extends BOPBiome
 		this.theBiomeDecorator.sandPerChunk = -999;
 		this.theBiomeDecorator.sandPerChunk2 = -999;
 
-        this.bopWorldFeatures.setFeature("mudPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.mudPerChunk = 1;
-        this.bopWorldFeatures.setFeature("waterLakesPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.waterLakesPerChunk = 10;
-        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 6);
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 6;
-        this.bopWorldFeatures.setFeature("koruPerChunk", 6);
+        this.theBiomeDecorator.bopFeatures.koruPerChunk = 6;
-        this.bopWorldFeatures.setFeature("seaweedPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 5;
-        this.bopWorldFeatures.setFeature("generatePumpkins", false);
+        this.theBiomeDecorator.bopFeatures.generatePumpkins = false;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 15);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 15;
 
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 1), 14);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 1), 14);
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 1D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
 	}
 	
 	@Override

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

@@ -1,19 +1,20 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import net.minecraft.world.gen.feature.WorldGenTallGrass;
 import net.minecraft.world.gen.feature.WorldGenerator;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.trees.WorldGenPineTree;
 
-public class BiomeGenMountain extends BOPBiome
+public class BiomeGenMountain extends BOPOverworldBiome
 {
 	private static final Height biomeHeight = new Height(2.5F, 0.5F);
 
@@ -28,20 +29,20 @@ public class BiomeGenMountain extends BOPBiome
 		this.theBiomeDecorator.treesPerChunk = 2;
 		this.theBiomeDecorator.grassPerChunk = 3;
 
-        this.bopWorldFeatures.setFeature("berryBushesPerChunk", 3);
+        this.theBiomeDecorator.bopFeatures.berryBushesPerChunk = 3;
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 10;
-        this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4);
+        this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 4;
-        this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 10;
-        this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 10;
-        this.bopWorldFeatures.setFeature("algaePerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.algaePerChunk = 2;
         
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 8);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 8;
         
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
 	}
 
 	@Override

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

@@ -1,4 +1,4 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
@@ -6,17 +6,18 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.monster.EntityWitch;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
+import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
-import biomesoplenty.api.BOPBlockHelper;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora;
 import biomesoplenty.common.world.features.WorldGenBOPFlora;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.trees.WorldGenBOPSwampTree;
 import biomesoplenty.common.world.features.trees.WorldGenOriginalTree;
 
-public class BiomeGenMysticGrove extends BOPBiome
+public class BiomeGenMysticGrove extends BOPOverworldBiome
 {
     private static final Height biomeHeight = new Height(0.1F, 0.2F);
 
@@ -41,31 +42,31 @@ public class BiomeGenMysticGrove extends BOPBiome
 		this.theBiomeDecorator.sandPerChunk2 = -999;
 		this.theBiomeDecorator.flowersPerChunk = 8;
 
-        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 10;
-        this.bopWorldFeatures.setFeature("sproutsPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.sproutsPerChunk = 1;
-        this.bopWorldFeatures.setFeature("blueMilksPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.blueMilksPerChunk = 1;
-        this.bopWorldFeatures.setFeature("poisonLakesPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.poisonLakesPerChunk = 1;
 
-        this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 10;
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 4);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 4;
-        this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 10;
-        this.bopWorldFeatures.setFeature("seaweedPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 5;
-        this.bopWorldFeatures.setFeature("algaePerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.algaePerChunk = 2;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 15);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 15;
 
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 6), 12);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 6), 12);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 3), 10);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 3), 10);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 4), 8);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 4), 8);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 3), 6);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 3), 6);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 6);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 6);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(1, 5), 4);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(1, 5), 4);
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 1D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
 	}
 
 	@Override

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

@@ -1,4 +1,4 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
@@ -8,18 +8,19 @@ import net.minecraft.entity.monster.EntityEnderman;
 import net.minecraft.entity.passive.EntityBat;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
+import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import net.minecraft.world.gen.feature.WorldGenTallGrass;
-import biomesoplenty.api.BOPBlockHelper;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.configuration.BOPConfigurationMisc;
 import biomesoplenty.common.world.features.WorldGenBOPFlora;
 import biomesoplenty.common.world.features.trees.WorldGenBOPSwampTree;
 import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2;
 import biomesoplenty.common.world.features.trees.WorldGenDeadTree;
 
-public class BiomeGenOminousWoods extends BOPBiome
+public class BiomeGenOminousWoods extends BOPOverworldBiome
 {
 	private static final Height biomeHeight = new Height(0.1F, 0.2F);
 	
@@ -51,21 +52,21 @@ public class BiomeGenOminousWoods extends BOPBiome
 		this.theBiomeDecorator.sandPerChunk = -999;
 		this.theBiomeDecorator.sandPerChunk2 = -999;
 
-        this.bopWorldFeatures.setFeature("thornsPerChunk", 9);
+        this.theBiomeDecorator.bopFeatures.thornsPerChunk = 9;
-        this.bopWorldFeatures.setFeature("poisonIvyPerChunk", 3);
+        this.theBiomeDecorator.bopFeatures.poisonIvyPerChunk = 3;
-        this.bopWorldFeatures.setFeature("leafPilesPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 2;
-        this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 4);
+        this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 4;
-        this.bopWorldFeatures.setFeature("poisonLakesPerChunk", 15);
+        this.theBiomeDecorator.bopFeatures.poisonLakesPerChunk = 15;
 
-        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 1;
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 1;
 
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 2), 20);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 2), 20);
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(Blocks.tallgrass, 0), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(Blocks.tallgrass, 0), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(Blocks.tallgrass, 1), 1D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenTallGrass(BOPCBlocks.foliage, 11), 0.5D);
 	}
 
 	@Override

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

@@ -1,17 +1,17 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
 import net.minecraft.init.Blocks;
+import net.minecraft.world.biome.BiomeGenBase.Height;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
-import biomesoplenty.api.BOPBlockHelper;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.configuration.BOPConfigurationMisc;
 import biomesoplenty.common.world.features.WorldGenBOPFlora;
 import biomesoplenty.common.world.features.trees.WorldGenOriginalTree;
 
-public class BiomeGenOriginValley extends BOPBiome
+public class BiomeGenOriginValley extends BOPOverworldBiome
 {
     private static final Height biomeHeight = new Height(0.1F, 0.3F);
 
@@ -33,16 +33,16 @@ public class BiomeGenOriginValley extends BOPBiome
 		this.theBiomeDecorator.clayPerChunk = 0;
 		this.theBiomeDecorator.flowersPerChunk = -999;
 
-        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 4);
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 4;
-        this.bopWorldFeatures.setFeature("rootsPerChunk", -999);
+        this.theBiomeDecorator.bopFeatures.rootsPerChunk = -999;
-        this.bopWorldFeatures.setFeature("stalagmitesPerChunk", -999);
+        this.theBiomeDecorator.bopFeatures.stalagmitesPerChunk = -999;
-        this.bopWorldFeatures.setFeature("stalactitesPerChunk", -999);
+        this.theBiomeDecorator.bopFeatures.stalactitesPerChunk = -999;
-        this.bopWorldFeatures.setFeature("minersDelightPerChunk", -999);
+        this.theBiomeDecorator.bopFeatures.minersDelightPerChunk = -999;
         //TODO: FEATURE this.theBiomeDecorator.generateUndergroundLakes = false;
-        this.bopWorldFeatures.setFeature("generatePumpkins", false);
+        this.theBiomeDecorator.bopFeatures.generatePumpkins = false;
 
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers2, 8), 8);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers2, 8), 8);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.yellow_flower, 0), 10);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.yellow_flower, 0), 10);
 	}
 
 	@Override

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

@@ -1,17 +1,18 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.trees.WorldGenBOPShrub;
 import biomesoplenty.common.world.features.trees.WorldGenMiniShrub;
 
-public class BiomeGenOutback extends BOPBiome
+public class BiomeGenOutback extends BOPOverworldBiome
 {
     private static final Height biomeHeight = new Height(0.1F, 0.1F);
 
@@ -34,11 +35,11 @@ public class BiomeGenOutback extends BOPBiome
 	    this.theBiomeDecorator.deadBushPerChunk = 7;
 	    this.theBiomeDecorator.cactiPerChunk = 4;
 
-        this.bopWorldFeatures.setFeature("grassSplatterPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.grassSplatterPerChunk = 10;
-        this.bopWorldFeatures.setFeature("tinyCactiPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.tinyCactiPerChunk = 2;
-        this.bopWorldFeatures.setFeature("bushesPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.bushesPerChunk = 5;
-        this.bopWorldFeatures.setFeature("redSandSplatterPerChunk", 4);
+        this.theBiomeDecorator.bopFeatures.redSandSplatterPerChunk = 4;
-        this.bopWorldFeatures.setFeature("generatePumpkins", false);
+        this.theBiomeDecorator.bopFeatures.generatePumpkins = false;
 	}
 	
     @Override

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

@@ -1,4 +1,4 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
@@ -6,14 +6,16 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.passive.EntityHorse;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
+import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPFlora;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2;
 
-public class BiomeGenPrairie extends BOPBiome
+public class BiomeGenPrairie extends BOPOverworldBiome
 {
     private static final Height biomeHeight = new Height(0.1F, 0.1F);
     
@@ -30,23 +32,23 @@ public class BiomeGenPrairie extends BOPBiome
 		this.theBiomeDecorator.treesPerChunk = 1;
 		this.theBiomeDecorator.grassPerChunk = 999;
 
-        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 30);
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 30;
-        this.bopWorldFeatures.setFeature("portobellosPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.portobellosPerChunk = 2;
-        this.bopWorldFeatures.setFeature("berryBushesPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.berryBushesPerChunk = 2;
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 3);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 3;
-        this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4);
+        this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 4;
-        this.bopWorldFeatures.setFeature("leafPilesPerChunk", 15);
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 15;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 999);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 999;
 
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers2, 4), 12);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers2, 4), 12);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 9), 6);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 9), 6);
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
 	}
 	
     @Override

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

@@ -1,4 +1,4 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
@@ -6,17 +6,19 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.passive.EntityOcelot;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
+import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import net.minecraft.world.gen.feature.WorldGenTallGrass;
 import net.minecraft.world.gen.feature.WorldGenerator;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.entities.EntityJungleSpider;
 import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora;
 import biomesoplenty.common.world.features.WorldGenBOPFlora;
 import biomesoplenty.common.world.features.trees.WorldGenOriginalTree;
 
-public class BiomeGenRainforest extends BOPBiome
+public class BiomeGenRainforest extends BOPOverworldBiome
 {
 	private static final Height biomeHeight = new Height(0.2F, 0.9F);
 
@@ -42,18 +44,18 @@ public class BiomeGenRainforest extends BOPBiome
 		customBiomeDecorator.rosesPerChunk = 10;
 		customBiomeDecorator.orangeFlowersPerChunk = 6;*/
 
-        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 25);
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 25;
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 5;
-        this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 20);
+        this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 20;
-        this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 10;
-        this.bopWorldFeatures.setFeature("seaweedPerChunk", 15);
+        this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 15;
-        this.bopWorldFeatures.setFeature("algaePerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.algaePerChunk = 2;
-        this.bopWorldFeatures.setFeature("generatePumpkins", false);
+        this.theBiomeDecorator.bopFeatures.generatePumpkins = false;
 
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 6), 12);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 6), 12);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 6);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 6);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(4, 5), 4);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(4, 5), 4);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(1, 5), 6);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(1, 5), 6);
 	}
 	
 	@Override

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

@@ -1,21 +1,22 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import net.minecraft.world.gen.feature.WorldGenShrub;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora;
 import biomesoplenty.common.world.features.WorldGenBOPFlora;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.trees.WorldGenRedwoodTree;
 import biomesoplenty.common.world.features.trees.WorldGenRedwoodTree2;
 
-public class BiomeGenRedwoodForest extends BOPBiome
+public class BiomeGenRedwoodForest extends BOPOverworldBiome
 {
     private static final Height biomeHeight = new Height(0.1F, 0.1F);
     
@@ -30,24 +31,24 @@ public class BiomeGenRedwoodForest extends BOPBiome
         this.theBiomeDecorator.treesPerChunk = 99;
         this.theBiomeDecorator.grassPerChunk = 15;
 
-        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 5;
-        this.bopWorldFeatures.setFeature("bushesPerChunk", 4);
+        this.theBiomeDecorator.bopFeatures.bushesPerChunk = 4;
-        this.bopWorldFeatures.setFeature("berryBushesPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.berryBushesPerChunk = 1;
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 10;
-        this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 2;
-        this.bopWorldFeatures.setFeature("leafPilesPerChunk", 15);
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 15;
-        this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 5;
-        this.bopWorldFeatures.setFeature("generatePumpkins", false);
+        this.theBiomeDecorator.bopFeatures.generatePumpkins = false;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 15);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 15;
 
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(4, 5), 10);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(4, 5), 10);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 8);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 8);
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
     }
 
     @Override

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

@@ -1,4 +1,4 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
@@ -6,12 +6,13 @@ import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.biome.BiomeGenBase.Height;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import net.minecraft.world.gen.feature.WorldGenShrub;
 import net.minecraft.world.gen.feature.WorldGenTallGrass;
 import net.minecraft.world.gen.feature.WorldGenerator;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.entities.EntityJungleSpider;
 import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora;
 import biomesoplenty.common.world.features.WorldGenBOPFlora;
@@ -19,7 +20,7 @@ import biomesoplenty.common.world.features.trees.WorldGenSacredOak;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class BiomeGenSacredSprings extends BOPBiome
+public class BiomeGenSacredSprings extends BOPOverworldBiome
 {
 	private static final Height biomeHeight = new Height(0.0F, 0.6F);
 	
@@ -36,14 +37,14 @@ public class BiomeGenSacredSprings extends BOPBiome
         this.theBiomeDecorator.grassPerChunk = 4;
         this.theBiomeDecorator.waterlilyPerChunk = 5;
 
-        this.bopWorldFeatures.setFeature("seaweedPerChunk", 15);
+        this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 15;
-        this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 10;
 
-        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 2;
 
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 6), 10);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 6), 10);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 6);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 6);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(5, 5), 5);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(5, 5), 5);
     }
 
     @Override

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

@@ -1,4 +1,4 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
@@ -6,14 +6,16 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.passive.EntityWolf;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
+import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.trees.WorldGenBOPBigTree;
 import biomesoplenty.common.world.features.trees.WorldGenOriginalTree;
 
-public class BiomeGenSeasonalForest extends BOPBiome
+public class BiomeGenSeasonalForest extends BOPOverworldBiome
 {
     private static final Height biomeHeight = new Height(0.2F, 0.4F);
 
@@ -31,19 +33,19 @@ public class BiomeGenSeasonalForest extends BOPBiome
         this.theBiomeDecorator.grassPerChunk = 8;
         this.theBiomeDecorator.flowersPerChunk = -999;
 
-        this.bopWorldFeatures.setFeature("toadstoolsPerChunk", 4);
+        this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 4;
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 15);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 15;
-        this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4);
+        this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 4;
-        this.bopWorldFeatures.setFeature("leafPilesPerChunk", 8);
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 8;
-        this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 15);
+        this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 15;
-        this.bopWorldFeatures.setFeature("algaePerChunk", 3);
+        this.theBiomeDecorator.bopFeatures.algaePerChunk = 3;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 8);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 8;
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
     }
 
     @Override

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

@@ -1,20 +1,21 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import net.minecraft.world.gen.feature.WorldGenShrub;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.WorldGenMoss;
 import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2;
 import biomesoplenty.common.world.features.trees.WorldGenPineTree;
 
-public class BiomeGenShield extends BOPBiome
+public class BiomeGenShield extends BOPOverworldBiome
 {
     private static final Height biomeHeight = new Height(0.0F, 0.2F);
 
@@ -32,19 +33,19 @@ public class BiomeGenShield extends BOPBiome
 		this.theBiomeDecorator.sandPerChunk = -999;
 		this.theBiomeDecorator.sandPerChunk2 = -999;
 
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 4);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 4;
-        this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4);
+        this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 4;
-        this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 10;
-        this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 5;
-        this.bopWorldFeatures.setFeature("seaweedPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 5;
-        this.bopWorldFeatures.setFeature("algaePerChunk", 4);
+        this.theBiomeDecorator.bopFeatures.algaePerChunk = 4;
-        this.bopWorldFeatures.setFeature("generateStoneInGrass2", true);
+        this.theBiomeDecorator.bopFeatures.generateStoneInGrass2 = true;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 12);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 12;
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
 	}
 
 	@Override

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

@@ -1,4 +1,4 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
@@ -6,14 +6,16 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.passive.EntityHorse;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
+import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import net.minecraft.world.gen.feature.WorldGenShrub;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPFlora;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 
-public class BiomeGenShrubland extends BOPBiome
+public class BiomeGenShrubland extends BOPOverworldBiome
 {
 	private static final Height biomeHeight = new Height(0.1F, 0.1F);
 	
@@ -31,21 +33,21 @@ public class BiomeGenShrubland extends BOPBiome
 		this.theBiomeDecorator.flowersPerChunk = 0;
 		this.theBiomeDecorator.grassPerChunk = 5;
 
-        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 5;
-        this.bopWorldFeatures.setFeature("bushesPerChunk", 7);
+        this.theBiomeDecorator.bopFeatures.bushesPerChunk = 7;
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 5;
-        this.bopWorldFeatures.setFeature("waterReedsPerChunk", 3);
+        this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 3;
-        this.bopWorldFeatures.setFeature("generatePumpkins", false);
+        this.theBiomeDecorator.bopFeatures.generatePumpkins = false;
         
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 1;
 
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 4);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 4);
         
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
 	}
 
 	@Override

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

@@ -1,4 +1,4 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
@@ -6,15 +6,17 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.monster.EntitySlime;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
+import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.configuration.BOPConfigurationMisc;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.trees.WorldGenBogTree1;
 import biomesoplenty.common.world.features.trees.WorldGenBogTree2;
 
-public class BiomeGenSludgepit extends BOPBiome
+public class BiomeGenSludgepit extends BOPOverworldBiome
 {
     private static final Height biomeHeight = new Height(0.0F, 0.1F);
 
@@ -43,20 +45,20 @@ public class BiomeGenSludgepit extends BOPBiome
         this.theBiomeDecorator.sandPerChunk2 = -999;
         this.theBiomeDecorator.deadBushPerChunk = 5;
 
-        this.bopWorldFeatures.setFeature("mudPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.mudPerChunk = 5;
-        this.bopWorldFeatures.setFeature("algaePerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.algaePerChunk = 2;
-        this.bopWorldFeatures.setFeature("poisonLakesPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.poisonLakesPerChunk = 5;
-        this.bopWorldFeatures.setFeature("waterReedsPerChunk", 6);
+        this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 6;
-        this.bopWorldFeatures.setFeature("koruPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.koruPerChunk = 1;
-        this.bopWorldFeatures.setFeature("leafPilesPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 5;
-        this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 5;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 30);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 30;
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 0), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 0), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
     }
     
     @Override

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

@@ -1,4 +1,4 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
@@ -6,11 +6,13 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.passive.EntityHorse;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
+import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 
-public class BiomeGenSteppe extends BOPBiome
+public class BiomeGenSteppe extends BOPOverworldBiome
 {
 	private static final Height biomeHeight = new Height(0.1F, 0.3F);
 	
@@ -27,16 +29,16 @@ public class BiomeGenSteppe extends BOPBiome
 		this.theBiomeDecorator.treesPerChunk = -999;
 		this.theBiomeDecorator.deadBushPerChunk = 7;
 		
-        this.bopWorldFeatures.setFeature("tinyCactiPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.tinyCactiPerChunk = 1;
-        this.bopWorldFeatures.setFeature("bromeliadsPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.bromeliadsPerChunk = 2;
-        this.bopWorldFeatures.setFeature("sandSplatterPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.sandSplatterPerChunk = 2;
-        this.bopWorldFeatures.setFeature("gravelSplatterPerChunk", 6);
+        this.theBiomeDecorator.bopFeatures.gravelSplatterPerChunk = 6;
-        this.bopWorldFeatures.setFeature("dirtSplatterPerChunk", 4);
+        this.theBiomeDecorator.bopFeatures.dirtSplatterPerChunk = 4;
-        this.bopWorldFeatures.setFeature("generateQuicksand", true);
+        this.theBiomeDecorator.bopFeatures.generateQuicksand = true;
 		
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 15);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 15;
         
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 1D);
 	}
 	
 	@Override

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

@@ -1,14 +1,15 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import net.minecraft.world.gen.feature.WorldGenShrub;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.configuration.BOPConfigurationMisc;
 import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
@@ -17,7 +18,7 @@ import biomesoplenty.common.world.features.trees.WorldGenBOPSwampTree;
 import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2;
 import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga3;
 
-public class BiomeGenTemperateRainforest extends BOPBiome
+public class BiomeGenTemperateRainforest extends BOPOverworldBiome
 {
     private static final Height biomeHeight = new Height(0.0F, 0.3F);
 
@@ -35,25 +36,25 @@ public class BiomeGenTemperateRainforest extends BOPBiome
 		this.theBiomeDecorator.sandPerChunk = -999;
 		this.theBiomeDecorator.sandPerChunk2 = -999;
 
-        this.bopWorldFeatures.setFeature("generatePumpkins", false);
+        this.theBiomeDecorator.bopFeatures.generatePumpkins = false;
-        this.bopWorldFeatures.setFeature("blueMilksPerChunk", 3);
+        this.theBiomeDecorator.bopFeatures.blueMilksPerChunk = 3;
-        this.bopWorldFeatures.setFeature("poisonIvyPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.poisonIvyPerChunk = 1;
-        this.bopWorldFeatures.setFeature("wildCarrotsPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.wildCarrotsPerChunk = 1;
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 10;
-        this.bopWorldFeatures.setFeature("waterReedsPerChunk", 6);
+        this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 6;
-        this.bopWorldFeatures.setFeature("leafPilesPerChunk", 15);
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 15;
-        this.bopWorldFeatures.setFeature("seaweedPerChunk", 15);
+        this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 15;
-        this.bopWorldFeatures.setFeature("algaePerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.algaePerChunk = 5;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 25);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 25;
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 1D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 2D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 2D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(3), 0.25D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(3), 0.25D);
 	}
 
 	@Override

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

@@ -1,19 +1,20 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import net.minecraft.world.gen.feature.WorldGenShrub;
 import net.minecraft.world.gen.feature.WorldGenTallGrass;
 import net.minecraft.world.gen.feature.WorldGenerator;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPFlora;
 
-public class BiomeGenThicket extends BOPBiome
+public class BiomeGenThicket extends BOPOverworldBiome
 {
 	private static final Height biomeHeight = new Height(0.1F, 0.1F);
 	
@@ -30,13 +31,13 @@ public class BiomeGenThicket extends BOPBiome
 		this.theBiomeDecorator.treesPerChunk = 17;
 		this.theBiomeDecorator.grassPerChunk = 1;
 
-        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 5;
-        this.bopWorldFeatures.setFeature("thornsPerChunk", 55);
+        this.theBiomeDecorator.bopFeatures.thornsPerChunk = 55;
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 5;
-        this.bopWorldFeatures.setFeature("leafPilesPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 5;
-        this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 10;
 
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 4);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 4);
 	}
 
 	@Override

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

@@ -1,4 +1,4 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
@@ -6,10 +6,12 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.passive.EntityOcelot;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
+import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import net.minecraft.world.gen.feature.WorldGenTrees;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.configuration.BOPConfigurationMisc;
 import biomesoplenty.common.entities.EntityJungleSpider;
 import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora;
@@ -17,7 +19,7 @@ import biomesoplenty.common.world.features.WorldGenBOPFlora;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.trees.WorldGenRainforestTree1;
 
-public class BiomeGenTropicalRainforest extends BOPBiome
+public class BiomeGenTropicalRainforest extends BOPOverworldBiome
 {
     private static final Height biomeHeight = new Height(0.2F, 0.3F);
 
@@ -39,25 +41,25 @@ public class BiomeGenTropicalRainforest extends BOPBiome
         this.theBiomeDecorator.reedsPerChunk = 10;
         this.theBiomeDecorator.waterlilyPerChunk = 2;
 
-        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 10;
-        this.bopWorldFeatures.setFeature("generatePumpkins", false);
+        this.theBiomeDecorator.bopFeatures.generatePumpkins = false;
-        this.bopWorldFeatures.setFeature("generateMelons", true);
+        this.theBiomeDecorator.bopFeatures.generateMelons = true;
-        this.bopWorldFeatures.setFeature("sproutsPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.sproutsPerChunk = 2;
-        this.bopWorldFeatures.setFeature("generateQuicksand", true);
+        this.theBiomeDecorator.bopFeatures.generateQuicksand = true;
-        this.bopWorldFeatures.setFeature("poisonIvyPerChunk", 4);
+        this.theBiomeDecorator.bopFeatures.poisonIvyPerChunk = 4;
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 15);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 15;
-        this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 10;
-        this.bopWorldFeatures.setFeature("seaweedPerChunk", 15);
+        this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 15;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 9);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 9;
 
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 5), 12);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 5), 12);
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.75D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.75D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(3), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(3), 1D);
     }
     
     @Override

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

@@ -1,18 +1,19 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import net.minecraft.world.gen.feature.WorldGenShrub;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPFlora;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 
-public class BiomeGenTundra extends BOPBiome
+public class BiomeGenTundra extends BOPOverworldBiome
 {
     private static final Height biomeHeight = new Height(0.0F, 0.1F);
     
@@ -34,21 +35,21 @@ public class BiomeGenTundra extends BOPBiome
         this.theBiomeDecorator.reedsPerChunk = -999;
         this.theBiomeDecorator.sandPerChunk = 8;
 
-        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 1;
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 2;
-        this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 2;
-        this.bopWorldFeatures.setFeature("rockpilesPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.rockpilesPerChunk = 2;
-        this.bopWorldFeatures.setFeature("leafPilesPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 5;
-        this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 5;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 8);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 8;
 
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 8), 4);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 8), 4);
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 1D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
     }
 
     @Override

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

@@ -1,18 +1,19 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.configuration.BOPConfigurationMisc;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.trees.WorldGenDeadTree;
 
-public class BiomeGenWasteland extends BOPBiome
+public class BiomeGenWasteland extends BOPOverworldBiome
 {
     private static final Height biomeHeight = new Height(0.1F, 0.1F);
 
@@ -35,17 +36,17 @@ public class BiomeGenWasteland extends BOPBiome
         this.theBiomeDecorator.treesPerChunk = 0;
         this.theBiomeDecorator.grassPerChunk = 20;
         
-        this.bopWorldFeatures.setFeature("poisonLakesPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.poisonLakesPerChunk = 10;
-        this.bopWorldFeatures.setFeature("waterLakesPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.waterLakesPerChunk = 2;
-        this.bopWorldFeatures.setFeature("wasteland1PerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.wasteland1PerChunk = 1;
-        this.bopWorldFeatures.setFeature("wasteland2PerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.wasteland2PerChunk = 1;
-        this.bopWorldFeatures.setFeature("wasteland3PerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.wasteland3PerChunk = 1;
-        this.bopWorldFeatures.setFeature("wasteland4PerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.wasteland4PerChunk = 1;
-        this.bopWorldFeatures.setFeature("wastelandRockPilesPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.wastelandRockPilesPerChunk = 2;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 20);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 20;
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.plants, 0), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.plants, 0), 1D);
     }
 
     @Override

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

@@ -1,4 +1,4 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
@@ -6,9 +6,11 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.monster.EntitySlime;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
+import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora;
 import biomesoplenty.common.world.features.WorldGenBOPFlora;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
@@ -16,7 +18,7 @@ import biomesoplenty.common.world.features.WorldGenMoss;
 import biomesoplenty.common.world.features.trees.WorldGenBOPSwampTree;
 import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2;
 
-public class BiomeGenWetland extends BOPBiome
+public class BiomeGenWetland extends BOPOverworldBiome
 {
     private static final Height biomeHeight = new Height(-0.1F, 0.2F);
 
@@ -36,7 +38,6 @@ public class BiomeGenWetland extends BOPBiome
         this.waterColorMultiplier = 6512772;
 
         this.theBiomeDecorator.treesPerChunk = 6;
-        this.theBiomeDecorator.grassPerChunk = 10;
         this.theBiomeDecorator.flowersPerChunk = -999;
         this.theBiomeDecorator.mushroomsPerChunk = 8;
         this.theBiomeDecorator.reedsPerChunk = 15;
@@ -45,34 +46,34 @@ public class BiomeGenWetland extends BOPBiome
         this.theBiomeDecorator.sandPerChunk2 = -999;
         this.theBiomeDecorator.waterlilyPerChunk = 4;
 
-        this.bopWorldFeatures.setFeature("toadstoolsPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 1;
-        this.bopWorldFeatures.setFeature("riverCanePerChunk", 15);
+        this.theBiomeDecorator.bopFeatures.riverCanePerChunk = 15;
-        this.bopWorldFeatures.setFeature("mudPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.mudPerChunk = 5;
-        this.bopWorldFeatures.setFeature("cattailsPerChunk", 20);
+        this.theBiomeDecorator.bopFeatures.cattailsPerChunk = 20;
-        this.bopWorldFeatures.setFeature("highCattailsPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.highCattailsPerChunk = 10;
-        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 6);
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 6;
-        this.bopWorldFeatures.setFeature("blueMilksPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.blueMilksPerChunk = 1;
-        this.bopWorldFeatures.setFeature("portobellosPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.portobellosPerChunk = 1;
-        this.bopWorldFeatures.setFeature("berryBushesPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.berryBushesPerChunk = 1;
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 10;
-        this.bopWorldFeatures.setFeature("waterReedsPerChunk", 8);
+        this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 8;
-        this.bopWorldFeatures.setFeature("koruPerChunk", 1);
+        this.theBiomeDecorator.bopFeatures.koruPerChunk = 1;
-        this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 15);
+        this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 15;
-        this.bopWorldFeatures.setFeature("seaweedPerChunk", 15);
+        this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 15;
-        this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 10;
-        this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 5;
-        this.bopWorldFeatures.setFeature("algaePerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.algaePerChunk = 5;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 10;
 
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 1), 10);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 1), 10);
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 6);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 1), 6);
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 2), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(3), 0.75D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPDoubleFlora(3), 0.75D);
     }
 
     @Override

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

@@ -1,17 +1,18 @@
-package biomesoplenty.common.biomes.overworld;
+package biomesoplenty.common.biome.overworld;
 
 import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase.Height;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPBiome;
+import biomesoplenty.common.biome.BOPOverworldBiome;
 import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 
-public class BiomeGenWoodland extends BOPBiome
+public class BiomeGenWoodland extends BOPOverworldBiome
 {
     private static final Height biomeHeight = new Height(0.1F, 0.2F);
     
@@ -27,23 +28,23 @@ public class BiomeGenWoodland extends BOPBiome
 		this.theBiomeDecorator.grassPerChunk = 7;
 		this.theBiomeDecorator.mushroomsPerChunk = 4;
 
-        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 5;
-        this.bopWorldFeatures.setFeature("toadstoolsPerChunk", 3);
+        this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 3;
-        this.bopWorldFeatures.setFeature("shrubsPerChunk", 20);
+        this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 20;
-        this.bopWorldFeatures.setFeature("waterReedsPerChunk", 2);
+        this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 2;
-        this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 10;
-        this.bopWorldFeatures.setFeature("leafPilesPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 10;
-        this.bopWorldFeatures.setFeature("deadLeafPilesPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 10;
-        this.bopWorldFeatures.setFeature("logsPerChunk", 10);
+        this.theBiomeDecorator.bopFeatures.logsPerChunk = 10;
-        this.bopWorldFeatures.setFeature("algaePerChunk", 3);
+        this.theBiomeDecorator.bopFeatures.algaePerChunk = 3;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 7);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 7;
 
-        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(4, 5), 6);
+        this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPDoubleFlora(4, 5), 6);
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
 	}
 	
 

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

@@ -1,4 +1,4 @@
-package biomesoplenty.common.biomes.overworld.ocean;
+package biomesoplenty.common.biome.overworld.ocean;
 
 import java.util.Random;
 
@@ -6,7 +6,7 @@ import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPOceanBiome;
+import biomesoplenty.common.biome.BOPOceanBiome;
 
 public class BiomeGenCoralReef extends BOPOceanBiome
 {
@@ -23,10 +23,10 @@ public class BiomeGenCoralReef extends BOPOceanBiome
         this.setColor(18285);
         this.setTemperatureRainfall(0.5F, 0.9F);
         
-        this.bopWorldFeatures.setFeature("coralPerChunk", 300);
+        this.theBiomeDecorator.bopFeatures.coralPerChunk = 300;
-        this.bopWorldFeatures.setFeature("shortKelpPerChunk", 100);
+        this.theBiomeDecorator.bopFeatures.shortKelpPerChunk = 100;
-        this.bopWorldFeatures.setFeature("generateSponge", true);
+        this.theBiomeDecorator.bopFeatures.generateSponge = true;
-        this.bopWorldFeatures.setFeature("seaweedPerChunk", 20);
+        this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 20;
 	}
 
 	@Override

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

@@ -1,4 +1,4 @@
-package biomesoplenty.common.biomes.overworld.ocean;
+package biomesoplenty.common.biome.overworld.ocean;
 
 import java.util.Random;
 
@@ -6,7 +6,7 @@ import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPOceanBiome;
+import biomesoplenty.common.biome.BOPOceanBiome;
 
 public class BiomeGenKelpForest extends BOPOceanBiome
 {
@@ -23,10 +23,10 @@ public class BiomeGenKelpForest extends BOPOceanBiome
         this.setColor(27468);
         this.setTemperatureRainfall(0.5F, 0.9F);
 
-        this.bopWorldFeatures.setFeature("kelpPerChunk", 999);
+        this.theBiomeDecorator.bopFeatures.kelpPerChunk = 999;
-        this.bopWorldFeatures.setFeature("kelpThickPerChunk", 999);
+        this.theBiomeDecorator.bopFeatures.kelpThickPerChunk = 999;
-        this.bopWorldFeatures.setFeature("shortKelpPerChunk", 200);
+        this.theBiomeDecorator.bopFeatures.shortKelpPerChunk = 200;
-        this.bopWorldFeatures.setFeature("seaweedPerChunk", 20);
+        this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 20;
 	}
 
 	@Override

src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenAlpsForest.java

@@ -1,4 +1,4 @@
-package biomesoplenty.common.biomes.overworld.sub;
+package biomesoplenty.common.biome.overworld.sub;
 
 import java.util.Random;
 
@@ -7,7 +7,7 @@ import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPSubBiome;
+import biomesoplenty.common.biome.BOPSubBiome;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2;
 
@@ -33,13 +33,13 @@ public class BiomeGenAlpsForest extends BOPSubBiome
 		this.theBiomeDecorator.sandPerChunk = -999;
 		this.theBiomeDecorator.sandPerChunk2 = -999;
 		
-		this.bopWorldFeatures.setFeature("bopGrassPerChunk", 5);
+		this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5;
 		
-		this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+		this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D);
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D);
 	}
 	
 	@Override

src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenCanyonRavine.java

@@ -1,4 +1,4 @@
-package biomesoplenty.common.biomes.overworld.sub;
+package biomesoplenty.common.biome.overworld.sub;
 
 import java.util.Random;
 
@@ -7,7 +7,7 @@ import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPSubBiome;
+import biomesoplenty.common.biome.BOPSubBiome;
 import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 import biomesoplenty.common.world.features.trees.WorldGenBOPShrub;
 import biomesoplenty.common.world.features.trees.WorldGenPineTree;
@@ -37,14 +37,14 @@ public class BiomeGenCanyonRavine extends BOPSubBiome
 		this.theBiomeDecorator.treesPerChunk = 1;
 		this.theBiomeDecorator.flowersPerChunk = -999;
 
-        this.bopWorldFeatures.setFeature("bromeliadsPerChunk", 3);
+        this.theBiomeDecorator.bopFeatures.bromeliadsPerChunk = 3;
-        this.bopWorldFeatures.setFeature("grassSplatterPerChunk", 4);
+        this.theBiomeDecorator.bopFeatures.grassSplatterPerChunk = 4;
-        this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4);
+        this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 4;
-        this.bopWorldFeatures.setFeature("generatePumpkins", false);
+        this.theBiomeDecorator.bopFeatures.generatePumpkins = false;
 
-        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 5);
+        this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5;
 
-        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 1D);
+        this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 1D);
 	}
 
 	@Override

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

@@ -1,4 +1,4 @@
-package biomesoplenty.common.biomes.overworld.sub;
+package biomesoplenty.common.biome.overworld.sub;
 
 import java.util.Random;
 
@@ -7,7 +7,7 @@ import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
 import biomesoplenty.api.BOPBlockHelper;
 import biomesoplenty.api.content.BOPCBlocks;
-import biomesoplenty.common.biomes.BOPSubBiome;
+import biomesoplenty.common.biome.BOPSubBiome;
 
 public class BiomeGenGlacier extends BOPSubBiome
 {