Merge branch 'master' of https://github.com/BiomesOPlenty/BiomesOPlenty, re-enabled generate lakes

src/main/java/biomesoplenty/api/content/BOPCBiomes.java

@@ -70,6 +70,9 @@ public class BOPCBiomes
 	public static BiomeGenBase quagmire;
 	public static BiomeGenBase tropics;
 	public static BiomeGenBase volcano;
+	public static BiomeGenBase meadowForest;
+	public static BiomeGenBase alpsForest;
+	public static BiomeGenBase canyonRavine;
 	
 	//Ocean Biomes
 	public static BiomeGenBase kelpForest;
@@ -82,6 +85,7 @@ public class BOPCBiomes
 	public static BiomeGenBase visceralHeap;
 	
 	//River Biomes
+	public static BiomeGenBase lushRiver;
 	public static BiomeGenBase dryRiver;
 	
 }

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

@@ -3,6 +3,7 @@ package biomesoplenty.common.biomes.nether;
 import net.minecraft.init.Blocks;
 import biomesoplenty.api.BOPBlockHelper;
 import biomesoplenty.common.biomes.BOPNetherBiome;
+import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
 
 public class BiomeGenUndergarden extends BOPNetherBiome
 {
@@ -12,16 +13,26 @@ public class BiomeGenUndergarden extends BOPNetherBiome
         
         this.setColor(15657658);
         
-        this.topBlock = Blocks.netherrack;
+        this.topBlock = BOPBlockHelper.get("overgrownNetherrack");
         this.fillerBlock = Blocks.netherrack;
         
-        this.bopWorldFeatures.setFeature("netherVinesPerChunk", 12);
+        this.theBiomeDecorator.mushroomsPerChunk = 60;
-        this.bopWorldFeatures.setFeature("overgrownNetherrackPerChunk", 60);
+		this.theBiomeDecorator.bigMushroomsPerChunk = 30;
+        
+        this.bopWorldFeatures.setFeature("netherVinesPerChunk", 20);
+        this.bopWorldFeatures.setFeature("netherrackSplatterPerChunk", 45);
         //customBiomeDecorator.gravesPerChunk = 1;
         this.bopWorldFeatures.setFeature("waspHivesPerChunk", 1);
         this.bopWorldFeatures.setFeature("toadstoolsPerChunk", 3);
         this.bopWorldFeatures.setFeature("glowshroomsPerChunk", 1);
-        this.theBiomeDecorator.mushroomsPerChunk = 30;
+        
-		this.theBiomeDecorator.bigMushroomsPerChunk = 30;
+        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 30);
+		
+        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 0), 0.25D);
+		this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 1), 0.5D);
+        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 2), 0.5D);
+        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 10), 0.5D);
+        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 11), 0.5D);
     }
 }

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

@@ -10,7 +10,7 @@ import java.util.Random;
 
 public class BiomeGenAlps extends BOPBiome
 {
-	private static final Height biomeHeight = new Height(0.5F, 1.5F);
+	private static final Height biomeHeight = new Height(8.0F, 0.025F);
 	
 	public BiomeGenAlps(int id)
 	{

src/main/java/biomesoplenty/common/biomes/overworld/BiomeGenDunes.java

@@ -33,7 +33,6 @@ public class BiomeGenDunes extends BOPBiome
 		this.theBiomeDecorator.deadBushPerChunk = 5;
 		this.theBiomeDecorator.reedsPerChunk = -999;
 		this.theBiomeDecorator.grassPerChunk = 75;
-		this.theBiomeDecorator.generateLakes = false;
 
         this.bopWorldFeatures.setFeature("desertSproutsPerChunk", 25);
         this.bopWorldFeatures.setFeature("bromeliadsPerChunk", 5);

src/main/java/biomesoplenty/common/biomes/overworld/subbiomes/BiomeGenAlpsForest.java

@@ -0,0 +1,73 @@
+package biomesoplenty.common.biomes.overworld.subbiomes;
+
+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.BOPBlockHelper;
+import biomesoplenty.common.biomes.BOPSubBiome;
+import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
+import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2;
+
+public class BiomeGenAlpsForest extends BOPSubBiome
+{
+	private static final Height biomeHeight = new Height(0.6F, 1.2F);
+	
+	public BiomeGenAlpsForest(int id)
+	{
+		super(id);
+		
+		this.zoom = 0.25D;
+		this.threshold = 0.25D;
+
+        this.setHeight(biomeHeight);
+        this.setColor(8034682);
+        this.setEnableSnow();
+        this.setTemperatureRainfall(0.0F, 0.5F);
+		
+		this.theBiomeDecorator.treesPerChunk = 12;
+		this.theBiomeDecorator.flowersPerChunk = -999;
+		this.theBiomeDecorator.grassPerChunk = 5;
+		this.theBiomeDecorator.sandPerChunk = -999;
+		this.theBiomeDecorator.sandPerChunk2 = -999;
+		
+		this.bopWorldFeatures.setFeature("bopGrassPerChunk", 5);
+		
+		this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 1), 0.5D);
+        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 2), 0.5D);
+        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 10), 0.5D);
+        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 11), 0.5D);
+	}
+	
+	@Override
+    //TODO:                     getRandomWorldGenForTrees()
+    public WorldGenAbstractTree func_150567_a(Random random)
+    {
+        return new WorldGenBOPTaiga2(Blocks.log, Blocks.leaves, 1, 1, false, 6, 4, 0);
+    }
+	
+	@Override
+	public void decorate(World world, Random random, int chunkX, int chunkZ)
+	{
+		super.decorate(world, random, chunkX, chunkZ);
+		int var5 = 12 + random.nextInt(6);
+
+		for (int var6 = 0; var6 < var5; ++var6)
+		{
+			int x = chunkX + random.nextInt(16);
+			int y = random.nextInt(28) + 4;
+			int z = chunkZ + random.nextInt(16);
+
+			Block block = world.getBlock(x, y, z);
+
+			if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone))
+			{
+				world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 8, 2);
+			}
+		}
+	}
+}

src/main/java/biomesoplenty/common/biomes/overworld/subbiomes/BiomeGenCanyonRavine.java

