Fix crashes caused by incorrect stack frames. (#114)

This commit is contained in:
ZekerZhayard authored and GitHub committed 2020-09-02 12:29:54 +08:00
1 parent f898831276
commit 67fbcf5cec
2 files changed
+7 -8

No files matched your search

@@ -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<AbstractInsnNode> iterator = mn.instructions.iterator();
while (iterator.hasNext()) {
for (ListIterator<AbstractInsnNode> 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));
}
}
}
@@ -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);
}
}