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,33 +6,38 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("lw")
@ObfuscatedName("lh")
@Implements("ArchiveDisk")
public final class ArchiveDisk {
@ObfuscatedName("h")
@ObfuscatedName("ru")
@ObfuscatedGetter(
intValue = 1117053017
)
static int field3886;
@ObfuscatedName("v")
@Export("ArchiveDisk_buffer")
static byte[] ArchiveDisk_buffer;
@ObfuscatedName("c")
@ObfuscatedName("n")
@ObfuscatedSignature(
descriptor = "Lne;"
descriptor = "Lnf;"
)
@Export("datFile")
BufferedFile datFile;
@ObfuscatedName("o")
@ObfuscatedName("f")
@ObfuscatedSignature(
descriptor = "Lne;"
descriptor = "Lnf;"
)
@Export("idxFile")
BufferedFile idxFile;
@ObfuscatedName("g")
@ObfuscatedName("y")
@ObfuscatedGetter(
intValue = 827560813
intValue = 1496779987
)
@Export("archive")
int archive;
@ObfuscatedName("l")
@ObfuscatedName("p")
@ObfuscatedGetter(
intValue = -780130401
intValue = 322921177
)
@Export("maxEntrySize")
int maxEntrySize;
@@ -42,7 +47,7 @@ public final class ArchiveDisk {
}
@ObfuscatedSignature(
descriptor = "(ILne;Lne;I)V"
descriptor = "(ILnf;Lnf;I)V"
)
public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) {
this.datFile = null; // L: 8
@@ -54,10 +59,10 @@ public final class ArchiveDisk {
this.maxEntrySize = var4; // L: 17
} // L: 18
@ObfuscatedName("h")
@ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "(II)[B",
garbageValue = "1429073742"
descriptor = "(IB)[B",
garbageValue = "1"
)
@Export("read")
public byte[] read(int var1) {
@@ -112,14 +117,14 @@ public final class ArchiveDisk {
}
var13 = 8; // L: 53
this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8); // L: 54
this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13); // L: 54
var9 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); // L: 55
var10 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); // L: 56
var11 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); // L: 57
var12 = ArchiveDisk_buffer[7] & 255; // L: 58
}
if (var9 != var1 || var7 != var10 || var12 != this.archive) { // L: 60
if (var9 != var1 || var10 != var7 || var12 != this.archive) { // L: 60
var10000 = null;
return (byte[])var10000;
}
@@ -148,10 +153,10 @@ public final class ArchiveDisk {
}
}
@ObfuscatedName("c")
@ObfuscatedName("n")
@ObfuscatedSignature(
descriptor = "(I[BII)Z",
garbageValue = "475877997"
descriptor = "(I[BIB)Z",
garbageValue = "77"
)
@Export("write")
public boolean write(int var1, byte[] var2, int var3) {
@@ -169,10 +174,10 @@ public final class ArchiveDisk {
}
}
@ObfuscatedName("o")
@ObfuscatedName("f")
@ObfuscatedSignature(
descriptor = "(I[BIZI)Z",
garbageValue = "1891795807"
garbageValue = "-1453784211"
)
@Export("write0")
boolean write0(int var1, byte[] var2, int var3, boolean var4) {
@@ -217,7 +222,7 @@ public final class ArchiveDisk {
int var9 = 0; // L: 112
int var10;
if (var4) { // L: 113
this.datFile.seek(520L * (long)var6); // L: 114
this.datFile.seek((long)var6 * 520L); // L: 114
int var11;
int var12;
if (var1 > 65535) { // L: 118
@@ -262,7 +267,7 @@ public final class ArchiveDisk {
++var9;
}
if (var9 == var6) { // L: 149
if (var6 == var9) { // L: 149
++var9;
}
}