@@ -0,0 +1,93 @@
+package biomesoplenty.common.biomes.overworld.subbiomes;
+
+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.BOPBlockHelper;
+import biomesoplenty.common.biomes.BOPSubBiome;
+import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
+import biomesoplenty.common.world.features.trees.WorldGenBOPShrub;
+import biomesoplenty.common.world.features.trees.WorldGenPineTree;
+
+public class BiomeGenCanyonRavine extends BOPSubBiome
+{
+	private static final Height biomeHeight = new Height(-0.1F, 0.4F);
+
+	public BiomeGenCanyonRavine(int id)
+	{
+		super(id);
+		
+		this.zoom = 0.25D;
+		this.threshold = 0.25D;
+		
+        //TODO: setHeight()
+        this.setHeight(biomeHeight);
+        //TODO:	setColor()
+        this.setColor(9337689);
+        this.setTemperatureRainfall(0.8F, 0.4F);
+
+		this.spawnableCreatureList.clear();
+
+		this.topBlock = BOPBlockHelper.get("hardDirt");
+		this.fillerBlock = BOPBlockHelper.get("hardDirt");
+		this.theBiomeDecorator.grassPerChunk = 5;
+		this.theBiomeDecorator.treesPerChunk = 1;
+		this.theBiomeDecorator.flowersPerChunk = -999;
+
+        this.bopWorldFeatures.setFeature("bromeliadsPerChunk", 3);
+        this.bopWorldFeatures.setFeature("grassSplatterPerChunk", 4);
+        this.bopWorldFeatures.setFeature("waterReedsPerChunk", 4);
+        this.bopWorldFeatures.setFeature("generatePumpkins", false);
+
+        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 5);
+
+        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 2), 1D);
+	}
+
+	@Override
+	//TODO:						getRandomWorldGenForTrees()
+	public WorldGenAbstractTree func_150567_a(Random random)
+	{
+		return random.nextInt(5) == 0 ? new WorldGenPineTree() : new WorldGenBOPShrub(Blocks.log2, Blocks.leaves2, 0, 0, 64, 256, BOPBlockHelper.get("hardDirt"));
+	}
+	
+	@Override
+	public void decorate(World world, Random random, int chunkX, int chunkZ)
+	{
+		super.decorate(world, random, chunkX, chunkZ);
+		int var5 = 12 + random.nextInt(6);
+
+		for (int var6 = 0; var6 < var5; ++var6)
+		{
+			int x = chunkX + random.nextInt(16);
+			int y = random.nextInt(28) + 4;
+			int z = chunkZ + random.nextInt(16);
+
+			Block block = world.getBlock(x, y, z);
+
+			if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone))
+			{
+				world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 2, 2);
+			}
+		}
+	}
+
+	@Override
+	//TODO:		getBiomeFoliageColor()
+	public int getBiomeFoliageColor(int x, int y, int z)
+	{
+		return 11123300;
+	}
+
+	@Override
+	//TODO:		getBiomeGrassColor()
+    public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_)
+    {
+		
+		return 11123300;
+	}
+}

src/main/java/biomesoplenty/common/biomes/overworld/subbiomes/BiomeGenGlacier.java

@@ -16,8 +16,8 @@ public class BiomeGenGlacier extends BOPSubBiome
 	{
 		super(biomeID);
 
-		this.zoom = 0.5D;
+		this.zoom = 0.25D;
-		this.threshold = 0D;
+		this.threshold = 0.25D;
 		
         this.setHeight(biomeHeight);
 		this.setColor(11582425);

src/main/java/biomesoplenty/common/biomes/overworld/subbiomes/BiomeGenMeadowForest.java

@@ -0,0 +1,100 @@
+package biomesoplenty.common.biomes.overworld.subbiomes;
+
+import java.util.Random;
+
+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.BOPBlockHelper;
+import biomesoplenty.common.biomes.BOPSubBiome;
+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 BiomeGenMeadowForest extends BOPSubBiome
+{
+	public BiomeGenMeadowForest(int id)
+	{
+		super(id);
+		
+		this.zoom = 0.25D;
+		this.threshold = 0.25D;
+		
+        //TODO: setColor()
+        this.setColor(5543515);
+        this.setTemperatureRainfall(0.7F, 0.7F);
+
+	    this.spawnableCreatureList.add(new SpawnListEntry(EntityHorse.class, 5, 2, 6));
+		
+		this.theBiomeDecorator.treesPerChunk = 8;
+		this.theBiomeDecorator.grassPerChunk = 10;
+		this.theBiomeDecorator.sandPerChunk = -999;
+		this.theBiomeDecorator.sandPerChunk2 = -999;
+		this.theBiomeDecorator.mushroomsPerChunk = 2;
+		this.theBiomeDecorator.flowersPerChunk = 5;
+
+        this.bopWorldFeatures.setFeature("bopFlowersPerChunk", 7);
+        this.bopWorldFeatures.setFeature("wildCarrotsPerChunk", 1);
+        this.bopWorldFeatures.setFeature("shrubsPerChunk", 2);
+        this.bopWorldFeatures.setFeature("cloverPatchesPerChunk", 5);
+        this.bopWorldFeatures.setFeature("seaweedPerChunk", 5);
+        this.bopWorldFeatures.setFeature("generatePumpkins", false);
+        this.bopWorldFeatures.setFeature("algaePerChunk", 2);
+
+        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 5);
+
+        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 0), 10);
+        this.bopWorldFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPBlockHelper.get("flowers"), 4), 8);
+
+        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 10), 0.5D);
+        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 11), 0.5D);
+        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+	}
+	
+    @Override
+    //TODO:                     getRandomWorldGenForTrees()
+    public WorldGenAbstractTree func_150567_a(Random random)
+    {
+        return new WorldGenBOPTaiga2(Blocks.log, Blocks.leaves, 1, 1, false, 6, 4, 0);
+    }
+	
+    @Override
+    public void decorate(World world, Random random, int chunkX, int chunkZ)
+    {
+        super.decorate(world, random, chunkX, chunkZ);
+        int var5 = 12 + random.nextInt(6);
+
+        for (int var6 = 0; var6 < var5; ++var6)
+        {
+            int x = chunkX + random.nextInt(16);
+            int y = random.nextInt(28) + 4;
+            int z = chunkZ + random.nextInt(16);
+
+            Block block = world.getBlock(x, y, z);
+
+            if (block != null && block.isReplaceableOreGen(world, x, y, z, Blocks.stone))
+            {
+                world.setBlock(x, y, z, BOPBlockHelper.get("gemOre"), 4, 2);
+            }
+        }
+    }
+
+    @Override
+    //TODO:     getBiomeGrassColor()
+    public int getBiomeGrassColor(int p_150558_1_, int p_150558_2_, int p_150558_3_)
+    {
+        return 6533741;
+    }
+
+    @Override
+    //TODO:     getBiomeFoliageColor()
+    public int getBiomeFoliageColor(int x, int y, int z)
+    {
+        return 6533741;
+    }
+}

