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

Replace opcode constants with ScriptOpcodes field refs in rsclient

Browse Source
This commit is contained in:
Lucas
2019-07-07 00:19:36 +02:00
parent 742bf7338d
commit aaea8ec0d5
32 changed files with 916 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
runescape-client/src/main/java/StructDefinition.java
View File

@@ -2,6 +2,7 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
import net.runelite.rs.ScriptOpcodes;
@ObfuscatedName("jq")
@Implements("StructDefinition")
@@ -111,7 +112,7 @@ public class StructDefinition extends DualNode {
var4 = var2 ? WorldMapIcon1.field1030 : class12.field1111;
}
if (var0 == 1100) {
if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) {
RouteStrategy.Interpreter_intStackSize -= 2;
var4.scrollX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
if (var4.scrollX > var4.scrollWidth - var4.width) {
@@ -133,40 +134,40 @@ public class StructDefinition extends DualNode {
class22.method295(var4);
return 1;
} else if (var0 == 1101) {
} else if (var0 == ScriptOpcodes.CC_SETCOLOUR) {
var4.color = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
return 1;
} else if (var0 == 1102) {
} else if (var0 == ScriptOpcodes.CC_SETFILL) {
var4.fill = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
class22.method295(var4);
return 1;
} else if (var0 == 1103) {
} else if (var0 == ScriptOpcodes.CC_SETTRANS) {
var4.transparency = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
return 1;
} else if (var0 == 1104) {
} else if (var0 == ScriptOpcodes.CC_SETLINEWID) {
var4.lineWid = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
return 1;
} else if (var0 == 1105) {
} else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) {
var4.spriteId2 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
return 1;
} else if (var0 == 1106) {
} else if (var0 == ScriptOpcodes.CC_SET2DANGLE) {
var4.spriteAngle = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
return 1;
} else if (var0 == 1107) {
} else if (var0 == ScriptOpcodes.CC_SETTILING) {
var4.spriteTiling = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
class22.method295(var4);
return 1;
} else if (var0 == 1108) {
} else if (var0 == ScriptOpcodes.CC_SETMODEL) {
var4.modelType = 1;
var4.modelId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
return 1;
} else if (var0 == 1109) {
} else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) {
RouteStrategy.Interpreter_intStackSize -= 6;
var4.modelOffsetX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var4.modelOffsetY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
@@ -178,7 +179,7 @@ public class StructDefinition extends DualNode {
return 1;
} else {
int var5;
if (var0 == 1110) {
if (var0 == ScriptOpcodes.CC_SETMODELANIM) {
var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
if (var5 != var4.sequenceId) {
var4.sequenceId = var5;
@@ -188,11 +189,11 @@ public class StructDefinition extends DualNode {
}
return 1;
} else if (var0 == 1111) {
} else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) {
var4.modelOrthog = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
class22.method295(var4);
return 1;
} else if (var0 == 1112) {
} else if (var0 == ScriptOpcodes.CC_SETTEXT) {
String var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
if (!var8.equals(var4.text)) {
var4.text = var8;
@@ -200,38 +201,38 @@ public class StructDefinition extends DualNode {
}
return 1;
} else if (var0 == 1113) {
} else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) {
var4.fontId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
return 1;
} else if (var0 == 1114) {
} else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) {
RouteStrategy.Interpreter_intStackSize -= 3;
var4.textXAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var4.textYAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
var4.textLineHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
class22.method295(var4);
return 1;
} else if (var0 == 1115) {
} else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) {
var4.textShadowed = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
class22.method295(var4);
return 1;
} else if (var0 == 1116) {
} else if (var0 == ScriptOpcodes.CC_SETOUTLINE) {
var4.outline = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
return 1;
} else if (var0 == 1117) {
} else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) {
var4.spriteShadow = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
return 1;
} else if (var0 == 1118) {
} else if (var0 == ScriptOpcodes.CC_SETVFLIP) {
var4.spriteFlipV = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
class22.method295(var4);
return 1;
} else if (var0 == 1119) {
} else if (var0 == ScriptOpcodes.CC_SETHFLIP) {
var4.spriteFlipH = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
class22.method295(var4);
return 1;
} else if (var0 == 1120) {
} else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) {
RouteStrategy.Interpreter_intStackSize -= 2;
var4.scrollWidth = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var4.scrollHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
@@ -241,7 +242,7 @@ public class StructDefinition extends DualNode {
}
return 1;
} else if (var0 == 1121) {
} else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) {
TilePaint.method3060(var4.id, var4.childIndex);
Client.field127 = var4;
class22.method295(var4);
@@ -250,7 +251,7 @@ public class StructDefinition extends DualNode {
var4.spriteId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
return 1;
} else if (var0 == 1123) {
} else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) {
var4.color2 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
class22.method295(var4);
return 1;
@@ -269,7 +270,7 @@ public class StructDefinition extends DualNode {
return 1;
} else {
boolean var6;
if (var0 == 1126) {
if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) {
var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
var4.field961 = var6;
return 1;