updating to 1.5.1 (1/2)

src/minecraft/tdwp_ftw/biomesop/armor/ArmorAmethyst.java

@@ -1,5 +1,6 @@
 package tdwp_ftw.biomesop.armor;
 
+import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.item.EnumArmorMaterial;
 import net.minecraft.item.ItemArmor;
 import net.minecraft.item.ItemStack;
@@ -9,8 +10,11 @@ import tdwp_ftw.biomesop.CommonProxy;
 
 public class ArmorAmethyst extends ItemArmor implements IArmorTextureProvider
 {
+	public int textureID = 0;
+	
 	public ArmorAmethyst(int par1, EnumArmorMaterial par2EnumArmorMaterial, int par3, int par4) {
 		super(par1, par2EnumArmorMaterial, par3, par4);
+		textureID = par4;
 	}
 	
 	public String getArmorTextureFile(ItemStack par1) {
@@ -22,4 +26,13 @@ public class ArmorAmethyst extends ItemArmor implements IArmorTextureProvider
 		}
 		return null;
 	}
+	
+	public void updateIcons(IconRegister iconRegister)
+	{
+    	if(textureID==0){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:amethysthelmet"); }
+    	else if(textureID==1){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:amethystchestplate"); }
+    	else if(textureID==2){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:amethystleggings"); }
+    	else if(textureID==3){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:amethystboots"); }
+    	else { iconIndex = iconRegister.registerIcon("BiomesOPlenty:mudball"); }
+	}
 }

src/minecraft/tdwp_ftw/biomesop/armor/ArmorMuddy.java

@@ -1,5 +1,6 @@
 package tdwp_ftw.biomesop.armor;
 
+import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.item.EnumArmorMaterial;
 import net.minecraft.item.ItemArmor;
 import net.minecraft.item.ItemStack;
@@ -9,8 +10,11 @@ import tdwp_ftw.biomesop.CommonProxy;
 
 public class ArmorMuddy extends ItemArmor implements IArmorTextureProvider
 {
+	public int textureID = 0;
+	
 	public ArmorMuddy(int par1, EnumArmorMaterial par2EnumArmorMaterial, int par3, int par4) {
 		super(par1, par2EnumArmorMaterial, par3, par4);
+		textureID = par4;
 	}
 	
 	public String getArmorTextureFile(ItemStack par1) {
@@ -22,4 +26,13 @@ public class ArmorMuddy extends ItemArmor implements IArmorTextureProvider
 		}
 		return null;
 	}
+
+	public void updateIcons(IconRegister iconRegister)
+	{
+    	if(textureID==0){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:mudhelmet"); }
+    	else if(textureID==1){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:mudchestplate"); }
+    	else if(textureID==2){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:mudleggings"); }
+    	else if(textureID==3){ iconIndex = iconRegister.registerIcon("BiomesOPlenty:mudboots"); }
+    	else { iconIndex = iconRegister.registerIcon("BiomesOPlenty:mudball"); }
+	}
 }

src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenBambooForest.java

@@ -58,7 +58,7 @@ public class BiomeGenBambooForest extends BiomeGenBase
 
             if (var10 == Block.stone.blockID)
             {
-                par1World.setBlockAndMetadataWithNotify(var7, var8, var9, Block.oreEmerald.blockID, 0, 2);
+                par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2);
             }
         }
     }

src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenBirchForest.java

@@ -57,7 +57,7 @@ public class BiomeGenBirchForest extends BiomeGenBase
 
             if (var10 == Block.stone.blockID)
             {
-                par1World.setBlockAndMetadataWithNotify(var7, var8, var9, Block.oreEmerald.blockID, 0, 2);
+                par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2);
             }
         }
     }

src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenChaparral.java

@@ -60,7 +60,7 @@ public class BiomeGenChaparral extends BiomeGenBase
 
             if (var10 == Block.stone.blockID)
             {
-                par1World.setBlockAndMetadataWithNotify(var7, var8, var9, Block.oreEmerald.blockID, 0, 2);
+                par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2);
             }
         }
     }

