2 files changed, 32 insertions, 0 deletions

diff --git a/src/cuchaz/enigma/bytecode/ClassTranslator.java b/src/cuchaz/enigma/bytecode/ClassTranslator.java
index 7952577b..32518d9c 100644
--- a/src/cuchaz/enigma/bytecode/ClassTranslator.java
+++ b/src/cuchaz/enigma/bytecode/ClassTranslator.java
@@ -16,6 +16,7 @@ import javassist.CtField;
 import javassist.CtMethod;
 import javassist.bytecode.ConstPool;
 import javassist.bytecode.Descriptor;
+import javassist.bytecode.EnclosingMethodAttribute;
 import javassist.bytecode.SourceFileAttribute;
 import cuchaz.enigma.mapping.BehaviorEntry;
 import cuchaz.enigma.mapping.ClassEntry;
@@ -115,6 +116,33 @@ public class ClassTranslator {
                         }
                 }
                 
+                // translate the EnclosingMethod attribute
+                EnclosingMethodAttribute enclosingMethodAttr = (EnclosingMethodAttribute)c.getClassFile().getAttribute(EnclosingMethodAttribute.tag);
+                if (enclosingMethodAttr != null) {
+                        
+                        if (enclosingMethodAttr.methodIndex() == 0) {
+                                BehaviorEntry obfBehaviorEntry = EntryFactory.getBehaviorEntry(Descriptor.toJvmName(enclosingMethodAttr.className()));
+                                BehaviorEntry deobfBehaviorEntry = m_translator.translateEntry(obfBehaviorEntry);
+                                c.getClassFile().addAttribute(new EnclosingMethodAttribute(
+                                        constants,
+                                        deobfBehaviorEntry.getClassName()
+                                ));
+                        } else {
+                                BehaviorEntry obfBehaviorEntry = EntryFactory.getBehaviorEntry(
+                                        Descriptor.toJvmName(enclosingMethodAttr.className()),
+                                        enclosingMethodAttr.methodName(),
+                                        enclosingMethodAttr.methodDescriptor()
+                                );
+                                BehaviorEntry deobfBehaviorEntry = m_translator.translateEntry(obfBehaviorEntry);
+                                c.getClassFile().addAttribute(new EnclosingMethodAttribute(
+                                        constants,
+                                        deobfBehaviorEntry.getClassName(),
+                                        deobfBehaviorEntry.getName(),
+                                        deobfBehaviorEntry.getSignature().toString()
+                                ));
+                        }
+                }
+                
                 // translate all the class names referenced in the code
                 // the above code only changed method/field/reference names and types, but not the rest of the class references
                 ClassRenamer.renameClasses(c, m_translator);
diff --git a/src/cuchaz/enigma/mapping/EntryFactory.java b/src/cuchaz/enigma/mapping/EntryFactory.java
index 4898e6de..69c1630f 100644
--- a/src/cuchaz/enigma/mapping/EntryFactory.java
+++ b/src/cuchaz/enigma/mapping/EntryFactory.java
@@ -156,6 +156,10 @@ public class EntryFactory {
                 return getBehaviorEntry(new ClassEntry(className), behaviorName);
         }
         
+        public static BehaviorEntry getBehaviorEntry(String className) {
+                return new ConstructorEntry(new ClassEntry(className));
+        }
+        
         public static BehaviorEntry getBehaviorEntry(ClassEntry classEntry, String behaviorName, Signature behaviorSignature) {
                 if (behaviorName.equals("<init>")) {
                         return new ConstructorEntry(classEntry, behaviorSignature);