diff options
| author |  gegy1000 | 2019-06-19 20:28:01 +0200 |
|---|---|---|
| committer | gegy1000 | 2019-06-19 20:28:01 +0200 |
| commit | e9f9f8f29f2504bb750ea0af11840c1aa746b476 (patch) | |
| tree | c08d8cec3387b535141cee9bd7ffddd5bb431652 /src/main/java/cuchaz/enigma/Main.java | |
| parent | Merge pull request #150 from Runemoro/short-inner-class-names (diff) | |
| download | enigma-fork-e9f9f8f29f2504bb750ea0af11840c1aa746b476.tar.gz enigma-fork-e9f9f8f29f2504bb750ea0af11840c1aa746b476.tar.xz enigma-fork-e9f9f8f29f2504bb750ea0af11840c1aa746b476.zip | |
Only open mappings once jar is loaded
Diffstat (limited to 'src/main/java/cuchaz/enigma/Main.java')
| -rw-r--r-- | src/main/java/cuchaz/enigma/Main.java | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/main/java/cuchaz/enigma/Main.java b/src/main/java/cuchaz/enigma/Main.java index 1f2cb84..b778946 100644 --- a/src/main/java/cuchaz/enigma/Main.java +++ b/src/main/java/cuchaz/enigma/Main.java | |||
| @@ -62,16 +62,17 @@ public class Main { | |||
| 62 | 62 | ||
| 63 | if (options.has(jar)) { | 63 | if (options.has(jar)) { |
| 64 | Path jarPath = options.valueOf(jar); | 64 | Path jarPath = options.valueOf(jar); |
| 65 | controller.openJar(jarPath); | 65 | controller.openJar(jarPath) |
| 66 | } | 66 | .whenComplete((v, t) -> { |
| 67 | 67 | if (options.has(mappings)) { | |
| 68 | if (options.has(mappings)) { | 68 | Path mappingsPath = options.valueOf(mappings); |
| 69 | Path mappingsPath = options.valueOf(mappings); | 69 | if (Files.isDirectory(mappingsPath)) { |
| 70 | if (Files.isDirectory(mappingsPath)) { | 70 | controller.openMappings(MappingFormat.ENIGMA_DIRECTORY, mappingsPath); |
| 71 | controller.openMappings(MappingFormat.ENIGMA_DIRECTORY, mappingsPath); | 71 | } else { |
| 72 | } else { | 72 | controller.openMappings(MappingFormat.ENIGMA_FILE, mappingsPath); |
| 73 | controller.openMappings(MappingFormat.ENIGMA_FILE, mappingsPath); | 73 | } |
| 74 | } | 74 | } |
| 75 | }); | ||
| 75 | } | 76 | } |
| 76 | } catch (OptionException e) { | 77 | } catch (OptionException e) { |
| 77 | System.out.println("Invalid arguments: " + e.getMessage()); | 78 | System.out.println("Invalid arguments: " + e.getMessage()); |