src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenConiferousForest.java

@@ -63,7 +63,7 @@ public class BiomeGenConiferousForest extends BiomeGenBase
 
             if (var10 == Block.stone.blockID)
             {
-                par1World.setBlockAndMetadataWithNotify(var7, var8, var9, Block.oreEmerald.blockID, 0, 2);
+                par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2);
             }
         }
     }

src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenGarden.java

@@ -67,7 +67,7 @@ public class BiomeGenGarden extends BiomeGenBase
 
             if (var10 == Block.stone.blockID)
             {
-                par1World.setBlockAndMetadataWithNotify(var7, var8, var9, Block.oreEmerald.blockID, 0, 2);
+                par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2);
             }
         }
     }

src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenGrassland.java

@@ -61,7 +61,7 @@ public class BiomeGenGrassland extends BiomeGenBase
 
             if (var10 == Block.stone.blockID)
             {
-                par1World.setBlockAndMetadataWithNotify(var7, var8, var9, Block.oreEmerald.blockID, 0, 2);
+                par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2);
             }
         }
     }

src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenHillsNew.java

@@ -39,7 +39,7 @@ public class BiomeGenHillsNew extends BiomeGenBase
 
             if (var10 == Block.stone.blockID)
             {
-                par1World.setBlockAndMetadataWithNotify(var7, var8, var9, Block.oreEmerald.blockID, 0, 2);
+                par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2);
             }
         }
 

src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenJadeCliffs.java

@@ -48,7 +48,7 @@ public class BiomeGenJadeCliffs extends BiomeGenBase
 
             if (var10 == Block.stone.blockID)
             {
-                par1World.setBlockAndMetadataWithNotify(var7, var8, var9, Block.oreEmerald.blockID, 0, 2);
+                par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2);
             }
         }
     }

src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenLushSwamp.java

@@ -51,7 +51,7 @@ public class BiomeGenLushSwamp extends BiomeGenBase
 
             if (var10 == Block.stone.blockID)
             {
-                par1World.setBlockAndMetadataWithNotify(var7, var8, var9, Block.oreEmerald.blockID, 0, 2);
+                par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2);
             }
         }
     }

src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenMeadow.java

@@ -51,7 +51,7 @@ public class BiomeGenMeadow extends BiomeGenBase
 
             if (var10 == Block.stone.blockID)
             {
-                par1World.setBlockAndMetadataWithNotify(var7, var8, var9, Block.oreEmerald.blockID, 0, 2);
+                par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2);
             }
         }
     }

src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenPromisedLand.java

@@ -73,7 +73,7 @@ public class BiomeGenPromisedLand extends BiomeGenBase
 
             if (var10 == Block.stone.blockID)
             {
-                par1World.setBlockAndMetadataWithNotify(var7, var8, var9, mod_BiomesOPlenty.amethystOre.blockID, 0, 2);
+                par1World.setBlock(var7, var8, var9, mod_BiomesOPlenty.amethystOre.blockID, 0, 2);
             }
         }
 

src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenSacredSprings.java

@@ -52,7 +52,7 @@ public class BiomeGenSacredSprings extends BiomeGenBase
 
             if (var10 == Block.stone.blockID || var10 == Block.dirt.blockID)
             {
-                par1World.setBlockAndMetadataWithNotify(var7, var8, var9, Block.waterMoving.blockID, 0, 2);
+                par1World.setBlock(var7, var8, var9, Block.waterMoving.blockID, 0, 2);
             }
         }
     }

src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenThicket.java

@@ -36,7 +36,7 @@ public class BiomeGenThicket extends BiomeGenBase
 
             if (var10 == Block.stone.blockID)
             {
-                par1World.setBlockAndMetadataWithNotify(var7, var8, var9, Block.oreEmerald.blockID, 0, 2);
+                par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2);
             }
         }
     }

