Map java/lang/reflect/Field and Method
This commit is contained in:
@@ -4,7 +4,6 @@ import net.runelite.asm.Field;
|
||||
import net.runelite.asm.attributes.code.Instruction;
|
||||
import net.runelite.asm.attributes.code.InstructionType;
|
||||
import net.runelite.asm.attributes.code.Instructions;
|
||||
import net.runelite.asm.attributes.code.instruction.types.ArrayLoad;
|
||||
import net.runelite.asm.attributes.code.instruction.types.ArrayStoreInstruction;
|
||||
import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction;
|
||||
import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil;
|
||||
|
||||
@@ -249,12 +249,6 @@ public class InvokeInterface extends Instruction implements InvokeInstruction
|
||||
List<net.runelite.asm.Method> thisMethods = thisIi.getMethods(),
|
||||
otherMethods = otherIi.getMethods();
|
||||
|
||||
if ((thisMethods != null) != (otherMethods != null))
|
||||
return false;
|
||||
|
||||
if (thisMethods == null || otherMethods == null)
|
||||
return true; // we don't map these anyway
|
||||
|
||||
if (thisMethods.size() != otherMethods.size())
|
||||
return false;
|
||||
|
||||
|
||||
@@ -250,12 +250,6 @@ public class InvokeSpecial extends Instruction implements InvokeInstruction
|
||||
List<net.runelite.asm.Method> thisMethods = thisIi.getMethods(),
|
||||
otherMethods = otherIi.getMethods();
|
||||
|
||||
if ((thisMethods != null) != (otherMethods != null))
|
||||
return false;
|
||||
|
||||
if (thisMethods == null || otherMethods == null)
|
||||
return true; // we don't map these anyway
|
||||
|
||||
if (thisMethods.size() != otherMethods.size())
|
||||
return false;
|
||||
|
||||
|
||||
@@ -19,7 +19,6 @@ import net.runelite.asm.signature.Signature;
|
||||
import java.io.DataInputStream;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import net.runelite.asm.Field;
|
||||
@@ -220,12 +219,6 @@ public class InvokeStatic extends Instruction implements InvokeInstruction
|
||||
List<net.runelite.asm.Method> thisMethods = thisIi.getMethods(),
|
||||
otherMethods = otherIi.getMethods();
|
||||
|
||||
if ((thisMethods != null) != (otherMethods != null))
|
||||
return false;
|
||||
|
||||
if (thisMethods == null || otherMethods == null)
|
||||
return true; // we don't map these anyway
|
||||
|
||||
if (thisMethods.size() != otherMethods.size())
|
||||
return false;
|
||||
|
||||
|
||||
@@ -255,12 +255,6 @@ public class InvokeVirtual extends Instruction implements InvokeInstruction
|
||||
List<net.runelite.asm.Method> thisMethods = thisIi.getMethods(),
|
||||
otherMethods = otherIi.getMethods();
|
||||
|
||||
if ((thisMethods != null) != (otherMethods != null))
|
||||
return false;
|
||||
|
||||
if (thisMethods == null || otherMethods == null)
|
||||
return true; // we don't map these anyway
|
||||
|
||||
if (thisMethods.size() != otherMethods.size())
|
||||
return false;
|
||||
|
||||
|
||||
@@ -199,6 +199,9 @@ public class MappingExecutorUtil
|
||||
assert false;
|
||||
return false;
|
||||
}
|
||||
|
||||
if (className.startsWith("java/lang/reflect/"))
|
||||
return true;
|
||||
|
||||
if (className.startsWith("java/") || className.startsWith("netscape/") || className.startsWith("javax/"))
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user