4 files changed, 60 insertions, 22 deletions

diff --git a/src/main/java/cuchaz/enigma/Deobfuscator.java b/src/main/java/cuchaz/enigma/Deobfuscator.java
index f42b59f2..0c671589 100644
--- a/src/main/java/cuchaz/enigma/Deobfuscator.java
+++ b/src/main/java/cuchaz/enigma/Deobfuscator.java
@@ -38,7 +38,7 @@ import oml.ast.transformers.InvalidIdentifierFix;
 import oml.ast.transformers.Java8Generics;
 import oml.ast.transformers.ObfuscatedEnumSwitchRewriterTransform;
 import oml.ast.transformers.RemoveObjectCasts;
-import oml.ast.transformers.VaragsFixer;
+import oml.ast.transformers.VarargsFixer;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.ClassNode;
@@ -337,6 +337,21 @@ public class Deobfuscator {
                 }
         }
 
+        public boolean isMethodProvider(MethodEntry methodEntry) {
+                Set<ClassEntry> classEntries = new HashSet<>();
+                addAllPotentialAncestors(classEntries, methodEntry.getOwnerClassEntry());
+
+                for (ClassEntry parentEntry : classEntries) {
+                        MethodEntry ancestorMethodEntry = entryPool.getMethod(parentEntry, methodEntry.getName(), methodEntry.getDesc());
+                        if (jarIndex.containsObfMethod(ancestorMethodEntry)) {
+                                return false;
+                        }
+                }
+
+                return true;
+        }
+
+        @Deprecated
         public boolean isMethodProvider(ClassEntry classObfEntry, MethodEntry methodEntry) {
                 Set<ClassEntry> classEntries = new HashSet<>();
                 addAllPotentialAncestors(classEntries, classObfEntry);
@@ -379,10 +394,12 @@ public class Deobfuscator {
                                 Entry obfEntry = entry.getKey();
                                 String name = entry.getValue();
 
-                                try {
-                                        rename(obfEntry, name);
-                                } catch (IllegalNameException exception) {
-                                        System.out.println("WARNING: " + exception.getMessage());
+                                if (name != null) {
+                                        try {
+                                                rename(obfEntry, name);
+                                        } catch (IllegalNameException exception) {
+                                                System.out.println("WARNING: " + exception.getMessage());
+                                        }
                                 }
                         }
                 });
