ra/openosrs-injector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow shadowing int/long fields with obfuscated getters

Browse Source
This commit is contained in:
Lucwousin
2019-11-07 02:16:07 +01:00
parent 4f2c72fb75
commit 28dad8a65c
7 changed files with 107 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/com/openosrs/injector/InjectUtil.java
View File

@@ -13,6 +13,7 @@ import static com.openosrs.injector.rsapi.RSApi.API_BASE;
import com.openosrs.injector.rsapi.RSApiClass;
import com.openosrs.injector.rsapi.RSApiMethod;
import java.util.List;
import java.util.function.Consumer;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import net.runelite.asm.Annotated;
@@ -30,14 +31,18 @@ import net.runelite.asm.attributes.code.instructions.ALoad;
import net.runelite.asm.attributes.code.instructions.DLoad;
import net.runelite.asm.attributes.code.instructions.FLoad;
import net.runelite.asm.attributes.code.instructions.ILoad;
import net.runelite.asm.attributes.code.instructions.IMul;
import net.runelite.asm.attributes.code.instructions.InvokeStatic;
import net.runelite.asm.attributes.code.instructions.InvokeVirtual;
import net.runelite.asm.attributes.code.instructions.LDC;
import net.runelite.asm.attributes.code.instructions.LLoad;
import net.runelite.asm.attributes.code.instructions.LMul;
import net.runelite.asm.attributes.code.instructions.Return;
import net.runelite.asm.attributes.code.instructions.VReturn;
import net.runelite.asm.pool.Class;
import net.runelite.asm.signature.Signature;
import net.runelite.deob.DeobAnnotations;
import net.runelite.deob.deobfuscators.arithmetic.DMath;
import org.jetbrains.annotations.Nullable;
public interface InjectUtil
@@ -208,7 +213,7 @@ public interface InjectUtil
field = clazz.findField(name, type);
if (field != null)
return data.toVanilla(field);
return field;
}
for (ClassFile clazz : deob)
@@ -219,7 +224,7 @@ public interface InjectUtil
field = clazz.findField(name, type);
if (field != null)
return data.toVanilla(field);
return field;
}
throw new Injexception(String.format("Static field %s doesn't exist", (type != null ? type + " " : "") + name));
@@ -450,4 +455,27 @@ public interface InjectUtil
String str = ((org.objectweb.asm.Type) v).getInternalName();
return data.toVanilla(data.toDeob(str));
}
/**
* Add after the get
*/
static void injectObfuscatedGetter(Number getter, Instructions instrs, Consumer<Instruction> into)
{
into.accept(new LDC(instrs, getter));
if (getter instanceof Integer)
into.accept(new IMul(instrs));
else if (getter instanceof Long)
into.accept(new LMul(instrs));
}
/**
* Add IN FRONT of the put
*
* @param getter should be the same value as for the getter (straight from ObfuscatedGetter)
*/
static void injectObfuscatedSetter(Number getter, Instructions instrs, Consumer<Instruction> into)
{
injectObfuscatedGetter(DMath.modInverse(getter), instrs, into);
}
}