From 2b2249e873c4adfd2dd6e8f1f2489ccd9f6aa021 Mon Sep 17 00:00:00 2001 From: gegy1000 Date: Sat, 19 May 2018 17:02:46 +0200 Subject: Initial port to ASM --- src/main/java/cuchaz/enigma/mapping/MappingsChecker.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/main/java/cuchaz/enigma/mapping/MappingsChecker.java') diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsChecker.java b/src/main/java/cuchaz/enigma/mapping/MappingsChecker.java index 172641b..4d5be2f 100644 --- a/src/main/java/cuchaz/enigma/mapping/MappingsChecker.java +++ b/src/main/java/cuchaz/enigma/mapping/MappingsChecker.java @@ -23,7 +23,7 @@ public class MappingsChecker { private Map droppedClassMappings; private Map droppedInnerClassMappings; private Map droppedFieldMappings; - private Map droppedMethodMappings; + private Map droppedMethodMappings; public MappingsChecker(JarIndex index) { this.index = index; @@ -45,7 +45,7 @@ public class MappingsChecker { return this.droppedFieldMappings; } - public Map getDroppedMethodMappings() { + public Map getDroppedMethodMappings() { return this.droppedMethodMappings; } @@ -77,10 +77,10 @@ public class MappingsChecker { // check methods for (MethodMapping methodMapping : Lists.newArrayList(classMapping.methods())) { - BehaviorEntry obfBehaviorEntry = EntryFactory.getObfBehaviorEntry(classEntry, methodMapping); - if (!this.index.containsObfBehavior(obfBehaviorEntry)) { + MethodEntry obfMethodEntry = EntryFactory.getObfMethodEntry(classEntry, methodMapping); + if (!this.index.containsObfMethod(obfMethodEntry)) { classMapping.removeMethodMapping(methodMapping); - this.droppedMethodMappings.put(obfBehaviorEntry, methodMapping); + this.droppedMethodMappings.put(obfMethodEntry, methodMapping); } } -- cgit v1.2.3 From 406b9a89318473571d27de60b8aa1b51f84af245 Mon Sep 17 00:00:00 2001 From: gegy1000 Date: Sat, 19 May 2018 17:06:26 +0200 Subject: Package updates --- src/main/java/cuchaz/enigma/mapping/MappingsChecker.java | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/main/java/cuchaz/enigma/mapping/MappingsChecker.java') diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsChecker.java b/src/main/java/cuchaz/enigma/mapping/MappingsChecker.java index 4d5be2f..a42f255 100644 --- a/src/main/java/cuchaz/enigma/mapping/MappingsChecker.java +++ b/src/main/java/cuchaz/enigma/mapping/MappingsChecker.java @@ -14,6 +14,10 @@ package cuchaz.enigma.mapping; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import cuchaz.enigma.analysis.JarIndex; +import cuchaz.enigma.mapping.entry.ClassEntry; +import cuchaz.enigma.mapping.entry.EntryFactory; +import cuchaz.enigma.mapping.entry.FieldEntry; +import cuchaz.enigma.mapping.entry.MethodEntry; import java.util.Map; -- cgit v1.2.3