diff options
Diffstat (limited to 'src/cuchaz/enigma/CommandMain.java')
| -rw-r--r-- | src/cuchaz/enigma/CommandMain.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/cuchaz/enigma/CommandMain.java b/src/cuchaz/enigma/CommandMain.java index 74bd499..1ec2ad2 100644 --- a/src/cuchaz/enigma/CommandMain.java +++ b/src/cuchaz/enigma/CommandMain.java | |||
| @@ -2,6 +2,7 @@ package cuchaz.enigma; | |||
| 2 | 2 | ||
| 3 | import java.io.File; | 3 | import java.io.File; |
| 4 | import java.io.FileReader; | 4 | import java.io.FileReader; |
| 5 | import java.util.jar.JarFile; | ||
| 5 | 6 | ||
| 6 | import cuchaz.enigma.Deobfuscator.ProgressListener; | 7 | import cuchaz.enigma.Deobfuscator.ProgressListener; |
| 7 | import cuchaz.enigma.mapping.Mappings; | 8 | import cuchaz.enigma.mapping.Mappings; |
| @@ -78,7 +79,7 @@ public class CommandMain { | |||
| 78 | File fileMappings = getReadableFile(getArg(args, 1, "mappings file")); | 79 | File fileMappings = getReadableFile(getArg(args, 1, "mappings file")); |
| 79 | File fileJarIn = getReadableFile(getArg(args, 2, "in jar")); | 80 | File fileJarIn = getReadableFile(getArg(args, 2, "in jar")); |
| 80 | File fileJarOut = getWritableFolder(getArg(args, 3, "out folder")); | 81 | File fileJarOut = getWritableFolder(getArg(args, 3, "out folder")); |
| 81 | Deobfuscator deobfuscator = getDeobfuscator(fileMappings, fileJarIn); | 82 | Deobfuscator deobfuscator = getDeobfuscator(fileMappings, new JarFile(fileJarIn)); |
| 82 | deobfuscator.writeSources(fileJarOut, new ConsoleProgressListener()); | 83 | deobfuscator.writeSources(fileJarOut, new ConsoleProgressListener()); |
| 83 | } | 84 | } |
| 84 | 85 | ||
| @@ -87,16 +88,16 @@ public class CommandMain { | |||
| 87 | File fileMappings = getReadableFile(getArg(args, 1, "mappings file")); | 88 | File fileMappings = getReadableFile(getArg(args, 1, "mappings file")); |
| 88 | File fileJarIn = getReadableFile(getArg(args, 2, "in jar")); | 89 | File fileJarIn = getReadableFile(getArg(args, 2, "in jar")); |
| 89 | File fileJarOut = getWritableFile(getArg(args, 3, "out jar")); | 90 | File fileJarOut = getWritableFile(getArg(args, 3, "out jar")); |
| 90 | Deobfuscator deobfuscator = getDeobfuscator(fileMappings, fileJarIn); | 91 | Deobfuscator deobfuscator = getDeobfuscator(fileMappings, new JarFile(fileJarIn)); |
| 91 | deobfuscator.writeJar(fileJarOut, new ConsoleProgressListener()); | 92 | deobfuscator.writeJar(fileJarOut, new ConsoleProgressListener()); |
| 92 | } | 93 | } |
| 93 | 94 | ||
| 94 | private static Deobfuscator getDeobfuscator(File fileMappings, File fileJar) | 95 | private static Deobfuscator getDeobfuscator(File fileMappings, JarFile jar) |
| 95 | throws Exception { | 96 | throws Exception { |
| 96 | System.out.println("Reading mappings..."); | 97 | System.out.println("Reading mappings..."); |
| 97 | Mappings mappings = new MappingsReader().read(new FileReader(fileMappings)); | 98 | Mappings mappings = new MappingsReader().read(new FileReader(fileMappings)); |
| 98 | System.out.println("Reading jar..."); | 99 | System.out.println("Reading jar..."); |
| 99 | Deobfuscator deobfuscator = new Deobfuscator(fileJar); | 100 | Deobfuscator deobfuscator = new Deobfuscator(jar); |
| 100 | deobfuscator.setMappings(mappings); | 101 | deobfuscator.setMappings(mappings); |
| 101 | return deobfuscator; | 102 | return deobfuscator; |
| 102 | } | 103 | } |