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

55
runescape-client/src/main/java/class4.java
View File

@@ -1,5 +1,6 @@
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
import net.runelite.rs.ScriptOpcodes;
@ObfuscatedName("o")
final class class4 implements class0 {
@@ -61,15 +62,15 @@ final class class4 implements class0 {
)
static int method54(int var0, Script var1, boolean var2) {
String var3;
if (var0 == 3100) {
if (var0 == ScriptOpcodes.MES) {
var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
WorldMapIcon1.method219(0, "", var3);
return 1;
} else if (var0 == 3101) {
} else if (var0 == ScriptOpcodes.ANIM) {
RouteStrategy.Interpreter_intStackSize -= 2;
class234.method4534(Canvas.localPlayer, Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize], Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
return 1;
} else if (var0 == 3103) {
} else if (var0 == ScriptOpcodes.IF_CLOSE) {
if (!Interpreter.field424) {
Interpreter.field423 = true;
}
@@ -78,7 +79,7 @@ final class class4 implements class0 {
} else {
int var4;
PacketBufferNode var5;
if (var0 == 3104) {
if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) {
var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
var4 = 0;
if (UserComparator4.method3336(var3)) {
@@ -89,14 +90,14 @@ final class class4 implements class0 {
var5.packetBuffer.writeInt(var4);
Client.packetWriter.method241(var5);
return 1;
} else if (var0 == 3105) {
} else if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) {
var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
var5 = Interpreter.method1915(ClientPacket.field317, Client.packetWriter.isaacCipher);
var5.packetBuffer.writeByte(var3.length() + 1);
var5.packetBuffer.writeStringCp1252NullTerminated(var3);
Client.packetWriter.method241(var5);
return 1;
} else if (var0 == 3106) {
} else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) {
var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
var5 = Interpreter.method1915(ClientPacket.field230, Client.packetWriter.isaacCipher);
var5.packetBuffer.writeByte(var3.length() + 1);
@@ -106,12 +107,12 @@ final class class4 implements class0 {
} else {
String var6;
int var7;
if (var0 == 3107) {
if (var0 == ScriptOpcodes.OPPLAYER) {
var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
var6 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
WorldMapSection2.method583(var7, var6);
return 1;
} else if (var0 == 3108) {
} else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) {
RouteStrategy.Interpreter_intStackSize -= 3;
var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
@@ -119,37 +120,37 @@ final class class4 implements class0 {
Widget var11 = Huffman.getWidget(var13);
Players.clickWidget(var11, var7, var4);
return 1;
} else if (var0 == 3109) {
} else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) {
RouteStrategy.Interpreter_intStackSize -= 2;
var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
Widget var12 = var2 ? WorldMapIcon1.field1030 : class12.field1111;
Players.clickWidget(var12, var7, var4);
return 1;
} else if (var0 == 3110) {
} else if (var0 == ScriptOpcodes.MOUSECAM) {
AbstractRasterProvider.mouseCam = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
return 1;
} else if (var0 == 3111) {
} else if (var0 == ScriptOpcodes.GETREMOVEROOFS) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.roofsHidden ? 1 : 0;
return 1;
} else if (var0 == 3112) {
} else if (var0 == ScriptOpcodes.SETREMOVEROOFS) {
ReflectionCheck.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
WorldMapSection0.savePreferences();
return 1;
} else {
boolean var8;
if (var0 == 3113) {
if (var0 == ScriptOpcodes.OPENURL) {
var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
WorldMapCacheName.method635(var3, var8, false);
return 1;
} else if (var0 == 3115) {
} else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) {
var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
var5 = Interpreter.method1915(ClientPacket.field264, Client.packetWriter.isaacCipher);
var5.packetBuffer.writeShort(var7);
Client.packetWriter.method241(var5);
return 1;
} else if (var0 == 3116) {
} else if (var0 == ScriptOpcodes.BUG_REPORT) {
var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
Interpreter.Interpreter_stringStackSize -= 2;
var6 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
@@ -167,13 +168,13 @@ final class class4 implements class0 {
Client.packetWriter.method241(var9);
return 1;
}
} else if (var0 == 3117) {
} else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) {
Client.shiftClickDrop = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
return 1;
} else if (var0 == 3118) {
} else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) {
Client.showMouseOverText = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
return 1;
} else if (var0 == 3119) {
} else if (var0 == ScriptOpcodes.RENDERSELF) {
Client.renderSelf = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
return 1;
} else if (var0 == 3120) {
@@ -211,16 +212,16 @@ final class class4 implements class0 {
} else if (var0 == 3124) {
Client.field210 = 0;
return 1;
} else if (var0 == 3125) {
} else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) {
Client.showMouseCross = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
return 1;
} else if (var0 == 3126) {
} else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) {
Client.showLoadingMessages = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
return 1;
} else if (var0 == 3127) {
} else if (var0 == ScriptOpcodes.SETTAPTODROP) {
WorldMapAreaData.method705(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1);
return 1;
} else if (var0 == 3128) {
} else if (var0 == ScriptOpcodes.GETTAPTODROP) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class206.method4028() ? 1 : 0;
return 1;
} else if (var0 == 3129) {
@@ -234,7 +235,7 @@ final class class4 implements class0 {
} else if (var0 == 3131) {
--RouteStrategy.Interpreter_intStackSize;
return 1;
} else if (var0 == 3132) {
} else if (var0 == ScriptOpcodes.GETCANVASSIZE) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = SoundCache.canvasWidth;
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Huffman.canvasHeight;
return 1;
@@ -264,15 +265,15 @@ final class class4 implements class0 {
Client.field151 = 3;
Client.field153 = var2 ? WorldMapIcon1.field1030.id : class12.field1111.id;
return 1;
} else if (var0 == 3141) {
} else if (var0 == ScriptOpcodes.SETHIDEUSERNAME) {
var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
ReflectionCheck.clientPreferences.hideUsername = var8;
WorldMapSection0.savePreferences();
return 1;
} else if (var0 == 3142) {
} else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.hideUsername ? 1 : 0;
return 1;
} else if (var0 == 3143) {
} else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) {
var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
Client.Login_isUsernameRemembered = var8;
if (!var8) {
@@ -281,7 +282,7 @@ final class class4 implements class0 {
}
return 1;
} else if (var0 == 3144) {
} else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) {
Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0;
return 1;
} else if (var0 == 3145) {