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>

1 files changed, 42 insertions, 32 deletions

diff --git a/src/main/java/cuchaz/enigma/ProposingTranslator.java b/src/main/java/cuchaz/enigma/ProposingTranslator.java
index 0807880..018fbfd 100644
--- a/src/main/java/cuchaz/enigma/ProposingTranslator.java
+++ b/src/main/java/cuchaz/enigma/ProposingTranslator.java
@@ -3,41 +3,51 @@ package cuchaz.enigma;
 import cuchaz.enigma.api.service.NameProposalService;
 import cuchaz.enigma.translation.Translatable;
 import cuchaz.enigma.translation.Translator;
-import cuchaz.enigma.translation.mapping.*;
+import cuchaz.enigma.translation.mapping.EntryRemapper;
+import cuchaz.enigma.translation.mapping.ResolutionStrategy;
 import cuchaz.enigma.translation.representation.entry.Entry;
 
+import java.util.Arrays;
 import java.util.Optional;
 
 public class ProposingTranslator implements Translator {
-    private final EntryRemapper mapper;
-    private final NameProposalService nameProposalService;
-
-    public ProposingTranslator(EntryRemapper mapper, NameProposalService nameProposalService) {
-        this.mapper = mapper;
-        this.nameProposalService = nameProposalService;
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public <T extends Translatable> T translate(T translatable) {
-        if (translatable == null) {
-            return null;
-        }
-
-        T deobfuscated = mapper.deobfuscate(translatable);
-
-        if (translatable instanceof Entry && ((Entry) deobfuscated).getName().equals(((Entry<?>) translatable).getName())) {
-            return mapper.getObfResolver()
-                    .resolveEntry((Entry<?>) translatable, ResolutionStrategy.RESOLVE_ROOT)
-                    .stream()
-                    .map(e1 -> nameProposalService.proposeName(e1, mapper))
-                    .filter(Optional::isPresent)
-                    .map(Optional::get)
-                    .findFirst()
-                    .map(newName -> (T) ((Entry) deobfuscated).withName(newName))
-                    .orElse(deobfuscated);
-        }
-
-        return deobfuscated;
-    }
+        private final EntryRemapper mapper;
+        private final NameProposalService[] nameProposalServices;
+
+        public ProposingTranslator(EntryRemapper mapper, NameProposalService[] nameProposalServices) {
+                this.mapper = mapper;
+                this.nameProposalServices = nameProposalServices;
+        }
+
+        @Override
+        @SuppressWarnings("unchecked")
+        public <T extends Translatable> T translate(T translatable) {
+                if (translatable == null) {
+                        return null;
+                }
+
+                T deobfuscated = mapper.deobfuscate(translatable);
+
+                if (translatable instanceof Entry && ((Entry) deobfuscated).getName().equals(((Entry<?>) translatable).getName())) {
+                        return mapper.getObfResolver()
+                                        .resolveEntry((Entry<?>) translatable, ResolutionStrategy.RESOLVE_ROOT)
+                                        .stream()
+                                        .map(this::proposeName)
+                                        .filter(Optional::isPresent)
+                                        .map(Optional::get)
+                                        .findFirst()
+                                        .map(newName -> (T) ((Entry) deobfuscated).withName(newName))
+                                        .orElse(deobfuscated);
+                }
+
+                return deobfuscated;
+        }
+
+        private Optional<String> proposeName(Entry<?> entry) {
+                return Arrays.stream(nameProposalServices)
+                                .map(service -> service.proposeName(entry, mapper))
+                                .filter(Optional::isPresent)
+                                .map(Optional::get)
+                                .findFirst();
+        }
 }