From 67fbcf5cecdd2b9ddaf6c265b250792d24610593 Mon Sep 17 00:00:00 2001 From: ZekerZhayard Date: Wed, 2 Sep 2020 12:29:54 +0800 Subject: [PATCH] Fix crashes caused by incorrect stack frames. (#114) --- .../forge/transformer/PlayerTabTransformer.java | 13 +++++-------- .../transformer/TileEntitySkullTransformer.java | 2 ++ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Forge/source/customskinloader/forge/transformer/PlayerTabTransformer.java b/Forge/source/customskinloader/forge/transformer/PlayerTabTransformer.java index 771f6c8..5c4c52e 100644 --- a/Forge/source/customskinloader/forge/transformer/PlayerTabTransformer.java +++ b/Forge/source/customskinloader/forge/transformer/PlayerTabTransformer.java @@ -6,8 +6,8 @@ import org.objectweb.asm.Opcodes; import org.objectweb.asm.tree.AbstractInsnNode; import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.InsnNode; +import org.objectweb.asm.tree.MethodInsnNode; import org.objectweb.asm.tree.MethodNode; -import org.objectweb.asm.tree.VarInsnNode; import customskinloader.forge.TransformerManager.IMethodTransformer; import customskinloader.forge.TransformerManager.TransformTarget; @@ -20,14 +20,11 @@ public class PlayerTabTransformer { //From: http://git.oschina.net/AsteriskTeam/TabIconHackForge/blob/master/src/main/java/kengxxiao/tabiconhack/coremod/TabIconHackForgeClassTransformer.java#L30-L43 @Override public void transform(ClassNode cn, MethodNode mn) { - ListIterator iterator = mn.instructions.iterator(); - while (iterator.hasNext()) { + for (ListIterator iterator = mn.instructions.iterator(); iterator.hasNext();) { AbstractInsnNode node = iterator.next(); - if (node instanceof VarInsnNode) { - VarInsnNode varNode = (VarInsnNode) node; - if (varNode.getOpcode() == Opcodes.ISTORE && varNode.var == 11) { - mn.instructions.set(varNode.getPrevious(), new InsnNode(Opcodes.ICONST_1)); - } + if (node.getOpcode() == Opcodes.INVOKEVIRTUAL && ((MethodInsnNode) node).name.equals("func_71387_A")) { + mn.instructions.insertBefore(node, new InsnNode(Opcodes.POP)); + mn.instructions.set(node, new InsnNode(Opcodes.ICONST_1)); } } } diff --git a/Forge/source/customskinloader/forge/transformer/TileEntitySkullTransformer.java b/Forge/source/customskinloader/forge/transformer/TileEntitySkullTransformer.java index ed30ac5..7b2d193 100644 --- a/Forge/source/customskinloader/forge/transformer/TileEntitySkullTransformer.java +++ b/Forge/source/customskinloader/forge/transformer/TileEntitySkullTransformer.java @@ -3,6 +3,7 @@ package customskinloader.forge.transformer; import customskinloader.forge.TransformerManager; import org.objectweb.asm.Opcodes; import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.FrameNode; import org.objectweb.asm.tree.InsnList; import org.objectweb.asm.tree.InsnNode; import org.objectweb.asm.tree.MethodNode; @@ -20,6 +21,7 @@ public class TileEntitySkullTransformer { InsnList il = new InsnList(); il.add(new VarInsnNode(Opcodes.ALOAD, 0)); il.add(new InsnNode(Opcodes.ARETURN)); + il.add(new FrameNode(Opcodes.F_SAME, 0, null, 0, null)); mn.instructions.insert(il); } }