rev187
This commit is contained in:
@@ -5,78 +5,78 @@ import net.runelite.mapping.ObfuscatedGetter;
|
||||
import net.runelite.mapping.ObfuscatedName;
|
||||
import net.runelite.mapping.ObfuscatedSignature;
|
||||
|
||||
@ObfuscatedName("ij")
|
||||
@ObfuscatedName("if")
|
||||
@Implements("Archive")
|
||||
public class Archive extends AbstractArchive {
|
||||
@ObfuscatedName("am")
|
||||
@ObfuscatedName("aw")
|
||||
@Export("Archive_crc")
|
||||
static CRC32 Archive_crc;
|
||||
@ObfuscatedName("v")
|
||||
@ObfuscatedName("m")
|
||||
@ObfuscatedSignature(
|
||||
signature = "Lke;"
|
||||
signature = "Lkg;"
|
||||
)
|
||||
@Export("archiveDisk")
|
||||
ArchiveDisk archiveDisk;
|
||||
@ObfuscatedName("q")
|
||||
@ObfuscatedName("g")
|
||||
@ObfuscatedSignature(
|
||||
signature = "Lke;"
|
||||
signature = "Lkg;"
|
||||
)
|
||||
@Export("masterDisk")
|
||||
ArchiveDisk masterDisk;
|
||||
@ObfuscatedName("l")
|
||||
@ObfuscatedName("r")
|
||||
@ObfuscatedGetter(
|
||||
intValue = -485019115
|
||||
intValue = -1842467633
|
||||
)
|
||||
@Export("index")
|
||||
int index;
|
||||
@ObfuscatedName("j")
|
||||
volatile boolean field3158;
|
||||
@ObfuscatedName("af")
|
||||
boolean field3163;
|
||||
@ObfuscatedName("ad")
|
||||
@ObfuscatedName("q")
|
||||
volatile boolean field3130;
|
||||
@ObfuscatedName("aa")
|
||||
boolean field3131;
|
||||
@ObfuscatedName("av")
|
||||
@Export("validGroups")
|
||||
volatile boolean[] validGroups;
|
||||
@ObfuscatedName("ai")
|
||||
@ObfuscatedName("as")
|
||||
@ObfuscatedGetter(
|
||||
intValue = -811032565
|
||||
intValue = -1109025613
|
||||
)
|
||||
@Export("indexCrc")
|
||||
int indexCrc;
|
||||
@ObfuscatedName("ag")
|
||||
@ObfuscatedName("ak")
|
||||
@ObfuscatedGetter(
|
||||
intValue = -714735647
|
||||
intValue = -1689263625
|
||||
)
|
||||
@Export("indexVersion")
|
||||
int indexVersion;
|
||||
@ObfuscatedName("ao")
|
||||
@ObfuscatedName("au")
|
||||
@ObfuscatedGetter(
|
||||
intValue = -1499508755
|
||||
intValue = 756827345
|
||||
)
|
||||
int field3168;
|
||||
int field3128;
|
||||
|
||||
static {
|
||||
Archive_crc = new CRC32();
|
||||
}
|
||||
|
||||
@ObfuscatedSignature(
|
||||
signature = "(Lke;Lke;IZZZ)V"
|
||||
signature = "(Lkg;Lkg;IZZZ)V"
|
||||
)
|
||||
public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) {
|
||||
super(var4, var5);
|
||||
this.field3158 = false;
|
||||
this.field3163 = false;
|
||||
this.field3168 = -1;
|
||||
this.field3130 = false;
|
||||
this.field3131 = false;
|
||||
this.field3128 = -1;
|
||||
this.archiveDisk = var1;
|
||||
this.masterDisk = var2;
|
||||
this.index = var3;
|
||||
this.field3163 = var6;
|
||||
WorldMapIcon_0.method224(this, this.index);
|
||||
this.field3131 = var6;
|
||||
class48.method862(this, this.index);
|
||||
}
|
||||
|
||||
@ObfuscatedName("f")
|
||||
@ObfuscatedName("i")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(II)V",
|
||||
garbageValue = "-64779180"
|
||||
garbageValue = "236985177"
|
||||
)
|
||||
@Export("loadRegionFromGroup")
|
||||
void loadRegionFromGroup(int var1) {
|
||||
@@ -89,116 +89,96 @@ public class Archive extends AbstractArchive {
|
||||
|
||||
}
|
||||
|
||||
@ObfuscatedName("w")
|
||||
@ObfuscatedName("a")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(II)I",
|
||||
garbageValue = "-1387572162"
|
||||
signature = "(IS)I",
|
||||
garbageValue = "6161"
|
||||
)
|
||||
@Export("groupLoadPercent")
|
||||
int groupLoadPercent(int var1) {
|
||||
if (super.groups[var1] != null) {
|
||||
return 100;
|
||||
} else if (this.validGroups[var1]) {
|
||||
return 100;
|
||||
} else {
|
||||
int var3 = this.index;
|
||||
long var4 = (long)((var3 << 16) + var1);
|
||||
int var2;
|
||||
if (NetCache.NetCache_currentResponse != null && NetCache.NetCache_currentResponse.key == var4) {
|
||||
var2 = class32.NetCache_responseArchiveBuffer.offset * 99 / (class32.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding) + 1;
|
||||
} else {
|
||||
var2 = 0;
|
||||
}
|
||||
|
||||
return var2;
|
||||
return this.validGroups[var1] ? 100 : Clock.method3489(this.index, var1);
|
||||
}
|
||||
}
|
||||
|
||||
@ObfuscatedName("o")
|
||||
@ObfuscatedName("l")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(II)V",
|
||||
garbageValue = "130067407"
|
||||
garbageValue = "1606315041"
|
||||
)
|
||||
@Export("loadGroup")
|
||||
void loadGroup(int var1) {
|
||||
if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) {
|
||||
PlayerType.method4210(var1, this.archiveDisk, this);
|
||||
class30.method543(var1, this.archiveDisk, this);
|
||||
} else {
|
||||
ClientPreferences.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true);
|
||||
class226.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ObfuscatedName("dw")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(B)Z",
|
||||
garbageValue = "0"
|
||||
)
|
||||
public boolean method4345() {
|
||||
return this.field3158;
|
||||
}
|
||||
|
||||
@ObfuscatedName("de")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(B)I",
|
||||
garbageValue = "-77"
|
||||
signature = "(B)Z",
|
||||
garbageValue = "-47"
|
||||
)
|
||||
public boolean method4246() {
|
||||
return this.field3130;
|
||||
}
|
||||
|
||||
@ObfuscatedName("df")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(I)I",
|
||||
garbageValue = "1662836587"
|
||||
)
|
||||
@Export("percentage")
|
||||
public int percentage() {
|
||||
if (this.field3158) {
|
||||
if (this.field3130) {
|
||||
return 100;
|
||||
} else if (super.groups != null) {
|
||||
return 99;
|
||||
} else {
|
||||
int var2 = this.index;
|
||||
long var3 = (long)(var2 + 16711680);
|
||||
int var1;
|
||||
if (NetCache.NetCache_currentResponse != null && NetCache.NetCache_currentResponse.key == var3) {
|
||||
var1 = class32.NetCache_responseArchiveBuffer.offset * 99 / (class32.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding) + 1;
|
||||
} else {
|
||||
var1 = 0;
|
||||
}
|
||||
|
||||
int var5 = var1;
|
||||
int var1 = Clock.method3489(255, this.index);
|
||||
if (var1 >= 100) {
|
||||
var5 = 99;
|
||||
var1 = 99;
|
||||
}
|
||||
|
||||
return var5;
|
||||
return var1;
|
||||
}
|
||||
}
|
||||
|
||||
@ObfuscatedName("dx")
|
||||
@ObfuscatedName("di")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(III)V",
|
||||
garbageValue = "-1360359241"
|
||||
garbageValue = "-190190944"
|
||||
)
|
||||
@Export("loadIndex")
|
||||
void loadIndex(int var1, int var2) {
|
||||
public void loadIndex(int var1, int var2) {
|
||||
this.indexCrc = var1;
|
||||
this.indexVersion = var2;
|
||||
if (this.masterDisk != null) {
|
||||
PlayerType.method4210(this.index, this.masterDisk, this);
|
||||
class30.method543(this.index, this.masterDisk, this);
|
||||
} else {
|
||||
ClientPreferences.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
|
||||
class226.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ObfuscatedName("dc")
|
||||
@ObfuscatedName("dr")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(I[BZZI)V",
|
||||
garbageValue = "1341522635"
|
||||
garbageValue = "-1214934891"
|
||||
)
|
||||
@Export("write")
|
||||
void write(int var1, byte[] var2, boolean var3, boolean var4) {
|
||||
public void write(int var1, byte[] var2, boolean var3, boolean var4) {
|
||||
if (var3) {
|
||||
if (this.field3158) {
|
||||
if (this.field3130) {
|
||||
throw new RuntimeException();
|
||||
}
|
||||
|
||||
if (this.masterDisk != null) {
|
||||
TileItem.method2144(this.index, var2, this.masterDisk);
|
||||
ByteArrayPool.method5805(this.index, var2, this.masterDisk);
|
||||
}
|
||||
|
||||
this.decodeIndex(var2);
|
||||
@@ -207,7 +187,7 @@ public class Archive extends AbstractArchive {
|
||||
var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8);
|
||||
var2[var2.length - 1] = (byte)super.groupVersions[var1];
|
||||
if (this.archiveDisk != null) {
|
||||
TileItem.method2144(var1, var2, this.archiveDisk);
|
||||
ByteArrayPool.method5805(var1, var2, this.archiveDisk);
|
||||
this.validGroups[var1] = true;
|
||||
}
|
||||
|
||||
@@ -230,21 +210,21 @@ public class Archive extends AbstractArchive {
|
||||
|
||||
}
|
||||
|
||||
@ObfuscatedName("dk")
|
||||
@ObfuscatedName("dg")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(Lke;I[BZB)V",
|
||||
garbageValue = "45"
|
||||
signature = "(Lkg;I[BZI)V",
|
||||
garbageValue = "-1566911980"
|
||||
)
|
||||
@Export("load")
|
||||
void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) {
|
||||
int var5;
|
||||
if (var1 == this.masterDisk) {
|
||||
if (this.field3158) {
|
||||
if (this.field3130) {
|
||||
throw new RuntimeException();
|
||||
}
|
||||
|
||||
if (var3 == null) {
|
||||
ClientPreferences.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
|
||||
class226.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -252,11 +232,11 @@ public class Archive extends AbstractArchive {
|
||||
Archive_crc.update(var3, 0, var3.length);
|
||||
var5 = (int)Archive_crc.getValue();
|
||||
if (var5 != this.indexCrc) {
|
||||
ClientPreferences.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
|
||||
class226.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
|
||||
return;
|
||||
}
|
||||
|
||||
Buffer var11 = new Buffer(class226.decompressBytes(var3));
|
||||
Buffer var11 = new Buffer(Skills.decompressBytes(var3));
|
||||
int var12 = var11.readUnsignedByte();
|
||||
if (var12 != 5 && var12 != 6) {
|
||||
throw new RuntimeException(var12 + "," + this.index + "," + var2);
|
||||
@@ -268,21 +248,21 @@ public class Archive extends AbstractArchive {
|
||||
}
|
||||
|
||||
if (var8 != this.indexVersion) {
|
||||
ClientPreferences.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
|
||||
class226.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
|
||||
return;
|
||||
}
|
||||
|
||||
this.decodeIndex(var3);
|
||||
this.loadAllLocal();
|
||||
} else {
|
||||
if (!var4 && var2 == this.field3168) {
|
||||
this.field3158 = true;
|
||||
if (!var4 && var2 == this.field3128) {
|
||||
this.field3130 = true;
|
||||
}
|
||||
|
||||
if (var3 == null || var3.length <= 2) {
|
||||
this.validGroups[var2] = false;
|
||||
if (this.field3163 || var4) {
|
||||
ClientPreferences.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
|
||||
if (this.field3131 || var4) {
|
||||
class226.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
|
||||
}
|
||||
|
||||
return;
|
||||
@@ -294,8 +274,8 @@ public class Archive extends AbstractArchive {
|
||||
int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255);
|
||||
if (var5 != super.groupCrcs[var2] || var6 != super.groupVersions[var2]) {
|
||||
this.validGroups[var2] = false;
|
||||
if (this.field3163 || var4) {
|
||||
ClientPreferences.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
|
||||
if (this.field3131 || var4) {
|
||||
class226.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
|
||||
}
|
||||
|
||||
return;
|
||||
@@ -321,10 +301,10 @@ public class Archive extends AbstractArchive {
|
||||
|
||||
}
|
||||
|
||||
@ObfuscatedName("dj")
|
||||
@ObfuscatedName("dh")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(I)V",
|
||||
garbageValue = "-1169710133"
|
||||
garbageValue = "-1822102759"
|
||||
)
|
||||
@Export("loadAllLocal")
|
||||
void loadAllLocal() {
|
||||
@@ -336,46 +316,46 @@ public class Archive extends AbstractArchive {
|
||||
}
|
||||
|
||||
if (this.archiveDisk == null) {
|
||||
this.field3158 = true;
|
||||
this.field3130 = true;
|
||||
} else {
|
||||
this.field3168 = -1;
|
||||
this.field3128 = -1;
|
||||
|
||||
for (var1 = 0; var1 < this.validGroups.length; ++var1) {
|
||||
if (super.fileCounts[var1] > 0) {
|
||||
class40.method780(var1, this.archiveDisk, this);
|
||||
this.field3168 = var1;
|
||||
WorldMapLabelSize.method186(var1, this.archiveDisk, this);
|
||||
this.field3128 = var1;
|
||||
}
|
||||
}
|
||||
|
||||
if (this.field3168 == -1) {
|
||||
this.field3158 = true;
|
||||
if (this.field3128 == -1) {
|
||||
this.field3130 = true;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ObfuscatedName("dp")
|
||||
@ObfuscatedName("dl")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(II)Z",
|
||||
garbageValue = "2065580050"
|
||||
garbageValue = "1057662007"
|
||||
)
|
||||
public boolean method4354(int var1) {
|
||||
public boolean method4266(int var1) {
|
||||
return this.validGroups[var1];
|
||||
}
|
||||
|
||||
@ObfuscatedName("di")
|
||||
@ObfuscatedName("da")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(II)Z",
|
||||
garbageValue = "581589057"
|
||||
garbageValue = "693879570"
|
||||
)
|
||||
public boolean method4355(int var1) {
|
||||
public boolean method4275(int var1) {
|
||||
return this.getGroupFileIds(var1) != null;
|
||||
}
|
||||
|
||||
@ObfuscatedName("dn")
|
||||
@ObfuscatedName("dp")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(I)I",
|
||||
garbageValue = "1792861334"
|
||||
garbageValue = "-576778169"
|
||||
)
|
||||
@Export("loadPercent")
|
||||
public int loadPercent() {
|
||||
@@ -397,4 +377,34 @@ public class Archive extends AbstractArchive {
|
||||
return var3;
|
||||
}
|
||||
}
|
||||
|
||||
@ObfuscatedName("gh")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(ZB)V",
|
||||
garbageValue = "0"
|
||||
)
|
||||
@Export("addNpcsToScene")
|
||||
static final void addNpcsToScene(boolean var0) {
|
||||
for (int var1 = 0; var1 < Client.npcCount; ++var1) {
|
||||
NPC var2 = Client.npcs[Client.npcIndices[var1]];
|
||||
if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) {
|
||||
int var3 = var2.x >> 7;
|
||||
int var4 = var2.y >> 7;
|
||||
if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) {
|
||||
if (var2.field925 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) {
|
||||
if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) {
|
||||
continue;
|
||||
}
|
||||
|
||||
Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount;
|
||||
}
|
||||
|
||||
long var5 = KeyHandler.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]);
|
||||
var2.playerCycle = Client.cycle;
|
||||
class14.scene.drawEntity(UrlRequest.Client_plane, var2.x, var2.y, ScriptEvent.getTileHeight(var2.field925 * 64 - 64 + var2.x, var2.field925 * 64 - 64 + var2.y, UrlRequest.Client_plane), var2.field925 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user