From 320d1360b84e241cd02c334c4c86a2c18e992c40 Mon Sep 17 00:00:00 2001 From: LexManos Date: Wed, 13 Jun 2012 20:26:38 -0700 Subject: [PATCH] Updated to FML #135 {Fixed ModList rendering issue, and incorrect arument on crafting hook} --- ...-2.2.42.132.zip => fml-src-2.2.48.135.zip} | Bin 209607 -> 209610 bytes .../net/minecraft/src/SlotCrafting.java.patch | 2 +- .../net/minecraft/src/SlotCrafting.java.patch | 5 ++--- 3 files changed, 3 insertions(+), 4 deletions(-) rename forge/{fml-src-2.2.42.132.zip => fml-src-2.2.48.135.zip} (93%) 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 81306a54291c1cd724e26c23b2a43dcbb12bd103..561d117c13a1654264c5dda64a44a16ef5812029 100644 GIT binary patch delta 8547 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 diff --git a/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch b/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch index ee3ba70d3d..d7c69e9db3 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 b0ffca9499..898ee7ab3f 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)