src/main/java/biomesoplenty/common/biomes/overworld/techbiomes/BiomeGenDryRiver.java

@@ -1,21 +1,31 @@
 package biomesoplenty.common.biomes.overworld.techbiomes;
 
-import biomesoplenty.api.BOPBlockHelper;
+import java.util.Random;
-import net.minecraft.init.Blocks;
-import net.minecraft.world.biome.BiomeGenBase;
 
-public class BiomeGenDryRiver extends BiomeGenBase
+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.common.biomes.BOPBiome;
+import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
+import biomesoplenty.common.world.features.trees.WorldGenBOPShrub;
+import biomesoplenty.common.world.features.trees.WorldGenMiniShrub;
+
+public class BiomeGenDryRiver extends BOPBiome
 {
-	private static final Height biomeHeight = new Height(-0.1F, 0.0F);
+	private static final Height biomeHeight = new Height(-0.5F, 0.0F);
 
     public BiomeGenDryRiver(int par1)
     {
         super(par1);
         this.spawnableCreatureList.clear();
+        this.setTemperatureRainfall(1.2F, 0.5F);
         
         this.setHeight(biomeHeight);
         
         this.topBlock = BOPBlockHelper.get("driedDirt");
 		this.fillerBlock = BOPBlockHelper.get("driedDirt");
+		
+		this.bopWorldFeatures.setFeature("dryRiverPerChunk", 999);
     }
 }

src/main/java/biomesoplenty/common/biomes/overworld/techbiomes/BiomeGenLushRiver.java

@@ -0,0 +1,51 @@
+package biomesoplenty.common.biomes.overworld.techbiomes;
+
+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.common.biomes.BOPBiome;
+import biomesoplenty.common.world.features.WorldGenBOPTallGrass;
+import biomesoplenty.common.world.features.trees.WorldGenBOPShrub;
+import biomesoplenty.common.world.features.trees.WorldGenMiniShrub;
+
+public class BiomeGenLushRiver extends BOPBiome
+{
+	private static final Height biomeHeight = new Height(-0.5F, 0.0F);
+
+    public BiomeGenLushRiver(int par1)
+    {
+        super(par1);
+        this.spawnableCreatureList.clear();
+        this.setTemperatureRainfall(0.6F, 0.7F);
+        
+        this.setHeight(biomeHeight);
+        
+        this.theBiomeDecorator.treesPerChunk = 10;
+        this.theBiomeDecorator.grassPerChunk = 10;
+        this.theBiomeDecorator.reedsPerChunk = 10;
+        this.theBiomeDecorator.waterlilyPerChunk = 8;
+        
+        this.bopWorldFeatures.setFeature("waterReedsPerChunk", 8);
+        this.bopWorldFeatures.setFeature("riverCanePerChunk", 10);
+        this.bopWorldFeatures.setFeature("seaweedPerChunk", 15);
+        this.bopWorldFeatures.setFeature("algaePerChunk", 10);
+        
+        this.bopWorldFeatures.setFeature("bopGrassPerChunk", 30);
+        
+        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 1), 0.5D);
+        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 2), 0.5D);
+        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 10), 0.5D);
+        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPBlockHelper.get("foliage"), 11), 0.5D);
+        this.bopWorldFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D);
+    }
+    
+    @Override
+    //TODO:                     getRandomWorldGenForTrees()
+    public WorldGenAbstractTree func_150567_a(Random random)
+    {
+        return new WorldGenBOPShrub(Blocks.log, Blocks.leaves, 0, 0, Blocks.grass);
+    }
+}

src/main/java/biomesoplenty/common/blocks/BlockOvergrownNetherrack.java

@@ -3,6 +3,7 @@ package biomesoplenty.common.blocks;
 import java.util.Random;
 
 import net.minecraft.block.Block;
+import net.minecraft.block.IGrowable;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.init.Blocks;

src/main/java/biomesoplenty/common/core/BOPBiomes.java

@@ -78,7 +78,10 @@ import biomesoplenty.common.biomes.overworld.BiomeGenTundra;
 import biomesoplenty.common.biomes.overworld.BiomeGenWasteland;
 import biomesoplenty.common.biomes.overworld.BiomeGenWetland;
 import biomesoplenty.common.biomes.overworld.BiomeGenWoodland;
+import biomesoplenty.common.biomes.overworld.subbiomes.BiomeGenAlpsForest;
+import biomesoplenty.common.biomes.overworld.subbiomes.BiomeGenCanyonRavine;
 import biomesoplenty.common.biomes.overworld.subbiomes.BiomeGenGlacier;
+import biomesoplenty.common.biomes.overworld.subbiomes.BiomeGenMeadowForest;
 import biomesoplenty.common.biomes.overworld.subbiomes.BiomeGenOasis;
 import biomesoplenty.common.biomes.overworld.subbiomes.BiomeGenQuagmire;
 import biomesoplenty.common.biomes.overworld.subbiomes.BiomeGenScrubland;
