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

rs-client: refactoring (#1344)

Browse Source 
* Rename some things to be more consistent everywhere

* rs-client: refactoring

* MenuAction -> MenuOpcode merge
This commit is contained in:
Lucwousin
2019-08-20 22:24:51 +02:00
committed by GitHub
parent 0f46656e9d
commit db705f5dd5
297 changed files with 13734 additions and 14043 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
runescape-client/src/main/java/UserComparator9.java
View File

@@ -37,15 +37,17 @@ public class UserComparator9 extends AbstractUserComparator {
signature = "(I)[Lkl;",
garbageValue = "-445895559"
)
static class310[] method3383() {
return new class310[]{class310.field3817, class310.field3816, class310.field3818};
@Export("ChatMode_values")
static PrivateChatMode[] ChatMode_values() {
return new PrivateChatMode[]{PrivateChatMode.field3817, PrivateChatMode.field3816, PrivateChatMode.field3818};
}
@ObfuscatedName("w")
@ObfuscatedSignature(
signature = "(Ljava/lang/Throwable;Ljava/lang/String;)Lml;"
)
public static RunException method3390(Throwable var0, String var1) {
@Export("newRunException")
public static RunException newRunException(Throwable var0, String var1) {
RunException var2;
if (var0 instanceof RunException) {
var2 = (RunException)var0;
@@ -73,9 +75,8 @@ public class UserComparator9 extends AbstractUserComparator {
var4 = var2 ? Interpreter.field1111 : Calendar.field2507;
}
int var11;
if (var0 == ScriptOpcodes.CC_SETOP) {
var11 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] - 1;
int var11 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] - 1;
if (var11 >= 0 && var11 <= 9) {
var4.setAction(var11, Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]);
return 1;
@@ -83,11 +84,10 @@ public class UserComparator9 extends AbstractUserComparator {
--Skills.Interpreter_stringStackSize;
return 1;
}
int var6;
if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var11 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var6 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
int var11 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
int var6 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
var4.parent = Client.getWidgetChild(var11, var6);
return 1;
}
@@ -119,80 +119,78 @@ public class UserComparator9 extends AbstractUserComparator {
var4.field2691 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
return 1;
}
int var7;
byte[] var9;
if (var0 == ScriptOpcodes.CC_SETOPKEY) {
byte[] var8 = null;
var9 = null;
if (var3) {
byte[] var9 = null;
if (!var3) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var8 = new byte[]{(byte) Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]};
var9 = new byte[]{(byte) Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]};
} else {
HealthBarUpdate.Interpreter_intStackSize -= 10;
for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + HealthBarUpdate.Interpreter_intStackSize] >= 0; var7 += 2) {
int var7 = 0;
while (var7 < 10 && Interpreter.Interpreter_intStack[var7 + HealthBarUpdate.Interpreter_intStackSize] >= 0) {
var7 += 2;
}
if (var7 > 0) {
var8 = new byte[var7 / 2];
var9 = new byte[var7 / 2];
for (var7 -= 2; var7 >= 0; var7 -= 2) {
while ((var7 -= 2) >= 0) {
var8[var7 / 2] = (byte) Interpreter.Interpreter_intStack[var7 + HealthBarUpdate.Interpreter_intStackSize];
var9[var7 / 2] = (byte) Interpreter.Interpreter_intStack[var7 + HealthBarUpdate.Interpreter_intStackSize + 1];
}
}
} else {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var8 = new byte[]{(byte) Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]};
var9 = new byte[]{(byte) Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]};
}
var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] - 1;
int var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] - 1;
if (var7 < 0 || var7 > 9) {
throw new RuntimeException();
}
FloorOverlayDefinition.method4756(var4, var7, var8, var9);
FloorOverlayDefinition.Widget_setKey(var4, var7, var8, var9);
return 1;
}
byte var5;
if (var0 == ScriptOpcodes.CC_SETOPTKEY) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var5 = 10;
var9 = new byte[]{(byte) Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]};
byte var5 = 10;
byte[] var9 = new byte[]{(byte) Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]};
byte[] var10 = new byte[]{(byte) Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]};
FloorOverlayDefinition.method4756(var4, var5, var9, var10);
FloorOverlayDefinition.Widget_setKey(var4, var5, var9, var10);
return 1;
}
if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) {
HealthBarUpdate.Interpreter_intStackSize -= 3;
var11 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] - 1;
var6 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
var7 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2];
if (var11 >= 0 && var11 <= 9) {
class14.method153(var4, var11, var6, var7);
return 1;
int var11 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] - 1;
int var6 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
int var7 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2];
if (var11 < 0 || var11 > 9) {
throw new RuntimeException();
}
throw new RuntimeException();
class14.Widget_setKeyRate(var4, var11, var6, var7);
return 1;
}
if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) {
var5 = 10;
var6 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
class14.method153(var4, var5, var6, var7);
byte var5 = 10;
int var6 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
int var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
class14.Widget_setKeyRate(var4, var5, var6, var7);
return 1;
}
if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) {
--HealthBarUpdate.Interpreter_intStackSize;
var11 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] - 1;
int var11 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] - 1;
if (var11 < 0 || var11 > 9) {
throw new RuntimeException();
}
WorldMapCacheName.method600(var4, var11);
WorldMapCacheName.Widget_setKeyIgnoreHeld(var4, var11);
return 1;
}
if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) {
var5 = 10;
WorldMapCacheName.method600(var4, var5);
byte var5 = 10;
WorldMapCacheName.Widget_setKeyIgnoreHeld(var4, var5);
return 1;
}