Fix SAS parser

Author: LexManos

src/main/java/net/minecraftforge/binarypatcher/ConsoleTool.java

@@ -72,7 +72,7 @@ public static void main(String[] args) throws IOException {
                 log("Generating: ");
                 log("  Output:  " + output);
                 log("  Pack200: " + pack200);
-                log("  Legacy:    " + legacy);
+                log("  Legacy:  " + legacy);
 
                 Generator gen = new Generator(output).pack200(pack200).legacy(legacy);
 
@@ -82,9 +82,9 @@ public static void main(String[] args) throws IOException {
                         int max = Math.max(clean.size(), Math.max(dirty.size(), prefixes.size()));
                         for (int x = 0; x < max; x++) {
                             log("Set #" + x + ':');
-                            log("  Prefix: " + (x < prefixes.size() ? prefixes.get(x) : null));
-                            log("  Clean:  " + (x < clean.size() ? clean.get(x) : null));
-                            log("  Dirty:  " + (x < dirty.size() ? dirty.get(x) : null));
+                            log("  Prefix:  " + (x < prefixes.size() ? prefixes.get(x) : null));
+                            log("  Clean:   " + (x < clean.size() ? clean.get(x) : null));
+                            log("  Dirty:   " + (x < dirty.size() ? dirty.get(x) : null));
                         }
                         err("Unbalanced patchset arguments, see log for details");
                     }
@@ -102,8 +102,8 @@ public static void main(String[] args) throws IOException {
                         log("    Dirty: " + dirty.get(0));
                         gen.addSet(clean.get(0), dirty.get(0), prefixes.get(0));
                     } else {
-                        log("  Clean: " + clean.get(0));
-                        log("  Dirty: " + dirty.get(0));
+                        log("  Clean:   " + clean.get(0));
+                        log("  Dirty:   " + dirty.get(0));
                         gen.addSet(clean.get(0), dirty.get(0), null);
                     }
                 }

src/main/java/net/minecraftforge/binarypatcher/Generator.java

@@ -114,17 +114,21 @@ public void loadPatches(File root) throws IOException {
     public void loadSideAnnotationStripper(File file) throws IOException {
         List<String> lines = Files.readAllLines(file.toPath());
         for (String line : lines) {
+            // Strip comments
             int idx = line.indexOf('#');
-            if (idx == 0) return;
-
+            if (idx == 0) continue;
             if (idx != -1) line = line.substring(0, idx - 1);
+
+            // Account for groups
             if (line.charAt(0) == '\t') line = line.substring(1);
             line = line.trim();
+
+            // Methods, we only care about the class name
             idx = line.indexOf(' ');
-            if (idx == -1)
-                continue;
+            if (idx != -1)
+                line = line.substring(0, idx);
 
-            patches.add(line.substring(0, idx));
+            patches.add(line);
         }
     }