diff --git a/src/main/java/tconstruct/blocks/CastingChannelBlock.java b/src/main/java/tconstruct/blocks/CastingChannelBlock.java
index a5c3eca1a33..938bb2f1feb 100644
--- a/src/main/java/tconstruct/blocks/CastingChannelBlock.java
+++ b/src/main/java/tconstruct/blocks/CastingChannelBlock.java
@@ -95,7 +95,7 @@ public int getRenderType ()
     @Override
     public void registerIcons (IIconRegister iconRegister)
     {
-        this.blockIcon = iconRegister.registerIcon("tinker:searedstone");
+        this.field_149761_L = iconRegister.registerIcon("tinker:searedstone");
     }
 
     @Override
diff --git a/src/main/java/tconstruct/blocks/GlassBlockConnected.java b/src/main/java/tconstruct/blocks/GlassBlockConnected.java
index 0550a99590d..462db5da751 100644
--- a/src/main/java/tconstruct/blocks/GlassBlockConnected.java
+++ b/src/main/java/tconstruct/blocks/GlassBlockConnected.java
@@ -5,7 +5,7 @@
 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.util.*;
 import net.minecraft.world.*;
 import tconstruct.library.TConstructRegistry;
@@ -17,7 +17,7 @@
 
 public class GlassBlockConnected extends MantleBlock
 {
-    protected Icon[] icons = new Icon[16];
+    protected IIcon[] icons = new IIcon[16];
     private boolean shouldRenderSelectionBox = true;
     protected String folder;
     private int renderPass;
@@ -33,7 +33,7 @@ public GlassBlockConnected(int par1, String location, boolean hasAlpha)
     }
 
     //For FMP support
-    public Icon[] getIcons ()
+    public IIcon[] getIcons ()
     {
         return icons;
     }
@@ -71,12 +71,12 @@ public boolean shouldConnectToBlock (IBlockAccess par1IBlockAccess, int par2, in
     }
 
     @Override
-    public Icon getBlockTexture (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)
+    public IIcon getBlockTexture (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)
     {
         return par1IBlockAccess.getBlockMetadata(par2, par3, par4) == 15 ? icons[0] : getConnectedBlockTexture(par1IBlockAccess, par2, par3, par4, par5, icons);
     }
 
-    public Icon getConnectedBlockTexture (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5, Icon[] icons)
+    public IIcon getConnectedBlockTexture (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5, Icon[] icons)
     {
         if (PHConstruct.connectedTexturesMode == 0)
         {
@@ -592,7 +592,7 @@ public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, in
     }
 
     @Override
-    public Icon getIcon (int par1, int par2)
+    public IIcon getIcon (int par1, int par2)
     {
         return icons[0];
     }
@@ -611,7 +611,7 @@ public AxisAlignedBB getSelectedBoundingBoxFromPool (World par1World, int par2,
     }
 
     @Override
-    public void registerIcons (IconRegister par1IconRegister)
+    public void registerIcons (IIconRegister par1IconRegister)
     {
         icons[0] = par1IconRegister.registerIcon("tinker:glass/" + folder + "/glass");
         icons[1] = par1IconRegister.registerIcon("tinker:glass/" + folder + "/glass_1_d");
diff --git a/src/main/java/tconstruct/blocks/SoilSlab.java b/src/main/java/tconstruct/blocks/SoilSlab.java
index 235b14962fa..6c06d83dd5a 100644
--- a/src/main/java/tconstruct/blocks/SoilSlab.java
+++ b/src/main/java/tconstruct/blocks/SoilSlab.java
@@ -6,6 +6,7 @@
 import net.minecraft.block.material.Material;
 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.IIcon;
 import net.minecraft.world.ColorizerGrass;
@@ -28,7 +29,7 @@ public SoilSlab()
     @SideOnly(Side.CLIENT)
     public void registerIcons (IIconRegister iconRegister)
     {
-        this.blockIcon = iconRegister.registerIcon("tinker:grass_top");
+        this.field_149761_L = iconRegister.registerIcon("tinker:grass_top");
     }
 
     @Override
@@ -38,11 +39,11 @@ public IIcon getIcon (int side, int meta)
         switch (meta % 8)
         {
         case 0:
-            return this.blockIcon;//Block.grass.getIcon(1, 0);
+            return this.field_149761_L;//Block.grass.getIcon(1, 0);
         case 1:
-            return Block.dirt.getIcon(side, 0);
+            return Blocks.dirt.getIcon(side, 0);
         case 2:
-            return Block.mycelium.getIcon(1, 0);
+            return Blocks.mycelium.getIcon(1, 0);
         default:
             return TRepo.craftedSoil.getIcon(side, meta - 3);
         }
diff --git a/src/main/java/tconstruct/blocks/ToolForgeBlock.java b/src/main/java/tconstruct/blocks/ToolForgeBlock.java
index 0404082f6b5..73e25dcdf6f 100644
--- a/src/main/java/tconstruct/blocks/ToolForgeBlock.java
+++ b/src/main/java/tconstruct/blocks/ToolForgeBlock.java
@@ -8,11 +8,13 @@
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 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.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
 import tconstruct.TConstruct;
 import tconstruct.blocks.logic.ToolForgeLogic;
 import tconstruct.client.block.TableForgeRender;
@@ -62,13 +64,13 @@ public IIcon getIcon (int side, int meta)
             switch (meta)
             {
             case 0:
-                return Block.blockIron.getIcon(side, 0);
+                return Blocks.iron_block.getIcon(side, 0);
             case 1:
-                return Block.blockGold.getIcon(side, 0);
+                return Blocks.gold_block.getIcon(side, 0);
             case 2:
-                return Block.blockDiamond.getIcon(side, 0);
+                return Blocks.diamond_block.getIcon(side, 0);
             case 3:
-                return Block.blockEmerald.getIcon(side, 0);
+                return Blocks.emerald_block.getIcon(side, 0);
             default:
                 return TRepo.metalBlock.getIcon(side, meta - 4);
             }
@@ -127,11 +129,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 < textureNames.length; iter++)
         {
-            list.add(new ItemStack(id, 1, iter));
+            list.add(new ItemStack(b, 1, iter));
         }
     }
 }
diff --git a/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java b/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java
index ce46ffd80c1..0c42b698611 100644
--- a/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java
+++ b/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java
@@ -14,11 +14,11 @@
 import net.minecraft.item.crafting.FurnaceRecipes;
 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.util.MathHelper;
 import net.minecraft.world.World;
-import net.minecraftforge.common.ForgeDirection;
+import net.minecraftforge.common.util.ForgeDirection;
 import tconstruct.inventory.FurnaceContainer;
 import mantle.blocks.abstracts.InventoryLogic;
 import mantle.blocks.iface.IActiveLogic;
diff --git a/src/main/java/tconstruct/blocks/traps/Punji.java b/src/main/java/tconstruct/blocks/traps/Punji.java
index d9603649356..e7768801962 100644
--- a/src/main/java/tconstruct/blocks/traps/Punji.java
+++ b/src/main/java/tconstruct/blocks/traps/Punji.java
@@ -106,7 +106,7 @@ public int getRenderType ()
     @SideOnly(Side.CLIENT)
     public void registerIcons (IIconRegister iconRegister)
     {
-        this.blockIcon = iconRegister.registerIcon("tinker:punji");
+        this.field_149761_L = iconRegister.registerIcon("tinker:punji");
     }
 
     @Override
diff --git a/src/main/java/tconstruct/client/TProxyClient.java b/src/main/java/tconstruct/client/TProxyClient.java
index 7b1a1a29659..db875062dfe 100644
--- a/src/main/java/tconstruct/client/TProxyClient.java
+++ b/src/main/java/tconstruct/client/TProxyClient.java
@@ -25,6 +25,8 @@
 import net.minecraft.client.renderer.entity.*;
 import net.minecraft.client.settings.*;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
 import net.minecraft.item.*;
 import net.minecraft.util.*;
 import net.minecraft.world.World;
@@ -242,10 +244,10 @@ public void registerRenderer ()
 
         RenderingRegistry.registerEntityRenderingHandler(CartEntity.class, new CartRender());
         RenderingRegistry.registerEntityRenderingHandler(Crystal.class, new CrystalRender());
-        RenderingRegistry.registerEntityRenderingHandler(LaunchedPotion.class, new LaunchedItemRender(Item.potion, 16384));
+        RenderingRegistry.registerEntityRenderingHandler(LaunchedPotion.class, new LaunchedItemRender(Items.potion, 16384));
         RenderingRegistry.registerEntityRenderingHandler(DaggerEntity.class, new DaggerRenderCustom());
         RenderingRegistry.registerEntityRenderingHandler(ArrowEntity.class, new ArrowRenderCustom());
-        RenderingRegistry.registerEntityRenderingHandler(EntityLandmineFirework.class, new RenderSnowball(Item.firework));
+        RenderingRegistry.registerEntityRenderingHandler(EntityLandmineFirework.class, new RenderSnowball(Items.firework));
         RenderingRegistry.registerEntityRenderingHandler(ExplosivePrimed.class, new ExplosiveRender());
         // RenderingRegistry.registerEntityRenderingHandler(net.minecraft.entity.player.EntityPlayer.class,
         // new PlayerArmorRender()); // <-- Works, woo!
@@ -316,23 +318,23 @@ public void initManualIcons ()
         MantleClientRegistry.registerManualIcon("partcrafter", new ItemStack(TRepo.toolStationWood, 1, 1));
         MantleClientRegistry.registerManualIcon("patternchest", new ItemStack(TRepo.toolStationWood, 1, 5));
         MantleClientRegistry.registerManualIcon("stenciltable", new ItemStack(TRepo.toolStationWood, 1, 10));
-        MantleClientRegistry.registerManualIcon("torch", new ItemStack(Block.torchWood));
-        MantleClientRegistry.registerManualIcon("sapling", new ItemStack(Block.sapling));
-        MantleClientRegistry.registerManualIcon("workbench", new ItemStack(Block.workbench));
-        MantleClientRegistry.registerManualIcon("coal", new ItemStack(Item.coal));
+        MantleClientRegistry.registerManualIcon("torch", new ItemStack(Blocks.torch));
+        MantleClientRegistry.registerManualIcon("sapling", new ItemStack(Blocks.sapling));
+        MantleClientRegistry.registerManualIcon("workbench", new ItemStack(Blocks.crafting_table));
+        MantleClientRegistry.registerManualIcon("coal", new ItemStack(Items.coal));
 
         MantleClientRegistry.registerManualIcon("obsidianingot", new ItemStack(TRepo.materials, 1, 18));
         MantleClientRegistry.registerManualIcon("lavacrystal", new ItemStack(TRepo.materials, 1, 7));
 
         // Tool Materials
-        MantleClientRegistry.registerManualIcon("woodplanks", new ItemStack(Block.planks));
-        MantleClientRegistry.registerManualIcon("stoneblock", new ItemStack(Block.stone));
-        MantleClientRegistry.registerManualIcon("ironingot", new ItemStack(Item.ingotIron));
-        MantleClientRegistry.registerManualIcon("flint", new ItemStack(Item.flint));
-        MantleClientRegistry.registerManualIcon("cactus", new ItemStack(Block.cactus));
-        MantleClientRegistry.registerManualIcon("bone", new ItemStack(Item.bone));
-        MantleClientRegistry.registerManualIcon("obsidian", new ItemStack(Block.obsidian));
-        MantleClientRegistry.registerManualIcon("netherrack", new ItemStack(Block.netherrack));
+        MantleClientRegistry.registerManualIcon("woodplanks", new ItemStack(Blocks.planks));
+        MantleClientRegistry.registerManualIcon("stoneblock", new ItemStack(Blocks.stone));
+        MantleClientRegistry.registerManualIcon("ironingot", new ItemStack(Items.iron_ingot));
+        MantleClientRegistry.registerManualIcon("flint", new ItemStack(Items.flint));
+        MantleClientRegistry.registerManualIcon("cactus", new ItemStack(Blocks.cactus));
+        MantleClientRegistry.registerManualIcon("bone", new ItemStack(Items.bone));
+        MantleClientRegistry.registerManualIcon("obsidian", new ItemStack(Blocks.obsidian));
+        MantleClientRegistry.registerManualIcon("netherrack", new ItemStack(Blocks.netherrack));
         MantleClientRegistry.registerManualIcon("blueslimecrystal", new ItemStack(TRepo.materials, 1, 17));
         MantleClientRegistry.registerManualIcon("slimecrystal", new ItemStack(TRepo.materials, 1, 1));
         MantleClientRegistry.registerManualIcon("paperstack", new ItemStack(TRepo.materials, 1, 0));
