diff --git a/forge/fml-src-2.2.42.132.zip b/forge/fml-src-2.2.48.135.zip similarity index 93% rename from forge/fml-src-2.2.42.132.zip rename to forge/fml-src-2.2.48.135.zip index 81306a542..561d117c1 100644 Binary files a/forge/fml-src-2.2.42.132.zip and b/forge/fml-src-2.2.48.135.zip differ diff --git a/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch b/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch index ee3ba70d3..d7c69e9db 100644 --- a/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch @@ -13,7 +13,7 @@ @@ -99,6 +102,7 @@ public void onPickupFromSlot(ItemStack par1ItemStack) { - FMLClientHandler.instance().onItemCrafted(thePlayer, par1ItemStack, inventory); + FMLClientHandler.instance().onItemCrafted(thePlayer, par1ItemStack, craftMatrix); + ForgeHooks.onTakenFromCrafting(thePlayer, par1ItemStack, craftMatrix); this.func_48434_c(par1ItemStack); diff --git a/forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch b/forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch index b0ffca949..898ee7ab3 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch @@ -9,12 +9,11 @@ public class SlotCrafting extends Slot { /** The craft matrix inventory linked to this result slot. */ -@@ -99,6 +101,8 @@ +@@ -99,6 +101,7 @@ public void onPickupFromSlot(ItemStack par1ItemStack) { - FMLServerHandler.instance().onItemCrafted(thePlayer, par1ItemStack, inventory); + FMLServerHandler.instance().onItemCrafted(thePlayer, par1ItemStack, craftMatrix); + ForgeHooks.onTakenFromCrafting(thePlayer, par1ItemStack, craftMatrix); -+ this.func_48416_b(par1ItemStack); for (int var2 = 0; var2 < this.craftMatrix.getSizeInventory(); ++var2)