src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenTropicalRainforest.java

@@ -61,7 +61,7 @@ public class BiomeGenTropicalRainforest extends BiomeGenBase
 
             if (var10 == Block.stone.blockID)
             {
-                par1World.setBlockAndMetadataWithNotify(var7, var8, var9, Block.oreEmerald.blockID, 0, 2);
+                par1World.setBlock(var7, var8, var9, Block.oreEmerald.blockID, 0, 2);
             }
         }
     }

src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaLeaves.java

@@ -233,7 +233,7 @@ public class BlockAcaciaLeaves extends BlockLeavesBase
     private void removeLeaves(World par1World, int par2, int par3, int par4)
     {
         this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0);
-        par1World.setBlockAndMetadataWithNotify(par2, par3, par4, this.blockID, 0, 2);
+        par1World.setBlock(par2, par3, par4, this.blockID, 0, 2);
     }
 
     /**
@@ -304,16 +304,10 @@ public class BlockAcaciaLeaves extends BlockLeavesBase
 			return Block.leaves.isOpaqueCube();
 	}
 	
-	//@Override
-	//public int getBlockTextureFromSideAndMetadata(int side, int metadata) {
-	
-			//return blockIndexInTexture + (isOpaqueCube() ? 1 : 0);
-	//}
-	
 	@Override
-	public void func_94332_a(IconRegister par1IconRegister)
+	public void registerIcons(IconRegister par1IconRegister)
 	{
-			this.field_94336_cN = (isOpaqueCube() ? par1IconRegister.func_94245_a("BiomesOPlenty:acaciaLeavesOpaque") : par1IconRegister.func_94245_a("BiomesOPlenty:acaciaLeaves"));
+		this.blockIcon = (isOpaqueCube() ? par1IconRegister.registerIcon("BiomesOPlenty:acacialeaves2") : par1IconRegister.registerIcon("BiomesOPlenty:acacialeaves1"));
 	}
 	
     public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)

src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaLog.java

@@ -6,11 +6,17 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
+//==============================================================
+//==============================================================
+//==============================================================
+//==============================================================
+
 public class BlockAcaciaLog extends Block
 {
     /** The type of tree this log came from. */
@@ -19,10 +25,15 @@ public class BlockAcaciaLog extends Block
     public BlockAcaciaLog(int par1)
     {
         super(par1, Material.wood);
-        this.blockIndexInTexture = 44;
 		this.setBurnProperties(this.blockID, 5, 5);
         this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty);
     }
+    
+	@Override
+	public void registerIcons(IconRegister par1IconRegister)
+	{
+		this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:acacialog");
+	}
 
     /**
      * The type of render function that is called for this block
@@ -72,7 +83,7 @@ public class BlockAcaciaLog extends Block
 
                             if ((var13 & 8) == 0)
                             {
-                                par1World.setBlockMetadata(par2 + var9, par3 + var10, par4 + var11, var13 | 8);
+                                par1World.setBlock(par2 + var9, par3 + var10, par4 + var11, var13 | 8);
                             }
                         }
                     }
@@ -109,12 +120,12 @@ public class BlockAcaciaLog extends Block
     /**
      * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata
      */
-    public int getBlockTextureFromSideAndMetadata(int par1, int par2)
+    /*public int getBlockTextureFromSideAndMetadata(int par1, int par2)
     {
         int var3 = par2 & 12;
         int var4 = par2 & 3;
         return var3 == 0 && (par1 == 1 || par1 == 0) ? 255 : (var3 == 4 && (par1 == 5 || par1 == 4) ? 255 : (var3 == 8 && (par1 == 2 || par1 == 3) ? 255 : (var4 == 1 ? 116 : (var4 == 2 ? 117 : (var4 == 3 ? 153 : 44)))));
-    }
+    }*/
 
     /**
      * Determines the damage on the item the block drops. Used in cloth and wood.

src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaPlank.java

@@ -4,24 +4,27 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.world.IBlockAccess;
 
 public class BlockAcaciaPlank extends Block
 {
-    /** The type of tree this block came from. */
     public static final String[] woodType = new String[] {"acacia"};
 
     public BlockAcaciaPlank(int par1)
     {
-        super(par1, 45, Material.wood);
+        super(par1, Material.wood); 
 		this.setBurnProperties(this.blockID, 5, 20);
         this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty);
     }
 
