Fixed the blocks, hopefully there are no crashes anymore :)

src/minecraft/biomesoplenty/blocks/BlockAcaciaLog.java

@@ -33,7 +33,8 @@ public class BlockAcaciaLog extends Block
 		this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:acacialog");
 	}   
 	
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+	@Override
+    public Icon getIcon(int par1, int par2)
     {
     	int pos = par2 & 12;
         if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))

src/minecraft/biomesoplenty/blocks/BlockAcaciaSapling.java

@@ -34,7 +34,8 @@ public class BlockAcaciaSapling extends BlockSapling
 		this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:acaciasapling");
 	}
     
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+	@Override
+    public Icon getIcon(int par1, int par2)
     {
         return this.blockIcon[0];
     }

src/minecraft/biomesoplenty/blocks/BlockAppleLeaves.java

@@ -47,8 +47,9 @@ public class BlockAppleLeaves extends BlockLeavesBase implements IShearable
 		this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:appleleaves2");
 	}
     
+	@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/BlockAppleLeavesFruitless.java

@@ -46,9 +46,10 @@ public class BlockAppleLeavesFruitless extends BlockLeavesBase implements IShear
 		this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:appleleaves3");
 		this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:appleleaves4");
 	}
-    
+	
+    @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/BlockAppleSapling.java

@@ -33,7 +33,8 @@ public class BlockAppleSapling extends BlockSapling
 		this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:applesapling");
 	}
     
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+	@Override
+    public Icon getIcon(int par1, int par2)
     {
         return this.blockIcon[0];
     }

src/minecraft/biomesoplenty/blocks/BlockAutumnLeaves.java

@@ -47,8 +47,9 @@ public class BlockAutumnLeaves extends BlockLeavesBase implements IShearable
 		this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:autumnleaves2");
 	}
     
+	@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/BlockBambooLeaves.java

@@ -47,8 +47,9 @@ public class BlockBambooLeaves extends BlockLeavesBase implements IShearable
 		this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:bambooleaves2");
 	}
     
+	@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/BlockBambooSapling.java

@@ -36,7 +36,8 @@ public class BlockBambooSapling extends BlockSapling
 		this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:bamboosapling");
 	}
     
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+	@Override
+    public Icon getIcon(int par1, int par2)
     {
         return this.blockIcon[0];
     }

src/minecraft/biomesoplenty/blocks/BlockBlueLeaves.java

@@ -47,8 +47,9 @@ public class BlockBlueLeaves extends BlockLeavesBase implements IShearable
 		this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:blueleaves2");
 	}
     
+	@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/BlockBrownSapling.java

@@ -34,7 +34,8 @@ public class BlockBrownSapling extends BlockSapling
 		this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:brownsapling");
 	}    
     
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+	@Override
+    public Icon getIcon(int par1, int par2)
     {
         return this.blockIcon[0];
     }

src/minecraft/biomesoplenty/blocks/BlockCherryLog.java

@@ -33,7 +33,8 @@ public class BlockCherryLog extends Block
 		this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:cherrylog");
 	}
 	
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+	@Override
+    public Icon getIcon(int par1, int par2)
     {
     	int pos = par2 & 12;
         if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))

src/minecraft/biomesoplenty/blocks/BlockDarkLeaves.java

@@ -47,8 +47,9 @@ public class BlockDarkLeaves extends BlockLeavesBase implements IShearable
 		this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:darkleaves2");
 	}
     
+	@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/BlockDarkLog.java

@@ -33,7 +33,8 @@ public class BlockDarkLog extends Block
 		this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:darklog");
 	}
 	
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+	@Override
+    public Icon getIcon(int par1, int par2)
     {
     	int pos = par2 & 12;
         if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))

src/minecraft/biomesoplenty/blocks/BlockDarkSapling.java

@@ -35,7 +35,8 @@ public class BlockDarkSapling extends BlockSapling
 		this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:darksapling");
 	}
     
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+	@Override
+    public Icon getIcon(int par1, int par2)
     {
         return this.blockIcon[0];
     }

src/minecraft/biomesoplenty/blocks/BlockDeadLeaves.java

@@ -47,8 +47,9 @@ public class BlockDeadLeaves extends BlockLeavesBase implements IShearable
 		this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:deadleaves2");
 	}
     
+	@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/BlockDeadLog.java

@@ -33,7 +33,8 @@ public class BlockDeadLog extends Block
 		this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:deadlog");
 	}
 	
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+	@Override
+    public Icon getIcon(int par1, int par2)
     {
     	int pos = par2 & 12;
         if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))

src/minecraft/biomesoplenty/blocks/BlockFirLeaves.java

@@ -47,8 +47,9 @@ public class BlockFirLeaves extends BlockLeavesBase implements IShearable
 		this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:firleaves2");
 	}
     
+	@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/BlockFirLog.java

@@ -33,7 +33,8 @@ public class BlockFirLog extends Block
 		this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:firlog");
 	}
 	
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+	@Override
+    public Icon getIcon(int par1, int par2)
     {
     	int pos = par2 & 12;
         if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))

