From 31a1a418b04cd3e7b06cb50cb8674a2c25079f6c Mon Sep 17 00:00:00 2001
From: jeff
Date: Sun, 8 Feb 2015 23:10:26 -0500
Subject: added types to fields

---
 src/cuchaz/enigma/mapping/MappingsRenamer.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/src/cuchaz/enigma/mapping/MappingsRenamer.java b/src/cuchaz/enigma/mapping/MappingsRenamer.java
index 0a41c2b..095e5e9 100644
--- a/src/cuchaz/enigma/mapping/MappingsRenamer.java
+++ b/src/cuchaz/enigma/mapping/MappingsRenamer.java
@@ -76,23 +76,23 @@ public class MappingsRenamer {
 	
 	public void setFieldName(FieldEntry obf, String deobfName) {
 		deobfName = NameValidator.validateFieldName(deobfName);
-		FieldEntry targetEntry = new FieldEntry(obf.getClassEntry(), deobfName);
-		if (m_mappings.containsDeobfField(obf.getClassEntry(), deobfName) || m_index.containsObfField(targetEntry)) {
+		FieldEntry targetEntry = new FieldEntry(obf.getClassEntry(), deobfName, obf.getType());
+		if (m_mappings.containsDeobfField(obf.getClassEntry(), deobfName, obf.getType()) || m_index.containsObfField(targetEntry)) {
 			throw new IllegalNameException(deobfName, "There is already a field with that name");
 		}
 		
 		ClassMapping classMapping = getOrCreateClassMappingOrInnerClassMapping(obf.getClassEntry());
-		classMapping.setFieldName(obf.getName(), deobfName);
+		classMapping.setFieldName(obf.getName(), obf.getType(), deobfName);
 	}
 	
 	public void removeFieldMapping(FieldEntry obf) {
 		ClassMapping classMapping = getClassMappingOrInnerClassMapping(obf.getClassEntry());
-		classMapping.setFieldName(obf.getName(), null);
+		classMapping.setFieldName(obf.getName(), obf.getType(), null);
 	}
 	
 	public void markFieldAsDeobfuscated(FieldEntry obf) {
 		ClassMapping classMapping = getOrCreateClassMappingOrInnerClassMapping(obf.getClassEntry());
-		classMapping.setFieldName(obf.getName(), obf.getName());
+		classMapping.setFieldName(obf.getName(), obf.getType(), obf.getName());
 	}
 	
 	public void setMethodTreeName(MethodEntry obf, String deobfName) {
@@ -171,8 +171,8 @@ public class MappingsRenamer {
 	public boolean moveFieldToObfClass(ClassMapping classMapping, FieldMapping fieldMapping, ClassEntry obfClass) {
 		classMapping.removeFieldMapping(fieldMapping);
 		ClassMapping targetClassMapping = getOrCreateClassMapping(obfClass);
-		if (!targetClassMapping.containsObfField(fieldMapping.getObfName())) {
-			if (!targetClassMapping.containsDeobfField(fieldMapping.getDeobfName())) {
+		if (!targetClassMapping.containsObfField(fieldMapping.getObfName(), fieldMapping.getObfType())) {
+			if (!targetClassMapping.containsDeobfField(fieldMapping.getDeobfName(), fieldMapping.getObfType())) {
 				targetClassMapping.addFieldMapping(fieldMapping);
 				return true;
 			} else {
-- 
cgit v1.2.3