Fix ClassNodeDecompiler not decompiling inner classes

Author: rcx

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

@@ -28,7 +28,7 @@ public FileContainer(File f) {
 
     public ClassNode getClassNode(String name) {
         if (!classes.containsKey(name)) {
-            byte[] bytes = files.get(name + ".class");
+            byte[] bytes = files.get(name);
             if (bytes != null) {
                 ClassReader reader = new ClassReader(bytes);
                 ClassNode classNode = new ClassNode();

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

@@ -164,8 +164,9 @@ public static ClassNode getCurrentlyOpenedClassNode() {
      */
     public static ClassNode getClassNode(String containerName, String name) {
         for (FileContainer container : files) {
-            if (container.name.equals(containerName) && container.getData().containsKey(name + ".class")) {
-                return container.getClassNode(name);
+            String classFileName = name + ".class";
+            if (container.name.equals(containerName) && container.getData().containsKey(classFileName)) {
+                return container.getClassNode(classFileName);
             }
         }
         return null;
@@ -233,7 +234,7 @@ public static ArrayList<ClassNode> loadAllClasses() {
             for (String s : container.files.keySet()) {
                 if (!s.endsWith(".class"))
                     continue;
-                ClassNode loaded = container.getClassNode(s.substring(0, s.length() - 6));
+                ClassNode loaded = container.getClassNode(s);
                 if (loaded != null) {
                     a.add(loaded);
                 }

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

@@ -41,6 +41,8 @@ public String decompileClassNode(ClassNode cn, byte[] b) {
                     containerName = container.name;
             }
         }
+        if (containerName == null)
+            System.out.println("Warning: Unable to locate container for class " + cn.name + "!");
 
         return decompile(new PrefixedStringBuilder(), new ArrayList<>(), containerName, cn).toString();
     }