Fernflower bug (#26)

Author: rcx

src/main/java/the/bytecode/club/jda/JDA.java

@@ -4,6 +4,7 @@
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.InnerClassNode;
 import the.bytecode.club.jda.api.ExceptionUI;
 import the.bytecode.club.jda.api.Plugin;
 import the.bytecode.club.jda.api.PluginLoader;
@@ -168,9 +169,20 @@ public static ClassNode getClassNode(String containerName, String name) {
                 return container.getClassNode(classFileName);
             }
         }
+
         return null;
     }
 
+    public static final String HACK_PREFIX = "\0JDA-hack";
+
+    public static File getClassFileProxy(ClassNode cn) {
+        return new File('/' + HACK_PREFIX, cn.name + ".class");
+    }
+
+    public static File getClassFileProxy(InnerClassNode cn) {
+        return new File('/' + HACK_PREFIX, cn.name + ".class");
+    }
+
     public static byte[] getFileBytes(String containerName, String name) {
         for (FileContainer container : files) {
             if (container.name.equals(containerName) && container.getData().containsKey(name)) {
@@ -191,8 +203,12 @@ public static String getClassfileName(ClassNode cn) {
         return cn.name + ".class";
     }
 
+    public static String extractProxyClassName(String fileName) {
+        return extractClassName(fileName.substring(fileName.indexOf(HACK_PREFIX) + HACK_PREFIX.length() + 1));
+    }
+
     public static String extractClassName(String fileName) {
-        return fileName.substring(0, fileName.length() - 6);
+        return fileName.replace(File.separator, "/").substring(0, fileName.length() - 6);
     }
 
     protected static byte[] fixBytes(byte[] in) {

src/main/java/the/bytecode/club/jda/api/PluginLoader.java

@@ -1,5 +1,7 @@
 package the.bytecode.club.jda.api;
 
+import the.bytecode.club.jda.JDA;
+
 import java.io.*;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -18,7 +20,7 @@ public URL getResource(String name) {
                 }
             };
 
-            InputStream metaInfStream = loader.getResourceAsStream("\0JDA-hack:META-INF/MANIFEST.MF");
+            InputStream metaInfStream = loader.getResourceAsStream(JDA.HACK_PREFIX + ":META-INF/MANIFEST.MF");
             if (metaInfStream == null) {
                 System.out.println("Invalid plugin " + pluginFileName + ": no manifest");
                 return null;

src/main/java/the/bytecode/club/jda/decompilers/FernflowerDecompiler.java

@@ -27,7 +27,6 @@
  */
 
 public final class FernflowerDecompiler extends Decompiler {
-
     public FernflowerDecompiler() {
         for (Settings setting : Settings.values()) {
             settings.registerSetting(setting);
@@ -48,7 +47,11 @@ public String decompileClassNode(String containerName, final ClassNode cn) {
             result.set(null);
 
             BaseDecompiler baseDecompiler = new BaseDecompiler((externalPath, internalPath) -> {
-                ClassNode requestedCn = JDA.getClassNode(containerName, JDA.extractClassName(new File(externalPath).getName()));
+                ClassNode requestedCn = JDA.getClassNode(containerName, JDA.extractProxyClassName(externalPath));
+                if (requestedCn == null) {
+                    System.err.println("Couldn't load " + externalPath);
+                    return new byte[0];
+                }
                 byte[] bytes = JDA.getClassBytes(containerName, requestedCn);
                 byte[] clone = new byte[bytes.length];
                 System.arraycopy(bytes, 0, clone, 0, bytes.length);
@@ -94,9 +97,9 @@ public void closeArchive(String s, String s1) {
                 }
             }, options, new PrintStreamLogger(System.out));
 
-            baseDecompiler.addSpace(new File(cn.name + ".class"), true);
+            baseDecompiler.addSpace(JDA.getClassFileProxy(cn), true);
             for (InnerClassNode innerCn : cn.innerClasses)
-                baseDecompiler.addSpace(new File(innerCn.name + ".class"), true);
+                baseDecompiler.addSpace(JDA.getClassFileProxy(innerCn), true);
             baseDecompiler.decompileContext();
             while (true) {
                 if (result.get() != null) {