diff --git a/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java b/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java
index 4bb2f03994f..c22f88503ef 100644
--- a/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java
+++ b/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java
@@ -12,12 +12,12 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.Packet;
+import net.minecraft.network.Packet;
 import net.minecraft.network.packet.Packet132TileEntityData;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
-import net.minecraftforge.common.ForgeDirection;
+import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
diff --git a/src/main/java/tconstruct/blocks/logic/GolemPedestalLogic.java b/src/main/java/tconstruct/blocks/logic/GolemPedestalLogic.java
index 3d16e386100..53bd1aa0a26 100644
--- a/src/main/java/tconstruct/blocks/logic/GolemPedestalLogic.java
+++ b/src/main/java/tconstruct/blocks/logic/GolemPedestalLogic.java
@@ -3,6 +3,8 @@
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -24,154 +26,154 @@ public GolemPedestalLogic()
         {
             cost = new int[512];
             souls = new int[512];
-            cost[Block.planks.blockID] = 0;
-            cost[Block.wood.blockID] = 32;
-            cost[Block.cloth.blockID] = 8;
-            cost[Block.cobblestoneMossy.blockID] = 16;
-            cost[Block.obsidian.blockID] = 8;
-            cost[Block.pumpkin.blockID] = 8;
-            cost[Block.netherrack.blockID] = 64;
-            cost[Block.slowSand.blockID] = 1;
-            cost[Block.glowStone.blockID] = 1;
-            cost[Block.pumpkinLantern.blockID] = 8;
-            cost[Block.blockDiamond.blockID] = 1;
-            cost[Block.blockGold.blockID] = 1;
-            cost[Block.blockIron.blockID] = 1;
-            cost[Block.blockLapis.blockID] = 1;
-            cost[Block.jukebox.blockID] = 1;
-            cost[Block.music.blockID] = 1;
-            cost[Block.melon.blockID] = 8;
-            cost[Block.torchRedstoneIdle.blockID] = 6;
-            cost[Block.torchRedstoneActive.blockID] = cost[Block.torchRedstoneIdle.blockID];
-            cost[Item.redstone.itemID] = 6;
-            cost[Item.beefRaw.itemID] = 8;
-            cost[Item.beefCooked.itemID] = cost[Item.beefRaw.itemID];
-            cost[Item.porkRaw.itemID] = cost[Item.beefRaw.itemID];
-            cost[Item.porkCooked.itemID] = cost[Item.beefRaw.itemID];
-            cost[Item.enderPearl.itemID] = 1;
-            cost[Item.eyeOfEnder.itemID] = 1;
-            cost[Item.blazeRod.itemID] = 2;
-            cost[Block.mushroomBrown.blockID] = 16;
-            cost[Block.mushroomRed.blockID] = cost[Block.mushroomBrown.blockID];
-            cost[Block.netherStalk.blockID] = 6;
-            cost[Item.glowstone.itemID] = 4;
-            cost[Item.diamond.itemID] = 1;
-            cost[Item.ingotIron.itemID] = 8;
-            cost[Item.ingotGold.itemID] = 2;
-            cost[Item.reed.itemID] = 8;
-            cost[Item.sugar.itemID] = cost[Item.reed.itemID];
-            cost[Item.bucketLava.itemID] = 1;
-            cost[Item.cake.itemID] = 1;
-            cost[Item.bucketMilk.itemID] = 1;
-            cost[Item.wheat.itemID] = 32;
-            cost[Item.bread.itemID] = 8;
-            cost[Block.plantYellow.blockID] = 32;
-            cost[Block.plantRed.blockID] = cost[Block.plantYellow.blockID];
-            cost[Block.dragonEgg.blockID] = 1;
-            cost[Block.tallGrass.blockID] = 64;
-            cost[Block.sapling.blockID] = 64;
-            cost[Item.ghastTear.itemID] = 8;
-            cost[Item.goldNugget.itemID] = 18;
-            cost[Item.spiderEye.itemID] = 16;
-            cost[Item.fermentedSpiderEye.itemID] = 6;
-            cost[Item.bowlSoup.itemID] = 0;
-            cost[Item.fishRaw.itemID] = 1;
-            cost[Item.fishCooked.itemID] = cost[Item.fishRaw.itemID];
-            cost[Item.magmaCream.itemID] = 2;
-            cost[Item.blazePowder.itemID] = 4;
-            cost[Item.speckledMelon.itemID] = 1;
-            cost[Item.paper.itemID] = 8;
-            cost[Item.book.itemID] = 2;
-            cost[Item.egg.itemID] = 4;
-            cost[Item.slimeBall.itemID] = 2;
-            cost[Item.saddle.itemID] = 1;
-            cost[Item.feather.itemID] = 48;
-            cost[Item.gunpowder.itemID] = 16;
-            cost[Item.appleRed.itemID] = 8;
-            cost[Item.appleGold.itemID] = 1;
-            cost[Item.dyePowder.itemID] = 64;
-            cost[Item.bone.itemID] = 2;
-            cost[Item.rottenFlesh.itemID] = 48;
-            cost[Item.cookie.itemID] = 16;
-            cost[Item.melon.itemID] = 32;
-            cost[Item.chickenCooked.itemID] = 8;
-            cost[Item.chickenRaw.itemID] = cost[Item.chickenCooked.itemID];
-            cost[Item.silk.itemID] = 64;
-            cost[Block.cactus.blockID] = 32;
-            souls[Block.planks.blockID] = 0;
-            souls[Block.wood.blockID] = 1;
-            souls[Block.cloth.blockID] = 1;
-            souls[Block.cobblestoneMossy.blockID] = 1;
-            souls[Block.obsidian.blockID] = 1;
-            souls[Block.pumpkin.blockID] = 1;
-            souls[Block.netherrack.blockID] = 1;
-            souls[Block.slowSand.blockID] = 1;
-            souls[Block.glowStone.blockID] = 2;
-            souls[Block.pumpkinLantern.blockID] = 1;
-            souls[Block.blockDiamond.blockID] = 27;
-            souls[Block.blockGold.blockID] = 2;
-            souls[Block.blockIron.blockID] = 2;
-            souls[Block.blockLapis.blockID] = 3;
-            souls[Block.jukebox.blockID] = 3;
-            souls[Block.music.blockID] = 1;
-            souls[Block.melon.blockID] = 1;
-            souls[Block.torchRedstoneIdle.blockID] = 1;
-            souls[Block.torchRedstoneActive.blockID] = souls[Block.torchRedstoneIdle.blockID];
-            souls[Item.redstone.itemID] = 1;
-            souls[Item.beefRaw.itemID] = 1;
-            souls[Item.beefCooked.itemID] = souls[Item.beefRaw.itemID];
-            souls[Item.porkRaw.itemID] = souls[Item.beefRaw.itemID];
-            souls[Item.porkCooked.itemID] = souls[Item.beefRaw.itemID];
-            souls[Item.enderPearl.itemID] = 1;
-            souls[Item.eyeOfEnder.itemID] = 2;
-            souls[Item.blazeRod.itemID] = 2;
-            souls[Block.mushroomBrown.blockID] = 1;
-            souls[Block.mushroomRed.blockID] = souls[Block.mushroomBrown.blockID];
-            souls[Block.netherStalk.blockID] = 1;
-            souls[Item.glowstone.itemID] = 1;
-            souls[Item.diamond.itemID] = 3;
-            souls[Item.ingotIron.itemID] = 1;
-            souls[Item.ingotGold.itemID] = 1;
-            souls[Item.reed.itemID] = 1;
-            souls[Item.sugar.itemID] = souls[Item.reed.itemID];
-            souls[Item.bucketLava.itemID] = 1;
-            souls[Item.cake.itemID] = 1;
-            souls[Item.bucketMilk.itemID] = 1;
-            souls[Item.wheat.itemID] = 1;
-            souls[Item.bread.itemID] = 1;
-            souls[Block.plantYellow.blockID] = 1;
-            souls[Block.plantRed.blockID] = souls[Block.plantYellow.blockID];
-            souls[Block.dragonEgg.blockID] = 1;
-            souls[Block.tallGrass.blockID] = 1;
-            souls[Block.sapling.blockID] = 1;
-            souls[Item.ghastTear.itemID] = 1;
-            souls[Item.goldNugget.itemID] = 1;
-            souls[Item.spiderEye.itemID] = 1;
-            souls[Item.fermentedSpiderEye.itemID] = 1;
-            souls[Item.bowlSoup.itemID] = 1;
-            souls[Item.fishRaw.itemID] = 1;
-            souls[Item.fishCooked.itemID] = souls[Item.fishRaw.itemID];
-            souls[Item.magmaCream.itemID] = 1;
-            souls[Item.blazePowder.itemID] = 1;
-            souls[Item.speckledMelon.itemID] = 1;
-            souls[Item.paper.itemID] = 1;
-            souls[Item.book.itemID] = 1;
-            souls[Item.egg.itemID] = 1;
-            souls[Item.slimeBall.itemID] = 1;
-            souls[Item.saddle.itemID] = 1;
-            souls[Item.feather.itemID] = 1;
-            souls[Item.gunpowder.itemID] = 1;
-            souls[Item.appleRed.itemID] = 1;
-            souls[Item.appleGold.itemID] = 3;
-            souls[Item.dyePowder.itemID] = 1;
-            souls[Item.bone.itemID] = 1;
-            souls[Item.rottenFlesh.itemID] = 1;
-            souls[Item.cookie.itemID] = 1;
-            souls[Item.melon.itemID] = 1;
-            souls[Item.chickenCooked.itemID] = 1;
-            souls[Item.chickenRaw.itemID] = souls[Item.chickenCooked.itemID];
-            souls[Item.silk.itemID] = 1;
-            souls[Block.cactus.blockID] = 1;
+            cost[Blocks.planks] = 0;
+            cost[Blocks.wood] = 32;
+            cost[Blocks.cloth] = 8;
+            cost[Blocks.cobblestoneMossy] = 16;
+            cost[Blocks.obsidian] = 8;
+            cost[Blocks.pumpkin] = 8;
+            cost[Blocks.netherrack] = 64;
+            cost[Blocks.slowSand] = 1;
+            cost[Blocks.glowStone] = 1;
+            cost[Blocks.pumpkinLantern] = 8;
+            cost[Blocks.blockDiamond] = 1;
+            cost[Blocks.blockGold] = 1;
+            cost[Blocks.blockIron] = 1;
+            cost[Blocks.blockLapis] = 1;
+            cost[Blocks.jukebox] = 1;
+            cost[Blocks.music] = 1;
+            cost[Blocks.melon] = 8;
+            cost[Blocks.torchRedstoneIdle] = 6;
+            cost[Blocks.torchRedstoneActive] = cost[Blocks.torchRedstoneIdle];
+            cost[Items.redstone] = 6;
+            cost[Items.beefRaw] = 8;
+            cost[Items.beefCooked] = cost[Items.beefRaw];
+            cost[Items.porkRaw] = cost[Items.beefRaw];
+            cost[Items.porkCooked] = cost[Items.beefRaw];
+            cost[Items.enderPearl] = 1;
+            cost[Items.eyeOfEnder] = 1;
+            cost[Items.blazeRod] = 2;
+            cost[Blocks.mushroomBrown] = 16;
+            cost[Blocks.mushroomRed] = cost[Blocks.mushroomBrown];
+            cost[Blocks.netherStalk] = 6;
+            cost[Items.glowstone] = 4;
+            cost[Items.diamond] = 1;
+            cost[Items.ingotIron] = 8;
+            cost[Items.ingotGold] = 2;
+            cost[Items.reed] = 8;
+            cost[Items.sugar] = cost[Items.reed];
+            cost[Items.bucketLava] = 1;
+            cost[Items.cake] = 1;
+            cost[Items.bucketMilk] = 1;
+            cost[Items.wheat] = 32;
+            cost[Items.bread] = 8;
+            cost[Blocks.plantYellow] = 32;
+            cost[Blocks.plantRed] = cost[Blocks.plantYellow];
+            cost[Blocks.dragonEgg] = 1;
+            cost[Blocks.tallGrass] = 64;
+            cost[Blocks.sapling] = 64;
+            cost[Items.ghastTear] = 8;
+            cost[Items.goldNugget] = 18;
+            cost[Items.spiderEye] = 16;
+            cost[Items.fermentedSpiderEye] = 6;
+            cost[Items.bowlSoup] = 0;
+            cost[Items.fishRaw] = 1;
+            cost[Items.fishCooked] = cost[Items.fishRaw];
+            cost[Items.magmaCream] = 2;
+            cost[Items.blazePowder] = 4;
+            cost[Items.speckledMelon] = 1;
+            cost[Items.paper] = 8;
+            cost[Items.book] = 2;
+            cost[Items.egg] = 4;
+            cost[Items.slimeBall] = 2;
+            cost[Items.saddle] = 1;
+            cost[Items.feather] = 48;
+            cost[Items.gunpowder] = 16;
+            cost[Items.appleRed] = 8;
+            cost[Items.appleGold] = 1;
+            cost[Items.dyePowder] = 64;
+            cost[Items.bone] = 2;
+            cost[Items.rottenFlesh] = 48;
+            cost[Items.cookie] = 16;
+            cost[Items.melon] = 32;
+            cost[Items.chickenCooked] = 8;
+            cost[Items.chickenRaw] = cost[Items.chickenCooked];
+            cost[Items.silk] = 64;
+            cost[Blocks.cactus] = 32;
+            souls[Blocks.planks] = 0;
+            souls[Blocks.wood] = 1;
+            souls[Blocks.cloth] = 1;
+            souls[Blocks.cobblestoneMossy] = 1;
+            souls[Blocks.obsidian] = 1;
+            souls[Blocks.pumpkin] = 1;
+            souls[Blocks.netherrack] = 1;
+            souls[Blocks.slowSand] = 1;
+            souls[Blocks.glowStone] = 2;
+            souls[Blocks.pumpkinLantern] = 1;
+            souls[Blocks.blockDiamond] = 27;
+            souls[Blocks.blockGold] = 2;
+            souls[Blocks.blockIron] = 2;
+            souls[Blocks.blockLapis] = 3;
+            souls[Blocks.jukebox] = 3;
+            souls[Blocks.music] = 1;
+            souls[Blocks.melon] = 1;
+            souls[Blocks.torchRedstoneIdle] = 1;
+            souls[Blocks.torchRedstoneActive] = souls[Blocks.torchRedstoneIdle];
+            souls[Items.redstone] = 1;
+            souls[Items.beefRaw] = 1;
+            souls[Items.beefCooked] = souls[Items.beefRaw];
+            souls[Items.porkRaw] = souls[Items.beefRaw];
+            souls[Items.porkCooked] = souls[Items.beefRaw];
+            souls[Items.enderPearl] = 1;
+            souls[Items.eyeOfEnder] = 2;
+            souls[Items.blazeRod] = 2;
+            souls[Blocks.mushroomBrown] = 1;
+            souls[Blocks.mushroomRed] = souls[Blocks.mushroomBrown];
+            souls[Blocks.netherStalk] = 1;
+            souls[Items.glowstone] = 1;
+            souls[Items.diamond] = 3;
+            souls[Items.ingotIron] = 1;
+            souls[Items.ingotGold] = 1;
+            souls[Items.reed] = 1;
+            souls[Items.sugar] = souls[Items.reed];
+            souls[Items.bucketLava] = 1;
+            souls[Items.cake] = 1;
+            souls[Items.bucketMilk] = 1;
+            souls[Items.wheat] = 1;
+            souls[Items.bread] = 1;
+            souls[Blocks.plantYellow] = 1;
+            souls[Blocks.plantRed] = souls[Blocks.plantYellow];
+            souls[Blocks.dragonEgg] = 1;
+            souls[Blocks.tallGrass] = 1;
+            souls[Blocks.sapling] = 1;
+            souls[Items.ghastTear] = 1;
+            souls[Items.goldNugget] = 1;
+            souls[Items.spiderEye] = 1;
+            souls[Items.fermentedSpiderEye] = 1;
+            souls[Items.bowlSoup] = 1;
+            souls[Items.fishRaw] = 1;
+            souls[Items.fishCooked] = souls[Items.fishRaw];
+            souls[Items.magmaCream] = 1;
+            souls[Items.blazePowder] = 1;
+            souls[Items.speckledMelon] = 1;
+            souls[Items.paper] = 1;
+            souls[Items.book] = 1;
+            souls[Items.egg] = 1;
+            souls[Items.slimeBall] = 1;
+            souls[Items.saddle] = 1;
+            souls[Items.feather] = 1;
+            souls[Items.gunpowder] = 1;
+            souls[Items.appleRed] = 1;
+            souls[Items.appleGold] = 3;
+            souls[Items.dyePowder] = 1;
+            souls[Items.bone] = 1;
+            souls[Items.rottenFlesh] = 1;
+            souls[Items.cookie] = 1;
+            souls[Items.melon] = 1;
+            souls[Items.chickenCooked] = 1;
+            souls[Items.chickenRaw] = souls[Items.chickenCooked];
+            souls[Items.silk] = 1;
+            souls[Blocks.cactus] = 1;
         }
     }
 
