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

@@ -4,42 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("jz")
@ObfuscatedName("js")
@Implements("GrandExchangeEvent")
public class GrandExchangeEvent {
@ObfuscatedName("k")
@ObfuscatedSignature(
descriptor = "Lof;"
)
@Export("options_buttons_2Sprite")
static IndexedSprite options_buttons_2Sprite;
@ObfuscatedName("h")
@ObfuscatedName("v")
@ObfuscatedGetter(
intValue = 1061538211
intValue = 512263149
)
@Export("world")
public final int world;
@ObfuscatedName("c")
@ObfuscatedName("n")
@ObfuscatedGetter(
longValue = -779308497234252569L
longValue = 6451811657459395973L
)
@Export("age")
public final long age;
@ObfuscatedName("o")
@ObfuscatedName("f")
@ObfuscatedSignature(
descriptor = "Ljm;"
descriptor = "Lju;"
)
@Export("grandExchangeOffer")
public final GrandExchangeOffer grandExchangeOffer;
@ObfuscatedName("g")
@ObfuscatedName("y")
@Export("offerName")
String offerName;
@ObfuscatedName("l")
@ObfuscatedName("p")
@Export("previousOfferName")
String previousOfferName;
@ObfuscatedSignature(
descriptor = "(Lnk;BI)V"
descriptor = "(Lnd;BI)V"
)
GrandExchangeEvent(Buffer var1, byte var2, int var3) {
this.offerName = var1.readStringCp1252NullTerminated(); // L: 111
@@ -49,8 +43,8 @@ public class GrandExchangeEvent {
int var4 = var1.readInt(); // L: 115
int var5 = var1.readInt(); // L: 116
this.grandExchangeOffer = new GrandExchangeOffer(); // L: 117
this.grandExchangeOffer.method5018(2); // L: 118
this.grandExchangeOffer.method5019(var2); // L: 119
this.grandExchangeOffer.method5092(2); // L: 118
this.grandExchangeOffer.method5102(var2); // L: 119
this.grandExchangeOffer.unitPrice = var4; // L: 120
this.grandExchangeOffer.totalQuantity = var5; // L: 121
this.grandExchangeOffer.currentQuantity = 0; // L: 122
@@ -58,20 +52,20 @@ public class GrandExchangeEvent {
this.grandExchangeOffer.id = var3; // L: 124
} // L: 125
@ObfuscatedName("h")
@ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "(S)Ljava/lang/String;",
garbageValue = "255"
descriptor = "(B)Ljava/lang/String;",
garbageValue = "-72"
)
@Export("getOfferName")
public String getOfferName() {
return this.offerName; // L: 128
}
@ObfuscatedName("c")
@ObfuscatedName("n")
@ObfuscatedSignature(
descriptor = "(I)Ljava/lang/String;",
garbageValue = "-1435135839"
garbageValue = "1720963732"
)
@Export("getPreviousOfferName")
public String getPreviousOfferName() {