src/minecraft/biomesoplenty/blocks/BlockFirSapling.java

@@ -34,7 +34,8 @@ public class BlockFirSapling extends BlockSapling
 		this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:firsapling");
 	}
     
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+    @Override
+    public Icon getIcon(int par1, int par2)
     {
         return this.blockIcon[0];
     }

src/minecraft/biomesoplenty/blocks/BlockGiantFlowerStem.java

@@ -32,7 +32,8 @@ public class BlockGiantFlowerStem extends Block
 		this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:bigflowerstem");
 	}    
 	
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+	@Override
+    public Icon getIcon(int par1, int par2)
     {
     	if(par1 == 0 || par1 == 1)
     	{

src/minecraft/biomesoplenty/blocks/BlockHolyGrass.java

@@ -42,7 +42,8 @@ public class BlockHolyGrass extends Block
     /**
      * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata
      */
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+	@Override
+    public Icon getIcon(int par1, int par2)
     {
         return blockIcon[par1];
     }

src/minecraft/biomesoplenty/blocks/BlockHolyLeaves.java

@@ -47,8 +47,9 @@ public class BlockHolyLeaves extends BlockLeavesBase implements IShearable
 		this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:holyleaves2");
 	}
     
+	@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/BlockHolyLog.java

@@ -33,7 +33,8 @@ public class BlockHolyLog extends Block
 		this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:holylog");
 	}
 	
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+	@Override
+    public Icon getIcon(int par1, int par2)
     {
     	int pos = par2 & 12;
         if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))

src/minecraft/biomesoplenty/blocks/BlockHolySapling.java

@@ -36,7 +36,8 @@ public class BlockHolySapling extends BlockSapling
 		this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:holysapling");
 	}
     
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+	@Override
+    public Icon getIcon(int par1, int par2)
     {
         return this.blockIcon[0];
 	}

src/minecraft/biomesoplenty/blocks/BlockMagicLog.java

@@ -32,7 +32,8 @@ public class BlockMagicLog extends Block
 		this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:magiclog");
 	}
 	
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+	@Override
+    public Icon getIcon(int par1, int par2)
     {
     	int pos = par2 & 12;
         if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))

src/minecraft/biomesoplenty/blocks/BlockMagicSapling.java

@@ -36,7 +36,8 @@ public class BlockMagicSapling extends BlockSapling
 		this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:magicsapling");
 	}
     
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+	@Override
+    public Icon getIcon(int par1, int par2)
     {
         return this.blockIcon[0];
     }

src/minecraft/biomesoplenty/blocks/BlockMangroveLeaves.java

@@ -48,8 +48,9 @@ public class BlockMangroveLeaves extends BlockLeavesBase implements IShearable
 		this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:mangroveleaves2");
 	}
     
+	@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/BlockMangroveLog.java

@@ -33,7 +33,8 @@ public class BlockMangroveLog extends Block
 		this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:mangrovelog");
 	}
 	
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+	@Override
+    public Icon getIcon(int par1, int par2)
     {
     	int pos = par2 & 12;
         if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))

src/minecraft/biomesoplenty/blocks/BlockMangroveSapling.java

@@ -35,7 +35,8 @@ public class BlockMangroveSapling extends BlockSapling
 		this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:mangrovesapling");
 	}
     
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+	@Override
+    public Icon getIcon(int par1, int par2)
     {
         return this.blockIcon[0];
     }

src/minecraft/biomesoplenty/blocks/BlockOrangeLeaves.java

@@ -48,8 +48,9 @@ public class BlockOrangeLeaves extends BlockLeavesBase implements IShearable
 		this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:orangeleaves2");
 	}
     
+	@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/BlockOrangeSapling.java

@@ -34,7 +34,8 @@ public class BlockOrangeSapling extends BlockSapling
 		this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:orangesapling");
 	}
     
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+	@Override
+    public Icon getIcon(int par1, int par2)
     {
         return this.blockIcon[0];
     }

src/minecraft/biomesoplenty/blocks/BlockOriginGrass.java

@@ -39,7 +39,8 @@ public class BlockOriginGrass extends Block
     /**
      * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata
      */
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+	@Override
+    public Icon getIcon(int par1, int par2)
     {
         return blockIcon[par1];
     }

src/minecraft/biomesoplenty/blocks/BlockOriginLeaves.java

@@ -47,8 +47,9 @@ public class BlockOriginLeaves extends BlockLeavesBase implements IShearable
 		this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:originleaves2");
 	}
     
+	@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/BlockOriginSapling.java

@@ -36,7 +36,8 @@ public class BlockOriginSapling extends BlockSapling
 		this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:originsapling");
 	}
     
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+	@Override
+    public Icon getIcon(int par1, int par2)
     {
         return this.blockIcon[0];
     }

src/minecraft/biomesoplenty/blocks/BlockPalmLeaves.java

@@ -48,8 +48,9 @@ public class BlockPalmLeaves extends BlockLeavesBase implements IShearable
 		this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:palmleaves2");
 	}
     
+	@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/BlockPalmLog.java

