--- ../src-base/minecraft/net/minecraft/item/crafting/RecipeRepairItem.java
+++ ../src-work/minecraft/net/minecraft/item/crafting/RecipeRepairItem.java
@@ -27,7 +27,7 @@
                 {
                     ItemStack itemstack1 = (ItemStack)arraylist.get(0);
 
-                    if (itemstack.func_77973_b() != itemstack1.func_77973_b() || itemstack1.field_77994_a != 1 || itemstack.field_77994_a != 1 || !itemstack1.func_77973_b().func_77645_m())
+                    if (itemstack.func_77973_b() != itemstack1.func_77973_b() || itemstack1.field_77994_a != 1 || itemstack.field_77994_a != 1 || !itemstack1.func_77973_b().isRepairable())
                     {
                         return false;
                     }
@@ -55,7 +55,7 @@
                 {
                     ItemStack itemstack1 = (ItemStack)arraylist.get(0);
 
-                    if (itemstack.func_77973_b() != itemstack1.func_77973_b() || itemstack1.field_77994_a != 1 || itemstack.field_77994_a != 1 || !itemstack1.func_77973_b().func_77645_m())
+                    if (itemstack.func_77973_b() != itemstack1.func_77973_b() || itemstack1.field_77994_a != 1 || itemstack.field_77994_a != 1 || !itemstack1.func_77973_b().isRepairable())
                     {
                         return null;
                     }
@@ -68,7 +68,7 @@
             ItemStack itemstack2 = (ItemStack)arraylist.get(0);
             itemstack = (ItemStack)arraylist.get(1);
 
-            if (itemstack2.func_77973_b() == itemstack.func_77973_b() && itemstack2.field_77994_a == 1 && itemstack.field_77994_a == 1 && itemstack2.func_77973_b().func_77645_m())
+            if (itemstack2.func_77973_b() == itemstack.func_77973_b() && itemstack2.field_77994_a == 1 && itemstack.field_77994_a == 1 && itemstack2.func_77973_b().isRepairable())
             {
                 Item item = itemstack2.func_77973_b();
                 int j = item.func_77612_l() - itemstack2.func_77952_i();
@@ -105,11 +105,7 @@
         for (int i = 0; i < aitemstack.length; ++i)
         {
             ItemStack itemstack = p_179532_1_.func_70301_a(i);
-
-            if (itemstack != null && itemstack.func_77973_b().func_77634_r())
-            {
-                aitemstack[i] = new ItemStack(itemstack.func_77973_b().func_77668_q());
-            }
+            aitemstack[i] = net.minecraftforge.common.ForgeHooks.getContainerItem(itemstack);
         }
 
         return aitemstack;