@@ -394,15 +411,15 @@ public class Deobfuscator {
                 for (MethodMapping methodMapping : Lists.newArrayList(classMapping.methods())) {
                         ClassEntry classObfEntry = classMapping.getObfEntry();
                         MethodEntry obfEntry = methodMapping.getObfEntry(classObfEntry);
+                        boolean isProvider = isMethodProvider(obfEntry);
 
-                        if (isMethodProvider(classObfEntry, obfEntry)) {
-                                if (hasDeobfuscatedName(obfEntry)
-                                                && !(methodMapping.getDeobfName().equals(methodMapping.getObfName()))) {
-                                        renameEntries.put(obfEntry, methodMapping.getDeobfName());
-                                }
+                        if (hasDeobfuscatedName(obfEntry)
+                                        && !(methodMapping.getDeobfName().equals(methodMapping.getObfName()))) {
+                                renameEntries.put(obfEntry, isProvider ? methodMapping.getDeobfName() : null);
+                        }
 
-                                ArrayList<LocalVariableMapping> arguments = Lists.newArrayList(methodMapping.arguments());
-                                for (LocalVariableMapping localVariableMapping : arguments) {
+                        if (isProvider) {
+                                for (LocalVariableMapping localVariableMapping : methodMapping.arguments()) {
                                         Entry argObfEntry = localVariableMapping.getObfEntry(obfEntry);
                                         if (hasDeobfuscatedName(argObfEntry)) {
                                                 renameEntries.put(argObfEntry, deobfuscateEntry(argObfEntry).getName());
@@ -675,12 +692,12 @@ public class Deobfuscator {
         public static void runCustomTransforms(AstBuilder builder, DecompilerContext context){
                 List<IAstTransform> transformers = Arrays.asList(
                                 new ObfuscatedEnumSwitchRewriterTransform(context),
-                                new VaragsFixer(context),
+                                new VarargsFixer(context),
                                 new RemoveObjectCasts(context),
                                 new Java8Generics(),
                                 new InvalidIdentifierFix()
                 );
-                for (IAstTransform transform : transformers){
+                for (IAstTransform transform : transformers) {
                         transform.run(builder.getCompilationUnit());
                 }
         }
diff --git a/src/main/java/cuchaz/enigma/analysis/JarIndex.java b/src/main/java/cuchaz/enigma/analysis/JarIndex.java
index 5917a32f..64ea7950 100644
--- a/src/main/java/cuchaz/enigma/analysis/JarIndex.java
+++ b/src/main/java/cuchaz/enigma/analysis/JarIndex.java
@@ -268,13 +268,34 @@ public class JarIndex {
         }
 
         public MethodInheritanceTreeNode getMethodInheritance(Translator deobfuscatingTranslator, MethodEntry obfMethodEntry) {
-
                 // travel to the ancestor implementation
+                LinkedList<ClassEntry> entries = new LinkedList<>();
+                entries.add(obfMethodEntry.getOwnerClassEntry());
+
+                // TODO: This could be optimized to not go through interfaces repeatedly...
+
                 ClassEntry baseImplementationClassEntry = obfMethodEntry.getOwnerClassEntry();
-                for (ClassEntry ancestorClassEntry : this.translationIndex.getAncestry(obfMethodEntry.getOwnerClassEntry())) {
+
+                for (ClassEntry itf : getInterfaces(obfMethodEntry.getOwnerClassEntry().getClassName())) {
+                        MethodEntry itfMethodEntry = entryPool.getMethod(itf, obfMethodEntry.getName(), obfMethodEntry.getDesc().toString());
+                        if (itfMethodEntry != null && containsObfMethod(itfMethodEntry)) {
+                                baseImplementationClassEntry = itf;
+                        }
+                }
+
+                for (ClassEntry ancestorClassEntry : this.translationIndex.getAncestry(entries.remove())) {
                         MethodEntry ancestorMethodEntry = entryPool.getMethod(ancestorClassEntry, obfMethodEntry.getName(), obfMethodEntry.getDesc().toString());
-                        if (ancestorMethodEntry != null && containsObfMethod(ancestorMethodEntry)) {
-                                baseImplementationClassEntry = ancestorClassEntry;
+                        if (ancestorMethodEntry != null) {
+                                if (containsObfMethod(ancestorMethodEntry)) {
+                                        baseImplementationClassEntry = ancestorClassEntry;
+                                }
+
+                                for (ClassEntry itf : getInterfaces(ancestorClassEntry.getClassName())) {
+                                        MethodEntry itfMethodEntry = entryPool.getMethod(itf, obfMethodEntry.getName(), obfMethodEntry.getDesc().toString());
+                                        if (itfMethodEntry != null && containsObfMethod(itfMethodEntry)) {
+                                                baseImplementationClassEntry = itf;
+                                        }
+                                }
                         }
                 }
 
diff --git a/src/main/java/cuchaz/enigma/config/Config.java b/src/main/java/cuchaz/enigma/config/Config.java
index 87ef3531..75ced70c 100644
--- a/src/main/java/cuchaz/enigma/config/Config.java
+++ b/src/main/java/cuchaz/enigma/config/Config.java
@@ -62,7 +62,7 @@ public class Config {
         public void loadConfig() throws IOException {
                 if (!ENIGMA_DIR.exists()) ENIGMA_DIR.mkdirs();
                 File configFile = new File(ENIGMA_DIR, "config.json");
-                if (configFile.exists()) gson.fromJson(Files.toString(configFile, Charset.defaultCharset()), Config.class);
+                if (configFile.exists()) gson.fromJson(Files.asCharSource(configFile, Charset.defaultCharset()).read(), Config.class);
                 else {
                         this.reset();
                         Files.touch(configFile);
@@ -71,7 +71,7 @@ public class Config {
         }
 
         public void saveConfig() throws IOException {
-                Files.write(gson.toJson(this), CONFIG_FILE, Charset.defaultCharset());
+                Files.asCharSink(CONFIG_FILE, Charset.defaultCharset()).write(gson.toJson(this));
         }
 
         public void reset() throws IOException {
diff --git a/src/main/java/oml/ast/transformers/VaragsFixer.java b/src/main/java/oml/ast/transformers/VarargsFixer.java
index cd711ae0..5810373d 100644
--- a/src/main/java/oml/ast/transformers/VaragsFixer.java
+++ b/src/main/java/oml/ast/transformers/VarargsFixer.java
@@ -32,10 +32,10 @@ import java.util.List;
 /**
  * Created by Thiakil on 12/07/2018.
  */
-public class VaragsFixer implements IAstTransform {
+public class VarargsFixer implements IAstTransform {
         private final DecompilerContext _context;
 
-        public VaragsFixer(final DecompilerContext context) {
+        public VarargsFixer(final DecompilerContext context) {
                 _context = VerifyArgument.notNull(context, "context");
         }