Updated to FML Build 95

This commit is contained in:
LexManos committed 2012-05-27 05:08:22 -07:00
1 parent c708b83425
commit b65c1f01ec
3 files changed
+8 -9

No files matched your search

@@ -1,7 +1,8 @@
--- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -0000
+++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -0000
@@ -1,5 +1,8 @@
package net.minecraft.src;
@@ -2,6 +2,9 @@
import cpw.mods.fml.client.FMLClientHandler;
+import cpw.mods.fml.client.FMLClientHandler;
+import net.minecraft.src.forge.ForgeHooks;
@@ -9,13 +10,11 @@
public class SlotCrafting extends Slot
{
/** The craft matrix inventory linked to this result slot. */
@@ -96,6 +99,9 @@
*/
@@ -99,6 +102,7 @@
public void onPickupFromSlot(ItemStack par1ItemStack)
{
+ FMLClientHandler.instance().onItemCrafted(thePlayer, par1ItemStack, craftMatrix);
FMLClientHandler.instance().onItemCrafted(thePlayer, par1ItemStack, inventory);
+ ForgeHooks.onTakenFromCrafting(thePlayer, par1ItemStack, craftMatrix);
+
this.func_48434_c(par1ItemStack);
for (int var2 = 0; var2 < this.craftMatrix.getSizeInventory(); ++var2)
+3 -3
View File
@@ -79,7 +79,7 @@ def main():
zip_add('fml', 'fml')
zip_add('conf', 'conf')
zip_add('install/install.cmd')
zip_add_perm('install/install.sh', 0777)
zip_add('install/install.sh')
zip_add('install/README-MinecraftForge.txt')
zip_add('install/install.py')
zip_add('forge.py')
@@ -120,8 +120,8 @@ def zip_add_perm(file, perm, key=None):
#zip.write(file, key)
with open(file, 'r') as fh: data = fh.read()
info = zipfile.ZipInfo(name)
info.external_attr = perm << 16L
info = zipfile.ZipInfo(key)
info.external_attr = 0777 << 16L
zip.writestr(info, data)
def zip_start(name, base=None):