diff --git a/fml/patches/minecraft/net/minecraft/item/ItemStack.java.patch b/fml/patches/minecraft/net/minecraft/item/ItemStack.java.patch index 37ac209756..7e2047115d 100644 --- a/fml/patches/minecraft/net/minecraft/item/ItemStack.java.patch +++ b/fml/patches/minecraft/net/minecraft/item/ItemStack.java.patch @@ -22,10 +22,19 @@ public Item func_77973_b() { - return this.field_151002_e; -+ return this.delegate.get(); ++ return this.delegate != null ? this.delegate.get() : null; } @SideOnly(Side.CLIENT) +@@ -164,7 +165,7 @@ + + public void func_77963_c(NBTTagCompound p_77963_1_) + { +- this.field_151002_e = Item.func_150899_d(p_77963_1_.func_74765_d("id")); ++ func_150996_a(Item.func_150899_d(p_77963_1_.func_74765_d("id"))); + this.field_77994_a = p_77963_1_.func_74771_c("Count"); + this.field_77991_e = p_77963_1_.func_74765_d("Damage"); + @@ -744,6 +745,7 @@ public void func_150996_a(Item p_150996_1_) diff --git a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/ItemStackTransformer.java b/fml/src/main/java/cpw/mods/fml/common/asm/transformers/ItemStackTransformer.java new file mode 100644 index 0000000000..4c78ae88d9 --- /dev/null +++ b/fml/src/main/java/cpw/mods/fml/common/asm/transformers/ItemStackTransformer.java @@ -0,0 +1,47 @@ +package cpw.mods.fml.common.asm.transformers; + +import java.util.ListIterator; + +import net.minecraft.launchwrapper.IClassTransformer; + +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.FieldInsnNode; +import org.objectweb.asm.tree.MethodInsnNode; +import org.objectweb.asm.tree.MethodNode; + +public class ItemStackTransformer implements IClassTransformer { + @Override + public byte[] transform(String name, String transformedName, byte[] basicClass) { + if (!"net.minecraft.item.ItemStack".equals(name)) + return basicClass; + ClassNode classNode = new ClassNode(); + ClassReader classReader = new ClassReader(basicClass); + classReader.accept(classNode, 0); + + for (MethodNode m: classNode.methods) + { + for (ListIterator it = m.instructions.iterator(); it.hasNext(); ) + { + AbstractInsnNode insnNode = it.next(); + if (insnNode.getType() == AbstractInsnNode.FIELD_INSN) + { + FieldInsnNode fi = (FieldInsnNode)insnNode; + if ("field_151002_e".equals(fi.name) && fi.getOpcode() == Opcodes.GETFIELD) + { + it.remove(); + MethodInsnNode replace = new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "net/minecraft/item/ItemStack","getItem", "()Lnet/minecraft/item/Item;"); + it.add(replace); + } + } + } + } + ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_MAXS); + classNode.accept(writer); + return writer.toByteArray(); + } + +} diff --git a/fml/src/main/java/cpw/mods/fml/common/launcher/FMLDeobfTweaker.java b/fml/src/main/java/cpw/mods/fml/common/launcher/FMLDeobfTweaker.java index 12b18a3d53..6c738cd639 100644 --- a/fml/src/main/java/cpw/mods/fml/common/launcher/FMLDeobfTweaker.java +++ b/fml/src/main/java/cpw/mods/fml/common/launcher/FMLDeobfTweaker.java @@ -32,6 +32,7 @@ public class FMLDeobfTweaker implements ITweaker { classLoader.registerTransformer(transformer); } classLoader.registerTransformer("cpw.mods.fml.common.asm.transformers.ModAccessTransformer"); + classLoader.registerTransformer("cpw.mods.fml.common.asm.transformers.ItemStackTransformer"); try { FMLRelaunchLog.fine("Validating minecraft");