most of item/block will now compile

src/main/java/tconstruct/blocks/BlockLandmine.java

@@ -42,9 +42,9 @@ public class BlockLandmine extends BlockContainer
     // Should explode when broken instead of dropping items(may not actually work
     boolean explodeOnBroken = false;
 
-    public BlockLandmine(int par1)
+    public BlockLandmine()
     {
-        super(par1, Material.tnt);
+        super(Material.tnt);
         this.setTickRandomly(true);
         this.setBlockBounds(0.0625F, 0.0F, 0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F);
     }

src/main/java/tconstruct/blocks/ConveyorBase.java

@@ -108,7 +108,7 @@ public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, in
         return super.shouldSideBeRendered(world, x, y, z, side);
     }
 
-    public Icon[] icons;
+    public IIcon[] icons;
 
     /* Rendering */
     @Override

src/main/java/tconstruct/blocks/CraftingSlab.java

@@ -27,9 +27,9 @@
 
 public class CraftingSlab extends InventorySlab
 {
-    public CraftingSlab(int id, Material material)
+    public CraftingSlab(Material material)
     {
-        super(id, material);
+        super(material);
         this.setCreativeTab(TConstructRegistry.blockTab);
         this.setHardness(2f);
         this.setStepSound(Block.soundWoodFootstep);
@@ -47,7 +47,7 @@ public String[] getTextureNames ()
     }
 
     @Override
-    public Icon getIcon (int side, int meta)
+    public IIcon getIcon (int side, int meta)
     {
         return icons[(meta % 8) * 3 + getTextureIndex(side)];
     }
@@ -123,11 +123,11 @@ public Object getModInstance ()
     }
 
     @Override
-    public void getSubBlocks (int id, CreativeTabs tab, List list)
+    public void getSubBlocks (Block b, CreativeTabs tab, List list)
     {
         for (int iter = 0; iter < 6; iter++)
         {
-            list.add(new ItemStack(id, 1, iter));
+            list.add(new ItemStack(b, 1, iter));
         }
     }
 

src/main/java/tconstruct/blocks/CraftingStationBlock.java

@@ -8,7 +8,7 @@
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.Icon;
+import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import tconstruct.TConstruct;
@@ -22,7 +22,7 @@ public class CraftingStationBlock extends InventoryBlock
 {
     public CraftingStationBlock(int id, Material material)
     {
-        super(id, material);
+        super(material);
         this.setCreativeTab(TConstructRegistry.blockTab);
         this.setHardness(2f);
         this.setStepSound(Block.soundWoodFootstep);
@@ -40,7 +40,7 @@ public String[] getTextureNames ()
     }
 
     @Override
-    public Icon getIcon (int side, int meta)
+    public IIcon getIcon (int side, int meta)
     {
         return icons[meta * 3 + getTextureIndex(side)];
     }
@@ -104,11 +104,11 @@ public Object getModInstance ()
     }
 
     @Override
-    public void getSubBlocks (int id, CreativeTabs tab, List list)
+    public void getSubBlocks (Block b, CreativeTabs tab, List list)
     {
         for (int iter = 0; iter < 1; iter++)
         {
-            list.add(new ItemStack(id, 1, iter));
+            list.add(new ItemStack(b, 1, iter));
         }
     }
 }

src/main/java/tconstruct/blocks/DryingRack.java

@@ -8,12 +8,12 @@
 import tconstruct.library.TConstructRegistry;
 import mantle.blocks.abstracts.InventoryBlock;
 import tconstruct.library.tools.AbilityHelper;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
@@ -224,7 +224,7 @@ public String[] getTextureNames ()
     @Override
     public IIcon getIcon (int side, int meta)
     {
-        return Block.planks.getIcon(side, 0);
+        return Blocks.planks.getIcon(side, 0);
     }
 
     public int getTextureIndex (int side)

src/main/java/tconstruct/blocks/EquipBlock.java

@@ -1,25 +1,23 @@
 package tconstruct.blocks;
 
 import tconstruct.blocks.logic.EquipLogic;
-
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 
 import java.util.*;
 
 import cpw.mods.fml.relauncher.*;
-
 import tconstruct.TConstruct;
 import tconstruct.blocks.logic.FrypanLogic;
 import tconstruct.client.block.FrypanRender;
 import mantle.blocks.abstracts.InventoryBlock;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IconRegister;
+import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.*;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.*;
@@ -28,9 +26,9 @@
 public class EquipBlock extends InventoryBlock
 {
 
-    public EquipBlock(int id, Material material)
+    public EquipBlock(Material material)
     {
-        super(id, material);
+        super(material);
         this.setHardness(0.3f);
         this.setBlockBounds(0, 0, 0, 1, 0.25f, 1);
         //this.setCreativeTab(ToolConstruct.materialTab);
@@ -42,9 +40,9 @@ public String[] getTextureNames ()
         return new String[] { "toolstation_top" };
     }
 
-    public Icon getIcon (int side, int meta)
+    public IIcon getIcon (int side, int meta)
     {
-        return Block.blockIron.getIcon(side, meta);
+        return Blocks.iron_block.getIcon(side, meta);
     }
 
     @SideOnly(Side.CLIENT)

src/main/java/tconstruct/blocks/FurnaceSlab.java

@@ -57,12 +57,12 @@ public String[] getTextureNames ()
     }
 
     @Override
-    public Icon getIcon (int side, int meta)
+    public IIcon getIcon (int side, int meta)
     {
         return icons[(meta % 8) * 3 + getTextureIndex(side)];
     }
 
