getting super close

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

@@ -120,7 +120,7 @@ public void func_149689_a (World par1World, int par2, int par3, int par4, Entity
     }
 
     @Override
-    public void breakBlock (World par1World, int x, int y, int z, int par5, int meta)
+    public void func_149749_a (World par1World, int x, int y, int z, Block par5, int meta)
     {
         TileEntity te = par1World.func_147438_o(x, y, z);
 
@@ -165,7 +165,7 @@ public void breakBlock (World par1World, int x, int y, int z, int par5, int meta
             }
         }
 
-        super.breakBlock(par1World, x, y, z, par5, meta);
+        super.func_149749_a(par1World, x, y, z, par5, meta);
     }
 
     public int getLightValue (IBlockAccess world, int x, int y, int z)

src/main/java/tconstruct/blocks/LavaTankBlock.java

@@ -263,7 +263,7 @@ public void onNeighborBlockChange (World world, int x, int y, int z, int nBlockI
     }
 
     @Override
-    public boolean removeBlockByPlayer (World world, EntityPlayer player, int x, int y, int z)
+    public boolean removedByPlayer (World world, EntityPlayer player, int x, int y, int z)
     {
         player.addExhaustion(0.025F);
         int meta = world.getBlockMetadata(x, y, z);

src/main/java/tconstruct/blocks/logic/DryingRackLogic.java

@@ -112,7 +112,7 @@ public Packet func_145844_m ()
     @Override
     public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet)
     {
-        readCustomNBT(packet.data);
+        readCustomNBT(packet.func_148857_g());
         field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e);
     }
 

src/main/java/tconstruct/blocks/traps/BarricadeBlock.java

