      }
  
      // JAVADOC METHOD $$ func_70041_e_
-@@ -2013,7 +2154,14 @@
+@@ -2013,7 +2149,14 @@
      // JAVADOC METHOD $$ func_70062_b
      public void setCurrentItemOrArmor(int par1, ItemStack par2ItemStack)
      {

     }
 
     protected String func_146067_o(int p_146067_1_)
@@ -1757,7 +1886,7 @@
         {
             if (par1ItemStack.getItem().requiresMultipleRenderPasses())
             {
-                return par1ItemStack.getItem().getIconFromDamageForRenderPass(par1ItemStack.getItemDamage(), par2);
+                return par1ItemStack.getItem().getIcon(par1ItemStack, par2);
             }
 
             if (this.itemInUse != null && par1ItemStack.getItem() == Items.bow)
@@ -1779,6 +1908,7 @@
                     return Items.bow.getItemIconForUseDuration(0);
                 }
             }

         chatcomponenttext.func_150256_b().func_150241_a(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/msg " + this.getCommandSenderName() + " "));
         return chatcomponenttext;
     }
@@ -2096,6 +2239,119 @@
         FMLNetworkHandler.openGui(this, mod, modGuiId, world, x, y, z);
     }
 
