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

Revert "Revert "change scriptvm to be more reliable""

Browse Source 
This reverts commit dbaa4d993c.
This commit is contained in:
ThatGamerBlue
2020-06-28 13:39:29 +01:00
parent 503a96748f
commit 052d002994
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build.gradle.kts
View File

@@ -15,10 +15,10 @@ plugins {
id("se.patrikerdes.use-latest-versions") version "0.2.14" id("se.patrikerdes.use-latest-versions") version "0.2.14"
} }
val oprsver = "3.3.1" val oprsver = "3.3.8"
group = "com.openosrs" group = "com.openosrs"
version = "1.1.3" version = "1.1.4"
repositories { repositories {
mavenCentral() mavenCentral()
@@ -26,6 +26,7 @@ repositories {
maven { maven {
url = uri("https://repo.runelite.net") url = uri("https://repo.runelite.net")
url = uri("https://raw.githubusercontent.com/open-osrs/hosting/master") url = uri("https://raw.githubusercontent.com/open-osrs/hosting/master")
url = uri("https://repo.openosrs.com/repository/maven")
} }
} }

6
src/main/java/com/openosrs/injector/injectors/raw/ScriptVM.java
View File

@@ -109,12 +109,12 @@ public class ScriptVM extends AbstractInjector
final Field scriptInstructions = InjectUtil.findField(inject, "opcodes", "Script"); final Field scriptInstructions = InjectUtil.findField(inject, "opcodes", "Script");
final Field scriptStatePC = InjectUtil.findField(inject, "pc", "ScriptFrame"); final Field scriptStatePC = InjectUtil.findField(inject, "pc", "ScriptFrame");
// Next 4 should be injected by mixins, so don't need fail fast
final ClassFile vanillaClient = vanilla.findClass("client"); final ClassFile vanillaClient = vanilla.findClass("client");
// Next 4 should be injected by mixins, so don't need fail fast
final Method runScript = vanillaClient.findStaticMethod("copy$runScript"); final Method runScript = vanillaClient.findStaticMethod("copy$runScript");
final Method vmExecuteOpcode = vanillaClient.findStaticMethod("vmExecuteOpcode"); final Method vmExecuteOpcode = vanillaClient.findStaticMethod("vmExecuteOpcode");
final Field currentScriptField = vanillaClient.findField("currentScript"); final Method setCurrentScript = vanillaClient.findStaticMethod("setCurrentScript");
final Field currentScriptPCField = vanillaClient.findField("currentScriptPC"); final Field currentScriptPCField = vanillaClient.findField("currentScriptPC");
Execution e = new Execution(inject.getVanilla()); Execution e = new Execution(inject.getVanilla());
@@ -242,7 +242,7 @@ public class ScriptVM extends AbstractInjector
{ {
instrIter.previous(); instrIter.previous();
instrIter.add(new Dup(instrs)); instrIter.add(new Dup(instrs));
instrIter.add(new PutStatic(instrs, currentScriptField)); instrIter.add(new InvokeStatic(instrs, setCurrentScript.getPoolMethod()));
instrIter.next(); instrIter.next();
} }
} }