@@ -65,19 +65,19 @@ public AxisAlignedBB getCollisionBoundingBoxFromPool (World par1World, int x, in
 
     public void func_147465_dBoundsBasedOnState (IBlockAccess par1IBlockAccess, int x, int y, int z)
     {
-        setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+        func_149676_a(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
     }
 
     public void harvestBlock (World world, EntityPlayer player, int x, int y, int z, int meta)
     {
         if (meta % 4 > 0)
         {
             world.func_147465_d(x, y, z, this, meta - 1, 3);
-            dropBlockAsItem_do(world, x, y, z, new ItemStack(this));
+            func_149642_a(world, x, y, z, new ItemStack(this));
         }
         else
         {
-            dropBlockAsItem_do(world, x, y, z, new ItemStack(this));
+            func_149642_a(world, x, y, z, new ItemStack(this));
         }
     }
 
@@ -119,7 +119,7 @@ public void onBlockExploded (World world, int x, int y, int z, Explosion explosi
             world.func_147465_d(x, y, z, Blocks.air, 0, 0);
         else
             world.setBlockMetadataWithNotify(x, y, z, (int) (meta - power), 3);
-        onBlockDestroyedByExplosion(world, x, y, z, explosion);
+        func_149723_a(world, x, y, z, explosion);
     }
 
     @Override

src/main/java/tconstruct/blocks/traps/Landmine.java

@@ -230,15 +230,15 @@ private void setStateIfMobInteractsWithPlate (World world, int posX, int posY, i
     /**
      * ejects contained items into the world, and notifies neighbours of an update, as appropriate
      */
-    public void breakBlock (World par1World, int par2, int par3, int par4, int par5, int par6)
+    public void breakBlock (World par1World, int par2, int par3, int par4, Block par5, int par6)
     {
         if (par6 > 0)
         {
             par1World.func_147459_d(par2, par3, par4, this);
             par1World.func_147459_d(par2, par3 - 1, par4, this);
         }
 
-        super.breakBlock(par1World, par2, par3, par4, par5, par6);
+        super.func_149749_a(par1World, par2, par3, par4, par5, par6);
     }
 
     /**

src/main/java/tconstruct/common/TContent.java

@@ -25,6 +25,7 @@
 import net.minecraft.stats.Achievement;
 import net.minecraft.util.WeightedRandomChestContent;
 import net.minecraftforge.common.*;
+import net.minecraftforge.common.util.EnumHelper;
 import net.minecraftforge.fluids.*;
 import net.minecraftforge.fluids.FluidContainerRegistry.*;
 import net.minecraftforge.oredict.*;
@@ -429,7 +430,7 @@ void registerBlocks ()
         TRepo.stainedGlassClearPane = new GlassPaneStained();
 
         //Rail
-        TRepo.woodenRail = new WoodRail().func_149672_a(Block.field_149766_f).func_149647_a(TConstructRegistry.blockTab).setUnlocalizedName("rail.wood");
+        TRepo.woodenRail = new WoodRail().func_149672_a(Block.field_149766_f).func_149647_a(TConstructRegistry.blockTab).func_149663_c("rail.wood");
 
     }
 
@@ -834,7 +835,7 @@ public void addAchievements ()
     {
         HashMap<String, Achievement> achievements = TAchievements.achievements;
 
-        achievements.put("tconstruct.beginner", new Achievement("" + 2741, "tconstruct.beginner", 0, 0, TRepo.manualBook, null).setIndependent());
+        achievements.put("tconstruct.beginner", new Achievement("" + 2741, "tconstruct.beginner", 0, 0, TRepo.manualBook, null));//.setIndependent());
         achievements.put("tconstruct.pattern", new Achievement("" + 2742, "tconstruct.pattern", 2, 1, TRepo.blankPattern, achievements.get("tconstruct.beginner")));
         achievements.put("tconstruct.tinkerer", new Achievement("" + 2743, "tconstruct.tinkerer", 2, 2, new ItemStack(TRepo.titleIcon, 1, 4096), achievements.get("tconstruct.pattern")));
         achievements.put("tconstruct.preparedFight", new Achievement("" + 2744, "tconstruct.preparedFight", 1, 3, new ItemStack(TRepo.titleIcon, 1, 4097), achievements.get("tconstruct.tinkerer")));

src/main/java/tconstruct/entity/projectile/ArrowEntity.java

@@ -150,7 +150,7 @@ public void onUpdate ()
             ++this.ticksInAir;
             Vec3 vec3 = this.worldObj.getWorldVec3Pool().getVecFromPool(this.posX, this.posY, this.posZ);
             Vec3 vec31 = this.worldObj.getWorldVec3Pool().getVecFromPool(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ);
-            MovingObjectPosition movingobjectposition = this.worldObj.rayTraceBlocks_do_do(vec3, vec31, false, true);
+            MovingObjectPosition movingobjectposition = this.worldObj.func_147447_a(vec3, vec31, false, true, false);
             vec3 = this.worldObj.getWorldVec3Pool().getVecFromPool(this.posX, this.posY, this.posZ);
             vec31 = this.worldObj.getWorldVec3Pool().getVecFromPool(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ);
 

src/main/java/tconstruct/entity/projectile/RotatingBase.java

@@ -20,6 +20,7 @@
 import com.google.common.io.ByteArrayDataInput;
 import com.google.common.io.ByteArrayDataOutput;
 
+import cpw.mods.fml.common.network.ByteBufUtils;
 import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData;
 
 public class RotatingBase extends Entity implements IEntityAdditionalSpawnData
@@ -341,7 +342,7 @@ public void writeEntityToNBT (NBTTagCompound tags)
         tags.setShort("xTile", (short) xTile);
         tags.setShort("yTile", (short) yTile);
         tags.setShort("zTile", (short) zTile);
-        tags.setByte("inTile", (byte) inTile);
+        tags.setString("inTile", (String) inTile.func_149739_a());
         tags.setByte("shake", (byte) arrowShake);
         tags.setByte("onGround", (byte) (onGround ? 1 : 0));
         tags.setBoolean("Retrieval", doNotRetrieve);
@@ -355,7 +356,8 @@ public void readEntityFromNBT (NBTTagCompound tags)
         xTile = tags.getShort("xTile");
         yTile = tags.getShort("yTile");
         zTile = tags.getShort("zTile");
-        inTile = tags.getByte("inTile") & 0xff;
+        //TODO fix this\/
+        //inTile = tags.getString("inTile");
         arrowShake = tags.getByte("shake") & 0xff;
         onGround = tags.getByte("onGround") == 1;
         doNotRetrieve = tags.getBoolean("Retrieval");
@@ -423,7 +425,7 @@ public ItemStack getEntityItem ()
     public void writeSpawnData (ByteBuf data)
     {
         NBTTagCompound tags = returnStack.getTagCompound().getCompoundTag("InfiTool");
-        data.writeShort(returnStack.itemID);
+        ByteBufUtils.writeItemStack(data, returnStack);
         data.writeFloat(rotationYaw);
         data.writeInt(tags.getInteger("RenderHandle"));
         data.writeInt(tags.getInteger("RenderHead"));
@@ -464,7 +466,7 @@ public void writeSpawnData (ByteBuf data)
     @Override
     public void readSpawnData (ByteBuf data)
     {
-        returnStack = new ItemStack(data.readShort(), 1, 0);
+        returnStack = ByteBufUtils.readItemStack(data);
         rotationYaw = data.readFloat();
         NBTTagCompound compound = new NBTTagCompound();
         NBTTagCompound toolTag = new NBTTagCompound();

src/main/java/tconstruct/items/armor/ArmorBasic.java

@@ -23,9 +23,9 @@ public void registerIcons (IIconRegister par1IconRegister)
     }
 
     @Override
-    public String getArmorTexture (ItemStack stack, Entity entity, int slot, int layer)
+    public String getArmorTexture (ItemStack stack, Entity entity, int slot, String type)
     {
-        return "tinker:textures/armor/" + textureName + "_" + layer + ".png";
+        return "tinker:textures/armor/" + textureName + "_" + type + ".png";
     }
 
 }

src/main/java/tconstruct/items/armor/ArmorStandard.java

@@ -21,7 +21,7 @@ public void registerIcons (IIconRegister par1IconRegister)
     }
 
     @Override
-    public String getArmorTexture (ItemStack stack, Entity entity, int slot, int layer)
+    public String getArmorTexture (ItemStack stack, Entity entity, int slot, String layer)
     {
         return "tinker:textures/armor/wood_" + layer + ".png";
     }

src/main/java/tconstruct/items/armor/ExoArmor.java

@@ -39,7 +39,7 @@ public void registerIcons (IIconRegister par1IconRegister)
     }
 
     @Override
-    public String getArmorTexture (ItemStack stack, Entity entity, int slot, int layer)
+    public String getArmorTexture (ItemStack stack, Entity entity, int slot, String layer)
     {
         return "tinker:textures/armor/" + textureName + "_" + layer + ".png";
     }

src/main/java/tconstruct/items/armor/TArmorBase.java

@@ -54,7 +54,7 @@ public void onArmorTickUpdate (World world, EntityPlayer player, ItemStack itemS
      */
     @Override
     @SideOnly(Side.CLIENT)
-    public String getArmorTexture (ItemStack stack, Entity entity, int slot, int layer)
+    public String getArmorTexture (ItemStack stack, Entity entity, int slot, String layer)
     {
         return "/mods/tinker/textures/armor/wood_1.png";
     }

src/main/java/tconstruct/items/tools/Battleaxe.java

@@ -275,7 +275,7 @@ public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPl
                             localMeta = world.getBlockMetadata(x, yPos, z);
                             if (!player.capabilities.isCreativeMode)
                             {
-                                if (block.removeBlockByPlayer(world, player, x, yPos, z))
+                                if (block.removedByPlayer(world, player, x, yPos, z))
                                 {
                                     block.func_149664_b(world, x, yPos, z, localMeta);
                                 }

src/main/java/tconstruct/items/tools/Excavator.java

@@ -217,7 +217,7 @@ public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPl
                                         {
                                             if (!player.capabilities.isCreativeMode)
                                             {
-                                                if (block.removeBlockByPlayer(world, player, xPos, yPos, zPos))
+                                                if (block.removedByPlayer(world, player, xPos, yPos, zPos))
                                                 {
                                                     block.func_149664_b(world, xPos, yPos, zPos, localMeta);
                                                 }

src/main/java/tconstruct/items/tools/Hammer.java

@@ -314,7 +314,7 @@ public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPl
                                         {
                                             if (!player.capabilities.isCreativeMode)
                                             {
-                                                if (localBlock.removeBlockByPlayer(world, player, xPos, yPos, zPos))
+                                                if (localBlock.removedByPlayer(world, player, xPos, yPos, zPos))
                                                 {
                                                     localBlock.func_149664_b(world, xPos, yPos, zPos, localMeta);
                                                 }

src/main/java/tconstruct/items/tools/LumberAxe.java

@@ -240,7 +240,7 @@ void breakTree (World world, int x, int y, int z, ItemStack stack, NBTTagCompoun
                                          }*/
                                         if (!player.capabilities.isCreativeMode)
                                         {
-                                            if (block.removeBlockByPlayer(world, player, xPos, yPos, zPos))
+                                            if (block.removedByPlayer(world, player, xPos, yPos, zPos))
                                             {
                                                 block.func_149664_b(world, xPos, yPos, zPos, meta);
                                             }

src/main/java/tconstruct/library/tools/AbilityHelper.java

@@ -242,7 +242,7 @@ public static boolean onLeftClickEntity (ItemStack stack, EntityLivingBase playe
 
                         if (entity instanceof EntityLivingBase)
                         {
-                            EnchantmentThorns.func_92096_a(player, (EntityLivingBase) entity, random);
+                            DamageSource.causeThornsDamage(entity);//(((EntityLivingBase)player, (EntityLivingBase) entity);
                         }
                     }
 
@@ -504,7 +504,7 @@ public static boolean hoeGround (ItemStack stack, EntityPlayer player, World wor
             }
             else
             {
-                Block block = Blocks.tilledField;
+                Block block = Blocks.farmland;
                 world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), block.field_149762_H.field_150501_a,
                         (block.field_149762_H.func_150497_c() + 1.0F) / 2.0F, block.field_149762_H.func_150494_d() * 0.8F);
 
@@ -632,6 +632,6 @@ public static MovingObjectPosition raytraceFromEntity (World world, Entity playe
             d3 = ((EntityPlayerMP) player).theItemInWorldManager.getBlockReachDistance();
         }
         Vec3 vec31 = vec3.addVector((double) f7 * d3, (double) f6 * d3, (double) f8 * d3);
-        return world.rayTraceBlocks_do_do(vec3, vec31, par3, !par3);
+        return world.func_147447_a(vec3, vec31, par3, !par3,par3);
     }
 }