Attempt to add referenced InnerClasses to InnerClass table. Potential fix for scala compile issues.

Author: LexManos

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

@@ -96,7 +96,15 @@ public MethodVisitor visitMethod(int access, String name, String desc, String si
         for (Type t : Type.getArgumentTypes(desc))
             referenced(t);
 
-        return super.visitMethod(access, name, desc, signature, exceptions);
+        return new MethodVisitor(api, super.visitMethod(access, name, desc, signature, exceptions))
+        {
+            public void visitLdcInsn(final Object cst)
+            {
+                if (cst instanceof Type)
+                    referenced((Type)cst);
+                super.visitLdcInsn(cst);
+            }
+        };
     }
 
     @Override
@@ -116,36 +124,33 @@ public void visitOuterClass(String owner, String name, String desc)
     @Override
     public void visitEnd()
     {
-        if (json == null)
-        {
-            super.visitEnd();
-            return;
-        }
-
-        JsonStruct.EnclosingMethod enc = json.enclosingMethod;
-        if (enc != null && !visitedOuter && enc.name != null && enc.desc != null)
+        if (json != null)
         {
-            log.fine("  Adding Outer Class:");
-            log.fine("    Owner: " + enc.owner);
-            log.fine("    Method: " + enc.name + enc.desc);
-            super.visitOuterClass(enc.owner, enc.name, enc.desc);
-        }
+            JsonStruct.EnclosingMethod enc = json.enclosingMethod;
+            if (enc != null && !visitedOuter && enc.name != null && enc.desc != null)
+            {
+                log.fine("  Adding Outer Class:");
+                log.fine("    Owner: " + enc.owner);
+                log.fine("    Method: " + enc.name + enc.desc);
+                super.visitOuterClass(enc.owner, enc.name, enc.desc);
+            }
 
-        if (json.innerClasses != null)
-        {
-            for (JsonStruct.InnerClass inner : json.innerClasses)
+            if (json.innerClasses != null)
             {
-                if (!visitedInners.contains(inner.inner_class))
+                for (JsonStruct.InnerClass inner : json.innerClasses)
                 {
-                    visitedInners.add(inner.inner_class);
-                    log.fine("  Adding Inner Class:");
-                    log.fine("    Inner: " + inner.inner_class);
-                    log.fine("    Access: " + getAccess(inner.getAccess()));
-                    if (inner.outer_class != null)
-                        log.fine("    Outer: "+ inner.outer_class);
-                    if (inner.inner_name != null)
-                        log.fine("    Name: " + inner.inner_name);
-                    super.visitInnerClass(inner.inner_class, inner.outer_class, inner.inner_name, inner.getAccess());
+                    if (!visitedInners.contains(inner.inner_class))
+                    {
+                        visitedInners.add(inner.inner_class);
+                        log.fine("  Adding Inner Class:");
+                        log.fine("    Inner: " + inner.inner_class);
+                        log.fine("    Access: " + getAccess(inner.getAccess()));
+                        if (inner.outer_class != null)
+                            log.fine("    Outer: "+ inner.outer_class);
+                        if (inner.inner_name != null)
+                            log.fine("    Name: " + inner.inner_name);
+                        super.visitInnerClass(inner.inner_class, inner.outer_class, inner.inner_name, inner.getAccess());
+                    }
                 }
             }
         }
@@ -156,7 +161,11 @@ public void visitEnd()
             JsonStruct.InnerClass ic = mci.inners.get(inner);
             if (ic == null)
             {
-                log.fine("  Referenced Inner Class: " + inner + " (missing)");
+                log.fine("  Referenced Inner Class: " + inner + " (missing) assuming defaults");
+                int idx = inner.lastIndexOf('$');
+                String outer = inner.substring(0, idx);
+                String name  = inner.substring(idx + 1);
+                super.visitInnerClass(inner, outer, name, Opcodes.ACC_PUBLIC); //Hacky, but ASSUME public
             }
             else
             {
@@ -167,7 +176,10 @@ public void visitEnd()
                     log.fine("    Outer: "+ ic.outer_class);
                 if (ic.inner_name != null)
                     log.fine("    Name: " + ic.inner_name);
+                super.visitInnerClass(ic.inner_class, ic.outer_class, ic.inner_name, ic.getAccess());
             }
         }
+
+        super.visitEnd();
     }
 }

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

@@ -45,7 +45,7 @@ public void visitEnd()
                     {
                         if (0x2603 != lvn.name.charAt(0)) // Snowmen, added in 1.8.2? rename them to FF names
                             continue;
-                        log.info("    Renaming LVT: " + lvn.index + " " + lvn.name + " " +lvn.desc + " -> " + "var" + lvn.index);
+                        log.info("    Renaming LVT: " + lvn.index + " " + lvn.name + " " + lvn.desc + " -> " + "var" + lvn.index);
                         lvn.name = "var" + lvn.index;
                     }
                 }