Map classes too when mapping fields/methods

src/main/java/net/runelite/deob/deobfuscators/rename/ParallelExecutorMapping.java

@@ -7,10 +7,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import net.runelite.asm.ClassFile;
 import net.runelite.asm.ClassGroup;
 import net.runelite.asm.Field;
 import net.runelite.asm.Method;
-import net.runelite.asm.attributes.code.instructions.If;
 
 public class ParallelExecutorMapping
 {
@@ -80,14 +80,8 @@ public class ParallelExecutorMapping
 	
 	public void map(Object one, Object two)
 	{
-		if (one instanceof Field)
+		mapClass(one, two);
-		{
+
-			Field f= (Field) one;
-			if (f.getName().equals("field849"))
-			{
-				int i = 5;
-			}
-		}
 		Mapping m = getMapping(one, two);
 		
 		belongs(one, group);
@@ -96,10 +90,49 @@ public class ParallelExecutorMapping
 		m.inc();
 	}
 
+	private void mapClass(Object one, Object two)
+	{
+		ClassFile cf1, cf2;
+
+		if (one instanceof Field || two instanceof Field)
+		{
+			assert one instanceof Field;
+			assert two instanceof Field;
+
+			Field f1 = (Field) one;
+			Field f2 = (Field) two;
+
+			cf1 = f1.getFields().getClassFile();
+			cf2 = f2.getFields().getClassFile();
+		}
+		else if (one instanceof Method || two instanceof Method)
+		{
+			assert one instanceof Method;
+			assert two instanceof Method;
+
+			Method m1 = (Method) one;
+			Method m2 = (Method) two;
+
+			cf1 = m1.getMethods().getClassFile();
+			cf2 = m2.getMethods().getClassFile();
+		}
+		else
+		{
+			assert false;
+			return;
+		}
+
+		belongs(cf1, group);
+		belongs(cf2, group2);
+
+		Mapping m = getMapping(cf1, cf2);
+
+		m.inc();
+	}
+	
 	public Object get(Object o)
 	{
 		return highest(o);
-		//return map.get(o);
 	}
 	
 	public Map<Object, Object> getMap()
@@ -126,6 +159,11 @@ public class ParallelExecutorMapping
 			Method m = (Method) o;
 			assert m.getMethods().getClassFile().getGroup() == to;
 		}
+		else if (o instanceof ClassFile)
+		{
+			ClassFile c = (ClassFile) o;
+			assert c.getGroup() == to;
+		}
 		else
 			assert false;
 	}

src/test/java/net/runelite/deob/deobfuscators/rename/MapStaticTest.java

@@ -168,7 +168,7 @@ public class MapStaticTest
 	
 	public static void summary(ParallelExecutorMapping finalm, ClassGroup in)
 	{
-		int fields = 0, staticMethod = 0, method = 0, total = 0;
+		int fields = 0, staticMethod = 0, method = 0, total = 0, classes = 0;
 		for (Entry<Object, Object> e : finalm.getMap().entrySet())
 		{
 			//System.out.println(e.getKey() + " <-> " + e.getValue());
@@ -191,10 +191,12 @@ public class MapStaticTest
 				else
 					++method;
 			}
+			else if (o instanceof ClassFile)
+				++classes;
 
 			++total;
 		}
-		System.out.println("Total " + total + ". " + fields + " fields, " + staticMethod + " static methods, " + method + " methods");
+		System.out.println("Total " + total + ". " + fields + " fields, " + staticMethod + " static methods, " + method + " non-static methods, " + classes + " classes");
 	}
 	
 //	@Test
@@ -450,8 +452,8 @@ public class MapStaticTest
 			methods += cf.getMethods().getMethods().size();
 			fields += cf.getFields().getFields().size();
 		}
-		int total = methods + fields;
+		int total = methods + fields + classes;
-		return "total methods/fields: " + total + ", " + methods + " methods, " + fields + " fields";
+		return "total: " + total + ", " + methods + " methods, " + fields + " fields, " + classes + " classes";
 	}
 	
 //	@Test