Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/biomesoplenty/common/biomes/BiomeGenBayou.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenBog.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenChaparral.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenConiferousForest.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenConiferousForestSnow.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenFrostForest.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenGrove.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenHeathland.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenJadeCliffs.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenLushDesert.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenMysticGrove.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenOminousWoods.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenRedwoodForest.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenSacredSprings.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenShield.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenSpruceWoods.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenThicket.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenTundra.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenWasteland.java
	src/main/java/biomesoplenty/common/biomes/BiomeGenWetland.java
	src/main/java/biomesoplenty/common/world/decoration/BOPWorldFeatures.java
	src/main/java/biomesoplenty/common/world/forceddecorators/BirchForestForcedDecorator.java
	src/main/java/biomesoplenty/common/world/forceddecorators/ExtremeHillsForcedDecorator.java
	src/main/java/biomesoplenty/common/world/forceddecorators/ForestForcedDecorator.java
	src/main/java/biomesoplenty/common/world/forceddecorators/IcePlainsForcedDecorator.java
	src/main/java/biomesoplenty/common/world/forceddecorators/JungleForcedDecorator.java
	src/main/java/biomesoplenty/common/world/forceddecorators/MesaForcedDecorator.java
	src/main/java/biomesoplenty/common/world/forceddecorators/PlainsForcedDecorator.java
	src/main/java/biomesoplenty/common/world/forceddecorators/RoofedForestForcedDecorator.java
	src/main/java/biomesoplenty/common/world/forceddecorators/SavannaForcedDecorator.java
	src/main/java/biomesoplenty/common/world/forceddecorators/SwampForcedDecorator.java
	src/main/java/biomesoplenty/common/world/forceddecorators/TaigaForcedDecorator.java
	src/main/java/biomesoplenty/common/world/generation/WorldGenFieldAssociation.java

src/main/java/biomesoplenty/client/render/blocks/FoliageRenderer.java

@@ -13,7 +13,7 @@ import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 
 public class FoliageRenderer implements ISimpleBlockRenderingHandler
 {
-	private final int GRASSTOP = 6;
+	private final int HEDGETOP = 6;
 
 	@Override
 	public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer)
@@ -344,7 +344,7 @@ public class FoliageRenderer implements ISimpleBlockRenderingHandler
 		if (par1Block == BOPBlockHelper.get("foliage"))
 		{
 			long i1;
-			if (world.getBlockMetadata(par2, par3, par4) == GRASSTOP) {
+			if (world.getBlockMetadata(par2, par3, par4) == HEDGETOP) {
 				i1 = par2 * 3129871 ^ par4 * 116129781L ^ par3 - 1;
 			} else {
 				i1 = par2 * 3129871 ^ par4 * 116129781L ^ par3;
@@ -362,6 +362,10 @@ public class FoliageRenderer implements ISimpleBlockRenderingHandler
 			//TODO:	 drawCrossedSquares()	 getIcon()
 			renderer.drawCrossedSquares(par1Block.getIcon(0, world.getBlockMetadata(par2, par3, par4)), d0, d1 - 1, d2, 1.0F);
 		} 
+		else if (world.getBlockMetadata(par2, par3, par4) == 3 && world.getBlock(par2, par3, par4) == BOPBlockHelper.get("foliage")) 
+		{
+			renderHedge(d0, d1, d2, 1.0F, f1, f2, f3, renderer);
+		}
 		//TODO:															getBlock()
 		else if (world.getBlockMetadata(par2, par3, par4) == 8 && world.getBlock(par2, par3, par4) == BOPBlockHelper.get("foliage")) 
 		{
@@ -410,4 +414,19 @@ public class FoliageRenderer implements ISimpleBlockRenderingHandler
 		//TODO:	 drawCrossedSquares()
         renderer.drawCrossedSquares(shrubBranch, par1, par2, par3, par4);
 	}
+	
+	private static void renderHedge(double par1, double par2, double par3, float par4, float par5, float par6, float par7, RenderBlocks renderer)
+	{
+        Tessellator tessellator = Tessellator.instance;
+        //TODO:					   getBlockIconFromSideAndMetadata()
+        IIcon hedgeLeaf = renderer.getBlockIconFromSideAndMetadata(BOPBlockHelper.get("foliage"), 0, 3);
+        IIcon hedgeTrunk = ((BlockBOPFoliage)BOPBlockHelper.get("foliage")).hedgeTrunk;
+
+		tessellator.setColorOpaque_F(par4 * par5, par4 * par6, par4 * par7);
+		//TODO:	 drawCrossedSquares()
+		renderer.drawCrossedSquares(hedgeLeaf, par1, par2, par3, par4);
+		tessellator.setColorOpaque_F(par4, par4, par4);
+		//TODO:	 drawCrossedSquares()
+        renderer.drawCrossedSquares(hedgeTrunk, par1, par2, par3, par4);
+	}
 }

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

@@ -29,11 +29,11 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockBOPFlower extends BOPBlockWorldDecor
 {
-	private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "cosmos", "daffodil", "wildflower", "violet", "anemone", "lilyflower", "rainbowflower", "bromeliad", "sunflowerbottom", "sunflowertop", "dandelion"};
+	private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "cosmos", "daffodil", "wildflower", "violet", "anemone", "lilyflower", "rainbowflower", "bromeliad", "eyebulbbottom", "eyebulbtop", "dandelion"};
 	private IIcon[] textures;
 
