keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Updated to FML #135 {Fixed ModList rendering issue, and incorrect arument on crafting hook}

This commit is contained in:
LexManos 2012-06-13 20:26:38 -07:00
parent 9bf3436be4
commit 320d1360b8
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
forge/fml-src-2.2.42.132.zip → forge/fml-src-2.2.48.135.zip
View File

Binary file not shown.

2
forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch
View File

@ -13,7 +13,7 @@
@@ -99,6 +102,7 @@ @@ -99,6 +102,7 @@
public void onPickupFromSlot(ItemStack par1ItemStack) public void onPickupFromSlot(ItemStack par1ItemStack)
{ {
FMLClientHandler.instance().onItemCrafted(thePlayer, par1ItemStack, inventory); FMLClientHandler.instance().onItemCrafted(thePlayer, par1ItemStack, craftMatrix);
+ ForgeHooks.onTakenFromCrafting(thePlayer, par1ItemStack, craftMatrix); + ForgeHooks.onTakenFromCrafting(thePlayer, par1ItemStack, craftMatrix);
this.func_48434_c(par1ItemStack); this.func_48434_c(par1ItemStack);

5
forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch
View File

@ -9,12 +9,11 @@
public class SlotCrafting extends Slot public class SlotCrafting extends Slot
{ {
/** The craft matrix inventory linked to this result slot. */ /** The craft matrix inventory linked to this result slot. */
@@ -99,6 +101,8 @@ @@ -99,6 +101,7 @@
public void onPickupFromSlot(ItemStack par1ItemStack) public void onPickupFromSlot(ItemStack par1ItemStack)
{ {
FMLServerHandler.instance().onItemCrafted(thePlayer, par1ItemStack, inventory); FMLServerHandler.instance().onItemCrafted(thePlayer, par1ItemStack, craftMatrix);
+ ForgeHooks.onTakenFromCrafting(thePlayer, par1ItemStack, craftMatrix); + ForgeHooks.onTakenFromCrafting(thePlayer, par1ItemStack, craftMatrix);
+
this.func_48416_b(par1ItemStack); this.func_48416_b(par1ItemStack);
for (int var2 = 0; var2 < this.craftMatrix.getSizeInventory(); ++var2) for (int var2 = 0; var2 < this.craftMatrix.getSizeInventory(); ++var2)