From 4dbf0ef6561e8b5d591281ae82ee9a94766e99a7 Mon Sep 17 00:00:00 2001
From: lclc98
Date: Sat, 2 Jul 2016 22:05:28 +1000
Subject: Fixed build.gradle

---
 build.gradle                                       |  2 +-
 .../java/cuchaz/enigma/mapping/EntryFactory.java   | 25 +++++-----------------
 .../java/cuchaz/enigma/mapping/MethodMapping.java  | 17 ---------------
 3 files changed, 6 insertions(+), 38 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6c621f69..2332c815 100644
--- a/build.gradle
+++ b/build.gradle
@@ -61,7 +61,7 @@ configurations {
 dependencies {
     compile 'com.google.guava:guava:17.+'
     compile 'org.javassist:javassist:3.+'
-    compile 'org.bitbucket.mstrobel:procyon-compilertools:0.5.32'
+    compile 'org.bitbucket.mstrobel:procyon-decompiler:0.5.28-enigma'
     compile 'org.javassist:javassist:3.20.0-GA'
 
     compile 'com.google.code.gson:gson:2.3.1'
diff --git a/src/main/java/cuchaz/enigma/mapping/EntryFactory.java b/src/main/java/cuchaz/enigma/mapping/EntryFactory.java
index 0ac739c1..3584ebbf 100644
--- a/src/main/java/cuchaz/enigma/mapping/EntryFactory.java
+++ b/src/main/java/cuchaz/enigma/mapping/EntryFactory.java
@@ -74,38 +74,23 @@ public class EntryFactory {
     }
 
     public static MethodEntry getMethodEntry(MethodCall call) {
-        return new MethodEntry(
-                new ClassEntry(Descriptor.toJvmName(call.getClassName())),
-                call.getMethodName(),
-                new Signature(call.getSignature())
-        );
+        return new MethodEntry(new ClassEntry(Descriptor.toJvmName(call.getClassName())), call.getMethodName(), new Signature(call.getSignature()));
     }
 
     public static ConstructorEntry getConstructorEntry(CtConstructor constructor) {
         if (constructor.isClassInitializer()) {
-            return new ConstructorEntry(
-                    getClassEntry(constructor.getDeclaringClass())
-            );
+            return new ConstructorEntry(getClassEntry(constructor.getDeclaringClass()));
         } else {
-            return new ConstructorEntry(
-                    getClassEntry(constructor.getDeclaringClass()),
-                    new Signature(constructor.getMethodInfo().getDescriptor())
-            );
+            return new ConstructorEntry(getClassEntry(constructor.getDeclaringClass()), new Signature(constructor.getMethodInfo().getDescriptor()));
         }
     }
 
     public static ConstructorEntry getConstructorEntry(ConstructorCall call) {
-        return new ConstructorEntry(
-                new ClassEntry(Descriptor.toJvmName(call.getClassName())),
-                new Signature(call.getSignature())
-        );
+        return new ConstructorEntry(new ClassEntry(Descriptor.toJvmName(call.getClassName())), new Signature(call.getSignature()));
     }
 
     public static ConstructorEntry getConstructorEntry(NewExpr call) {
-        return new ConstructorEntry(
-                new ClassEntry(Descriptor.toJvmName(call.getClassName())),
-                new Signature(call.getSignature())
-        );
+        return new ConstructorEntry(new ClassEntry(Descriptor.toJvmName(call.getClassName())), new Signature(call.getSignature()));
     }
 
     public static BehaviorEntry getBehaviorEntry(CtBehavior behavior) {
diff --git a/src/main/java/cuchaz/enigma/mapping/MethodMapping.java b/src/main/java/cuchaz/enigma/mapping/MethodMapping.java
index ff14ccd3..fbd97bd1 100644
--- a/src/main/java/cuchaz/enigma/mapping/MethodMapping.java
+++ b/src/main/java/cuchaz/enigma/mapping/MethodMapping.java
@@ -151,23 +151,6 @@ public class MethodMapping implements Serializable, Comparable<MethodMapping>, M
         return (this.m_obfName + this.m_obfSignature).compareTo(other.m_obfName + other.m_obfSignature);
     }
 
-    public boolean renameObfClass(final String oldObfClassName, final String newObfClassName) {
-
-        // rename obf classes in the signature
-        Signature newSignature = new Signature(this.m_obfSignature, className -> {
-            if (className.equals(oldObfClassName)) {
-                return newObfClassName;
-            }
-            return null;
-        });
-
-        if (!newSignature.equals(this.m_obfSignature)) {
-            this.m_obfSignature = newSignature;
-            return true;
-        }
-        return false;
-    }
-
     public boolean containsArgument(String name) {
         for (ArgumentMapping argumentMapping : this.m_arguments.values()) {
             if (argumentMapping.getName().equals(name)) {
-- 
cgit v1.2.3