From 4ceb8d490058e48df666bf7227ce020e60928be5 Mon Sep 17 00:00:00 2001
From: jeff
Date: Sun, 8 Mar 2015 20:48:30 -0400
Subject: more tweaks, improvements, and bug fixes

---
 src/cuchaz/enigma/mapping/ClassMapping.java | 11 +++++++++++
 1 file changed, 11 insertions(+)

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

diff --git a/src/cuchaz/enigma/mapping/ClassMapping.java b/src/cuchaz/enigma/mapping/ClassMapping.java
index 3610e33..43605e5 100644
--- a/src/cuchaz/enigma/mapping/ClassMapping.java
+++ b/src/cuchaz/enigma/mapping/ClassMapping.java
@@ -393,6 +393,17 @@ public class ClassMapping implements Serializable, Comparable<ClassMapping> {
 			}
 		}
 		
+		// rename field types
+		for (FieldMapping fieldMapping : new ArrayList<FieldMapping>(m_fieldsByObf.values())) {
+			String oldFieldKey = getFieldKey(fieldMapping.getObfName(), fieldMapping.getObfType());
+			if (fieldMapping.renameObfClass(oldObfClassName, newObfClassName)) {
+				boolean wasRemoved = m_fieldsByObf.remove(oldFieldKey) != null;
+				assert (wasRemoved);
+				boolean wasAdded = m_fieldsByObf.put(getFieldKey(fieldMapping.getObfName(), fieldMapping.getObfType()), fieldMapping) == null;
+				assert (wasAdded);
+			}
+		}
+		
 		// rename method signatures
 		for (MethodMapping methodMapping : new ArrayList<MethodMapping>(m_methodsByObf.values())) {
 			String oldMethodKey = getMethodKey(methodMapping.getObfName(), methodMapping.getObfSignature());
-- 
cgit v1.2.3