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,66 +4,60 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("hf")
@ObfuscatedName("hw")
@Implements("BoundaryObject")
public final class BoundaryObject {
@ObfuscatedName("ex")
@ObfuscatedName("v")
@ObfuscatedGetter(
intValue = 156821715
)
@Export("currentPort")
static int currentPort;
@ObfuscatedName("h")
@ObfuscatedGetter(
intValue = 81410901
intValue = -727989945
)
@Export("tileHeight")
int tileHeight;
@ObfuscatedName("c")
@ObfuscatedName("n")
@ObfuscatedGetter(
intValue = 1731477927
intValue = 662711357
)
@Export("x")
int x;
@ObfuscatedName("o")
@ObfuscatedName("f")
@ObfuscatedGetter(
intValue = 828570099
intValue = -1127510877
)
@Export("y")
int y;
@ObfuscatedName("g")
@ObfuscatedName("y")
@ObfuscatedGetter(
intValue = -2004551277
intValue = 643320237
)
@Export("orientationA")
int orientationA;
@ObfuscatedName("l")
@ObfuscatedName("p")
@ObfuscatedGetter(
intValue = -1692741097
intValue = 1924609359
)
@Export("orientationB")
int orientationB;
@ObfuscatedName("z")
@ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "Lge;"
descriptor = "Lgl;"
)
@Export("renderable1")
public Renderable renderable1;
@ObfuscatedName("t")
@ObfuscatedName("r")
@ObfuscatedSignature(
descriptor = "Lge;"
descriptor = "Lgl;"
)
@Export("renderable2")
public Renderable renderable2;
@ObfuscatedName("v")
@ObfuscatedName("b")
@ObfuscatedGetter(
longValue = -5701861202645263443L
longValue = 1374506562499121997L
)
@Export("tag")
public long tag;
@ObfuscatedName("b")
@ObfuscatedName("d")
@ObfuscatedGetter(
intValue = 1847127539
intValue = -1331667357
)
@Export("flags")
int flags;
@@ -72,4 +66,40 @@ public final class BoundaryObject {
this.tag = 0L; // L: 11
this.flags = 0; // L: 12
} // L: 14
@ObfuscatedName("io")
@ObfuscatedSignature(
descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V",
garbageValue = "-2076246411"
)
@Export("insertMenuItem")
static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) {
if (!Client.isMenuOpen) { // L: 8805
if (Client.menuOptionsCount < 500) { // L: 8806
Client.menuActions[Client.menuOptionsCount] = var0; // L: 8807
Client.menuTargets[Client.menuOptionsCount] = var1; // L: 8808
Client.menuOpcodes[Client.menuOptionsCount] = var2; // L: 8809
Client.menuIdentifiers[Client.menuOptionsCount] = var3; // L: 8810
Client.menuArguments1[Client.menuOptionsCount] = var4; // L: 8811
Client.menuArguments2[Client.menuOptionsCount] = var5; // L: 8812
Client.menuShiftClick[Client.menuOptionsCount] = var6; // L: 8813
++Client.menuOptionsCount; // L: 8814
}
}
} // L: 8816
@ObfuscatedName("lo")
@ObfuscatedSignature(
descriptor = "(Lio;I)Ljava/lang/String;",
garbageValue = "-502869844"
)
@Export("Widget_getSpellActionName")
static String Widget_getSpellActionName(Widget var0) {
if (AttackOption.Widget_unpackTargetMask(class21.getWidgetFlags(var0)) == 0) { // L: 11377
return null;
} else {
return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; // L: 11378 11379 11381
}
}
}