diff --git a/src/main/java/net/runelite/deob/execution/ParallellMappingExecutor.java b/src/main/java/net/runelite/deob/execution/ParallellMappingExecutor.java index 7e8cafd653..e78d7e776d 100644 --- a/src/main/java/net/runelite/deob/execution/ParallellMappingExecutor.java +++ b/src/main/java/net/runelite/deob/execution/ParallellMappingExecutor.java @@ -21,7 +21,8 @@ public class ParallellMappingExecutor boolean step1 = true, step2 = true; public boolean step() { - assert e.frames.size() == e2.frames.size(); + // this no longer holds with recursive stepinfo + //assert e.frames.size() == e2.frames.size(); p1 = p2 = null; diff --git a/src/test/java/net/runelite/deob/deobfuscators/rename/MapStaticTest.java b/src/test/java/net/runelite/deob/deobfuscators/rename/MapStaticTest.java index 1ff2667e49..19dd506aba 100644 --- a/src/test/java/net/runelite/deob/deobfuscators/rename/MapStaticTest.java +++ b/src/test/java/net/runelite/deob/deobfuscators/rename/MapStaticTest.java @@ -34,7 +34,7 @@ public class MapStaticTest { "client.init", "client.init" }, { "class162.method3270", "class86.method2020" }, { "class29.method711", "class36.method742" }, - //{ "class72.run", "class72.run" }, + { "class72.run", "class72.run" }, }; // @Test @@ -56,7 +56,7 @@ public class MapStaticTest // } // } - //@Test + @Test public void testAll() throws IOException { ClassGroup group1 = JarUtil.loadJar(new File("d:/rs/07/adamin1.jar")); @@ -79,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("client").findMethod("vmethod3054"); - Method m2 = group2.findClass("client").findMethod("vmethod2973"); + Method m1 = group1.findClass("client").findMethod("init"); + Method m2 = group2.findClass("client").findMethod("init"); ParallelExecutorMapping mappings = MappingExecutorUtil.map(m1, m2);