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,30 +4,38 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("fg")
@ObfuscatedName("fh")
@Implements("WorldMapDecoration")
public class WorldMapDecoration {
@ObfuscatedName("hh")
@ObfuscatedName("y")
@Export("SpriteBuffer_xOffsets")
public static int[] SpriteBuffer_xOffsets;
@ObfuscatedName("d")
@ObfuscatedGetter(
intValue = -117135279
intValue = -1317870659
)
@Export("cameraZ")
static int cameraZ;
@ObfuscatedName("h")
static int field2082;
@ObfuscatedName("hf")
@ObfuscatedSignature(
descriptor = "[Lop;"
)
@Export("modIconSprites")
static IndexedSprite[] modIconSprites;
@ObfuscatedName("v")
@ObfuscatedGetter(
intValue = -193579243
intValue = -1952293629
)
@Export("objectDefinitionId")
final int objectDefinitionId;
@ObfuscatedName("c")
@ObfuscatedName("n")
@ObfuscatedGetter(
intValue = 2117060031
intValue = 739729953
)
@Export("decoration")
final int decoration;
@ObfuscatedName("o")
@ObfuscatedName("f")
@ObfuscatedGetter(
intValue = -26030581
intValue = -184500109
)
@Export("rotation")
final int rotation;
@@ -38,36 +46,37 @@ public class WorldMapDecoration {
this.rotation = var3; // L: 11
} // L: 12
@ObfuscatedName("h")
@ObfuscatedName("n")
@ObfuscatedSignature(
descriptor = "(Ljp;IIB)[Lof;",
garbageValue = "43"
descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Loz;"
)
public static IndexedSprite[] method3571(AbstractArchive var0, int var1, int var2) {
if (!Username.method5711(var0, var1, var2)) { // L: 23
return null;
@Export("newRunException")
public static RunException newRunException(Throwable var0, String var1) {
RunException var2;
if (var0 instanceof RunException) { // L: 99
var2 = (RunException)var0; // L: 100
var2.message = var2.message + ' ' + var1; // L: 101
} else {
IndexedSprite[] var4 = new IndexedSprite[class396.SpriteBuffer_spriteCount]; // L: 26
for (int var5 = 0; var5 < class396.SpriteBuffer_spriteCount; ++var5) { // L: 27
IndexedSprite var6 = var4[var5] = new IndexedSprite(); // L: 28
var6.width = class396.SpriteBuffer_spriteWidth; // L: 29
var6.height = class396.SpriteBuffer_spriteHeight; // L: 30
var6.xOffset = class243.SpriteBuffer_xOffsets[var5]; // L: 31
var6.yOffset = class396.SpriteBuffer_yOffsets[var5]; // L: 32
var6.subWidth = ArchiveDiskActionHandler.SpriteBuffer_spriteWidths[var5]; // L: 33
var6.subHeight = class372.SpriteBuffer_spriteHeights[var5]; // L: 34
var6.palette = AccessFile.SpriteBuffer_spritePalette; // L: 35
var6.pixels = class396.SpriteBuffer_pixels[var5]; // L: 36
}
class243.SpriteBuffer_xOffsets = null; // L: 39
class396.SpriteBuffer_yOffsets = null; // L: 40
ArchiveDiskActionHandler.SpriteBuffer_spriteWidths = null; // L: 41
class372.SpriteBuffer_spriteHeights = null; // L: 42
AccessFile.SpriteBuffer_spritePalette = null; // L: 43
class396.SpriteBuffer_pixels = null; // L: 44
return var4; // L: 48
var2 = new RunException(var0, var1); // L: 103
}
return var2; // L: 104
}
@ObfuscatedName("hb")
@ObfuscatedSignature(
descriptor = "(III)I",
garbageValue = "-1091351445"
)
static int method3627(int var0, int var1) {
int var2 = var1 - 334; // L: 5040
if (var2 < 0) { // L: 5041
var2 = 0;
} else if (var2 > 100) { // L: 5042
var2 = 100;
}
int var3 = (Client.zoomWidth - Client.zoomHeight) * var2 / 100 + Client.zoomHeight; // L: 5043
return var0 * var3 / 256; // L: 5044
}
}