summaryrefslogtreecommitdiff
path: root/src/cuchaz/enigma/Deobfuscator.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/cuchaz/enigma/Deobfuscator.java')
-rw-r--r--src/cuchaz/enigma/Deobfuscator.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cuchaz/enigma/Deobfuscator.java b/src/cuchaz/enigma/Deobfuscator.java
index 679518a..2305722 100644
--- a/src/cuchaz/enigma/Deobfuscator.java
+++ b/src/cuchaz/enigma/Deobfuscator.java
@@ -144,7 +144,7 @@ public class Deobfuscator {
144 // fields 144 // fields
145 for (FieldMapping fieldMapping : Lists.newArrayList(classMapping.fields())) { 145 for (FieldMapping fieldMapping : Lists.newArrayList(classMapping.fields())) {
146 FieldEntry fieldEntry = new FieldEntry(obfClassEntry, fieldMapping.getObfName()); 146 FieldEntry fieldEntry = new FieldEntry(obfClassEntry, fieldMapping.getObfName());
147 ClassEntry resolvedObfClassEntry = m_jarIndex.resolveEntryClass(fieldEntry); 147 ClassEntry resolvedObfClassEntry = m_jarIndex.getTranslationIndex().resolveEntryClass(fieldEntry);
148 if (resolvedObfClassEntry != null && !resolvedObfClassEntry.equals(fieldEntry.getClassEntry())) { 148 if (resolvedObfClassEntry != null && !resolvedObfClassEntry.equals(fieldEntry.getClassEntry())) {
149 boolean wasMoved = renamer.moveFieldToObfClass(classMapping, fieldMapping, resolvedObfClassEntry); 149 boolean wasMoved = renamer.moveFieldToObfClass(classMapping, fieldMapping, resolvedObfClassEntry);
150 if (wasMoved) { 150 if (wasMoved) {
@@ -167,7 +167,7 @@ public class Deobfuscator {
167 methodMapping.getObfName(), 167 methodMapping.getObfName(),
168 methodMapping.getObfSignature() 168 methodMapping.getObfSignature()
169 ); 169 );
170 ClassEntry resolvedObfClassEntry = m_jarIndex.resolveEntryClass(methodEntry); 170 ClassEntry resolvedObfClassEntry = m_jarIndex.getTranslationIndex().resolveEntryClass(methodEntry);
171 if (resolvedObfClassEntry != null && !resolvedObfClassEntry.equals(methodEntry.getClassEntry())) { 171 if (resolvedObfClassEntry != null && !resolvedObfClassEntry.equals(methodEntry.getClassEntry())) {
172 boolean wasMoved = renamer.moveMethodToObfClass(classMapping, methodMapping, resolvedObfClassEntry); 172 boolean wasMoved = renamer.moveMethodToObfClass(classMapping, methodMapping, resolvedObfClassEntry);
173 if (wasMoved) { 173 if (wasMoved) {
@@ -233,7 +233,7 @@ public class Deobfuscator {
233 public Translator getTranslator(TranslationDirection direction) { 233 public Translator getTranslator(TranslationDirection direction) {
234 Translator translator = m_translatorCache.get(direction); 234 Translator translator = m_translatorCache.get(direction);
235 if (translator == null) { 235 if (translator == null) {
236 translator = m_mappings.getTranslator(direction); 236 translator = m_mappings.getTranslator(direction, m_jarIndex.getTranslationIndex());
237 m_translatorCache.put(direction, translator); 237 m_translatorCache.put(direction, translator);
238 } 238 }
239 return translator; 239 return translator;
@@ -311,7 +311,7 @@ public class Deobfuscator {
311 Entry obfEntry = obfuscateEntry(deobfReference.entry); 311 Entry obfEntry = obfuscateEntry(deobfReference.entry);
312 312
313 // try to resolve the class 313 // try to resolve the class
314 ClassEntry resolvedObfClassEntry = m_jarIndex.resolveEntryClass(obfEntry); 314 ClassEntry resolvedObfClassEntry = m_jarIndex.getTranslationIndex().resolveEntryClass(obfEntry);
315 if (resolvedObfClassEntry != null && !resolvedObfClassEntry.equals(obfEntry.getClassEntry())) { 315 if (resolvedObfClassEntry != null && !resolvedObfClassEntry.equals(obfEntry.getClassEntry())) {
316 // change the class of the entry 316 // change the class of the entry
317 obfEntry = obfEntry.cloneToNewClass(resolvedObfClassEntry); 317 obfEntry = obfEntry.cloneToNewClass(resolvedObfClassEntry);