@@ -86,6 +89,7 @@ import biomesoplenty.common.biomes.overworld.subbiomes.BiomeGenSilkglades;
 import biomesoplenty.common.biomes.overworld.subbiomes.BiomeGenTropics;
 import biomesoplenty.common.biomes.overworld.subbiomes.BiomeGenVolcano;
 import biomesoplenty.common.biomes.overworld.techbiomes.BiomeGenDryRiver;
+import biomesoplenty.common.biomes.overworld.techbiomes.BiomeGenLushRiver;
 import biomesoplenty.common.configuration.BOPConfigurationBiomeGen;
 import biomesoplenty.common.configuration.BOPConfigurationIDs;
 import biomesoplenty.common.configuration.BOPConfigurationMisc;
@@ -190,6 +194,9 @@ public class BOPBiomes
 		oasis = registerOverworldSubBiome(BiomeGenOasis.class, "Oasis", 10, BiomeGenBase.desert.biomeID);
 		quagmire = registerOverworldSubBiome(BiomeGenQuagmire.class, "Quagmire", 10, sludgepit.biomeID);
 		silkglades = registerOverworldSubBiome(BiomeGenSilkglades.class, "Silkglades", 10, sludgepit.biomeID);
+		meadowForest = registerOverworldSubBiome(BiomeGenMeadowForest.class, "Meadow Forest", 10, meadow.biomeID);
+		alpsForest = registerOverworldSubBiome(BiomeGenAlpsForest.class, "Alps Forest", 10, alps.biomeID);
+		canyonRavine = registerOverworldSubBiome(BiomeGenCanyonRavine.class, "Canyon Ravine", 10, canyon.biomeID);
 		
 		//Ocean Biomes
 		volcano = registerOverworldSubBiome(BiomeGenVolcano.class, "Volcano", 10, BiomeGenBase.ocean.biomeID, BiomeGenBase.deepOcean.biomeID);
@@ -203,7 +210,8 @@ public class BOPBiomes
         undergarden = registerNetherBiome(BiomeGenUndergarden.class, "Undergarden", 10);
         
         //River Biomes
-        dryRiver = registerOverworldRiverBiome(BiomeGenDryRiver.class, "Dry River", BiomeGenBase.desert.biomeID);
+        lushRiver = registerOverworldRiverBiome(BiomeGenLushRiver.class, "Lush River", lushSwamp.biomeID, lavenderFields.biomeID, flowerField.biomeID, bambooForest.biomeID, cherryBlossomGrove.biomeID, lushDesert.biomeID, meadow.biomeID, spruceWoods.biomeID, rainforest.biomeID, BiomeGenBase.forest.biomeID, BiomeGenBase.forestHills.biomeID, BiomeGenBase.jungle.biomeID, BiomeGenBase.jungleEdge.biomeID, BiomeGenBase.jungleHills.biomeID);
+        dryRiver = registerOverworldRiverBiome(BiomeGenDryRiver.class, "Dry River", outback.biomeID, dunes.biomeID, steppe.biomeID, BiomeGenBase.desert.biomeID, BiomeGenBase.desertHills.biomeID);
 	}
 	
 	private static void addBiomesToDictionary()

src/main/java/biomesoplenty/common/eventhandler/world/VillageMaterialEventHandler.java

