chore: rev 188

This commit is contained in:
Owain van Brakel
2020-01-29 14:20:08 +01:00
parent c785d0015b
commit add4ca8005
357 changed files with 41366 additions and 41447 deletions

View File

@@ -5,180 +5,194 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("if")
@ObfuscatedName("ia")
@Implements("Archive")
public class Archive extends AbstractArchive {
@ObfuscatedName("aw")
@ObfuscatedName("az")
@Export("Archive_crc")
static CRC32 Archive_crc;
@ObfuscatedName("m")
@ObfuscatedName("r")
@ObfuscatedSignature(
signature = "Lkg;"
signature = "Lky;"
)
@Export("archiveDisk")
ArchiveDisk archiveDisk;
@ObfuscatedName("g")
@ObfuscatedName("s")
@ObfuscatedSignature(
signature = "Lkg;"
signature = "Lky;"
)
@Export("masterDisk")
ArchiveDisk masterDisk;
@ObfuscatedName("r")
@ObfuscatedName("a")
@ObfuscatedGetter(
intValue = -1842467633
intValue = 1512012277
)
@Export("index")
int index;
@ObfuscatedName("q")
volatile boolean field3130;
@ObfuscatedName("aa")
boolean field3131;
@ObfuscatedName("av")
@ObfuscatedName("u")
volatile boolean field3159;
@ObfuscatedName("ae")
boolean field3165;
@ObfuscatedName("af")
@Export("validGroups")
volatile boolean[] validGroups;
@ObfuscatedName("as")
@ObfuscatedName("ax")
@ObfuscatedGetter(
intValue = -1109025613
intValue = 291322429
)
@Export("indexCrc")
int indexCrc;
@ObfuscatedName("ak")
@ObfuscatedName("aj")
@ObfuscatedGetter(
intValue = -1689263625
intValue = 1082053615
)
@Export("indexVersion")
int indexVersion;
@ObfuscatedName("au")
@ObfuscatedGetter(
intValue = 756827345
intValue = 1711156023
)
int field3128;
int field3157;
static {
Archive_crc = new CRC32();
}
@ObfuscatedSignature(
signature = "(Lkg;Lkg;IZZZ)V"
signature = "(Lky;Lky;IZZZ)V"
)
public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) {
super(var4, var5);
this.field3130 = false;
this.field3131 = false;
this.field3128 = -1;
this.field3159 = false;
this.field3165 = false;
this.field3157 = -1;
this.archiveDisk = var1;
this.masterDisk = var2;
this.index = var3;
this.field3131 = var6;
class48.method862(this, this.index);
this.field3165 = var6;
class83.method2110(this, this.index);
}
@ObfuscatedName("i")
@ObfuscatedName("t")
@ObfuscatedSignature(
signature = "(II)V",
garbageValue = "236985177"
garbageValue = "-1758408707"
)
@Export("loadRegionFromGroup")
void loadRegionFromGroup(int var1) {
int var2 = this.index;
long var3 = (long)((var2 << 16) + var1);
NetFileRequest var5 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var3);
if (var5 != null) {
NetCache.NetCache_pendingWritesQueue.addLast(var5);
}
class210.method4032(this.index, var1);
}
@ObfuscatedName("a")
@ObfuscatedName("j")
@ObfuscatedSignature(
signature = "(IS)I",
garbageValue = "6161"
signature = "(IB)I",
garbageValue = "27"
)
@Export("groupLoadPercent")
int groupLoadPercent(int var1) {
if (super.groups[var1] != null) {
return 100;
} else if (this.validGroups[var1]) {
return 100;
} else {
return this.validGroups[var1] ? 100 : Clock.method3489(this.index, var1);
int var3 = this.index;
long var4 = (long)((var3 << 16) + var1);
int var2;
if (GrandExchangeEvent.NetCache_currentResponse != null && GrandExchangeEvent.NetCache_currentResponse.key == var4) {
var2 = VertexNormal.NetCache_responseArchiveBuffer.offset * 99 / (VertexNormal.NetCache_responseArchiveBuffer.array.length - GrandExchangeEvent.NetCache_currentResponse.padding) + 1;
} else {
var2 = 0;
}
return var2;
}
}
@ObfuscatedName("l")
@ObfuscatedName("v")
@ObfuscatedSignature(
signature = "(II)V",
garbageValue = "1606315041"
garbageValue = "1179679189"
)
@Export("loadGroup")
void loadGroup(int var1) {
if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) {
class30.method543(var1, this.archiveDisk, this);
NetSocket.method3613(var1, this.archiveDisk, this);
} else {
class226.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true);
BuddyRankComparator.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true);
}
}
@ObfuscatedName("de")
@ObfuscatedName("dc")
@ObfuscatedSignature(
signature = "(B)Z",
garbageValue = "-47"
signature = "(I)Z",
garbageValue = "-757168814"
)
public boolean method4246() {
return this.field3130;
public boolean method4372() {
return this.field3159;
}
@ObfuscatedName("df")
@ObfuscatedName("dj")
@ObfuscatedSignature(
signature = "(I)I",
garbageValue = "1662836587"
garbageValue = "1215614912"
)
@Export("percentage")
public int percentage() {
if (this.field3130) {
if (this.field3159) {
return 100;
} else if (super.groups != null) {
return 99;
} else {
int var1 = Clock.method3489(255, this.index);
if (var1 >= 100) {
var1 = 99;
int var2 = this.index;
long var3 = (long)(var2 + 16711680);
int var1;
if (GrandExchangeEvent.NetCache_currentResponse != null && var3 == GrandExchangeEvent.NetCache_currentResponse.key) {
var1 = VertexNormal.NetCache_responseArchiveBuffer.offset * 99 / (VertexNormal.NetCache_responseArchiveBuffer.array.length - GrandExchangeEvent.NetCache_currentResponse.padding) + 1;
} else {
var1 = 0;
}
return var1;
int var5 = var1;
if (var1 >= 100) {
var5 = 99;
}
return var5;
}
}
@ObfuscatedName("di")
@ObfuscatedName("de")
@ObfuscatedSignature(
signature = "(III)V",
garbageValue = "-190190944"
signature = "(IIB)V",
garbageValue = "0"
)
@Export("loadIndex")
public void loadIndex(int var1, int var2) {
void loadIndex(int var1, int var2) {
this.indexCrc = var1;
this.indexVersion = var2;
if (this.masterDisk != null) {
class30.method543(this.index, this.masterDisk, this);
NetSocket.method3613(this.index, this.masterDisk, this);
} else {
class226.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
BuddyRankComparator.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
}
}
@ObfuscatedName("dr")
@ObfuscatedName("df")
@ObfuscatedSignature(
signature = "(I[BZZI)V",
garbageValue = "-1214934891"
garbageValue = "1506082666"
)
@Export("write")
public void write(int var1, byte[] var2, boolean var3, boolean var4) {
void write(int var1, byte[] var2, boolean var3, boolean var4) {
if (var3) {
if (this.field3130) {
if (this.field3159) {
throw new RuntimeException();
}
if (this.masterDisk != null) {
ByteArrayPool.method5805(this.index, var2, this.masterDisk);
BuddyRankComparator.method3507(this.index, var2, this.masterDisk);
}
this.decodeIndex(var2);
@@ -187,7 +201,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) {
ByteArrayPool.method5805(var1, var2, this.archiveDisk);
BuddyRankComparator.method3507(var1, var2, this.archiveDisk);
this.validGroups[var1] = true;
}
@@ -210,21 +224,21 @@ public class Archive extends AbstractArchive {
}
@ObfuscatedName("dg")
@ObfuscatedName("dn")
@ObfuscatedSignature(
signature = "(Lkg;I[BZI)V",
garbageValue = "-1566911980"
signature = "(Lky;I[BZB)V",
garbageValue = "-124"
)
@Export("load")
void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) {
int var5;
if (var1 == this.masterDisk) {
if (this.field3130) {
if (this.field3159) {
throw new RuntimeException();
}
if (var3 == null) {
class226.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
BuddyRankComparator.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
return;
}
@@ -232,11 +246,11 @@ public class Archive extends AbstractArchive {
Archive_crc.update(var3, 0, var3.length);
var5 = (int)Archive_crc.getValue();
if (var5 != this.indexCrc) {
class226.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
BuddyRankComparator.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
return;
}
Buffer var11 = new Buffer(Skills.decompressBytes(var3));
Buffer var11 = new Buffer(class2.decompressBytes(var3));
int var12 = var11.readUnsignedByte();
if (var12 != 5 && var12 != 6) {
throw new RuntimeException(var12 + "," + this.index + "," + var2);
@@ -248,21 +262,21 @@ public class Archive extends AbstractArchive {
}
if (var8 != this.indexVersion) {
class226.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
BuddyRankComparator.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
return;
}
this.decodeIndex(var3);
this.loadAllLocal();
} else {
if (!var4 && var2 == this.field3128) {
this.field3130 = true;
if (!var4 && var2 == this.field3157) {
this.field3159 = true;
}
if (var3 == null || var3.length <= 2) {
this.validGroups[var2] = false;
if (this.field3131 || var4) {
class226.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
if (this.field3165 || var4) {
BuddyRankComparator.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
}
return;
@@ -274,8 +288,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.field3131 || var4) {
class226.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
if (this.field3165 || var4) {
BuddyRankComparator.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
}
return;
@@ -301,10 +315,10 @@ public class Archive extends AbstractArchive {
}
@ObfuscatedName("dh")
@ObfuscatedName("dy")
@ObfuscatedSignature(
signature = "(I)V",
garbageValue = "-1822102759"
garbageValue = "-901365537"
)
@Export("loadAllLocal")
void loadAllLocal() {
@@ -316,46 +330,56 @@ public class Archive extends AbstractArchive {
}
if (this.archiveDisk == null) {
this.field3130 = true;
this.field3159 = true;
} else {
this.field3128 = -1;
this.field3157 = -1;
for (var1 = 0; var1 < this.validGroups.length; ++var1) {
if (super.fileCounts[var1] > 0) {
WorldMapLabelSize.method186(var1, this.archiveDisk, this);
this.field3128 = var1;
ArchiveDisk var2 = this.archiveDisk;
ArchiveDiskAction var4 = new ArchiveDiskAction();
var4.type = 1;
var4.key = (long)var1;
var4.archiveDisk = var2;
var4.archive = this;
synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) {
ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var4);
}
NetSocket.method3595();
this.field3157 = var1;
}
}
if (this.field3128 == -1) {
this.field3130 = true;
if (this.field3157 == -1) {
this.field3159 = true;
}
}
}
@ObfuscatedName("dl")
@ObfuscatedName("dq")
@ObfuscatedSignature(
signature = "(II)Z",
garbageValue = "1057662007"
garbageValue = "1567701044"
)
public boolean method4266(int var1) {
public boolean method4347(int var1) {
return this.validGroups[var1];
}
@ObfuscatedName("da")
@ObfuscatedName("dd")
@ObfuscatedSignature(
signature = "(II)Z",
garbageValue = "693879570"
garbageValue = "-507892306"
)
public boolean method4275(int var1) {
public boolean method4348(int var1) {
return this.getGroupFileIds(var1) != null;
}
@ObfuscatedName("dp")
@ObfuscatedName("dr")
@ObfuscatedSignature(
signature = "(I)I",
garbageValue = "-576778169"
garbageValue = "1870889361"
)
@Export("loadPercent")
public int loadPercent() {
@@ -377,34 +401,4 @@ 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);
}
}
}
}
}