Rough update to Forge 656, only thing that needs work is crashes due to block textures

src/minecraft/biomesoplenty/armor/ArmorAmethyst.java

@@ -28,12 +28,12 @@ public class ArmorAmethyst extends ItemArmor implements IArmorTextureProvider
 		return null;
 	}
 	
-	public void updateIcons(IconRegister iconRegister)
+	public void registerIcons(IconRegister iconRegister)
 	{
-    	if(textureID==0){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:amethysthelmet"); }
+    	if(textureID==0){ itemIcon = iconRegister.registerIcon("BiomesOPlenty:amethysthelmet"); }
-    	else if(textureID==1){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:amethystchestplate"); }
+    	else if(textureID==1){ itemIcon = iconRegister.registerIcon("BiomesOPlenty:amethystchestplate"); }
-    	else if(textureID==2){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:amethystleggings"); }
+    	else if(textureID==2){ itemIcon = iconRegister.registerIcon("BiomesOPlenty:amethystleggings"); }
-    	else if(textureID==3){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:amethystboots"); }
+    	else if(textureID==3){ itemIcon = iconRegister.registerIcon("BiomesOPlenty:amethystboots"); }
-    	else { iconIndex = iconRegister.registerIcon("BiomesOPlenty:mudball"); }
+    	else { itemIcon = iconRegister.registerIcon("BiomesOPlenty:mudball"); }
 	}
 }

src/minecraft/biomesoplenty/armor/ArmorMuddy.java

@@ -28,12 +28,12 @@ public class ArmorMuddy extends ItemArmor implements IArmorTextureProvider
 		return null;
 	}
 
-	public void updateIcons(IconRegister iconRegister)
+	public void registerIcons(IconRegister iconRegister)
 	{
-    	if(textureID==0){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:mudhelmet"); }
+    	if(textureID==0){ itemIcon = iconRegister.registerIcon("BiomesOPlenty:mudhelmet"); }
-    	else if(textureID==1){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:mudchestplate"); }
+    	else if(textureID==1){ itemIcon = iconRegister.registerIcon("BiomesOPlenty:mudchestplate"); }
-    	else if(textureID==2){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:mudleggings"); }
+    	else if(textureID==2){ itemIcon = iconRegister.registerIcon("BiomesOPlenty:mudleggings"); }
-    	else if(textureID==3){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:mudboots"); }
+    	else if(textureID==3){ itemIcon = iconRegister.registerIcon("BiomesOPlenty:mudboots"); }
-    	else { iconIndex = iconRegister.registerIcon("BiomesOPlenty:mudball"); }
+    	else { itemIcon = iconRegister.registerIcon("BiomesOPlenty:mudball"); }
 	}
 }

src/minecraft/biomesoplenty/blocks/BlockAcaciaLeaves.java

@@ -48,8 +48,9 @@ public class BlockAcaciaLeaves extends BlockLeavesBase implements IShearable
 		this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:acacialeaves2");
 	}
     
+    @Override
     @SideOnly(Side.CLIENT)
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+    public Icon getIcon(int par1, int par2)
     {
 		return blockIcon[(!isOpaqueCube() ? 0 : 1)];
     }

src/minecraft/biomesoplenty/blocks/BlockBOPColorizedLeaves.java

@@ -91,7 +91,7 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab
     
     @Override
     @SideOnly(Side.CLIENT)
-    public Icon getBlockTextureFromSideAndMetadata(int side, int meta)
+    public Icon getIcon(int side, int meta)
     {
         if (meta < 0 || meta >= textures[0].length)
             meta = 0;

src/minecraft/biomesoplenty/blocks/BlockBOPColorizedSapling.java

@@ -63,7 +63,7 @@ public class BlockBOPColorizedSapling extends BlockSapling
     
     @Override
     @SideOnly(Side.CLIENT)
-    public Icon getBlockTextureFromSideAndMetadata(int side, int meta)
+    public Icon getIcon(int side, int meta)
     {
         if (meta < 0 || meta >= saplings.length)
             meta = 0;

src/minecraft/biomesoplenty/blocks/BlockBOPFlower.java

@@ -51,7 +51,7 @@ public class BlockBOPFlower extends BlockFlower
     
     @Override
     @SideOnly(Side.CLIENT)
-    public Icon getBlockTextureFromSideAndMetadata(int side, int meta)
+    public Icon getIcon(int side, int meta)
     {
         if (meta < 0 || meta >= textures.length)
             meta = 0;

src/minecraft/biomesoplenty/blocks/BlockBOPFoliage.java

@@ -57,7 +57,7 @@ public class BlockBOPFoliage extends BlockFlower implements IShearable
     
     @Override
     @SideOnly(Side.CLIENT)
-    public Icon getBlockTextureFromSideAndMetadata(int side, int meta)
+    public Icon getIcon(int side, int meta)
     {
         if (meta >= textures.length)
             meta = 0;

src/minecraft/biomesoplenty/blocks/BlockBOPLeaves.java

@@ -54,7 +54,7 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable
     
     @Override
     @SideOnly(Side.CLIENT)
-    public Icon getBlockTextureFromSideAndMetadata(int side, int meta)
+    public Icon getIcon(int side, int meta)
     {
         if (meta < 0 || meta >= textures[0].length)
             meta = 0;

src/minecraft/biomesoplenty/blocks/BlockBOPLog.java

@@ -55,7 +55,7 @@ public class BlockBOPLog extends Block
     
     @Override
     @SideOnly(Side.CLIENT)
-    public Icon getBlockTextureFromSideAndMetadata(int side, int meta)
+    public Icon getIcon(int side, int meta)
     {
         int pos = meta & 12;
         if (pos == 0 && (side == 1 || side == 0) || pos == 4 && (side == 5 || side == 4) || pos == 8 && (side == 2 || side == 3))

src/minecraft/biomesoplenty/blocks/BlockBOPPetals.java

@@ -47,7 +47,7 @@ public class BlockBOPPetals extends BlockLeavesBase implements IShearable
     
     @Override
     @SideOnly(Side.CLIENT)
-    public Icon getBlockTextureFromSideAndMetadata(int side, int meta)
+    public Icon getIcon(int side, int meta)
     {
         if (meta < 0 || meta >= textures.length)
             meta = 0;

src/minecraft/biomesoplenty/blocks/BlockBOPPlank.java

@@ -39,7 +39,7 @@ public class BlockBOPPlank extends Block
     
     @Override
     @SideOnly(Side.CLIENT)
-    public Icon getBlockTextureFromSideAndMetadata(int side, int meta)
+    public Icon getIcon(int side, int meta)
     {
         if (meta < 0 || meta >= textures.length)
             meta = 0;

src/minecraft/biomesoplenty/blocks/BlockBOPPlant.java

@@ -53,7 +53,7 @@ public class BlockBOPPlant extends BlockFlower implements IShearable
     
     @Override
     @SideOnly(Side.CLIENT)
-    public Icon getBlockTextureFromSideAndMetadata(int side, int meta)
+    public Icon getIcon(int side, int meta)
     {
         if (meta < 0 || meta >= textures.length)
             meta = 0;

src/minecraft/biomesoplenty/blocks/BlockBOPSapling.java

@@ -57,7 +57,7 @@ public class BlockBOPSapling extends BlockSapling
     
     @Override
     @SideOnly(Side.CLIENT)
-    public Icon getBlockTextureFromSideAndMetadata(int side, int meta)
+    public Icon getIcon(int side, int meta)
     {
         if (meta < 0 || meta >= saplings.length)
             meta = 0;

src/minecraft/biomesoplenty/blocks/BlockBOPSlab.java

@@ -69,7 +69,7 @@ public class BlockBOPSlab extends BlockHalfSlab
     
     @Override
     @SideOnly(Side.CLIENT)
-    public Icon getBlockTextureFromSideAndMetadata(int side, int meta)
+    public Icon getIcon(int side, int meta)
     {
         if (category == SlabCategory.STONE)
             return textures[getTypeFromMeta(meta)];

src/minecraft/biomesoplenty/blocks/BlockBOPStairs.java

@@ -42,7 +42,7 @@ public class BlockBOPStairs extends BlockStairs
     
     @Override
     @SideOnly(Side.CLIENT)
-    public Icon getBlockTextureFromSideAndMetadata(int side, int meta)
+    public Icon getIcon(int side, int meta)
     {
         return textures[category.ordinal()];
     }

src/minecraft/biomesoplenty/blocks/BlockMoss.java

@@ -292,7 +292,7 @@ public class BlockMoss extends Block
 
             var9 = par1World.getBlockMetadata(par2, par3, par4);
             var10 = par1World.rand.nextInt(6);
-            var11 = Direction.vineGrowth[var10];
+            var11 = Direction.facingToDirection[var10];
             int var12;
             int var13;
 

src/minecraft/biomesoplenty/helpers/TeleporterPromised.java

@@ -193,7 +193,7 @@ public class TeleporterPromised extends Teleporter
 			var12 = 1;
 			var13 = 31;
 			var14 = 0;
-			var20.field_85087_d = this.worldServerInstance.getTotalWorldTime();
+			var20.lastUpdateTime = this.worldServerInstance.getTotalWorldTime();
 			var19 = false;
 		}
 		else
@@ -264,11 +264,11 @@ public class TeleporterPromised extends Teleporter
 				var50 = 1;
 			}
 
-			int var30 = par1Entity.func_82148_at();
+			int var30 = par1Entity.getTeleportDirection();
 
 		if (var50 > -1)
 		{
-			int var31 = Direction.field_71578_g[var50];
+			int var31 = Direction.rotateLeft[var50];
 			int var32 = Direction.offsetX[var50];
 			int var33 = Direction.offsetZ[var50];
 			int var34 = Direction.offsetX[var31];
@@ -278,8 +278,8 @@ public class TeleporterPromised extends Teleporter
 
 			if (var36 && var37)
 			{
-				var50 = Direction.footInvisibleFaceRemap[var50];
+				var50 = Direction.rotateOpposite[var50];
-				var31 = Direction.footInvisibleFaceRemap[var31];
+				var31 = Direction.rotateOpposite[var31];
 				var32 = Direction.offsetX[var50];
 				var33 = Direction.offsetZ[var50];
 				var34 = Direction.offsetX[var31];
@@ -320,12 +320,12 @@ public class TeleporterPromised extends Teleporter
 				var40 = 1.0F;
 				var41 = 1.0F;
 			}
-			else if (var50 == Direction.footInvisibleFaceRemap[var30])
+			else if (var50 == Direction.rotateOpposite[var30])
 			{
 				var40 = -1.0F;
 				var41 = -1.0F;
 			}
-			else if (var50 == Direction.enderEyeMetaToDirection[var30])
+			else if (var50 == Direction.rotateRight[var30])
 			{
 				var42 = 1.0F;
 				var43 = -1.0F;
@@ -783,7 +783,7 @@ public class TeleporterPromised extends Teleporter
 
 	@SuppressWarnings("rawtypes")
 	@Override
-	public void func_85189_a(long par1)
+	public void removeStalePortalLocations(long par1)
 	{
 		if (par1 % 100L == 0L)
 		{
@@ -795,7 +795,7 @@ public class TeleporterPromised extends Teleporter
 				Long var6 = (Long) var3.next();
 				PortalPosition var7 = (PortalPosition) this.field_85191_c.getValueByKey(var6.longValue());
 
-				if (var7 == null || var7.field_85087_d < var4)
+				if (var7 == null || var7.lastUpdateTime < var4)
 				{
 					var3.remove();
 					this.field_85191_c.remove(var6.longValue());

src/minecraft/biomesoplenty/items/ItemAncientStaff.java

@@ -22,9 +22,9 @@ public class ItemAncientStaff extends Item
         return true;
     }
     
-	public void updateIcons(IconRegister iconRegister)
+	public void registerIcons(IconRegister iconRegister)
 	{
-    	iconIndex = iconRegister.registerIcon("BiomesOPlenty:ancientstaff");
+    	itemIcon = iconRegister.registerIcon("BiomesOPlenty:ancientstaff");
 	}
 
     public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)

src/minecraft/biomesoplenty/items/ItemBOP.java

@@ -19,17 +19,17 @@ public class ItemBOP extends Item
 		boptextureid = texture;
 	}
 
-	public void updateIcons(IconRegister iconRegister)
+	public void registerIcons(IconRegister iconRegister)
 	{
-		if(boptextureid==0){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:mudball"); }
+		if(boptextureid==0){ itemIcon = iconRegister.registerIcon("BiomesOPlenty:mudball"); }
-		else if(boptextureid==1){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:mudbrick"); }
+		else if(boptextureid==1){ itemIcon = iconRegister.registerIcon("BiomesOPlenty:mudbrick"); }
-		else if(boptextureid==2){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:moss"); }
+		else if(boptextureid==2){ itemIcon = iconRegister.registerIcon("BiomesOPlenty:moss"); }
-		else if(boptextureid==3){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:ash"); }
+		else if(boptextureid==3){ itemIcon = iconRegister.registerIcon("BiomesOPlenty:ash"); }
-		else if(boptextureid==4){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:amethyst"); }
+		else if(boptextureid==4){ itemIcon = iconRegister.registerIcon("BiomesOPlenty:amethyst"); }
-		else if(boptextureid==5){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:staffhandle"); }
+		else if(boptextureid==5){ itemIcon = iconRegister.registerIcon("BiomesOPlenty:staffhandle"); }
-		else if(boptextureid==6){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:staffpole"); }
+		else if(boptextureid==6){ itemIcon = iconRegister.registerIcon("BiomesOPlenty:staffpole"); }
-		else if(boptextureid==7){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:stafftopper"); }
+		else if(boptextureid==7){ itemIcon = iconRegister.registerIcon("BiomesOPlenty:stafftopper"); }
-		else { iconIndex = iconRegister.registerIcon("BiomesOPlenty:mudball"); }
+		else { itemIcon = iconRegister.registerIcon("BiomesOPlenty:mudball"); }
 	}
 
 	public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)

src/minecraft/biomesoplenty/items/ItemBOPAxe.java

@@ -14,10 +14,10 @@ public class ItemBOPAxe extends ItemAxe
 		TextureID = texture;
 	}
 	
-	public void updateIcons(IconRegister iconRegister)
+	public void registerIcons(IconRegister iconRegister)
 	{
-    	if(TextureID==0){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:mudaxe"); }
+    	if(TextureID==0){ itemIcon = iconRegister.registerIcon("BiomesOPlenty:mudaxe"); }
-    	else if(TextureID==1){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:amethystaxe"); }
+    	else if(TextureID==1){ itemIcon = iconRegister.registerIcon("BiomesOPlenty:amethystaxe"); }
-    	else { iconIndex = iconRegister.registerIcon("BiomesOPlenty:mudball"); }
+    	else { itemIcon = iconRegister.registerIcon("BiomesOPlenty:mudball"); }
 	}
 }

src/minecraft/biomesoplenty/items/ItemBOPColorizedSapling.java

@@ -33,6 +33,6 @@ public class ItemBOPColorizedSapling extends ItemBlock
     @Override
     public Icon getIconFromDamage(int meta)
     {
-        return Block.blocksList[this.itemID].getBlockTextureFromSideAndMetadata(0, meta);
+        return Block.blocksList[this.itemID].getIcon(0, meta);
     }
 }

src/minecraft/biomesoplenty/items/ItemBOPFlower.java

@@ -31,6 +31,6 @@ public class ItemBOPFlower extends ItemBlock
     @Override
     public Icon getIconFromDamage(int meta)
     {
-        return Block.blocksList[this.itemID].getBlockTextureFromSideAndMetadata(0, meta);
+        return Block.blocksList[this.itemID].getIcon(0, meta);
     }
 }

src/minecraft/biomesoplenty/items/ItemBOPFoliage.java

@@ -24,7 +24,7 @@ public class ItemBOPFoliage extends ItemBlock
     }
     
     @SideOnly(Side.CLIENT)
-    public void updateIcons(IconRegister iconRegister)
+    public void registerIcons(IconRegister iconRegister)
     {
         textures = new Icon[foliageTypes.length - 1];
         

src/minecraft/biomesoplenty/items/ItemBOPHoe.java

@@ -14,10 +14,10 @@ public class ItemBOPHoe extends ItemHoe
 		TextureID = texture;
 	}
 	
-	public void updateIcons(IconRegister iconRegister)
+	public void registerIcons(IconRegister iconRegister)
 	{
-    	if(TextureID==0){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:mudhoe"); }
+    	if(TextureID==0){ itemIcon = iconRegister.registerIcon("BiomesOPlenty:mudhoe"); }
-    	else if(TextureID==1){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:amethysthoe"); }
+    	else if(TextureID==1){ itemIcon = iconRegister.registerIcon("BiomesOPlenty:amethysthoe"); }
-    	else { iconIndex = iconRegister.registerIcon("BiomesOPlenty:mudball"); }
+    	else { itemIcon = iconRegister.registerIcon("BiomesOPlenty:mudball"); }
 	}
 }

src/minecraft/biomesoplenty/items/ItemBOPPickaxe.java

@@ -14,10 +14,10 @@ public class ItemBOPPickaxe extends ItemPickaxe
 		TextureID = texture;
 	}
 	
-	public void updateIcons(IconRegister iconRegister)
+	public void registerIcons(IconRegister iconRegister)
 	{
-    	if(TextureID==0){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:mudpickaxe"); }
+    	if(TextureID==0){ itemIcon = iconRegister.registerIcon("BiomesOPlenty:mudpickaxe"); }
-    	else if(TextureID==1){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:amethystpickaxe"); }
+    	else if(TextureID==1){ itemIcon = iconRegister.registerIcon("BiomesOPlenty:amethystpickaxe"); }
-    	else { iconIndex = iconRegister.registerIcon("BiomesOPlenty:mudball"); }
+    	else { itemIcon = iconRegister.registerIcon("BiomesOPlenty:mudball"); }
 	}
 }

src/minecraft/biomesoplenty/items/ItemBOPPlant.java

@@ -31,6 +31,6 @@ public class ItemBOPPlant extends ItemBlock
     @Override
     public Icon getIconFromDamage(int meta)
     {
-        return Block.blocksList[this.itemID].getBlockTextureFromSideAndMetadata(0, meta);
+        return Block.blocksList[this.itemID].getIcon(0, meta);
     }
 }

src/minecraft/biomesoplenty/items/ItemBOPRecord.java

@@ -36,9 +36,9 @@ public class ItemBOPRecord extends ItemRecord
         records.put(par2Str, this);
     }
 
-	public void updateIcons(IconRegister iconRegister)
+	public void registerIcons(IconRegister iconRegister)
 	{
-    	iconIndex = iconRegister.registerIcon("BiomesOPlenty:boprecord");
+    	itemIcon = iconRegister.registerIcon("BiomesOPlenty:boprecord");
 	}
 	
     /**

src/minecraft/biomesoplenty/items/ItemBOPRecordMud.java

@@ -36,9 +36,9 @@ public class ItemBOPRecordMud extends ItemRecord
         records.put(par2Str, this);
     }
 
-	public void updateIcons(IconRegister iconRegister)
+	public void registerIcons(IconRegister iconRegister)
 	{
-    	iconIndex = iconRegister.registerIcon("BiomesOPlenty:mudrecord");
+    	itemIcon = iconRegister.registerIcon("BiomesOPlenty:mudrecord");
 	}
 
     /**

src/minecraft/biomesoplenty/items/ItemBOPSapling.java

@@ -33,6 +33,6 @@ private static final String[] saplings = new String[] {"yellow", "bamboo", "magi
     @Override
     public Icon getIconFromDamage(int meta)
     {
-        return Block.blocksList[this.itemID].getBlockTextureFromSideAndMetadata(0, meta);
+        return Block.blocksList[this.itemID].getIcon(0, meta);
     }
 }

src/minecraft/biomesoplenty/items/ItemBOPSlab.java

@@ -32,7 +32,8 @@ public class ItemBOPSlab extends ItemSlab
 
 	@Override
 	public String getUnlocalizedName(ItemStack itemStack) {
-	    BlockBOPSlab slab = (BlockBOPSlab)Block.blocksList[itemStack.itemID];
+		//	    BlockBOPSlab slab = (BlockBOPSlab)Block.blocksList[itemStack.itemID];
-        return (new StringBuilder()).append(slab.getFullSlabName(itemStack.getItemDamage())).toString();
+		//        return (new StringBuilder()).append(slab.getFullSlabName(itemStack.getItemDamage())).toString();
+		return itemStack.getItem().getUnlocalizedName();
 	}
 }

src/minecraft/biomesoplenty/items/ItemBOPSpade.java

@@ -14,10 +14,10 @@ public class ItemBOPSpade extends ItemSpade
 		TextureID = texture;
 	}
 	
-	public void updateIcons(IconRegister iconRegister)
+	public void registerIcons(IconRegister iconRegister)
 	{
-    	if(TextureID==0){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:mudshovel"); }
+    	if(TextureID==0){ itemIcon = iconRegister.registerIcon("BiomesOPlenty:mudshovel"); }
-    	else if(TextureID==1){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:amethystshovel"); }
+    	else if(TextureID==1){ itemIcon = iconRegister.registerIcon("BiomesOPlenty:amethystshovel"); }
-    	else { iconIndex = iconRegister.registerIcon("BiomesOPlenty:mudball"); }
+    	else { itemIcon = iconRegister.registerIcon("BiomesOPlenty:mudball"); }
 	}
 }

src/minecraft/biomesoplenty/items/ItemBOPSword.java

@@ -14,10 +14,10 @@ public class ItemBOPSword extends ItemSword
 		TextureID = texture;
 	}
 	
-	public void updateIcons(IconRegister iconRegister)
+	public void registerIcons(IconRegister iconRegister)
 	{
-    	if(TextureID==0){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:mudsword"); }
+    	if(TextureID==0){ itemIcon = iconRegister.registerIcon("BiomesOPlenty:mudsword"); }
-    	else if(TextureID==1){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:amethystsword"); }
+    	else if(TextureID==1){ itemIcon = iconRegister.registerIcon("BiomesOPlenty:amethystsword"); }
-    	else { iconIndex = iconRegister.registerIcon("BiomesOPlenty:mudball"); }
+    	else { itemIcon = iconRegister.registerIcon("BiomesOPlenty:mudball"); }
 	}
 }

src/minecraft/biomesoplenty/items/ItemBamboo.java

@@ -18,9 +18,9 @@ public class ItemBamboo extends Item
         this.spawnID = par2Block.blockID;
     }
     
-	public void updateIcons(IconRegister iconRegister)
+	public void registerIcons(IconRegister iconRegister)
 	{
-    	iconIndex = iconRegister.registerIcon("BiomesOPlenty:bamboo");
+    	itemIcon = iconRegister.registerIcon("BiomesOPlenty:bamboo");
 	}
 	
     public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10)

src/minecraft/biomesoplenty/items/ItemBarley.java

@@ -18,9 +18,9 @@ public class ItemBarley extends Item
         this.spawnID = par2Block.blockID;
     }
     
-	public void updateIcons(IconRegister iconRegister)
+	public void registerIcons(IconRegister iconRegister)
 	{
-    	iconIndex = iconRegister.registerIcon("BiomesOPlenty:barley");
+    	itemIcon = iconRegister.registerIcon("BiomesOPlenty:barley");
 	}
 	
     public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10)

src/minecraft/biomesoplenty/items/ItemBush.java

@@ -19,9 +19,9 @@ public class ItemBush extends Item
         this.spawnID = par2Block.blockID;
     }
 
-	public void updateIcons(IconRegister iconRegister)
+	public void registerIcons(IconRegister iconRegister)
 	{
-    	iconIndex = iconRegister.registerIcon("BiomesOPlenty:bush");
+    	itemIcon = iconRegister.registerIcon("BiomesOPlenty:bush");
 	}
 
     /**

src/minecraft/biomesoplenty/items/ItemCattail.java

@@ -19,9 +19,9 @@ public class ItemCattail extends Item
         this.spawnID = par2Block.blockID;
     }
     
-	public void updateIcons(IconRegister iconRegister)
+	public void registerIcons(IconRegister iconRegister)
 	{
-    	iconIndex = iconRegister.registerIcon("BiomesOPlenty:cattail");
+    	itemIcon = iconRegister.registerIcon("BiomesOPlenty:cattail");
 	}
 	
     /**

src/minecraft/biomesoplenty/items/ItemEnderporter.java

@@ -18,9 +18,9 @@ public class ItemEnderporter extends Item
 		this.setMaxDamage(9);
     }
 	
-	public void updateIcons(IconRegister iconRegister)
+	public void registerIcons(IconRegister iconRegister)
 	{
-    	iconIndex = iconRegister.registerIcon("BiomesOPlenty:enderporter");
+    	itemIcon = iconRegister.registerIcon("BiomesOPlenty:enderporter");
 	}    
     
     public boolean hasEffect(ItemStack par1ItemStack)

src/minecraft/biomesoplenty/items/ItemMediumGrass.java

@@ -19,9 +19,9 @@ public class ItemMediumGrass extends Item
         this.spawnID = par2Block.blockID;
     }
 
-	public void updateIcons(IconRegister iconRegister)
+	public void registerIcons(IconRegister iconRegister)
 	{
-    	iconIndex = iconRegister.registerIcon("BiomesOPlenty:mediumgrass");
+    	itemIcon = iconRegister.registerIcon("BiomesOPlenty:mediumgrass");
 	}    
     
     /**

src/minecraft/biomesoplenty/items/ItemShortGrass.java

@@ -19,9 +19,9 @@ public class ItemShortGrass extends Item
         this.spawnID = par2Block.blockID;
     }
     
-	public void updateIcons(IconRegister iconRegister)
+	public void registerIcons(IconRegister iconRegister)
 	{
-    	iconIndex = iconRegister.registerIcon("BiomesOPlenty:shortgrass");
+    	itemIcon = iconRegister.registerIcon("BiomesOPlenty:shortgrass");
 	}
 	
     /**

src/minecraft/biomesoplenty/items/ItemShroomPowder.java

@@ -10,8 +10,8 @@ public class ItemShroomPowder extends ItemFood
 		super(par1, par2, par3, par4);
 	}
 	
-	public void updateIcons(IconRegister iconRegister)
+	public void registerIcons(IconRegister iconRegister)
 	{
-    	iconIndex = iconRegister.registerIcon("BiomesOPlenty:shroompowder");
+    	itemIcon = iconRegister.registerIcon("BiomesOPlenty:shroompowder");
 	}
 }

src/minecraft/biomesoplenty/items/ItemSprout.java

@@ -19,9 +19,9 @@ public class ItemSprout extends Item
         this.spawnID = par2Block.blockID;
     }
     
-	public void updateIcons(IconRegister iconRegister)
+	public void registerIcons(IconRegister iconRegister)
 	{
-    	iconIndex = iconRegister.registerIcon("BiomesOPlenty:sprout");
+    	itemIcon = iconRegister.registerIcon("BiomesOPlenty:sprout");
 	}
 	
     /**

src/minecraft/biomesoplenty/worldgen/WorldGenBambooTree.java

@@ -233,7 +233,7 @@ public class WorldGenBambooTree extends WorldGenerator
                                     if (par2Random.nextInt(4 - var11) == 0)
                                     {
                                         var13 = par2Random.nextInt(3);
-                                        this.setBlockAndMetadata(par1World, par3 + Direction.offsetX[Direction.footInvisibleFaceRemap[var12]], par4 + var6 - 5 + var11, par5 + Direction.offsetZ[Direction.footInvisibleFaceRemap[var12]], Block.cocoaPlant.blockID, var13 << 2 | var12);
+                                        this.setBlockAndMetadata(par1World, par3 + Direction.offsetX[Direction.rotateOpposite[var12]], par4 + var6 - 5 + var11, par5 + Direction.offsetZ[Direction.rotateOpposite[var12]], Block.cocoaPlant.blockID, var13 << 2 | var12);
                                     }
                                 }
                             }

src/minecraft/biomesoplenty/worldgen/WorldGenBambooTree2.java

@@ -233,7 +233,7 @@ public class WorldGenBambooTree2 extends WorldGenerator
                                     if (par2Random.nextInt(4 - var11) == 0)
                                     {
                                         var13 = par2Random.nextInt(3);
-                                        this.setBlockAndMetadata(par1World, X + Direction.offsetX[Direction.footInvisibleFaceRemap[var12]], Y + var6 - 5 + var11, Z + Direction.offsetZ[Direction.footInvisibleFaceRemap[var12]], Block.cocoaPlant.blockID, var13 << 2 | var12);
+                                        this.setBlockAndMetadata(par1World, X + Direction.offsetX[Direction.rotateOpposite[var12]], Y + var6 - 5 + var11, Z + Direction.offsetZ[Direction.rotateOpposite[var12]], Block.cocoaPlant.blockID, var13 << 2 | var12);
                                     }
                                 }
                             }

src/minecraft/biomesoplenty/worldgen/WorldGenDeciduous.java

@@ -231,7 +231,7 @@ public class WorldGenDeciduous extends WorldGenerator
                                     if (par2Random.nextInt(4 - var11) == 0)
                                     {
                                         var13 = par2Random.nextInt(3);
-                                        this.setBlockAndMetadata(par1World, par3 + Direction.offsetX[Direction.footInvisibleFaceRemap[var12]], par4 + var6 - 5 + var11, par5 + Direction.offsetZ[Direction.footInvisibleFaceRemap[var12]], Block.cocoaPlant.blockID, var13 << 2 | var12);
+                                        this.setBlockAndMetadata(par1World, par3 + Direction.offsetX[Direction.rotateOpposite[var12]], par4 + var6 - 5 + var11, par5 + Direction.offsetZ[Direction.rotateOpposite[var12]], Block.cocoaPlant.blockID, var13 << 2 | var12);
                                     }
                                 }
                             }

src/minecraft/biomesoplenty/worldgen/WorldGenHeath.java

@@ -199,7 +199,7 @@ public class WorldGenHeath extends WorldGenerator
                                     if (par2Random.nextInt(4 - var11) == 0)
                                     {
                                         var13 = par2Random.nextInt(3);
-                                        this.setBlockAndMetadata(par1World, par3 + Direction.offsetX[Direction.footInvisibleFaceRemap[var12]], par4 + var6 - 5 + var11, par5 + Direction.offsetZ[Direction.footInvisibleFaceRemap[var12]], Block.cocoaPlant.blockID, var13 << 2 | var12);
+                                        this.setBlockAndMetadata(par1World, par3 + Direction.offsetX[Direction.rotateOpposite[var12]], par4 + var6 - 5 + var11, par5 + Direction.offsetZ[Direction.rotateOpposite[var12]], Block.cocoaPlant.blockID, var13 << 2 | var12);
                                     }
                                 }
                             }

src/minecraft/biomesoplenty/worldgen/WorldGenMoss.java

@@ -23,7 +23,7 @@ public class WorldGenMoss extends WorldGenerator
                 {
                     if (BOPBlocks.moss.canPlaceBlockOnSide(par1World, par3, par4, par5, var8))
                     {
-                        par1World.setBlock(par3, par4, par5, BOPBlocks.moss.blockID, 1 << Direction.vineGrowth[Facing.faceToSide[var8]], 2);
+                        par1World.setBlock(par3, par4, par5, BOPBlocks.moss.blockID, 1 << Direction.facingToDirection[Facing.oppositeSide[var8]], 2);
                         break;
                     }
                 }

src/minecraft/biomesoplenty/worldgen/WorldGenRainforestTree1.java

@@ -211,7 +211,7 @@ public class WorldGenRainforestTree1 extends WorldGenerator
                                     if (par2Random.nextInt(4 - var11) == 0)
                                     {
                                         var13 = par2Random.nextInt(3);
-                                        this.setBlockAndMetadata(par1World, par3 + Direction.offsetX[Direction.footInvisibleFaceRemap[var12]], par4 + var6 - 5 + var11, par5 + Direction.offsetZ[Direction.footInvisibleFaceRemap[var12]], Block.cocoaPlant.blockID, var13 << 2 | var12);
+                                        this.setBlockAndMetadata(par1World, par3 + Direction.offsetX[Direction.rotateOpposite[var12]], par4 + var6 - 5 + var11, par5 + Direction.offsetZ[Direction.rotateOpposite[var12]], Block.cocoaPlant.blockID, var13 << 2 | var12);
                                     }
                                 }
                             }

src/minecraft/biomesoplenty/worldgen/WorldGenRedwoodTree.java

@@ -332,7 +332,7 @@ public class WorldGenRedwoodTree extends WorldGenerator
                                     if (par2Random.nextInt(4 - var11) == 0)
                                     {
                                         var13 = par2Random.nextInt(3);
-                                        this.setBlockAndMetadata(par1World, par3 + Direction.offsetX[Direction.footInvisibleFaceRemap[var12]], par4 + var6 - 5 + var11, par5 + Direction.offsetZ[Direction.footInvisibleFaceRemap[var12]], Block.cocoaPlant.blockID, var13 << 2 | var12);
+                                        this.setBlockAndMetadata(par1World, par3 + Direction.offsetX[Direction.rotateOpposite[var12]], par4 + var6 - 5 + var11, par5 + Direction.offsetZ[Direction.rotateOpposite[var12]], Block.cocoaPlant.blockID, var13 << 2 | var12);
                                     }
                                 }
                             }

src/minecraft/biomesoplenty/worldgen/WorldGenRedwoodTree2.java

@@ -277,7 +277,7 @@ public class WorldGenRedwoodTree2 extends WorldGenerator
                                     if (par2Random.nextInt(4 - var11) == 0)
                                     {
                                         var13 = par2Random.nextInt(3);
-                                        this.setBlockAndMetadata(par1World, par3 + Direction.offsetX[Direction.footInvisibleFaceRemap[var12]], par4 + var6 - 5 + var11, par5 + Direction.offsetZ[Direction.footInvisibleFaceRemap[var12]], Block.cocoaPlant.blockID, var13 << 2 | var12);
+                                        this.setBlockAndMetadata(par1World, par3 + Direction.offsetX[Direction.rotateOpposite[var12]], par4 + var6 - 5 + var11, par5 + Direction.offsetZ[Direction.rotateOpposite[var12]], Block.cocoaPlant.blockID, var13 << 2 | var12);
                                     }
                                 }
                             }