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

@@ -6,45 +6,36 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("dl")
@ObfuscatedName("dk")
@Implements("Messages")
public class Messages {
@ObfuscatedName("h")
@ObfuscatedName("v")
@Export("Messages_channels")
static final Map Messages_channels;
@ObfuscatedName("c")
@ObfuscatedName("n")
@ObfuscatedSignature(
descriptor = "Lmo;"
descriptor = "Lmr;"
)
@Export("Messages_hashTable")
static final IterableNodeHashTable Messages_hashTable;
@ObfuscatedName("o")
@ObfuscatedName("f")
@ObfuscatedSignature(
descriptor = "Lkd;"
descriptor = "Lko;"
)
@Export("Messages_queue")
static final IterableDualNodeQueue Messages_queue;
@ObfuscatedName("g")
@ObfuscatedName("y")
@ObfuscatedGetter(
intValue = 383484853
intValue = 543094313
)
@Export("Messages_count")
static int Messages_count;
@ObfuscatedName("l")
@ObfuscatedName("o")
@ObfuscatedSignature(
descriptor = "[Lbc;"
descriptor = "Lbu;"
)
@Export("World_worlds")
static World[] World_worlds;
@ObfuscatedName("gw")
@ObfuscatedGetter(
intValue = -1601684285
)
@Export("baseY")
static int baseY;
@ObfuscatedName("gu")
@Export("regionLandArchives")
static byte[][] regionLandArchives;
@Export("soundCache")
public static SoundCache soundCache;
static {
Messages_channels = new HashMap(); // L: 9
@@ -53,105 +44,22 @@ public class Messages {
Messages_count = 0; // L: 12
}
@ObfuscatedName("b")
@ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "(III)V",
garbageValue = "1068493596"
descriptor = "([Lkj;II)Lkj;",
garbageValue = "-611336247"
)
public static final void method2374(int var0, int var1) {
ViewportMouse.ViewportMouse_x = var0; // L: 88
ViewportMouse.ViewportMouse_y = var1; // L: 89
ViewportMouse.ViewportMouse_isInViewport = true; // L: 90
ViewportMouse.ViewportMouse_entityCount = 0; // L: 91
ViewportMouse.ViewportMouse_false0 = false; // L: 92
} // L: 93
@Export("findEnumerated")
public static Enumerated findEnumerated(Enumerated[] var0, int var1) {
Enumerated[] var2 = var0; // L: 17
@ObfuscatedName("r")
@ObfuscatedSignature(
descriptor = "(II)I",
garbageValue = "252284948"
)
public static int method2381(int var0) {
if (var0 > 0) { // L: 210
return 1;
} else {
return var0 < 0 ? -1 : 0; // L: 211 212
}
}
@ObfuscatedName("jk")
@ObfuscatedSignature(
descriptor = "(IIIIIII)V",
garbageValue = "-1395505171"
)
static final void method2378(int var0, int var1, int var2, int var3, int var4, int var5) {
int var6 = var2 - var0; // L: 9966
int var7 = var3 - var1; // L: 9967
int var8 = var6 >= 0 ? var6 : -var6; // L: 9968
int var9 = var7 >= 0 ? var7 : -var7; // L: 9969
int var10 = var8; // L: 9970
if (var8 < var9) { // L: 9971
var10 = var9;
}
if (var10 != 0) { // L: 9972
int var11 = (var6 << 16) / var10; // L: 9973
int var12 = (var7 << 16) / var10; // L: 9974
if (var12 <= var11) { // L: 9975
var11 = -var11;
} else {
var12 = -var12; // L: 9976
for (int var3 = 0; var3 < var2.length; ++var3) { // L: 18
Enumerated var4 = var2[var3]; // L: 19
if (var1 == var4.rsOrdinal()) {
return var4; // L: 21
}
int var13 = var5 * var12 >> 17; // L: 9977
int var14 = var5 * var12 + 1 >> 17; // L: 9978
int var15 = var5 * var11 >> 17; // L: 9979
int var16 = var5 * var11 + 1 >> 17; // L: 9980
var0 -= Rasterizer2D.Rasterizer2D_xClipStart; // L: 9981
var1 -= Rasterizer2D.Rasterizer2D_yClipStart; // L: 9982
int var17 = var0 + var13; // L: 9983
int var18 = var0 - var14; // L: 9984
int var19 = var0 + var6 - var14; // L: 9985
int var20 = var0 + var13 + var6; // L: 9986
int var21 = var15 + var1; // L: 9987
int var22 = var1 - var16; // L: 9988
int var23 = var7 + var1 - var16; // L: 9989
int var24 = var7 + var15 + var1; // L: 9990
Rasterizer3D.method3823(var17, var18, var19); // L: 9991
Rasterizer3D.method3826(var21, var22, var23, var17, var18, var19, var4); // L: 9992
Rasterizer3D.method3823(var17, var19, var20); // L: 9993
Rasterizer3D.method3826(var21, var23, var24, var17, var19, var20, var4); // L: 9994
}
} // L: 9995
@ObfuscatedName("jh")
@ObfuscatedSignature(
descriptor = "(II)Ljava/lang/String;",
garbageValue = "930594009"
)
@Export("formatItemStacks")
static final String formatItemStacks(int var0) {
String var1 = Integer.toString(var0); // L: 10011
for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { // L: 10012
var1 = var1.substring(0, var2) + "," + var1.substring(var2); // L: 10013
}
if (var1.length() > 9) { // L: 10015
return " " + HorizontalAlignment.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + "</col>";
} else {
return var1.length() > 6 ? " " + HorizontalAlignment.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "</col>" : " " + HorizontalAlignment.colorStartTag(16776960) + var1 + "</col>"; // L: 10016 10017
}
return null; // L: 25
}
@ObfuscatedName("ka")
@ObfuscatedSignature(
descriptor = "(II)V",
garbageValue = "716451367"
)
static final void method2357(int var0) {
if (UserComparator8.loadInterface(var0)) { // L: 11121
class308.drawModelComponents(Widget.Widget_interfaceComponents[var0], -1); // L: 11122
}
} // L: 11123
}