summaryrefslogtreecommitdiff
path: root/src/main/java/cuchaz/enigma/EnigmaProject.java
diff options
context:
space:
mode:
authorGravatar liach2019-11-08 16:35:19 -0600
committerGravatar modmuss502019-11-08 22:35:19 +0000
commitad59e46740ef636b95667615e3881fcee6fbbcb9 (patch)
tree2cc829684426f8f0373834efe4bee0513a0544f2 /src/main/java/cuchaz/enigma/EnigmaProject.java
parentAdd tinyv2 save/load (diff)
downloadenigma-fork-ad59e46740ef636b95667615e3881fcee6fbbcb9.tar.gz
enigma-fork-ad59e46740ef636b95667615e3881fcee6fbbcb9.tar.xz
enigma-fork-ad59e46740ef636b95667615e3881fcee6fbbcb9.zip
Allow multiple services for enigma (#168)
* Allow multiple services for enigma Signed-off-by: liach <liach@users.noreply.github.com> * Delete bad dummy Signed-off-by: liach <liach@users.noreply.github.com>
Diffstat (limited to 'src/main/java/cuchaz/enigma/EnigmaProject.java')
-rw-r--r--src/main/java/cuchaz/enigma/EnigmaProject.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/main/java/cuchaz/enigma/EnigmaProject.java b/src/main/java/cuchaz/enigma/EnigmaProject.java
index a589c63..47a3790 100644
--- a/src/main/java/cuchaz/enigma/EnigmaProject.java
+++ b/src/main/java/cuchaz/enigma/EnigmaProject.java
@@ -144,11 +144,8 @@ public class EnigmaProject {
144 public JarExport exportRemappedJar(ProgressListener progress) { 144 public JarExport exportRemappedJar(ProgressListener progress) {
145 Collection<ClassEntry> classEntries = jarIndex.getEntryIndex().getClasses(); 145 Collection<ClassEntry> classEntries = jarIndex.getEntryIndex().getClasses();
146 146
147 Translator deobfuscator = getEnigma() 147 NameProposalService[] nameProposalServices = getEnigma().getServices().get(NameProposalService.TYPE).toArray(new NameProposalService[0]);
148 .getServices() 148 Translator deobfuscator = nameProposalServices.length == 0 ? mapper.getDeobfuscator() : new ProposingTranslator(mapper, nameProposalServices);
149 .get(NameProposalService.TYPE)
150 .map(nameProposalService -> (Translator) new ProposingTranslator(mapper, nameProposalService))
151 .orElse(mapper.getDeobfuscator());
152 149
153 AtomicInteger count = new AtomicInteger(); 150 AtomicInteger count = new AtomicInteger();
154 progress.init(classEntries.size(), "Deobfuscating classes..."); 151 progress.init(classEntries.size(), "Deobfuscating classes...");