@@ -420,33 +422,33 @@ public void initManualRecipes ()
     {
         ItemStack pattern = new ItemStack(TRepo.blankPattern, 1, 0);
 
-        ItemStack stick = new ItemStack(Item.stick, 1, 0);
-        ItemStack plank = new ItemStack(Block.planks, 1, 0);
-        ItemStack plankSlab = new ItemStack(Block.woodSingleSlab, 1, 0);
-        ItemStack workbench = new ItemStack(Block.workbench, 1, 0);
-        ItemStack chest = new ItemStack(Block.chest, 1, 0);
-        ItemStack log = new ItemStack(Block.wood, 1, 0);
-        ItemStack mossycobble = new ItemStack(Block.cobblestoneMossy);
-        ItemStack netherrack = new ItemStack(Block.netherrack);
-
-        ItemStack dirt = new ItemStack(Block.dirt, 1, 0);
-        ItemStack sand = new ItemStack(Block.sand, 1, 0);
-        ItemStack gravel = new ItemStack(Block.gravel, 1, 0);
-        ItemStack clay = new ItemStack(Item.clay, 1, 0);
-        ItemStack glass = new ItemStack(Block.glass, 1, 0);
-        ItemStack ironblock = new ItemStack(Block.blockIron, 1, 0);
+        ItemStack stick = new ItemStack(Items.stick, 1, 0);
+        ItemStack plank = new ItemStack(Blocks.planks, 1, 0);
+        ItemStack plankSlab = new ItemStack(Blocks.woodSingleSlab, 1, 0);
+        ItemStack workbench = new ItemStack(Blocks.crafting_table, 1, 0);
+        ItemStack chest = new ItemStack(Blocks.chest, 1, 0);
+        ItemStack log = new ItemStack(Blocks.log, 1, 0);
+        ItemStack mossycobble = new ItemStack(Blocks.mossy_cobblestone);
+        ItemStack netherrack = new ItemStack(Blocks.netherrack);
+
+        ItemStack dirt = new ItemStack(Blocks.dirt, 1, 0);
+        ItemStack sand = new ItemStack(Blocks.sand, 1, 0);
+        ItemStack gravel = new ItemStack(Blocks.gravel, 1, 0);
+        ItemStack clay = new ItemStack(Items.clay_ball, 1, 0);
+        ItemStack glass = new ItemStack(Blocks.glass, 1, 0);
+        ItemStack ironblock = new ItemStack(Blocks.iron_block, 1, 0);
 
         ItemStack grout = new ItemStack(TRepo.craftedSoil, 2, 1);
         ItemStack searedbrick = new ItemStack(TRepo.materials, 1, 2);
         ItemStack searedbrickBlock = new ItemStack(TRepo.smeltery, 1, 2);
 
-        ItemStack coal = new ItemStack(Item.coal);
-        ItemStack paper = new ItemStack(Item.paper);
-        ItemStack slimeball = new ItemStack(Item.slimeBall);
+        ItemStack coal = new ItemStack(Items.coal);
+        ItemStack paper = new ItemStack(Items.paper);
+        ItemStack slimeball = new ItemStack(Items.slime_ball);
         ItemStack slimyMud = new ItemStack(TRepo.craftedSoil);
-        ItemStack blazerod = new ItemStack(Item.blazeRod);
-        ItemStack firecharge = new ItemStack(Item.fireballCharge);
-        ItemStack string = new ItemStack(Item.silk);
+        ItemStack blazerod = new ItemStack(Items.blaze_rod);
+        ItemStack firecharge = new ItemStack(Items.fire_charge);
+        ItemStack string = new ItemStack(Items.string);
 
         ItemStack silkyCloth = new ItemStack(TRepo.materials, 1, 25);
 
@@ -454,8 +456,8 @@ public void initManualRecipes ()
         ItemStack consecratedsoil = new ItemStack(TRepo.craftedSoil, 1, 4);
 
         // TConstruct recipes
-        MantleClientRegistry.registerManualLargeRecipe("alternatebook", new ItemStack(Item.book), paper, paper, paper, string, pattern, pattern, null, null, null);
-        MantleClientRegistry.registerManualSmallRecipe("patternbook1", new ItemStack(TRepo.manualBook, 1, 0), new ItemStack(Item.paper), pattern, null, null);
+        MantleClientRegistry.registerManualLargeRecipe("alternatebook", new ItemStack(Items.book), paper, paper, paper, string, pattern, pattern, null, null, null);
+        MantleClientRegistry.registerManualSmallRecipe("patternbook1", new ItemStack(TRepo.manualBook, 1, 0), new ItemStack(Items.paper), pattern, null, null);
         MantleClientRegistry.registerManualSmallRecipe("patternbook2", new ItemStack(TRepo.manualBook, 1, 1), new ItemStack(TRepo.manualBook, 1, 0), null, null, null);
         MantleClientRegistry.registerManualSmallRecipe("patternbook3", new ItemStack(TRepo.manualBook, 1, 2), new ItemStack(TRepo.manualBook, 1, 1), null, null, null);
         MantleClientRegistry.registerManualSmallRecipe("blankpattern", pattern, plank, stick, stick, plank);
@@ -463,8 +465,8 @@ public void initManualRecipes ()
         MantleClientRegistry.registerManualSmallRecipe("partcrafter", new ItemStack(TRepo.toolStationWood, 1, 1), null, pattern, null, log);
         MantleClientRegistry.registerManualSmallRecipe("patternchest", new ItemStack(TRepo.toolStationWood, 1, 5), null, pattern, null, chest);
         MantleClientRegistry.registerManualSmallRecipe("stenciltable", new ItemStack(TRepo.toolStationWood, 1, 10), null, pattern, null, plank);
-        MantleClientRegistry.registerManualSmallRecipe("slimechannel", new ItemStack(TRepo.slimeChannel, 1, 0), new ItemStack(TRepo.slimeGel, 1, 0), new ItemStack(Item.redstone), null, null);
-        MantleClientRegistry.registerManualSmallRecipe("bouncepad", new ItemStack(TRepo.slimePad, 1, 0), new ItemStack(TRepo.slimeChannel), new ItemStack(Item.slimeBall), null, null);
+        MantleClientRegistry.registerManualSmallRecipe("slimechannel", new ItemStack(TRepo.slimeChannel, 1, 0), new ItemStack(TRepo.slimeGel, 1, 0), new ItemStack(Items.redstone), null, null);
+        MantleClientRegistry.registerManualSmallRecipe("bouncepad", new ItemStack(TRepo.slimePad, 1, 0), new ItemStack(TRepo.slimeChannel), new ItemStack(Items.slime_ball), null, null);
         MantleClientRegistry.registerManualLargeRecipe("toolforge", new ItemStack(TRepo.toolForge, 1, 0), searedbrickBlock, searedbrickBlock, searedbrickBlock, ironblock, new ItemStack(
                 TRepo.toolStationWood, 1, 0), ironblock, ironblock, null, ironblock);
 
@@ -473,13 +475,13 @@ public void initManualRecipes ()
         MantleClientRegistry.registerManualSmallRecipe("paperstack", new ItemStack(TRepo.materials, 1, 0), paper, paper, paper, paper);
         MantleClientRegistry.registerManualLargeRecipe("mossball", new ItemStack(TRepo.materials, 1, 6), mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble,
                 mossycobble, mossycobble);
-        MantleClientRegistry.registerManualLargeRecipe("lavacrystal", new ItemStack(TRepo.materials, 1, 7), blazerod, firecharge, blazerod, firecharge, new ItemStack(Item.bucketLava), firecharge,
+        MantleClientRegistry.registerManualLargeRecipe("lavacrystal", new ItemStack(TRepo.materials, 1, 7), blazerod, firecharge, blazerod, firecharge, new ItemStack(Items.lava_bucket), firecharge,
                 blazerod, firecharge, blazerod);
         MantleClientRegistry.registerManualLargeRecipe("silkycloth", silkyCloth, string, string, string, string, new ItemStack(TRepo.materials, 1, 24), string, string, string, string);
-        MantleClientRegistry.registerManualLargeRecipe("silkyjewel", new ItemStack(TRepo.materials, 1, 26), null, silkyCloth, null, silkyCloth, new ItemStack(Item.emerald), silkyCloth, null,
+        MantleClientRegistry.registerManualLargeRecipe("silkyjewel", new ItemStack(TRepo.materials, 1, 26), null, silkyCloth, null, silkyCloth, new ItemStack(Items.emerald), silkyCloth, null,
                 silkyCloth, null);
 
-        MantleClientRegistry.registerManualSmallRecipe("graveyardsoil", graveyardsoil, new ItemStack(Block.dirt), new ItemStack(Item.rottenFlesh), new ItemStack(Item.dyePowder, 1, 15), null);
+        MantleClientRegistry.registerManualSmallRecipe("graveyardsoil", graveyardsoil, new ItemStack(Blocks.dirt), new ItemStack(Items.rotten_flesh), new ItemStack(Items.dyePowder, 1, 15), null);
         MantleClientRegistry.registerManualFurnaceRecipe("consecratedsoil", consecratedsoil, graveyardsoil);
 
         MantleClientRegistry.registerManualSmallRecipe("grout", grout, sand, gravel, null, clay);
@@ -514,7 +516,7 @@ public void initManualRecipes ()
         ItemStack alubrassIngot = new ItemStack(TRepo.materials, 1, 14);
         ItemStack bronzeIngot = new ItemStack(TRepo.materials, 1, 13);
         ItemStack blankCast = new ItemStack(TRepo.blankPattern, 1, 1);
-        ItemStack redstone = new ItemStack(Item.redstone);
+        ItemStack redstone = new ItemStack(Items.redstone);
 
         // Modifier recipes
         ItemStack ironpick = ToolBuilder.instance.buildTool(new ItemStack(TRepo.pickaxeHead, 1, 6), new ItemStack(TRepo.toolRod, 1, 2), new ItemStack(TRepo.binding, 1, 6), "");
@@ -522,33 +524,33 @@ public void initManualRecipes ()
         ItemStack ironlongsword = ToolBuilder.instance.buildTool(new ItemStack(TRepo.swordBlade, 1, 6), new ItemStack(TRepo.toolRod, 1, 2), new ItemStack(TRepo.handGuard, 1, 10), "");
         MantleClientRegistry.registerManualIcon("ironlongsword", ironlongsword);
 
-        TConstructClientRegistry.registerManualModifier("diamondmod", ironpick.copy(), new ItemStack(Item.diamond));
-        TConstructClientRegistry.registerManualModifier("emeraldmod", ironpick.copy(), new ItemStack(Item.emerald));
-        TConstructClientRegistry.registerManualModifier("redstonemod", ironpick.copy(), new ItemStack(Item.redstone), new ItemStack(Block.blockRedstone));
+        TConstructClientRegistry.registerManualModifier("diamondmod", ironpick.copy(), new ItemStack(Items.diamond));
+        TConstructClientRegistry.registerManualModifier("emeraldmod", ironpick.copy(), new ItemStack(Items.emerald));
+        TConstructClientRegistry.registerManualModifier("redstonemod", ironpick.copy(), new ItemStack(Items.redstone), new ItemStack(Blocks.redstone_block));
         TConstructClientRegistry.registerManualModifier("lavacrystalmod", ironpick.copy(), new ItemStack(TRepo.materials, 1, 7));
-        TConstructClientRegistry.registerManualModifier("lapismod", ironpick.copy(), new ItemStack(Item.dyePowder, 1, 4), new ItemStack(Block.blockLapis));
+        TConstructClientRegistry.registerManualModifier("lapismod", ironpick.copy(), new ItemStack(Items.dyePowder, 1, 4), new ItemStack(Blocks.lapis_block));
         TConstructClientRegistry.registerManualModifier("mossmod", ironpick.copy(), new ItemStack(TRepo.materials, 1, 6));
-        TConstructClientRegistry.registerManualModifier("quartzmod", ironlongsword.copy(), new ItemStack(Item.netherQuartz), new ItemStack(Block.blockNetherQuartz));
-        TConstructClientRegistry.registerManualModifier("blazemod", ironlongsword.copy(), new ItemStack(Item.blazePowder));
+        TConstructClientRegistry.registerManualModifier("quartzmod", ironlongsword.copy(), new ItemStack(Items.quartz), new ItemStack(Blocks.quartz_block));
+        TConstructClientRegistry.registerManualModifier("blazemod", ironlongsword.copy(), new ItemStack(Items.blaze_powder));
         TConstructClientRegistry.registerManualModifier("necroticmod", ironlongsword.copy(), new ItemStack(TRepo.materials, 1, 8));
         TConstructClientRegistry.registerManualModifier("silkymod", ironpick.copy(), new ItemStack(TRepo.materials, 1, 26));
         TConstructClientRegistry.registerManualModifier("reinforcedmod", ironpick.copy(), new ItemStack(TRepo.largePlate, 1, 6));
 
-        TConstructClientRegistry.registerManualModifier("pistonmod", ironlongsword.copy(), new ItemStack(Block.pistonBase));
-        TConstructClientRegistry.registerManualModifier("beheadingmod", ironlongsword.copy(), new ItemStack(Item.enderPearl), new ItemStack(Block.obsidian));
-        TConstructClientRegistry.registerManualModifier("spidermod", ironlongsword.copy(), new ItemStack(Item.fermentedSpiderEye));
+        TConstructClientRegistry.registerManualModifier("pistonmod", ironlongsword.copy(), new ItemStack(Blocks.piston));
+        TConstructClientRegistry.registerManualModifier("beheadingmod", ironlongsword.copy(), new ItemStack(Items.ender_pearl), new ItemStack(Blocks.obsidian));
+        TConstructClientRegistry.registerManualModifier("spidermod", ironlongsword.copy(), new ItemStack(Items.fermented_spider_eye));
         TConstructClientRegistry.registerManualModifier("smitemod", ironlongsword.copy(), new ItemStack(TRepo.craftedSoil, 1, 4));
 
-        TConstructClientRegistry.registerManualModifier("fluxmod", ironpick.copy(), new ItemStack(Block.dirt));
-        TConstructClientRegistry.registerManualModifier("fluxmod2", ironpick.copy(), new ItemStack(Block.dirt));
+        TConstructClientRegistry.registerManualModifier("fluxmod", ironpick.copy(), new ItemStack(Blocks.dirt));
+        TConstructClientRegistry.registerManualModifier("fluxmod2", ironpick.copy(), new ItemStack(Blocks.dirt));
 
-        TConstructClientRegistry.registerManualModifier("tier1free", ironpick.copy(), new ItemStack(Item.diamond), new ItemStack(Block.blockGold));
-        TConstructClientRegistry.registerManualModifier("tier2free", ironpick.copy(), new ItemStack(Item.netherStar));
+        TConstructClientRegistry.registerManualModifier("tier1free", ironpick.copy(), new ItemStack(Items.diamond), new ItemStack(Blocks.gold_block));
+        TConstructClientRegistry.registerManualModifier("tier2free", ironpick.copy(), new ItemStack(Items.nether_star));
 
-        TConstructClientRegistry.registerManualSmeltery("brownstone", new ItemStack(TRepo.speedBlock), new ItemStack(TRepo.moltenTin, 1), new ItemStack(Block.gravel));
+        TConstructClientRegistry.registerManualSmeltery("brownstone", new ItemStack(TRepo.speedBlock), new ItemStack(TRepo.moltenTin, 1), new ItemStack(Blocks.gravel));
         TConstructClientRegistry.registerManualSmeltery("clearglass", new ItemStack(TRepo.clearGlass), new ItemStack(TRepo.moltenGlass, 1), null);
         TConstructClientRegistry.registerManualSmeltery("searedstone", new ItemStack(TRepo.smeltery, 1, 4), new ItemStack(TRepo.moltenStone, 1), null);
-        TConstructClientRegistry.registerManualSmeltery("endstone", new ItemStack(Block.whiteStone), new ItemStack(TRepo.moltenEnder, 1), new ItemStack(Block.obsidian));
+        TConstructClientRegistry.registerManualSmeltery("endstone", new ItemStack(Blocks.end_stone), new ItemStack(TRepo.moltenEnder, 1), new ItemStack(Blocks.obsidian));
         TConstructClientRegistry.registerManualSmeltery("glueball", new ItemStack(TRepo.materials, 1, 36), new ItemStack(TRepo.glueFluidBlock, 1), null);
 
     }
@@ -890,7 +892,7 @@ else if (par1Str.equals("reddust"))
                     }
                     else if (par1Str.equals("snowballpoof"))
                     {
-                        entityfx = new EntityBreakingFX(mc.theWorld, par2, par4, par6, Item.snowball);
+                        entityfx = new EntityBreakingFX(mc.theWorld, par2, par4, par6, Items.snowball);
                     }
                     else if (par1Str.equals("dripWater"))
                     {
diff --git a/src/main/java/tconstruct/common/TRecipes.java b/src/main/java/tconstruct/common/TRecipes.java
index d1db409bd53..5980cd147c8 100644
--- a/src/main/java/tconstruct/common/TRecipes.java
+++ b/src/main/java/tconstruct/common/TRecipes.java
@@ -10,6 +10,8 @@
 import mantle.blocks.abstracts.MultiServantLogic;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockDispenser;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.FurnaceRecipes;
@@ -69,7 +71,7 @@ static void registerBlockRecipes ()
         GameRegistry.registerBlock(TRepo.meatBlock, HamboneItemBlock.class, "MeatBlock");
 
         OreDictionary.registerOre("hambone", new ItemStack(TRepo.meatBlock));
-        GameRegistry.addRecipe(new ItemStack(TRepo.meatBlock), "mmm", "mbm", "mmm", 'b', new ItemStack(Item.bone), 'm', new ItemStack(Item.porkRaw));
+        GameRegistry.addRecipe(new ItemStack(TRepo.meatBlock), "mmm", "mbm", "mmm", 'b', new ItemStack(Items.bone), 'm', new ItemStack(Items.porkchop));
 
         GameRegistry.registerBlock(TRepo.glueBlock, "GlueBlock");
         OreDictionary.registerOre("blockRubber", new ItemStack(TRepo.glueBlock));
@@ -130,8 +132,8 @@ static void registerBlockRecipes ()
         GameRegistry.registerBlock(TRepo.slimeChannel, "slime.channel");
         GameRegistry.registerBlock(TRepo.bloodChannel, "blood.channel");
         GameRegistry.registerBlock(TRepo.slimePad, "slime.pad");
-        TConstructRegistry.drawbridgeState[TRepo.slimePad.blockID] = 1;
-        TConstructRegistry.drawbridgeState[TRepo.bloodChannel.blockID] = 1;
+        TConstructRegistry.drawbridgeState[TRepo.slimePad] = 1;
+        TConstructRegistry.drawbridgeState[TRepo.bloodChannel] = 1;
 
         //Decoration
         GameRegistry.registerBlock(TRepo.stoneTorch, "decoration.stonetorch");
@@ -237,50 +239,50 @@ protected static void addRecipesForToolBuilder ()
         tb.addCustomToolRecipe(recipe);
         tb.addNormalToolRecipe(TRepo.arrow, TRepo.arrowhead, TRepo.toolRod, TRepo.fletching);
 
-        ItemStack diamond = new ItemStack(Item.diamond);
+        ItemStack diamond = new ItemStack(Items.diamond);
         tb.registerToolMod(new ModRepair());
         tb.registerToolMod(new ModDurability(new ItemStack[] { diamond }, 0, 500, 0f, 3, "Diamond", "\u00a7bDurability +500", "\u00a7b"));
-        tb.registerToolMod(new ModDurability(new ItemStack[] { new ItemStack(Item.emerald) }, 1, 0, 0.5f, 2, "Emerald", "\u00a72Durability +50%", "\u00a72"));
+        tb.registerToolMod(new ModDurability(new ItemStack[] { new ItemStack(Items.emerald) }, 1, 0, 0.5f, 2, "Emerald", "\u00a72Durability +50%", "\u00a72"));
 
         TRepo.modFlux = new ModFlux();
         tb.registerToolMod(TRepo.modFlux);
 
         EnumSet<EnumArmorPart> allArmors = EnumSet.of(EnumArmorPart.HELMET, EnumArmorPart.CHEST, EnumArmorPart.PANTS, EnumArmorPart.SHOES);
-        ItemStack redstoneItem = new ItemStack(Item.redstone);
-        ItemStack redstoneBlock = new ItemStack(Block.blockRedstone);
+        ItemStack redstoneItem = new ItemStack(Items.redstone);
+        ItemStack redstoneBlock = new ItemStack(Blocks.redstone_block);
         tb.registerToolMod(new ModRedstone(2, new ItemStack[] { redstoneItem, redstoneBlock }, new int[] { 1, 9 }));
         tb.registerArmorMod(new AModMoveSpeed(2, allArmors, new ItemStack[] { redstoneItem, redstoneBlock }, new int[] { 1, 9 }, false));
 
-        ItemStack lapisItem = new ItemStack(Item.dyePowder, 1, 4);
-        ItemStack lapisBlock = new ItemStack(Block.blockLapis);
+        ItemStack lapisItem = new ItemStack(Items.dyePowder, 1, 4);
+        ItemStack lapisBlock = new ItemStack(Blocks.lapis_block);
         TRepo.modLapis = new ModLapis(10, new ItemStack[] { lapisItem, lapisBlock }, new int[] { 1, 9 });
         tb.registerToolMod(TRepo.modLapis);
 
         tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(TRepo.materials, 1, 6) }, 4, "Moss", 3, "\u00a72", "Auto-Repair"));
-        ItemStack blazePowder = new ItemStack(Item.blazePowder);
+        ItemStack blazePowder = new ItemStack(Items.blaze_powder);
         tb.registerToolMod(new ModBlaze(7, new ItemStack[] { blazePowder }, new int[] { 1 }));
         tb.registerToolMod(new ModAutoSmelt(new ItemStack[] { new ItemStack(TRepo.materials, 1, 7) }, 6, "Lava", "\u00a74", "Auto-Smelt"));
         tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(TRepo.materials, 1, 8) }, 8, "Necrotic", 1, "\u00a78", "Life Steal"));
 
-        TRepo.modAttack = new ModAttack("Quartz", 11, new ItemStack[] { new ItemStack(Item.netherQuartz), new ItemStack(Block.blockNetherQuartz, 1, Short.MAX_VALUE) }, new int[] { 1, 4 });
+        TRepo.modAttack = new ModAttack("Quartz", 11, new ItemStack[] { new ItemStack(Items.quartz), new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE) }, new int[] { 1, 4 });
         tb.registerToolMod(TRepo.modAttack);
 
-        tb.registerToolMod(new ModExtraModifier(new ItemStack[] { diamond, new ItemStack(Block.blockGold) }, "Tier1Free"));
-        tb.registerToolMod(new ModExtraModifier(new ItemStack[] { new ItemStack(Block.blockDiamond), new ItemStack(Item.appleGold, 1, 1) }, "Tier1.5Free"));
-        tb.registerToolMod(new ModExtraModifier(new ItemStack[] { new ItemStack(Item.netherStar) }, "Tier2Free"));
+        tb.registerToolMod(new ModExtraModifier(new ItemStack[] { diamond, new ItemStack(Blocks.gold_block) }, "Tier1Free"));
+        tb.registerToolMod(new ModExtraModifier(new ItemStack[] { new ItemStack(Blocks.diamond_block), new ItemStack(Items.golden_apple, 1, 1) }, "Tier1.5Free"));
+        tb.registerToolMod(new ModExtraModifier(new ItemStack[] { new ItemStack(Items.nether_star) }, "Tier2Free"));
 
         ItemStack silkyJewel = new ItemStack(TRepo.materials, 1, 26);
         tb.registerToolMod(new ModButtertouch(new ItemStack[] { silkyJewel }, 12));
 
-        ItemStack piston = new ItemStack(Block.pistonBase);
+        ItemStack piston = new ItemStack(Blocks.piston);
         tb.registerToolMod(new ModPiston(3, new ItemStack[] { piston }, new int[] { 1 }));
 
-        tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(Block.obsidian), new ItemStack(Item.enderPearl) }, 13, "Beheading", 1, "\u00a7d", "Beheading"));
+        tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(Blocks.obsidian), new ItemStack(Items.ender_pearl) }, 13, "Beheading", 1, "\u00a7d", "Beheading"));
 
         ItemStack holySoil = new ItemStack(TRepo.craftedSoil, 1, 4);
         tb.registerToolMod(new ModSmite("Smite", 14, new ItemStack[] { holySoil }, new int[] { 1 }));
 
-        ItemStack spidereyeball = new ItemStack(Item.fermentedSpiderEye);
+        ItemStack spidereyeball = new ItemStack(Items.fermented_spider_eye);
         tb.registerToolMod(new ModAntiSpider("Anti-Spider", 15, new ItemStack[] { spidereyeball }, new int[] { 1 }));
 
         ItemStack obsidianPlate = new ItemStack(TRepo.largePlate, 1, 6);
@@ -305,7 +307,7 @@ protected static void addPartMapping ()
                 for (int meta = 0; meta < TRepo.patternOutputs.length; meta++)
                 {
                     if (TRepo.patternOutputs[meta] != null)
-                        TConstructRegistry.addPartMapping(TRepo.woodPattern.itemID, meta + 1, mat, new ItemStack(TRepo.patternOutputs[meta], 1, mat));
+                        TConstructRegistry.addPartMapping(TRepo.woodPattern, meta + 1, mat, new ItemStack(TRepo.patternOutputs[meta], 1, mat));
                 }
             }
         }
