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

Nice insider info btw, be nice if you shared it, so-called "open source" client.
This commit is contained in:
ThatGamerBlue
2021-05-28 21:39:25 +01:00
481 changed files with 53410 additions and 51723 deletions

View File

@@ -5,108 +5,160 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("bl")
@ObfuscatedName("bk")
@Implements("GrandExchangeOfferOwnWorldComparator")
public class GrandExchangeOfferOwnWorldComparator implements Comparator {
@ObfuscatedName("gm")
@ObfuscatedName("as")
@ObfuscatedSignature(
descriptor = "Low;"
descriptor = "Lli;"
)
@Export("redHintArrowSprite")
static SpritePixels redHintArrowSprite;
@ObfuscatedName("lk")
static Bounds field631;
@ObfuscatedName("gw")
@ObfuscatedGetter(
intValue = -1477191609
intValue = 1130183005
)
@Export("menuHeight")
static int menuHeight;
@ObfuscatedName("h")
static int field632;
@ObfuscatedName("ob")
@ObfuscatedSignature(
descriptor = "Ldc;"
)
@Export("varcs")
static Varcs varcs;
@ObfuscatedName("oo")
@ObfuscatedSignature(
descriptor = "Lnu;"
)
static class369 field634;
@ObfuscatedName("v")
@Export("filterWorlds")
boolean filterWorlds;
GrandExchangeOfferOwnWorldComparator() {
} // L: 11820
} // L: 11583
@ObfuscatedName("h")
@ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "(Ljz;Ljz;B)I",
garbageValue = "-64"
descriptor = "(Ljs;Ljs;I)I",
garbageValue = "-1562146243"
)
@Export("compare_bridged")
int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
if (var2.world == var1.world) { // L: 11823
if (var2.world == var1.world) { // L: 11586
return 0;
} else {
if (this.filterWorlds) { // L: 11824
if (Client.worldId == var1.world) { // L: 11825
if (this.filterWorlds) { // L: 11587
if (Client.worldId == var1.world) { // L: 11588
return -1;
}
if (var2.world == Client.worldId) { // L: 11826
if (var2.world == Client.worldId) { // L: 11589
return 1;
}
}
return var1.world < var2.world ? -1 : 1; // L: 11828
return var1.world < var2.world ? -1 : 1; // L: 11591
}
}
public boolean equals(Object var1) {
return super.equals(var1); // L: 11836
return super.equals(var1); // L: 11599
}
public int compare(Object var1, Object var2) {
return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 11832
return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 11595
}
@ObfuscatedName("z")
@ObfuscatedName("n")
@ObfuscatedSignature(
descriptor = "(I)V",
garbageValue = "836817261"
descriptor = "(IB)Lep;",
garbageValue = "-78"
)
static void method1213() {
if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 242
Login.currentLoginField = 1; // L: 243
@Export("getInvDefinition")
public static InvDefinition getInvDefinition(int var0) {
InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); // L: 21
if (var1 != null) { // L: 22
return var1;
} else {
Login.currentLoginField = 0; // L: 246
byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); // L: 23
var1 = new InvDefinition(); // L: 24
if (var2 != null) { // L: 25
var1.decode(new Buffer(var2));
}
InvDefinition.InvDefinition_cached.put(var1, (long)var0); // L: 26
return var1; // L: 27
}
}
@ObfuscatedName("p")
@ObfuscatedSignature(
descriptor = "(II)V",
garbageValue = "-1916477751"
)
@Export("clearItemContainer")
static void clearItemContainer(int var0) {
ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 63
if (var1 != null) { // L: 64
for (int var2 = 0; var2 < var1.ids.length; ++var2) { // L: 65
var1.ids[var2] = -1; // L: 66
var1.quantities[var2] = 0; // L: 67
}
}
} // L: 69
@ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "(II)I",
garbageValue = "-1870393029"
)
public static int method1166(int var0) {
return class229.method4374(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 68
}
@ObfuscatedName("ai")
@ObfuscatedSignature(
descriptor = "([BIII)I",
garbageValue = "1889329497"
)
public static int method1176(byte[] var0, int var1, int var2) {
int var3 = -1; // L: 45
for (int var4 = var1; var4 < var2; ++var4) { // L: 46
var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; // L: 47
}
} // L: 248
var3 = ~var3; // L: 49
return var3; // L: 50
}
@ObfuscatedName("im")
@ObfuscatedName("gl")
@ObfuscatedSignature(
descriptor = "(I)V",
garbageValue = "-1470000440"
descriptor = "(ZI)V",
garbageValue = "2022835517"
)
static void method1212() {
for (int var0 = 0; var0 < Client.menuOptionsCount; ++var0) { // L: 9105
if (class44.method499(Client.menuOpcodes[var0])) { // L: 9106
if (var0 < Client.menuOptionsCount - 1) { // L: 9107
for (int var1 = var0; var1 < Client.menuOptionsCount - 1; ++var1) { // L: 9108
Client.menuActions[var1] = Client.menuActions[var1 + 1]; // L: 9109
Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; // L: 9110
Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; // L: 9111
Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; // L: 9112
Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; // L: 9113
Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; // L: 9114
Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; // L: 9115
}
}
@Export("addNpcsToScene")
static final void addNpcsToScene(boolean var0) {
for (int var1 = 0; var1 < Client.npcCount; ++var1) { // L: 4390
NPC var2 = Client.npcs[Client.npcIndices[var1]]; // L: 4391
if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { // L: 4392
int var3 = var2.x >> 7; // L: 4393
int var4 = var2.y >> 7; // L: 4394
if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { // L: 4395
if (var2.field1239 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { // L: 4396
if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { // L: 4397
continue;
}
--var0; // L: 9118
--Client.menuOptionsCount; // L: 9119
Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; // L: 4398
}
long var5 = DevicePcmPlayerProvider.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); // L: 4400
var2.playerCycle = Client.cycle; // L: 4401
AbstractSocket.scene.drawEntity(class22.Client_plane, var2.x, var2.y, class105.getTileHeight(var2.field1239 * 64 - 64 + var2.x, var2.field1239 * 64 - 64 + var2.y, class22.Client_plane), var2.field1239 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); // L: 4402
}
}
}
WorldMapRegion.method3317(SoundCache.menuWidth / 2 + AbstractByteArrayCopier.menuX, HitSplatDefinition.menuY); // L: 9123
} // L: 9125
@ObfuscatedName("ji")
@ObfuscatedSignature(
descriptor = "(IB)Ljava/lang/String;",
garbageValue = "117"
)
static final String method1214(int var0) {
return var0 < 999999999 ? Integer.toString(var0) : "*"; // L: 10156 10157
}
} // L: 4406
}