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

I don't know why this is failing

Browse Source
This commit is contained in:
Adam
2016-01-14 21:02:07 -05:00
parent 90d5f5ead0
commit 67d8bfed47
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/runelite/deob/ClassFile.java
View File

@@ -66,6 +66,12 @@ public class ClassFile
methods = new Methods(this); methods = new Methods(this);
attributes = new Attributes(this); attributes = new Attributes(this);
} }
@Override
public String toString()
{
return "ClassFile{" + "name=" + name + '}';
}
public void write(DataOutputStream out) throws IOException public void write(DataOutputStream out) throws IOException
{ {

8
src/main/java/net/runelite/deob/attributes/code/instructions/InvokeVirtual.java
View File

@@ -173,7 +173,13 @@ public class InvokeVirtual extends Instruction implements InvokeInstruction
assert myMethods.size() == otherMethods.size(); assert myMethods.size() == otherMethods.size();
for (int i = 0; i < myMethods.size(); ++i) for (int i = 0; i < myMethods.size(); ++i)
mapping.map(myMethods.get(i), otherMethods.get(i)); {
net.runelite.deob.Method m1 = myMethods.get(i), m2 = otherMethods.get(i);
assert m1.getMethods().getClassFile().getName().equals(m2.getMethods().getClassFile().getName());
mapping.map(m1, m2);
}
} }
@Override @Override

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

@@ -63,8 +63,8 @@ public class MapStaticTest
ClassGroup group1 = JarUtil.loadJar(new File("d:/rs/07/adamin1.jar")); ClassGroup group1 = JarUtil.loadJar(new File("d:/rs/07/adamin1.jar"));
ClassGroup group2 = JarUtil.loadJar(new File("d:/rs/07/adamin2.jar")); ClassGroup group2 = JarUtil.loadJar(new File("d:/rs/07/adamin2.jar"));
Method m1 = group1.findClass("class40").findMethod("method851"); Method m1 = group1.findClass("class55").findMethod("method1187");
Method m2 = group2.findClass("class40").findMethod("method803"); Method m2 = group2.findClass("class55").findMethod("method1140");
ParallelExecutorMapping mappings = MappingExecutorUtil.map(m1, m2); ParallelExecutorMapping mappings = MappingExecutorUtil.map(m1, m2);
} }