@@ -192,14 +194,14 @@ public ItemStack getStackInSlot (int i)
     public boolean subtractSoul (int i)
     {
         TConstruct.logger.info("SUBTRACT WHY");
-        if (supply == null || supply.itemID >= 512 || cost[supply.itemID] == 0)
+        if (supply == null || supply.itemID >= 512 || cost[supply] == 0)
         {
             worldObj.playSoundAtEntity(Minecraft.getMinecraft().thePlayer, "mob.blaze.death", 1.0F, 0.5F);
             Minecraft.getMinecraft().thePlayer.addChatMessage("I require more souls...");
             return false;
         }
-        int j = cost[supply.itemID];
-        int k = souls[supply.itemID];
+        int j = cost[supply];
+        int k = souls[supply];
         int l = (supply.stackSize / j) * k;
         TConstruct.logger.info((new StringBuilder()).append("Subtracting amt").append(i).append(" s").append(k).append(" c").append(j).append(" ss").append(supply.stackSize).append(" id")
                 .append(supply.itemID).append(" sa").append(l).append(" calc").append(Math.ceil((double) i / (double) k)).toString());
diff --git a/src/main/java/tconstruct/blocks/logic/RedwireLogic.java b/src/main/java/tconstruct/blocks/logic/RedwireLogic.java
index c28d2a82c68..9a9bb45c382 100644
--- a/src/main/java/tconstruct/blocks/logic/RedwireLogic.java
+++ b/src/main/java/tconstruct/blocks/logic/RedwireLogic.java
@@ -2,7 +2,7 @@
 
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.Packet;
+import net.minecraft.network.Packet;
 import net.minecraft.network.packet.Packet132TileEntityData;
 import net.minecraft.tileentity.TileEntity;
 
diff --git a/src/main/java/tconstruct/blocks/logic/TankAirLogic.java b/src/main/java/tconstruct/blocks/logic/TankAirLogic.java
index 2c24ffb6f3d..92c5bc2d5e6 100644
--- a/src/main/java/tconstruct/blocks/logic/TankAirLogic.java
+++ b/src/main/java/tconstruct/blocks/logic/TankAirLogic.java
@@ -10,7 +10,7 @@
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.Packet;
+import net.minecraft.network.Packet;
 import net.minecraft.network.packet.Packet132TileEntityData;
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.FluidStack;
diff --git a/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java b/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java
index 11c51b4d1f1..a63a997a35d 100644
--- a/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java
+++ b/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java
@@ -8,7 +8,7 @@
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.Packet;
+import net.minecraft.network.Packet;
 import net.minecraft.network.packet.Packet132TileEntityData;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntityFurnace;
diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGel.java b/src/main/java/tconstruct/blocks/slime/SlimeGel.java
index 65c660b570d..eebd51d2e16 100644
--- a/src/main/java/tconstruct/blocks/slime/SlimeGel.java
+++ b/src/main/java/tconstruct/blocks/slime/SlimeGel.java
@@ -69,10 +69,10 @@ public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y,
     /**
      * returns a list of blocks with the same ID, but different meta (eg: wood returns 4 blocks)
      */
-    public void getSubBlocks (int par1, CreativeTabs par2CreativeTabs, List par3List)
+    public void getSubBlocks (Block b, CreativeTabs par2CreativeTabs, List par3List)
     {
-        par3List.add(new ItemStack(par1, 1, 0));
-        par3List.add(new ItemStack(par1, 1, 1));
+        par3List.add(new ItemStack(b, 1, 0));
+        par3List.add(new ItemStack(b, 1, 1));
         //par3List.add(new ItemStack(par1, 1, 2));
     }
 
diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java
index 5c699504bdb..8190a227759 100644
--- a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java
+++ b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java
@@ -6,13 +6,14 @@
 import mantle.blocks.MantleBlock;
 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.init.Blocks;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.Icon;
+import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 import net.minecraftforge.common.EnumPlantType;
-import net.minecraftforge.common.ForgeDirection;
+import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.common.IPlantable;
 import tconstruct.common.TContent;
 import tconstruct.common.TRepo;
@@ -23,11 +24,11 @@
 public class SlimeGrass extends MantleBlock
 {
     public String[] textureNames = { "slimegrass_green_top", "slimedirt_blue", "slimegrass_green_blue_side", "slimegrass_green_dirt_side" };//green, purple
-    public Icon[] icons;
+    public IIcon[] icons;
 
-    public SlimeGrass(int id)
+    public SlimeGrass()
     {
-        super(id, Material.grass);
+        super(Material.grass);
         setHardness(0.6f);
         this.setTickRandomly(true);
         this.setCreativeTab(TConstructRegistry.blockTab);
@@ -46,9 +47,9 @@ public int damageDropped (int meta)
 
     @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)
         {
@@ -58,7 +59,7 @@ public void registerIcons (IconRegister iconRegister)
 
     @Override
     @SideOnly(Side.CLIENT)
-    public Icon getIcon (int side, int meta)
+    public IIcon getIcon (int side, int meta)
     {
         if (meta >= 2)
             meta = 0;
@@ -78,11 +79,11 @@ else if (side == 1)
     }
 
     @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));
         }
     }
 
