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

Add raw injector to hook the script interpreter

Browse Source
This commit is contained in:
Max Weber
2018-02-09 16:40:28 -07:00
committed by Adam
parent 0781a39a91
commit f71059ce20
4 changed files with 100 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runelite-mixins/src/main/java/net/runelite/client/callback/Hooks.java
View File

@@ -25,7 +25,6 @@
package net.runelite.client.callback;
import com.google.common.eventbus.EventBus;
import net.runelite.api.Script;
import org.slf4j.Logger;
/**
@@ -38,9 +37,4 @@ public class Hooks
public static Logger log;
public static EventBus eventBus;
public static int runeliteExecute(int opcode, Script script, boolean isOne)
{
throw new RuntimeException();
}
}

70
runelite-mixins/src/main/java/net/runelite/mixins/VmMixin.java → runelite-mixins/src/main/java/net/runelite/mixins/ScriptVMMixin.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, Adam <Adam@sigterm.info>
* Copyright (c) 2018 Abex
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -24,28 +24,74 @@
*/
package net.runelite.mixins;
import static net.runelite.api.Opcodes.RUNELITE_EXECUTE;
import net.runelite.api.Script;
import net.runelite.api.Client;
import net.runelite.api.events.ScriptEvent;
import net.runelite.api.mixins.Copy;
import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
import net.runelite.api.mixins.Replace;
import net.runelite.api.mixins.Shadow;
import net.runelite.client.callback.Hooks;
import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSScript;
import net.runelite.rs.api.RSScriptEvent;
//@Mixin(RSClient.class)
public abstract class VmMixin
import static net.runelite.api.Opcodes.RUNELITE_EXECUTE;
@Mixin(RSClient.class)
public abstract class ScriptVMMixin implements RSClient
{
@Copy("execute6500")
static int rs$execute6500(int opcode, Script script, boolean isOne)
@Shadow("clientInstance")
private static Client client;
// This field is set by the ScriptVM raw injector
@Inject
private static RSScript currentScript;
// This field is set by the ScriptVM raw injector
@Inject
private static int currentScriptPC;
// Call is injected into runScript by the ScriptVM raw injector
@Inject
static boolean vmExecuteOpcode(int opcode)
{
if (opcode == RUNELITE_EXECUTE)
{
if (currentScript.getInstructions()[currentScriptPC] != RUNELITE_EXECUTE)
{
throw new AssertionError("currentScriptPC is wrong");
}
int stringStackSize = client.getStringStackSize();
String stringOp = client.getStringStack()[--stringStackSize];
client.setStringStackSize(stringStackSize);
ScriptEvent event = new ScriptEvent();
event.setScript(currentScript);
event.setEventName(stringOp);
Hooks.eventBus.post(event);
return true;
}
return false;
}
@Copy("runScript")
static void rs$runScript(RSScriptEvent event, int maxExecutionTime)
{
throw new RuntimeException();
}
@Replace("execute6500")
static int rl$execute6500(int opcode, Script script, boolean isOne)
@Replace("runScript")
static void rl$runScript(RSScriptEvent event, int maxExecutionTime)
{
if (opcode == RUNELITE_EXECUTE)
try
{
return Hooks.runeliteExecute(opcode, script, isOne);
rs$runScript(event, maxExecutionTime);
}
finally
{
currentScript = null;
}
return rs$execute6500(opcode, script, isOne);
}
}