@@ -13,121 +13,6 @@ public class VillageMaterialEventHandler
 	@SubscribeEvent
 	public void getVillageBlockID(BiomeEvent.GetVillageBlockID event)
 	{
-		//Arctic
-		if (event.biome == BOPCBiomes.arctic)
-		{
-			//Cobblestone
-			if (event.original == Blocks.cobblestone)
-			{
-				event.replacement = Blocks.snow;
-				event.setResult(Result.DENY);
-			}
-			
-			//Logs
-			if (event.original == Blocks.log)
-			{
-				event.replacement = Blocks.snow;
-				event.setResult(Result.DENY);
-			}
-			
-			//Wooden Planks
-			if (event.original == Blocks.planks)
-			{
-				event.replacement = Blocks.snow;
-				event.setResult(Result.DENY);
-			}
-			
-			//Wooden Stairs
-			if (event.original == Blocks.oak_stairs)
-			{
-				event.replacement = Blocks.snow;
-				event.setResult(Result.DENY);
-			}
-			
-			//Cobblestone Stairs
-			if (event.original == Blocks.stone_brick_stairs)
-			{
-				event.replacement = Blocks.snow;
-				event.setResult(Result.DENY);
-			}
-			
-			//Single Stone Slabs
-			if (event.original == Blocks.stone_slab)
-			{
-				event.replacement = Blocks.snow;
-				event.setResult(Result.DENY);
-			}
-			
-			//Glass Panes
-			if (event.original == Blocks.glass_pane)
-			{
-				event.replacement = Blocks.ice;
-				event.setResult(Result.DENY);
-			}
-			
-			//Iron Bars
-			if (event.original == Blocks.iron_bars)
-			{
-				event.replacement = Blocks.snow;
-				event.setResult(Result.DENY);
-			}
-			
-			//Double Stone Slabs
-			if (event.original == Blocks.double_stone_slab)
-			{
-				event.replacement = Blocks.snow;
-				event.setResult(Result.DENY);
-			}
-			
-			//Lava
-			if (event.original == Blocks.lava)
-			{
-				event.replacement = Blocks.ice;
-				event.setResult(Result.DENY);
-			}
-			if (event.original == Blocks.flowing_lava)
-			{
-				event.replacement = Blocks.ice;
-				event.setResult(Result.DENY);
-			}
-			
-			//Water
-			if (event.original == Blocks.water)
-			{
-				event.replacement = Blocks.ice;
-				event.setResult(Result.DENY);
-			}
-			if (event.original == Blocks.flowing_water)
-			{
-				event.replacement = Blocks.ice;
-				event.setResult(Result.DENY);
-			}
-			
-			//Crops
-			if (event.original == Blocks.wheat)
-			{
-				event.replacement = Blocks.air;
-				event.setResult(Result.DENY);
-			}
-			if (event.original == Blocks.potatoes)
-			{
-				event.replacement = Blocks.air;
-				event.setResult(Result.DENY);
-			}
-			if (event.original == Blocks.carrots)
-			{
-				event.replacement = Blocks.air;
-				event.setResult(Result.DENY);
-			}
-			
-			//Farmland
-			if (event.original == Blocks.farmland)
-			{
-				event.replacement = Blocks.dirt;
-				event.setResult(Result.DENY);
-			}
-		}
-		
 		//Birch Forest
 		/*if (event.biome == Biomes.birchForest.get())
 		{	
@@ -153,13 +38,6 @@ public class VillageMaterialEventHandler
 		//Coniferous Forest
 		if (event.biome == BOPCBiomes.coniferousForest)
 		{	
-			//Cobblestone
-			if (event.original == Blocks.cobblestone)
-			{
-				event.replacement = BOPBlockHelper.get("logs1");
-				event.setResult(Result.DENY);
-			}
-			
 			//Logs
 			if (event.original == Blocks.log)
 			{
@@ -180,39 +58,6 @@ public class VillageMaterialEventHandler
 				event.replacement = BOPBlockHelper.get("firStairs");
 				event.setResult(Result.DENY);
 			}
-			
-			//Cobblestone Stairs
-			if (event.original == Blocks.stone_brick_stairs)
-			{
-				event.replacement = BOPBlockHelper.get("firStairs");
-				event.setResult(Result.DENY);
-			}
-			
-			//Stone Slabs
-			if (event.original == Blocks.stone_slab)
-			{
-				event.replacement = BOPBlockHelper.get("woodenSingleSlab1");
-				event.setResult(Result.DENY);
-			}
-			
-			//Lava
-			if (event.original == Blocks.lava)
-			{
-				event.replacement = Blocks.water;
-				event.setResult(Result.DENY);
-			}
-			if (event.original == Blocks.flowing_lava)
-			{
-				event.replacement = Blocks.flowing_water;
-				event.setResult(Result.DENY);
-			}
-			
-			//Glass Panes
-			if (event.original == Blocks.glass_pane)
-			{
-				event.replacement = Blocks.iron_bars;
-				event.setResult(Result.DENY);
-			}
 		}
 		
 		//Desert
@@ -263,53 +108,13 @@ public class VillageMaterialEventHandler
 		
 		//Grove
 		if (event.biome == BOPCBiomes.grove)
-		{
+		{	
-			//Cobblestone
-			if (event.original == Blocks.cobblestone)
-			{
-				event.replacement = Blocks.log;
-				event.setResult(Result.DENY);
-			}
-			
 			//Wooden Stairs
 			if (event.original == Blocks.oak_stairs)
-			{
-				event.replacement = Blocks.leaves;
-				event.setResult(Result.DENY);
-			}
-			
-			//Cobblestone Stairs
-			if (event.original == Blocks.stone_brick_stairs)
 			{
 				event.replacement = Blocks.spruce_stairs;
 				event.setResult(Result.DENY);
 			}
-			
-			//Stone Slabs
-			if (event.original == Blocks.stone_slab)
-			{
-				event.replacement = Blocks.wooden_slab;
-				event.setResult(Result.DENY);
-			}
-			
-			//Lava
-			if (event.original == Blocks.lava)
-			{
-				event.replacement = Blocks.water;
-				event.setResult(Result.DENY);
-			}
-			if (event.original == Blocks.flowing_lava)
-			{
-				event.replacement = Blocks.flowing_water;
-				event.setResult(Result.DENY);
-			}
-			
-			//Glass Panes
-			if (event.original == Blocks.glass_pane)
-			{
-				event.replacement = Blocks.iron_bars;
-				event.setResult(Result.DENY);
-			}
 		}
 		
 		//Heathland
@@ -346,14 +151,7 @@ public class VillageMaterialEventHandler
 		
 		//Lush Desert
 		if (event.biome == BOPCBiomes.lushDesert)
-		{
+		{		
-			//Cobblestone
-			if (event.original == Blocks.cobblestone)
-			{
-				event.replacement = BOPBlockHelper.get("redRock");
-				event.setResult(Result.DENY);
-			}
-			
 			//Logs
 			if (event.original == Blocks.log)
 			{
@@ -368,44 +166,12 @@ public class VillageMaterialEventHandler
 				event.setResult(Result.DENY);
 			}
 			
-			//Cobblestone Stairs
-			if (event.original == Blocks.stone_brick_stairs)
-			{
-				event.replacement = BOPBlockHelper.get("redCobbleStairs");
-				event.setResult(Result.DENY);
-			}
-			
-			//Stone Slabs
-			if (event.original == Blocks.stone_slab)
-			{
-				event.replacement = BOPBlockHelper.get("stoneSingleSlab");
-				event.setResult(Result.DENY);
-			}
-			
 			//Gravel
 			if (event.original == Blocks.gravel)
 			{
 				event.replacement = Blocks.sand;
 				event.setResult(Result.DENY);
 			}
-			
-			//Glass Panes
-			if (event.original == Blocks.glass_pane)
-			{
-				event.replacement = Blocks.iron_bars;
-				event.setResult(Result.DENY);
-			}
-		}
-		
-		//Lush Swamp
-		if (event.biome == BOPCBiomes.lushSwamp)
-		{
-			//Gravel
-			if (event.original == Blocks.cobblestone)
-			{
-				event.replacement = Blocks.mossy_cobblestone;
-				event.setResult(Result.DENY);
-			}
 		}
 		
 		//Maple Woods
@@ -422,52 +188,12 @@ public class VillageMaterialEventHandler
 		//Meadow
 		if (event.biome == BOPCBiomes.meadow)
 		{	
-			//Cobblestone
-			if (event.original == Blocks.cobblestone)
-			{
-				event.replacement = Blocks.log;
-				event.setResult(Result.DENY);
-			}
-			
 			//Wooden Stairs
 			if (event.original == Blocks.oak_stairs)
 			{
 				event.replacement = Blocks.spruce_stairs;
 				event.setResult(Result.DENY);
 			}
-			
-			//Cobblestone Stairs
-			if (event.original == Blocks.stone_brick_stairs)
-			{
-				event.replacement = Blocks.spruce_stairs;
-				event.setResult(Result.DENY);
-			}
-			
-			//Stone Slabs
-			if (event.original == Blocks.stone_slab)
-			{
-				event.replacement = Blocks.wooden_slab;
-				event.setResult(Result.DENY);
-			}
-			
-			//Lava
-			if (event.original == Blocks.lava)
-			{
-				event.replacement = Blocks.water;
-				event.setResult(Result.DENY);
-			}
-			if (event.original == Blocks.flowing_lava)
-			{
-				event.replacement = Blocks.flowing_water;
-				event.setResult(Result.DENY);
-			}
-			
-			//Glass Panes
-			if (event.original == Blocks.glass_pane)
-			{
-				event.replacement = Blocks.iron_bars;
-				event.setResult(Result.DENY);
-			}
 		}
 		
 		//Meadow Forest
@@ -524,13 +250,6 @@ public class VillageMaterialEventHandler
 		//Outback
 		if (event.biome == BOPCBiomes.outback)
 		{
-			//Cobblestone
-			if (event.original == Blocks.cobblestone)
-			{
-				event.replacement = Blocks.log2;
-				event.setResult(Result.DENY);
-			}
-			
 			//Logs
 			if (event.original == Blocks.log)
 			{
@@ -547,50 +266,17 @@ public class VillageMaterialEventHandler
 			
 			//Wooden Stairs
 			if (event.original == Blocks.oak_stairs)
-			{
-				event.replacement = Blocks.leaves;
-				event.setResult(Result.DENY);
-			}
-			
-			//Cobblestone Stairs
-			if (event.original == Blocks.stone_brick_stairs)
 			{
 				event.replacement = Blocks.acacia_stairs;
 				event.setResult(Result.DENY);
 			}
 			
-			//Stone Slabs
-			if (event.original == Blocks.stone_slab)
-			{
-				event.replacement = BOPBlockHelper.get("woodenSingleSlab1");
-				event.setResult(Result.DENY);
-			}
-			
-			//Lava
-			if (event.original == Blocks.lava)
-			{
-				event.replacement = Blocks.water;
-				event.setResult(Result.DENY);
-			}
-			if (event.original == Blocks.flowing_lava)
-			{
-				event.replacement = Blocks.flowing_water;
-				event.setResult(Result.DENY);
-			}
-			
 			//Gravel
 			if (event.original == Blocks.gravel)
 			{
 				event.replacement = Blocks.sand;
 				event.setResult(Result.DENY);
 			}
-			
-			//Glass Panes
-			if (event.original == Blocks.glass_pane)
-			{
-				event.replacement = Blocks.iron_bars;
-				event.setResult(Result.DENY);
-			}
 		}
 		
 		//Overgrown Greens
@@ -715,13 +401,6 @@ public class VillageMaterialEventHandler
 		//Snowy Coniferous Forest
 		if (event.biome == BOPCBiomes.snowyConiferousForest)
 		{	
-			//Cobblestone
-			if (event.original == Blocks.cobblestone)
-			{
-				event.replacement = BOPBlockHelper.get("logs1");
-				event.setResult(Result.DENY);
-			}
-			
 			//Logs
 			if (event.original == Blocks.log)
 			{
@@ -742,39 +421,6 @@ public class VillageMaterialEventHandler
 				event.replacement = BOPBlockHelper.get("firStairs");
 				event.setResult(Result.DENY);
 			}
-			
-			//Cobblestone Stairs
-			if (event.original == Blocks.stone_brick_stairs)
-			{
-				event.replacement = BOPBlockHelper.get("firStairs");
-				event.setResult(Result.DENY);
-			}
-			
-			//Stone Slabs
-			if (event.original == Blocks.stone_slab)
-			{
-				event.replacement = BOPBlockHelper.get("woodenSingleSlab1");
-				event.setResult(Result.DENY);
-			}
-			
-			//Lava
-			if (event.original == Blocks.lava)
-			{
-				event.replacement = Blocks.water;
-				event.setResult(Result.DENY);
-			}
-			if (event.original == Blocks.flowing_lava)
-			{
-				event.replacement = Blocks.flowing_water;
-				event.setResult(Result.DENY);
-			}
-			
-			//Glass Panes
-			if (event.original == Blocks.glass_pane)
-			{
-				event.replacement = Blocks.iron_bars;
-				event.setResult(Result.DENY);
-			}
 		}
 		
 		//Spruce Woods
@@ -863,43 +509,24 @@ public class VillageMaterialEventHandler
 		//Tropical Rainforest
 		if (event.biome == BOPCBiomes.tropicalRainforest)
 		{	
-			//Cobblestone
+			//Logs
-			if (event.original == Blocks.cobblestone)
+			if (event.original == Blocks.log)
 			{
-				event.replacement = Blocks.log;
+				event.replacement = BOPBlockHelper.get("logs4");
+				event.setResult(Result.DENY);
+			}
+			
+			//Wooden Planks
+			if (event.original == Blocks.planks)
+			{
+				event.replacement = BOPBlockHelper.get("planks");
 				event.setResult(Result.DENY);
 			}
 			
 			//Wooden Stairs
 			if (event.original == Blocks.oak_stairs)
 			{
-				event.replacement = Blocks.jungle_stairs;
+				event.replacement = BOPBlockHelper.get("mahoganyStairs");
-				event.setResult(Result.DENY);
-			}
-			
-			//Cobblestone Stairs
-			if (event.original == Blocks.stone_brick_stairs)
-			{
-				event.replacement = Blocks.jungle_stairs;
-				event.setResult(Result.DENY);
-			}
-			
-			//Stone Slabs
-			if (event.original == Blocks.stone_slab)
-			{
-				event.replacement = Blocks.wooden_slab;
-				event.setResult(Result.DENY);
-			}
-			
-			//Lava
-			if (event.original == Blocks.lava)
-			{
-				event.replacement = Blocks.water;
-				event.setResult(Result.DENY);
-			}
-			if (event.original == Blocks.flowing_lava)
-			{
-				event.replacement = Blocks.flowing_water;
 				event.setResult(Result.DENY);
 			}
 			
@@ -909,25 +536,11 @@ public class VillageMaterialEventHandler
 				event.replacement = Blocks.sand;
 				event.setResult(Result.DENY);
 			}
-			
-			//Glass Panes
-			if (event.original == Blocks.glass_pane)
-			{
-				event.replacement = Blocks.iron_bars;
-				event.setResult(Result.DENY);
-			}
 		}
 		
 		//Wetland
 		if (event.biome == BOPCBiomes.wetland)
 		{
-			//Cobblestone
-			if (event.original == Blocks.cobblestone)
-			{
-				event.replacement = BOPBlockHelper.get("logs3");
-				event.setResult(Result.DENY);
-			}
-			
 			//Logs
 			if (event.original == Blocks.log)
 			{
@@ -948,39 +561,6 @@ public class VillageMaterialEventHandler
 				event.replacement = BOPBlockHelper.get("willowStairs");
 				event.setResult(Result.DENY);
 			}
-			
-			//Cobblestone Stairs
-			if (event.original == Blocks.stone_brick_stairs)
-			{
-				event.replacement = BOPBlockHelper.get("willowStairs");
-				event.setResult(Result.DENY);
-			}
-			
-			//Stone Slabs
-			if (event.original == Blocks.stone_slab)
-			{
-				event.replacement = BOPBlockHelper.get("woodenSingleSlab2");
-				event.setResult(Result.DENY);
-			}
-			
-			//Lava
-			if (event.original == Blocks.lava)
-			{
-				event.replacement = Blocks.water;
-				event.setResult(Result.DENY);
-			}
-			if (event.original == Blocks.flowing_lava)
-			{
-				event.replacement = Blocks.flowing_water;
-				event.setResult(Result.DENY);
-			}
-			
-			//Glass Panes
-			if (event.original == Blocks.glass_pane)
-			{
-				event.replacement = Blocks.iron_bars;
-				event.setResult(Result.DENY);
-			}
 		}
 	}
 	
@@ -1000,14 +580,7 @@ public class VillageMaterialEventHandler
 		
 		//Coniferous Forest
 		if (event.biome == BOPCBiomes.coniferousForest)
-		{
+		{	
-			//Cobblestone
-			if (event.original == Blocks.cobblestone)
-			{
-				event.replacement = 3;
-				event.setResult(Result.DENY);
-			}
-			
 			//Logs
 			if (event.original == Blocks.log)
 			{
@@ -1021,13 +594,6 @@ public class VillageMaterialEventHandler
 				event.replacement = 3;
 				event.setResult(Result.DENY);
 			}
-			
-			//Single Stone Slab
-			if (event.original == Blocks.stone_slab)
-			{
-				event.replacement = 3;
-				event.setResult(Result.DENY);
-			}
 		}
 		
 		//Desert
@@ -1051,13 +617,6 @@ public class VillageMaterialEventHandler
 		//Grove
 		if (event.biome == BOPCBiomes.grove)
 		{
-			//Cobblestone
-			if (event.original == Blocks.cobblestone)
-			{
-				event.replacement = 1;
-				event.setResult(Result.DENY);
-			}
-			
 			//Logs
 			if (event.original == Blocks.log)
 			{
@@ -1078,13 +637,6 @@ public class VillageMaterialEventHandler
 				event.replacement = 5;
 				event.setResult(Result.DENY);
 			}
-			
-			//Single Stone Slab
-			if (event.original == Blocks.stone_slab)
-			{
-				event.replacement = 1;
-				event.setResult(Result.DENY);
-			}
 		}
 		
 		//Heathland
@@ -1108,27 +660,12 @@ public class VillageMaterialEventHandler
 		//Lush Desert
 		if (event.biome == BOPCBiomes.lushDesert)
 		{
-			//Cobblestone
-			if (event.original == Blocks.cobblestone)
-			{
-				event.replacement = 1;
-				event.setResult(Result.DENY);
-			}
-			
-			
 			//Wooden Planks
 			if (event.original == Blocks.planks)
 			{
 				event.replacement = 4;
 				event.setResult(Result.DENY);
 			}
-			
-			//Single Stone Slab
-			if (event.original == Blocks.stone_slab)
-			{
-				event.replacement = 0;
-				event.setResult(Result.DENY);
-			}
 		}
 		
 		//Maple Woods
@@ -1152,13 +689,6 @@ public class VillageMaterialEventHandler
 		//Meadow
 		if (event.biome == BOPCBiomes.meadow)
 		{
-			//Cobblestone
-			if (event.original == Blocks.cobblestone)
-			{
-				event.replacement = 1;
-				event.setResult(Result.DENY);
-			}
-			
 			//Logs
 			if (event.original == Blocks.log)
 			{
@@ -1172,13 +702,6 @@ public class VillageMaterialEventHandler
 				event.replacement = 1;
 				event.setResult(Result.DENY);
 			}
-			
-			//Single Stone Slab
-			if (event.original == Blocks.stone_slab)
-			{
-				event.replacement = 1;
-				event.setResult(Result.DENY);
-			}
 		}
 		
 		//Meadow Forest
@@ -1222,13 +745,6 @@ public class VillageMaterialEventHandler
 				event.replacement = 4;
 				event.setResult(Result.DENY);
 			}
-			
-			//Wooden Stairs
-			if (event.original == Blocks.oak_stairs)
-			{
-				event.replacement = 4;
-				event.setResult(Result.DENY);
-			}
 		}
 		
 		//Overgrown Greens
@@ -1244,14 +760,7 @@ public class VillageMaterialEventHandler
 		
 		//Snowy Coniferous Forest
 		if (event.biome == BOPCBiomes.snowyConiferousForest)
-		{
+		{		
-			//Cobblestone
-			if (event.original == Blocks.cobblestone)
-			{
-				event.replacement = 3;
-				event.setResult(Result.DENY);
-			}
-			
 			//Logs
 			if (event.original == Blocks.log)
 			{
@@ -1265,13 +774,6 @@ public class VillageMaterialEventHandler
 				event.replacement = 3;
 				event.setResult(Result.DENY);
 			}
-			
-			//Single Stone Slab
-			if (event.original == Blocks.stone_slab)
-			{
-				event.replacement = 3;
-				event.setResult(Result.DENY);
-			}
 		}
 		
 		//Spruce Woods
@@ -1295,13 +797,6 @@ public class VillageMaterialEventHandler
 		//Tropical Rainforest
 		if (event.biome == BOPCBiomes.tropicalRainforest)
 		{
-			//Cobblestone
-			if (event.original == Blocks.cobblestone)
-			{
-				event.replacement = 3;
-				event.setResult(Result.DENY);
-			}
-			
 			//Logs
 			if (event.original == Blocks.log)
 			{
@@ -1312,14 +807,7 @@ public class VillageMaterialEventHandler
 			//Wooden Planks
 			if (event.original == Blocks.planks)
 			{
-				event.replacement = 3;
+				event.replacement = 14;
-				event.setResult(Result.DENY);
-			}
-			
-			//Single Stone Slab
-			if (event.original == Blocks.stone_slab)
-			{
-				event.replacement = 3;
 				event.setResult(Result.DENY);
 			}
 		}
@@ -1327,13 +815,6 @@ public class VillageMaterialEventHandler
 		//Wetland
 		if (event.biome == BOPCBiomes.wetland)
 		{
-			//Cobblestone
-			if (event.original == Blocks.cobblestone)
-			{
-				event.replacement = 1;
-				event.setResult(Result.DENY);
-			}
-			
 			//Logs
 			if (event.original == Blocks.log)
 			{
@@ -1347,13 +828,6 @@ public class VillageMaterialEventHandler
 				event.replacement = 9;
 				event.setResult(Result.DENY);
 			}
-			
-			//Single Stone Slab
-			if (event.original == Blocks.stone_slab)
-			{
-				event.replacement = 1;
-				event.setResult(Result.DENY);
-			}
 		}
 	}
 }

src/main/java/biomesoplenty/common/world/decoration/BOPWorldFeatures.java

@@ -85,6 +85,7 @@ public class BOPWorldFeatures
         addFeature("gravelSplatterPerChunk", 0);
         addFeature("redSandSplatterPerChunk", 0);
         addFeature("dirtSplatterPerChunk", 0);
+        addFeature("dryRiverPerChunk", 0);
         addFeature("glowshroomsPerChunk", 0);
 
         //Nether Features
@@ -93,7 +94,7 @@ public class BOPWorldFeatures
         addFeature("boneSpinesDownPerChunk", 0);
         addFeature("netherLavaLakesPerChunk", 0);
         addFeature("netherVinesPerChunk", 0);
-        addFeature("overgrownNetherrackPerChunk", 0);
+        addFeature("netherrackSplatterPerChunk", 0);
         
         addFeature("bopFlowersPerChunk", 0);
         addFeature("bopGrassPerChunk", 0);

src/main/java/biomesoplenty/common/world/generation/WorldGenFieldAssociation.java

@@ -105,6 +105,7 @@ public class WorldGenFieldAssociation
         associateFeature("gravelSplatterPerChunk", new WorldGenSplatter(Blocks.gravel, Blocks.grass));
         associateFeature("redSandSplatterPerChunk", new WorldGenSplatter(Blocks.sand, 1, BOPBlockHelper.get("hardSand")));
         associateFeature("dirtSplatterPerChunk", new WorldGenSplatter(Blocks.dirt, 1, Blocks.grass));
+        associateFeature("dryRiverPerChunk", new WorldGenWaterside(BOPBlockHelper.get("driedDirt"), 7, Blocks.water));
         associateFeature("glowshroomsPerChunk", new WorldGenBOPFlora(BOPBlockHelper.get("mushrooms"), 3));
         
         //Nether Features
@@ -112,8 +113,8 @@ public class WorldGenFieldAssociation
         associateFeature("boneSpinesUpPerChunk", new WorldGenBoneSpine(false));
         associateFeature("boneSpinesDownPerChunk", new WorldGenBoneSpine(true));
         associateFeature("netherLavaLakesPerChunk", new WorldGenLakesNether());
-        associateFeature("netherVinesPerChunk", new WorldGenLongVine(BOPBlockHelper.get("ivy"), 15, 30));
+        associateFeature("netherVinesPerChunk", new WorldGenLongVine(BOPBlockHelper.get("ivy"), 15, 45));
-        associateFeature("overgrownNetherrackPerChunk", new WorldGenOvergrownNetherrack());
+        associateFeature("netherrackSplatterPerChunk", new WorldGenSplatter(Blocks.netherrack, BOPBlockHelper.get("overgrownNetherrack")));
 
         associateFeature("bopFlowersPerChunk", new WorldGenBOPFlowerManager());
         associateFeature("bopGrassPerChunk", new WorldGenBOPGrassManager());

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

@@ -5,6 +5,7 @@ import net.minecraft.world.gen.layer.GenLayer;
 import net.minecraft.world.gen.layer.GenLayerRiverMix;
 import net.minecraft.world.gen.layer.IntCache;
 import biomesoplenty.api.BOPBiomeManager;
+import biomesoplenty.api.content.BOPCBiomes;
 
 public class GenLayerRiverMixBOP extends GenLayerRiverMix
 {
@@ -40,7 +41,7 @@ public class GenLayerRiverMixBOP extends GenLayerRiverMix
             {
                 if (riverBiomeIds[i1] == BiomeGenBase.river.biomeID)
                 {
-                    if (inputBiomeIds[i1] == BiomeGenBase.icePlains.biomeID)
+                    if (inputBiomeIds[i1] == BiomeGenBase.icePlains.biomeID || inputBiomeIds[i1] == BOPCBiomes.alps.biomeID || inputBiomeIds[i1] == BOPCBiomes.alpsForest.biomeID || inputBiomeIds[i1] == BOPCBiomes.arctic.biomeID || inputBiomeIds[i1] == BOPCBiomes.glacier.biomeID || inputBiomeIds[i1] == BOPCBiomes.frostForest.biomeID || inputBiomeIds[i1] == BOPCBiomes.snowyConiferousForest.biomeID)
                     {
                         outputBiomeIds[i1] = BiomeGenBase.frozenRiver.biomeID;
                     }