-    /**
-     * Determines the damage on the item the block drops. Used in cloth and wood.
-     */
+	@Override
+	public void registerIcons(IconRegister par1IconRegister)
+	{
+		this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:acaciaplank");
+	}
+	
     public int damageDropped(int par1)
     {
         return par1;

src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaSapling.java

@@ -9,6 +9,7 @@ import tdwp_ftw.biomesop.helpers.CreativeTabsBOP;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockSapling;
 import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
@@ -19,18 +20,29 @@ import net.minecraft.world.gen.feature.WorldGenerator;
 import tdwp_ftw.biomesop.worldgen.WorldGenAcacia;
 import net.minecraft.util.AxisAlignedBB;
 
+//==============================================================
+//==============================================================
+//==============================================================
+//==============================================================
+
 public class BlockAcaciaSapling extends BlockSapling
 {
     public static final String[] WOOD_TYPES = new String[] {"acacia"};
 
     public BlockAcaciaSapling(int par1, int par2)
     {
-        super(par1, par2);
+        super(par1);
         float var3 = 0.4F;
 		this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty);
         this.setBlockBounds(0.5F - var3, 0.0F, 0.5F - var3, 0.5F + var3, var3 * 2.0F, 0.5F + var3);
     }
 
+	@Override
+	public void registerIcons(IconRegister par1IconRegister)
+	{
+		this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:acaciasapling");
+	}
+    
     /**
      * Ticks the block if it's been scheduled
      */
@@ -46,7 +58,7 @@ public class BlockAcaciaSapling extends BlockSapling
 
                 if ((var6 & 8) == 0)
                 {
-                    par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 | 8);
+                    par1World.setBlock(par2, par3, par4, var6 | 8);
                 }
                 else
                 {
@@ -59,11 +71,11 @@ public class BlockAcaciaSapling extends BlockSapling
     /**
      * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata
      */
-    public int getBlockTextureFromSideAndMetadata(int par1, int par2)
+    /*public int getBlockTextureFromSideAndMetadata(int par1, int par2)
     {
         par2 &= 3;
         return par2 == 1 ? 63 : (par2 == 2 ? 79 : (par2 == 3 ? 30 : super.getBlockTextureFromSideAndMetadata(par1, par2)));
-    }
+    }*/
 
     /**
      * Attempts to grow a sapling into a tree
@@ -116,14 +128,14 @@ public class BlockAcaciaSapling extends BlockSapling
         {
             if (var10)
             {
-                par1World.setBlockAndMetadata(par2 + var8, par3, par4 + var9, this.blockID, var6);
-                par1World.setBlockAndMetadata(par2 + var8 + 1, par3, par4 + var9, this.blockID, var6);
-                par1World.setBlockAndMetadata(par2 + var8, par3, par4 + var9 + 1, this.blockID, var6);
-                par1World.setBlockAndMetadata(par2 + var8 + 1, par3, par4 + var9 + 1, this.blockID, var6);
+                par1World.setBlock(par2 + var8, par3, par4 + var9, this.blockID, var6, 2);
+                par1World.setBlock(par2 + var8 + 1, par3, par4 + var9, this.blockID, var6, 2);
+                par1World.setBlock(par2 + var8, par3, par4 + var9 + 1, this.blockID, var6, 2);
+                par1World.setBlock(par2 + var8 + 1, par3, par4 + var9 + 1, this.blockID, var6, 2);
             }
             else
             {
-                par1World.setBlockAndMetadata(par2, par3, par4, this.blockID, var6);
+                par1World.setBlock(par2, par3, par4, this.blockID, var6, 2);
             }
         }
     }

src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaSlab.java

@@ -8,11 +8,17 @@ import tdwp_ftw.biomesop.helpers.CreativeTabsBOP;
 
 import net.minecraft.block.BlockHalfSlab;
 import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
+//==============================================================
+//==============================================================
+//==============================================================
+//==============================================================
+
 public class BlockAcaciaSlab extends BlockHalfSlab
 {
     /** The type of tree this slab came from. */
@@ -26,10 +32,16 @@ public class BlockAcaciaSlab extends BlockHalfSlab
 		this.useNeighborBrightness[blockID] = true;
     }
 
