Merge pull request #135 from gegy1000/proposal-tweak

Plugin rework

9 files changed, 91 insertions, 15 deletions

diff --git a/src/main/java/cuchaz/enigma/api/EnigmaPlugin.java b/src/main/java/cuchaz/enigma/api/EnigmaPlugin.java
index 3efe0dc..bdd6015 100644
--- a/src/main/java/cuchaz/enigma/api/EnigmaPlugin.java
+++ b/src/main/java/cuchaz/enigma/api/EnigmaPlugin.java
@@ -1,18 +1,5 @@
 package cuchaz.enigma.api;
 
-import org.objectweb.asm.tree.ClassNode;
-
-import javax.annotation.Nullable;
-import java.util.Map;
-import java.util.function.Function;
-
-public abstract class EnigmaPlugin {
-    public void onClassesLoaded(Map<String, byte[]> classData, Function<String, ClassNode> classNodeGetter) {
-
-    }
-
-    @Nullable
-    public String proposeFieldName(String owner, String name, String desc) {
-        return null;
-    }
+public interface EnigmaPlugin {
+        void init(EnigmaPluginContext ctx);
 }
diff --git a/src/main/java/cuchaz/enigma/api/EnigmaPluginContext.java b/src/main/java/cuchaz/enigma/api/EnigmaPluginContext.java
new file mode 100644
index 0000000..a59051a
--- /dev/null
+++ b/src/main/java/cuchaz/enigma/api/EnigmaPluginContext.java
@@ -0,0 +1,9 @@
+package cuchaz.enigma.api;
+
+import cuchaz.enigma.api.service.EnigmaService;
+import cuchaz.enigma.api.service.EnigmaServiceFactory;
+import cuchaz.enigma.api.service.EnigmaServiceType;
+
+public interface EnigmaPluginContext {
+        <T extends EnigmaService> void registerService(String id, EnigmaServiceType<T> serviceType, EnigmaServiceFactory<T> factory);
+}
diff --git a/src/main/java/cuchaz/enigma/api/service/EnigmaService.java b/src/main/java/cuchaz/enigma/api/service/EnigmaService.java
new file mode 100644
index 0000000..526dda7
--- /dev/null
+++ b/src/main/java/cuchaz/enigma/api/service/EnigmaService.java
@@ -0,0 +1,4 @@
+package cuchaz.enigma.api.service;
+
+public interface EnigmaService {
+}
diff --git a/src/main/java/cuchaz/enigma/api/service/EnigmaServiceContext.java b/src/main/java/cuchaz/enigma/api/service/EnigmaServiceContext.java
new file mode 100644
index 0000000..9e433fb
--- /dev/null
+++ b/src/main/java/cuchaz/enigma/api/service/EnigmaServiceContext.java
@@ -0,0 +1,11 @@
+package cuchaz.enigma.api.service;
+
+import java.util.Optional;
+
+public interface EnigmaServiceContext<T extends EnigmaService> {
+        static <T extends EnigmaService> EnigmaServiceContext<T> empty() {
+                return key -> Optional.empty();
+        }
+
+        Optional<String> getArgument(String key);
+}
diff --git a/src/main/java/cuchaz/enigma/api/service/EnigmaServiceFactory.java b/src/main/java/cuchaz/enigma/api/service/EnigmaServiceFactory.java
new file mode 100644
index 0000000..7c10ac2
--- /dev/null
+++ b/src/main/java/cuchaz/enigma/api/service/EnigmaServiceFactory.java
@@ -0,0 +1,5 @@
+package cuchaz.enigma.api.service;
+
+public interface EnigmaServiceFactory<T extends EnigmaService> {
+        T create(EnigmaServiceContext<T> ctx);
+}
diff --git a/src/main/java/cuchaz/enigma/api/service/EnigmaServiceType.java b/src/main/java/cuchaz/enigma/api/service/EnigmaServiceType.java
new file mode 100644
index 0000000..358828f
--- /dev/null
+++ b/src/main/java/cuchaz/enigma/api/service/EnigmaServiceType.java
@@ -0,0 +1,29 @@
+package cuchaz.enigma.api.service;
+
+public final class EnigmaServiceType<T extends EnigmaService> {
+        public final String key;
+
+        private EnigmaServiceType(String key) {
+                this.key = key;
+        }
+
+        public static <T extends EnigmaService> EnigmaServiceType<T> create(String key) {
+                return new EnigmaServiceType<>(key);
+        }
+
+        @Override
+        public int hashCode() {
+                return key.hashCode();
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+                if (obj == this) return true;
+
+                if (obj instanceof EnigmaServiceType) {
+                        return ((EnigmaServiceType) obj).key.equals(key);
+                }
+
+                return false;
+        }
+}
diff --git a/src/main/java/cuchaz/enigma/api/service/JarIndexerService.java b/src/main/java/cuchaz/enigma/api/service/JarIndexerService.java
new file mode 100644
index 0000000..0cda199
--- /dev/null
+++ b/src/main/java/cuchaz/enigma/api/service/JarIndexerService.java
@@ -0,0 +1,10 @@
+package cuchaz.enigma.api.service;
+
+import cuchaz.enigma.analysis.ClassCache;
+import cuchaz.enigma.analysis.index.JarIndex;
+
+public interface JarIndexerService extends EnigmaService {
+        EnigmaServiceType<JarIndexerService> TYPE = EnigmaServiceType.create("jar_indexer");
+
+        void acceptJar(ClassCache classCache, JarIndex jarIndex);
+}
diff --git a/src/main/java/cuchaz/enigma/api/service/NameProposalService.java b/src/main/java/cuchaz/enigma/api/service/NameProposalService.java
new file mode 100644
index 0000000..4c357db
--- /dev/null
+++ b/src/main/java/cuchaz/enigma/api/service/NameProposalService.java
@@ -0,0 +1,12 @@
+package cuchaz.enigma.api.service;
+
+import cuchaz.enigma.translation.mapping.EntryRemapper;
+import cuchaz.enigma.translation.representation.entry.Entry;
+
+import java.util.Optional;
+
+public interface NameProposalService extends EnigmaService {
+        EnigmaServiceType<NameProposalService> TYPE = EnigmaServiceType.create("name_proposal");
+
+        Optional<String> proposeName(Entry<?> obfEntry, EntryRemapper remapper);
+}
diff --git a/src/main/java/cuchaz/enigma/api/service/ObfuscationTestService.java b/src/main/java/cuchaz/enigma/api/service/ObfuscationTestService.java
new file mode 100644
index 0000000..af0cf30
--- /dev/null
+++ b/src/main/java/cuchaz/enigma/api/service/ObfuscationTestService.java
@@ -0,0 +1,9 @@
+package cuchaz.enigma.api.service;
+
+import cuchaz.enigma.translation.representation.entry.Entry;
+
+public interface ObfuscationTestService extends EnigmaService {
+        EnigmaServiceType<ObfuscationTestService> TYPE = EnigmaServiceType.create("obfuscation_test");
+
+        boolean testDeobfuscated(Entry<?> entry);
+}