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,30 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("mz")
@ObfuscatedName("ma")
@Implements("WorldMapArchiveLoader")
public class WorldMapArchiveLoader {
@ObfuscatedName("l")
@ObfuscatedName("p")
@Export("cacheName")
String cacheName;
@ObfuscatedName("z")
@ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "Ljp;"
descriptor = "Ljv;"
)
@Export("archive")
AbstractArchive archive;
@ObfuscatedName("t")
@ObfuscatedName("r")
@ObfuscatedGetter(
intValue = -2128153827
intValue = 134811513
)
@Export("percentLoaded")
int percentLoaded;
@ObfuscatedName("v")
@ObfuscatedName("b")
@Export("loaded")
boolean loaded;
@ObfuscatedSignature(
descriptor = "(Ljp;)V"
descriptor = "(Ljv;)V"
)
WorldMapArchiveLoader(AbstractArchive var1) {
this.percentLoaded = 0; // L: 13
@@ -35,10 +35,10 @@ public class WorldMapArchiveLoader {
this.archive = var1; // L: 17
} // L: 18
@ObfuscatedName("h")
@ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "(Ljava/lang/String;I)V",
garbageValue = "1620207835"
descriptor = "(Ljava/lang/String;B)V",
garbageValue = "87"
)
@Export("reset")
void reset(String var1) {
@@ -52,15 +52,15 @@ public class WorldMapArchiveLoader {
}
} // L: 22 25 31
@ObfuscatedName("c")
@ObfuscatedName("n")
@ObfuscatedSignature(
descriptor = "(I)I",
garbageValue = "-208007083"
descriptor = "(B)I",
garbageValue = "-69"
)
@Export("load")
int load() {
if (this.percentLoaded < 33) { // L: 34
if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2123.name, this.cacheName)) { // L: 35
if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2132.name, this.cacheName)) { // L: 35
return this.percentLoaded; // L: 36
}
@@ -68,7 +68,7 @@ public class WorldMapArchiveLoader {
}
if (this.percentLoaded == 33) { // L: 40
if (this.archive.isValidFileName(WorldMapCacheName.field2124.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field2124.name, this.cacheName)) { // L: 41 42
if (this.archive.isValidFileName(WorldMapCacheName.field2134.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field2134.name, this.cacheName)) { // L: 41 42
return this.percentLoaded; // L: 43
}
@@ -76,7 +76,7 @@ public class WorldMapArchiveLoader {
}
if (this.percentLoaded == 66) { // L: 48
if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field2126.name)) { // L: 49
if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field2135.name)) { // L: 49
return this.percentLoaded; // L: 50
}
@@ -87,20 +87,20 @@ public class WorldMapArchiveLoader {
return this.percentLoaded; // L: 55
}
@ObfuscatedName("o")
@ObfuscatedName("f")
@ObfuscatedSignature(
descriptor = "(I)Z",
garbageValue = "-2026049146"
garbageValue = "1213842170"
)
@Export("isLoaded")
boolean isLoaded() {
return this.loaded; // L: 59
}
@ObfuscatedName("g")
@ObfuscatedName("y")
@ObfuscatedSignature(
descriptor = "(B)I",
garbageValue = "16"
descriptor = "(I)I",
garbageValue = "-192788125"
)
@Export("getPercentLoaded")
int getPercentLoaded() {