-	private static final int SUNFLOWERTOP = 14;
-	private static final int SUNFLOWERBOTTOM = 13;
+	private static final int EYEBULBTOP = 14;
+	private static final int EYEBULBBOTTOM = 13;
 
 	public BlockBOPFlower()
 	{
@@ -227,8 +227,11 @@ public class BlockBOPFlower extends BOPBlockWorldDecor
 
 		case 12: // Bromeliad
 			return block == BOPBlockHelper.get("hardDirt") || block == Blocks.hardened_clay || block == Blocks.sand;
+			
+		case 13: // Eyebulb Bottom
+			 return block == Blocks.netherrack || block == BOPBlockHelper.get("overgrownNetherrack") || block == BOPBlockHelper.get("flesh");
 
-		case 14: // Sunflower Top
+		case 14: // Eyebulb Top
 			return block == this;
 
 		default:
@@ -243,13 +246,13 @@ public class BlockBOPFlower extends BOPBlockWorldDecor
 		super.onNeighborBlockChange(world, x, y, z, neighborBlock);
 
 		//TODO:														getBlock()
-		if (world.getBlockMetadata(x, y, z) == SUNFLOWERTOP && world.getBlock(x, y - 1, z) == this && world.getBlockMetadata(x, y - 1, z) != SUNFLOWERBOTTOM) 
+		if (world.getBlockMetadata(x, y, z) == EYEBULBTOP && world.getBlock(x, y - 1, z) == this && world.getBlockMetadata(x, y - 1, z) != EYEBULBBOTTOM) 
 		{
 			//TODO: setBlockToAir()
 			world.setBlockToAir(x, y, z);
 		}
 		//TODO:														getBlock()
-		if (world.getBlockMetadata(x, y, z) == SUNFLOWERBOTTOM && world.getBlock(x, y + 1, z) != this) 
+		if (world.getBlockMetadata(x, y, z) == EYEBULBBOTTOM && world.getBlock(x, y + 1, z) != this) 
 		{
 			//TODO: setBlockToAir()
 			world.setBlockToAir(x, y, z);
@@ -261,7 +264,7 @@ public class BlockBOPFlower extends BOPBlockWorldDecor
 	public int getDamageValue(World world, int x, int y, int z) 
 	{
 		int meta = world.getBlockMetadata(x, y, z);
-		if (meta == SUNFLOWERTOP) {
+		if (meta == EYEBULBTOP) {
 			meta = 13;
 		}
 		return meta;

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

@@ -39,15 +39,16 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockBOPFoliage extends BlockTallGrass implements IShearable
 {
-	private static final String[] foliageTypes = new String[] {"algae", "shortgrass", "mediumgrass", "highgrassbottom", "bush", "sprout", "highgrasstop", "poisonivy", "berrybush", "shrub", "wheatgrass", "dampgrass", "koru", "cloverpatch", "leafpile", "deadleafpile"};
+	private static final String[] foliageTypes = new String[] {"algae", "shortgrass", "mediumgrass", "hedgebottom", "bush", "sprout", "hedgetop", "poisonivy", "berrybush", "shrub", "wheatgrass", "dampgrass", "koru", "cloverpatch", "leafpile", "deadleafpile"};
 
 	private IIcon[] textures;
+	public IIcon hedgeTrunk;
 	public IIcon shrubBranch;
 	public IIcon berryBushBerry;
 
-    private static final int GRASSTOP = 6;
+    private static final int HEDGETOP = 6;
     private static final int ALGAE = 0;
-    private static final int GRASSBOTTOM = 3;
+    private static final int HEDGEBOTTOM = 3;
 
 	public BlockBOPFoliage()
 	{
@@ -76,6 +77,7 @@ public class BlockBOPFoliage extends BlockTallGrass implements IShearable
 			textures[i] = iconRegister.registerIcon("biomesoplenty:"+foliageTypes[i]);
 		}
 		
+		hedgeTrunk = iconRegister.registerIcon("biomesoplenty:" + "hedge_trunk");
 		shrubBranch = iconRegister.registerIcon("biomesoplenty:" + "shrub_branch");
 		berryBushBerry = iconRegister.registerIcon("biomesoplenty:" + "berrybush_berry");
 	}
@@ -97,7 +99,7 @@ public class BlockBOPFoliage extends BlockTallGrass implements IShearable
 	{
 		for (int i = 0; i < foliageTypes.length; ++i)
 		{
-			if (i != GRASSTOP) 
+			if (i != HEDGETOP) 
 			{
 				list.add(new ItemStack(block, 1, i));
 			}
@@ -159,17 +161,22 @@ public class BlockBOPFoliage extends BlockTallGrass implements IShearable
 	{
 		//TODO:					  getBlock()
 		Block block = world.getBlock(x, y - 1, z);
-		boolean solid = block.isOpaqueCube();
 		
     	if (block == Blocks.air) return false;
 		
 		switch (metadata)
 		{
-		case GRASSTOP:
+		case HEDGETOP:
 			return block == this;
 
 		case ALGAE: // Algae
 			return block == Blocks.water;
+			
+		case 14: // Leaf Pile
+			return block == Blocks.grass || block == Blocks.dirt || block == Blocks.farmland || block == Blocks.stone || block == Blocks.sand || block == Blocks.gravel || block == BOPBlockHelper.get("longGrass") || block == BOPBlockHelper.get("overgrownNetherrack");
+			
+		case 15: // Dead Leaf Pile
+			return block == Blocks.grass || block == Blocks.dirt || block == Blocks.farmland || block == Blocks.stone || block == Blocks.sand || block == Blocks.gravel || block == BOPBlockHelper.get("longGrass") || block == BOPBlockHelper.get("overgrownNetherrack");
 
 		default:
 			return block == Blocks.grass || block == Blocks.dirt || block == Blocks.farmland || block == BOPBlockHelper.get("longGrass") || block == BOPBlockHelper.get("overgrownNetherrack");
@@ -240,7 +247,7 @@ public class BlockBOPFoliage extends BlockTallGrass implements IShearable
 		
 	    int metadata = world.getBlockMetadata(x, y, z);
 	    
-	    if (world.getBlockMetadata(x, y, z) == GRASSBOTTOM) 
+	    if (world.getBlockMetadata(x, y, z) == HEDGEBOTTOM) 
 	    {
 	    	//TODO:	 getBlock()
 	        if (world.getBlock(x, y + 1, z) != this)
@@ -316,7 +323,7 @@ public class BlockBOPFoliage extends BlockTallGrass implements IShearable
 	@Override
     public int colorMultiplier(IBlockAccess world, int x, int y, int z)
 	{
-		if (world.getBlockMetadata(x, y, z) == 9 || world.getBlockMetadata(x, y, z) == 14)
+		if (world.getBlockMetadata(x, y, z) == 3 || world.getBlockMetadata(x, y, z) == 6 || world.getBlockMetadata(x, y, z) == 9 || world.getBlockMetadata(x, y, z) == 14)
 		{
 			return world.getBiomeGenForCoords(x, z).getBiomeFoliageColor(x, y, z);
 		}
@@ -334,8 +341,8 @@ public class BlockBOPFoliage extends BlockTallGrass implements IShearable
 	public int getDamageValue(World world, int x, int y, int z) 
 	{
 		int meta = world.getBlockMetadata(x, y, z);
-		if (meta == GRASSTOP) {
-			meta = GRASSBOTTOM;
+		if (meta == HEDGETOP) {
+			meta = HEDGEBOTTOM;
 		}
 		return meta;
 	}
@@ -467,7 +474,7 @@ public class BlockBOPFoliage extends BlockTallGrass implements IShearable
 	{
 		ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
 
-		if (world.getBlockMetadata(x, y, z) == GRASSTOP) 
+		if (world.getBlockMetadata(x, y, z) == HEDGETOP) 
 		{
 			ret.add(new ItemStack(Blocks.tallgrass, 1, 1));
 		} 

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

@@ -164,19 +164,6 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable
 			double d2 = z + random.nextFloat();
 			world.spawnParticle("dripWater", d0, d1, d2, 0.0D, 0.0D, 0.0D);
 		}
-		
-		//TODO:		getBlock()
-		if (world.getBlock(x, y, z) == BOPBlockHelper.get("leaves1") && isType(world.getBlockMetadata(x, y, z), 2))
-        {
-			//TODO:		getBlock()
-            if (!(world.getBlock(x, y - 1, z) == BOPBlockHelper.get("leaves1") && isType(world.getBlockMetadata(x, y - 1, z), 2)))
-            {
-            	if (random.nextInt(5) == 0)
-            	{
-            		BiomesOPlenty.proxy.spawnParticle("magictree", x + random.nextFloat(), y + 0.9F, z + random.nextFloat());
-            	}
-            }
-        }
 
 		//TODO: 	randomDisplayTick()
 		super.randomDisplayTick(world, x, y, z, random);

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

@@ -0,0 +1,60 @@
+package biomesoplenty.common.blocks;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockVine;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.init.Blocks;
+import net.minecraft.world.ColorizerFoliage;
+import net.minecraft.world.IBlockAccess;
+import biomesoplenty.BiomesOPlenty;
+
+public class BlockFlowerVine extends BlockVine
+{
+	public BlockFlowerVine()
+	{
+		//TODO: this.setHardness
+		this.setHardness(0.2F);
+		
+		//TODO setStepSound(Block.soundGrassFootstep)
+		this.setStepSound(Block.soundTypeGrass);
+		
+		//TODO: setTickRandomly()
+		this.setTickRandomly(true);
+		
+		//TODO: this.setCreativeTab()
+		this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
+	}
+
+	@Override
+	//TODO:		registerIcons()
+	public void registerBlockIcons(IIconRegister iconRegister)
+	{
+				//TODO: blockIcon
+		this.blockIcon = iconRegister.registerIcon("biomesoplenty:flowervine");
+	}
+	
+	@Override
+    @SideOnly(Side.CLIENT)
+    public int getBlockColor()
+    {
+        return 16777215;
+    }
+
+    // JAVADOC METHOD $$ func_149741_i
+	@Override
+    @SideOnly(Side.CLIENT)
+    public int getRenderColor(int p_149741_1_)
+    {
+        return 16777215;
+    }
+
+    // JAVADOC METHOD $$ func_149720_d
+	@Override
+    @SideOnly(Side.CLIENT)
+    public int colorMultiplier(IBlockAccess p_149720_1_, int p_149720_2_, int p_149720_3_, int p_149720_4_)
+    {
+        return 16777215;
+    }
+}

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

@@ -1,9 +1,12 @@
 package biomesoplenty.common.blocks;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockVine;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.init.Blocks;
+import net.minecraft.world.IBlockAccess;
 import biomesoplenty.BiomesOPlenty;
 
 public class BlockTreeMoss extends BlockVine
@@ -30,4 +33,27 @@ public class BlockTreeMoss extends BlockVine
 				//TODO: blockIcon
 		this.blockIcon = iconRegister.registerIcon("biomesoplenty:treemoss");
 	}
+	
+	@Override
+    @SideOnly(Side.CLIENT)
+    public int getBlockColor()
+    {
+        return 16777215;
+    }
+
+    // JAVADOC METHOD $$ func_149741_i
+	@Override
+    @SideOnly(Side.CLIENT)
+    public int getRenderColor(int p_149741_1_)
+    {
+        return 16777215;
+    }
+
+    // JAVADOC METHOD $$ func_149720_d
+	@Override
+    @SideOnly(Side.CLIENT)
+    public int colorMultiplier(IBlockAccess p_149720_1_, int p_149720_2_, int p_149720_3_, int p_149720_4_)
+    {
+        return 16777215;
+    }
 }

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

@@ -1,19 +1,87 @@
 package biomesoplenty.common.core;
 
-import biomesoplenty.api.BOPBlockHelper;
-import biomesoplenty.common.blocks.*;
-import biomesoplenty.common.blocks.BlockBOPColorizedLeaves.ColourizedLeafCategory;
-import biomesoplenty.common.blocks.BlockBOPGeneric.BlockType;
-import biomesoplenty.common.blocks.BlockBOPLeaves.LeafCategory;
-import biomesoplenty.common.blocks.BlockBOPLog.LogCategory;
-import biomesoplenty.common.blocks.BlockBOPSlab.SlabCategory;
-import biomesoplenty.common.blocks.BlockBOPStairs.Category;
-import biomesoplenty.common.itemblocks.*;
-import cpw.mods.fml.common.registry.GameRegistry;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemBlock;
+import biomesoplenty.api.BOPBlockHelper;
+import biomesoplenty.common.blocks.BlockAsh;
+import biomesoplenty.common.blocks.BlockBOPAppleLeaves;
+import biomesoplenty.common.blocks.BlockBOPColorizedLeaves;
+import biomesoplenty.common.blocks.BlockBOPColorizedLeaves.ColourizedLeafCategory;
+import biomesoplenty.common.blocks.BlockBOPColorizedSapling;
+import biomesoplenty.common.blocks.BlockBOPCoral;
+import biomesoplenty.common.blocks.BlockBOPFlower;
+import biomesoplenty.common.blocks.BlockBOPFlower2;
+import biomesoplenty.common.blocks.BlockBOPFoliage;
+import biomesoplenty.common.blocks.BlockBOPGems;
+import biomesoplenty.common.blocks.BlockBOPGeneric;
+import biomesoplenty.common.blocks.BlockBOPGeneric.BlockType;
+import biomesoplenty.common.blocks.BlockBOPGrass;
+import biomesoplenty.common.blocks.BlockBOPLeaves;
+import biomesoplenty.common.blocks.BlockBOPLeaves.LeafCategory;
+import biomesoplenty.common.blocks.BlockBOPLog;
+import biomesoplenty.common.blocks.BlockBOPLog.LogCategory;
+import biomesoplenty.common.blocks.BlockBOPMushroom;
+import biomesoplenty.common.blocks.BlockBOPPersimmonLeaves;
+import biomesoplenty.common.blocks.BlockBOPPetals;
+import biomesoplenty.common.blocks.BlockBOPPlank;
+import biomesoplenty.common.blocks.BlockBOPPlant;
+import biomesoplenty.common.blocks.BlockBOPRedRock;
+import biomesoplenty.common.blocks.BlockBOPSapling;
+import biomesoplenty.common.blocks.BlockBOPSkystone;
+import biomesoplenty.common.blocks.BlockBOPSlab;
+import biomesoplenty.common.blocks.BlockBOPSlab.SlabCategory;
+import biomesoplenty.common.blocks.BlockBOPStairs;
+import biomesoplenty.common.blocks.BlockBOPStairs.Category;
+import biomesoplenty.common.blocks.BlockBamboo;
+import biomesoplenty.common.blocks.BlockBones;
+import biomesoplenty.common.blocks.BlockCloud;
+import biomesoplenty.common.blocks.BlockFlesh;
+import biomesoplenty.common.blocks.BlockFlowerVine;
+import biomesoplenty.common.blocks.BlockGrave;
+import biomesoplenty.common.blocks.BlockHive;
+import biomesoplenty.common.blocks.BlockHoney;
+import biomesoplenty.common.blocks.BlockIvy;
+import biomesoplenty.common.blocks.BlockLongGrass;
+import biomesoplenty.common.blocks.BlockMoss;
+import biomesoplenty.common.blocks.BlockMud;
+import biomesoplenty.common.blocks.BlockOriginGrass;
+import biomesoplenty.common.blocks.BlockOvergrownNetherrack;
+import biomesoplenty.common.blocks.BlockPromisedPortal;
+import biomesoplenty.common.blocks.BlockStoneFormations;
+import biomesoplenty.common.blocks.BlockTreeMoss;
+import biomesoplenty.common.blocks.BlockTurnip;
+import biomesoplenty.common.blocks.BlockWillow;
+import biomesoplenty.common.itemblocks.ItemBlockAppleLeaves;
+import biomesoplenty.common.itemblocks.ItemBlockBamboo;
+import biomesoplenty.common.itemblocks.ItemBlockBones;
+import biomesoplenty.common.itemblocks.ItemBlockColorizedLeaves;
+import biomesoplenty.common.itemblocks.ItemBlockColorizedSapling;
+import biomesoplenty.common.itemblocks.ItemBlockCoral;
+import biomesoplenty.common.itemblocks.ItemBlockFlower;
+import biomesoplenty.common.itemblocks.ItemBlockFlower2;
+import biomesoplenty.common.itemblocks.ItemBlockFoliage;
+import biomesoplenty.common.itemblocks.ItemBlockGems;
+import biomesoplenty.common.itemblocks.ItemBlockGrave;
+import biomesoplenty.common.itemblocks.ItemBlockHive;
+import biomesoplenty.common.itemblocks.ItemBlockIvy;
+import biomesoplenty.common.itemblocks.ItemBlockLeaves;
+import biomesoplenty.common.itemblocks.ItemBlockLog;
+import biomesoplenty.common.itemblocks.ItemBlockMoss;
+import biomesoplenty.common.itemblocks.ItemBlockMud;
+import biomesoplenty.common.itemblocks.ItemBlockMushroom;
+import biomesoplenty.common.itemblocks.ItemBlockPersimmonLeaves;
+import biomesoplenty.common.itemblocks.ItemBlockPetals;
+import biomesoplenty.common.itemblocks.ItemBlockPlank;
+import biomesoplenty.common.itemblocks.ItemBlockPlant;
+import biomesoplenty.common.itemblocks.ItemBlockRedRock;
+import biomesoplenty.common.itemblocks.ItemBlockSapling;
+import biomesoplenty.common.itemblocks.ItemBlockSkystone;
+import biomesoplenty.common.itemblocks.ItemBlockSlab;
+import biomesoplenty.common.itemblocks.ItemBlockStoneFormations;
+import biomesoplenty.common.itemblocks.ItemBlockWillow;
+import cpw.mods.fml.common.registry.GameRegistry;
 
 public class BOPBlocks 
 {
@@ -62,6 +130,7 @@ public class BOPBlocks
         registerBlock(new BlockBOPGrass().setBlockName("grass"));
         
         registerBlock(new BlockTreeMoss().setBlockName("treeMoss"));
+        registerBlock(new BlockFlowerVine().setBlockName("flowerVine"));
         
 		registerBlock(new BlockBOPLog(LogCategory.CAT1).setBlockName("logs1"), ItemBlockLog.class);
 		registerBlock(new BlockBOPLog(LogCategory.CAT2).setBlockName("logs2"), ItemBlockLog.class);

src/main/java/biomesoplenty/common/itemblocks/ItemBlockFlower.java

@@ -19,10 +19,10 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 public class ItemBlockFlower extends ItemBlock
 {
-	private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "cosmos", "daffodil", "wildflower", "violet", "anemone", "lilyflower", "rainbowflower", "bromeliad", "sunflowerbottom", "sunflowertop", "dandelion"};
+	private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "cosmos", "daffodil", "wildflower", "violet", "anemone", "lilyflower", "rainbowflower", "bromeliad", "eyebulbbottom", "eyebulbtop", "dandelion"};
 	@SideOnly(Side.CLIENT)
 	private IIcon[] textures;
-	private static final int SUNFLOWERTOP = 14;
+	private static final int EYEBULBTOP = 14;
 
 	public ItemBlockFlower(Block block)
 	{
@@ -44,7 +44,7 @@ public class ItemBlockFlower extends ItemBlock
 	{
 		textures = new IIcon[2];
 
-		textures[0] = iconRegister.registerIcon("biomesoplenty:item_sunflower");
+		textures[0] = iconRegister.registerIcon("biomesoplenty:eyebulbtop");
 		textures[1] = iconRegister.registerIcon("biomesoplenty:item_rainbowflower");
 	}
 
@@ -136,7 +136,7 @@ public class ItemBlockFlower extends ItemBlock
     {
     	if (metadata == 13) 
     	{
-    		if (!placeBlockAt(stack, player, world, x, y + 1, z, side, hitX, hitY + 1, hitZ, SUNFLOWERTOP)) return false;
+    		if (!placeBlockAt(stack, player, world, x, y + 1, z, side, hitX, hitY + 1, hitZ, EYEBULBTOP)) return false;
     	}
 
     	return super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata);

src/main/java/biomesoplenty/common/itemblocks/ItemBlockFoliage.java

@@ -17,10 +17,10 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 public class ItemBlockFoliage extends ItemColored
 {
-	private static final String[] foliageTypes = new String[] {"algae", "shortgrass", "mediumgrass", "highgrassbottom", "bush", "sprout", "highgrasstop", "poisonivy", "berrybush", "shrub", "wheatgrass", "dampgrass", "koru", "cloverpatch", "leafpile", "deadleafpile"};
+	private static final String[] foliageTypes = new String[] {"algae", "shortgrass", "mediumgrass", "hedgebottom", "bush", "sprout", "hedgetop", "poisonivy", "berrybush", "shrub", "wheatgrass", "dampgrass", "koru", "cloverpatch", "leafpile", "deadleafpile"};
 	@SideOnly(Side.CLIENT)
 	private IIcon[] textures;
-	private static final int GRASSTOP = 6;
+	private static final int HEDGETOP = 6;
 
 	public ItemBlockFoliage(Block block)
 	{
@@ -40,7 +40,7 @@ public class ItemBlockFoliage extends ItemColored
 			textures[i] = iconRegister.registerIcon("biomesoplenty:" + foliageTypes[i]);
 		}
 
-		textures[3] = iconRegister.registerIcon("biomesoplenty:item_highgrass");
+		textures[3] = iconRegister.registerIcon("biomesoplenty:hedgetop");
 		textures[8] = iconRegister.registerIcon("biomesoplenty:item_berrybush");
 		textures[9] = iconRegister.registerIcon("biomesoplenty:item_shrub");
 		textures[15] = iconRegister.registerIcon("biomesoplenty:deadleafpile");
@@ -50,7 +50,7 @@ public class ItemBlockFoliage extends ItemColored
 	@SideOnly(Side.CLIENT)
 	public int getColorFromItemStack(ItemStack itemStack, int par2)
 	{
-		if (itemStack.getItemDamage() == 3 || itemStack.getItemDamage() == 8 || itemStack.getItemDamage() == 9 || itemStack.getItemDamage() == 15)
+		if (itemStack.getItemDamage() == 8 || itemStack.getItemDamage() == 9 || itemStack.getItemDamage() == 15)
 			return 16777215;
 		else
 			//TODO:							 getRenderColor()
@@ -77,7 +77,7 @@ public class ItemBlockFoliage extends ItemColored
 	@Override
 	public IIcon getIconFromDamage(int meta)
 	{
-		if (meta == GRASSTOP) {
+		if (meta == HEDGETOP) {
 			meta = 3;
 		}
 		
@@ -130,7 +130,7 @@ public class ItemBlockFoliage extends ItemColored
     {
     	if (metadata == 3) 
     	{
-    		if (!placeBlockAt(stack, player, world, x, y + 1, z, side, hitX, hitY + 1, hitZ, GRASSTOP)) return false;
+    		if (!placeBlockAt(stack, player, world, x, y + 1, z, side, hitX, hitY + 1, hitZ, HEDGETOP)) return false;
     	}
 
     	return super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata);

src/main/java/biomesoplenty/common/world/features/trees/WorldGenBayou1.java

@@ -230,7 +230,7 @@ public class WorldGenBayou1 extends WorldGenAbstractTree
             --y;
 
             //TODO:     getBlock()
-            if (world.getBlock(x, y, z).isAir(world, x, y, z) || i1 <= 0)
+            if (!(world.getBlock(x, y, z).isAir(world, x, y, z)) || i1 <= 0)
             {
                 return;
             }

src/main/java/biomesoplenty/common/world/features/trees/WorldGenBayou2.java

@@ -222,7 +222,7 @@ public class WorldGenBayou2 extends WorldGenAbstractTree
             --y;
 
             //TODO:     getBlock()
-            if (world.getBlock(x, y, z).isAir(world, x, y, z) || i1 <= 0)
+            if (!(world.getBlock(x, y, z).isAir(world, x, y, z)) || i1 <= 0)
             {
                 return;
             }

src/main/java/biomesoplenty/common/world/forceddecorators/DesertForcedDecorator.java

@@ -6,6 +6,7 @@ public class DesertForcedDecorator extends ForcedDecorator
 {
 	public DesertForcedDecorator()
 	{
-
+		this.bopWorldFeatures.tinyCactiPerChunk = 10;
+		this.bopWorldFeatures.generateQuicksand = true;
 	}
 }

src/main/java/biomesoplenty/common/world/forceddecorators/MushroomIslandForcedDecorator.java

@@ -6,6 +6,8 @@ public class MushroomIslandForcedDecorator extends ForcedDecorator
 {
 	public MushroomIslandForcedDecorator()
 	{
-
+		this.bopWorldFeatures.blueMilksPerChunk = 2;
+		this.bopWorldFeatures.toadstoolsPerChunk = 8;
+		this.bopWorldFeatures.portobellosPerChunk = 6;
 	}
 }

src/main/java/biomesoplenty/common/world/forceddecorators/OceanForcedDecorator.java

@@ -6,6 +6,6 @@ public class OceanForcedDecorator extends ForcedDecorator
 {
 	public OceanForcedDecorator()
 	{
-
+		this.bopWorldFeatures.seaweedPerChunk = 20;
 	}
 }

src/main/resources/assets/biomesoplenty/lang/en_US.lang

@@ -47,8 +47,8 @@ tile.flowers.anemone.name=White Anemone
 tile.flowers.lilyflower.name=Waterlily
 tile.flowers.rainbowflower.name=Chromaflora
 tile.flowers.bromeliad.name=Bromeliad
-tile.flowers.sunflowerbottom.name=Sunflower
-tile.flowers.sunflowertop.name=Sunflower
+tile.flowers.eyebulbbottom.name=Eyebulb
+tile.flowers.eyebulbtop.name=Eyebulb
 tile.flowers.dandelion.name=Dandelion Puff
 
 tile.flowers2.hibiscus.name=Pink Hibiscus
@@ -67,10 +67,10 @@ tile.stoneFormations.stalactite.name=Stalactite
 tile.foliage.algae.name=Algae
 tile.foliage.shortgrass.name=Short Grass
 tile.foliage.mediumgrass.name=Medium Grass
-tile.foliage.highgrassbottom.name=High Grass
+tile.foliage.hedgebottom.name=Hedge
 tile.foliage.bush.name=Bush
 tile.foliage.sprout.name=Sprout
-tile.foliage.highgrasstop.name=High Grass
+tile.foliage.hedgetop.name=Hedge
 tile.foliage.poisonivy.name=Poison Ivy
 tile.foliage.berrybush.name=Berry Bush
 tile.foliage.shrub.name=Shrub
@@ -123,6 +123,7 @@ tile.originGrass.name=Origin Grass Block
 tile.longGrass.name=Long Grass Block
 tile.overgrownNetherrack.name=Overgrown Netherrack
 tile.treeMoss.name=Tree Moss
+tile.flowerVine.name=Flowering Vines
 
 tile.coral.kelpsingle.name=Kelp
 tile.coral.pinkcoral.name=Pink Coral

src/main/resources/assets/biomesoplenty/lang/it_IT.lang

@@ -32,7 +32,7 @@ tile.plants.rivercane.name=Canne
 tile.plants.cactus.name=Piantina Grassa
 tile.plants.witherwart.name=Verruca Wither
 tile.plants.reed.name=Canne
-tile.plants.root.name=Radice
+tile.plants.root.name=Radici
 
 tile.flowers.clover.name=Trifoglio
 tile.flowers.swampflower.name=Fiore di Palude
@@ -47,8 +47,8 @@ tile.flowers.anemone.name=Anemone Bianca
 tile.flowers.lilyflower.name=Ninfea
 tile.flowers.rainbowflower.name=Chromaflora
 tile.flowers.bromeliad.name=Aloe
-tile.flowers.sunflowerbottom.name=Girasole
-tile.flowers.sunflowertop.name=Girasole
+tile.flowers.eyebulbbottom.name=Oleracea
+tile.flowers.eyebulbtop.name=Oleracea
 tile.flowers.dandelion.name=Dente di Leone Bianco
 
 tile.flowers2.hibiscus.name=Ibisco Rosa
@@ -59,6 +59,7 @@ tile.flowers2.goldenrod.name=Asteracea
 tile.flowers2.bluebells.name=Campanule
 tile.flowers2.minersdelight.name=Felicità del Minatore
 tile.flowers2.icyiris.name=Iris Gelato
+tile.flowers2.rose.name=Rosa
 
 tile.stoneFormations.stalagmite.name=Stalagmite
 tile.stoneFormations.stalactite.name=Stalattite
@@ -66,10 +67,10 @@ tile.stoneFormations.stalactite.name=Stalattite
 tile.foliage.algae.name=Alghe
 tile.foliage.shortgrass.name=Erba Bassa
 tile.foliage.mediumgrass.name=Erba Media
-tile.foliage.highgrassbottom.name=Erba Alta
+tile.foliage.hedgebottom.name=Siepe
 tile.foliage.bush.name=Cespuglio
 tile.foliage.sprout.name=Germoglio
-tile.foliage.highgrasstop.name=Erba Alta
+tile.foliage.hedgetop.name=Siepe
 tile.foliage.poisonivy.name=Edera Velenosa
 tile.foliage.berrybush.name=Cespuglio di Bacche
 tile.foliage.shrub.name=Cespuglio
@@ -77,6 +78,8 @@ tile.foliage.wheatgrass.name=Erba di Grano
 tile.foliage.dampgrass.name=Erba Umida
 tile.foliage.koru.name=Koru
 tile.foliage.cloverpatch.name=Tappeto di Trifogli
+tile.foliage.leafpile.name=Cumulo di Foglie
+tile.foliage.deadleafpile.name=Cumulo di Foglie Morte
 
 tile.petals.bigflowerred.name=Fiore Rosso Gigante
 tile.petals.bigfloweryellow.name=Fiore Giallo Gigante
@@ -120,12 +123,14 @@ tile.originGrass.name=Blocco di Erba della Valle dell'Origine
 tile.longGrass.name=Blocco di Erba Copiosa
 tile.overgrownNetherrack.name=Netherrack Ricoperto di Vegetazione
 tile.treeMoss.name=Muschio Parassita
+tile.flowerVine.name=Rampicante Fiorente
 
 tile.coral.kelpsingle.name=Alga Kelp
 tile.coral.pinkcoral.name=Corallo Rosa
 tile.coral.orangecoral.name=Corallo Arancione
 tile.coral.bluecoral.name=Corallo Blu
 tile.coral.glowcoral.name=Corallo Luminescente
+tile.coral.seaweed.name=Alghe
 
 tile.redCobbleStairs.name=Scalini in Pietrisco di Roccia Rossa
 tile.redBricksStairs.name=Scalini in Mattoni di Roccia Rossa
@@ -143,7 +148,7 @@ tile.holyBricksStairs.name=Scalini in Mattoni del Cielo
 
 tile.promisedPortal.name=Portale della Terra Promessa
 
-tile.gemOre.amethystore.name=Ametista Grezza
+tile.gemOre.amethystore.name=Ametista dell'End Grezza
 tile.gemOre.amethystblock.name=Blocco di Ametista
 tile.gemOre.rubyore.name=Rubino Grezzo
 tile.gemOre.rubyblock.name=Blocco di Rubino
@@ -337,7 +342,7 @@ item.jarFilled.jarhoney.name=Barattolo di Miele
 item.jarFilled.jarpoison.name=Barattolo di Estratto di Veleno
 item.jarFilled.jarpixie.name=Barattolo con Pixie
 
-item.gems.amethyst.name=Ametista
+item.gems.amethyst.name=Ametista dell'End
 item.gems.ruby.name=Rubino
 item.gems.peridot.name=Peridoto
 item.gems.topaz.name=Topazio