ifacmpeq vs ifacmpne, fix ordering methods on initial mappings

src/main/java/net/runelite/deob/attributes/code/instructions/IfACmpEq.java

@@ -2,6 +2,7 @@ package net.runelite.deob.attributes.code.instructions;
 
 import net.runelite.deob.attributes.code.InstructionType;
 import net.runelite.deob.attributes.code.Instructions;
+import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
 import net.runelite.deob.execution.InstructionContext;
 import net.runelite.deob.execution.StackContext;
 
@@ -32,7 +33,24 @@ public class IfACmpEq extends If
 				return true;
 			}
 		}
+		else if (otherIc.getInstruction() instanceof IfACmpNe)
+		{
+			return true;
+		}
 		
 		return false;
 	}
+	
+	@Override
+	public void map(ParallelExecutorMapping mapping, InstructionContext ctx, InstructionContext other)
+	{
+		if (other.getInstruction() instanceof IfACmpNe)
+		{
+			super.mapOtherBranch(mapping, ctx, other);
+		}
+		else
+		{
+			super.map(mapping, ctx, other);
+		}
+	}
 }

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

@@ -9,6 +9,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.stream.Collectors;
 import net.runelite.deob.ClassFile;
 import net.runelite.deob.ClassGroup;
 import net.runelite.deob.Deob;
@@ -33,6 +34,7 @@ public class MapStaticTest
 		{ "client.init", "client.init" },
 		{ "class162.method3270", "class86.method2020" },
 		{ "class29.method711", "class36.method742" },
+		{ "class72.run", "class72.run" },
 	};
 	
 //	@Test
@@ -77,8 +79,8 @@ public class MapStaticTest
 		ClassGroup group1 = JarUtil.loadJar(new File("d:/rs/07/adamin1.jar"));
 		ClassGroup group2 = JarUtil.loadJar(new File("d:/rs/07/adamin2.jar"));
 		
-		Method m1 = group1.findClass("class29").findMethod("method711");
+		Method m1 = group1.findClass("class72").findMethod("run");
-		Method m2 = group2.findClass("class36").findMethod("method742");
+		Method m2 = group2.findClass("class72").findMethod("run");
 		
 		ParallelExecutorMapping mappings = MappingExecutorUtil.map(m1, m2);
 		
@@ -127,6 +129,8 @@ public class MapStaticTest
 		
 		for (ClassFile cf : group.getClasses())
 		{
+			List<Method> cmethods = new ArrayList<>();
+			
 			for (Method m : cf.getMethods().getMethods())
 			{
 				if (!Deob.isObfuscated(m.getName()) && !m.getName().startsWith("<"))
@@ -137,9 +141,14 @@ public class MapStaticTest
 						continue;
 					}
 					
-					methods.add(m); // I guess this method name is overriding a jre interface (init, run, ?).
+					cmethods.add(m); // I guess this method name is overriding a jre interface (init, run, ?).
 				}
 			}
+			
+			// cmethods are scrambled randomally, so sort by name
+			cmethods = cmethods.stream().sorted((m1, m2) -> m1.getName().compareTo(m2.getName())).collect(Collectors.toList());
+			
+			methods.addAll(cmethods);
 		}
 		
 		return methods;