diff --git a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/EventSubscriptionTransformer.java b/fml/src/main/java/cpw/mods/fml/common/asm/transformers/EventSubscriptionTransformer.java index 9d76e2718..6d16b8c6f 100644 --- a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/EventSubscriptionTransformer.java +++ b/fml/src/main/java/cpw/mods/fml/common/asm/transformers/EventSubscriptionTransformer.java @@ -8,7 +8,7 @@ import static org.objectweb.asm.Opcodes.ACC_PUBLIC; import static org.objectweb.asm.Opcodes.ACC_STATIC; import static org.objectweb.asm.Opcodes.ALOAD; import static org.objectweb.asm.Opcodes.ARETURN; -import static org.objectweb.asm.Opcodes.ASM4; +import static org.objectweb.asm.Opcodes.ASM5; import static org.objectweb.asm.Opcodes.DUP; import static org.objectweb.asm.Opcodes.F_SAME; import static org.objectweb.asm.Opcodes.GETSTATIC; @@ -139,7 +139,7 @@ public class EventSubscriptionTransformer implements IClassTransformer * super(); * } */ - MethodNode method = new MethodNode(ASM4, ACC_PUBLIC, "", getMethodDescriptor(VOID_TYPE), null, null); + MethodNode method = new MethodNode(ASM5, ACC_PUBLIC, "", getMethodDescriptor(VOID_TYPE), null, null); method.instructions.add(new VarInsnNode(ALOAD, 0)); method.instructions.add(new MethodInsnNode(INVOKESPECIAL, tSuper.getInternalName(), "", getMethodDescriptor(VOID_TYPE), false)); method.instructions.add(new InsnNode(RETURN)); @@ -159,7 +159,7 @@ public class EventSubscriptionTransformer implements IClassTransformer * LISTENER_LIST = new ListenerList(super.getListenerList()); * } */ - method = new MethodNode(ASM4, ACC_PROTECTED, "setup", getMethodDescriptor(VOID_TYPE), null, null); + method = new MethodNode(ASM5, ACC_PROTECTED, "setup", getMethodDescriptor(VOID_TYPE), null, null); method.instructions.add(new VarInsnNode(ALOAD, 0)); method.instructions.add(new MethodInsnNode(INVOKESPECIAL, tSuper.getInternalName(), "setup", getMethodDescriptor(VOID_TYPE), false)); method.instructions.add(new FieldInsnNode(GETSTATIC, classNode.name, "LISTENER_LIST", tList.getDescriptor())); @@ -183,7 +183,7 @@ public class EventSubscriptionTransformer implements IClassTransformer * return this.LISTENER_LIST; * } */ - method = new MethodNode(ASM4, ACC_PUBLIC, "getListenerList", getMethodDescriptor(tList), null, null); + method = new MethodNode(ASM5, ACC_PUBLIC, "getListenerList", getMethodDescriptor(tList), null, null); method.instructions.add(new FieldInsnNode(GETSTATIC, classNode.name, "LISTENER_LIST", tList.getDescriptor())); method.instructions.add(new InsnNode(ARETURN)); classNode.methods.add(method); diff --git a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/TerminalTransformer.java b/fml/src/main/java/cpw/mods/fml/common/asm/transformers/TerminalTransformer.java index 865486bc6..6bf2cd4bc 100644 --- a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/TerminalTransformer.java +++ b/fml/src/main/java/cpw/mods/fml/common/asm/transformers/TerminalTransformer.java @@ -29,7 +29,7 @@ public class TerminalTransformer implements IClassTransformer private ExitVisitor(ClassVisitor cv) { - super(Opcodes.ASM4, cv); + super(Opcodes.ASM5, cv); } @Override @@ -49,7 +49,7 @@ public class TerminalTransformer implements IClassTransformer clsName.startsWith("scala/sys/") ); - return new MethodVisitor(Opcodes.ASM4, super.visitMethod(mAccess, mName, mDesc, mSignature, mExceptions)) + return new MethodVisitor(Opcodes.ASM5, super.visitMethod(mAccess, mName, mDesc, mSignature, mExceptions)) { @Override public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean isIntf) diff --git a/fml/src/main/java/cpw/mods/fml/common/discovery/asm/ModAnnotationVisitor.java b/fml/src/main/java/cpw/mods/fml/common/discovery/asm/ModAnnotationVisitor.java index c7b4a91f8..ff710efce 100644 --- a/fml/src/main/java/cpw/mods/fml/common/discovery/asm/ModAnnotationVisitor.java +++ b/fml/src/main/java/cpw/mods/fml/common/discovery/asm/ModAnnotationVisitor.java @@ -25,7 +25,7 @@ public class ModAnnotationVisitor extends AnnotationVisitor public ModAnnotationVisitor(ASMModParser discoverer) { - super(Opcodes.ASM4); + super(Opcodes.ASM5); this.discoverer = discoverer; } diff --git a/fml/src/main/java/cpw/mods/fml/common/discovery/asm/ModClassVisitor.java b/fml/src/main/java/cpw/mods/fml/common/discovery/asm/ModClassVisitor.java index 97d7f85e3..a4459f39a 100644 --- a/fml/src/main/java/cpw/mods/fml/common/discovery/asm/ModClassVisitor.java +++ b/fml/src/main/java/cpw/mods/fml/common/discovery/asm/ModClassVisitor.java @@ -24,7 +24,7 @@ public class ModClassVisitor extends ClassVisitor public ModClassVisitor(ASMModParser discoverer) { - super(Opcodes.ASM4); + super(Opcodes.ASM5); this.discoverer = discoverer; } diff --git a/fml/src/main/java/cpw/mods/fml/common/discovery/asm/ModFieldVisitor.java b/fml/src/main/java/cpw/mods/fml/common/discovery/asm/ModFieldVisitor.java index dba33cb25..024db4b66 100644 --- a/fml/src/main/java/cpw/mods/fml/common/discovery/asm/ModFieldVisitor.java +++ b/fml/src/main/java/cpw/mods/fml/common/discovery/asm/ModFieldVisitor.java @@ -24,7 +24,7 @@ public class ModFieldVisitor extends FieldVisitor public ModFieldVisitor(String name, ASMModParser discoverer) { - super(Opcodes.ASM4); + super(Opcodes.ASM5); this.fieldName = name; this.discoverer = discoverer; } diff --git a/fml/src/main/java/cpw/mods/fml/common/discovery/asm/ModMethodVisitor.java b/fml/src/main/java/cpw/mods/fml/common/discovery/asm/ModMethodVisitor.java index cf9fe0eab..f9ce46772 100644 --- a/fml/src/main/java/cpw/mods/fml/common/discovery/asm/ModMethodVisitor.java +++ b/fml/src/main/java/cpw/mods/fml/common/discovery/asm/ModMethodVisitor.java @@ -12,7 +12,7 @@ public class ModMethodVisitor extends MethodVisitor { public ModMethodVisitor(String name, String desc, ASMModParser discoverer) { - super(Opcodes.ASM4); + super(Opcodes.ASM5); this.methodName = name; this.methodDescriptor = desc; this.discoverer = discoverer;