@@ -316,7 +318,7 @@ protected static void addPartMapping ()
                 for (int meta = 0; meta < TRepo.patternOutputs.length; meta++)
                 {
                     if (TRepo.patternOutputs[meta] != null)
-                        TConstructRegistry.addPartMapping(TRepo.woodPattern.itemID, meta + 1, nonMetals[mat], new ItemStack(TRepo.patternOutputs[meta], 1, nonMetals[mat]));
+                        TConstructRegistry.addPartMapping(TRepo.woodPattern, meta + 1, nonMetals[mat], new ItemStack(TRepo.patternOutputs[meta], 1, nonMetals[mat]));
                 }
             }
         }
@@ -331,19 +333,19 @@ protected static void addRecipesForTableCasting ()
         //Blank
         tableCasting.addCastingRecipe(new ItemStack(TRepo.blankPattern, 1, 1), new FluidStack(TRepo.moltenAlubrassFluid, TConstruct.ingotLiquidValue), 80);
         tableCasting.addCastingRecipe(new ItemStack(TRepo.blankPattern, 1, 2), new FluidStack(TRepo.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), 80);
-        tableCasting.addCastingRecipe(gemcast, new FluidStack(TRepo.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(Item.emerald), 80);
-        tableCasting.addCastingRecipe(gemcast, new FluidStack(TRepo.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(Item.emerald), 80);
+        tableCasting.addCastingRecipe(gemcast, new FluidStack(TRepo.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(Items.emerald), 80);
+        tableCasting.addCastingRecipe(gemcast, new FluidStack(TRepo.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(Items.emerald), 80);
 
         //Ingots
         tableCasting.addCastingRecipe(new ItemStack(TRepo.materials, 1, 2), new FluidStack(TRepo.moltenStoneFluid, TConstruct.ingotLiquidValue / 4), ingotcast, 80); //stone
 
         //Misc
-        tableCasting.addCastingRecipe(new ItemStack(Item.emerald), new FluidStack(TRepo.moltenEmeraldFluid, 640), gemcast, 80);
+        tableCasting.addCastingRecipe(new ItemStack(Items.emerald), new FluidStack(TRepo.moltenEmeraldFluid, 640), gemcast, 80);
         tableCasting.addCastingRecipe(new ItemStack(TRepo.materials, 1, 36), new FluidStack(TRepo.glueFluid, TConstruct.ingotLiquidValue), null, 50);
         tableCasting.addCastingRecipe(new ItemStack(TRepo.strangeFood, 1, 1), new FluidStack(TRepo.bloodFluid, 160), null, 50);
 
         //Buckets
-        ItemStack bucket = new ItemStack(Item.bucketEmpty);
+        ItemStack bucket = new ItemStack(Items.bucketEmpty);
 
         for (int sc = 0; sc < 24; sc++)
         {
@@ -382,7 +384,7 @@ protected static void addRecipesForTableCasting ()
             }
         }
 
-        ItemStack[] ingotShapes = { new ItemStack(Item.brick), new ItemStack(Item.netherrackBrick), new ItemStack(TRepo.materials, 1, 2), new ItemStack(TRepo.materials, 1, 37) };
+        ItemStack[] ingotShapes = { new ItemStack(Items.brick), new ItemStack(Items.netherrackBrick), new ItemStack(TRepo.materials, 1, 2), new ItemStack(TRepo.materials, 1, 37) };
         for (int i = 0; i < ingotShapes.length; i++)
         {
             tableCasting.addCastingRecipe(ingotcast, new FluidStack(TRepo.moltenAlubrassFluid, TConstruct.ingotLiquidValue), ingotShapes[i], false, 50);
@@ -403,41 +405,41 @@ protected static void addRecipesForTableCasting ()
         {
             goldAmount = new FluidStack(TRepo.moltenGoldFluid, TConstruct.nuggetLiquidValue * 8);
         }
-        tableCasting.addCastingRecipe(new ItemStack(Item.appleGold, 1), goldAmount, new ItemStack(Item.appleRed), true, 50);
-        tableCasting.addCastingRecipe(new ItemStack(Item.goldenCarrot, 1), goldAmount, new ItemStack(Item.carrot), true, 50);
-        tableCasting.addCastingRecipe(new ItemStack(Item.speckledMelon, 1), goldAmount, new ItemStack(Item.melon), true, 50);
-        tableCasting.addCastingRecipe(new ItemStack(TRepo.goldHead), goldAmount, new ItemStack(Item.skull, 1, 3), true, 50);
+        tableCasting.addCastingRecipe(new ItemStack(Items.golden_apple, 1), goldAmount, new ItemStack(Items.apple), true, 50);
+        tableCasting.addCastingRecipe(new ItemStack(Items.golden_carrot, 1), goldAmount, new ItemStack(Items.carrot), true, 50);
+        tableCasting.addCastingRecipe(new ItemStack(Items.speckled_melon, 1), goldAmount, new ItemStack(Items.melon), true, 50);
+        tableCasting.addCastingRecipe(new ItemStack(TRepo.goldHead), goldAmount, new ItemStack(Items.skull, 1, 3), true, 50);
     }
 
     protected static void addRecipesForFurnace ()
     {
-        FurnaceRecipes.smelting().addSmelting(TRepo.craftedSoil.blockID, 3, new ItemStack(TRepo.craftedSoil, 1, 4), 0.2f); //Concecrated Soil
-
-        FurnaceRecipes.smelting().addSmelting(TRepo.craftedSoil.blockID, 0, new ItemStack(TRepo.materials, 1, 1), 2f); //Slime
-        FurnaceRecipes.smelting().addSmelting(TRepo.craftedSoil.blockID, 1, new ItemStack(TRepo.materials, 1, 2), 2f); //Seared brick item
-        FurnaceRecipes.smelting().addSmelting(TRepo.craftedSoil.blockID, 2, new ItemStack(TRepo.materials, 1, 17), 2f); //Blue Slime
-        FurnaceRecipes.smelting().addSmelting(TRepo.craftedSoil.blockID, 6, new ItemStack(TRepo.materials, 1, 37), 2f); //Nether seared brick
-
-        //FurnaceRecipes.smelting().addSmelting(TRepo.oreSlag.blockID, 1, new ItemStack(TRepo.materials, 1, 3), 3f);
-        //FurnaceRecipes.smelting().addSmelting(TRepo.oreSlag.blockID, 2, new ItemStack(TRepo.materials, 1, 4), 3f);
-        FurnaceRecipes.smelting().addSmelting(TRepo.oreSlag.blockID, 3, new ItemStack(TRepo.materials, 1, 9), 0.5f);
-        FurnaceRecipes.smelting().addSmelting(TRepo.oreSlag.blockID, 4, new ItemStack(TRepo.materials, 1, 10), 0.5f);
-        FurnaceRecipes.smelting().addSmelting(TRepo.oreSlag.blockID, 5, new ItemStack(TRepo.materials, 1, 12), 0.5f);
-
-        FurnaceRecipes.smelting().addSmelting(TRepo.oreBerries.itemID, 0, new ItemStack(TRepo.materials, 1, 19), 0.2f);
-        FurnaceRecipes.smelting().addSmelting(TRepo.oreBerries.itemID, 1, new ItemStack(Item.goldNugget), 0.2f);
-        FurnaceRecipes.smelting().addSmelting(TRepo.oreBerries.itemID, 2, new ItemStack(TRepo.materials, 1, 20), 0.2f);
-        FurnaceRecipes.smelting().addSmelting(TRepo.oreBerries.itemID, 3, new ItemStack(TRepo.materials, 1, 21), 0.2f);
-        FurnaceRecipes.smelting().addSmelting(TRepo.oreBerries.itemID, 4, new ItemStack(TRepo.materials, 1, 22), 0.2f);
-        //FurnaceRecipes.smelting().addSmelting(TRepo.oreBerries.itemID, 5, new ItemStack(TRepo.materials, 1, 23), 0.2f);
-
-        FurnaceRecipes.smelting().addSmelting(TRepo.oreGravel.blockID, 0, new ItemStack(Item.ingotIron), 0.2f);
-        FurnaceRecipes.smelting().addSmelting(TRepo.oreGravel.blockID, 1, new ItemStack(Item.ingotGold), 0.2f);
-        FurnaceRecipes.smelting().addSmelting(TRepo.oreGravel.blockID, 2, new ItemStack(TRepo.materials, 1, 9), 0.2f);
-        FurnaceRecipes.smelting().addSmelting(TRepo.oreGravel.blockID, 3, new ItemStack(TRepo.materials, 1, 10), 0.2f);
-        FurnaceRecipes.smelting().addSmelting(TRepo.oreGravel.blockID, 4, new ItemStack(TRepo.materials, 1, 12), 0.2f);
-
-        FurnaceRecipes.smelting().addSmelting(TRepo.speedBlock.blockID, 0, new ItemStack(TRepo.speedBlock, 1, 2), 0.2f);
+        FurnaceRecipes.smelting().addSmelting(TRepo.craftedSoil, 3, new ItemStack(TRepo.craftedSoil, 1, 4), 0.2f); //Concecrated Soil
+
+        FurnaceRecipes.smelting().addSmelting(TRepo.craftedSoil, 0, new ItemStack(TRepo.materials, 1, 1), 2f); //Slime
+        FurnaceRecipes.smelting().addSmelting(TRepo.craftedSoil, 1, new ItemStack(TRepo.materials, 1, 2), 2f); //Seared brick item
+        FurnaceRecipes.smelting().addSmelting(TRepo.craftedSoil, 2, new ItemStack(TRepo.materials, 1, 17), 2f); //Blue Slime
+        FurnaceRecipes.smelting().addSmelting(TRepo.craftedSoil, 6, new ItemStack(TRepo.materials, 1, 37), 2f); //Nether seared brick
+
+        //FurnaceRecipes.smelting().addSmelting(TRepo.oreSlag, 1, new ItemStack(TRepo.materials, 1, 3), 3f);
+        //FurnaceRecipes.smelting().addSmelting(TRepo.oreSlag, 2, new ItemStack(TRepo.materials, 1, 4), 3f);
+        FurnaceRecipes.smelting().addSmelting(TRepo.oreSlag, 3, new ItemStack(TRepo.materials, 1, 9), 0.5f);
+        FurnaceRecipes.smelting().addSmelting(TRepo.oreSlag, 4, new ItemStack(TRepo.materials, 1, 10), 0.5f);
+        FurnaceRecipes.smelting().addSmelting(TRepo.oreSlag, 5, new ItemStack(TRepo.materials, 1, 12), 0.5f);
+
+        FurnaceRecipes.smelting().addSmelting(TRepo.oreBerries, 0, new ItemStack(TRepo.materials, 1, 19), 0.2f);
+        FurnaceRecipes.smelting().addSmelting(TRepo.oreBerries, 1, new ItemStack(Items.gold_nugget), 0.2f);
+        FurnaceRecipes.smelting().addSmelting(TRepo.oreBerries, 2, new ItemStack(TRepo.materials, 1, 20), 0.2f);
+        FurnaceRecipes.smelting().addSmelting(TRepo.oreBerries, 3, new ItemStack(TRepo.materials, 1, 21), 0.2f);
+        FurnaceRecipes.smelting().addSmelting(TRepo.oreBerries, 4, new ItemStack(TRepo.materials, 1, 22), 0.2f);
+        //FurnaceRecipes.smelting().addSmelting(TRepo.oreBerries, 5, new ItemStack(TRepo.materials, 1, 23), 0.2f);
+
+        FurnaceRecipes.smelting().addSmelting(TRepo.oreGravel, 0, new ItemStack(Items.ingotIron), 0.2f);
+        FurnaceRecipes.smelting().addSmelting(TRepo.oreGravel, 1, new ItemStack(Items.ingotGold), 0.2f);
+        FurnaceRecipes.smelting().addSmelting(TRepo.oreGravel, 2, new ItemStack(TRepo.materials, 1, 9), 0.2f);
+        FurnaceRecipes.smelting().addSmelting(TRepo.oreGravel, 3, new ItemStack(TRepo.materials, 1, 10), 0.2f);
+        FurnaceRecipes.smelting().addSmelting(TRepo.oreGravel, 4, new ItemStack(TRepo.materials, 1, 12), 0.2f);
+
+        FurnaceRecipes.smelting().addSmelting(TRepo.speedBlock, 0, new ItemStack(TRepo.speedBlock, 1, 2), 0.2f);
     }
 
     protected static void addRecipesForCraftingTable ()
@@ -445,7 +447,7 @@ protected static void addRecipesForCraftingTable ()
         String[] patBlock = { "###", "###", "###" };
         String[] patSurround = { "###", "#m#", "###" };
 
-        Object[] toolForgeBlocks = { "blockIron", "blockGold", Block.blockDiamond, Block.blockEmerald, "blockCobalt", "blockArdite", "blockManyullyn", "blockCopper", "blockBronze", "blockTin",
+        Object[] toolForgeBlocks = { "blockIron", "blockGold", Blocks.diamond_block, Blocks.emerald_block, "blockCobalt", "blockArdite", "blockManyullyn", "blockCopper", "blockBronze", "blockTin",
                 "blockAluminum", "blockAluminumBrass", "blockAlumite", "blockSteel" };
 
         // ToolForge Recipes (Metal Version)
@@ -463,55 +465,55 @@ protected static void addRecipesForCraftingTable ()
         GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', "craftingTableWood"));
         GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', new ItemStack(TRepo.craftingStationWood, 1, 0));
         GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', new ItemStack(TRepo.craftingSlabWood, 1, 0));
-        GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 2), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 1));
-        GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 3), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 2));
-        GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 4), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 3));
-        GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 5), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', Block.chest);
+        GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 2), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', new ItemStack(Blocks.log, 1, 1));
+        GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 3), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', new ItemStack(Blocks.log, 1, 2));
+        GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 4), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', new ItemStack(Blocks.log, 1, 3));
+        GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 5), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', Blocks.chest);
         GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.toolStationWood, 1, 1), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', "logWood"));
         if (PHConstruct.stencilTableCrafting)
         {
-            GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 10), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 0));
-            GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 11), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 1));
-            GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 12), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 2));
-            GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 13), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 3));
+            GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 10), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', new ItemStack(Blocks.planks, 1, 0));
+            GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 11), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', new ItemStack(Blocks.planks, 1, 1));
+            GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 12), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', new ItemStack(Blocks.planks, 1, 2));
+            GameRegistry.addRecipe(new ItemStack(TRepo.toolStationWood, 1, 13), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', new ItemStack(Blocks.planks, 1, 3));
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.toolStationWood, 1, 10), "p", "w", 'p', new ItemStack(TRepo.blankPattern, 1, 0), 'w', "plankWood"));
         }
-        GameRegistry.addRecipe(new ItemStack(TRepo.furnaceSlab, 1, 0), "###", "# #", "###", '#', new ItemStack(Block.stoneSingleSlab, 1, 3));
+        GameRegistry.addRecipe(new ItemStack(TRepo.furnaceSlab, 1, 0), "###", "# #", "###", '#', new ItemStack(Blocks.stone_slab, 1, 3));
 
         // Blank Pattern Recipe
         GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.blankPattern, 1, 0), "ps", "sp", 'p', "plankWood", 's', "stickWood"));
         // Manual Book Recipes
-        GameRegistry.addRecipe(new ItemStack(TRepo.manualBook), "wp", 'w', new ItemStack(TRepo.blankPattern, 1, 0), 'p', Item.paper);
-        GameRegistry.addShapelessRecipe(new ItemStack(TRepo.manualBook, 2, 0), new ItemStack(TRepo.manualBook, 1, 0), Item.book);
+        GameRegistry.addRecipe(new ItemStack(TRepo.manualBook), "wp", 'w', new ItemStack(TRepo.blankPattern, 1, 0), 'p', Items.paper);
+        GameRegistry.addShapelessRecipe(new ItemStack(TRepo.manualBook, 2, 0), new ItemStack(TRepo.manualBook, 1, 0), Items.book);
         GameRegistry.addShapelessRecipe(new ItemStack(TRepo.manualBook, 1, 1), new ItemStack(TRepo.manualBook, 1, 0));
-        GameRegistry.addShapelessRecipe(new ItemStack(TRepo.manualBook, 2, 1), new ItemStack(TRepo.manualBook, 1, 1), Item.book);
+        GameRegistry.addShapelessRecipe(new ItemStack(TRepo.manualBook, 2, 1), new ItemStack(TRepo.manualBook, 1, 1), Items.book);
         GameRegistry.addShapelessRecipe(new ItemStack(TRepo.manualBook, 1, 2), new ItemStack(TRepo.manualBook, 1, 1));
-        GameRegistry.addShapelessRecipe(new ItemStack(TRepo.manualBook, 2, 2), new ItemStack(TRepo.manualBook, 1, 2), Item.book);
+        GameRegistry.addShapelessRecipe(new ItemStack(TRepo.manualBook, 2, 2), new ItemStack(TRepo.manualBook, 1, 2), Items.book);
         GameRegistry.addShapelessRecipe(new ItemStack(TRepo.manualBook, 1, 3), new ItemStack(TRepo.manualBook, 1, 2));
         // alternative Vanilla Book Recipe
-        GameRegistry.addShapelessRecipe(new ItemStack(Item.book), Item.paper, Item.paper, Item.paper, Item.silk, TRepo.blankPattern, TRepo.blankPattern);
+        GameRegistry.addShapelessRecipe(new ItemStack(Items.book), Items.paper, Items.paper, Items.paper, Items.string, TRepo.blankPattern, TRepo.blankPattern);
         // Paperstack Recipe
-        GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 0), "pp", "pp", 'p', Item.paper);
+        GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 0), "pp", "pp", 'p', Items.paper);
         // Mossball Recipe
         GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.materials, 1, 6), patBlock, '#', "stoneMossy"));
         // LavaCrystal Recipes -Auto-smelt
-        GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 7), "xcx", "cbc", "xcx", 'b', Item.bucketLava, 'c', Item.fireballCharge, 'x', Item.blazeRod);
-        GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 7), "xcx", "cbc", "xcx", 'b', Item.bucketLava, 'x', Item.fireballCharge, 'c', Item.blazeRod);
+        GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 7), "xcx", "cbc", "xcx", 'b', Items.lava_bucket, 'c', Items.fireballCharge, 'x', Items.blaze_rod);
+        GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 7), "xcx", "cbc", "xcx", 'b', Items.lava_bucket, 'x', Items.fireballCharge, 'c', Items.blaze_rod);
         // Slimy sand Recipes
