Update ASM to 5.0.2

Author: LexManos

build.gradle

@@ -35,7 +35,7 @@ artifacts {
 }
 
 dependencies {
-    compile 'org.ow2.asm:asm-debug-all:4.1'
+    compile 'org.ow2.asm:asm-debug-all:5.0.4'
     compile 'net.sf.jopt-simple:jopt-simple:4.5'
     compile 'com.google.code.gson:gson:2.2.4'
 }

src/main/java/de/oceanlabs/mcp/mcinjector/adaptors/AccessReader.java

@@ -23,7 +23,7 @@ public class AccessReader extends ClassVisitor
 
     public AccessReader(ClassVisitor cv, MCInjectorImpl mci)
     {
-        super(ASM4, cv);
+        super(ASM5, cv);
         //this.mci = mci;
     }
 
@@ -44,7 +44,7 @@ public MethodVisitor visitMethod(int access, String name, String desc, String si
             final AccessInfo info = new AccessInfo(className, name, desc);
             info.access = access;
             methods.put(path, info);
-            
+
             ret = new MethodVisitor(api, ret)
             {
                 // GETSTATIC, PUTSTATIC, GETFIELD or PUTFIELD.
@@ -56,10 +56,10 @@ public void visitFieldInsn(int opcode, String owner, String name, String desc)
                 }
 
                 // INVOKEVIRTUAL, INVOKESPECIAL, INVOKESTATIC or INVOKEINTERFACE.
-                public void visitMethodInsn(int opcode, String owner, String name, String desc)
+                public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf)
                 {
                     info.add(opcode, owner, name, desc);
-                    super.visitMethodInsn(opcode, owner, name, desc);
+                    super.visitMethodInsn(opcode, owner, name, desc, itf);
                 }
             };
         }
@@ -84,7 +84,7 @@ private static class AccessInfo
         public String desc;
         public int access;
         public List<Insn> insns = new ArrayList<Insn>();
-        
+
         public static class Insn
         {
             public int opcode;
@@ -117,7 +117,7 @@ public String toString()
                 return op + " " + target_owner + "/" + target_name + " " + target_desc;
             }
         }
-        
+
         public AccessInfo(String owner, String name, String desc)
         {
             this.owner = owner;
@@ -140,7 +140,7 @@ public String toString()
             buf.append(']');
             return buf.toString();
         }
-        
+
         public boolean targetEquals(AccessInfo o)
         {
             return toString().equals(o.toString());

src/main/java/de/oceanlabs/mcp/mcinjector/adaptors/ApplyMap.java

@@ -28,7 +28,7 @@ public class ApplyMap extends ClassVisitor
 
     public ApplyMap(ClassNode cn, MCInjectorImpl mci)
     {
-        super(Opcodes.ASM4, cn);
+        super(Opcodes.ASM5, cn);
         this.mci = mci;
         this.cn = cn;
     }
@@ -49,11 +49,11 @@ public MethodVisitor visitMethod(int access, String name, String desc, String si
         {
             return super.visitMethod(access, name, desc, signature, exceptions);
         }
-        
+
         if (!mci.generate) log.log(Level.FINER, "  Name: " + name + " Desc: " + desc + " Sig: " + signature);
 
         String clsSig = this.className + "." + name + desc;
-        
+
         exceptions = processExceptions(clsSig, exceptions);
 
         // abstract and native methods don't have a Code attribute
@@ -111,34 +111,34 @@ private MethodNode processLVT(String clsName, String classSig, MethodNode mn)
         }
 
         types.addAll(Arrays.asList(Type.getArgumentTypes(mn.desc)));
-        
+
         //Skip anything with no params
         if (types.size() == 0)
         {
             return mn;
         }
-        
+
         log.fine("    Applying map:");
         if (params.size() != types.size())
         {
             log.log(Level.SEVERE, "    Incorrect argument count: " + types.size() + " -> " + params.size());
             throw new RuntimeException("Incorrect argument count: " + types.size() + " -> " + params.size());
         }
-        
-        
+
+
         // Add labels to the start and end if they are not already labels
         AbstractInsnNode tmp = mn.instructions.getFirst();
         if (tmp == null)
             mn.instructions.add(new LabelNode());
         else if (tmp.getType() != AbstractInsnNode.LABEL)
             mn.instructions.insertBefore(tmp, new LabelNode());
-        
+
         tmp = mn.instructions.getLast();
         if (tmp == null)
             mn.instructions.add(new LabelNode());
         else if (tmp.getType() != AbstractInsnNode.LABEL)
             mn.instructions.insert(tmp, new LabelNode());
-        
+
         //Grab the start and end labels
         LabelNode start = (LabelNode)mn.instructions.getFirst();
         LabelNode end = (LabelNode)mn.instructions.getLast();

src/main/java/de/oceanlabs/mcp/mcinjector/adaptors/ApplyMarker.java

@@ -18,7 +18,7 @@ public class ApplyMarker extends ClassVisitor
 
     public ApplyMarker(ClassVisitor cv, MCInjectorImpl mci)
     {
-        super(Opcodes.ASM4, cv);
+        super(Opcodes.ASM5, cv);
         this.mci = mci;
     }
 

src/main/java/de/oceanlabs/mcp/mcinjector/adaptors/GenerateMap.java

@@ -22,7 +22,7 @@ public class GenerateMap extends ClassVisitor
 
     public GenerateMap(ClassVisitor cv, MCInjectorImpl mci)
     {
-        super(Opcodes.ASM4, cv);
+        super(Opcodes.ASM5, cv);
         this.mci = mci;
     }
 

src/main/java/de/oceanlabs/mcp/mcinjector/adaptors/JsonAttribute.java

@@ -26,7 +26,7 @@ public class JsonAttribute extends ClassVisitor
 
     public JsonAttribute(ClassVisitor cv, MCInjectorImpl mci)
     {
-        super(Opcodes.ASM4, cv);
+        super(Opcodes.ASM5, cv);
         this.mci = mci;
     }
 

src/main/java/de/oceanlabs/mcp/mcinjector/adaptors/ReadMarker.java

@@ -15,7 +15,7 @@ public class ReadMarker extends ClassVisitor
 
     public ReadMarker(ClassVisitor cv, MCInjectorImpl mci)
     {
-        super(Opcodes.ASM4, cv);
+        super(Opcodes.ASM5, cv);
     }
 
     @Override