@@ -118,7 +119,7 @@ else if (par1World.getBlockLightValue(par2, par3 + 1, par4) >= 9)
                     if (par1World.getBlockLightValue(posX, posY + 1, posZ) >= 4 && par1World.getBlockLightOpacity(posX, posY + 1, posZ) <= 2)
                     {
                         int blockID = par1World.getBlockId(posX, posY, posZ);
-                        if (blockID == Block.dirt.blockID)
+                        if (blockID == Blocks.dirt.blockID)
                         {
                             par1World.setBlock(posX, posY, posZ, this.blockID, 1, 3);
                             return;
@@ -138,7 +139,7 @@ else if (par1World.getBlockLightValue(par2, par3 + 1, par4) >= 9)
     public int idDropped (int metadata, Random random, int fortune)
     {
         if (metadata == 1)
-            return Block.dirt.blockID;
+            return Blocks.dirt.blockID;
         else
             return TRepo.craftedSoil.blockID;
     }
diff --git a/src/main/java/tconstruct/client/TClientEvents.java b/src/main/java/tconstruct/client/TClientEvents.java
index a5c7358550b..4c1348ae113 100644
--- a/src/main/java/tconstruct/client/TClientEvents.java
+++ b/src/main/java/tconstruct/client/TClientEvents.java
@@ -11,10 +11,11 @@
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.texture.IconRegister;
+import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.entity.*;
 import net.minecraft.entity.ai.attributes.AttributeInstance;
+import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.potion.*;
 import net.minecraft.util.*;
@@ -63,8 +64,8 @@ public void onSound (SoundLoadEvent event)
 
     /* Liquids */
 
-    Icon[] stillIcons = new Icon[2];
-    Icon[] flowIcons = new Icon[2];
+    IIcon[] stillIcons = new IIcon[2];
+    IIcon[] flowIcons = new IIcon[2];
 
     @ForgeSubscribe
     public void preStitch (TextureStitchEvent.Pre event)
@@ -252,7 +253,7 @@ public void fovModifier(FOVUpdateEvent event)
             f *= 1.1F;
         }
 
-        if (event.entity.isUsingItem() && event.entity.getItemInUse().itemID == Item.bow.itemID)
+        if (event.entity.isUsingItem() && event.entity.getItemInUse().itemID == Items.bow.itemID)
         {
             int i = event.entity.getItemInUseDuration();
             float f1 = (float) i / 20.0F;
diff --git a/src/main/java/tconstruct/common/BowRecipe.java b/src/main/java/tconstruct/common/BowRecipe.java
index 1e5ab17a65b..0ea75e20992 100644
--- a/src/main/java/tconstruct/common/BowRecipe.java
+++ b/src/main/java/tconstruct/common/BowRecipe.java
@@ -1,5 +1,6 @@
 package tconstruct.common;
 
+import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import tconstruct.library.crafting.ToolRecipe;
 import tconstruct.library.tools.ToolCore;
@@ -28,7 +29,7 @@ public boolean validHead (Item input)
         {
             if (part == input)
                 return true;
-            if (toolRod != null && part == toolRod && (input == Item.stick || input == Item.bone))
+            if (toolRod != null && part == toolRod && (input == Items.stick || input == Items.bone))
                 return true;
         }
         return false;
diff --git a/src/main/java/tconstruct/common/TRepo.java b/src/main/java/tconstruct/common/TRepo.java
index 200660ecc8a..28c86451742 100644
--- a/src/main/java/tconstruct/common/TRepo.java
+++ b/src/main/java/tconstruct/common/TRepo.java
@@ -10,6 +10,7 @@
 import net.minecraft.block.material.Material;
 import net.minecraft.item.EnumArmorMaterial;
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemArmor.ArmorMaterial;
 import net.minecraftforge.common.ChestGenHooks;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
@@ -260,7 +261,7 @@ public class TRepo
     public static Item chestplateWood;
     public static Item leggingsWood;
     public static Item bootsWood;
-    public static EnumArmorMaterial materialWood;
+    public static ArmorMaterial materialWood;
 
     //Armor - exosuit
     public static Item exoGoggles;
diff --git a/src/main/java/tconstruct/items/armor/ArmorBasic.java b/src/main/java/tconstruct/items/armor/ArmorBasic.java
index 07542ac9798..546d76acf4e 100644
--- a/src/main/java/tconstruct/items/armor/ArmorBasic.java
+++ b/src/main/java/tconstruct/items/armor/ArmorBasic.java
@@ -9,9 +9,9 @@ public class ArmorBasic extends ItemArmor
 
     public String textureName;
 
-    public ArmorBasic(int par1, EnumArmorMaterial par2EnumArmorMaterial, int par3, String textureName)
+    public ArmorBasic(ArmorMaterial par2EnumArmorMaterial, int par3, String textureName)
     {
-        super(par1, par2EnumArmorMaterial, 0, par3);
+        super(par2EnumArmorMaterial, 0, par3);
         this.textureName = textureName;
     }
 
diff --git a/src/main/java/tconstruct/items/tools/Arrow.java b/src/main/java/tconstruct/items/tools/Arrow.java
index 682877a5433..837bb16b0ff 100644
--- a/src/main/java/tconstruct/items/tools/Arrow.java
+++ b/src/main/java/tconstruct/items/tools/Arrow.java
@@ -19,9 +19,9 @@
 public class Arrow extends ToolCore
 {
 
-    public Arrow(int id)
+    public Arrow()
     {
-        super(id, 3);
+        super(3);
         this.setUnlocalizedName("InfiTool.Arrow");
         this.setMaxStackSize(64);
         this.setMaxDamage(0);
diff --git a/src/main/java/tconstruct/items/tools/BattleSign.java b/src/main/java/tconstruct/items/tools/BattleSign.java
index 70bea9300af..2af54a693a4 100644
--- a/src/main/java/tconstruct/items/tools/BattleSign.java
+++ b/src/main/java/tconstruct/items/tools/BattleSign.java
@@ -8,9 +8,9 @@
 
 public class BattleSign extends Weapon
 {
-    public BattleSign(int itemID)
+    public BattleSign()
     {
-        super(itemID, 1);
+        super(1);
         this.setUnlocalizedName("InfiTool.Battlesign");
     }
 
diff --git a/src/main/java/tconstruct/items/tools/BowBase.java b/src/main/java/tconstruct/items/tools/BowBase.java
index 5e4b252a080..c0b4d835bed 100644
--- a/src/main/java/tconstruct/items/tools/BowBase.java
+++ b/src/main/java/tconstruct/items/tools/BowBase.java
@@ -11,13 +11,13 @@
 import tconstruct.library.crafting.ToolBuilder;
 import tconstruct.library.tools.AbilityHelper;
 import tconstruct.library.tools.ToolCore;
-
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.entity.projectile.EntityArrow;
+import net.minecraft.init.Items;
 import net.minecraft.item.EnumAction;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -32,9 +32,9 @@
 
 public abstract class BowBase extends ToolCore
 {
-    public BowBase(int itemID)
+    public BowBase()
     {
-        super(itemID, 0);
+        super(0);
     }
 
     public int durabilityTypeAccessory ()
@@ -64,7 +64,7 @@ public void onPlayerStoppedUsing (ItemStack stack, World world, EntityPlayer pla
 
         boolean creative = player.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0;
         int slotID = getInventorySlotContainItem(TRepo.arrow, player.inventory);
-        int arrowID = getInventorySlotContainItem(Item.arrow, player.inventory);
+        int arrowID = getInventorySlotContainItem(Items.arrow, player.inventory);
         int arrowState = 0;
         ItemStack tinkerArrow = null;
         if (slotID != -1)
@@ -153,7 +153,7 @@ public void onPlayerStoppedUsing (ItemStack stack, World world, EntityPlayer pla
                 }
                 else
                 {
-                    player.inventory.consumeInventoryItem(Item.arrow);
+                    player.inventory.consumeInventoryItem(Items.arrow);
                 }
             }
 
diff --git a/src/main/java/tconstruct/items/tools/Broadsword.java b/src/main/java/tconstruct/items/tools/Broadsword.java
index aa848f1499b..da200e5d050 100644
--- a/src/main/java/tconstruct/items/tools/Broadsword.java
+++ b/src/main/java/tconstruct/items/tools/Broadsword.java
@@ -6,9 +6,9 @@
 
 public class Broadsword extends Weapon
 {
-    public Broadsword(int itemID)
+    public Broadsword()
     {
-        super(itemID, 4);
+        super(4);
         this.setUnlocalizedName("InfiTool.Broadsword");
     }
 
diff --git a/src/main/java/tconstruct/items/tools/Chisel.java b/src/main/java/tconstruct/items/tools/Chisel.java
index 1223c849bb4..2f157763724 100644
--- a/src/main/java/tconstruct/items/tools/Chisel.java
+++ b/src/main/java/tconstruct/items/tools/Chisel.java
@@ -12,17 +12,17 @@
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumMovingObjectType;
 import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.MovingObjectPosition.MovingObjectType;
 import net.minecraft.world.World;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
 public class Chisel extends ToolCore
 {
-    public Chisel(int id)
+    public Chisel()
     {
-        super(id, 0);
+        super(0);
         this.setUnlocalizedName("InfiTool.Chisel");
         this.setContainerItem(this);
     }
@@ -89,7 +89,7 @@ public ItemStack onEaten (ItemStack itemstack, World world, EntityPlayer entityp
             {
                 return itemstack;
             }
-            if (movingobjectposition.typeOfHit == EnumMovingObjectType.TILE)
+            if (movingobjectposition.typeOfHit == MovingObjectType.TILE)
             {
                 int x = movingobjectposition.blockX;
                 int y = movingobjectposition.blockY;
diff --git a/src/main/java/tconstruct/items/tools/Cleaver.java b/src/main/java/tconstruct/items/tools/Cleaver.java
index ddd2fa4bf74..6bb83faa736 100644
--- a/src/main/java/tconstruct/items/tools/Cleaver.java
+++ b/src/main/java/tconstruct/items/tools/Cleaver.java
@@ -16,9 +16,9 @@
 
 public class Cleaver extends Weapon
 {
-    public Cleaver(int itemID)
+    public Cleaver()
     {
-        super(itemID, 6);
+        super(6);
         this.setUnlocalizedName("InfiTool.Cleaver");
     }
 
diff --git a/src/main/java/tconstruct/items/tools/Cutlass.java b/src/main/java/tconstruct/items/tools/Cutlass.java
index e57a500c1a5..7b6b6ea0162 100644
--- a/src/main/java/tconstruct/items/tools/Cutlass.java
+++ b/src/main/java/tconstruct/items/tools/Cutlass.java
@@ -1,18 +1,15 @@
 package tconstruct.items.tools;
 
-import java.util.List;
-
 import tconstruct.common.TRepo;
 import tconstruct.library.tools.Weapon;
 
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 
 public class Cutlass extends Weapon
 {
     public Cutlass(int itemID)
     {
-        super(itemID, 4);
+        super(4);
         this.setUnlocalizedName("InfiTool.Cutlass");
     }
 
diff --git a/src/main/java/tconstruct/items/tools/Dagger.java b/src/main/java/tconstruct/items/tools/Dagger.java
index d839e0ffda9..658bfa0651d 100644
--- a/src/main/java/tconstruct/items/tools/Dagger.java
+++ b/src/main/java/tconstruct/items/tools/Dagger.java
@@ -11,9 +11,9 @@
 
 public class Dagger extends Weapon
 {
-    public Dagger(int id)
+    public Dagger()
     {
-        super(id, 1);
+        super(1);
         this.setUnlocalizedName("InfiTool.Dagger");
     }
 
diff --git a/src/main/java/tconstruct/items/tools/Excavator.java b/src/main/java/tconstruct/items/tools/Excavator.java
index 4b5f90c01f4..3e37b1236fc 100644
--- a/src/main/java/tconstruct/items/tools/Excavator.java
+++ b/src/main/java/tconstruct/items/tools/Excavator.java
@@ -19,9 +19,9 @@
 
 public class Excavator extends HarvestTool
 {
-    public Excavator(int itemID)
+    public Excavator()
     {
-        super(itemID, 2);
+        super(2);
         this.setUnlocalizedName("InfiTool.Excavator");
     }
 
diff --git a/src/main/java/tconstruct/items/tools/FryingPan.java b/src/main/java/tconstruct/items/tools/FryingPan.java
index 9111c38c874..5ad64e01163 100644
--- a/src/main/java/tconstruct/items/tools/FryingPan.java
+++ b/src/main/java/tconstruct/items/tools/FryingPan.java
@@ -24,9 +24,9 @@
 
 public class FryingPan extends Weapon
 {
-    public FryingPan(int itemID)
+    public FryingPan()
     {
-        super(itemID, 2);
+        super(2);
         this.setUnlocalizedName("InfiTool.FryPan");
     }
 
diff --git a/src/main/java/tconstruct/items/tools/Hatchet.java b/src/main/java/tconstruct/items/tools/Hatchet.java
index 3072e5b9477..b2d764dfd58 100644
--- a/src/main/java/tconstruct/items/tools/Hatchet.java
+++ b/src/main/java/tconstruct/items/tools/Hatchet.java
@@ -15,9 +15,9 @@
 
 public class Hatchet extends HarvestTool
 {
-    public Hatchet(int itemID)
+    public Hatchet()
     {
-        super(itemID, 3);
+        super(3);
         this.setUnlocalizedName("InfiTool.Axe");
     }
 
diff --git a/src/main/java/tconstruct/items/tools/Longsword.java b/src/main/java/tconstruct/items/tools/Longsword.java
index 9c13a0e3d9c..4694754fb72 100644
--- a/src/main/java/tconstruct/items/tools/Longsword.java
+++ b/src/main/java/tconstruct/items/tools/Longsword.java
@@ -15,9 +15,9 @@
 
 public class Longsword extends Weapon
 {
-    public Longsword(int itemID)
+    public Longsword()
     {
-        super(itemID, 4);
+        super(4);
         this.setUnlocalizedName("InfiTool.Longsword");
     }
 
diff --git a/src/main/java/tconstruct/items/tools/LumberAxe.java b/src/main/java/tconstruct/items/tools/LumberAxe.java
index 84b7fb24ca7..e4f3f069278 100644
--- a/src/main/java/tconstruct/items/tools/LumberAxe.java
+++ b/src/main/java/tconstruct/items/tools/LumberAxe.java
@@ -19,9 +19,9 @@
 
 public class LumberAxe extends HarvestTool
 {
-    public LumberAxe(int itemID)
+    public LumberAxe()
     {
-        super(itemID, 0);
+        super(0);
         this.setUnlocalizedName("InfiTool.LumberAxe");
     }
 
diff --git a/src/main/java/tconstruct/items/tools/Mattock.java b/src/main/java/tconstruct/items/tools/Mattock.java
index 08b03c34699..c901f30100e 100644
--- a/src/main/java/tconstruct/items/tools/Mattock.java
+++ b/src/main/java/tconstruct/items/tools/Mattock.java
@@ -17,9 +17,9 @@
 
 public class Mattock extends DualHarvestTool
 {
-    public Mattock(int itemID)
+    public Mattock()
     {
-        super(itemID, 3);
+        super(3);
         this.setUnlocalizedName("InfiTool.Mattock");
     }
 
diff --git a/src/main/java/tconstruct/items/tools/Pickaxe.java b/src/main/java/tconstruct/items/tools/Pickaxe.java
index a685882ee17..6064f0a2bc2 100644
--- a/src/main/java/tconstruct/items/tools/Pickaxe.java
+++ b/src/main/java/tconstruct/items/tools/Pickaxe.java
@@ -7,9 +7,9 @@
 
 public class Pickaxe extends HarvestTool
 {
-    public Pickaxe(int itemID)
+    public Pickaxe()
     {
-        super(itemID, 1);
+        super(1);
         this.setUnlocalizedName("InfiTool.Pickaxe");
     }
 
diff --git a/src/main/java/tconstruct/items/tools/PotionLauncher.java b/src/main/java/tconstruct/items/tools/PotionLauncher.java
index b49660a1a70..7b8a9056bcf 100644
--- a/src/main/java/tconstruct/items/tools/PotionLauncher.java
+++ b/src/main/java/tconstruct/items/tools/PotionLauncher.java
@@ -44,7 +44,7 @@ public ItemStack onEaten (ItemStack stack, World world, EntityPlayer player)
 
             NBTTagCompound potionTag = new NBTTagCompound();
             potion.writeToNBT(potionTag);
-            tags.setCompoundTag("LoadedPotion", potionTag);
+            tags.setTag("LoadedPotion", potionTag);
             tags.setBoolean("Loaded", true);
 
             if (!player.capabilities.isCreativeMode)
@@ -115,7 +115,7 @@ public void getSubItems (Block b, CreativeTabs tabs, List list)
         ItemStack stack = new ItemStack(b, 1, 0);
         NBTTagCompound compound = new NBTTagCompound();
         NBTTagCompound tags = new NBTTagCompound();
-        compound.setCompoundTag("InfiTool", tags);
+        compound.setTag("InfiTool", tags);
 
         tags.setBoolean("Loaded", false);
 
diff --git a/src/main/java/tconstruct/items/tools/Rapier.java b/src/main/java/tconstruct/items/tools/Rapier.java
index a0da0023d91..e406c96d50e 100644
--- a/src/main/java/tconstruct/items/tools/Rapier.java
+++ b/src/main/java/tconstruct/items/tools/Rapier.java
@@ -13,9 +13,9 @@
 
 public class Rapier extends Weapon
 {
-    public Rapier(int itemID)
+    public Rapier()
     {
-        super(itemID, 2);
+        super(2);
         this.setUnlocalizedName("InfiTool.Rapier");
     }
 
diff --git a/src/main/java/tconstruct/items/tools/Scythe.java b/src/main/java/tconstruct/items/tools/Scythe.java
index 3d18b071dad..fccdf5c9789 100644
--- a/src/main/java/tconstruct/items/tools/Scythe.java
+++ b/src/main/java/tconstruct/items/tools/Scythe.java
@@ -22,9 +22,9 @@
 
 public class Scythe extends Weapon
 {
-    public Scythe(int itemID)
+    public Scythe()
     {
-        super(itemID, 4);
+        super(4);
         this.setUnlocalizedName("InfiTool.Scythe");
     }
 
diff --git a/src/main/java/tconstruct/items/tools/Shortbow.java b/src/main/java/tconstruct/items/tools/Shortbow.java
index f6ba3c510b3..cd015720d43 100644
--- a/src/main/java/tconstruct/items/tools/Shortbow.java
+++ b/src/main/java/tconstruct/items/tools/Shortbow.java
@@ -15,9 +15,9 @@
 
 public class Shortbow extends BowBase
 {
-    public Shortbow(int itemID)
+    public Shortbow()
     {
-        super(itemID);
+        super();
         this.setUnlocalizedName("InfiTool.Shortbow");
     }
 
diff --git a/src/main/java/tconstruct/items/tools/Shovel.java b/src/main/java/tconstruct/items/tools/Shovel.java
index 2e77fa67783..a5dfb2557b5 100644
--- a/src/main/java/tconstruct/items/tools/Shovel.java
+++ b/src/main/java/tconstruct/items/tools/Shovel.java
@@ -9,9 +9,9 @@
 
 public class Shovel extends HarvestTool
 {
-    public Shovel(int itemID)
+    public Shovel()
     {
-        super(itemID, 2);
+        super(2);
         this.setUnlocalizedName("InfiTool.Shovel");
     }
 
diff --git a/src/main/java/tconstruct/library/TConstructRegistry.java b/src/main/java/tconstruct/library/TConstructRegistry.java
index 68c2efd75a7..b610c385bc4 100644
--- a/src/main/java/tconstruct/library/TConstructRegistry.java
+++ b/src/main/java/tconstruct/library/TConstructRegistry.java
@@ -556,7 +556,7 @@ static void initializeDrawbridgeState ()
         drawbridgeState[Blocks.mushroomRed] = 1;
         drawbridgeState[Blocks.gold_block] = 1;
         drawbridgeState[Blocks.iron_block] = 1;
-        drawbridgeState[Blocks.brick] = 1;
+        drawbridgeState[Blocks.brick_block] = 1;
         drawbridgeState[Blocks.tnt] = 1;
         drawbridgeState[Blocks.bookShelf] = 1;
         drawbridgeState[Blocks.cobblestoneMossy] = 1;
diff --git a/src/main/java/tconstruct/library/armor/ArmorCore.java b/src/main/java/tconstruct/library/armor/ArmorCore.java
index d8bedf78f97..3eb8aeb1511 100644
--- a/src/main/java/tconstruct/library/armor/ArmorCore.java
+++ b/src/main/java/tconstruct/library/armor/ArmorCore.java
@@ -28,9 +28,9 @@ public abstract class ArmorCore extends ItemArmor implements IEnergyContainerIte
     protected int maxReceive = 75;
     protected int maxExtract = 75;
 
-    public ArmorCore(int par1, int baseProtection, EnumArmorPart part)
+    public ArmorCore(int baseProtection, EnumArmorPart part)
     {
-        super(par1, EnumArmorMaterial.CHAIN, 0, part.getPartId());
+        super(ArmorMaterial.CHAIN, 0, part.getPartId());
         this.maxStackSize = 1;
         this.setMaxDamage(100);
         this.setUnlocalizedName(SET_NAME);
diff --git a/src/main/java/tconstruct/library/crafting/FluidType.java b/src/main/java/tconstruct/library/crafting/FluidType.java
index ca878d67456..8d58d6dc5a3 100644
--- a/src/main/java/tconstruct/library/crafting/FluidType.java
+++ b/src/main/java/tconstruct/library/crafting/FluidType.java
@@ -1,6 +1,7 @@
 package tconstruct.library.crafting;
 
 import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
 import net.minecraftforge.fluids.*;
 import tconstruct.common.TRepo;
 
@@ -11,7 +12,7 @@ public enum FluidType
     /** Iron Smelting **/
     Iron(Block.blockIron.blockID, 0, 600, TRepo.moltenIronFluid, true),
     /** Gold  Smelting **/
-    Gold(Block.blockGold.blockID, 0, 400, TRepo.moltenGoldFluid, false),
+    Gold(Blocks.glold_block.blockID, 0, 400, TRepo.moltenGoldFluid, false),
     /** Tin  Smelting **/
     Tin(TRepo.metalBlock.blockID, 5, 400, TRepo.moltenTinFluid, false),
     /** Copper  Smelting **/
diff --git a/src/main/java/tconstruct/library/crafting/PatternBuilder.java b/src/main/java/tconstruct/library/crafting/PatternBuilder.java
index be61072d7c9..6d0327a7e80 100644
--- a/src/main/java/tconstruct/library/crafting/PatternBuilder.java
+++ b/src/main/java/tconstruct/library/crafting/PatternBuilder.java
@@ -5,16 +5,15 @@
 import java.util.HashMap;
 import java.util.List;
 
+import cpw.mods.fml.common.eventhandler.Event.Result;
 import tconstruct.library.TConstructRegistry;
 import tconstruct.library.event.PartBuilderEvent;
 import tconstruct.library.tools.CustomMaterial;
 import tconstruct.library.util.IPattern;
-
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.Event.Result;
 
 public class PatternBuilder
 {
diff --git a/src/main/java/tconstruct/library/crafting/ToolBuilder.java b/src/main/java/tconstruct/library/crafting/ToolBuilder.java
index 0888348c8fa..63f8ddc1bd0 100644
--- a/src/main/java/tconstruct/library/crafting/ToolBuilder.java
+++ b/src/main/java/tconstruct/library/crafting/ToolBuilder.java
@@ -5,11 +5,13 @@
 import java.util.HashMap;
 import java.util.List;
 
+import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.MinecraftForge;
 import cpw.mods.fml.common.event.*;
+import cpw.mods.fml.common.eventhandler.Event.Result;
 import tconstruct.library.TConstructRegistry;
 import tconstruct.library.armor.ArmorCore;
 import tconstruct.library.armor.ArmorMod;
@@ -118,9 +120,9 @@ public int getMaterialID (ItemStack stack)
         if (stack == null)
             return -1;
         Item item = stack.getItem();
-        if (item == Item.stick)
+        if (item == Items.stick)
             return 0;
-        else if (item == Item.bone)
+        else if (item == Items.bone)
             return 5;
         else if (item instanceof IToolPart)
             return ((IToolPart) item).getMaterialID(stack);
@@ -266,7 +268,7 @@ else if (item.durabilityTypeExtra() == 1)
         ItemStack tool = new ItemStack(item);
         NBTTagCompound compound = new NBTTagCompound();
 
-        compound.setCompoundTag("InfiTool", new NBTTagCompound());
+        compound.setTag("InfiTool", new NBTTagCompound());
         compound.getCompoundTag("InfiTool").setInteger("Head", head);
         compound.getCompoundTag("InfiTool").setInteger("RenderHead", head);
 
@@ -326,7 +328,7 @@ else if (item.durabilityTypeExtra() == 1)
 
         if (name != null && !name.equals(""))
         {
-            compound.setCompoundTag("display", new NBTTagCompound());
+            compound.setTag("display", new NBTTagCompound());
             compound.getCompoundTag("display").setString("Name", "\u00A7f" + name);
         }
 
@@ -369,7 +371,7 @@ public ItemStack modifyTool (ItemStack input, ItemStack[] slots, String name)
         tags = tool.getTagCompound();
         if (name != null && !name.equals("") && !tags.hasKey("display"))
         {
-            tags.setCompoundTag("display", new NBTTagCompound());
+            tags.setTag("display", new NBTTagCompound());
             tags.getCompoundTag("display").setString("Name", "\u00A7f" + name);
         }
 
@@ -399,7 +401,7 @@ public ItemStack modifyArmor (ItemStack input, ItemStack[] slots, String name)
         tags = armor.getTagCompound();
         if (name != null && !name.equals("") && !tags.hasKey("display"))
         {
-            tags.setCompoundTag("display", new NBTTagCompound());
+            tags.setTag("display", new NBTTagCompound());
             tags.getCompoundTag("display").setString("Name", "\u00A7f" + name);
         }
 
@@ -437,7 +439,7 @@ public ItemStack modifyTool (ItemStack input, ItemStack topSlot, ItemStack botto
         tags = tool.getTagCompound();
         if (name != null && !name.equals("") && !tags.hasKey("display"))
         {
-            tags.setCompoundTag("display", new NBTTagCompound());
+            tags.setTag("display", new NBTTagCompound());
             tags.getCompoundTag("display").setString("Name", "\u00A7f" + name);
         }
 
diff --git a/src/main/java/tconstruct/library/crafting/ToolRecipe.java b/src/main/java/tconstruct/library/crafting/ToolRecipe.java
index 3d4f95cb1de..fd25c3ae63e 100644
--- a/src/main/java/tconstruct/library/crafting/ToolRecipe.java
+++ b/src/main/java/tconstruct/library/crafting/ToolRecipe.java
@@ -2,6 +2,7 @@
 
 import java.util.LinkedList;
 
+import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import tconstruct.library.TConstructRegistry;
 import tconstruct.library.tools.ToolCore;
@@ -81,7 +82,7 @@ public boolean validHandle (Item input)
         {
             if (part == input)
                 return true;
-            if (toolRod != null && part == toolRod && (input == Item.stick || input == Item.bone))
+            if (toolRod != null && part == toolRod && (input == Items.stick || input == Items.bone))
                 return true;
         }
         return false;
@@ -99,7 +100,7 @@ public boolean validAccessory (Item input)
         {
             if (part == input)
                 return true;
-            if (toolRod != null && part == toolRod && (input == Item.stick || input == Item.bone))
+            if (toolRod != null && part == toolRod && (input == Items.stick || input == Items.bone))
                 return true;
         }
         return false;
@@ -117,7 +118,7 @@ public boolean validExtra (Item input)
         {
             if (part == input)
                 return true;
-            if (toolRod != null && part == toolRod && (input == Item.stick || input == Item.bone))
+            if (toolRod != null && part == toolRod && (input == Items.stick || input == Items.bone))
                 return true;
         }
         return false;
diff --git a/src/main/java/tconstruct/library/tools/DualHarvestTool.java b/src/main/java/tconstruct/library/tools/DualHarvestTool.java
index 93550acf55f..8dd599f7a5e 100644
--- a/src/main/java/tconstruct/library/tools/DualHarvestTool.java
+++ b/src/main/java/tconstruct/library/tools/DualHarvestTool.java
@@ -14,9 +14,9 @@
 
 public abstract class DualHarvestTool extends HarvestTool
 {
-    public DualHarvestTool(int itemID, int baseDamage)
+    public DualHarvestTool(int baseDamage)
     {
-        super(itemID, baseDamage);
+        super(baseDamage);
     }
 
     @Override
diff --git a/src/main/java/tconstruct/library/util/TabTools.java b/src/main/java/tconstruct/library/util/TabTools.java
index 202e260f569..6da985bd602 100644
--- a/src/main/java/tconstruct/library/util/TabTools.java
+++ b/src/main/java/tconstruct/library/util/TabTools.java
@@ -1,6 +1,7 @@
 package tconstruct.library.util;
 
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
 public class TabTools extends CreativeTabs
@@ -21,4 +22,9 @@ public ItemStack getIconItemStack ()
     {
         return display;
     }
+
+    public Item getTabIconItem ()
+    {
+        return display.getItem();
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java b/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java
index 685b7fcbe6d..7727bc5a459 100644
--- a/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java
+++ b/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java
@@ -73,7 +73,7 @@ public void modify (ItemStack[] input, ItemStack tool)
 
     public void addEnchantment (ItemStack tool, Enchantment enchant, int level)
     {
-        NBTTagList tags = new NBTTagList("ench");
+        NBTTagList tags = new NBTTagList();
         Map enchantMap = EnchantmentHelper.getEnchantments(tool);
         Iterator iterator = enchantMap.keySet().iterator();
         int index;
diff --git a/src/main/java/tconstruct/modifiers/tools/ModLapis.java b/src/main/java/tconstruct/modifiers/tools/ModLapis.java
index 5614d2dc87d..70b48e74a39 100644
--- a/src/main/java/tconstruct/modifiers/tools/ModLapis.java
+++ b/src/main/java/tconstruct/modifiers/tools/ModLapis.java
@@ -165,7 +165,7 @@ else if (keyPair[0] >= 10)
 
     public void addEnchantment (ItemStack tool, Enchantment enchant, int level)
     {
-        NBTTagList tags = new NBTTagList("ench");
+        NBTTagList tags = new NBTTagList();
         Map enchantMap = EnchantmentHelper.getEnchantments(tool);
         Iterator iterator = enchantMap.keySet().iterator();
         int index;
diff --git a/src/main/java/tconstruct/modifiers/tools/ModPotion.java b/src/main/java/tconstruct/modifiers/tools/ModPotion.java
index cc2581fc17b..3dc888fac3c 100644
--- a/src/main/java/tconstruct/modifiers/tools/ModPotion.java
+++ b/src/main/java/tconstruct/modifiers/tools/ModPotion.java
@@ -1,6 +1,7 @@
 package tconstruct.modifiers.tools;
 
 import tconstruct.library.tools.ToolMod;
+import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -10,7 +11,7 @@ public class ModPotion extends ToolMod
 
     public ModPotion(ItemStack[] items, int effect, String dataKey)
     {
-        super(new ItemStack[] { new ItemStack(Item.potion, 1, Short.MAX_VALUE) }, 0, "");
+        super(new ItemStack[] { new ItemStack(Items.potion, 1, Short.MAX_VALUE) }, 0, "");
     }
 
     protected boolean canModify (ItemStack tool, ItemStack[] input)
diff --git a/src/main/java/tconstruct/plugins/PluginController.java b/src/main/java/tconstruct/plugins/PluginController.java
index 9bd6fae8dd6..2f721c8e8b3 100644
--- a/src/main/java/tconstruct/plugins/PluginController.java
+++ b/src/main/java/tconstruct/plugins/PluginController.java
@@ -1,7 +1,7 @@
 package tconstruct.plugins;
 
 import cpw.mods.fml.common.Loader;
-import net.minecraftforge.common.Configuration;
+import net.minecraftforge.common.config.Configuration;
 import tconstruct.TConstruct;
 import tconstruct.plugins.ic2.IC2;
 import tconstruct.plugins.imc.AppEng;
diff --git a/src/main/java/tconstruct/plugins/imc/BuildcraftTransport.java b/src/main/java/tconstruct/plugins/imc/BuildcraftTransport.java
index af4ccdf8c3d..e5f83f2ddfa 100644
--- a/src/main/java/tconstruct/plugins/imc/BuildcraftTransport.java
+++ b/src/main/java/tconstruct/plugins/imc/BuildcraftTransport.java
@@ -1,5 +1,6 @@
 package tconstruct.plugins.imc;
 
+import net.minecraft.block.Block;
 import cpw.mods.fml.common.event.FMLInterModComms;
 import tconstruct.TConstruct;
 import tconstruct.common.TRepo;
@@ -21,42 +22,42 @@ public void preInit() {
     public void init() {
         TConstruct.logger.info("[BC|Transport] Registering facades.");
         // Smeltery Blocks
-        addFacade(TRepo.smeltery.blockID, 2);
+        addFacade(TRepo.smeltery, 2);
         for (int sc = 4; sc < 11; sc++)
         {
-            addFacade(TRepo.smeltery.blockID, sc);
+            addFacade(TRepo.smeltery, sc);
         }
         // Multi Brick + Fancy
         for (int sc = 0; sc < 13; sc++)
         {
-            addFacade(TRepo.multiBrick.blockID, sc);
+            addFacade(TRepo.multiBrick, sc);
         }
         for (int sc = 0; sc < 16; sc++)
         {
-            addFacade(TRepo.multiBrickFancy.blockID, sc);
+            addFacade(TRepo.multiBrickFancy, sc);
         }
         // Special Soil
         for (int sc = 0; sc < 6; sc++)
         {
-            addFacade(TRepo.craftedSoil.blockID, sc);
+            addFacade(TRepo.craftedSoil, sc);
         }
         // Metal Storage
         for (int sc = 0; sc < 11; sc++)
         {
-            addFacade(TRepo.metalBlock.blockID, sc);
+            addFacade(TRepo.metalBlock, sc);
         }
         // Speed Block
         for (int sc = 0; sc < 7; sc++)
         {
-            addFacade(TRepo.speedBlock.blockID, sc);
+            addFacade(TRepo.speedBlock, sc);
         }
         // Hambone
-        addFacade(TRepo.meatBlock.blockID, 4);
-        addFacade(TRepo.meatBlock.blockID, 8);
+        addFacade(TRepo.meatBlock, 4);
+        addFacade(TRepo.meatBlock, 8);
 
         // Slime Gel
-        addFacade(TRepo.slimeGel.blockID, 0);
-        addFacade(TRepo.slimeGel.blockID, 1);
+        addFacade(TRepo.slimeGel, 0);
+        addFacade(TRepo.slimeGel, 1);
     }
 
     @Override
@@ -64,9 +65,9 @@ public void postInit() {
 
     }
 
-    private void addFacade (int blockId, int meta)
+    private void addFacade (Block b, int meta)
     {
-        FMLInterModComms.sendMessage("BuildCraft|Transport", "add-facade", String.format("%d@%d", blockId, meta));
+        FMLInterModComms.sendMessage("BuildCraft|Transport", "add-facade", String.format("%d@%d", "REPLACE W/ UNLOCALIZED NAME", meta));
     }
 
 }
diff --git a/src/main/java/tconstruct/plugins/imc/Mystcraft.java b/src/main/java/tconstruct/plugins/imc/Mystcraft.java
index 43b375619e7..11ef88cfa8a 100644
--- a/src/main/java/tconstruct/plugins/imc/Mystcraft.java
+++ b/src/main/java/tconstruct/plugins/imc/Mystcraft.java
@@ -34,7 +34,7 @@ public void postInit() {
     private void sendFluidBlacklist (String FluidName)
     {
         NBTTagCompound NBTMsg = new NBTTagCompound();
-        NBTMsg.setCompoundTag("fluidsymbol", new NBTTagCompound());
+        NBTMsg.setTag("fluidsymbol", new NBTTagCompound());
         NBTMsg.getCompoundTag("fluidsymbol").setFloat("rarity", 0.0F);
         NBTMsg.getCompoundTag("fluidsymbol").setFloat("grammarweight", 0.0F);
         NBTMsg.getCompoundTag("fluidsymbol").setFloat("instabilityPerBlock", 10000F);// renders creative symbol useless
diff --git a/src/main/java/tconstruct/preloader/TConstructLoaderContainer.java b/src/main/java/tconstruct/preloader/TConstructLoaderContainer.java
index f0adc559bc1..d3223e3f7ad 100644
--- a/src/main/java/tconstruct/preloader/TConstructLoaderContainer.java
+++ b/src/main/java/tconstruct/preloader/TConstructLoaderContainer.java
@@ -6,6 +6,7 @@
  */
 
 import com.google.common.eventbus.EventBus;
+
 import cpw.mods.fml.common.DummyModContainer;
 import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.LoadController;
@@ -14,7 +15,6 @@
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
-import net.minecraftforge.event.ForgeSubscribe;
 import tconstruct.preloader.helpers.PropertyManager;
 import tconstruct.preloader.helpers.PropertyManager.PropAccessException;
 
@@ -69,24 +69,6 @@ public TConstructLoaderContainer()
         md.authorList = Arrays.asList("AlgorithmX2", "Sunstrike");
     }
 
-    /*@ForgeSubscribe
-    public void preInit (FMLPreInitializationEvent evt)
-    {
-
-    }
-
-    @ForgeSubscribe
-    public void init (FMLInitializationEvent evt)
-    {
-
-    }
-
-    @ForgeSubscribe
-    public void postInit (FMLPostInitializationEvent evt)
-    {
-
-    }*/
-
     @Override
     public String getModId ()
     {
@@ -147,8 +129,10 @@ public void injectData (Map<String, Object> data)
     {
     }
 
-    @Deprecated
-    public String[] getLibraryRequestClass() {
-        return new String[0];
+    //TODO IMPLEMENT THIS
+    @Override
+    public String getAccessTransformerClass ()
+    {
+        return null;
     }
 }
diff --git a/src/main/java/tconstruct/util/TEventHandler.java b/src/main/java/tconstruct/util/TEventHandler.java
index eef7b41d903..41e5638775b 100644
--- a/src/main/java/tconstruct/util/TEventHandler.java
+++ b/src/main/java/tconstruct/util/TEventHandler.java
@@ -1,7 +1,6 @@
 package tconstruct.util;
 
 import tconstruct.util.player.ArmorExtended;
-
 import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
 
 import java.util.Random;
@@ -22,6 +21,7 @@
 import net.minecraft.entity.monster.IMob;
 import net.minecraft.entity.passive.EntityChicken;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemFood;
 import net.minecraft.item.ItemStack;
@@ -550,7 +550,7 @@ else if (evt.Name == "crystalCerusQuartz")
     @ForgeSubscribe
     public void bucketFill (FillBucketEvent evt)
     {
-        if (evt.current.getItem() == Item.bucketEmpty && evt.target.typeOfHit == EnumMovingObjectType.TILE)
+        if (evt.current.getItem() == Items.bucket && evt.target.typeOfHit == EnumMovingObjectType.TILE)
         {
             int hitX = evt.target.blockX;
             int hitY = evt.target.blockY;
diff --git a/src/main/java/tconstruct/worldgen/village/ComponentToolWorkshop.java b/src/main/java/tconstruct/worldgen/village/ComponentToolWorkshop.java
index f5cf5b31760..579ea5d3d38 100644
--- a/src/main/java/tconstruct/worldgen/village/ComponentToolWorkshop.java
+++ b/src/main/java/tconstruct/worldgen/village/ComponentToolWorkshop.java
@@ -61,27 +61,27 @@ public boolean addComponentParts (World world, Random random, StructureBoundingB
          * maxZ, int placeBlockId, int replaceBlockId, boolean alwaysreplace)
          */
 
-        this.fillWithBlocks(world, sbb, 0, 0, 0, 6, 0, 6, Block.cobblestone.blockID, Block.cobblestone.blockID, false); //Base
-        this.fillWithBlocks(world, sbb, 0, 5, 0, 6, 5, 6, Block.fence.blockID, Block.fence.blockID, false);
-        this.fillWithBlocks(world, sbb, 1, 0, 1, 5, 0, 5, Block.planks.blockID, Block.planks.blockID, false);
-        this.fillWithBlocks(world, sbb, 2, 0, 2, 4, 0, 4, Block.cloth.blockID, Block.cloth.blockID, false);
+        this.fillWithBlocks(world, sbb, 0, 0, 0, 6, 0, 6, Blocks.cobblestone.blockID, Blocks.cobblestone.blockID, false); //Base
+        this.fillWithBlocks(world, sbb, 0, 5, 0, 6, 5, 6, Blocks.fence.blockID, Blocks.fence.blockID, false);
+        this.fillWithBlocks(world, sbb, 1, 0, 1, 5, 0, 5, Blocks.planks.blockID, Blocks.planks.blockID, false);
+        this.fillWithBlocks(world, sbb, 2, 0, 2, 4, 0, 4, Blocks.wool.blockID, Blocks.cloth.blockID, false);
 
         //this.fillWithBlocks(world, sbb, 0, 5, 0, 6, 5, 6, Block.wood.blockID, Block.wood.blockID, false);
 
-        this.fillWithBlocks(world, sbb, 0, 1, 0, 0, 4, 0, Block.wood.blockID, Block.wood.blockID, false); //Edges
-        this.fillWithBlocks(world, sbb, 0, 1, 6, 0, 4, 6, Block.wood.blockID, Block.wood.blockID, false);
-        this.fillWithBlocks(world, sbb, 6, 1, 0, 6, 4, 0, Block.wood.blockID, Block.wood.blockID, false);
-        this.fillWithBlocks(world, sbb, 6, 1, 6, 6, 4, 6, Block.wood.blockID, Block.wood.blockID, false);
+        this.fillWithBlocks(world, sbb, 0, 1, 0, 0, 4, 0, Blocks.log, Blocks.log, false); //Edges
+        this.fillWithBlocks(world, sbb, 0, 1, 6, 0, 4, 6, Blocks.log, Blocks.log, false);
+        this.fillWithBlocks(world, sbb, 6, 1, 0, 6, 4, 0, Blocks.log, Blocks.log, false);
+        this.fillWithBlocks(world, sbb, 6, 1, 6, 6, 4, 6, Blocks.log, Blocks.log, false);
 
-        this.fillWithBlocks(world, sbb, 0, 1, 1, 0, 1, 5, Block.planks.blockID, Block.planks.blockID, false); //Walls
-        this.fillWithBlocks(world, sbb, 1, 1, 0, 5, 1, 0, Block.planks.blockID, Block.planks.blockID, false);
-        this.fillWithBlocks(world, sbb, 6, 1, 1, 6, 1, 5, Block.planks.blockID, Block.planks.blockID, false);
-        this.fillWithBlocks(world, sbb, 1, 1, 6, 5, 1, 6, Block.planks.blockID, Block.planks.blockID, false);
+        this.fillWithBlocks(world, sbb, 0, 1, 1, 0, 1, 5, Blocks.planks, Blocks.planks, false); //Walls
+        this.fillWithBlocks(world, sbb, 1, 1, 0, 5, 1, 0, Blocks.planks, Blocks.planks, false);
+        this.fillWithBlocks(world, sbb, 6, 1, 1, 6, 1, 5, Blocks.planks, Blocks.planks, false);
+        this.fillWithBlocks(world, sbb, 1, 1, 6, 5, 1, 6, Blocks.planks, Blocks.planks, false);
 
-        this.fillWithBlocks(world, sbb, 0, 3, 1, 0, 3, 5, Block.planks.blockID, Block.planks.blockID, false);
-        this.fillWithBlocks(world, sbb, 1, 3, 0, 5, 3, 0, Block.planks.blockID, Block.planks.blockID, false);
-        this.fillWithBlocks(world, sbb, 6, 3, 1, 6, 3, 5, Block.planks.blockID, Block.planks.blockID, false);
-        this.fillWithBlocks(world, sbb, 1, 3, 6, 5, 3, 6, Block.planks.blockID, Block.planks.blockID, false);
+        this.fillWithBlocks(world, sbb, 0, 3, 1, 0, 3, 5, Blocks.planks, Blocks.planks, false);
+        this.fillWithBlocks(world, sbb, 1, 3, 0, 5, 3, 0, Blocks.planks, Blocks.planks, false);
+        this.fillWithBlocks(world, sbb, 6, 3, 1, 6, 3, 5, Blocks.planks, Blocks.planks, false);
+        this.fillWithBlocks(world, sbb, 1, 3, 6, 5, 3, 6, Blocks.planks, Blocks.planks, false);
 
         this.fillWithBlocks(world, sbb, 0, 4, 1, 0, 4, 5, Block.wood.blockID, Block.wood.blockID, false);
         this.fillWithBlocks(world, sbb, 1, 4, 0, 5, 4, 0, Block.wood.blockID, Block.wood.blockID, false);
@@ -89,38 +89,38 @@ public boolean addComponentParts (World world, Random random, StructureBoundingB
         this.fillWithBlocks(world, sbb, 1, 4, 6, 5, 4, 6, Block.wood.blockID, Block.wood.blockID, false);
 
         this.fillWithBlocks(world, sbb, 1, 1, 1, 5, 5, 5, 0, 0, false);
-        this.fillWithBlocks(world, sbb, 1, 4, 1, 5, 4, 5, Block.planks.blockID, Block.planks.blockID, false);
+        this.fillWithBlocks(world, sbb, 1, 4, 1, 5, 4, 5, Blocks.planks, Blocks.planks, false);
 
         //world, blockID, metadata, x, y, z, bounds
-        this.placeBlockAtCurrentPosition(world, Block.thinGlass.blockID, 0, 1, 2, 0, sbb);//Glass and door
-        this.placeBlockAtCurrentPosition(world, Block.planks.blockID, 0, 2, 2, 0, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 1, 2, 0, sbb);//Glass and door
+        this.placeBlockAtCurrentPosition(world, Blocks.planks, 0, 2, 2, 0, sbb);
         this.placeDoorAtCurrentPosition(world, sbb, random, 3, 1, 0, this.getMetadataWithOffset(Block.doorWood.blockID, 1));
-        this.placeBlockAtCurrentPosition(world, Block.planks.blockID, 0, 4, 2, 0, sbb);
-        this.placeBlockAtCurrentPosition(world, Block.thinGlass.blockID, 0, 5, 2, 0, sbb);
-
-        this.placeBlockAtCurrentPosition(world, Block.thinGlass.blockID, 0, 1, 2, 6, sbb);
-        this.placeBlockAtCurrentPosition(world, Block.thinGlass.blockID, 0, 2, 2, 6, sbb);
-        this.placeBlockAtCurrentPosition(world, Block.planks.blockID, 0, 3, 2, 6, sbb);
-        this.placeBlockAtCurrentPosition(world, Block.thinGlass.blockID, 0, 4, 2, 6, sbb);
-        this.placeBlockAtCurrentPosition(world, Block.thinGlass.blockID, 0, 5, 2, 6, sbb);
-
-        this.placeBlockAtCurrentPosition(world, Block.thinGlass.blockID, 0, 0, 2, 1, sbb);
-        this.placeBlockAtCurrentPosition(world, Block.thinGlass.blockID, 0, 0, 2, 2, sbb);
-        this.placeBlockAtCurrentPosition(world, Block.planks.blockID, 0, 0, 2, 3, sbb);
-        this.placeBlockAtCurrentPosition(world, Block.thinGlass.blockID, 0, 0, 2, 4, sbb);
-        this.placeBlockAtCurrentPosition(world, Block.thinGlass.blockID, 0, 0, 2, 5, sbb);
-
-        this.placeBlockAtCurrentPosition(world, Block.thinGlass.blockID, 0, 6, 2, 1, sbb);
-        this.placeBlockAtCurrentPosition(world, Block.thinGlass.blockID, 0, 6, 2, 2, sbb);
-        this.placeBlockAtCurrentPosition(world, Block.planks.blockID, 0, 6, 2, 3, sbb);
-        this.placeBlockAtCurrentPosition(world, Block.thinGlass.blockID, 0, 6, 2, 4, sbb);
-        this.placeBlockAtCurrentPosition(world, Block.thinGlass.blockID, 0, 6, 2, 5, sbb);
-
-        int i = this.getMetadataWithOffset(Block.ladder.blockID, 3); //Ladders
-        this.placeBlockAtCurrentPosition(world, Block.ladder.blockID, i, 3, 1, 5, sbb);
-        this.placeBlockAtCurrentPosition(world, Block.ladder.blockID, i, 3, 2, 5, sbb);
-        this.placeBlockAtCurrentPosition(world, Block.ladder.blockID, i, 3, 3, 5, sbb);
-        this.placeBlockAtCurrentPosition(world, Block.ladder.blockID, i, 3, 4, 5, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.planks, 0, 4, 2, 0, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 5, 2, 0, sbb);
+
+        this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 1, 2, 6, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 2, 2, 6, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.planks, 0, 3, 2, 6, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 4, 2, 6, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 5, 2, 6, sbb);
+
+        this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 0, 2, 1, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 0, 2, 2, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.planks, 0, 0, 2, 3, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 0, 2, 4, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 0, 2, 5, sbb);
+
+        this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 6, 2, 1, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 6, 2, 2, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.planks, 0, 6, 2, 3, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 6, 2, 4, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 6, 2, 5, sbb);
+
+        int i = this.getMetadataWithOffset(Blocks.ladder, 3); //Ladders
+        this.placeBlockAtCurrentPosition(world, Blocks.ladder, i, 3, 1, 5, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.ladder, i, 3, 2, 5, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.ladder, i, 3, 3, 5, sbb);
+        this.placeBlockAtCurrentPosition(world, Blocks.ladder, i, 3, 4, 5, sbb);
 
         this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood.blockID, 0, 1, 1, 1, sbb); //Inside
         this.generateStructurePatternChestContents(world, sbb, random, 1, 1, 2, TRepo.tinkerHousePatterns.getItems(random), TRepo.tinkerHousePatterns.getCount(random));
@@ -134,15 +134,15 @@ public boolean addComponentParts (World world, Random random, StructureBoundingB
 
         this.generateStructureChestContents(world, sbb, random, 4, 1, 5, TRepo.tinkerHouseChest.getItems(random), TRepo.tinkerHouseChest.getCount(random));
         //this.placeBlockAtCurrentPosition(world, Block.chest.blockID, i, 4, 1, 5, sbb);
-        i = this.getMetadataWithOffset(Block.pistonBase.blockID, 3);
-        this.placeBlockAtCurrentPosition(world, Block.pistonBase.blockID, i, 5, 1, 5, sbb);
+        i = this.getMetadataWithOffset(Blocks.piston, 3);
+        this.placeBlockAtCurrentPosition(world, Blocks.piston, i, 5, 1, 5, sbb);
 
         for (int l = 0; l < 6; ++l)
         {
             for (int i1 = 0; i1 < 9; ++i1)
             {
                 this.clearCurrentPositionBlocksUpwards(world, i1, 9, l, sbb);
-                this.fillCurrentPositionBlocksDownwards(world, Blocks.cobblestone.blockID, 0, i1, -1, l, sbb);
+                this.fillCurrentPositionBlocksDownwards(world, Blocks.cobblestone, 0, i1, -1, l, sbb);
             }
         }
         this.spawnVillagers(world, sbb, 3, 1, 3, 1);
@@ -181,7 +181,7 @@ protected boolean generateStructurePatternChestContents (World world, StructureB
         int posY = this.getYWithOffset(y);
         int posZ = this.getZWithOffset(x, z);
 
-        if (par2StructureBoundingBox.isVecInside(posX, posY, posZ) && world.getBlockId(posX, posY, posZ) != Block.chest.blockID)
+        if (par2StructureBoundingBox.isVecInside(posX, posY, posZ) && world.getBlockId(posX, posY, posZ) != Blocks.chest.blockID)
         {
             world.setBlock(posX, posY, posZ, TRepo.toolStationWood.blockID, 5, 2);
             PatternChestLogic logic = (PatternChestLogic) world.getBlockTileEntity(posX, posY, posZ);