-        GameRegistry.addShapelessRecipe(new ItemStack(TRepo.craftedSoil, 1, 0), Item.slimeBall, Item.slimeBall, Item.slimeBall, Item.slimeBall, Block.sand, Block.dirt);
-        GameRegistry.addShapelessRecipe(new ItemStack(TRepo.craftedSoil, 1, 2), TRepo.strangeFood, TRepo.strangeFood, TRepo.strangeFood, TRepo.strangeFood, Block.sand, Block.dirt);
+        GameRegistry.addShapelessRecipe(new ItemStack(TRepo.craftedSoil, 1, 0), Items.slime_ball, Items.slime_ball, Items.slime_ball, Items.slime_ball, Blocks.sand, Blocks.dirt);
+        GameRegistry.addShapelessRecipe(new ItemStack(TRepo.craftedSoil, 1, 2), TRepo.strangeFood, TRepo.strangeFood, TRepo.strangeFood, TRepo.strangeFood, Blocks.sand, Blocks.dirt);
         // Grout Recipes
-        GameRegistry.addShapelessRecipe(new ItemStack(TRepo.craftedSoil, 2, 1), Item.clay, Block.sand, Block.gravel);
-        GameRegistry.addShapelessRecipe(new ItemStack(TRepo.craftedSoil, 8, 1), new ItemStack(Block.blockClay, 1, Short.MAX_VALUE), Block.sand, Block.sand, Block.sand, Block.sand, Block.gravel,
-                Block.gravel, Block.gravel, Block.gravel);
-        GameRegistry.addShapelessRecipe(new ItemStack(TRepo.craftedSoil, 2, 6), Item.netherStalkSeeds, Block.slowSand, Block.gravel);
+        GameRegistry.addShapelessRecipe(new ItemStack(TRepo.craftedSoil, 2, 1), Items.clay_ball, Blocks.sand, Blocks.gravel);
+        GameRegistry.addShapelessRecipe(new ItemStack(TRepo.craftedSoil, 8, 1), new ItemStack(Blocks.clay, 1, Short.MAX_VALUE), Blocks.sand, Blocks.sand, Blocks.sand, Blocks.sand, Blocks.gravel,
+                Blocks.gravel, Blocks.gravel, Blocks.gravel);
+        GameRegistry.addShapelessRecipe(new ItemStack(TRepo.craftedSoil, 2, 6), Items.netherStalkSeeds, Blocks.soul_sand, Blocks.gravel);
         // Graveyard Soil Recipes
-        GameRegistry.addShapelessRecipe(new ItemStack(TRepo.craftedSoil, 1, 3), Block.dirt, Item.rottenFlesh, new ItemStack(Item.dyePowder, 1, 15));
+        GameRegistry.addShapelessRecipe(new ItemStack(TRepo.craftedSoil, 1, 3), Blocks.dirt, Items.rotten_flesh, new ItemStack(Items.dyePowder, 1, 15));
         // Silky Cloth Recipes
-        GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 25), patSurround, 'm', new ItemStack(TRepo.materials, 1, 24), '#', new ItemStack(Item.silk));
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.materials, 1, 25), patSurround, 'm', "nuggetGold", '#', new ItemStack(Item.silk)));
+        GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 25), patSurround, 'm', new ItemStack(TRepo.materials, 1, 24), '#', new ItemStack(Items.string));
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.materials, 1, 25), patSurround, 'm', "nuggetGold", '#', new ItemStack(Items.string)));
         // Silky Jewel Recipes
-        GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 26), " c ", "cec", " c ", 'c', new ItemStack(TRepo.materials, 1, 25), 'e', new ItemStack(Item.emerald));
+        GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 26), " c ", "cec", " c ", 'c', new ItemStack(TRepo.materials, 1, 25), 'e', new ItemStack(Items.emerald));
         // Wooden Armor Recipes
         GameRegistry.addRecipe(new ShapedOreRecipe(TRepo.helmetWood, new Object[] { "www", "w w", 'w', "logWood" }));
         GameRegistry.addRecipe(new ShapedOreRecipe(TRepo.chestplateWood, new Object[] { "w w", "www", "www", 'w', "logWood" }));
@@ -542,7 +544,7 @@ protected static void addRecipesForCraftingTable ()
         GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 15), "m", 'm', new ItemStack(TRepo.metalBlock, 1, 8)); //Alumite
         GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 16), "m", 'm', new ItemStack(TRepo.metalBlock, 1, 9)); //Steel
 
-        GameRegistry.addRecipe(new ItemStack(Item.ingotIron), patBlock, '#', new ItemStack(TRepo.materials, 1, 19)); //Iron
+        GameRegistry.addRecipe(new ItemStack(Items.ingotIron), patBlock, '#', new ItemStack(TRepo.materials, 1, 19)); //Iron
         GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 9), patBlock, '#', new ItemStack(TRepo.materials, 1, 20)); //Copper
         GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 10), patBlock, '#', new ItemStack(TRepo.materials, 1, 21)); //Tin
         GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 11), patBlock, '#', new ItemStack(TRepo.materials, 1, 22)); //Aluminum
@@ -555,7 +557,7 @@ protected static void addRecipesForCraftingTable ()
         GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 15), patBlock, '#', new ItemStack(TRepo.materials, 1, 32)); //Alumite
         GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 16), patBlock, '#', new ItemStack(TRepo.materials, 1, 33)); //Steel    
 
-        GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 19), "m", 'm', new ItemStack(Item.ingotIron)); //Iron
+        GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 19), "m", 'm', new ItemStack(Items.ingotIron)); //Iron
         GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 20), "m", 'm', new ItemStack(TRepo.materials, 1, 9)); //Copper
         GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 21), "m", 'm', new ItemStack(TRepo.materials, 1, 10)); //Tin
         GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 22), "m", 'm', new ItemStack(TRepo.materials, 1, 11)); //Aluminum
@@ -588,9 +590,9 @@ protected static void addRecipesForCraftingTable ()
         }
 
         // Glass Recipes
-        GameRegistry.addRecipe(new ItemStack(Item.glassBottle, 3), new Object[] { "# #", " # ", '#', TRepo.clearGlass });
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Block.daylightSensor), new Object[] { "GGG", "QQQ", "WWW", 'G', "glass", 'Q', Item.netherQuartz, 'W', "slabWood" }));
-        GameRegistry.addRecipe(new ItemStack(Block.beacon, 1), new Object[] { "GGG", "GSG", "OOO", 'G', TRepo.clearGlass, 'S', Item.netherStar, 'O', Block.obsidian });
+        GameRegistry.addRecipe(new ItemStack(Items.glass_bottle, 3), new Object[] { "# #", " # ", '#', TRepo.clearGlass });
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Blocks.daylight_detector), new Object[] { "GGG", "QQQ", "WWW", 'G', "glass", 'Q', Items.quartz, 'W', "slabWood" }));
+        GameRegistry.addRecipe(new ItemStack(Blocks.beacon, 1), new Object[] { "GGG", "GSG", "OOO", 'G', TRepo.clearGlass, 'S', Items.nether_star, 'O', Blocks.obsidian });
         GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.glassPane, 16, 0), "GGG", "GGG", 'G', TRepo.clearGlass));
 
         // Smeltery Components Recipes
@@ -619,48 +621,48 @@ protected static void addRecipesForCraftingTable ()
         GameRegistry.addRecipe(new ItemStack(TRepo.castingChannel, 4, 0), "b b", "bbb", 'b', searedBrick); //Channel
 
         // Jack o'Latern Recipe - Stone Torch
-        GameRegistry.addRecipe(new ItemStack(Block.pumpkinLantern, 1, 0), "p", "s", 'p', new ItemStack(Block.pumpkin), 's', new ItemStack(TRepo.stoneTorch));
+        GameRegistry.addRecipe(new ItemStack(Blocks.lit_pumpkin, 1, 0), "p", "s", 'p', new ItemStack(Blocks.pumpkin), 's', new ItemStack(TRepo.stoneTorch));
         // Stone Torch Recipe
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.stoneTorch, 4), "p", "w", 'p', new ItemStack(Item.coal, 1, Short.MAX_VALUE), 'w', "stoneRod"));
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.stoneTorch, 4), "p", "w", 'p', new ItemStack(Items.coal, 1, Short.MAX_VALUE), 'w', "stoneRod"));
         // Stone Ladder Recipe
         GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.stoneLadder, 3), "w w", "www", "w w", 'w', "stoneRod"));
         // Wooden Rail Recipe
         GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.woodenRail, 4, 0), "b b", "bxb", "b b", 'b', "plankWood", 'x', "stickWood"));
         // Stonesticks Recipes
-        GameRegistry.addRecipe(new ItemStack(TRepo.toolRod, 4, 1), "c", "c", 'c', new ItemStack(Block.stone));
-        GameRegistry.addRecipe(new ItemStack(TRepo.toolRod, 2, 1), "c", "c", 'c', new ItemStack(Block.cobblestone));
+        GameRegistry.addRecipe(new ItemStack(TRepo.toolRod, 4, 1), "c", "c", 'c', new ItemStack(Blocks.stone));
+        GameRegistry.addRecipe(new ItemStack(TRepo.toolRod, 2, 1), "c", "c", 'c', new ItemStack(Blocks.cobblestone));
         // 
         ItemStack aluBrass = new ItemStack(TRepo.materials, 1, 14);
         // Clock Recipe - Vanilla alternativ
-        GameRegistry.addRecipe(new ItemStack(Item.pocketSundial), " i ", "iri", " i ", 'i', aluBrass, 'r', new ItemStack(Item.redstone));
+        GameRegistry.addRecipe(new ItemStack(Items.pocketSundial), " i ", "iri", " i ", 'i', aluBrass, 'r', new ItemStack(Items.redstone));
         // Gold Pressure Plate -  Vanilla alternativ
         GameRegistry.addRecipe(new ItemStack(Block.pressurePlateGold), "ii", 'i', aluBrass);
         //Accessories
         GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.heartCanister, 1, 0), "##", "##", '#', "ingotAluminum"));
         GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.heartCanister, 1, 0), "##", "##", '#', "ingotAluminium"));
         GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.heartCanister, 1, 0), "##", "##", '#', "ingotNaturalAluminum"));
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.heartCanister, 1, 0), " # ", "#B#", " # ", '#', "ingotTin", 'B', Item.bone));
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.heartCanister, 1, 0), " # ", "#B#", " # ", '#', "ingotTin", 'B', Items.bone));
 
-        GameRegistry.addRecipe(new ItemStack(TRepo.diamondApple), " d ", "d#d", " d ", 'd', new ItemStack(Item.diamond), '#', new ItemStack(Item.appleRed));
+        GameRegistry.addRecipe(new ItemStack(TRepo.diamondApple), " d ", "d#d", " d ", 'd', new ItemStack(Items.diamond), '#', new ItemStack(Items.apple));
         GameRegistry.addShapelessRecipe(new ItemStack(TRepo.heartCanister, 1, 2), new ItemStack(TRepo.diamondApple), new ItemStack(TRepo.materials, 1, 8), new ItemStack(TRepo.heartCanister, 1, 0),
                 new ItemStack(TRepo.heartCanister, 1, 1));
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.knapsack, 1, 0), "###", "rmr", "###", '#', new ItemStack(Item.leather), 'r', new ItemStack(TRepo.toughRod, 1, 2), 'm',
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.knapsack, 1, 0), "###", "rmr", "###", '#', new ItemStack(Items.leather), 'r', new ItemStack(TRepo.toughRod, 1, 2), 'm',
                 "ingotGold"));
-        GameRegistry.addRecipe(new ItemStack(TRepo.knapsack, 1, 0), "###", "rmr", "###", '#', new ItemStack(Item.leather), 'r', new ItemStack(TRepo.toughRod, 1, 2), 'm', aluBrass);
+        GameRegistry.addRecipe(new ItemStack(TRepo.knapsack, 1, 0), "###", "rmr", "###", '#', new ItemStack(Items.leather), 'r', new ItemStack(TRepo.toughRod, 1, 2), 'm', aluBrass);
         // Drying Rack Recipes
         GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.dryingRack, 1, 0), "bbb", 'b', "slabWood"));
         //Landmine Recipes
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.landmine, 1, 0), "mcm", "rpr", 'm', "plankWood", 'c', new ItemStack(TRepo.blankPattern, 1, 1), 'r', Item.redstone, 'p',
-                Block.pressurePlateStone));
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.landmine, 1, 1), "mcm", "rpr", 'm', Block.stone, 'c', new ItemStack(TRepo.blankPattern, 1, 1), 'r', Item.redstone, 'p',
-                Block.pressurePlateStone));
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.landmine, 1, 2), "mcm", "rpr", 'm', Block.obsidian, 'c', new ItemStack(TRepo.blankPattern, 1, 1), 'r', Item.redstone, 'p',
-                Block.pressurePlateStone));
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.landmine, 1, 3), "mcm", "rpr", 'm', Item.redstoneRepeater, 'c', new ItemStack(TRepo.blankPattern, 1, 1), 'r', Item.redstone,
-                'p', Block.pressurePlateStone));
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.landmine, 1, 0), "mcm", "rpr", 'm', "plankWood", 'c', new ItemStack(TRepo.blankPattern, 1, 1), 'r', Items.redstone, 'p',
+                Blocks.stone_pressure_plate));
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.landmine, 1, 1), "mcm", "rpr", 'm', Blocks.stone, 'c', new ItemStack(TRepo.blankPattern, 1, 1), 'r', Items.redstone, 'p',
+                Blocks.stone_pressure_plate));
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.landmine, 1, 2), "mcm", "rpr", 'm', Blocks.obsidian, 'c', new ItemStack(TRepo.blankPattern, 1, 1), 'r', Items.redstone, 'p',
+                Blocks.stone_pressure_plate));
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.landmine, 1, 3), "mcm", "rpr", 'm', Items.repeater, 'c', new ItemStack(TRepo.blankPattern, 1, 1), 'r', Items.redstone,
+                'p', Blocks.stone_pressure_plate));
 
         //Ultra hardcore recipes
-        GameRegistry.addRecipe(new ItemStack(TRepo.goldHead), patSurround, '#', new ItemStack(Item.ingotGold), 'm', new ItemStack(Item.skull, 1, 3));
+        GameRegistry.addRecipe(new ItemStack(TRepo.goldHead), patSurround, '#', new ItemStack(Items.ingotGold), 'm', new ItemStack(Items.skull, 1, 3));
 
         // Slab Smeltery Components Recipes
         for (int i = 0; i < 7; i++)
@@ -687,7 +689,7 @@ protected static void addRecipesForCraftingTable ()
         }
         GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Block.cloth, 1, 0), "slabCloth", "slabCloth"));
         //Trap Recipes
-        GameRegistry.addRecipe(new ItemStack(TRepo.punji, 5, 0), "b b", " b ", "b b", 'b', new ItemStack(Item.reed));
+        GameRegistry.addRecipe(new ItemStack(TRepo.punji, 5, 0), "b b", " b ", "b b", 'b', new ItemStack(Items.reed));
         GameRegistry.addRecipe(new ItemStack(TRepo.barricadeSpruce, 1, 0), "b", "b", 'b', new ItemStack(Block.wood, 1, 1));
         GameRegistry.addRecipe(new ItemStack(TRepo.barricadeBirch, 1, 0), "b", "b", 'b', new ItemStack(Block.wood, 1, 2));
         GameRegistry.addRecipe(new ItemStack(TRepo.barricadeJungle, 1, 0), "b", "b", 'b', new ItemStack(Block.wood, 1, 3));
@@ -715,28 +717,28 @@ protected static void addRecipesForCraftingTable ()
         GameRegistry.addRecipe(new ItemStack(TRepo.slimeGel, 1, 0), "##", "##", '#', TRepo.strangeFood);
         GameRegistry.addRecipe(new ItemStack(TRepo.strangeFood, 4, 0), "#", '#', new ItemStack(TRepo.slimeGel, 1, 0));
         GameRegistry.addRecipe(new ItemStack(TRepo.slimeGel, 1, 1), "##", "##", '#', Item.slimeBall);
-        GameRegistry.addRecipe(new ItemStack(Item.slimeBall, 4, 0), "#", '#', new ItemStack(TRepo.slimeGel, 1, 1));
+        GameRegistry.addRecipe(new ItemStack(Items.slimeBall, 4, 0), "#", '#', new ItemStack(TRepo.slimeGel, 1, 1));
         //slimeExplosive
         GameRegistry.addShapelessRecipe(new ItemStack(TRepo.slimeExplosive, 1, 0), Item.slimeBall, Block.tnt);
         GameRegistry.addShapelessRecipe(new ItemStack(TRepo.slimeExplosive, 1, 2), TRepo.strangeFood, Block.tnt);
         GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TRepo.slimeExplosive, 1, 0), "slimeball", Block.tnt));
 