+	@Override
+	public void registerIcons(IconRegister par1IconRegister)
+	{
+		this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:acaciaplank");
+	}
+    
     /**
      * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata
      */
-    public int getBlockTextureFromSideAndMetadata(int par1, int par2)
+    /*public int getBlockTextureFromSideAndMetadata(int par1, int par2)
     {
         switch (par2 & 7)
         {
@@ -45,15 +57,15 @@ public class BlockAcaciaSlab extends BlockHalfSlab
             default:
                 return 45;
         }
-    }
+    }*/
 
     /**
      * Returns the block texture based on the side being looked at.  Args: side
      */
-    public int getBlockTextureFromSide(int par1)
+    /*public int getBlockTextureFromSide(int par1)
     {
         return this.getBlockTextureFromSideAndMetadata(par1, 0);
-    }
+    }*/
 
     /**
      * Returns the ID of the items to drop on destruction.
@@ -82,7 +94,7 @@ public class BlockAcaciaSlab extends BlockHalfSlab
             par1 = 0;
         }
 
-        return super.getBlockName() + "." + woodType[par1];
+        return super.getUnlocalizedName2() + "." + woodType[par1];
     }
 	
     /**

src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaStairs.java

@@ -4,21 +4,31 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockStairs;
+import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.world.IBlockAccess;
 
+//==============================================================
+//==============================================================
+//==============================================================
+//==============================================================
+
 public class BlockAcaciaStairs extends BlockStairs
 {
-    /** The block that is used as model for the stair. */
     private final Block modelBlock;
 
-    public BlockAcaciaStairs(int par1, Block par2Block, int par3)
+    public BlockAcaciaStairs(int par1, Block par2Block)
     {
-        super(par1, par2Block, par3);
-        blockIndexInTexture = par3;
+        super(par1, par2Block, 0);
         this.modelBlock = par2Block;
 		this.setBurnProperties(this.blockID, 5, 20);
         this.setLightOpacity(0);
         this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty);
     }
+
+	@Override
+	public void registerIcons(IconRegister par1IconRegister)
+	{
+		this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:acaciaplank");
+	}
 }

src/minecraft/tdwp_ftw/biomesop/blocks/BlockAlgae.java

@@ -12,6 +12,7 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import java.util.List;
 import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.EntityBoat;
