Save

Author: rcx

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

@@ -51,7 +51,7 @@ public void add(ClassNode classNode) {
         classes.put(classNode.name, classNode);
     }
 
-    public Collection<ClassNode> values() {
+    public Collection<ClassNode> getClasses() {
         return classes.values();
     }
 }

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

@@ -156,13 +156,13 @@ public static ClassNode getCurrentlyOpenedClassNode() {
     }
 
     public static FileContainer findContainer(String containerName, String fileName) {
-        boolean checkContainer = !containerName.endsWith(".class");
-        System.out.println("Loading " + containerName + "$" + fileName);
+        boolean isClassFile = containerName.endsWith(".class");
         for (FileContainer container : files) {
-            if (checkContainer && !container.name.equals(containerName))
+            if (!isClassFile && !container.name.equals(containerName))
+                continue;
+            else if (isClassFile && !container.name.endsWith(".class"))
                 continue;
             if (container.getData().containsKey(fileName)) {
-                System.out.println("Found it");
                 return container;
             }
         }
@@ -272,7 +272,7 @@ public static ArrayList<ClassNode> getLoadedClasses() {
         ArrayList<ClassNode> a = new ArrayList<>();
 
         for (FileContainer container : files)
-            for (ClassNode c : container.values())
+            for (ClassNode c : container.getClasses())
                 if (!a.contains(c))
                     a.add(c);
 
@@ -362,7 +362,7 @@ public void run() {
                                     }
                                 }
                                 container.files = files;
-                                JDA.files.add(container);
+                                addFile(container);
                             } else {
                                 if (fn.endsWith(".jar") || fn.endsWith(".zip")) {
                                     try {
@@ -382,7 +382,7 @@ public void run() {
                                             FileContainer container = new FileContainer(f);
                                             container.files.put(getClassfileName(cn), bytes);
                                             container.add(cn);
-                                            JDA.files.add(container);
+                                            addFile(container);
                                         } else {
                                             showMessage(fn + ": Header does not start with CAFEBABE, ignoring.");
                                             update = false;
@@ -399,7 +399,7 @@ public void run() {
 
                                     FileContainer container = new FileContainer(f);
                                     container.files = files;
-                                    JDA.files.add(container);
+                                    addFile(container);
                                 }
                             }
                         }
@@ -419,6 +419,11 @@ public void run() {
         t.start();
     }
 
+    public static void addFile(FileContainer fc) {
+        JDA.files.add(fc);
+        plugins.forEach((plugin -> plugin.onAddFile(fc)));
+    }
+
     /**
      * Send a message to alert the user
      *

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

@@ -1,7 +1,11 @@
 package the.bytecode.club.jda.api;
 
+import the.bytecode.club.jda.FileContainer;
+
 public interface Plugin {
     int onGUILoad();
 
     int onExit();
+
+    int onAddFile(FileContainer container);
 }

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

@@ -47,6 +47,7 @@ public String decompileClassNode(String containerName, final ClassNode cn) {
             result.set(null);
 
             BaseDecompiler baseDecompiler = new BaseDecompiler((externalPath, internalPath) -> {
+//                System.out.println("boi " + externalPath + " " + internalPath);
                 ClassNode requestedCn = JDA.getClassNode(containerName, JDA.extractProxyClassName(externalPath));
                 if (requestedCn == null) {
                     System.err.println("Couldn't load " + externalPath);