-        GameRegistry.addShapelessRecipe(new ItemStack(TRepo.slimeChannel, 1, 0), new ItemStack(TRepo.slimeGel, 1, Short.MAX_VALUE), new ItemStack(Item.redstone));
+        GameRegistry.addShapelessRecipe(new ItemStack(TRepo.slimeChannel, 1, 0), new ItemStack(TRepo.slimeGel, 1, Short.MAX_VALUE), new ItemStack(Items.redstone));
         GameRegistry.addShapelessRecipe(new ItemStack(TRepo.bloodChannel, 1, 0), new ItemStack(TRepo.strangeFood, 1, 1), new ItemStack(TRepo.strangeFood, 1, 1),
-                new ItemStack(TRepo.strangeFood, 1, 1), new ItemStack(TRepo.strangeFood, 1, 1), new ItemStack(Item.redstone));
-        GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TRepo.slimeChannel, 1, 0), "slimeball", "slimeball", "slimeball", "slimeball", new ItemStack(Item.redstone)));
+                new ItemStack(TRepo.strangeFood, 1, 1), new ItemStack(TRepo.strangeFood, 1, 1), new ItemStack(Items.redstone));
+        GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TRepo.slimeChannel, 1, 0), "slimeball", "slimeball", "slimeball", "slimeball", new ItemStack(Items.redstone)));
         GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TRepo.slimePad, 1, 0), TRepo.slimeChannel, "slimeball"));
     }
 
     protected static void addRecipesForDryingRack ()
     {
         //Drying rack
-        DryingRackRecipes.addDryingRecipe(Item.beefRaw, 20 * 60 * 5, new ItemStack(TRepo.jerky, 1, 0));
-        DryingRackRecipes.addDryingRecipe(Item.chickenRaw, 20 * 60 * 5, new ItemStack(TRepo.jerky, 1, 1));
-        DryingRackRecipes.addDryingRecipe(Item.porkRaw, 20 * 60 * 5, new ItemStack(TRepo.jerky, 1, 2));
+        DryingRackRecipes.addDryingRecipe(Items.beefRaw, 20 * 60 * 5, new ItemStack(TRepo.jerky, 1, 0));
+        DryingRackRecipes.addDryingRecipe(Items.chickenRaw, 20 * 60 * 5, new ItemStack(TRepo.jerky, 1, 1));
+        DryingRackRecipes.addDryingRecipe(Items.porkRaw, 20 * 60 * 5, new ItemStack(TRepo.jerky, 1, 2));
         //DryingRackRecipes.addDryingRecipe(Item.muttonRaw, 20 * 60 * 5, new ItemStack(TRepo.jerky, 1, 3));
-        DryingRackRecipes.addDryingRecipe(Item.fishRaw, 20 * 60 * 5, new ItemStack(TRepo.jerky, 1, 4));
-        DryingRackRecipes.addDryingRecipe(Item.rottenFlesh, 20 * 60 * 5, new ItemStack(TRepo.jerky, 1, 5));
+        DryingRackRecipes.addDryingRecipe(Items.fishRaw, 20 * 60 * 5, new ItemStack(TRepo.jerky, 1, 4));
+        DryingRackRecipes.addDryingRecipe(Items.rotten_flesh, 20 * 60 * 5, new ItemStack(TRepo.jerky, 1, 5));
         DryingRackRecipes.addDryingRecipe(new ItemStack(TRepo.strangeFood, 1, 0), 20 * 60 * 5, new ItemStack(TRepo.jerky, 1, 6));
         DryingRackRecipes.addDryingRecipe(new ItemStack(TRepo.strangeFood, 1, 1), 20 * 60 * 5, new ItemStack(TRepo.jerky, 1, 7));
 
@@ -747,28 +749,28 @@ protected static void addRecipesForChisel ()
     {
         /* Detailing */
         Detailing chiseling = TConstructRegistry.getChiselDetailing();
-        chiseling.addDetailing(Block.stone, 0, Block.stoneBrick, 0, TRepo.chisel);
+        chiseling.addDetailing(Blocks.stone, 0, Blocks.stonebrick, 0, TRepo.chisel);
         chiseling.addDetailing(TRepo.speedBlock, 0, TRepo.speedBlock, 1, TRepo.chisel);
         chiseling.addDetailing(TRepo.speedBlock, 2, TRepo.speedBlock, 3, TRepo.chisel);
         chiseling.addDetailing(TRepo.speedBlock, 3, TRepo.speedBlock, 4, TRepo.chisel);
         chiseling.addDetailing(TRepo.speedBlock, 4, TRepo.speedBlock, 5, TRepo.chisel);
         chiseling.addDetailing(TRepo.speedBlock, 5, TRepo.speedBlock, 6, TRepo.chisel);
 
-        chiseling.addDetailing(Block.obsidian, 0, TRepo.multiBrick, 0, TRepo.chisel);
-        chiseling.addDetailing(Block.sandStone, 0, Block.sandStone, 2, TRepo.chisel);
-        chiseling.addDetailing(Block.sandStone, 2, Block.sandStone, 1, TRepo.chisel);
-        chiseling.addDetailing(Block.sandStone, 1, TRepo.multiBrick, 1, TRepo.chisel);
+        chiseling.addDetailing(Blocks.obsidian, 0, TRepo.multiBrick, 0, TRepo.chisel);
+        chiseling.addDetailing(Blocks.sandstone, 0, Blocks.sandstone, 2, TRepo.chisel);
+        chiseling.addDetailing(Blocks.sandstone, 2, Blocks.sandstone, 1, TRepo.chisel);
+        chiseling.addDetailing(Blocks.sandstone, 1, TRepo.multiBrick, 1, TRepo.chisel);
         //chiseling.addDetailing(Block.netherrack, 0, TRepo.multiBrick, 2, TRepo.chisel);
         //chiseling.addDetailing(Block.stone_refined, 0, TRepo.multiBrick, 3, TRepo.chisel);
-        chiseling.addDetailing(Item.ingotIron, 0, TRepo.multiBrick, 4, TRepo.chisel);
-        chiseling.addDetailing(Item.ingotGold, 0, TRepo.multiBrick, 5, TRepo.chisel);
-        chiseling.addDetailing(Item.dyePowder, 4, TRepo.multiBrick, 6, TRepo.chisel);
-        chiseling.addDetailing(Item.diamond, 0, TRepo.multiBrick, 7, TRepo.chisel);
-        chiseling.addDetailing(Item.redstone, 0, TRepo.multiBrick, 8, TRepo.chisel);
-        chiseling.addDetailing(Item.bone, 0, TRepo.multiBrick, 9, TRepo.chisel);
-        chiseling.addDetailing(Item.slimeBall, 0, TRepo.multiBrick, 10, TRepo.chisel);
+        chiseling.addDetailing(Items.iron_ingot, 0, TRepo.multiBrick, 4, TRepo.chisel);
+        chiseling.addDetailing(Items.gold_ingot, 0, TRepo.multiBrick, 5, TRepo.chisel);
+        chiseling.addDetailing(Items.dyePowder, 4, TRepo.multiBrick, 6, TRepo.chisel);
+        chiseling.addDetailing(Items.diamond, 0, TRepo.multiBrick, 7, TRepo.chisel);
+        chiseling.addDetailing(Items.redstone, 0, TRepo.multiBrick, 8, TRepo.chisel);
+        chiseling.addDetailing(Items.bone, 0, TRepo.multiBrick, 9, TRepo.chisel);
+        chiseling.addDetailing(Items.slime_ball, 0, TRepo.multiBrick, 10, TRepo.chisel);
         chiseling.addDetailing(TRepo.strangeFood, 0, TRepo.multiBrick, 11, TRepo.chisel);
-        chiseling.addDetailing(Block.whiteStone, 0, TRepo.multiBrick, 12, TRepo.chisel);
+        chiseling.addDetailing(Blocks.end_stone, 0, TRepo.multiBrick, 12, TRepo.chisel);
         chiseling.addDetailing(TRepo.materials, 18, TRepo.multiBrick, 13, TRepo.chisel);
 
         // adding multiBrick / multiBrickFanxy meta 0-13 to list
@@ -777,9 +779,9 @@ protected static void addRecipesForChisel ()
             chiseling.addDetailing(TRepo.multiBrick, sc, TRepo.multiBrickFancy, sc, TRepo.chisel);
         }
 
-        chiseling.addDetailing(Block.stoneBrick, 0, TRepo.multiBrickFancy, 15, TRepo.chisel);
+        chiseling.addDetailing(Blocks.stonebrick, 0, TRepo.multiBrickFancy, 15, TRepo.chisel);
         chiseling.addDetailing(TRepo.multiBrickFancy, 15, TRepo.multiBrickFancy, 14, TRepo.chisel);
-        chiseling.addDetailing(TRepo.multiBrickFancy, 14, Block.stoneBrick, 3, TRepo.chisel);
+        chiseling.addDetailing(TRepo.multiBrickFancy, 14, Blocks.stonebrick, 3, TRepo.chisel);
         /*chiseling.addDetailing(TRepo.multiBrick, 14, TRepo.multiBrickFancy, 14, TRepo.chisel);
         chiseling.addDetailing(TRepo.multiBrick, 15, TRepo.multiBrickFancy, 15, TRepo.chisel);*/
 
@@ -820,8 +822,8 @@ public void oreRegistry ()
         OreDictionary.registerOre("ingotAluminiumBrass", new ItemStack(TRepo.materials, 1, 14));
         OreDictionary.registerOre("ingotAlumite", new ItemStack(TRepo.materials, 1, 15));
         OreDictionary.registerOre("ingotSteel", new ItemStack(TRepo.materials, 1, 16));
-        ensureOreIsRegistered("ingotIron", new ItemStack(Item.ingotIron));
-        ensureOreIsRegistered("ingotGold", new ItemStack(Item.ingotGold));
+        ensureOreIsRegistered("ingotIron", new ItemStack(Items.iron_ingot));
+        ensureOreIsRegistered("ingotGold", new ItemStack(Items.gold_ingot));
         OreDictionary.registerOre("ingotObsidian", new ItemStack(TRepo.materials, 1, 18));
         OreDictionary.registerOre("ingotPigIron", new ItemStack(TRepo.materials, 1, 34));
         OreDictionary.registerOre("itemRawRubber", new ItemStack(TRepo.materials, 1, 36));
@@ -838,8 +840,8 @@ public void oreRegistry ()
         OreDictionary.registerOre("blockAluminiumBrass", new ItemStack(TRepo.metalBlock, 1, 7));
         OreDictionary.registerOre("blockAlumite", new ItemStack(TRepo.metalBlock, 1, 8));
         OreDictionary.registerOre("blockSteel", new ItemStack(TRepo.metalBlock, 1, 9));
-        ensureOreIsRegistered("blockIron", new ItemStack(Block.blockIron));
-        ensureOreIsRegistered("blockGold", new ItemStack(Block.blockGold));
+        ensureOreIsRegistered("blockIron", new ItemStack(Blocks.iron_block));
+        ensureOreIsRegistered("blockGold", new ItemStack(Blocks.gold_block));
 
         OreDictionary.registerOre("nuggetIron", new ItemStack(TRepo.materials, 1, 19));
         OreDictionary.registerOre("nuggetIron", new ItemStack(TRepo.oreBerries, 1, 0));
@@ -861,17 +863,17 @@ public void oreRegistry ()
         OreDictionary.registerOre("nuggetAlumite", new ItemStack(TRepo.materials, 1, 32));
         OreDictionary.registerOre("nuggetSteel", new ItemStack(TRepo.materials, 1, 33));
         OreDictionary.registerOre("nuggetGold", new ItemStack(TRepo.oreBerries, 1, 1));
-        ensureOreIsRegistered("nuggetGold", new ItemStack(Item.goldNugget));
+        ensureOreIsRegistered("nuggetGold", new ItemStack(Items.gold_nugget));
         OreDictionary.registerOre("nuggetPigIron", new ItemStack(TRepo.materials, 1, 35));
 
         OreDictionary.registerOre("slabCloth", new ItemStack(TRepo.woolSlab1, 1, Short.MAX_VALUE));
         OreDictionary.registerOre("slabCloth", new ItemStack(TRepo.woolSlab2, 1, Short.MAX_VALUE));
 
-        ensureOreIsRegistered("stoneMossy", new ItemStack(Block.stoneBrick, 1, 1));
-        ensureOreIsRegistered("stoneMossy", new ItemStack(Block.cobblestoneMossy));
+        ensureOreIsRegistered("stoneMossy", new ItemStack(Blocks.stonebrick, 1, 1));
+        ensureOreIsRegistered("stoneMossy", new ItemStack(Blocks.mossy_cobblestone));
 
-        OreDictionary.registerOre("crafterWood", new ItemStack(Block.workbench, 1));
-        OreDictionary.registerOre("craftingTableWood", new ItemStack(Block.workbench, 1));
+        OreDictionary.registerOre("crafterWood", new ItemStack(Blocks.crafting_table, 1));
+        OreDictionary.registerOre("craftingTableWood", new ItemStack(Blocks.crafting_table, 1));
 
         OreDictionary.registerOre("torchStone", new ItemStack(TRepo.stoneTorch));
 
@@ -893,18 +895,18 @@ public void oreRegistry ()
         BlockDispenser.dispenseBehaviorRegistry.putObject(TRepo.arrow, new TDispenserBehaviorArrow());
 
         //Vanilla stuff
-        OreDictionary.registerOre("slimeball", new ItemStack(Item.slimeBall));
+        OreDictionary.registerOre("slimeball", new ItemStack(Items.slimeBall));
         OreDictionary.registerOre("slimeball", new ItemStack(TRepo.strangeFood, 1, 0));
         OreDictionary.registerOre("slimeball", new ItemStack(TRepo.strangeFood, 1, 1));
         OreDictionary.registerOre("slimeball", new ItemStack(TRepo.materials, 1, 36));
         OreDictionary.registerOre("glass", new ItemStack(TRepo.clearGlass));
         OreDictionary.registerOre("glass", new ItemStack(Block.glass));
         RecipeRemover.removeShapedRecipe(new ItemStack(Block.pistonStickyBase));
-        RecipeRemover.removeShapedRecipe(new ItemStack(Item.magmaCream));
-        RecipeRemover.removeShapedRecipe(new ItemStack(Item.leash));
+        RecipeRemover.removeShapedRecipe(new ItemStack(Items.magmaCream));
+        RecipeRemover.removeShapedRecipe(new ItemStack(Items.leash));
         GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Block.pistonStickyBase), "slimeball", Block.pistonBase));
-        GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Item.magmaCream), "slimeball", Item.blazePowder));
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.leash, 2), "ss ", "sS ", "  s", 's', Item.silk, 'S', "slimeball"));
+        GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Items.magmaCream), "slimeball", Item.blazePowder));
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.leash, 2), "ss ", "sS ", "  s", 's', Item.silk, 'S', "slimeball"));
     }
 
     private static void ensureOreIsRegistered (String oreName, ItemStack is)
@@ -996,35 +998,35 @@ public void modRecipes ()
             TRepo.initRecipes = true;
             if (PHConstruct.removeVanillaToolRecipes)
             {
-                RecipeRemover.removeAnyRecipe(new ItemStack(Item.pickaxeWood));
-                RecipeRemover.removeAnyRecipe(new ItemStack(Item.axeWood));
-                RecipeRemover.removeAnyRecipe(new ItemStack(Item.shovelWood));
-                RecipeRemover.removeAnyRecipe(new ItemStack(Item.hoeWood));
-                RecipeRemover.removeAnyRecipe(new ItemStack(Item.swordWood));
-
-                RecipeRemover.removeAnyRecipe(new ItemStack(Item.pickaxeStone));
-                RecipeRemover.removeAnyRecipe(new ItemStack(Item.axeStone));
-                RecipeRemover.removeAnyRecipe(new ItemStack(Item.shovelStone));
-                RecipeRemover.removeAnyRecipe(new ItemStack(Item.hoeStone));
-                RecipeRemover.removeAnyRecipe(new ItemStack(Item.swordStone));
-
-                RecipeRemover.removeAnyRecipe(new ItemStack(Item.pickaxeIron));
-                RecipeRemover.removeAnyRecipe(new ItemStack(Item.axeIron));
-                RecipeRemover.removeAnyRecipe(new ItemStack(Item.shovelIron));
-                RecipeRemover.removeAnyRecipe(new ItemStack(Item.hoeIron));
-                RecipeRemover.removeAnyRecipe(new ItemStack(Item.swordIron));
-
-                RecipeRemover.removeAnyRecipe(new ItemStack(Item.pickaxeDiamond));
-                RecipeRemover.removeAnyRecipe(new ItemStack(Item.axeDiamond));
-                RecipeRemover.removeAnyRecipe(new ItemStack(Item.shovelDiamond));
-                RecipeRemover.removeAnyRecipe(new ItemStack(Item.hoeDiamond));
-                RecipeRemover.removeAnyRecipe(new ItemStack(Item.swordDiamond));
-
-                RecipeRemover.removeAnyRecipe(new ItemStack(Item.pickaxeGold));
-                RecipeRemover.removeAnyRecipe(new ItemStack(Item.axeGold));
-                RecipeRemover.removeAnyRecipe(new ItemStack(Item.shovelGold));
-                RecipeRemover.removeAnyRecipe(new ItemStack(Item.hoeGold));
-                RecipeRemover.removeAnyRecipe(new ItemStack(Item.swordGold));
+                RecipeRemover.removeAnyRecipe(new ItemStack(Items.wooden_pickaxe));
+                RecipeRemover.removeAnyRecipe(new ItemStack(Items.wooden_axe));
+                RecipeRemover.removeAnyRecipe(new ItemStack(Items.wooden_shovel));
+                RecipeRemover.removeAnyRecipe(new ItemStack(Items.wooden_hoe));
+                RecipeRemover.removeAnyRecipe(new ItemStack(Items.wooden_sword));
+
+                RecipeRemover.removeAnyRecipe(new ItemStack(Items.stone_pickaxe));
+                RecipeRemover.removeAnyRecipe(new ItemStack(Items.stone_axe));
+                RecipeRemover.removeAnyRecipe(new ItemStack(Items.stone_shovel));
+                RecipeRemover.removeAnyRecipe(new ItemStack(Items.stone_hoe));
+                RecipeRemover.removeAnyRecipe(new ItemStack(Items.stone_sword));
+
+                RecipeRemover.removeAnyRecipe(new ItemStack(Items.iron_pickaxe));
+                RecipeRemover.removeAnyRecipe(new ItemStack(Items.iron_axe));
+                RecipeRemover.removeAnyRecipe(new ItemStack(Items.iron_shovel));
+                RecipeRemover.removeAnyRecipe(new ItemStack(Items.iron_hoe));
+                RecipeRemover.removeAnyRecipe(new ItemStack(Items.iron_sword));
+
+                RecipeRemover.removeAnyRecipe(new ItemStack(Items.diamond_pickaxe));
+                RecipeRemover.removeAnyRecipe(new ItemStack(Items.diamond_axe));
+                RecipeRemover.removeAnyRecipe(new ItemStack(Items.diamond_shovel));
+                RecipeRemover.removeAnyRecipe(new ItemStack(Items.diamond_hoe));
+                RecipeRemover.removeAnyRecipe(new ItemStack(Items.diamond_sword));
+
+                RecipeRemover.removeAnyRecipe(new ItemStack(Items.golden_pickaxe));
+                RecipeRemover.removeAnyRecipe(new ItemStack(Items.golden_axe));
+                RecipeRemover.removeAnyRecipe(new ItemStack(Items.golden_shovel));
+                RecipeRemover.removeAnyRecipe(new ItemStack(Items.golden_hoe));
+                RecipeRemover.removeAnyRecipe(new ItemStack(Items.golden_sword));
             }
         }
     }