@@ -21,9 +22,9 @@ import net.minecraft.world.World;
 
 public class BlockAlgae extends BlockFlower
 {
-    public BlockAlgae(int par1, int par2)
+    public BlockAlgae(int par1)
     {
-        super(par1, par2);
+        super(par1);
         float var3 = 0.5F;
         float var4 = 0.015625F;
         this.setBlockBounds(0.5F - var3, 0.0F, 0.5F - var3, 0.5F + var3, var4, 0.5F + var3);
@@ -36,6 +37,12 @@ public class BlockAlgae extends BlockFlower
     {
         return 23;
     }
+    
+	@Override
+	public void registerIcons(IconRegister par1IconRegister)
+	{
+		this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:algae");
+	}
 
     public int getBlockColor()
     {

src/minecraft/tdwp_ftw/biomesop/blocks/BlockAmethystBlock.java

@@ -6,14 +6,15 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.world.IBlockAccess;
 
 public class BlockAmethystBlock extends Block
 {
-    public BlockAmethystBlock(int par1, int par2)
+    public BlockAmethystBlock(int par1)
     {
-        super(par1, par2, Material.iron);
+        super(par1, Material.iron);
         this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty);
     }
 	
@@ -32,4 +33,10 @@ public class BlockAmethystBlock extends Block
     {
         return 1;
     }
+    
+	@Override
+	public void registerIcons(IconRegister par1IconRegister)
+	{
+		this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:amethystblock");
+	}
 }

src/minecraft/tdwp_ftw/biomesop/blocks/BlockAmethystOre.java

@@ -5,6 +5,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty;
 import net.minecraft.block.Block;
 import java.util.Random;
 import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.util.MathHelper;
@@ -12,12 +13,18 @@ import net.minecraft.world.World;
 
 public class BlockAmethystOre extends Block
 {
-    public BlockAmethystOre(int par1, int par2)
+    public BlockAmethystOre(int par1)
     {
-        super(par1, par2, Material.rock);
+        super(par1, Material.rock);
         this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty);
     }
 
+    @Override
+	public void registerIcons(IconRegister par1IconRegister)
+	{
+		this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:amethystore");
+	}
+    
     /**
      * Returns the ID of the items to drop on destruction.
      */

src/minecraft/tdwp_ftw/biomesop/blocks/BlockAppleLeaves.java

@@ -33,6 +33,12 @@ public class BlockAppleLeaves extends BlockLeavesBase
 		this.setBurnProperties(this.blockID, 30, 60);
         this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty);
     }
+    
+	@Override
+	public void registerIcons(IconRegister par1IconRegister)
+	{
+		this.blockIcon = (isOpaqueCube() ? par1IconRegister.registerIcon("BiomesOPlenty:appleleaves2") : par1IconRegister.registerIcon("BiomesOPlenty:appleleaves1"));
+	}
 
     /**
      * ejects contained items into the world, and notifies neighbours of an update, as appropriate
@@ -193,7 +199,7 @@ public class BlockAppleLeaves extends BlockLeavesBase
     private void removeLeaves(World par1World, int par2, int par3, int par4)
     {
         this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0);
-        par1World.setBlockAndMetadataWithNotify(par2, par3, par4, this.blockID, 0, 2);
+        par1World.setBlock(par2, par3, par4, this.blockID, 0, 2);
     }
 
     /**
@@ -268,13 +274,7 @@ public class BlockAppleLeaves extends BlockLeavesBase
 	public boolean isOpaqueCube() {
 			return Block.leaves.isOpaqueCube();
 	}
-	
-	@Override
-	public void func_94332_a(IconRegister par1IconRegister)
-	{
-			this.field_94336_cN = (isOpaqueCube() ? par1IconRegister.func_94245_a("BiomesOPlenty:appleLeavesOpaque") : par1IconRegister.func_94245_a("BiomesOPlenty:appleLeaves"));
-	}
-	
+
     public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)
     {
         return true;

src/minecraft/tdwp_ftw/biomesop/blocks/BlockAppleLeavesFruitless.java

@@ -7,6 +7,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockLeavesBase;
 import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
@@ -192,7 +193,7 @@ public class BlockAppleLeavesFruitless extends BlockLeavesBase
     private void removeLeaves(World par1World, int par2, int par3, int par4)
     {
         this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0);
-        par1World.setBlockAndMetadataWithNotify(par2, par3, par4, this.blockID, 0, 2);
+        par1World.setBlock(par2, par3, par4, this.blockID, 0, 2);
     }
 
     /**
@@ -269,9 +270,9 @@ public class BlockAppleLeavesFruitless extends BlockLeavesBase
 	}
 	
 	@Override
-	public void func_94332_a(IconRegister par1IconRegister)
+	public void registerIcons(IconRegister par1IconRegister)
 	{
-			this.field_94336_cN = (isOpaqueCube() ? par1IconRegister.func_94245_a("BiomesOPlenty:appleLeavesFruitlessOpaque") : par1IconRegister.func_94245_a("BiomesOPlenty:appleLeavesFruitless"));
+		this.blockIcon = (isOpaqueCube() ? par1IconRegister.registerIcon("BiomesOPlenty:appleLeavesFruitlessOpaque") : par1IconRegister.registerIcon("BiomesOPlenty:appleLeavesFruitless"));
 	}
 	
     public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)

src/minecraft/tdwp_ftw/biomesop/blocks/BlockAppleSapling.java

@@ -8,6 +8,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockSapling;
 import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
@@ -18,17 +19,28 @@ import net.minecraft.world.gen.feature.WorldGenerator;
 import tdwp_ftw.biomesop.worldgen.WorldGenApple;
 import net.minecraft.util.AxisAlignedBB;
 
+//==============================================================
+//==============================================================
+//==============================================================
+//==============================================================
+
 public class BlockAppleSapling extends BlockSapling
 {
     public static final String[] WOOD_TYPES = new String[] {"apple"};
 
-    public BlockAppleSapling(int par1, int par2)
+    public BlockAppleSapling(int par1)
     {
-        super(par1, par2);
+        super(par1);
         float var3 = 0.4F;
         this.setBlockBounds(0.5F - var3, 0.0F, 0.5F - var3, 0.5F + var3, var3 * 2.0F, 0.5F + var3);
         this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty);
     }
+    
+	@Override
+	public void registerIcons(IconRegister par1IconRegister)
+	{
+		this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:applesapling");
+	}
 
     /**
      * Ticks the block if it's been scheduled
@@ -45,7 +57,7 @@ public class BlockAppleSapling extends BlockSapling
 
                 if ((var6 & 8) == 0)
                 {
-                    par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 | 8);
+                    par1World.setBlock(par2, par3, par4, var6 | 8);
                 }
                 else
                 {
@@ -58,11 +70,11 @@ public class BlockAppleSapling extends BlockSapling
     /**
      * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata
      */