-    public Icon getBlockTexture (IBlockAccess world, int x, int y, int z, int side)
+    public IIcon getBlockTexture (IBlockAccess world, int x, int y, int z, int side)
     {
         TileEntity logic = world.getBlockTileEntity(x, y, z);
         short direction = (logic instanceof IFacingLogic) ? ((IFacingLogic) logic).getRenderDirection() : 0;
@@ -97,10 +97,10 @@ public int getTextureIndex (int side)
     }
 
     @Override
-    public void registerIcons (IconRegister iconRegister)
+    public void registerIcons (IIconRegister iconRegister)
     {
         String[] textureNames = getTextureNames();
-        this.icons = new Icon[textureNames.length];
+        this.icons = new IIcon[textureNames.length];
 
         for (int i = 0; i < this.icons.length; ++i)
         {

src/main/java/tconstruct/blocks/GolemHeadBlock.java

@@ -5,11 +5,11 @@
 import tconstruct.common.TContent;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IconRegister;
+import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.Icon;
+import net.minecraft.util.IIcon;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 
@@ -19,19 +19,19 @@ public class GolemHeadBlock extends MantleBlock
     public static int headTopTex = ModLoader.addOverride("/terrain.png", "/GGE/golemheadtop&bottom.png");
     public static int face;*/
 
-    public GolemHeadBlock(int id)
+    public GolemHeadBlock()
     {
-        super(id, Material.ground);
+        super(Material.ground);
         //setTickRandomly(true);
     }
 
-    public Icon[] icons;
+    public IIcon[] icons;
     public String[] textureNames = new String[] { "golemhead_face", "golemhead_side", "golemhead_top" };
 
     @Override
-    public void registerIcons (IconRegister iconRegister)
+    public void registerIcons (IIconRegister iconRegister)
     {
-        this.icons = new Icon[textureNames.length];
+        this.icons = new IIcon[textureNames.length];
 
         for (int i = 0; i < this.icons.length; ++i)
         {

src/main/java/tconstruct/blocks/GravelOre.java

@@ -18,9 +18,9 @@ public class GravelOre extends BlockSand
     public String[] textureNames = new String[] { "iron", "gold", "copper", "tin", "aluminum", "cobalt" };
     public IIcon[] icons;
 
-    public GravelOre(int id)
+    public GravelOre()
     {
-        super(id, Material.craftedSnow);
+        super(Material.craftedSnow);
         this.setCreativeTab(TConstructRegistry.blockTab);
         this.setStepSound(soundGravelFootstep);
     }

src/main/java/tconstruct/blocks/MeatBlock.java

@@ -5,23 +5,23 @@
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IconRegister;
+import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.Icon;
+import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 import tconstruct.library.TConstructRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
 public class MeatBlock extends Block
 {
-    public Icon[] icons;
+    public IIcon[] icons;
     public String[] textureNames = new String[] { "ham_skin", "ham_bone" };
 
-    public MeatBlock(int id)
+    public MeatBlock()
     {
-        super(id, Material.wood);
+        super(Material.wood);
         this.setHardness(1.0F);
         this.setStepSound(Block.soundWoodFootstep);
         //setBurnProperties(this.blockID, 5, 20);
@@ -30,7 +30,7 @@ public MeatBlock(int id)
 
     @Override
     @SideOnly(Side.CLIENT)
-    public Icon getIcon (int side, int metadata)
+    public IIcon getIcon (int side, int metadata)
     {
         int tex = (metadata % 4) * 2;
         int orientation = metadata / 4;
@@ -57,9 +57,9 @@ public Icon getIcon (int side, int metadata)
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void registerIcons (IconRegister iconRegister)
+    public void registerIcons (IIconRegister iconRegister)
     {
-        this.icons = new Icon[textureNames.length];
+        this.icons = new IIcon[textureNames.length];
 
         for (int i = 0; i < this.icons.length; ++i)
         {
@@ -165,10 +165,10 @@ public boolean isBlockReplaceable (World world, int x, int y, int z)
 
     @SideOnly(Side.CLIENT)
     @Override
-    public void getSubBlocks (int par1, CreativeTabs par2CreativeTabs, List par3List)
+    public void getSubBlocks (Block b, CreativeTabs par2CreativeTabs, List par3List)
     {
         for (int i = 0; i < icons.length / 2; i++)
-            par3List.add(new ItemStack(par1, 1, i));
+            par3List.add(new ItemStack(b, 1, i));
     }
 
     @Override

src/main/java/tconstruct/blocks/MetalOre.java

@@ -2,16 +2,17 @@
 
 import java.util.List;
 
+import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
 public class MetalOre extends TConstructBlock
 {
-    public MetalOre(int id, Material material, float hardness, String[] tex)
+    public MetalOre(Material material, float hardness, String[] tex)
     {
-        super(id, material, hardness, tex);
+        super(material, hardness, tex);
     }
 
     public float getBlockHardness (World world, int x, int y, int z)
@@ -25,11 +26,11 @@ public float getBlockHardness (World world, int x, int y, int z)
     }
 
     @Override
-    public void getSubBlocks (int id, CreativeTabs tab, List list)
+    public void getSubBlocks (Block b, CreativeTabs tab, List list)
     {
         for (int iter = 1; iter < 6; iter++)
         {
-            list.add(new ItemStack(id, 1, iter));
+            list.add(new ItemStack(b, 1, iter));
         }
     }
 }