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

Merge remote-tracking branch 'upstream/master' into master

Browse Source
This commit is contained in:
ThatGamerBlue
2021-04-26 17:36:22 +01:00
parent e1e62a4f7d c3fa428aa9
commit 532edebb8f
28 changed files with 553 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
runescape-client/src/main/java/Client.java
View File

@@ -180,7 +180,8 @@ public final class Client extends GameEngine implements Usernamed {
@Export("minimapState")
static int minimapState;
@ObfuscatedName("pt")
static long[] field689;
@Export("crossWorldMessageIds")
static long[] crossWorldMessageIds;
@ObfuscatedName("qt")
@ObfuscatedGetter(
intValue = -163319865
@@ -195,7 +196,8 @@ public final class Client extends GameEngine implements Usernamed {
@ObfuscatedGetter(
intValue = 1846796199
)
static int field760;
@Export("crossWorldMessageIdsIndex")
static int crossWorldMessageIdsIndex;
@ObfuscatedName("st")
@ObfuscatedSignature(
descriptor = "Lmi;"
@@ -1534,8 +1536,8 @@ public final class Client extends GameEngine implements Usernamed {
publicChatMode = 0; // L: 573
tradeChatMode = 0; // L: 575
field824 = ""; // L: 576
field689 = new long[100]; // L: 578
field760 = 0; // L: 579
crossWorldMessageIds = new long[100]; // L: 578
crossWorldMessageIdsIndex = 0; // L: 579
field827 = 0; // L: 581
field828 = new int[128]; // L: 582
field792 = new int[128]; // L: 583
@@ -3836,7 +3838,7 @@ public final class Client extends GameEngine implements Usernamed {
boolean var12 = false; // L: 5460
for (var53 = 0; var53 < 100; ++var53) { // L: 5461
if (field689[var53] == var10) { // L: 5462
if (crossWorldMessageIds[var53] == var10) { // L: 5462
var12 = true; // L: 5463
break; // L: 5464
}
@@ -3847,8 +3849,8 @@ public final class Client extends GameEngine implements Usernamed {
}
if (!var12 && field716 == 0) { // L: 5468
field689[field760] = var10; // L: 5469
field760 = (field760 + 1) % 100; // L: 5470
crossWorldMessageIds[crossWorldMessageIdsIndex] = var10; // L: 5469
crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 5470
var22 = AbstractFont.escapeBrackets(GrandExchangeOfferAgeComparator.method4607(class16.method258(var3))); // L: 5471
byte var55;
if (var9.isPrivileged) { // L: 5473
@@ -4379,7 +4381,7 @@ public final class Client extends GameEngine implements Usernamed {
var11 = true;
} else {
for (var53 = 0; var53 < 100; ++var53) { // L: 5866
if (field689[var53] == var31) { // L: 5867
if (crossWorldMessageIds[var53] == var31) { // L: 5867
var11 = true; // L: 5868
break; // L: 5869
}
@@ -4387,8 +4389,8 @@ public final class Client extends GameEngine implements Usernamed {
}
if (!var11) { // L: 5873
field689[field760] = var31; // L: 5874
field760 = (field760 + 1) % 100; // L: 5875
crossWorldMessageIds[crossWorldMessageIdsIndex] = var31; // L: 5874
crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 5875
var22 = class16.method258(var3); // L: 5876
int var54 = var56 >= 0 ? 43 : 46; // L: 5877
Projectile.addChatMessage(var54, "", var22, var33.field25); // L: 5878
@@ -4659,7 +4661,7 @@ public final class Client extends GameEngine implements Usernamed {
break;
}
if (var39 == field689[var15]) { // L: 6076
if (var39 == crossWorldMessageIds[var15]) { // L: 6076
var13 = true; // L: 6077
break; // L: 6078
}
@@ -4669,8 +4671,8 @@ public final class Client extends GameEngine implements Usernamed {
}
if (!var13) { // L: 6085
field689[field760] = var39; // L: 6086
field760 = (field760 + 1) % 100; // L: 6087
crossWorldMessageIds[crossWorldMessageIdsIndex] = var39; // L: 6086
crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6087
var42 = AbstractFont.escapeBrackets(class16.method258(var3)); // L: 6088
int var16 = var56 >= 0 ? 41 : 44; // L: 6089
if (var74.modIcon != -1) { // L: 6090
@@ -5017,7 +5019,7 @@ public final class Client extends GameEngine implements Usernamed {
boolean var14 = false; // L: 6349
for (var15 = 0; var15 < 100; ++var15) { // L: 6350
if (var29 == field689[var15]) { // L: 6351
if (var29 == crossWorldMessageIds[var15]) { // L: 6351
var14 = true; // L: 6352
break; // L: 6353
}
@@ -5028,8 +5030,8 @@ public final class Client extends GameEngine implements Usernamed {
}
if (!var14 && field716 == 0) { // L: 6359
field689[field760] = var29; // L: 6360
field760 = (field760 + 1) % 100; // L: 6361
crossWorldMessageIds[crossWorldMessageIdsIndex] = var29; // L: 6360
crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6361
var42 = AbstractFont.escapeBrackets(GrandExchangeOfferAgeComparator.method4607(class16.method258(var3))); // L: 6362
if (var34.modIcon != -1) { // L: 6363
Projectile.addChatMessage(9, class337.method5986(var34.modIcon) + var45, var42, Varcs.base37DecodeLong(var20));