ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

arraystore: map values field

Browse Source
This commit is contained in:
Adam
2016-03-18 20:41:52 -04:00
parent 39e2c0420f
commit 5a0c8ee21d
6 changed files with 76 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/java/net/runelite/deob/deobfuscators/rename/AnnotationMapperTest.java
View File

@@ -9,8 +9,8 @@ import org.junit.Test;
public class AnnotationMapperTest
{
private static final String JAR1 = "C:\\Users\\Adam\\.m2\\repository\\net\\runelite\\rs\\rs-client\\1.0-SNAPSHOT\\rs-client-1.0-SNAPSHOT.jar",
JAR2 = "c:/rs/gamepack_v18_deobbed.jar",
OUT = "c:/rs/adamout.jar";
JAR2 = "d:/rs/07/gamepack_v18_deobbed.jar",
OUT = "d:/rs/07/adamout.jar";
@Test
public void testRun() throws IOException

16
src/test/java/net/runelite/deob/deobfuscators/rename/MapStaticTest.java
View File

@@ -614,20 +614,22 @@ public class MapStaticTest
@Test
public void testPacket() throws IOException
{
String JAR1 = "C:\\Users\\Adam\\.m2\\repository\\net\\runelite\\rs\\rs-client\\1.0-SNAPSHOT\\rs-client-1.0-SNAPSHOT.jar",
JAR2 = "d:/rs/07/gamepack_v18_deobbed.jar";
ClassGroup group1 = JarUtil.loadJar(new File(JAR1));
ClassGroup group2 = JarUtil.loadJar(new File(JAR2));
group1.findClass("client").findField("field446").packetHandler = true;
group2.findClass("client").findField("field324").packetHandler = true;
group1.findClass("client").findField("field333").packetHandler = true;
group2.findClass("client").findField("field488").packetHandler = true;
Method m1 = group1.findClass("client").findMethod("vmethod3096");
Method m2 = group2.findClass("client").findMethod("vmethod2975");
Method m1 = group1.findClass("client").findMethod("vmethod2968");
Method m2 = group2.findClass("client").findMethod("vmethod3044");
ParallelExecutorMapping mappings = MappingExecutorUtil.map(m1, m2);
// var55 = class17.method214(); vs var107 = class25.field625[++class25.field624 - 1];
PacketHandler h1 = mappings.findPacketHandler1(127);
PacketHandler h2 = mappings.findPacketHandler2(160);
PacketHandler h1 = mappings.findPacketHandler1(9);
PacketHandler h2 = mappings.findPacketHandler2(25);
ParallelExecutorMapping mapping = MappingExecutorUtil.mapFrame(group1, group2, h1.getFirstInsOfHandler(), h2.getFirstInsOfHandler());

74
src/test/java/net/runelite/deob/deobfuscators/rename/MapperTest.java
View File

@@ -1,37 +1,37 @@
package net.runelite.deob.deobfuscators.rename;
import java.io.File;
import java.io.IOException;
import net.runelite.deob.ClassGroup;
import static net.runelite.deob.deobfuscators.rename.MapStaticTest.print;
import static net.runelite.deob.deobfuscators.rename.MapStaticTest.summary;
import net.runelite.deob.util.JarUtil;
import org.junit.Test;
// Compares two deobfuscated versions of the client
public class MapperTest
{
private static final String JAR1 = "C:\\Users\\Adam\\.m2\\repository\\net\\runelite\\rs\\rs-client\\1.0-SNAPSHOT\\rs-client-1.0-SNAPSHOT.jar",//"d:/rs/07/gamepack_v16_deobbed.jar",
JAR2 = MapperTest.class.getResource("/gamepack_v16_deobbed.jar").getFile();
// private static final String JAR1 = MapStaticTest.class.getResource("/adamin1.jar").getFile(),
// JAR2 = MapStaticTest.class.getResource("/adamin2.jar").getFile();
@Test
public void testRun() throws IOException
{
ClassGroup group1 = JarUtil.loadJar(new File(JAR1));
ClassGroup group2 = JarUtil.loadJar(new File(JAR2));
Mapper mapper = new Mapper(group1, group2);
mapper.run();
ParallelExecutorMapping mapping = mapper.getMapping();
summary(mapping, group1);
String sg1 = print(group1),
sg2 = print(group2);
System.out.println("GROUP 1 " + sg1);
System.out.println("GROUP 2 " + sg2);
}
}
package net.runelite.deob.deobfuscators.rename;
import java.io.File;
import java.io.IOException;
import net.runelite.deob.ClassGroup;
import static net.runelite.deob.deobfuscators.rename.MapStaticTest.print;
import static net.runelite.deob.deobfuscators.rename.MapStaticTest.summary;
import net.runelite.deob.util.JarUtil;
import org.junit.Test;
// Compares two deobfuscated versions of the client
public class MapperTest
{
private static final String JAR1 = "C:\\Users\\Adam\\.m2\\repository\\net\\runelite\\rs\\rs-client\\1.0-SNAPSHOT\\rs-client-1.0-SNAPSHOT.jar",
JAR2 = "c:/rs/gamepack_v18_deobbed.jar";
// private static final String JAR1 = MapStaticTest.class.getResource("/adamin1.jar").getFile(),
// JAR2 = MapStaticTest.class.getResource("/adamin2.jar").getFile();
@Test
public void testRun() throws IOException
{
ClassGroup group1 = JarUtil.loadJar(new File(JAR1));
ClassGroup group2 = JarUtil.loadJar(new File(JAR2));
Mapper mapper = new Mapper(group1, group2);
mapper.run();
ParallelExecutorMapping mapping = mapper.getMapping();
summary(mapping, group1);
String sg1 = print(group1),
sg2 = print(group2);
System.out.println("GROUP 1 " + sg1);
System.out.println("GROUP 2 " + sg2);
}
}