@@ -1043,9 +1045,9 @@ private static void registerIngotCasting (FluidType ft)
         LiquidCasting tableCasting = TConstructRegistry.instance.getTableCasting();
         for (ItemStack ore : OreDictionary.getOres("ingot" + ft.toString()))
         {
-            tableCasting.addCastingRecipe(pattern, new FluidStack(TRepo.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(ore.itemID, 1, ore.getItemDamage()), false, 50);
-            tableCasting.addCastingRecipe(pattern, new FluidStack(TRepo.moltenGoldFluid, TConstruct.oreLiquidValue), new ItemStack(ore.itemID, 1, ore.getItemDamage()), false, 50);
-            tableCasting.addCastingRecipe(new ItemStack(ore.itemID, 1, ore.getItemDamage()), new FluidStack(ft.fluid, TConstruct.ingotLiquidValue), pattern, 80);
+            tableCasting.addCastingRecipe(pattern, new FluidStack(TRepo.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(ore, 1, ore.getItemDamage()), false, 50);
+            tableCasting.addCastingRecipe(pattern, new FluidStack(TRepo.moltenGoldFluid, TConstruct.oreLiquidValue), new ItemStack(ore, 1, ore.getItemDamage()), false, 50);
+            tableCasting.addCastingRecipe(new ItemStack(ore, 1, ore.getItemDamage()), new FluidStack(ft.fluid, TConstruct.ingotLiquidValue), pattern, 80);
         }
 
     }
@@ -1054,8 +1056,8 @@ protected static void addRecipesForBasinCasting ()
     {
         LiquidCasting basinCasting = TConstructRegistry.getBasinCasting();
         // Block Casting
-        basinCasting.addCastingRecipe(new ItemStack(Block.blockIron), new FluidStack(TRepo.moltenIronFluid, TConstruct.blockLiquidValue), null, true, 100); //Iron
-        basinCasting.addCastingRecipe(new ItemStack(Block.blockGold), new FluidStack(TRepo.moltenGoldFluid, TConstruct.blockLiquidValue), null, true, 100); //gold
+        basinCasting.addCastingRecipe(new ItemStack(Blocks.iron_block), new FluidStack(TRepo.moltenIronFluid, TConstruct.blockLiquidValue), null, true, 100); //Iron
+        basinCasting.addCastingRecipe(new ItemStack(Blocks.gold_block), new FluidStack(TRepo.moltenGoldFluid, TConstruct.blockLiquidValue), null, true, 100); //gold
         basinCasting.addCastingRecipe(new ItemStack(TRepo.metalBlock, 1, 3), new FluidStack(TRepo.moltenCopperFluid, TConstruct.blockLiquidValue), null, true, 100); //copper
         basinCasting.addCastingRecipe(new ItemStack(TRepo.metalBlock, 1, 5), new FluidStack(TRepo.moltenTinFluid, TConstruct.blockLiquidValue), null, true, 100); //tin
         basinCasting.addCastingRecipe(new ItemStack(TRepo.metalBlock, 1, 6), new FluidStack(TRepo.moltenAluminumFluid, TConstruct.blockLiquidValue), null, true, 100); //aluminum
@@ -1065,15 +1067,15 @@ protected static void addRecipesForBasinCasting ()
         basinCasting.addCastingRecipe(new ItemStack(TRepo.metalBlock, 1, 7), new FluidStack(TRepo.moltenAlubrassFluid, TConstruct.blockLiquidValue), null, true, 100); //albrass
         basinCasting.addCastingRecipe(new ItemStack(TRepo.metalBlock, 1, 2), new FluidStack(TRepo.moltenManyullynFluid, TConstruct.blockLiquidValue), null, true, 100); //manyullyn
         basinCasting.addCastingRecipe(new ItemStack(TRepo.metalBlock, 1, 8), new FluidStack(TRepo.moltenAlumiteFluid, TConstruct.blockLiquidValue), null, true, 100); //alumite
-        basinCasting.addCastingRecipe(new ItemStack(Block.obsidian), new FluidStack(TRepo.moltenObsidianFluid, TConstruct.oreLiquidValue), null, true, 100);// obsidian
+        basinCasting.addCastingRecipe(new ItemStack(Blocks.obsidian), new FluidStack(TRepo.moltenObsidianFluid, TConstruct.oreLiquidValue), null, true, 100);// obsidian
         basinCasting.addCastingRecipe(new ItemStack(TRepo.metalBlock, 1, 9), new FluidStack(TRepo.moltenSteelFluid, TConstruct.blockLiquidValue), null, true, 100); //steel
         basinCasting.addCastingRecipe(new ItemStack(TRepo.clearGlass, 1, 0), new FluidStack(TRepo.moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME), null, true, 100); //glass
         basinCasting.addCastingRecipe(new ItemStack(TRepo.smeltery, 1, 4), new FluidStack(TRepo.moltenStoneFluid, TConstruct.ingotLiquidValue), null, true, 100); //seared stone
         basinCasting.addCastingRecipe(new ItemStack(TRepo.smeltery, 1, 5), new FluidStack(TRepo.moltenStoneFluid, TConstruct.chunkLiquidValue), new ItemStack(Block.cobblestone), true, 100);
-        basinCasting.addCastingRecipe(new ItemStack(Block.blockEmerald), new FluidStack(TRepo.moltenEmeraldFluid, 640 * 9), null, true, 100); //emerald
+        basinCasting.addCastingRecipe(new ItemStack(Blocks.emerald_block), new FluidStack(TRepo.moltenEmeraldFluid, 640 * 9), null, true, 100); //emerald
         basinCasting.addCastingRecipe(new ItemStack(TRepo.speedBlock, 1, 0), new FluidStack(TRepo.moltenTinFluid, TConstruct.nuggetLiquidValue), new ItemStack(Block.gravel), true, 100); //brownstone
-        basinCasting.addCastingRecipe(new ItemStack(Block.whiteStone), new FluidStack(TRepo.moltenEnderFluid, TConstruct.chunkLiquidValue), new ItemStack(Block.obsidian), true, 100); //endstone
-        basinCasting.addCastingRecipe(new ItemStack(TRepo.metalBlock.blockID, 1, 10), new FluidStack(TRepo.moltenEnderFluid, 1000), null, true, 100); //ender
+        basinCasting.addCastingRecipe(new ItemStack(Blocks.end_stone), new FluidStack(TRepo.moltenEnderFluid, TConstruct.chunkLiquidValue), new ItemStack(Block.obsidian), true, 100); //endstone
+        basinCasting.addCastingRecipe(new ItemStack(TRepo.metalBlock, 1, 10), new FluidStack(TRepo.moltenEnderFluid, 1000), null, true, 100); //ender
         basinCasting.addCastingRecipe(new ItemStack(TRepo.glueBlock), new FluidStack(TRepo.glueFluid, TConstruct.blockLiquidValue), null, true, 100); //glue
 
         // basinCasting.addCastingRecipe(new ItemStack(slimeGel, 1, 0), new FluidStack(blueSlimeFluid, FluidContainerRegistry.BUCKET_VOLUME), null, true, 100);
@@ -1132,20 +1134,20 @@ protected static void addRecipesForSmeltery ()
         Smeltery.addMelting(FluidType.Gold, new ItemStack(TRepo.blankPattern, 4, 2), -50, TConstruct.ingotLiquidValue * 2);
         Smeltery.addMelting(FluidType.Glue, new ItemStack(TRepo.materials, 1, 36), 0, TConstruct.ingotLiquidValue);
 
-        Smeltery.addMelting(FluidType.Ender, new ItemStack(Item.enderPearl, 4), 0, 250);
+        Smeltery.addMelting(FluidType.Ender, new ItemStack(Items.enderPearl, 4), 0, 250);
         Smeltery.addMelting(TRepo.metalBlock, 10, 50, new FluidStack(TRepo.moltenEnderFluid, 1000));
-        Smeltery.addMelting(FluidType.Water, new ItemStack(Item.snowball, 1, 0), 0, 125);
-        Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.flintAndSteel, 1, 0), 0, TConstruct.ingotLiquidValue);
-        Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.compass, 1, 0), 0, TConstruct.ingotLiquidValue * 4);
-        Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.bucketEmpty), 0, TConstruct.ingotLiquidValue * 3);
-        Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.minecartEmpty), 0, TConstruct.ingotLiquidValue * 5);
-        Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.minecartCrate), 0, TConstruct.ingotLiquidValue * 5);
-        Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.minecartPowered), 0, TConstruct.ingotLiquidValue * 5);
-        Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.minecartHopper), 50, TConstruct.ingotLiquidValue * 10);
-        Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.doorIron), 0, TConstruct.ingotLiquidValue * 6);
-        Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.cauldron), 0, TConstruct.ingotLiquidValue * 7);
-        Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.shears), 0, TConstruct.ingotLiquidValue * 2);
-        Smeltery.addMelting(FluidType.Emerald, new ItemStack(Item.emerald), -50, 640);
+        Smeltery.addMelting(FluidType.Water, new ItemStack(Items.snowball, 1, 0), 0, 125);
+        Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.flintAndSteel, 1, 0), 0, TConstruct.ingotLiquidValue);
+        Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.compass, 1, 0), 0, TConstruct.ingotLiquidValue * 4);
+        Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.bucketEmpty), 0, TConstruct.ingotLiquidValue * 3);
+        Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.minecartEmpty), 0, TConstruct.ingotLiquidValue * 5);
+        Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.minecartCrate), 0, TConstruct.ingotLiquidValue * 5);
+        Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.minecartPowered), 0, TConstruct.ingotLiquidValue * 5);
+        Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.minecartHopper), 50, TConstruct.ingotLiquidValue * 10);
+        Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.doorIron), 0, TConstruct.ingotLiquidValue * 6);
+        Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.cauldron), 0, TConstruct.ingotLiquidValue * 7);
+        Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.shears), 0, TConstruct.ingotLiquidValue * 2);
+        Smeltery.addMelting(FluidType.Emerald, new ItemStack(Items.emerald), -50, 640);
 
         //Blocks melt as themselves!
         //Ore
@@ -1203,36 +1205,36 @@ protected static void addRecipesForSmeltery ()
         Smeltery.addMelting(FluidType.Iron, new ItemStack(Block.hopperBlock), 0, TConstruct.ingotLiquidValue * 5);
 
         //Vanilla Armor
-        Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.helmetIron, 1, 0), 50, TConstruct.ingotLiquidValue * 5);
-        Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.plateIron, 1, 0), 50, TConstruct.ingotLiquidValue * 8);
-        Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.legsIron, 1, 0), 50, TConstruct.ingotLiquidValue * 7);
-        Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.bootsIron, 1, 0), 50, TConstruct.ingotLiquidValue * 4);
+        Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.helmetIron, 1, 0), 50, TConstruct.ingotLiquidValue * 5);
+        Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.plateIron, 1, 0), 50, TConstruct.ingotLiquidValue * 8);
+        Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.legsIron, 1, 0), 50, TConstruct.ingotLiquidValue * 7);
+        Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.bootsIron, 1, 0), 50, TConstruct.ingotLiquidValue * 4);
 
-        Smeltery.addMelting(FluidType.Gold, new ItemStack(Item.helmetGold, 1, 0), 50, TConstruct.ingotLiquidValue * 5);
-        Smeltery.addMelting(FluidType.Gold, new ItemStack(Item.plateGold, 1, 0), 50, TConstruct.ingotLiquidValue * 8);
-        Smeltery.addMelting(FluidType.Gold, new ItemStack(Item.legsGold, 1, 0), 50, TConstruct.ingotLiquidValue * 7);
-        Smeltery.addMelting(FluidType.Gold, new ItemStack(Item.bootsGold, 1, 0), 50, TConstruct.ingotLiquidValue * 4);
+        Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.helmetGold, 1, 0), 50, TConstruct.ingotLiquidValue * 5);
+        Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.plateGold, 1, 0), 50, TConstruct.ingotLiquidValue * 8);
+        Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.legsGold, 1, 0), 50, TConstruct.ingotLiquidValue * 7);
+        Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.bootsGold, 1, 0), 50, TConstruct.ingotLiquidValue * 4);
 
-        Smeltery.addMelting(FluidType.Steel, new ItemStack(Item.helmetChain, 1, 0), 25, TConstruct.ingotLiquidValue);
-        Smeltery.addMelting(FluidType.Steel, new ItemStack(Item.plateChain, 1, 0), 50, TConstruct.oreLiquidValue);
-        Smeltery.addMelting(FluidType.Steel, new ItemStack(Item.legsChain, 1, 0), 50, TConstruct.oreLiquidValue);
-        Smeltery.addMelting(FluidType.Steel, new ItemStack(Item.bootsChain, 1, 0), 25, TConstruct.ingotLiquidValue);
+        Smeltery.addMelting(FluidType.Steel, new ItemStack(Items.helmetChain, 1, 0), 25, TConstruct.ingotLiquidValue);
+        Smeltery.addMelting(FluidType.Steel, new ItemStack(Items.plateChain, 1, 0), 50, TConstruct.oreLiquidValue);
+        Smeltery.addMelting(FluidType.Steel, new ItemStack(Items.legsChain, 1, 0), 50, TConstruct.oreLiquidValue);
+        Smeltery.addMelting(FluidType.Steel, new ItemStack(Items.bootsChain, 1, 0), 25, TConstruct.ingotLiquidValue);
 
-        Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.horseArmorIron, 1), 100, TConstruct.ingotLiquidValue * 8);
-        Smeltery.addMelting(FluidType.Gold, new ItemStack(Item.horseArmorGold, 1), 100, TConstruct.ingotLiquidValue * 8);
+        Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.horseArmorIron, 1), 100, TConstruct.ingotLiquidValue * 8);
+        Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.horseArmorGold, 1), 100, TConstruct.ingotLiquidValue * 8);
 
         //Vanilla tools
-        Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.hoeIron, 1, 0), 0, TConstruct.oreLiquidValue);
-        Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.swordIron, 1, 0), 0, TConstruct.oreLiquidValue);
-        Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.shovelIron, 1, 0), 0, TConstruct.ingotLiquidValue);
-        Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.pickaxeIron, 1, 0), 0, TConstruct.ingotLiquidValue * 3);
-        Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.axeIron, 1, 0), 0, TConstruct.ingotLiquidValue * 3);
-
-        Smeltery.addMelting(FluidType.Gold, new ItemStack(Item.hoeGold, 1, 0), 0, TConstruct.oreLiquidValue);
-        Smeltery.addMelting(FluidType.Gold, new ItemStack(Item.swordGold, 1, 0), 0, TConstruct.oreLiquidValue);
-        Smeltery.addMelting(FluidType.Gold, new ItemStack(Item.shovelGold, 1, 0), 0, TConstruct.ingotLiquidValue);
-        Smeltery.addMelting(FluidType.Gold, new ItemStack(Item.pickaxeGold, 1, 0), 0, TConstruct.ingotLiquidValue * 3);
-        Smeltery.addMelting(FluidType.Gold, new ItemStack(Item.axeGold, 1, 0), 0, TConstruct.ingotLiquidValue * 3);
+        Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.hoeIron, 1, 0), 0, TConstruct.oreLiquidValue);
+        Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.swordIron, 1, 0), 0, TConstruct.oreLiquidValue);
+        Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.shovelIron, 1, 0), 0, TConstruct.ingotLiquidValue);
+        Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.pickaxeIron, 1, 0), 0, TConstruct.ingotLiquidValue * 3);
+        Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.axeIron, 1, 0), 0, TConstruct.ingotLiquidValue * 3);
+
+        Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.hoeGold, 1, 0), 0, TConstruct.oreLiquidValue);
+        Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.swordGold, 1, 0), 0, TConstruct.oreLiquidValue);
+        Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.shovelGold, 1, 0), 0, TConstruct.ingotLiquidValue);
+        Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.pickaxeGold, 1, 0), 0, TConstruct.ingotLiquidValue * 3);
+        Smeltery.addMelting(FluidType.Gold, new ItemStack(Items.axeGold, 1, 0), 0, TConstruct.ingotLiquidValue * 3);
     }
 
     public void modIntegration ()
@@ -1241,7 +1243,7 @@ public void modIntegration ()
         Block taintedSoil = GameRegistry.findBlock("Natura", "soil.tainted");
         Block heatSand = GameRegistry.findBlock("Natura", "heatsand");
         if (taintedSoil != null && heatSand != null)
-            GameRegistry.addShapelessRecipe(new ItemStack(TRepo.craftedSoil, 2, 6), Item.netherStalkSeeds, taintedSoil, heatSand);
+            GameRegistry.addShapelessRecipe(new ItemStack(TRepo.craftedSoil, 2, 6), Items.netherStalkSeeds, taintedSoil, heatSand);
 
         ItemStack ironpick = ToolBuilder.instance.buildTool(new ItemStack(TRepo.pickaxeHead, 1, 6), new ItemStack(TRepo.toolRod, 1, 2), new ItemStack(TRepo.binding, 1, 6), "");
         /*TE3 Flux*/
@@ -1272,7 +1274,7 @@ public void modIntegration ()
             for (int meta = 0; meta < TRepo.patternOutputs.length; meta++)
             {
                 if (TRepo.patternOutputs[meta] != null)
-                    TConstructRegistry.addPartMapping(TRepo.woodPattern.itemID, meta + 1, 31, new ItemStack(TRepo.patternOutputs[meta], 1, 31));
+                    TConstructRegistry.addPartMapping(TRepo.woodPattern, meta + 1, 31, new ItemStack(TRepo.patternOutputs[meta], 1, 31));
             }
 
             TConstructRegistry.addBowstringMaterial(1, 2, new ItemStack((Item) obj, 1, 7), new ItemStack(TRepo.bowstring, 1, 1), 1F, 1F, 0.9f);
@@ -1381,7 +1383,7 @@ public void modIntegration ()
         ores = OreDictionary.getOres("itemRubber");
         if (ores.size() > 0)
         {
-            FurnaceRecipes.smelting().addSmelting(TRepo.materials.itemID, 36, ores.get(0), 0.2f);
+            FurnaceRecipes.smelting().addSmelting(TRepo.materials, 36, ores.get(0), 0.2f);
         }
     }
 
diff --git a/src/main/java/tconstruct/items/tools/Hammer.java b/src/main/java/tconstruct/items/tools/Hammer.java
index 18d0bc88bbd..4502db61251 100644
--- a/src/main/java/tconstruct/items/tools/Hammer.java
+++ b/src/main/java/tconstruct/items/tools/Hammer.java
@@ -9,15 +9,15 @@
 import tconstruct.library.crafting.ToolBuilder;
 import tconstruct.library.tools.AbilityHelper;
 import tconstruct.library.tools.HarvestTool;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.Icon;
+import net.minecraft.util.IIcon;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
@@ -26,9 +26,9 @@
 
 public class Hammer extends HarvestTool
 {
-    public Hammer(int itemID)
+    public Hammer()
     {
-        super(itemID, 2);
+        super(2);
         this.setUnlocalizedName("InfiTool.Hammer");
     }
 
@@ -131,7 +131,7 @@ public String getDefaultFolder ()
     }
 
     @Override
-    public Icon getIcon (ItemStack stack, int renderPass)
+    public IIcon getIcon (ItemStack stack, int renderPass)
     {
         NBTTagCompound tags = stack.getTagCompound();
 
@@ -254,7 +254,7 @@ public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPl
             }
         }
 
-        if (block == Block.silverfish)
+        if (block == Blocks.silverfish)
             validStart = true;
 
         MovingObjectPosition mop = AbilityHelper.raytraceFromEntity(world, player, true, 4.5D);
diff --git a/src/main/java/tconstruct/items/tools/LumberAxe.java b/src/main/java/tconstruct/items/tools/LumberAxe.java
index 8e7a4446f3d..84b7fb24ca7 100644
--- a/src/main/java/tconstruct/items/tools/LumberAxe.java
+++ b/src/main/java/tconstruct/items/tools/LumberAxe.java
@@ -308,7 +308,8 @@ void destroyWood (World world, int x, int y, int z, ItemStack stack, NBTTagCompo
                                     world.setBlockToAir(xPos, yPos, zPos);
                                     if (!player.capabilities.isCreativeMode)
                                     {
-                                        block.harvestBlock(world, player, xPos, yPos, zPos, meta);
+                                        //TODO harvestBlock
+                                        block.func_149636_a(world, player, xPos, yPos, zPos, meta);
                                         onBlockDestroyed(stack, world, localblockID, xPos, yPos, zPos, player);
                                     }
                                 }
