From 2fbcf8e5c4eec0aa4a4fc59c7cc8abac33b1429c Mon Sep 17 00:00:00 2001
From: jeff
Date: Mon, 19 Jan 2015 22:22:57 -0500
Subject: solved tricky issue with incorrect translation of fields/methods
 referenced by a subclass instead of the declaring class

---
 src/cuchaz/enigma/mapping/Mappings.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/cuchaz/enigma/mapping/Mappings.java')

diff --git a/src/cuchaz/enigma/mapping/Mappings.java b/src/cuchaz/enigma/mapping/Mappings.java
index c5e38f4..cc560a8 100644
--- a/src/cuchaz/enigma/mapping/Mappings.java
+++ b/src/cuchaz/enigma/mapping/Mappings.java
@@ -24,6 +24,7 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 
 import cuchaz.enigma.Util;
+import cuchaz.enigma.analysis.TranslationIndex;
 import cuchaz.enigma.mapping.SignatureUpdater.ClassNameUpdater;
 
 public class Mappings implements Serializable {
@@ -104,11 +105,11 @@ public class Mappings implements Serializable {
 		return m_classesByDeobf.get(deobfName);
 	}
 	
-	public Translator getTranslator(TranslationDirection direction) {
+	public Translator getTranslator(TranslationDirection direction, TranslationIndex index) {
 		switch (direction) {
 			case Deobfuscating:
 				
-				return new Translator(direction, m_classesByObf);
+				return new Translator(direction, m_classesByObf, index);
 				
 			case Obfuscating:
 				
@@ -122,7 +123,11 @@ public class Mappings implements Serializable {
 					}
 				}
 				
-				return new Translator(direction, classes);
+				// translate the translation index
+				// NOTE: this isn't actually recursive
+				TranslationIndex deobfIndex = new TranslationIndex(index, getTranslator(TranslationDirection.Deobfuscating, index));
+				
+				return new Translator(direction, classes, deobfIndex);
 				
 			default:
 				throw new Error("Invalid translation direction!");
-- 
cgit v1.2.3