1 files changed, 20 insertions, 0 deletions

diff --git a/src/main/java/cuchaz/enigma/mapping/EntryFactory.java b/src/main/java/cuchaz/enigma/mapping/EntryFactory.java
index 2351dcfb..ce4b948a 100644
--- a/src/main/java/cuchaz/enigma/mapping/EntryFactory.java
+++ b/src/main/java/cuchaz/enigma/mapping/EntryFactory.java
@@ -33,6 +33,10 @@ public class EntryFactory {
         return new ClassEntry(classMapping.getObfFullName());
     }
 
+    public static ClassEntry getDeobfClassEntry(ClassMapping classMapping) {
+        return new ClassEntry(classMapping.getDeobfName());
+    }
+
     public static ClassEntry getSuperclassEntry(CtClass c) {
         return new ClassEntry(Descriptor.toJvmName(c.getClassFile().getSuperclass()));
     }
@@ -90,6 +94,10 @@ public class EntryFactory {
         return getBehaviorEntry(new ClassEntry(className), behaviorName, new Signature(behaviorSignature));
     }
 
+    public static BehaviorEntry getBehaviorEntry(String className, String behaviorName) {
+        return getBehaviorEntry(new ClassEntry(className), behaviorName);
+    }
+
     public static BehaviorEntry getBehaviorEntry(String className) {
         return new ConstructorEntry(new ClassEntry(className));
     }
@@ -105,7 +113,19 @@ public class EntryFactory {
         }
     }
 
+    public static BehaviorEntry getBehaviorEntry(ClassEntry classEntry, String behaviorName) {
+        if(behaviorName.equals("<clinit>")) {
+            return new ConstructorEntry(classEntry);
+        } else {
+            throw new IllegalArgumentException("Only class initializers don't have signatures");
+        }
+    }
+
     public static BehaviorEntry getObfBehaviorEntry(ClassEntry classEntry, MethodMapping methodMapping) {
         return getBehaviorEntry(classEntry, methodMapping.getObfName(), methodMapping.getObfSignature());
     }
+
+    public static BehaviorEntry getObfBehaviorEntry(ClassMapping classMapping, MethodMapping methodMapping) {
+        return getObfBehaviorEntry(getObfClassEntry(classMapping), methodMapping);
+    }
 }