-    public int getBlockTextureFromSideAndMetadata(int par1, int par2)
+    /*public int getBlockTextureFromSideAndMetadata(int par1, int par2)
     {
         par2 &= 3;
         return par2 == 1 ? 63 : (par2 == 2 ? 79 : (par2 == 3 ? 30 : super.getBlockTextureFromSideAndMetadata(par1, par2)));
-    }
+    }*/
 
     /**
      * Attempts to grow a sapling into a tree
@@ -115,14 +127,14 @@ public class BlockAppleSapling extends BlockSapling
         {
             if (var10)
             {
-                par1World.setBlockAndMetadata(par2 + var8, par3, par4 + var9, this.blockID, var6);
-                par1World.setBlockAndMetadata(par2 + var8 + 1, par3, par4 + var9, this.blockID, var6);
-                par1World.setBlockAndMetadata(par2 + var8, par3, par4 + var9 + 1, this.blockID, var6);
-                par1World.setBlockAndMetadata(par2 + var8 + 1, par3, par4 + var9 + 1, this.blockID, var6);
+                par1World.setBlock(par2 + var8, par3, par4 + var9, this.blockID, var6, 2);
+                par1World.setBlock(par2 + var8 + 1, par3, par4 + var9, this.blockID, var6, 2);
+                par1World.setBlock(par2 + var8, par3, par4 + var9 + 1, this.blockID, var6, 2);
+                par1World.setBlock(par2 + var8 + 1, par3, par4 + var9 + 1, this.blockID, var6, 2);
             }
             else
             {
-                par1World.setBlockAndMetadata(par2, par3, par4, this.blockID, var6);
+                par1World.setBlock(par2, par3, par4, this.blockID, var6, 2);
             }
         }
     }