diff --git a/src/main/java/tconstruct/items/tools/PotionLauncher.java b/src/main/java/tconstruct/items/tools/PotionLauncher.java
index ccf61efff93..b49660a1a70 100644
--- a/src/main/java/tconstruct/items/tools/PotionLauncher.java
+++ b/src/main/java/tconstruct/items/tools/PotionLauncher.java
@@ -3,7 +3,7 @@
 import java.util.List;
 
 import tconstruct.entity.projectile.LaunchedPotion;
-
+import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.EntityLivingBase;
@@ -104,7 +104,7 @@ public void registerIcons (IIconRegister par1IconRegister)
     }
 
     @SideOnly(Side.CLIENT)
-    public Icon getIconFromDamage (int meta)
+    public IIcon getIconFromDamage (int meta)
     {
         return icons[0];
     }
diff --git a/src/main/java/tconstruct/library/TConstructRegistry.java b/src/main/java/tconstruct/library/TConstructRegistry.java
index 17f7abe9b79..8d969c2150e 100644
--- a/src/main/java/tconstruct/library/TConstructRegistry.java
+++ b/src/main/java/tconstruct/library/TConstructRegistry.java
@@ -18,8 +18,9 @@
 import tconstruct.library.tools.ToolCore;
 import tconstruct.library.tools.ToolMaterial;
 import tconstruct.library.util.TabTools;
-
 import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
@@ -147,14 +148,14 @@ public static ItemStack getItemStack (String name)
 
     /** Maps an item and a material ID to an output part
      * 
-     * @param patternID ID to check against
+     * @param woodPattern ID to check against
      * @param patternMeta Metadata to check against
      * @param materialID Material that goes with the item
      * @param output The resulting part
      */
-    public static void addPartMapping (int patternID, int patternMeta, int materialID, ItemStack output)
+    public static void addPartMapping (Item woodPattern, int patternMeta, int materialID, ItemStack output)
     {
-        patternPartMapping.put(Arrays.asList(patternID, patternMeta, materialID), output);
+        patternPartMapping.put(Arrays.asList(woodPattern, patternMeta, materialID), output);
     }
 
     public static ItemStack getPartMapping (int itemID, int metadata, int materialID)
@@ -511,7 +512,7 @@ public static void registerActiveToolMod (ActiveToolMod mod)
      * 5: Has rotational TileEntity data
      * 6: Custom placement logic
      */
-    public static int[] drawbridgeState = new int[Block.blocksList.length];
+    public static Block[] drawbridgeState = new Block[Block.blocksList.length];
     /** Blocks that are interchangable with each other. Ex: Still and flowing water */
     public static int[] interchangableBlockMapping = new int[Block.blocksList.length];
     /** Blocks that place items, and vice versa */
@@ -519,166 +520,166 @@ public static void registerActiveToolMod (ActiveToolMod mod)
 
     static void initializeDrawbridgeState ()
     {
-        drawbridgeState[Block.stone.blockID] = 1;
-        drawbridgeState[Block.grass.blockID] = 1;
-        drawbridgeState[Block.dirt.blockID] = 1;
-        drawbridgeState[Block.cobblestone.blockID] = 1;
-        drawbridgeState[Block.bedrock.blockID] = 2;
-        drawbridgeState[Block.waterMoving.blockID] = 1;
-        drawbridgeState[Block.waterStill.blockID] = 1;
-        interchangableBlockMapping[Block.waterStill.blockID] = Block.waterMoving.blockID;
-        interchangableBlockMapping[Block.waterMoving.blockID] = Block.waterStill.blockID;
-        drawbridgeState[Block.lavaMoving.blockID] = 1;
-        drawbridgeState[Block.lavaStill.blockID] = 1;
-        interchangableBlockMapping[Block.lavaStill.blockID] = Block.lavaMoving.blockID;
-        interchangableBlockMapping[Block.lavaMoving.blockID] = Block.lavaStill.blockID;
-        drawbridgeState[Block.sand.blockID] = 1;
-        drawbridgeState[Block.gravel.blockID] = 1;
-        drawbridgeState[Block.oreGold.blockID] = 1;
-        drawbridgeState[Block.oreIron.blockID] = 1;
-        drawbridgeState[Block.oreCoal.blockID] = 1;
-        drawbridgeState[Block.sponge.blockID] = 1;
-        drawbridgeState[Block.oreLapis.blockID] = 1;
-        drawbridgeState[Block.blockLapis.blockID] = 1;
-        drawbridgeState[Block.dispenser.blockID] = 3;
-        drawbridgeState[Block.music.blockID] = 1;
-        drawbridgeState[Block.bed.blockID] = 2;
-        drawbridgeState[Block.railPowered.blockID] = 4;
-        drawbridgeState[Block.railDetector.blockID] = 4;
-        drawbridgeState[Block.pistonStickyBase.blockID] = 3;
-        drawbridgeState[Block.web.blockID] = 1;
-        drawbridgeState[Block.pistonBase.blockID] = 3;
-        drawbridgeState[Block.pistonExtension.blockID] = 2;
-        drawbridgeState[Block.plantYellow.blockID] = 1;
-        drawbridgeState[Block.plantRed.blockID] = 1;
-        drawbridgeState[Block.mushroomBrown.blockID] = 1;
-        drawbridgeState[Block.mushroomRed.blockID] = 1;
-        drawbridgeState[Block.blockGold.blockID] = 1;
-        drawbridgeState[Block.blockIron.blockID] = 1;
-        drawbridgeState[Block.brick.blockID] = 1;
-        drawbridgeState[Block.tnt.blockID] = 1;
-        drawbridgeState[Block.bookShelf.blockID] = 1;
-        drawbridgeState[Block.cobblestoneMossy.blockID] = 1;
-        drawbridgeState[Block.obsidian.blockID] = 1;
-        drawbridgeState[Block.torchWood.blockID] = 1;
-        drawbridgeState[Block.fire.blockID] = 1;
-        drawbridgeState[Block.mobSpawner.blockID] = 2;
-        drawbridgeState[Block.stairsWoodOak.blockID] = 3;
-        drawbridgeState[Block.chest.blockID] = 5;
-        drawbridgeState[Block.redstoneWire.blockID] = 1;
-        blockToItemMapping[Block.redstoneWire.blockID] = Item.redstone.itemID;
-        blockToItemMapping[Item.redstone.itemID] = Block.redstoneWire.blockID;
-        drawbridgeState[Block.oreDiamond.blockID] = 1;
-        drawbridgeState[Block.blockDiamond.blockID] = 1;
-        drawbridgeState[Block.workbench.blockID] = 1;
-        drawbridgeState[Block.crops.blockID] = 2;
-        drawbridgeState[Block.tilledField.blockID] = 1;
-        drawbridgeState[Block.furnaceIdle.blockID] = 3;
-        drawbridgeState[Block.furnaceBurning.blockID] = 3;
-        interchangableBlockMapping[Block.furnaceIdle.blockID] = Block.furnaceBurning.blockID;
-        interchangableBlockMapping[Block.furnaceBurning.blockID] = Block.furnaceIdle.blockID;
-        drawbridgeState[Block.tilledField.blockID] = 1;
-        drawbridgeState[Block.signPost.blockID] = 3;
-        drawbridgeState[Block.doorWood.blockID] = 2;
-        drawbridgeState[Block.ladder.blockID] = 1;
-        drawbridgeState[Block.rail.blockID] = 4;
-        drawbridgeState[Block.stairsCobblestone.blockID] = 3;
-        drawbridgeState[Block.signWall.blockID] = 3;
-        drawbridgeState[Block.lever.blockID] = 3;
-        drawbridgeState[Block.pressurePlateStone.blockID] = 1;
-        drawbridgeState[Block.doorIron.blockID] = 2;
-        drawbridgeState[Block.pressurePlatePlanks.blockID] = 1;
-        drawbridgeState[Block.oreRedstone.blockID] = 1;
-        drawbridgeState[Block.oreRedstoneGlowing.blockID] = 1;
-        drawbridgeState[Block.torchRedstoneIdle.blockID] = 1;
-        drawbridgeState[Block.torchRedstoneActive.blockID] = 1;
-        drawbridgeState[Block.stoneButton.blockID] = 3;
-        drawbridgeState[Block.snow.blockID] = 1;
-        drawbridgeState[Block.ice.blockID] = 1;
-        drawbridgeState[Block.blockSnow.blockID] = 1;
-        drawbridgeState[Block.cactus.blockID] = 2;
-        drawbridgeState[Block.blockClay.blockID] = 1;
-        drawbridgeState[Block.reed.blockID] = 1;
-        drawbridgeState[Block.jukebox.blockID] = 1;
-        drawbridgeState[Block.fence.blockID] = 1;
-        drawbridgeState[Block.pumpkin.blockID] = 1;
-        drawbridgeState[Block.netherrack.blockID] = 1;
-        drawbridgeState[Block.slowSand.blockID] = 1;
-        drawbridgeState[Block.glowStone.blockID] = 1;
-        drawbridgeState[Block.portal.blockID] = 2;
-        drawbridgeState[Block.pumpkinLantern.blockID] = 1;
-        drawbridgeState[Block.cake.blockID] = 2;
-        drawbridgeState[Block.redstoneRepeaterIdle.blockID] = 3;
-        drawbridgeState[Block.redstoneRepeaterActive.blockID] = 3;
-        interchangableBlockMapping[Block.redstoneRepeaterIdle.blockID] = Block.redstoneRepeaterActive.blockID;
-        interchangableBlockMapping[Block.redstoneRepeaterActive.blockID] = Block.redstoneRepeaterIdle.blockID;
-        blockToItemMapping[Block.redstoneRepeaterIdle.blockID] = Item.redstoneRepeater.itemID;
-        blockToItemMapping[Block.redstoneRepeaterActive.blockID] = Item.redstoneRepeater.itemID;
-        blockToItemMapping[Item.redstoneRepeater.itemID] = Block.redstoneRepeaterIdle.blockID;
-        drawbridgeState[Block.lockedChest.blockID] = 5;
-        drawbridgeState[Block.trapdoor.blockID] = 3;
-        drawbridgeState[Block.mushroomCapBrown.blockID] = 1;
-        drawbridgeState[Block.mushroomCapRed.blockID] = 1;
-        drawbridgeState[Block.fenceIron.blockID] = 1;
-        drawbridgeState[Block.thinGlass.blockID] = 1;
-        drawbridgeState[Block.melon.blockID] = 1;
-        drawbridgeState[Block.pumpkinStem.blockID] = 2;
-        drawbridgeState[Block.melonStem.blockID] = 2;
-        drawbridgeState[Block.vine.blockID] = 3;
-        drawbridgeState[Block.fenceGate.blockID] = 3;
-        drawbridgeState[Block.stairsBrick.blockID] = 3;
-        drawbridgeState[Block.stairsStoneBrick.blockID] = 3;
-        drawbridgeState[Block.mycelium.blockID] = 1;
-        drawbridgeState[Block.waterlily.blockID] = 1;
-        drawbridgeState[Block.netherBrick.blockID] = 1;
-        drawbridgeState[Block.netherFence.blockID] = 1;
-        drawbridgeState[Block.netherFence.blockID] = 3;
-        drawbridgeState[Block.netherStalk.blockID] = 2;
-        drawbridgeState[Block.enchantmentTable.blockID] = 1;
-        drawbridgeState[Block.brewingStand.blockID] = 1;
-        drawbridgeState[Block.cauldron.blockID] = 1;
-        drawbridgeState[Block.endPortal.blockID] = 2;
-        drawbridgeState[Block.dragonEgg.blockID] = 1;
-        drawbridgeState[Block.redstoneLampIdle.blockID] = 1;
-        drawbridgeState[Block.redstoneLampActive.blockID] = 1;
-        drawbridgeState[Block.cocoaPlant.blockID] = 2;
-        drawbridgeState[Block.stairsSandStone.blockID] = 3;
-        drawbridgeState[Block.oreEmerald.blockID] = 1;
-        drawbridgeState[Block.enderChest.blockID] = 5;
-        drawbridgeState[Block.tripWireSource.blockID] = 1;
-        drawbridgeState[Block.tripWire.blockID] = 1;
-        drawbridgeState[Block.blockEmerald.blockID] = 1;
-        drawbridgeState[Block.stairsWoodSpruce.blockID] = 3;
-        drawbridgeState[Block.stairsWoodBirch.blockID] = 3;
-        drawbridgeState[Block.stairsWoodJungle.blockID] = 3;
-        drawbridgeState[Block.commandBlock.blockID] = 1;
-        drawbridgeState[Block.beacon.blockID] = 1;
-        drawbridgeState[Block.cobblestoneWall.blockID] = 1;
-        drawbridgeState[Block.flowerPot.blockID] = 1;
-        drawbridgeState[Block.carrot.blockID] = 2;
-        drawbridgeState[Block.potato.blockID] = 1;
-        drawbridgeState[Block.woodenButton.blockID] = 3;
-        drawbridgeState[Block.skull.blockID] = 2;
-        drawbridgeState[Block.chestTrapped.blockID] = 5;
-        drawbridgeState[Block.pressurePlateGold.blockID] = 1;
-        drawbridgeState[Block.pressurePlateIron.blockID] = 1;
-        drawbridgeState[Block.redstoneComparatorIdle.blockID] = 1;
-        drawbridgeState[Block.redstoneComparatorActive.blockID] = 1;
-        interchangableBlockMapping[Block.redstoneComparatorIdle.blockID] = Block.redstoneComparatorActive.blockID;
-        interchangableBlockMapping[Block.redstoneComparatorActive.blockID] = Block.redstoneComparatorIdle.blockID;
-        blockToItemMapping[Block.redstoneComparatorIdle.blockID] = Item.comparator.itemID;
-        blockToItemMapping[Block.redstoneComparatorActive.blockID] = Item.comparator.itemID;
-        blockToItemMapping[Item.comparator.itemID] = Block.redstoneComparatorIdle.blockID;
-        drawbridgeState[Block.daylightSensor.blockID] = 1;
-        drawbridgeState[Block.blockRedstone.blockID] = 1;
-        drawbridgeState[Block.oreNetherQuartz.blockID] = 1;
-        drawbridgeState[Block.hopperBlock.blockID] = 3;
-        drawbridgeState[Block.blockNetherQuartz.blockID] = 1;
-        drawbridgeState[Block.stairsNetherQuartz.blockID] = 3;
-        drawbridgeState[Block.railActivator.blockID] = 4;
-        drawbridgeState[Block.dropper.blockID] = 3;
-        interchangableBlockMapping[Block.dirt.blockID] = Block.grass.blockID;
-        interchangableBlockMapping[Block.grass.blockID] = Block.dirt.blockID;
+        drawbridgeState[Blocks.stone] = 1;
+        drawbridgeState[Blocks.grass] = 1;
+        drawbridgeState[Blocks.dirt] = 1;
+        drawbridgeState[Blocks.cobblestone] = 1;
+        drawbridgeState[Blocks.bedrock] = 2;
+        drawbridgeState[Blocks.waterMoving] = 1;
+        drawbridgeState[Blocks.waterStill] = 1;
+        interchangableBlockMapping[Blocks.waterStill] = Block.waterMoving;
+        interchangableBlockMapping[Blocks.waterMoving] = Block.waterStill;
+        drawbridgeState[Blocks.lavaMoving] = 1;
+        drawbridgeState[Blocks.lavaStill] = 1;
+        interchangableBlockMapping[Blocks.lavaStill] = Block.lavaMoving;
+        interchangableBlockMapping[Blocks.lavaMoving] = Block.lavaStill;
+        drawbridgeState[Blocks.sand] = 1;
+        drawbridgeState[Blocks.gravel] = 1;
+        drawbridgeState[Blocks.oreGold] = 1;
+        drawbridgeState[Blocks.oreIron] = 1;
+        drawbridgeState[Blocks.oreCoal] = 1;
+        drawbridgeState[Blocks.sponge] = 1;
+        drawbridgeState[Blocks.oreLapis] = 1;
+        drawbridgeState[Blocks.blockLapis] = 1;
+        drawbridgeState[Blocks.dispenser] = 3;
+        drawbridgeState[Blocks.music] = 1;
+        drawbridgeState[Blocks.bed] = 2;
+        drawbridgeState[Blocks.railPowered] = 4;
+        drawbridgeState[Blocks.railDetector] = 4;
+        drawbridgeState[Blocks.pistonStickyBase] = 3;
+        drawbridgeState[Blocks.web] = 1;
+        drawbridgeState[Blocks.pistonBase] = 3;
+        drawbridgeState[Blocks.pistonExtension] = 2;
+        drawbridgeState[Blocks.plantYellow] = 1;
+        drawbridgeState[Blocks.plantRed] = 1;
+        drawbridgeState[Blocks.mushroomBrown] = 1;
+        drawbridgeState[Blocks.mushroomRed] = 1;
+        drawbridgeState[Blocks.gold_block] = 1;
+        drawbridgeState[Blocks.iron_block] = 1;
+        drawbridgeState[Blocks.brick] = 1;
+        drawbridgeState[Blocks.tnt] = 1;
+        drawbridgeState[Blocks.bookShelf] = 1;
+        drawbridgeState[Blocks.cobblestoneMossy] = 1;
+        drawbridgeState[Blocks.obsidian] = 1;
+        drawbridgeState[Blocks.torchWood] = 1;
+        drawbridgeState[Blocks.fire] = 1;
+        drawbridgeState[Blocks.mobSpawner] = 2;
+        drawbridgeState[Blocks.stairsWoodOak] = 3;
+        drawbridgeState[Blocks.chest] = 5;
+        drawbridgeState[Blocks.redstoneWire] = 1;
+        blockToItemMapping[Blocks.redstoneWire] = Items.redstone;
+        blockToItemMapping[Items.redstone] = Blocks.redstoneWire;
+        drawbridgeState[Blocks.oreDiamond] = 1;
+        drawbridgeState[Blocks.blockDiamond] = 1;
+        drawbridgeState[Blocks.workbench] = 1;
+        drawbridgeState[Blocks.crops] = 2;
+        drawbridgeState[Blocks.tilledField] = 1;
+        drawbridgeState[Blocks.furnaceIdle] = 3;
+        drawbridgeState[Blocks.furnaceBurning] = 3;
+        interchangableBlockMapping[Blocks.furnaceIdle] = Blocks.furnaceBurning;
+        interchangableBlockMapping[Blocks.furnaceBurning] = Blocks.furnaceIdle;
+        drawbridgeState[Blocks.tilledField] = 1;
+        drawbridgeState[Blocks.signPost] = 3;
+        drawbridgeState[Blocks.doorWood] = 2;
+        drawbridgeState[Blocks.ladder] = 1;
+        drawbridgeState[Blocks.rail] = 4;
+        drawbridgeState[Blocks.stairsCobblestone] = 3;
+        drawbridgeState[Blocks.signWall] = 3;
+        drawbridgeState[Blocks.lever] = 3;
+        drawbridgeState[Blocks.pressurePlateStone] = 1;
+        drawbridgeState[Blocks.doorIron] = 2;
+        drawbridgeState[Blocks.pressurePlatePlanks] = 1;
+        drawbridgeState[Blocks.oreRedstone] = 1;
+        drawbridgeState[Blocks.oreRedstoneGlowing] = 1;
+        drawbridgeState[Blocks.torchRedstoneIdle] = 1;
+        drawbridgeState[Blocks.torchRedstoneActive] = 1;
+        drawbridgeState[Blocks.stoneButton] = 3;
+        drawbridgeState[Blocks.snow] = 1;
+        drawbridgeState[Blocks.ice] = 1;
+        drawbridgeState[Blocks.blockSnow] = 1;
+        drawbridgeState[Blocks.cactus] = 2;
+        drawbridgeState[Blocks.blockClay] = 1;
+        drawbridgeState[Blocks.reed] = 1;
+        drawbridgeState[Blocks.jukebox] = 1;
+        drawbridgeState[Blocks.fence] = 1;
+        drawbridgeState[Blocks.pumpkin] = 1;
+        drawbridgeState[Blocks.netherrack] = 1;
+        drawbridgeState[Blocks.slowSand] = 1;
+        drawbridgeState[Blocks.glowStone] = 1;
+        drawbridgeState[Blocks.portal] = 2;
+        drawbridgeState[Blocks.pumpkinLantern] = 1;
+        drawbridgeState[Blocks.cake] = 2;
+        drawbridgeState[Blocks.redstoneRepeaterIdle] = 3;
+        drawbridgeState[Blocks.redstoneRepeaterActive] = 3;
+        interchangableBlockMapping[Blocks.redstoneRepeaterIdle] = Blocks.redstoneRepeaterActive;
+        interchangableBlockMapping[Blocks.redstoneRepeaterActive] = Blocks.redstoneRepeaterIdle;
+        blockToItemMapping[Blocks.redstoneRepeaterIdle] = Items.redstoneRepeater.itemID;
+        blockToItemMapping[Blocks.redstoneRepeaterActive] = Items.redstoneRepeater.itemID;
+        blockToItemMapping[Items.redstoneRepeater] = Blocks.redstoneRepeaterIdle;
+        drawbridgeState[Blocks.lockedChest] = 5;
+        drawbridgeState[Blocks.trapdoor] = 3;
+        drawbridgeState[Blocks.mushroomCapBrown] = 1;
+        drawbridgeState[Blocks.mushroomCapRed] = 1;
+        drawbridgeState[Blocks.fenceIron] = 1;
+        drawbridgeState[Blocks.thinGlass] = 1;
+        drawbridgeState[Blocks.melon] = 1;
+        drawbridgeState[Blocks.pumpkinStem] = 2;
+        drawbridgeState[Blocks.melonStem] = 2;
+        drawbridgeState[Blocks.vine] = 3;
+        drawbridgeState[Blocks.fenceGate] = 3;
+        drawbridgeState[Blocks.stairsBrick] = 3;
+        drawbridgeState[Blocks.stairsStoneBrick] = 3;
+        drawbridgeState[Blocks.mycelium] = 1;
+        drawbridgeState[Blocks.waterlily] = 1;
+        drawbridgeState[Blocks.netherBrick] = 1;
+        drawbridgeState[Blocks.netherFence] = 1;
+        drawbridgeState[Blocks.netherFence] = 3;
+        drawbridgeState[Blocks.netherStalk] = 2;
+        drawbridgeState[Blocks.enchantmentTable] = 1;
+        drawbridgeState[Blocks.brewingStand] = 1;
+        drawbridgeState[Blocks.cauldron] = 1;
+        drawbridgeState[Blocks.endPortal] = 2;
+        drawbridgeState[Blocks.dragonEgg] = 1;
+        drawbridgeState[Blocks.redstoneLampIdle] = 1;
+        drawbridgeState[Blocks.redstoneLampActive] = 1;
+        drawbridgeState[Blocks.cocoaPlant] = 2;
+        drawbridgeState[Blocks.stairsSandStone] = 3;
+        drawbridgeState[Blocks.oreEmerald] = 1;
+        drawbridgeState[Blocks.enderChest] = 5;
+        drawbridgeState[Blocks.tripWireSource] = 1;
+        drawbridgeState[Blocks.tripWire] = 1;
+        drawbridgeState[Blocks.blockEmerald] = 1;
+        drawbridgeState[Blocks.stairsWoodSpruce] = 3;
+        drawbridgeState[Blocks.stairsWoodBirch] = 3;
+        drawbridgeState[Blocks.stairsWoodJungle] = 3;
+        drawbridgeState[Blocks.commandBlock] = 1;
+        drawbridgeState[Blocks.beacon] = 1;
+        drawbridgeState[Blocks.cobblestoneWall] = 1;
+        drawbridgeState[Blocks.flowerPot] = 1;
+        drawbridgeState[Blocks.carrot] = 2;
+        drawbridgeState[Blocks.potato] = 1;
+        drawbridgeState[Blocks.woodenButton] = 3;
+        drawbridgeState[Blocks.skull] = 2;
+        drawbridgeState[Blocks.chestTrapped] = 5;
+        drawbridgeState[Blocks.pressurePlateGold] = 1;
+        drawbridgeState[Blocks.pressurePlateIron] = 1;
+        drawbridgeState[Blocks.redstoneComparatorIdle] = 1;
+        drawbridgeState[Blocks.redstoneComparatorActive] = 1;
+        interchangableBlockMapping[Blocks.redstoneComparatorIdle] = Blocks.redstoneComparatorActive;
+        interchangableBlockMapping[Blocks.redstoneComparatorActive] = Blocks.redstoneComparatorIdle;
+        blockToItemMapping[Blocks.redstoneComparatorIdle] = Items.comparator.itemID;
+        blockToItemMapping[Blocks.redstoneComparatorActive] = Items.comparator.itemID;
+        blockToItemMapping[Items.comparator] = Blocks.redstoneComparatorIdle;
+        drawbridgeState[Blocks.daylightSensor] = 1;
+        drawbridgeState[Blocks.blockRedstone] = 1;
+        drawbridgeState[Blocks.oreNetherQuartz] = 1;
+        drawbridgeState[Blocks.hopperBlock] = 3;
+        drawbridgeState[Blocks.blockNetherQuartz] = 1;
+        drawbridgeState[Blocks.stairsNetherQuartz] = 3;
+        drawbridgeState[Blocks.railActivator] = 4;
+        drawbridgeState[Blocks.dropper] = 3;
+        interchangableBlockMapping[Blocks.dirt] = Blocks.grass;
+        interchangableBlockMapping[Blocks.grass] = Blocks.dirt;
     }
 
     static