@@ -33,7 +33,8 @@ public class BlockPalmLog extends Block
 		this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:palmlog");
 	}
 	
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+	@Override
+    public Icon getIcon(int par1, int par2)
     {
     	int pos = par2 & 12;
         if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))

src/minecraft/biomesoplenty/blocks/BlockPalmSapling.java

@@ -35,7 +35,8 @@ public class BlockPalmSapling extends BlockSapling
 		this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:palmsapling");
 	}
     
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+	@Override
+    public Icon getIcon(int par1, int par2)
     {
         return this.blockIcon[0];
     }

src/minecraft/biomesoplenty/blocks/BlockPinkLeaves.java

@@ -47,8 +47,9 @@ public class BlockPinkLeaves extends BlockLeavesBase implements IShearable
 		this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:pinkleaves2");
 	}
     
+	@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/BlockPinkSapling.java

@@ -34,7 +34,8 @@ public class BlockPinkSapling extends BlockSapling
 		this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:pinksapling");
 	}
     
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+	@Override
+    public Icon getIcon(int par1, int par2)
     {
         return this.blockIcon[0];
     }

src/minecraft/biomesoplenty/blocks/BlockRedLeaves.java

@@ -47,8 +47,9 @@ public class BlockRedLeaves extends BlockLeavesBase implements IShearable
 		this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:redleaves2");
 	}
     
+	@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/BlockRedSapling.java

@@ -34,7 +34,8 @@ public class BlockRedSapling extends BlockSapling
 		this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:redsapling");
 	}
     
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+	@Override
+    public Icon getIcon(int par1, int par2)
     {
         return this.blockIcon[0];
     }

src/minecraft/biomesoplenty/blocks/BlockRedwoodLeaves.java

@@ -48,8 +48,9 @@ public class BlockRedwoodLeaves extends BlockLeavesBase implements IShearable
 		this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:redwoodleaves2");
 	}
     
+	@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/BlockRedwoodLog.java

@@ -33,7 +33,8 @@ public class BlockRedwoodLog extends Block
 		this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:redwoodlog");
 	}
 	
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+	@Override
+    public Icon getIcon(int par1, int par2)
     {
     	int pos = par2 & 12;
         if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))

src/minecraft/biomesoplenty/blocks/BlockRedwoodSapling.java

@@ -34,7 +34,8 @@ public class BlockRedwoodSapling extends BlockSapling
 		this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:redwoodsapling");
 	}
     
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+	@Override
+    public Icon getIcon(int par1, int par2)
     {
         return this.blockIcon[0];
     }

src/minecraft/biomesoplenty/blocks/BlockSmolderingGrass.java

@@ -34,7 +34,8 @@ public class BlockSmolderingGrass extends Block
 		this.blockIcon[5] = par1IconRegister.registerIcon("BiomesOPlenty:smolderinggrass2");
 	}
 	
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+	@Override
+    public Icon getIcon(int par1, int par2)
     {
         return blockIcon[par1];
     }

src/minecraft/biomesoplenty/blocks/BlockWhiteLeaves.java

@@ -47,8 +47,9 @@ public class BlockWhiteLeaves extends BlockLeavesBase implements IShearable
 		this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:whiteleaves2");
 	}
     
+	@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/BlockWhiteSapling.java

@@ -34,7 +34,8 @@ public class BlockWhiteSapling extends BlockSapling
 		this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:whitesapling");
 	}
     
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+	@Override
+    public Icon getIcon(int par1, int par2)
     {
         return this.blockIcon[0];
     }

src/minecraft/biomesoplenty/blocks/BlockWillowLeaves.java

@@ -48,8 +48,9 @@ public class BlockWillowLeaves extends BlockLeavesBase implements IShearable
 		this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:willowleaves4");
 	}
     
+	@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/BlockWillowLog.java

@@ -33,7 +33,8 @@ public class BlockWillowLog extends Block
 		this.blockIcon[1] = par1IconRegister.registerIcon("BiomesOPlenty:willowlog");
 	}
 	
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+	@Override
+    public Icon getIcon(int par1, int par2)
     {
     	int pos = par2 & 12;
         if (pos == 0 && (par1 == 1 || par1 == 0) || pos == 4 && (par1 == 5 || par1 == 4) || pos == 8 && (par1 == 2 || par1 == 3))

src/minecraft/biomesoplenty/blocks/BlockWillowSapling.java

@@ -34,7 +34,8 @@ public class BlockWillowSapling extends BlockSapling
 		this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:willowsapling");
 	}
     
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+	@Override
+    public Icon getIcon(int par1, int par2)
     {
         return this.blockIcon[0];
     }

src/minecraft/biomesoplenty/blocks/BlockYellowSapling.java

@@ -34,7 +34,8 @@ public class BlockYellowSapling extends BlockSapling
 		this.blockIcon[0] = par1IconRegister.registerIcon("BiomesOPlenty:yellowsapling");
 	}
     
-    public Icon getBlockTextureFromSideAndMetadata(int par1, int par2)
+	@Override
+    public Icon getIcon(int par1, int par2)
     {
         return this.blockIcon[0];
     }