diff --git a/src/main/java/tconstruct/library/client/TConstructClientRegistry.java b/src/main/java/tconstruct/library/client/TConstructClientRegistry.java
index a433aa848b7..6441e767a47 100644
--- a/src/main/java/tconstruct/library/client/TConstructClientRegistry.java
+++ b/src/main/java/tconstruct/library/client/TConstructClientRegistry.java
@@ -7,6 +7,7 @@
 import tconstruct.library.TConstructRegistry;
 import tconstruct.library.crafting.ToolBuilder;
 import tconstruct.library.tools.ToolCore;
+import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
@@ -16,7 +17,7 @@ public class TConstructClientRegistry
     public static ArrayList<ToolGuiElement> tierTwoButtons = new ArrayList<ToolGuiElement>();
     public static Map<String, ItemStack> manualIcons = new HashMap<String, ItemStack>();
     public static Map<String, ItemStack[]> recipeIcons = new HashMap<String, ItemStack[]>();
-    public static ItemStack defaultStack = new ItemStack(Item.ingotIron);
+    public static ItemStack defaultStack = new ItemStack(Items.iron_ingot);
 
     public static void addMaterialRenderMapping (int materialID, String domain, String renderName, boolean useDefaultFolder)
     {
diff --git a/src/main/java/tconstruct/plugins/ic2/IC2.java b/src/main/java/tconstruct/plugins/ic2/IC2.java
index d700487de23..c6857de5aba 100644
--- a/src/main/java/tconstruct/plugins/ic2/IC2.java
+++ b/src/main/java/tconstruct/plugins/ic2/IC2.java
@@ -1,6 +1,7 @@
 package tconstruct.plugins.ic2;
 
 import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
@@ -53,7 +54,7 @@ public void init() {
         //basinCasting.addCastingRecipe(new ItemStack(Block.blockIron), fluidStackBlock, null, true, 50); // Iron convenience
         // Dirt <-> Diamonds
         //basinCasting.addCastingRecipe(new ItemStack(Block.dirt), new FluidStack(fluidUUM, 500), new ItemStack(Block.blockDiamond), true, 50);
-        basinCasting.addCastingRecipe(new ItemStack(Block.blockDiamond), fluidStackBlock, new ItemStack(Block.dirt), true, 50);
+        basinCasting.addCastingRecipe(new ItemStack(Blocks.diamond_block), fluidStackBlock, new ItemStack(Blocks.dirt), true, 50);
         // RS cycle
         //basinCasting.addCastingRecipe(new ItemStack(Block.blockRedstone), fluidStack, new ItemStack(Item.redstone), true, 50);
         //basinCasting.addCastingRecipe(new ItemStack(Block.hardenedClay, 14, 1), fluidStack, new ItemStack(Block.blockRedstone), true, 50);
diff --git a/src/main/java/tconstruct/worldgen/TBaseWorldGenerator.java b/src/main/java/tconstruct/worldgen/TBaseWorldGenerator.java
index 14eb4f480f1..b35e015bc18 100644
--- a/src/main/java/tconstruct/worldgen/TBaseWorldGenerator.java
+++ b/src/main/java/tconstruct/worldgen/TBaseWorldGenerator.java
@@ -4,6 +4,7 @@
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
+import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldType;
 import net.minecraft.world.chunk.IChunkProvider;
@@ -16,19 +17,19 @@ public class TBaseWorldGenerator implements IWorldGenerator
 {
     public TBaseWorldGenerator()
     {
-        copper = new WorldGenMinable(TRepo.oreSlag.blockID, 3, 8, Block.stone.blockID);
-        tin = new WorldGenMinable(TRepo.oreSlag.blockID, 4, 8, Block.stone.blockID);
-        aluminum = new WorldGenMinable(TRepo.oreSlag.blockID, 5, 6, Block.stone.blockID);
+        copper = new WorldGenMinable(TRepo.oreSlag, 3, 8, Block.stone);
+        tin = new WorldGenMinable(TRepo.oreSlag, 4, 8, Block.stone);
+        aluminum = new WorldGenMinable(TRepo.oreSlag, 5, 6, Block.stone);
 
-        cobalt = new WorldGenMinable(TRepo.oreSlag.blockID, 1, 3, Block.netherrack.blockID);
-        ardite = new WorldGenMinable(TRepo.oreSlag.blockID, 2, 3, Block.netherrack.blockID);
+        cobalt = new WorldGenMinable(TRepo.oreSlag, 1, 3, Block.netherrack);
+        ardite = new WorldGenMinable(TRepo.oreSlag, 2, 3, Block.netherrack);
 
-        ironBush = new OreberryBushGen(TRepo.oreBerry.blockID, 12, 12);
-        goldBush = new OreberryBushGen(TRepo.oreBerry.blockID, 13, 6);
-        copperBush = new OreberryBushGen(TRepo.oreBerry.blockID, 14, 12);
-        tinBush = new OreberryBushGen(TRepo.oreBerry.blockID, 15, 12);
-        aluminumBush = new OreberryBushGen(TRepo.oreBerrySecond.blockID, 12, 14);
-        silverBush = new OreberryBushGen(TRepo.oreBerrySecond.blockID, 13, 8);
+        ironBush = new OreberryBushGen(TRepo.oreBerry, 12, 12);
+        goldBush = new OreberryBushGen(TRepo.oreBerry, 13, 6);
+        copperBush = new OreberryBushGen(TRepo.oreBerry, 14, 12);
+        tinBush = new OreberryBushGen(TRepo.oreBerry, 15, 12);
+        aluminumBush = new OreberryBushGen(TRepo.oreBerrySecond, 12, 14);
+        silverBush = new OreberryBushGen(TRepo.oreBerrySecond, 13, 8);
     }
 
     @Override
@@ -262,7 +263,7 @@ void superfunGenerate (Random random, int chunkX, int chunkZ, World world)
     {
         /*for (int x = 0; x < 16; x++)
             for (int z = 0; z < 16; z++)
-                world.setBlock(x+chunkX, 192, z+chunkZ, Block.glowStone.blockID);*/
+                world.setBlock(x+chunkX, 192, z+chunkZ, Block.glowStone);*/
 
         for (int x = 0; x < 16; x++)
         {
@@ -275,15 +276,15 @@ void superfunGenerate (Random random, int chunkX, int chunkZ, World world)
                     if (block != null)
                     {
                         if (block.blockMaterial == Material.leaves)
-                            world.setBlock(x + chunkX, y, z + chunkZ, Block.lavaStill.blockID, 0, 0);
+                            world.setBlock(x + chunkX, y, z + chunkZ, Block.lavaStill, 0, 0);
                         if (block.blockMaterial == Material.wood)
-                            world.setBlock(x + chunkX, y, z + chunkZ, Block.netherrack.blockID, 0, 0);
-                        if (block.blockID == Block.stone.blockID)
-                            world.setBlock(x + chunkX, y, z + chunkZ, Block.whiteStone.blockID, 0, 0);
+                            world.setBlock(x + chunkX, y, z + chunkZ, Block.netherrack, 0, 0);
+                        if (block == Blocks.stone)
+                            world.setBlock(x + chunkX, y, z + chunkZ, Block.whiteStone, 0, 0);
                         if (y > 40 && (block.blockMaterial == Material.ground || block.blockMaterial == Material.grass))
-                            world.setBlock(x + chunkX, y, z + chunkZ, Block.slowSand.blockID, 0, 0);
+                            world.setBlock(x + chunkX, y, z + chunkZ, Block.slowSand, 0, 0);
                         if (block.blockMaterial == Material.sand)
-                            world.setBlock(x + chunkX, y, z + chunkZ, Block.silverfish.blockID, 0, 0);
+                            world.setBlock(x + chunkX, y, z + chunkZ, Block.silverfish, 0, 0);
                     }
                 }
             }
@@ -300,7 +301,7 @@ void generateChunkBorder (Random random, int chunkX, int chunkZ, World world)
                 {
                     for (int y = 0; y < 256; y++)
                     {
-                        world.setBlock(x + chunkX, y, z + chunkZ, Block.bedrock.blockID, 0, 0);
+                        world.setBlock(x + chunkX, y, z + chunkZ, Blocks.bedrock, 0, 0);
                     }
                 }
             }
diff --git a/src/main/java/tconstruct/worldgen/village/ComponentSmeltery.java b/src/main/java/tconstruct/worldgen/village/ComponentSmeltery.java
index 47a30b41f82..d8104a854e6 100644
--- a/src/main/java/tconstruct/worldgen/village/ComponentSmeltery.java
+++ b/src/main/java/tconstruct/worldgen/village/ComponentSmeltery.java
@@ -5,16 +5,15 @@
 
 import tconstruct.TConstruct;
 import tconstruct.common.TRepo;
-
 import net.minecraft.block.Block;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.structure.ComponentVillage;
-import net.minecraft.world.gen.structure.ComponentVillageStartPiece;
 import net.minecraft.world.gen.structure.MapGenStructureIO;
+import net.minecraft.world.gen.structure.MapGenVillage;
 import net.minecraft.world.gen.structure.StructureBoundingBox;
 import net.minecraft.world.gen.structure.StructureComponent;
+import net.minecraft.world.gen.structure.StructureVillagePieces;
 
-public class ComponentSmeltery extends ComponentVillage
+public class ComponentSmeltery extends MapGenVillage
 {
     private int averageGroundLevel = -1;
 
@@ -22,9 +21,9 @@ public ComponentSmeltery()
     {
     }
 
-    public ComponentSmeltery(ComponentVillageStartPiece par1ComponentVillageStartPiece, int par2, Random par3Random, StructureBoundingBox par4StructureBoundingBox, int par5)
+    public ComponentSmeltery(StructureVillagePieces par1ComponentVillageStartPiece, int par2, Random par3Random, StructureBoundingBox par4StructureBoundingBox, int par5)
     {
-        super(par1ComponentVillageStartPiece, par2);
+        super();
         this.coordBaseMode = par5;
         this.boundingBox = par4StructureBoundingBox;
     }
diff --git a/src/main/java/tconstruct/worldgen/village/ComponentToolWorkshop.java b/src/main/java/tconstruct/worldgen/village/ComponentToolWorkshop.java
index 7f5072632ef..f5cf5b31760 100644
--- a/src/main/java/tconstruct/worldgen/village/ComponentToolWorkshop.java
+++ b/src/main/java/tconstruct/worldgen/village/ComponentToolWorkshop.java
@@ -7,15 +7,16 @@
 import tconstruct.blocks.logic.PatternChestLogic;
 import tconstruct.common.TRepo;
 import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
 import net.minecraft.util.WeightedRandomChestContent;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.structure.ComponentVillage;
-import net.minecraft.world.gen.structure.ComponentVillageStartPiece;
 import net.minecraft.world.gen.structure.MapGenStructureIO;
+import net.minecraft.world.gen.structure.MapGenVillage;
 import net.minecraft.world.gen.structure.StructureBoundingBox;
 import net.minecraft.world.gen.structure.StructureComponent;
+import net.minecraft.world.gen.structure.StructureVillagePieces;
 
-public class ComponentToolWorkshop extends ComponentVillage
+public class ComponentToolWorkshop extends MapGenVillage
 {
     private int averageGroundLevel = -1;
 
@@ -23,9 +24,9 @@ public ComponentToolWorkshop()
     {
     }
 
-    public ComponentToolWorkshop(ComponentVillageStartPiece par1ComponentVillageStartPiece, int par2, Random par3Random, StructureBoundingBox par4StructureBoundingBox, int par5)
+    public ComponentToolWorkshop(StructureVillagePieces par1ComponentVillageStartPiece, int par2, Random par3Random, StructureBoundingBox par4StructureBoundingBox, int par5)
     {
-        super(par1ComponentVillageStartPiece, par2);
+        super();
         this.coordBaseMode = par5;
         this.boundingBox = par4StructureBoundingBox;
     }
@@ -141,7 +142,7 @@ public boolean addComponentParts (World world, Random random, StructureBoundingB
             for (int i1 = 0; i1 < 9; ++i1)
             {
                 this.clearCurrentPositionBlocksUpwards(world, i1, 9, l, sbb);
-                this.fillCurrentPositionBlocksDownwards(world, Block.cobblestone.blockID, 0, i1, -1, l, sbb);
+                this.fillCurrentPositionBlocksDownwards(world, Blocks.cobblestone.blockID, 0, i1, -1, l, sbb);
             }
         }
         this.spawnVillagers(world, sbb, 3, 1, 3, 1);