diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index b9dc3adc40..0129db565e 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -29,7 +29,7 @@ object ProjectVersions { const val openosrsVersion = "2.1.24-SNAPSHOT" - const val rsversion = 187 + const val rsversion = 188 const val cacheversion = 165 } diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java index faa87bf2d1..4ab9ccf557 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -1811,7 +1811,7 @@ public abstract class RSClientMixin implements RSClient { if (volume > 0 && client.getMusicVolume() <= 0 && client.getCurrentTrackGroupId() != -1) { - client.playMusicTrack(client.getMusicTracks(), client.getCurrentTrackGroupId(), 0, volume, false); + client.playMusicTrack(1000, client.getMusicTracks(), client.getCurrentTrackGroupId(), 0, volume, false); } client.setClientMusicVolume(volume); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java index 3d30a06166..946e52b682 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java @@ -1072,7 +1072,7 @@ public interface RSClient extends RSGameShell, Client void setViewportWalking(boolean viewportWalking); @Import("playMusicTrack") - void playMusicTrack(RSAbstractArchive var0, int var1, int var2, int var3, boolean var4); + void playMusicTrack(int var0, RSAbstractArchive var1, int var2, int var3, int var4, boolean var5); @Import("midiPcmStream") RSMidiPcmStream getMidiPcmStream(); diff --git a/runescape-client/src/main/java/AbstractArchive.java b/runescape-client/src/main/java/AbstractArchive.java index 4ca50dc63c..b9c3ff931b 100644 --- a/runescape-client/src/main/java/AbstractArchive.java +++ b/runescape-client/src/main/java/AbstractArchive.java @@ -3,83 +3,82 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("hz") +@ObfuscatedName("ii") @Implements("AbstractArchive") public abstract class AbstractArchive { - @ObfuscatedName("k") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Llw;" + signature = "Llg;" ) @Export("gzipDecompressor") static GZipDecompressor gzipDecompressor; - @ObfuscatedName("j") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 433676401 + intValue = 1542762901 ) - static int field3118; - @ObfuscatedName("i") + static int field3148; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1190752161 + intValue = 836955159 ) @Export("groupCount") int groupCount; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("groupIds") int[] groupIds; - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("groupNameHashes") int[] groupNameHashes; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Llq;" + signature = "Llk;" ) @Export("groupNameHashTable") IntHashTable groupNameHashTable; - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("groupCrcs") int[] groupCrcs; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("groupVersions") int[] groupVersions; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("fileCounts") int[] fileCounts; - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("fileIds") int[][] fileIds; - @ObfuscatedName("d") + @ObfuscatedName("m") @Export("fileNameHashes") int[][] fileNameHashes; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "[Llq;" + signature = "[Llk;" ) @Export("fileNameHashTables") IntHashTable[] fileNameHashTables; - @ObfuscatedName("o") + @ObfuscatedName("h") @Export("groups") Object[] groups; @ObfuscatedName("v") @Export("files") Object[][] files; - @ObfuscatedName("s") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1303272215 + intValue = 648103117 ) @Export("hash") public int hash; - @ObfuscatedName("l") + @ObfuscatedName("w") @Export("releaseGroups") boolean releaseGroups; - @ObfuscatedName("t") + @ObfuscatedName("k") @Export("shallowFiles") boolean shallowFiles; static { gzipDecompressor = new GZipDecompressor(); - field3118 = 0; + field3148 = 0; } AbstractArchive(boolean var1, boolean var2) { @@ -87,133 +86,131 @@ public abstract class AbstractArchive { this.shallowFiles = var2; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "([BI)V", - garbageValue = "105045873" + garbageValue = "324274119" ) @Export("decodeIndex") void decodeIndex(byte[] var1) { - int var3 = var1.length; - int var2 = Timer.method5033(var1, 0, var3); - this.hash = var2; - Buffer var4 = new Buffer(Skills.decompressBytes(var1)); - int var5 = var4.readUnsignedByte(); - if (var5 >= 5 && var5 <= 7) { - if (var5 >= 6) { - var4.readInt(); + this.hash = Timer.method5068(var1, var1.length); + Buffer var2 = new Buffer(class2.decompressBytes(var1)); + int var3 = var2.readUnsignedByte(); + if (var3 >= 5 && var3 <= 7) { + if (var3 >= 6) { + var2.readInt(); } - int var6 = var4.readUnsignedByte(); - if (var5 >= 7) { - this.groupCount = var4.method5559(); + int var4 = var2.readUnsignedByte(); + if (var3 >= 7) { + this.groupCount = var2.method5592(); } else { - this.groupCount = var4.readUnsignedShort(); + this.groupCount = var2.readUnsignedShort(); } - int var7 = 0; - int var8 = -1; + int var5 = 0; + int var6 = -1; this.groupIds = new int[this.groupCount]; - int var9; - if (var5 >= 7) { - for (var9 = 0; var9 < this.groupCount; ++var9) { - this.groupIds[var9] = var7 += var4.method5559(); - if (this.groupIds[var9] > var8) { - var8 = this.groupIds[var9]; + int var7; + if (var3 >= 7) { + for (var7 = 0; var7 < this.groupCount; ++var7) { + this.groupIds[var7] = var5 += var2.method5592(); + if (this.groupIds[var7] > var6) { + var6 = this.groupIds[var7]; } } } else { - for (var9 = 0; var9 < this.groupCount; ++var9) { - this.groupIds[var9] = var7 += var4.readUnsignedShort(); - if (this.groupIds[var9] > var8) { - var8 = this.groupIds[var9]; + for (var7 = 0; var7 < this.groupCount; ++var7) { + this.groupIds[var7] = var5 += var2.readUnsignedShort(); + if (this.groupIds[var7] > var6) { + var6 = this.groupIds[var7]; } } } - this.groupCrcs = new int[var8 + 1]; - this.groupVersions = new int[var8 + 1]; - this.fileCounts = new int[var8 + 1]; - this.fileIds = new int[var8 + 1][]; - this.groups = new Object[var8 + 1]; - this.files = new Object[var8 + 1][]; - if (var6 != 0) { - this.groupNameHashes = new int[var8 + 1]; + this.groupCrcs = new int[var6 + 1]; + this.groupVersions = new int[var6 + 1]; + this.fileCounts = new int[var6 + 1]; + this.fileIds = new int[var6 + 1][]; + this.groups = new Object[var6 + 1]; + this.files = new Object[var6 + 1][]; + if (var4 != 0) { + this.groupNameHashes = new int[var6 + 1]; - for (var9 = 0; var9 < this.groupCount; ++var9) { - this.groupNameHashes[this.groupIds[var9]] = var4.readInt(); + for (var7 = 0; var7 < this.groupCount; ++var7) { + this.groupNameHashes[this.groupIds[var7]] = var2.readInt(); } this.groupNameHashTable = new IntHashTable(this.groupNameHashes); } - for (var9 = 0; var9 < this.groupCount; ++var9) { - this.groupCrcs[this.groupIds[var9]] = var4.readInt(); + for (var7 = 0; var7 < this.groupCount; ++var7) { + this.groupCrcs[this.groupIds[var7]] = var2.readInt(); } - for (var9 = 0; var9 < this.groupCount; ++var9) { - this.groupVersions[this.groupIds[var9]] = var4.readInt(); + for (var7 = 0; var7 < this.groupCount; ++var7) { + this.groupVersions[this.groupIds[var7]] = var2.readInt(); } - for (var9 = 0; var9 < this.groupCount; ++var9) { - this.fileCounts[this.groupIds[var9]] = var4.readUnsignedShort(); + for (var7 = 0; var7 < this.groupCount; ++var7) { + this.fileCounts[this.groupIds[var7]] = var2.readUnsignedShort(); } + int var8; + int var9; int var10; int var11; int var12; - int var13; - int var14; - if (var5 >= 7) { - for (var9 = 0; var9 < this.groupCount; ++var9) { - var10 = this.groupIds[var9]; - var11 = this.fileCounts[var10]; - var7 = 0; - var12 = -1; - this.fileIds[var10] = new int[var11]; + if (var3 >= 7) { + for (var7 = 0; var7 < this.groupCount; ++var7) { + var8 = this.groupIds[var7]; + var9 = this.fileCounts[var8]; + var5 = 0; + var10 = -1; + this.fileIds[var8] = new int[var9]; - for (var13 = 0; var13 < var11; ++var13) { - var14 = this.fileIds[var10][var13] = var7 += var4.method5559(); - if (var14 > var12) { - var12 = var14; + for (var11 = 0; var11 < var9; ++var11) { + var12 = this.fileIds[var8][var11] = var5 += var2.method5592(); + if (var12 > var10) { + var10 = var12; } } - this.files[var10] = new Object[var12 + 1]; + this.files[var8] = new Object[var10 + 1]; } } else { - for (var9 = 0; var9 < this.groupCount; ++var9) { - var10 = this.groupIds[var9]; - var11 = this.fileCounts[var10]; - var7 = 0; - var12 = -1; - this.fileIds[var10] = new int[var11]; + for (var7 = 0; var7 < this.groupCount; ++var7) { + var8 = this.groupIds[var7]; + var9 = this.fileCounts[var8]; + var5 = 0; + var10 = -1; + this.fileIds[var8] = new int[var9]; - for (var13 = 0; var13 < var11; ++var13) { - var14 = this.fileIds[var10][var13] = var7 += var4.readUnsignedShort(); - if (var14 > var12) { - var12 = var14; + for (var11 = 0; var11 < var9; ++var11) { + var12 = this.fileIds[var8][var11] = var5 += var2.readUnsignedShort(); + if (var12 > var10) { + var10 = var12; } } - this.files[var10] = new Object[var12 + 1]; + this.files[var8] = new Object[var10 + 1]; } } - if (var6 != 0) { - this.fileNameHashes = new int[var8 + 1][]; - this.fileNameHashTables = new IntHashTable[var8 + 1]; + if (var4 != 0) { + this.fileNameHashes = new int[var6 + 1][]; + this.fileNameHashTables = new IntHashTable[var6 + 1]; - for (var9 = 0; var9 < this.groupCount; ++var9) { - var10 = this.groupIds[var9]; - var11 = this.fileCounts[var10]; - this.fileNameHashes[var10] = new int[this.files[var10].length]; + for (var7 = 0; var7 < this.groupCount; ++var7) { + var8 = this.groupIds[var7]; + var9 = this.fileCounts[var8]; + this.fileNameHashes[var8] = new int[this.files[var8].length]; - for (var12 = 0; var12 < var11; ++var12) { - this.fileNameHashes[var10][this.fileIds[var10][var12]] = var4.readInt(); + for (var10 = 0; var10 < var9; ++var10) { + this.fileNameHashes[var8][this.fileIds[var8][var10]] = var2.readInt(); } - this.fileNameHashTables[var10] = new IntHashTable(this.fileNameHashes[var10]); + this.fileNameHashTables[var8] = new IntHashTable(this.fileNameHashes[var8]); } } @@ -222,29 +219,29 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "236985177" + garbageValue = "-1758408707" ) @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(III)[B", - garbageValue = "-429733349" + signature = "(IIS)[B", + garbageValue = "-10226" ) @Export("takeFile") public byte[] takeFile(int var1, int var2) { return this.takeFileEncrypted(var1, var2, (int[])null); } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(II[IB)[B", - garbageValue = "1" + signature = "(II[IS)[B", + garbageValue = "-26073" ) @Export("takeFileEncrypted") public byte[] takeFileEncrypted(int var1, int var2, int[] var3) { @@ -286,10 +283,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(IIB)Z", - garbageValue = "25" + garbageValue = "2" ) @Export("tryLoadFile") public boolean tryLoadFile(int var1, int var2) { @@ -307,12 +304,12 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(IB)Z", - garbageValue = "120" + garbageValue = "-56" ) - public boolean method4157(int var1) { + public boolean method4224(int var1) { if (this.files.length == 1) { return this.tryLoadFile(0, var1); } else if (this.files[var1].length == 1) { @@ -322,10 +319,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "5" + signature = "(II)Z", + garbageValue = "-1747453394" ) @Export("tryLoadGroup") public boolean tryLoadGroup(int var1) { @@ -337,10 +334,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-1599628318" + signature = "(B)Z", + garbageValue = "8" ) @Export("isFullyLoaded") public boolean isFullyLoaded() { @@ -359,20 +356,20 @@ public abstract class AbstractArchive { return var1; } - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IS)I", - garbageValue = "6161" + signature = "(IB)I", + garbageValue = "27" ) @Export("groupLoadPercent") int groupLoadPercent(int var1) { return this.groups[var1] != null ? 100 : 0; } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IS)[B", - garbageValue = "19233" + signature = "(II)[B", + garbageValue = "-1122703928" ) @Export("takeFileFlat") public byte[] takeFileFlat(int var1) { @@ -385,10 +382,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(III)[B", - garbageValue = "-1676912636" + signature = "(IIB)[B", + garbageValue = "11" ) @Export("getFile") public byte[] getFile(int var1, int var2) { @@ -426,10 +423,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(II)[B", - garbageValue = "1222234626" + signature = "(IB)[B", + garbageValue = "20" ) @Export("getFileFlat") public byte[] getFileFlat(int var1) { @@ -442,49 +439,49 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("l") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1606315041" + garbageValue = "1179679189" ) @Export("loadGroup") void loadGroup(int var1) { } - @ObfuscatedName("t") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(II)[I", - garbageValue = "1353626049" + garbageValue = "1870169263" ) @Export("getGroupFileIds") public int[] getGroupFileIds(int var1) { return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(IB)I", - garbageValue = "-34" + garbageValue = "83" ) @Export("getGroupFileCount") public int getGroupFileCount(int var1) { return this.files[var1].length; } - @ObfuscatedName("n") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(S)I", - garbageValue = "24456" + signature = "(I)I", + garbageValue = "-2083361836" ) @Export("getGroupCount") public int getGroupCount() { return this.files.length; } - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "0" + signature = "(I)V", + garbageValue = "-2144159595" ) @Export("clearGroups") public void clearGroups() { @@ -497,7 +494,7 @@ public abstract class AbstractArchive { @ObfuscatedName("z") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-667248353" + garbageValue = "1860298470" ) @Export("clearFilesGroup") public void clearFilesGroup(int var1) { @@ -507,10 +504,10 @@ public abstract class AbstractArchive { } - @ObfuscatedName("h") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1078168043" + garbageValue = "-2052832906" ) @Export("clearFiles") public void clearFiles() { @@ -524,10 +521,10 @@ public abstract class AbstractArchive { } - @ObfuscatedName("m") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(I[II)Z", - garbageValue = "-518851469" + signature = "(I[IB)Z", + garbageValue = "-1" ) @Export("buildFiles") boolean buildFiles(int var1, int[] var2) { @@ -550,48 +547,66 @@ public abstract class AbstractArchive { return true; } else { byte[] var8; + Object var9; + byte[] var10; byte[] var21; + AbstractByteArrayCopier var26; if (var2 != null && (var2[0] != 0 || var2[1] != 0 || var2[2] != 0 || var2[3] != 0)) { - var21 = class268.serialize(this.groups[var1], true); - Buffer var26 = new Buffer(var21); - var26.xteaDecrypt(var2, 5, var26.array.length); - } else { - Object var9 = this.groups[var1]; + var9 = this.groups[var1]; if (var9 == null) { var8 = null; } else if (var9 instanceof byte[]) { - byte[] var23 = (byte[])((byte[])var9); - var8 = var23; + var10 = (byte[])((byte[])var9); + var8 = WorldMapSectionType.method250(var10); } else { if (!(var9 instanceof AbstractByteArrayCopier)) { throw new IllegalArgumentException(); } - AbstractByteArrayCopier var29 = (AbstractByteArrayCopier)var9; - var8 = var29.get(); + var26 = (AbstractByteArrayCopier)var9; + var8 = var26.get(); + } + + var21 = var8; + Buffer var27 = new Buffer(var8); + var27.xteaDecrypt(var2, 5, var27.array.length); + } else { + var9 = this.groups[var1]; + if (var9 == null) { + var8 = null; + } else if (var9 instanceof byte[]) { + var10 = (byte[])((byte[])var9); + var8 = var10; + } else { + if (!(var9 instanceof AbstractByteArrayCopier)) { + throw new IllegalArgumentException(); + } + + var26 = (AbstractByteArrayCopier)var9; + var8 = var26.get(); } var21 = var8; } - var8 = Skills.decompressBytes(var21); + var8 = class2.decompressBytes(var21); if (this.releaseGroups) { this.groups[var1] = null; } - int var10; + int var23; if (var3 > 1) { int var22 = var8.length; --var22; - var10 = var8[var22] & 255; - var22 -= var3 * var10 * 4; + var23 = var8[var22] & 255; + var22 -= var23 * var3 * 4; Buffer var11 = new Buffer(var8); int[] var12 = new int[var3]; var11.offset = var22; int var14; int var15; - for (int var13 = 0; var13 < var10; ++var13) { + for (int var13 = 0; var13 < var23; ++var13) { var14 = 0; for (var15 = 0; var15 < var3; ++var15) { @@ -611,7 +626,7 @@ public abstract class AbstractArchive { var14 = 0; int var17; - for (var15 = 0; var15 < var10; ++var15) { + for (var15 = 0; var15 < var23; ++var15) { int var16 = 0; for (var17 = 0; var17 < var3; ++var17) { @@ -643,19 +658,19 @@ public abstract class AbstractArchive { } } } else if (!this.shallowFiles) { - var10 = var4[0]; - Object var27; + var23 = var4[0]; + Object var28; if (var8 == null) { - var27 = null; + var28 = null; } else if (var8.length > 136) { - DirectByteArrayCopier var28 = new DirectByteArrayCopier(); - var28.set(var8); - var27 = var28; + DirectByteArrayCopier var29 = new DirectByteArrayCopier(); + var29.set(var8); + var28 = var29; } else { - var27 = var8; + var28 = var8; } - var5[var10] = var27; + var5[var23] = var28; } else { var5[var4[0]] = var8; } @@ -665,505 +680,109 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("aa") + @ObfuscatedName("a") @ObfuscatedSignature( signature = "(Ljava/lang/String;I)I", - garbageValue = "-201265341" + garbageValue = "-674594159" ) @Export("getGroupId") public int getGroupId(String var1) { var1 = var1.toLowerCase(); - return this.groupNameHashTable.get(class81.hashString(var1)); + return this.groupNameHashTable.get(GameShell.hashString(var1)); } - @ObfuscatedName("av") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(ILjava/lang/String;I)I", - garbageValue = "-531189072" + garbageValue = "-1938235992" ) @Export("getFileId") public int getFileId(int var1, String var2) { var2 = var2.toLowerCase(); - return this.fileNameHashTables[var1].get(class81.hashString(var2)); + return this.fileNameHashTables[var1].get(GameShell.hashString(var2)); } - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedSignature( signature = "(Ljava/lang/String;Ljava/lang/String;I)Z", - garbageValue = "-614905429" + garbageValue = "1887226326" ) @Export("isValidFileName") public boolean isValidFileName(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(class81.hashString(var1)); + int var3 = this.groupNameHashTable.get(GameShell.hashString(var1)); if (var3 < 0) { return false; } else { - int var4 = this.fileNameHashTables[var3].get(class81.hashString(var2)); + int var4 = this.fileNameHashTables[var3].get(GameShell.hashString(var2)); return var4 >= 0; } } - @ObfuscatedName("as") + @ObfuscatedName("af") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;I)[B", - garbageValue = "-1446365619" + signature = "(Ljava/lang/String;Ljava/lang/String;B)[B", + garbageValue = "-87" ) @Export("takeFileByNames") public byte[] takeFileByNames(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(class81.hashString(var1)); - int var4 = this.fileNameHashTables[var3].get(class81.hashString(var2)); + int var3 = this.groupNameHashTable.get(GameShell.hashString(var1)); + int var4 = this.fileNameHashTables[var3].get(GameShell.hashString(var2)); return this.takeFile(var3, var4); } - @ObfuscatedName("ak") + @ObfuscatedName("az") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;B)Z", - garbageValue = "-92" + signature = "(Ljava/lang/String;Ljava/lang/String;I)Z", + garbageValue = "1903495537" ) @Export("tryLoadFileByNames") public boolean tryLoadFileByNames(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(class81.hashString(var1)); - int var4 = this.fileNameHashTables[var3].get(class81.hashString(var2)); + int var3 = this.groupNameHashTable.get(GameShell.hashString(var1)); + int var4 = this.fileNameHashTables[var3].get(GameShell.hashString(var2)); return this.tryLoadFile(var3, var4); } - @ObfuscatedName("au") + @ObfuscatedName("ax") @ObfuscatedSignature( signature = "(Ljava/lang/String;I)Z", - garbageValue = "1377272883" + garbageValue = "-1357995676" ) @Export("tryLoadGroupByName") public boolean tryLoadGroupByName(String var1) { var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(class81.hashString(var1)); + int var2 = this.groupNameHashTable.get(GameShell.hashString(var1)); return this.tryLoadGroup(var2); } - @ObfuscatedName("ah") + @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "(Ljava/lang/String;S)V", - garbageValue = "1980" + signature = "(Ljava/lang/String;I)V", + garbageValue = "994130396" ) @Export("loadRegionFromName") public void loadRegionFromName(String var1) { var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(class81.hashString(var1)); + int var2 = this.groupNameHashTable.get(GameShell.hashString(var1)); if (var2 >= 0) { this.loadRegionFromGroup(var2); } } - @ObfuscatedName("aq") + @ObfuscatedName("au") @ObfuscatedSignature( - signature = "(Ljava/lang/String;S)I", - garbageValue = "27201" + signature = "(Ljava/lang/String;I)I", + garbageValue = "1917128614" ) @Export("groupLoadPercentByName") public int groupLoadPercentByName(String var1) { var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(class81.hashString(var1)); + int var2 = this.groupNameHashTable.get(GameShell.hashString(var1)); return this.groupLoadPercent(var2); } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(BI)C", - garbageValue = "1023580311" - ) - public static char method4124(byte var0) { - int var1 = var0 & 255; - if (var1 == 0) { - throw new IllegalArgumentException("" + Integer.toString(var1, 16)); - } else { - if (var1 >= 128 && var1 < 160) { - char var2 = class287.cp1252AsciiExtension[var1 - 128]; - if (var2 == 0) { - var2 = '?'; - } - - var1 = var2; - } - - return (char)var1; - } - } - - @ObfuscatedName("av") - @ObfuscatedSignature( - signature = "(ILcu;ZI)I", - garbageValue = "1255135753" - ) - static int method4166(int var0, Script var1, boolean var2) { - String var3; - if (var0 == ScriptOpcodes.MES) { - var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - class83.addGameMessage(0, "", var3); - return 1; - } else if (var0 == ScriptOpcodes.ANIM) { - class188.Interpreter_intStackSize -= 2; - BuddyRankComparator.performPlayerAnimation(Message.localPlayer, Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]); - return 1; - } else if (var0 == ScriptOpcodes.IF_CLOSE) { - if (!Interpreter.field1078) { - Interpreter.field1077 = true; - } - - return 1; - } else { - int var10; - if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { - var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - var10 = 0; - if (SecureRandomFuture.isNumber(var3)) { - var10 = ArchiveDiskActionHandler.parseInt(var3); - } - - PacketBufferNode var12 = class2.getPacketBufferNode(ClientPacket.field2192, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeInt(var10); - Client.packetWriter.addNode(var12); - return 1; - } else { - PacketBufferNode var14; - if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { - var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - var14 = class2.getPacketBufferNode(ClientPacket.field2271, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeByte(var3.length() + 1); - var14.packetBuffer.writeStringCp1252NullTerminated(var3); - Client.packetWriter.addNode(var14); - return 1; - } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { - var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - var14 = class2.getPacketBufferNode(ClientPacket.field2188, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeByte(var3.length() + 1); - var14.packetBuffer.writeStringCp1252NullTerminated(var3); - Client.packetWriter.addNode(var14); - return 1; - } else { - String var7; - int var15; - if (var0 == ScriptOpcodes.OPPLAYER) { - var15 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - WorldMapArea.method364(var15, var7); - return 1; - } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { - class188.Interpreter_intStackSize -= 3; - var15 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var10 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - int var9 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2]; - Widget var13 = Tile.getWidget(var9); - GrandExchangeOfferNameComparator.clickWidget(var13, var15, var10); - return 1; - } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { - class188.Interpreter_intStackSize -= 2; - var15 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var10 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - Widget var11 = var2 ? UserComparator7.field1946 : class197.field2398; - GrandExchangeOfferNameComparator.clickWidget(var11, var15, var10); - return 1; - } else if (var0 == ScriptOpcodes.MOUSECAM) { - NetFileRequest.mouseCam = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Interpreter.clientPreferences.roofsHidden ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { - Interpreter.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - FriendSystem.savePreferences(); - return 1; - } else if (var0 == ScriptOpcodes.OPENURL) { - var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - boolean var4 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - class13.openURL(var3, var4, false); - return 1; - } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { - var15 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - var14 = class2.getPacketBufferNode(ClientPacket.field2178, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeShort(var15); - Client.packetWriter.addNode(var14); - return 1; - } else if (var0 == ScriptOpcodes.BUG_REPORT) { - var15 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - class65.Interpreter_stringStackSize -= 2; - var7 = Interpreter.Interpreter_stringStack[class65.Interpreter_stringStackSize]; - String var5 = Interpreter.Interpreter_stringStack[class65.Interpreter_stringStackSize + 1]; - if (var7.length() > 500) { - return 1; - } else if (var5.length() > 500) { - return 1; - } else { - PacketBufferNode var6 = class2.getPacketBufferNode(ClientPacket.field2218, Client.packetWriter.isaacCipher); - var6.packetBuffer.writeShort(1 + ViewportMouse.stringCp1252NullTerminatedByteSize(var7) + ViewportMouse.stringCp1252NullTerminatedByteSize(var5)); - var6.packetBuffer.writeStringCp1252NullTerminated(var7); - var6.packetBuffer.writeStringCp1252NullTerminated(var5); - var6.packetBuffer.method5696(var15); - Client.packetWriter.addNode(var6); - return 1; - } - } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { - Client.shiftClickDrop = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { - Client.showMouseOverText = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.RENDERSELF) { - Client.renderSelf = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 3120) { - if (Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 1; - } else { - Client.drawPlayerNames &= -2; - } - - return 1; - } else if (var0 == 3121) { - if (Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 2; - } else { - Client.drawPlayerNames &= -3; - } - - return 1; - } else if (var0 == 3122) { - if (Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 4; - } else { - Client.drawPlayerNames &= -5; - } - - return 1; - } else if (var0 == 3123) { - if (Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 8; - } else { - Client.drawPlayerNames &= -9; - } - - return 1; - } else if (var0 == 3124) { - Client.drawPlayerNames = 0; - return 1; - } else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) { - Client.showMouseCross = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { - Client.showLoadingMessages = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.SETTAPTODROP) { - class295.setTapToDrop(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1); - return 1; - } else if (var0 == ScriptOpcodes.GETTAPTODROP) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = class42.getTapToDrop() ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.SETOCULUSORBSPEED) { - class188.Interpreter_intStackSize -= 2; - Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - return 1; - } else if (var0 == 3130) { - class188.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 3131) { - --class188.Interpreter_intStackSize; - return 1; - } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = GrandExchangeOfferTotalQuantityComparator.canvasWidth; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = AttackOption.canvasHeight; - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { - --class188.Interpreter_intStackSize; - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { - class188.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 3136) { - Client.field790 = 3; - Client.field791 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - return 1; - } else if (var0 == 3137) { - Client.field790 = 2; - Client.field791 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - return 1; - } else if (var0 == 3138) { - Client.field790 = 0; - return 1; - } else if (var0 == 3139) { - Client.field790 = 1; - return 1; - } else if (var0 == 3140) { - Client.field790 = 3; - Client.field791 = var2 ? UserComparator7.field1946.id : class197.field2398.id; - return 1; - } else { - boolean var8; - if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { - var8 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - Interpreter.clientPreferences.hideUsername = var8; - FriendSystem.savePreferences(); - return 1; - } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Interpreter.clientPreferences.hideUsername ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { - var8 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - Client.Login_isUsernameRemembered = var8; - if (!var8) { - Interpreter.clientPreferences.rememberedUsername = ""; - FriendSystem.savePreferences(); - } - - return 1; - } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; - return 1; - } else if (var0 == 3145) { - return 1; - } else if (var0 == ScriptOpcodes.SETTITLEMUSICENABLED) { - var8 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - if (var8 == Interpreter.clientPreferences.titleMusicDisabled) { - Interpreter.clientPreferences.titleMusicDisabled = !var8; - FriendSystem.savePreferences(); - } - - return 1; - } else if (var0 == ScriptOpcodes.GETTITLEMUSICENABLED) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Interpreter.clientPreferences.titleMusicDisabled ? 0 : 1; - return 1; - } else if (var0 == 3148) { - return 1; - } else if (var0 == 3149) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3150) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3151) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3152) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3153) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; - return 1; - } else if (var0 == 3154) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = class48.method861(); - return 1; - } else if (var0 == 3155) { - --class65.Interpreter_stringStackSize; - return 1; - } else if (var0 == 3156) { - return 1; - } else if (var0 == 3157) { - class188.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 3158) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3159) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3160) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3161) { - --class188.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3162) { - --class188.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3163) { - --class65.Interpreter_stringStackSize; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3164) { - --class188.Interpreter_intStackSize; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 == 3165) { - --class188.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3166) { - class188.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3167) { - class188.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3168) { - class188.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 == 3169) { - return 1; - } else if (var0 == 3170) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3171) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3172) { - --class188.Interpreter_intStackSize; - return 1; - } else if (var0 == 3173) { - --class188.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3174) { - --class188.Interpreter_intStackSize; - return 1; - } else if (var0 == 3175) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3176) { - return 1; - } else if (var0 == 3177) { - return 1; - } else if (var0 == 3178) { - --class65.Interpreter_stringStackSize; - return 1; - } else if (var0 == 3179) { - return 1; - } else if (var0 == 3180) { - --class65.Interpreter_stringStackSize; - return 1; - } else { - return 2; - } - } - } - } - } - } - - @ObfuscatedName("em") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "1" - ) - static final void method4222() { - Scene.Scene_isLowDetail = false; - Client.isLowDetail = false; - } } diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index 7d02698490..65e19971f5 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -1,50 +1,35 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("gu") +@ObfuscatedName("gv") @Implements("AbstractByteArrayCopier") public abstract class AbstractByteArrayCopier { + @ObfuscatedName("se") + @ObfuscatedGetter( + intValue = -1844063971 + ) + @Export("foundItemIndex") + static int foundItemIndex; + AbstractByteArrayCopier() { } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)[B", - garbageValue = "-112018699" + garbageValue = "-571467457" ) @Export("get") public abstract byte[] get(); - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "([BB)V", - garbageValue = "33" + signature = "([BI)V", + garbageValue = "1471312739" ) @Export("set") public abstract void set(byte[] var1); - - @ObfuscatedName("aw") - @ObfuscatedSignature( - signature = "(ILcu;ZB)I", - garbageValue = "-27" - ) - static int method3937(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.SOUND_SYNTH) { - class188.Interpreter_intStackSize -= 3; - class268.queueSoundEffect(Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2]); - return 1; - } else if (var0 == ScriptOpcodes.SOUND_SONG) { - WorldMapSprite.playSong(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); - return 1; - } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { - class188.Interpreter_intStackSize -= 2; - ScriptFrame.playSoundJingle(Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]); - return 1; - } else { - return 2; - } - } } diff --git a/runescape-client/src/main/java/AbstractFont.java b/runescape-client/src/main/java/AbstractFont.java index 67f5235b80..3e717222ab 100644 --- a/runescape-client/src/main/java/AbstractFont.java +++ b/runescape-client/src/main/java/AbstractFont.java @@ -4,76 +4,76 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kn") +@ObfuscatedName("kc") @Implements("AbstractFont") public abstract class AbstractFont extends Rasterizer2D { - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "[Lli;" ) @Export("AbstractFont_modIconSprites") public static IndexedSprite[] AbstractFont_modIconSprites; - @ObfuscatedName("o") + @ObfuscatedName("h") @Export("AbstractFont_strike") static int AbstractFont_strike; @ObfuscatedName("v") @Export("AbstractFont_underline") static int AbstractFont_underline; - @ObfuscatedName("k") + @ObfuscatedName("n") @Export("AbstractFont_previousShadow") static int AbstractFont_previousShadow; - @ObfuscatedName("s") + @ObfuscatedName("x") @Export("AbstractFont_shadow") static int AbstractFont_shadow; - @ObfuscatedName("l") + @ObfuscatedName("w") @Export("AbstractFont_previousColor") static int AbstractFont_previousColor; - @ObfuscatedName("t") + @ObfuscatedName("k") @Export("AbstractFont_color") static int AbstractFont_color; - @ObfuscatedName("j") + @ObfuscatedName("q") @Export("AbstractFont_alpha") static int AbstractFont_alpha; - @ObfuscatedName("n") + @ObfuscatedName("z") @Export("AbstractFont_justificationTotal") static int AbstractFont_justificationTotal; - @ObfuscatedName("u") + @ObfuscatedName("y") @Export("AbstractFont_justificationCurrent") static int AbstractFont_justificationCurrent; - @ObfuscatedName("z") + @ObfuscatedName("f") @Export("AbstractFont_random") static Random AbstractFont_random; - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("AbstractFont_lines") static String[] AbstractFont_lines; - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("pixels") byte[][] pixels; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("advances") int[] advances; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("widths") int[] widths; - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("heights") int[] heights; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("leftBearings") int[] leftBearings; - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("topBearings") int[] topBearings; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("ascent") public int ascent; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("maxAscent") public int maxAscent; - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("maxDescent") public int maxDescent; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("kerning") byte[] kerning; @@ -123,15 +123,15 @@ public abstract class AbstractFont extends Rasterizer2D { this.readMetrics(var1); } - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("drawGlyph") abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6); - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("drawGlyphAlpha") abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7); - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("readMetrics") void readMetrics(byte[] var1) { this.advances = new int[256]; @@ -193,7 +193,7 @@ public abstract class AbstractFont extends Rasterizer2D { if (var13 != 32 && var13 != 160) { for (var8 = 0; var8 < 256; ++var8) { if (var8 != 32 && var8 != 160) { - this.kerning[var8 + (var13 << 8)] = (byte)method5388(var11, var12, var4, this.advances, var10, var13, var8); + this.kerning[var8 + (var13 << 8)] = (byte)method5414(var11, var12, var4, this.advances, var10, var13, var8); } } } @@ -204,17 +204,17 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("x") + @ObfuscatedName("j") @Export("charWidth") int charWidth(char var1) { if (var1 == 160) { var1 = ' '; } - return this.advances[NetSocket.charToByteCp1252(var1) & 255]; + return this.advances[TextureProvider.charToByteCp1252(var1) & 255]; } - @ObfuscatedName("a") + @ObfuscatedName("m") @Export("stringWidth") public int stringWidth(String var1) { if (var1 == null) { @@ -238,7 +238,7 @@ public abstract class AbstractFont extends Rasterizer2D { if (!var7.equals("gt")) { if (var7.startsWith("img=")) { try { - int var8 = ArchiveDiskActionHandler.parseInt(var7.substring(4)); + int var8 = VerticalAlignment.parseInt(var7.substring(4)); var4 += AbstractFont_modIconSprites[var8].width; var3 = -1; } catch (Exception var10) { @@ -256,7 +256,7 @@ public abstract class AbstractFont extends Rasterizer2D { } if (var2 == -1) { - var4 += this.advances[(char)(NetSocket.charToByteCp1252(var6) & 255)]; + var4 += this.advances[(char)(TextureProvider.charToByteCp1252(var6) & 255)]; if (this.kerning != null && var3 != -1) { var4 += this.kerning[var6 + (var3 << 8)]; } @@ -270,7 +270,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("d") + @ObfuscatedName("p") @Export("breakLines") public int breakLines(String var1, int[] var2, String[] var3) { if (var1 == null) { @@ -321,7 +321,7 @@ public abstract class AbstractFont extends Rasterizer2D { var11 = '>'; } else if (var16.startsWith("img=")) { try { - int var17 = ArchiveDiskActionHandler.parseInt(var16.substring(4)); + int var17 = VerticalAlignment.parseInt(var16.substring(4)); var4 += AbstractFont_modIconSprites[var17].width; var11 = 0; } catch (Exception var20) { @@ -375,7 +375,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("lineWidth") public int lineWidth(String var1, int var2) { int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines); @@ -391,13 +391,13 @@ public abstract class AbstractFont extends Rasterizer2D { return var4; } - @ObfuscatedName("o") + @ObfuscatedName("v") @Export("lineCount") public int lineCount(String var1, int var2) { return this.breakLines(var1, new int[]{var2}, AbstractFont_lines); } - @ObfuscatedName("t") + @ObfuscatedName("x") @Export("draw") public void draw(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { @@ -406,7 +406,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("j") + @ObfuscatedName("w") @Export("drawAlpha") public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { @@ -416,7 +416,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("n") + @ObfuscatedName("q") @Export("drawRightAligned") public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { @@ -425,7 +425,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("u") + @ObfuscatedName("z") @Export("drawCentered") public void drawCentered(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { @@ -434,7 +434,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("z") + @ObfuscatedName("y") @Export("drawLines") public int drawLines(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { if (var1 == null) { @@ -495,7 +495,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("h") + @ObfuscatedName("f") @Export("drawCenteredWave") public void drawCenteredWave(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { @@ -510,7 +510,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("m") + @ObfuscatedName("a") @Export("drawCenteredWave2") public void drawCenteredWave2(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { @@ -527,7 +527,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("aa") + @ObfuscatedName("u") @Export("drawCenteredShake") public void drawCenteredShake(String var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (var1 != null) { @@ -547,7 +547,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("av") + @ObfuscatedName("ae") @Export("drawRandomAlphaAndSpacing") public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { @@ -568,7 +568,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("aw") + @ObfuscatedName("af") @Export("reset") void reset(int var1, int var2) { AbstractFont_strike = -1; @@ -582,28 +582,28 @@ public abstract class AbstractFont extends Rasterizer2D { AbstractFont_justificationCurrent = 0; } - @ObfuscatedName("as") + @ObfuscatedName("az") @Export("decodeTag") void decodeTag(String var1) { try { if (var1.startsWith("col=")) { - AbstractFont_color = VerticalAlignment.method4326(var1.substring(4), 16); + AbstractFont_color = ScriptEvent.method1202(var1.substring(4), 16); } else if (var1.equals("/col")) { AbstractFont_color = AbstractFont_previousColor; } else if (var1.startsWith("str=")) { - AbstractFont_strike = VerticalAlignment.method4326(var1.substring(4), 16); + AbstractFont_strike = ScriptEvent.method1202(var1.substring(4), 16); } else if (var1.equals("str")) { AbstractFont_strike = 8388608; } else if (var1.equals("/str")) { AbstractFont_strike = -1; } else if (var1.startsWith("u=")) { - AbstractFont_underline = VerticalAlignment.method4326(var1.substring(2), 16); + AbstractFont_underline = ScriptEvent.method1202(var1.substring(2), 16); } else if (var1.equals("u")) { AbstractFont_underline = 0; } else if (var1.equals("/u")) { AbstractFont_underline = -1; } else if (var1.startsWith("shad=")) { - AbstractFont_shadow = VerticalAlignment.method4326(var1.substring(5), 16); + AbstractFont_shadow = ScriptEvent.method1202(var1.substring(5), 16); } else if (var1.equals("shad")) { AbstractFont_shadow = 0; } else if (var1.equals("/shad")) { @@ -616,7 +616,7 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("ak") + @ObfuscatedName("ax") @Export("calculateLineJustification") void calculateLineJustification(String var1, int var2) { int var3 = 0; @@ -639,7 +639,7 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("au") + @ObfuscatedName("aj") @Export("draw0") void draw0(String var1, int var2, int var3) { var3 -= this.ascent; @@ -648,7 +648,7 @@ public abstract class AbstractFont extends Rasterizer2D { for (int var6 = 0; var6 < var1.length(); ++var6) { if (var1.charAt(var6) != 0) { - char var7 = (char)(NetSocket.charToByteCp1252(var1.charAt(var6)) & 255); + char var7 = (char)(TextureProvider.charToByteCp1252(var1.charAt(var6)) & 255); if (var7 == '<') { var4 = var6; } else { @@ -662,7 +662,7 @@ public abstract class AbstractFont extends Rasterizer2D { if (!var8.equals("gt")) { if (var8.startsWith("img=")) { try { - var9 = ArchiveDiskActionHandler.parseInt(var8.substring(4)); + var9 = VerticalAlignment.parseInt(var8.substring(4)); IndexedSprite var10 = AbstractFont_modIconSprites[var9]; var10.drawAt(var2, var3 + this.ascent - var10.height); var2 += var10.width; @@ -728,7 +728,7 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("ah") + @ObfuscatedName("au") @Export("drawWithOffsets0") void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) { var3 -= this.ascent; @@ -738,7 +738,7 @@ public abstract class AbstractFont extends Rasterizer2D { for (int var9 = 0; var9 < var1.length(); ++var9) { if (var1.charAt(var9) != 0) { - char var10 = (char)(NetSocket.charToByteCp1252(var1.charAt(var9)) & 255); + char var10 = (char)(TextureProvider.charToByteCp1252(var1.charAt(var9)) & 255); if (var10 == '<') { var6 = var9; } else { @@ -767,7 +767,7 @@ public abstract class AbstractFont extends Rasterizer2D { } ++var8; - var14 = ArchiveDiskActionHandler.parseInt(var11.substring(4)); + var14 = VerticalAlignment.parseInt(var11.substring(4)); IndexedSprite var15 = AbstractFont_modIconSprites[var14]; var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height)); var2 += var15.width; @@ -846,8 +846,8 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("e") - static int method5388(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { + @ObfuscatedName("l") + static int method5414(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { int var7 = var2[var5]; int var8 = var7 + var4[var5]; int var9 = var2[var6]; @@ -882,7 +882,7 @@ public abstract class AbstractFont extends Rasterizer2D { return -var13; } - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("escapeBrackets") public static String escapeBrackets(String var0) { int var1 = var0.length(); @@ -911,7 +911,7 @@ public abstract class AbstractFont extends Rasterizer2D { return var6.toString(); } - @ObfuscatedName("aq") + @ObfuscatedName("ay") @Export("AbstractFont_drawGlyph") static void AbstractFont_drawGlyph(byte[] var0, int var1, int var2, int var3, int var4, int var5) { int var6 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; @@ -953,7 +953,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("ao") + @ObfuscatedName("aa") @Export("AbstractFont_placeGlyph") static void AbstractFont_placeGlyph(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = -(var5 >> 2); @@ -1001,7 +1001,7 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("an") + @ObfuscatedName("aq") @Export("AbstractFont_drawGlyphAlpha") static void AbstractFont_drawGlyphAlpha(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6) { int var7 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; @@ -1043,7 +1043,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("ar") + @ObfuscatedName("as") @Export("AbstractFont_placeGlyphAlpha") static void AbstractFont_placeGlyphAlpha(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { var2 = ((var2 & 65280) * var9 & 16711680) + (var9 * (var2 & 16711935) & -16711936) >> 8; diff --git a/runescape-client/src/main/java/AbstractRasterProvider.java b/runescape-client/src/main/java/AbstractRasterProvider.java index 53702e52e4..dea087d471 100644 --- a/runescape-client/src/main/java/AbstractRasterProvider.java +++ b/runescape-client/src/main/java/AbstractRasterProvider.java @@ -4,21 +4,21 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lk") +@ObfuscatedName("lc") @Implements("AbstractRasterProvider") public abstract class AbstractRasterProvider { - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("pixels") public int[] pixels; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -2051103705 + intValue = -677565243 ) @Export("width") public int width; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 705915003 + intValue = 1515017949 ) @Export("height") public int height; @@ -26,29 +26,51 @@ public abstract class AbstractRasterProvider { protected AbstractRasterProvider() { } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "1570881200" + garbageValue = "-529782293" ) @Export("drawFull") public abstract void drawFull(int var1, int var2); - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIIIB)V", - garbageValue = "-116" + signature = "(IIIII)V", + garbageValue = "934582222" ) @Export("draw") public abstract void draw(int var1, int var2, int var3, int var4); - @ObfuscatedName("h") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1390931728" + signature = "(B)V", + garbageValue = "-96" ) @Export("apply") public final void apply() { Rasterizer2D.Rasterizer2D_replace(this.pixels, this.width, this.height); } + + @ObfuscatedName("fx") + @ObfuscatedSignature( + signature = "(I)Z", + garbageValue = "-569880085" + ) + static boolean method6151() { + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { + while (Client.archiveLoadersDone < Client.archiveLoaders.size()) { + ArchiveLoader var0 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); + if (!var0.isLoaded()) { + return false; + } + + ++Client.archiveLoadersDone; + } + + return true; + } else { + return true; + } + } } diff --git a/runescape-client/src/main/java/AbstractSocket.java b/runescape-client/src/main/java/AbstractSocket.java index 6f7cfab31f..e7b763efee 100644 --- a/runescape-client/src/main/java/AbstractSocket.java +++ b/runescape-client/src/main/java/AbstractSocket.java @@ -4,56 +4,56 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ky") +@ObfuscatedName("kr") @Implements("AbstractSocket") public abstract class AbstractSocket { protected AbstractSocket() { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-647274291" + garbageValue = "-259367480" ) @Export("close") public abstract void close(); - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "2115277231" + signature = "(B)I", + garbageValue = "-108" ) @Export("readUnsignedByte") public abstract int readUnsignedByte() throws IOException; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-972484659" + garbageValue = "2004103994" ) @Export("available") public abstract int available() throws IOException; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "497635177" + garbageValue = "-624446357" ) @Export("isAvailable") public abstract boolean isAvailable(int var1) throws IOException; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "([BIII)I", - garbageValue = "-1642271193" + garbageValue = "1847434030" ) @Export("read") public abstract int read(byte[] var1, int var2, int var3) throws IOException; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "-340382115" + garbageValue = "977025272" ) @Export("write") public abstract void write(byte[] var1, int var2, int var3) throws IOException; diff --git a/runescape-client/src/main/java/AbstractSound.java b/runescape-client/src/main/java/AbstractSound.java index 544120b7ae..6edd0df6c4 100644 --- a/runescape-client/src/main/java/AbstractSound.java +++ b/runescape-client/src/main/java/AbstractSound.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ds") +@ObfuscatedName("dd") @Implements("AbstractSound") public abstract class AbstractSound extends Node { - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("position") int position; diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java index ae0db8b06e..43ffce806c 100644 --- a/runescape-client/src/main/java/AbstractUserComparator.java +++ b/runescape-client/src/main/java/AbstractUserComparator.java @@ -4,20 +4,20 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jm") +@ObfuscatedName("jx") @Implements("AbstractUserComparator") public abstract class AbstractUserComparator implements Comparator { - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("nextComparator") Comparator nextComparator; protected AbstractUserComparator() { } - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(Ljava/util/Comparator;B)V", - garbageValue = "1" + garbageValue = "71" ) @Export("addComparator") final void addComparator(Comparator var1) { @@ -29,10 +29,10 @@ public abstract class AbstractUserComparator implements Comparator { } - @ObfuscatedName("e") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(Ljy;Ljy;I)I", - garbageValue = "-1667132208" + signature = "(Ljk;Ljk;I)I", + garbageValue = "-1613196050" ) @Export("compareUser") protected final int compareUser(User var1, User var2) { @@ -43,77 +43,45 @@ public abstract class AbstractUserComparator implements Comparator { return super.equals(var1); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(II)Liw;", - garbageValue = "928288295" + signature = "(III)I", + garbageValue = "-1320582539" ) - @Export("getNpcDefinition") - public static NPCDefinition getNpcDefinition(int var0) { - NPCDefinition var1 = (NPCDefinition)NPCDefinition.NpcDefinition_cached.get((long)var0); - if (var1 != null) { + static int method5119(int var0, int var1) { + FloorOverlayDefinition var2 = ArchiveLoader.FloorUnderlayDefinition_get(var0); + if (var2 == null) { + return var1; + } else if (var2.secondaryRgb >= 0) { + return var2.secondaryRgb | -16777216; + } else if (var2.texture >= 0) { + int var3 = class218.method4178(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var2.texture), 96); + return Rasterizer3D.Rasterizer3D_colorPalette[var3] | -16777216; + } else if (var2.primaryRgb == 16711935) { return var1; } else { - byte[] var2 = NPCDefinition.NpcDefinition_archive.takeFile(9, var0); - var1 = new NPCDefinition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); + int var4 = var2.hue; + int var5 = var2.saturation; + int var6 = var2.lightness; + if (var6 > 179) { + var5 /= 2; } - var1.postDecode(); - NPCDefinition.NpcDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("gw") - @ObfuscatedSignature( - signature = "(Lha;IIB)V", - garbageValue = "-91" - ) - @Export("checkIfMinimapClicked") - static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { - if (Client.minimapState == 0 || Client.minimapState == 3) { - if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !NetFileRequest.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { - SpriteMask var3 = var0.getSpriteMask(true); - if (var3 == null) { - return; - } - - int var4 = MouseHandler.MouseHandler_lastPressedX - var1; - int var5 = MouseHandler.MouseHandler_lastPressedY - var2; - if (var3.contains(var4, var5)) { - var4 -= var3.width / 2; - var5 -= var3.height / 2; - int var6 = Client.camAngleY & 2047; - int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; - int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; - int var9 = var8 * var4 + var5 * var7 >> 11; - int var10 = var5 * var8 - var4 * var7 >> 11; - int var11 = var9 + Message.localPlayer.x >> 7; - int var12 = Message.localPlayer.y - var10 >> 7; - PacketBufferNode var13 = class2.getPacketBufferNode(ClientPacket.field2212, Client.packetWriter.isaacCipher); - var13.packetBuffer.writeByte(18); - var13.packetBuffer.method5696(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); - var13.packetBuffer.writeShort(MusicPatchPcmStream.baseX * 64 + var11); - var13.packetBuffer.writeIntME(ScriptEvent.baseY * 64 + var12); - var13.packetBuffer.writeByte(var4); - var13.packetBuffer.writeByte(var5); - var13.packetBuffer.writeShort(Client.camAngleY); - var13.packetBuffer.writeByte(57); - var13.packetBuffer.writeByte(0); - var13.packetBuffer.writeByte(0); - var13.packetBuffer.writeByte(89); - var13.packetBuffer.writeShort(Message.localPlayer.x); - var13.packetBuffer.writeShort(Message.localPlayer.y); - var13.packetBuffer.writeByte(63); - Client.packetWriter.addNode(var13); - Client.destinationX = var11; - Client.destinationY = var12; - } + if (var6 > 192) { + var5 /= 2; } + if (var6 > 217) { + var5 /= 2; + } + + if (var6 > 243) { + var5 /= 2; + } + + int var7 = (var5 / 32 << 7) + var6 / 2 + (var4 / 4 << 10); + int var8 = class218.method4178(var7, 96); + return Rasterizer3D.Rasterizer3D_colorPalette[var8] | -16777216; } } } diff --git a/runescape-client/src/main/java/AbstractWorldMapData.java b/runescape-client/src/main/java/AbstractWorldMapData.java index cd78bcdc66..9d900a668c 100644 --- a/runescape-client/src/main/java/AbstractWorldMapData.java +++ b/runescape-client/src/main/java/AbstractWorldMapData.java @@ -4,127 +4,120 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("h") +@ObfuscatedName("b") @Implements("AbstractWorldMapData") public abstract class AbstractWorldMapData { - @ObfuscatedName("qa") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = 1014546432 + intValue = 1805663379 ) - static int field147; - @ObfuscatedName("db") + static int field190; + @ObfuscatedName("gv") @ObfuscatedSignature( - signature = "Lif;" + signature = "[Llt;" ) - @Export("archive5") - static Archive archive5; - @ObfuscatedName("dm") - @ObfuscatedSignature( - signature = "Lif;" - ) - @Export("archive18") - static Archive archive18; - @ObfuscatedName("f") + @Export("mapDotSprites") + static Sprite[] mapDotSprites; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1789439424 + intValue = -894906368 ) @Export("regionXLow") int regionXLow; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 810971136 + intValue = -1390111808 ) @Export("regionYLow") int regionYLow; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 826366773 + intValue = -1468899765 ) @Export("regionX") int regionX; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -20485777 + intValue = 1986069101 ) @Export("regionY") int regionY; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 185589827 + intValue = -1726472533 ) @Export("minPlane") int minPlane; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1464369351 + intValue = -1228656521 ) @Export("planes") int planes; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 2104808793 + intValue = -672684543 ) @Export("groupId") int groupId; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -299525603 + intValue = -199023581 ) @Export("fileId") int fileId; - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("floorUnderlayIds") short[][][] floorUnderlayIds; - @ObfuscatedName("d") + @ObfuscatedName("m") @Export("floorOverlayIds") short[][][] floorOverlayIds; - @ObfuscatedName("c") - byte[][][] field150; - @ObfuscatedName("o") - byte[][][] field149; + @ObfuscatedName("p") + byte[][][] field188; + @ObfuscatedName("h") + byte[][][] field175; @ObfuscatedName("v") @ObfuscatedSignature( - signature = "[[[[Lq;" + signature = "[[[[Lu;" ) @Export("decorations") WorldMapDecoration[][][][] decorations; - @ObfuscatedName("k") - boolean field153; - @ObfuscatedName("s") - boolean field154; + @ObfuscatedName("n") + boolean field174; + @ObfuscatedName("x") + boolean field185; AbstractWorldMapData() { this.groupId = -1; this.fileId = -1; new LinkedList(); - this.field153 = false; - this.field154 = false; + this.field174 = false; + this.field185 = false; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lkq;I)V", - garbageValue = "1425420215" + signature = "(Lkp;S)V", + garbageValue = "-30591" ) @Export("readGeography") abstract void readGeography(Buffer var1); - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "890560047" + garbageValue = "1888663118" ) @Export("isFullyLoaded") boolean isFullyLoaded() { - return this.field153 && this.field154; + return this.field174 && this.field185; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lhz;I)V", - garbageValue = "-1774423787" + signature = "(Lii;I)V", + garbageValue = "-60010713" ) @Export("loadGeography") void loadGeography(AbstractArchive var1) { @@ -132,53 +125,53 @@ public abstract class AbstractWorldMapData { byte[] var2 = var1.takeFile(this.groupId, this.fileId); if (var2 != null) { this.readGeography(new Buffer(var2)); - this.field153 = true; - this.field154 = true; + this.field174 = true; + this.field185 = true; } } } - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1921381610" + garbageValue = "559104793" ) @Export("reset") void reset() { this.floorUnderlayIds = null; this.floorOverlayIds = null; - this.field150 = null; - this.field149 = null; + this.field188 = null; + this.field175 = null; this.decorations = null; - this.field153 = false; - this.field154 = false; + this.field174 = false; + this.field185 = false; } - @ObfuscatedName("d") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(IILkq;I)V", - garbageValue = "-1827340514" + signature = "(IILkp;I)V", + garbageValue = "-1538793396" ) @Export("readTile") void readTile(int var1, int var2, Buffer var3) { int var4 = var3.readUnsignedByte(); if (var4 != 0) { if ((var4 & 1) != 0) { - this.method247(var1, var2, var3, var4); + this.method257(var1, var2, var3, var4); } else { - this.method269(var1, var2, var3, var4); + this.method258(var1, var2, var3, var4); } } } - @ObfuscatedName("c") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(IILkq;II)V", - garbageValue = "947555268" + signature = "(IILkp;II)V", + garbageValue = "1470319349" ) - void method247(int var1, int var2, Buffer var3, int var4) { + void method257(int var1, int var2, Buffer var3, int var4) { boolean var5 = (var4 & 2) != 0; if (var5) { this.floorOverlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); @@ -187,12 +180,12 @@ public abstract class AbstractWorldMapData { this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(IILkq;IB)V", - garbageValue = "77" + signature = "(IILkp;II)V", + garbageValue = "-2109689105" ) - void method269(int var1, int var2, Buffer var3, int var4) { + void method258(int var1, int var2, Buffer var3, int var4) { int var5 = ((var4 & 24) >> 3) + 1; boolean var6 = (var4 & 2) != 0; boolean var7 = (var4 & 4) != 0; @@ -208,8 +201,8 @@ public abstract class AbstractWorldMapData { if (var10 != 0) { this.floorOverlayIds[var9][var1][var2] = (short)var10; var11 = var3.readUnsignedByte(); - this.field150[var9][var1][var2] = (byte)(var11 >> 2); - this.field149[var9][var1][var2] = (byte)(var11 & 3); + this.field188[var9][var1][var2] = (byte)(var11 >> 2); + this.field175[var9][var1][var2] = (byte)(var11 & 3); } } } @@ -221,7 +214,7 @@ public abstract class AbstractWorldMapData { WorldMapDecoration[] var14 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9]; for (var11 = 0; var11 < var9; ++var11) { - int var12 = var3.method5560(); + int var12 = var3.method5593(); int var13 = var3.readUnsignedByte(); var14[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); } @@ -231,1205 +224,23 @@ public abstract class AbstractWorldMapData { } - @ObfuscatedName("l") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "58" + signature = "(I)I", + garbageValue = "-1419701819" ) @Export("getRegionX") int getRegionX() { return this.regionX; } - @ObfuscatedName("t") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "63" + signature = "(I)I", + garbageValue = "879615206" ) @Export("getRegionY") int getRegionY() { return this.regionY; } - - @ObfuscatedName("a") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V", - garbageValue = "4" - ) - @Export("setLoginResponseString") - static void setLoginResponseString(String var0, String var1, String var2) { - Login.Login_response1 = var0; - Login.Login_response2 = var1; - Login.Login_response3 = var2; - } - - @ObfuscatedName("ad") - @ObfuscatedSignature( - signature = "(ILcu;ZI)I", - garbageValue = "357466702" - ) - static int method272(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = MouseRecorder.loadWorlds() ? 1 : 0; - return 1; - } else { - World var3; - if (var0 == ScriptOpcodes.WORLDLIST_START) { - var3 = ChatChannel.worldListStart(); - if (var3 != null) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.id; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.properties; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3.activity; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.location; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.population; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3.host; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { - var3 = Friend.getNextWorldListWorld(); - if (var3 != null) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.id; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.properties; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3.activity; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.location; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.population; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3.host; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else { - World var4; - int var5; - int var7; - if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { - var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - var4 = null; - - for (var5 = 0; var5 < World.World_count; ++var5) { - if (var7 == class162.World_worlds[var5].id) { - var4 = class162.World_worlds[var5]; - break; - } - } - - if (var4 != null) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var4.id; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var4.properties; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var4.activity; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var4.location; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var4.population; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var4.host; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { - class188.Interpreter_intStackSize -= 4; - var7 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - boolean var10 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1] == 1; - var5 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2]; - boolean var6 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 3] == 1; - Player.sortWorldList(var7, var10, var5, var6); - return 1; - } else if (var0 != ScriptOpcodes.GETWORLDINFO) { - if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { - Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - return 1; - } else { - int var8; - ParamDefinition var9; - if (var0 == ScriptOpcodes.NC_PARAM) { - class188.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - var9 = WorldMapIcon_1.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = AbstractUserComparator.getNpcDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = AbstractUserComparator.getNpcDefinition(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.LC_PARAM) { - class188.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - var9 = WorldMapIcon_1.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = Coord.getObjectDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Coord.getObjectDefinition(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_PARAM) { - class188.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - var9 = WorldMapIcon_1.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = PacketBufferNode.ItemDefinition_get(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = PacketBufferNode.ItemDefinition_get(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { - class188.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - var9 = WorldMapIcon_1.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = KitDefinition.StructDefinition_getStructDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = KitDefinition.StructDefinition_getStructDefinition(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.ON_MOBILE) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLIENTTYPE) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.clientType & 3; - return 1; - } else if (var0 == 6520) { - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { - return 1; - } else if (var0 == 6522) { - --class65.Interpreter_stringStackSize; - --class188.Interpreter_intStackSize; - return 1; - } else if (var0 == 6523) { - --class65.Interpreter_stringStackSize; - --class188.Interpreter_intStackSize; - return 1; - } else if (var0 == ScriptOpcodes.BATTERYLEVEL) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; - return 1; - } else if (var0 == ScriptOpcodes.BATTERYCHARGING) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 1; - return 1; - } else if (var0 == ScriptOpcodes.WIFIAVAILABLE) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 1; - return 1; - } else { - return 2; - } - } - } else { - var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - if (var7 >= 0 && var7 < World.World_count) { - var4 = class162.World_worlds[var7]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var4.id; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var4.properties; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var4.activity; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var4.location; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var4.population; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var4.host; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } - } - } - } - - @ObfuscatedName("ir") - @ObfuscatedSignature( - signature = "(IIIILjava/lang/String;Ljava/lang/String;III)V", - garbageValue = "-803158058" - ) - @Export("menuAction") - static final void menuAction(int var0, int var1, int var2, int var3, String var4, String var5, int var6, int var7) { - if (var2 >= 2000) { - var2 -= 2000; - } - - PacketBufferNode var8; - if (var2 == 1) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = class2.getPacketBufferNode(ClientPacket.field2228, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(MusicPatchPcmStream.baseX * 64 + var0); - var8.packetBuffer.method5744(Occluder.selectedItemWidget); - var8.packetBuffer.writeIntME(ScriptEvent.baseY * 64 + var1); - var8.packetBuffer.method5746(var3); - var8.packetBuffer.method5579(KeyHandler.selectedItemSlot); - var8.packetBuffer.method5569(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5579(IsaacCipher.selectedItemId); - Client.packetWriter.addNode(var8); - } else if (var2 == 2) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = class2.getPacketBufferNode(ClientPacket.field2199, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5579(var3); - var8.packetBuffer.method5744(WorldMapDecoration.selectedSpellWidget); - var8.packetBuffer.method5746(MusicPatchPcmStream.baseX * 64 + var0); - var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); - var8.packetBuffer.method5579(ScriptEvent.baseY * 64 + var1); - var8.packetBuffer.method5569(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var8); - } else if (var2 == 3) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = class2.getPacketBufferNode(ClientPacket.field2233, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5720(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeIntME(var3); - var8.packetBuffer.method5579(ScriptEvent.baseY * 64 + var1); - var8.packetBuffer.method5746(MusicPatchPcmStream.baseX * 64 + var0); - Client.packetWriter.addNode(var8); - } else if (var2 == 4) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = class2.getPacketBufferNode(ClientPacket.field2265, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5579(var3); - var8.packetBuffer.method5696(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5579(ScriptEvent.baseY * 64 + var1); - var8.packetBuffer.method5579(MusicPatchPcmStream.baseX * 64 + var0); - Client.packetWriter.addNode(var8); - } else if (var2 == 5) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = class2.getPacketBufferNode(ClientPacket.field2264, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(var3); - var8.packetBuffer.method5696(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5746(ScriptEvent.baseY * 64 + var1); - var8.packetBuffer.method5579(MusicPatchPcmStream.baseX * 64 + var0); - Client.packetWriter.addNode(var8); - } else if (var2 == 6) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = class2.getPacketBufferNode(ClientPacket.field2248, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5579(var3); - var8.packetBuffer.writeIntME(MusicPatchPcmStream.baseX * 64 + var0); - var8.packetBuffer.method5720(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5746(ScriptEvent.baseY * 64 + var1); - Client.packetWriter.addNode(var8); - } else { - PacketBufferNode var9; - NPC var13; - if (var2 == 7) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = class2.getPacketBufferNode(ClientPacket.field2270, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeIntME(IsaacCipher.selectedItemId); - var9.packetBuffer.writeIntME(KeyHandler.selectedItemSlot); - var9.packetBuffer.method5744(Occluder.selectedItemWidget); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5579(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 8) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = class2.getPacketBufferNode(ClientPacket.field2213, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShortLE(WorldMapDecoration.selectedSpellWidget); - var9.packetBuffer.method5579(var3); - var9.packetBuffer.method5746(Client.selectedSpellChildIndex); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 9) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = class2.getPacketBufferNode(ClientPacket.field2208, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5569(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeIntME(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 10) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = class2.getPacketBufferNode(ClientPacket.field2224, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5579(var3); - var9.packetBuffer.method5569(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 11) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = class2.getPacketBufferNode(ClientPacket.field2256, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5579(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 12) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = class2.getPacketBufferNode(ClientPacket.field2266, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5569(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 13) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = class2.getPacketBufferNode(ClientPacket.field2215, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5746(var3); - var9.packetBuffer.method5720(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else { - Player var15; - if (var2 == 14) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = class2.getPacketBufferNode(ClientPacket.field2239, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeInt(Occluder.selectedItemWidget); - var9.packetBuffer.method5720(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeShort(KeyHandler.selectedItemSlot); - var9.packetBuffer.writeIntME(IsaacCipher.selectedItemId); - var9.packetBuffer.method5746(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 15) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = class2.getPacketBufferNode(ClientPacket.field2217, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5569(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5746(var3); - var9.packetBuffer.writeInt(WorldMapDecoration.selectedSpellWidget); - var9.packetBuffer.writeIntME(Client.selectedSpellChildIndex); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 16) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = class2.getPacketBufferNode(ClientPacket.field2257, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5720(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShort(KeyHandler.selectedItemSlot); - var8.packetBuffer.writeShortLE(Occluder.selectedItemWidget); - var8.packetBuffer.method5746(IsaacCipher.selectedItemId); - var8.packetBuffer.method5746(var3); - var8.packetBuffer.method5746(ScriptEvent.baseY * 64 + var1); - var8.packetBuffer.writeIntME(MusicPatchPcmStream.baseX * 64 + var0); - Client.packetWriter.addNode(var8); - } else if (var2 == 17) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = class2.getPacketBufferNode(ClientPacket.field2263, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(WorldMapDecoration.selectedSpellWidget); - var8.packetBuffer.writeIntME(ScriptEvent.baseY * 64 + var1); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5746(var3); - var8.packetBuffer.method5746(MusicPatchPcmStream.baseX * 64 + var0); - var8.packetBuffer.method5579(Client.selectedSpellChildIndex); - Client.packetWriter.addNode(var8); - } else if (var2 == 18) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = class2.getPacketBufferNode(ClientPacket.field2201, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(var3); - var8.packetBuffer.method5746(ScriptEvent.baseY * 64 + var1); - var8.packetBuffer.method5720(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5579(MusicPatchPcmStream.baseX * 64 + var0); - Client.packetWriter.addNode(var8); - } else if (var2 == 19) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = class2.getPacketBufferNode(ClientPacket.field2189, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5720(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5746(ScriptEvent.baseY * 64 + var1); - var8.packetBuffer.writeShort(MusicPatchPcmStream.baseX * 64 + var0); - var8.packetBuffer.method5579(var3); - Client.packetWriter.addNode(var8); - } else if (var2 == 20) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = class2.getPacketBufferNode(ClientPacket.field2272, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5579(MusicPatchPcmStream.baseX * 64 + var0); - var8.packetBuffer.method5569(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeIntME(var3); - var8.packetBuffer.method5746(ScriptEvent.baseY * 64 + var1); - Client.packetWriter.addNode(var8); - } else if (var2 == 21) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = class2.getPacketBufferNode(ClientPacket.field2243, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(MusicPatchPcmStream.baseX * 64 + var0); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.writeIntME(ScriptEvent.baseY * 64 + var1); - var8.packetBuffer.method5696(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var8); - } else if (var2 == 22) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = class2.getPacketBufferNode(ClientPacket.field2258, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5746(ScriptEvent.baseY * 64 + var1); - var8.packetBuffer.method5746(var3); - var8.packetBuffer.method5696(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5746(MusicPatchPcmStream.baseX * 64 + var0); - Client.packetWriter.addNode(var8); - } else if (var2 == 23) { - if (Client.isMenuOpen) { - class14.scene.setViewportWalking(); - } else { - class14.scene.menuOpen(UrlRequest.Client_plane, var0, var1, true); - } - } else { - PacketBufferNode var10; - Widget var16; - if (var2 == 24) { - var16 = Tile.getWidget(var1); - boolean var12 = true; - if (var16.contentType > 0) { - var12 = GrandExchangeOfferNameComparator.method136(var16); - } - - if (var12) { - var10 = class2.getPacketBufferNode(ClientPacket.field2220, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var10); - } - } else { - if (var2 == 25) { - var16 = BZip2State.getWidgetChild(var1, var0); - if (var16 != null) { - GrandExchangeOfferUnitPriceComparator.Widget_runOnTargetLeave(); - WorldMapData_0.selectSpell(var1, var0, class14.method157(WorldMapSection0.getWidgetClickMask(var16)), var16.itemId); - Client.isItemSelected = 0; - Client.selectedSpellActionName = class60.method1167(var16); - if (Client.selectedSpellActionName == null) { - Client.selectedSpellActionName = "null"; - } - - if (var16.isIf3) { - Client.selectedSpellName = var16.dataText + NPC.colorStartTag(16777215); - } else { - Client.selectedSpellName = NPC.colorStartTag(65280) + var16.spellName + NPC.colorStartTag(16777215); - } - } - - return; - } - - if (var2 == 26) { - Clock.method3488(); - } else { - int var11; - Widget var14; - if (var2 == 28) { - var8 = class2.getPacketBufferNode(ClientPacket.field2220, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var8); - var14 = Tile.getWidget(var1); - if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { - var11 = var14.cs1Instructions[0][1]; - Varps.Varps_main[var11] = 1 - Varps.Varps_main[var11]; - BufferedSink.changeGameOptions(var11); - } - } else if (var2 == 29) { - var8 = class2.getPacketBufferNode(ClientPacket.field2220, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var8); - var14 = Tile.getWidget(var1); - if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { - var11 = var14.cs1Instructions[0][1]; - if (Varps.Varps_main[var11] != var14.cs1ComparisonValues[0]) { - Varps.Varps_main[var11] = var14.cs1ComparisonValues[0]; - BufferedSink.changeGameOptions(var11); - } - } - } else if (var2 == 30) { - if (Client.meslayerContinueWidget == null) { - WorldMapRectangle.resumePauseWidget(var1, var0); - Client.meslayerContinueWidget = BZip2State.getWidgetChild(var1, var0); - LoginPacket.invalidateWidget(Client.meslayerContinueWidget); - } - } else if (var2 == 31) { - var8 = class2.getPacketBufferNode(ClientPacket.field2185, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5746(IsaacCipher.selectedItemId); - var8.packetBuffer.method5587(Occluder.selectedItemWidget); - var8.packetBuffer.writeIntME(KeyHandler.selectedItemSlot); - var8.packetBuffer.method5587(var1); - var8.packetBuffer.method5746(var3); - var8.packetBuffer.method5579(var0); - Client.packetWriter.addNode(var8); - Client.field764 = 0; - class192.field2372 = Tile.getWidget(var1); - Client.field735 = var0; - } else if (var2 == 32) { - var8 = class2.getPacketBufferNode(ClientPacket.field2237, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5579(var0); - var8.packetBuffer.method5744(WorldMapDecoration.selectedSpellWidget); - var8.packetBuffer.writeIntME(var3); - var8.packetBuffer.writeIntME(Client.selectedSpellChildIndex); - var8.packetBuffer.method5587(var1); - Client.packetWriter.addNode(var8); - Client.field764 = 0; - class192.field2372 = Tile.getWidget(var1); - Client.field735 = var0; - } else if (var2 == 33) { - var8 = class2.getPacketBufferNode(ClientPacket.field2207, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5587(var1); - var8.packetBuffer.writeIntME(var3); - var8.packetBuffer.method5579(var0); - Client.packetWriter.addNode(var8); - Client.field764 = 0; - class192.field2372 = Tile.getWidget(var1); - Client.field735 = var0; - } else if (var2 == 34) { - var8 = class2.getPacketBufferNode(ClientPacket.field2261, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5746(var0); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.method5587(var1); - Client.packetWriter.addNode(var8); - Client.field764 = 0; - class192.field2372 = Tile.getWidget(var1); - Client.field735 = var0; - } else if (var2 == 35) { - var8 = class2.getPacketBufferNode(ClientPacket.field2197, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(var1); - var8.packetBuffer.method5579(var0); - var8.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var8); - Client.field764 = 0; - class192.field2372 = Tile.getWidget(var1); - Client.field735 = var0; - } else if (var2 == 36) { - var8 = class2.getPacketBufferNode(ClientPacket.field2190, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5579(var3); - var8.packetBuffer.writeShortLE(var1); - var8.packetBuffer.writeShort(var0); - Client.packetWriter.addNode(var8); - Client.field764 = 0; - class192.field2372 = Tile.getWidget(var1); - Client.field735 = var0; - } else if (var2 == 37) { - var8 = class2.getPacketBufferNode(ClientPacket.field2227, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5746(var0); - var8.packetBuffer.method5746(var3); - var8.packetBuffer.method5587(var1); - Client.packetWriter.addNode(var8); - Client.field764 = 0; - class192.field2372 = Tile.getWidget(var1); - Client.field735 = var0; - } else { - if (var2 == 38) { - GrandExchangeOfferUnitPriceComparator.Widget_runOnTargetLeave(); - var16 = Tile.getWidget(var1); - Client.isItemSelected = 1; - KeyHandler.selectedItemSlot = var0; - Occluder.selectedItemWidget = var1; - IsaacCipher.selectedItemId = var3; - LoginPacket.invalidateWidget(var16); - Client.selectedItemName = NPC.colorStartTag(16748608) + PacketBufferNode.ItemDefinition_get(var3).name + NPC.colorStartTag(16777215); - if (Client.selectedItemName == null) { - Client.selectedItemName = "null"; - } - - return; - } - - if (var2 == 39) { - var8 = class2.getPacketBufferNode(ClientPacket.field2196, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5744(var1); - var8.packetBuffer.writeIntME(var0); - var8.packetBuffer.writeIntME(var3); - Client.packetWriter.addNode(var8); - Client.field764 = 0; - class192.field2372 = Tile.getWidget(var1); - Client.field735 = var0; - } else if (var2 == 40) { - var8 = class2.getPacketBufferNode(ClientPacket.field2253, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5746(var0); - var8.packetBuffer.method5587(var1); - var8.packetBuffer.method5746(var3); - Client.packetWriter.addNode(var8); - Client.field764 = 0; - class192.field2372 = Tile.getWidget(var1); - Client.field735 = var0; - } else if (var2 == 41) { - var8 = class2.getPacketBufferNode(ClientPacket.field2247, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5746(var0); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var8); - Client.field764 = 0; - class192.field2372 = Tile.getWidget(var1); - Client.field735 = var0; - } else if (var2 == 42) { - var8 = class2.getPacketBufferNode(ClientPacket.field2211, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5579(var3); - var8.packetBuffer.writeShort(var0); - var8.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var8); - Client.field764 = 0; - class192.field2372 = Tile.getWidget(var1); - Client.field735 = var0; - } else if (var2 == 43) { - var8 = class2.getPacketBufferNode(ClientPacket.field2181, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5587(var1); - var8.packetBuffer.writeIntME(var0); - var8.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var8); - Client.field764 = 0; - class192.field2372 = Tile.getWidget(var1); - Client.field735 = var0; - } else if (var2 == 44) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = class2.getPacketBufferNode(ClientPacket.field2222, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5746(var3); - var9.packetBuffer.method5569(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 45) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = class2.getPacketBufferNode(ClientPacket.field2250, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5696(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeIntME(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 46) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = class2.getPacketBufferNode(ClientPacket.field2269, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5720(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 47) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = class2.getPacketBufferNode(ClientPacket.field2273, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5696(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeIntME(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 48) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = class2.getPacketBufferNode(ClientPacket.field2267, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(var3); - var9.packetBuffer.method5720(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 49) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = class2.getPacketBufferNode(ClientPacket.field2214, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5720(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5579(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 50) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = class2.getPacketBufferNode(ClientPacket.field2235, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5720(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5746(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 51) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = class2.getPacketBufferNode(ClientPacket.field2203, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(var3); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else { - label888: { - if (var2 != 57) { - if (var2 == 58) { - var16 = BZip2State.getWidgetChild(var1, var0); - if (var16 != null) { - var9 = class2.getPacketBufferNode(ClientPacket.field2275, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5746(var0); - var9.packetBuffer.writeShortLE(var1); - var9.packetBuffer.method5579(Client.selectedSpellChildIndex); - var9.packetBuffer.method5746(var16.itemId); - var9.packetBuffer.method5746(Client.field785); - var9.packetBuffer.method5744(WorldMapDecoration.selectedSpellWidget); - Client.packetWriter.addNode(var9); - } - break label888; - } - - if (var2 == 1001) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = class2.getPacketBufferNode(ClientPacket.field2230, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5746(var3); - var8.packetBuffer.method5579(ScriptEvent.baseY * 64 + var1); - var8.packetBuffer.writeShort(MusicPatchPcmStream.baseX * 64 + var0); - var8.packetBuffer.method5720(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var8); - break label888; - } - - if (var2 == 1002) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var8 = class2.getPacketBufferNode(ClientPacket.field2184, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(var3); - Client.packetWriter.addNode(var8); - break label888; - } - - if (var2 == 1003) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var13 = Client.npcs[var3]; - if (var13 != null) { - NPCDefinition var17 = var13.definition; - if (var17.transforms != null) { - var17 = var17.transform(); - } - - if (var17 != null) { - var10 = class2.getPacketBufferNode(ClientPacket.field2194, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeIntME(var17.id); - Client.packetWriter.addNode(var10); - } - } - break label888; - } - - if (var2 == 1004) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var8 = class2.getPacketBufferNode(ClientPacket.field2234, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5746(var3); - Client.packetWriter.addNode(var8); - break label888; - } - - if (var2 == 1005) { - var16 = Tile.getWidget(var1); - if (var16 != null && var16.itemQuantities[var0] >= 100000) { - class83.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + PacketBufferNode.ItemDefinition_get(var3).name); - } else { - var9 = class2.getPacketBufferNode(ClientPacket.field2234, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5746(var3); - Client.packetWriter.addNode(var9); - } - - Client.field764 = 0; - class192.field2372 = Tile.getWidget(var1); - Client.field735 = var0; - break label888; - } - - if (var2 != 1007) { - if (var2 == 1009 || var2 == 1011 || var2 == 1010 || var2 == 1008 || var2 == 1012) { - GrandExchangeEvent.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); - } - break label888; - } - } - - var16 = BZip2State.getWidgetChild(var1, var0); - if (var16 != null) { - KeyHandler.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); - } - } - } - } - } - } - } - } - } - - if (Client.isItemSelected != 0) { - Client.isItemSelected = 0; - LoginPacket.invalidateWidget(Tile.getWidget(Occluder.selectedItemWidget)); - } - - if (Client.isSpellSelected) { - GrandExchangeOfferUnitPriceComparator.Widget_runOnTargetLeave(); - } - - if (class192.field2372 != null && Client.field764 == 0) { - LoginPacket.invalidateWidget(class192.field2372); - } - - } - - @ObfuscatedName("jy") - @ObfuscatedSignature( - signature = "(Lha;III)V", - garbageValue = "2081657202" - ) - static final void method263(Widget var0, int var1, int var2) { - if (var0.buttonType == 1) { - class1.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); - } - - String var3; - if (var0.buttonType == 2 && !Client.isSpellSelected) { - var3 = class60.method1167(var0); - if (var3 != null) { - class1.insertMenuItemNoShift(var3, NPC.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); - } - } - - if (var0.buttonType == 3) { - class1.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); - } - - if (var0.buttonType == 4) { - class1.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); - } - - if (var0.buttonType == 5) { - class1.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); - } - - if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { - class1.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); - } - - int var4; - int var5; - int var6; - int var7; - int var13; - if (var0.type == 2) { - var13 = 0; - - for (var4 = 0; var4 < var0.height; ++var4) { - for (var5 = 0; var5 < var0.width; ++var5) { - var6 = (var0.paddingX + 32) * var5; - var7 = (var0.paddingY + 32) * var4; - if (var13 < 20) { - var6 += var0.inventoryXOffsets[var13]; - var7 += var0.inventoryYOffsets[var13]; - } - - if (var1 >= var6 && var2 >= var7 && var1 < var6 + 32 && var2 < var7 + 32) { - Client.dragItemSlotDestination = var13; - WorldMapManager.field312 = var0; - if (var0.itemIds[var13] > 0) { - ItemDefinition var8 = PacketBufferNode.ItemDefinition_get(var0.itemIds[var13] - 1); - if (Client.isItemSelected == 1 && class30.method542(WorldMapSection0.getWidgetClickMask(var0))) { - if (var0.id != Occluder.selectedItemWidget || var13 != KeyHandler.selectedItemSlot) { - class1.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + NPC.colorStartTag(16748608) + var8.name, 31, var8.id, var13, var0.id); - } - } else if (Client.isSpellSelected && class30.method542(WorldMapSection0.getWidgetClickMask(var0))) { - if ((ReflectionCheck.selectedSpellFlags & 16) == 16) { - class1.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + NPC.colorStartTag(16748608) + var8.name, 32, var8.id, var13, var0.id); - } - } else { - String[] var9 = var8.inventoryActions; - int var10 = -1; - if (Client.shiftClickDrop && WorldMapDecoration.method326()) { - var10 = var8.getShiftClickIndex(); - } - - int var11; - if (class30.method542(WorldMapSection0.getWidgetClickMask(var0))) { - for (var11 = 4; var11 >= 3; --var11) { - if (var11 != var10) { - class312.addWidgetItemMenuItem(var0, var8, var13, var11, false); - } - } - } - - if (Varcs.method2195(WorldMapSection0.getWidgetClickMask(var0))) { - class1.insertMenuItemNoShift("Use", NPC.colorStartTag(16748608) + var8.name, 38, var8.id, var13, var0.id); - } - - if (class30.method542(WorldMapSection0.getWidgetClickMask(var0))) { - for (var11 = 2; var11 >= 0; --var11) { - if (var10 != var11) { - class312.addWidgetItemMenuItem(var0, var8, var13, var11, false); - } - } - - if (var10 >= 0) { - class312.addWidgetItemMenuItem(var0, var8, var13, var10, true); - } - } - - var9 = var0.itemActions; - if (var9 != null) { - for (var11 = 4; var11 >= 0; --var11) { - if (var9[var11] != null) { - byte var12 = 0; - if (var11 == 0) { - var12 = 39; - } - - if (var11 == 1) { - var12 = 40; - } - - if (var11 == 2) { - var12 = 41; - } - - if (var11 == 3) { - var12 = 42; - } - - if (var11 == 4) { - var12 = 43; - } - - class1.insertMenuItemNoShift(var9[var11], NPC.colorStartTag(16748608) + var8.name, var12, var8.id, var13, var0.id); - } - } - } - - class1.insertMenuItemNoShift("Examine", NPC.colorStartTag(16748608) + var8.name, 1005, var8.id, var13, var0.id); - } - } - } - - ++var13; - } - } - } - - if (var0.isIf3) { - if (Client.isSpellSelected) { - if (Login.method2119(WorldMapSection0.getWidgetClickMask(var0)) && (ReflectionCheck.selectedSpellFlags & 32) == 32) { - class1.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); - } - } else { - for (var13 = 9; var13 >= 5; --var13) { - var6 = WorldMapSection0.getWidgetClickMask(var0); - boolean var18 = (var6 >> var13 + 1 & 1) != 0; - String var14; - if (!var18 && var0.onOp == null) { - var14 = null; - } else if (var0.actions != null && var0.actions.length > var13 && var0.actions[var13] != null && var0.actions[var13].trim().length() != 0) { - var14 = var0.actions[var13]; - } else { - var14 = null; - } - - if (var14 != null) { - class1.insertMenuItemNoShift(var14, var0.dataText, 1007, var13 + 1, var0.childIndex, var0.id); - } - } - - var3 = class60.method1167(var0); - if (var3 != null) { - class1.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); - } - - for (var4 = 4; var4 >= 0; --var4) { - var7 = WorldMapSection0.getWidgetClickMask(var0); - boolean var19 = (var7 >> var4 + 1 & 1) != 0; - String var15; - if (!var19 && var0.onOp == null) { - var15 = null; - } else if (var0.actions != null && var0.actions.length > var4 && var0.actions[var4] != null && var0.actions[var4].trim().length() != 0) { - var15 = var0.actions[var4]; - } else { - var15 = null; - } - - if (var15 != null) { - AbstractWorldMapIcon.insertMenuItem(var15, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.field2602); - } - } - - var5 = WorldMapSection0.getWidgetClickMask(var0); - boolean var17 = (var5 & 1) != 0; - if (var17) { - class1.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); - } - } - } - - } } diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index fa6d70539a..784a5ae7b4 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -1,92 +1,88 @@ +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ao") +@ObfuscatedName("aq") @Implements("AbstractWorldMapIcon") public abstract class AbstractWorldMapIcon { - @ObfuscatedName("bl") - @ObfuscatedSignature( - signature = "Lhq;" + @ObfuscatedName("qk") + @ObfuscatedGetter( + intValue = -1430527955 ) - static StudioGame field284; - @ObfuscatedName("by") + static int field306; + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "[Lli;" - ) - @Export("worldSelectFlagSprites") - static IndexedSprite[] worldSelectFlagSprites; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lht;" + signature = "Lhj;" ) @Export("coord2") public final Coord coord2; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Lht;" + signature = "Lhj;" ) @Export("coord1") public final Coord coord1; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 130683095 + intValue = -503139537 ) @Export("screenX") int screenX; - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -170696787 + intValue = 1934442125 ) @Export("screenY") int screenY; @ObfuscatedSignature( - signature = "(Lht;Lht;)V" + signature = "(Lhj;Lhj;)V" ) AbstractWorldMapIcon(Coord var1, Coord var2) { this.coord1 = var1; this.coord2 = var2; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "63" + signature = "(I)I", + garbageValue = "1499764486" ) @Export("getElement") public abstract int getElement(); - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)Law;", - garbageValue = "-1801186977" + signature = "(B)Laz;", + garbageValue = "124" ) @Export("getLabel") abstract WorldMapLabel getLabel(); - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-2033351231" + signature = "(S)I", + garbageValue = "-26101" ) @Export("getSubWidth") abstract int getSubWidth(); - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1873129621" + signature = "(B)I", + garbageValue = "1" ) @Export("getSubHeight") abstract int getSubHeight(); - @ObfuscatedName("h") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(III)Z", - garbageValue = "-1038278508" + garbageValue = "-671812733" ) @Export("fitsScreen") boolean fitsScreen(int var1, int var2) { @@ -97,27 +93,27 @@ public abstract class AbstractWorldMapIcon { } } - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(B)Z", - garbageValue = "3" + garbageValue = "-18" ) @Export("hasValidElement") boolean hasValidElement() { return this.getElement() >= 0; } - @ObfuscatedName("aa") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(III)Z", - garbageValue = "-2033564740" + garbageValue = "1514075887" ) @Export("elementFitsScreen") boolean elementFitsScreen(int var1, int var2) { if (!this.hasValidElement()) { return false; } else { - WorldMapElement var3 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(this.getElement()); + WorldMapElement var3 = PacketBufferNode.WorldMapElement_get(this.getElement()); int var4 = this.getSubWidth(); int var5 = this.getSubHeight(); switch(var3.horizontalAlignment.value) { @@ -127,30 +123,32 @@ public abstract class AbstractWorldMapIcon { } break; case 1: - if (var1 >= this.screenX && var1 < var4 + this.screenX) { + if (var1 >= this.screenX - var4 / 2 && var1 <= var4 / 2 + this.screenX) { break; } return false; case 2: - if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) { + if (var1 < this.screenX || var1 >= var4 + this.screenX) { return false; } } switch(var3.verticalAlignment.value) { case 0: - if (var2 <= this.screenY - var5 || var2 > this.screenY) { - return false; + if (var2 >= this.screenY - var5 / 2 && var2 <= var5 / 2 + this.screenY) { + break; } - break; + + return false; case 1: - if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) { - return false; + if (var2 >= this.screenY && var2 < var5 + this.screenY) { + break; } - break; + + return false; case 2: - if (var2 < this.screenY || var2 >= var5 + this.screenY) { + if (var2 <= this.screenY - var5 || var2 > this.screenY) { return false; } } @@ -159,10 +157,10 @@ public abstract class AbstractWorldMapIcon { } } - @ObfuscatedName("av") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(III)Z", - garbageValue = "501002350" + garbageValue = "-543519402" ) @Export("labelFitsScreen") boolean labelFitsScreen(int var1, int var2) { @@ -170,427 +168,305 @@ public abstract class AbstractWorldMapIcon { if (var3 == null) { return false; } else if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) { - return var2 >= this.screenY && var2 <= this.screenY + var3.height; + return var2 >= this.screenY && var2 <= var3.height + this.screenY; } else { return false; } } - @ObfuscatedName("t") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "([BI)V", - garbageValue = "-1395894499" + signature = "(Lks;ILba;IB)V", + garbageValue = "91" ) - @Export("SpriteBuffer_decode") - static void SpriteBuffer_decode(byte[] var0) { - Buffer var1 = new Buffer(var0); - var1.offset = var0.length - 2; - class325.SpriteBuffer_spriteCount = var1.readUnsignedShort(); - class325.SpriteBuffer_xOffsets = new int[class325.SpriteBuffer_spriteCount]; - class325.SpriteBuffer_yOffsets = new int[class325.SpriteBuffer_spriteCount]; - UserComparator1.SpriteBuffer_spriteWidths = new int[class325.SpriteBuffer_spriteCount]; - class325.SpriteBuffer_spriteHeights = new int[class325.SpriteBuffer_spriteCount]; - class290.SpriteBuffer_pixels = new byte[class325.SpriteBuffer_spriteCount][]; - var1.offset = var0.length - 7 - class325.SpriteBuffer_spriteCount * 8; - class325.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); - class325.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); - int var2 = (var1.readUnsignedByte() & 255) + 1; - - int var3; - for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) { - class325.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) { - class325.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) { - UserComparator1.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) { - class325.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); - } - - var1.offset = var0.length - 7 - class325.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; - class268.SpriteBuffer_spritePalette = new int[var2]; - - for (var3 = 1; var3 < var2; ++var3) { - class268.SpriteBuffer_spritePalette[var3] = var1.readMedium(); - if (class268.SpriteBuffer_spritePalette[var3] == 0) { - class268.SpriteBuffer_spritePalette[var3] = 1; + static final void method613(PacketBuffer var0, int var1, Player var2, int var3) { + byte var4 = -1; + if ((var3 & 1024) != 0) { + var2.field981 = var0.method5618(); + var2.field957 = var0.method5780(); + var2.field961 = var0.method5618(); + var2.field991 = var0.readByte(); + var2.field985 = var0.method5762() + Client.cycle; + var2.field986 = var0.method5762() + Client.cycle; + var2.field987 = var0.method5740(); + if (var2.field621) { + var2.field981 += var2.tileX; + var2.field957 += var2.tileY; + var2.field961 += var2.tileX; + var2.field991 += var2.tileY; + var2.pathLength = 0; + } else { + var2.field981 += var2.pathX[0]; + var2.field957 += var2.pathY[0]; + var2.field961 += var2.pathX[0]; + var2.field991 += var2.pathY[0]; + var2.pathLength = 1; } + + var2.field998 = 0; } - var1.offset = 0; - - for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) { - int var4 = UserComparator1.SpriteBuffer_spriteWidths[var3]; - int var5 = class325.SpriteBuffer_spriteHeights[var3]; - int var6 = var4 * var5; - byte[] var7 = new byte[var6]; - class290.SpriteBuffer_pixels[var3] = var7; - int var8 = var1.readUnsignedByte(); - int var9; - if (var8 == 0) { - for (var9 = 0; var9 < var6; ++var9) { - var7[var9] = var1.readByte(); - } - } else if (var8 == 1) { - for (var9 = 0; var9 < var4; ++var9) { - for (int var10 = 0; var10 < var5; ++var10) { - var7[var9 + var10 * var4] = var1.readByte(); - } - } - } - } - - } - - @ObfuscatedName("fp") - @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "294564457" - ) - static final void method612(boolean var0) { - if (var0) { - Client.field743 = Login.field1178 ? class160.field1984 : class160.field1986; - } else { - Client.field743 = Interpreter.clientPreferences.parameters.containsKey(UrlRequester.method3299(Login.Login_username)) ? class160.field1988 : class160.field1985; - } - - } - - @ObfuscatedName("hw") - @ObfuscatedSignature( - signature = "(Lfi;I)V", - garbageValue = "-432214243" - ) - static final void method614(class179 var0) { - PacketBuffer var1 = Client.packetWriter.packetBuffer; - int var2; - int var3; - int var4; int var5; + if ((var3 & 4096) != 0) { + var2.spotAnimation = var0.readUnsignedShort(); + var5 = var0.readInt(); + var2.field980 = var5 >> 16; + var2.field979 = (var5 & 65535) + Client.cycle; + var2.spotAnimationFrame = 0; + var2.spotAnimationFrameCycle = 0; + if (var2.field979 > Client.cycle) { + var2.spotAnimationFrame = -1; + } + + if (var2.spotAnimation == 65535) { + var2.spotAnimation = -1; + } + } + int var6; - int var7; int var8; int var9; - if (class179.field2293 == var0) { - var2 = var1.method5628(); - var3 = (var2 >> 4 & 7) + class3.field7; - var4 = (var2 & 7) + PlayerAppearance.field2520; - var5 = var1.method5723(); - var6 = var1.readUnsignedByte(); - var7 = var6 >> 2; - var8 = var6 & 3; - var9 = Client.field689[var7]; - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { - class65.updatePendingSpawn(UrlRequest.Client_plane, var3, var4, var9, var5, var7, var8, 0, -1); - } - - } else if (class179.field2290 == var0) { - var2 = var1.method5582(); - var3 = var1.method5723(); - var4 = var1.readUnsignedByte(); - var5 = (var4 >> 4 & 7) + class3.field7; - var6 = (var4 & 7) + PlayerAppearance.field2520; - var7 = var1.method5675(); - if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { - var5 = var5 * 128 + 64; - var6 = var6 * 128 + 64; - GraphicsObject var43 = new GraphicsObject(var2, UrlRequest.Client_plane, var5, var6, ScriptEvent.getTileHeight(var5, var6, UrlRequest.Client_plane) - var7, var3, Client.cycle); - Client.graphicsObjects.addFirst(var43); - } - - } else { - TileItem var32; - if (class179.field2295 == var0) { - var2 = var1.method5582(); - var3 = var1.method5583(); - var4 = var1.readUnsignedByte(); - var5 = (var4 >> 4 & 7) + class3.field7; - var6 = (var4 & 7) + PlayerAppearance.field2520; - if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { - var32 = new TileItem(); - var32.id = var2; - var32.quantity = var3; - if (Client.groundItems[UrlRequest.Client_plane][var5][var6] == null) { - Client.groundItems[UrlRequest.Client_plane][var5][var6] = new NodeDeque(); + int var12; + if ((var3 & 64) != 0) { + var5 = var0.readUnsignedByte(); + int var7; + int var10; + int var11; + if (var5 > 0) { + for (var6 = 0; var6 < var5; ++var6) { + var8 = -1; + var9 = -1; + var10 = -1; + var7 = var0.readUShortSmart(); + if (var7 == 32767) { + var7 = var0.readUShortSmart(); + var9 = var0.readUShortSmart(); + var8 = var0.readUShortSmart(); + var10 = var0.readUShortSmart(); + } else if (var7 != 32766) { + var9 = var0.readUShortSmart(); + } else { + var7 = -1; } - Client.groundItems[UrlRequest.Client_plane][var5][var6].addFirst(var32); - Skills.updateItemPile(var5, var6); + var11 = var0.readUShortSmart(); + var2.addHitSplat(var7, var9, var8, var10, Client.cycle, var11); + } + } + + var6 = var0.method5605(); + if (var6 > 0) { + for (var7 = 0; var7 < var6; ++var7) { + var8 = var0.readUShortSmart(); + var9 = var0.readUShortSmart(); + if (var9 != 32767) { + var10 = var0.readUShortSmart(); + var11 = var0.method5771(); + var12 = var9 > 0 ? var0.method5771() : var11; + var2.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); + } else { + var2.removeHealthBar(var8); + } + } + } + } + + if ((var3 & 2048) != 0) { + Players.field1237[var1] = var0.method5618(); + } + + if ((var3 & 32) != 0) { + var5 = var0.method5614(); + PlayerType var13 = (PlayerType)WorldMapSection0.findEnumerated(SecureRandomFuture.PlayerType_values(), var0.method5771()); + boolean var17 = var0.readUnsignedByte() == 1; + var8 = var0.method5605(); + var9 = var0.offset; + if (var2.username != null && var2.appearance != null) { + boolean var18 = false; + if (var13.isUser && KeyHandler.friendSystem.isIgnored(var2.username)) { + var18 = true; } + if (!var18 && Client.field759 == 0 && !var2.isHidden) { + Players.field1248.offset = 0; + var0.readBytes(Players.field1248.array, 0, var8); + Players.field1248.offset = 0; + String var14 = AbstractFont.escapeBrackets(class40.method735(WallDecoration.method3356(Players.field1248))); + var2.overheadText = var14.trim(); + var2.overheadTextColor = var5 >> 8; + var2.overheadTextEffect = var5 & 255; + var2.overheadTextCyclesRemaining = 150; + var2.isAutoChatting = var17; + var2.field954 = var2 != class192.localPlayer && var13.isUser && "" != Client.field780 && var14.toLowerCase().indexOf(Client.field780) == -1; + if (var13.isPrivileged) { + var12 = var17 ? 91 : 1; + } else { + var12 = var17 ? 90 : 2; + } + + if (var13.modIcon != -1) { + ClientPreferences.addGameMessage(var12, Language.method3728(var13.modIcon) + var2.username.getName(), var14); + } else { + ClientPreferences.addGameMessage(var12, var2.username.getName(), var14); + } + } + } + + var0.offset = var8 + var9; + } + + if ((var3 & 1) != 0) { + var5 = var0.method5740(); + if (var5 == 65535) { + var5 = -1; + } + + var6 = var0.method5605(); + InterfaceParent.performPlayerAnimation(var2, var5, var6); + } + + if ((var3 & 512) != 0) { + var4 = var0.method5609(); + } + + if ((var3 & 2) != 0) { + var2.targetIndex = var0.readUnsignedShort(); + if (var2.targetIndex == 65535) { + var2.targetIndex = -1; + } + } + + if ((var3 & 8) != 0) { + var5 = var0.method5771(); + byte[] var19 = new byte[var5]; + Buffer var15 = new Buffer(var19); + var0.readBytes(var19, 0, var5); + Players.field1235[var1] = var15; + var2.read(var15); + } + + if ((var3 & 256) != 0) { + for (var5 = 0; var5 < 3; ++var5) { + var2.actions[var5] = var0.readStringCp1252NullTerminated(); + } + } + + if ((var3 & 16) != 0) { + var2.overheadText = var0.readStringCp1252NullTerminated(); + if (var2.overheadText.charAt(0) == '~') { + var2.overheadText = var2.overheadText.substring(1); + ClientPreferences.addGameMessage(2, var2.username.getName(), var2.overheadText); + } else if (var2 == class192.localPlayer) { + ClientPreferences.addGameMessage(2, var2.username.getName(), var2.overheadText); + } + + var2.isAutoChatting = false; + var2.overheadTextColor = 0; + var2.overheadTextEffect = 0; + var2.overheadTextCyclesRemaining = 150; + } + + if ((var3 & 128) != 0) { + var2.field967 = var0.readUnsignedShort(); + if (var2.pathLength == 0) { + var2.orientation = var2.field967; + var2.field967 = -1; + } + } + + if (var2.field621) { + if (var4 == 127) { + var2.resetPath(var2.tileX, var2.tileY); } else { - int var10; - if (class179.field2297 == var0) { - var2 = var1.method5723(); - var3 = var1.method5675(); - var4 = var1.method5572(); - var5 = (var4 >> 4 & 7) + class3.field7; - var6 = (var4 & 7) + PlayerAppearance.field2520; - var7 = var1.method5675(); - var8 = var7 >> 4 & 15; - var9 = var7 & 7; - if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { - var10 = var8 + 1; - if (Message.localPlayer.pathX[0] >= var5 - var10 && Message.localPlayer.pathX[0] <= var5 + var10 && Message.localPlayer.pathY[0] >= var6 - var10 && Message.localPlayer.pathY[0] <= var10 + var6 && Client.areaSoundEffectVolume != 0 && var9 > 0 && Client.soundEffectCount < 50) { - Client.soundEffectIds[Client.soundEffectCount] = var2; - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var9; - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var3; - Client.soundEffects[Client.soundEffectCount] = null; - Client.soundLocations[Client.soundEffectCount] = var8 + (var6 << 8) + (var5 << 16); - ++Client.soundEffectCount; - } - } - } - - int var14; - int var39; - if (class179.field2289 == var0) { - var2 = var1.readUnsignedByte(); - var3 = var1.method5675() * 4; - var4 = var1.method5723(); - byte var38 = var1.method5577(); - var6 = var1.method5723(); - var7 = var1.method5572(); - var8 = (var7 >> 4 & 7) + class3.field7; - var9 = (var7 & 7) + PlayerAppearance.field2520; - var10 = var1.method5584(); - var39 = var1.method5675(); - int var40 = var1.method5583(); - int var41 = var1.method5572() * 4; - byte var42 = var1.method5577(); - var14 = var42 + var8; - var5 = var38 + var9; - if (var8 >= 0 && var9 >= 0 && var8 < 104 && var9 < 104 && var14 >= 0 && var5 >= 0 && var14 < 104 && var5 < 104 && var6 != 65535) { - var8 = var8 * 128 + 64; - var9 = var9 * 128 + 64; - var14 = var14 * 128 + 64; - var5 = var5 * 128 + 64; - Projectile var15 = new Projectile(var6, UrlRequest.Client_plane, var8, var9, ScriptEvent.getTileHeight(var8, var9, UrlRequest.Client_plane) - var3, var40 + Client.cycle, var4 + Client.cycle, var2, var39, var10, var41); - var15.setDestination(var14, var5, ScriptEvent.getTileHeight(var14, var5, UrlRequest.Client_plane) - var41, var40 + Client.cycle); - Client.projectiles.addFirst(var15); - } - - } else if (class179.field2296 == var0) { - var2 = var1.method5572(); - var3 = var2 >> 2; - var4 = var2 & 3; - var5 = Client.field689[var3]; - var6 = var1.readUnsignedByte(); - var7 = (var6 >> 4 & 7) + class3.field7; - var8 = (var6 & 7) + PlayerAppearance.field2520; - if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { - class65.updatePendingSpawn(UrlRequest.Client_plane, var7, var8, var5, -1, var3, var4, 0, -1); - } - - } else if (class179.field2294 == var0) { - var2 = var1.method5583(); - var3 = var1.method5582(); - var4 = var1.method5723(); - var5 = var1.method5675(); - var6 = (var5 >> 4 & 7) + class3.field7; - var7 = (var5 & 7) + PlayerAppearance.field2520; - if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { - NodeDeque var31 = Client.groundItems[UrlRequest.Client_plane][var6][var7]; - if (var31 != null) { - for (TileItem var33 = (TileItem)var31.last(); var33 != null; var33 = (TileItem)var31.previous()) { - if ((var3 & 32767) == var33.id && var4 == var33.quantity) { - var33.quantity = var2; - break; - } - } - - Skills.updateItemPile(var6, var7); - } - } - - } else if (class179.field2291 == var0) { - var2 = var1.method5628(); - var3 = (var2 >> 4 & 7) + class3.field7; - var4 = (var2 & 7) + PlayerAppearance.field2520; - var5 = var1.method5582(); - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { - NodeDeque var34 = Client.groundItems[UrlRequest.Client_plane][var3][var4]; - if (var34 != null) { - for (var32 = (TileItem)var34.last(); var32 != null; var32 = (TileItem)var34.previous()) { - if ((var5 & 32767) == var32.id) { - var32.remove(); - break; - } - } - - if (var34.last() == null) { - Client.groundItems[UrlRequest.Client_plane][var3][var4] = null; - } - - Skills.updateItemPile(var3, var4); - } - } - - } else if (class179.field2292 == var0) { - var2 = var1.method5675(); - var3 = (var2 >> 4 & 7) + class3.field7; - var4 = (var2 & 7) + PlayerAppearance.field2520; - var5 = var1.method5572(); - var6 = var5 >> 2; - var7 = var5 & 3; - var8 = Client.field689[var6]; - var9 = var1.method5582(); - if (var3 >= 0 && var4 >= 0 && var3 < 103 && var4 < 103) { - if (var8 == 0) { - BoundaryObject var35 = class14.scene.method3112(UrlRequest.Client_plane, var3, var4); - if (var35 != null) { - var39 = class2.Entity_unpackID(var35.tag); - if (var6 == 2) { - var35.entity1 = new DynamicObject(var39, 2, var7 + 4, UrlRequest.Client_plane, var3, var4, var9, false, var35.entity1); - var35.entity2 = new DynamicObject(var39, 2, var7 + 1 & 3, UrlRequest.Client_plane, var3, var4, var9, false, var35.entity2); - } else { - var35.entity1 = new DynamicObject(var39, var6, var7, UrlRequest.Client_plane, var3, var4, var9, false, var35.entity1); - } - } - } - - if (var8 == 1) { - WallDecoration var44 = class14.scene.method3113(UrlRequest.Client_plane, var3, var4); - if (var44 != null) { - var39 = class2.Entity_unpackID(var44.tag); - if (var6 != 4 && var6 != 5) { - if (var6 == 6) { - var44.entity1 = new DynamicObject(var39, 4, var7 + 4, UrlRequest.Client_plane, var3, var4, var9, false, var44.entity1); - } else if (var6 == 7) { - var44.entity1 = new DynamicObject(var39, 4, (var7 + 2 & 3) + 4, UrlRequest.Client_plane, var3, var4, var9, false, var44.entity1); - } else if (var6 == 8) { - var44.entity1 = new DynamicObject(var39, 4, var7 + 4, UrlRequest.Client_plane, var3, var4, var9, false, var44.entity1); - var44.entity2 = new DynamicObject(var39, 4, (var7 + 2 & 3) + 4, UrlRequest.Client_plane, var3, var4, var9, false, var44.entity2); - } - } else { - var44.entity1 = new DynamicObject(var39, 4, var7, UrlRequest.Client_plane, var3, var4, var9, false, var44.entity1); - } - } - } - - if (var8 == 2) { - GameObject var45 = class14.scene.method3114(UrlRequest.Client_plane, var3, var4); - if (var6 == 11) { - var6 = 10; - } - - if (var45 != null) { - var45.entity = new DynamicObject(class2.Entity_unpackID(var45.tag), var6, var7, UrlRequest.Client_plane, var3, var4, var9, false, var45.entity); - } - } - - if (var8 == 3) { - FloorDecoration var46 = class14.scene.getFloorDecoration(UrlRequest.Client_plane, var3, var4); - if (var46 != null) { - var46.entity = new DynamicObject(class2.Entity_unpackID(var46.tag), 22, var7, UrlRequest.Client_plane, var3, var4, var9, false, var46.entity); - } - } - } - + byte var16; + if (var4 != -1) { + var16 = var4; } else { - if (class179.field2298 == var0) { - byte var37 = var1.readByte(); - var3 = var1.method5583(); - var4 = var1.method5675(); - var5 = (var4 >> 4 & 7) + class3.field7; - var6 = (var4 & 7) + PlayerAppearance.field2520; - var7 = var1.method5572(); - var8 = var7 >> 2; - var9 = var7 & 3; - var10 = Client.field689[var8]; - byte var11 = var1.readByte(); - byte var12 = var1.method5576(); - byte var13 = var1.method5575(); - var14 = var1.readUnsignedShort(); - int var36 = var1.method5582(); - int var16 = var1.readUnsignedShort(); - Player var17; - if (var36 == Client.localPlayerIndex) { - var17 = Message.localPlayer; - } else { - var17 = Client.players[var36]; - } + var16 = Players.field1237[var1]; + } - if (var17 != null) { - ObjectDefinition var18 = Coord.getObjectDefinition(var16); - int var19; - int var20; - if (var9 != 1 && var9 != 3) { - var19 = var18.sizeX; - var20 = var18.sizeY; - } else { - var19 = var18.sizeY; - var20 = var18.sizeX; - } + var2.method1266(var2.tileX, var2.tileY, var16); + } + } - int var21 = var5 + (var19 >> 1); - int var22 = var5 + (var19 + 1 >> 1); - int var23 = var6 + (var20 >> 1); - int var24 = var6 + (var20 + 1 >> 1); - int[][] var25 = Tiles.Tiles_heights[UrlRequest.Client_plane]; - int var26 = var25[var22][var24] + var25[var21][var23] + var25[var22][var23] + var25[var21][var24] >> 2; - int var27 = (var5 << 7) + (var19 << 6); - int var28 = (var6 << 7) + (var20 << 6); - Model var29 = var18.getModel(var8, var9, var25, var27, var26, var28); - if (var29 != null) { - class65.updatePendingSpawn(UrlRequest.Client_plane, var5, var6, var10, -1, 0, 0, var3 + 1, var14 + 1); - var17.animationCycleStart = var3 + Client.cycle; - var17.animationCycleEnd = var14 + Client.cycle; - var17.model0 = var29; - var17.field601 = var5 * 128 + var19 * 64; - var17.field603 = var6 * 128 + var20 * 64; - var17.tileHeight2 = var26; - byte var30; - if (var13 > var11) { - var30 = var13; - var13 = var11; - var11 = var30; - } + } - if (var37 > var12) { - var30 = var37; - var37 = var12; - var12 = var30; - } + @ObfuscatedName("az") + @ObfuscatedSignature( + signature = "(Lff;III)Ldw;", + garbageValue = "1204269673" + ) + public static final PcmPlayer method627(TaskHandler var0, int var1, int var2) { + if (PcmPlayer.field1398 == 0) { + throw new IllegalStateException(); + } else if (var1 >= 0 && var1 < 2) { + if (var2 < 256) { + var2 = 256; + } - var17.field605 = var13 + var5; - var17.field607 = var5 + var11; - var17.field606 = var37 + var6; - var17.field608 = var6 + var12; - } - } + try { + PcmPlayer var3 = PcmPlayer.pcmPlayerProvider.player(); + var3.samples = new int[(PcmPlayer.PcmPlayer_stereo ? 2 : 1) * 256]; + var3.field1401 = var2; + var3.init(); + var3.capacity = (var2 & -1024) + 1024; + if (var3.capacity > 16384) { + var3.capacity = 16384; + } + + var3.open(var3.capacity); + if (GrandExchangeEvent.field45 > 0 && UserComparator2.soundSystem == null) { + UserComparator2.soundSystem = new SoundSystem(); + Frames.soundSystemExecutor = Executors.newScheduledThreadPool(1); + Frames.soundSystemExecutor.scheduleAtFixedRate(UserComparator2.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); + } + + if (UserComparator2.soundSystem != null) { + if (UserComparator2.soundSystem.players[var1] != null) { + throw new IllegalArgumentException(); } + UserComparator2.soundSystem.players[var1] = var3; } + + return var3; + } catch (Throwable var4) { + return new PcmPlayer(); } + } else { + throw new IllegalArgumentException(); } } - @ObfuscatedName("is") + @ObfuscatedName("fa") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V", - garbageValue = "-1072362060" + signature = "(IIII)V", + garbageValue = "926175900" ) - @Export("insertMenuItem") - static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) { - if (!Client.isMenuOpen) { - if (Client.menuOptionsCount < 500) { - Client.menuActions[Client.menuOptionsCount] = var0; - Client.menuTargets[Client.menuOptionsCount] = var1; - Client.menuOpcodes[Client.menuOptionsCount] = var2; - Client.menuIdentifiers[Client.menuOptionsCount] = var3; - Client.menuArguments1[Client.menuOptionsCount] = var4; - Client.menuArguments2[Client.menuOptionsCount] = var5; - Client.menuShiftClick[Client.menuOptionsCount] = var6; - ++Client.menuOptionsCount; - } - + @Export("queueSoundEffect") + static void queueSoundEffect(int var0, int var1, int var2) { + if (Client.soundEffectVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) { + Client.soundEffectIds[Client.soundEffectCount] = var0; + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; + Client.soundEffects[Client.soundEffectCount] = null; + Client.soundLocations[Client.soundEffectCount] = 0; + ++Client.soundEffectCount; } + + } + + @ObfuscatedName("kt") + @ObfuscatedSignature( + signature = "(IB)V", + garbageValue = "4" + ) + static void method628(int var0) { + for (IntegerNode var1 = (IntegerNode)Client.widgetClickMasks.first(); var1 != null; var1 = (IntegerNode)Client.widgetClickMasks.next()) { + if ((long)var0 == (var1.key >> 48 & 65535L)) { + var1.remove(); + } + } + } } diff --git a/runescape-client/src/main/java/AccessFile.java b/runescape-client/src/main/java/AccessFile.java index c492b5ddd0..103fce3dac 100644 --- a/runescape-client/src/main/java/AccessFile.java +++ b/runescape-client/src/main/java/AccessFile.java @@ -9,27 +9,27 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mk") +@ObfuscatedName("mx") @Implements("AccessFile") public final class AccessFile { - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("file") RandomAccessFile file; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - longValue = -2099605315629278245L + longValue = -6958977035237183007L ) @Export("maxSize") final long maxSize; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = 9136921121469373871L + longValue = -8139275980542647059L ) @Export("offset") long offset; public AccessFile(File var1, String var2, long var3) throws IOException { - if (var3 == -1L) { + if (-1L == var3) { var3 = Long.MAX_VALUE; } @@ -49,17 +49,17 @@ public final class AccessFile { this.file.seek(0L); } - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("seek") final void seek(long var1) throws IOException { this.file.seek(var1); this.offset = var1; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "([BIIB)V", - garbageValue = "87" + signature = "([BIII)V", + garbageValue = "-1955646442" ) @Export("write") public final void write(byte[] var1, int var2, int var3) throws IOException { @@ -73,20 +73,20 @@ public final class AccessFile { } } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1441194559" + garbageValue = "-1993690958" ) @Export("close") public final void close() throws IOException { this.closeSync(false); } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(ZS)V", - garbageValue = "180" + signature = "(ZI)V", + garbageValue = "1689425186" ) @Export("closeSync") public final void closeSync(boolean var1) throws IOException { @@ -104,20 +104,20 @@ public final class AccessFile { } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(I)J", - garbageValue = "-1766264538" + garbageValue = "1409759117" ) @Export("length") public final long length() throws IOException { return this.file.length(); } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "([BIII)I", - garbageValue = "1663251439" + garbageValue = "-1292209502" ) @Export("read") public final int read(byte[] var1, int var2, int var3) throws IOException { diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index 182b23ab87..82e1292d2f 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -4,320 +4,326 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bv") +@ObfuscatedName("bx") @Implements("Actor") public abstract class Actor extends Entity { - @ObfuscatedName("as") + @ObfuscatedName("hw") @ObfuscatedGetter( - intValue = 274195699 + intValue = -1081089529 + ) + @Export("cameraZ") + static int cameraZ; + @ObfuscatedName("ax") + @ObfuscatedGetter( + intValue = -892372587 ) @Export("x") int x; - @ObfuscatedName("ak") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 1601699261 + intValue = -340039451 ) @Export("y") int y; @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -1309373011 + intValue = 349053657 ) @Export("rotation") int rotation; - @ObfuscatedName("ah") + @ObfuscatedName("ay") @Export("isWalking") boolean isWalking; + @ObfuscatedName("aa") + @ObfuscatedGetter( + intValue = -697437632 + ) + int field942; @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 511883639 - ) - int field925; - @ObfuscatedName("ao") - @ObfuscatedGetter( - intValue = -1397421297 + intValue = 1907492229 ) @Export("playerCycle") int playerCycle; - @ObfuscatedName("an") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -218556909 + intValue = -1598432795 ) @Export("readySequence") int readySequence; - @ObfuscatedName("ar") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -1204927265 + intValue = -291727723 ) @Export("turnLeftSequence") int turnLeftSequence; - @ObfuscatedName("az") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -824766843 + intValue = -1728008405 ) @Export("turnRightSequence") int turnRightSequence; - @ObfuscatedName("ay") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -1263337971 + intValue = -1086097041 ) @Export("walkSequence") int walkSequence; - @ObfuscatedName("ag") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -1033895093 + intValue = -1467237959 ) @Export("walkBackSequence") int walkBackSequence; - @ObfuscatedName("ac") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 1049050611 + intValue = 1983487081 ) @Export("walkLeftSequence") int walkLeftSequence; @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -1372236963 + intValue = 849163825 ) @Export("walkRightSequence") int walkRightSequence; - @ObfuscatedName("ae") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -1324653627 + intValue = 1212229631 ) @Export("runSequence") int runSequence; - @ObfuscatedName("ad") + @ObfuscatedName("am") @Export("overheadText") String overheadText; - @ObfuscatedName("aj") + @ObfuscatedName("ao") @Export("isAutoChatting") boolean isAutoChatting; - @ObfuscatedName("ax") - boolean field937; @ObfuscatedName("at") + boolean field954; + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -171465493 + intValue = 411062959 ) @Export("overheadTextCyclesRemaining") int overheadTextCyclesRemaining; - @ObfuscatedName("af") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -1280129029 + intValue = 303951077 ) @Export("overheadTextColor") int overheadTextColor; - @ObfuscatedName("ap") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = -373599431 + intValue = -1337341867 ) @Export("overheadTextEffect") int overheadTextEffect; - @ObfuscatedName("am") + @ObfuscatedName("ap") @Export("hitSplatCount") byte hitSplatCount; - @ObfuscatedName("ab") + @ObfuscatedName("ah") @Export("hitSplatTypes") int[] hitSplatTypes; - @ObfuscatedName("bj") + @ObfuscatedName("bq") @Export("hitSplatValues") int[] hitSplatValues; - @ObfuscatedName("bg") + @ObfuscatedName("bf") @Export("hitSplatCycles") int[] hitSplatCycles; - @ObfuscatedName("bw") + @ObfuscatedName("bc") @Export("hitSplatTypes2") int[] hitSplatTypes2; @ObfuscatedName("bk") @Export("hitSplatValues2") int[] hitSplatValues2; - @ObfuscatedName("bl") + @ObfuscatedName("bb") @ObfuscatedSignature( - signature = "Ljl;" + signature = "Ljj;" ) @Export("healthBars") IterableNodeDeque healthBars; - @ObfuscatedName("bq") + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = -842697287 + intValue = -186074271 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("bx") + @ObfuscatedName("bp") @Export("false0") boolean false0; - @ObfuscatedName("bc") + @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = -2004895213 + intValue = 49507657 ) - int field960; + int field967; @ObfuscatedName("by") @ObfuscatedGetter( - intValue = -1753452087 + intValue = 1446195429 ) @Export("movementSequence") int movementSequence; - @ObfuscatedName("bz") + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = 25834883 + intValue = 707889715 ) @Export("movementFrame") int movementFrame; - @ObfuscatedName("bm") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = -143174307 + intValue = -1510221367 ) @Export("movementFrameCycle") int movementFrameCycle; - @ObfuscatedName("bo") + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = 382239063 + intValue = 2138595105 ) @Export("sequence") int sequence; - @ObfuscatedName("bs") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = -226786267 + intValue = -1231128891 ) @Export("sequenceFrame") int sequenceFrame; - @ObfuscatedName("ba") + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = 175494277 + intValue = -733211881 ) @Export("sequenceFrameCycle") int sequenceFrameCycle; - @ObfuscatedName("bn") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = 62784213 + intValue = 825906927 ) @Export("sequenceDelay") int sequenceDelay; - @ObfuscatedName("bb") + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = 1890920221 + intValue = -768397183 ) - int field958; - @ObfuscatedName("bh") + int field983; + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = 185005207 + intValue = 340005731 ) @Export("spotAnimation") int spotAnimation; - @ObfuscatedName("bv") + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = 1786856989 + intValue = -1782758549 ) @Export("spotAnimationFrame") int spotAnimationFrame; - @ObfuscatedName("bu") + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = -327769151 + intValue = 794012987 ) @Export("spotAnimationFrameCycle") int spotAnimationFrameCycle; - @ObfuscatedName("be") + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = -1796469609 + intValue = 2005510657 ) - int field943; - @ObfuscatedName("bd") + int field979; + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = 1623110031 + intValue = 1479778797 ) - int field963; - @ObfuscatedName("bf") + int field980; + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = -909355861 + intValue = 1805966651 ) - int field921; - @ObfuscatedName("bi") + int field981; + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = -1912574851 + intValue = 491483643 ) - int field965; + int field961; + @ObfuscatedName("bv") + @ObfuscatedGetter( + intValue = 479016033 + ) + int field957; + @ObfuscatedName("bo") + @ObfuscatedGetter( + intValue = 1112662559 + ) + int field991; @ObfuscatedName("br") @ObfuscatedGetter( - intValue = 503419835 + intValue = -71204417 ) - int field966; - @ObfuscatedName("bt") - @ObfuscatedGetter( - intValue = 625634807 - ) - int field929; - @ObfuscatedName("bp") - @ObfuscatedGetter( - intValue = -202999541 - ) - int field950; - @ObfuscatedName("co") - @ObfuscatedGetter( - intValue = 1681195499 - ) - int field969; + int field985; @ObfuscatedName("cp") @ObfuscatedGetter( - intValue = 819823007 + intValue = 78951405 ) - int field970; - @ObfuscatedName("cd") + int field986; + @ObfuscatedName("cg") @ObfuscatedGetter( - intValue = 1293515615 + intValue = 179265201 + ) + int field987; + @ObfuscatedName("cr") + @ObfuscatedGetter( + intValue = -787364139 ) @Export("npcCycle") int npcCycle; - @ObfuscatedName("cj") + @ObfuscatedName("co") @ObfuscatedGetter( - intValue = -958995757 + intValue = 1402601371 ) @Export("defaultHeight") int defaultHeight; - @ObfuscatedName("cq") + @ObfuscatedName("ck") @ObfuscatedGetter( - intValue = -839837513 + intValue = 186982923 ) @Export("orientation") int orientation; - @ObfuscatedName("cb") + @ObfuscatedName("cn") @ObfuscatedGetter( - intValue = -1474803963 + intValue = 661505811 ) - int field974; - @ObfuscatedName("cf") + int field956; + @ObfuscatedName("cd") @ObfuscatedGetter( - intValue = 1709100513 + intValue = 1778571567 ) - int field968; - @ObfuscatedName("cs") + int field975; + @ObfuscatedName("ct") @ObfuscatedGetter( - intValue = 905332161 + intValue = -1795737793 ) @Export("pathLength") int pathLength; - @ObfuscatedName("ch") + @ObfuscatedName("cb") @Export("pathX") int[] pathX; - @ObfuscatedName("ca") + @ObfuscatedName("cf") @Export("pathY") int[] pathY; - @ObfuscatedName("cn") + @ObfuscatedName("cm") @Export("pathTraversed") byte[] pathTraversed; - @ObfuscatedName("cx") + @ObfuscatedName("cz") @ObfuscatedGetter( - intValue = 426432369 + intValue = -1512455111 ) - int field980; - @ObfuscatedName("ck") + int field997; + @ObfuscatedName("cu") @ObfuscatedGetter( - intValue = -1929716187 + intValue = -737673093 ) - int field926; + int field998; Actor() { this.isWalking = false; - this.field925 = 1; + this.field942 = 64; this.readySequence = -1; this.turnLeftSequence = -1; this.turnRightSequence = -1; @@ -327,7 +333,7 @@ public abstract class Actor extends Entity { this.walkRightSequence = -1; this.runSequence = -1; this.overheadText = null; - this.field937 = false; + this.field954 = false; this.overheadTextCyclesRemaining = 100; this.overheadTextColor = 0; this.overheadTextEffect = 0; @@ -340,7 +346,7 @@ public abstract class Actor extends Entity { this.healthBars = new IterableNodeDeque(); this.targetIndex = -1; this.false0 = false; - this.field960 = -1; + this.field967 = -1; this.movementSequence = -1; this.movementFrame = 0; this.movementFrameCycle = 0; @@ -348,26 +354,26 @@ public abstract class Actor extends Entity { this.sequenceFrame = 0; this.sequenceFrameCycle = 0; this.sequenceDelay = 0; - this.field958 = 0; + this.field983 = 0; this.spotAnimation = -1; this.spotAnimationFrame = 0; this.spotAnimationFrameCycle = 0; this.npcCycle = 0; this.defaultHeight = 200; - this.field974 = 0; - this.field968 = 32; + this.field956 = 0; + this.field975 = 32; this.pathLength = 0; this.pathX = new int[10]; this.pathY = new int[10]; this.pathTraversed = new byte[10]; - this.field980 = 0; - this.field926 = 0; + this.field997 = 0; + this.field998 = 0; } - @ObfuscatedName("l") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(S)Z", - garbageValue = "3163" + signature = "(I)Z", + garbageValue = "-515224238" ) @Export("isVisible") boolean isVisible() { @@ -376,18 +382,18 @@ public abstract class Actor extends Entity { @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-52" + signature = "(I)V", + garbageValue = "-847107041" ) - final void method1742() { + final void method1740() { this.pathLength = 0; - this.field926 = 0; + this.field998 = 0; } - @ObfuscatedName("am") + @ObfuscatedName("ab") @ObfuscatedSignature( signature = "(IIIIIII)V", - garbageValue = "2136221861" + garbageValue = "-913342353" ) @Export("addHitSplat") final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) { @@ -407,38 +413,52 @@ public abstract class Actor extends Entity { int var10 = -1; int var11 = 0; if (var1 >= 0) { - HitSplatDefinition var12 = MusicPatchNode.method3815(var1); - var10 = var12.field3299; - var11 = var12.field3298; + HitSplatDefinition var13 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var1); + HitSplatDefinition var12; + if (var13 != null) { + var12 = var13; + } else { + byte[] var14 = class49.HitSplatDefinition_archive.takeFile(32, var1); + var13 = new HitSplatDefinition(); + if (var14 != null) { + var13.decode(new Buffer(var14)); + } + + HitSplatDefinition.HitSplatDefinition_cached.put(var13, (long)var1); + var12 = var13; + } + + var10 = var12.field3337; + var11 = var12.field3328; } - int var14; + int var15; if (var8) { if (var10 == -1) { return; } var9 = 0; - var14 = 0; + var15 = 0; if (var10 == 0) { - var14 = this.hitSplatCycles[0]; + var15 = this.hitSplatCycles[0]; } else if (var10 == 1) { - var14 = this.hitSplatValues[0]; + var15 = this.hitSplatValues[0]; } - for (int var13 = 1; var13 < 4; ++var13) { + for (int var16 = 1; var16 < 4; ++var16) { if (var10 == 0) { - if (this.hitSplatCycles[var13] < var14) { - var9 = var13; - var14 = this.hitSplatCycles[var13]; + if (this.hitSplatCycles[var16] < var15) { + var9 = var16; + var15 = this.hitSplatCycles[var16]; } - } else if (var10 == 1 && this.hitSplatValues[var13] < var14) { - var9 = var13; - var14 = this.hitSplatValues[var13]; + } else if (var10 == 1 && this.hitSplatValues[var16] < var15) { + var9 = var16; + var15 = this.hitSplatValues[var16]; } } - if (var10 == 1 && var14 >= var2) { + if (var10 == 1 && var15 >= var2) { return; } } else { @@ -446,11 +466,11 @@ public abstract class Actor extends Entity { this.hitSplatCount = 0; } - for (var14 = 0; var14 < 4; ++var14) { - byte var15 = this.hitSplatCount; + for (var15 = 0; var15 < 4; ++var15) { + byte var17 = this.hitSplatCount; this.hitSplatCount = (byte)((this.hitSplatCount + 1) % 4); - if (this.hitSplatCycles[var15] <= var5) { - var9 = var15; + if (this.hitSplatCycles[var17] <= var5) { + var9 = var17; break; } } @@ -465,14 +485,14 @@ public abstract class Actor extends Entity { } } - @ObfuscatedName("ab") + @ObfuscatedName("ap") @ObfuscatedSignature( signature = "(IIIIIII)V", - garbageValue = "1083208214" + garbageValue = "1968439377" ) @Export("addHealthBar") final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) { - HealthBarDefinition var7 = class32.method548(var1); + HealthBarDefinition var7 = PacketWriter.method2329(var1); HealthBar var8 = null; HealthBar var9 = null; int var10 = var7.int2; @@ -481,7 +501,7 @@ public abstract class Actor extends Entity { HealthBar var12; for (var12 = (HealthBar)this.healthBars.last(); var12 != null; var12 = (HealthBar)this.healthBars.previous()) { ++var11; - if (var12.definition.field3249 == var7.field3249) { + if (var12.definition.field3275 == var7.field3275) { var12.put(var2 + var4, var5, var6, var3); return; } @@ -512,14 +532,14 @@ public abstract class Actor extends Entity { } } - @ObfuscatedName("bj") + @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-982043878" + signature = "(IB)V", + garbageValue = "51" ) @Export("removeHealthBar") final void removeHealthBar(int var1) { - HealthBarDefinition var2 = class32.method548(var1); + HealthBarDefinition var2 = PacketWriter.method2329(var1); for (HealthBar var3 = (HealthBar)this.healthBars.last(); var3 != null; var3 = (HealthBar)this.healthBars.previous()) { if (var2 == var3.definition) { @@ -530,38 +550,40 @@ public abstract class Actor extends Entity { } - @ObfuscatedName("y") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "277" + signature = "(IIZB)Ljava/lang/String;", + garbageValue = "91" ) - public static void method1755() { - GZipDecompressor.midiPcmStream.clear(); - class197.field2392 = 1; - Coord.musicTrackArchive = null; - } + static String method1741(int var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { + if (var2 && var0 >= 0) { + int var3 = 2; - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "540632011" - ) - public static void method1756() { - VarpDefinition.VarpDefinition_cached.clear(); - } + for (int var4 = var0 / var1; var4 != 0; ++var3) { + var4 /= var1; + } - @ObfuscatedName("ih") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "276036566" - ) - @Export("addCancelMenuEntry") - static void addCancelMenuEntry() { - WorldMapData_1.method708(); - Client.menuActions[0] = "Cancel"; - Client.menuTargets[0] = ""; - Client.menuOpcodes[0] = 1006; - Client.menuShiftClick[0] = false; - Client.menuOptionsCount = 1; + char[] var5 = new char[var3]; + var5[0] = '+'; + + for (int var6 = var3 - 1; var6 > 0; --var6) { + int var7 = var0; + var0 /= var1; + int var8 = var7 - var0 * var1; + if (var8 >= 10) { + var5[var6] = (char)(var8 + 87); + } else { + var5[var6] = (char)(var8 + 48); + } + } + + return new String(var5); + } else { + return Integer.toString(var0, var1); + } + } else { + throw new IllegalArgumentException("" + var1); + } } } diff --git a/runescape-client/src/main/java/Animation.java b/runescape-client/src/main/java/Animation.java index 4d77a4bd7a..f49d79426f 100644 --- a/runescape-client/src/main/java/Animation.java +++ b/runescape-client/src/main/java/Animation.java @@ -3,51 +3,51 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dj") +@ObfuscatedName("dh") @Implements("Animation") public class Animation { - @ObfuscatedName("f") - static int[] field1615; + @ObfuscatedName("c") + static int[] field1628; + @ObfuscatedName("t") + static int[] field1621; + @ObfuscatedName("o") + static int[] field1627; + @ObfuscatedName("e") + static int[] field1623; @ObfuscatedName("i") - static int[] field1614; - @ObfuscatedName("y") - static int[] field1611; - @ObfuscatedName("w") - static int[] field1616; - @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lek;" + signature = "Lec;" ) @Export("skeleton") Skeleton skeleton; - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("transformCount") int transformCount; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("transformSkeletonLabels") int[] transformSkeletonLabels; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("transformXs") int[] transformXs; - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("transformYs") int[] transformYs; - @ObfuscatedName("d") + @ObfuscatedName("m") @Export("transformZs") int[] transformZs; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("hasAlphaTransform") boolean hasAlphaTransform; static { - field1615 = new int[500]; - field1614 = new int[500]; - field1611 = new int[500]; - field1616 = new int[500]; + field1628 = new int[500]; + field1621 = new int[500]; + field1627 = new int[500]; + field1623 = new int[500]; } @ObfuscatedSignature( - signature = "([BLek;)V" + signature = "([BLec;)V" ) Animation(byte[] var1, Skeleton var2) { this.skeleton = null; @@ -69,38 +69,38 @@ public class Animation { if (this.skeleton.transformTypes[var8] != 0) { for (int var10 = var8 - 1; var10 > var6; --var10) { if (this.skeleton.transformTypes[var10] == 0) { - field1615[var7] = var10; - field1614[var7] = 0; - field1611[var7] = 0; - field1616[var7] = 0; + field1628[var7] = var10; + field1621[var7] = 0; + field1627[var7] = 0; + field1623[var7] = 0; ++var7; break; } } } - field1615[var7] = var8; + field1628[var7] = var8; short var11 = 0; if (this.skeleton.transformTypes[var8] == 3) { var11 = 128; } if ((var9 & 1) != 0) { - field1614[var7] = var4.readShortSmart(); + field1621[var7] = var4.readShortSmart(); } else { - field1614[var7] = var11; + field1621[var7] = var11; } if ((var9 & 2) != 0) { - field1611[var7] = var4.readShortSmart(); + field1627[var7] = var4.readShortSmart(); } else { - field1611[var7] = var11; + field1627[var7] = var11; } if ((var9 & 4) != 0) { - field1616[var7] = var4.readShortSmart(); + field1623[var7] = var4.readShortSmart(); } else { - field1616[var7] = var11; + field1623[var7] = var11; } var6 = var8; @@ -121,10 +121,10 @@ public class Animation { this.transformZs = new int[var7]; for (var8 = 0; var8 < var7; ++var8) { - this.transformSkeletonLabels[var8] = field1615[var8]; - this.transformXs[var8] = field1614[var8]; - this.transformYs[var8] = field1611[var8]; - this.transformZs[var8] = field1616[var8]; + this.transformSkeletonLabels[var8] = field1628[var8]; + this.transformXs[var8] = field1621[var8]; + this.transformYs[var8] = field1627[var8]; + this.transformZs[var8] = field1623[var8]; } } diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java index 201e7f79c3..3dc0480d65 100644 --- a/runescape-client/src/main/java/Archive.java +++ b/runescape-client/src/main/java/Archive.java @@ -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); - } - } - } - - } } diff --git a/runescape-client/src/main/java/ArchiveDisk.java b/runescape-client/src/main/java/ArchiveDisk.java index 756d0d3c05..3ef4d5dddd 100644 --- a/runescape-client/src/main/java/ArchiveDisk.java +++ b/runescape-client/src/main/java/ArchiveDisk.java @@ -6,33 +6,33 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kg") +@ObfuscatedName("ky") @Implements("ArchiveDisk") public final class ArchiveDisk { - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("ArchiveDisk_buffer") static byte[] ArchiveDisk_buffer; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 77454403 - ) - @Export("archive") - int archive; - @ObfuscatedName("y") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lmy;" + signature = "Lme;" ) @Export("datFile") BufferedFile datFile; - @ObfuscatedName("w") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lmy;" + signature = "Lme;" ) @Export("idxFile") BufferedFile idxFile; - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1304769843 + intValue = 92062517 + ) + @Export("archive") + int archive; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -1875566271 ) @Export("maxEntrySize") int maxEntrySize; @@ -42,7 +42,7 @@ public final class ArchiveDisk { } @ObfuscatedSignature( - signature = "(ILmy;Lmy;I)V" + signature = "(ILme;Lme;I)V" ) public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) { this.datFile = null; @@ -54,10 +54,10 @@ public final class ArchiveDisk { this.maxEntrySize = var4; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IB)[B", - garbageValue = "-19" + signature = "(II)[B", + garbageValue = "1862196910" ) @Export("read") public byte[] read(int var1) { @@ -101,7 +101,7 @@ public final class ArchiveDisk { } var13 = 10; - this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13); + this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8); var9 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); var10 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[4] & 255) << 8); var11 = (ArchiveDisk_buffer[8] & 255) + ((ArchiveDisk_buffer[7] & 255) << 8) + ((ArchiveDisk_buffer[6] & 255) << 16); @@ -112,14 +112,14 @@ public final class ArchiveDisk { } var13 = 8; - this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8); + this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13); var9 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); var10 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); var11 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); var12 = ArchiveDisk_buffer[7] & 255; } - if (var9 != var1 || var7 != var10 || var12 != this.archive) { + if (var9 != var1 || var10 != var7 || var12 != this.archive) { var10000 = null; return (byte[])var10000; } @@ -148,10 +148,10 @@ public final class ArchiveDisk { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I[BII)Z", - garbageValue = "1696997019" + garbageValue = "2136581865" ) @Export("write") public boolean write(int var1, byte[] var2, int var3) { @@ -169,10 +169,10 @@ public final class ArchiveDisk { } } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I[BIZI)Z", - garbageValue = "957483155" + garbageValue = "-1086221243" ) @Export("write0") boolean write0(int var1, byte[] var2, int var3, boolean var4) { @@ -244,7 +244,7 @@ public final class ArchiveDisk { var12 = ArchiveDisk_buffer[7] & 255; } - if (var10 != var1 || var8 != var11 || var12 != this.archive) { + if (var10 != var1 || var11 != var8 || var12 != this.archive) { var10000 = false; return var10000; } @@ -282,7 +282,7 @@ public final class ArchiveDisk { ArchiveDisk_buffer[7] = (byte)(var9 >> 8); ArchiveDisk_buffer[8] = (byte)var9; ArchiveDisk_buffer[9] = (byte)this.archive; - this.datFile.seek((long)var6 * 520L); + this.datFile.seek(520L * (long)var6); this.datFile.write(ArchiveDisk_buffer, 0, 10); var10 = var3 - var7; if (var10 > 510) { @@ -304,7 +304,7 @@ public final class ArchiveDisk { ArchiveDisk_buffer[5] = (byte)(var9 >> 8); ArchiveDisk_buffer[6] = (byte)var9; ArchiveDisk_buffer[7] = (byte)this.archive; - this.datFile.seek((long)var6 * 520L); + this.datFile.seek(520L * (long)var6); this.datFile.write(ArchiveDisk_buffer, 0, 8); var10 = var3 - var7; if (var10 > 512) { @@ -333,24 +333,4 @@ public final class ArchiveDisk { public String toString() { return "" + this.archive; } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(I)[Lcf;", - garbageValue = "2092727218" - ) - static AttackOption[] method5908() { - return new AttackOption[]{AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_hidden, AttackOption.AttackOption_alwaysRightClick}; - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(Lhz;Lhz;Ljava/lang/String;Ljava/lang/String;I)Lko;", - garbageValue = "-378013703" - ) - public static Font method5909(AbstractArchive var0, AbstractArchive var1, String var2, String var3) { - int var4 = var0.getGroupId(var2); - int var5 = var0.getFileId(var4, var3); - return class14.method160(var0, var1, var4, var5); - } } diff --git a/runescape-client/src/main/java/ArchiveDiskAction.java b/runescape-client/src/main/java/ArchiveDiskAction.java index de149d6088..61515f9629 100644 --- a/runescape-client/src/main/java/ArchiveDiskAction.java +++ b/runescape-client/src/main/java/ArchiveDiskAction.java @@ -1,4 +1,3 @@ -import java.awt.Component; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; @@ -8,24 +7,30 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("hr") @Implements("ArchiveDiskAction") public class ArchiveDiskAction extends Node { - @ObfuscatedName("f") + @ObfuscatedName("ky") @ObfuscatedGetter( - intValue = -867682367 + intValue = 1465828327 + ) + @Export("menuX") + static int menuX; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 529558381 ) @Export("type") int type; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("data") byte[] data; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lkg;" + signature = "Lky;" ) @Export("archiveDisk") ArchiveDisk archiveDisk; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lif;" + signature = "Lia;" ) @Export("archive") Archive archive; @@ -33,14 +38,52 @@ public class ArchiveDiskAction extends Node { ArchiveDiskAction() { } - @ObfuscatedName("y") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/awt/Component;I)V", - garbageValue = "2084975828" + signature = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", + garbageValue = "-2068094459" ) - static void method4120(Component var0) { - var0.removeKeyListener(KeyHandler.KeyHandler_instance); - var0.removeFocusListener(KeyHandler.KeyHandler_instance); - KeyHandler.field373 = -1; + public static String method4216(CharSequence var0) { + int var1 = var0.length(); + StringBuilder var2 = new StringBuilder(var1); + + for (int var3 = 0; var3 < var1; ++var3) { + char var4 = var0.charAt(var3); + if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { + if (var4 == ' ') { + var2.append('+'); + } else { + byte var5 = TextureProvider.charToByteCp1252(var4); + var2.append('%'); + int var6 = var5 >> 4 & 15; + if (var6 >= 10) { + var2.append((char)(var6 + 55)); + } else { + var2.append((char)(var6 + 48)); + } + + var6 = var5 & 15; + if (var6 >= 10) { + var2.append((char)(var6 + 55)); + } else { + var2.append((char)(var6 + 48)); + } + } + } else { + var2.append(var4); + } + } + + return var2.toString(); + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "(CB)Z", + garbageValue = "57" + ) + @Export("isAlphaNumeric") + public static boolean isAlphaNumeric(char var0) { + return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; } } diff --git a/runescape-client/src/main/java/ArchiveDiskActionHandler.java b/runescape-client/src/main/java/ArchiveDiskActionHandler.java index 7eed8ae045..123f1dfb5f 100644 --- a/runescape-client/src/main/java/ArchiveDiskActionHandler.java +++ b/runescape-client/src/main/java/ArchiveDiskActionHandler.java @@ -4,37 +4,40 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ih") +@ObfuscatedName("ik") @Implements("ArchiveDiskActionHandler") public class ArchiveDiskActionHandler implements Runnable { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Ljs;" + signature = "Ljw;" ) @Export("ArchiveDiskActionHandler_requestQueue") static NodeDeque ArchiveDiskActionHandler_requestQueue; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Ljs;" + signature = "Lii;" + ) + @Export("SpotAnimationDefinition_modelArchive") + public static AbstractArchive SpotAnimationDefinition_modelArchive; + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "Ljw;" ) @Export("ArchiveDiskActionHandler_responseQueue") static NodeDeque ArchiveDiskActionHandler_responseQueue; - @ObfuscatedName("y") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 509614069 + intValue = 416833363 ) - static int field3120; - @ObfuscatedName("w") + public static int field3150; + @ObfuscatedName("i") @Export("ArchiveDiskActionHandler_lock") - static Object ArchiveDiskActionHandler_lock; - @ObfuscatedName("p") - @Export("ArchiveDiskActionHandler_thread") - static Thread ArchiveDiskActionHandler_thread; + public static Object ArchiveDiskActionHandler_lock; static { ArchiveDiskActionHandler_requestQueue = new NodeDeque(); ArchiveDiskActionHandler_responseQueue = new NodeDeque(); - field3120 = 0; + field3150 = 0; ArchiveDiskActionHandler_lock = new Object(); } @@ -63,39 +66,393 @@ public class ArchiveDiskActionHandler implements Runnable { } synchronized(ArchiveDiskActionHandler_lock) { - if (field3120 <= 1) { - field3120 = 0; + if (field3150 <= 1) { + field3150 = 0; ArchiveDiskActionHandler_lock.notifyAll(); return; } - field3120 = 600; + field3150 = 600; } } else { - ServerBuild.method4111(100L); + FriendLoginUpdate.method5325(100L); synchronized(ArchiveDiskActionHandler_lock) { - if (field3120 <= 1) { - field3120 = 0; + if (field3150 <= 1) { + field3150 = 0; ArchiveDiskActionHandler_lock.notifyAll(); return; } - --field3120; + --field3150; } } } } catch (Exception var13) { - DesktopPlatformInfoProvider.RunException_sendStackTrace((String)null, var13); + class225.RunException_sendStackTrace((String)null, var13); } } - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)I", - garbageValue = "139365615" + signature = "(IIIIIILem;Lfv;I)V", + garbageValue = "-1749856384" ) - @Export("parseInt") - public static int parseInt(CharSequence var0) { - return TriBool.parseIntCustomRadix(var0, 10, true); + static final void method4336(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) { + if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) { + if (var0 < Tiles.Tiles_minPlane) { + Tiles.Tiles_minPlane = var0; + } + + ObjectDefinition var8 = Occluder.getObjectDefinition(var3); + int var9; + int var10; + if (var4 != 1 && var4 != 3) { + var9 = var8.sizeX; + var10 = var8.sizeY; + } else { + var9 = var8.sizeY; + var10 = var8.sizeX; + } + + int var11; + int var12; + if (var9 + var1 <= 104) { + var11 = (var9 >> 1) + var1; + var12 = (var9 + 1 >> 1) + var1; + } else { + var11 = var1; + var12 = var1 + 1; + } + + int var13; + int var14; + if (var10 + var2 <= 104) { + var13 = (var10 >> 1) + var2; + var14 = var2 + (var10 + 1 >> 1); + } else { + var13 = var2; + var14 = var2 + 1; + } + + int[][] var15 = Tiles.Tiles_heights[var0]; + int var16 = var15[var11][var13] + var15[var12][var13] + var15[var11][var14] + var15[var12][var14] >> 2; + int var17 = (var1 << 7) + (var9 << 6); + int var18 = (var2 << 7) + (var10 << 6); + long var19 = GameShell.calculateTag(var1, var2, 2, var8.int1 == 0, var3); + int var21 = var5 + (var4 << 6); + if (var8.int3 == 1) { + var21 += 256; + } + + if (var8.hasSound()) { + ObjectSound.method1931(var0, var1, var2, var8, var4); + } + + Object var22; + if (var5 == 22) { + if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(22, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newFloorDecoration(var0, var1, var2, var16, (Entity)var22, var19, var21); + if (var8.interactType == 1 && var7 != null) { + var7.setBlockedByFloorDec(var1, var2); + } + + } + } else { + int var23; + if (var5 != 10 && var5 != 11) { + int[] var10000; + if (var5 >= 12) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.method3165(var0, var1, var2, var16, 1, 1, (Entity)var22, 0, var19, var21); + if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { + var10000 = UrlRequest.field1940[var0][var1]; + var10000[var2] |= 2340; + } + + if (var8.interactType != 0 && var7 != null) { + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + } else if (var5 == 0) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(0, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var22, (Entity)null, Tiles.field508[var4], 0, var19, var21); + if (var4 == 0) { + if (var8.clipped) { + InterfaceParent.field565[var0][var1][var2] = 50; + InterfaceParent.field565[var0][var1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = UrlRequest.field1940[var0][var1]; + var10000[var2] |= 585; + } + } else if (var4 == 1) { + if (var8.clipped) { + InterfaceParent.field565[var0][var1][var2 + 1] = 50; + InterfaceParent.field565[var0][var1 + 1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = UrlRequest.field1940[var0][var1]; + var10000[1 + var2] |= 1170; + } + } else if (var4 == 2) { + if (var8.clipped) { + InterfaceParent.field565[var0][var1 + 1][var2] = 50; + InterfaceParent.field565[var0][var1 + 1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = UrlRequest.field1940[var0][var1 + 1]; + var10000[var2] |= 585; + } + } else if (var4 == 3) { + if (var8.clipped) { + InterfaceParent.field565[var0][var1][var2] = 50; + InterfaceParent.field565[var0][var1 + 1][var2] = 50; + } + + if (var8.modelClipped) { + var10000 = UrlRequest.field1940[var0][var1]; + var10000[var2] |= 1170; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method3626(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method3171(var0, var1, var2, var8.int2); + } + + } else if (var5 == 1) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(1, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var22, (Entity)null, Tiles.field513[var4], 0, var19, var21); + if (var8.clipped) { + if (var4 == 0) { + InterfaceParent.field565[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { + InterfaceParent.field565[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { + InterfaceParent.field565[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { + InterfaceParent.field565[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method3626(var1, var2, var5, var4, var8.boolean1); + } + + } else { + int var28; + if (var5 == 2) { + var28 = var4 + 1 & 3; + Object var29; + Object var30; + if (var8.animationId == -1 && var8.transforms == null) { + var29 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); + var30 = var8.getEntity(2, var28, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + var30 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var29, (Entity)var30, Tiles.field508[var4], Tiles.field508[var28], var19, var21); + if (var8.modelClipped) { + if (var4 == 0) { + var10000 = UrlRequest.field1940[var0][var1]; + var10000[var2] |= 585; + var10000 = UrlRequest.field1940[var0][var1]; + var10000[var2 + 1] |= 1170; + } else if (var4 == 1) { + var10000 = UrlRequest.field1940[var0][var1]; + var10000[var2 + 1] |= 1170; + var10000 = UrlRequest.field1940[var0][var1 + 1]; + var10000[var2] |= 585; + } else if (var4 == 2) { + var10000 = UrlRequest.field1940[var0][var1 + 1]; + var10000[var2] |= 585; + var10000 = UrlRequest.field1940[var0][var1]; + var10000[var2] |= 1170; + } else if (var4 == 3) { + var10000 = UrlRequest.field1940[var0][var1]; + var10000[var2] |= 1170; + var10000 = UrlRequest.field1940[var0][var1]; + var10000[var2] |= 585; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method3626(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method3171(var0, var1, var2, var8.int2); + } + + } else if (var5 == 3) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(3, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var22, (Entity)null, Tiles.field513[var4], 0, var19, var21); + if (var8.clipped) { + if (var4 == 0) { + InterfaceParent.field565[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { + InterfaceParent.field565[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { + InterfaceParent.field565[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { + InterfaceParent.field565[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method3626(var1, var2, var5, var4, var8.boolean1); + } + + } else if (var5 == 9) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.method3165(var0, var1, var2, var16, 1, 1, (Entity)var22, 0, var19, var21); + if (var8.interactType != 0 && var7 != null) { + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method3171(var0, var1, var2, var8.int2); + } + + } else if (var5 == 4) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var22, (Entity)null, Tiles.field508[var4], 0, 0, 0, var19, var21); + } else { + long var31; + Object var33; + if (var5 == 5) { + var28 = 16; + var31 = var6.getBoundaryObjectTag(var0, var1, var2); + if (var31 != 0L) { + var28 = Occluder.getObjectDefinition(GrandExchangeEvents.Entity_unpackID(var31)).int2; + } + + if (var8.animationId == -1 && var8.transforms == null) { + var33 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var33 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)null, Tiles.field508[var4], 0, var28 * Tiles.field506[var4], var28 * Tiles.field516[var4], var19, var21); + } else if (var5 == 6) { + var28 = 8; + var31 = var6.getBoundaryObjectTag(var0, var1, var2); + if (0L != var31) { + var28 = Occluder.getObjectDefinition(GrandExchangeEvents.Entity_unpackID(var31)).int2 / 2; + } + + if (var8.animationId == -1 && var8.transforms == null) { + var33 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); + } else { + var33 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)null, 256, var4, var28 * Tiles.field503[var4], var28 * Tiles.field517[var4], var19, var21); + } else if (var5 == 7) { + var23 = var4 + 2 & 3; + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(4, var23 + 4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 4, var23 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var22, (Entity)null, 256, var23, 0, 0, var19, var21); + } else if (var5 == 8) { + var28 = 8; + var31 = var6.getBoundaryObjectTag(var0, var1, var2); + if (0L != var31) { + var28 = Occluder.getObjectDefinition(GrandExchangeEvents.Entity_unpackID(var31)).int2 / 2; + } + + int var27 = var4 + 2 & 3; + Object var26; + if (var8.animationId == -1 && var8.transforms == null) { + var33 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); + var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); + } else { + var33 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)var26, 256, var4, var28 * Tiles.field503[var4], var28 * Tiles.field517[var4], var19, var21); + } + } + } + } else { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(10, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + if (var22 != null && var6.method3165(var0, var1, var2, var16, var9, var10, (Entity)var22, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { + var23 = 15; + if (var22 instanceof Model) { + var23 = ((Model)var22).method2952() / 4; + if (var23 > 30) { + var23 = 30; + } + } + + for (int var24 = 0; var24 <= var9; ++var24) { + for (int var25 = 0; var25 <= var10; ++var25) { + if (var23 > InterfaceParent.field565[var0][var24 + var1][var25 + var2]) { + InterfaceParent.field565[var0][var24 + var1][var25 + var2] = (byte)var23; + } + } + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + } + } + } } } diff --git a/runescape-client/src/main/java/ArchiveLoader.java b/runescape-client/src/main/java/ArchiveLoader.java index f8446a87ab..df719fc61b 100644 --- a/runescape-client/src/main/java/ArchiveLoader.java +++ b/runescape-client/src/main/java/ArchiveLoader.java @@ -1,39 +1,42 @@ -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.net.URL; -import java.net.URLConnection; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bx") +@ObfuscatedName("bp") @Implements("ArchiveLoader") public class ArchiveLoader { - @ObfuscatedName("a") - static int[][] field512; - @ObfuscatedName("i") + @ObfuscatedName("cj") + @Export("mouseCam") + static boolean mouseCam; + @ObfuscatedName("gw") @ObfuscatedSignature( - signature = "Lif;" + signature = "Llt;" + ) + @Export("redHintArrowSprite") + static Sprite redHintArrowSprite; + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "Lia;" ) @Export("archive") final Archive archive; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1214838645 + intValue = -737175839 ) @Export("groupCount") final int groupCount; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -2093675437 + intValue = -1316044815 ) @Export("loadedCount") int loadedCount; @ObfuscatedSignature( - signature = "(Lif;Ljava/lang/String;)V" + signature = "(Lia;Ljava/lang/String;)V" ) ArchiveLoader(Archive var1, String var2) { this.loadedCount = 0; @@ -41,17 +44,17 @@ public class ArchiveLoader { this.groupCount = var1.getGroupCount(); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1163747631" + garbageValue = "1992240637" ) @Export("isLoaded") boolean isLoaded() { this.loadedCount = 0; for (int var1 = 0; var1 < this.groupCount; ++var1) { - if (!this.archive.method4275(var1) || this.archive.method4266(var1)) { + if (!this.archive.method4348(var1) || this.archive.method4347(var1)) { ++this.loadedCount; } } @@ -59,39 +62,253 @@ public class ArchiveLoader { return this.loadedCount >= this.groupCount; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)J", - garbageValue = "-2" + signature = "(II)Lig;", + garbageValue = "1395082133" ) - static long method1156() { - try { - URL var0 = new URL(NetFileRequest.method4121("services", false) + "m=accountappeal/login.ws"); - URLConnection var1 = var0.openConnection(); - var1.setRequestProperty("connection", "close"); - var1.setDoInput(true); - var1.setDoOutput(true); - var1.setConnectTimeout(5000); - OutputStreamWriter var2 = new OutputStreamWriter(var1.getOutputStream()); - var2.write("data1=req"); - var2.flush(); - InputStream var3 = var1.getInputStream(); - Buffer var4 = new Buffer(new byte[1000]); + @Export("FloorUnderlayDefinition_get") + public static FloorOverlayDefinition FloorUnderlayDefinition_get(int var0) { + FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var0); + var1 = new FloorOverlayDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2), var0); + } - do { - int var5 = var3.read(var4.array, var4.offset, 1000 - var4.offset); - if (var5 == -1) { - var4.offset = 0; - long var7 = var4.readLong(); - return var7; + var1.postDecode(); + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "(IIIIIIILem;Lfv;I)V", + garbageValue = "2035242734" + ) + static final void method1168(int var0, int var1, int var2, int var3, int var4, int var5, int var6, Scene var7, CollisionMap var8) { + ObjectDefinition var9 = Occluder.getObjectDefinition(var4); + int var10; + int var11; + if (var5 != 1 && var5 != 3) { + var10 = var9.sizeX; + var11 = var9.sizeY; + } else { + var10 = var9.sizeY; + var11 = var9.sizeX; + } + + int var12; + int var13; + if (var10 + var2 <= 104) { + var12 = (var10 >> 1) + var2; + var13 = var2 + (var10 + 1 >> 1); + } else { + var12 = var2; + var13 = var2 + 1; + } + + int var14; + int var15; + if (var3 + var11 <= 104) { + var14 = var3 + (var11 >> 1); + var15 = var3 + (var11 + 1 >> 1); + } else { + var14 = var3; + var15 = var3 + 1; + } + + int[][] var16 = Tiles.Tiles_heights[var1]; + int var17 = var16[var13][var15] + var16[var13][var14] + var16[var12][var14] + var16[var12][var15] >> 2; + int var18 = (var2 << 7) + (var10 << 6); + int var19 = (var3 << 7) + (var11 << 6); + long var20 = GameShell.calculateTag(var2, var3, 2, var9.int1 == 0, var4); + int var22 = (var5 << 6) + var6; + if (var9.int3 == 1) { + var22 += 256; + } + + Object var23; + if (var6 == 22) { + if (var9.animationId == -1 && var9.transforms == null) { + var23 = var9.getModel(22, var5, var16, var18, var17, var19); + } else { + var23 = new DynamicObject(var4, 22, var5, var1, var2, var3, var9.animationId, true, (Entity)null); + } + + var7.newFloorDecoration(var0, var2, var3, var17, (Entity)var23, var20, var22); + if (var9.interactType == 1) { + var8.setBlockedByFloorDec(var2, var3); + } + + } else if (var6 != 10 && var6 != 11) { + if (var6 >= 12) { + if (var9.animationId == -1 && var9.transforms == null) { + var23 = var9.getModel(var6, var5, var16, var18, var17, var19); + } else { + var23 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, true, (Entity)null); } - var4.offset += var5; - } while(var4.offset < 1000); + var7.method3165(var0, var2, var3, var17, 1, 1, (Entity)var23, 0, var20, var22); + if (var9.interactType != 0) { + var8.addGameObject(var2, var3, var10, var11, var9.boolean1); + } + + } else if (var6 == 0) { + if (var9.animationId == -1 && var9.transforms == null) { + var23 = var9.getModel(0, var5, var16, var18, var17, var19); + } else { + var23 = new DynamicObject(var4, 0, var5, var1, var2, var3, var9.animationId, true, (Entity)null); + } + + var7.newBoundaryObject(var0, var2, var3, var17, (Entity)var23, (Entity)null, Tiles.field508[var5], 0, var20, var22); + if (var9.interactType != 0) { + var8.method3626(var2, var3, var6, var5, var9.boolean1); + } + + } else if (var6 == 1) { + if (var9.animationId == -1 && var9.transforms == null) { + var23 = var9.getModel(1, var5, var16, var18, var17, var19); + } else { + var23 = new DynamicObject(var4, 1, var5, var1, var2, var3, var9.animationId, true, (Entity)null); + } + + var7.newBoundaryObject(var0, var2, var3, var17, (Entity)var23, (Entity)null, Tiles.field513[var5], 0, var20, var22); + if (var9.interactType != 0) { + var8.method3626(var2, var3, var6, var5, var9.boolean1); + } + + } else { + int var29; + if (var6 == 2) { + var29 = var5 + 1 & 3; + Object var24; + Object var25; + if (var9.animationId == -1 && var9.transforms == null) { + var24 = var9.getModel(2, var5 + 4, var16, var18, var17, var19); + var25 = var9.getModel(2, var29, var16, var18, var17, var19); + } else { + var24 = new DynamicObject(var4, 2, var5 + 4, var1, var2, var3, var9.animationId, true, (Entity)null); + var25 = new DynamicObject(var4, 2, var29, var1, var2, var3, var9.animationId, true, (Entity)null); + } + + var7.newBoundaryObject(var0, var2, var3, var17, (Entity)var24, (Entity)var25, Tiles.field508[var5], Tiles.field508[var29], var20, var22); + if (var9.interactType != 0) { + var8.method3626(var2, var3, var6, var5, var9.boolean1); + } + + } else if (var6 == 3) { + if (var9.animationId == -1 && var9.transforms == null) { + var23 = var9.getModel(3, var5, var16, var18, var17, var19); + } else { + var23 = new DynamicObject(var4, 3, var5, var1, var2, var3, var9.animationId, true, (Entity)null); + } + + var7.newBoundaryObject(var0, var2, var3, var17, (Entity)var23, (Entity)null, Tiles.field513[var5], 0, var20, var22); + if (var9.interactType != 0) { + var8.method3626(var2, var3, var6, var5, var9.boolean1); + } + + } else if (var6 == 9) { + if (var9.animationId == -1 && var9.transforms == null) { + var23 = var9.getModel(var6, var5, var16, var18, var17, var19); + } else { + var23 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, true, (Entity)null); + } + + var7.method3165(var0, var2, var3, var17, 1, 1, (Entity)var23, 0, var20, var22); + if (var9.interactType != 0) { + var8.addGameObject(var2, var3, var10, var11, var9.boolean1); + } + + } else if (var6 == 4) { + if (var9.animationId == -1 && var9.transforms == null) { + var23 = var9.getModel(4, var5, var16, var18, var17, var19); + } else { + var23 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, true, (Entity)null); + } + + var7.newWallDecoration(var0, var2, var3, var17, (Entity)var23, (Entity)null, Tiles.field508[var5], 0, 0, 0, var20, var22); + } else { + Object var26; + long var30; + if (var6 == 5) { + var29 = 16; + var30 = var7.getBoundaryObjectTag(var0, var2, var3); + if (var30 != 0L) { + var29 = Occluder.getObjectDefinition(GrandExchangeEvents.Entity_unpackID(var30)).int2; + } + + if (var9.animationId == -1 && var9.transforms == null) { + var26 = var9.getModel(4, var5, var16, var18, var17, var19); + } else { + var26 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, true, (Entity)null); + } + + var7.newWallDecoration(var0, var2, var3, var17, (Entity)var26, (Entity)null, Tiles.field508[var5], 0, var29 * Tiles.field506[var5], var29 * Tiles.field516[var5], var20, var22); + } else if (var6 == 6) { + var29 = 8; + var30 = var7.getBoundaryObjectTag(var0, var2, var3); + if (var30 != 0L) { + var29 = Occluder.getObjectDefinition(GrandExchangeEvents.Entity_unpackID(var30)).int2 / 2; + } + + if (var9.animationId == -1 && var9.transforms == null) { + var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19); + } else { + var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, true, (Entity)null); + } + + var7.newWallDecoration(var0, var2, var3, var17, (Entity)var26, (Entity)null, 256, var5, var29 * Tiles.field503[var5], var29 * Tiles.field517[var5], var20, var22); + } else if (var6 == 7) { + int var32 = var5 + 2 & 3; + if (var9.animationId == -1 && var9.transforms == null) { + var23 = var9.getModel(4, var32 + 4, var16, var18, var17, var19); + } else { + var23 = new DynamicObject(var4, 4, var32 + 4, var1, var2, var3, var9.animationId, true, (Entity)null); + } + + var7.newWallDecoration(var0, var2, var3, var17, (Entity)var23, (Entity)null, 256, var32, 0, 0, var20, var22); + } else if (var6 == 8) { + var29 = 8; + var30 = var7.getBoundaryObjectTag(var0, var2, var3); + if (var30 != 0L) { + var29 = Occluder.getObjectDefinition(GrandExchangeEvents.Entity_unpackID(var30)).int2 / 2; + } + + int var28 = var5 + 2 & 3; + Object var27; + if (var9.animationId == -1 && var9.transforms == null) { + var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19); + var27 = var9.getModel(4, var28 + 4, var16, var18, var17, var19); + } else { + var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, true, (Entity)null); + var27 = new DynamicObject(var4, 4, var28 + 4, var1, var2, var3, var9.animationId, true, (Entity)null); + } + + var7.newWallDecoration(var0, var2, var3, var17, (Entity)var26, (Entity)var27, 256, var5, var29 * Tiles.field503[var5], var29 * Tiles.field517[var5], var20, var22); + } + } + } + } else { + if (var9.animationId == -1 && var9.transforms == null) { + var23 = var9.getModel(10, var5, var16, var18, var17, var19); + } else { + var23 = new DynamicObject(var4, 10, var5, var1, var2, var3, var9.animationId, true, (Entity)null); + } + + if (var23 != null) { + var7.method3165(var0, var2, var3, var17, var10, var11, (Entity)var23, var6 == 11 ? 256 : 0, var20, var22); + } + + if (var9.interactType != 0) { + var8.addGameObject(var2, var3, var10, var11, var9.boolean1); + } - return 0L; - } catch (Exception var9) { - return 0L; } } } diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java index dfdd03463c..52d05ccc83 100644 --- a/runescape-client/src/main/java/AttackOption.java +++ b/runescape-client/src/main/java/AttackOption.java @@ -4,49 +4,43 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cf") +@ObfuscatedName("cd") @Implements("AttackOption") public enum AttackOption implements Enumerated { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lcf;" + signature = "Lcd;" ) @Export("AttackOption_dependsOnCombatLevels") AttackOption_dependsOnCombatLevels(0), - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lcf;" + signature = "Lcd;" ) @Export("AttackOption_alwaysRightClick") AttackOption_alwaysRightClick(1), - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lcf;" + signature = "Lcd;" ) @Export("AttackOption_leftClickWhereAvailable") AttackOption_leftClickWhereAvailable(2), - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lcf;" + signature = "Lcd;" ) @Export("AttackOption_hidden") AttackOption_hidden(3); - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "[Lmy;" - ) - @Export("JagexCache_idxFiles") - public static BufferedFile[] JagexCache_idxFiles; - @ObfuscatedName("r") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 478106921 + intValue = -324037883 ) - @Export("canvasHeight") - public static int canvasHeight; - @ObfuscatedName("p") + @Export("musicTrackVolume") + public static int musicTrackVolume; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -201450723 + intValue = 1398359293 ) @Export("id") final int id; @@ -55,63 +49,179 @@ public enum AttackOption implements Enumerated { this.id = var3; } - @ObfuscatedName("i") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "-57" + garbageValue = "1" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("x") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-1189493177" + signature = "(II)Z", + garbageValue = "-458989272" ) - @Export("Messages_getLastChatID") - static int Messages_getLastChatID(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); - if (var1 == null) { - return -1; - } else { - return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; + public static boolean method2117(int var0) { + return (var0 & 1) != 0; + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(Lks;IB)V", + garbageValue = "100" + ) + @Export("updatePlayers") + static final void updatePlayers(PacketBuffer var0, int var1) { + int var2 = var0.offset; + Players.Players_pendingUpdateCount = 0; + WorldMapIcon_0.method206(var0); + class43.method813(var0); + if (var0.offset - var2 != var1) { + throw new RuntimeException(var0.offset - var2 + " " + var1); } } - @ObfuscatedName("a") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lha;I[B[BI)V", - garbageValue = "304370962" + signature = "(I)Ljava/lang/String;", + garbageValue = "546448401" ) - @Export("Widget_setKey") - static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { - if (var0.field2626 == null) { - if (var2 == null) { - return; - } + static String method2115() { + return WorldMapSection2.clientPreferences.hideUsername ? WorldMapSection2.method321(Login.Login_username) : Login.Login_username; + } - var0.field2626 = new byte[11][]; - var0.field2629 = new byte[11][]; - var0.field2631 = new int[11]; - var0.field2670 = new int[11]; + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "(IIIIIZI)Llt;", + garbageValue = "603666538" + ) + @Export("getItemSprite") + public static final Sprite getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { + if (var1 == -1) { + var4 = 0; + } else if (var4 == 2 && var1 != 1) { + var4 = 1; } - var0.field2626[var1] = var2; - if (var2 != null) { - var0.field2625 = true; - } else { - var0.field2625 = false; + long var6 = ((long)var4 << 40) + ((long)var1 << 16) + (long)var0 + ((long)var2 << 38) + ((long)var3 << 42); + Sprite var8; + if (!var5) { + var8 = (Sprite)ItemDefinition.ItemDefinition_cachedSprites.get(var6); + if (var8 != null) { + return var8; + } + } - for (int var4 = 0; var4 < var0.field2626.length; ++var4) { - if (var0.field2626[var4] != null) { - var0.field2625 = true; - break; + ItemDefinition var9 = HealthBarDefinition.ItemDefinition_get(var0); + if (var1 > 1 && var9.countobj != null) { + int var10 = -1; + + for (int var11 = 0; var11 < 10; ++var11) { + if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { + var10 = var9.countobj[var11]; } } + + if (var10 != -1) { + var9 = HealthBarDefinition.ItemDefinition_get(var10); + } } - var0.field2629[var1] = var3; + Model var21 = var9.getModel(1); + if (var21 == null) { + return null; + } else { + Sprite var22 = null; + if (var9.noteTemplate != -1) { + var22 = getItemSprite(var9.note, 10, 1, 0, 0, true); + if (var22 == null) { + return null; + } + } else if (var9.notedId != -1) { + var22 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); + if (var22 == null) { + return null; + } + } else if (var9.placeholderTemplate != -1) { + var22 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); + if (var22 == null) { + return null; + } + } + + int[] var12 = Rasterizer2D.Rasterizer2D_pixels; + int var13 = Rasterizer2D.Rasterizer2D_width; + int var14 = Rasterizer2D.Rasterizer2D_height; + int[] var15 = new int[4]; + Rasterizer2D.Rasterizer2D_getClipArray(var15); + var8 = new Sprite(36, 32); + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); + Rasterizer2D.Rasterizer2D_clear(); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); + Rasterizer3D.method3101(16, 16); + Rasterizer3D.field1762 = false; + if (var9.placeholderTemplate != -1) { + var22.drawTransBgAt(0, 0); + } + + int var16 = var9.zoom2d; + if (var5) { + var16 = (int)(1.5D * (double)var16); + } else if (var2 == 2) { + var16 = (int)(1.04D * (double)var16); + } + + int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; + int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; + var21.calculateBoundsCylinder(); + var21.method2946(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var21.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); + if (var9.notedId != -1) { + var22.drawTransBgAt(0, 0); + } + + if (var2 >= 1) { + var8.outline(1); + } + + if (var2 >= 2) { + var8.outline(16777215); + } + + if (var3 != 0) { + var8.shadow(var3); + } + + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); + if (var9.noteTemplate != -1) { + var22.drawTransBgAt(0, 0); + } + + if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { + Font var19 = ItemDefinition.ItemDefinition_fontPlain11; + String var20; + if (var1 < 100000) { + var20 = "" + var1 + ""; + } else if (var1 < 10000000) { + var20 = "" + var1 / 1000 + "K" + ""; + } else { + var20 = "" + var1 / 1000000 + "M" + ""; + } + + var19.draw(var20, 0, 9, 16776960, 1); + } + + if (!var5) { + ItemDefinition.ItemDefinition_cachedSprites.put(var8, var6); + } + + Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); + Rasterizer2D.Rasterizer2D_setClipArray(var15); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); + Rasterizer3D.field1762 = true; + return var8; + } } } diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java index e31f49e307..e5c7197c1c 100644 --- a/runescape-client/src/main/java/AudioFilter.java +++ b/runescape-client/src/main/java/AudioFilter.java @@ -3,154 +3,154 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dh") +@ObfuscatedName("df") @Implements("AudioFilter") public class AudioFilter { - @ObfuscatedName("b") - static float[][] field1445; - @ObfuscatedName("e") + @ObfuscatedName("g") + static float[][] field1474; + @ObfuscatedName("d") @Export("coefficients") static int[][] coefficients; - @ObfuscatedName("x") - static float field1447; - @ObfuscatedName("a") + @ObfuscatedName("l") + static float field1472; + @ObfuscatedName("j") @Export("forwardMultiplier") static int forwardMultiplier; - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("pairs") int[] pairs; - @ObfuscatedName("y") - int[][][] field1450; - @ObfuscatedName("w") - int[][][] field1443; - @ObfuscatedName("p") - int[] field1444; + @ObfuscatedName("o") + int[][][] field1467; + @ObfuscatedName("e") + int[][][] field1476; + @ObfuscatedName("i") + int[] field1469; static { - field1445 = new float[2][8]; + field1474 = new float[2][8]; coefficients = new int[2][8]; } AudioFilter() { this.pairs = new int[2]; - this.field1450 = new int[2][2][4]; - this.field1443 = new int[2][2][4]; - this.field1444 = new int[2]; + this.field1467 = new int[2][2][4]; + this.field1476 = new int[2][2][4]; + this.field1469 = new int[2]; } - @ObfuscatedName("f") - float method2710(int var1, int var2, float var3) { - float var4 = (float)this.field1443[var1][0][var2] + var3 * (float)(this.field1443[var1][1][var2] - this.field1443[var1][0][var2]); + @ObfuscatedName("c") + float method2758(int var1, int var2, float var3) { + float var4 = (float)this.field1476[var1][0][var2] + var3 * (float)(this.field1476[var1][1][var2] - this.field1476[var1][0][var2]); var4 *= 0.0015258789F; return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F)); } - @ObfuscatedName("y") - float method2700(int var1, int var2, float var3) { - float var4 = (float)this.field1450[var1][0][var2] + var3 * (float)(this.field1450[var1][1][var2] - this.field1450[var1][0][var2]); + @ObfuscatedName("o") + float method2770(int var1, int var2, float var3) { + float var4 = (float)this.field1467[var1][0][var2] + var3 * (float)(this.field1467[var1][1][var2] - this.field1467[var1][0][var2]); var4 *= 1.2207031E-4F; return normalize(var4); } - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("compute") int compute(int var1, float var2) { float var3; if (var1 == 0) { - var3 = (float)this.field1444[0] + (float)(this.field1444[1] - this.field1444[0]) * var2; + var3 = (float)this.field1469[0] + (float)(this.field1469[1] - this.field1469[0]) * var2; var3 *= 0.0030517578F; - field1447 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); - forwardMultiplier = (int)(field1447 * 65536.0F); + field1472 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); + forwardMultiplier = (int)(field1472 * 65536.0F); } if (this.pairs[var1] == 0) { return 0; } else { - var3 = this.method2710(var1, 0, var2); - field1445[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2700(var1, 0, var2)); - field1445[var1][1] = var3 * var3; + var3 = this.method2758(var1, 0, var2); + field1474[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2770(var1, 0, var2)); + field1474[var1][1] = var3 * var3; float[] var10000; int var4; for (var4 = 1; var4 < this.pairs[var1]; ++var4) { - var3 = this.method2710(var1, var4, var2); - float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2700(var1, var4, var2)); + var3 = this.method2758(var1, var4, var2); + float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2770(var1, var4, var2)); float var6 = var3 * var3; - field1445[var1][var4 * 2 + 1] = field1445[var1][var4 * 2 - 1] * var6; - field1445[var1][var4 * 2] = field1445[var1][var4 * 2 - 1] * var5 + field1445[var1][var4 * 2 - 2] * var6; + field1474[var1][var4 * 2 + 1] = field1474[var1][var4 * 2 - 1] * var6; + field1474[var1][var4 * 2] = field1474[var1][var4 * 2 - 1] * var5 + field1474[var1][var4 * 2 - 2] * var6; for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { - var10000 = field1445[var1]; - var10000[var7] += field1445[var1][var7 - 1] * var5 + field1445[var1][var7 - 2] * var6; + var10000 = field1474[var1]; + var10000[var7] += field1474[var1][var7 - 1] * var5 + field1474[var1][var7 - 2] * var6; } - var10000 = field1445[var1]; - var10000[1] += field1445[var1][0] * var5 + var6; - var10000 = field1445[var1]; + var10000 = field1474[var1]; + var10000[1] += field1474[var1][0] * var5 + var6; + var10000 = field1474[var1]; var10000[0] += var5; } if (var1 == 0) { for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) { - var10000 = field1445[0]; - var10000[var4] *= field1447; + var10000 = field1474[0]; + var10000[var4] *= field1472; } } for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { - coefficients[var1][var4] = (int)(field1445[var1][var4] * 65536.0F); + coefficients[var1][var4] = (int)(field1474[var1][var4] * 65536.0F); } return this.pairs[var1] * 2; } } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkq;Ldo;)V" + signature = "(Lkp;Lds;)V" ) - final void method2713(Buffer var1, SoundEnvelope var2) { + final void method2769(Buffer var1, SoundEnvelope var2) { int var3 = var1.readUnsignedByte(); this.pairs[0] = var3 >> 4; this.pairs[1] = var3 & 15; if (var3 != 0) { - this.field1444[0] = var1.readUnsignedShort(); - this.field1444[1] = var1.readUnsignedShort(); + this.field1469[0] = var1.readUnsignedShort(); + this.field1469[1] = var1.readUnsignedShort(); int var4 = var1.readUnsignedByte(); int var5; int var6; for (var5 = 0; var5 < 2; ++var5) { for (var6 = 0; var6 < this.pairs[var5]; ++var6) { - this.field1450[var5][0][var6] = var1.readUnsignedShort(); - this.field1443[var5][0][var6] = var1.readUnsignedShort(); + this.field1467[var5][0][var6] = var1.readUnsignedShort(); + this.field1476[var5][0][var6] = var1.readUnsignedShort(); } } for (var5 = 0; var5 < 2; ++var5) { for (var6 = 0; var6 < this.pairs[var5]; ++var6) { if ((var4 & 1 << var5 * 4 << var6) != 0) { - this.field1450[var5][1][var6] = var1.readUnsignedShort(); - this.field1443[var5][1][var6] = var1.readUnsignedShort(); + this.field1467[var5][1][var6] = var1.readUnsignedShort(); + this.field1476[var5][1][var6] = var1.readUnsignedShort(); } else { - this.field1450[var5][1][var6] = this.field1450[var5][0][var6]; - this.field1443[var5][1][var6] = this.field1443[var5][0][var6]; + this.field1467[var5][1][var6] = this.field1467[var5][0][var6]; + this.field1476[var5][1][var6] = this.field1476[var5][0][var6]; } } } - if (var4 != 0 || this.field1444[1] != this.field1444[0]) { + if (var4 != 0 || this.field1469[1] != this.field1469[0]) { var2.decodeSegments(var1); } } else { - int[] var7 = this.field1444; - this.field1444[1] = 0; + int[] var7 = this.field1469; + this.field1469[1] = 0; var7[0] = 0; } } - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("normalize") static float normalize(float var0) { float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0); diff --git a/runescape-client/src/main/java/BZip2Decompressor.java b/runescape-client/src/main/java/BZip2Decompressor.java index 678d8da5c6..fe2303fe50 100644 --- a/runescape-client/src/main/java/BZip2Decompressor.java +++ b/runescape-client/src/main/java/BZip2Decompressor.java @@ -3,12 +3,12 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kp") +@ObfuscatedName("kf") @Implements("BZip2Decompressor") public final class BZip2Decompressor { - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Lkv;" + signature = "Lki;" ) @Export("BZip2Decompressor_state") static BZip2State BZip2Decompressor_state; @@ -17,7 +17,7 @@ public final class BZip2Decompressor { BZip2Decompressor_state = new BZip2State(); } - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("BZip2Decompressor_decompress") public static int BZip2Decompressor_decompress(byte[] var0, int var1, byte[] var2, int var3, int var4) { synchronized(BZip2Decompressor_state) { @@ -29,7 +29,7 @@ public final class BZip2Decompressor { BZip2Decompressor_state.bsLive = 0; BZip2Decompressor_state.bsBuff = 0; BZip2Decompressor_state.nextBit_unused = 0; - BZip2Decompressor_state.field3726 = 0; + BZip2Decompressor_state.field3729 = 0; BZip2Decompressor_decompress(BZip2Decompressor_state); var1 -= BZip2Decompressor_state.outputLength; BZip2Decompressor_state.inputArray = null; @@ -38,21 +38,21 @@ public final class BZip2Decompressor { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lkv;)V" + signature = "(Lki;)V" ) - static void method5816(BZip2State var0) { + static void method5836(BZip2State var0) { byte var2 = var0.out_char; int var3 = var0.su_rNToGo; int var4 = var0.nblocks_used; int var5 = var0.su_ch2; - int[] var6 = SoundSystem.BZip2Decompressor_block; - int var7 = var0.field3733; + int[] var6 = WorldMapManager.BZip2Decompressor_block; + int var7 = var0.field3746; byte[] var8 = var0.outputArray; int var9 = var0.next_out; int var10 = var0.outputLength; - int var12 = var0.field3742 + 1; + int var12 = var0.field3754 + 1; label61: while (true) { @@ -148,25 +148,25 @@ public final class BZip2Decompressor { break; } - int var13 = var0.field3726; - var0.field3726 += var10 - var10; - if (var0.field3726 < var13) { + int var13 = var0.field3729; + var0.field3729 += var10 - var10; + if (var0.field3729 < var13) { } var0.out_char = var2; var0.su_rNToGo = var3; var0.nblocks_used = var4; var0.su_ch2 = var5; - SoundSystem.BZip2Decompressor_block = var6; - var0.field3733 = var7; + WorldMapManager.BZip2Decompressor_block = var6; + var0.field3746 = var7; var0.outputArray = var8; var0.next_out = var9; var0.outputLength = var10; } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkv;)V" + signature = "(Lki;)V" ) @Export("BZip2Decompressor_decompress") static void BZip2Decompressor_decompress(BZip2State var0) { @@ -192,9 +192,9 @@ public final class BZip2Decompressor { int[] var23 = null; int[] var24 = null; int[] var25 = null; - var0.blockSize100k = 1; - if (SoundSystem.BZip2Decompressor_block == null) { - SoundSystem.BZip2Decompressor_block = new int[var0.blockSize100k * 100000]; + var0.blockSize100k = 1410065408; + if (WorldMapManager.BZip2Decompressor_block == null) { + WorldMapManager.BZip2Decompressor_block = new int[var0.blockSize100k * 100000]; } boolean var26 = true; @@ -430,7 +430,7 @@ public final class BZip2Decompressor { } var10002 = var0.unzftab[var0.seqToUnseq[var1 & 255] & 255]++; - SoundSystem.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; + WorldMapManager.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; ++var47; if (var45 == 0) { ++var43; @@ -489,7 +489,7 @@ public final class BZip2Decompressor { var10000 = var0.unzftab; for (var10000[var1 & 255] += var48; var48 > 0; --var48) { - SoundSystem.BZip2Decompressor_block[var47] = var1 & 255; + WorldMapManager.BZip2Decompressor_block[var47] = var1 & 255; ++var47; } } @@ -509,22 +509,22 @@ public final class BZip2Decompressor { } for (var36 = 0; var36 < var47; ++var36) { - var1 = (byte)(SoundSystem.BZip2Decompressor_block[var36] & 255); - var10000 = SoundSystem.BZip2Decompressor_block; + var1 = (byte)(WorldMapManager.BZip2Decompressor_block[var36] & 255); + var10000 = WorldMapManager.BZip2Decompressor_block; int var10001 = var0.cftab[var1 & 255]; var10000[var10001] |= var36 << 8; var10002 = var0.cftab[var1 & 255]++; } - var0.field3733 = SoundSystem.BZip2Decompressor_block[var0.originalPointer] >> 8; + var0.field3746 = WorldMapManager.BZip2Decompressor_block[var0.originalPointer] >> 8; var0.nblocks_used = 0; - var0.field3733 = SoundSystem.BZip2Decompressor_block[var0.field3733]; - var0.su_ch2 = (byte)(var0.field3733 & 255); - var0.field3733 >>= 8; + var0.field3746 = WorldMapManager.BZip2Decompressor_block[var0.field3746]; + var0.su_ch2 = (byte)(var0.field3746 & 255); + var0.field3746 >>= 8; ++var0.nblocks_used; - var0.field3742 = var47; - method5816(var0); - if (var0.field3742 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { + var0.field3754 = var47; + method5836(var0); + if (var0.field3754 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { var26 = true; break; } @@ -538,27 +538,27 @@ public final class BZip2Decompressor { } } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Lkv;)B" + signature = "(Lki;)B" ) @Export("BZip2Decompressor_readNextByte") static byte BZip2Decompressor_readNextByte(BZip2State var0) { return (byte)BZip2Decompressor_readBits(8, var0); } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkv;)B" + signature = "(Lki;)B" ) @Export("BZip2Decompressor_readNextBit") static byte BZip2Decompressor_readNextBit(BZip2State var0) { return (byte)BZip2Decompressor_readBits(1, var0); } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(ILkv;)I" + signature = "(ILki;)I" ) @Export("BZip2Decompressor_readBits") static int BZip2Decompressor_readBits(int var0, BZip2State var1) { @@ -576,9 +576,9 @@ public final class BZip2Decompressor { return var2; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lkv;)V" + signature = "(Lki;)V" ) @Export("makeMaps") static void makeMaps(BZip2State var0) { @@ -593,7 +593,7 @@ public final class BZip2Decompressor { } - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("BZip2Decompressor_createHuffmanTables") static void BZip2Decompressor_createHuffmanTables(int[] var0, int[] var1, int[] var2, byte[] var3, int var4, int var5, int var6) { int var7 = 0; diff --git a/runescape-client/src/main/java/BZip2State.java b/runescape-client/src/main/java/BZip2State.java index a1cad0e92e..563424da12 100644 --- a/runescape-client/src/main/java/BZip2State.java +++ b/runescape-client/src/main/java/BZip2State.java @@ -4,167 +4,167 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kv") +@ObfuscatedName("ki") @Implements("BZip2State") public final class BZip2State { - @ObfuscatedName("f") - final int field3721; - @ObfuscatedName("i") - final int field3728; - @ObfuscatedName("y") - final int field3716; - @ObfuscatedName("w") - final int field3722; - @ObfuscatedName("p") - final int field3735; - @ObfuscatedName("b") - final int field3719; + @ObfuscatedName("c") + final int field3736; + @ObfuscatedName("t") + final int field3718; + @ObfuscatedName("o") + final int field3748; @ObfuscatedName("e") + final int field3720; + @ObfuscatedName("i") + final int field3717; + @ObfuscatedName("g") + final int field3722; + @ObfuscatedName("d") @Export("inputArray") byte[] inputArray; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -117705425 + intValue = -807035473 ) @Export("nextByte") int nextByte; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 808052371 + intValue = -1509070377 ) @Export("nextBit_unused") int nextBit_unused; - @ObfuscatedName("d") + @ObfuscatedName("m") @Export("outputArray") byte[] outputArray; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 862638407 + intValue = -902711531 ) @Export("next_out") int next_out; - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 982229001 + intValue = 1633057799 ) @Export("outputLength") int outputLength; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1677667273 + intValue = 135980565 ) - int field3726; - @ObfuscatedName("k") + int field3729; + @ObfuscatedName("n") @Export("out_char") byte out_char; - @ObfuscatedName("s") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -320144157 + intValue = 1481212591 ) @Export("su_rNToGo") int su_rNToGo; - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 720575069 + intValue = -29854091 ) @Export("bsBuff") int bsBuff; - @ObfuscatedName("t") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 846973035 + intValue = -725667235 ) @Export("bsLive") int bsLive; - @ObfuscatedName("j") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1197540352 + intValue = -1401293824 ) @Export("blockSize100k") int blockSize100k; - @ObfuscatedName("n") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 184664593 + intValue = 2006117845 ) @Export("originalPointer") int originalPointer; - @ObfuscatedName("u") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1391220013 + intValue = -1496152105 ) - int field3733; - @ObfuscatedName("z") + int field3746; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1996939641 + intValue = 2017789723 ) @Export("su_ch2") int su_ch2; - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("unzftab") int[] unzftab; - @ObfuscatedName("m") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 903678455 + intValue = -2065710979 ) @Export("nblocks_used") int nblocks_used; - @ObfuscatedName("g") + @ObfuscatedName("s") @Export("cftab") int[] cftab; - @ObfuscatedName("q") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1381794175 + intValue = -402806649 ) @Export("nInUse") int nInUse; - @ObfuscatedName("aa") + @ObfuscatedName("ae") @Export("inUse") boolean[] inUse; - @ObfuscatedName("av") + @ObfuscatedName("af") @Export("inUse16") boolean[] inUse16; - @ObfuscatedName("aw") + @ObfuscatedName("az") @Export("seqToUnseq") byte[] seqToUnseq; - @ObfuscatedName("as") + @ObfuscatedName("ax") @Export("ll8") byte[] ll8; - @ObfuscatedName("ak") + @ObfuscatedName("aj") @Export("getAndMoveToFrontDecode_yy") int[] getAndMoveToFrontDecode_yy; @ObfuscatedName("au") @Export("selector") byte[] selector; - @ObfuscatedName("ah") + @ObfuscatedName("ay") @Export("selectorMtf") byte[] selectorMtf; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("temp_charArray2d") byte[][] temp_charArray2d; - @ObfuscatedName("ao") + @ObfuscatedName("aq") @Export("limit") int[][] limit; - @ObfuscatedName("an") + @ObfuscatedName("as") @Export("base") int[][] base; - @ObfuscatedName("ar") + @ObfuscatedName("ak") @Export("perm") int[][] perm; - @ObfuscatedName("az") + @ObfuscatedName("ac") @Export("minLens") int[] minLens; - @ObfuscatedName("ay") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = 871538763 + intValue = 1642554811 ) - int field3742; + int field3754; BZip2State() { - this.field3721 = 4096; - this.field3728 = 16; - this.field3716 = 258; - this.field3722 = 6; - this.field3735 = 50; - this.field3719 = 18002; + this.field3736 = 4096; + this.field3718 = 16; + this.field3748 = 258; + this.field3720 = 6; + this.field3717 = 50; + this.field3722 = 18002; this.nextByte = 0; this.next_out = 0; this.unzftab = new int[256]; @@ -183,18 +183,16 @@ public final class BZip2State { this.minLens = new int[6]; } - @ObfuscatedName("y") + @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "(IIB)Lha;", - garbageValue = "119" + signature = "(Ljava/lang/String;IB)V", + garbageValue = "84" ) - @Export("getWidgetChild") - public static Widget getWidgetChild(int var0, int var1) { - Widget var2 = Tile.getWidget(var0); - if (var1 == -1) { - return var2; - } else { - return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; - } + static final void method5833(String var0, int var1) { + PacketBufferNode var2 = TilePaint.getPacketBufferNode(ClientPacket.field2265, Client.packetWriter.isaacCipher); + var2.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var0) + 1); + var2.packetBuffer.writeStringCp1252NullTerminated(var0); + var2.packetBuffer.method5603(var1); + Client.packetWriter.addNode(var2); } } diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java index aa72b177b9..dba23ddf6a 100644 --- a/runescape-client/src/main/java/BoundaryObject.java +++ b/runescape-client/src/main/java/BoundaryObject.java @@ -4,66 +4,60 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("er") +@ObfuscatedName("eu") @Implements("BoundaryObject") public final class BoundaryObject { @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Lhz;" - ) - @Export("Widget_spritesArchive") - static AbstractArchive Widget_spritesArchive; - @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1534521391 + intValue = -432640287 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1718210699 + intValue = -970419585 ) @Export("x") int x; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1666415467 + intValue = -1376780288 ) @Export("y") int y; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -211420525 + intValue = 778552875 ) @Export("orientationA") int orientationA; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 951647449 + intValue = -829648765 ) @Export("orientationB") int orientationB; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lep;" + signature = "Leq;" ) @Export("entity1") public Entity entity1; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lep;" + signature = "Leq;" ) @Export("entity2") public Entity entity2; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - longValue = 3162324910013074859L + longValue = 515248560912133581L ) @Export("tag") public long tag; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1096622413 + intValue = -1262947559 ) @Export("flags") int flags; @@ -73,31 +67,44 @@ public final class BoundaryObject { this.flags = 0; } - @ObfuscatedName("b") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "-13" + signature = "(I)V", + garbageValue = "2085601803" ) - public static void method3273(int var0) { - class197.field2392 = 1; - Coord.musicTrackArchive = null; - class16.musicTrackGroupId = -1; - GrandExchangeOffer.musicTrackFileId = -1; - class197.musicTrackVolume = 0; - WorldMapDecoration.musicTrackBoolean = false; - ParamDefinition.field3275 = var0; - } + public static void method3333() { + synchronized(KeyHandler.KeyHandler_instance) { + ++KeyHandler.KeyHandler_idleCycles; + KeyHandler.field406 = KeyHandler.field408; + KeyHandler.field405 = 0; + int var1; + if (KeyHandler.field387 < 0) { + for (var1 = 0; var1 < 112; ++var1) { + KeyHandler.KeyHandler_pressedKeys[var1] = false; + } - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;II)V", - garbageValue = "-318547131" - ) - static final void method3274(String var0, int var1) { - PacketBufferNode var2 = class2.getPacketBufferNode(ClientPacket.field2219, Client.packetWriter.isaacCipher); - var2.packetBuffer.writeByte(ViewportMouse.stringCp1252NullTerminatedByteSize(var0) + 1); - var2.packetBuffer.writeStringCp1252NullTerminated(var0); - var2.packetBuffer.method5696(var1); - Client.packetWriter.addNode(var2); + KeyHandler.field387 = KeyHandler.field400; + } else { + while (KeyHandler.field387 != KeyHandler.field400) { + var1 = KeyHandler.field399[KeyHandler.field400]; + KeyHandler.field400 = KeyHandler.field400 + 1 & 127; + if (var1 < 0) { + KeyHandler.KeyHandler_pressedKeys[~var1] = false; + } else { + if (!KeyHandler.KeyHandler_pressedKeys[var1] && KeyHandler.field405 < KeyHandler.field404.length - 1) { + KeyHandler.field404[++KeyHandler.field405 - 1] = var1; + } + + KeyHandler.KeyHandler_pressedKeys[var1] = true; + } + } + } + + if (KeyHandler.field405 > 0) { + KeyHandler.KeyHandler_idleCycles = 0; + } + + KeyHandler.field408 = KeyHandler.field407; + } } } diff --git a/runescape-client/src/main/java/Bounds.java b/runescape-client/src/main/java/Bounds.java index cf5941aef7..9ceb761803 100644 --- a/runescape-client/src/main/java/Bounds.java +++ b/runescape-client/src/main/java/Bounds.java @@ -1,33 +1,39 @@ +import java.io.BufferedReader; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringReader; +import java.io.StringWriter; +import java.net.Socket; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lh") +@ObfuscatedName("ll") @Implements("Bounds") public class Bounds { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -136751855 + intValue = -743788715 ) @Export("lowX") public int lowX; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1318120515 + intValue = 390143547 ) @Export("lowY") public int lowY; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -388222223 + intValue = -1967964901 ) @Export("highX") public int highX; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1704369811 + intValue = 1178395907 ) @Export("highY") public int highY; @@ -41,10 +47,10 @@ public class Bounds { this(0, 0, var1, var2); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-535694945" + garbageValue = "2024948285" ) @Export("setLow") public void setLow(int var1, int var2) { @@ -52,10 +58,10 @@ public class Bounds { this.lowY = var2; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(IIB)V", - garbageValue = "69" + garbageValue = "-30" ) @Export("setHigh") public void setHigh(int var1, int var2) { @@ -63,22 +69,22 @@ public class Bounds { this.highY = var2; } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Llh;Llh;I)V", - garbageValue = "871538763" + signature = "(Lll;Lll;I)V", + garbageValue = "-782590696" ) - public void method5997(Bounds var1, Bounds var2) { - this.method6005(var1, var2); - this.method5999(var1, var2); + public void method6031(Bounds var1, Bounds var2) { + this.method6032(var1, var2); + this.method6033(var1, var2); } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Llh;Llh;I)V", - garbageValue = "-541537742" + signature = "(Lll;Lll;I)V", + garbageValue = "-997217284" ) - void method6005(Bounds var1, Bounds var2) { + void method6032(Bounds var1, Bounds var2) { var2.lowX = this.lowX; var2.highX = this.highX; if (this.lowX < var1.lowX) { @@ -86,8 +92,8 @@ public class Bounds { var2.lowX = var1.lowX; } - if (var2.method6000() > var1.method6000()) { - var2.highX -= var2.method6000() - var1.method6000(); + if (var2.method6034() > var1.method6034()) { + var2.highX -= var2.method6034() - var1.method6034(); } if (var2.highX < 0) { @@ -96,12 +102,12 @@ public class Bounds { } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Llh;Llh;B)V", - garbageValue = "-89" + signature = "(Lll;Lll;I)V", + garbageValue = "1896853998" ) - void method5999(Bounds var1, Bounds var2) { + void method6033(Bounds var1, Bounds var2) { var2.lowY = this.lowY; var2.highY = this.highY; if (this.lowY < var1.lowY) { @@ -109,8 +115,8 @@ public class Bounds { var2.lowY = var1.lowY; } - if (var2.method5994() > var1.method5994()) { - var2.highY -= var2.method5994() - var1.method5994(); + if (var2.method6035() > var1.method6035()) { + var2.highY -= var2.method6035() - var1.method6035(); } if (var2.highY < 0) { @@ -119,25 +125,87 @@ public class Bounds { } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1022454109" + garbageValue = "1353685285" ) - int method6000() { + int method6034() { return this.lowX + this.highX; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "1" + signature = "(I)I", + garbageValue = "-155482088" ) - int method5994() { + int method6035() { return this.highY + this.lowY; } public String toString() { return null; } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(Ljava/lang/Throwable;I)Ljava/lang/String;", + garbageValue = "1378927694" + ) + static String method6058(Throwable var0) throws IOException { + String var1; + if (var0 instanceof RunException) { + RunException var2 = (RunException)var0; + var1 = var2.message + " | "; + var0 = var2.throwable; + } else { + var1 = ""; + } + + StringWriter var12 = new StringWriter(); + PrintWriter var3 = new PrintWriter(var12); + var0.printStackTrace(var3); + var3.close(); + String var4 = var12.toString(); + BufferedReader var5 = new BufferedReader(new StringReader(var4)); + String var6 = var5.readLine(); + + while (true) { + while (true) { + String var7 = var5.readLine(); + if (var7 == null) { + var1 = var1 + "| " + var6; + return var1; + } + + int var8 = var7.indexOf(40); + int var9 = var7.indexOf(41, var8 + 1); + if (var8 >= 0 && var9 >= 0) { + String var10 = var7.substring(var8 + 1, var9); + int var11 = var10.indexOf(".java:"); + if (var11 >= 0) { + var10 = var10.substring(0, var11) + var10.substring(var11 + 5); + var1 = var1 + var10 + ' '; + continue; + } + + var7 = var7.substring(0, var8); + } + + var7 = var7.trim(); + var7 = var7.substring(var7.lastIndexOf(32) + 1); + var7 = var7.substring(var7.lastIndexOf(9) + 1); + var1 = var1 + var7 + ' '; + } + } + } + + @ObfuscatedName("af") + @ObfuscatedSignature( + signature = "(Ljava/net/Socket;IIB)Lkr;", + garbageValue = "-41" + ) + public static AbstractSocket method6040(Socket var0, int var1, int var2) throws IOException { + return new BufferedNetSocket(var0, var1, var2); + } } diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java index 762e63d0ce..abae376e4e 100644 --- a/runescape-client/src/main/java/Buddy.java +++ b/runescape-client/src/main/java/Buddy.java @@ -1,29 +1,27 @@ -import java.io.IOException; -import java.net.Socket; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jt") +@ObfuscatedName("je") @Implements("Buddy") public class Buddy extends User { - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 945410251 + intValue = -1462953665 ) @Export("world") public int world; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 509966379 + intValue = 179134735 ) @Export("int2") public int int2; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1815065489 + intValue = -1349530221 ) @Export("rank") public int rank; @@ -32,10 +30,10 @@ public class Buddy extends User { this.world = -1; } - @ObfuscatedName("am") + @ObfuscatedName("ai") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-309378639" + garbageValue = "1991575010" ) @Export("set") void set(int var1, int var2) { @@ -46,99 +44,46 @@ public class Buddy extends User { @ObfuscatedName("ab") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1803035811" + garbageValue = "-1822334974" ) @Export("getWorld") public int getWorld() { return this.world; } - @ObfuscatedName("bj") + @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-1364700600" + signature = "(B)Z", + garbageValue = "-101" ) @Export("hasWorld") public boolean hasWorld() { return this.world > 0; } - @ObfuscatedName("l") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "1663251439" + signature = "(Ljava/lang/CharSequence;I)I", + garbageValue = "631809601" ) - public static String method5214(String var0) { + public static int method5234(CharSequence var0) { int var1 = var0.length(); - char[] var2 = new char[var1]; - byte var3 = 2; + int var2 = 0; - for (int var4 = 0; var4 < var1; ++var4) { - char var5 = var0.charAt(var4); - if (var3 == 0) { - var5 = Character.toLowerCase(var5); - } else if (var3 == 2 || Character.isUpperCase(var5)) { - var5 = ScriptFrame.method1110(var5); - } - - if (Character.isLetter(var5)) { - var3 = 0; - } else if (var5 != '.' && var5 != '?' && var5 != '!') { - if (Character.isSpaceChar(var5)) { - if (var3 != 2) { - var3 = 1; - } - } else { - var3 = 1; - } - } else { - var3 = 2; - } - - var2[var4] = var5; + for (int var3 = 0; var3 < var1; ++var3) { + var2 = (var2 << 5) - var2 + var0.charAt(var3); } - return new String(var2); + return var2; } - @ObfuscatedName("an") + @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(Ljava/net/Socket;III)Lky;", - garbageValue = "62058076" + signature = "(Ljava/lang/String;I)I", + garbageValue = "-2002208158" ) - public static AbstractSocket method5215(Socket var0, int var1, int var2) throws IOException { - return new BufferedNetSocket(var0, var1, var2); - } - - @ObfuscatedName("kt") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-16" - ) - static void method5211() { - for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { - int var1 = var0.group; - if (MusicPatch.loadInterface(var1)) { - boolean var2 = true; - Widget[] var3 = UserComparator7.Widget_interfaceComponents[var1]; - - int var4; - for (var4 = 0; var4 < var3.length; ++var4) { - if (var3[var4] != null) { - var2 = var3[var4].isIf3; - break; - } - } - - if (!var2) { - var4 = (int)var0.key; - Widget var5 = Tile.getWidget(var4); - if (var5 != null) { - LoginPacket.invalidateWidget(var5); - } - } - } - } - + @Export("stringCp1252NullTerminatedByteSize") + public static int stringCp1252NullTerminatedByteSize(String var0) { + return var0.length() + 1; } } diff --git a/runescape-client/src/main/java/BuddyRankComparator.java b/runescape-client/src/main/java/BuddyRankComparator.java index a48bac0557..7086d2fffb 100644 --- a/runescape-client/src/main/java/BuddyRankComparator.java +++ b/runescape-client/src/main/java/BuddyRankComparator.java @@ -1,13 +1,24 @@ -import java.io.IOException; +import java.awt.Component; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ed") +@ObfuscatedName("fx") @Implements("BuddyRankComparator") public class BuddyRankComparator extends AbstractUserComparator { - @ObfuscatedName("f") + @ObfuscatedName("bc") + @ObfuscatedSignature( + signature = "Lhq;" + ) + static ServerBuild field1987; + @ObfuscatedName("dr") + @ObfuscatedSignature( + signature = "Lia;" + ) + @Export("archive7") + static Archive archive7; + @ObfuscatedName("c") @Export("reversed") final boolean reversed; @@ -15,10 +26,10 @@ public class BuddyRankComparator extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljt;Ljt;B)I", - garbageValue = "70" + signature = "(Lje;Lje;I)I", + garbageValue = "552186656" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -33,98 +44,112 @@ public class BuddyRankComparator extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(ZB)V", - garbageValue = "-2" + signature = "(I[BLky;B)V", + garbageValue = "-1" ) - public static void method3362(boolean var0) { - if (class297.NetCache_socket != null) { - try { - Buffer var1 = new Buffer(4); - var1.writeByte(var0 ? 2 : 3); - var1.writeMedium(0); - class297.NetCache_socket.write(var1.array, 0, 4); - } catch (IOException var4) { - try { - class297.NetCache_socket.close(); - } catch (Exception var3) { - } + static void method3507(int var0, byte[] var1, ArchiveDisk var2) { + ArchiveDiskAction var3 = new ArchiveDiskAction(); + var3.type = 0; + var3.key = (long)var0; + var3.data = var1; + var3.archiveDisk = var2; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); + } - ++NetCache.NetCache_ioExceptions; - class297.NetCache_socket = null; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { + if (ArchiveDiskActionHandler.field3150 == 0) { + class218.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); + class218.ArchiveDiskActionHandler_thread.setDaemon(true); + class218.ArchiveDiskActionHandler_thread.start(); + class218.ArchiveDiskActionHandler_thread.setPriority(5); } + ArchiveDiskActionHandler.field3150 = 600; } } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lhz;Lhz;I)Z", - garbageValue = "-1979792654" + signature = "(Ljava/awt/Component;I)V", + garbageValue = "-837089812" ) - public static boolean method3363(AbstractArchive var0, AbstractArchive var1) { - WorldMapElement.WorldMapElement_archive = var1; - if (!var0.isFullyLoaded()) { - return false; - } else { - class180.WorldMapElement_count = var0.getGroupFileCount(35); - WorldMapElement.WorldMapElement_cached = new WorldMapElement[class180.WorldMapElement_count]; - - for (int var2 = 0; var2 < class180.WorldMapElement_count; ++var2) { - byte[] var3 = var0.takeFile(35, var2); - WorldMapElement.WorldMapElement_cached[var2] = new WorldMapElement(var2); - if (var3 != null) { - WorldMapElement.WorldMapElement_cached[var2].decode(new Buffer(var3)); - WorldMapElement.WorldMapElement_cached[var2].method4360(); - } - } + static void method3505(Component var0) { + var0.addMouseListener(MouseHandler.MouseHandler_instance); + var0.addMouseMotionListener(MouseHandler.MouseHandler_instance); + var0.addFocusListener(MouseHandler.MouseHandler_instance); + } + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(CB)Z", + garbageValue = "0" + ) + public static boolean method3510(char var0) { + if (var0 >= ' ' && var0 < 127 || var0 > 127 && var0 < 160 || var0 > 160 && var0 <= 255) { return true; + } else { + if (var0 != 0) { + char[] var1 = class288.cp1252AsciiExtension; + + for (int var2 = 0; var2 < var1.length; ++var2) { + char var3 = var1[var2]; + if (var0 == var3) { + return true; + } + } + } + + return false; } } - @ObfuscatedName("gd") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Lbn;III)V", - garbageValue = "-49955773" + signature = "(Lia;IIIBZI)V", + garbageValue = "-1197984265" ) - @Export("performPlayerAnimation") - static void performPlayerAnimation(Player var0, int var1, int var2) { - if (var0.sequence == var1 && var1 != -1) { - int var3 = WorldMapSection0.SequenceDefinition_get(var1).field3495; - if (var3 == 1) { - var0.sequenceFrame = 0; - var0.sequenceFrameCycle = 0; - var0.sequenceDelay = var2; - var0.field958 = 0; - } + @Export("requestNetFile") + static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { + long var6 = (long)((var1 << 16) + var2); + NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); + if (var8 == null) { + var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); + if (var8 == null) { + var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); + if (var8 != null) { + if (var5) { + var8.removeDual(); + NetCache.NetCache_pendingPriorityWrites.put(var8, var6); + --NetCache.NetCache_pendingWritesCount; + ++NetCache.NetCache_pendingPriorityWritesCount; + } - if (var3 == 2) { - var0.field958 = 0; + } else { + if (!var5) { + var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); + if (var8 != null) { + return; + } + } + + var8 = new NetFileRequest(); + var8.archive = var0; + var8.crc = var3; + var8.padding = var4; + if (var5) { + NetCache.NetCache_pendingPriorityWrites.put(var8, var6); + ++NetCache.NetCache_pendingPriorityWritesCount; + } else { + NetCache.NetCache_pendingWritesQueue.addFirst(var8); + NetCache.NetCache_pendingWrites.put(var8, var6); + ++NetCache.NetCache_pendingWritesCount; + } + + } } - } else if (var1 == -1 || var0.sequence == -1 || WorldMapSection0.SequenceDefinition_get(var1).field3492 >= WorldMapSection0.SequenceDefinition_get(var0.sequence).field3492) { - var0.sequence = var1; - var0.sequenceFrame = 0; - var0.sequenceFrameCycle = 0; - var0.sequenceDelay = var2; - var0.field958 = 0; - var0.field926 = var0.pathLength; } - - } - - @ObfuscatedName("jg") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "73" - ) - static void method3361(int var0) { - LoginType.tempMenuAction = new MenuAction(); - LoginType.tempMenuAction.param0 = Client.menuArguments1[var0]; - LoginType.tempMenuAction.param1 = Client.menuArguments2[var0]; - LoginType.tempMenuAction.opcode = Client.menuOpcodes[var0]; - LoginType.tempMenuAction.identifier = Client.menuIdentifiers[var0]; - LoginType.tempMenuAction.action = Client.menuActions[var0]; } } diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java index 4e49a4c044..d49272f797 100644 --- a/runescape-client/src/main/java/Buffer.java +++ b/runescape-client/src/main/java/Buffer.java @@ -5,21 +5,21 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kq") +@ObfuscatedName("kp") @Implements("Buffer") public class Buffer extends Node { - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("crc32Table") static int[] crc32Table; - @ObfuscatedName("d") + @ObfuscatedName("m") @Export("crc64Table") static long[] crc64Table; - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("array") public byte[] array; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -974427465 + intValue = -1466465553 ) @Export("offset") public int offset; @@ -61,7 +61,7 @@ public class Buffer extends Node { } public Buffer(int var1) { - this.array = class218.ByteArrayPool_getArray(var1); + this.array = GrandExchangeOfferTotalQuantityComparator.ByteArrayPool_getArray(var1); this.offset = 0; } @@ -70,34 +70,34 @@ public class Buffer extends Node { this.offset = 0; } - @ObfuscatedName("ax") + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-1" + signature = "(I)V", + garbageValue = "-597466859" ) @Export("releaseArray") public void releaseArray() { if (this.array != null) { - GraphicsDefaults.ByteArrayPool_release(this.array); + class267.ByteArrayPool_release(this.array); } this.array = null; } - @ObfuscatedName("at") + @ObfuscatedName("ao") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-1741213473" + garbageValue = "1142768671" ) @Export("writeByte") public void writeByte(int var1) { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("af") + @ObfuscatedName("at") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "2" + signature = "(II)V", + garbageValue = "774845024" ) @Export("writeShort") public void writeShort(int var1) { @@ -105,10 +105,10 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("ap") + @ObfuscatedName("an") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-2091001139" + garbageValue = "1983251437" ) @Export("writeMedium") public void writeMedium(int var1) { @@ -117,10 +117,10 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("ai") + @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "49619739" + signature = "(IS)V", + garbageValue = "14678" ) @Export("writeInt") public void writeInt(int var1) { @@ -130,7 +130,7 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("am") + @ObfuscatedName("ai") @Export("writeLongMedium") public void writeLongMedium(long var1) { this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); @@ -154,20 +154,20 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)((int)var1); } - @ObfuscatedName("bj") + @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "(ZB)V", - garbageValue = "52" + signature = "(ZI)V", + garbageValue = "1178283673" ) @Export("writeBoolean") public void writeBoolean(boolean var1) { this.writeByte(var1 ? 1 : 0); } - @ObfuscatedName("bw") + @ObfuscatedName("bq") @ObfuscatedSignature( signature = "(Ljava/lang/String;I)V", - garbageValue = "2103649600" + garbageValue = "-562863668" ) @Export("writeStringCp1252NullTerminated") public void writeStringCp1252NullTerminated(String var1) { @@ -175,15 +175,15 @@ public class Buffer extends Node { if (var2 >= 0) { throw new IllegalArgumentException(""); } else { - this.offset += class32.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); + this.offset += Tiles.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); this.array[++this.offset - 1] = 0; } } - @ObfuscatedName("bl") + @ObfuscatedName("bc") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "1339106309" + signature = "(Ljava/lang/String;B)V", + garbageValue = "-18" ) @Export("writeStringCp1252NullCircumfixed") public void writeStringCp1252NullCircumfixed(String var1) { @@ -192,28 +192,41 @@ public class Buffer extends Node { throw new IllegalArgumentException(""); } else { this.array[++this.offset - 1] = 0; - this.offset += class32.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); + this.offset += Tiles.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); this.array[++this.offset - 1] = 0; } } - @ObfuscatedName("bq") + @ObfuscatedName("bk") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)V", - garbageValue = "104360038" + signature = "(Ljava/lang/CharSequence;S)V", + garbageValue = "139" ) @Export("writeCESU8") public void writeCESU8(CharSequence var1) { - int var2 = class3.method35(var1); + int var3 = var1.length(); + int var4 = 0; + + for (int var5 = 0; var5 < var3; ++var5) { + char var6 = var1.charAt(var5); + if (var6 <= 127) { + ++var4; + } else if (var6 <= 2047) { + var4 += 2; + } else { + var4 += 3; + } + } + this.array[++this.offset - 1] = 0; - this.writeVarInt(var2); - this.offset += Strings.method4095(this.array, this.offset, var1); + this.writeVarInt(var4); + this.offset += WorldMapIcon_1.method310(this.array, this.offset, var1); } - @ObfuscatedName("bx") + @ObfuscatedName("bb") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "1871386509" + garbageValue = "-1019958265" ) @Export("writeBytes") public void writeBytes(byte[] var1, int var2, int var3) { @@ -223,10 +236,10 @@ public class Buffer extends Node { } - @ObfuscatedName("bc") + @ObfuscatedName("bi") @ObfuscatedSignature( signature = "(IB)V", - garbageValue = "10" + garbageValue = "6" ) @Export("writeLengthInt") public void writeLengthInt(int var1) { @@ -240,10 +253,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("by") + @ObfuscatedName("bp") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "-119" + signature = "(IS)V", + garbageValue = "-14085" ) @Export("writeLengthShort") public void writeLengthShort(int var1) { @@ -255,10 +268,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("bz") + @ObfuscatedName("bl") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "600259384" + garbageValue = "-739300213" ) @Export("writeLengthByte") public void writeLengthByte(int var1) { @@ -269,10 +282,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("bm") + @ObfuscatedName("by") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-1935597490" + garbageValue = "-1285300574" ) @Export("writeSmartByteShort") public void writeSmartByteShort(int var1) { @@ -285,10 +298,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("bo") + @ObfuscatedName("be") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1722354173" + garbageValue = "-1255643673" ) @Export("writeVarInt") public void writeVarInt(int var1) { @@ -311,20 +324,20 @@ public class Buffer extends Node { this.writeByte(var1 & 127); } - @ObfuscatedName("bs") + @ObfuscatedName("bw") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-465262399" + signature = "(B)I", + garbageValue = "-7" ) @Export("readUnsignedByte") public int readUnsignedByte() { return this.array[++this.offset - 1] & 255; } - @ObfuscatedName("ba") + @ObfuscatedName("bt") @ObfuscatedSignature( - signature = "(S)B", - garbageValue = "-9846" + signature = "(B)B", + garbageValue = "90" ) @Export("readByte") public byte readByte() { @@ -334,7 +347,7 @@ public class Buffer extends Node { @ObfuscatedName("bn") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "252196330" + garbageValue = "-1290925283" ) @Export("readUnsignedShort") public int readUnsignedShort() { @@ -342,10 +355,10 @@ public class Buffer extends Node { return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); } - @ObfuscatedName("bb") + @ObfuscatedName("bm") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-76" + signature = "(I)I", + garbageValue = "1932495481" ) @Export("readShort") public int readShort() { @@ -358,10 +371,10 @@ public class Buffer extends Node { return var1; } - @ObfuscatedName("bh") + @ObfuscatedName("ba") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "70" + garbageValue = "-17" ) @Export("readMedium") public int readMedium() { @@ -369,10 +382,10 @@ public class Buffer extends Node { return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); } - @ObfuscatedName("bv") + @ObfuscatedName("bd") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1030598931" + garbageValue = "-1209977249" ) @Export("readInt") public int readInt() { @@ -380,32 +393,32 @@ public class Buffer extends Node { return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 24); } - @ObfuscatedName("bu") + @ObfuscatedName("bs") @ObfuscatedSignature( - signature = "(B)J", - garbageValue = "-108" + signature = "(I)J", + garbageValue = "-1589308129" ) @Export("readLong") public long readLong() { long var1 = (long)this.readInt() & 4294967295L; long var3 = (long)this.readInt() & 4294967295L; - return (var1 << 32) + var3; + return var3 + (var1 << 32); } - @ObfuscatedName("be") + @ObfuscatedName("bx") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1652642398" + garbageValue = "1547974327" ) @Export("readBoolean") public boolean readBoolean() { return (this.readUnsignedByte() & 1) == 1; } - @ObfuscatedName("bd") + @ObfuscatedName("bh") @ObfuscatedSignature( signature = "(I)Ljava/lang/String;", - garbageValue = "1889291164" + garbageValue = "510750130" ) @Export("readStringCp1252NullTerminatedOrNull") public String readStringCp1252NullTerminatedOrNull() { @@ -417,10 +430,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("bf") + @ObfuscatedName("bg") @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", - garbageValue = "-1443383745" + signature = "(B)Ljava/lang/String;", + garbageValue = "46" ) @Export("readStringCp1252NullTerminated") public String readStringCp1252NullTerminated() { @@ -430,13 +443,13 @@ public class Buffer extends Node { } int var2 = this.offset - var1 - 1; - return var2 == 0 ? "" : class225.decodeStringCp1252(this.array, var1, var2); + return var2 == 0 ? "" : ScriptFrame.decodeStringCp1252(this.array, var1, var2); } - @ObfuscatedName("bi") + @ObfuscatedName("bz") @ObfuscatedSignature( - signature = "(B)Ljava/lang/String;", - garbageValue = "9" + signature = "(I)Ljava/lang/String;", + garbageValue = "-1698785441" ) @Export("readStringCp1252NullCircumfixed") public String readStringCp1252NullCircumfixed() { @@ -450,14 +463,14 @@ public class Buffer extends Node { } int var3 = this.offset - var2 - 1; - return var3 == 0 ? "" : class225.decodeStringCp1252(this.array, var2, var3); + return var3 == 0 ? "" : ScriptFrame.decodeStringCp1252(this.array, var2, var3); } } - @ObfuscatedName("br") + @ObfuscatedName("bj") @ObfuscatedSignature( - signature = "(B)Ljava/lang/String;", - garbageValue = "-7" + signature = "(I)Ljava/lang/String;", + garbageValue = "-1344056693" ) @Export("readCESU8") public String readCESU8() { @@ -476,7 +489,7 @@ public class Buffer extends Node { int var8 = var5; int var11; - for (int var9 = var2 + var5; var8 < var9; var6[var7++] = (char)var11) { + for (int var9 = var5 + var2; var8 < var9; var6[var7++] = (char)var11) { int var10 = var4[var8++] & 255; if (var10 < 128) { if (var10 == 0) { @@ -527,10 +540,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("bt") + @ObfuscatedName("bu") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "-991608538" + garbageValue = "1664358165" ) @Export("readBytes") public void readBytes(byte[] var1, int var2, int var3) { @@ -540,10 +553,10 @@ public class Buffer extends Node { } - @ObfuscatedName("bp") + @ObfuscatedName("bv") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "53" + garbageValue = "91" ) @Export("readShortSmart") public int readShortSmart() { @@ -551,10 +564,10 @@ public class Buffer extends Node { return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; } - @ObfuscatedName("co") + @ObfuscatedName("bo") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1683950502" + garbageValue = "1358328667" ) @Export("readUShortSmart") public int readUShortSmart() { @@ -562,12 +575,12 @@ public class Buffer extends Node { return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; } - @ObfuscatedName("cp") + @ObfuscatedName("br") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1533459014" + garbageValue = "-403922272" ) - public int method5558() { + public int method5589() { int var1 = 0; int var2; @@ -579,21 +592,21 @@ public class Buffer extends Node { return var1; } - @ObfuscatedName("cd") + @ObfuscatedName("cp") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1600881896" + garbageValue = "1291286864" ) - public int method5559() { + public int method5592() { return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); } - @ObfuscatedName("cj") + @ObfuscatedName("cg") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "406513070" + garbageValue = "-292040841" ) - public int method5560() { + public int method5593() { if (this.array[this.offset] < 0) { return this.readInt() & Integer.MAX_VALUE; } else { @@ -602,10 +615,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("cq") + @ObfuscatedName("cr") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "2058260314" + signature = "(S)I", + garbageValue = "8212" ) @Export("readVarInt") public int readVarInt() { @@ -619,10 +632,10 @@ public class Buffer extends Node { return var2 | var1; } - @ObfuscatedName("cb") + @ObfuscatedName("co") @ObfuscatedSignature( signature = "([II)V", - garbageValue = "-1596114237" + garbageValue = "-537752227" ) @Export("xteaEncryptAll") public void xteaEncryptAll(int[] var1) { @@ -647,10 +660,10 @@ public class Buffer extends Node { } - @ObfuscatedName("cf") + @ObfuscatedName("ck") @ObfuscatedSignature( signature = "([II)V", - garbageValue = "1737935822" + garbageValue = "1804216479" ) @Export("xteaDecryptAll") public void xteaDecryptAll(int[] var1) { @@ -675,10 +688,10 @@ public class Buffer extends Node { } - @ObfuscatedName("cs") + @ObfuscatedName("cn") @ObfuscatedSignature( signature = "([IIII)V", - garbageValue = "1065285661" + garbageValue = "-996526145" ) @Export("xteaEncrypt") public void xteaEncrypt(int[] var1, int var2, int var3) { @@ -705,10 +718,10 @@ public class Buffer extends Node { this.offset = var4; } - @ObfuscatedName("ch") + @ObfuscatedName("cd") @ObfuscatedSignature( - signature = "([IIIB)V", - garbageValue = "1" + signature = "([IIII)V", + garbageValue = "571658661" ) @Export("xteaDecrypt") public void xteaDecrypt(int[] var1, int var2, int var3) { @@ -735,10 +748,10 @@ public class Buffer extends Node { this.offset = var4; } - @ObfuscatedName("ca") + @ObfuscatedName("ct") @ObfuscatedSignature( - signature = "(Ljava/math/BigInteger;Ljava/math/BigInteger;B)V", - garbageValue = "1" + signature = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V", + garbageValue = "-573569377" ) @Export("encryptRsa") public void encryptRsa(BigInteger var1, BigInteger var2) { @@ -754,179 +767,197 @@ public class Buffer extends Node { this.writeBytes(var7, 0, var7.length); } - @ObfuscatedName("cn") + @ObfuscatedName("cb") @ObfuscatedSignature( signature = "(II)I", - garbageValue = "-1528934542" + garbageValue = "-1621128652" ) @Export("writeCrc") public int writeCrc(int var1) { - int var2 = Timer.method5033(this.array, var1, this.offset); - this.writeInt(var2); - return var2; + byte[] var3 = this.array; + int var4 = this.offset; + int var5 = -1; + + for (int var6 = var1; var6 < var4; ++var6) { + var5 = var5 >>> 8 ^ crc32Table[(var5 ^ var3[var6]) & 255]; + } + + var5 = ~var5; + this.writeInt(var5); + return var5; } - @ObfuscatedName("cx") + @ObfuscatedName("cf") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "1162985517" + garbageValue = "-1877134209" ) @Export("checkCrc") public boolean checkCrc() { this.offset -= 4; - int var1 = Timer.method5033(this.array, 0, this.offset); - int var2 = this.readInt(); - return var1 == var2; + byte[] var2 = this.array; + int var3 = this.offset; + int var4 = -1; + + int var5; + for (var5 = 0; var5 < var3; ++var5) { + var4 = var4 >>> 8 ^ crc32Table[(var4 ^ var2[var5]) & 255]; + } + + var4 = ~var4; + var5 = this.readInt(); + return var4 == var5; } - @ObfuscatedName("ck") + @ObfuscatedName("cm") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1226995915" + garbageValue = "-579952259" ) - public void method5569(int var1) { + public void method5602(int var1) { this.array[++this.offset - 1] = (byte)(var1 + 128); } - @ObfuscatedName("ce") + @ObfuscatedName("cz") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-532797740" + garbageValue = "-1753597571" ) - public void method5720(int var1) { + public void method5603(int var1) { this.array[++this.offset - 1] = (byte)(0 - var1); } @ObfuscatedName("cu") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1575926021" + signature = "(IB)V", + garbageValue = "9" ) - public void method5696(int var1) { + public void method5604(int var1) { this.array[++this.offset - 1] = (byte)(128 - var1); } - @ObfuscatedName("cg") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1475390763" - ) - public int method5572() { - return this.array[++this.offset - 1] - 128 & 255; - } - - @ObfuscatedName("ct") - @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "25" - ) - public int method5675() { - return 0 - this.array[++this.offset - 1] & 255; - } - - @ObfuscatedName("cr") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-997591738" - ) - public int method5628() { - return 128 - this.array[++this.offset - 1] & 255; - } - @ObfuscatedName("cy") - @ObfuscatedSignature( - signature = "(I)B", - garbageValue = "2082648513" - ) - public byte method5575() { - return (byte)(this.array[++this.offset - 1] - 128); - } - - @ObfuscatedName("cz") - @ObfuscatedSignature( - signature = "(I)B", - garbageValue = "768698766" - ) - public byte method5576() { - return (byte)(0 - this.array[++this.offset - 1]); - } - - @ObfuscatedName("cm") - @ObfuscatedSignature( - signature = "(I)B", - garbageValue = "-1982248202" - ) - public byte method5577() { - return (byte)(128 - this.array[++this.offset - 1]); - } - - @ObfuscatedName("cl") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "829423539" - ) - @Export("writeIntME") - public void writeIntME(int var1) { - this.array[++this.offset - 1] = (byte)var1; - this.array[++this.offset - 1] = (byte)(var1 >> 8); - } - - @ObfuscatedName("ci") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1832241296" - ) - public void method5579(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); - this.array[++this.offset - 1] = (byte)(var1 + 128); - } - - @ObfuscatedName("cc") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "375556310" - ) - public void method5746(int var1) { - this.array[++this.offset - 1] = (byte)(var1 + 128); - this.array[++this.offset - 1] = (byte)(var1 >> 8); - } - - @ObfuscatedName("cv") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "26" + garbageValue = "0" ) - public int method5723() { - this.offset += 2; - return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); + public int method5605() { + return this.array[++this.offset - 1] - 128 & 255; + } + + @ObfuscatedName("ce") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "-534230920" + ) + public int method5606() { + return 0 - this.array[++this.offset - 1] & 255; } @ObfuscatedName("cw") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "989740563" + garbageValue = "2078777161" ) - public int method5582() { + public int method5771() { + return 128 - this.array[++this.offset - 1] & 255; + } + + @ObfuscatedName("cq") + @ObfuscatedSignature( + signature = "(B)B", + garbageValue = "-58" + ) + public byte method5618() { + return (byte)(this.array[++this.offset - 1] - 128); + } + + @ObfuscatedName("ci") + @ObfuscatedSignature( + signature = "(I)B", + garbageValue = "1756539900" + ) + public byte method5609() { + return (byte)(0 - this.array[++this.offset - 1]); + } + + @ObfuscatedName("ca") + @ObfuscatedSignature( + signature = "(I)B", + garbageValue = "1575706022" + ) + public byte method5780() { + return (byte)(128 - this.array[++this.offset - 1]); + } + + @ObfuscatedName("cc") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "1143249456" + ) + @Export("writeShortLE") + public void writeShortLE(int var1) { + this.array[++this.offset - 1] = (byte)var1; + this.array[++this.offset - 1] = (byte)(var1 >> 8); + } + + @ObfuscatedName("ch") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "-240350169" + ) + public void method5787(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); + this.array[++this.offset - 1] = (byte)(var1 + 128); + } + + @ObfuscatedName("cx") + @ObfuscatedSignature( + signature = "(IB)V", + garbageValue = "73" + ) + @Export("writeIntME") + public void writeIntME(int var1) { + this.array[++this.offset - 1] = (byte)(var1 + 128); + this.array[++this.offset - 1] = (byte)(var1 >> 8); + } + + @ObfuscatedName("cl") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "1821746850" + ) + public int method5614() { + this.offset += 2; + return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); + } + + @ObfuscatedName("cs") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "1470404124" + ) + public int method5762() { this.offset += 2; return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); } - @ObfuscatedName("do") + @ObfuscatedName("cj") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "1" + signature = "(I)I", + garbageValue = "1025515920" ) - public int method5583() { + public int method5740() { this.offset += 2; return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); } - @ObfuscatedName("dk") + @ObfuscatedName("cv") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "572488175" + garbageValue = "-1559852644" ) - public int method5584() { + public int method5610() { this.offset += 2; int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); if (var1 > 32767) { @@ -936,14 +967,14 @@ public class Buffer extends Node { return var1; } - @ObfuscatedName("dx") + @ObfuscatedName("dm") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1271070909" + garbageValue = "1775390343" ) - public int method5565() { + public int method5722() { this.offset += 2; - int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); + int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); if (var1 > 32767) { var1 -= 65536; } @@ -951,142 +982,90 @@ public class Buffer extends Node { return var1; } - @ObfuscatedName("de") + @ObfuscatedName("dw") @ObfuscatedSignature( signature = "(IB)V", - garbageValue = "-22" + garbageValue = "3" ) - public void method5586(int var1) { - this.array[++this.offset - 1] = (byte)var1; - this.array[++this.offset - 1] = (byte)(var1 >> 8); + public void method5619(int var1) { this.array[++this.offset - 1] = (byte)(var1 >> 16); - } - - @ObfuscatedName("df") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1666942102" - ) - public void method5744(int var1) { - this.array[++this.offset - 1] = (byte)var1; - this.array[++this.offset - 1] = (byte)(var1 >> 8); - this.array[++this.offset - 1] = (byte)(var1 >> 16); - this.array[++this.offset - 1] = (byte)(var1 >> 24); - } - - @ObfuscatedName("di") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1515627566" - ) - @Export("writeShortLE") - public void writeShortLE(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); - this.array[++this.offset - 1] = (byte)var1; - this.array[++this.offset - 1] = (byte)(var1 >> 24); - this.array[++this.offset - 1] = (byte)(var1 >> 16); - } - - @ObfuscatedName("dr") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-511439532" - ) - public void method5587(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 16); - this.array[++this.offset - 1] = (byte)(var1 >> 24); this.array[++this.offset - 1] = (byte)var1; this.array[++this.offset - 1] = (byte)(var1 >> 8); } - @ObfuscatedName("dg") + @ObfuscatedName("ds") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-154665051" + garbageValue = "1418078449" ) - public int method5590() { - this.offset += 4; - return (this.array[this.offset - 4] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16) + ((this.array[this.offset - 1] & 255) << 24); - } - - @ObfuscatedName("dh") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1197658984" - ) - public int method5591() { - this.offset += 4; - return ((this.array[this.offset - 2] & 255) << 24) + ((this.array[this.offset - 4] & 255) << 8) + (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 1] & 255) << 16); + public int method5620() { + this.offset += 3; + return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16); } @ObfuscatedName("dl") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "84" + signature = "(II)V", + garbageValue = "-2033639615" ) - public int method5592() { + public void method5624(int var1) { + this.array[++this.offset - 1] = (byte)var1; + this.array[++this.offset - 1] = (byte)(var1 >> 8); + this.array[++this.offset - 1] = (byte)(var1 >> 16); + this.array[++this.offset - 1] = (byte)(var1 >> 24); + } + + @ObfuscatedName("dv") + @ObfuscatedSignature( + signature = "(IB)V", + garbageValue = "33" + ) + public void method5622(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); + this.array[++this.offset - 1] = (byte)var1; + this.array[++this.offset - 1] = (byte)(var1 >> 24); + this.array[++this.offset - 1] = (byte)(var1 >> 16); + } + + @ObfuscatedName("do") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "-2048648417" + ) + public void method5623(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 16); + this.array[++this.offset - 1] = (byte)(var1 >> 24); + this.array[++this.offset - 1] = (byte)var1; + this.array[++this.offset - 1] = (byte)(var1 >> 8); + } + + @ObfuscatedName("di") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "-1385775072" + ) + public int method5665() { + this.offset += 4; + return (this.array[this.offset - 4] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16) + ((this.array[this.offset - 1] & 255) << 24); + } + + @ObfuscatedName("dc") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "-96808350" + ) + public int method5625() { + this.offset += 4; + return ((this.array[this.offset - 2] & 255) << 24) + ((this.array[this.offset - 4] & 255) << 8) + (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 1] & 255) << 16); + } + + @ObfuscatedName("dj") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "1174485250" + ) + public int method5626() { this.offset += 4; return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 16) + (this.array[this.offset - 2] & 255) + ((this.array[this.offset - 3] & 255) << 24); } - - @ObfuscatedName("da") - @ObfuscatedSignature( - signature = "([BIII)V", - garbageValue = "1567135679" - ) - public void method5593(byte[] var1, int var2, int var3) { - for (int var4 = var3 + var2 - 1; var4 >= var2; --var4) { - var1[var4] = this.array[++this.offset - 1]; - } - - } - - @ObfuscatedName("dp") - @ObfuscatedSignature( - signature = "([BIII)V", - garbageValue = "-448986261" - ) - public void method5740(byte[] var1, int var2, int var3) { - for (int var4 = var2; var4 < var3 + var2; ++var4) { - var1[var4] = (byte)(this.array[++this.offset - 1] - 128); - } - - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "(I)Lls;", - garbageValue = "-2068256812" - ) - static Sprite method5689() { - Sprite var0 = new Sprite(); - var0.width = class325.SpriteBuffer_spriteWidth; - var0.height = class325.SpriteBuffer_spriteHeight; - var0.xOffset = class325.SpriteBuffer_xOffsets[0]; - var0.yOffset = class325.SpriteBuffer_yOffsets[0]; - var0.subWidth = UserComparator1.SpriteBuffer_spriteWidths[0]; - var0.subHeight = class325.SpriteBuffer_spriteHeights[0]; - int var1 = var0.subHeight * var0.subWidth; - byte[] var2 = class290.SpriteBuffer_pixels[0]; - var0.pixels = new int[var1]; - - for (int var3 = 0; var3 < var1; ++var3) { - var0.pixels[var3] = class268.SpriteBuffer_spritePalette[var2[var3] & 255]; - } - - Message.method1223(); - return var0; - } - - @ObfuscatedName("je") - @ObfuscatedSignature( - signature = "(IIIIIIII)V", - garbageValue = "946172281" - ) - @Export("updateRootInterface") - static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (MusicPatch.loadInterface(var0)) { - WorldMapAreaData.updateInterface(UserComparator7.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); - } - } } diff --git a/runescape-client/src/main/java/BufferedFile.java b/runescape-client/src/main/java/BufferedFile.java index 329587e70e..8150c318ad 100644 --- a/runescape-client/src/main/java/BufferedFile.java +++ b/runescape-client/src/main/java/BufferedFile.java @@ -6,72 +6,72 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("my") +@ObfuscatedName("me") @Implements("BufferedFile") public class BufferedFile { - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lmk;" + signature = "Lmx;" ) @Export("accessFile") AccessFile accessFile; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("readBuffer") byte[] readBuffer; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - longValue = -5118577974640492239L + longValue = -8444963977777256649L ) @Export("readBufferOffset") long readBufferOffset; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 999715569 + intValue = 322598023 ) @Export("readBufferLength") int readBufferLength; - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("writeBuffer") byte[] writeBuffer; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - longValue = -7430138866634347913L + longValue = 2521859524399949401L ) @Export("writeBufferOffset") long writeBufferOffset; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1565373677 + intValue = -477832747 ) @Export("writeBufferLength") int writeBufferLength; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedGetter( - longValue = -5354612076530734833L + longValue = 8179397345785106237L ) @Export("offset") long offset; - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedGetter( - longValue = -2323016013084465375L + longValue = 3198798508515629197L ) @Export("fileLength") long fileLength; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - longValue = 4889558715252805571L + longValue = 4935958229854898805L ) @Export("length") long length; - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedGetter( - longValue = 7555588731094843747L + longValue = 647147803493944647L ) @Export("fileOffset") long fileOffset; @ObfuscatedSignature( - signature = "(Lmk;II)V" + signature = "(Lmx;II)V" ) public BufferedFile(AccessFile var1, int var2, int var3) throws IOException { this.readBufferOffset = -1L; @@ -84,10 +84,10 @@ public class BufferedFile { this.offset = 0L; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1595800163" + garbageValue = "-1756613502" ) @Export("close") public void close() throws IOException { @@ -95,7 +95,7 @@ public class BufferedFile { this.accessFile.close(); } - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("seek") public void seek(long var1) throws IOException { if (var1 < 0L) { @@ -105,30 +105,30 @@ public class BufferedFile { } } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(B)J", - garbageValue = "91" + garbageValue = "-80" ) @Export("length") public long length() { return this.length; } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "([BB)V", - garbageValue = "-24" + signature = "([BI)V", + garbageValue = "-1589882877" ) @Export("readFully") public void readFully(byte[] var1) throws IOException { this.read(var1, 0, var1.length); } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "([BIIB)V", - garbageValue = "61" + garbageValue = "22" ) @Export("read") public void read(byte[] var1, int var2, int var3) throws IOException { @@ -146,7 +146,7 @@ public class BufferedFile { long var4 = this.offset; int var7 = var3; int var8; - if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { + if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) { var8 = (int)((long)this.readBufferLength - (this.offset - this.readBufferOffset)); if (var8 > var3) { var8 = var3; @@ -200,15 +200,15 @@ public class BufferedFile { long var13 = -1L; long var10 = -1L; - if (this.writeBufferOffset >= var4 && this.writeBufferOffset < var4 + (long)var7) { + if (this.writeBufferOffset >= var4 && this.writeBufferOffset < (long)var7 + var4) { var13 = this.writeBufferOffset; - } else if (var4 >= this.writeBufferOffset && var4 < (long)this.writeBufferLength + this.writeBufferOffset) { + } else if (var4 >= this.writeBufferOffset && var4 < this.writeBufferOffset + (long)this.writeBufferLength) { var13 = var4; } - if (this.writeBufferOffset + (long)this.writeBufferLength > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= (long)var7 + var4) { + if ((long)this.writeBufferLength + this.writeBufferOffset > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= (long)var7 + var4) { var10 = (long)this.writeBufferLength + this.writeBufferOffset; - } else if ((long)var7 + var4 > this.writeBufferOffset && (long)var7 + var4 <= this.writeBufferOffset + (long)this.writeBufferLength) { + } else if ((long)var7 + var4 > this.writeBufferOffset && (long)var7 + var4 <= (long)this.writeBufferLength + this.writeBufferOffset) { var10 = (long)var7 + var4; } @@ -231,10 +231,10 @@ public class BufferedFile { } } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1578743019" + garbageValue = "-1700584004" ) @Export("load") void load() throws IOException { @@ -261,23 +261,23 @@ public class BufferedFile { } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "732073067" + garbageValue = "-1609695177" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { try { if (this.offset + (long)var3 > this.length) { - this.length = (long)var3 + this.offset; + this.length = this.offset + (long)var3; } - if (-1L != this.writeBufferOffset && (this.offset < this.writeBufferOffset || this.offset > this.writeBufferOffset + (long)this.writeBufferLength)) { + if (this.writeBufferOffset != -1L && (this.offset < this.writeBufferOffset || this.offset > this.writeBufferOffset + (long)this.writeBufferLength)) { this.flush(); } - if (-1L != this.writeBufferOffset && (long)var3 + this.offset > this.writeBufferOffset + (long)this.writeBuffer.length) { + if (-1L != this.writeBufferOffset && this.offset + (long)var3 > this.writeBufferOffset + (long)this.writeBuffer.length) { int var4 = (int)((long)this.writeBuffer.length - (this.offset - this.writeBufferOffset)); System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var4); this.offset += (long)var4; @@ -314,21 +314,21 @@ public class BufferedFile { long var9 = -1L; long var6 = -1L; - if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) { + if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { var9 = this.offset; - } else if (this.readBufferOffset >= this.offset && this.readBufferOffset < (long)var3 + this.offset) { + } else if (this.readBufferOffset >= this.offset && this.readBufferOffset < this.offset + (long)var3) { var9 = this.readBufferOffset; } - if (this.offset + (long)var3 > this.readBufferOffset && (long)var3 + this.offset <= this.readBufferOffset + (long)this.readBufferLength) { + if (this.offset + (long)var3 > this.readBufferOffset && this.offset + (long)var3 <= (long)this.readBufferLength + this.readBufferOffset) { var6 = this.offset + (long)var3; - } else if (this.readBufferOffset + (long)this.readBufferLength > this.offset && (long)this.readBufferLength + this.readBufferOffset <= (long)var3 + this.offset) { + } else if ((long)this.readBufferLength + this.readBufferOffset > this.offset && this.readBufferOffset + (long)this.readBufferLength <= (long)var3 + this.offset) { var6 = this.readBufferOffset + (long)this.readBufferLength; } if (var9 > -1L && var6 > var9) { int var8 = (int)(var6 - var9); - System.arraycopy(var1, (int)(var9 + (long)var2 - this.offset), this.readBuffer, (int)(var9 - this.readBufferOffset), var8); + System.arraycopy(var1, (int)((long)var2 + var9 - this.offset), this.readBuffer, (int)(var9 - this.readBufferOffset), var8); } this.offset += (long)var3; @@ -339,37 +339,37 @@ public class BufferedFile { } } - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "-37" + garbageValue = "118" ) @Export("flush") void flush() throws IOException { - if (-1L != this.writeBufferOffset) { - if (this.fileOffset != this.writeBufferOffset) { + if (this.writeBufferOffset != -1L) { + if (this.writeBufferOffset != this.fileOffset) { this.accessFile.seek(this.writeBufferOffset); this.fileOffset = this.writeBufferOffset; } this.accessFile.write(this.writeBuffer, 0, this.writeBufferLength); - this.fileOffset += 1565373677L * (long)(this.writeBufferLength * -466302747); + this.fileOffset += (long)(this.writeBufferLength * -2104387715) * -477832747L; if (this.fileOffset > this.fileLength) { this.fileLength = this.fileOffset; } long var1 = -1L; long var3 = -1L; - if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < this.readBufferOffset + (long)this.readBufferLength) { + if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < (long)this.readBufferLength + this.readBufferOffset) { var1 = this.writeBufferOffset; } else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < (long)this.writeBufferLength + this.writeBufferOffset) { var1 = this.readBufferOffset; } - if (this.writeBufferOffset + (long)this.writeBufferLength > this.readBufferOffset && this.writeBufferOffset + (long)this.writeBufferLength <= (long)this.readBufferLength + this.readBufferOffset) { - var3 = this.writeBufferOffset + (long)this.writeBufferLength; - } else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && (long)this.readBufferLength + this.readBufferOffset <= this.writeBufferOffset + (long)this.writeBufferLength) { - var3 = (long)this.readBufferLength + this.readBufferOffset; + if ((long)this.writeBufferLength + this.writeBufferOffset > this.readBufferOffset && (long)this.writeBufferLength + this.writeBufferOffset <= (long)this.readBufferLength + this.readBufferOffset) { + var3 = (long)this.writeBufferLength + this.writeBufferOffset; + } else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && this.readBufferOffset + (long)this.readBufferLength <= (long)this.writeBufferLength + this.writeBufferOffset) { + var3 = this.readBufferOffset + (long)this.readBufferLength; } if (var1 > -1L && var3 > var1) { diff --git a/runescape-client/src/main/java/BufferedNetSocket.java b/runescape-client/src/main/java/BufferedNetSocket.java index da73f298ed..9299816f3b 100644 --- a/runescape-client/src/main/java/BufferedNetSocket.java +++ b/runescape-client/src/main/java/BufferedNetSocket.java @@ -8,24 +8,18 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("kw") @Implements("BufferedNetSocket") public class BufferedNetSocket extends AbstractSocket { - @ObfuscatedName("fr") - @ObfuscatedSignature( - signature = "Leo;" - ) - @Export("urlRequester") - static UrlRequester urlRequester; - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("socket") Socket socket; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lkx;" + signature = "Lkk;" ) @Export("source") BufferedSource source; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lkb;" + signature = "Lkv;" ) @Export("sink") BufferedSink sink; @@ -40,10 +34,10 @@ public class BufferedNetSocket extends AbstractSocket { this.sink = new BufferedSink(this.socket.getOutputStream(), var3); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-647274291" + garbageValue = "-259367480" ) @Export("close") public void close() { @@ -57,50 +51,50 @@ public class BufferedNetSocket extends AbstractSocket { this.source.close(); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "2115277231" + signature = "(B)I", + garbageValue = "-108" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { return this.source.readUnsignedByte(); } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-972484659" + garbageValue = "2004103994" ) @Export("available") public int available() throws IOException { return this.source.available(); } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "497635177" + garbageValue = "-624446357" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { return this.source.isAvailable(var1); } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "([BIII)I", - garbageValue = "-1642271193" + garbageValue = "1847434030" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { return this.source.read(var1, var2, var3); } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "-340382115" + garbageValue = "977025272" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { diff --git a/runescape-client/src/main/java/BufferedSink.java b/runescape-client/src/main/java/BufferedSink.java index d286df5276..ce492381ef 100644 --- a/runescape-client/src/main/java/BufferedSink.java +++ b/runescape-client/src/main/java/BufferedSink.java @@ -6,40 +6,40 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kb") +@ObfuscatedName("kv") @Implements("BufferedSink") public class BufferedSink implements Runnable { - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("thread") Thread thread; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("outputStream") OutputStream outputStream; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1559219719 + intValue = -2050676869 ) @Export("capacity") int capacity; - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("buffer") byte[] buffer; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -196208499 + intValue = -1109896429 ) @Export("position") int position; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1767380433 + intValue = -1699191965 ) @Export("limit") int limit; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("exception") IOException exception; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("closed") boolean closed; @@ -54,10 +54,10 @@ public class BufferedSink implements Runnable { this.thread.start(); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "649877335" + signature = "(B)Z", + garbageValue = "-96" ) @Export("isClosed") boolean isClosed() { @@ -79,10 +79,10 @@ public class BufferedSink implements Runnable { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "([BIII)V", - garbageValue = "-1804311851" + signature = "([BIIB)V", + garbageValue = "0" ) @Export("write") void write(byte[] var1, int var2, int var3) throws IOException { @@ -119,10 +119,10 @@ public class BufferedSink implements Runnable { } } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1910014350" + garbageValue = "1954153796" ) @Export("close") void close() { @@ -198,161 +198,141 @@ public class BufferedSink implements Runnable { } - @ObfuscatedName("kr") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1908686960" + signature = "(DDIB)[D", + garbageValue = "80" ) - @Export("changeGameOptions") - static final void changeGameOptions(int var0) { - Buddy.method5211(); - MouseRecorder.method1187(); - int var1 = UserComparator8.VarpDefinition_get(var0).type; - if (var1 != 0) { - int var2 = Varps.Varps_main[var0]; - if (var1 == 1) { - if (var2 == 1) { - Rasterizer3D.Rasterizer3D_setBrightness(0.9D); - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.9D); - } + public static double[] method5902(double var0, double var2, int var4) { + int var5 = var4 * 2 + 1; + double[] var6 = new double[var5]; + int var7 = -var4; - if (var2 == 2) { - Rasterizer3D.Rasterizer3D_setBrightness(0.8D); - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.8D); - } + for (int var8 = 0; var7 <= var4; ++var8) { + var6[var8] = ViewportMouse.method3061((double)var7, var0, var2); + ++var7; + } - if (var2 == 3) { - Rasterizer3D.Rasterizer3D_setBrightness(0.7D); - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.7D); - } + return var6; + } - if (var2 == 4) { - Rasterizer3D.Rasterizer3D_setBrightness(0.6D); - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.6D); - } + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "([BIIB)Z", + garbageValue = "0" + ) + static final boolean method5913(byte[] var0, int var1, int var2) { + boolean var3 = true; + Buffer var4 = new Buffer(var0); + int var5 = -1; - NetSocket.method3525(); + label68: + while (true) { + int var6 = var4.method5589(); + if (var6 == 0) { + return var3; } - if (var1 == 3) { - short var3 = 0; - if (var2 == 0) { - var3 = 255; - } + var5 += var6; + int var7 = 0; + boolean var8 = false; - if (var2 == 1) { - var3 = 192; - } - - if (var2 == 2) { - var3 = 128; - } - - if (var2 == 3) { - var3 = 64; - } - - if (var2 == 4) { - var3 = 0; - } - - if (var3 != Client.musicVolume) { - if (Client.musicVolume == 0 && Client.currentTrackGroupId != -1) { - class173.playMusicTrack(GrandExchangeOfferWorldComparator.archive6, Client.currentTrackGroupId, 0, var3, false); - Client.field767 = false; - } else if (var3 == 0) { - Actor.method1755(); - Client.field767 = false; - } else { - TextureProvider.method2796(var3); + while (true) { + int var9; + while (!var8) { + var9 = var4.readUShortSmart(); + if (var9 == 0) { + continue label68; } - Client.musicVolume = var3; + var7 += var9 - 1; + int var10 = var7 & 63; + int var11 = var7 >> 6 & 63; + int var12 = var4.readUnsignedByte() >> 2; + int var13 = var11 + var1; + int var14 = var10 + var2; + if (var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) { + ObjectDefinition var15 = Occluder.getObjectDefinition(var5); + if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { + if (!var15.needsModelFiles()) { + ++Client.field700; + var3 = false; + } + + var8 = true; + } + } } + + var9 = var4.readUShortSmart(); + if (var9 == 0) { + break; + } + + var4.readUnsignedByte(); + } + } + } + + @ObfuscatedName("fy") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "-529911776" + ) + @Export("playSong") + static void playSong(int var0) { + if (var0 == -1 && !Client.field881) { + class197.midiPcmStream.clear(); + class197.field2414 = 1; + UserComparator5.musicTrackArchive = null; + } else if (var0 != -1 && var0 != Client.currentTrackGroupId && Client.musicVolume != 0 && !Client.field881) { + TaskHandler.method3554(2, MouseHandler.archive6, var0, 0, Client.musicVolume, false); + } + + Client.currentTrackGroupId = var0; + } + + @ObfuscatedName("km") + @ObfuscatedSignature( + signature = "(Lhn;I)Z", + garbageValue = "-2086851217" + ) + static final boolean method5915(Widget var0) { + int var1 = var0.contentType; + if (var1 == 205) { + Client.logoutTimer = 250; + return true; + } else { + int var2; + int var3; + if (var1 >= 300 && var1 <= 313) { + var2 = (var1 - 300) / 2; + var3 = var1 & 1; + Client.playerAppearance.changeAppearance(var2, var3 == 1); } - if (var1 == 4) { - if (var2 == 0) { - Client.soundEffectVolume = 127; - } - - if (var2 == 1) { - Client.soundEffectVolume = 96; - } - - if (var2 == 2) { - Client.soundEffectVolume = 64; - } - - if (var2 == 3) { - Client.soundEffectVolume = 32; - } - - if (var2 == 4) { - Client.soundEffectVolume = 0; - } + if (var1 >= 314 && var1 <= 323) { + var2 = (var1 - 314) / 2; + var3 = var1 & 1; + Client.playerAppearance.method4066(var2, var3 == 1); } - if (var1 == 5) { - Client.leftClickOpensMenu = var2; + if (var1 == 324) { + Client.playerAppearance.changeSex(false); } - if (var1 == 6) { - Client.chatEffects = var2; + if (var1 == 325) { + Client.playerAppearance.changeSex(true); } - if (var1 == 9) { - Client.field901 = var2; + if (var1 == 326) { + PacketBufferNode var4 = TilePaint.getPacketBufferNode(ClientPacket.field2284, Client.packetWriter.isaacCipher); + Client.playerAppearance.write(var4.packetBuffer); + Client.packetWriter.addNode(var4); + return true; + } else { + return false; } - - if (var1 == 10) { - if (var2 == 0) { - Client.areaSoundEffectVolume = 127; - } - - if (var2 == 1) { - Client.areaSoundEffectVolume = 96; - } - - if (var2 == 2) { - Client.areaSoundEffectVolume = 64; - } - - if (var2 == 3) { - Client.areaSoundEffectVolume = 32; - } - - if (var2 == 4) { - Client.areaSoundEffectVolume = 0; - } - } - - if (var1 == 17) { - Client.followerIndex = var2 & 65535; - } - - if (var1 == 18) { - Client.playerAttackOption = (AttackOption)DynamicObject.findEnumerated(ArchiveDisk.method5908(), var2); - if (Client.playerAttackOption == null) { - Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - - if (var1 == 19) { - if (var2 == -1) { - Client.combatTargetPlayerIndex = -1; - } else { - Client.combatTargetPlayerIndex = var2 & 2047; - } - } - - if (var1 == 22) { - Client.npcAttackOption = (AttackOption)DynamicObject.findEnumerated(ArchiveDisk.method5908(), var2); - if (Client.npcAttackOption == null) { - Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - } } } diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java index d6a8a105c9..b67b62482a 100644 --- a/runescape-client/src/main/java/BufferedSource.java +++ b/runescape-client/src/main/java/BufferedSource.java @@ -7,37 +7,37 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kx") +@ObfuscatedName("kk") @Implements("BufferedSource") public class BufferedSource implements Runnable { - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("thread") Thread thread; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 608753777 + intValue = 276934727 ) @Export("capacity") int capacity; - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("buffer") byte[] buffer; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1571350283 + intValue = 1985873745 ) @Export("position") int position; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1626755739 + intValue = 738500389 ) @Export("limit") int limit; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("exception") IOException exception; @@ -52,10 +52,10 @@ public class BufferedSource implements Runnable { this.thread.start(); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "2103445622" + signature = "(IB)Z", + garbageValue = "89" ) @Export("isAvailable") boolean isAvailable(int var1) throws IOException { @@ -86,10 +86,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(S)I", - garbageValue = "8192" + signature = "(I)I", + garbageValue = "-956188768" ) @Export("available") int available() throws IOException { @@ -110,15 +110,15 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "54" + garbageValue = "0" ) @Export("readUnsignedByte") int readUnsignedByte() throws IOException { synchronized(this) { - if (this.limit == this.position) { + if (this.position == this.limit) { if (this.exception != null) { throw new IOException(this.exception.toString()); } else { @@ -133,10 +133,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "([BIII)I", - garbageValue = "1982977111" + garbageValue = "-2106245122" ) @Export("read") int read(byte[] var1, int var2, int var3) throws IOException { @@ -174,10 +174,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-103" + signature = "(I)V", + garbageValue = "-2102342981" ) @Export("close") void close() { @@ -244,14 +244,35 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("fv") + @ObfuscatedName("jm") @ObfuscatedSignature( - signature = "(Lif;Ljava/lang/String;I)V", - garbageValue = "502005158" + signature = "(B)V", + garbageValue = "114" ) - static void method5925(Archive var0, String var1) { - ArchiveLoader var2 = new ArchiveLoader(var0, var1); - Client.archiveLoaders.add(var2); - Client.field629 += var2.groupCount; + static void method5934() { + for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { + int var1 = var0.group; + if (ScriptFrame.loadInterface(var1)) { + boolean var2 = true; + Widget[] var3 = WorldMapLabel.Widget_interfaceComponents[var1]; + + int var4; + for (var4 = 0; var4 < var3.length; ++var4) { + if (var3[var4] != null) { + var2 = var3[var4].isIf3; + break; + } + } + + if (!var2) { + var4 = (int)var0.key; + Widget var5 = Varps.getWidget(var4); + if (var5 != null) { + NPCDefinition.invalidateWidget(var5); + } + } + } + } + } } diff --git a/runescape-client/src/main/java/ByteArrayNode.java b/runescape-client/src/main/java/ByteArrayNode.java index 3cb8ff6a49..c698663666 100644 --- a/runescape-client/src/main/java/ByteArrayNode.java +++ b/runescape-client/src/main/java/ByteArrayNode.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("gn") +@ObfuscatedName("fd") @Implements("ByteArrayNode") public class ByteArrayNode extends Node { - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("byteArray") public byte[] byteArray; diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java index 523ad992b5..058c300718 100644 --- a/runescape-client/src/main/java/ByteArrayPool.java +++ b/runescape-client/src/main/java/ByteArrayPool.java @@ -4,40 +4,40 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kj") +@ObfuscatedName("ka") @Implements("ByteArrayPool") public class ByteArrayPool { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -210161975 + intValue = 1009050051 ) @Export("ByteArrayPool_smallCount") static int ByteArrayPool_smallCount; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1380698397 + intValue = 2126667647 ) @Export("ByteArrayPool_mediumCount") static int ByteArrayPool_mediumCount; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 750629749 + intValue = -82871939 ) @Export("ByteArrayPool_largeCount") static int ByteArrayPool_largeCount; - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("ByteArrayPool_small") static byte[][] ByteArrayPool_small; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("ByteArrayPool_medium") static byte[][] ByteArrayPool_medium; - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("ByteArrayPool_large") static byte[][] ByteArrayPool_large; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("ByteArrayPool_alternativeSizes") static int[] ByteArrayPool_alternativeSizes; - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("ByteArrayPool_arrays") static byte[][][] ByteArrayPool_arrays; @@ -50,37 +50,10 @@ public class ByteArrayPool { ByteArrayPool_large = new byte[50][]; } - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(I[BLkg;B)V", - garbageValue = "107" - ) - static void method5805(int var0, byte[] var1, ArchiveDisk var2) { - ArchiveDiskAction var3 = new ArchiveDiskAction(); - var3.type = 0; - var3.key = (long)var0; - var3.data = var1; - var3.archiveDisk = var2; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); - } - - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { - if (ArchiveDiskActionHandler.field3120 == 0) { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); - } - - ArchiveDiskActionHandler.field3120 = 600; - } - } - - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(IZI)[B", - garbageValue = "877934718" + garbageValue = "103093333" ) @Export("ByteArrayPool_getArrayBool") static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) { @@ -117,9 +90,9 @@ public class ByteArrayPool { if (ByteArrayPool_alternativeSizes[var4] != var0) { if (var0 < ByteArrayPool_alternativeSizes[var4]) { } - } else if (Interpreter.ByteArrayPool_altSizeArrayCounts[var4] > 0) { - byte[] var3 = ByteArrayPool_arrays[var4][--Interpreter.ByteArrayPool_altSizeArrayCounts[var4]]; - ByteArrayPool_arrays[var4][Interpreter.ByteArrayPool_altSizeArrayCounts[var4]] = null; + } else if (VerticalAlignment.ByteArrayPool_altSizeArrayCounts[var4] > 0) { + byte[] var3 = ByteArrayPool_arrays[var4][--VerticalAlignment.ByteArrayPool_altSizeArrayCounts[var4]]; + ByteArrayPool_arrays[var4][VerticalAlignment.ByteArrayPool_altSizeArrayCounts[var4]] = null; return var3; } } diff --git a/runescape-client/src/main/java/Calendar.java b/runescape-client/src/main/java/Calendar.java index f5a9fb1b85..c297c926cf 100644 --- a/runescape-client/src/main/java/Calendar.java +++ b/runescape-client/src/main/java/Calendar.java @@ -4,36 +4,24 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hd") +@ObfuscatedName("gz") @Implements("Calendar") public class Calendar { - @ObfuscatedName("pb") - @ObfuscatedSignature( - signature = "Ljq;" - ) - @Export("clanChat") - static ClanChat clanChat; - @ObfuscatedName("pv") - @ObfuscatedSignature( - signature = "Lku;" - ) - @Export("privateChatMode") - static PrivateChatMode privateChatMode; - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("MONTH_NAMES_ENGLISH_GERMAN") static final String[][] MONTH_NAMES_ENGLISH_GERMAN; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("DAYS_OF_THE_WEEK") static final String[] DAYS_OF_THE_WEEK; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("Calendar_calendar") static java.util.Calendar Calendar_calendar; - @ObfuscatedName("bc") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "[Lls;" + signature = "Lii;" ) - @Export("worldSelectBackSprites") - static Sprite[] worldSelectBackSprites; + @Export("Widget_modelsArchive") + static AbstractArchive Widget_modelsArchive; static { MONTH_NAMES_ENGLISH_GERMAN = new String[][]{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"}, {"jan", "fév", "mars", "avr", "mai", "juin", "juil", "août", "sept", "oct", "nov", "déc"}, {"jan", "fev", "mar", "abr", "mai", "jun", "jul", "ago", "set", "out", "nov", "dez"}, {"jan", "feb", "mrt", "apr", "mei", "jun", "jul", "aug", "sep", "okt", "nov", "dec"}, {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sep", "oct", "nov", "dic"}}; @@ -42,39 +30,12 @@ public class Calendar { Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT")); } - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(Lkq;Llc;B)Llc;", - garbageValue = "-33" + signature = "(Ljava/lang/String;I)V", + garbageValue = "-1040616662" ) - @Export("readStringIntParameters") - static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { - int var2 = var0.readUnsignedByte(); - int var3; - if (var1 == null) { - int var4 = var2 - 1; - var4 |= var4 >>> 1; - var4 |= var4 >>> 2; - var4 |= var4 >>> 4; - var4 |= var4 >>> 8; - var4 |= var4 >>> 16; - var3 = var4 + 1; - var1 = new IterableNodeHashTable(var3); - } - - for (var3 = 0; var3 < var2; ++var3) { - boolean var7 = var0.readUnsignedByte() == 1; - int var5 = var0.readMedium(); - Object var6; - if (var7) { - var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); - } else { - var6 = new IntegerNode(var0.readInt()); - } - - var1.put((Node)var6, (long)var5); - } - - return var1; + static final void method4014(String var0) { + class60.method1188("Please remove " + var0 + " from your ignore list first"); } } diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index 3bef7045dc..3686aa1ad8 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -2,22 +2,19 @@ import java.awt.Component; import java.awt.Graphics; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("af") +@ObfuscatedName("ai") @Implements("Canvas") public final class Canvas extends java.awt.Canvas { - @ObfuscatedName("qn") - @ObfuscatedGetter( - intValue = 739574061 + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "Lii;" ) - static int field397; - @ObfuscatedName("gk") - @Export("xteaKeys") - static int[][] xteaKeys; - @ObfuscatedName("f") + @Export("SequenceDefinition_animationsArchive") + static AbstractArchive SequenceDefinition_animationsArchive; + @ObfuscatedName("c") @Export("component") Component component; @@ -25,76 +22,45 @@ public final class Canvas extends java.awt.Canvas { this.component = var1; } - public final void update(Graphics var1) { - this.component.update(var1); - } - public final void paint(Graphics var1) { this.component.paint(var1); } - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(IIIIB)V", - garbageValue = "-7" - ) - @Export("itemContainerSetItem") - static void itemContainerSetItem(int var0, int var1, int var2, int var3) { - ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var4 == null) { - var4 = new ItemContainer(); - ItemContainer.itemContainers.put(var4, (long)var0); - } - - if (var4.ids.length <= var1) { - int[] var5 = new int[var1 + 1]; - int[] var6 = new int[var1 + 1]; - - int var7; - for (var7 = 0; var7 < var4.ids.length; ++var7) { - var5[var7] = var4.ids[var7]; - var6[var7] = var4.quantities[var7]; - } - - for (var7 = var4.ids.length; var7 < var1; ++var7) { - var5[var7] = -1; - var6[var7] = 0; - } - - var4.ids = var5; - var4.quantities = var6; - } - - var4.ids[var1] = var2; - var4.quantities[var1] = var3; + public final void update(Graphics var1) { + this.component.update(var1); } - @ObfuscatedName("p") + @ObfuscatedName("fq") @ObfuscatedSignature( - signature = "(Lhz;Ljava/lang/String;Ljava/lang/String;I)Lli;", - garbageValue = "-1768952191" + signature = "(B)V", + garbageValue = "-97" ) - @Export("SpriteBuffer_getIndexedSpriteByName") - public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { - int var3 = var0.getGroupId(var1); - int var4 = var0.getFileId(var3, var2); - IndexedSprite var5; - if (!HitSplatDefinition.method4586(var0, var3, var4)) { - var5 = null; - } else { - var5 = WorldMapDecoration.method327(); + static final void method861() { + if (FileSystem.ClanChat_inClanChat) { + if (InterfaceParent.clanChat != null) { + InterfaceParent.clanChat.sort(); + } + + DefaultsGroup.method5953(); + FileSystem.ClanChat_inClanChat = false; } - return var5; } - @ObfuscatedName("ey") + @ObfuscatedName("hf") @ObfuscatedSignature( - signature = "(I)Lld;", - garbageValue = "-228805350" + signature = "(IIB)I", + garbageValue = "-77" ) - @Export("getWorldMap") - static WorldMap getWorldMap() { - return GrandExchangeEvent.worldMap; + static int method864(int var0, int var1) { + int var2 = var1 - 334; + if (var2 < 0) { + var2 = 0; + } else if (var2 > 100) { + var2 = 100; + } + + int var3 = (Client.zoomWidth - Client.zoomHeight) * var2 / 100 + Client.zoomHeight; + return var0 * var3 / 256; } } diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java index a6bc4b1fa2..1d4be05597 100644 --- a/runescape-client/src/main/java/ChatChannel.java +++ b/runescape-client/src/main/java/ChatChannel.java @@ -4,24 +4,25 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ct") +@ObfuscatedName("cq") @Implements("ChatChannel") public class ChatChannel { - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "Lcz;" - ) - @Export("pcmPlayerProvider") - static class97 pcmPlayerProvider; @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -899235317 + ) + public static int field1289; + @ObfuscatedName("k") + public static String[] field1291; + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "[Lbs;" + signature = "[Lbn;" ) @Export("messages") Message[] messages; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 510013085 + intValue = -2026360781 ) @Export("count") int count; @@ -30,10 +31,10 @@ public class ChatChannel { this.messages = new Message[100]; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbs;", - garbageValue = "481031645" + signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)Lbn;", + garbageValue = "0" ) @Export("addMessage") Message addMessage(int var1, String var2, String var3, String var4) { @@ -61,95 +62,140 @@ public class ChatChannel { return var5; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(II)Lbs;", - garbageValue = "-2132499563" + signature = "(II)Lbn;", + garbageValue = "187354939" ) @Export("getMessage") Message getMessage(int var1) { return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "134905957" + signature = "(B)I", + garbageValue = "40" ) @Export("size") int size() { return this.count; } - @ObfuscatedName("f") + @ObfuscatedName("hj") @ObfuscatedSignature( - signature = "(II)Ljava/lang/String;", - garbageValue = "1959752215" + signature = "(IIZI)V", + garbageValue = "-1620265194" ) - static String method2269(int var0) { - return ""; - } + static final void method2302(int var0, int var1, boolean var2) { + if (!var2 || var0 != SecureRandomCallable.field530 || Language.field2359 != var1) { + SecureRandomCallable.field530 = var0; + Language.field2359 = var1; + Projectile.updateGameState(25); + class197.drawLoadingMessage("Loading - please wait.", true); + int var3 = Messages.baseX * 64; + int var4 = Language.baseY * 64; + Messages.baseX = (var0 - 6) * 8; + Language.baseY = (var1 - 6) * 8; + int var5 = Messages.baseX * 64 - var3; + int var6 = Language.baseY * 64 - var4; + var3 = Messages.baseX * 64; + var4 = Language.baseY * 64; + + int var7; + int var9; + int[] var10000; + for (var7 = 0; var7 < 32768; ++var7) { + NPC var8 = Client.npcs[var7]; + if (var8 != null) { + for (var9 = 0; var9 < 10; ++var9) { + var10000 = var8.pathX; + var10000[var9] -= var5; + var10000 = var8.pathY; + var10000[var9] -= var6; + } + + var8.x -= var5 * 128; + var8.y -= var6 * 128; + } + } + + for (var7 = 0; var7 < 2048; ++var7) { + Player var21 = Client.players[var7]; + if (var21 != null) { + for (var9 = 0; var9 < 10; ++var9) { + var10000 = var21.pathX; + var10000[var9] -= var5; + var10000 = var21.pathY; + var10000[var9] -= var6; + } + + var21.x -= var5 * 128; + var21.y -= var6 * 128; + } + } + + byte var20 = 0; + byte var18 = 104; + byte var22 = 1; + if (var5 < 0) { + var20 = 103; + var18 = -1; + var22 = -1; + } + + byte var10 = 0; + byte var11 = 104; + byte var12 = 1; + if (var6 < 0) { + var10 = 103; + var11 = -1; + var12 = -1; + } + + int var14; + for (int var13 = var20; var18 != var13; var13 += var22) { + for (var14 = var10; var11 != var14; var14 += var12) { + int var15 = var13 + var5; + int var16 = var6 + var14; + + for (int var17 = 0; var17 < 4; ++var17) { + if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { + Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; + } else { + Client.groundItems[var17][var13][var14] = null; + } + } + } + } + + for (PendingSpawn var19 = (PendingSpawn)Client.pendingSpawns.last(); var19 != null; var19 = (PendingSpawn)Client.pendingSpawns.previous()) { + var19.x -= var5; + var19.y -= var6; + if (var19.x < 0 || var19.y < 0 || var19.x >= 104 || var19.y >= 104) { + var19.remove(); + } + } + + if (Client.destinationX != 0) { + Client.destinationX -= var5; + Client.destinationY -= var6; + } + + Client.soundEffectCount = 0; + Client.isCameraLocked = false; + HitSplatDefinition.cameraX -= var5 << 7; + Actor.cameraZ -= var6 << 7; + PendingSpawn.oculusOrbFocalPointX -= var5 << 7; + Skeleton.oculusOrbFocalPointY -= var6 << 7; + Client.field704 = -1; + Client.graphicsObjects.clear(); + Client.projectiles.clear(); + + for (var14 = 0; var14 < 4; ++var14) { + Client.collisionMaps[var14].clear(); + } - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "-2136093779" - ) - public static void method2259(int var0, int var1) { - VarbitDefinition var2 = UserComparator9.method3319(var0); - int var3 = var2.baseVar; - int var4 = var2.startBit; - int var5 = var2.endBit; - int var6 = Varps.Varps_masks[var5 - var4]; - if (var1 < 0 || var1 > var6) { - var1 = 0; } - - var6 <<= var4; - Varps.Varps_main[var3] = Varps.Varps_main[var3] & ~var6 | var1 << var4 & var6; - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(B)Lbe;", - garbageValue = "90" - ) - @Export("worldListStart") - static World worldListStart() { - World.World_listCount = 0; - return Friend.getNextWorldListWorld(); - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "([BI)Lko;", - garbageValue = "65535" - ) - static Font method2270(byte[] var0) { - if (var0 == null) { - return null; - } else { - Font var1 = new Font(var0, class325.SpriteBuffer_xOffsets, class325.SpriteBuffer_yOffsets, UserComparator1.SpriteBuffer_spriteWidths, class325.SpriteBuffer_spriteHeights, class268.SpriteBuffer_spritePalette, class290.SpriteBuffer_pixels); - Message.method1223(); - return var1; - } - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - signature = "(Ldl;B)V", - garbageValue = "21" - ) - @Export("PcmStream_disable") - static final void PcmStream_disable(PcmStream var0) { - var0.active = false; - if (var0.sound != null) { - var0.sound.position = 0; - } - - for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { - PcmStream_disable(var1); - } - } } diff --git a/runescape-client/src/main/java/ClanChat.java b/runescape-client/src/main/java/ClanChat.java index f3d20beca2..924bfea967 100644 --- a/runescape-client/src/main/java/ClanChat.java +++ b/runescape-client/src/main/java/ClanChat.java @@ -4,82 +4,82 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jq") +@ObfuscatedName("jl") @Implements("ClanChat") public class ClanChat extends UserList { - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lll;" + signature = "Lmv;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Ljv;" + signature = "Ljh;" ) @Export("localUser") final Usernamed localUser; - @ObfuscatedName("d") + @ObfuscatedName("m") @Export("name") public String name; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("owner") public String owner; - @ObfuscatedName("o") + @ObfuscatedName("h") @Export("minKick") public byte minKick; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 208405129 + intValue = 1887951893 ) @Export("rank") public int rank; - @ObfuscatedName("k") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1142922895 + intValue = 404560335 ) - int field3614; + int field3628; @ObfuscatedSignature( - signature = "(Lll;Ljv;)V" + signature = "(Lmv;Ljh;)V" ) public ClanChat(LoginType var1, Usernamed var2) { super(100); this.name = null; this.owner = null; - this.field3614 = 1; + this.field3628 = 1; this.loginType = var1; this.localUser = var2; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)Ljy;", - garbageValue = "68" + signature = "(S)Ljk;", + garbageValue = "30683" ) @Export("newInstance") User newInstance() { return new ClanMate(); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IB)[Ljy;", - garbageValue = "32" + signature = "(IB)[Ljk;", + garbageValue = "19" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new ClanMate[var1]; } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "505839882" + signature = "(Ljava/lang/String;B)V", + garbageValue = "-26" ) @Export("readName") final void readName(String var1) { - String var3 = CollisionMap.base37DecodeLong(class226.method4101(var1)); + String var3 = WorldMapArea.base37DecodeLong(VerticalAlignment.method4424(var1)); if (var3 == null) { var3 = ""; } @@ -87,14 +87,14 @@ public class ClanChat extends UserList { this.name = var3; } - @ObfuscatedName("x") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "1040645085" + signature = "(Ljava/lang/String;B)V", + garbageValue = "-11" ) @Export("setOwner") final void setOwner(String var1) { - String var3 = CollisionMap.base37DecodeLong(class226.method4101(var1)); + String var3 = WorldMapArea.base37DecodeLong(VerticalAlignment.method4424(var1)); if (var3 == null) { var3 = ""; } @@ -102,39 +102,66 @@ public class ClanChat extends UserList { this.owner = var3; } - @ObfuscatedName("cg") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkq;I)V", - garbageValue = "171385473" + signature = "(Lkp;I)V", + garbageValue = "-866668156" ) @Export("readUpdate") public final void readUpdate(Buffer var1) { this.setOwner(var1.readStringCp1252NullTerminated()); long var2 = var1.readLong(); - this.readName(WorldMapIcon_0.method201(var2)); + long var5 = var2; + String var4; + int var7; + if (var2 > 0L && var2 < 6582952005840035281L) { + if (0L == var2 % 37L) { + var4 = null; + } else { + var7 = 0; + + for (long var13 = var2; var13 != 0L; var13 /= 37L) { + ++var7; + } + + StringBuilder var15 = new StringBuilder(var7); + + while (0L != var5) { + long var11 = var5; + var5 /= 37L; + var15.append(class289.base37Table[(int)(var11 - var5 * 37L)]); + } + + var4 = var15.reverse().toString(); + } + } else { + var4 = null; + } + + this.readName(var4); this.minKick = var1.readByte(); - int var4 = var1.readUnsignedByte(); - if (var4 != 255) { + var7 = var1.readUnsignedByte(); + if (var7 != 255) { this.clear(); - for (int var5 = 0; var5 < var4; ++var5) { - ClanMate var6 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); - int var7 = var1.readUnsignedShort(); - var6.set(var7, ++this.field3614 - 1); - var6.rank = var1.readByte(); + for (int var8 = 0; var8 < var7; ++var8) { + ClanMate var9 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); + int var10 = var1.readUnsignedShort(); + var9.set(var10, ++this.field3628 - 1); + var9.rank = var1.readByte(); var1.readStringCp1252NullTerminated(); - this.isLocalPlayer(var6); + this.isLocalPlayer(var9); } } } - @ObfuscatedName("ct") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Lkq;I)V", - garbageValue = "-1031148737" + signature = "(Lkp;I)V", + garbageValue = "1239861248" ) - public final void method5262(Buffer var1) { + public final void method5296(Buffer var1) { Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); int var3 = var1.readUnsignedShort(); byte var4 = var1.readByte(); @@ -164,17 +191,17 @@ public class ClanChat extends UserList { var6 = (ClanMate)this.addLastNoPreviousUsername(var2); } - var6.set(var3, ++this.field3614 - 1); + var6.set(var3, ++this.field3628 - 1); var6.rank = var4; this.isLocalPlayer(var6); } } - @ObfuscatedName("cr") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1039852282" + signature = "(B)V", + garbageValue = "58" ) @Export("clearFriends") public final void clearFriends() { @@ -184,10 +211,10 @@ public class ClanChat extends UserList { } - @ObfuscatedName("cy") + @ObfuscatedName("cb") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "32" + signature = "(I)V", + garbageValue = "-275876635" ) @Export("invalidateIgnoreds") public final void invalidateIgnoreds() { @@ -197,10 +224,10 @@ public class ClanChat extends UserList { } - @ObfuscatedName("cz") + @ObfuscatedName("cf") @ObfuscatedSignature( - signature = "(Ljd;I)V", - garbageValue = "667645943" + signature = "(Ljt;I)V", + garbageValue = "1790054092" ) @Export("isLocalPlayer") final void isLocalPlayer(ClanMate var1) { @@ -209,4 +236,49 @@ public class ClanChat extends UserList { } } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(Lhn;I[B[BI)V", + garbageValue = "1586924151" + ) + @Export("Widget_setKey") + static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { + if (var0.field2702 == null) { + if (var2 == null) { + return; + } + + var0.field2702 = new byte[11][]; + var0.field2648 = new byte[11][]; + var0.field2649 = new int[11]; + var0.field2560 = new int[11]; + } + + var0.field2702[var1] = var2; + if (var2 != null) { + var0.field2646 = true; + } else { + var0.field2646 = false; + + for (int var4 = 0; var4 < var0.field2702.length; ++var4) { + if (var0.field2702[var4] != null) { + var0.field2646 = true; + break; + } + } + } + + var0.field2648[var1] = var3; + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "(CI)Z", + garbageValue = "520942545" + ) + @Export("isCharAlphabetic") + public static boolean isCharAlphabetic(char var0) { + return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; + } } diff --git a/runescape-client/src/main/java/ClanMate.java b/runescape-client/src/main/java/ClanMate.java index a180ebb57b..5ae704c244 100644 --- a/runescape-client/src/main/java/ClanMate.java +++ b/runescape-client/src/main/java/ClanMate.java @@ -1,31 +1,20 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jd") +@ObfuscatedName("jt") @Implements("ClanMate") public class ClanMate extends Buddy { - @ObfuscatedName("ex") - @ObfuscatedGetter( - intValue = -1283772433 - ) - static int field3566; - @ObfuscatedName("fm") - @ObfuscatedGetter( - intValue = 1387790873 - ) - static int field3567; - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Ljf;" + signature = "Lju;" ) @Export("friend") TriBool friend; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Ljf;" + signature = "Lju;" ) @Export("ignored") TriBool ignored; @@ -35,20 +24,20 @@ public class ClanMate extends Buddy { this.ignored = TriBool.TriBool_unknown; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1521819508" + garbageValue = "-526388551" ) @Export("clearIsFriend") void clearIsFriend() { this.friend = TriBool.TriBool_unknown; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "2007555671" + garbageValue = "2130139941" ) @Export("isFriend") public final boolean isFriend() { @@ -59,30 +48,30 @@ public class ClanMate extends Buddy { return this.friend == TriBool.TriBool_true; } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1569748469" + garbageValue = "-2012869833" ) @Export("fillIsFriend") void fillIsFriend() { - this.friend = Message.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.friend = KeyHandler.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "3103" + signature = "(I)V", + garbageValue = "1620040890" ) @Export("clearIsIgnored") void clearIsIgnored() { this.ignored = TriBool.TriBool_unknown; } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-732818208" + signature = "(B)Z", + garbageValue = "-84" ) @Export("isIgnored") public final boolean isIgnored() { @@ -93,40 +82,74 @@ public class ClanMate extends Buddy { return this.ignored == TriBool.TriBool_true; } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1631625166" + garbageValue = "-749177789" ) @Export("fillIsIgnored") void fillIsIgnored() { - this.ignored = Message.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.ignored = KeyHandler.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("jp") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIIIII)V", - garbageValue = "2022495737" + signature = "(Ljava/lang/CharSequence;IZI)Z", + garbageValue = "-1733263063" ) - @Export("drawScrollBar") - static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { - class60.scrollBarSprites[0].drawAt(var0, var1); - class60.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field691); - int var5 = var3 * (var3 - 32) / var4; - if (var5 < 8) { - var5 = 8; - } + static boolean method5073(CharSequence var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { + boolean var3 = false; + boolean var4 = false; + int var5 = 0; + int var6 = var0.length(); - int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field692); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field694); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field694); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field694); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field694); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field693); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field693); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var5 + var6 + var1 + 15, 16, Client.field693); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field693); + for (int var7 = 0; var7 < var6; ++var7) { + char var8 = var0.charAt(var7); + if (var7 == 0) { + if (var8 == '-') { + var3 = true; + continue; + } + + if (var8 == '+') { + continue; + } + } + + int var10; + if (var8 >= '0' && var8 <= '9') { + var10 = var8 - '0'; + } else if (var8 >= 'A' && var8 <= 'Z') { + var10 = var8 - '7'; + } else { + if (var8 < 'a' || var8 > 'z') { + return false; + } + + var10 = var8 - 'W'; + } + + if (var10 >= var1) { + return false; + } + + if (var3) { + var10 = -var10; + } + + int var9 = var5 * var1 + var10; + if (var9 / var1 != var5) { + return false; + } + + var5 = var9; + var4 = true; + } + + return var4; + } else { + throw new IllegalArgumentException("" + var1); + } } } diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index a1a6af5193..b4487ff86a 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -1,8 +1,11 @@ +import java.io.File; import java.io.IOException; +import java.io.RandomAccessFile; import java.net.Socket; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedHashMap; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; @@ -13,1261 +16,1279 @@ import netscape.javascript.JSObject; @Implements("Client") @ObfuscatedName("client") public final class Client extends GameShell implements Usernamed { - @ObfuscatedName("mu") + @ObfuscatedName("mg") @ObfuscatedSignature( - signature = "Lha;" + signature = "Lhn;" ) @Export("clickedWidget") static Widget clickedWidget; - @ObfuscatedName("ov") + @ObfuscatedName("oh") @ObfuscatedGetter( - intValue = -880923057 - ) - static int field832; - @ObfuscatedName("og") - @ObfuscatedGetter( - intValue = -405077157 + intValue = -2146709593 ) @Export("rootWidgetCount") static int rootWidgetCount; - @ObfuscatedName("oa") + @ObfuscatedName("of") @ObfuscatedGetter( - longValue = 6996967877064872553L + intValue = -1865852327 ) - static long field841; - @ObfuscatedName("os") - static boolean[] field833; - @ObfuscatedName("ok") - static boolean[] field834; - @ObfuscatedName("on") - static boolean[] field835; - @ObfuscatedName("ni") - static boolean field809; - @ObfuscatedName("nc") + static int field850; + @ObfuscatedName("od") @ObfuscatedGetter( - intValue = -1405704491 + longValue = 3639588590521619509L + ) + static long field859; + @ObfuscatedName("qa") + static boolean field881; + @ObfuscatedName("ov") + static boolean[] field851; + @ObfuscatedName("oo") + static boolean[] field853; + @ObfuscatedName("ni") + static boolean field827; + @ObfuscatedName("oc") + static boolean[] field852; + @ObfuscatedName("nd") + static boolean field824; + @ObfuscatedName("nh") + @ObfuscatedGetter( + intValue = 1483646797 ) @Export("cycleCntr") static int cycleCntr; - @ObfuscatedName("ot") + @ObfuscatedName("oz") @Export("isResizable") static boolean isResizable; - @ObfuscatedName("nt") + @ObfuscatedName("nu") @ObfuscatedGetter( - intValue = -1225978651 + intValue = 1169531803 ) - static int field711; - @ObfuscatedName("sc") + static int field839; + @ObfuscatedName("sa") @ObfuscatedGetter( - intValue = -1513063055 + intValue = 1909140369 ) - public static int field749; - @ObfuscatedName("nh") - static boolean field806; - @ObfuscatedName("qt") - static boolean field767; - @ObfuscatedName("mm") + public static int field888; + @ObfuscatedName("mi") @ObfuscatedGetter( - intValue = -733462179 + intValue = 1522690023 ) @Export("widgetClickX") static int widgetClickX; - @ObfuscatedName("mx") + @ObfuscatedName("mr") @ObfuscatedGetter( - intValue = 1296654555 + intValue = 708609409 ) @Export("widgetClickY") static int widgetClickY; - @ObfuscatedName("no") + @ObfuscatedName("nz") @ObfuscatedGetter( - intValue = 265525087 + intValue = 1648334173 ) - static int field807; - @ObfuscatedName("oo") + static int field919; + @ObfuscatedName("mw") @ObfuscatedSignature( - signature = "Lle;" - ) - @Export("widgetClickMasks") - static NodeHashTable widgetClickMasks; - @ObfuscatedName("mo") - @ObfuscatedSignature( - signature = "Lha;" + signature = "Lhn;" ) @Export("clickedWidgetParent") static Widget clickedWidgetParent; - @ObfuscatedName("oz") - @Export("rootWidgetWidths") - static int[] rootWidgetWidths; - @ObfuscatedName("ma") - @ObfuscatedSignature( - signature = "Lle;" - ) - @Export("interfaceParents") - static NodeHashTable interfaceParents; - @ObfuscatedName("ow") - @Export("rootWidgetXs") - static int[] rootWidgetXs; - @ObfuscatedName("nm") + @ObfuscatedName("on") @ObfuscatedGetter( - intValue = 1203464941 - ) - static int field808; - @ObfuscatedName("mc") - @ObfuscatedSignature( - signature = "Lha;" - ) - @Export("viewportWidget") - static Widget viewportWidget; - @ObfuscatedName("ou") - @ObfuscatedGetter( - intValue = -2063650301 + intValue = 1447905711 ) @Export("gameDrawingMode") static int gameDrawingMode; - @ObfuscatedName("oq") - @Export("rootWidgetHeights") - static int[] rootWidgetHeights; - @ObfuscatedName("mt") + @ObfuscatedName("nf") @ObfuscatedGetter( - intValue = -1570996335 + intValue = -393886603 ) - @Export("staffModLevel") - public static int staffModLevel; - @ObfuscatedName("ts") - @ObfuscatedSignature( - signature = "Lba;" - ) - static final class65 field902; + static int field826; @ObfuscatedName("oi") + @Export("rootWidgetXs") + static int[] rootWidgetXs; + @ObfuscatedName("oj") + @Export("rootWidgetWidths") + static int[] rootWidgetWidths; + @ObfuscatedName("mq") + @ObfuscatedSignature( + signature = "Lhn;" + ) + @Export("viewportWidget") + static Widget viewportWidget; + @ObfuscatedName("os") @Export("rootWidgetYs") static int[] rootWidgetYs; - @ObfuscatedName("ql") + @ObfuscatedName("mk") @ObfuscatedGetter( - intValue = -731795947 + intValue = -1785096625 ) - @Export("currentTrackGroupId") - static int currentTrackGroupId; - @ObfuscatedName("op") + @Export("staffModLevel") + static int staffModLevel; + @ObfuscatedName("ox") + @Export("rootWidgetHeights") + static int[] rootWidgetHeights; + @ObfuscatedName("tc") @ObfuscatedSignature( - signature = "Ljs;" + signature = "Lbm;" ) - @Export("scriptEvents") - static NodeDeque scriptEvents; - @ObfuscatedName("pj") + static final class65 field809; + @ObfuscatedName("oq") @ObfuscatedGetter( - intValue = 1081160319 - ) - @Export("destinationX") - static int destinationX; - @ObfuscatedName("ng") - @ObfuscatedGetter( - intValue = 1476822695 - ) - static int field882; - @ObfuscatedName("qc") - @ObfuscatedGetter( - intValue = 1145130111 - ) - @Export("musicVolume") - static int musicVolume; - @ObfuscatedName("pd") - @ObfuscatedGetter( - intValue = 810038281 - ) - @Export("destinationY") - static int destinationY; - @ObfuscatedName("nk") - @ObfuscatedGetter( - intValue = -1107460421 - ) - static int field811; - @ObfuscatedName("tr") - static int[] field903; - @ObfuscatedName("tb") - static int[] field730; - @ObfuscatedName("ne") - static int[] field814; - @ObfuscatedName("nv") - @ObfuscatedGetter( - intValue = 1654772915 - ) - static int field648; - @ObfuscatedName("qe") - @ObfuscatedGetter( - intValue = -1501062623 - ) - @Export("minimapState") - static int minimapState; - @ObfuscatedName("nj") - @Export("isDraggingWidget") - static boolean isDraggingWidget; - @ObfuscatedName("mi") - @ObfuscatedGetter( - intValue = -883981411 - ) - @Export("runEnergy") - static int runEnergy; - @ObfuscatedName("mq") - @ObfuscatedGetter( - intValue = 601999387 - ) - @Export("weight") - static int weight; - @ObfuscatedName("sv") - @ObfuscatedGetter( - intValue = -1907588415 - ) - static int field893; - @ObfuscatedName("rh") - @ObfuscatedSignature( - signature = "Lhh;" - ) - @Export("playerAppearance") - static PlayerAppearance playerAppearance; - @ObfuscatedName("qh") - @ObfuscatedGetter( - intValue = 1772801815 - ) - @Export("areaSoundEffectVolume") - static int areaSoundEffectVolume; - @ObfuscatedName("sm") - @ObfuscatedGetter( - intValue = -308750649 - ) - static int field894; - @ObfuscatedName("mw") - @ObfuscatedSignature( - signature = "Lha;" - ) - @Export("draggedOnWidget") - static Widget draggedOnWidget; - @ObfuscatedName("om") - @ObfuscatedGetter( - intValue = -414027891 + intValue = 1929690709 ) @Export("mouseWheelRotation") static int mouseWheelRotation; - @ObfuscatedName("nq") - @ObfuscatedGetter( - intValue = -1985880681 - ) - static int field825; - @ObfuscatedName("qk") - @ObfuscatedGetter( - intValue = -1182860481 - ) - @Export("soundEffectVolume") - static int soundEffectVolume; - @ObfuscatedName("qp") - @Export("isCameraLocked") - static boolean isCameraLocked; - @ObfuscatedName("sk") - @Export("archiveLoaders") - static ArrayList archiveLoaders; - @ObfuscatedName("qx") - @ObfuscatedGetter( - intValue = 413353821 - ) - @Export("soundEffectCount") - static int soundEffectCount; - @ObfuscatedName("np") - @Export("changedSkills") - static int[] changedSkills; - @ObfuscatedName("qm") - @Export("soundEffectIds") - static int[] soundEffectIds; - @ObfuscatedName("sx") - @ObfuscatedGetter( - intValue = 83394787 - ) - @Export("archiveLoadersDone") - static int archiveLoadersDone; - @ObfuscatedName("rj") - static boolean[] field779; - @ObfuscatedName("nu") - @ObfuscatedGetter( - intValue = 1316268697 - ) - @Export("changedSkillsCount") - static int changedSkillsCount; - @ObfuscatedName("pp") - @ObfuscatedGetter( - intValue = -1130941139 - ) - static int field853; - @ObfuscatedName("qj") - @Export("queuedSoundEffectLoops") - static int[] queuedSoundEffectLoops; - @ObfuscatedName("qz") - @Export("queuedSoundEffectDelays") - static int[] queuedSoundEffectDelays; - @ObfuscatedName("mn") - @ObfuscatedGetter( - intValue = -1572396161 - ) - @Export("chatEffects") - static int chatEffects; - @ObfuscatedName("qf") + @ObfuscatedName("oe") @ObfuscatedSignature( - signature = "[Lcl;" + signature = "Lln;" ) - @Export("soundEffects") - static SoundEffect[] soundEffects; - @ObfuscatedName("mr") + @Export("widgetClickMasks") + static NodeHashTable widgetClickMasks; + @ObfuscatedName("nw") @ObfuscatedGetter( - intValue = 2013132005 + intValue = 1341246229 ) - static int field901; - @ObfuscatedName("ps") + static int field864; + @ObfuscatedName("nn") @ObfuscatedGetter( - longValue = 5997092609949214729L + intValue = 1361957455 ) - static long field852; - @ObfuscatedName("qw") - @Export("soundLocations") - static int[] soundLocations; - @ObfuscatedName("mv") + static int field829; + @ObfuscatedName("ot") @ObfuscatedSignature( - signature = "Lha;" + signature = "Ljw;" ) - @Export("meslayerContinueWidget") - static Widget meslayerContinueWidget; - @ObfuscatedName("si") - @ObfuscatedSignature( - signature = "[Ld;" - ) - @Export("grandExchangeOffers") - static GrandExchangeOffer[] grandExchangeOffers; - @ObfuscatedName("na") - @ObfuscatedGetter( - intValue = 2032426333 - ) - static int field823; - @ObfuscatedName("mh") - @ObfuscatedGetter( - intValue = 48387723 - ) - @Export("followerIndex") - static int followerIndex; - @ObfuscatedName("pz") - @ObfuscatedGetter( - intValue = -1325828335 - ) - @Export("mapIconCount") - static int mapIconCount; - @ObfuscatedName("ny") - @ObfuscatedGetter( - intValue = -2121721263 - ) - static int field862; - @ObfuscatedName("sq") - @ObfuscatedSignature( - signature = "Lly;" - ) - @Export("platformInfoProvider") - static PlatformInfoProvider platformInfoProvider; - @ObfuscatedName("rx") - static short field879; - @ObfuscatedName("rt") - static short field880; - @ObfuscatedName("rl") - static short field804; - @ObfuscatedName("pf") - @Export("mapIconXs") - static int[] mapIconXs; - @ObfuscatedName("ri") - static short field886; - @ObfuscatedName("rn") - static short field884; - @ObfuscatedName("rk") - @ObfuscatedGetter( - intValue = -1174260245 - ) - @Export("viewportZoom") - static int viewportZoom; - @ObfuscatedName("rd") - static short field796; - @ObfuscatedName("rv") - @ObfuscatedGetter( - intValue = -1637393507 - ) - @Export("viewportWidth") - static int viewportWidth; - @ObfuscatedName("py") - @Export("mapIconYs") - static int[] mapIconYs; + @Export("scriptEvents") + static NodeDeque scriptEvents; @ObfuscatedName("px") - @ObfuscatedSignature( - signature = "[Lls;" - ) - @Export("mapIcons") - static Sprite[] mapIcons; - @ObfuscatedName("rg") @ObfuscatedGetter( - intValue = 312765867 + intValue = 1776210233 ) - @Export("viewportHeight") - static int viewportHeight; - @ObfuscatedName("nr") - @Export("changedItemContainers") - static int[] changedItemContainers; - @ObfuscatedName("ns") + @Export("destinationX") + static int destinationX; + @ObfuscatedName("pl") @ObfuscatedGetter( - intValue = -2138189623 + intValue = 1779344353 ) - static int field701; - @ObfuscatedName("rz") + @Export("destinationY") + static int destinationY; + @ObfuscatedName("tk") + static int[] field920; + @ObfuscatedName("tn") + static int[] field921; + @ObfuscatedName("pn") @ObfuscatedGetter( - intValue = 1559591419 - ) - @Export("viewportOffsetX") - static int viewportOffsetX; - @ObfuscatedName("ru") - @ObfuscatedGetter( - intValue = -1657218597 - ) - @Export("viewportOffsetY") - static int viewportOffsetY; - @ObfuscatedName("ra") - @ObfuscatedGetter( - intValue = -1958895977 - ) - static int field873; - @ObfuscatedName("pm") - @ObfuscatedGetter( - intValue = -226076741 + intValue = -391943327 ) @Export("publicChatMode") static int publicChatMode; - @ObfuscatedName("pk") + @ObfuscatedName("na") + @Export("isDraggingWidget") + static boolean isDraggingWidget; + @ObfuscatedName("py") @ObfuscatedGetter( - intValue = 765110439 + intValue = -1040328597 ) @Export("tradeChatMode") static int tradeChatMode; - @ObfuscatedName("pr") - @ObfuscatedGetter( - intValue = -255532007 - ) - static int field849; - @ObfuscatedName("nz") - @ObfuscatedGetter( - intValue = -2038569335 - ) - static int field860; - @ObfuscatedName("sr") - @ObfuscatedGetter( - intValue = 135931079 - ) - static int field629; - @ObfuscatedName("pq") - static int[] field851; - @ObfuscatedName("po") - static long[] field707; - @ObfuscatedName("oy") + @ObfuscatedName("sl") @ObfuscatedSignature( - signature = "Ljs;" + signature = "[Lm;" ) - static NodeDeque field865; - @ObfuscatedName("pa") - static int[] field850; - @ObfuscatedName("of") + @Export("grandExchangeOffers") + static GrandExchangeOffer[] grandExchangeOffers; + @ObfuscatedName("st") + @Export("archiveLoaders") + static ArrayList archiveLoaders; + @ObfuscatedName("ss") + @ObfuscatedGetter( + intValue = 2033282957 + ) + @Export("archiveLoadersDone") + static int archiveLoadersDone; + @ObfuscatedName("mf") + @ObfuscatedGetter( + intValue = -89243397 + ) + @Export("runEnergy") + static int runEnergy; + @ObfuscatedName("qg") + @ObfuscatedGetter( + intValue = -1907233593 + ) + @Export("currentTrackGroupId") + static int currentTrackGroupId; + @ObfuscatedName("ma") + @ObfuscatedGetter( + intValue = 1843511131 + ) + @Export("weight") + static int weight; + @ObfuscatedName("qu") + @ObfuscatedGetter( + intValue = -1100066023 + ) + @Export("musicVolume") + static int musicVolume; + @ObfuscatedName("nt") + @ObfuscatedGetter( + intValue = -1399282537 + ) + static int field841; + @ObfuscatedName("rk") + static boolean[] field775; + @ObfuscatedName("qb") + @ObfuscatedGetter( + intValue = 569870541 + ) + @Export("areaSoundEffectVolume") + static int areaSoundEffectVolume; + @ObfuscatedName("ry") + static int[] field892; + @ObfuscatedName("ru") + static int[] field699; + @ObfuscatedName("sh") + @ObfuscatedGetter( + intValue = 1166836543 + ) + static int field910; + @ObfuscatedName("rx") + static int[] field894; + @ObfuscatedName("mc") @ObfuscatedSignature( - signature = "Ljs;" + signature = "Lhn;" ) - static NodeDeque field883; - @ObfuscatedName("rc") - static int[] field876; - @ObfuscatedName("rw") - static int[] field875; - @ObfuscatedName("re") - static int[] field877; + @Export("draggedOnWidget") + static Widget draggedOnWidget; + @ObfuscatedName("rl") + @ObfuscatedSignature( + signature = "Lhp;" + ) + @Export("playerAppearance") + static PlayerAppearance playerAppearance; @ObfuscatedName("ro") - @Export("zoomWidth") - static short zoomWidth; + static int[] field895; @ObfuscatedName("mb") + @ObfuscatedSignature( + signature = "Lhn;" + ) + @Export("meslayerContinueWidget") + static Widget meslayerContinueWidget; + @ObfuscatedName("sw") + @ObfuscatedGetter( + intValue = -1075965475 + ) + static int field911; + @ObfuscatedName("nk") + static int[] field832; + @ObfuscatedName("ng") + @Export("changedItemContainers") + static int[] changedItemContainers; + @ObfuscatedName("nm") + @ObfuscatedGetter( + intValue = 584378815 + ) + static int field823; + @ObfuscatedName("nv") + @ObfuscatedGetter( + intValue = 1832354705 + ) + static int field833; + @ObfuscatedName("nr") + @ObfuscatedGetter( + intValue = 1067328579 + ) + static int field835; + @ObfuscatedName("qh") + @ObfuscatedGetter( + intValue = 1605243509 + ) + @Export("soundEffectCount") + static int soundEffectCount; + @ObfuscatedName("qi") + @Export("soundEffectIds") + static int[] soundEffectIds; + @ObfuscatedName("qc") + @Export("queuedSoundEffectLoops") + static int[] queuedSoundEffectLoops; + @ObfuscatedName("qd") + @Export("queuedSoundEffectDelays") + static int[] queuedSoundEffectDelays; + @ObfuscatedName("si") + @ObfuscatedSignature( + signature = "Llz;" + ) + @Export("platformInfoProvider") + static PlatformInfoProvider platformInfoProvider; + @ObfuscatedName("qy") + @ObfuscatedSignature( + signature = "[Lcs;" + ) + @Export("soundEffects") + static SoundEffect[] soundEffects; + @ObfuscatedName("qe") + @ObfuscatedGetter( + intValue = -1155592801 + ) + @Export("minimapState") + static int minimapState; + @ObfuscatedName("qf") + @Export("soundLocations") + static int[] soundLocations; + @ObfuscatedName("qs") + @Export("isCameraLocked") + static boolean isCameraLocked; + @ObfuscatedName("pj") + @ObfuscatedGetter( + intValue = 1175842115 + ) + static int field704; + @ObfuscatedName("pp") + @ObfuscatedGetter( + longValue = -1084323639285145485L + ) + static long field702; + @ObfuscatedName("qt") + @ObfuscatedGetter( + intValue = 1226020911 + ) + @Export("soundEffectVolume") + static int soundEffectVolume; + @ObfuscatedName("pu") + @ObfuscatedGetter( + intValue = -1024835233 + ) + @Export("mapIconCount") + static int mapIconCount; + @ObfuscatedName("pw") + @Export("mapIconXs") + static int[] mapIconXs; + @ObfuscatedName("pt") + @Export("mapIconYs") + static int[] mapIconYs; + @ObfuscatedName("sm") + @ObfuscatedGetter( + intValue = -1315339885 + ) + static int field813; + @ObfuscatedName("pg") + @ObfuscatedSignature( + signature = "[Llt;" + ) + @Export("mapIcons") + static Sprite[] mapIcons; + @ObfuscatedName("my") + @ObfuscatedGetter( + intValue = 712982519 + ) + @Export("chatEffects") + static int chatEffects; + @ObfuscatedName("nb") + @Export("changedSkills") + static int[] changedSkills; + @ObfuscatedName("rd") + static short field908; + @ObfuscatedName("np") + @ObfuscatedGetter( + intValue = 539828499 + ) + @Export("changedSkillsCount") + static int changedSkillsCount; + @ObfuscatedName("re") + static short field897; + @ObfuscatedName("rv") + static short field819; + @ObfuscatedName("mp") + @ObfuscatedGetter( + intValue = 1687250363 + ) + static int field811; + @ObfuscatedName("rr") + static short field903; + @ObfuscatedName("rj") + static short field673; + @ObfuscatedName("ri") + @ObfuscatedGetter( + intValue = -589414587 + ) + @Export("viewportZoom") + static int viewportZoom; + @ObfuscatedName("rf") + static short field900; + @ObfuscatedName("rz") + @ObfuscatedGetter( + intValue = 1429063259 + ) + @Export("viewportWidth") + static int viewportWidth; + @ObfuscatedName("ra") + @ObfuscatedGetter( + intValue = 846238467 + ) + @Export("viewportHeight") + static int viewportHeight; + @ObfuscatedName("ne") + @ObfuscatedGetter( + intValue = -114993345 + ) + static int field842; + @ObfuscatedName("mz") + @ObfuscatedGetter( + intValue = 1973962691 + ) + @Export("followerIndex") + static int followerIndex; + @ObfuscatedName("rt") + @ObfuscatedGetter( + intValue = -1457697577 + ) + @Export("viewportOffsetX") + static int viewportOffsetX; + @ObfuscatedName("rw") + @ObfuscatedGetter( + intValue = 1641050699 + ) + @Export("viewportOffsetY") + static int viewportOffsetY; + @ObfuscatedName("pz") + @ObfuscatedGetter( + intValue = 1835135495 + ) + static int field762; + @ObfuscatedName("pf") + static long[] field865; + @ObfuscatedName("ml") @Export("playerMod") static boolean playerMod; - @ObfuscatedName("rb") + @ObfuscatedName("nq") + @ObfuscatedGetter( + intValue = -2044772591 + ) + static int field795; + @ObfuscatedName("pm") + static int[] field869; + @ObfuscatedName("pr") + static int[] field868; + @ObfuscatedName("om") + @ObfuscatedSignature( + signature = "Ljw;" + ) + static NodeDeque field846; + @ObfuscatedName("ol") + @ObfuscatedSignature( + signature = "Ljw;" + ) + static NodeDeque field847; + @ObfuscatedName("pi") + @ObfuscatedGetter( + intValue = -1435172975 + ) + static int field715; + @ObfuscatedName("rq") @Export("zoomHeight") static short zoomHeight; - @ObfuscatedName("ry") - static int[] field878; + @ObfuscatedName("rs") + @Export("zoomWidth") + static short zoomWidth; + @ObfuscatedName("mu") + @ObfuscatedGetter( + intValue = 206170513 + ) + static int field808; @ObfuscatedName("ms") @ObfuscatedGetter( - intValue = 171617061 + intValue = 1466636235 ) - static int field790; - @ObfuscatedName("ph") + static int field664; + @ObfuscatedName("ny") @ObfuscatedGetter( - intValue = 1104581319 - ) - static int field682; - @ObfuscatedName("ml") - @ObfuscatedGetter( - intValue = 6075793 - ) - static int field791; - @ObfuscatedName("nw") - @ObfuscatedGetter( - intValue = 1430052583 + intValue = -2045672721 ) @Export("chatCycle") static int chatCycle; - @ObfuscatedName("pc") - static String field846; - @ObfuscatedName("sw") + @ObfuscatedName("pd") + static int[] field861; + @ObfuscatedName("pa") + static String field780; + @ObfuscatedName("sb") @ObfuscatedSignature( - signature = "Lbb;" + signature = "Lbd;" ) @Export("GrandExchangeEvents_worldComparator") static GrandExchangeOfferOwnWorldComparator GrandExchangeEvents_worldComparator; - @ObfuscatedName("pe") - static int[] field864; @ObfuscatedName("w") @ObfuscatedSignature( - signature = "[Lfp;" + signature = "[Lfv;" ) @Export("collisionMaps") static CollisionMap[] collisionMaps; - @ObfuscatedName("ab") - static boolean field895; - @ObfuscatedName("bj") + @ObfuscatedName("ah") + static boolean field922; + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = 860985583 + intValue = 1070916763 ) @Export("worldId") public static int worldId; - @ObfuscatedName("bg") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = 192625081 + intValue = -1124780897 ) @Export("worldProperties") static int worldProperties; @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = -1621867791 + intValue = 762805581 ) @Export("gameBuild") static int gameBuild; - @ObfuscatedName("bx") + @ObfuscatedName("bp") @Export("isMembersWorld") public static boolean isMembersWorld; - @ObfuscatedName("bc") + @ObfuscatedName("bl") @Export("isLowDetail") static boolean isLowDetail; - @ObfuscatedName("bs") + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = 285214129 + intValue = 2121027027 + ) + static int field672; + @ObfuscatedName("bn") + @ObfuscatedGetter( + intValue = 1947983405 ) @Export("clientType") static int clientType; - @ObfuscatedName("ba") + @ObfuscatedName("bm") @Export("onMobile") static boolean onMobile; - @ObfuscatedName("bn") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = -1978456723 + intValue = -873301681 ) @Export("gameState") static int gameState; - @ObfuscatedName("cf") + @ObfuscatedName("cd") @Export("isLoading") static boolean isLoading; - @ObfuscatedName("cs") + @ObfuscatedName("ct") @ObfuscatedGetter( - intValue = 1942837123 + intValue = 996993213 ) @Export("cycle") static int cycle; - @ObfuscatedName("ch") + @ObfuscatedName("cb") @ObfuscatedGetter( - longValue = 9167305382877438331L + longValue = -3748954884429607225L ) @Export("mouseLastLastPressedTimeMillis") static long mouseLastLastPressedTimeMillis; - @ObfuscatedName("cn") + @ObfuscatedName("cm") @ObfuscatedGetter( - intValue = 785556091 + intValue = -241635753 ) - static int field642; - @ObfuscatedName("cx") + static int field657; + @ObfuscatedName("cz") @ObfuscatedGetter( - intValue = -284349487 + intValue = 235164627 ) - static int field681; - @ObfuscatedName("ck") + static int field912; + @ObfuscatedName("cu") @ObfuscatedGetter( - longValue = 2095221084394078139L + longValue = -8326458938814166675L ) - static long field728; - @ObfuscatedName("ce") + static long field745; + @ObfuscatedName("cy") @Export("hadFocus") static boolean hadFocus; - @ObfuscatedName("cu") + @ObfuscatedName("ce") @Export("displayFps") static boolean displayFps; - @ObfuscatedName("cg") + @ObfuscatedName("cw") @ObfuscatedGetter( - intValue = -2127828035 + intValue = -1706106531 ) @Export("rebootTimer") static int rebootTimer; - @ObfuscatedName("ct") + @ObfuscatedName("cq") @ObfuscatedGetter( - intValue = 1251218153 + intValue = 2120122053 ) @Export("hintArrowType") static int hintArrowType; - @ObfuscatedName("cr") + @ObfuscatedName("ci") @ObfuscatedGetter( - intValue = -643479427 + intValue = -1436156017 ) @Export("hintArrowNpcIndex") static int hintArrowNpcIndex; - @ObfuscatedName("cy") + @ObfuscatedName("ca") @ObfuscatedGetter( - intValue = -2133905465 + intValue = 1200698835 ) @Export("hintArrowPlayerIndex") static int hintArrowPlayerIndex; - @ObfuscatedName("cz") + @ObfuscatedName("cc") @ObfuscatedGetter( - intValue = 1969776841 + intValue = -59894547 ) @Export("hintArrowX") static int hintArrowX; - @ObfuscatedName("cm") + @ObfuscatedName("ch") @ObfuscatedGetter( - intValue = -206701331 + intValue = 228888197 ) @Export("hintArrowY") static int hintArrowY; - @ObfuscatedName("cl") + @ObfuscatedName("cx") @ObfuscatedGetter( - intValue = -959107052 + intValue = -1687993100 ) @Export("hintArrowHeight") static int hintArrowHeight; - @ObfuscatedName("ci") + @ObfuscatedName("cl") @ObfuscatedGetter( - intValue = 1849140865 + intValue = 1422789440 ) @Export("hintArrowSubX") static int hintArrowSubX; - @ObfuscatedName("cc") + @ObfuscatedName("cs") @ObfuscatedGetter( - intValue = 1728405841 + intValue = -1150277369 ) @Export("hintArrowSubY") static int hintArrowSubY; - @ObfuscatedName("cw") + @ObfuscatedName("cv") @ObfuscatedSignature( - signature = "Lcf;" + signature = "Lcd;" ) @Export("playerAttackOption") static AttackOption playerAttackOption; - @ObfuscatedName("do") + @ObfuscatedName("dm") @ObfuscatedSignature( - signature = "Lcf;" + signature = "Lcd;" ) @Export("npcAttackOption") static AttackOption npcAttackOption; - @ObfuscatedName("dx") + @ObfuscatedName("ds") @ObfuscatedGetter( - intValue = -727124447 + intValue = 544123225 ) @Export("titleLoadingStage") static int titleLoadingStage; - @ObfuscatedName("di") + @ObfuscatedName("do") @ObfuscatedGetter( - intValue = 1173358373 + intValue = 802630795 ) @Export("js5ConnectState") static int js5ConnectState; - @ObfuscatedName("dr") + @ObfuscatedName("di") @ObfuscatedGetter( - intValue = -1353267399 + intValue = 679409999 ) - static int field660; - @ObfuscatedName("ek") + static int field675; + @ObfuscatedName("dy") + @ObfuscatedSignature( + signature = "Lia;" + ) + @Export("archive4") + static Archive archive4; + @ObfuscatedName("ee") + @ObfuscatedSignature( + signature = "Lia;" + ) + @Export("archive17") + static Archive archive17; + @ObfuscatedName("ec") @ObfuscatedGetter( - intValue = -509949081 + intValue = 788466911 ) @Export("js5Errors") static int js5Errors; - @ObfuscatedName("ew") + @ObfuscatedName("el") @ObfuscatedGetter( - intValue = -492792025 + intValue = 598488389 ) @Export("loginState") static int loginState; - @ObfuscatedName("ep") - @ObfuscatedGetter( - intValue = 303516097 - ) - static int field663; - @ObfuscatedName("er") - @ObfuscatedGetter( - intValue = -27008237 - ) - static int field740; - @ObfuscatedName("es") - @ObfuscatedGetter( - intValue = -427416641 - ) - static int field665; @ObfuscatedName("eq") - @ObfuscatedSignature( - signature = "Lfv;" + @ObfuscatedGetter( + intValue = 1283349071 ) - static class160 field743; - @ObfuscatedName("eg") + static int field679; + @ObfuscatedName("eu") + @ObfuscatedGetter( + intValue = -1801662641 + ) + static int field680; + @ObfuscatedName("et") + @ObfuscatedGetter( + intValue = -1956928739 + ) + static int field681; + @ObfuscatedName("es") + @ObfuscatedSignature( + signature = "Lfn;" + ) + static class160 field682; + @ObfuscatedName("en") + @ObfuscatedGetter( + intValue = -1694065133 + ) + @Export("port2") + static int port2; + @ObfuscatedName("ev") @Export("Login_isUsernameRemembered") static boolean Login_isUsernameRemembered; - @ObfuscatedName("ec") + @ObfuscatedName("eb") @ObfuscatedSignature( - signature = "Lcn;" + signature = "Lcm;" ) @Export("secureRandomFuture") static SecureRandomFuture secureRandomFuture; - @ObfuscatedName("ea") + @ObfuscatedName("ej") @Export("randomDatData") static byte[] randomDatData; - @ObfuscatedName("eb") + @ObfuscatedName("ew") @ObfuscatedSignature( - signature = "[Lcp;" + signature = "[Lcg;" ) @Export("npcs") static NPC[] npcs; - @ObfuscatedName("em") + @ObfuscatedName("ed") @ObfuscatedGetter( - intValue = -712593235 + intValue = 1706473169 ) @Export("npcCount") static int npcCount; - @ObfuscatedName("fd") + @ObfuscatedName("fl") @Export("npcIndices") static int[] npcIndices; - @ObfuscatedName("ff") + @ObfuscatedName("fp") @ObfuscatedGetter( - intValue = 278898125 + intValue = 1670938007 ) - static int field673; - @ObfuscatedName("fe") - static int[] field720; - @ObfuscatedName("fo") + static int field690; + @ObfuscatedName("fx") + static int[] field867; + @ObfuscatedName("fh") @ObfuscatedSignature( - signature = "Lcr;" + signature = "Lci;" ) @Export("packetWriter") public static final PacketWriter packetWriter; - @ObfuscatedName("fn") + @ObfuscatedName("fz") @ObfuscatedGetter( - intValue = 2048559591 + intValue = -446741929 ) @Export("logoutTimer") static int logoutTimer; - @ObfuscatedName("fy") - static boolean field677; - @ObfuscatedName("fu") + @ObfuscatedName("fj") + static boolean field800; + @ObfuscatedName("fw") @Export("useBufferedSocket") static boolean useBufferedSocket; - @ObfuscatedName("fl") + @ObfuscatedName("ff") @ObfuscatedSignature( - signature = "Ljx;" + signature = "Ljn;" ) @Export("timer") static Timer timer; - @ObfuscatedName("fp") + @ObfuscatedName("fv") @Export("fontsMap") static HashMap fontsMap; - @ObfuscatedName("fi") + @ObfuscatedName("fc") @ObfuscatedGetter( - intValue = 1305702889 + intValue = 1167098885 ) - static int field824; - @ObfuscatedName("fj") + static int field791; + @ObfuscatedName("ft") @ObfuscatedGetter( - intValue = 2025601593 + intValue = 1435781107 ) - static int field859; - @ObfuscatedName("fz") + static int field884; + @ObfuscatedName("fr") @ObfuscatedGetter( - intValue = -244261703 + intValue = 1220114723 ) - static int field683; - @ObfuscatedName("gw") + static int field700; + @ObfuscatedName("gb") @ObfuscatedGetter( - intValue = 1006687669 + intValue = -920973165 ) - static int field684; - @ObfuscatedName("ga") + static int field733; + @ObfuscatedName("gi") @ObfuscatedGetter( - intValue = -958408065 + intValue = 1525628521 ) - static int field734; - @ObfuscatedName("gd") + static int field695; + @ObfuscatedName("gx") @Export("isInInstance") static boolean isInInstance; - @ObfuscatedName("gb") + @ObfuscatedName("gp") @Export("instanceChunkTemplates") static int[][][] instanceChunkTemplates; - @ObfuscatedName("gi") - static final int[] field689; - @ObfuscatedName("gt") + @ObfuscatedName("go") + static final int[] field743; + @ObfuscatedName("gf") @ObfuscatedGetter( - intValue = -480027501 + intValue = -115001383 ) - static int field690; - @ObfuscatedName("he") - @ObfuscatedGetter( - intValue = -43720627 - ) - static int field691; - @ObfuscatedName("hd") - @ObfuscatedGetter( - intValue = -895055541 - ) - static int field692; - @ObfuscatedName("hj") - @ObfuscatedGetter( - intValue = 97511831 - ) - static int field693; - @ObfuscatedName("hy") - @ObfuscatedGetter( - intValue = -1638312043 - ) - static int field694; - @ObfuscatedName("hu") - static boolean field695; + static int field707; @ObfuscatedName("ht") @ObfuscatedGetter( - intValue = -1245138777 + intValue = 1088390909 + ) + static int field870; + @ObfuscatedName("hc") + @ObfuscatedGetter( + intValue = -1687869927 + ) + static int field709; + @ObfuscatedName("hi") + @ObfuscatedGetter( + intValue = -2107893215 + ) + static int field710; + @ObfuscatedName("hf") + @ObfuscatedGetter( + intValue = 404388609 + ) + static int field711; + @ObfuscatedName("hb") + static boolean field712; + @ObfuscatedName("hj") + @ObfuscatedGetter( + intValue = -922297079 ) @Export("alternativeScrollbarWidth") static int alternativeScrollbarWidth; - @ObfuscatedName("hv") + @ObfuscatedName("hm") @ObfuscatedGetter( - intValue = 161071957 + intValue = 2017298607 ) @Export("camAngleX") static int camAngleX; - @ObfuscatedName("hc") + @ObfuscatedName("hg") @ObfuscatedGetter( - intValue = 1782454389 + intValue = 715685771 ) @Export("camAngleY") static int camAngleY; - @ObfuscatedName("hw") + @ObfuscatedName("hy") @ObfuscatedGetter( - intValue = -1982031919 + intValue = -1271117347 ) @Export("camAngleDY") static int camAngleDY; - @ObfuscatedName("hm") + @ObfuscatedName("hk") @ObfuscatedGetter( - intValue = 1897616521 + intValue = -502249305 ) @Export("camAngleDX") static int camAngleDX; - @ObfuscatedName("hf") + @ObfuscatedName("hv") @ObfuscatedGetter( - intValue = 1783666051 + intValue = 1265592985 ) @Export("mouseCamClickedX") static int mouseCamClickedX; - @ObfuscatedName("hl") + @ObfuscatedName("ho") @ObfuscatedGetter( - intValue = -346780995 + intValue = -229935521 ) @Export("mouseCamClickedY") static int mouseCamClickedY; - @ObfuscatedName("hk") + @ObfuscatedName("hz") @ObfuscatedGetter( - intValue = 1183996551 + intValue = 573387673 ) @Export("oculusOrbState") static int oculusOrbState; - @ObfuscatedName("hp") + @ObfuscatedName("hh") @ObfuscatedGetter( - intValue = -1225679861 + intValue = -758522723 ) @Export("camFollowHeight") static int camFollowHeight; - @ObfuscatedName("ho") + @ObfuscatedName("hr") @ObfuscatedGetter( - intValue = 354489243 + intValue = -654913029 ) - static int field705; - @ObfuscatedName("hz") + static int field647; + @ObfuscatedName("he") @ObfuscatedGetter( - intValue = -2121988069 + intValue = 1993254297 ) - static int field706; - @ObfuscatedName("ih") + static int field723; + @ObfuscatedName("ii") @ObfuscatedGetter( - intValue = 693041111 + intValue = 955066829 ) - static int field632; - @ObfuscatedName("ie") + static int field724; + @ObfuscatedName("ia") @ObfuscatedGetter( - intValue = 1625985575 + intValue = -1010817559 ) @Export("oculusOrbNormalSpeed") static int oculusOrbNormalSpeed; - @ObfuscatedName("ic") + @ObfuscatedName("ib") @ObfuscatedGetter( - intValue = -5930147 + intValue = 2046982327 ) @Export("oculusOrbSlowedSpeed") static int oculusOrbSlowedSpeed; - @ObfuscatedName("ia") + @ObfuscatedName("in") @ObfuscatedGetter( - intValue = 959698373 + intValue = 631186879 ) - public static int field710; - @ObfuscatedName("ip") - static boolean field751; + static int field727; + @ObfuscatedName("ic") + static boolean field728; + @ObfuscatedName("id") + @ObfuscatedGetter( + intValue = 1899106867 + ) + static int field729; + @ObfuscatedName("ij") + static boolean field730; @ObfuscatedName("im") @ObfuscatedGetter( - intValue = -1249522927 + intValue = 1534235447 ) - static int field712; - @ObfuscatedName("it") - @Export("selectedItemName") - static String selectedItemName; - @ObfuscatedName("ir") - static boolean field713; - @ObfuscatedName("il") + static int field818; + @ObfuscatedName("ie") @ObfuscatedGetter( - intValue = -2096925203 - ) - static int field714; - @ObfuscatedName("iy") - @ObfuscatedGetter( - intValue = -712265205 + intValue = 489065879 ) @Export("overheadTextCount") static int overheadTextCount; - @ObfuscatedName("io") + @ObfuscatedName("iu") @ObfuscatedGetter( - intValue = 1274484349 + intValue = 546122341 ) @Export("overheadTextLimit") static int overheadTextLimit; - @ObfuscatedName("iu") + @ObfuscatedName("io") @Export("overheadTextXs") static int[] overheadTextXs; - @ObfuscatedName("iq") + @ObfuscatedName("iy") @Export("overheadTextYs") static int[] overheadTextYs; - @ObfuscatedName("ij") + @ObfuscatedName("iv") @Export("overheadTextAscents") static int[] overheadTextAscents; - @ObfuscatedName("is") + @ObfuscatedName("iq") @Export("overheadTextXOffsets") static int[] overheadTextXOffsets; - @ObfuscatedName("ik") + @ObfuscatedName("is") @Export("overheadTextColors") static int[] overheadTextColors; - @ObfuscatedName("id") + @ObfuscatedName("it") + @Export("selectedItemName") + static String selectedItemName; + @ObfuscatedName("iw") @Export("overheadTextEffects") static int[] overheadTextEffects; - @ObfuscatedName("ig") + @ObfuscatedName("il") @Export("overheadTextCyclesRemaining") static int[] overheadTextCyclesRemaining; - @ObfuscatedName("ii") + @ObfuscatedName("ir") @Export("overheadText") static String[] overheadText; - @ObfuscatedName("iw") + @ObfuscatedName("if") @Export("tileLastDrawnActor") static int[][] tileLastDrawnActor; - @ObfuscatedName("ib") + @ObfuscatedName("ih") @ObfuscatedGetter( - intValue = 1082148805 + intValue = 2113059389 ) @Export("viewportDrawCount") static int viewportDrawCount; - @ObfuscatedName("iv") + @ObfuscatedName("ig") @ObfuscatedGetter( - intValue = 1604718859 + intValue = 770836743 ) @Export("viewportTempX") static int viewportTempX; - @ObfuscatedName("in") + @ObfuscatedName("ip") @ObfuscatedGetter( - intValue = 141110117 + intValue = 1799484349 ) @Export("viewportTempY") static int viewportTempY; - @ObfuscatedName("jl") + @ObfuscatedName("jq") @ObfuscatedGetter( - intValue = 1442681791 + intValue = -247632533 ) @Export("mouseCrossX") static int mouseCrossX; - @ObfuscatedName("js") + @ObfuscatedName("jj") @ObfuscatedGetter( - intValue = -267915889 + intValue = 217544107 ) @Export("mouseCrossY") static int mouseCrossY; @ObfuscatedName("jw") @ObfuscatedGetter( - intValue = 1233219852 + intValue = 250308260 ) @Export("mouseCrossState") static int mouseCrossState; - @ObfuscatedName("jo") + @ObfuscatedName("jr") @ObfuscatedGetter( - intValue = -557514861 + intValue = 14031919 ) @Export("mouseCrossColor") static int mouseCrossColor; - @ObfuscatedName("ja") + @ObfuscatedName("jg") @Export("showMouseCross") static boolean showMouseCross; - @ObfuscatedName("jn") + @ObfuscatedName("jb") @ObfuscatedGetter( - intValue = 1412380751 + intValue = -1559592119 ) - static int field764; - @ObfuscatedName("jh") + static int field751; + @ObfuscatedName("jo") @ObfuscatedGetter( - intValue = -1293433949 + intValue = -769809143 ) - static int field735; - @ObfuscatedName("jk") + static int field752; + @ObfuscatedName("ji") @ObfuscatedGetter( - intValue = -958619817 + intValue = 680963965 ) @Export("dragItemSlotSource") static int dragItemSlotSource; - @ObfuscatedName("jx") + @ObfuscatedName("jc") @ObfuscatedGetter( - intValue = 1858822219 + intValue = -509412397 ) @Export("draggedWidgetX") static int draggedWidgetX; - @ObfuscatedName("jd") + @ObfuscatedName("jn") @ObfuscatedGetter( - intValue = 1449162079 + intValue = 24720215 ) @Export("draggedWidgetY") static int draggedWidgetY; - @ObfuscatedName("jy") + @ObfuscatedName("jt") @ObfuscatedGetter( - intValue = -1787846911 + intValue = -200424637 ) @Export("dragItemSlotDestination") static int dragItemSlotDestination; - @ObfuscatedName("jm") - static boolean field768; - @ObfuscatedName("ju") + @ObfuscatedName("jk") + static boolean field757; + @ObfuscatedName("jx") @ObfuscatedGetter( - intValue = -353478655 + intValue = 1665305383 ) @Export("itemDragDuration") static int itemDragDuration; - @ObfuscatedName("jb") + @ObfuscatedName("jf") @ObfuscatedGetter( - intValue = -1748491077 + intValue = 1608164289 ) - static int field678; - @ObfuscatedName("jt") + static int field759; + @ObfuscatedName("jp") @Export("showLoadingMessages") static boolean showLoadingMessages; - @ObfuscatedName("jf") + @ObfuscatedName("jh") @ObfuscatedSignature( - signature = "[Lbn;" + signature = "[Lba;" ) @Export("players") static Player[] players; - @ObfuscatedName("jc") + @ObfuscatedName("jd") @ObfuscatedGetter( - intValue = -1257096167 + intValue = 356089511 ) @Export("localPlayerIndex") static int localPlayerIndex; - @ObfuscatedName("jq") + @ObfuscatedName("jz") @ObfuscatedGetter( - intValue = -1822880047 + intValue = -2132889429 ) - static int field746; - @ObfuscatedName("jj") + static int field763; + @ObfuscatedName("jl") @Export("renderSelf") static boolean renderSelf; - @ObfuscatedName("kf") + @ObfuscatedName("kh") @ObfuscatedGetter( - intValue = 1400486467 + intValue = 1701089391 ) @Export("drawPlayerNames") static int drawPlayerNames; - @ObfuscatedName("kk") + @ObfuscatedName("kj") @ObfuscatedGetter( - intValue = -1772541191 + intValue = -425837641 ) - static int field815; - @ObfuscatedName("ki") - static int[] field745; - @ObfuscatedName("kn") + static int field766; + @ObfuscatedName("kq") + static int[] field828; + @ObfuscatedName("kb") @Export("playerMenuOpcodes") static final int[] playerMenuOpcodes; - @ObfuscatedName("ka") + @ObfuscatedName("ko") @Export("playerMenuActions") static String[] playerMenuActions; - @ObfuscatedName("km") + @ObfuscatedName("kc") @Export("playerOptionsPriorities") static boolean[] playerOptionsPriorities; - @ObfuscatedName("ks") + @ObfuscatedName("kg") @Export("defaultRotations") static int[] defaultRotations; - @ObfuscatedName("kl") + @ObfuscatedName("kt") @ObfuscatedGetter( - intValue = -1980827323 + intValue = -1908938957 ) @Export("combatTargetPlayerIndex") static int combatTargetPlayerIndex; - @ObfuscatedName("kq") + @ObfuscatedName("ks") @ObfuscatedSignature( - signature = "[[[Ljs;" + signature = "[[[Ljw;" ) @Export("groundItems") static NodeDeque[][][] groundItems; - @ObfuscatedName("kh") + @ObfuscatedName("kp") @ObfuscatedSignature( - signature = "Ljs;" + signature = "Ljw;" ) @Export("pendingSpawns") static NodeDeque pendingSpawns; - @ObfuscatedName("kj") + @ObfuscatedName("kd") @ObfuscatedSignature( - signature = "Ljs;" + signature = "Ljw;" ) @Export("projectiles") static NodeDeque projectiles; - @ObfuscatedName("kv") + @ObfuscatedName("ka") @ObfuscatedSignature( - signature = "Ljs;" + signature = "Ljw;" ) @Export("graphicsObjects") static NodeDeque graphicsObjects; - @ObfuscatedName("kp") + @ObfuscatedName("ki") @Export("currentLevels") static int[] currentLevels; - @ObfuscatedName("ky") + @ObfuscatedName("kf") @Export("levels") static int[] levels; - @ObfuscatedName("kw") + @ObfuscatedName("kr") @Export("experience") static int[] experience; - @ObfuscatedName("kb") + @ObfuscatedName("kw") @ObfuscatedGetter( - intValue = -1271914129 + intValue = 1989694785 ) @Export("leftClickOpensMenu") static int leftClickOpensMenu; - @ObfuscatedName("kg") + @ObfuscatedName("kv") @Export("isMenuOpen") static boolean isMenuOpen; - @ObfuscatedName("lf") + @ObfuscatedName("ld") @ObfuscatedGetter( - intValue = -1021045037 + intValue = -1335676379 ) @Export("menuOptionsCount") static int menuOptionsCount; - @ObfuscatedName("lv") + @ObfuscatedName("lr") @Export("menuArguments1") static int[] menuArguments1; - @ObfuscatedName("lc") + @ObfuscatedName("lh") @Export("menuArguments2") static int[] menuArguments2; - @ObfuscatedName("la") + @ObfuscatedName("lp") @Export("menuOpcodes") static int[] menuOpcodes; - @ObfuscatedName("le") + @ObfuscatedName("lu") @Export("menuIdentifiers") static int[] menuIdentifiers; - @ObfuscatedName("lh") + @ObfuscatedName("ln") @Export("menuActions") static String[] menuActions; - @ObfuscatedName("lo") + @ObfuscatedName("ll") @Export("menuTargets") static String[] menuTargets; - @ObfuscatedName("lj") + @ObfuscatedName("lq") @Export("menuShiftClick") static boolean[] menuShiftClick; - @ObfuscatedName("lk") + @ObfuscatedName("lb") @Export("followerOpsLowPriority") static boolean followerOpsLowPriority; - @ObfuscatedName("li") + @ObfuscatedName("lf") @Export("shiftClickDrop") static boolean shiftClickDrop; - @ObfuscatedName("ls") + @ObfuscatedName("li") @Export("tapToDrop") static boolean tapToDrop; - @ObfuscatedName("lz") + @ObfuscatedName("lt") @Export("showMouseOverText") static boolean showMouseOverText; - @ObfuscatedName("ln") + @ObfuscatedName("lx") @ObfuscatedGetter( - intValue = 981856147 + intValue = -1770752135 ) @Export("viewportX") static int viewportX; - @ObfuscatedName("lr") + @ObfuscatedName("lm") @ObfuscatedGetter( - intValue = -1679083747 + intValue = 1940696691 ) @Export("viewportY") static int viewportY; - @ObfuscatedName("lm") + @ObfuscatedName("lv") @ObfuscatedGetter( - intValue = 1613029861 + intValue = 1680914597 ) - static int field798; - @ObfuscatedName("ld") + static int field796; + @ObfuscatedName("le") @ObfuscatedGetter( - intValue = -1066881411 + intValue = 1451138947 ) - static int field674; - @ObfuscatedName("lw") + static int field797; + @ObfuscatedName("ly") @ObfuscatedGetter( - intValue = -134952871 + intValue = 353529783 ) @Export("isItemSelected") static int isItemSelected; - @ObfuscatedName("lu") + @ObfuscatedName("lk") @Export("isSpellSelected") static boolean isSpellSelected; - @ObfuscatedName("ll") + @ObfuscatedName("ls") @ObfuscatedGetter( - intValue = -1987429727 + intValue = -678517667 ) @Export("selectedSpellChildIndex") static int selectedSpellChildIndex; - @ObfuscatedName("mj") + @ObfuscatedName("mv") @ObfuscatedGetter( - intValue = -1680716253 + intValue = 259223343 ) - static int field785; - @ObfuscatedName("mg") + static int field802; + @ObfuscatedName("mn") @Export("selectedSpellActionName") static String selectedSpellActionName; - @ObfuscatedName("my") + @ObfuscatedName("mo") @Export("selectedSpellName") static String selectedSpellName; - @ObfuscatedName("mk") + @ObfuscatedName("me") @ObfuscatedGetter( - intValue = -1055224191 + intValue = 1383553915 ) @Export("rootInterface") static int rootInterface; + @ObfuscatedName("mx") + @ObfuscatedSignature( + signature = "Lln;" + ) + @Export("interfaceParents") + static NodeHashTable interfaceParents; static { - field895 = true; + field922 = true; worldId = 1; worldProperties = 0; gameBuild = 0; @@ -1278,10 +1299,10 @@ public final class Client extends GameShell implements Usernamed { gameState = 0; isLoading = true; cycle = 0; - mouseLastLastPressedTimeMillis = 1L; - field642 = -1; - field681 = -1; - field728 = -1L; + mouseLastLastPressedTimeMillis = -1L; + field657 = -1; + field912 = -1; + field745 = -1L; hadFocus = true; displayFps = false; rebootTimer = 0; @@ -1297,42 +1318,42 @@ public final class Client extends GameShell implements Usernamed { npcAttackOption = AttackOption.AttackOption_hidden; titleLoadingStage = 0; js5ConnectState = 0; - field660 = 0; + field675 = 0; js5Errors = 0; loginState = 0; - field663 = 0; - field740 = 0; - field665 = 0; - field743 = class160.field1985; + field679 = 0; + field680 = 0; + field681 = 0; + field682 = class160.field1993; Login_isUsernameRemembered = false; secureRandomFuture = new SecureRandomFuture(); randomDatData = null; npcs = new NPC[32768]; npcCount = 0; npcIndices = new int[32768]; - field673 = 0; - field720 = new int[250]; + field690 = 0; + field867 = new int[250]; packetWriter = new PacketWriter(); logoutTimer = 0; - field677 = false; + field800 = false; useBufferedSocket = true; timer = new Timer(); fontsMap = new HashMap(); - field824 = 0; - field859 = 1; - field683 = 0; - field684 = 1; - field734 = 0; + field791 = 0; + field884 = 1; + field700 = 0; + field733 = 1; + field695 = 0; collisionMaps = new CollisionMap[4]; isInInstance = false; instanceChunkTemplates = new int[4][13][13]; - field689 = new int[]{0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3}; - field690 = 0; - field691 = 2301979; - field692 = 5063219; - field693 = 3353893; - field694 = 7759444; - field695 = false; + field743 = new int[]{0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3}; + field707 = 0; + field870 = 2301979; + field709 = 5063219; + field710 = 3353893; + field711 = 7759444; + field712 = false; alternativeScrollbarWidth = 0; camAngleX = 128; camAngleY = 0; @@ -1342,16 +1363,16 @@ public final class Client extends GameShell implements Usernamed { mouseCamClickedY = 0; oculusOrbState = 0; camFollowHeight = 50; - field705 = 0; - field706 = 0; - field632 = 0; + field647 = 0; + field723 = 0; + field724 = 0; oculusOrbNormalSpeed = 12; oculusOrbSlowedSpeed = 6; - field710 = 0; - field751 = false; - field712 = 0; - field713 = false; - field714 = 0; + field727 = 0; + field728 = false; + field729 = 0; + field730 = false; + field818 = 0; overheadTextCount = 0; overheadTextLimit = 50; overheadTextXs = new int[overheadTextLimit]; @@ -1371,23 +1392,23 @@ public final class Client extends GameShell implements Usernamed { mouseCrossState = 0; mouseCrossColor = 0; showMouseCross = true; - field764 = 0; - field735 = 0; + field751 = 0; + field752 = 0; dragItemSlotSource = 0; draggedWidgetX = 0; draggedWidgetY = 0; dragItemSlotDestination = 0; - field768 = false; + field757 = false; itemDragDuration = 0; - field678 = 0; + field759 = 0; showLoadingMessages = true; players = new Player[2048]; localPlayerIndex = -1; - field746 = 0; + field763 = 0; renderSelf = true; drawPlayerNames = 0; - field815 = 0; - field745 = new int[1000]; + field766 = 0; + field828 = new int[1000]; playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; playerMenuActions = new String[8]; playerOptionsPriorities = new boolean[8]; @@ -1416,21 +1437,21 @@ public final class Client extends GameShell implements Usernamed { showMouseOverText = true; viewportX = -1; viewportY = -1; - field798 = 0; - field674 = 50; + field796 = 0; + field797 = 50; isItemSelected = 0; selectedItemName = null; isSpellSelected = false; selectedSpellChildIndex = -1; - field785 = -1; + field802 = -1; selectedSpellActionName = null; selectedSpellName = null; rootInterface = -1; interfaceParents = new NodeHashTable(8); - field790 = 0; - field791 = -1; + field808 = 0; + field664 = -1; chatEffects = 0; - field901 = 0; + field811 = 0; meslayerContinueWidget = null; runEnergy = 0; weight = 0; @@ -1443,54 +1464,54 @@ public final class Client extends GameShell implements Usernamed { widgetClickX = 0; widgetClickY = 0; draggedOnWidget = null; - field806 = false; - field807 = -1; - field808 = -1; - field809 = false; - field882 = -1; - field811 = -1; + field824 = false; + field919 = -1; + field826 = -1; + field827 = false; + field864 = -1; + field829 = -1; isDraggingWidget = false; cycleCntr = 1; - field814 = new int[32]; - field648 = 0; + field832 = new int[32]; + field833 = 0; changedItemContainers = new int[32]; - field701 = 0; + field835 = 0; changedSkills = new int[32]; changedSkillsCount = 0; chatCycle = 0; - field711 = 0; - field862 = 0; + field839 = 0; field823 = 0; - field860 = 0; - field825 = 0; + field841 = 0; + field842 = 0; + field795 = 0; mouseWheelRotation = 0; scriptEvents = new NodeDeque(); - field865 = new NodeDeque(); - field883 = new NodeDeque(); + field846 = new NodeDeque(); + field847 = new NodeDeque(); widgetClickMasks = new NodeHashTable(512); rootWidgetCount = 0; - field832 = -2; - field833 = new boolean[100]; - field834 = new boolean[100]; - field835 = new boolean[100]; + field850 = -2; + field851 = new boolean[100]; + field852 = new boolean[100]; + field853 = new boolean[100]; rootWidgetXs = new int[100]; rootWidgetYs = new int[100]; rootWidgetWidths = new int[100]; rootWidgetHeights = new int[100]; gameDrawingMode = 0; - field841 = 0L; + field859 = 0L; isResizable = true; - field864 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; + field861 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; publicChatMode = 0; tradeChatMode = 0; - field846 = ""; - field707 = new long[100]; - field682 = 0; - field849 = 0; - field850 = new int[128]; - field851 = new int[128]; - field852 = -1L; - field853 = -1; + field780 = ""; + field865 = new long[100]; + field715 = 0; + field762 = 0; + field868 = new int[128]; + field869 = new int[128]; + field702 = -1L; + field704 = -1; mapIconCount = 0; mapIconXs = new int[1000]; mapIconYs = new int[1000]; @@ -1500,7 +1521,7 @@ public final class Client extends GameShell implements Usernamed { minimapState = 0; musicVolume = 255; currentTrackGroupId = -1; - field767 = false; + field881 = false; soundEffectVolume = 127; areaSoundEffectVolume = 127; soundEffectCount = 0; @@ -1510,47 +1531,47 @@ public final class Client extends GameShell implements Usernamed { soundLocations = new int[50]; soundEffects = new SoundEffect[50]; isCameraLocked = false; - field779 = new boolean[5]; - field875 = new int[5]; - field876 = new int[5]; - field877 = new int[5]; - field878 = new int[5]; - field879 = 256; - field880 = 205; + field775 = new boolean[5]; + field892 = new int[5]; + field699 = new int[5]; + field894 = new int[5]; + field895 = new int[5]; + field908 = 256; + field897 = 205; zoomHeight = 256; zoomWidth = 320; - field796 = 1; - field884 = 32767; - field804 = 1; - field886 = 32767; + field900 = 1; + field673 = 32767; + field819 = 1; + field903 = 32767; viewportOffsetX = 0; viewportOffsetY = 0; viewportWidth = 0; viewportHeight = 0; viewportZoom = 0; playerAppearance = new PlayerAppearance(); - field893 = -1; - field894 = -1; + field910 = -1; + field911 = -1; platformInfoProvider = new DesktopPlatformInfoProvider(); grandExchangeOffers = new GrandExchangeOffer[8]; GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); - field749 = -1; + field888 = -1; archiveLoaders = new ArrayList(10); archiveLoadersDone = 0; - field629 = 0; - field902 = new class65(); - field903 = new int[50]; - field730 = new int[50]; + field813 = 0; + field809 = new class65(); + field920 = new int[50]; + field921 = new int[50]; } - @ObfuscatedName("u") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1309389764" + garbageValue = "1781530375" ) @Export("resizeGame") protected final void resizeGame() { - field841 = WorldMapID.currentTimeMillis() + 500L; + field859 = WorldMapIcon_0.currentTimeMillis() + 500L; this.resizeJS(); if (rootInterface != -1) { this.resizeRoot(true); @@ -1558,31 +1579,31 @@ public final class Client extends GameShell implements Usernamed { } - @ObfuscatedName("ao") + @ObfuscatedName("as") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "557803519" + garbageValue = "159835862" ) @Export("setUp") protected final void setUp() { - Players.method2161(new int[]{20, 260, 10000}, new int[]{1000, 100, 500}); - class197.port1 = gameBuild == 0 ? 43594 : worldId + 40000; - MouseRecorder.port2 = gameBuild == 0 ? 443 : worldId + 50000; - WorldMapData_1.port3 = class197.port1; - PlayerAppearance.field2525 = class215.field2529; - WorldMapSection1.field269 = class215.field2533; - IntHashTable.field4010 = class215.field2531; - CollisionMap.field2066 = class215.field2532; - BufferedNetSocket.urlRequester = new UrlRequester(); + NetFileRequest.method4217(new int[]{20, 260, 10000}, new int[]{1000, 100, 500}); + WorldMapLabelSize.port1 = gameBuild == 0 ? 43594 : worldId + 40000; + port2 = gameBuild == 0 ? 443 : worldId + 50000; + WorldMapSection2.port3 = WorldMapLabelSize.port1; + WorldMapLabelSize.field128 = class215.field2552; + PlayerAppearance.field2545 = class215.field2553; + PlayerAppearance.field2547 = class215.field2551; + class208.field2514 = class215.field2550; + WorldMapData_0.urlRequester = new UrlRequester(); this.setUpKeyboard(); this.setUpMouse(); - MusicPatch.mouseWheel = this.mouseWheel(); - WorldMapRectangle.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); + PacketWriter.mouseWheel = this.mouseWheel(); + TileItem.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); AccessFile var2 = null; ClientPreferences var3 = new ClientPreferences(); try { - var2 = Messages.getPreferencesFile("", AbstractWorldMapIcon.field284.name, false); + var2 = WorldMapRectangle.getPreferencesFile("", class14.field102.name, false); byte[] var4 = new byte[(int)var2.length()]; int var6; @@ -1604,364 +1625,239 @@ public final class Client extends GameShell implements Usernamed { } catch (Exception var7) { } - Interpreter.clientPreferences = var3; + WorldMapSection2.clientPreferences = var3; this.setUpClipboard(); - class3.method39(this, GameShell.null_string); + String var9 = GrandExchangeOfferUnitPriceComparator.null_string; + class51.applet = this; + if (var9 != null) { + class51.field431 = var9; + } + if (gameBuild != 0) { displayFps = true; } - class60.setWindowedMode(Interpreter.clientPreferences.windowMode); - Message.friendSystem = new FriendSystem(class188.loginType); + VertexNormal.setWindowedMode(WorldMapSection2.clientPreferences.windowMode); + KeyHandler.friendSystem = new FriendSystem(class192.loginType); } - @ObfuscatedName("ae") + @ObfuscatedName("ak") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1971545072" + garbageValue = "1684911639" ) @Export("doCycle") protected final void doCycle() { ++cycle; this.doCycleJs5(); - class173.method3560(); + ClientPreferences.method1854(); int var1; try { - if (class197.field2392 == 1) { - var1 = GZipDecompressor.midiPcmStream.method3692(); - if (var1 > 0 && GZipDecompressor.midiPcmStream.isReady()) { - var1 -= ParamDefinition.field3275; + if (class197.field2414 == 1) { + var1 = class197.midiPcmStream.method3764(); + if (var1 > 0 && class197.midiPcmStream.isReady()) { + var1 -= class197.field2412; if (var1 < 0) { var1 = 0; } - GZipDecompressor.midiPcmStream.setPcmStreamVolume(var1); + class197.midiPcmStream.setPcmStreamVolume(var1); } else { - GZipDecompressor.midiPcmStream.clear(); - GZipDecompressor.midiPcmStream.removeAll(); - if (Coord.musicTrackArchive != null) { - class197.field2392 = 2; + class197.midiPcmStream.clear(); + class197.midiPcmStream.removeAll(); + if (UserComparator5.musicTrackArchive != null) { + class197.field2414 = 2; } else { - class197.field2392 = 0; + class197.field2414 = 0; } - class197.musicTrack = null; - class268.soundCache = null; + FileSystem.musicTrack = null; + class197.soundCache = null; } } - } catch (Exception var35) { - var35.printStackTrace(); - GZipDecompressor.midiPcmStream.clear(); - class197.field2392 = 0; - class197.musicTrack = null; - class268.soundCache = null; - Coord.musicTrackArchive = null; + } catch (Exception var50) { + var50.printStackTrace(); + class197.midiPcmStream.clear(); + class197.field2414 = 0; + FileSystem.musicTrack = null; + class197.soundCache = null; + UserComparator5.musicTrackArchive = null; } - WorldMapLabel.playPcmPlayers(); - int var2; - synchronized(KeyHandler.KeyHandler_instance) { - ++KeyHandler.KeyHandler_idleCycles; - KeyHandler.field378 = KeyHandler.field380; - KeyHandler.field377 = 0; - if (KeyHandler.field373 >= 0) { - while (KeyHandler.field372 != KeyHandler.field373) { - var2 = KeyHandler.field371[KeyHandler.field372]; - KeyHandler.field372 = KeyHandler.field372 + 1 & 127; - if (var2 < 0) { - KeyHandler.KeyHandler_pressedKeys[~var2] = false; - } else { - if (!KeyHandler.KeyHandler_pressedKeys[var2] && KeyHandler.field377 < KeyHandler.field376.length - 1) { - KeyHandler.field376[++KeyHandler.field377 - 1] = var2; - } - - KeyHandler.KeyHandler_pressedKeys[var2] = true; - } - } - } else { - for (var2 = 0; var2 < 112; ++var2) { - KeyHandler.KeyHandler_pressedKeys[var2] = false; - } - - KeyHandler.field373 = KeyHandler.field372; - } - - if (KeyHandler.field377 > 0) { - KeyHandler.KeyHandler_idleCycles = 0; - } - - KeyHandler.field380 = KeyHandler.field386; - } - - synchronized(MouseHandler.MouseHandler_instance) { - MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; - MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; - MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; - MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; - MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; - MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; - MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; - MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; - MouseHandler.MouseHandler_lastButtonVolatile = 0; - } - - if (MusicPatch.mouseWheel != null) { - var1 = MusicPatch.mouseWheel.useRotation(); + UserComparator3.playPcmPlayers(); + BoundaryObject.method3333(); + UserComparator10.method3476(); + if (PacketWriter.mouseWheel != null) { + var1 = PacketWriter.mouseWheel.useRotation(); mouseWheelRotation = var1; } if (gameState == 0) { - WorldMapRegion.load(); - Skeleton.method3088(); + class225.load(); + class2.method24(); } else if (gameState == 5) { - UserComparator8.doCycleTitle(this); - WorldMapRegion.load(); - Skeleton.method3088(); + GrandExchangeEvents.doCycleTitle(this); + class225.load(); + class2.method24(); } else if (gameState != 10 && gameState != 11) { if (gameState == 20) { - UserComparator8.doCycleTitle(this); + GrandExchangeEvents.doCycleTitle(this); this.doCycleLoggedOut(); } else if (gameState == 25) { - CollisionMap.method3557(false); - field824 = 0; - boolean var36 = true; + UserComparator4.method3442(false); + field791 = 0; + boolean var51 = true; - for (var2 = 0; var2 < Projectile.regionLandArchives.length; ++var2) { - if (SecureRandomFuture.regionMapArchiveIds[var2] != -1 && Projectile.regionLandArchives[var2] == null) { - Projectile.regionLandArchives[var2] = AbstractWorldMapData.archive5.takeFile(SecureRandomFuture.regionMapArchiveIds[var2], 0); - if (Projectile.regionLandArchives[var2] == null) { - var36 = false; - ++field824; + int var2; + for (var2 = 0; var2 < Tiles.regionLandArchives.length; ++var2) { + if (class30.regionMapArchiveIds[var2] != -1 && Tiles.regionLandArchives[var2] == null) { + Tiles.regionLandArchives[var2] = NetSocket.archive5.takeFile(class30.regionMapArchiveIds[var2], 0); + if (Tiles.regionLandArchives[var2] == null) { + var51 = false; + ++field791; } } - if (class222.regionLandArchiveIds[var2] != -1 && GrandExchangeOfferOwnWorldComparator.regionMapArchives[var2] == null) { - GrandExchangeOfferOwnWorldComparator.regionMapArchives[var2] = AbstractWorldMapData.archive5.takeFileEncrypted(class222.regionLandArchiveIds[var2], 0, Canvas.xteaKeys[var2]); - if (GrandExchangeOfferOwnWorldComparator.regionMapArchives[var2] == null) { - var36 = false; - ++field824; + if (class65.regionLandArchiveIds[var2] != -1 && class226.regionMapArchives[var2] == null) { + class226.regionMapArchives[var2] = NetSocket.archive5.takeFileEncrypted(class65.regionLandArchiveIds[var2], 0, JagexCache.xteaKeys[var2]); + if (class226.regionMapArchives[var2] == null) { + var51 = false; + ++field791; } } } - if (!var36) { - field734 = 1; + if (!var51) { + field695 = 1; } else { - field683 = 0; - var36 = true; + field700 = 0; + var51 = true; + int var4; int var5; - Buffer var9; - int var10; - int var11; - int var12; - int var14; - int var15; - int var16; - int var17; - int var18; - int var19; - int var25; - for (var2 = 0; var2 < Projectile.regionLandArchives.length; ++var2) { - byte[] var3 = GrandExchangeOfferOwnWorldComparator.regionMapArchives[var2]; + for (var2 = 0; var2 < Tiles.regionLandArchives.length; ++var2) { + byte[] var3 = class226.regionMapArchives[var2]; if (var3 != null) { - var25 = (WorldMapSection2.regions[var2] >> 8) * 64 - MusicPatchPcmStream.baseX * 64; - var5 = (WorldMapSection2.regions[var2] & 255) * 64 - ScriptEvent.baseY * 64; + var4 = (FriendsList.regions[var2] >> 8) * 64 - Messages.baseX * 64; + var5 = (FriendsList.regions[var2] & 255) * 64 - Language.baseY * 64; if (isInInstance) { - var25 = 10; + var4 = 10; var5 = 10; } - boolean var8 = true; - var9 = new Buffer(var3); - var10 = -1; - - label694: - while (true) { - var11 = var9.method5558(); - if (var11 == 0) { - var36 &= var8; - break; - } - - var10 += var11; - var12 = 0; - boolean var13 = false; - - while (true) { - while (!var13) { - var14 = var9.readUShortSmart(); - if (var14 == 0) { - continue label694; - } - - var12 += var14 - 1; - var15 = var12 & 63; - var16 = var12 >> 6 & 63; - var17 = var9.readUnsignedByte() >> 2; - var18 = var16 + var25; - var19 = var15 + var5; - if (var18 > 0 && var19 > 0 && var18 < 103 && var19 < 103) { - ObjectDefinition var20 = Coord.getObjectDefinition(var10); - if (var17 != 22 || !isLowDetail || var20.int1 != 0 || var20.interactType == 1 || var20.boolean2) { - if (!var20.needsModelFiles()) { - ++field683; - var8 = false; - } - - var13 = true; - } - } - } - - var14 = var9.readUShortSmart(); - if (var14 == 0) { - break; - } - - var9.readUnsignedByte(); - } - } + var51 &= BufferedSink.method5913(var3, var4, var5); } } - if (!var36) { - field734 = 2; + if (!var51) { + field695 = 2; } else { - if (field734 != 0) { - class1.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); + if (field695 != 0) { + class197.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); } - WorldMapLabel.playPcmPlayers(); - class14.scene.clear(); + UserComparator3.playPcmPlayers(); + ServerBuild.scene.clear(); for (var2 = 0; var2 < 4; ++var2) { collisionMaps[var2].clear(); } - int var26; + int var44; for (var2 = 0; var2 < 4; ++var2) { - for (var26 = 0; var26 < 104; ++var26) { - for (var25 = 0; var25 < 104; ++var25) { - Tiles.Tiles_renderFlags[var2][var26][var25] = 0; + for (var44 = 0; var44 < 104; ++var44) { + for (var4 = 0; var4 < 104; ++var4) { + Tiles.Tiles_renderFlags[var2][var44][var4] = 0; } } } - WorldMapLabel.playPcmPlayers(); - WorldMapIcon_1.method277(); - var2 = Projectile.regionLandArchives.length; - WorldMapSectionType.method236(); - CollisionMap.method3557(true); - int var6; + UserComparator3.playPcmPlayers(); + Tiles.Tiles_minPlane = 99; + Tiles.field502 = new byte[4][104][104]; + Tiles.field514 = new byte[4][104][104]; + Tiles.field507 = new byte[4][104][104]; + Tiles.field518 = new byte[4][104][104]; + UrlRequest.field1940 = new int[4][105][105]; + InterfaceParent.field565 = new byte[4][105][105]; + Tiles.field509 = new int[105][105]; + class268.Tiles_hue = new int[104]; + HorizontalAlignment.Tiles_saturation = new int[104]; + class30.Tiles_lightness = new int[104]; + class40.Tiles_hueMultiplier = new int[104]; + TileItemPile.field1529 = new int[104]; + var2 = Tiles.regionLandArchives.length; + UrlRequest.method3375(); + UserComparator4.method3442(true); int var7; - int var39; - int var41; + int var8; + int var10; + int var11; + int var12; + int var13; + int var47; if (!isInInstance) { - var26 = 0; + var44 = 0; - label632: + label611: while (true) { - byte[] var27; - if (var26 >= var2) { - for (var26 = 0; var26 < var2; ++var26) { - var25 = (WorldMapSection2.regions[var26] >> 8) * 64 - MusicPatchPcmStream.baseX * 64; - var5 = (WorldMapSection2.regions[var26] & 255) * 64 - ScriptEvent.baseY * 64; - var27 = Projectile.regionLandArchives[var26]; - if (var27 == null && ClanMate.field3567 < 800) { - WorldMapLabel.playPcmPlayers(); - GrandExchangeOffer.method114(var25, var5, 64, 64); + byte[] var6; + if (var44 >= var2) { + for (var44 = 0; var44 < var2; ++var44) { + var4 = (FriendsList.regions[var44] >> 8) * 64 - Messages.baseX * 64; + var5 = (FriendsList.regions[var44] & 255) * 64 - Language.baseY * 64; + var6 = Tiles.regionLandArchives[var44]; + if (var6 == null && Language.field2359 < 800) { + UserComparator3.playPcmPlayers(); + KitDefinition.method4532(var4, var5, 64, 64); } } - CollisionMap.method3557(true); - var26 = 0; + UserComparator4.method3442(true); + var44 = 0; while (true) { - if (var26 >= var2) { - break label632; + if (var44 >= var2) { + break label611; } - byte[] var4 = GrandExchangeOfferOwnWorldComparator.regionMapArchives[var26]; - if (var4 != null) { - var5 = (WorldMapSection2.regions[var26] >> 8) * 64 - MusicPatchPcmStream.baseX * 64; - var6 = (WorldMapSection2.regions[var26] & 255) * 64 - ScriptEvent.baseY * 64; - WorldMapLabel.playPcmPlayers(); - Scene var29 = class14.scene; - CollisionMap[] var30 = collisionMaps; - var9 = new Buffer(var4); - var10 = -1; - - while (true) { - var11 = var9.method5558(); - if (var11 == 0) { - break; - } - - var10 += var11; - var12 = 0; - - while (true) { - var41 = var9.readUShortSmart(); - if (var41 == 0) { - break; - } - - var12 += var41 - 1; - var14 = var12 & 63; - var15 = var12 >> 6 & 63; - var16 = var12 >> 12; - var17 = var9.readUnsignedByte(); - var18 = var17 >> 2; - var19 = var17 & 3; - int var31 = var15 + var5; - int var21 = var6 + var14; - if (var31 > 0 && var21 > 0 && var31 < 103 && var21 < 103) { - int var22 = var16; - if ((Tiles.Tiles_renderFlags[1][var31][var21] & 2) == 2) { - var22 = var16 - 1; - } - - CollisionMap var23 = null; - if (var22 >= 0) { - var23 = var30[var22]; - } - - VarbitDefinition.method4500(var16, var31, var21, var10, var19, var18, var29, var23); - } - } - } + byte[] var46 = class226.regionMapArchives[var44]; + if (var46 != null) { + var5 = (FriendsList.regions[var44] >> 8) * 64 - Messages.baseX * 64; + var47 = (FriendsList.regions[var44] & 255) * 64 - Language.baseY * 64; + UserComparator3.playPcmPlayers(); + class160.method3518(var46, var5, var47, ServerBuild.scene, collisionMaps); } - ++var26; + ++var44; } } - var25 = (WorldMapSection2.regions[var26] >> 8) * 64 - MusicPatchPcmStream.baseX * 64; - var5 = (WorldMapSection2.regions[var26] & 255) * 64 - ScriptEvent.baseY * 64; - var27 = Projectile.regionLandArchives[var26]; - if (var27 != null) { - WorldMapLabel.playPcmPlayers(); - var7 = GrandExchangeOfferTotalQuantityComparator.field47 * 8 - 48; - var39 = ClanMate.field3567 * 8 - 48; - CollisionMap[] var40 = collisionMaps; + var4 = (FriendsList.regions[var44] >> 8) * 64 - Messages.baseX * 64; + var5 = (FriendsList.regions[var44] & 255) * 64 - Language.baseY * 64; + var6 = Tiles.regionLandArchives[var44]; + if (var6 != null) { + UserComparator3.playPcmPlayers(); + var7 = SecureRandomCallable.field530 * 8 - 48; + var8 = Language.field2359 * 8 - 48; + CollisionMap[] var9 = collisionMaps; var10 = 0; - label629: + label608: while (true) { if (var10 >= 4) { - Buffer var28 = new Buffer(var27); + Buffer var45 = new Buffer(var6); var11 = 0; while (true) { if (var11 >= 4) { - break label629; + break label608; } for (var12 = 0; var12 < 64; ++var12) { - for (var41 = 0; var41 < 64; ++var41) { - PrivateChatMode.loadTerrain(var28, var11, var25 + var12, var5 + var41, var7, var39, 0); + for (var13 = 0; var13 < 64; ++var13) { + WorldMapArea.loadTerrain(var45, var11, var4 + var12, var5 + var13, var7, var8, 0); } } @@ -1971,8 +1867,8 @@ public final class Client extends GameShell implements Usernamed { for (var11 = 0; var11 < 64; ++var11) { for (var12 = 0; var12 < 64; ++var12) { - if (var25 + var11 > 0 && var11 + var25 < 103 && var5 + var12 > 0 && var5 + var12 < 103) { - int[] var10000 = var40[var10].flags[var11 + var25]; + if (var11 + var4 > 0 && var11 + var4 < 103 && var12 + var5 > 0 && var5 + var12 < 103) { + int[] var10000 = var9[var10].flags[var11 + var4]; var10000[var12 + var5] &= -16777217; } } @@ -1982,182 +1878,265 @@ public final class Client extends GameShell implements Usernamed { } } - ++var26; + ++var44; } } - int var32; + int var48; if (isInInstance) { - var26 = 0; + var44 = 0; - label565: + label557: while (true) { - if (var26 >= 4) { - for (var26 = 0; var26 < 13; ++var26) { - for (var25 = 0; var25 < 13; ++var25) { - var5 = instanceChunkTemplates[0][var26][var25]; + if (var44 >= 4) { + for (var44 = 0; var44 < 13; ++var44) { + for (var4 = 0; var4 < 13; ++var4) { + var5 = instanceChunkTemplates[0][var44][var4]; if (var5 == -1) { - GrandExchangeOffer.method114(var26 * 8, var25 * 8, 8, 8); + KitDefinition.method4532(var44 * 8, var4 * 8, 8, 8); } } } - CollisionMap.method3557(true); - var26 = 0; + UserComparator4.method3442(true); + var44 = 0; while (true) { - if (var26 >= 4) { - break label565; + if (var44 >= 4) { + break label557; } - WorldMapLabel.playPcmPlayers(); + UserComparator3.playPcmPlayers(); - for (var25 = 0; var25 < 13; ++var25) { + for (var4 = 0; var4 < 13; ++var4) { + label480: for (var5 = 0; var5 < 13; ++var5) { - var6 = instanceChunkTemplates[var26][var25][var5]; - if (var6 != -1) { - var7 = var6 >> 24 & 3; - var39 = var6 >> 1 & 3; - var32 = var6 >> 14 & 1023; - var10 = var6 >> 3 & 2047; - var11 = (var32 / 8 << 8) + var10 / 8; + var47 = instanceChunkTemplates[var44][var4][var5]; + if (var47 != -1) { + var7 = var47 >> 24 & 3; + var8 = var47 >> 1 & 3; + var48 = var47 >> 14 & 1023; + var10 = var47 >> 3 & 2047; + var11 = (var48 / 8 << 8) + var10 / 8; - for (var12 = 0; var12 < WorldMapSection2.regions.length; ++var12) { - if (WorldMapSection2.regions[var12] == var11 && GrandExchangeOfferOwnWorldComparator.regionMapArchives[var12] != null) { - UserComparator7.method3344(GrandExchangeOfferOwnWorldComparator.regionMapArchives[var12], var26, var25 * 8, var5 * 8, var7, (var32 & 7) * 8, (var10 & 7) * 8, var39, class14.scene, collisionMaps); - break; + for (var12 = 0; var12 < FriendsList.regions.length; ++var12) { + if (FriendsList.regions[var12] == var11 && class226.regionMapArchives[var12] != null) { + byte[] var49 = class226.regionMapArchives[var12]; + int var14 = var4 * 8; + int var15 = var5 * 8; + int var16 = (var48 & 7) * 8; + int var17 = (var10 & 7) * 8; + Scene var18 = ServerBuild.scene; + CollisionMap[] var19 = collisionMaps; + Buffer var20 = new Buffer(var49); + int var21 = -1; + + while (true) { + int var22 = var20.method5589(); + if (var22 == 0) { + continue label480; + } + + var21 += var22; + int var23 = 0; + + while (true) { + int var24 = var20.readUShortSmart(); + if (var24 == 0) { + break; + } + + var23 += var24 - 1; + int var25 = var23 & 63; + int var26 = var23 >> 6 & 63; + int var27 = var23 >> 12; + int var28 = var20.readUnsignedByte(); + int var29 = var28 >> 2; + int var30 = var28 & 3; + if (var7 == var27 && var26 >= var16 && var26 < var16 + 8 && var25 >= var17 && var25 < var17 + 8) { + ObjectDefinition var31 = Occluder.getObjectDefinition(var21); + int var32 = var14 + FloorDecoration.method2913(var26 & 7, var25 & 7, var8, var31.sizeX, var31.sizeY, var30); + int var35 = var26 & 7; + int var36 = var25 & 7; + int var38 = var31.sizeX; + int var39 = var31.sizeY; + int var40; + if ((var30 & 1) == 1) { + var40 = var38; + var38 = var39; + var39 = var40; + } + + int var37 = var8 & 3; + int var34; + if (var37 == 0) { + var34 = var36; + } else if (var37 == 1) { + var34 = 7 - var35 - (var38 - 1); + } else if (var37 == 2) { + var34 = 7 - var36 - (var39 - 1); + } else { + var34 = var35; + } + + var40 = var15 + var34; + if (var32 > 0 && var40 > 0 && var32 < 103 && var40 < 103) { + int var41 = var44; + if ((Tiles.Tiles_renderFlags[1][var32][var40] & 2) == 2) { + var41 = var44 - 1; + } + + CollisionMap var42 = null; + if (var41 >= 0) { + var42 = var19[var41]; + } + + ArchiveDiskActionHandler.method4336(var44, var32, var40, var21, var30 + var8 & 3, var29, var18, var42); + } + } + } + } } } } } } - ++var26; + ++var44; } } - WorldMapLabel.playPcmPlayers(); + UserComparator3.playPcmPlayers(); - for (var25 = 0; var25 < 13; ++var25) { + for (var4 = 0; var4 < 13; ++var4) { for (var5 = 0; var5 < 13; ++var5) { - boolean var38 = false; - var7 = instanceChunkTemplates[var26][var25][var5]; + boolean var54 = false; + var7 = instanceChunkTemplates[var44][var4][var5]; if (var7 != -1) { - var39 = var7 >> 24 & 3; - var32 = var7 >> 1 & 3; + var8 = var7 >> 24 & 3; + var48 = var7 >> 1 & 3; var10 = var7 >> 14 & 1023; var11 = var7 >> 3 & 2047; var12 = (var10 / 8 << 8) + var11 / 8; - for (var41 = 0; var41 < WorldMapSection2.regions.length; ++var41) { - if (WorldMapSection2.regions[var41] == var12 && Projectile.regionLandArchives[var41] != null) { - class48.method858(Projectile.regionLandArchives[var41], var26, var25 * 8, var5 * 8, var39, (var10 & 7) * 8, (var11 & 7) * 8, var32, collisionMaps); - var38 = true; + for (var13 = 0; var13 < FriendsList.regions.length; ++var13) { + if (FriendsList.regions[var13] == var12 && Tiles.regionLandArchives[var13] != null) { + ClientPreferences.method1853(Tiles.regionLandArchives[var13], var44, var4 * 8, var5 * 8, var8, (var10 & 7) * 8, (var11 & 7) * 8, var48, collisionMaps); + var54 = true; break; } } } - if (!var38) { - var39 = var26; - var32 = var25 * 8; + if (!var54) { + var8 = var44; + var48 = var4 * 8; var10 = var5 * 8; for (var11 = 0; var11 < 8; ++var11) { for (var12 = 0; var12 < 8; ++var12) { - Tiles.Tiles_heights[var39][var32 + var11][var10 + var12] = 0; + Tiles.Tiles_heights[var8][var48 + var11][var12 + var10] = 0; } } - if (var32 > 0) { + if (var48 > 0) { for (var11 = 1; var11 < 8; ++var11) { - Tiles.Tiles_heights[var39][var32][var11 + var10] = Tiles.Tiles_heights[var39][var32 - 1][var10 + var11]; + Tiles.Tiles_heights[var8][var48][var10 + var11] = Tiles.Tiles_heights[var8][var48 - 1][var10 + var11]; } } if (var10 > 0) { for (var11 = 1; var11 < 8; ++var11) { - Tiles.Tiles_heights[var39][var11 + var32][var10] = Tiles.Tiles_heights[var39][var32 + var11][var10 - 1]; + Tiles.Tiles_heights[var8][var48 + var11][var10] = Tiles.Tiles_heights[var8][var11 + var48][var10 - 1]; } } - if (var32 > 0 && Tiles.Tiles_heights[var39][var32 - 1][var10] != 0) { - Tiles.Tiles_heights[var39][var32][var10] = Tiles.Tiles_heights[var39][var32 - 1][var10]; - } else if (var10 > 0 && Tiles.Tiles_heights[var39][var32][var10 - 1] != 0) { - Tiles.Tiles_heights[var39][var32][var10] = Tiles.Tiles_heights[var39][var32][var10 - 1]; - } else if (var32 > 0 && var10 > 0 && Tiles.Tiles_heights[var39][var32 - 1][var10 - 1] != 0) { - Tiles.Tiles_heights[var39][var32][var10] = Tiles.Tiles_heights[var39][var32 - 1][var10 - 1]; + if (var48 > 0 && Tiles.Tiles_heights[var8][var48 - 1][var10] != 0) { + Tiles.Tiles_heights[var8][var48][var10] = Tiles.Tiles_heights[var8][var48 - 1][var10]; + } else if (var10 > 0 && Tiles.Tiles_heights[var8][var48][var10 - 1] != 0) { + Tiles.Tiles_heights[var8][var48][var10] = Tiles.Tiles_heights[var8][var48][var10 - 1]; + } else if (var48 > 0 && var10 > 0 && Tiles.Tiles_heights[var8][var48 - 1][var10 - 1] != 0) { + Tiles.Tiles_heights[var8][var48][var10] = Tiles.Tiles_heights[var8][var48 - 1][var10 - 1]; } } } } - ++var26; + ++var44; } } - CollisionMap.method3557(true); - WorldMapLabel.playPcmPlayers(); - Language.method3624(class14.scene, collisionMaps); - CollisionMap.method3557(true); - var26 = Tiles.Tiles_minPlane; - if (var26 > UrlRequest.Client_plane) { - var26 = UrlRequest.Client_plane; + UserComparator4.method3442(true); + UserComparator3.playPcmPlayers(); + GrandExchangeOfferNameComparator.method152(ServerBuild.scene, collisionMaps); + UserComparator4.method3442(true); + var44 = Tiles.Tiles_minPlane; + if (var44 > Clock.Client_plane) { + var44 = Clock.Client_plane; } - if (var26 < UrlRequest.Client_plane - 1) { - var26 = UrlRequest.Client_plane - 1; + if (var44 < Clock.Client_plane - 1) { + var44 = Clock.Client_plane - 1; } if (isLowDetail) { - class14.scene.init(Tiles.Tiles_minPlane); + ServerBuild.scene.init(Tiles.Tiles_minPlane); } else { - class14.scene.init(0); + ServerBuild.scene.init(0); } - for (var25 = 0; var25 < 104; ++var25) { + for (var4 = 0; var4 < 104; ++var4) { for (var5 = 0; var5 < 104; ++var5) { - Skills.updateItemPile(var25, var5); + WorldMapEvent.updateItemPile(var4, var5); + } + } + + UserComparator3.playPcmPlayers(); + + for (PendingSpawn var52 = (PendingSpawn)pendingSpawns.last(); var52 != null; var52 = (PendingSpawn)pendingSpawns.previous()) { + if (var52.hitpoints == -1) { + var52.delay = 0; + WorldMapDecoration.method347(var52); + } else { + var52.remove(); } } - WorldMapLabel.playPcmPlayers(); - class32.method556(); ObjectDefinition.ObjectDefinition_cachedModelData.clear(); - PacketBufferNode var37; - if (class206.client.hasFrame()) { - var37 = class2.getPacketBufferNode(ClientPacket.field2180, packetWriter.isaacCipher); - var37.packetBuffer.writeInt(1057001181); - packetWriter.addNode(var37); + PacketBufferNode var53; + if (Username.client.hasFrame()) { + var53 = TilePaint.getPacketBufferNode(ClientPacket.field2249, packetWriter.isaacCipher); + var53.packetBuffer.writeInt(1057001181); + packetWriter.addNode(var53); } if (!isInInstance) { - var25 = (GrandExchangeOfferTotalQuantityComparator.field47 - 6) / 8; - var5 = (GrandExchangeOfferTotalQuantityComparator.field47 + 6) / 8; - var6 = (ClanMate.field3567 - 6) / 8; - var7 = (ClanMate.field3567 + 6) / 8; + var4 = (SecureRandomCallable.field530 - 6) / 8; + var5 = (SecureRandomCallable.field530 + 6) / 8; + var47 = (Language.field2359 - 6) / 8; + var7 = (Language.field2359 + 6) / 8; - for (var39 = var25 - 1; var39 <= var5 + 1; ++var39) { - for (var32 = var6 - 1; var32 <= var7 + 1; ++var32) { - if (var39 < var25 || var39 > var5 || var32 < var6 || var32 > var7) { - AbstractWorldMapData.archive5.loadRegionFromName("m" + var39 + "_" + var32); - AbstractWorldMapData.archive5.loadRegionFromName("l" + var39 + "_" + var32); + for (var8 = var4 - 1; var8 <= var5 + 1; ++var8) { + for (var48 = var47 - 1; var48 <= var7 + 1; ++var48) { + if (var8 < var4 || var8 > var5 || var48 < var47 || var48 > var7) { + NetSocket.archive5.loadRegionFromName("m" + var8 + "_" + var48); + NetSocket.archive5.loadRegionFromName("l" + var8 + "_" + var48); } } } } - class195.updateGameState(30); - WorldMapLabel.playPcmPlayers(); - MusicPatchNode2.method3669(); - var37 = class2.getPacketBufferNode(ClientPacket.field2176, packetWriter.isaacCipher); - packetWriter.addNode(var37); - Skeleton.method3088(); + Projectile.updateGameState(30); + UserComparator3.playPcmPlayers(); + Players.method2179(); + var53 = TilePaint.getPacketBufferNode(ClientPacket.field2218, packetWriter.isaacCipher); + packetWriter.addNode(var53); + class2.method24(); } } } } else { - UserComparator8.doCycleTitle(this); + GrandExchangeEvents.doCycleTitle(this); } if (gameState == 30) { @@ -2168,142 +2147,152 @@ public final class Client extends GameShell implements Usernamed { } - @ObfuscatedName("ad") + @ObfuscatedName("ac") @ObfuscatedSignature( signature = "(ZI)V", - garbageValue = "-1655647135" + garbageValue = "-1486807503" ) @Export("draw") protected final void draw(boolean var1) { - boolean var2 = WorldMapCacheName.method619(); - if (var2 && field767 && UserComparator6.pcmPlayer0 != null) { - UserComparator6.pcmPlayer0.tryDiscard(); + boolean var2 = GrandExchangeOffer.method129(); + if (var2 && field881 && WorldMapLabelSize.pcmPlayer0 != null) { + WorldMapLabelSize.pcmPlayer0.tryDiscard(); } - if ((gameState == 10 || gameState == 20 || gameState == 30) && field841 != 0L && WorldMapID.currentTimeMillis() > field841) { - class60.setWindowedMode(ItemDefinition.getWindowedMode()); + if ((gameState == 10 || gameState == 20 || gameState == 30) && field859 != 0L && WorldMapIcon_0.currentTimeMillis() > field859) { + VertexNormal.setWindowedMode(Friend.getWindowedMode()); } int var3; if (var1) { for (var3 = 0; var3 < 100; ++var3) { - field833[var3] = true; + field851[var3] = true; } } if (gameState == 0) { this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1); } else if (gameState == 5) { - MidiPcmStream.drawTitle(GrandExchangeOffer.fontBold12, class3.fontPlain11, ScriptFrame.fontPlain12); + NetSocket.drawTitle(class1.fontBold12, WorldMapData_0.fontPlain11, class13.fontPlain12); } else if (gameState != 10 && gameState != 11) { if (gameState == 20) { - MidiPcmStream.drawTitle(GrandExchangeOffer.fontBold12, class3.fontPlain11, ScriptFrame.fontPlain12); + NetSocket.drawTitle(class1.fontBold12, WorldMapData_0.fontPlain11, class13.fontPlain12); } else if (gameState == 25) { - if (field734 == 1) { - if (field824 > field859) { - field859 = field824; + if (field695 == 1) { + if (field791 > field884) { + field884 = field791; } - var3 = (field859 * 50 - field824 * 50) / field859; - class1.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); - } else if (field734 == 2) { - if (field683 > field684) { - field684 = field683; + var3 = (field884 * 50 - field791 * 50) / field884; + class197.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); + } else if (field695 == 2) { + if (field700 > field733) { + field733 = field700; } - var3 = (field684 * 50 - field683 * 50) / field684 + 50; - class1.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); + var3 = (field733 * 50 - field700 * 50) / field733 + 50; + class197.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); } else { - class1.drawLoadingMessage("Loading - please wait.", false); + class197.drawLoadingMessage("Loading - please wait.", false); } } else if (gameState == 30) { this.drawLoggedIn(); } else if (gameState == 40) { - class1.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); + class197.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); } else if (gameState == 45) { - class1.drawLoadingMessage("Please wait...", false); + class197.drawLoadingMessage("Please wait...", false); } } else { - MidiPcmStream.drawTitle(GrandExchangeOffer.fontBold12, class3.fontPlain11, ScriptFrame.fontPlain12); + NetSocket.drawTitle(class1.fontBold12, WorldMapData_0.fontPlain11, class13.fontPlain12); } if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { for (var3 = 0; var3 < rootWidgetCount; ++var3) { - if (field834[var3]) { - IgnoreList.rasterProvider.draw(rootWidgetXs[var3], rootWidgetYs[var3], rootWidgetWidths[var3], rootWidgetHeights[var3]); - field834[var3] = false; + if (field852[var3]) { + DevicePcmPlayerProvider.rasterProvider.draw(rootWidgetXs[var3], rootWidgetYs[var3], rootWidgetWidths[var3], rootWidgetHeights[var3]); + field852[var3] = false; } } } else if (gameState > 0) { - IgnoreList.rasterProvider.drawFull(0, 0); + DevicePcmPlayerProvider.rasterProvider.drawFull(0, 0); for (var3 = 0; var3 < rootWidgetCount; ++var3) { - field834[var3] = false; + field852[var3] = false; } } } - @ObfuscatedName("aj") + @ObfuscatedName("aw") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1818676977" + garbageValue = "-2144356516" ) @Export("kill0") protected final void kill0() { - if (MilliClock.varcs.hasUnwrittenChanges()) { - MilliClock.varcs.write(); + if (class197.varcs.hasUnwrittenChanges()) { + class197.varcs.write(); } - if (class173.mouseRecorder != null) { - class173.mouseRecorder.isRunning = false; + if (class16.mouseRecorder != null) { + class16.mouseRecorder.isRunning = false; } - class173.mouseRecorder = null; + class16.mouseRecorder = null; packetWriter.close(); - class179.method3579(); + DevicePcmPlayerProvider.method855(); if (MouseHandler.MouseHandler_instance != null) { synchronized(MouseHandler.MouseHandler_instance) { MouseHandler.MouseHandler_instance = null; } } - MusicPatch.mouseWheel = null; - if (UserComparator6.pcmPlayer0 != null) { - UserComparator6.pcmPlayer0.shutdown(); + PacketWriter.mouseWheel = null; + if (WorldMapLabelSize.pcmPlayer0 != null) { + WorldMapLabelSize.pcmPlayer0.shutdown(); } - if (NetSocket.pcmPlayer1 != null) { - NetSocket.pcmPlayer1.shutdown(); + if (class43.pcmPlayer1 != null) { + class43.pcmPlayer1.shutdown(); } - ScriptEvent.method1183(); - class192.method3655(); - if (BufferedNetSocket.urlRequester != null) { - BufferedNetSocket.urlRequester.close(); - BufferedNetSocket.urlRequester = null; + WorldMapElement.method4470(); + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { + if (ArchiveDiskActionHandler.field3150 != 0) { + ArchiveDiskActionHandler.field3150 = 1; + + try { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); + } catch (InterruptedException var5) { + } + } + } + + if (WorldMapData_0.urlRequester != null) { + WorldMapData_0.urlRequester.close(); + WorldMapData_0.urlRequester = null; } try { JagexCache.JagexCache_dat2File.close(); - for (int var3 = 0; var3 < JagexCache.idxCount; ++var3) { - AttackOption.JagexCache_idxFiles[var3].close(); + for (int var4 = 0; var4 < JagexCache.idxCount; ++var4) { + MilliClock.JagexCache_idxFiles[var4].close(); } JagexCache.JagexCache_idx255File.close(); JagexCache.JagexCache_randomDat.close(); - } catch (Exception var5) { + } catch (Exception var7) { } } - @ObfuscatedName("bj") + @ObfuscatedName("an") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1677674321" + signature = "(B)V", + garbageValue = "-2" ) - protected final void vmethod1290() { + protected final void vmethod1478() { } public final void init() { @@ -2312,7 +2301,6 @@ public final class Client extends GameShell implements Usernamed { for (int var1 = 0; var1 <= 19; ++var1) { String var2 = this.getParameter(Integer.toString(var1)); if (var2 != null) { - int var4; switch(var1) { case 1: useBufferedSocket = Integer.parseInt(var2) != 0; @@ -2338,315 +2326,164 @@ public final class Client extends GameShell implements Usernamed { worldProperties = Integer.parseInt(var2); break; case 6: - var4 = Integer.parseInt(var2); - Language var14; - if (var4 >= 0 && var4 < Language.Language_valuesOrdered.length) { - var14 = Language.Language_valuesOrdered[var4]; - } else { - var14 = null; - } - - Varps.clientLanguage = var14; + FriendLoginUpdate.clientLanguage = Language.method3711(Integer.parseInt(var2)); break; case 7: - var4 = Integer.parseInt(var2); - ServerBuild[] var5 = new ServerBuild[]{ServerBuild.BUILDLIVE, ServerBuild.WIP, ServerBuild.LIVE, ServerBuild.RC}; - ServerBuild[] var6 = var5; - int var7 = 0; - - ServerBuild var13; - while (true) { - if (var7 >= var6.length) { - var13 = null; - break; - } - - ServerBuild var8 = var6[var7]; - if (var4 == var8.field3081) { - var13 = var8; - break; - } - - ++var7; - } - - class48.field402 = var13; + BuddyRankComparator.field1987 = class2.method31(Integer.parseInt(var2)); break; case 8: if (var2.equalsIgnoreCase("true")) { } break; case 9: - UserComparator10.field1943 = var2; + GameShell.field477 = var2; break; case 10: - StudioGame[] var3 = new StudioGame[]{StudioGame.stellardawn, StudioGame.game3, StudioGame.runescape, StudioGame.game4, StudioGame.oldscape, StudioGame.game5}; - AbstractWorldMapIcon.field284 = (StudioGame)DynamicObject.findEnumerated(var3, Integer.parseInt(var2)); - if (AbstractWorldMapIcon.field284 == StudioGame.oldscape) { - class188.loginType = LoginType.oldscape; + class14.field102 = (StudioGame)WorldMapSection0.findEnumerated(MusicPatchNode.method3898(), Integer.parseInt(var2)); + if (StudioGame.oldscape == class14.field102) { + class192.loginType = LoginType.oldscape; } else { - class188.loginType = LoginType.field4031; + class192.loginType = LoginType.field4029; } break; case 12: worldId = Integer.parseInt(var2); break; case 14: - MouseRecorder.field564 = Integer.parseInt(var2); + field672 = Integer.parseInt(var2); break; case 15: gameBuild = Integer.parseInt(var2); break; case 17: - TextureProvider.field1510 = var2; + StructDefinition.field3307 = var2; } } } - AbstractArchive.method4222(); - CollisionMap.worldHost = this.getCodeBase().getHost(); - String var9 = class48.field402.name; - byte var10 = 0; + Scene.Scene_isLowDetail = false; + isLowDetail = false; + NetSocket.worldHost = this.getCodeBase().getHost(); + String var11 = BuddyRankComparator.field1987.name; + byte var12 = 0; try { - WorldMapRegion.method504("oldschool", var9, var10, 21); - } catch (Exception var11) { - DesktopPlatformInfoProvider.RunException_sendStackTrace((String)null, var11); + JagexCache.idxCount = 21; + GrandExchangeOfferOwnWorldComparator.cacheGamebuild = var12; + + try { + MilliClock.field2015 = System.getProperty("os.name"); + } catch (Exception var17) { + MilliClock.field2015 = "Unknown"; + } + + class160.field1998 = MilliClock.field2015.toLowerCase(); + + try { + UserComparator4.userHomeDirectory = System.getProperty("user.home"); + if (UserComparator4.userHomeDirectory != null) { + UserComparator4.userHomeDirectory = UserComparator4.userHomeDirectory + "/"; + } + } catch (Exception var16) { + } + + try { + if (class160.field1998.startsWith("win")) { + if (UserComparator4.userHomeDirectory == null) { + UserComparator4.userHomeDirectory = System.getenv("USERPROFILE"); + } + } else if (UserComparator4.userHomeDirectory == null) { + UserComparator4.userHomeDirectory = System.getenv("HOME"); + } + + if (UserComparator4.userHomeDirectory != null) { + UserComparator4.userHomeDirectory = UserComparator4.userHomeDirectory + "/"; + } + } catch (Exception var15) { + } + + if (UserComparator4.userHomeDirectory == null) { + UserComparator4.userHomeDirectory = "~/"; + } + + ChatChannel.field1291 = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", UserComparator4.userHomeDirectory, "/tmp/", ""}; + class42.field373 = new String[]{".jagex_cache_" + GrandExchangeOfferOwnWorldComparator.cacheGamebuild, ".file_store_" + GrandExchangeOfferOwnWorldComparator.cacheGamebuild}; + + int var13; + label136: + for (var13 = 0; var13 < 4; ++var13) { + JagexCache.cacheDir = GrandExchangeOfferOwnWorldComparator.method1311("oldschool", var11, var13); + if (!JagexCache.cacheDir.exists()) { + JagexCache.cacheDir.mkdirs(); + } + + File[] var4 = JagexCache.cacheDir.listFiles(); + if (var4 == null) { + break; + } + + File[] var5 = var4; + int var6 = 0; + + while (true) { + if (var6 >= var5.length) { + break label136; + } + + File var7 = var5[var6]; + + boolean var8; + try { + RandomAccessFile var9 = new RandomAccessFile(var7, "rw"); + int var10 = var9.read(); + var9.seek(0L); + var9.write(var10); + var9.seek(0L); + var9.close(); + var8 = true; + } catch (Exception var14) { + var8 = false; + } + + if (!var8) { + break; + } + + ++var6; + } + } + + class208.method4016(JagexCache.cacheDir); + class3.method52(); + JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(UserComparator3.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); + JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(UserComparator3.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); + MilliClock.JagexCache_idxFiles = new BufferedFile[JagexCache.idxCount]; + + for (var13 = 0; var13 < JagexCache.idxCount; ++var13) { + MilliClock.JagexCache_idxFiles[var13] = new BufferedFile(new AccessFile(UserComparator3.getFile("main_file_cache.idx" + var13), "rw", 1048576L), 6000, 0); + } + } catch (Exception var18) { + class225.RunException_sendStackTrace((String)null, var18); } - class206.client = this; + Username.client = this; RunException.clientType = clientType; - this.startThread(765, 503, 187); + this.startThread(765, 503, 188); } - } catch (RuntimeException var12) { - throw WorldMapAreaData.newRunException(var12, "client.init(" + ')'); + } catch (RuntimeException var19) { + throw class218.newRunException(var19, "client.init(" + ')'); } } - @ObfuscatedName("ff") + @ObfuscatedName("ew") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-67" + signature = "(I)V", + garbageValue = "1362908208" ) @Export("doCycleJs5") void doCycleJs5() { if (gameState != 1000) { - long var2 = WorldMapID.currentTimeMillis(); - int var4 = (int)(var2 - NetCache.field3138); - NetCache.field3138 = var2; - if (var4 > 200) { - var4 = 200; - } - - NetCache.NetCache_loadTime += var4; - boolean var1; - if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { - var1 = true; - } else if (class297.NetCache_socket == null) { - var1 = false; - } else { - try { - label241: { - if (NetCache.NetCache_loadTime > 30000) { - throw new IOException(); - } - - NetFileRequest var5; - Buffer var6; - while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { - var5 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); - var6 = new Buffer(4); - var6.writeByte(1); - var6.writeMedium((int)var5.key); - class297.NetCache_socket.write(var6.array, 0, 4); - NetCache.NetCache_pendingPriorityResponses.put(var5, var5.key); - --NetCache.NetCache_pendingPriorityWritesCount; - ++NetCache.NetCache_pendingPriorityResponsesCount; - } - - while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { - var5 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); - var6 = new Buffer(4); - var6.writeByte(0); - var6.writeMedium((int)var5.key); - class297.NetCache_socket.write(var6.array, 0, 4); - var5.removeDual(); - NetCache.NetCache_pendingResponses.put(var5, var5.key); - --NetCache.NetCache_pendingWritesCount; - ++NetCache.NetCache_pendingResponsesCount; - } - - for (int var17 = 0; var17 < 100; ++var17) { - int var18 = class297.NetCache_socket.available(); - if (var18 < 0) { - throw new IOException(); - } - - if (var18 == 0) { - break; - } - - NetCache.NetCache_loadTime = 0; - byte var7 = 0; - if (PrivateChatMode.NetCache_currentResponse == null) { - var7 = 8; - } else if (NetCache.field3150 == 0) { - var7 = 1; - } - - int var8; - int var9; - int var10; - int var12; - byte[] var10000; - int var10001; - Buffer var25; - if (var7 > 0) { - var8 = var7 - NetCache.NetCache_responseHeaderBuffer.offset; - if (var8 > var18) { - var8 = var18; - } - - class297.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var8); - if (NetCache.field3145 != 0) { - for (var9 = 0; var9 < var8; ++var9) { - var10000 = NetCache.NetCache_responseHeaderBuffer.array; - var10001 = var9 + NetCache.NetCache_responseHeaderBuffer.offset; - var10000[var10001] ^= NetCache.field3145; - } - } - - var25 = NetCache.NetCache_responseHeaderBuffer; - var25.offset += var8; - if (NetCache.NetCache_responseHeaderBuffer.offset < var7) { - break; - } - - if (PrivateChatMode.NetCache_currentResponse == null) { - NetCache.NetCache_responseHeaderBuffer.offset = 0; - var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); - var10 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); - int var11 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); - var12 = NetCache.NetCache_responseHeaderBuffer.readInt(); - long var13 = (long)(var10 + (var9 << 16)); - NetFileRequest var15 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var13); - class14.field89 = true; - if (var15 == null) { - var15 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var13); - class14.field89 = false; - } - - if (var15 == null) { - throw new IOException(); - } - - int var16 = var11 == 0 ? 5 : 9; - PrivateChatMode.NetCache_currentResponse = var15; - NetCache.NetCache_responseArchiveBuffer = new Buffer(var16 + var12 + PrivateChatMode.NetCache_currentResponse.padding); - NetCache.NetCache_responseArchiveBuffer.writeByte(var11); - NetCache.NetCache_responseArchiveBuffer.writeInt(var12); - NetCache.field3150 = 8; - NetCache.NetCache_responseHeaderBuffer.offset = 0; - } else if (NetCache.field3150 == 0) { - if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { - NetCache.field3150 = 1; - NetCache.NetCache_responseHeaderBuffer.offset = 0; - } else { - PrivateChatMode.NetCache_currentResponse = null; - } - } - } else { - var8 = NetCache.NetCache_responseArchiveBuffer.array.length - PrivateChatMode.NetCache_currentResponse.padding; - var9 = 512 - NetCache.field3150; - if (var9 > var8 - NetCache.NetCache_responseArchiveBuffer.offset) { - var9 = var8 - NetCache.NetCache_responseArchiveBuffer.offset; - } - - if (var9 > var18) { - var9 = var18; - } - - class297.NetCache_socket.read(NetCache.NetCache_responseArchiveBuffer.array, NetCache.NetCache_responseArchiveBuffer.offset, var9); - if (NetCache.field3145 != 0) { - for (var10 = 0; var10 < var9; ++var10) { - var10000 = NetCache.NetCache_responseArchiveBuffer.array; - var10001 = NetCache.NetCache_responseArchiveBuffer.offset + var10; - var10000[var10001] ^= NetCache.field3145; - } - } - - var25 = NetCache.NetCache_responseArchiveBuffer; - var25.offset += var9; - NetCache.field3150 += var9; - if (var8 == NetCache.NetCache_responseArchiveBuffer.offset) { - if (16711935L == PrivateChatMode.NetCache_currentResponse.key) { - NetCache.NetCache_reference = NetCache.NetCache_responseArchiveBuffer; - - for (var10 = 0; var10 < 256; ++var10) { - Archive var19 = NetCache.NetCache_archives[var10]; - if (var19 != null) { - NetCache.NetCache_reference.offset = var10 * 8 + 5; - var12 = NetCache.NetCache_reference.readInt(); - int var20 = NetCache.NetCache_reference.readInt(); - var19.loadIndex(var12, var20); - } - } - } else { - NetCache.NetCache_crc.reset(); - NetCache.NetCache_crc.update(NetCache.NetCache_responseArchiveBuffer.array, 0, var8); - var10 = (int)NetCache.NetCache_crc.getValue(); - if (var10 != PrivateChatMode.NetCache_currentResponse.crc) { - try { - class297.NetCache_socket.close(); - } catch (Exception var23) { - } - - ++NetCache.NetCache_crcMismatches; - class297.NetCache_socket = null; - NetCache.field3145 = (byte)((int)(Math.random() * 255.0D + 1.0D)); - var1 = false; - break label241; - } - - NetCache.NetCache_crcMismatches = 0; - NetCache.NetCache_ioExceptions = 0; - PrivateChatMode.NetCache_currentResponse.archive.write((int)(PrivateChatMode.NetCache_currentResponse.key & 65535L), NetCache.NetCache_responseArchiveBuffer.array, (PrivateChatMode.NetCache_currentResponse.key & 16711680L) == 16711680L, class14.field89); - } - - PrivateChatMode.NetCache_currentResponse.remove(); - if (class14.field89) { - --NetCache.NetCache_pendingPriorityResponsesCount; - } else { - --NetCache.NetCache_pendingResponsesCount; - } - - NetCache.field3150 = 0; - PrivateChatMode.NetCache_currentResponse = null; - NetCache.NetCache_responseArchiveBuffer = null; - } else { - if (NetCache.field3150 != 512) { - break; - } - - NetCache.field3150 = 0; - } - } - } - - var1 = true; - } - } catch (IOException var24) { - try { - class297.NetCache_socket.close(); - } catch (Exception var22) { - } - - ++NetCache.NetCache_ioExceptions; - class297.NetCache_socket = null; - var1 = false; - } - } - + boolean var1 = WorldMapDecorationType.method4187(); if (!var1) { this.doCycleJs5Connect(); } @@ -2654,10 +2491,10 @@ public final class Client extends GameShell implements Usernamed { } } - @ObfuscatedName("fe") + @ObfuscatedName("ed") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "-21988" + signature = "(B)V", + garbageValue = "59" ) @Export("doCycleJs5Connect") void doCycleJs5Connect() { @@ -2672,66 +2509,123 @@ public final class Client extends GameShell implements Usernamed { return; } - field660 = 3000; + field675 = 3000; NetCache.NetCache_ioExceptions = 3; } - if (--field660 + 1 <= 0) { + if (--field675 + 1 <= 0) { try { if (js5ConnectState == 0) { - SecureRandomCallable.js5SocketTask = GameShell.taskHandler.newSocketTask(CollisionMap.worldHost, WorldMapData_1.port3); + TileItemPile.js5SocketTask = GameShell.taskHandler.newSocketTask(NetSocket.worldHost, WorldMapSection2.port3); ++js5ConnectState; } if (js5ConnectState == 1) { - if (SecureRandomCallable.js5SocketTask.status == 2) { + if (TileItemPile.js5SocketTask.status == 2) { this.js5Error(-1); return; } - if (SecureRandomCallable.js5SocketTask.status == 1) { + if (TileItemPile.js5SocketTask.status == 1) { ++js5ConnectState; } } if (js5ConnectState == 2) { if (useBufferedSocket) { - ModelData0.js5Socket = Buddy.method5215((Socket)SecureRandomCallable.js5SocketTask.result, 40000, 5000); + WorldMapIcon_0.js5Socket = Bounds.method6040((Socket)TileItemPile.js5SocketTask.result, 40000, 5000); } else { - ModelData0.js5Socket = new NetSocket((Socket)SecureRandomCallable.js5SocketTask.result, GameShell.taskHandler, 5000); + WorldMapIcon_0.js5Socket = new NetSocket((Socket)TileItemPile.js5SocketTask.result, GameShell.taskHandler, 5000); } Buffer var1 = new Buffer(5); var1.writeByte(15); - var1.writeInt(187); - ModelData0.js5Socket.write(var1.array, 0, 5); + var1.writeInt(188); + WorldMapIcon_0.js5Socket.write(var1.array, 0, 5); ++js5ConnectState; - ItemContainer.field519 = WorldMapID.currentTimeMillis(); + ServerBuild.field3111 = WorldMapIcon_0.currentTimeMillis(); } if (js5ConnectState == 3) { - if (ModelData0.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { - int var2 = ModelData0.js5Socket.readUnsignedByte(); - if (var2 != 0) { - this.js5Error(var2); + if (WorldMapIcon_0.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { + int var5 = WorldMapIcon_0.js5Socket.readUnsignedByte(); + if (var5 != 0) { + this.js5Error(var5); return; } ++js5ConnectState; - } else if (WorldMapID.currentTimeMillis() - ItemContainer.field519 > 30000L) { + } else if (WorldMapIcon_0.currentTimeMillis() - ServerBuild.field3111 > 30000L) { this.js5Error(-2); return; } } if (js5ConnectState == 4) { - FriendsList.method5229(ModelData0.js5Socket, gameState > 20); - SecureRandomCallable.js5SocketTask = null; - ModelData0.js5Socket = null; - js5ConnectState = 0; - js5Errors = 0; + AbstractSocket var10 = WorldMapIcon_0.js5Socket; + boolean var2 = gameState > 20; + if (NetCache.NetCache_socket != null) { + try { + NetCache.NetCache_socket.close(); + } catch (Exception var8) { + } + + NetCache.NetCache_socket = null; + } + + NetCache.NetCache_socket = var10; + TextureProvider.method2833(var2); + NetCache.NetCache_responseHeaderBuffer.offset = 0; + GrandExchangeEvent.NetCache_currentResponse = null; + VertexNormal.NetCache_responseArchiveBuffer = null; + NetCache.field3181 = 0; + + while (true) { + NetFileRequest var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); + if (var3 == null) { + while (true) { + var3 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); + if (var3 == null) { + if (NetCache.field3184 != 0) { + try { + Buffer var11 = new Buffer(4); + var11.writeByte(4); + var11.writeByte(NetCache.field3184); + var11.writeShort(0); + NetCache.NetCache_socket.write(var11.array, 0, 4); + } catch (IOException var7) { + try { + NetCache.NetCache_socket.close(); + } catch (Exception var6) { + } + + ++NetCache.NetCache_ioExceptions; + NetCache.NetCache_socket = null; + } + } + + NetCache.NetCache_loadTime = 0; + NetCache.field3170 = WorldMapIcon_0.currentTimeMillis(); + TileItemPile.js5SocketTask = null; + WorldMapIcon_0.js5Socket = null; + js5ConnectState = 0; + js5Errors = 0; + return; + } + + NetCache.NetCache_pendingWritesQueue.addLast(var3); + NetCache.NetCache_pendingWrites.put(var3, var3.key); + ++NetCache.NetCache_pendingWritesCount; + --NetCache.NetCache_pendingResponsesCount; + } + } + + NetCache.NetCache_pendingPriorityWrites.put(var3, var3.key); + ++NetCache.NetCache_pendingPriorityWritesCount; + --NetCache.NetCache_pendingPriorityResponsesCount; + } } - } catch (IOException var3) { + } catch (IOException var9) { this.js5Error(-3); } @@ -2739,48 +2633,48 @@ public final class Client extends GameShell implements Usernamed { } } - @ObfuscatedName("fk") + @ObfuscatedName("fl") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1925866063" + signature = "(IB)V", + garbageValue = "-52" ) @Export("js5Error") void js5Error(int var1) { - SecureRandomCallable.js5SocketTask = null; - ModelData0.js5Socket = null; + TileItemPile.js5SocketTask = null; + WorldMapIcon_0.js5Socket = null; js5ConnectState = 0; - if (WorldMapData_1.port3 == class197.port1) { - WorldMapData_1.port3 = MouseRecorder.port2; + if (WorldMapSection2.port3 == WorldMapLabelSize.port1) { + WorldMapSection2.port3 = port2; } else { - WorldMapData_1.port3 = class197.port1; + WorldMapSection2.port3 = WorldMapLabelSize.port1; } ++js5Errors; - if (js5Errors >= 2 && (var1 == 7 || var1 == 9)) { - if (gameState <= 5) { - this.error("js5connect_full"); + if (js5Errors < 2 || var1 != 7 && var1 != 9) { + if (js5Errors >= 2 && var1 == 6) { + this.error("js5connect_outofdate"); gameState = 1000; - } else { - field660 = 3000; + } else if (js5Errors >= 4) { + if (gameState <= 5) { + this.error("js5connect"); + gameState = 1000; + } else { + field675 = 3000; + } } - } else if (js5Errors >= 2 && var1 == 6) { - this.error("js5connect_outofdate"); + } else if (gameState <= 5) { + this.error("js5connect_full"); gameState = 1000; - } else if (js5Errors >= 4) { - if (gameState <= 5) { - this.error("js5connect"); - gameState = 1000; - } else { - field660 = 3000; - } + } else { + field675 = 3000; } } - @ObfuscatedName("fu") + @ObfuscatedName("fz") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-443791919" + garbageValue = "1666234502" ) @Export("doCycleLoggedOut") final void doCycleLoggedOut() { @@ -2789,94 +2683,88 @@ public final class Client extends GameShell implements Usernamed { try { if (loginState == 0) { - if (Login.secureRandom == null && (secureRandomFuture.isDone() || field663 > 250)) { - Login.secureRandom = secureRandomFuture.get(); + if (ScriptEvent.secureRandom == null && (secureRandomFuture.isDone() || field679 > 250)) { + ScriptEvent.secureRandom = secureRandomFuture.get(); secureRandomFuture.shutdown(); secureRandomFuture = null; } - if (Login.secureRandom != null) { + if (ScriptEvent.secureRandom != null) { if (var1 != null) { ((AbstractSocket)var1).close(); var1 = null; } - MenuAction.socketTask = null; - field677 = false; - field663 = 0; + NetFileRequest.socketTask = null; + field800 = false; + field679 = 0; loginState = 1; } } if (loginState == 1) { - if (MenuAction.socketTask == null) { - MenuAction.socketTask = GameShell.taskHandler.newSocketTask(CollisionMap.worldHost, WorldMapData_1.port3); + if (NetFileRequest.socketTask == null) { + NetFileRequest.socketTask = GameShell.taskHandler.newSocketTask(NetSocket.worldHost, WorldMapSection2.port3); } - if (MenuAction.socketTask.status == 2) { + if (NetFileRequest.socketTask.status == 2) { throw new IOException(); } - if (MenuAction.socketTask.status == 1) { + if (NetFileRequest.socketTask.status == 1) { if (useBufferedSocket) { - var1 = Buddy.method5215((Socket)MenuAction.socketTask.result, 40000, 5000); + var1 = Bounds.method6040((Socket)NetFileRequest.socketTask.result, 40000, 5000); } else { - var1 = new NetSocket((Socket)MenuAction.socketTask.result, GameShell.taskHandler, 5000); + var1 = new NetSocket((Socket)NetFileRequest.socketTask.result, GameShell.taskHandler, 5000); } packetWriter.setSocket((AbstractSocket)var1); - MenuAction.socketTask = null; + NetFileRequest.socketTask = null; loginState = 2; } } if (loginState == 2) { packetWriter.clearBuffer(); - PacketBufferNode var4; - if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { - var4 = new PacketBufferNode(); - } else { - var4 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; - } - + PacketBufferNode var4 = UserComparator5.method3488(); var4.clientPacket = null; var4.clientPacketLength = 0; var4.packetBuffer = new PacketBuffer(5000); - var4.packetBuffer.writeByte(LoginPacket.field2282.id); + var4.packetBuffer.writeByte(LoginPacket.field2310.id); packetWriter.addNode(var4); packetWriter.flush(); var2.offset = 0; loginState = 3; } - boolean var13; - int var14; + boolean var14; + int var15; if (loginState == 3) { - if (UserComparator6.pcmPlayer0 != null) { - UserComparator6.pcmPlayer0.method2472(); + if (WorldMapLabelSize.pcmPlayer0 != null) { + WorldMapLabelSize.pcmPlayer0.method2489(); } - if (NetSocket.pcmPlayer1 != null) { - NetSocket.pcmPlayer1.method2472(); + if (class43.pcmPlayer1 != null) { + class43.pcmPlayer1.method2489(); } - var13 = true; + var14 = true; if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { - var13 = false; + var14 = false; } - if (var13) { - var14 = ((AbstractSocket)var1).readUnsignedByte(); - if (UserComparator6.pcmPlayer0 != null) { - UserComparator6.pcmPlayer0.method2472(); + if (var14) { + var15 = ((AbstractSocket)var1).readUnsignedByte(); + if (WorldMapLabelSize.pcmPlayer0 != null) { + WorldMapLabelSize.pcmPlayer0.method2489(); } - if (NetSocket.pcmPlayer1 != null) { - NetSocket.pcmPlayer1.method2472(); + if (class43.pcmPlayer1 != null) { + class43.pcmPlayer1.method2489(); } - if (var14 != 0) { - ModelData0.getLoginError(var14); + if (var15 != 0) { + GameShell.getLoginError(var15); return; } @@ -2885,23 +2773,23 @@ public final class Client extends GameShell implements Usernamed { } } - int var28; + int var33; if (loginState == 4) { if (var2.offset < 8) { - var28 = ((AbstractSocket)var1).available(); - if (var28 > 8 - var2.offset) { - var28 = 8 - var2.offset; + var33 = ((AbstractSocket)var1).available(); + if (var33 > 8 - var2.offset) { + var33 = 8 - var2.offset; } - if (var28 > 0) { - ((AbstractSocket)var1).read(var2.array, var2.offset, var28); - var2.offset += var28; + if (var33 > 0) { + ((AbstractSocket)var1).read(var2.array, var2.offset, var33); + var2.offset += var33; } } if (var2.offset == 8) { var2.offset = 0; - class2.field4 = var2.readLong(); + WorldMapLabel.field250 = var2.readLong(); loginState = 5; } } @@ -2910,136 +2798,157 @@ public final class Client extends GameShell implements Usernamed { packetWriter.packetBuffer.offset = 0; packetWriter.clearBuffer(); PacketBuffer var3 = new PacketBuffer(500); - int[] var22 = new int[]{Login.secureRandom.nextInt(), Login.secureRandom.nextInt(), Login.secureRandom.nextInt(), Login.secureRandom.nextInt()}; + int[] var28 = new int[]{ScriptEvent.secureRandom.nextInt(), ScriptEvent.secureRandom.nextInt(), ScriptEvent.secureRandom.nextInt(), ScriptEvent.secureRandom.nextInt()}; var3.offset = 0; var3.writeByte(1); - var3.writeInt(var22[0]); - var3.writeInt(var22[1]); - var3.writeInt(var22[2]); - var3.writeInt(var22[3]); - var3.writeLong(class2.field4); + var3.writeInt(var28[0]); + var3.writeInt(var28[1]); + var3.writeInt(var28[2]); + var3.writeInt(var28[3]); + var3.writeLong(WorldMapLabel.field250); if (gameState == 40) { - var3.writeInt(GrandExchangeOfferOwnWorldComparator.field626[0]); - var3.writeInt(GrandExchangeOfferOwnWorldComparator.field626[1]); - var3.writeInt(GrandExchangeOfferOwnWorldComparator.field626[2]); - var3.writeInt(GrandExchangeOfferOwnWorldComparator.field626[3]); + var3.writeInt(WorldMapSection1.field295[0]); + var3.writeInt(WorldMapSection1.field295[1]); + var3.writeInt(WorldMapSection1.field295[2]); + var3.writeInt(WorldMapSection1.field295[3]); } else { - var3.writeByte(field743.rsOrdinal()); - switch(field743.field1987) { + var3.writeByte(field682.rsOrdinal()); + switch(field682.field1992) { case 0: - case 1: - var3.writeMedium(class266.field3517); + case 3: + var3.writeMedium(Frames.field1885); ++var3.offset; break; - case 2: - var3.writeInt((Integer)Interpreter.clientPreferences.parameters.get(UrlRequester.method3299(Login.Login_username))); + case 1: + LinkedHashMap var6 = WorldMapSection2.clientPreferences.parameters; + String var8 = Login.Login_username; + int var9 = var8.length(); + int var10 = 0; + + for (int var11 = 0; var11 < var9; ++var11) { + var10 = (var10 << 5) - var10 + var8.charAt(var11); + } + + var3.writeInt((Integer)var6.get(var10)); break; - case 3: + case 2: var3.offset += 4; } - var3.writeByte(class312.field3813.rsOrdinal()); + var3.writeByte(class313.field3815.rsOrdinal()); var3.writeStringCp1252NullTerminated(Login.Login_password); } - var3.encryptRsa(class83.field1144, class83.field1142); - GrandExchangeOfferOwnWorldComparator.field626 = var22; - PacketBufferNode var6; - if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { - var6 = new PacketBufferNode(); - } else { - var6 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; - } - - var6.clientPacket = null; - var6.clientPacketLength = 0; - var6.packetBuffer = new PacketBuffer(5000); - var6.packetBuffer.offset = 0; + var3.encryptRsa(class83.field1151, class83.field1150); + WorldMapSection1.field295 = var28; + PacketBufferNode var31 = UserComparator5.method3488(); + var31.clientPacket = null; + var31.clientPacketLength = 0; + var31.packetBuffer = new PacketBuffer(5000); + var31.packetBuffer.offset = 0; if (gameState == 40) { - var6.packetBuffer.writeByte(LoginPacket.field2283.id); + var31.packetBuffer.writeByte(LoginPacket.field2313.id); } else { - var6.packetBuffer.writeByte(LoginPacket.field2285.id); + var31.packetBuffer.writeByte(LoginPacket.field2308.id); } - var6.packetBuffer.writeShort(0); - int var15 = var6.packetBuffer.offset; - var6.packetBuffer.writeInt(187); - var6.packetBuffer.writeInt(1); - var6.packetBuffer.writeByte(clientType); - var6.packetBuffer.writeBytes(var3.array, 0, var3.offset); - int var8 = var6.packetBuffer.offset; - var6.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); - var6.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); - var6.packetBuffer.writeShort(GrandExchangeOfferTotalQuantityComparator.canvasWidth); - var6.packetBuffer.writeShort(AttackOption.canvasHeight); - PacketBuffer var9 = var6.packetBuffer; + var31.packetBuffer.writeShort(0); + int var7 = var31.packetBuffer.offset; + var31.packetBuffer.writeInt(188); + var31.packetBuffer.writeInt(1); + var31.packetBuffer.writeByte(clientType); + var31.packetBuffer.writeBytes(var3.array, 0, var3.offset); + int var16 = var31.packetBuffer.offset; + var31.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); + var31.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); + var31.packetBuffer.writeShort(Username.canvasWidth); + var31.packetBuffer.writeShort(WorldMapData_1.canvasHeight); + PacketBuffer var17 = var31.packetBuffer; + int var12; if (randomDatData != null) { - var9.writeBytes(randomDatData, 0, randomDatData.length); + var17.writeBytes(randomDatData, 0, randomDatData.length); } else { - byte[] var10 = MenuAction.method2068(); - var9.writeBytes(var10, 0, var10.length); + byte[] var18 = new byte[24]; + + try { + JagexCache.JagexCache_randomDat.seek(0L); + JagexCache.JagexCache_randomDat.readFully(var18); + + for (var12 = 0; var12 < 24 && var18[var12] == 0; ++var12) { + } + + if (var12 >= 24) { + throw new IOException(); + } + } catch (Exception var25) { + for (int var13 = 0; var13 < 24; ++var13) { + var18[var13] = -1; + } + } + + var17.writeBytes(var18, 0, var18.length); } - var6.packetBuffer.writeStringCp1252NullTerminated(UserComparator10.field1943); - var6.packetBuffer.writeInt(MouseRecorder.field564); - Buffer var27 = new Buffer(class42.platformInfo.size()); - class42.platformInfo.write(var27); - var6.packetBuffer.writeBytes(var27.array, 0, var27.array.length); - var6.packetBuffer.writeByte(clientType); - var6.packetBuffer.writeInt(0); - var6.packetBuffer.writeInt(ClientPacket.archive0.hash); - var6.packetBuffer.writeInt(ItemDefinition.archive1.hash); - var6.packetBuffer.writeInt(class2.archive2.hash); - var6.packetBuffer.writeInt(WorldMapData_1.archive3.hash); - var6.packetBuffer.writeInt(FloorDecoration.archive4.hash); - var6.packetBuffer.writeInt(AbstractWorldMapData.archive5.hash); - var6.packetBuffer.writeInt(GrandExchangeOfferWorldComparator.archive6.hash); - var6.packetBuffer.writeInt(MouseRecorder.archive7.hash); - var6.packetBuffer.writeInt(class3.archive8.hash); - var6.packetBuffer.writeInt(WorldMapManager.archive9.hash); - var6.packetBuffer.writeInt(ServerBuild.archive10.hash); - var6.packetBuffer.writeInt(class48.archive11.hash); - var6.packetBuffer.writeInt(SoundSystem.archive12.hash); - var6.packetBuffer.writeInt(WorldMapSection1.archive13.hash); - var6.packetBuffer.writeInt(class117.archive14.hash); - var6.packetBuffer.writeInt(GrandExchangeOfferTotalQuantityComparator.archive15.hash); - var6.packetBuffer.writeInt(0); - var6.packetBuffer.writeInt(GrandExchangeOfferNameComparator.archive17.hash); - var6.packetBuffer.writeInt(AbstractWorldMapData.archive18.hash); - var6.packetBuffer.writeInt(MusicPatchNode2.archive19.hash); - var6.packetBuffer.writeInt(UserComparator9.archive20.hash); - var6.packetBuffer.xteaEncrypt(var22, var8, var6.packetBuffer.offset); - var6.packetBuffer.writeLengthShort(var6.packetBuffer.offset - var15); - packetWriter.addNode(var6); + var31.packetBuffer.writeStringCp1252NullTerminated(GameShell.field477); + var31.packetBuffer.writeInt(field672); + Buffer var20 = new Buffer(NetSocket.platformInfo.size()); + NetSocket.platformInfo.write(var20); + var31.packetBuffer.writeBytes(var20.array, 0, var20.array.length); + var31.packetBuffer.writeByte(clientType); + var31.packetBuffer.writeInt(0); + var31.packetBuffer.writeInt(GrandExchangeEvent.archive0.hash); + var31.packetBuffer.writeInt(class65.archive1.hash); + var31.packetBuffer.writeInt(GrandExchangeOfferWorldComparator.archive2.hash); + var31.packetBuffer.writeInt(class267.archive3.hash); + var31.packetBuffer.writeInt(archive4.hash); + var31.packetBuffer.writeInt(NetSocket.archive5.hash); + var31.packetBuffer.writeInt(MouseHandler.archive6.hash); + var31.packetBuffer.writeInt(BuddyRankComparator.archive7.hash); + var31.packetBuffer.writeInt(UserComparator8.archive8.hash); + var31.packetBuffer.writeInt(GrandExchangeOfferNameComparator.archive9.hash); + var31.packetBuffer.writeInt(HealthBar.archive10.hash); + var31.packetBuffer.writeInt(GrandExchangeOffer.archive11.hash); + var31.packetBuffer.writeInt(MilliClock.archive12.hash); + var31.packetBuffer.writeInt(MouseHandler.archive13.hash); + var31.packetBuffer.writeInt(class189.archive14.hash); + var31.packetBuffer.writeInt(WorldMapSection1.archive15.hash); + var31.packetBuffer.writeInt(0); + var31.packetBuffer.writeInt(archive17.hash); + var31.packetBuffer.writeInt(UserComparator2.archive18.hash); + var31.packetBuffer.writeInt(Clock.archive19.hash); + var31.packetBuffer.writeInt(SecureRandomCallable.archive20.hash); + var31.packetBuffer.xteaEncrypt(var28, var16, var31.packetBuffer.offset); + var31.packetBuffer.writeLengthShort(var31.packetBuffer.offset - var7); + packetWriter.addNode(var31); packetWriter.flush(); - packetWriter.isaacCipher = new IsaacCipher(var22); - int[] var11 = new int[4]; + packetWriter.isaacCipher = new IsaacCipher(var28); + int[] var35 = new int[4]; - for (int var12 = 0; var12 < 4; ++var12) { - var11[var12] = var22[var12] + 50; + for (var12 = 0; var12 < 4; ++var12) { + var35[var12] = var28[var12] + 50; } - var2.newIsaacCipher(var11); + var2.newIsaacCipher(var35); loginState = 6; } if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { - var28 = ((AbstractSocket)var1).readUnsignedByte(); - if (var28 == 21 && gameState == 20) { + var33 = ((AbstractSocket)var1).readUnsignedByte(); + if (var33 == 21 && gameState == 20) { loginState = 9; - } else if (var28 == 2) { + } else if (var33 == 2) { loginState = 11; - } else if (var28 == 15 && gameState == 40) { + } else if (var33 == 15 && gameState == 40) { packetWriter.serverPacketLength = -1; loginState = 16; - } else if (var28 == 64) { + } else if (var33 == 64) { loginState = 7; - } else if (var28 == 23 && field740 < 1) { - ++field740; + } else if (var33 == 23 && field680 < 1) { + ++field680; loginState = 0; } else { - if (var28 != 29) { - ModelData0.getLoginError(var28); + if (var33 != 29) { + GameShell.getLoginError(var33); return; } @@ -3048,109 +2957,119 @@ public final class Client extends GameShell implements Usernamed { } if (loginState == 7 && ((AbstractSocket)var1).available() > 0) { - ClanMate.field3566 = ((AbstractSocket)var1).readUnsignedByte(); + WorldMapIcon_0.field148 = ((AbstractSocket)var1).readUnsignedByte(); loginState = 8; } - if (loginState == 8 && ((AbstractSocket)var1).available() >= ClanMate.field3566) { - ((AbstractSocket)var1).read(var2.array, 0, ClanMate.field3566); + if (loginState == 8 && ((AbstractSocket)var1).available() >= WorldMapIcon_0.field148) { + ((AbstractSocket)var1).read(var2.array, 0, WorldMapIcon_0.field148); var2.offset = 0; loginState = 6; } if (loginState == 9 && ((AbstractSocket)var1).available() > 0) { - field665 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; + field681 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; loginState = 10; } if (loginState == 10) { - field663 = 0; - AbstractWorldMapData.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field665 / 60 + " seconds."); - if (--field665 <= 0) { + field679 = 0; + Tiles.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field681 / 60 + " seconds."); + if (--field681 <= 0) { loginState = 0; } } else { if (loginState == 11 && ((AbstractSocket)var1).available() >= 1) { - class54.field482 = ((AbstractSocket)var1).readUnsignedByte(); + class189.field2353 = ((AbstractSocket)var1).readUnsignedByte(); loginState = 12; } - int var16; - if (loginState == 12 && ((AbstractSocket)var1).available() >= class54.field482) { - var13 = ((AbstractSocket)var1).readUnsignedByte() == 1; + if (loginState == 12 && ((AbstractSocket)var1).available() >= class189.field2353) { + var14 = ((AbstractSocket)var1).readUnsignedByte() == 1; ((AbstractSocket)var1).read(var2.array, 0, 4); var2.offset = 0; - boolean var29 = false; - if (var13) { - var14 = var2.readByteIsaac() << 24; - var14 |= var2.readByteIsaac() << 16; - var14 |= var2.readByteIsaac() << 8; - var14 |= var2.readByteIsaac(); - var16 = UrlRequester.method3299(Login.Login_username); - if (Interpreter.clientPreferences.parameters.size() >= 10 && !Interpreter.clientPreferences.parameters.containsKey(var16)) { - Iterator var26 = Interpreter.clientPreferences.parameters.entrySet().iterator(); - var26.next(); - var26.remove(); + boolean var34 = false; + if (var14) { + var15 = var2.readByteIsaac() << 24; + var15 |= var2.readByteIsaac() << 16; + var15 |= var2.readByteIsaac() << 8; + var15 |= var2.readByteIsaac(); + int var21 = Buddy.method5234(Login.Login_username); + if (WorldMapSection2.clientPreferences.parameters.size() >= 10 && !WorldMapSection2.clientPreferences.parameters.containsKey(var21)) { + Iterator var32 = WorldMapSection2.clientPreferences.parameters.entrySet().iterator(); + var32.next(); + var32.remove(); } - Interpreter.clientPreferences.parameters.put(var16, var14); + WorldMapSection2.clientPreferences.parameters.put(var21, var15); } if (Login_isUsernameRemembered) { - Interpreter.clientPreferences.rememberedUsername = Login.Login_username; + WorldMapSection2.clientPreferences.rememberedUsername = Login.Login_username; } else { - Interpreter.clientPreferences.rememberedUsername = null; + WorldMapSection2.clientPreferences.rememberedUsername = null; } - FriendSystem.savePreferences(); + WorldMapData_1.savePreferences(); staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); localPlayerIndex <<= 8; localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); - field746 = ((AbstractSocket)var1).readUnsignedByte(); + field763 = ((AbstractSocket)var1).readUnsignedByte(); ((AbstractSocket)var1).read(var2.array, 0, 1); var2.offset = 0; - ServerPacket[] var5 = class162.ServerPacket_values(); - int var17 = var2.readSmartByteShortIsaac(); - if (var17 < 0 || var17 >= var5.length) { - throw new IOException(var17 + " " + var2.offset); + ServerPacket[] var5 = Occluder.ServerPacket_values(); + int var22 = var2.readSmartByteShortIsaac(); + if (var22 < 0 || var22 >= var5.length) { + throw new IOException(var22 + " " + var2.offset); } - packetWriter.serverPacket = var5[var17]; + packetWriter.serverPacket = var5[var22]; packetWriter.serverPacketLength = packetWriter.serverPacket.length; ((AbstractSocket)var1).read(var2.array, 0, 2); var2.offset = 0; packetWriter.serverPacketLength = var2.readUnsignedShort(); try { - Client var7 = class206.client; - JSObject.getWindow(var7).call("zap", (Object[])null); - } catch (Throwable var18) { + class47.method857(Username.client, "zap"); + } catch (Throwable var24) { } loginState = 13; } - if (loginState != 13) { + if (loginState == 13) { + if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { + var2.offset = 0; + ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); + timer.method5047(); + class2.method32(); + MenuAction.updatePlayer(var2); + SecureRandomCallable.field530 = -1; + WorldMapLabel.loadRegions(false, var2); + packetWriter.serverPacket = null; + } + + } else { if (loginState == 14 && ((AbstractSocket)var1).available() >= 2) { var2.offset = 0; ((AbstractSocket)var1).read(var2.array, 0, 2); var2.offset = 0; - WorldMapDecoration.field195 = var2.readUnsignedShort(); + FontName.field3650 = var2.readUnsignedShort(); loginState = 15; } - if (loginState == 15 && ((AbstractSocket)var1).available() >= WorldMapDecoration.field195) { + if (loginState == 15 && ((AbstractSocket)var1).available() >= FontName.field3650) { var2.offset = 0; - ((AbstractSocket)var1).read(var2.array, 0, WorldMapDecoration.field195); + ((AbstractSocket)var1).read(var2.array, 0, FontName.field3650); var2.offset = 0; - String var21 = var2.readStringCp1252NullTerminated(); - String var25 = var2.readStringCp1252NullTerminated(); - String var23 = var2.readStringCp1252NullTerminated(); - AbstractWorldMapData.setLoginResponseString(var21, var25, var23); - class195.updateGameState(10); + String var27 = var2.readStringCp1252NullTerminated(); + String var29 = var2.readStringCp1252NullTerminated(); + String var30 = var2.readStringCp1252NullTerminated(); + Tiles.setLoginResponseString(var27, var29, var30); + Projectile.updateGameState(10); } if (loginState == 16) { @@ -3167,166 +3086,53 @@ public final class Client extends GameShell implements Usernamed { if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); var2.offset = 0; - var28 = packetWriter.serverPacketLength; - timer.method5020(); - Interpreter.method2020(); - GraphicsObject.updatePlayer(var2); - if (var28 != var2.offset) { + var33 = packetWriter.serverPacketLength; + timer.method5046(); + MouseHandler.method1110(); + MenuAction.updatePlayer(var2); + if (var33 != var2.offset) { throw new RuntimeException(); } } } else { - ++field663; - if (field663 > 2000) { - if (field740 < 1) { - if (class197.port1 == WorldMapData_1.port3) { - WorldMapData_1.port3 = MouseRecorder.port2; + ++field679; + if (field679 > 2000) { + if (field680 < 1) { + if (WorldMapSection2.port3 == WorldMapLabelSize.port1) { + WorldMapSection2.port3 = port2; } else { - WorldMapData_1.port3 = class197.port1; + WorldMapSection2.port3 = WorldMapLabelSize.port1; } - ++field740; + ++field680; loginState = 0; } else { - ModelData0.getLoginError(-3); + GameShell.getLoginError(-3); } } } - } else { - if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { - var2.offset = 0; - ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); - timer.method5037(); - mouseLastLastPressedTimeMillis = 1L; - class173.mouseRecorder.index = 0; - GameShell.hasFocus = true; - hadFocus = true; - field852 = -1L; - GrandExchangeOfferAgeComparator.method147(); - packetWriter.clearBuffer(); - packetWriter.packetBuffer.offset = 0; - packetWriter.serverPacket = null; - packetWriter.field1300 = null; - packetWriter.field1301 = null; - packetWriter.field1299 = null; - packetWriter.serverPacketLength = 0; - packetWriter.field1298 = 0; - rebootTimer = 0; - logoutTimer = 0; - hintArrowType = 0; - WorldMapData_1.method708(); - MouseHandler.MouseHandler_idleCycles = 0; - class54.method1105(); - isItemSelected = 0; - isSpellSelected = false; - soundEffectCount = 0; - camAngleY = 0; - oculusOrbState = 0; - class215.field2534 = null; - minimapState = 0; - field853 = -1; - destinationX = 0; - destinationY = 0; - playerAttackOption = AttackOption.AttackOption_hidden; - npcAttackOption = AttackOption.AttackOption_hidden; - npcCount = 0; - LoginScreenAnimation.method1831(); - - for (var28 = 0; var28 < 2048; ++var28) { - players[var28] = null; - } - - for (var28 = 0; var28 < 32768; ++var28) { - npcs[var28] = null; - } - - combatTargetPlayerIndex = -1; - projectiles.clear(); - graphicsObjects.clear(); - - for (var28 = 0; var28 < 4; ++var28) { - for (var14 = 0; var14 < 104; ++var14) { - for (var16 = 0; var16 < 104; ++var16) { - groundItems[var28][var14][var16] = null; - } - } - } - - pendingSpawns = new NodeDeque(); - Message.friendSystem.clear(); - - for (var28 = 0; var28 < VarpDefinition.VarpDefinition_fileCount; ++var28) { - VarpDefinition var24 = UserComparator8.VarpDefinition_get(var28); - if (var24 != null) { - Varps.Varps_temp[var28] = 0; - Varps.Varps_main[var28] = 0; - } - } - - MilliClock.varcs.clearTransient(); - followerIndex = -1; - if (rootInterface != -1) { - ItemDefinition.method4715(rootInterface); - } - - for (InterfaceParent var20 = (InterfaceParent)interfaceParents.first(); var20 != null; var20 = (InterfaceParent)interfaceParents.next()) { - VarpDefinition.closeInterface(var20, true); - } - - rootInterface = -1; - interfaceParents = new NodeHashTable(8); - meslayerContinueWidget = null; - WorldMapData_1.method708(); - playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); - - for (var28 = 0; var28 < 8; ++var28) { - playerMenuActions[var28] = null; - playerOptionsPriorities[var28] = false; - } - - ItemContainer.itemContainers = new NodeHashTable(32); - isLoading = true; - - for (var28 = 0; var28 < 100; ++var28) { - field833[var28] = true; - } - - class219.method4076(); - Calendar.clanChat = null; - - for (var28 = 0; var28 < 8; ++var28) { - grandExchangeOffers[var28] = new GrandExchangeOffer(); - } - - Script.grandExchangeEvents = null; - GraphicsObject.updatePlayer(var2); - GrandExchangeOfferTotalQuantityComparator.field47 = -1; - SecureRandomCallable.loadRegions(false, var2); - packetWriter.serverPacket = null; - } - } } - } catch (IOException var19) { - if (field740 < 1) { - if (WorldMapData_1.port3 == class197.port1) { - WorldMapData_1.port3 = MouseRecorder.port2; + } catch (IOException var26) { + if (field680 < 1) { + if (WorldMapSection2.port3 == WorldMapLabelSize.port1) { + WorldMapSection2.port3 = port2; } else { - WorldMapData_1.port3 = class197.port1; + WorldMapSection2.port3 = WorldMapLabelSize.port1; } - ++field740; + ++field680; loginState = 0; } else { - ModelData0.getLoginError(-2); + GameShell.getLoginError(-2); } } } - @ObfuscatedName("ft") + @ObfuscatedName("fe") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1040465625" + signature = "(B)V", + garbageValue = "14" ) @Export("doCycleLoggedIn") final void doCycleLoggedIn() { @@ -3338,38 +3144,38 @@ public final class Client extends GameShell implements Usernamed { --logoutTimer; } - if (field677) { - field677 = false; - StudioGame.method4119(); + if (field800) { + field800 = false; + WorldMapIcon_1.method308(); } else { if (!isMenuOpen) { - Actor.addCancelMenuEntry(); + class96.addCancelMenuEntry(); } int var1; - for (var1 = 0; var1 < 100 && this.method1304(packetWriter); ++var1) { + for (var1 = 0; var1 < 100 && this.method1363(packetWriter); ++var1) { } if (gameState == 30) { int var2; PacketBufferNode var14; - while (class210.method3947()) { - var14 = class2.getPacketBufferNode(ClientPacket.field2187, packetWriter.isaacCipher); + while (FaceNormal.method3334()) { + var14 = TilePaint.getPacketBufferNode(ClientPacket.field2235, packetWriter.isaacCipher); var14.packetBuffer.writeByte(0); var2 = var14.packetBuffer.offset; - class60.performReflectionCheck(var14.packetBuffer); + Messages.performReflectionCheck(var14.packetBuffer); var14.packetBuffer.writeLengthByte(var14.packetBuffer.offset - var2); packetWriter.addNode(var14); } - if (timer.field3555) { - var14 = class2.getPacketBufferNode(ClientPacket.field2195, packetWriter.isaacCipher); + if (timer.field3569) { + var14 = TilePaint.getPacketBufferNode(ClientPacket.field2293, packetWriter.isaacCipher); var14.packetBuffer.writeByte(0); var2 = var14.packetBuffer.offset; timer.write(var14.packetBuffer); var14.packetBuffer.writeLengthByte(var14.packetBuffer.offset - var2); packetWriter.addNode(var14); - timer.method5039(); + timer.method5057(); } int var3; @@ -3382,35 +3188,35 @@ public final class Client extends GameShell implements Usernamed { int var10; int var11; int var12; - synchronized(class173.mouseRecorder.lock) { - if (!field895) { - class173.mouseRecorder.index = 0; - } else if (MouseHandler.MouseHandler_lastButton != 0 || class173.mouseRecorder.index >= 40) { + synchronized(class16.mouseRecorder.lock) { + if (!field922) { + class16.mouseRecorder.index = 0; + } else if (MouseHandler.MouseHandler_lastButton != 0 || class16.mouseRecorder.index >= 40) { PacketBufferNode var15 = null; var3 = 0; var4 = 0; var5 = 0; var6 = 0; - for (var7 = 0; var7 < class173.mouseRecorder.index && (var15 == null || var15.packetBuffer.offset - var3 < 246); ++var7) { + for (var7 = 0; var7 < class16.mouseRecorder.index && (var15 == null || var15.packetBuffer.offset - var3 < 246); ++var7) { var4 = var7; - var8 = class173.mouseRecorder.ys[var7]; + var8 = class16.mouseRecorder.ys[var7]; if (var8 < -1) { var8 = -1; } else if (var8 > 65534) { var8 = 65534; } - var9 = class173.mouseRecorder.xs[var7]; + var9 = class16.mouseRecorder.xs[var7]; if (var9 < -1) { var9 = -1; } else if (var9 > 65534) { var9 = 65534; } - if (var9 != field642 || var8 != field681) { + if (var9 != field657 || var8 != field912) { if (var15 == null) { - var15 = class2.getPacketBufferNode(ClientPacket.field2225, packetWriter.isaacCipher); + var15 = TilePaint.getPacketBufferNode(ClientPacket.field2222, packetWriter.isaacCipher); var15.packetBuffer.writeByte(0); var3 = var15.packetBuffer.offset; PacketBuffer var10000 = var15.packetBuffer; @@ -3419,19 +3225,19 @@ public final class Client extends GameShell implements Usernamed { var6 = 0; } - if (-1L != field728) { - var10 = var9 - field642; - var11 = var8 - field681; - var12 = (int)((class173.mouseRecorder.millis[var7] - field728) / 20L); - var5 = (int)((long)var5 + (class173.mouseRecorder.millis[var7] - field728) % 20L); + if (-1L != field745) { + var10 = var9 - field657; + var11 = var8 - field912; + var12 = (int)((class16.mouseRecorder.millis[var7] - field745) / 20L); + var5 = (int)((long)var5 + (class16.mouseRecorder.millis[var7] - field745) % 20L); } else { var10 = var9; var11 = var8; var12 = Integer.MAX_VALUE; } - field642 = var9; - field681 = var8; + field657 = var9; + field912 = var8; if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { var10 += 32; var11 += 32; @@ -3458,7 +3264,7 @@ public final class Client extends GameShell implements Usernamed { } ++var6; - field728 = class173.mouseRecorder.millis[var7]; + field745 = class16.mouseRecorder.millis[var7]; } } @@ -3472,159 +3278,226 @@ public final class Client extends GameShell implements Usernamed { packetWriter.addNode(var15); } - if (var4 >= class173.mouseRecorder.index) { - class173.mouseRecorder.index = 0; + if (var4 >= class16.mouseRecorder.index) { + class16.mouseRecorder.index = 0; } else { - MouseRecorder var46 = class173.mouseRecorder; - var46.index -= var4; - System.arraycopy(class173.mouseRecorder.xs, var4, class173.mouseRecorder.xs, 0, class173.mouseRecorder.index); - System.arraycopy(class173.mouseRecorder.ys, var4, class173.mouseRecorder.ys, 0, class173.mouseRecorder.index); - System.arraycopy(class173.mouseRecorder.millis, var4, class173.mouseRecorder.millis, 0, class173.mouseRecorder.index); + MouseRecorder var44 = class16.mouseRecorder; + var44.index -= var4; + System.arraycopy(class16.mouseRecorder.xs, var4, class16.mouseRecorder.xs, 0, class16.mouseRecorder.index); + System.arraycopy(class16.mouseRecorder.ys, var4, class16.mouseRecorder.ys, 0, class16.mouseRecorder.index); + System.arraycopy(class16.mouseRecorder.millis, var4, class16.mouseRecorder.millis, 0, class16.mouseRecorder.index); } } } - PacketBufferNode var18; - if (MouseHandler.MouseHandler_lastButton == 1 || !NetFileRequest.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { - long var16 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis * -1L; + if (MouseHandler.MouseHandler_lastButton == 1 || !ArchiveLoader.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { + long var16 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; if (var16 > 32767L) { var16 = 32767L; } - mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis * -1L; + mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; var3 = MouseHandler.MouseHandler_lastPressedY; if (var3 < 0) { var3 = 0; - } else if (var3 > AttackOption.canvasHeight) { - var3 = AttackOption.canvasHeight; + } else if (var3 > WorldMapData_1.canvasHeight) { + var3 = WorldMapData_1.canvasHeight; } var4 = MouseHandler.MouseHandler_lastPressedX; if (var4 < 0) { var4 = 0; - } else if (var4 > GrandExchangeOfferTotalQuantityComparator.canvasWidth) { - var4 = GrandExchangeOfferTotalQuantityComparator.canvasWidth; + } else if (var4 > Username.canvasWidth) { + var4 = Username.canvasWidth; } var5 = (int)var16; - var18 = class2.getPacketBufferNode(ClientPacket.field2241, packetWriter.isaacCipher); - var18.packetBuffer.writeShort((var5 << 1) + (MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0)); + PacketBufferNode var18 = TilePaint.getPacketBufferNode(ClientPacket.field2275, packetWriter.isaacCipher); + var18.packetBuffer.writeShort((MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0) + (var5 << 1)); var18.packetBuffer.writeShort(var4); var18.packetBuffer.writeShort(var3); packetWriter.addNode(var18); } - if (KeyHandler.field377 > 0) { - var14 = class2.getPacketBufferNode(ClientPacket.field2202, packetWriter.isaacCipher); + if (KeyHandler.field405 > 0) { + var14 = TilePaint.getPacketBufferNode(ClientPacket.field2286, packetWriter.isaacCipher); var14.packetBuffer.writeShort(0); var2 = var14.packetBuffer.offset; - long var19 = WorldMapID.currentTimeMillis(); + long var19 = WorldMapIcon_0.currentTimeMillis(); - for (var5 = 0; var5 < KeyHandler.field377; ++var5) { - long var21 = var19 - field852; + for (var5 = 0; var5 < KeyHandler.field405; ++var5) { + long var21 = var19 - field702; if (var21 > 16777215L) { var21 = 16777215L; } - field852 = var19; - var14.packetBuffer.method5569(KeyHandler.field376[var5]); - var14.packetBuffer.method5586((int)var21); + field702 = var19; + var14.packetBuffer.writeByte(KeyHandler.field404[var5]); + var14.packetBuffer.method5619((int)var21); } var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var2); packetWriter.addNode(var14); } - if (field712 > 0) { - --field712; + if (field729 > 0) { + --field729; } if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { - field713 = true; + field730 = true; } - if (field713 && field712 <= 0) { - field712 = 20; - field713 = false; - var14 = class2.getPacketBufferNode(ClientPacket.field2193, packetWriter.isaacCipher); - var14.packetBuffer.method5579(camAngleY); - var14.packetBuffer.method5579(camAngleX); + if (field730 && field729 <= 0) { + field729 = 20; + field730 = false; + var14 = TilePaint.getPacketBufferNode(ClientPacket.field2208, packetWriter.isaacCipher); + var14.packetBuffer.method5787(camAngleY); + var14.packetBuffer.writeShortLE(camAngleX); packetWriter.addNode(var14); } - if (GameShell.hasFocus && !hadFocus) { + if (GrandExchangeOfferTotalQuantityComparator.hasFocus && !hadFocus) { hadFocus = true; - var14 = class2.getPacketBufferNode(ClientPacket.field2229, packetWriter.isaacCipher); + var14 = TilePaint.getPacketBufferNode(ClientPacket.field2210, packetWriter.isaacCipher); var14.packetBuffer.writeByte(1); packetWriter.addNode(var14); } - if (!GameShell.hasFocus && hadFocus) { + if (!GrandExchangeOfferTotalQuantityComparator.hasFocus && hadFocus) { hadFocus = false; - var14 = class2.getPacketBufferNode(ClientPacket.field2229, packetWriter.isaacCipher); + var14 = TilePaint.getPacketBufferNode(ClientPacket.field2210, packetWriter.isaacCipher); var14.packetBuffer.writeByte(0); packetWriter.addNode(var14); } - if (GrandExchangeEvent.worldMap != null) { - GrandExchangeEvent.worldMap.method6357(); + if (WorldMapIcon_0.worldMap != null) { + WorldMapIcon_0.worldMap.method6499(); } - Script.method2244(); - SoundCache.method2509(); - if (gameState == 30) { - for (PendingSpawn var36 = (PendingSpawn)pendingSpawns.last(); var36 != null; var36 = (PendingSpawn)pendingSpawns.previous()) { - if (var36.hitpoints > 0) { - --var36.hitpoints; + Canvas.method861(); + if (Clock.Client_plane != field704) { + field704 = Clock.Client_plane; + var1 = Clock.Client_plane; + int[] var36 = WorldMapRectangle.sceneMinimapSprite.pixels; + var3 = var36.length; + + for (var4 = 0; var4 < var3; ++var4) { + var36[var4] = 0; + } + + for (var4 = 1; var4 < 103; ++var4) { + var5 = (103 - var4) * 2048 + 24628; + + for (var6 = 1; var6 < 103; ++var6) { + if ((Tiles.Tiles_renderFlags[var1][var6][var4] & 24) == 0) { + ServerBuild.scene.drawTileMinimap(var36, var5, 512, var1, var6, var4); + } + + if (var1 < 3 && (Tiles.Tiles_renderFlags[var1 + 1][var6][var4] & 8) != 0) { + ServerBuild.scene.drawTileMinimap(var36, var5, 512, var1 + 1, var6, var4); + } + + var5 += 4; } + } - if (var36.hitpoints == 0) { - if (var36.objectId < 0 || StructDefinition.method4546(var36.objectId, var36.field912)) { - VarcInt.addPendingSpawnToScene(var36.plane, var36.type, var36.x, var36.y, var36.objectId, var36.field911, var36.field912); - var36.remove(); - } - } else { - if (var36.delay > 0) { - --var36.delay; + var4 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); + var5 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; + WorldMapRectangle.sceneMinimapSprite.setRaster(); + + for (var6 = 1; var6 < 103; ++var6) { + for (var7 = 1; var7 < 103; ++var7) { + if ((Tiles.Tiles_renderFlags[var1][var7][var6] & 24) == 0) { + RouteStrategy.drawObject(var1, var7, var6, var4, var5); } - if (var36.delay == 0 && var36.x >= 1 && var36.y >= 1 && var36.x <= 102 && var36.y <= 102 && (var36.id < 0 || StructDefinition.method4546(var36.id, var36.field918))) { - VarcInt.addPendingSpawnToScene(var36.plane, var36.type, var36.x, var36.y, var36.id, var36.orientation, var36.field918); - var36.delay = -1; - if (var36.id == var36.objectId && var36.objectId == -1) { - var36.remove(); - } else if (var36.id == var36.objectId && var36.orientation == var36.field911 && var36.field918 == var36.field912) { - var36.remove(); + if (var1 < 3 && (Tiles.Tiles_renderFlags[var1 + 1][var7][var6] & 8) != 0) { + RouteStrategy.drawObject(var1 + 1, var7, var6, var4, var5); + } + } + } + + mapIconCount = 0; + + for (var6 = 0; var6 < 104; ++var6) { + for (var7 = 0; var7 < 104; ++var7) { + long var23 = ServerBuild.scene.getFloorDecorationTag(Clock.Client_plane, var6, var7); + if (0L != var23) { + var10 = GrandExchangeEvents.Entity_unpackID(var23); + var11 = Occluder.getObjectDefinition(var10).mapIconId; + if (var11 >= 0) { + mapIcons[mapIconCount] = PacketBufferNode.WorldMapElement_get(var11).getSpriteBool(false); + mapIconXs[mapIconCount] = var6; + mapIconYs[mapIconCount] = var7; + ++mapIconCount; } } } } - WorldMapID.method546(); - ++packetWriter.field1298; - if (packetWriter.field1298 > 750) { - StudioGame.method4119(); + DevicePcmPlayerProvider.rasterProvider.apply(); + } + + if (gameState == 30) { + for (PendingSpawn var34 = (PendingSpawn)pendingSpawns.last(); var34 != null; var34 = (PendingSpawn)pendingSpawns.previous()) { + if (var34.hitpoints > 0) { + --var34.hitpoints; + } + + if (var34.hitpoints == 0) { + if (var34.objectId < 0 || WorldMapData_0.method187(var34.objectId, var34.field924)) { + WorldMapSection0.addPendingSpawnToScene(var34.plane, var34.type, var34.x, var34.y, var34.objectId, var34.field935, var34.field924); + var34.remove(); + } + } else { + if (var34.delay > 0) { + --var34.delay; + } + + if (var34.delay == 0 && var34.x >= 1 && var34.y >= 1 && var34.x <= 102 && var34.y <= 102 && (var34.id < 0 || WorldMapData_0.method187(var34.id, var34.field933))) { + WorldMapSection0.addPendingSpawnToScene(var34.plane, var34.type, var34.x, var34.y, var34.id, var34.orientation, var34.field933); + var34.delay = -1; + if (var34.id == var34.objectId && var34.objectId == -1) { + var34.remove(); + } else if (var34.id == var34.objectId && var34.field935 == var34.orientation && var34.field924 == var34.field933) { + var34.remove(); + } + } + } + } + + class222.method4192(); + ++packetWriter.field1299; + if (packetWriter.field1299 > 750) { + WorldMapIcon_1.method308(); } else { - var1 = Players.Players_count; - int[] var38 = Players.Players_indices; + Entity.method3332(); + WorldMapSprite.method434(); + int[] var35 = Players.Players_indices; - for (var3 = 0; var3 < var1; ++var3) { - Player var23 = players[var38[var3]]; - if (var23 != null) { - Message.updateActorSequence(var23, 1); + for (var2 = 0; var2 < Players.Players_count; ++var2) { + Player var25 = players[var35[var2]]; + if (var25 != null && var25.overheadTextCyclesRemaining > 0) { + --var25.overheadTextCyclesRemaining; + if (var25.overheadTextCyclesRemaining == 0) { + var25.overheadText = null; + } } } - for (var1 = 0; var1 < npcCount; ++var1) { - var2 = npcIndices[var1]; - NPC var24 = npcs[var2]; - if (var24 != null) { - Message.updateActorSequence(var24, var24.definition.size); + for (var2 = 0; var2 < npcCount; ++var2) { + var3 = npcIndices[var2]; + NPC var26 = npcs[var3]; + if (var26 != null && var26.overheadTextCyclesRemaining > 0) { + --var26.overheadTextCyclesRemaining; + if (var26.overheadTextCyclesRemaining == 0) { + var26.overheadText = null; + } } } - class269.method5014(); - ++field690; + ++field707; if (mouseCrossColor != 0) { mouseCrossState = mouseCrossState * 400 + 400; if (mouseCrossState * 20 >= 400) { @@ -3632,356 +3505,328 @@ public final class Client extends GameShell implements Usernamed { } } - if (class192.field2372 != null) { - ++field764; - if (field764 >= 15) { - LoginPacket.invalidateWidget(class192.field2372); - class192.field2372 = null; + if (Skeleton.field1793 != null) { + ++field751; + if (field751 >= 15) { + NPCDefinition.invalidateWidget(Skeleton.field1793); + Skeleton.field1793 = null; } } - Widget var37 = class16.mousedOverWidgetIf1; - Widget var39 = class14.field90; - class16.mousedOverWidgetIf1 = null; - class14.field90 = null; + Widget var37 = GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1; + Widget var38 = VarbitDefinition.field3296; + GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1 = null; + VarbitDefinition.field3296 = null; draggedOnWidget = null; - field809 = false; - field806 = false; - field849 = 0; + field827 = false; + field824 = false; + field762 = 0; - while (KeyHandler.isKeyDown() && field849 < 128) { - if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && VertexNormal.field1732 == 66) { - String var42 = ""; - - Message var40; - for (Iterator var25 = Messages.Messages_hashTable.iterator(); var25.hasNext(); var42 = var42 + var40.sender + ':' + var40.text + '\n') { - var40 = (Message)var25.next(); - } - - class206.client.clipboardSetString(var42); - } else if (oculusOrbState != 1 || TileItemPile.field1521 <= 0) { - field851[field849] = VertexNormal.field1732; - field850[field849] = TileItemPile.field1521; - ++field849; + while (SoundSystem.isKeyDown() && field762 < 128) { + if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && RouteStrategy.field2102 == 66) { + String var39 = Skeleton.method3153(); + Username.client.clipboardSetString(var39); + } else if (oculusOrbState != 1 || class51.field432 <= 0) { + field869[field762] = RouteStrategy.field2102; + field868[field762] = class51.field432; + ++field762; } } - boolean var31 = staffModLevel >= 2; - PacketBufferNode var26; - if (var31 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { - var4 = Message.localPlayer.plane - mouseWheelRotation; - if (var4 < 0) { - var4 = 0; - } else if (var4 > 3) { - var4 = 3; + if (FloorOverlayDefinition.method4835() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { + var3 = class192.localPlayer.plane - mouseWheelRotation; + if (var3 < 0) { + var3 = 0; + } else if (var3 > 3) { + var3 = 3; } - if (var4 != Message.localPlayer.plane) { - var5 = Message.localPlayer.pathX[0] + MusicPatchPcmStream.baseX * 64; - var6 = Message.localPlayer.pathY[0] + ScriptEvent.baseY * 64; - var26 = class2.getPacketBufferNode(ClientPacket.field2251, packetWriter.isaacCipher); - var26.packetBuffer.writeIntME(var5); - var26.packetBuffer.writeShortLE(0); - var26.packetBuffer.writeIntME(var6); - var26.packetBuffer.method5569(var4); - packetWriter.addNode(var26); + if (var3 != class192.localPlayer.plane) { + WorldMapRegion.method563(class192.localPlayer.pathX[0] + Messages.baseX * 64, class192.localPlayer.pathY[0] + Language.baseY * 64, var3, false); } mouseWheelRotation = 0; } if (rootInterface != -1) { - Buffer.updateRootInterface(rootInterface, 0, 0, GrandExchangeOfferTotalQuantityComparator.canvasWidth, AttackOption.canvasHeight, 0, 0); + WorldMapDecoration.updateRootInterface(rootInterface, 0, 0, Username.canvasWidth, WorldMapData_1.canvasHeight, 0, 0); } ++cycleCntr; while (true) { + Widget var27; + ScriptEvent var40; Widget var41; - ScriptEvent var43; - Widget var45; do { - var43 = (ScriptEvent)field865.removeLast(); - if (var43 == null) { + var40 = (ScriptEvent)field846.removeLast(); + if (var40 == null) { while (true) { do { - var43 = (ScriptEvent)field883.removeLast(); - if (var43 == null) { + var40 = (ScriptEvent)field847.removeLast(); + if (var40 == null) { while (true) { do { - var43 = (ScriptEvent)scriptEvents.removeLast(); - if (var43 == null) { + var40 = (ScriptEvent)scriptEvents.removeLast(); + if (var40 == null) { this.menu(); - WorldMapSection1.method584(); - if (clickedWidget != null) { - this.method1310(); + if (WorldMapIcon_0.worldMap != null) { + WorldMapIcon_0.worldMap.method6371(Clock.Client_plane, Messages.baseX * 64 + (class192.localPlayer.x >> 7), Language.baseY * 64 + (class192.localPlayer.y >> 7), false); + WorldMapIcon_0.worldMap.loadCache(); } - if (ClientPreferences.dragInventoryWidget != null) { - LoginPacket.invalidateWidget(ClientPreferences.dragInventoryWidget); + if (clickedWidget != null) { + this.method1541(); + } + + PacketBufferNode var43; + if (class185.dragInventoryWidget != null) { + NPCDefinition.invalidateWidget(class185.dragInventoryWidget); ++itemDragDuration; if (MouseHandler.MouseHandler_currentButton == 0) { - if (field768) { - if (ClientPreferences.dragInventoryWidget == WorldMapManager.field312 && dragItemSlotDestination != dragItemSlotSource) { - Widget var44 = ClientPreferences.dragInventoryWidget; - byte var33 = 0; - if (field901 == 1 && var44.contentType == 206) { - var33 = 1; + if (field757) { + if (FloorDecoration.field1604 == class185.dragInventoryWidget && dragItemSlotDestination != dragItemSlotSource) { + Widget var42 = class185.dragInventoryWidget; + byte var31 = 0; + if (field811 == 1 && var42.contentType == 206) { + var31 = 1; } - if (var44.itemIds[dragItemSlotDestination] <= 0) { - var33 = 0; + if (var42.itemIds[dragItemSlotDestination] <= 0) { + var31 = 0; } - var7 = WorldMapSection0.getWidgetClickMask(var44); - boolean var32 = (var7 >> 29 & 1) != 0; - if (var32) { - var8 = dragItemSlotSource; - var9 = dragItemSlotDestination; - var44.itemIds[var9] = var44.itemIds[var8]; - var44.itemQuantities[var9] = var44.itemQuantities[var8]; - var44.itemIds[var8] = -1; - var44.itemQuantities[var8] = 0; - } else if (var33 == 1) { - var8 = dragItemSlotSource; - var9 = dragItemSlotDestination; + if (FriendLoginUpdate.method5326(WorldMapIcon_0.getWidgetClickMask(var42))) { + var5 = dragItemSlotSource; + var6 = dragItemSlotDestination; + var42.itemIds[var6] = var42.itemIds[var5]; + var42.itemQuantities[var6] = var42.itemQuantities[var5]; + var42.itemIds[var5] = -1; + var42.itemQuantities[var5] = 0; + } else if (var31 == 1) { + var5 = dragItemSlotSource; + var6 = dragItemSlotDestination; - while (var8 != var9) { - if (var8 > var9) { - var44.swapItems(var8 - 1, var8); - --var8; - } else if (var8 < var9) { - var44.swapItems(var8 + 1, var8); - ++var8; + while (var6 != var5) { + if (var5 > var6) { + var42.swapItems(var5 - 1, var5); + --var5; + } else if (var5 < var6) { + var42.swapItems(var5 + 1, var5); + ++var5; } } } else { - var44.swapItems(dragItemSlotDestination, dragItemSlotSource); + var42.swapItems(dragItemSlotDestination, dragItemSlotSource); } - PacketBufferNode var27 = class2.getPacketBufferNode(ClientPacket.field2183, packetWriter.isaacCipher); - var27.packetBuffer.writeInt(ClientPreferences.dragInventoryWidget.id); - var27.packetBuffer.method5720(var33); - var27.packetBuffer.writeShort(dragItemSlotSource); - var27.packetBuffer.writeIntME(dragItemSlotDestination); - packetWriter.addNode(var27); + var43 = TilePaint.getPacketBufferNode(ClientPacket.field2219, packetWriter.isaacCipher); + var43.packetBuffer.method5787(dragItemSlotSource); + var43.packetBuffer.method5604(var31); + var43.packetBuffer.method5787(dragItemSlotDestination); + var43.packetBuffer.method5624(class185.dragInventoryWidget.id); + packetWriter.addNode(var43); } } else if (this.shouldLeftClickOpenMenu()) { this.openMenu(draggedWidgetX, draggedWidgetY); } else if (menuOptionsCount > 0) { - var4 = draggedWidgetX; - var5 = draggedWidgetY; - Messages.method2231(LoginType.tempMenuAction, var4, var5); - LoginType.tempMenuAction = null; + GrandExchangeOfferTotalQuantityComparator.method105(draggedWidgetX, draggedWidgetY); } - field764 = 10; + field751 = 10; MouseHandler.MouseHandler_lastButton = 0; - ClientPreferences.dragInventoryWidget = null; + class185.dragInventoryWidget = null; } else if (itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > draggedWidgetX + 5 || MouseHandler.MouseHandler_x < draggedWidgetX - 5 || MouseHandler.MouseHandler_y > draggedWidgetY + 5 || MouseHandler.MouseHandler_y < draggedWidgetY - 5)) { - field768 = true; + field757 = true; } } - if (Scene.method3092()) { - var4 = Scene.Scene_selectedX; - var5 = Scene.Scene_selectedY; - var18 = class2.getPacketBufferNode(ClientPacket.field2278, packetWriter.isaacCipher); - var18.packetBuffer.writeByte(5); - var18.packetBuffer.method5696(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); - var18.packetBuffer.writeShort(MusicPatchPcmStream.baseX * 64 + var4); - var18.packetBuffer.writeIntME(ScriptEvent.baseY * 64 + var5); - packetWriter.addNode(var18); - Scene.method3150(); + if (Scene.method3321()) { + var3 = Scene.Scene_selectedX; + var4 = Scene.Scene_selectedY; + var43 = TilePaint.getPacketBufferNode(ClientPacket.field2207, packetWriter.isaacCipher); + var43.packetBuffer.writeByte(5); + var43.packetBuffer.writeShort(Language.baseY * 64 + var4); + var43.packetBuffer.method5787(Messages.baseX * 64 + var3); + var43.packetBuffer.method5604(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); + packetWriter.addNode(var43); + Scene.method3279(); mouseCrossX = MouseHandler.MouseHandler_lastPressedX; mouseCrossY = MouseHandler.MouseHandler_lastPressedY; mouseCrossColor = 1; mouseCrossState = 0; - destinationX = var4; - destinationY = var5; + destinationX = var3; + destinationY = var4; } - if (var37 != class16.mousedOverWidgetIf1) { + if (var37 != GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1) { if (var37 != null) { - LoginPacket.invalidateWidget(var37); + NPCDefinition.invalidateWidget(var37); } - if (class16.mousedOverWidgetIf1 != null) { - LoginPacket.invalidateWidget(class16.mousedOverWidgetIf1); + if (GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1 != null) { + NPCDefinition.invalidateWidget(GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1); } } - if (var39 != class14.field90 && field674 == field798) { - if (var39 != null) { - LoginPacket.invalidateWidget(var39); + if (var38 != VarbitDefinition.field3296 && field796 == field797) { + if (var38 != null) { + NPCDefinition.invalidateWidget(var38); } - if (class14.field90 != null) { - LoginPacket.invalidateWidget(class14.field90); + if (VarbitDefinition.field3296 != null) { + NPCDefinition.invalidateWidget(VarbitDefinition.field3296); } } - if (class14.field90 != null) { - if (field798 < field674) { - ++field798; - if (field674 == field798) { - LoginPacket.invalidateWidget(class14.field90); + if (VarbitDefinition.field3296 != null) { + if (field796 < field797) { + ++field796; + if (field796 == field797) { + NPCDefinition.invalidateWidget(VarbitDefinition.field3296); } } - } else if (field798 > 0) { - --field798; + } else if (field796 > 0) { + --field796; } if (oculusOrbState == 0) { - var4 = Message.localPlayer.x; - var5 = Message.localPlayer.y; - if (WorldMapSectionType.oculusOrbFocalPointX - var4 < -500 || WorldMapSectionType.oculusOrbFocalPointX - var4 > 500 || Language.oculusOrbFocalPointY - var5 < -500 || Language.oculusOrbFocalPointY - var5 > 500) { - WorldMapSectionType.oculusOrbFocalPointX = var4; - Language.oculusOrbFocalPointY = var5; + var3 = class192.localPlayer.x; + var4 = class192.localPlayer.y; + if (PendingSpawn.oculusOrbFocalPointX - var3 < -500 || PendingSpawn.oculusOrbFocalPointX - var3 > 500 || Skeleton.oculusOrbFocalPointY - var4 < -500 || Skeleton.oculusOrbFocalPointY - var4 > 500) { + PendingSpawn.oculusOrbFocalPointX = var3; + Skeleton.oculusOrbFocalPointY = var4; } - if (var4 != WorldMapSectionType.oculusOrbFocalPointX) { - WorldMapSectionType.oculusOrbFocalPointX += (var4 - WorldMapSectionType.oculusOrbFocalPointX) / 16; + if (var3 != PendingSpawn.oculusOrbFocalPointX) { + PendingSpawn.oculusOrbFocalPointX += (var3 - PendingSpawn.oculusOrbFocalPointX) / 16; } - if (var5 != Language.oculusOrbFocalPointY) { - Language.oculusOrbFocalPointY += (var5 - Language.oculusOrbFocalPointY) / 16; + if (var4 != Skeleton.oculusOrbFocalPointY) { + Skeleton.oculusOrbFocalPointY += (var4 - Skeleton.oculusOrbFocalPointY) / 16; } - var6 = WorldMapSectionType.oculusOrbFocalPointX >> 7; - var7 = Language.oculusOrbFocalPointY >> 7; - var8 = ScriptEvent.getTileHeight(WorldMapSectionType.oculusOrbFocalPointX, Language.oculusOrbFocalPointY, UrlRequest.Client_plane); - var9 = 0; - if (var6 > 3 && var7 > 3 && var6 < 100 && var7 < 100) { - for (var10 = var6 - 4; var10 <= var6 + 4; ++var10) { - for (var11 = var7 - 4; var11 <= var7 + 4; ++var11) { - var12 = UrlRequest.Client_plane; - if (var12 < 3 && (Tiles.Tiles_renderFlags[1][var10][var11] & 2) == 2) { - ++var12; + var5 = PendingSpawn.oculusOrbFocalPointX >> 7; + var6 = Skeleton.oculusOrbFocalPointY >> 7; + var7 = WorldMapSectionType.getTileHeight(PendingSpawn.oculusOrbFocalPointX, Skeleton.oculusOrbFocalPointY, Clock.Client_plane); + var8 = 0; + if (var5 > 3 && var6 > 3 && var5 < 100 && var6 < 100) { + for (var9 = var5 - 4; var9 <= var5 + 4; ++var9) { + for (var10 = var6 - 4; var10 <= var6 + 4; ++var10) { + var11 = Clock.Client_plane; + if (var11 < 3 && (Tiles.Tiles_renderFlags[1][var9][var10] & 2) == 2) { + ++var11; } - int var28 = var8 - Tiles.Tiles_heights[var12][var10][var11]; - if (var28 > var9) { - var9 = var28; + var12 = var7 - Tiles.Tiles_heights[var11][var9][var10]; + if (var12 > var8) { + var8 = var12; } } } } - var10 = var9 * 192; - if (var10 > 98048) { - var10 = 98048; + var9 = var8 * 192; + if (var9 > 98048) { + var9 = 98048; } - if (var10 < 32768) { - var10 = 32768; + if (var9 < 32768) { + var9 = 32768; } - if (var10 > field714) { - field714 += (var10 - field714) / 24; - } else if (var10 < field714) { - field714 += (var10 - field714) / 80; + if (var9 > field818) { + field818 += (var9 - field818) / 24; + } else if (var9 < field818) { + field818 += (var9 - field818) / 80; } - WorldMapManager.field314 = ScriptEvent.getTileHeight(Message.localPlayer.x, Message.localPlayer.y, UrlRequest.Client_plane) - camFollowHeight; + WorldMapSectionType.field166 = WorldMapSectionType.getTileHeight(class192.localPlayer.x, class192.localPlayer.y, Clock.Client_plane) - camFollowHeight; } else if (oculusOrbState == 1) { - if (field751 && Message.localPlayer != null) { - var4 = Message.localPlayer.pathX[0]; - var5 = Message.localPlayer.pathY[0]; - if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { - WorldMapSectionType.oculusOrbFocalPointX = Message.localPlayer.x; - var6 = ScriptEvent.getTileHeight(Message.localPlayer.x, Message.localPlayer.y, UrlRequest.Client_plane) - camFollowHeight; - if (var6 < WorldMapManager.field314) { - WorldMapManager.field314 = var6; - } - - Language.oculusOrbFocalPointY = Message.localPlayer.y; - field751 = false; - } - } - - short var34 = -1; + PrivateChatMode.method5952(); + short var32 = -1; if (KeyHandler.KeyHandler_pressedKeys[33]) { - var34 = 0; + var32 = 0; } else if (KeyHandler.KeyHandler_pressedKeys[49]) { - var34 = 1024; + var32 = 1024; } if (KeyHandler.KeyHandler_pressedKeys[48]) { - if (var34 == 0) { - var34 = 1792; - } else if (var34 == 1024) { - var34 = 1280; + if (var32 == 0) { + var32 = 1792; + } else if (var32 == 1024) { + var32 = 1280; } else { - var34 = 1536; + var32 = 1536; } } else if (KeyHandler.KeyHandler_pressedKeys[50]) { - if (var34 == 0) { - var34 = 256; - } else if (var34 == 1024) { - var34 = 768; + if (var32 == 0) { + var32 = 256; + } else if (var32 == 1024) { + var32 = 768; } else { - var34 = 512; + var32 = 512; } } - byte var35 = 0; + byte var33 = 0; if (KeyHandler.KeyHandler_pressedKeys[35]) { - var35 = -1; + var33 = -1; } else if (KeyHandler.KeyHandler_pressedKeys[51]) { - var35 = 1; + var33 = 1; } - var6 = 0; - if (var34 >= 0 || var35 != 0) { - var6 = KeyHandler.KeyHandler_pressedKeys[81] ? oculusOrbSlowedSpeed : oculusOrbNormalSpeed; - var6 *= 16; - field706 = var34; - field632 = var35; + var5 = 0; + if (var32 >= 0 || var33 != 0) { + var5 = KeyHandler.KeyHandler_pressedKeys[81] ? oculusOrbSlowedSpeed : oculusOrbNormalSpeed; + var5 *= 16; + field723 = var32; + field724 = var33; } - if (field705 < var6) { - field705 += var6 / 8; - if (field705 > var6) { - field705 = var6; + if (field647 < var5) { + field647 += var5 / 8; + if (field647 > var5) { + field647 = var5; } - } else if (field705 > var6) { - field705 = field705 * 9 / 10; + } else if (field647 > var5) { + field647 = field647 * 9 / 10; } - if (field705 > 0) { - var7 = field705 / 16; - if (field706 >= 0) { - var4 = field706 - WorldMapLabelSize.cameraYaw & 2047; - var8 = Rasterizer3D.Rasterizer3D_sine[var4]; - var9 = Rasterizer3D.Rasterizer3D_cosine[var4]; - WorldMapSectionType.oculusOrbFocalPointX += var8 * var7 / 65536; - Language.oculusOrbFocalPointY += var9 * var7 / 65536; + if (field647 > 0) { + var6 = field647 / 16; + if (field723 >= 0) { + var3 = field723 - FriendSystem.cameraYaw & 2047; + var7 = Rasterizer3D.Rasterizer3D_sine[var3]; + var8 = Rasterizer3D.Rasterizer3D_cosine[var3]; + PendingSpawn.oculusOrbFocalPointX += var7 * var6 / 65536; + Skeleton.oculusOrbFocalPointY += var8 * var6 / 65536; } - if (field632 != 0) { - WorldMapManager.field314 += var7 * field632; - if (WorldMapManager.field314 > 0) { - WorldMapManager.field314 = 0; + if (field724 != 0) { + WorldMapSectionType.field166 += var6 * field724; + if (WorldMapSectionType.field166 > 0) { + WorldMapSectionType.field166 = 0; } } } else { - field706 = -1; - field632 = -1; + field723 = -1; + field724 = -1; } if (KeyHandler.KeyHandler_pressedKeys[13]) { - class189.method3620(); + packetWriter.addNode(TilePaint.getPacketBufferNode(ClientPacket.field2274, packetWriter.isaacCipher)); + oculusOrbState = 0; } } - if (MouseHandler.MouseHandler_currentButton == 4 && NetFileRequest.mouseCam) { - var4 = MouseHandler.MouseHandler_y - mouseCamClickedY; - camAngleDX = var4 * 2; - mouseCamClickedY = var4 != -1 && var4 != 1 ? (mouseCamClickedY + MouseHandler.MouseHandler_y) / 2 : MouseHandler.MouseHandler_y; - var5 = mouseCamClickedX - MouseHandler.MouseHandler_x; - camAngleDY = var5 * 2; - mouseCamClickedX = var5 != -1 && var5 != 1 ? (MouseHandler.MouseHandler_x + mouseCamClickedX) / 2 : MouseHandler.MouseHandler_x; + if (MouseHandler.MouseHandler_currentButton == 4 && ArchiveLoader.mouseCam) { + var3 = MouseHandler.MouseHandler_y - mouseCamClickedY; + camAngleDX = var3 * 2; + mouseCamClickedY = var3 != -1 && var3 != 1 ? (mouseCamClickedY + MouseHandler.MouseHandler_y) / 2 : MouseHandler.MouseHandler_y; + var4 = mouseCamClickedX - MouseHandler.MouseHandler_x; + camAngleDY = var4 * 2; + mouseCamClickedX = var4 != -1 && var4 != 1 ? (mouseCamClickedX + MouseHandler.MouseHandler_x) / 2 : MouseHandler.MouseHandler_x; } else { if (KeyHandler.KeyHandler_pressedKeys[96]) { camAngleDY += (-24 - camAngleDY) / 2; @@ -4014,72 +3859,178 @@ public final class Client extends GameShell implements Usernamed { } if (isCameraLocked) { - StructDefinition.method4529(); + var3 = GrandExchangeOfferOwnWorldComparator.field640 * 16384 + 64; + var4 = ReflectionCheck.field1319 * 16384 + 64; + var5 = WorldMapSectionType.getTileHeight(var3, var4, Clock.Client_plane) - AbstractWorldMapIcon.field306; + if (HitSplatDefinition.cameraX < var3) { + HitSplatDefinition.cameraX = (var3 - HitSplatDefinition.cameraX) * WorldMapElement.field3230 / 1000 + HitSplatDefinition.cameraX + FontName.field3660; + if (HitSplatDefinition.cameraX > var3) { + HitSplatDefinition.cameraX = var3; + } + } + + if (HitSplatDefinition.cameraX > var3) { + HitSplatDefinition.cameraX -= WorldMapElement.field3230 * (HitSplatDefinition.cameraX - var3) / 1000 + FontName.field3660; + if (HitSplatDefinition.cameraX < var3) { + HitSplatDefinition.cameraX = var3; + } + } + + if (class51.cameraY < var5) { + class51.cameraY = (var5 - class51.cameraY) * WorldMapElement.field3230 / 1000 + class51.cameraY + FontName.field3660; + if (class51.cameraY > var5) { + class51.cameraY = var5; + } + } + + if (class51.cameraY > var5) { + class51.cameraY -= WorldMapElement.field3230 * (class51.cameraY - var5) / 1000 + FontName.field3660; + if (class51.cameraY < var5) { + class51.cameraY = var5; + } + } + + if (Actor.cameraZ < var4) { + Actor.cameraZ = (var4 - Actor.cameraZ) * WorldMapElement.field3230 / 1000 + Actor.cameraZ + FontName.field3660; + if (Actor.cameraZ > var4) { + Actor.cameraZ = var4; + } + } + + if (Actor.cameraZ > var4) { + Actor.cameraZ -= WorldMapElement.field3230 * (Actor.cameraZ - var4) / 1000 + FontName.field3660; + if (Actor.cameraZ < var4) { + Actor.cameraZ = var4; + } + } + + var3 = class188.field2346 * 16384 + 64; + var4 = WorldMapLabelSize.field139 * 128 + 64; + var5 = WorldMapSectionType.getTileHeight(var3, var4, Clock.Client_plane) - PlayerAppearance.field2549; + var6 = var3 - HitSplatDefinition.cameraX; + var7 = var5 - class51.cameraY; + var8 = var4 - Actor.cameraZ; + var9 = (int)Math.sqrt((double)(var8 * var8 + var6 * var6)); + var10 = (int)(Math.atan2((double)var7, (double)var9) * 325.949D) & 2047; + var11 = (int)(Math.atan2((double)var6, (double)var8) * -325.949D) & 2047; + if (var10 < 128) { + var10 = 128; + } + + if (var10 > 383) { + var10 = 383; + } + + if (GrandExchangeOffer.cameraPitch < var10) { + GrandExchangeOffer.cameraPitch = (var10 - GrandExchangeOffer.cameraPitch) * class51.field435 / 1000 + GrandExchangeOffer.cameraPitch + WorldMapSprite.field240; + if (GrandExchangeOffer.cameraPitch > var10) { + GrandExchangeOffer.cameraPitch = var10; + } + } + + if (GrandExchangeOffer.cameraPitch > var10) { + GrandExchangeOffer.cameraPitch -= class51.field435 * (GrandExchangeOffer.cameraPitch - var10) / 1000 + WorldMapSprite.field240; + if (GrandExchangeOffer.cameraPitch < var10) { + GrandExchangeOffer.cameraPitch = var10; + } + } + + var12 = var11 - FriendSystem.cameraYaw; + if (var12 > 1024) { + var12 -= 2048; + } + + if (var12 < -1024) { + var12 += 2048; + } + + if (var12 > 0) { + FriendSystem.cameraYaw = FriendSystem.cameraYaw + WorldMapSprite.field240 + var12 * class51.field435 / 1000; + FriendSystem.cameraYaw &= 2047; + } + + if (var12 < 0) { + FriendSystem.cameraYaw -= -var12 * class51.field435 / 1000 + WorldMapSprite.field240; + FriendSystem.cameraYaw &= 2047; + } + + int var28 = var11 - FriendSystem.cameraYaw; + if (var28 > 1024) { + var28 -= 2048; + } + + if (var28 < -1024) { + var28 += 2048; + } + + if (var28 < 0 && var12 > 0 || var28 > 0 && var12 < 0) { + FriendSystem.cameraYaw = var11; + } } - for (var4 = 0; var4 < 5; ++var4) { - int var10002 = field878[var4]++; + for (var3 = 0; var3 < 5; ++var3) { + int var10002 = field895[var3]++; } - MilliClock.varcs.tryWrite(); - var4 = ++MouseHandler.MouseHandler_idleCycles - 1; - var6 = MusicPatchNode.method3814(); - if (var4 > 15000 && var6 > 15000) { + class197.varcs.tryWrite(); + var3 = SpriteMask.method4038(); + var4 = FontName.method5401(); + if (var3 > 15000 && var4 > 15000) { logoutTimer = 250; MouseHandler.MouseHandler_idleCycles = 14500; - var26 = class2.getPacketBufferNode(ClientPacket.field2268, packetWriter.isaacCipher); - packetWriter.addNode(var26); + var43 = TilePaint.getPacketBufferNode(ClientPacket.field2287, packetWriter.isaacCipher); + packetWriter.addNode(var43); } - Message.friendSystem.processFriendUpdates(); + KeyHandler.friendSystem.processFriendUpdates(); ++packetWriter.pendingWrites; if (packetWriter.pendingWrites > 50) { - var26 = class2.getPacketBufferNode(ClientPacket.field2182, packetWriter.isaacCipher); - packetWriter.addNode(var26); + var43 = TilePaint.getPacketBufferNode(ClientPacket.field2247, packetWriter.isaacCipher); + packetWriter.addNode(var43); } try { packetWriter.flush(); } catch (IOException var29) { - StudioGame.method4119(); + WorldMapIcon_1.method308(); } return; } - var45 = var43.widget; - if (var45.childIndex < 0) { + var41 = var40.widget; + if (var41.childIndex < 0) { break; } - var41 = Tile.getWidget(var45.parentId); - } while(var41 == null || var41.children == null || var45.childIndex >= var41.children.length || var45 != var41.children[var45.childIndex]); + var27 = Varps.getWidget(var41.parentId); + } while(var27 == null || var27.children == null || var41.childIndex >= var27.children.length || var41 != var27.children[var41.childIndex]); - runScriptEvent(var43); + class4.runScriptEvent(var40); } } - var45 = var43.widget; - if (var45.childIndex < 0) { + var41 = var40.widget; + if (var41.childIndex < 0) { break; } - var41 = Tile.getWidget(var45.parentId); - } while(var41 == null || var41.children == null || var45.childIndex >= var41.children.length || var45 != var41.children[var45.childIndex]); + var27 = Varps.getWidget(var41.parentId); + } while(var27 == null || var27.children == null || var41.childIndex >= var27.children.length || var41 != var27.children[var41.childIndex]); - runScriptEvent(var43); + class4.runScriptEvent(var40); } } - var45 = var43.widget; - if (var45.childIndex < 0) { + var41 = var40.widget; + if (var41.childIndex < 0) { break; } - var41 = Tile.getWidget(var45.parentId); - } while(var41 == null || var41.children == null || var45.childIndex >= var41.children.length || var45 != var41.children[var45.childIndex]); + var27 = Varps.getWidget(var41.parentId); + } while(var27 == null || var27.children == null || var41.childIndex >= var27.children.length || var41 != var27.children[var41.childIndex]); - runScriptEvent(var43); + class4.runScriptEvent(var40); } } } @@ -4087,15 +4038,15 @@ public final class Client extends GameShell implements Usernamed { } } - @ObfuscatedName("ge") + @ObfuscatedName("gx") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1368439578" + signature = "(B)V", + garbageValue = "2" ) @Export("resizeJS") void resizeJS() { - int var1 = GrandExchangeOfferTotalQuantityComparator.canvasWidth; - int var2 = AttackOption.canvasHeight; + int var1 = Username.canvasWidth; + int var2 = WorldMapData_1.canvasHeight; if (super.contentWidth < var1) { var1 = super.contentWidth; } @@ -4104,10 +4055,10 @@ public final class Client extends GameShell implements Usernamed { var2 = super.contentHeight; } - if (Interpreter.clientPreferences != null) { + if (WorldMapSection2.clientPreferences != null) { try { - Client var3 = class206.client; - Object[] var4 = new Object[]{ItemDefinition.getWindowedMode()}; + Client var3 = Username.client; + Object[] var4 = new Object[]{Friend.getWindowedMode()}; JSObject.getWindow(var3).call("resize", var4); } catch (Throwable var5) { } @@ -4115,263 +4066,184 @@ public final class Client extends GameShell implements Usernamed { } - @ObfuscatedName("gt") + @ObfuscatedName("gp") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1903314138" + garbageValue = "1323665648" ) @Export("drawLoggedIn") final void drawLoggedIn() { - int var1; if (rootInterface != -1) { - var1 = rootInterface; - if (MusicPatch.loadInterface(var1)) { - MouseHandler.drawModelComponents(UserComparator7.Widget_interfaceComponents[var1], -1); - } + GrandExchangeOfferNameComparator.method150(rootInterface); } + int var1; for (var1 = 0; var1 < rootWidgetCount; ++var1) { - if (field833[var1]) { - field834[var1] = true; + if (field851[var1]) { + field852[var1] = true; } - field835[var1] = field833[var1]; - field833[var1] = false; + field853[var1] = field851[var1]; + field851[var1] = false; } - field832 = cycle; + field850 = cycle; viewportX = -1; viewportY = -1; - WorldMapManager.field312 = null; + FloorDecoration.field1604 = null; if (rootInterface != -1) { rootWidgetCount = 0; - class13.drawWidgets(rootInterface, 0, 0, GrandExchangeOfferTotalQuantityComparator.canvasWidth, AttackOption.canvasHeight, 0, 0, -1); + ServerPacket.drawWidgets(rootInterface, 0, 0, Username.canvasWidth, WorldMapData_1.canvasHeight, 0, 0, -1); } Rasterizer2D.Rasterizer2D_resetClip(); if (showMouseCross) { if (mouseCrossColor == 1) { - ObjectDefinition.crossSprites[mouseCrossState * 20 / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); + WorldMapData_0.crossSprites[mouseCrossState * 20 / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); } if (mouseCrossColor == 2) { - ObjectDefinition.crossSprites[mouseCrossState * 20 / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); + WorldMapData_0.crossSprites[mouseCrossState * 20 / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); } } - int var2; - int var3; - int var4; - int var6; - int var7; - int var8; if (!isMenuOpen) { if (viewportX != -1) { - var1 = viewportX; - var2 = viewportY; - if ((menuOptionsCount >= 2 || isItemSelected != 0 || isSpellSelected) && showMouseOverText) { - var3 = GrandExchangeOfferOwnWorldComparator.method1288(); - String var19; - if (isItemSelected == 1 && menuOptionsCount < 2) { - var19 = "Use" + " " + selectedItemName + " " + "->"; - } else if (isSpellSelected && menuOptionsCount < 2) { - var19 = selectedSpellActionName + " " + selectedSpellName + " " + "->"; - } else { - String var5; - if (var3 < 0) { - var5 = ""; - } else if (menuTargets[var3].length() > 0) { - var5 = menuActions[var3] + " " + menuTargets[var3]; - } else { - var5 = menuActions[var3]; - } - - var19 = var5; - } - - if (menuOptionsCount > 2) { - var19 = var19 + NPC.colorStartTag(16777215) + " " + '/' + " " + (menuOptionsCount - 2) + " more options"; - } - - GrandExchangeOffer.fontBold12.drawRandomAlphaAndSpacing(var19, var1 + 4, var2 + 15, 16777215, 0, cycle / 1000); - } + Ignored.method5213(viewportX, viewportY); } } else { - var1 = GrandExchangeEvent.menuX; - var2 = WorldMapManager.menuY; - var3 = KeyHandler.menuWidth; - var4 = class54.menuHeight; - int var13 = 6116423; - Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, var13); - Rasterizer2D.Rasterizer2D_fillRectangle(var1 + 1, var2 + 1, var3 - 2, 16, 0); - Rasterizer2D.Rasterizer2D_drawRectangle(var1 + 1, var2 + 18, var3 - 2, var4 - 19, 0); - GrandExchangeOffer.fontBold12.draw("Choose Option", var1 + 3, var2 + 14, var13, -1); - var6 = MouseHandler.MouseHandler_x; - var7 = MouseHandler.MouseHandler_y; - - int var9; - int var10; - for (var8 = 0; var8 < menuOptionsCount; ++var8) { - var9 = (menuOptionsCount - 1 - var8) * 15 + var2 + 31; - var10 = 16777215; - if (var6 > var1 && var6 < var1 + var3 && var7 > var9 - 13 && var7 < var9 + 3) { - var10 = 16776960; - } - - Font var11 = GrandExchangeOffer.fontBold12; - String var12; - if (var8 < 0) { - var12 = ""; - } else if (menuTargets[var8].length() > 0) { - var12 = menuActions[var8] + " " + menuTargets[var8]; - } else { - var12 = menuActions[var8]; - } - - var11.draw(var12, var1 + 3, var9, var10, 0); - } - - var8 = GrandExchangeEvent.menuX; - var9 = WorldMapManager.menuY; - var10 = KeyHandler.menuWidth; - int var14 = class54.menuHeight; - - for (int var15 = 0; var15 < rootWidgetCount; ++var15) { - if (rootWidgetWidths[var15] + rootWidgetXs[var15] > var8 && rootWidgetXs[var15] < var10 + var8 && rootWidgetHeights[var15] + rootWidgetYs[var15] > var9 && rootWidgetYs[var15] < var9 + var14) { - field834[var15] = true; - } - } + class4.method64(); } if (gameDrawingMode == 3) { for (var1 = 0; var1 < rootWidgetCount; ++var1) { - if (field835[var1]) { + if (field853[var1]) { Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); - } else if (field834[var1]) { + } else if (field852[var1]) { Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); } } } - var1 = UrlRequest.Client_plane; - var2 = Message.localPlayer.x; - var3 = Message.localPlayer.y; - var4 = field690; + var1 = Clock.Client_plane; + int var2 = class192.localPlayer.x; + int var3 = class192.localPlayer.y; + int var4 = field707; - for (ObjectSound var20 = (ObjectSound)ObjectSound.objectSounds.last(); var20 != null; var20 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var20.soundEffectId != -1 || var20.soundEffectIds != null) { - var6 = 0; - if (var2 > var20.field1064 * 16384) { - var6 += var2 - var20.field1064 * 16384; - } else if (var2 < var20.x * 128) { - var6 += var20.x * 128 - var2; + for (ObjectSound var5 = (ObjectSound)ObjectSound.objectSounds.last(); var5 != null; var5 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var5.soundEffectId != -1 || var5.soundEffectIds != null) { + int var6 = 0; + if (var2 > var5.field1069 * 16384) { + var6 += var2 - var5.field1069 * 16384; + } else if (var2 < var5.x * 16384) { + var6 += var5.x * 16384 - var2; } - if (var3 > var20.field1052 * 16384) { - var6 += var3 - var20.field1052 * 16384; - } else if (var3 < var20.y * 16384) { - var6 += var20.y * 16384 - var3; + if (var3 > var5.field1080 * 128) { + var6 += var3 - var5.field1080 * 128; + } else if (var3 < var5.y * 128) { + var6 += var5.y * 128 - var3; } - if (var6 - 64 <= var20.field1053 && areaSoundEffectVolume != 0 && var1 == var20.plane) { + if (var6 - 64 <= var5.field1070 && areaSoundEffectVolume != 0 && var1 == var5.plane) { var6 -= 64; if (var6 < 0) { var6 = 0; } - var7 = (var20.field1053 - var6) * areaSoundEffectVolume / var20.field1053; + int var7 = (var5.field1070 - var6) * areaSoundEffectVolume / var5.field1070; Object var10000; - if (var20.stream1 == null) { - if (var20.soundEffectId >= 0) { + if (var5.stream1 == null) { + if (var5.soundEffectId >= 0) { var10000 = null; - SoundEffect var16 = SoundEffect.readSoundEffect(FloorDecoration.archive4, var20.soundEffectId, 0); - if (var16 != null) { - RawSound var17 = var16.toRawSound().resample(ClientPreferences.decimator); - RawPcmStream var18 = RawPcmStream.createRawPcmStream(var17, 100, var7); - var18.setNumLoops(-1); - Tiles.pcmStreamMixer.addSubStream(var18); - var20.stream1 = var18; + SoundEffect var8 = SoundEffect.readSoundEffect(archive4, var5.soundEffectId, 0); + if (var8 != null) { + RawSound var9 = var8.toRawSound().resample(WorldMapSection1.decimator); + RawPcmStream var10 = RawPcmStream.createRawPcmStream(var9, 100, var7); + var10.setNumLoops(-1); + class2.pcmStreamMixer.addSubStream(var10); + var5.stream1 = var10; } } } else { - var20.stream1.method2578(var7); + var5.stream1.method2665(var7); } - if (var20.stream2 == null) { - if (var20.soundEffectIds != null && (var20.field1055 -= var4) <= 0) { - var8 = (int)(Math.random() * (double)var20.soundEffectIds.length); + if (var5.stream2 == null) { + if (var5.soundEffectIds != null && (var5.field1077 -= var4) <= 0) { + int var12 = (int)(Math.random() * (double)var5.soundEffectIds.length); var10000 = null; - SoundEffect var22 = SoundEffect.readSoundEffect(FloorDecoration.archive4, var20.soundEffectIds[var8], 0); - if (var22 != null) { - RawSound var23 = var22.toRawSound().resample(ClientPreferences.decimator); - RawPcmStream var21 = RawPcmStream.createRawPcmStream(var23, 100, var7); - var21.setNumLoops(0); - Tiles.pcmStreamMixer.addSubStream(var21); - var20.stream2 = var21; - var20.field1055 = var20.field1060 + (int)(Math.random() * (double)(var20.field1061 - var20.field1060)); + SoundEffect var13 = SoundEffect.readSoundEffect(archive4, var5.soundEffectIds[var12], 0); + if (var13 != null) { + RawSound var14 = var13.toRawSound().resample(WorldMapSection1.decimator); + RawPcmStream var11 = RawPcmStream.createRawPcmStream(var14, 100, var7); + var11.setNumLoops(0); + class2.pcmStreamMixer.addSubStream(var11); + var5.stream2 = var11; + var5.field1077 = var5.field1074 + (int)(Math.random() * (double)(var5.field1075 - var5.field1074)); } } } else { - var20.stream2.method2578(var7); - if (!var20.stream2.hasNext()) { - var20.stream2 = null; + var5.stream2.method2665(var7); + if (!var5.stream2.hasNext()) { + var5.stream2 = null; } } } else { - if (var20.stream1 != null) { - Tiles.pcmStreamMixer.removeSubStream(var20.stream1); - var20.stream1 = null; + if (var5.stream1 != null) { + class2.pcmStreamMixer.removeSubStream(var5.stream1); + var5.stream1 = null; } - if (var20.stream2 != null) { - Tiles.pcmStreamMixer.removeSubStream(var20.stream2); - var20.stream2 = null; + if (var5.stream2 != null) { + class2.pcmStreamMixer.removeSubStream(var5.stream2); + var5.stream2 = null; } } } } - field690 = 0; + field707 = 0; } - @ObfuscatedName("hc") + @ObfuscatedName("hs") @ObfuscatedSignature( - signature = "(Lcr;I)Z", - garbageValue = "1049525241" + signature = "(Lci;I)Z", + garbageValue = "1768904673" ) - final boolean method1304(PacketWriter var1) { + final boolean method1363(PacketWriter var1) { AbstractSocket var2 = var1.getSocket(); PacketBuffer var3 = var1.packetBuffer; if (var2 == null) { return false; } else { int var6; - String var18; + String var16; try { int var5; if (var1.serverPacket == null) { - if (var1.field1297) { + if (var1.field1301) { if (!var2.isAvailable(1)) { return false; } var2.read(var1.packetBuffer.array, 0, 1); - var1.field1298 = 0; - var1.field1297 = false; + var1.field1299 = 0; + var1.field1301 = false; } var3.offset = 0; - if (var3.method5492()) { + if (var3.method5539()) { if (!var2.isAvailable(1)) { return false; } var2.read(var1.packetBuffer.array, 1, 1); - var1.field1298 = 0; + var1.field1299 = 0; } - var1.field1297 = true; - ServerPacket[] var4 = class162.ServerPacket_values(); + var1.field1301 = true; + ServerPacket[] var4 = Occluder.ServerPacket_values(); var5 = var3.readSmartByteShortIsaac(); if (var5 < 0 || var5 >= var4.length) { throw new IOException(var5 + " " + var3.offset); @@ -4406,123 +4278,49 @@ public final class Client extends GameShell implements Usernamed { var3.offset = 0; var2.read(var3.array, 0, var1.serverPacketLength); - var1.field1298 = 0; - timer.method5016(); - var1.field1299 = var1.field1301; - var1.field1301 = var1.field1300; - var1.field1300 = var1.serverPacket; - int var16; - if (ServerPacket.field2100 == var1.serverPacket) { - var16 = var3.method5583(); - var5 = var3.method5591(); - Varps.Varps_temp[var16] = var5; - if (Varps.Varps_main[var16] != var5) { - Varps.Varps_main[var16] = var5; - } - - BufferedSink.changeGameOptions(var16); - field814[++field648 - 1 & 31] = var16; + var1.field1299 = 0; + timer.method5044(); + var1.field1307 = var1.field1305; + var1.field1305 = var1.field1309; + var1.field1309 = var1.serverPacket; + if (ServerPacket.field2116 == var1.serverPacket) { + WorldMapLabel.loadRegions(false, var1.packetBuffer); var1.serverPacket = null; return true; } - if (ServerPacket.field2107 == var1.serverPacket) { - var16 = var3.method5583(); - if (var16 == 65535) { - var16 = -1; - } - - WorldMapSprite.playSong(var16); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2148 == var1.serverPacket) { - var16 = var3.method5723(); - if (var16 == 65535) { - var16 = -1; - } - - var5 = var3.readMedium(); - ScriptFrame.playSoundJingle(var16, var5); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2157 == var1.serverPacket) { - var16 = var3.readInt(); - if (var16 != field710) { - field710 = var16; - KeyHandler.method835(); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2147 == var1.serverPacket) { - InterfaceParent.logOut(); + if (ServerPacket.field2118 == var1.serverPacket) { + class30.logOut(); var1.serverPacket = null; return false; } - if (ServerPacket.field2104 == var1.serverPacket) { - var16 = var3.readInt(); - var5 = var3.readInt(); - var6 = WorldMapSectionType.getGcDuration(); - PacketBufferNode var42 = class2.getPacketBufferNode(ClientPacket.field2191, packetWriter.isaacCipher); - var42.packetBuffer.method5569(GameShell.fps); - var42.packetBuffer.writeShortLE(var16); - var42.packetBuffer.writeShortLE(var5); - var42.packetBuffer.method5696(var6); - packetWriter.addNode(var42); + String var38; + if (ServerPacket.field2200 == var1.serverPacket) { + var38 = var3.readStringCp1252NullTerminated(); + var16 = AbstractFont.escapeBrackets(class40.method735(WallDecoration.method3356(var3))); + ClientPreferences.addGameMessage(6, var38, var16); var1.serverPacket = null; return true; } - Widget var17; - if (ServerPacket.field2163 == var1.serverPacket) { - var16 = var3.method5583(); - var5 = var3.method5590(); - var17 = Tile.getWidget(var5); - if (var17.modelType != 1 || var16 != var17.modelId) { - var17.modelType = 1; - var17.modelId = var16; - LoginPacket.invalidateWidget(var17); - } - + if (ServerPacket.field2172 == var1.serverPacket) { + GrandExchangeOfferWorldComparator.method77(class185.field2322); var1.serverPacket = null; return true; } - if (ServerPacket.field2088 == var1.serverPacket) { - minimapState = var3.readUnsignedByte(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2142 == var1.serverPacket) { - AbstractWorldMapIcon.method614(class179.field2297); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2120 == var1.serverPacket) { - WorldMapRectangle.updateNpcs(true, var3); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2114 == var1.serverPacket) { - for (var16 = 0; var16 < players.length; ++var16) { - if (players[var16] != null) { - players[var16].sequence = -1; + int var17; + if (ServerPacket.field2181 == var1.serverPacket) { + for (var17 = 0; var17 < players.length; ++var17) { + if (players[var17] != null) { + players[var17].sequence = -1; } } - for (var16 = 0; var16 < npcs.length; ++var16) { - if (npcs[var16] != null) { - npcs[var16].sequence = -1; + for (var17 = 0; var17 < npcs.length; ++var17) { + if (npcs[var17] != null) { + npcs[var17].sequence = -1; } } @@ -4530,157 +4328,213 @@ public final class Client extends GameShell implements Usernamed { return true; } - Widget var55; - if (ServerPacket.field2112 == var1.serverPacket) { - var16 = var3.method5592(); - var55 = Tile.getWidget(var16); - - for (var6 = 0; var6 < var55.itemIds.length; ++var6) { - var55.itemIds[var6] = -1; - var55.itemIds[var6] = 0; - } - - LoginPacket.invalidateWidget(var55); + if (ServerPacket.field2185 == var1.serverPacket) { + KeyHandler.friendSystem.ignoreList.read(var3, var1.serverPacketLength); + class96.FriendSystem_invalidateIgnoreds(); + field839 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.field2160 == var1.serverPacket) { - var16 = var3.readInt(); - var5 = var3.method5565(); - var17 = Tile.getWidget(var16); - if (var5 != var17.sequenceId || var5 == -1) { - var17.sequenceId = var5; - var17.modelFrame = 0; - var17.modelFrameCycle = 0; - LoginPacket.invalidateWidget(var17); + if (ServerPacket.field2145 == var1.serverPacket) { + publicChatMode = var3.readUnsignedByte(); + tradeChatMode = var3.method5606(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2180 == var1.serverPacket) { + var17 = var3.readUnsignedByte(); + if (var3.readUnsignedByte() == 0) { + grandExchangeOffers[var17] = new GrandExchangeOffer(); + var3.offset += 18; + } else { + --var3.offset; + grandExchangeOffers[var17] = new GrandExchangeOffer(var3, false); + } + + field841 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2171 == var1.serverPacket) { + var17 = var3.readInt(); + if (var17 != field727) { + field727 = var17; + WorldMapCacheName.method636(); } var1.serverPacket = null; return true; } - if (ServerPacket.field2164 == var1.serverPacket) { - AbstractWorldMapIcon.method614(class179.field2298); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2159 == var1.serverPacket) { - Message.friendSystem.ignoreList.read(var3, var1.serverPacketLength); - GameShell.FriendSystem_invalidateIgnoreds(); - field711 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2113 == var1.serverPacket) { - Buddy.method5211(); - runEnergy = var3.readUnsignedByte(); - field825 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2152 == var1.serverPacket) { - var16 = var3.method5583(); - var5 = var3.method5590(); - var17 = Tile.getWidget(var5); - if (var17 != null && var17.type == 0) { - if (var16 > var17.scrollHeight - var17.height) { - var16 = var17.scrollHeight - var17.height; - } - - if (var16 < 0) { - var16 = 0; - } - - if (var16 != var17.scrollY) { - var17.scrollY = var16; - LoginPacket.invalidateWidget(var17); - } + if (ServerPacket.field2129 == var1.serverPacket) { + var17 = var3.readUnsignedShort(); + if (var17 == 65535) { + var17 = -1; } + BufferedSink.playSong(var17); var1.serverPacket = null; return true; } - if (ServerPacket.field2110 == var1.serverPacket) { - for (var16 = 0; var16 < Varps.Varps_main.length; ++var16) { - if (Varps.Varps_main[var16] != Varps.Varps_temp[var16]) { - Varps.Varps_main[var16] = Varps.Varps_temp[var16]; - BufferedSink.changeGameOptions(var16); - field814[++field648 - 1 & 31] = var16; - } + if (ServerPacket.field2198 == var1.serverPacket) { + var17 = var3.method5762(); + if (var17 == 65535) { + var17 = -1; } + var5 = var3.method5620(); + class49.playSoundJingle(var17, var5); var1.serverPacket = null; return true; } - if (ServerPacket.field2140 == var1.serverPacket) { - Message.friendSystem.method1845(); - field711 = cycleCntr; + int var7; + if (ServerPacket.field2166 == var1.serverPacket) { + var17 = var3.readUnsignedByte(); + var5 = var3.readUnsignedByte(); + var6 = var3.readUnsignedByte(); + var7 = var3.readUnsignedByte(); + field775[var17] = true; + field892[var17] = var5; + field699[var17] = var6; + field894[var17] = var7; + field895[var17] = 0; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2125 == var1.serverPacket) { + var17 = var3.method5614(); + var5 = var3.method5665(); + Varps.Varps_temp[var17] = var5; + if (Varps.Varps_main[var17] != var5) { + Varps.Varps_main[var17] = var5; + } + + ServerPacket.changeGameOptions(var17); + field832[++field833 - 1 & 31] = var17; var1.serverPacket = null; return true; } int var8; int var9; - long var12; - int var19; - int var20; - InterfaceParent var41; - if (ServerPacket.field2153 == var1.serverPacket) { - var16 = var3.offset + var1.serverPacketLength; + Widget var18; + if (ServerPacket.field2150 == var1.serverPacket) { + var17 = var3.readInt(); var5 = var3.readUnsignedShort(); - var6 = var3.readUnsignedShort(); - if (var5 != rootInterface) { - rootInterface = var5; - this.resizeRoot(false); - GameShell.Widget_resetModelFrames(rootInterface); - Players.runWidgetOnLoadListener(rootInterface); - - for (var19 = 0; var19 < 100; ++var19) { - field833[var19] = true; - } + if (var17 < -70000) { + var5 += 32768; } - InterfaceParent var43; - for (; var6-- > 0; var43.field546 = true) { - var19 = var3.readInt(); + if (var17 >= 0) { + var18 = Varps.getWidget(var17); + } else { + var18 = null; + } + + for (; var3.offset < var1.serverPacketLength; PlayerAppearance.itemContainerSetItem(var5, var7, var8 - 1, var9)) { + var7 = var3.readUShortSmart(); var8 = var3.readUnsignedShort(); - var9 = var3.readUnsignedByte(); - var43 = (InterfaceParent)interfaceParents.get((long)var19); - if (var43 != null && var8 != var43.group) { - VarpDefinition.closeInterface(var43, true); - var43 = null; + var9 = 0; + if (var8 != 0) { + var9 = var3.readUnsignedByte(); + if (var9 == 255) { + var9 = var3.readInt(); + } } - if (var43 == null) { - var43 = ScriptFrame.method1107(var19, var8, var9); + if (var18 != null && var7 >= 0 && var7 < var18.itemIds.length) { + var18.itemIds[var7] = var8; + var18.itemQuantities[var7] = var9; } } - for (var41 = (InterfaceParent)interfaceParents.first(); var41 != null; var41 = (InterfaceParent)interfaceParents.next()) { - if (var41.field546) { - var41.field546 = false; - } else { - VarpDefinition.closeInterface(var41, true); + if (var18 != null) { + NPCDefinition.invalidateWidget(var18); + } + + BufferedSource.method5934(); + changedItemContainers[++field835 - 1 & 31] = var5 & 32767; + var1.serverPacket = null; + return true; + } + + boolean var41; + if (ServerPacket.field2173 == var1.serverPacket) { + var17 = var3.readInt(); + var41 = var3.readUnsignedByte() == 1; + var18 = Varps.getWidget(var17); + if (var41 != var18.isHidden) { + var18.isHidden = var41; + NPCDefinition.invalidateWidget(var18); + } + + var1.serverPacket = null; + return true; + } + + Widget var51; + if (ServerPacket.field2161 == var1.serverPacket) { + var17 = var3.method5626(); + var51 = Varps.getWidget(var17); + + for (var6 = 0; var6 < var51.itemIds.length; ++var6) { + var51.itemIds[var6] = -1; + var51.itemIds[var6] = 0; + } + + NPCDefinition.invalidateWidget(var51); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2157 == var1.serverPacket) { + KeyHandler.updateNpcs(false, var3); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2135 == var1.serverPacket) { + if (InterfaceParent.clanChat != null) { + InterfaceParent.clanChat.method5296(var3); + } + + Players.method2189(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2159 == var1.serverPacket) { + var17 = var3.method5625(); + var51 = Varps.getWidget(var17); + var51.modelType = 3; + var51.modelId = class192.localPlayer.appearance.getChatHeadId(); + NPCDefinition.invalidateWidget(var51); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2183 == var1.serverPacket) { + FontName.field3663 = var3.readUnsignedByte(); + SecureRandomCallable.field531 = var3.method5605(); + + for (var17 = SecureRandomCallable.field531; var17 < SecureRandomCallable.field531 + 8; ++var17) { + for (var5 = FontName.field3663; var5 < FontName.field3663 + 8; ++var5) { + if (groundItems[Clock.Client_plane][var17][var5] != null) { + groundItems[Clock.Client_plane][var17][var5] = null; + WorldMapEvent.updateItemPile(var17, var5); + } } } - widgetClickMasks = new NodeHashTable(512); - - while (var3.offset < var16) { - var19 = var3.readInt(); - var8 = var3.readUnsignedShort(); - var9 = var3.readUnsignedShort(); - var20 = var3.readInt(); - - for (int var11 = var8; var11 <= var9; ++var11) { - var12 = (long)var11 + ((long)var19 << 32); - widgetClickMasks.put(new IntegerNode(var20), var12); + for (PendingSpawn var42 = (PendingSpawn)pendingSpawns.last(); var42 != null; var42 = (PendingSpawn)pendingSpawns.previous()) { + if (var42.x >= SecureRandomCallable.field531 && var42.x < SecureRandomCallable.field531 + 8 && var42.y >= FontName.field3663 && var42.y < FontName.field3663 + 8 && var42.plane == Clock.Client_plane) { + var42.hitpoints = 0; } } @@ -4688,18 +4542,308 @@ public final class Client extends GameShell implements Usernamed { return true; } + if (ServerPacket.field2139 == var1.serverPacket) { + InterfaceParent.method1192(var3.readStringCp1252NullTerminated()); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2178 == var1.serverPacket) { + var17 = var3.method5740(); + rootInterface = var17; + this.resizeRoot(false); + class51.Widget_resetModelFrames(var17); + WorldMapLabelSize.runWidgetOnLoadListener(rootInterface); + + for (var5 = 0; var5 < 100; ++var5) { + field851[var5] = true; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2137 == var1.serverPacket) { + for (var17 = 0; var17 < VarpDefinition.VarpDefinition_fileCount; ++var17) { + VarpDefinition var50 = Messages.VarpDefinition_get(var17); + if (var50 != null) { + Varps.Varps_temp[var17] = 0; + Varps.Varps_main[var17] = 0; + } + } + + BufferedSource.method5934(); + field833 += 32; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2123 == var1.serverPacket) { + GrandExchangeOfferWorldComparator.method77(class185.field2319); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2144 == var1.serverPacket) { + GrandExchangeOfferWorldComparator.method77(class185.field2327); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2153 == var1.serverPacket) { + byte var61 = var3.method5609(); + var5 = var3.method5740(); + Varps.Varps_temp[var5] = var61; + if (Varps.Varps_main[var5] != var61) { + Varps.Varps_main[var5] = var61; + } + + ServerPacket.changeGameOptions(var5); + field832[++field833 - 1 & 31] = var5; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2192 == var1.serverPacket) { + isCameraLocked = false; + + for (var17 = 0; var17 < 5; ++var17) { + field775[var17] = false; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2146 == var1.serverPacket) { + var38 = var3.readStringCp1252NullTerminated(); + Object[] var49 = new Object[var38.length() + 1]; + + for (var6 = var38.length() - 1; var6 >= 0; --var6) { + if (var38.charAt(var6) == 's') { + var49[var6 + 1] = var3.readStringCp1252NullTerminated(); + } else { + var49[var6 + 1] = new Integer(var3.readInt()); + } + } + + var49[0] = new Integer(var3.readInt()); + ScriptEvent var57 = new ScriptEvent(); + var57.args = var49; + class4.runScriptEvent(var57); + var1.serverPacket = null; + return true; + } + + Widget var54; + if (ServerPacket.field2133 == var1.serverPacket) { + var17 = var3.readUnsignedShort(); + var5 = var3.method5740(); + var6 = var3.method5665(); + var54 = Varps.getWidget(var6); + var54.field2696 = var17 + (var5 << 16); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2156 == var1.serverPacket) { + var17 = var3.method5610(); + var5 = var3.method5722(); + var6 = var3.readInt(); + var54 = Varps.getWidget(var6); + if (var17 != var54.rawX || var5 != var54.rawY || var54.xAlignment != 0 || var54.yAlignment != 0) { + var54.rawX = var17; + var54.rawY = var5; + var54.xAlignment = 0; + var54.yAlignment = 0; + NPCDefinition.invalidateWidget(var54); + this.alignWidget(var54); + if (var54.type == 0) { + WorldMapIcon_1.revalidateWidgetScroll(WorldMapLabel.Widget_interfaceComponents[var6 >> 16], var54, false); + } + } + + var1.serverPacket = null; + return true; + } + + long var20; + if (ServerPacket.field2121 == var1.serverPacket) { + var17 = var3.method5625(); + var5 = var3.method5665(); + var6 = var3.method5762(); + if (var6 == 65535) { + var6 = -1; + } + + var7 = var3.method5740(); + if (var7 == 65535) { + var7 = -1; + } + + for (var8 = var6; var8 <= var7; ++var8) { + var20 = ((long)var5 << 32) + (long)var8; + Node var44 = widgetClickMasks.get(var20); + if (var44 != null) { + var44.remove(); + } + + widgetClickMasks.put(new IntegerNode(var17), var20); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2148 == var1.serverPacket) { + KeyHandler.updateNpcs(true, var3); + var1.serverPacket = null; + return true; + } + + int var10; + if (ServerPacket.field2182 == var1.serverPacket) { + var17 = var3.readInt(); + var5 = var3.readUnsignedShort(); + if (var17 < -70000) { + var5 += 32768; + } + + if (var17 >= 0) { + var18 = Varps.getWidget(var17); + } else { + var18 = null; + } + + if (var18 != null) { + for (var7 = 0; var7 < var18.itemIds.length; ++var7) { + var18.itemIds[var7] = 0; + var18.itemQuantities[var7] = 0; + } + } + + WorldMapRectangle.clearItemContainer(var5); + var7 = var3.readUnsignedShort(); + + for (var8 = 0; var8 < var7; ++var8) { + var9 = var3.method5740(); + var10 = var3.readUnsignedByte(); + if (var10 == 255) { + var10 = var3.readInt(); + } + + if (var18 != null && var8 < var18.itemIds.length) { + var18.itemIds[var8] = var9; + var18.itemQuantities[var8] = var10; + } + + PlayerAppearance.itemContainerSetItem(var5, var8, var9 - 1, var10); + } + + if (var18 != null) { + NPCDefinition.invalidateWidget(var18); + } + + BufferedSource.method5934(); + changedItemContainers[++field835 - 1 & 31] = var5 & 32767; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2147 == var1.serverPacket) { + GrandExchangeOfferWorldComparator.method77(class185.field2315); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2175 == var1.serverPacket) { + GrandExchangeOfferWorldComparator.method77(class185.field2316); + var1.serverPacket = null; + return true; + } + if (ServerPacket.field2154 == var1.serverPacket) { - Buddy.method5211(); - var16 = var3.method5628(); - var5 = var3.method5628(); - var6 = var3.method5591(); - experience[var5] = var6; - currentLevels[var5] = var16; + var17 = var3.method5740(); + var5 = var3.readInt(); + var6 = var17 >> 10 & 31; + var7 = var17 >> 5 & 31; + var8 = var17 & 31; + var9 = (var7 << 11) + (var6 << 19) + (var8 << 3); + Widget var59 = Varps.getWidget(var5); + if (var9 != var59.color) { + var59.color = var9; + NPCDefinition.invalidateWidget(var59); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2170 == var1.serverPacket) { + if (rootInterface != -1) { + class226.runIntfCloseListeners(rootInterface, 0); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2169 == var1.serverPacket) { + SecureRandomCallable.field531 = var3.method5771(); + FontName.field3663 = var3.method5605(); + + while (var3.offset < var1.serverPacketLength) { + var17 = var3.readUnsignedByte(); + class185 var48 = class83.method2107()[var17]; + GrandExchangeOfferWorldComparator.method77(var48); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2130 == var1.serverPacket) { + isCameraLocked = true; + class188.field2346 = var3.readUnsignedByte() * 128; + WorldMapLabelSize.field139 = var3.readUnsignedByte() * 16384; + PlayerAppearance.field2549 = var3.readUnsignedShort(); + WorldMapSprite.field240 = var3.readUnsignedByte(); + class51.field435 = var3.readUnsignedByte(); + if (class51.field435 >= 100) { + var17 = class188.field2346 * 16384 + 64; + var5 = WorldMapLabelSize.field139 * 128 + 64; + var6 = WorldMapSectionType.getTileHeight(var17, var5, Clock.Client_plane) - PlayerAppearance.field2549; + var7 = var17 - HitSplatDefinition.cameraX; + var8 = var6 - class51.cameraY; + var9 = var5 - Actor.cameraZ; + var10 = (int)Math.sqrt((double)(var9 * var9 + var7 * var7)); + GrandExchangeOffer.cameraPitch = (int)(Math.atan2((double)var8, (double)var10) * 325.949D) & 2047; + FriendSystem.cameraYaw = (int)(Math.atan2((double)var7, (double)var9) * -325.949D) & 2047; + if (GrandExchangeOffer.cameraPitch < 128) { + GrandExchangeOffer.cameraPitch = 128; + } + + if (GrandExchangeOffer.cameraPitch > 383) { + GrandExchangeOffer.cameraPitch = 383; + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2199 == var1.serverPacket) { + BufferedSource.method5934(); + var17 = var3.method5626(); + var5 = var3.readUnsignedByte(); + var6 = var3.method5605(); + experience[var5] = var17; + currentLevels[var5] = var6; levels[var5] = 1; - for (var19 = 0; var19 < 98; ++var19) { - if (var6 >= Skills.Skills_experienceTable[var19]) { - levels[var5] = var19 + 2; + for (var7 = 0; var7 < 98; ++var7) { + if (var17 >= Skills.Skills_experienceTable[var7]) { + levels[var5] = var7 + 2; } } @@ -4708,253 +4852,526 @@ public final class Client extends GameShell implements Usernamed { return true; } - if (ServerPacket.field2095 == var1.serverPacket) { - AbstractWorldMapIcon.method614(class179.field2289); + if (ServerPacket.field2167 == var1.serverPacket) { + class13.readReflectionCheck(var3, var1.serverPacketLength); var1.serverPacket = null; return true; } - if (ServerPacket.field2122 == var1.serverPacket) { - AbstractWorldMapIcon.method614(class179.field2290); - var1.serverPacket = null; - return true; - } + if (ServerPacket.field2132 == var1.serverPacket) { + if (var1.serverPacketLength == 0) { + InterfaceParent.clanChat = null; + } else { + if (InterfaceParent.clanChat == null) { + InterfaceParent.clanChat = new ClanChat(class192.loginType, Username.client); + } - Widget var7; - if (ServerPacket.field2128 == var1.serverPacket) { - var16 = var3.method5723(); - var5 = var3.method5723(); - var6 = var3.readInt(); - var7 = Tile.getWidget(var6); - var7.field2607 = var16 + (var5 << 16); - var1.serverPacket = null; - return true; - } + InterfaceParent.clanChat.readUpdate(var3); + } - if (ServerPacket.field2134 == var1.serverPacket) { - var16 = var3.readUnsignedShort(); - var5 = var3.readUnsignedByte(); - var6 = var3.readUnsignedShort(); - class268.queueSoundEffect(var16, var5, var6); + Players.method2189(); var1.serverPacket = null; return true; } if (ServerPacket.field2138 == var1.serverPacket) { - isCameraLocked = false; + var17 = var3.method5762(); + class215.method4101(var17); + changedItemContainers[++field835 - 1 & 31] = var17 & 32767; + var1.serverPacket = null; + return true; + } - for (var16 = 0; var16 < 5; ++var16) { - field779[var16] = false; + if (ServerPacket.field2141 == var1.serverPacket) { + var17 = var3.readInt(); + var5 = var3.readInt(); + var6 = GrandExchangeEvent.getGcDuration(); + PacketBufferNode var56 = TilePaint.getPacketBufferNode(ClientPacket.field2214, packetWriter.isaacCipher); + var56.packetBuffer.method5602(GameShell.fps); + var56.packetBuffer.writeByte(var6); + var56.packetBuffer.method5624(var17); + var56.packetBuffer.writeInt(var5); + packetWriter.addNode(var56); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2128 == var1.serverPacket) { + var17 = var3.method5614(); + var5 = var3.method5665(); + var18 = Varps.getWidget(var5); + if (var18 != null && var18.type == 0) { + if (var17 > var18.scrollHeight - var18.height) { + var17 = var18.scrollHeight - var18.height; + } + + if (var17 < 0) { + var17 = 0; + } + + if (var17 != var18.scrollY) { + var18.scrollY = var17; + NPCDefinition.invalidateWidget(var18); + } } var1.serverPacket = null; return true; } - if (ServerPacket.field2155 == var1.serverPacket) { - SecureRandomCallable.loadRegions(true, var1.packetBuffer); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2109 == var1.serverPacket) { - AbstractWorldMapIcon.method614(class179.field2295); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2135 == var1.serverPacket) { - var16 = var3.method5582(); - byte var45 = var3.method5575(); - Varps.Varps_temp[var16] = var45; - if (Varps.Varps_main[var16] != var45) { - Varps.Varps_main[var16] = var45; + if (ServerPacket.field2158 == var1.serverPacket) { + var17 = var3.method5610(); + var5 = var3.readInt(); + var18 = Varps.getWidget(var5); + if (var17 != var18.sequenceId || var17 == -1) { + var18.sequenceId = var17; + var18.modelFrame = 0; + var18.modelFrameCycle = 0; + NPCDefinition.invalidateWidget(var18); } - BufferedSink.changeGameOptions(var16); - field814[++field648 - 1 & 31] = var16; var1.serverPacket = null; return true; } - if (ServerPacket.field2125 == var1.serverPacket) { - AbstractWorldMapIcon.method614(class179.field2293); + if (ServerPacket.field2195 == var1.serverPacket) { + var17 = var3.readUnsignedShort(); + var5 = var3.readUnsignedByte(); + var6 = var3.readUnsignedShort(); + AbstractWorldMapIcon.queueSoundEffect(var17, var5, var6); var1.serverPacket = null; return true; } - if (ServerPacket.field2093 == var1.serverPacket) { - var16 = var3.readUnsignedByte(); - if (var3.readUnsignedByte() == 0) { - grandExchangeOffers[var16] = new GrandExchangeOffer(); - var3.offset += 18; + if (ServerPacket.field2163 == var1.serverPacket) { + var17 = var3.readUnsignedByte(); + GrandExchangeOffer.method127(var17); + var1.serverPacket = null; + return true; + } + + InterfaceParent var19; + Widget var23; + if (ServerPacket.field2174 == var1.serverPacket) { + var17 = var3.method5625(); + var5 = var3.method5665(); + InterfaceParent var55 = (InterfaceParent)interfaceParents.get((long)var5); + var19 = (InterfaceParent)interfaceParents.get((long)var17); + if (var19 != null) { + class185.closeInterface(var19, var55 == null || var55.group != var19.group); + } + + if (var55 != null) { + var55.remove(); + interfaceParents.put(var55, (long)var17); + } + + var23 = Varps.getWidget(var5); + if (var23 != null) { + NPCDefinition.invalidateWidget(var23); + } + + var23 = Varps.getWidget(var17); + if (var23 != null) { + NPCDefinition.invalidateWidget(var23); + WorldMapIcon_1.revalidateWidgetScroll(WorldMapLabel.Widget_interfaceComponents[var23.id >>> 16], var23, true); + } + + if (rootInterface != -1) { + class226.runIntfCloseListeners(rootInterface, 1); + } + + var1.serverPacket = null; + return true; + } + + boolean var53; + if (ServerPacket.field2149 == var1.serverPacket) { + var53 = var3.readUnsignedByte() == 1; + if (var53) { + class30.field274 = WorldMapIcon_0.currentTimeMillis() - var3.readLong(); + PendingSpawn.grandExchangeEvents = new GrandExchangeEvents(var3, true); } else { - --var3.offset; - grandExchangeOffers[var16] = new GrandExchangeOffer(var3, false); + PendingSpawn.grandExchangeEvents = null; + } + + field842 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2187 == var1.serverPacket) { + GrandExchangeOfferWorldComparator.method77(class185.field2320); + var1.serverPacket = null; + return true; + } + + long var24; + long var26; + if (ServerPacket.field2151 == var1.serverPacket) { + var38 = var3.readStringCp1252NullTerminated(); + var24 = (long)var3.readUnsignedShort(); + var26 = (long)var3.readMedium(); + PlayerType var28 = (PlayerType)WorldMapSection0.findEnumerated(SecureRandomFuture.PlayerType_values(), var3.readUnsignedByte()); + long var29 = (var24 << 32) + var26; + boolean var12 = false; + + for (int var13 = 0; var13 < 100; ++var13) { + if (var29 == field865[var13]) { + var12 = true; + break; + } + } + + if (KeyHandler.friendSystem.isIgnored(new Username(var38, class192.loginType))) { + var12 = true; + } + + if (!var12 && field759 == 0) { + field865[field715] = var29; + field715 = (field715 + 1) % 100; + String var31 = AbstractFont.escapeBrackets(class40.method735(WallDecoration.method3356(var3))); + byte var45; + if (var28.isPrivileged) { + var45 = 7; + } else { + var45 = 3; + } + + if (var28.modIcon != -1) { + ClientPreferences.addGameMessage(var45, Language.method3728(var28.modIcon) + var38, var31); + } else { + ClientPreferences.addGameMessage(var45, var38, var31); + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2184 == var1.serverPacket) { + isCameraLocked = true; + GrandExchangeOfferOwnWorldComparator.field640 = var3.readUnsignedByte() * 128; + ReflectionCheck.field1319 = var3.readUnsignedByte() * 128; + AbstractWorldMapIcon.field306 = var3.readUnsignedShort(); + FontName.field3660 = var3.readUnsignedByte(); + WorldMapElement.field3230 = var3.readUnsignedByte(); + if (WorldMapElement.field3230 >= 100) { + HitSplatDefinition.cameraX = GrandExchangeOfferOwnWorldComparator.field640 * 16384 + 64; + Actor.cameraZ = ReflectionCheck.field1319 * 16384 + 64; + class51.cameraY = WorldMapSectionType.getTileHeight(HitSplatDefinition.cameraX, Actor.cameraZ, Clock.Client_plane) - AbstractWorldMapIcon.field306; + } + + var1.serverPacket = null; + return true; + } + + long var32; + if (ServerPacket.field2142 == var1.serverPacket) { + var38 = var3.readStringCp1252NullTerminated(); + var24 = var3.readLong(); + var26 = (long)var3.readUnsignedShort(); + var20 = (long)var3.readMedium(); + PlayerType var11 = (PlayerType)WorldMapSection0.findEnumerated(SecureRandomFuture.PlayerType_values(), var3.readUnsignedByte()); + var32 = var20 + (var26 << 32); + boolean var14 = false; + + for (int var15 = 0; var15 < 100; ++var15) { + if (field865[var15] == var32) { + var14 = true; + break; + } + } + + if (var11.isUser && KeyHandler.friendSystem.isIgnored(new Username(var38, class192.loginType))) { + var14 = true; + } + + if (!var14 && field759 == 0) { + field865[field715] = var32; + field715 = (field715 + 1) % 100; + String var34 = AbstractFont.escapeBrackets(class40.method735(WallDecoration.method3356(var3))); + if (var11.modIcon != -1) { + class173.addChatMessage(9, Language.method3728(var11.modIcon) + var38, var34, WorldMapArea.base37DecodeLong(var24)); + } else { + class173.addChatMessage(9, var38, var34, WorldMapArea.base37DecodeLong(var24)); + } } - field823 = cycleCntr; var1.serverPacket = null; return true; } if (ServerPacket.field2162 == var1.serverPacket) { - PlayerAppearance.field2520 = var3.method5628(); - class3.field7 = var3.method5675(); - - while (var3.offset < var1.serverPacketLength) { - var16 = var3.readUnsignedByte(); - class179 var57 = LoginScreenAnimation.method1832()[var16]; - AbstractWorldMapIcon.method614(var57); + var17 = var3.readInt(); + InterfaceParent var47 = (InterfaceParent)interfaceParents.get((long)var17); + if (var47 != null) { + class185.closeInterface(var47, true); } + if (meslayerContinueWidget != null) { + NPCDefinition.invalidateWidget(meslayerContinueWidget); + meslayerContinueWidget = null; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2160 == var1.serverPacket) { + WorldMapSectionType.privateChatMode = UserComparator9.method3461(var3.readUnsignedByte()); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2189 == var1.serverPacket) { + FontName.field3663 = var3.method5606(); + SecureRandomCallable.field531 = var3.method5771(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2117 == var1.serverPacket) { + World var40 = new World(); + var40.host = var3.readStringCp1252NullTerminated(); + var40.id = var3.readUnsignedShort(); + var5 = var3.readInt(); + var40.properties = var5; + Projectile.updateGameState(45); + var2.close(); + var2 = null; + GrandExchangeEvents.changeWorld(var40); + var1.serverPacket = null; + return false; + } + + if (ServerPacket.field2179 == var1.serverPacket) { + var17 = var3.method5626(); + var5 = var3.method5762(); + var18 = Varps.getWidget(var17); + if (var18.modelType != 1 || var5 != var18.modelId) { + var18.modelType = 1; + var18.modelId = var5; + NPCDefinition.invalidateWidget(var18); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2165 == var1.serverPacket) { + var17 = var3.method5625(); + var5 = var3.method5614(); + if (var5 == 65535) { + var5 = -1; + } + + var6 = var3.method5665(); + var54 = Varps.getWidget(var6); + ItemDefinition var60; + if (!var54.isIf3) { + if (var5 == -1) { + var54.modelType = 0; + var1.serverPacket = null; + return true; + } + + var60 = HealthBarDefinition.ItemDefinition_get(var5); + var54.modelType = 4; + var54.modelId = var5; + var54.modelAngleX = var60.xan2d; + var54.modelAngleY = var60.yan2d; + var54.modelZoom = var60.zoom2d * 100 / var17; + NPCDefinition.invalidateWidget(var54); + } else { + var54.itemId = var5; + var54.itemQuantity = var17; + var60 = HealthBarDefinition.ItemDefinition_get(var5); + var54.modelAngleX = var60.xan2d; + var54.modelAngleY = var60.yan2d; + var54.modelAngleZ = var60.zan2d; + var54.modelOffsetX = var60.offsetX2d; + var54.modelOffsetY = var60.offsetY2d; + var54.modelZoom = var60.zoom2d; + if (var60.isStackable == 1) { + var54.itemQuantityMode = 1; + } else { + var54.itemQuantityMode = 2; + } + + if (var54.field2627 > 0) { + var54.modelZoom = var54.modelZoom * 32 / var54.field2627; + } else if (var54.rawWidth > 0) { + var54.modelZoom = var54.modelZoom * 32 / var54.rawWidth; + } + + NPCDefinition.invalidateWidget(var54); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2186 == var1.serverPacket) { + destinationX = var3.readUnsignedByte(); + if (destinationX == 255) { + destinationX = 0; + } + + destinationY = var3.readUnsignedByte(); + if (destinationY == 255) { + destinationY = 0; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2152 == var1.serverPacket) { + var53 = var3.readBoolean(); + if (var53) { + if (class218.field2716 == null) { + class218.field2716 = new class238(); + } + } else { + class218.field2716 = null; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2143 == var1.serverPacket) { + var17 = var3.method5614(); + var5 = var3.method5606(); + var6 = var3.method5625(); + var19 = (InterfaceParent)interfaceParents.get((long)var6); + if (var19 != null) { + class185.closeInterface(var19, var17 != var19.group); + } + + class287.method5327(var6, var17, var5); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2119 == var1.serverPacket) { + rebootTimer = var3.method5762() * 30; + field795 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2134 == var1.serverPacket) { + BufferedSource.method5934(); + runEnergy = var3.readUnsignedByte(); + field795 = cycleCntr; var1.serverPacket = null; return true; } if (ServerPacket.field2115 == var1.serverPacket) { - rebootTimer = var3.readUnsignedShort() * 30; - field825 = cycleCntr; + AttackOption.updatePlayers(var3, var1.serverPacketLength); + ObjectSound.method1934(); var1.serverPacket = null; return true; } - if (ServerPacket.field2102 == var1.serverPacket) { - var16 = var3.method5590(); - var5 = var3.method5723(); - var6 = var5 >> 10 & 31; - var19 = var5 >> 5 & 31; - var8 = var5 & 31; - var9 = (var19 << 11) + (var6 << 19) + (var8 << 3); - Widget var10 = Tile.getWidget(var16); - if (var9 != var10.color) { - var10.color = var9; - LoginPacket.invalidateWidget(var10); - } - + if (ServerPacket.field2188 == var1.serverPacket) { + GrandExchangeOfferWorldComparator.method77(class185.field2323); var1.serverPacket = null; return true; } String var52; + if (ServerPacket.field2140 == var1.serverPacket) { + byte[] var39 = new byte[var1.serverPacketLength]; + var3.method5525(var39, 0, var39.length); + Buffer var46 = new Buffer(var39); + var52 = var46.readStringCp1252NullTerminated(); + class215.openURL(var52, true, false); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2155 == var1.serverPacket) { + var17 = var3.readUShortSmart(); + var41 = var3.readUnsignedByte() == 1; + var52 = ""; + boolean var43 = false; + if (var41) { + var52 = var3.readStringCp1252NullTerminated(); + if (KeyHandler.friendSystem.isIgnored(new Username(var52, class192.loginType))) { + var43 = true; + } + } + + String var58 = var3.readStringCp1252NullTerminated(); + if (!var43) { + ClientPreferences.addGameMessage(var17, var52, var58); + } + + var1.serverPacket = null; + return true; + } + if (ServerPacket.field2168 == var1.serverPacket) { - byte[] var40 = new byte[var1.serverPacketLength]; - var3.method5494(var40, 0, var40.length); - Buffer var56 = new Buffer(var40); - var52 = var56.readStringCp1252NullTerminated(); - class13.openURL(var52, true, false); + var17 = var3.readUnsignedByte(); + class13.forceDisconnect(var17); + var1.serverPacket = null; + return false; + } + + if (ServerPacket.field2197 == var1.serverPacket) { + GrandExchangeOfferWorldComparator.method77(class185.field2317); var1.serverPacket = null; return true; } - long var21; - if (ServerPacket.field2170 == var1.serverPacket) { - var16 = var3.method5592(); - var5 = var3.method5592(); - var6 = var3.method5583(); - if (var6 == 65535) { - var6 = -1; - } + if (ServerPacket.field2190 == var1.serverPacket) { + minimapState = var3.readUnsignedByte(); + var1.serverPacket = null; + return true; + } - var19 = var3.readUnsignedShort(); - if (var19 == 65535) { - var19 = -1; - } - - for (var8 = var19; var8 <= var6; ++var8) { - var21 = (long)var8 + ((long)var16 << 32); - Node var58 = widgetClickMasks.get(var21); - if (var58 != null) { - var58.remove(); - } - - widgetClickMasks.put(new IntegerNode(var5), var21); + if (ServerPacket.field2194 == var1.serverPacket) { + var17 = var3.method5740(); + var5 = var3.method5740(); + var6 = var3.method5625(); + var7 = var3.method5614(); + var23 = Varps.getWidget(var6); + if (var5 != var23.modelAngleX || var7 != var23.modelAngleY || var17 != var23.modelZoom) { + var23.modelAngleX = var5; + var23.modelAngleY = var7; + var23.modelZoom = var17; + NPCDefinition.invalidateWidget(var23); } var1.serverPacket = null; return true; } - if (ServerPacket.field2111 == var1.serverPacket) { - var16 = var3.readInt(); - var5 = var3.readUnsignedShort(); - if (var16 < -70000) { - var5 += 32768; - } - - if (var16 >= 0) { - var17 = Tile.getWidget(var16); - } else { - var17 = null; - } - - if (var17 != null) { - for (var19 = 0; var19 < var17.itemIds.length; ++var19) { - var17.itemIds[var19] = 0; - var17.itemQuantities[var19] = 0; - } - } - - FriendSystem.clearItemContainer(var5); - var19 = var3.readUnsignedShort(); - - for (var8 = 0; var8 < var19; ++var8) { - var9 = var3.method5572(); - if (var9 == 255) { - var9 = var3.method5592(); - } - - var20 = var3.readUnsignedShort(); - if (var17 != null && var8 < var17.itemIds.length) { - var17.itemIds[var8] = var20; - var17.itemQuantities[var8] = var9; - } - - Canvas.itemContainerSetItem(var5, var8, var20 - 1, var9); - } - - if (var17 != null) { - LoginPacket.invalidateWidget(var17); - } - - Buddy.method5211(); - changedItemContainers[++field701 - 1 & 31] = var5 & 32767; + if (ServerPacket.field2193 == var1.serverPacket) { + KeyHandler.friendSystem.method1858(); + field839 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.field2167 == var1.serverPacket) { - if (Calendar.clanChat != null) { - Calendar.clanChat.method5262(var3); - } - - PlayerAppearance.method4011(); + if (ServerPacket.field2176 == var1.serverPacket) { + GrandExchangeOfferWorldComparator.method77(class185.field2314); var1.serverPacket = null; return true; } - boolean var47; - if (ServerPacket.field2156 == var1.serverPacket) { - var47 = var3.method5675() == 1; - var5 = var3.readInt(); - var17 = Tile.getWidget(var5); - if (var47 != var17.isHidden) { - var17.isHidden = var47; - LoginPacket.invalidateWidget(var17); - } - + if (ServerPacket.field2124 == var1.serverPacket) { + KeyHandler.friendSystem.readUpdate(var3, var1.serverPacketLength); + field839 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.field2144 == var1.serverPacket) { - var16 = var3.readUnsignedByte(); - FontName.method5376(var16); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2086 == var1.serverPacket) { + if (ServerPacket.field2127 == var1.serverPacket) { hintArrowType = var3.readUnsignedByte(); if (hintArrowType == 1) { hintArrowNpcIndex = var3.readUnsignedShort(); @@ -4962,7 +5379,7 @@ public final class Client extends GameShell implements Usernamed { if (hintArrowType >= 2 && hintArrowType <= 6) { if (hintArrowType == 2) { - hintArrowSubX = 64; + hintArrowSubX = 4096; hintArrowSubY = 64; } @@ -4972,17 +5389,17 @@ public final class Client extends GameShell implements Usernamed { } if (hintArrowType == 4) { - hintArrowSubX = 128; + hintArrowSubX = 8192; hintArrowSubY = 64; } if (hintArrowType == 5) { - hintArrowSubX = 64; + hintArrowSubX = 4096; hintArrowSubY = 0; } if (hintArrowType == 6) { - hintArrowSubX = 64; + hintArrowSubX = 4096; hintArrowSubY = 128; } @@ -5000,169 +5417,116 @@ public final class Client extends GameShell implements Usernamed { return true; } - if (ServerPacket.field2117 == var1.serverPacket) { - isCameraLocked = true; - class80.field1111 = var3.readUnsignedByte() * 16384; - Ignored.field3589 = var3.readUnsignedByte() * 128; - field873 = var3.readUnsignedShort(); - PacketBufferNode.field2310 = var3.readUnsignedByte(); - GrandExchangeOfferOwnWorldComparator.field623 = var3.readUnsignedByte(); - if (GrandExchangeOfferOwnWorldComparator.field623 >= 100) { - var16 = class80.field1111 * 128 + 64; - var5 = Ignored.field3589 * 16384 + 64; - var6 = ScriptEvent.getTileHeight(var16, var5, UrlRequest.Client_plane) - field873; - var19 = var16 - MusicPatchNode2.cameraX; - var8 = var6 - class60.cameraY; - var9 = var5 - UserComparator9.cameraZ; - var20 = (int)Math.sqrt((double)(var19 * var19 + var9 * var9)); - ViewportMouse.cameraPitch = (int)(Math.atan2((double)var8, (double)var20) * 325.949D) & 2047; - WorldMapLabelSize.cameraYaw = (int)(Math.atan2((double)var19, (double)var9) * -325.949D) & 2047; - if (ViewportMouse.cameraPitch < 128) { - ViewportMouse.cameraPitch = 128; + if (ServerPacket.field2122 == var1.serverPacket) { + var38 = var3.readStringCp1252NullTerminated(); + var5 = var3.method5606(); + var6 = var3.method5605(); + if (var6 >= 1 && var6 <= 8) { + if (var38.equalsIgnoreCase("null")) { + var38 = null; } - if (ViewportMouse.cameraPitch > 383) { - ViewportMouse.cameraPitch = 383; + playerMenuActions[var6 - 1] = var38; + playerOptionsPriorities[var6 - 1] = var5 == 0; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2136 == var1.serverPacket) { + var3.offset += 28; + if (var3.checkCrc()) { + UrlRequester.method3373(var3, var3.offset - 28); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2164 == var1.serverPacket) { + GrandExchangeOfferWorldComparator.method77(class185.field2318); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2191 == var1.serverPacket) { + var17 = var3.method5740(); + var5 = var3.method5665(); + var18 = Varps.getWidget(var5); + if (var18.modelType != 2 || var17 != var18.modelId) { + var18.modelType = 2; + var18.modelId = var17; + NPCDefinition.invalidateWidget(var18); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2177 == var1.serverPacket) { + var38 = var3.readStringCp1252NullTerminated(); + var5 = var3.method5665(); + var18 = Varps.getWidget(var5); + if (!var38.equals(var18.text)) { + var18.text = var38; + NPCDefinition.invalidateWidget(var18); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2126 == var1.serverPacket) { + var17 = var3.offset + var1.serverPacketLength; + var5 = var3.readUnsignedShort(); + var6 = var3.readUnsignedShort(); + if (var5 != rootInterface) { + rootInterface = var5; + this.resizeRoot(false); + class51.Widget_resetModelFrames(rootInterface); + WorldMapLabelSize.runWidgetOnLoadListener(rootInterface); + + for (var7 = 0; var7 < 100; ++var7) { + field851[var7] = true; } } - var1.serverPacket = null; - return true; - } + InterfaceParent var22; + for (; var6-- > 0; var22.field568 = true) { + var7 = var3.readInt(); + var8 = var3.readUnsignedShort(); + var9 = var3.readUnsignedByte(); + var22 = (InterfaceParent)interfaceParents.get((long)var7); + if (var22 != null && var8 != var22.group) { + class185.closeInterface(var22, true); + var22 = null; + } - if (ServerPacket.field2094 == var1.serverPacket) { - PlayerAppearance.field2520 = var3.readUnsignedByte(); - class3.field7 = var3.method5675(); - - for (var16 = class3.field7; var16 < class3.field7 + 8; ++var16) { - for (var5 = PlayerAppearance.field2520; var5 < PlayerAppearance.field2520 + 8; ++var5) { - if (groundItems[UrlRequest.Client_plane][var16][var5] != null) { - groundItems[UrlRequest.Client_plane][var16][var5] = null; - Skills.updateItemPile(var16, var5); - } + if (var22 == null) { + var22 = class287.method5327(var7, var8, var9); } } - for (PendingSpawn var39 = (PendingSpawn)pendingSpawns.last(); var39 != null; var39 = (PendingSpawn)pendingSpawns.previous()) { - if (var39.x >= class3.field7 && var39.x < class3.field7 + 8 && var39.y >= PlayerAppearance.field2520 && var39.y < PlayerAppearance.field2520 + 8 && var39.plane == UrlRequest.Client_plane) { - var39.hitpoints = 0; - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2092 == var1.serverPacket) { - var16 = var3.readUShortSmart(); - boolean var44 = var3.readUnsignedByte() == 1; - var52 = ""; - boolean var54 = false; - if (var44) { - var52 = var3.readStringCp1252NullTerminated(); - if (Message.friendSystem.isIgnored(new Username(var52, class188.loginType))) { - var54 = true; - } - } - - String var60 = var3.readStringCp1252NullTerminated(); - if (!var54) { - class83.addGameMessage(var16, var52, var60); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2139 == var1.serverPacket) { - Message.friendSystem.readUpdate(var3, var1.serverPacketLength); - field711 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2089 == var1.serverPacket) { - isCameraLocked = true; - SequenceDefinition.field3477 = var3.readUnsignedByte() * 16384; - AbstractWorldMapData.field147 = var3.readUnsignedByte() * 16384; - Canvas.field397 = var3.readUnsignedShort(); - HitSplatDefinition.field3312 = var3.readUnsignedByte(); - WorldMapData_0.field92 = var3.readUnsignedByte(); - if (WorldMapData_0.field92 >= 100) { - MusicPatchNode2.cameraX = SequenceDefinition.field3477 * 128 + 64; - UserComparator9.cameraZ = AbstractWorldMapData.field147 * 128 + 64; - class60.cameraY = ScriptEvent.getTileHeight(MusicPatchNode2.cameraX, UserComparator9.cameraZ, UrlRequest.Client_plane) - Canvas.field397; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2146 == var1.serverPacket) { - var16 = var3.readUnsignedShort(); - rootInterface = var16; - this.resizeRoot(false); - GameShell.Widget_resetModelFrames(var16); - Players.runWidgetOnLoadListener(rootInterface); - - for (var5 = 0; var5 < 100; ++var5) { - field833[var5] = true; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2090 == var1.serverPacket) { - publicChatMode = var3.method5572(); - tradeChatMode = var3.method5675(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2123 == var1.serverPacket) { - AbstractWorldMapIcon.method614(class179.field2294); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2166 == var1.serverPacket) { - Calendar.privateChatMode = class50.method893(var3.readUnsignedByte()); - var1.serverPacket = null; - return true; - } - - long var25; - long var27; - String var37; - if (ServerPacket.field2169 == var1.serverPacket) { - var37 = var3.readStringCp1252NullTerminated(); - var25 = var3.readLong(); - var27 = (long)var3.readUnsignedShort(); - var21 = (long)var3.readMedium(); - PlayerType var23 = (PlayerType)DynamicObject.findEnumerated(MusicPatchPcmStream.PlayerType_values(), var3.readUnsignedByte()); - var12 = var21 + (var27 << 32); - boolean var46 = false; - - for (int var15 = 0; var15 < 100; ++var15) { - if (field707[var15] == var12) { - var46 = true; - break; - } - } - - if (var23.isUser && Message.friendSystem.isIgnored(new Username(var37, class188.loginType))) { - var46 = true; - } - - if (!var46 && field678 == 0) { - field707[field682] = var12; - field682 = (field682 + 1) % 100; - String var29 = AbstractFont.escapeBrackets(Buddy.method5214(GraphicsObject.method2028(var3))); - if (var23.modIcon != -1) { - GameShell.addChatMessage(9, ChatChannel.method2269(var23.modIcon) + var37, var29, CollisionMap.base37DecodeLong(var25)); + for (var19 = (InterfaceParent)interfaceParents.first(); var19 != null; var19 = (InterfaceParent)interfaceParents.next()) { + if (var19.field568) { + var19.field568 = false; } else { - GameShell.addChatMessage(9, var37, var29, CollisionMap.base37DecodeLong(var25)); + class185.closeInterface(var19, true); + } + } + + widgetClickMasks = new NodeHashTable(512); + + while (var3.offset < var17) { + var7 = var3.readInt(); + var8 = var3.readUnsignedShort(); + var9 = var3.readUnsignedShort(); + var10 = var3.readInt(); + + for (int var35 = var8; var35 <= var9; ++var35) { + var32 = ((long)var7 << 32) + (long)var35; + widgetClickMasks.put(new IntegerNode(var10), var32); } } @@ -5171,342 +5535,17 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field2131 == var1.serverPacket) { - WorldMapElement.method4381(var3.readStringCp1252NullTerminated()); + WorldMapLabel.loadRegions(true, var1.packetBuffer); var1.serverPacket = null; return true; } - Widget var24; - if (ServerPacket.field2133 == var1.serverPacket) { - var16 = var3.method5591(); - var5 = var3.method5590(); - InterfaceParent var50 = (InterfaceParent)interfaceParents.get((long)var5); - var41 = (InterfaceParent)interfaceParents.get((long)var16); - if (var41 != null) { - VarpDefinition.closeInterface(var41, var50 == null || var41.group != var50.group); - } - - if (var50 != null) { - var50.remove(); - interfaceParents.put(var50, (long)var16); - } - - var24 = Tile.getWidget(var5); - if (var24 != null) { - LoginPacket.invalidateWidget(var24); - } - - var24 = Tile.getWidget(var16); - if (var24 != null) { - LoginPacket.invalidateWidget(var24); - Messages.revalidateWidgetScroll(UserComparator7.Widget_interfaceComponents[var24.id >>> 16], var24, true); - } - - if (rootInterface != -1) { - ItemContainer.runIntfCloseListeners(rootInterface, 1); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2087 == var1.serverPacket) { - var47 = var3.readUnsignedByte() == 1; - if (var47) { - TileItemPile.field1522 = WorldMapID.currentTimeMillis() - var3.readLong(); - Script.grandExchangeEvents = new GrandExchangeEvents(var3, true); - } else { - Script.grandExchangeEvents = null; - } - - field860 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2141 == var1.serverPacket) { - var16 = var3.readInt(); - var55 = Tile.getWidget(var16); - var55.modelType = 3; - var55.modelId = Message.localPlayer.appearance.getChatHeadId(); - LoginPacket.invalidateWidget(var55); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2165 == var1.serverPacket) { - class65.updatePlayers(var3, var1.serverPacketLength); - GraphicsObject.method2030(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2116 == var1.serverPacket) { - SecureRandomCallable.loadRegions(false, var1.packetBuffer); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2126 == var1.serverPacket) { - var16 = var3.readUnsignedShort(); - var5 = var3.method5675(); - var6 = var3.method5590(); - var41 = (InterfaceParent)interfaceParents.get((long)var6); - if (var41 != null) { - VarpDefinition.closeInterface(var41, var16 != var41.group); - } - - ScriptFrame.method1107(var6, var16, var5); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2130 == var1.serverPacket) { - var16 = var3.method5723(); - if (var16 == 65535) { - var16 = -1; - } - - var5 = var3.readInt(); - var6 = var3.method5591(); - var7 = Tile.getWidget(var5); - ItemDefinition var59; - if (!var7.isIf3) { - if (var16 == -1) { - var7.modelType = 0; - var1.serverPacket = null; - return true; - } - - var59 = PacketBufferNode.ItemDefinition_get(var16); - var7.modelType = 4; - var7.modelId = var16; - var7.modelAngleX = var59.xan2d; - var7.modelAngleY = var59.yan2d; - var7.modelZoom = var59.zoom2d * 100 / var6; - LoginPacket.invalidateWidget(var7); - } else { - var7.itemId = var16; - var7.itemQuantity = var6; - var59 = PacketBufferNode.ItemDefinition_get(var16); - var7.modelAngleX = var59.xan2d; - var7.modelAngleY = var59.yan2d; - var7.modelAngleZ = var59.zan2d; - var7.modelOffsetX = var59.offsetX2d; - var7.modelOffsetY = var59.offsetY2d; - var7.modelZoom = var59.zoom2d; - if (var59.isStackable == 1) { - var7.itemQuantityMode = 1; - } else { - var7.itemQuantityMode = 2; - } - - if (var7.field2645 > 0) { - var7.modelZoom = var7.modelZoom * 32 / var7.field2645; - } else if (var7.rawWidth > 0) { - var7.modelZoom = var7.modelZoom * 32 / var7.rawWidth; - } - - LoginPacket.invalidateWidget(var7); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2171 == var1.serverPacket) { - class3.field7 = var3.method5572(); - PlayerAppearance.field2520 = var3.method5628(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2151 == var1.serverPacket) { - var3.offset += 28; - if (var3.checkCrc()) { - class48.method859(var3, var3.offset - 28); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2129 == var1.serverPacket) { - var37 = var3.readStringCp1252NullTerminated(); - var5 = var3.method5675(); - var6 = var3.method5628(); - if (var6 >= 1 && var6 <= 8) { - if (var37.equalsIgnoreCase("null")) { - var37 = null; - } - - playerMenuActions[var6 - 1] = var37; - playerOptionsPriorities[var6 - 1] = var5 == 0; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2127 == var1.serverPacket) { - var16 = var3.readUnsignedByte(); - WorldMapData_0.forceDisconnect(var16); - var1.serverPacket = null; - return false; - } - - if (ServerPacket.field2101 == var1.serverPacket) { - AbstractWorldMapIcon.method614(class179.field2292); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2149 == var1.serverPacket) { - var37 = var3.readStringCp1252NullTerminated(); - var18 = AbstractFont.escapeBrackets(Buddy.method5214(GraphicsObject.method2028(var3))); - class83.addGameMessage(6, var37, var18); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2136 == var1.serverPacket) { - class117.readReflectionCheck(var3, var1.serverPacketLength); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2097 == var1.serverPacket) { - var16 = var3.method5723(); - GrandExchangeOfferWorldComparator.method70(var16); - changedItemContainers[++field701 - 1 & 31] = var16 & 32767; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2099 == var1.serverPacket) { - World var38 = new World(); - var38.host = var3.readStringCp1252NullTerminated(); - var38.id = var3.readUnsignedShort(); - var5 = var3.readInt(); - var38.properties = var5; - class195.updateGameState(45); - var2.close(); - var2 = null; - KeyHandler.changeWorld(var38); - var1.serverPacket = null; - return false; - } - - if (ServerPacket.field2119 == var1.serverPacket) { - var16 = var3.method5582(); - var5 = var3.method5582(); - var6 = var3.method5723(); - var19 = var3.readInt(); - var24 = Tile.getWidget(var19); - if (var5 != var24.modelAngleX || var6 != var24.modelAngleY || var16 != var24.modelZoom) { - var24.modelAngleX = var5; - var24.modelAngleY = var6; - var24.modelZoom = var16; - LoginPacket.invalidateWidget(var24); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2106 == var1.serverPacket) { - if (var1.serverPacketLength == 0) { - Calendar.clanChat = null; - } else { - if (Calendar.clanChat == null) { - Calendar.clanChat = new ClanChat(class188.loginType, class206.client); - } - - Calendar.clanChat.readUpdate(var3); - } - - PlayerAppearance.method4011(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2145 == var1.serverPacket) { - var37 = var3.readStringCp1252NullTerminated(); - Object[] var53 = new Object[var37.length() + 1]; - - for (var6 = var37.length() - 1; var6 >= 0; --var6) { - if (var37.charAt(var6) == 's') { - var53[var6 + 1] = var3.readStringCp1252NullTerminated(); - } else { - var53[var6 + 1] = new Integer(var3.readInt()); - } - } - - var53[0] = new Integer(var3.readInt()); - ScriptEvent var48 = new ScriptEvent(); - var48.args = var53; - runScriptEvent(var48); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2091 == var1.serverPacket) { - var16 = var3.readUnsignedByte(); - var5 = var3.readUnsignedByte(); - var6 = var3.readUnsignedByte(); - var19 = var3.readUnsignedByte(); - field779[var16] = true; - field875[var16] = var5; - field876[var16] = var6; - field877[var16] = var19; - field878[var16] = 0; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2098 == var1.serverPacket) { - destinationX = var3.readUnsignedByte(); - if (destinationX == 255) { - destinationX = 0; - } - - destinationY = var3.readUnsignedByte(); - if (destinationY == 255) { - destinationY = 0; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2121 == var1.serverPacket) { - var16 = var3.readInt(); - var5 = var3.method5723(); - var17 = Tile.getWidget(var16); - if (var17.modelType != 2 || var5 != var17.modelId) { - var17.modelType = 2; - var17.modelId = var5; - LoginPacket.invalidateWidget(var17); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2124 == var1.serverPacket) { - var16 = var3.method5584(); - var5 = var3.method5591(); - var6 = var3.method5565(); - var7 = Tile.getWidget(var5); - if (var6 != var7.rawX || var16 != var7.rawY || var7.xAlignment != 0 || var7.yAlignment != 0) { - var7.rawX = var6; - var7.rawY = var16; - var7.xAlignment = 0; - var7.yAlignment = 0; - LoginPacket.invalidateWidget(var7); - this.alignWidget(var7); - if (var7.type == 0) { - Messages.revalidateWidgetScroll(UserComparator7.Widget_interfaceComponents[var5 >> 16], var7, false); + if (ServerPacket.field2196 == var1.serverPacket) { + for (var17 = 0; var17 < Varps.Varps_main.length; ++var17) { + if (Varps.Varps_main[var17] != Varps.Varps_temp[var17]) { + Varps.Varps_main[var17] = Varps.Varps_temp[var17]; + ServerPacket.changeGameOptions(var17); + field832[++field833 - 1 & 31] = var17; } } @@ -5514,278 +5553,144 @@ public final class Client extends GameShell implements Usernamed { return true; } - if (ServerPacket.field2158 == var1.serverPacket) { - if (rootInterface != -1) { - ItemContainer.runIntfCloseListeners(rootInterface, 0); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2150 == var1.serverPacket) { - var37 = var3.readStringCp1252NullTerminated(); - var25 = (long)var3.readUnsignedShort(); - var27 = (long)var3.readMedium(); - PlayerType var30 = (PlayerType)DynamicObject.findEnumerated(MusicPatchPcmStream.PlayerType_values(), var3.readUnsignedByte()); - long var31 = (var25 << 32) + var27; - boolean var33 = false; - - for (int var13 = 0; var13 < 100; ++var13) { - if (var31 == field707[var13]) { - var33 = true; - break; - } - } - - if (Message.friendSystem.isIgnored(new Username(var37, class188.loginType))) { - var33 = true; - } - - if (!var33 && field678 == 0) { - field707[field682] = var31; - field682 = (field682 + 1) % 100; - String var34 = AbstractFont.escapeBrackets(Buddy.method5214(GraphicsObject.method2028(var3))); - byte var14; - if (var30.isPrivileged) { - var14 = 7; - } else { - var14 = 3; - } - - if (var30.modIcon != -1) { - class83.addGameMessage(var14, ChatChannel.method2269(var30.modIcon) + var37, var34); - } else { - class83.addGameMessage(var14, var37, var34); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2143 == var1.serverPacket) { - var16 = var3.readInt(); - InterfaceParent var51 = (InterfaceParent)interfaceParents.get((long)var16); - if (var51 != null) { - VarpDefinition.closeInterface(var51, true); - } - - if (meslayerContinueWidget != null) { - LoginPacket.invalidateWidget(meslayerContinueWidget); - meslayerContinueWidget = null; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2161 == var1.serverPacket) { - var16 = var3.readInt(); - var5 = var3.readUnsignedShort(); - if (var16 < -70000) { - var5 += 32768; - } - - if (var16 >= 0) { - var17 = Tile.getWidget(var16); - } else { - var17 = null; - } - - for (; var3.offset < var1.serverPacketLength; Canvas.itemContainerSetItem(var5, var19, var8 - 1, var9)) { - var19 = var3.readUShortSmart(); - var8 = var3.readUnsignedShort(); - var9 = 0; - if (var8 != 0) { - var9 = var3.readUnsignedByte(); - if (var9 == 255) { - var9 = var3.readInt(); - } - } - - if (var17 != null && var19 >= 0 && var19 < var17.itemIds.length) { - var17.itemIds[var19] = var8; - var17.itemQuantities[var19] = var9; - } - } - - if (var17 != null) { - LoginPacket.invalidateWidget(var17); - } - - Buddy.method5211(); - changedItemContainers[++field701 - 1 & 31] = var5 & 32767; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2132 == var1.serverPacket) { - Buddy.method5211(); + if (ServerPacket.field2120 == var1.serverPacket) { + BufferedSource.method5934(); weight = var3.readShort(); - field825 = cycleCntr; + field795 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.field2118 == var1.serverPacket) { - for (var16 = 0; var16 < VarpDefinition.VarpDefinition_fileCount; ++var16) { - VarpDefinition var49 = UserComparator8.VarpDefinition_get(var16); - if (var49 != null) { - Varps.Varps_temp[var16] = 0; - Varps.Varps_main[var16] = 0; - } - } - - Buddy.method5211(); - field648 += 32; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2137 == var1.serverPacket) { - AbstractWorldMapIcon.method614(class179.field2296); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2173 == var1.serverPacket) { - var47 = var3.readBoolean(); - if (var47) { - if (class215.field2534 == null) { - class215.field2534 = new class237(); - } - } else { - class215.field2534 = null; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2108 == var1.serverPacket) { - AbstractWorldMapIcon.method614(class179.field2291); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2105 == var1.serverPacket) { - WorldMapRectangle.updateNpcs(false, var3); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2096 == var1.serverPacket) { - var16 = var3.method5592(); - var18 = var3.readStringCp1252NullTerminated(); - var17 = Tile.getWidget(var16); - if (!var18.equals(var17.text)) { - var17.text = var18; - LoginPacket.invalidateWidget(var17); - } - - var1.serverPacket = null; - return true; - } - - DesktopPlatformInfoProvider.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id : -1) + "," + (var1.field1301 != null ? var1.field1301.id : -1) + "," + (var1.field1299 != null ? var1.field1299.id : -1) + "," + var1.serverPacketLength, (Throwable)null); - InterfaceParent.logOut(); - } catch (IOException var35) { - StudioGame.method4119(); - } catch (Exception var36) { - var18 = "" + (var1.serverPacket != null ? var1.serverPacket.id : -1) + "," + (var1.field1301 != null ? var1.field1301.id : -1) + "," + (var1.field1299 != null ? var1.field1299.id : -1) + "," + var1.serverPacketLength + "," + (Message.localPlayer.pathX[0] + MusicPatchPcmStream.baseX * 64) + "," + (Message.localPlayer.pathY[0] + ScriptEvent.baseY * 64) + ","; + class225.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id : -1) + "," + (var1.field1305 != null ? var1.field1305.id : -1) + "," + (var1.field1307 != null ? var1.field1307.id : -1) + "," + var1.serverPacketLength, (Throwable)null); + class30.logOut(); + } catch (IOException var36) { + WorldMapIcon_1.method308(); + } catch (Exception var37) { + var16 = "" + (var1.serverPacket != null ? var1.serverPacket.id : -1) + "," + (var1.field1305 != null ? var1.field1305.id : -1) + "," + (var1.field1307 != null ? var1.field1307.id : -1) + "," + var1.serverPacketLength + "," + (class192.localPlayer.pathX[0] + Messages.baseX * 64) + "," + (class192.localPlayer.pathY[0] + Language.baseY * 64) + ","; for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { - var18 = var18 + var3.array[var6] + ","; + var16 = var16 + var3.array[var6] + ","; } - DesktopPlatformInfoProvider.RunException_sendStackTrace(var18, var36); - InterfaceParent.logOut(); + class225.RunException_sendStackTrace(var16, var37); + class30.logOut(); } return true; } } - @ObfuscatedName("ie") + @ObfuscatedName("hh") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-2088122930" + garbageValue = "1020734975" ) @Export("menu") final void menu() { - WorldMapArea.method404(); - if (ClientPreferences.dragInventoryWidget == null) { + class60.method1186(); + if (class185.dragInventoryWidget == null) { if (clickedWidget == null) { int var2; - int var4; int var5; - int var10; - int var13; - label240: { + int var6; + label320: { int var1 = MouseHandler.MouseHandler_lastButton; - int var3; - int var8; + int var4; + int var7; + int var9; if (isMenuOpen) { - if (var1 != 1 && (NetFileRequest.mouseCam || var1 != 4)) { + int var3; + int var18; + if (var1 != 1 && (ArchiveLoader.mouseCam || var1 != 4)) { var2 = MouseHandler.MouseHandler_x; var3 = MouseHandler.MouseHandler_y; - if (var2 < GrandExchangeEvent.menuX - 10 || var2 > GrandExchangeEvent.menuX + KeyHandler.menuWidth + 10 || var3 < WorldMapManager.menuY - 10 || var3 > class54.menuHeight + WorldMapManager.menuY + 10) { + if (var2 < ArchiveDiskAction.menuX - 10 || var2 > ArchiveDiskAction.menuX + InterfaceParent.menuWidth + 10 || var3 < SecureRandomCallable.menuY - 10 || var3 > Message.menuHeight + SecureRandomCallable.menuY + 10) { isMenuOpen = false; - GameObject.method3297(GrandExchangeEvent.menuX, WorldMapManager.menuY, KeyHandler.menuWidth, class54.menuHeight); + var4 = ArchiveDiskAction.menuX; + var5 = SecureRandomCallable.menuY; + var6 = InterfaceParent.menuWidth; + var7 = Message.menuHeight; + + for (var18 = 0; var18 < rootWidgetCount; ++var18) { + if (rootWidgetXs[var18] + rootWidgetWidths[var18] > var4 && rootWidgetXs[var18] < var6 + var4 && rootWidgetHeights[var18] + rootWidgetYs[var18] > var5 && rootWidgetYs[var18] < var5 + var7) { + field851[var18] = true; + } + } } } - if (var1 == 1 || !NetFileRequest.mouseCam && var1 == 4) { - var2 = GrandExchangeEvent.menuX; - var3 = WorldMapManager.menuY; - var4 = KeyHandler.menuWidth; + if (var1 == 1 || !ArchiveLoader.mouseCam && var1 == 4) { + var2 = ArchiveDiskAction.menuX; + var3 = SecureRandomCallable.menuY; + var4 = InterfaceParent.menuWidth; var5 = MouseHandler.MouseHandler_lastPressedX; - int var6 = MouseHandler.MouseHandler_lastPressedY; - int var12 = -1; + var6 = MouseHandler.MouseHandler_lastPressedY; + var7 = -1; - for (var8 = 0; var8 < menuOptionsCount; ++var8) { - var13 = (menuOptionsCount - 1 - var8) * 15 + var3 + 31; - if (var5 > var2 && var5 < var2 + var4 && var6 > var13 - 13 && var6 < var13 + 3) { - var12 = var8; + for (var18 = 0; var18 < menuOptionsCount; ++var18) { + var9 = var3 + (menuOptionsCount - 1 - var18) * 15 + 31; + if (var5 > var2 && var5 < var4 + var2 && var6 > var9 - 13 && var6 < var9 + 3) { + var7 = var18; } } - if (var12 != -1) { - MusicPatchPcmStream.method3898(var12); + int var10; + int var11; + if (var7 != -1 && var7 >= 0) { + var18 = menuArguments1[var7]; + var9 = menuArguments2[var7]; + var10 = menuOpcodes[var7]; + var11 = menuIdentifiers[var7]; + String var15 = menuActions[var7]; + String var13 = menuTargets[var7]; + UserComparator10.menuAction(var18, var9, var10, var11, var15, var13, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); } isMenuOpen = false; - GameObject.method3297(GrandExchangeEvent.menuX, WorldMapManager.menuY, KeyHandler.menuWidth, class54.menuHeight); + var18 = ArchiveDiskAction.menuX; + var9 = SecureRandomCallable.menuY; + var10 = InterfaceParent.menuWidth; + var11 = Message.menuHeight; + + for (int var12 = 0; var12 < rootWidgetCount; ++var12) { + if (rootWidgetXs[var12] + rootWidgetWidths[var12] > var18 && rootWidgetXs[var12] < var10 + var18 && rootWidgetHeights[var12] + rootWidgetYs[var12] > var9 && rootWidgetYs[var12] < var11 + var9) { + field851[var12] = true; + } + } } } else { - var2 = GrandExchangeOfferOwnWorldComparator.method1288(); - if ((var1 == 1 || !NetFileRequest.mouseCam && var1 == 4) && var2 >= 0) { - var3 = menuOpcodes[var2]; - if (var3 == 39 || var3 == 40 || var3 == 41 || var3 == 42 || var3 == 43 || var3 == 33 || var3 == 34 || var3 == 35 || var3 == 36 || var3 == 37 || var3 == 38 || var3 == 1005) { - var4 = menuArguments1[var2]; - var5 = menuArguments2[var2]; - Widget var11 = Tile.getWidget(var5); - var8 = WorldMapSection0.getWidgetClickMask(var11); - boolean var7 = (var8 >> 28 & 1) != 0; - if (var7) { - break label240; + var2 = menuOptionsCount - 1; + if ((var1 == 1 || !ArchiveLoader.mouseCam && var1 == 4) && var2 >= 0) { + var4 = menuOpcodes[var2]; + if (var4 == 39 || var4 == 40 || var4 == 41 || var4 == 42 || var4 == 43 || var4 == 33 || var4 == 34 || var4 == 35 || var4 == 36 || var4 == 37 || var4 == 38 || var4 == 1005) { + var5 = menuArguments1[var2]; + var6 = menuArguments2[var2]; + Widget var14 = Varps.getWidget(var6); + var9 = WorldMapIcon_0.getWidgetClickMask(var14); + boolean var8 = (var9 >> 28 & 1) != 0; + if (var8) { + break label320; } - var10 = WorldMapSection0.getWidgetClickMask(var11); - boolean var9 = (var10 >> 29 & 1) != 0; - if (var9) { - break label240; + Object var10000 = null; + if (FriendLoginUpdate.method5326(WorldMapIcon_0.getWidgetClickMask(var14))) { + break label320; } } } - if ((var1 == 1 || !NetFileRequest.mouseCam && var1 == 4) && this.shouldLeftClickOpenMenu()) { + if ((var1 == 1 || !ArchiveLoader.mouseCam && var1 == 4) && this.shouldLeftClickOpenMenu()) { var1 = 2; } - if ((var1 == 1 || !NetFileRequest.mouseCam && var1 == 4) && menuOptionsCount > 0) { - MusicPatchPcmStream.method3898(var2); + if ((var1 == 1 || !ArchiveLoader.mouseCam && var1 == 4) && menuOptionsCount > 0 && var2 >= 0) { + var4 = menuArguments1[var2]; + var5 = menuArguments2[var2]; + var6 = menuOpcodes[var2]; + var7 = menuIdentifiers[var2]; + String var16 = menuActions[var2]; + String var17 = menuTargets[var2]; + UserComparator10.menuAction(var4, var5, var6, var7, var16, var17, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); } if (var1 == 2 && menuOptionsCount > 0) { @@ -5796,168 +5701,161 @@ public final class Client extends GameShell implements Usernamed { return; } - if (ClientPreferences.dragInventoryWidget != null && !field768 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { - var13 = draggedWidgetX; - var10 = draggedWidgetY; - Messages.method2231(LoginType.tempMenuAction, var13, var10); - LoginType.tempMenuAction = null; + if (class185.dragInventoryWidget != null && !field757 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { + GrandExchangeOfferTotalQuantityComparator.method105(draggedWidgetX, draggedWidgetY); } - field768 = false; + field757 = false; itemDragDuration = 0; - if (ClientPreferences.dragInventoryWidget != null) { - LoginPacket.invalidateWidget(ClientPreferences.dragInventoryWidget); + if (class185.dragInventoryWidget != null) { + NPCDefinition.invalidateWidget(class185.dragInventoryWidget); } - ClientPreferences.dragInventoryWidget = Tile.getWidget(var5); - dragItemSlotSource = var4; + class185.dragInventoryWidget = Varps.getWidget(var6); + dragItemSlotSource = var5; draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; if (var2 >= 0) { - BuddyRankComparator.method3361(var2); + WorldMapRegion.tempMenuAction = new MenuAction(); + WorldMapRegion.tempMenuAction.param0 = menuArguments1[var2]; + WorldMapRegion.tempMenuAction.param1 = menuArguments2[var2]; + WorldMapRegion.tempMenuAction.opcode = menuOpcodes[var2]; + WorldMapRegion.tempMenuAction.identifier = menuIdentifiers[var2]; + WorldMapRegion.tempMenuAction.action = menuActions[var2]; } - LoginPacket.invalidateWidget(ClientPreferences.dragInventoryWidget); + NPCDefinition.invalidateWidget(class185.dragInventoryWidget); } } } - @ObfuscatedName("ic") + @ObfuscatedName("hu") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1378557318" + garbageValue = "-2097265219" ) @Export("shouldLeftClickOpenMenu") final boolean shouldLeftClickOpenMenu() { - int var1 = GrandExchangeOfferOwnWorldComparator.method1288(); - return (leftClickOpensMenu == 1 && menuOptionsCount > 2 || MouseHandler.method1074(var1)) && !menuShiftClick[var1]; + int var1 = menuOptionsCount - 1; + return (leftClickOpensMenu == 1 && menuOptionsCount > 2 || UrlRequest.method3383(var1)) && !menuShiftClick[var1]; } - @ObfuscatedName("ia") + @ObfuscatedName("hq") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "1132899725" + signature = "(IIB)V", + garbageValue = "-53" ) @Export("openMenu") final void openMenu(int var1, int var2) { - int var3 = GrandExchangeOffer.fontBold12.stringWidth("Choose Option"); + int var3 = class1.fontBold12.stringWidth("Choose Option"); int var4; + int var5; for (var4 = 0; var4 < menuOptionsCount; ++var4) { - Font var5 = GrandExchangeOffer.fontBold12; - String var6; - if (var4 < 0) { - var6 = ""; - } else if (menuTargets[var4].length() > 0) { - var6 = menuActions[var4] + " " + menuTargets[var4]; - } else { - var6 = menuActions[var4]; - } - - int var7 = var5.stringWidth(var6); - if (var7 > var3) { - var3 = var7; + var5 = class1.fontBold12.stringWidth(VerticalAlignment.method4426(var4)); + if (var5 > var3) { + var3 = var5; } } var3 += 8; var4 = menuOptionsCount * 15 + 22; - int var8 = var1 - var3 / 2; - if (var8 + var3 > GrandExchangeOfferTotalQuantityComparator.canvasWidth) { - var8 = GrandExchangeOfferTotalQuantityComparator.canvasWidth - var3; + var5 = var1 - var3 / 2; + if (var5 + var3 > Username.canvasWidth) { + var5 = Username.canvasWidth - var3; } - if (var8 < 0) { - var8 = 0; + if (var5 < 0) { + var5 = 0; } - int var9 = var2; - if (var4 + var2 > AttackOption.canvasHeight) { - var9 = AttackOption.canvasHeight - var4; + int var6 = var2; + if (var4 + var2 > WorldMapData_1.canvasHeight) { + var6 = WorldMapData_1.canvasHeight - var4; } - if (var9 < 0) { - var9 = 0; + if (var6 < 0) { + var6 = 0; } - GrandExchangeEvent.menuX = var8; - WorldMapManager.menuY = var9; - KeyHandler.menuWidth = var3; - class54.menuHeight = menuOptionsCount * 15 + 22; - class14.scene.menuOpen(UrlRequest.Client_plane, var1, var2, false); + ArchiveDiskAction.menuX = var5; + SecureRandomCallable.menuY = var6; + InterfaceParent.menuWidth = var3; + Message.menuHeight = menuOptionsCount * 15 + 22; + ServerBuild.scene.menuOpen(Clock.Client_plane, var1, var2, false); isMenuOpen = true; } - @ObfuscatedName("js") + @ObfuscatedName("it") @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "-2076621933" + signature = "(ZS)V", + garbageValue = "32113" ) @Export("resizeRoot") final void resizeRoot(boolean var1) { - LoginPacket.method3572(rootInterface, GrandExchangeOfferTotalQuantityComparator.canvasWidth, AttackOption.canvasHeight, var1); + GrandExchangeOfferUnitPriceComparator.method135(rootInterface, Username.canvasWidth, WorldMapData_1.canvasHeight, var1); } - @ObfuscatedName("jw") + @ObfuscatedName("iw") @ObfuscatedSignature( - signature = "(Lha;I)V", - garbageValue = "-654127595" + signature = "(Lhn;I)V", + garbageValue = "-1172183202" ) @Export("alignWidget") void alignWidget(Widget var1) { - Widget var2 = var1.parentId == -1 ? null : Tile.getWidget(var1.parentId); + Widget var2 = var1.parentId == -1 ? null : Varps.getWidget(var1.parentId); int var3; int var4; if (var2 == null) { - var3 = GrandExchangeOfferTotalQuantityComparator.canvasWidth; - var4 = AttackOption.canvasHeight; + var3 = Username.canvasWidth; + var4 = WorldMapData_1.canvasHeight; } else { var3 = var2.width; var4 = var2.height; } - class32.alignWidgetSize(var1, var3, var4, false); - class2.alignWidgetPosition(var1, var3, var4); + UrlRequester.alignWidgetSize(var1, var3, var4, false); + InterfaceParent.alignWidgetPosition(var1, var3, var4); } - @ObfuscatedName("jq") + @ObfuscatedName("jk") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-642381621" + signature = "(B)V", + garbageValue = "75" ) - final void method1310() { - LoginPacket.invalidateWidget(clickedWidget); - ++WorldMapSection2.widgetDragDuration; - if (field809 && field806) { + final void method1541() { + NPCDefinition.invalidateWidget(clickedWidget); + ++SequenceDefinition.widgetDragDuration; + if (field827 && field824) { int var1 = MouseHandler.MouseHandler_x; int var2 = MouseHandler.MouseHandler_y; var1 -= widgetClickX; var2 -= widgetClickY; - if (var1 < field807) { - var1 = field807; + if (var1 < field919) { + var1 = field919; } - if (var1 + clickedWidget.width > field807 + clickedWidgetParent.width) { - var1 = field807 + clickedWidgetParent.width - clickedWidget.width; + if (var1 + clickedWidget.width > field919 + clickedWidgetParent.width) { + var1 = field919 + clickedWidgetParent.width - clickedWidget.width; } - if (var2 < field808) { - var2 = field808; + if (var2 < field826) { + var2 = field826; } - if (var2 + clickedWidget.height > field808 + clickedWidgetParent.height) { - var2 = field808 + clickedWidgetParent.height - clickedWidget.height; + if (var2 + clickedWidget.height > field826 + clickedWidgetParent.height) { + var2 = field826 + clickedWidgetParent.height - clickedWidget.height; } - int var3 = var1 - field882; - int var4 = var2 - field811; + int var3 = var1 - field864; + int var4 = var2 - field829; int var5 = clickedWidget.dragZoneSize; - if (WorldMapSection2.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { + if (SequenceDefinition.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { isDraggingWidget = true; } - int var6 = var1 - field807 + clickedWidgetParent.scrollX; - int var7 = var2 - field808 + clickedWidgetParent.scrollY; + int var6 = var1 - field919 + clickedWidgetParent.scrollX; + int var7 = var2 - field826 + clickedWidgetParent.scrollY; ScriptEvent var8; if (clickedWidget.onDrag != null && isDraggingWidget) { var8 = new ScriptEvent(); @@ -5965,7 +5863,7 @@ public final class Client extends GameShell implements Usernamed { var8.mouseX = var6; var8.mouseY = var7; var8.args = clickedWidget.onDrag; - runScriptEvent(var8); + class4.runScriptEvent(var8); } if (MouseHandler.MouseHandler_currentButton == 0) { @@ -5977,65 +5875,178 @@ public final class Client extends GameShell implements Usernamed { var8.mouseY = var7; var8.dragTarget = draggedOnWidget; var8.args = clickedWidget.onDragComplete; - runScriptEvent(var8); + class4.runScriptEvent(var8); } - if (draggedOnWidget != null && StudioGame.method4116(clickedWidget) != null) { - PacketBufferNode var11 = class2.getPacketBufferNode(ClientPacket.field2209, packetWriter.isaacCipher); - var11.packetBuffer.writeIntME(draggedOnWidget.itemId); - var11.packetBuffer.method5579(clickedWidget.itemId); - var11.packetBuffer.writeShort(clickedWidget.childIndex); - var11.packetBuffer.method5746(draggedOnWidget.childIndex); - var11.packetBuffer.writeInt(clickedWidget.id); - var11.packetBuffer.writeInt(draggedOnWidget.id); - packetWriter.addNode(var11); + if (draggedOnWidget != null && ItemContainer.method1184(clickedWidget) != null) { + PacketBufferNode var9 = TilePaint.getPacketBufferNode(ClientPacket.field2242, packetWriter.isaacCipher); + var9.packetBuffer.writeIntME(draggedOnWidget.childIndex); + var9.packetBuffer.method5787(clickedWidget.itemId); + var9.packetBuffer.method5622(clickedWidget.id); + var9.packetBuffer.method5622(draggedOnWidget.id); + var9.packetBuffer.writeShortLE(draggedOnWidget.itemId); + var9.packetBuffer.writeShortLE(clickedWidget.childIndex); + packetWriter.addNode(var9); } } else if (this.shouldLeftClickOpenMenu()) { - this.openMenu(field882 + widgetClickX, widgetClickY + field811); + this.openMenu(field864 + widgetClickX, widgetClickY + field829); } else if (menuOptionsCount > 0) { - int var10 = widgetClickX + field882; - int var9 = widgetClickY + field811; - Messages.method2231(LoginType.tempMenuAction, var10, var9); - LoginType.tempMenuAction = null; + GrandExchangeOfferTotalQuantityComparator.method105(widgetClickX + field864, field829 + widgetClickY); } clickedWidget = null; } } else { - if (WorldMapSection2.widgetDragDuration > 1) { + if (SequenceDefinition.widgetDragDuration > 1) { clickedWidget = null; } } } - @ObfuscatedName("lv") + @ObfuscatedName("ky") @ObfuscatedSignature( - signature = "(I)Ljc;", - garbageValue = "83008429" + signature = "(I)Ljz;", + garbageValue = "2135870107" ) @Export("username") public Username username() { - return Message.localPlayer != null ? Message.localPlayer.username : null; + return class192.localPlayer != null ? class192.localPlayer.username : null; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lbm;I)V", - garbageValue = "-74737560" + signature = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lgl;I)I", + garbageValue = "505977953" ) - @Export("runScriptEvent") - public static void runScriptEvent(ScriptEvent var0) { - GrandExchangeEvents.runScript(var0, 500000); + @Export("compareStrings") + public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) { + int var3 = var0.length(); + int var4 = var1.length(); + int var5 = 0; + int var6 = 0; + byte var7 = 0; + byte var8 = 0; + + while (var5 - var7 < var3 || var6 - var8 < var4) { + if (var5 - var7 >= var3) { + return -1; + } + + if (var6 - var8 >= var4) { + return 1; + } + + char var9; + if (var7 != 0) { + var9 = (char)var7; + boolean var14 = false; + } else { + var9 = var0.charAt(var5++); + } + + char var10; + if (var8 != 0) { + var10 = (char)var8; + boolean var15 = false; + } else { + var10 = var1.charAt(var6++); + } + + byte var11; + if (var9 == 198) { + var11 = 69; + } else if (var9 == 230) { + var11 = 101; + } else if (var9 == 223) { + var11 = 115; + } else if (var9 == 338) { + var11 = 69; + } else if (var9 == 339) { + var11 = 101; + } else { + var11 = 0; + } + + var7 = var11; + byte var12; + if (var10 == 198) { + var12 = 69; + } else if (var10 == 230) { + var12 = 101; + } else if (var10 == 223) { + var12 = 115; + } else if (var10 == 338) { + var12 = 69; + } else if (var10 == 339) { + var12 = 101; + } else { + var12 = 0; + } + + var8 = var12; + var9 = FloorUnderlayDefinition.standardizeChar(var9, var2); + var10 = FloorUnderlayDefinition.standardizeChar(var10, var2); + if (var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { + var9 = Character.toLowerCase(var9); + var10 = Character.toLowerCase(var10); + if (var9 != var10) { + return class42.lowercaseChar(var9, var2) - class42.lowercaseChar(var10, var2); + } + } + } + + int var16 = Math.min(var3, var4); + + int var17; + char var20; + for (var17 = 0; var17 < var16; ++var17) { + if (var2 == Language.Language_FR) { + var5 = var3 - 1 - var17; + var6 = var4 - 1 - var17; + } else { + var6 = var17; + var5 = var17; + } + + char var18 = var0.charAt(var5); + var20 = var1.charAt(var6); + if (var20 != var18 && Character.toUpperCase(var18) != Character.toUpperCase(var20)) { + var18 = Character.toLowerCase(var18); + var20 = Character.toLowerCase(var20); + if (var18 != var20) { + return class42.lowercaseChar(var18, var2) - class42.lowercaseChar(var20, var2); + } + } + } + + var17 = var3 - var4; + if (var17 != 0) { + return var17; + } else { + for (int var19 = 0; var19 < var16; ++var19) { + var20 = var0.charAt(var19); + char var13 = var1.charAt(var19); + if (var13 != var20) { + return class42.lowercaseChar(var20, var2) - class42.lowercaseChar(var13, var2); + } + } + + return 0; + } } - @ObfuscatedName("al") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "0" + signature = "(B)Lfu;", + garbageValue = "4" ) - static int method1740(int var0) { - return (int)((Math.log((double)var0) / Interpreter.field1083 - 7.0D) * 256.0D); + public static Clock method1432() { + try { + return new NanoClock(); + } catch (Throwable var1) { + return new MilliClock(); + } } } diff --git a/runescape-client/src/main/java/ClientPacket.java b/runescape-client/src/main/java/ClientPacket.java index 507341ac65..3d04a6a822 100644 --- a/runescape-client/src/main/java/ClientPacket.java +++ b/runescape-client/src/main/java/ClientPacket.java @@ -4,640 +4,629 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fh") +@ObfuscatedName("gi") @Implements("ClientPacket") -public class ClientPacket implements class175 { - @ObfuscatedName("nf") - @ObfuscatedSignature( - signature = "[Lha;" - ) - static Widget[] field2223; - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2181; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2189; - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2177; - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2239; - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2179; - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2176; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2210; - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2175; - @ObfuscatedName("a") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2220; - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2184; +public class ClientPacket implements class181 { @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2185; - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "Lfh;" - ) - static final ClientPacket field2252; - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2187; - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2195; - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2233; - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2190; - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2253; - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2192; - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2193; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2194; - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2178; - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2196; - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2186; - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "Lfh;" - ) - static final ClientPacket field2198; - @ObfuscatedName("r") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2215; - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2200; - @ObfuscatedName("aa") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2201; - @ObfuscatedName("av") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2202; - @ObfuscatedName("aw") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2203; - @ObfuscatedName("as") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2219; - @ObfuscatedName("ak") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2205; - @ObfuscatedName("au") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2206; - @ObfuscatedName("ah") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2207; - @ObfuscatedName("aq") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2208; - @ObfuscatedName("ao") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2209; - @ObfuscatedName("an") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2225; - @ObfuscatedName("ar") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2266; - @ObfuscatedName("az") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2264; - @ObfuscatedName("ay") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2213; - @ObfuscatedName("ag") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2214; - @ObfuscatedName("ac") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2204; - @ObfuscatedName("al") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2216; - @ObfuscatedName("ae") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2180; - @ObfuscatedName("ad") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2218; - @ObfuscatedName("aj") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2242; - @ObfuscatedName("ax") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2257; - @ObfuscatedName("at") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2221; - @ObfuscatedName("af") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2222; - @ObfuscatedName("ap") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2211; - @ObfuscatedName("ai") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2224; - @ObfuscatedName("am") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2278; - @ObfuscatedName("ab") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2226; - @ObfuscatedName("bj") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2227; - @ObfuscatedName("bg") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2228; - @ObfuscatedName("bw") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2188; - @ObfuscatedName("bk") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2230; - @ObfuscatedName("bl") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2267; - @ObfuscatedName("bq") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2254; - @ObfuscatedName("bx") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2183; - @ObfuscatedName("bc") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2197; - @ObfuscatedName("by") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2235; - @ObfuscatedName("bz") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2236; - @ObfuscatedName("bm") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2237; - @ObfuscatedName("bo") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2238; - @ObfuscatedName("bs") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2231; - @ObfuscatedName("ba") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2279; - @ObfuscatedName("bn") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2241; - @ObfuscatedName("bb") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2199; - @ObfuscatedName("bh") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2182; - @ObfuscatedName("bv") - @ObfuscatedSignature( - signature = "Lfh;" - ) - static final ClientPacket field2244; - @ObfuscatedName("bu") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2245; - @ObfuscatedName("be") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2246; - @ObfuscatedName("bd") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2247; - @ObfuscatedName("bf") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2248; - @ObfuscatedName("bi") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2249; - @ObfuscatedName("br") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2250; - @ObfuscatedName("bt") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2251; - @ObfuscatedName("bp") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2229; - @ObfuscatedName("co") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2268; - @ObfuscatedName("cp") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2265; - @ObfuscatedName("cd") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2255; - @ObfuscatedName("cj") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2256; - @ObfuscatedName("cq") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2240; - @ObfuscatedName("cb") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2258; - @ObfuscatedName("cf") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2259; - @ObfuscatedName("cs") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2217; - @ObfuscatedName("ch") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2261; - @ObfuscatedName("ca") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2262; - @ObfuscatedName("cn") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2263; - @ObfuscatedName("cx") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2212; - @ObfuscatedName("ck") - @ObfuscatedSignature( - signature = "Lfh;" - ) - public static final ClientPacket field2273; - @ObfuscatedName("ce") - @ObfuscatedSignature( - signature = "Lfh;" + signature = "Lgi;" ) public static final ClientPacket field2232; - @ObfuscatedName("cu") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lfh;" + signature = "Lgi;" + ) + public static final ClientPacket field2204; + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2205; + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2206; + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2229; + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2208; + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2209; + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2210; + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2211; + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2296; + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2213; + @ObfuscatedName("h") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2214; + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "Lgi;" ) public static final ClientPacket field2234; - @ObfuscatedName("cg") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lfh;" + signature = "Lgi;" ) - public static final ClientPacket field2191; - @ObfuscatedName("ct") + public static final ClientPacket field2298; + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lfh;" + signature = "Lgi;" ) - public static final ClientPacket field2269; - @ObfuscatedName("cr") + public static final ClientPacket field2273; + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lfh;" + signature = "Lgi;" ) - public static final ClientPacket field2270; - @ObfuscatedName("cy") + public static final ClientPacket field2297; + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lfh;" + signature = "Lgi;" ) - public static final ClientPacket field2271; - @ObfuscatedName("cz") + static final ClientPacket field2295; + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lfh;" + signature = "Lgi;" ) - public static final ClientPacket field2272; - @ObfuscatedName("cm") + public static final ClientPacket field2276; + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Lfh;" + signature = "Lgi;" + ) + public static final ClientPacket field2203; + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2222; + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2223; + @ObfuscatedName("b") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2224; + @ObfuscatedName("r") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2225; + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2226; + @ObfuscatedName("a") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2227; + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2228; + @ObfuscatedName("ae") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2283; + @ObfuscatedName("af") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2230; + @ObfuscatedName("az") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2288; + @ObfuscatedName("ax") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2215; + @ObfuscatedName("aj") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2233; + @ObfuscatedName("au") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2262; + @ObfuscatedName("ay") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2235; + @ObfuscatedName("aa") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2236; + @ObfuscatedName("aq") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2237; + @ObfuscatedName("as") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2238; + @ObfuscatedName("ak") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2239; + @ObfuscatedName("ac") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2240; + @ObfuscatedName("aw") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2217; + @ObfuscatedName("ar") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2242; + @ObfuscatedName("av") + @ObfuscatedSignature( + signature = "Lgi;" ) public static final ClientPacket field2243; - @ObfuscatedName("cl") + @ObfuscatedName("al") @ObfuscatedSignature( - signature = "Lfh;" + signature = "Lgi;" + ) + public static final ClientPacket field2244; + @ObfuscatedName("ad") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2207; + @ObfuscatedName("am") + @ObfuscatedSignature( + signature = "Lgi;" + ) + static final ClientPacket field2245; + @ObfuscatedName("ao") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2247; + @ObfuscatedName("at") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2241; + @ObfuscatedName("an") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2249; + @ObfuscatedName("ag") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2250; + @ObfuscatedName("ai") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2221; + @ObfuscatedName("ab") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2216; + @ObfuscatedName("ap") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2253; + @ObfuscatedName("ah") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2254; + @ObfuscatedName("bq") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2255; + @ObfuscatedName("bf") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2266; + @ObfuscatedName("bc") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2257; + @ObfuscatedName("bk") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2258; + @ObfuscatedName("bb") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2231; + @ObfuscatedName("bi") + @ObfuscatedSignature( + signature = "Lgi;" ) public static final ClientPacket field2260; - @ObfuscatedName("ci") + @ObfuscatedName("bp") @ObfuscatedSignature( - signature = "Lfh;" + signature = "Lgi;" + ) + public static final ClientPacket field2261; + @ObfuscatedName("bl") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2259; + @ObfuscatedName("by") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2263; + @ObfuscatedName("be") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2264; + @ObfuscatedName("bw") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2265; + @ObfuscatedName("bt") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2220; + @ObfuscatedName("bn") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2267; + @ObfuscatedName("bm") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2268; + @ObfuscatedName("ba") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2269; + @ObfuscatedName("bd") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2270; + @ObfuscatedName("bs") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2271; + @ObfuscatedName("bx") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2272; + @ObfuscatedName("bh") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2290; + @ObfuscatedName("bg") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2274; + @ObfuscatedName("bz") + @ObfuscatedSignature( + signature = "Lgi;" ) public static final ClientPacket field2275; - @ObfuscatedName("dh") + @ObfuscatedName("bj") @ObfuscatedSignature( - signature = "Lif;" + signature = "Lgi;" ) - @Export("archive0") - static Archive archive0; + public static final ClientPacket field2218; + @ObfuscatedName("bu") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2277; + @ObfuscatedName("bv") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2278; + @ObfuscatedName("bo") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2251; + @ObfuscatedName("br") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2280; + @ObfuscatedName("cp") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2281; + @ObfuscatedName("cg") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2282; + @ObfuscatedName("cr") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2291; + @ObfuscatedName("co") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2284; + @ObfuscatedName("ck") + @ObfuscatedSignature( + signature = "Lgi;" + ) + static final ClientPacket field2285; + @ObfuscatedName("cn") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2286; + @ObfuscatedName("cd") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2287; + @ObfuscatedName("ct") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2279; + @ObfuscatedName("cb") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2289; + @ObfuscatedName("cf") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2248; + @ObfuscatedName("cm") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2219; + @ObfuscatedName("cz") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2292; + @ObfuscatedName("cu") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2293; + @ObfuscatedName("cy") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2294; + @ObfuscatedName("ce") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2301; + @ObfuscatedName("cw") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2212; + @ObfuscatedName("cq") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2256; + @ObfuscatedName("ci") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2252; + @ObfuscatedName("ca") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2299; @ObfuscatedName("cc") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2300; + @ObfuscatedName("ch") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2246; + @ObfuscatedName("cx") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2302; + @ObfuscatedName("cl") + @ObfuscatedSignature( + signature = "Lgi;" + ) + public static final ClientPacket field2303; + @ObfuscatedName("cs") @ObfuscatedGetter( - intValue = -900434403 + intValue = -1068668193 ) @Export("id") final int id; - @ObfuscatedName("cv") + @ObfuscatedName("cj") @ObfuscatedGetter( - intValue = -1150168729 + intValue = -249887029 ) @Export("length") final int length; static { - field2181 = new ClientPacket(0, 8); - field2189 = new ClientPacket(1, 7); - field2177 = new ClientPacket(2, -2); - field2239 = new ClientPacket(3, 11); - field2179 = new ClientPacket(4, 5); - field2176 = new ClientPacket(5, 0); - field2210 = new ClientPacket(6, 4); - field2175 = new ClientPacket(7, 3); - field2220 = new ClientPacket(8, 4); - field2184 = new ClientPacket(9, 2); - field2185 = new ClientPacket(10, 16); - field2252 = new ClientPacket(11, 2); - field2187 = new ClientPacket(12, -1); - field2195 = new ClientPacket(13, -1); - field2233 = new ClientPacket(14, 7); - field2190 = new ClientPacket(15, 8); - field2253 = new ClientPacket(16, 8); - field2192 = new ClientPacket(17, 4); - field2193 = new ClientPacket(18, 4); - field2194 = new ClientPacket(19, 2); - field2178 = new ClientPacket(20, 2); - field2196 = new ClientPacket(21, 8); - field2186 = new ClientPacket(22, 8); - field2198 = new ClientPacket(23, -1); - field2215 = new ClientPacket(24, 3); - field2200 = new ClientPacket(25, 8); - field2201 = new ClientPacket(26, 7); - field2202 = new ClientPacket(27, -2); - field2203 = new ClientPacket(28, 3); - field2219 = new ClientPacket(29, -1); - field2205 = new ClientPacket(30, 8); - field2206 = new ClientPacket(31, -1); - field2207 = new ClientPacket(32, 8); - field2208 = new ClientPacket(33, 3); - field2209 = new ClientPacket(34, 16); - field2225 = new ClientPacket(35, -1); - field2266 = new ClientPacket(36, 3); - field2264 = new ClientPacket(37, 7); - field2213 = new ClientPacket(38, 9); - field2214 = new ClientPacket(39, 3); - field2204 = new ClientPacket(40, 8); - field2216 = new ClientPacket(41, -1); - field2180 = new ClientPacket(42, 4); - field2218 = new ClientPacket(43, -2); - field2242 = new ClientPacket(44, 8); - field2257 = new ClientPacket(45, 15); - field2221 = new ClientPacket(46, -1); - field2222 = new ClientPacket(47, 3); - field2211 = new ClientPacket(48, 8); - field2224 = new ClientPacket(49, 3); - field2278 = new ClientPacket(50, -1); - field2226 = new ClientPacket(51, 0); - field2227 = new ClientPacket(52, 8); - field2228 = new ClientPacket(53, 15); - field2188 = new ClientPacket(54, -1); - field2230 = new ClientPacket(55, 7); - field2267 = new ClientPacket(56, 3); - field2254 = new ClientPacket(57, 8); - field2183 = new ClientPacket(58, 9); - field2197 = new ClientPacket(59, 8); - field2235 = new ClientPacket(60, 3); - field2236 = new ClientPacket(61, -1); - field2237 = new ClientPacket(62, 14); - field2238 = new ClientPacket(63, -1); - field2231 = new ClientPacket(64, 0); - field2279 = new ClientPacket(65, 8); - field2241 = new ClientPacket(66, 6); - field2199 = new ClientPacket(67, 13); - field2182 = new ClientPacket(68, 0); - field2244 = new ClientPacket(69, 7); - field2245 = new ClientPacket(70, -1); - field2246 = new ClientPacket(71, 6); - field2247 = new ClientPacket(72, 8); - field2248 = new ClientPacket(73, 7); - field2249 = new ClientPacket(74, -1); - field2250 = new ClientPacket(75, 3); - field2251 = new ClientPacket(76, 9); - field2229 = new ClientPacket(77, 1); - field2268 = new ClientPacket(78, 0); - field2265 = new ClientPacket(79, 7); - field2255 = new ClientPacket(80, 8); - field2256 = new ClientPacket(81, 3); - field2240 = new ClientPacket(82, 8); - field2258 = new ClientPacket(83, 7); - field2259 = new ClientPacket(84, -1); - field2217 = new ClientPacket(85, 9); - field2261 = new ClientPacket(86, 8); - field2262 = new ClientPacket(87, 8); - field2263 = new ClientPacket(88, 13); - field2212 = new ClientPacket(89, -1); - field2273 = new ClientPacket(90, 3); - field2232 = new ClientPacket(91, 13); - field2234 = new ClientPacket(92, 2); - field2191 = new ClientPacket(93, 10); - field2269 = new ClientPacket(94, 3); - field2270 = new ClientPacket(95, 11); - field2271 = new ClientPacket(96, -1); - field2272 = new ClientPacket(97, 7); - field2243 = new ClientPacket(98, 7); - field2260 = new ClientPacket(99, -1); - field2275 = new ClientPacket(100, 16); + field2232 = new ClientPacket(0, 16); + field2204 = new ClientPacket(1, 8); + field2205 = new ClientPacket(2, 8); + field2206 = new ClientPacket(3, 11); + field2229 = new ClientPacket(4, -1); + field2208 = new ClientPacket(5, 4); + field2209 = new ClientPacket(6, 8); + field2210 = new ClientPacket(7, 1); + field2211 = new ClientPacket(8, 3); + field2296 = new ClientPacket(9, 3); + field2213 = new ClientPacket(10, -1); + field2214 = new ClientPacket(11, 10); + field2234 = new ClientPacket(12, 8); + field2298 = new ClientPacket(13, 0); + field2273 = new ClientPacket(14, 8); + field2297 = new ClientPacket(15, 7); + field2295 = new ClientPacket(16, -1); + field2276 = new ClientPacket(17, -1); + field2203 = new ClientPacket(18, -1); + field2222 = new ClientPacket(19, -1); + field2223 = new ClientPacket(20, 13); + field2224 = new ClientPacket(21, 7); + field2225 = new ClientPacket(22, 4); + field2226 = new ClientPacket(23, 8); + field2227 = new ClientPacket(24, 7); + field2228 = new ClientPacket(25, 2); + field2283 = new ClientPacket(26, 3); + field2230 = new ClientPacket(27, 3); + field2288 = new ClientPacket(28, -1); + field2215 = new ClientPacket(29, 8); + field2233 = new ClientPacket(30, -2); + field2262 = new ClientPacket(31, 13); + field2235 = new ClientPacket(32, -1); + field2236 = new ClientPacket(33, 7); + field2237 = new ClientPacket(34, 8); + field2238 = new ClientPacket(35, 3); + field2239 = new ClientPacket(36, 3); + field2240 = new ClientPacket(37, -1); + field2217 = new ClientPacket(38, 9); + field2242 = new ClientPacket(39, 16); + field2243 = new ClientPacket(40, 3); + field2244 = new ClientPacket(41, 7); + field2207 = new ClientPacket(42, -1); + field2245 = new ClientPacket(43, 7); + field2247 = new ClientPacket(44, 0); + field2241 = new ClientPacket(45, -2); + field2249 = new ClientPacket(46, 4); + field2250 = new ClientPacket(47, 14); + field2221 = new ClientPacket(48, 3); + field2216 = new ClientPacket(49, 3); + field2253 = new ClientPacket(50, 8); + field2254 = new ClientPacket(51, 8); + field2255 = new ClientPacket(52, 9); + field2266 = new ClientPacket(53, 3); + field2257 = new ClientPacket(54, 8); + field2258 = new ClientPacket(55, 2); + field2231 = new ClientPacket(56, 7); + field2260 = new ClientPacket(57, -1); + field2261 = new ClientPacket(58, 8); + field2259 = new ClientPacket(59, 8); + field2263 = new ClientPacket(60, -1); + field2264 = new ClientPacket(61, 16); + field2265 = new ClientPacket(62, -1); + field2220 = new ClientPacket(63, 9); + field2267 = new ClientPacket(64, 15); + field2268 = new ClientPacket(65, 8); + field2269 = new ClientPacket(66, 8); + field2270 = new ClientPacket(67, -1); + field2271 = new ClientPacket(68, -1); + field2272 = new ClientPacket(69, 15); + field2290 = new ClientPacket(70, 11); + field2274 = new ClientPacket(71, 0); + field2275 = new ClientPacket(72, 6); + field2218 = new ClientPacket(73, 0); + field2277 = new ClientPacket(74, 2); + field2278 = new ClientPacket(75, 4); + field2251 = new ClientPacket(76, 4); + field2280 = new ClientPacket(77, -1); + field2281 = new ClientPacket(78, 3); + field2282 = new ClientPacket(79, 3); + field2291 = new ClientPacket(80, 8); + field2284 = new ClientPacket(81, 13); + field2285 = new ClientPacket(82, 2); + field2286 = new ClientPacket(83, -2); + field2287 = new ClientPacket(84, 0); + field2279 = new ClientPacket(85, 3); + field2289 = new ClientPacket(86, 5); + field2248 = new ClientPacket(87, 8); + field2219 = new ClientPacket(88, 9); + field2292 = new ClientPacket(89, 7); + field2293 = new ClientPacket(90, -1); + field2294 = new ClientPacket(91, 7); + field2301 = new ClientPacket(92, 7); + field2212 = new ClientPacket(93, 8); + field2256 = new ClientPacket(94, 6); + field2252 = new ClientPacket(95, -1); + field2299 = new ClientPacket(96, 7); + field2300 = new ClientPacket(97, 3); + field2246 = new ClientPacket(98, 2); + field2302 = new ClientPacket(99, 8); + field2303 = new ClientPacket(100, 8); } ClientPacket(int var1, int var2) { @@ -645,36 +634,80 @@ public class ClientPacket implements class175 { this.length = var2; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lhz;Lhz;I)V", - garbageValue = "121922848" + signature = "(Lii;Lii;ZII)V", + garbageValue = "-1455542031" ) - public static void method3570(AbstractArchive var0, AbstractArchive var1) { - SpotAnimationDefinition.SpotAnimationDefinition_archive = var0; - SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var1; - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(IB)Lil;", - garbageValue = "-81" - ) - @Export("SpotAnimationDefinition_get") - public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) { - SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); - var1 = new SpotAnimationDefinition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); + static void method3683(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { + if (Login.field1163) { + if (var3 == 4) { + Login.loginIndex = 4; } - SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); - return var1; + } else { + Login.loginIndex = var3; + Rasterizer2D.Rasterizer2D_clear(); + byte[] var4 = var0.takeFileByNames("title.jpg", ""); + Login.leftTitleSprite = class14.convertJpgToSprite(var4); + class32.rightTitleSprite = Login.leftTitleSprite.mirrorHorizontally(); + if ((Client.worldProperties & 536870912) != 0) { + FloorDecoration.logoSprite = class16.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); + } else if ((Client.worldProperties & 1073741824) != 0) { + FloorDecoration.logoSprite = class16.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); + } else { + FloorDecoration.logoSprite = class16.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); + } + + ScriptFrame.titleboxSprite = class16.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); + Login.titlebuttonSprite = class16.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); + class16.runesSprite = FaceNormal.method3336(var1, "runes", ""); + Login.title_muteSprite = FaceNormal.method3336(var1, "title_mute", ""); + WorldMapSprite.options_buttons_0Sprite = class16.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); + ItemContainer.field547 = class16.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); + DirectByteArrayCopier.options_buttons_2Sprite = class16.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); + VertexNormal.field1753 = class16.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); + class216.field2559 = WorldMapSprite.options_buttons_0Sprite.subWidth; + AbstractWorldMapData.field190 = WorldMapSprite.options_buttons_0Sprite.subHeight; + WorldMapLabelSize.loginScreenRunesAnimation = new LoginScreenAnimation(class16.runesSprite); + if (var2) { + Login.Login_username = ""; + Login.Login_password = ""; + } + + Frames.field1885 = 0; + LoginScreenAnimation.otp = ""; + Login.field1185 = true; + Login.worldSelectOpen = false; + if (!WorldMapSection2.clientPreferences.titleMusicDisabled) { + WorldMapData_0.method189(2, MouseHandler.archive6, "scape main", "", 255, false); + } else { + class197.field2414 = 1; + UserComparator5.musicTrackArchive = null; + class197.musicTrackGroupId = -1; + class83.musicTrackFileId = -1; + AttackOption.musicTrackVolume = 0; + KeyHandler.musicTrackBoolean = false; + class197.field2412 = 2; + } + + TextureProvider.method2833(false); + Login.field1163 = true; + Login.xPadding = (Username.canvasWidth - 765) / 2; + Login.loginBoxX = Login.xPadding + 202; + class96.loginBoxCenter = Login.loginBoxX + 180; + Login.leftTitleSprite.drawAt(Login.xPadding, 0); + class32.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + FloorDecoration.logoSprite.drawAt(Login.xPadding + 382 - FloorDecoration.logoSprite.subWidth / 2, 18); } } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;II)Z", + garbageValue = "799979614" + ) + static boolean method3682(String var0, int var1) { + return class14.method174(var0, var1, "openjs"); + } } diff --git a/runescape-client/src/main/java/ClientPreferences.java b/runescape-client/src/main/java/ClientPreferences.java index e484067ea8..90a07b39d0 100644 --- a/runescape-client/src/main/java/ClientPreferences.java +++ b/runescape-client/src/main/java/ClientPreferences.java @@ -7,46 +7,39 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bf") +@ObfuscatedName("bj") @Implements("ClientPreferences") public class ClientPreferences { - @ObfuscatedName("qu") - @ObfuscatedSignature( - signature = "Ldr;" - ) - @Export("decimator") - static Decimator decimator; - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1642477041 + intValue = 1562806739 ) @Export("ClientPreferences_optionCount") static int ClientPreferences_optionCount; - @ObfuscatedName("jz") + @ObfuscatedName("fb") @ObfuscatedSignature( - signature = "Lha;" + signature = "Lkr;" ) - @Export("dragInventoryWidget") - static Widget dragInventoryWidget; - @ObfuscatedName("y") + static AbstractSocket field1052; + @ObfuscatedName("o") @Export("roofsHidden") boolean roofsHidden; - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("titleMusicDisabled") boolean titleMusicDisabled; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -732780625 + intValue = -122570971 ) @Export("windowMode") int windowMode; - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("rememberedUsername") String rememberedUsername; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("hideUsername") boolean hideUsername; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("parameters") LinkedHashMap parameters; @@ -59,11 +52,11 @@ public class ClientPreferences { this.rememberedUsername = null; this.hideUsername = false; this.parameters = new LinkedHashMap(); - this.method1835(true); + this.method1849(true); } @ObfuscatedSignature( - signature = "(Lkq;)V" + signature = "(Lkp;)V" ) ClientPreferences(Buffer var1) { this.windowMode = 1; @@ -103,26 +96,26 @@ public class ClientPreferences { this.hideUsername = var1.readBoolean(); } } else { - this.method1835(true); + this.method1849(true); } } else { - this.method1835(true); + this.method1849(true); } } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(ZS)V", - garbageValue = "-15246" + signature = "(ZI)V", + garbageValue = "1265192708" ) - void method1835(boolean var1) { + void method1849(boolean var1) { } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)Lkq;", - garbageValue = "458366092" + signature = "(I)Lkp;", + garbageValue = "-1961223036" ) @Export("toBuffer") Buffer toBuffer() { @@ -144,4 +137,168 @@ public class ClientPreferences { var1.writeBoolean(this.hideUsername); return var1; } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(I)[Llf;", + garbageValue = "-1068264717" + ) + @Export("FillMode_values") + public static FillMode[] FillMode_values() { + return new FillMode[]{FillMode.field3858, FillMode.SOLID, FillMode.field3854}; + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(ILjava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-756119302" + ) + @Export("addGameMessage") + static void addGameMessage(int var0, String var1, String var2) { + class173.addChatMessage(var0, var1, var2, (String)null); + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1958479056" + ) + public static void method1854() { + while (true) { + ArchiveDiskAction var0; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + var0 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); + } + + if (var0 == null) { + return; + } + + var0.archive.load(var0.archiveDisk, (int)var0.key, var0.data, false); + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "([BIIIIIII[Lfv;I)V", + garbageValue = "-1733201175" + ) + static final void method1853(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, CollisionMap[] var8) { + int var10; + for (int var9 = 0; var9 < 8; ++var9) { + for (var10 = 0; var10 < 8; ++var10) { + if (var9 + var2 > 0 && var9 + var2 < 103 && var3 + var10 > 0 && var3 + var10 < 103) { + int[] var10000 = var8[var1].flags[var9 + var2]; + var10000[var10 + var3] &= -16777217; + } + } + } + + Buffer var13 = new Buffer(var0); + + for (var10 = 0; var10 < 4; ++var10) { + for (int var11 = 0; var11 < 64; ++var11) { + for (int var12 = 0; var12 < 64; ++var12) { + if (var10 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) { + WorldMapArea.loadTerrain(var13, var1, var2 + ModelData0.method3322(var11 & 7, var12 & 7, var7), var3 + ViewportMouse.method3059(var11 & 7, var12 & 7, var7), 0, 0, var7); + } else { + WorldMapArea.loadTerrain(var13, 0, -1, -1, 0, 0, 0); + } + } + } + } + + } + + @ObfuscatedName("gh") + @ObfuscatedSignature( + signature = "(Lba;I)Z", + garbageValue = "-1602315616" + ) + static boolean method1840(Player var0) { + if (Client.drawPlayerNames == 0) { + return false; + } else { + boolean var1; + if (class192.localPlayer == var0) { + var1 = (Client.drawPlayerNames & 8) != 0; + return var1; + } else { + var1 = MouseRecorder.method1210() || LoginScreenAnimation.method1819() && var0.isFriend(); + if (!var1) { + boolean var2 = (Client.drawPlayerNames & 2) != 0; + var1 = var2 && var0.isClanMember(); + } + + return var1; + } + } + } + + @ObfuscatedName("hy") + @ObfuscatedSignature( + signature = "(S)V", + garbageValue = "14321" + ) + static final void method1852() { + PacketBuffer var0 = Client.packetWriter.packetBuffer; + var0.importIndex(); + int var1 = var0.readBits(8); + int var2; + if (var1 < Client.npcCount) { + for (var2 = var1; var2 < Client.npcCount; ++var2) { + Client.field828[++Client.field766 - 1] = Client.npcIndices[var2]; + } + } + + if (var1 > Client.npcCount) { + throw new RuntimeException(""); + } else { + Client.npcCount = 0; + + for (var2 = 0; var2 < var1; ++var2) { + int var3 = Client.npcIndices[var2]; + NPC var4 = Client.npcs[var3]; + int var5 = var0.readBits(1); + if (var5 == 0) { + Client.npcIndices[++Client.npcCount - 1] = var3; + var4.npcCycle = Client.cycle; + } else { + int var6 = var0.readBits(2); + if (var6 == 0) { + Client.npcIndices[++Client.npcCount - 1] = var3; + var4.npcCycle = Client.cycle; + Client.field867[++Client.field690 - 1] = var3; + } else { + int var7; + int var8; + if (var6 == 1) { + Client.npcIndices[++Client.npcCount - 1] = var3; + var4.npcCycle = Client.cycle; + var7 = var0.readBits(3); + var4.method2083(var7, (byte)1); + var8 = var0.readBits(1); + if (var8 == 1) { + Client.field867[++Client.field690 - 1] = var3; + } + } else if (var6 == 2) { + Client.npcIndices[++Client.npcCount - 1] = var3; + var4.npcCycle = Client.cycle; + var7 = var0.readBits(3); + var4.method2083(var7, (byte)2); + var8 = var0.readBits(3); + var4.method2083(var8, (byte)2); + int var9 = var0.readBits(1); + if (var9 == 1) { + Client.field867[++Client.field690 - 1] = var3; + } + } else if (var6 == 3) { + Client.field828[++Client.field766 - 1] = var3; + } + } + } + } + + } + } } diff --git a/runescape-client/src/main/java/Clock.java b/runescape-client/src/main/java/Clock.java index 17715352fd..270dbdead8 100644 --- a/runescape-client/src/main/java/Clock.java +++ b/runescape-client/src/main/java/Clock.java @@ -1,59 +1,98 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fc") +@ObfuscatedName("fu") @Implements("Clock") public abstract class Clock { + @ObfuscatedName("da") + @ObfuscatedSignature( + signature = "Lia;" + ) + @Export("archive19") + static Archive archive19; + @ObfuscatedName("ju") + @ObfuscatedGetter( + intValue = 346699043 + ) + @Export("Client_plane") + static int Client_plane; + Clock() { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "4" + garbageValue = "29" ) @Export("mark") public abstract void mark(); - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "670539248" + garbageValue = "-561232674" ) @Export("wait") public abstract int wait(int var1, int var2); - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "90199453" + signature = "([BB)Lce;", + garbageValue = "-106" ) - static int method3489(int var0, int var1) { - long var2 = (long)((var0 << 16) + var1); - return PrivateChatMode.NetCache_currentResponse != null && PrivateChatMode.NetCache_currentResponse.key == var2 ? NetCache.NetCache_responseArchiveBuffer.offset * 99 / (NetCache.NetCache_responseArchiveBuffer.array.length - PrivateChatMode.NetCache_currentResponse.padding) + 1 : 0; - } + @Export("newScript") + static Script newScript(byte[] var0) { + Script var1 = new Script(); + Buffer var2 = new Buffer(var0); + var2.offset = var2.array.length - 2; + int var3 = var2.readUnsignedShort(); + int var4 = var2.array.length - 2 - var3 - 12; + var2.offset = var4; + int var5 = var2.readInt(); + var1.localIntCount = var2.readUnsignedShort(); + var1.localStringCount = var2.readUnsignedShort(); + var1.intArgumentCount = var2.readUnsignedShort(); + var1.stringArgumentCount = var2.readUnsignedShort(); + int var6 = var2.readUnsignedByte(); + int var7; + int var8; + if (var6 > 0) { + var1.switches = var1.newIterableNodeHashTable(var6); - @ObfuscatedName("kk") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1974720745" - ) - static final void method3488() { - PacketBufferNode var0 = class2.getPacketBufferNode(ClientPacket.field2231, Client.packetWriter.isaacCipher); - Client.packetWriter.addNode(var0); + for (var7 = 0; var7 < var6; ++var7) { + var8 = var2.readUnsignedShort(); + IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? DynamicObject.method2293(var8) : 1); + var1.switches[var7] = var9; - for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { - if (var1.type == 0 || var1.type == 3) { - VarpDefinition.closeInterface(var1, true); + while (var8-- > 0) { + int var10 = var2.readInt(); + int var11 = var2.readInt(); + var9.put(new IntegerNode(var11), (long)var10); + } } } - if (Client.meslayerContinueWidget != null) { - LoginPacket.invalidateWidget(Client.meslayerContinueWidget); - Client.meslayerContinueWidget = null; + var2.offset = 0; + var2.readStringCp1252NullTerminatedOrNull(); + var1.opcodes = new int[var5]; + var1.intOperands = new int[var5]; + var1.stringOperands = new String[var5]; + + for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { + var8 = var2.readUnsignedShort(); + if (var8 == 3) { + var1.stringOperands[var7] = var2.readStringCp1252NullTerminated(); + } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { + var1.intOperands[var7] = var2.readInt(); + } else { + var1.intOperands[var7] = var2.readUnsignedByte(); + } } + return var1; } } diff --git a/runescape-client/src/main/java/CollisionMap.java b/runescape-client/src/main/java/CollisionMap.java index f78b7e5037..930f9c6d5c 100644 --- a/runescape-client/src/main/java/CollisionMap.java +++ b/runescape-client/src/main/java/CollisionMap.java @@ -1,43 +1,43 @@ -import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fp") +@ObfuscatedName("fv") @Implements("CollisionMap") public class CollisionMap { - @ObfuscatedName("d") - public static short[][] field2066; - @ObfuscatedName("ev") - @Export("worldHost") - static String worldHost; - @ObfuscatedName("aq") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -733536729 + intValue = 54587863 + ) + @Export("KitDefinition_fileCount") + public static int KitDefinition_fileCount; + @ObfuscatedName("aa") + @ObfuscatedGetter( + intValue = 1510475887 ) @Export("xInset") - public int xInset; - @ObfuscatedName("ao") + int xInset; + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -572637509 + intValue = 1655019513 ) @Export("yInset") - public int yInset; - @ObfuscatedName("an") + int yInset; + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 1390386939 + intValue = -120946659 ) @Export("xSize") int xSize; - @ObfuscatedName("ar") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -1658785195 + intValue = 910331901 ) @Export("ySize") int ySize; - @ObfuscatedName("az") + @ObfuscatedName("ac") @Export("flags") public int[][] flags; @@ -50,10 +50,10 @@ public class CollisionMap { this.clear(); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-734218208" + signature = "(B)V", + garbageValue = "76" ) @Export("clear") public void clear() { @@ -69,12 +69,12 @@ public class CollisionMap { } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IIIIZB)V", - garbageValue = "1" + signature = "(IIIIZI)V", + garbageValue = "1606080292" ) - public void method3552(int var1, int var2, int var3, int var4, boolean var5) { + public void method3626(int var1, int var2, int var3, int var4, boolean var5) { var1 -= this.xInset; var2 -= this.yInset; if (var3 == 0) { @@ -221,10 +221,10 @@ public class CollisionMap { } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIIIZI)V", - garbageValue = "-629817472" + signature = "(IIIIZB)V", + garbageValue = "1" ) @Export("addGameObject") public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) { @@ -248,10 +248,10 @@ public class CollisionMap { } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-1485831416" + garbageValue = "-909320528" ) @Export("setBlockedByFloor") public void setBlockedByFloor(int var1, int var2) { @@ -261,10 +261,10 @@ public class CollisionMap { var10000[var2] |= 2097152; } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "1736221922" + signature = "(IIB)V", + garbageValue = "16" ) @Export("setBlockedByFloorDec") public void setBlockedByFloorDec(int var1, int var2) { @@ -274,10 +274,10 @@ public class CollisionMap { var10000[var2] |= 262144; } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(IIII)V", - garbageValue = "677755057" + garbageValue = "13415555" ) @Export("setFlag") void setFlag(int var1, int var2, int var3) { @@ -285,12 +285,12 @@ public class CollisionMap { var10000[var2] |= var3; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(IIIIZB)V", - garbageValue = "-90" + signature = "(IIIIZI)V", + garbageValue = "-127214723" ) - public void method3534(int var1, int var2, int var3, int var4, boolean var5) { + public void method3621(int var1, int var2, int var3, int var4, boolean var5) { var1 -= this.xInset; var2 -= this.yInset; if (var3 == 0) { @@ -437,10 +437,10 @@ public class CollisionMap { } - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(IIIIIZI)V", - garbageValue = "1274501460" + garbageValue = "1921144321" ) @Export("setFlagOffNonSquare") public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) { @@ -470,10 +470,10 @@ public class CollisionMap { } - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(IIIB)V", - garbageValue = "114" + garbageValue = "16" ) @Export("setFlagOff") void setFlagOff(int var1, int var2, int var3) { @@ -481,102 +481,70 @@ public class CollisionMap { var10000[var2] &= ~var3; } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "55211859" + garbageValue = "1328839290" ) - public void method3535(int var1, int var2) { + public void method3624(int var1, int var2) { var1 -= this.xInset; var2 -= this.yInset; int[] var10000 = this.flags[var1]; var10000[var2] &= -262145; } - @ObfuscatedName("y") - @Export("base37DecodeLong") - public static String base37DecodeLong(long var0) { - if (var0 > 0L && var0 < 6582952005840035281L) { - if (var0 % 37L == 0L) { - return null; - } else { - int var2 = 0; - - for (long var3 = var0; var3 != 0L; var3 /= 37L) { - ++var2; - } - - StringBuilder var5; - char var8; - for (var5 = new StringBuilder(var2); 0L != var0; var5.append(var8)) { - long var6 = var0; - var0 /= 37L; - var8 = class288.base37Table[(int)(var6 - 37L * var0)]; - if (var8 == '_') { - int var9 = var5.length() - 1; - var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); - var8 = 160; - } - } - - var5.reverse(); - var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); - return var5.toString(); - } - } else { - return null; + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(II)I", + garbageValue = "-1311825595" + ) + @Export("iLog") + public static int iLog(int var0) { + int var1 = 0; + if (var0 < 0 || var0 >= 65536) { + var0 >>>= 16; + var1 += 16; } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(IS)I", - garbageValue = "1536" - ) - public static int method3555(int var0) { - return class268.method5012(ViewportMouse.ViewportMouse_entityTags[var0]); - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - signature = "(IIII)I", - garbageValue = "-1858221764" - ) - static final int method3530(int var0, int var1, int var2) { - int var3 = var0 / var2; - int var4 = var0 & var2 - 1; - int var5 = var1 / var2; - int var6 = var1 & var2 - 1; - int var7 = class32.method551(var3, var5); - int var8 = class32.method551(var3 + 1, var5); - int var9 = class32.method551(var3, var5 + 1); - int var10 = class32.method551(var3 + 1, var5 + 1); - int var11 = class13.method150(var7, var8, var4, var2); - int var12 = class13.method150(var9, var10, var4, var2); - return class13.method150(var11, var12, var6, var2); - } - - @ObfuscatedName("hs") - @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "1164715285" - ) - static final void method3557(boolean var0) { - WorldMapLabel.playPcmPlayers(); - ++Client.packetWriter.pendingWrites; - if (Client.packetWriter.pendingWrites >= 50 || var0) { - Client.packetWriter.pendingWrites = 0; - if (!Client.field677 && Client.packetWriter.getSocket() != null) { - PacketBufferNode var1 = class2.getPacketBufferNode(ClientPacket.field2182, Client.packetWriter.isaacCipher); - Client.packetWriter.addNode(var1); - - try { - Client.packetWriter.flush(); - } catch (IOException var3) { - Client.field677 = true; - } - } + if (var0 >= 256) { + var0 >>>= 8; + var1 += 8; } + + if (var0 >= 16) { + var0 >>>= 4; + var1 += 4; + } + + if (var0 >= 4) { + var0 >>>= 2; + var1 += 2; + } + + if (var0 >= 1) { + var0 >>>= 1; + ++var1; + } + + return var0 + var1; + } + + @ObfuscatedName("fn") + @ObfuscatedSignature( + signature = "(III)V", + garbageValue = "-557927999" + ) + static void method3650(int var0, int var1) { + int[] var2 = new int[9]; + + for (int var3 = 0; var3 < var2.length; ++var3) { + int var4 = var3 * 32 + 15 + 128; + int var5 = var4 * 3 + 600; + int var7 = Rasterizer3D.Rasterizer3D_sine[var4]; + int var6 = Canvas.method864(var5, var1); + var2[var3] = var7 * var6 >> 16; + } + + Scene.Scene_buildVisiblityMap(var2, 500, 800, var0 * 334 / var1, 334); } } diff --git a/runescape-client/src/main/java/Coord.java b/runescape-client/src/main/java/Coord.java index eb803d8a01..3c69776492 100644 --- a/runescape-client/src/main/java/Coord.java +++ b/runescape-client/src/main/java/Coord.java @@ -4,36 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ht") +@ObfuscatedName("hj") @Implements("Coord") public class Coord { - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Lhz;" - ) - @Export("musicTrackArchive") - public static AbstractArchive musicTrackArchive; - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 84466269 + intValue = 995034769 ) @Export("plane") public int plane; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 468184679 + intValue = 1797414909 ) @Export("x") public int x; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -387366221 + intValue = 1015808091 ) @Export("y") public int y; @ObfuscatedSignature( - signature = "(Lht;)V" + signature = "(Lhj;)V" ) public Coord(Coord var1) { this.plane = var1.plane; @@ -58,20 +52,20 @@ public class Coord { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-72" + signature = "(I)I", + garbageValue = "6116423" ) @Export("packed") public int packed() { return this.plane << 28 | this.x << 14 | this.y; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lht;I)Z", - garbageValue = "1703593953" + signature = "(Lhj;I)Z", + garbageValue = "-557558477" ) @Export("equalsCoord") boolean equalsCoord(Coord var1) { @@ -84,10 +78,10 @@ public class Coord { } } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(Ljava/lang/String;B)Ljava/lang/String;", - garbageValue = "32" + garbageValue = "-120" ) @Export("toString") String toString(String var1) { @@ -109,33 +103,4 @@ public class Coord { return !(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1); } } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(IB)Lig;", - garbageValue = "1" - ) - @Export("getObjectDefinition") - public static ObjectDefinition getObjectDefinition(int var0) { - ObjectDefinition var1 = (ObjectDefinition)ObjectDefinition.ObjectDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = ObjectDefinition.ObjectDefinition_archive.takeFile(6, var0); - var1 = new ObjectDefinition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - if (var1.isSolid) { - var1.interactType = 0; - var1.boolean1 = false; - } - - ObjectDefinition.ObjectDefinition_cached.put(var1, (long)var0); - return var1; - } - } } diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index 3b2eecd2c6..aed08637e5 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -4,28 +4,28 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dr") +@ObfuscatedName("dj") @Implements("Decimator") public class Decimator { - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -2103215085 + intValue = 1591513513 ) @Export("inputRate") int inputRate; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 643968559 + intValue = -1648120479 ) @Export("outputRate") int outputRate; - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("table") int[][] table; public Decimator(int var1, int var2) { if (var2 != var1) { - int var3 = class179.method3580(var1, var2); + int var3 = MouseHandler.method1111(var1, var2); var1 /= var3; var2 /= var3; this.inputRate = var1; @@ -40,7 +40,7 @@ public class Decimator { var8 = 0; } - int var9 = (int)Math.ceil(7.0D + var6); + int var9 = (int)Math.ceil(var6 + 7.0D); if (var9 > 14) { var9 = 14; } @@ -53,17 +53,17 @@ public class Decimator { } var14 *= 0.54D + 0.46D * Math.cos(0.2243994752564138D * ((double)var8 - var6)); - var5[var8] = (int)Math.floor(var14 * 65536.0D + 0.5D); + var5[var8] = (int)Math.floor(0.5D + 65536.0D * var14); } } } } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "([BI)[B", - garbageValue = "-1964001548" + garbageValue = "992629690" ) @Export("resample") byte[] resample(byte[] var1) { @@ -80,7 +80,7 @@ public class Decimator { int var9; for (var9 = 0; var9 < 14; ++var9) { - var3[var9 + var4] += var8[var9] * var7; + var3[var9 + var4] += var7 * var8[var9]; } var5 += this.outputRate; @@ -106,31 +106,181 @@ public class Decimator { return var1; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(II)I", - garbageValue = "-1093845583" + garbageValue = "-356284580" ) @Export("scaleRate") int scaleRate(int var1) { if (this.table != null) { - var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate); + var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate); } return var1; } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "1063686920" + signature = "(IB)I", + garbageValue = "5" ) @Export("scalePosition") int scalePosition(int var1) { if (this.table != null) { - var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate) + 6; + var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate) + 6; } return var1; } + + @ObfuscatedName("c") + public static final int method2600(double var0, double var2, double var4) { + double var6 = var4; + double var8 = var4; + double var10 = var4; + if (var2 != 0.0D) { + double var12; + if (var4 < 0.5D) { + var12 = var4 * (var2 + 1.0D); + } else { + var12 = var2 + var4 - var2 * var4; + } + + double var14 = var4 * 2.0D - var12; + double var16 = 0.3333333333333333D + var0; + if (var16 > 1.0D) { + --var16; + } + + double var20 = var0 - 0.3333333333333333D; + if (var20 < 0.0D) { + ++var20; + } + + if (var16 * 6.0D < 1.0D) { + var6 = var14 + 6.0D * (var12 - var14) * var16; + } else if (2.0D * var16 < 1.0D) { + var6 = var12; + } else if (3.0D * var16 < 2.0D) { + var6 = 6.0D * (var12 - var14) * (0.6666666666666666D - var16) + var14; + } else { + var6 = var14; + } + + if (var0 * 6.0D < 1.0D) { + var8 = var14 + 6.0D * (var12 - var14) * var0; + } else if (2.0D * var0 < 1.0D) { + var8 = var12; + } else if (var0 * 3.0D < 2.0D) { + var8 = var14 + (var12 - var14) * (0.6666666666666666D - var0) * 6.0D; + } else { + var8 = var14; + } + + if (var20 * 6.0D < 1.0D) { + var10 = 6.0D * (var12 - var14) * var20 + var14; + } else if (2.0D * var20 < 1.0D) { + var10 = var12; + } else if (var20 * 3.0D < 2.0D) { + var10 = (0.6666666666666666D - var20) * (var12 - var14) * 6.0D + var14; + } else { + var10 = var14; + } + } + + int var22 = (int)(256.0D * var6); + int var13 = (int)(var8 * 256.0D); + int var23 = (int)(256.0D * var10); + int var15 = var23 + (var13 << 8) + (var22 << 16); + return var15; + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(CI)C", + garbageValue = "2008041614" + ) + public static char method2597(char var0) { + switch(var0) { + case ' ': + case '-': + case '_': + case ' ': + return '_'; + case '#': + case '[': + case ']': + return var0; + case 'À': + case 'Á': + case 'Â': + case 'Ã': + case 'Ä': + case 'à': + case 'á': + case 'â': + case 'ã': + case 'ä': + return 'a'; + case 'Ç': + case 'ç': + return 'c'; + case 'È': + case 'É': + case 'Ê': + case 'Ë': + case 'è': + case 'é': + case 'ê': + case 'ë': + return 'e'; + case 'Í': + case 'Î': + case 'Ï': + case 'í': + case 'î': + case 'ï': + return 'i'; + case 'Ñ': + case 'ñ': + return 'n'; + case 'Ò': + case 'Ó': + case 'Ô': + case 'Õ': + case 'Ö': + case 'ò': + case 'ó': + case 'ô': + case 'õ': + case 'ö': + return 'o'; + case 'Ù': + case 'Ú': + case 'Û': + case 'Ü': + case 'ù': + case 'ú': + case 'û': + case 'ü': + return 'u'; + case 'ß': + return 'b'; + case 'ÿ': + case 'Ÿ': + return 'y'; + default: + return Character.toLowerCase(var0); + } + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "(I)Z", + garbageValue = "2087967382" + ) + static final boolean method2601() { + return ViewportMouse.ViewportMouse_isInViewport; + } } diff --git a/runescape-client/src/main/java/DefaultsGroup.java b/runescape-client/src/main/java/DefaultsGroup.java index 5e58fef6c4..ec35ba15ee 100644 --- a/runescape-client/src/main/java/DefaultsGroup.java +++ b/runescape-client/src/main/java/DefaultsGroup.java @@ -1,168 +1,52 @@ -import java.io.File; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kz") +@ObfuscatedName("kn") @Implements("DefaultsGroup") public class DefaultsGroup { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lkz;" + signature = "Lkn;" ) - static final DefaultsGroup field3796; - @ObfuscatedName("w") - @Export("JagexCache_locationFile") - static File JagexCache_locationFile; - @ObfuscatedName("i") + static final DefaultsGroup field3793; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 154892097 + intValue = 1864717017 ) @Export("group") final int group; static { - field3796 = new DefaultsGroup(3); + field3793 = new DefaultsGroup(3); } DefaultsGroup(int var1) { this.group = var1; } - @ObfuscatedName("ii") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Liw;IIII)V", - garbageValue = "-2125986282" + signature = "(I)Lbg;", + garbageValue = "310437659" ) - @Export("addNpcToMenu") - static final void addNpcToMenu(NPCDefinition var0, int var1, int var2, int var3) { - if (Client.menuOptionsCount < 400) { - if (var0.transforms != null) { - var0 = var0.transform(); - } + @Export("getNextWorldListWorld") + static World getNextWorldListWorld() { + return World.World_listCount < World.World_count ? class96.World_worlds[++World.World_listCount - 1] : null; + } - if (var0 != null) { - if (var0.isInteractable) { - if (!var0.isFollower || Client.followerIndex == var1) { - String var4 = var0.name; - int var7; - int var8; - if (var0.combatLevel != 0) { - var7 = var0.combatLevel; - var8 = Message.localPlayer.combatLevel; - int var9 = var8 - var7; - String var6; - if (var9 < -9) { - var6 = NPC.colorStartTag(16711680); - } else if (var9 < -6) { - var6 = NPC.colorStartTag(16723968); - } else if (var9 < -3) { - var6 = NPC.colorStartTag(16740352); - } else if (var9 < 0) { - var6 = NPC.colorStartTag(16756736); - } else if (var9 > 9) { - var6 = NPC.colorStartTag(65280); - } else if (var9 > 6) { - var6 = NPC.colorStartTag(4259584); - } else if (var9 > 3) { - var6 = NPC.colorStartTag(8453888); - } else if (var9 > 0) { - var6 = NPC.colorStartTag(12648192); - } else { - var6 = NPC.colorStartTag(16776960); - } - - var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")"; - } - - if (var0.isFollower && Client.followerOpsLowPriority) { - class1.insertMenuItemNoShift("Examine", NPC.colorStartTag(16776960) + var4, 1003, var1, var2, var3); - } - - if (Client.isItemSelected == 1) { - class1.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + NPC.colorStartTag(16776960) + var4, 7, var1, var2, var3); - } else if (Client.isSpellSelected) { - if ((ReflectionCheck.selectedSpellFlags & 2) == 2) { - class1.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + NPC.colorStartTag(16776960) + var4, 8, var1, var2, var3); - } - } else { - int var10 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0; - String[] var11 = var0.actions; - if (var11 != null) { - for (var7 = 4; var7 >= 0; --var7) { - if (var11[var7] != null && !var11[var7].equalsIgnoreCase("Attack")) { - var8 = 0; - if (var7 == 0) { - var8 = var10 + 9; - } - - if (var7 == 1) { - var8 = var10 + 10; - } - - if (var7 == 2) { - var8 = var10 + 11; - } - - if (var7 == 3) { - var8 = var10 + 12; - } - - if (var7 == 4) { - var8 = var10 + 13; - } - - class1.insertMenuItemNoShift(var11[var7], NPC.colorStartTag(16776960) + var4, var8, var1, var2, var3); - } - } - } - - if (var11 != null) { - for (var7 = 4; var7 >= 0; --var7) { - if (var11[var7] != null && var11[var7].equalsIgnoreCase("Attack")) { - short var12 = 0; - if (Client.npcAttackOption != AttackOption.AttackOption_hidden) { - if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || AttackOption.AttackOption_dependsOnCombatLevels == Client.npcAttackOption && var0.combatLevel > Message.localPlayer.combatLevel) { - var12 = 2000; - } - - var8 = 0; - if (var7 == 0) { - var8 = var12 + 9; - } - - if (var7 == 1) { - var8 = var12 + 10; - } - - if (var7 == 2) { - var8 = var12 + 11; - } - - if (var7 == 3) { - var8 = var12 + 12; - } - - if (var7 == 4) { - var8 = var12 + 13; - } - - class1.insertMenuItemNoShift(var11[var7], NPC.colorStartTag(16776960) + var4, var8, var1, var2, var3); - } - } - } - } - - if (!var0.isFollower || !Client.followerOpsLowPriority) { - class1.insertMenuItemNoShift("Examine", NPC.colorStartTag(16776960) + var4, 1003, var1, var2, var3); - } - } - - } - } - } + @ObfuscatedName("kz") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-245092845" + ) + static final void method5953() { + for (int var0 = 0; var0 < Players.Players_count; ++var0) { + Player var1 = Client.players[Players.Players_indices[var0]]; + var1.clearIsInClanChat(); } + } } diff --git a/runescape-client/src/main/java/DemotingHashTable.java b/runescape-client/src/main/java/DemotingHashTable.java index c020d9fdb0..3520243c24 100644 --- a/runescape-client/src/main/java/DemotingHashTable.java +++ b/runescape-client/src/main/java/DemotingHashTable.java @@ -3,32 +3,32 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fe") +@ObfuscatedName("ek") @Implements("DemotingHashTable") public final class DemotingHashTable { - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("capacity") int capacity; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("remaining") int remaining; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Llc;" + signature = "Llp;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lji;" + signature = "Ljb;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lem;" + signature = "Lev;" ) - class155 field1978; + class146 field1953; public DemotingHashTable(int var1, int var2) { this.queue = new IterableDualNodeQueue(); @@ -42,7 +42,7 @@ public final class DemotingHashTable { this.hashTable = new IterableNodeHashTable(var3); } - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("get") public Object get(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); @@ -73,16 +73,16 @@ public final class DemotingHashTable { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("remove") void remove(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); this.removeWrapper(var3); } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lff;)V" + signature = "(Lef;)V" ) @Export("removeWrapper") void removeWrapper(Wrapper var1) { @@ -94,7 +94,7 @@ public final class DemotingHashTable { } - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("put") public void put(Object var1, long var2, int var4) { if (var4 > this.capacity) { @@ -113,8 +113,8 @@ public final class DemotingHashTable { } this.removeWrapper(var5); - if (this.field1978 != null) { - this.field1978.method3386(var5.get()); + if (this.field1953 != null) { + this.field1953.method3397(var5.get()); } } @@ -125,7 +125,7 @@ public final class DemotingHashTable { } } - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("demote") public void demote(int var1) { for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) { @@ -146,7 +146,7 @@ public final class DemotingHashTable { } - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("clear") public void clear() { this.queue.clear(); diff --git a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java index ac30bf1177..0ab553e29d 100644 --- a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java +++ b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java @@ -1,44 +1,41 @@ -import java.io.DataInputStream; -import java.net.URL; -import java.util.Random; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lb") +@ObfuscatedName("la") @Implements("DesktopPlatformInfoProvider") public class DesktopPlatformInfoProvider implements PlatformInfoProvider { - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 2108856267 + intValue = -2006912315 ) - int field3897; - @ObfuscatedName("p") + int field3900; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -526176171 + intValue = 713316533 ) - int field3896; - @ObfuscatedName("b") + int field3901; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1221750841 + intValue = 2074317301 ) - int field3899; + int field3902; - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)Llx;", - garbageValue = "-83" + signature = "(I)Llv;", + garbageValue = "-1317089795" ) @Export("get") public PlatformInfo get() { byte var1; - if (class81.field1129.startsWith("win")) { + if (class160.field1998.startsWith("win")) { var1 = 1; - } else if (class81.field1129.startsWith("mac")) { + } else if (class160.field1998.startsWith("mac")) { var1 = 2; - } else if (class81.field1129.startsWith("linux")) { + } else if (class160.field1998.startsWith("linux")) { var1 = 3; } else { var1 = 4; @@ -136,11 +133,10 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { var8 = 4; } - this.method6317(var5); - Runtime.getRuntime(); - int var10 = (int)((long)((new Random()).nextInt(31457280) + 230686720) / 1048576L) + 1; + this.method6331(var5); + int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1; int var11; - if (this.field3897 > 3) { + if (this.field3900 > 3) { var11 = Runtime.getRuntime().availableProcessors(); } else { var11 = 0; @@ -154,98 +150,55 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { String var17 = ""; String var18 = ""; int[] var23 = new int[3]; - return new PlatformInfo(var1, var24, var7, var8, this.field3897, this.field3896, this.field3899, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); + return new PlatformInfo(var1, var24, var7, var8, this.field3900, this.field3901, this.field3902, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); } - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "-1" - ) - void method6317(String var1) { - if (var1.startsWith("1.")) { - this.method6316(var1); - } else { - this.method6324(var1); - } - - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "50" - ) - void method6316(String var1) { - String[] var2 = var1.split("\\."); - - try { - this.field3897 = Integer.parseInt(var2[1]); - var2 = var2[2].split("_"); - this.field3896 = Integer.parseInt(var2[0]); - this.field3899 = Integer.parseInt(var2[1]); - } catch (Exception var4) { - } - - } - - @ObfuscatedName("w") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(Ljava/lang/String;I)V", - garbageValue = "1412850976" + garbageValue = "-1120202582" ) - void method6324(String var1) { + void method6331(String var1) { + if (var1.startsWith("1.")) { + this.method6323(var1); + } else { + this.method6322(var1); + } + + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;B)V", + garbageValue = "1" + ) + void method6323(String var1) { String[] var2 = var1.split("\\."); try { - this.field3897 = Integer.parseInt(var2[0]); - this.field3896 = Integer.parseInt(var2[1]); - this.field3899 = Integer.parseInt(var2[2]); + this.field3900 = Integer.parseInt(var2[1]); + var2 = var2[2].split("_"); + this.field3901 = Integer.parseInt(var2[0]); + this.field3902 = Integer.parseInt(var2[1]); } catch (Exception var4) { } } - @ObfuscatedName("f") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/Throwable;B)V", - garbageValue = "0" + signature = "(Ljava/lang/String;B)V", + garbageValue = "-78" ) - @Export("RunException_sendStackTrace") - public static void RunException_sendStackTrace(String var0, Throwable var1) { - if (var1 != null) { - var1.printStackTrace(); - } else { - try { - String var2 = ""; - if (var1 != null) { - var2 = GrandExchangeOfferUnitPriceComparator.method124(var1); - } - - if (var0 != null) { - if (var1 != null) { - var2 = var2 + " | "; - } - - var2 = var2 + var0; - } - - System.out.println("Error: " + var2); - var2 = var2.replace(':', '.'); - var2 = var2.replace('@', '_'); - var2 = var2.replace('&', '_'); - var2 = var2.replace('#', '_'); - if (RunException.RunException_applet == null) { - return; - } - - URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + RunException.clientType + "&e=" + var2); - DataInputStream var4 = new DataInputStream(var3.openStream()); - var4.read(); - var4.close(); - } catch (Exception var5) { - } + void method6322(String var1) { + String[] var2 = var1.split("\\."); + try { + this.field3900 = Integer.parseInt(var2[0]); + this.field3901 = Integer.parseInt(var2[1]); + this.field3902 = Integer.parseInt(var2[2]); + } catch (Exception var4) { } + } } diff --git a/runescape-client/src/main/java/DevicePcmPlayer.java b/runescape-client/src/main/java/DevicePcmPlayer.java index dcd4eb1982..d86f1c68f2 100644 --- a/runescape-client/src/main/java/DevicePcmPlayer.java +++ b/runescape-client/src/main/java/DevicePcmPlayer.java @@ -9,62 +9,61 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ai") +@ObfuscatedName("ap") @Implements("DevicePcmPlayer") public class DevicePcmPlayer extends PcmPlayer { - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("format") AudioFormat format; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("line") SourceDataLine line; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 828002731 + intValue = -1117759731 ) @Export("capacity2") int capacity2; - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("byteSamples") byte[] byteSamples; DevicePcmPlayer() { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "15" + garbageValue = "-111" ) @Export("init") protected void init() { - this.format = new AudioFormat((float)(DirectByteArrayCopier.field2490 * -168449264), 16, SoundCache.PcmPlayer_stereo ? 2 : 1, true, false); - this.byteSamples = new byte[256 << (SoundCache.PcmPlayer_stereo ? 2 : 1)]; + this.format = new AudioFormat((float)PcmPlayer.field1398, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false); + this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "797185937" + garbageValue = "-871749312" ) @Export("open") protected void open(int var1) throws LineUnavailableException { try { - Info var2 = new Info(SourceDataLine.class, this.format, var1 << (SoundCache.PcmPlayer_stereo ? 2 : 1)); + Info var2 = new Info(SourceDataLine.class, this.format, var1 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); this.line = (SourceDataLine)AudioSystem.getLine(var2); this.line.open(); this.line.start(); this.capacity2 = var1; } catch (LineUnavailableException var5) { - if (ScriptFrame.method1109(var1) != 1) { - int var4 = var1 - 1; - var4 |= var4 >>> 1; - var4 |= var4 >>> 2; - var4 |= var4 >>> 4; - var4 |= var4 >>> 8; - var4 |= var4 >>> 16; - int var3 = var4 + 1; - this.open(var3); + int var4 = (var1 >>> 1 & 1431655765) + (var1 & 1431655765); + var4 = (var4 >>> 2 & 858993459) + (var4 & 858993459); + var4 = (var4 >>> 4) + var4 & 252645135; + var4 += var4 >>> 8; + var4 += var4 >>> 16; + int var3 = var4 & 255; + if (var3 != 1) { + this.open(DynamicObject.method2293(var1)); } else { this.line = null; throw var5; @@ -72,21 +71,21 @@ public class DevicePcmPlayer extends PcmPlayer { } } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "2013132005" + garbageValue = "-164846701" ) @Export("position") protected int position() { - return this.capacity2 - (this.line.available() >> (SoundCache.PcmPlayer_stereo ? 2 : 1)); + return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); } - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("write") protected void write() { int var1 = 256; - if (SoundCache.PcmPlayer_stereo) { + if (PcmPlayer.PcmPlayer_stereo) { var1 <<= 1; } @@ -103,10 +102,10 @@ public class DevicePcmPlayer extends PcmPlayer { this.line.write(this.byteSamples, 0, var1 << 1); } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "390" + signature = "(I)V", + garbageValue = "1942741652" ) @Export("close") protected void close() { @@ -117,10 +116,10 @@ public class DevicePcmPlayer extends PcmPlayer { } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1127195595" + garbageValue = "2088617942" ) @Export("discard") protected void discard() { diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index d71035f8fc..77cde643f6 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -2,226 +2,41 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ax") +@ObfuscatedName("an") @Implements("DevicePcmPlayerProvider") -public class DevicePcmPlayerProvider implements class97 { - @ObfuscatedName("aq") - static String field391; +public class DevicePcmPlayerProvider implements class99 { + @ObfuscatedName("av") + @ObfuscatedSignature( + signature = "Llc;" + ) + @Export("rasterProvider") + public static AbstractRasterProvider rasterProvider; DevicePcmPlayerProvider() { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)Lcw;", - garbageValue = "479224621" + signature = "(I)Ldw;", + garbageValue = "-1842325799" ) @Export("player") public PcmPlayer player() { return new DevicePcmPlayer(); } - @ObfuscatedName("f") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lhz;Lhz;ZII)V", - garbageValue = "808644232" + signature = "(I)V", + garbageValue = "-1589308129" ) - static void method841(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { - if (Login.field1173) { - if (var3 == 4) { - Login.loginIndex = 4; - } - - } else { - Login.loginIndex = var3; - Rasterizer2D.Rasterizer2D_clear(); - byte[] var4 = var0.takeFileByNames("title.jpg", ""); - UrlRequest.leftTitleSprite = GrandExchangeOfferTotalQuantityComparator.convertJpgToSprite(var4); - ScriptFrame.rightTitleSprite = UrlRequest.leftTitleSprite.mirrorHorizontally(); - if ((Client.worldProperties & 536870912) != 0) { - Login.logoSprite = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); - } else if ((Client.worldProperties & 1073741824) != 0) { - Login.logoSprite = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); - } else { - Login.logoSprite = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); - } - - Login.titleboxSprite = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); - Login.titlebuttonSprite = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); - Login.runesSprite = class195.method3667(var1, "runes", ""); - class30.title_muteSprite = class195.method3667(var1, "title_mute", ""); - class218.options_buttons_0Sprite = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); - GrandExchangeOffer.field64 = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); - Login.options_buttons_2Sprite = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); - Login.field1162 = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); - IgnoreList.field3579 = class218.options_buttons_0Sprite.subWidth; - MenuAction.field1133 = class218.options_buttons_0Sprite.subHeight; - StructDefinition.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite); - if (var2) { - Login.Login_username = ""; - Login.Login_password = ""; - } - - class266.field3517 = 0; - class80.otp = ""; - Login.field1178 = true; - Login.worldSelectOpen = false; - if (!Interpreter.clientPreferences.titleMusicDisabled) { - WorldMapCacheName.method616(2, GrandExchangeOfferWorldComparator.archive6, "scape main", "", 255, false); - } else { - BoundaryObject.method3273(2); - } - - BuddyRankComparator.method3362(false); - Login.field1173 = true; - Login.xPadding = (GrandExchangeOfferTotalQuantityComparator.canvasWidth - 765) / 2; - Login.loginBoxX = Login.xPadding + 202; - Script.loginBoxCenter = Login.loginBoxX + 180; - UrlRequest.leftTitleSprite.drawAt(Login.xPadding, 0); - ScriptFrame.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); - } - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(Lhz;Lhz;Lhz;Lhz;B)V", - garbageValue = "0" - ) - public static void method842(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) { - FriendLoginUpdate.Widget_archive = var0; - Widget.Widget_modelsArchive = var1; - BoundaryObject.Widget_spritesArchive = var2; - MilliClock.Widget_fontsArchive = var3; - UserComparator7.Widget_interfaceComponents = new Widget[FriendLoginUpdate.Widget_archive.getGroupCount()][]; - Widget.Widget_loadedInterfaces = new boolean[FriendLoginUpdate.Widget_archive.getGroupCount()]; - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - signature = "(ILcu;ZI)I", - garbageValue = "1220009444" - ) - static int method840(int var0, Script var1, boolean var2) { - int var3; - int var4; - int var6; - if (var0 == ScriptOpcodes.ENUM_STRING) { - class188.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - EnumDefinition var5 = World.getEnum(var3); - if (var5.outputType != 's') { - } - - for (var6 = 0; var6 < var5.outputCount; ++var6) { - if (var4 == var5.keys[var6]) { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var5.strVals[var6]; - var5 = null; - break; - } - } - - if (var5 != null) { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var5.defaultStr; - } - - return 1; - } else if (var0 != ScriptOpcodes.ENUM) { - if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - EnumDefinition var10 = World.getEnum(var3); - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var10.size(); - return 1; - } else { - return 2; - } - } else { - class188.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - int var9 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 3]; - EnumDefinition var7 = World.getEnum(var9); - if (var3 == var7.inputType && var4 == var7.outputType) { - for (int var8 = 0; var8 < var7.outputCount; ++var8) { - if (var6 == var7.keys[var8]) { - if (var4 == 115) { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var7.strVals[var8]; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var7.intVals[var8]; - } - - var7 = null; - break; - } - } - - if (var7 != null) { - if (var4 == 115) { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var7.defaultStr; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var7.defaultInt; - } - } - - return 1; - } else { - if (var4 == 115) { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = "null"; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - } - - return 1; + public static void method855() { + if (KeyHandler.KeyHandler_instance != null) { + synchronized(KeyHandler.KeyHandler_instance) { + KeyHandler.KeyHandler_instance = null; } } - } - @ObfuscatedName("iv") - @ObfuscatedSignature( - signature = "(IIIIIIB)V", - garbageValue = "89" - ) - static final void method839(int var0, int var1, int var2, int var3, int var4, int var5) { - int var6 = var2 - var0; - int var7 = var3 - var1; - int var8 = var6 >= 0 ? var6 : -var6; - int var9 = var7 >= 0 ? var7 : -var7; - int var10 = var8; - if (var8 < var9) { - var10 = var9; - } - - if (var10 != 0) { - int var11 = (var6 << 16) / var10; - int var12 = (var7 << 16) / var10; - if (var12 <= var11) { - var11 = -var11; - } else { - var12 = -var12; - } - - int var13 = var5 * var12 >> 17; - int var14 = var5 * var12 + 1 >> 17; - int var15 = var5 * var11 >> 17; - int var16 = var5 * var11 + 1 >> 17; - var0 -= Rasterizer2D.Rasterizer2D_xClipStart; - var1 -= Rasterizer2D.Rasterizer2D_yClipStart; - int var17 = var0 + var13; - int var18 = var0 - var14; - int var19 = var0 + var6 - var14; - int var20 = var0 + var13 + var6; - int var21 = var15 + var1; - int var22 = var1 - var16; - int var23 = var7 + var1 - var16; - int var24 = var7 + var15 + var1; - Rasterizer3D.method3078(var17, var18, var19); - Rasterizer3D.method3008(var21, var22, var23, var17, var18, var19, var4); - Rasterizer3D.method3078(var17, var19, var20); - Rasterizer3D.method3008(var21, var23, var24, var17, var19, var20, var4); - } } } diff --git a/runescape-client/src/main/java/DirectByteArrayCopier.java b/runescape-client/src/main/java/DirectByteArrayCopier.java index 5e92d572a9..9e8b6f9d10 100644 --- a/runescape-client/src/main/java/DirectByteArrayCopier.java +++ b/runescape-client/src/main/java/DirectByteArrayCopier.java @@ -1,26 +1,26 @@ import java.nio.ByteBuffer; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("he") +@ObfuscatedName("gc") @Implements("DirectByteArrayCopier") public class DirectByteArrayCopier extends AbstractByteArrayCopier { - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 1433331089 + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "Lli;" ) - public static int field2490; - @ObfuscatedName("f") + @Export("options_buttons_2Sprite") + static IndexedSprite options_buttons_2Sprite; + @ObfuscatedName("c") @Export("directBuffer") ByteBuffer directBuffer; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)[B", - garbageValue = "-112018699" + garbageValue = "-571467457" ) @Export("get") public byte[] get() { @@ -30,10 +30,10 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { return var1; } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "([BB)V", - garbageValue = "33" + signature = "([BI)V", + garbageValue = "1471312739" ) @Export("set") public void set(byte[] var1) { @@ -42,12 +42,60 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { this.directBuffer.put(var1); } - @ObfuscatedName("f") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lhz;B)V", - garbageValue = "7" + signature = "(IIB)V", + garbageValue = "19" ) - public static void method3940(AbstractArchive var0) { - class286.EnumDefinition_archive = var0; + public static void method4006(int var0, int var1) { + VarbitDefinition var3 = (VarbitDefinition)VarbitDefinition.VarbitDefinition_cached.get((long)var0); + VarbitDefinition var2; + if (var3 != null) { + var2 = var3; + } else { + byte[] var8 = class287.VarbitDefinition_archive.takeFile(14, var0); + var3 = new VarbitDefinition(); + if (var8 != null) { + var3.decode(new Buffer(var8)); + } + + VarbitDefinition.VarbitDefinition_cached.put(var3, (long)var0); + var2 = var3; + } + + int var4 = var2.baseVar; + int var5 = var2.startBit; + int var6 = var2.endBit; + int var7 = Varps.Varps_masks[var6 - var5]; + if (var1 < 0 || var1 > var7) { + var1 = 0; + } + + var7 <<= var5; + Varps.Varps_main[var4] = Varps.Varps_main[var4] & ~var7 | var1 << var5 & var7; + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "(CI)Z", + garbageValue = "-186978734" + ) + static boolean method4004(char var0) { + for (int var1 = 0; var1 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var1) { + if (var0 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var1)) { + return true; + } + } + + return false; + } + + @ObfuscatedName("bf") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)I", + garbageValue = "-470893406" + ) + public static int method4012(String var0) { + return var0.length() + 2; } } diff --git a/runescape-client/src/main/java/DirectWrapper.java b/runescape-client/src/main/java/DirectWrapper.java index aebbb7fb58..eb1c9f8fe4 100644 --- a/runescape-client/src/main/java/DirectWrapper.java +++ b/runescape-client/src/main/java/DirectWrapper.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("fd") +@ObfuscatedName("eb") @Implements("DirectWrapper") public class DirectWrapper extends Wrapper { - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("obj") Object obj; @@ -14,13 +14,13 @@ public class DirectWrapper extends Wrapper { this.obj = var1; } - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("get") Object get() { return this.obj; } - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("isSoft") boolean isSoft() { return false; diff --git a/runescape-client/src/main/java/DualNode.java b/runescape-client/src/main/java/DualNode.java index 21454bbd81..db824a2ce3 100644 --- a/runescape-client/src/main/java/DualNode.java +++ b/runescape-client/src/main/java/DualNode.java @@ -3,26 +3,26 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gw") +@ObfuscatedName("fa") @Implements("DualNode") public class DualNode extends Node { - @ObfuscatedName("cu") + @ObfuscatedName("ce") @Export("keyDual") public long keyDual; - @ObfuscatedName("cg") + @ObfuscatedName("cw") @ObfuscatedSignature( - signature = "Lgw;" + signature = "Lfa;" ) @Export("previousDual") public DualNode previousDual; - @ObfuscatedName("ct") + @ObfuscatedName("cq") @ObfuscatedSignature( - signature = "Lgw;" + signature = "Lfa;" ) @Export("nextDual") public DualNode nextDual; - @ObfuscatedName("cz") + @ObfuscatedName("ca") @Export("removeDual") public void removeDual() { if (this.nextDual != null) { diff --git a/runescape-client/src/main/java/DualNodeDeque.java b/runescape-client/src/main/java/DualNodeDeque.java index 2dc0f382fd..b504bd0901 100644 --- a/runescape-client/src/main/java/DualNodeDeque.java +++ b/runescape-client/src/main/java/DualNodeDeque.java @@ -3,12 +3,12 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("in") +@ObfuscatedName("jq") @Implements("DualNodeDeque") public final class DualNodeDeque { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lgw;" + signature = "Lfa;" ) @Export("sentinel") DualNode sentinel; @@ -19,9 +19,9 @@ public final class DualNodeDeque { this.sentinel.nextDual = this.sentinel; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lgw;)V" + signature = "(Lfa;)V" ) @Export("addFirst") public void addFirst(DualNode var1) { @@ -35,9 +35,9 @@ public final class DualNodeDeque { var1.previousDual.nextDual = var1; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lgw;)V" + signature = "(Lfa;)V" ) @Export("addLast") public void addLast(DualNode var1) { @@ -51,9 +51,9 @@ public final class DualNodeDeque { var1.previousDual.nextDual = var1; } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "()Lgw;" + signature = "()Lfa;" ) @Export("removeLast") public DualNode removeLast() { diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index 5b1f30a65e..ca909e30c7 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -4,66 +4,72 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cg") +@ObfuscatedName("cw") @Implements("DynamicObject") public class DynamicObject extends Entity { - @ObfuscatedName("f") + @ObfuscatedName("bw") + @ObfuscatedSignature( + signature = "[Lli;" + ) + @Export("worldSelectStars") + static IndexedSprite[] worldSelectStars; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -95317183 + intValue = 1669181917 ) @Export("id") int id; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1520992013 + intValue = -433017079 ) @Export("type") int type; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1128540715 + intValue = -857154587 ) @Export("orientation") int orientation; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1824445575 + intValue = 1092550967 ) @Export("plane") int plane; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1187953645 + intValue = -660680399 ) @Export("x") int x; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -589129473 + intValue = 74739559 ) @Export("y") int y; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Liv;" + signature = "Lip;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1848001731 + intValue = -1110728841 ) @Export("frame") int frame; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 22641631 + intValue = -1571006873 ) @Export("cycleStart") int cycleStart; @ObfuscatedSignature( - signature = "(IIIIIIIZLep;)V" + signature = "(IIIIIIIZLeq;)V" ) DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Entity var9) { this.id = var1; @@ -73,10 +79,10 @@ public class DynamicObject extends Entity { this.x = var5; this.y = var6; if (var7 != -1) { - this.sequenceDefinition = WorldMapSection0.SequenceDefinition_get(var7); + this.sequenceDefinition = GraphicsDefaults.SequenceDefinition_get(var7); this.frame = 0; this.cycleStart = Client.cycle - 1; - if (this.sequenceDefinition.field3495 == 0 && var9 != null && var9 instanceof DynamicObject) { + if (this.sequenceDefinition.field3516 == 0 && var9 != null && var9 instanceof DynamicObject) { DynamicObject var10 = (DynamicObject)var9; if (this.sequenceDefinition == var10.sequenceDefinition) { this.frame = var10.frame; @@ -93,10 +99,10 @@ public class DynamicObject extends Entity { } - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)Ldw;", - garbageValue = "822221372" + signature = "(I)Ldx;", + garbageValue = "-2133076860" ) @Export("getModel") protected final Model getModel() { @@ -106,11 +112,11 @@ public class DynamicObject extends Entity { var1 = 100; } - label56: { + label57: { do { do { if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) { - break label56; + break label57; } var1 -= this.sequenceDefinition.frameLengths[this.frame]; @@ -126,7 +132,7 @@ public class DynamicObject extends Entity { this.cycleStart = Client.cycle - var1; } - ObjectDefinition var12 = Coord.getObjectDefinition(this.id); + ObjectDefinition var12 = Occluder.getObjectDefinition(this.id); if (var12.transforms != null) { var12 = var12.transform(); } @@ -149,76 +155,74 @@ public class DynamicObject extends Entity { int var6 = (var3 >> 1) + this.y; int var7 = (var3 + 1 >> 1) + this.y; int[][] var8 = Tiles.Tiles_heights[this.plane]; - int var9 = var8[var4][var7] + var8[var4][var6] + var8[var5][var6] + var8[var5][var7] >> 2; + int var9 = var8[var4][var6] + var8[var5][var6] + var8[var4][var7] + var8[var5][var7] >> 2; int var10 = (this.x << 7) + (var2 << 6); int var11 = (this.y << 7) + (var3 << 6); return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame); } } - @ObfuscatedName("f") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "([Lgz;II)Lgz;", - garbageValue = "2071189465" + signature = "(IB)I", + garbageValue = "2" ) - @Export("findEnumerated") - public static Enumerated findEnumerated(Enumerated[] var0, int var1) { - Enumerated[] var2 = var0; - - for (int var3 = 0; var3 < var2.length; ++var3) { - Enumerated var4 = var2[var3]; - if (var1 == var4.rsOrdinal()) { - return var4; - } - } - - return null; + public static int method2293(int var0) { + --var0; + var0 |= var0 >>> 1; + var0 |= var0 >>> 2; + var0 |= var0 >>> 4; + var0 |= var0 >>> 8; + var0 |= var0 >>> 16; + return var0 + 1; } - @ObfuscatedName("jr") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "([Lha;II)V", - garbageValue = "-794395559" + signature = "(Lkp;J)V" ) - @Export("runComponentCloseListeners") - static final void runComponentCloseListeners(Widget[] var0, int var1) { - for (int var2 = 0; var2 < var0.length; ++var2) { - Widget var3 = var0[var2]; - if (var3 != null) { - if (var3.type == 0) { - if (var3.children != null) { - runComponentCloseListeners(var3.children, var1); - } - - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); - if (var4 != null) { - ItemContainer.runIntfCloseListeners(var4.group, var1); - } - } - - ScriptEvent var5; - if (var1 == 0 && var3.onDialogAbort != null) { - var5 = new ScriptEvent(); - var5.widget = var3; - var5.args = var3.onDialogAbort; - Client.runScriptEvent(var5); - } - - if (var1 == 1 && var3.onSubChange != null) { - if (var3.childIndex >= 0) { - Widget var6 = Tile.getWidget(var3.id); - if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { - continue; - } - } - - var5 = new ScriptEvent(); - var5.widget = var3; - var5.args = var3.onSubChange; - Client.runScriptEvent(var5); - } - } + static void method2291(Buffer var0, long var1) { + var1 /= 10L; + if (var1 < 0L) { + var1 = 0L; + } else if (var1 > 65535L) { + var1 = 65535L; } + var0.writeShort((int)var1); + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1735804307" + ) + public static void method2292() { + Huffman.SpriteBuffer_xOffsets = null; + NPC.SpriteBuffer_yOffsets = null; + class326.SpriteBuffer_spriteWidths = null; + class326.SpriteBuffer_spriteHeights = null; + class326.SpriteBuffer_spritePalette = null; + class326.SpriteBuffer_pixels = null; + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + signature = "(IIB)I", + garbageValue = "-75" + ) + static final int method2286(int var0, int var1) { + if (var0 == -1) { + return 12345678; + } else { + var1 = (var0 & 127) * var1 / 128; + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; + } + + return (var0 & 65408) + var1; + } } } diff --git a/runescape-client/src/main/java/Entity.java b/runescape-client/src/main/java/Entity.java index 5b4d820135..1f4e10d2dc 100644 --- a/runescape-client/src/main/java/Entity.java +++ b/runescape-client/src/main/java/Entity.java @@ -4,12 +4,23 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ep") +@ObfuscatedName("eq") @Implements("Entity") public abstract class Entity extends DualNode { - @ObfuscatedName("ce") + @ObfuscatedName("nj") + @ObfuscatedSignature( + signature = "[Lhn;" + ) + static Widget[] field1866; + @ObfuscatedName("gj") + @ObfuscatedSignature( + signature = "Llt;" + ) + @Export("compass") + static Sprite compass; + @ObfuscatedName("cy") @ObfuscatedGetter( - intValue = -294742571 + intValue = -384609857 ) @Export("height") public int height; @@ -18,17 +29,17 @@ public abstract class Entity extends DualNode { this.height = 1000; } - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)Ldw;", - garbageValue = "822221372" + signature = "(I)Ldx;", + garbageValue = "-2133076860" ) @Export("getModel") protected Model getModel() { return null; } - @ObfuscatedName("ch") + @ObfuscatedName("cn") @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { Model var11 = this.getModel(); @@ -38,4 +49,22 @@ public abstract class Entity extends DualNode { } } + + @ObfuscatedName("fr") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-553494705" + ) + static final void method3332() { + int var0 = Players.Players_count; + int[] var1 = Players.Players_indices; + + for (int var2 = 0; var2 < var0; ++var2) { + Player var3 = Client.players[var1[var2]]; + if (var3 != null) { + ScriptFrame.updateActorSequence(var3, 1); + } + } + + } } diff --git a/runescape-client/src/main/java/EnumDefinition.java b/runescape-client/src/main/java/EnumDefinition.java index 59dc8f5856..3a5c85d35f 100644 --- a/runescape-client/src/main/java/EnumDefinition.java +++ b/runescape-client/src/main/java/EnumDefinition.java @@ -4,43 +4,43 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ik") +@ObfuscatedName("iw") @Implements("EnumDefinition") public class EnumDefinition extends DualNode { - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("EnumDefinition_cached") static EvictingDualNodeHashTable EnumDefinition_cached; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("inputType") public char inputType; - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("outputType") public char outputType; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1935496033 + intValue = 763609869 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 2015380105 + intValue = 1620263743 ) @Export("outputCount") public int outputCount; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("keys") public int[] keys; - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("intVals") public int[] intVals; - @ObfuscatedName("d") + @ObfuscatedName("m") @Export("strVals") public String[] strVals; @@ -53,10 +53,10 @@ public class EnumDefinition extends DualNode { this.outputCount = 0; } - @ObfuscatedName("y") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lkq;I)V", - garbageValue = "-1351538350" + signature = "(Lkp;I)V", + garbageValue = "-1295672156" ) @Export("decode") void decode(Buffer var1) { @@ -70,10 +70,10 @@ public class EnumDefinition extends DualNode { } } - @ObfuscatedName("w") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkq;II)V", - garbageValue = "789591005" + signature = "(Lkp;II)V", + garbageValue = "1239403484" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -110,13 +110,61 @@ public class EnumDefinition extends DualNode { } - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1025007031" + garbageValue = "-1222306007" ) @Export("size") public int size() { return this.outputCount; } + + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "(II)Les;", + garbageValue = "-1471944994" + ) + @Export("getFrames") + static Frames getFrames(int var0) { + Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); + if (var1 != null) { + return var1; + } else { + AbstractArchive var3 = Canvas.SequenceDefinition_animationsArchive; + AbstractArchive var4 = SequenceDefinition.SequenceDefinition_skeletonsArchive; + boolean var5 = true; + int[] var6 = var3.getGroupFileIds(var0); + + for (int var7 = 0; var7 < var6.length; ++var7) { + byte[] var8 = var3.getFile(var0, var6[var7]); + if (var8 == null) { + var5 = false; + } else { + int var9 = (var8[0] & 255) << 8 | var8[1] & 255; + byte[] var10 = var4.getFile(var9, 0); + if (var10 == null) { + var5 = false; + } + } + } + + Frames var2; + if (!var5) { + var2 = null; + } else { + try { + var2 = new Frames(var3, var4, var0, false); + } catch (Exception var12) { + var2 = null; + } + } + + if (var2 != null) { + SequenceDefinition.SequenceDefinition_cachedFrames.put(var2, (long)var0); + } + + return var2; + } + } } diff --git a/runescape-client/src/main/java/Enumerated.java b/runescape-client/src/main/java/Enumerated.java index b0f8abe774..9e7073f6f7 100644 --- a/runescape-client/src/main/java/Enumerated.java +++ b/runescape-client/src/main/java/Enumerated.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gz") +@ObfuscatedName("gq") @Implements("Enumerated") public interface Enumerated { - @ObfuscatedName("i") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "-57" + garbageValue = "1" ) @Export("rsOrdinal") int rsOrdinal(); diff --git a/runescape-client/src/main/java/EvictingDualNodeHashTable.java b/runescape-client/src/main/java/EvictingDualNodeHashTable.java index 530b7598d1..f47552c803 100644 --- a/runescape-client/src/main/java/EvictingDualNodeHashTable.java +++ b/runescape-client/src/main/java/EvictingDualNodeHashTable.java @@ -3,35 +3,35 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eb") +@ObfuscatedName("eh") @Implements("EvictingDualNodeHashTable") public final class EvictingDualNodeHashTable { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lgw;" + signature = "Lfa;" ) - DualNode field1974; - @ObfuscatedName("i") + DualNode field1950; + @ObfuscatedName("t") @Export("capacity") int capacity; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("remainingCapacity") int remainingCapacity; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Llc;" + signature = "Llp;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lji;" + signature = "Ljb;" ) @Export("deque") IterableDualNodeQueue deque; public EvictingDualNodeHashTable(int var1) { - this.field1974 = new DualNode(); + this.field1950 = new DualNode(); this.deque = new IterableDualNodeQueue(); this.capacity = var1; this.remainingCapacity = var1; @@ -43,9 +43,9 @@ public final class EvictingDualNodeHashTable { this.hashTable = new IterableNodeHashTable(var2); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(J)Lgw;" + signature = "(J)Lfa;" ) @Export("get") public DualNode get(long var1) { @@ -57,7 +57,7 @@ public final class EvictingDualNodeHashTable { return var3; } - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("remove") public void remove(long var1) { DualNode var3 = (DualNode)this.hashTable.get(var1); @@ -69,9 +69,9 @@ public final class EvictingDualNodeHashTable { } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lgw;J)V" + signature = "(Lfa;J)V" ) @Export("put") public void put(DualNode var1, long var2) { @@ -79,7 +79,7 @@ public final class EvictingDualNodeHashTable { DualNode var4 = this.deque.removeLast(); var4.remove(); var4.removeDual(); - if (var4 == this.field1974) { + if (var4 == this.field1950) { var4 = this.deque.removeLast(); var4.remove(); var4.removeDual(); @@ -92,12 +92,12 @@ public final class EvictingDualNodeHashTable { this.deque.add(var1); } - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("clear") public void clear() { this.deque.clear(); this.hashTable.clear(); - this.field1974 = new DualNode(); + this.field1950 = new DualNode(); this.remainingCapacity = this.capacity; } } diff --git a/runescape-client/src/main/java/FaceNormal.java b/runescape-client/src/main/java/FaceNormal.java index 1882113aab..dd0e371689 100644 --- a/runescape-client/src/main/java/FaceNormal.java +++ b/runescape-client/src/main/java/FaceNormal.java @@ -2,29 +2,96 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("es") +@ObfuscatedName("et") @Implements("FaceNormal") public class FaceNormal { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 2144913037 + intValue = 1677646269 ) @Export("x") int x; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 2071532839 + intValue = 531566341 ) @Export("y") int y; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1947716121 + intValue = 1439819501 ) @Export("z") int z; FaceNormal() { } + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(Lii;Lii;III)Lko;", + garbageValue = "1973799897" + ) + public static Font method3335(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { + if (!class228.method4199(var0, var2, var3)) { + return null; + } else { + byte[] var5 = var1.takeFile(var2, var3); + Font var4; + if (var5 == null) { + var4 = null; + } else { + Font var6 = new Font(var5, Huffman.SpriteBuffer_xOffsets, NPC.SpriteBuffer_yOffsets, class326.SpriteBuffer_spriteWidths, class326.SpriteBuffer_spriteHeights, class326.SpriteBuffer_spritePalette, class326.SpriteBuffer_pixels); + DynamicObject.method2292(); + var4 = var6; + } + + return var4; + } + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(I)Z", + garbageValue = "2042389443" + ) + public static boolean method3334() { + ReflectionCheck var0 = (ReflectionCheck)class96.reflectionChecks.last(); + return var0 != null; + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(Lii;Ljava/lang/String;Ljava/lang/String;I)[Lli;", + garbageValue = "326479912" + ) + public static IndexedSprite[] method3336(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); + int var4 = var0.getFileId(var3, var2); + IndexedSprite[] var5; + if (!class228.method4199(var0, var3, var4)) { + var5 = null; + } else { + IndexedSprite[] var7 = new IndexedSprite[class326.SpriteBuffer_spriteCount]; + + for (int var8 = 0; var8 < class326.SpriteBuffer_spriteCount; ++var8) { + IndexedSprite var9 = var7[var8] = new IndexedSprite(); + var9.width = GZipDecompressor.SpriteBuffer_spriteWidth; + var9.height = class326.SpriteBuffer_spriteHeight; + var9.xOffset = Huffman.SpriteBuffer_xOffsets[var8]; + var9.yOffset = NPC.SpriteBuffer_yOffsets[var8]; + var9.subWidth = class326.SpriteBuffer_spriteWidths[var8]; + var9.subHeight = class326.SpriteBuffer_spriteHeights[var8]; + var9.palette = class326.SpriteBuffer_spritePalette; + var9.pixels = class326.SpriteBuffer_pixels[var8]; + } + + DynamicObject.method2292(); + var5 = var7; + } + + return var5; + } } diff --git a/runescape-client/src/main/java/FileSystem.java b/runescape-client/src/main/java/FileSystem.java index c6af238642..927d0c5c2a 100644 --- a/runescape-client/src/main/java/FileSystem.java +++ b/runescape-client/src/main/java/FileSystem.java @@ -1,20 +1,43 @@ +import java.io.File; import java.util.Hashtable; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("fg") @Implements("FileSystem") public class FileSystem { - @ObfuscatedName("f") + @ObfuscatedName("pk") + @Export("ClanChat_inClanChat") + static boolean ClanChat_inClanChat; + @ObfuscatedName("c") @Export("FileSystem_hasPermissions") static boolean FileSystem_hasPermissions; - @ObfuscatedName("y") + @ObfuscatedName("t") + @Export("FileSystem_cacheDir") + static File FileSystem_cacheDir; + @ObfuscatedName("o") @Export("FileSystem_cacheFiles") static Hashtable FileSystem_cacheFiles; + @ObfuscatedName("h") + @ObfuscatedSignature( + signature = "Lgk;" + ) + @Export("musicTrack") + public static MusicTrack musicTrack; static { FileSystem_hasPermissions = false; FileSystem_cacheFiles = new Hashtable(16); } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(III)Z", + garbageValue = "-1674158829" + ) + static boolean method3572(int var0, int var1) { + return var0 != 4 || var1 < 8; + } } diff --git a/runescape-client/src/main/java/FillMode.java b/runescape-client/src/main/java/FillMode.java index bba6d2cb23..f8342516d3 100644 --- a/runescape-client/src/main/java/FillMode.java +++ b/runescape-client/src/main/java/FillMode.java @@ -4,35 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lg") +@ObfuscatedName("lf") @Implements("FillMode") public enum FillMode implements Enumerated { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Llg;" + signature = "Llf;" ) @Export("SOLID") SOLID(0, 0), - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Llg;" + signature = "Llf;" ) - field3850(1, 1), - @ObfuscatedName("y") + field3858(1, 1), + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Llg;" + signature = "Llf;" ) - field3853(2, 2); + field3854(2, 2); - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1693216809 + intValue = -999027833 ) @Export("value") public final int value; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -19931109 + intValue = 2109460743 ) @Export("id") final int id; @@ -42,22 +42,13 @@ public enum FillMode implements Enumerated { this.id = var4; } - @ObfuscatedName("i") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "-57" + garbageValue = "1" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(Lhz;I)V", - garbageValue = "-1700551628" - ) - public static void method6117(AbstractArchive var0) { - FloorOverlayDefinition.FloorOverlayDefinition_archive = var0; - } } diff --git a/runescape-client/src/main/java/FloorDecoration.java b/runescape-client/src/main/java/FloorDecoration.java index 1e1e06babf..107a70affa 100644 --- a/runescape-client/src/main/java/FloorDecoration.java +++ b/runescape-client/src/main/java/FloorDecoration.java @@ -7,49 +7,99 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("du") @Implements("FloorDecoration") public final class FloorDecoration { - @ObfuscatedName("ds") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lif;" + signature = "Lli;" ) - @Export("archive4") - static Archive archive4; - @ObfuscatedName("f") + @Export("logoSprite") + static IndexedSprite logoSprite; + @ObfuscatedName("ja") + @ObfuscatedSignature( + signature = "Lhn;" + ) + static Widget field1604; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -813492053 + intValue = -340818917 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -508707057 + intValue = 2029727385 ) @Export("x") int x; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1453565009 + intValue = -588436191 ) @Export("y") int y; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lep;" + signature = "Leq;" ) @Export("entity") public Entity entity; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - longValue = 5434856025712210831L + longValue = -1449564120774695343L ) @Export("tag") public long tag; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1187671267 + intValue = -1732648277 ) @Export("flags") int flags; FloorDecoration() { } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(Llp;ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "1267809906" + ) + static String method2914(IterableNodeHashTable var0, int var1, String var2) { + if (var0 == null) { + return var2; + } else { + ObjectNode var3 = (ObjectNode)var0.get((long)var1); + return var3 == null ? var2 : (String)var3.obj; + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(IIIIIIB)I", + garbageValue = "94" + ) + public static int method2913(int var0, int var1, int var2, int var3, int var4, int var5) { + if ((var5 & 1) == 1) { + int var6 = var3; + var3 = var4; + var4 = var6; + } + + var2 &= 3; + if (var2 == 0) { + return var0; + } else if (var2 == 1) { + return var1; + } else { + return var2 == 2 ? 7 - var0 - (var3 - 1) : 7 - var1 - (var4 - 1); + } + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)V", + garbageValue = "-2102248580" + ) + static final void method2912(String var0) { + class60.method1188("Please remove " + var0 + " from your friend list first"); + } } diff --git a/runescape-client/src/main/java/FloorOverlayDefinition.java b/runescape-client/src/main/java/FloorOverlayDefinition.java index d13f9baea4..651915b703 100644 --- a/runescape-client/src/main/java/FloorOverlayDefinition.java +++ b/runescape-client/src/main/java/FloorOverlayDefinition.java @@ -4,75 +4,75 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ib") +@ObfuscatedName("ig") @Implements("FloorOverlayDefinition") public class FloorOverlayDefinition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) @Export("FloorOverlayDefinition_archive") - static AbstractArchive FloorOverlayDefinition_archive; - @ObfuscatedName("i") + public static AbstractArchive FloorOverlayDefinition_archive; + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("FloorOverlayDefinition_cached") static EvictingDualNodeHashTable FloorOverlayDefinition_cached; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 946777937 + intValue = 935951655 ) @Export("primaryRgb") public int primaryRgb; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -554828149 + intValue = 1095526673 ) @Export("texture") public int texture; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("hideUnderlay") public boolean hideUnderlay; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1736494727 + intValue = -1729092423 ) @Export("secondaryRgb") public int secondaryRgb; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 2036887063 + intValue = -29355705 ) @Export("hue") public int hue; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 636469013 + intValue = -1250783645 ) @Export("saturation") public int saturation; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 2078445359 + intValue = -1922537883 ) @Export("lightness") public int lightness; - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -906220363 + intValue = 291644117 ) @Export("secondaryHue") public int secondaryHue; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -484926363 + intValue = 1538627711 ) @Export("secondarySaturation") public int secondarySaturation; - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -234627479 + intValue = 1197825263 ) @Export("secondaryLightness") public int secondaryLightness; @@ -88,10 +88,10 @@ public class FloorOverlayDefinition extends DualNode { this.secondaryRgb = -1; } - @ObfuscatedName("y") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-50" + signature = "(I)V", + garbageValue = "342799854" ) @Export("postDecode") void postDecode() { @@ -105,10 +105,10 @@ public class FloorOverlayDefinition extends DualNode { this.setHsl(this.primaryRgb); } - @ObfuscatedName("w") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkq;IB)V", - garbageValue = "-31" + signature = "(Lkp;IB)V", + garbageValue = "-45" ) @Export("decode") void decode(Buffer var1, int var2) { @@ -122,10 +122,10 @@ public class FloorOverlayDefinition extends DualNode { } } - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Lkq;IIB)V", - garbageValue = "1" + signature = "(Lkp;IIB)V", + garbageValue = "16" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { @@ -142,10 +142,10 @@ public class FloorOverlayDefinition extends DualNode { } - @ObfuscatedName("b") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "49" + signature = "(II)V", + garbageValue = "-1731410531" ) @Export("setHsl") void setHsl(int var1) { @@ -172,10 +172,10 @@ public class FloorOverlayDefinition extends DualNode { double var12 = 0.0D; double var14 = 0.0D; - double var16 = (var8 + var10) / 2.0D; + double var16 = (var10 + var8) / 2.0D; if (var8 != var10) { if (var16 < 0.5D) { - var14 = (var10 - var8) / (var10 + var8); + var14 = (var10 - var8) / (var8 + var10); } if (var16 >= 0.5D) { @@ -185,9 +185,9 @@ public class FloorOverlayDefinition extends DualNode { if (var2 == var10) { var12 = (var4 - var6) / (var10 - var8); } else if (var10 == var4) { - var12 = 2.0D + (var6 - var2) / (var10 - var8); + var12 = (var6 - var2) / (var10 - var8) + 2.0D; } else if (var6 == var10) { - var12 = (var2 - var4) / (var10 - var8) + 4.0D; + var12 = 4.0D + (var2 - var4) / (var10 - var8); } } @@ -209,59 +209,643 @@ public class FloorOverlayDefinition extends DualNode { } - @ObfuscatedName("y") + @ObfuscatedName("iy") @ObfuscatedSignature( - signature = "(CLgs;B)I", - garbageValue = "-103" + signature = "([Lhn;IIIIIIIIB)V", + garbageValue = "40" ) - @Export("lowercaseChar") - static int lowercaseChar(char var0, Language var1) { - int var2 = var0 << 4; - if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { - var0 = Character.toLowerCase(var0); - var2 = (var0 << 4) + 1; - } + @Export("drawInterface") + static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - if (var0 == 241 && var1 == Language.Language_ES) { - var2 = 1762; - } - - return var2; - } - - @ObfuscatedName("ji") - @ObfuscatedSignature( - signature = "([Lha;IIIZB)V", - garbageValue = "48" - ) - @Export("resizeInterface") - static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { - for (int var5 = 0; var5 < var0.length; ++var5) { - Widget var6 = var0[var5]; - if (var6 != null && var6.parentId == var1) { - class32.alignWidgetSize(var6, var2, var3, var4); - class2.alignWidgetPosition(var6, var2, var3); - if (var6.scrollX > var6.scrollWidth - var6.width) { - var6.scrollX = var6.scrollWidth - var6.width; + for (int var9 = 0; var9 < var0.length; ++var9) { + Widget var10 = var0[var9]; + if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { + int var11; + if (var8 == -1) { + Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; + Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; + Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; + Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; + var11 = ++Client.rootWidgetCount - 1; + } else { + var11 = var8; } - if (var6.scrollX < 0) { - var6.scrollX = 0; - } + var10.rootIndex = var11; + var10.cycle = Client.cycle; + if (!var10.isIf3 || !VarcInt.isComponentHidden(var10)) { + if (var10.contentType > 0) { + GrandExchangeEvent.method93(var10); + } - if (var6.scrollY > var6.scrollHeight - var6.height) { - var6.scrollY = var6.scrollHeight - var6.height; - } + int var12 = var10.x + var6; + int var13 = var7 + var10.y; + int var14 = var10.transparencyTop; + int var15; + int var16; + if (var10 == Client.clickedWidget) { + if (var1 != -1412584499 && !var10.isScrollBar) { + Entity.field1866 = var0; + WorldMapIcon_0.field142 = var6; + UserComparator9.field1965 = var7; + continue; + } - if (var6.scrollY < 0) { - var6.scrollY = 0; - } + if (Client.isDraggingWidget && Client.field824) { + var15 = MouseHandler.MouseHandler_x; + var16 = MouseHandler.MouseHandler_y; + var15 -= Client.widgetClickX; + var16 -= Client.widgetClickY; + if (var15 < Client.field919) { + var15 = Client.field919; + } - if (var6.type == 0) { - Messages.revalidateWidgetScroll(var0, var6, var4); + if (var15 + var10.width > Client.field919 + Client.clickedWidgetParent.width) { + var15 = Client.field919 + Client.clickedWidgetParent.width - var10.width; + } + + if (var16 < Client.field826) { + var16 = Client.field826; + } + + if (var16 + var10.height > Client.field826 + Client.clickedWidgetParent.height) { + var16 = Client.field826 + Client.clickedWidgetParent.height - var10.height; + } + + var12 = var15; + var13 = var16; + } + + if (!var10.isScrollBar) { + var14 = 128; + } + } + + int var17; + int var18; + int var20; + int var21; + int var22; + int var30; + if (var10.type == 2) { + var15 = var2; + var16 = var3; + var17 = var4; + var18 = var5; + } else if (var10.type == 9) { + var30 = var12; + var20 = var13; + var21 = var12 + var10.width; + var22 = var13 + var10.height; + if (var21 < var12) { + var30 = var21; + var21 = var12; + } + + if (var22 < var13) { + var20 = var22; + var22 = var13; + } + + ++var21; + ++var22; + var15 = var30 > var2 ? var30 : var2; + var16 = var20 > var3 ? var20 : var3; + var17 = var21 < var4 ? var21 : var4; + var18 = var22 < var5 ? var22 : var5; + } else { + var30 = var12 + var10.width; + var20 = var13 + var10.height; + var15 = var12 > var2 ? var12 : var2; + var16 = var13 > var3 ? var13 : var3; + var17 = var30 < var4 ? var30 : var4; + var18 = var20 < var5 ? var20 : var5; + } + + if (!var10.isIf3 || var15 < var17 && var16 < var18) { + if (var10.contentType != 0) { + if (var10.contentType == 1336) { + if (Client.displayFps) { + var13 += 15; + class13.fontPlain12.drawRightAligned("Fps:" + GameShell.fps, var12 + var10.width, var13, 16776960, -1); + var13 += 15; + Runtime var38 = Runtime.getRuntime(); + var20 = (int)((var38.totalMemory() - var38.freeMemory()) / 1024L); + var21 = 16776960; + if (var20 > 327680 && !Client.isLowDetail) { + var21 = 16711680; + } + + class13.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); + var13 += 15; + } + continue; + } + + if (var10.contentType == 1337) { + Client.viewportX = var12; + Client.viewportY = var13; + WorldMapSection1.drawEntities(var12, var13, var10.width, var10.height); + Client.field851[var10.rootIndex] = true; + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; + } + + if (var10.contentType == 1338) { + WorldMapRegion.drawMinimap(var10, var12, var13, var11); + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; + } + + if (var10.contentType == 1339) { + UserComparator8.drawCompass(var10, var12, var13, var11); + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; + } + + if (var10.contentType == 1400) { + WorldMapIcon_0.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); + } + + if (var10.contentType == 1401) { + WorldMapIcon_0.worldMap.drawOverview(var12, var13, var10.width, var10.height); + } + + if (var10.contentType == 1402) { + WorldMapLabelSize.loginScreenRunesAnimation.draw(var12, Client.cycle); + } + } + + if (var10.type == 0) { + if (!var10.isIf3 && VarcInt.isComponentHidden(var10) && var10 != GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1) { + continue; + } + + if (!var10.isIf3) { + if (var10.scrollY > var10.scrollHeight - var10.height) { + var10.scrollY = var10.scrollHeight - var10.height; + } + + if (var10.scrollY < 0) { + var10.scrollY = 0; + } + } + + drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); + if (var10.children != null) { + drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); + } + + InterfaceParent var19 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); + if (var19 != null) { + ServerPacket.drawWidgets(var19.group, var15, var16, var17, var18, var12, var13, var11); + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); + } + + if (Client.isResizable || Client.field853[var11] || Client.gameDrawingMode > 1) { + if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { + WorldMapRectangle.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); + } + + if (var10.type != 1) { + int var23; + int var24; + int var25; + int var26; + if (var10.type == 2) { + var30 = 0; + + for (var20 = 0; var20 < var10.rawHeight; ++var20) { + for (var21 = 0; var21 < var10.rawWidth; ++var21) { + var22 = var21 * (var10.paddingX + 32) + var12; + var23 = var20 * (var10.paddingY + 32) + var13; + if (var30 < 20) { + var22 += var10.inventoryXOffsets[var30]; + var23 += var10.inventoryYOffsets[var30]; + } + + if (var10.itemIds[var30] <= 0) { + if (var10.inventorySprites != null && var30 < 20) { + Sprite var46 = var10.getInventorySprite(var30); + if (var46 != null) { + var46.drawTransBgAt(var22, var23); + } else if (Widget.field2697) { + NPCDefinition.invalidateWidget(var10); + } + } + } else { + boolean var39 = false; + boolean var40 = false; + var26 = var10.itemIds[var30] - 1; + if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == class185.dragInventoryWidget && var30 == Client.dragItemSlotSource) { + Sprite var35; + if (Client.isItemSelected == 1 && var30 == class65.selectedItemSlot && var10.id == FriendSystem.selectedItemWidget) { + var35 = AttackOption.getItemSprite(var26, var10.itemQuantities[var30], 2, 0, 2, false); + } else { + var35 = AttackOption.getItemSprite(var26, var10.itemQuantities[var30], 1, 3153952, 2, false); + } + + if (var35 != null) { + if (var10 == class185.dragInventoryWidget && var30 == Client.dragItemSlotSource) { + var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; + var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; + if (var24 < 5 && var24 > -5) { + var24 = 0; + } + + if (var25 < 5 && var25 > -5) { + var25 = 0; + } + + if (Client.itemDragDuration < 5) { + var24 = 0; + var25 = 0; + } + + var35.drawTransAt(var22 + var24, var25 + var23, 128); + if (var1 != -1) { + Widget var28 = var0[var1 & 65535]; + int var29; + if (var25 + var23 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { + var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field707 / 3; + if (var29 > Client.field707 * 10) { + var29 = Client.field707 * 10; + } + + if (var29 > var28.scrollY) { + var29 = var28.scrollY; + } + + var28.scrollY -= var29; + Client.draggedWidgetY += var29; + NPCDefinition.invalidateWidget(var28); + } + + if (var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { + var29 = (var23 + var25 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field707 / 3; + if (var29 > Client.field707 * 10) { + var29 = Client.field707 * 10; + } + + if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { + var29 = var28.scrollHeight - var28.height - var28.scrollY; + } + + var28.scrollY += var29; + Client.draggedWidgetY -= var29; + NPCDefinition.invalidateWidget(var28); + } + } + } else if (var10 == Skeleton.field1793 && var30 == Client.field752) { + var35.drawTransAt(var22, var23, 128); + } else { + var35.drawTransBgAt(var22, var23); + } + } else { + NPCDefinition.invalidateWidget(var10); + } + } + } + + ++var30; + } + } + } else if (var10.type == 3) { + if (ScriptFrame.runCs1(var10)) { + var30 = var10.color2; + if (var10 == GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { + var30 = var10.mouseOverColor2; + } + } else { + var30 = var10.color; + if (var10 == GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { + var30 = var10.mouseOverColor; + } + } + + if (var10.fill) { + switch(var10.fillMode.value) { + case 1: + Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); + break; + case 2: + Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); + break; + default: + if (var14 == 0) { + Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var30); + } else { + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var30, 256 - (var14 & 255)); + } + } + } else if (var14 == 0) { + Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var30); + } else { + Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var30, 256 - (var14 & 255)); + } + } else { + Font var36; + if (var10.type == 4) { + var36 = var10.getFont(); + if (var36 == null) { + if (Widget.field2697) { + NPCDefinition.invalidateWidget(var10); + } + } else { + String var43 = var10.text; + if (ScriptFrame.runCs1(var10)) { + var20 = var10.color2; + if (var10 == GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { + var20 = var10.mouseOverColor2; + } + + if (var10.text2.length() > 0) { + var43 = var10.text2; + } + } else { + var20 = var10.color; + if (var10 == GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { + var20 = var10.mouseOverColor; + } + } + + if (var10.isIf3 && var10.itemId != -1) { + ItemDefinition var47 = HealthBarDefinition.ItemDefinition_get(var10.itemId); + var43 = var47.name; + if (var43 == null) { + var43 = "null"; + } + + if ((var47.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { + var43 = PacketWriter.colorStartTag(16748608) + var43 + "" + " " + 'x' + WorldMapCacheName.formatItemStacks(var10.itemQuantity); + } + } + + if (var10 == Client.meslayerContinueWidget) { + var43 = "Please wait..."; + var20 = var10.color; + } + + if (!var10.isIf3) { + var43 = MouseHandler.method1096(var43, var10); + } + + var36.drawLines(var43, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); + } + } else if (var10.type == 5) { + Sprite var37; + if (!var10.isIf3) { + var37 = var10.getSprite(ScriptFrame.runCs1(var10)); + if (var37 != null) { + var37.drawTransBgAt(var12, var13); + } else if (Widget.field2697) { + NPCDefinition.invalidateWidget(var10); + } + } else { + if (var10.itemId != -1) { + var37 = AttackOption.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); + } else { + var37 = var10.getSprite(false); + } + + if (var37 == null) { + if (Widget.field2697) { + NPCDefinition.invalidateWidget(var10); + } + } else { + var20 = var37.width; + var21 = var37.height; + if (!var10.spriteTiling) { + var22 = var10.width * 4096 / var20; + if (var10.spriteAngle != 0) { + var37.method6210(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); + } else if (var14 != 0) { + var37.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); + } else if (var20 == var10.width && var21 == var10.height) { + var37.drawTransBgAt(var12, var13); + } else { + var37.drawScaledAt(var12, var13, var10.width, var10.height); + } + } else { + Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); + var22 = (var20 - 1 + var10.width) / var20; + var23 = (var21 - 1 + var10.height) / var21; + + for (var24 = 0; var24 < var22; ++var24) { + for (var25 = 0; var25 < var23; ++var25) { + if (var10.spriteAngle != 0) { + var37.method6210(var20 / 2 + var12 + var24 * var20, var21 / 2 + var13 + var21 * var25, var10.spriteAngle, 4096); + } else if (var14 != 0) { + var37.drawTransAt(var12 + var24 * var20, var13 + var21 * var25, 256 - (var14 & 255)); + } else { + var37.drawTransBgAt(var12 + var24 * var20, var13 + var25 * var21); + } + } + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + } + } + } + } else { + ItemDefinition var32; + if (var10.type == 6) { + boolean var44 = ScriptFrame.runCs1(var10); + if (var44) { + var20 = var10.sequenceId2; + } else { + var20 = var10.sequenceId; + } + + Model var41 = null; + var22 = 0; + if (var10.itemId != -1) { + var32 = HealthBarDefinition.ItemDefinition_get(var10.itemId); + if (var32 != null) { + var32 = var32.getCountObj(var10.itemQuantity); + var41 = var32.getModel(1); + if (var41 != null) { + var41.calculateBoundsCylinder(); + var22 = var41.height / 2; + } else { + NPCDefinition.invalidateWidget(var10); + } + } + } else if (var10.modelType == 5) { + if (var10.modelId == 0) { + var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); + } else { + var41 = class192.localPlayer.getModel(); + } + } else if (var20 == -1) { + var41 = var10.getModel((SequenceDefinition)null, -1, var44, class192.localPlayer.appearance); + if (var41 == null && Widget.field2697) { + NPCDefinition.invalidateWidget(var10); + } + } else { + SequenceDefinition var45 = GraphicsDefaults.SequenceDefinition_get(var20); + var41 = var10.getModel(var45, var10.modelFrame, var44, class192.localPlayer.appearance); + if (var41 == null && Widget.field2697) { + NPCDefinition.invalidateWidget(var10); + } + } + + Rasterizer3D.method3101(var10.width / 2 + var12, var10.height / 2 + var13); + var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; + var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; + if (var41 != null) { + if (!var10.isIf3) { + var41.method2946(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); + } else { + var41.calculateBoundsCylinder(); + if (var10.modelOrthog) { + var41.method2938(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); + } else { + var41.method2946(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY); + } + } + } + + Rasterizer3D.Rasterizer3D_method3(); + } else { + if (var10.type == 7) { + var36 = var10.getFont(); + if (var36 == null) { + if (Widget.field2697) { + NPCDefinition.invalidateWidget(var10); + } + continue; + } + + var20 = 0; + + for (var21 = 0; var21 < var10.rawHeight; ++var21) { + for (var22 = 0; var22 < var10.rawWidth; ++var22) { + if (var10.itemIds[var20] > 0) { + var32 = HealthBarDefinition.ItemDefinition_get(var10.itemIds[var20] - 1); + String var34; + if (var32.isStackable != 1 && var10.itemQuantities[var20] == 1) { + var34 = PacketWriter.colorStartTag(16748608) + var32.name + ""; + } else { + var34 = PacketWriter.colorStartTag(16748608) + var32.name + "" + " " + 'x' + WorldMapCacheName.formatItemStacks(var10.itemQuantities[var20]); + } + + var25 = var12 + var22 * (var10.paddingX + 115); + var26 = (var10.paddingY + 12) * var21 + var13; + if (var10.textXAlignment == 0) { + var36.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1); + } else if (var10.textXAlignment == 1) { + var36.drawCentered(var34, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1); + } else { + var36.drawRightAligned(var34, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); + } + } + + ++var20; + } + } + } + + if (var10.type == 8 && var10 == VarbitDefinition.field3296 && Client.field796 == Client.field797) { + var30 = 0; + var20 = 0; + Font var31 = class13.fontPlain12; + String var33 = var10.text; + + String var42; + for (var33 = MouseHandler.method1096(var33, var10); var33.length() > 0; var20 = var20 + var31.ascent + 1) { + var24 = var33.indexOf("
"); + if (var24 != -1) { + var42 = var33.substring(0, var24); + var33 = var33.substring(var24 + 4); + } else { + var42 = var33; + var33 = ""; + } + + var25 = var31.stringWidth(var42); + if (var25 > var30) { + var30 = var25; + } + } + + var30 += 6; + var20 += 7; + var24 = var12 + var10.width - 5 - var30; + var25 = var13 + var10.height + 5; + if (var24 < var12 + 5) { + var24 = var12 + 5; + } + + if (var24 + var30 > var4) { + var24 = var4 - var30; + } + + if (var20 + var25 > var5) { + var25 = var5 - var20; + } + + Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var30, var20, 16777120); + Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var30, var20, 0); + var33 = var10.text; + var26 = var25 + var31.ascent + 2; + + for (var33 = MouseHandler.method1096(var33, var10); var33.length() > 0; var26 = var26 + var31.ascent + 1) { + int var27 = var33.indexOf("
"); + if (var27 != -1) { + var42 = var33.substring(0, var27); + var33 = var33.substring(var27 + 4); + } else { + var42 = var33; + var33 = ""; + } + + var31.draw(var42, var24 + 3, var26, 0, -1); + } + } + + if (var10.type == 9) { + if (var10.field2606) { + var30 = var12; + var20 = var13 + var10.height; + var21 = var12 + var10.width; + var22 = var13; + } else { + var30 = var12; + var20 = var13; + var21 = var12 + var10.width; + var22 = var13 + var10.height; + } + + if (var10.lineWid == 1) { + Rasterizer2D.Rasterizer2D_drawLine(var30, var20, var21, var22, var10.color); + } else { + GrandExchangeOfferWorldComparator.method74(var30, var20, var21, var22, var10.color, var10.lineWid); + } + } + } + } + } + } + } + } } } } } + + @ObfuscatedName("kx") + @ObfuscatedSignature( + signature = "(I)Z", + garbageValue = "-825352084" + ) + public static boolean method4835() { + return Client.staffModLevel >= 2; + } } diff --git a/runescape-client/src/main/java/FloorUnderlayDefinition.java b/runescape-client/src/main/java/FloorUnderlayDefinition.java index c1f51c465d..3359af3b59 100644 --- a/runescape-client/src/main/java/FloorUnderlayDefinition.java +++ b/runescape-client/src/main/java/FloorUnderlayDefinition.java @@ -4,48 +4,48 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iy") +@ObfuscatedName("ix") @Implements("FloorUnderlayDefinition") public class FloorUnderlayDefinition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) @Export("FloorUnderlayDefinition_archive") static AbstractArchive FloorUnderlayDefinition_archive; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("FloorUnderlayDefinition_cached") public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1172468213 + intValue = 324274119 ) @Export("rgb") int rgb; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1800958439 + intValue = 38778911 ) @Export("hue") public int hue; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -217803579 + intValue = -974835439 ) @Export("saturation") public int saturation; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1888954087 + intValue = 1002192481 ) @Export("lightness") public int lightness; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1484017615 + intValue = 1556624477 ) @Export("hueMultiplier") public int hueMultiplier; @@ -58,20 +58,20 @@ public class FloorUnderlayDefinition extends DualNode { this.rgb = 0; } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "47336247" + garbageValue = "-667447338" ) @Export("postDecode") void postDecode() { this.setHsl(this.rgb); } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Lkq;II)V", - garbageValue = "790135935" + signature = "(Lkp;IB)V", + garbageValue = "34" ) @Export("decode") void decode(Buffer var1, int var2) { @@ -85,10 +85,10 @@ public class FloorUnderlayDefinition extends DualNode { } } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkq;III)V", - garbageValue = "-1066801871" + signature = "(Lkp;IIB)V", + garbageValue = "-93" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { @@ -98,10 +98,10 @@ public class FloorUnderlayDefinition extends DualNode { } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "395351662" + signature = "(IB)V", + garbageValue = "15" ) @Export("setHsl") void setHsl(int var1) { @@ -131,7 +131,7 @@ public class FloorUnderlayDefinition extends DualNode { double var16 = (var10 + var8) / 2.0D; if (var10 != var8) { if (var16 < 0.5D) { - var14 = (var10 - var8) / (var10 + var8); + var14 = (var10 - var8) / (var8 + var10); } if (var16 >= 0.5D) { @@ -140,8 +140,8 @@ public class FloorUnderlayDefinition extends DualNode { if (var10 == var2) { var12 = (var4 - var6) / (var10 - var8); - } else if (var4 == var10) { - var12 = 2.0D + (var6 - var2) / (var10 - var8); + } else if (var10 == var4) { + var12 = (var6 - var2) / (var10 - var8) + 2.0D; } else if (var10 == var6) { var12 = 4.0D + (var2 - var4) / (var10 - var8); } @@ -149,7 +149,7 @@ public class FloorUnderlayDefinition extends DualNode { var12 /= 6.0D; this.saturation = (int)(var14 * 256.0D); - this.lightness = (int)(256.0D * var16); + this.lightness = (int)(var16 * 256.0D); if (this.saturation < 0) { this.saturation = 0; } else if (this.saturation > 255) { @@ -165,23 +165,137 @@ public class FloorUnderlayDefinition extends DualNode { if (var16 > 0.5D) { this.hueMultiplier = (int)((1.0D - var16) * var14 * 512.0D); } else { - this.hueMultiplier = (int)(var16 * var14 * 512.0D); + this.hueMultiplier = (int)(512.0D * var16 * var14); } if (this.hueMultiplier < 1) { this.hueMultiplier = 1; } - this.hue = (int)((double)this.hueMultiplier * var12); + this.hue = (int)(var12 * (double)this.hueMultiplier); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lhz;III)Lls;", - garbageValue = "-1136853521" + signature = "(CLgl;I)C", + garbageValue = "-291129938" ) - @Export("SpriteBuffer_getSprite") - public static Sprite SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { - return !HitSplatDefinition.method4586(var0, var1, var2) ? null : Buffer.method5689(); + @Export("standardizeChar") + static char standardizeChar(char var0, Language var1) { + if (var0 >= 192 && var0 <= 255) { + if (var0 >= 192 && var0 <= 198) { + return 'A'; + } + + if (var0 == 199) { + return 'C'; + } + + if (var0 >= 200 && var0 <= 203) { + return 'E'; + } + + if (var0 >= 204 && var0 <= 207) { + return 'I'; + } + + if (var0 == 209 && var1 != Language.Language_ES) { + return 'N'; + } + + if (var0 >= 210 && var0 <= 214) { + return 'O'; + } + + if (var0 >= 217 && var0 <= 220) { + return 'U'; + } + + if (var0 == 221) { + return 'Y'; + } + + if (var0 == 223) { + return 's'; + } + + if (var0 >= 224 && var0 <= 230) { + return 'a'; + } + + if (var0 == 231) { + return 'c'; + } + + if (var0 >= 232 && var0 <= 235) { + return 'e'; + } + + if (var0 >= 236 && var0 <= 239) { + return 'i'; + } + + if (var0 == 241 && var1 != Language.Language_ES) { + return 'n'; + } + + if (var0 >= 242 && var0 <= 246) { + return 'o'; + } + + if (var0 >= 249 && var0 <= 252) { + return 'u'; + } + + if (var0 == 253 || var0 == 255) { + return 'y'; + } + } + + if (var0 == 338) { + return 'O'; + } else if (var0 == 339) { + return 'o'; + } else if (var0 == 376) { + return 'Y'; + } else { + return var0; + } + } + + @ObfuscatedName("if") + @ObfuscatedSignature( + signature = "([Lhn;IIIZB)V", + garbageValue = "1" + ) + @Export("resizeInterface") + static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { + for (int var5 = 0; var5 < var0.length; ++var5) { + Widget var6 = var0[var5]; + if (var6 != null && var6.parentId == var1) { + UrlRequester.alignWidgetSize(var6, var2, var3, var4); + InterfaceParent.alignWidgetPosition(var6, var2, var3); + if (var6.scrollX > var6.scrollWidth - var6.width) { + var6.scrollX = var6.scrollWidth - var6.width; + } + + if (var6.scrollX < 0) { + var6.scrollX = 0; + } + + if (var6.scrollY > var6.scrollHeight - var6.height) { + var6.scrollY = var6.scrollHeight - var6.height; + } + + if (var6.scrollY < 0) { + var6.scrollY = 0; + } + + if (var6.type == 0) { + WorldMapIcon_1.revalidateWidgetScroll(var0, var6, var4); + } + } + } + } } diff --git a/runescape-client/src/main/java/Font.java b/runescape-client/src/main/java/Font.java index 4497a331ce..aefb563534 100644 --- a/runescape-client/src/main/java/Font.java +++ b/runescape-client/src/main/java/Font.java @@ -13,7 +13,7 @@ public final class Font extends AbstractFont { super(var1); } - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("drawGlyph") final void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6) { int var7 = var3 * Rasterizer2D.Rasterizer2D_width + var2; @@ -55,7 +55,7 @@ public final class Font extends AbstractFont { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("drawGlyphAlpha") final void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7) { int var8 = var3 * Rasterizer2D.Rasterizer2D_width + var2; diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index ce0a0f769f..6e13091a53 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -1,48 +1,70 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kk") +@ObfuscatedName("kq") @Implements("FontName") public class FontName { - @ObfuscatedName("f") + @ObfuscatedName("qm") + @ObfuscatedGetter( + intValue = -1887929743 + ) + static int field3660; + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lkk;" + signature = "Lkq;" ) @Export("FontName_plain11") public static final FontName FontName_plain11; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lkk;" + signature = "Lkq;" ) @Export("FontName_plain12") public static final FontName FontName_plain12; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lkk;" + signature = "Lkq;" ) @Export("FontName_bold12") public static final FontName FontName_bold12; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lkk;" + signature = "Lkq;" ) @Export("FontName_verdana11") public static final FontName FontName_verdana11; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lkk;" + signature = "Lkq;" ) @Export("FontName_verdana13") public static final FontName FontName_verdana13; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lkk;" + signature = "Lkq;" ) @Export("FontName_verdana15") public static final FontName FontName_verdana15; - @ObfuscatedName("e") + @ObfuscatedName("eh") + @ObfuscatedGetter( + intValue = -1770194779 + ) + static int field3650; + @ObfuscatedName("gt") + @ObfuscatedGetter( + intValue = -1472159493 + ) + static int field3663; + @ObfuscatedName("lo") + @ObfuscatedGetter( + intValue = 1238804293 + ) + @Export("selectedSpellWidget") + static int selectedSpellWidget; + @ObfuscatedName("d") @Export("name") String name; @@ -59,35 +81,21 @@ public class FontName { this.name = var1; } - @ObfuscatedName("az") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lig;B)Z", - garbageValue = "9" + signature = "(B)I", + garbageValue = "2" ) - static boolean method5377(ObjectDefinition var0) { - if (var0.transforms != null) { - int[] var1 = var0.transforms; - - for (int var2 = 0; var2 < var1.length; ++var2) { - int var3 = var1[var2]; - ObjectDefinition var4 = Coord.getObjectDefinition(var3); - if (var4.mapIconId != -1) { - return true; - } - } - } else if (var0.mapIconId != -1) { - return true; - } - - return false; + public static int method5401() { + return KeyHandler.KeyHandler_idleCycles; } - @ObfuscatedName("lc") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "-46" + signature = "(I)V", + garbageValue = "-1505118855" ) - static void method5376(int var0) { - Client.oculusOrbState = var0; + public static void method5402() { + KitDefinition.KitDefinition_cached.clear(); } } diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java index a4be686359..64c6fcac86 100644 --- a/runescape-client/src/main/java/Fonts.java +++ b/runescape-client/src/main/java/Fonts.java @@ -1,30 +1,37 @@ import java.util.HashMap; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ki") +@ObfuscatedName("kz") @Implements("Fonts") public class Fonts { - @ObfuscatedName("f") + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 902886517 + ) + @Export("gameCyclesToDo") + static int gameCyclesToDo; + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) @Export("spritesArchive") AbstractArchive spritesArchive; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) @Export("fontsArchive") AbstractArchive fontsArchive; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("map") HashMap map; @ObfuscatedSignature( - signature = "(Lhz;Lhz;)V" + signature = "(Lii;Lii;)V" ) public Fonts(AbstractArchive var1, AbstractArchive var2) { this.spritesArchive = var1; @@ -32,10 +39,10 @@ public class Fonts { this.map = new HashMap(); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "([Lkk;I)Ljava/util/HashMap;", - garbageValue = "-819608021" + signature = "([Lkq;I)Ljava/util/HashMap;", + garbageValue = "-448655147" ) @Export("createMap") public HashMap createMap(FontName[] var1) { @@ -47,7 +54,12 @@ public class Fonts { if (this.map.containsKey(var5)) { var2.put(var5, this.map.get(var5)); } else { - Font var6 = ArchiveDisk.method5909(this.spritesArchive, this.fontsArchive, var5.name, ""); + AbstractArchive var7 = this.spritesArchive; + AbstractArchive var8 = this.fontsArchive; + String var9 = var5.name; + int var10 = var7.getGroupId(var9); + int var11 = var7.getFileId(var10, ""); + Font var6 = FaceNormal.method3335(var7, var8, var10, var11); if (var6 != null) { this.map.put(var5, var6); var2.put(var5, var6); @@ -57,4 +69,27 @@ public class Fonts { return var2; } + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(II)Lit;", + garbageValue = "291132223" + ) + @Export("StructDefinition_getStructDefinition") + public static StructDefinition StructDefinition_getStructDefinition(int var0) { + StructDefinition var1 = (StructDefinition)StructDefinition.StructDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = StructDefinition.StructDefinition_archive.takeFile(34, var0); + var1 = new StructDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); + StructDefinition.StructDefinition_cached.put(var1, (long)var0); + return var1; + } + } } diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java index 055ad4b8a8..e6dee1dada 100644 --- a/runescape-client/src/main/java/Frames.java +++ b/runescape-client/src/main/java/Frames.java @@ -1,20 +1,30 @@ +import java.util.concurrent.ScheduledExecutorService; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eq") +@ObfuscatedName("es") @Implements("Frames") public class Frames extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("l") + @Export("soundSystemExecutor") + static ScheduledExecutorService soundSystemExecutor; + @ObfuscatedName("ah") + @ObfuscatedGetter( + intValue = -1849974283 + ) + static int field1885; + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "[Ldj;" + signature = "[Ldh;" ) @Export("frames") Animation[] frames; @ObfuscatedSignature( - signature = "(Lhz;Lhz;IZ)V", + signature = "(Lii;Lii;IZ)V", garbageValue = "0" ) public Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { @@ -46,234 +56,43 @@ public class Frames extends DualNode { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "-996338531" + garbageValue = "-1402532864" ) @Export("hasAlphaTransform") public boolean hasAlphaTransform(int var1) { return this.frames[var1].hasAlphaTransform; } - @ObfuscatedName("i") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-360173892" + signature = "([BS)Ljava/lang/String;", + garbageValue = "255" ) - static void method3280() { - if (Login.field1173) { - Login.titleboxSprite = null; - Login.titlebuttonSprite = null; - Login.runesSprite = null; - UrlRequest.leftTitleSprite = null; - ScriptFrame.rightTitleSprite = null; - Login.logoSprite = null; - class30.title_muteSprite = null; - class218.options_buttons_0Sprite = null; - Login.options_buttons_2Sprite = null; - Calendar.worldSelectBackSprites = null; - AbstractWorldMapIcon.worldSelectFlagSprites = null; - Message.worldSelectArrows = null; - SpotAnimationDefinition.worldSelectStars = null; - class54.field483 = null; - StructDefinition.loginScreenRunesAnimation.method1812(); - BoundaryObject.method3273(2); - BuddyRankComparator.method3362(true); - Login.field1173 = false; - } - } + public static String method3340(byte[] var0) { + int var2 = var0.length; + StringBuilder var3 = new StringBuilder(); - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "(ILcu;ZB)I", - garbageValue = "43" - ) - static int method3281(int var0, Script var1, boolean var2) { - if (var0 < 1000) { - return WorldMapManager.method656(var0, var1, var2); - } else if (var0 < 1100) { - return class60.method1170(var0, var1, var2); - } else if (var0 < 1200) { - return MidiPcmStream.method3737(var0, var1, var2); - } else if (var0 < 1300) { - return Friend.method5286(var0, var1, var2); - } else if (var0 < 1400) { - return UrlRequester.method3306(var0, var1, var2); - } else if (var0 < 1500) { - return GrandExchangeOfferNameComparator.method134(var0, var1, var2); - } else if (var0 < 1600) { - return class2.method34(var0, var1, var2); - } else if (var0 < 1700) { - return ServerPacket.method3568(var0, var1, var2); - } else if (var0 < 1800) { - return UserList.method5193(var0, var1, var2); - } else if (var0 < 1900) { - return ServerPacket.method3569(var0, var1, var2); - } else if (var0 < 2000) { - return LoginPacket.method3575(var0, var1, var2); - } else if (var0 < 2100) { - return class60.method1170(var0, var1, var2); - } else if (var0 < 2200) { - return MidiPcmStream.method3737(var0, var1, var2); - } else if (var0 < 2300) { - return Friend.method5286(var0, var1, var2); - } else if (var0 < 2400) { - return UrlRequester.method3306(var0, var1, var2); - } else if (var0 < 2500) { - return GrandExchangeOfferNameComparator.method134(var0, var1, var2); - } else if (var0 < 2600) { - return class219.method4077(var0, var1, var2); - } else if (var0 < 2700) { - return WorldMapAreaData.method692(var0, var1, var2); - } else if (var0 < 2800) { - return GameShell.method1068(var0, var1, var2); - } else if (var0 < 2900) { - return class32.method559(var0, var1, var2); - } else if (var0 < 3000) { - return LoginPacket.method3575(var0, var1, var2); - } else if (var0 < 3200) { - return AbstractArchive.method4166(var0, var1, var2); - } else if (var0 < 3300) { - return AbstractByteArrayCopier.method3937(var0, var1, var2); - } else if (var0 < 3400) { - return class206.method3919(var0, var1, var2); - } else if (var0 < 3500) { - return DevicePcmPlayerProvider.method840(var0, var1, var2); - } else if (var0 < 3700) { - return MenuAction.method2069(var0, var1, var2); - } else if (var0 < 4000) { - return ScriptFrame.method1111(var0, var1, var2); - } else if (var0 < 4100) { - return GrandExchangeEvents.method72(var0, var1, var2); - } else if (var0 < 4200) { - return class60.method1171(var0, var1, var2); - } else if (var0 < 4300) { - return ScriptFrame.method1112(var0, var1, var2); - } else if (var0 < 5100) { - return Tiles.method1144(var0, var1, var2); - } else if (var0 < 5400) { - return UserComparator6.method3369(var0, var1, var2); - } else if (var0 < 5600) { - return VarpDefinition.method4347(var0, var1, var2); - } else if (var0 < 5700) { - return UserComparator7.method3345(var0, var1, var2); - } else if (var0 < 6300) { - return Player.method1277(var0, var1, var2); - } else if (var0 < 6600) { - return AbstractWorldMapData.method272(var0, var1, var2); - } else { - return var0 < 6700 ? WorldMapRectangle.method273(var0, var1, var2) : 2; - } - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-1767342490" - ) - @Export("iLog") - public static int iLog(int var0) { - int var1 = 0; - if (var0 < 0 || var0 >= 65536) { - var0 >>>= 16; - var1 += 16; - } - - if (var0 >= 256) { - var0 >>>= 8; - var1 += 8; - } - - if (var0 >= 16) { - var0 >>>= 4; - var1 += 4; - } - - if (var0 >= 4) { - var0 >>>= 2; - var1 += 2; - } - - if (var0 >= 1) { - var0 >>>= 1; - ++var1; - } - - return var0 + var1; - } - - @ObfuscatedName("gl") - @ObfuscatedSignature( - signature = "(IIIIZB)V", - garbageValue = "36" - ) - @Export("setViewportShape") - static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { - if (var2 < 1) { - var2 = 1; - } - - if (var3 < 1) { - var3 = 1; - } - - int var5 = var3 - 334; - int var6; - if (var5 < 0) { - var6 = Client.field879; - } else if (var5 >= 100) { - var6 = Client.field880; - } else { - var6 = (Client.field880 - Client.field879) * var5 / 100 + Client.field879; - } - - int var7 = var3 * var6 * 512 / (var2 * 334); - int var8; - int var9; - short var10; - if (var7 < Client.field804) { - var10 = Client.field804; - var6 = var10 * var2 * 334 / (var3 * 512); - if (var6 > Client.field884) { - var6 = Client.field884; - var8 = var3 * var6 * 512 / (var10 * 334); - var9 = (var2 - var8) / 2; - if (var4) { - Rasterizer2D.Rasterizer2D_resetClip(); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); - Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); + for (int var4 = 0; var4 < var2 + 0; var4 += 3) { + int var5 = var0[var4] & 255; + var3.append(class290.field3646[var5 >>> 2]); + if (var4 < var2 - 1) { + int var6 = var0[var4 + 1] & 255; + var3.append(class290.field3646[(var5 & 3) << 4 | var6 >>> 4]); + if (var4 < var2 - 2) { + int var7 = var0[var4 + 2] & 255; + var3.append(class290.field3646[(var6 & 15) << 2 | var7 >>> 6]).append(class290.field3646[var7 & 63]); + } else { + var3.append(class290.field3646[(var6 & 15) << 2]).append("="); } - - var0 += var9; - var2 -= var9 * 2; - } - } else if (var7 > Client.field886) { - var10 = Client.field886; - var6 = var10 * var2 * 334 / (var3 * 512); - if (var6 < Client.field796) { - var6 = Client.field796; - var8 = var10 * var2 * 334 / (var6 * 512); - var9 = (var3 - var8) / 2; - if (var4) { - Rasterizer2D.Rasterizer2D_resetClip(); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); - } - - var1 += var9; - var3 -= var9 * 2; + } else { + var3.append(class290.field3646[(var5 & 3) << 4]).append("=="); } } - Client.viewportZoom = var3 * var6 / 334; - if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { - Language.method3634(var2, var3); - } - - Client.viewportOffsetX = var0; - Client.viewportOffsetY = var1; - Client.viewportWidth = var2; - Client.viewportHeight = var3; + String var1 = var3.toString(); + return var1; } } diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java index 63305e6ad0..ab2689980c 100644 --- a/runescape-client/src/main/java/Friend.java +++ b/runescape-client/src/main/java/Friend.java @@ -2,23 +2,22 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("jg") +@ObfuscatedName("jy") @Implements("Friend") public class Friend extends Buddy { - @ObfuscatedName("f") - boolean field3617; - @ObfuscatedName("i") + @ObfuscatedName("c") boolean field3618; + @ObfuscatedName("t") + boolean field3619; Friend() { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljg;B)I", - garbageValue = "73" + signature = "(Ljy;S)I", + garbageValue = "30306" ) @Export("compareToFriend") int compareToFriend(Friend var1) { @@ -30,23 +29,23 @@ public class Friend extends Buddy { return -1; } else if (var1.world != 0 && super.world == 0) { return 1; - } else if (this.field3617 && !var1.field3617) { - return -1; - } else if (!this.field3617 && var1.field3617) { - return 1; } else if (this.field3618 && !var1.field3618) { return -1; } else if (!this.field3618 && var1.field3618) { return 1; + } else if (this.field3619 && !var1.field3619) { + return -1; + } else if (!this.field3619 && var1.field3619) { + return 1; } else { return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; } } - @ObfuscatedName("ay") + @ObfuscatedName("az") @ObfuscatedSignature( - signature = "(Ljy;S)I", - garbageValue = "9221" + signature = "(Ljk;I)I", + garbageValue = "-746331144" ) @Export("compareTo_user") public int compareTo_user(User var1) { @@ -57,90 +56,13 @@ public class Friend extends Buddy { return this.compareToFriend((Friend)var1); } - @ObfuscatedName("e") + @ObfuscatedName("gm") @ObfuscatedSignature( - signature = "(ILcu;ZI)I", - garbageValue = "316315133" + signature = "(I)I", + garbageValue = "-1214522869" ) - static int method5286(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var3 = Tile.getWidget(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); - } else { - var3 = var2 ? UserComparator7.field1946 : class197.field2398; - } - - LoginPacket.invalidateWidget(var3); - if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { - if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { - var3.modelType = 2; - var3.modelId = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { - var3.modelType = 3; - var3.modelId = Message.localPlayer.appearance.getChatHeadId(); - return 1; - } else { - return 2; - } - } else { - class188.Interpreter_intStackSize -= 2; - int var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - int var5 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - var3.itemId = var4; - var3.itemQuantity = var5; - ItemDefinition var6 = PacketBufferNode.ItemDefinition_get(var4); - var3.modelAngleX = var6.xan2d; - var3.modelAngleY = var6.yan2d; - var3.modelAngleZ = var6.zan2d; - var3.modelOffsetX = var6.offsetX2d; - var3.modelOffsetY = var6.offsetY2d; - var3.modelZoom = var6.zoom2d; - if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) { - var3.itemQuantityMode = 0; - } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | 1 == var6.isStackable) { - var3.itemQuantityMode = 1; - } else { - var3.itemQuantityMode = 2; - } - - if (var3.field2645 > 0) { - var3.modelZoom = var3.modelZoom * 32 / var3.field2645; - } else if (var3.rawWidth > 0) { - var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; - } - - return 1; - } - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(I)Lbe;", - garbageValue = "-422000887" - ) - @Export("getNextWorldListWorld") - static World getNextWorldListWorld() { - return World.World_listCount < World.World_count ? class162.World_worlds[++World.World_listCount - 1] : null; - } - - @ObfuscatedName("kq") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-2130982399" - ) - @Export("FriendSystem_invalidateFriends") - static final void FriendSystem_invalidateFriends() { - for (int var0 = 0; var0 < Players.Players_count; ++var0) { - Player var1 = Client.players[Players.Players_indices[var0]]; - var1.clearIsFriend(); - } - - class216.method4013(); - if (Calendar.clanChat != null) { - Calendar.clanChat.clearFriends(); - } - + @Export("getWindowedMode") + static int getWindowedMode() { + return Client.isResizable ? 2 : 1; } } diff --git a/runescape-client/src/main/java/FriendLoginUpdate.java b/runescape-client/src/main/java/FriendLoginUpdate.java index 0984c33ca7..4a5ba74b15 100644 --- a/runescape-client/src/main/java/FriendLoginUpdate.java +++ b/runescape-client/src/main/java/FriendLoginUpdate.java @@ -4,50 +4,96 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jj") +@ObfuscatedName("km") @Implements("FriendLoginUpdate") public class FriendLoginUpdate extends Link { - @ObfuscatedName("a") + @ObfuscatedName("by") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lgl;" ) - @Export("Widget_archive") - static AbstractArchive Widget_archive; - @ObfuscatedName("y") + @Export("clientLanguage") + static Language clientLanguage; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1496749481 + intValue = 625683847 ) - public int field3623; - @ObfuscatedName("w") + public int field3632; + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Ljc;" + signature = "Ljz;" ) @Export("username") public Username username; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("world") public short world; @ObfuscatedSignature( - signature = "(Ljc;I)V" + signature = "(Ljz;I)V" ) FriendLoginUpdate(Username var1, int var2) { - this.field3623 = (int)(WorldMapID.currentTimeMillis() / 1000L); + this.field3632 = (int)(WorldMapIcon_0.currentTimeMillis() / 1000L); this.username = var1; this.world = (short)var2; } - @ObfuscatedName("f") - static double method5301(double var0) { - return Math.exp(var0 * -var0 / 2.0D) / Math.sqrt(6.283185307179586D); + @ObfuscatedName("c") + public static final void method5325(long var0) { + if (var0 > 0L) { + if (var0 % 10L == 0L) { + World.method1801(var0 - 1L); + World.method1801(1L); + } else { + World.method1801(var0); + } + + } } - @ObfuscatedName("au") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lcz;I)V", - garbageValue = "-651295245" + signature = "([Ljava/lang/String;[SIII)V", + garbageValue = "2127417563" ) - public static final void method5300(class97 var0) { - ChatChannel.pcmPlayerProvider = var0; + @Export("sortItemsByName") + public static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) { + if (var2 < var3) { + int var4 = (var3 + var2) / 2; + int var5 = var2; + String var6 = var0[var4]; + var0[var4] = var0[var3]; + var0[var3] = var6; + short var7 = var1[var4]; + var1[var4] = var1[var3]; + var1[var3] = var7; + + for (int var8 = var2; var8 < var3; ++var8) { + if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { + String var9 = var0[var8]; + var0[var8] = var0[var5]; + var0[var5] = var9; + short var10 = var1[var8]; + var1[var8] = var1[var5]; + var1[var5++] = var10; + } + } + + var0[var3] = var0[var5]; + var0[var5] = var6; + var1[var3] = var1[var5]; + var1[var5] = var7; + sortItemsByName(var0, var1, var2, var5 - 1); + sortItemsByName(var0, var1, var5 + 1, var3); + } + + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(II)Z", + garbageValue = "1669041813" + ) + public static boolean method5326(int var0) { + return (var0 >> 29 & 1) != 0; } } diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index 642fe0d8c7..0397ab9067 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -1,95 +1,104 @@ -import java.util.concurrent.ScheduledExecutorService; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bi") +@ObfuscatedName("bu") @Implements("FriendSystem") public class FriendSystem { - @ObfuscatedName("x") - @Export("soundSystemExecutor") - static ScheduledExecutorService soundSystemExecutor; - @ObfuscatedName("w") + @ObfuscatedName("ha") + @ObfuscatedGetter( + intValue = -1970559655 + ) + @Export("cameraYaw") + static int cameraYaw; + @ObfuscatedName("ix") + @ObfuscatedGetter( + intValue = -1654190039 + ) + @Export("selectedItemWidget") + static int selectedItemWidget; + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lll;" + signature = "Lmv;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Ljr;" + signature = "Ljd;" ) @Export("friendsList") public final FriendsList friendsList; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lju;" + signature = "Ljf;" ) @Export("ignoreList") public final IgnoreList ignoreList; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1346758177 + intValue = -154816357 ) - int field1045; + int field1063; @ObfuscatedSignature( - signature = "(Lll;)V" + signature = "(Lmv;)V" ) FriendSystem(LoginType var1) { - this.field1045 = 0; + this.field1063 = 0; this.loginType = var1; this.friendsList = new FriendsList(var1); this.ignoreList = new IgnoreList(var1); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1542848201" + garbageValue = "-1947292888" ) - boolean method1844() { - return this.field1045 == 2; + boolean method1857() { + return this.field1063 == 2; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "0" + signature = "(I)V", + garbageValue = "1940001821" ) - final void method1845() { - this.field1045 = 1; + final void method1858() { + this.field1063 = 1; } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkq;II)V", - garbageValue = "818210154" + signature = "(Lkp;II)V", + garbageValue = "224283434" ) @Export("readUpdate") final void readUpdate(Buffer var1, int var2) { this.friendsList.read(var1, var2); - this.field1045 = 2; - Friend.FriendSystem_invalidateFriends(); + this.field1063 = 2; + WorldMapID.FriendSystem_invalidateFriends(); } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "64" + signature = "(I)V", + garbageValue = "291777380" ) @Export("processFriendUpdates") final void processFriendUpdates() { for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { - if ((long)var1.field3623 < WorldMapID.currentTimeMillis() / 1000L - 5L) { + if ((long)var1.field3632 < WorldMapIcon_0.currentTimeMillis() / 1000L - 5L) { if (var1.world > 0) { - class83.addGameMessage(5, "", var1.username + " has logged in."); + ClientPreferences.addGameMessage(5, "", var1.username + " has logged in."); } if (var1.world == 0) { - class83.addGameMessage(5, "", var1.username + " has logged out."); + ClientPreferences.addGameMessage(5, "", var1.username + " has logged out."); } var1.remove(); @@ -98,38 +107,38 @@ public class FriendSystem { } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-3" + signature = "(I)V", + garbageValue = "-1660346454" ) @Export("clear") final void clear() { - this.field1045 = 0; + this.field1063 = 0; this.friendsList.clear(); this.ignoreList.clear(); } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Ljc;ZI)Z", - garbageValue = "-1562604277" + signature = "(Ljz;ZI)Z", + garbageValue = "1100778689" ) @Export("isFriended") final boolean isFriended(Username var1, boolean var2) { if (var1 == null) { return false; - } else if (var1.equals(Message.localPlayer.username)) { + } else if (var1.equals(class192.localPlayer.username)) { return true; } else { return this.friendsList.isFriended(var1, var2); } } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Ljc;I)Z", - garbageValue = "-408948257" + signature = "(Ljz;I)Z", + garbageValue = "819479662" ) @Export("isIgnored") final boolean isIgnored(Username var1) { @@ -140,10 +149,10 @@ public class FriendSystem { } } - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "-28" + signature = "(Ljava/lang/String;I)V", + garbageValue = "-340804777" ) @Export("addFriend") final void addFriend(String var1) { @@ -151,16 +160,16 @@ public class FriendSystem { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { if (this.friendsListIsFull()) { - WorldMapRegion.method446(); - } else if (Message.localPlayer.username.equals(var2)) { - Tiles.method1143("You can't add yourself to your own friend list"); + WorldMapArea.method425(); + } else if (class192.localPlayer.username.equals(var2)) { + WorldMapLabel.method439(); } else if (this.isFriended(var2, false)) { - class288.method5335(var1); + LoginScreenAnimation.method1837(var1); } else if (this.isIgnored(var2)) { - Tiles.method1143("Please remove " + var1 + " from your ignore list first"); + Calendar.method4014(var1); } else { - PacketBufferNode var3 = class2.getPacketBufferNode(ClientPacket.field2236, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(ViewportMouse.stringCp1252NullTerminatedByteSize(var1)); + PacketBufferNode var3 = TilePaint.getPacketBufferNode(ClientPacket.field2260, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var1)); var3.packetBuffer.writeStringCp1252NullTerminated(var1); Client.packetWriter.addNode(var3); } @@ -168,20 +177,20 @@ public class FriendSystem { } } - @ObfuscatedName("o") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "1773395073" + garbageValue = "-1302160469" ) @Export("friendsListIsFull") final boolean friendsListIsFull() { - return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field746 != 1; + return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field763 != 1; } - @ObfuscatedName("l") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(Ljava/lang/String;I)V", - garbageValue = "1243376516" + garbageValue = "-1143439097" ) @Export("addIgnore") final void addIgnore(String var1) { @@ -189,37 +198,34 @@ public class FriendSystem { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { if (this.canAddIgnore()) { - VertexNormal.method2996(); - } else if (Message.localPlayer.username.equals(var2)) { - WorldMapCacheName.method620(); + class60.method1188("Your ignore list is full. Max of 100 for free users, and 400 for members"); + } else if (class192.localPlayer.username.equals(var2)) { + class80.method2097(); } else if (this.isIgnored(var2)) { - Tiles.method1143(var1 + " is already on your ignore list"); + ModelData0.method3323(var1); } else if (this.isFriended(var2, false)) { - class191.method3640(var1); + FloorDecoration.method2912(var1); } else { - PacketBufferNode var3 = class2.getPacketBufferNode(ClientPacket.field2206, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(ViewportMouse.stringCp1252NullTerminatedByteSize(var1)); - var3.packetBuffer.writeStringCp1252NullTerminated(var1); - Client.packetWriter.addNode(var3); + class43.method817(var1); } } } } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1684864200" + garbageValue = "-1820924219" ) @Export("canAddIgnore") final boolean canAddIgnore() { - return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field746 != 1; + return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field763 != 1; } - @ObfuscatedName("z") + @ObfuscatedName("a") @ObfuscatedSignature( signature = "(Ljava/lang/String;I)V", - garbageValue = "975666104" + garbageValue = "561828243" ) @Export("removeFriend") final void removeFriend(String var1) { @@ -227,22 +233,22 @@ public class FriendSystem { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { if (this.friendsList.removeByUsername(var2)) { - VertexNormal.method2995(); - PacketBufferNode var3 = class2.getPacketBufferNode(ClientPacket.field2238, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(ViewportMouse.stringCp1252NullTerminatedByteSize(var1)); + Client.field839 = Client.cycleCntr; + PacketBufferNode var3 = TilePaint.getPacketBufferNode(ClientPacket.field2213, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var1)); var3.packetBuffer.writeStringCp1252NullTerminated(var1); Client.packetWriter.addNode(var3); } - Friend.FriendSystem_invalidateFriends(); + WorldMapID.FriendSystem_invalidateFriends(); } } } - @ObfuscatedName("h") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(Ljava/lang/String;I)V", - garbageValue = "2048585665" + garbageValue = "-892672688" ) @Export("removeIgnore") final void removeIgnore(String var1) { @@ -250,22 +256,22 @@ public class FriendSystem { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { if (this.ignoreList.removeByUsername(var2)) { - VertexNormal.method2995(); - PacketBufferNode var3 = class2.getPacketBufferNode(ClientPacket.field2260, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(ViewportMouse.stringCp1252NullTerminatedByteSize(var1)); + Client.field839 = Client.cycleCntr; + PacketBufferNode var3 = TilePaint.getPacketBufferNode(ClientPacket.field2288, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var1)); var3.packetBuffer.writeStringCp1252NullTerminated(var1); Client.packetWriter.addNode(var3); } - GameShell.FriendSystem_invalidateIgnoreds(); + class96.FriendSystem_invalidateIgnoreds(); } } } - @ObfuscatedName("aa") + @ObfuscatedName("af") @ObfuscatedSignature( - signature = "(Ljc;I)Z", - garbageValue = "-2137551829" + signature = "(Ljz;I)Z", + garbageValue = "431116625" ) @Export("isFriendAndHasWorld") final boolean isFriendAndHasWorld(Username var1) { @@ -273,63 +279,42 @@ public class FriendSystem { return var2 != null && var2.hasWorld(); } - @ObfuscatedName("y") + @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-435303731" + signature = "(ILce;ZB)I", + garbageValue = "0" ) - @Export("savePreferences") - static void savePreferences() { - AccessFile var0 = null; - - try { - var0 = Messages.getPreferencesFile("", AbstractWorldMapIcon.field284.name, true); - Buffer var1 = Interpreter.clientPreferences.toBuffer(); - var0.write(var1.array, 0, var1.offset); - } catch (Exception var3) { - } - - try { - if (var0 != null) { - var0.closeSync(true); - } - } catch (Exception var2) { - } - - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "2090172291" - ) - @Export("clearItemContainer") - static void clearItemContainer(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var1 != null) { - for (int var2 = 0; var2 < var1.ids.length; ++var2) { - var1.ids[var2] = -1; - var1.quantities[var2] = 0; + static int method1920(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { + class320.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + int var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + if (!Client.isCameraLocked) { + Client.camAngleX = var3; + Client.camAngleY = var4; } - } - } - - @ObfuscatedName("km") - @ObfuscatedSignature( - signature = "(Lha;IIII)V", - garbageValue = "688328393" - ) - @Export("drawCompass") - static final void drawCompass(Widget var0, int var1, int var2, int var3) { - SpriteMask var4 = var0.getSpriteMask(false); - if (var4 != null) { - if (Client.minimapState < 3) { - GrandExchangeOfferTotalQuantityComparator.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths); - } else { - Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); + return 1; + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.camAngleX; + return 1; + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.camAngleY; + return 1; + } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + if (var3 < 0) { + var3 = 0; } + Client.camFollowHeight = var3; + return 1; + } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.camFollowHeight; + return 1; + } else { + return 2; } } } diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java index a4d727c4b2..5b9c502ca9 100644 --- a/runescape-client/src/main/java/FriendsList.java +++ b/runescape-client/src/main/java/FriendsList.java @@ -1,65 +1,67 @@ -import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jr") +@ObfuscatedName("jd") @Implements("FriendsList") public class FriendsList extends UserList { - @ObfuscatedName("y") + @ObfuscatedName("ge") + @Export("regions") + static int[] regions; + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lll;" + signature = "Lmv;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1316127355 + intValue = -1784077363 ) - int field3603; - @ObfuscatedName("c") + int field3606; + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Ljw;" + signature = "Ljr;" ) @Export("friendLoginUpdates") public LinkDeque friendLoginUpdates; @ObfuscatedSignature( - signature = "(Lll;)V" + signature = "(Lmv;)V" ) public FriendsList(LoginType var1) { super(400); - this.field3603 = 1; + this.field3606 = 1; this.friendLoginUpdates = new LinkDeque(); this.loginType = var1; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)Ljy;", - garbageValue = "68" + signature = "(S)Ljk;", + garbageValue = "30683" ) @Export("newInstance") User newInstance() { return new Friend(); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IB)[Ljy;", - garbageValue = "32" + signature = "(IB)[Ljk;", + garbageValue = "19" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new Friend[var1]; } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ljc;ZI)Z", - garbageValue = "-1998488053" + signature = "(Ljz;ZI)Z", + garbageValue = "-1382316514" ) @Export("isFriended") public boolean isFriended(Username var1, boolean var2) { @@ -71,10 +73,10 @@ public class FriendsList extends UserList { } } - @ObfuscatedName("x") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkq;IB)V", - garbageValue = "-60" + signature = "(Lkp;IB)V", + garbageValue = "118" ) @Export("read") public void read(Buffer var1, int var2) { @@ -138,17 +140,17 @@ public class FriendsList extends UserList { } if (var6 != var11.world) { - var11.int2 = ++this.field3603 - 1; + var11.int2 = ++this.field3606 - 1; if (var11.world == -1 && var6 == 0) { - var11.int2 = -(var11.int2 * 604472963) * 509966379; + var11.int2 = -(var11.int2 * 1598123503) * 179134735; } var11.world = var6; } var11.rank = var7; - var11.field3617 = var9; - var11.field3618 = var10; + var11.field3618 = var9; + var11.field3619 = var10; continue; } @@ -159,68 +161,4 @@ public class FriendsList extends UserList { return; } } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(Lky;ZI)V", - garbageValue = "491459043" - ) - public static void method5229(AbstractSocket var0, boolean var1) { - if (class297.NetCache_socket != null) { - try { - class297.NetCache_socket.close(); - } catch (Exception var6) { - } - - class297.NetCache_socket = null; - } - - class297.NetCache_socket = var0; - BuddyRankComparator.method3362(var1); - NetCache.NetCache_responseHeaderBuffer.offset = 0; - PrivateChatMode.NetCache_currentResponse = null; - NetCache.NetCache_responseArchiveBuffer = null; - NetCache.field3150 = 0; - - while (true) { - NetFileRequest var2 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); - if (var2 == null) { - while (true) { - var2 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); - if (var2 == null) { - if (NetCache.field3145 != 0) { - try { - Buffer var7 = new Buffer(4); - var7.writeByte(4); - var7.writeByte(NetCache.field3145); - var7.writeShort(0); - class297.NetCache_socket.write(var7.array, 0, 4); - } catch (IOException var5) { - try { - class297.NetCache_socket.close(); - } catch (Exception var4) { - } - - ++NetCache.NetCache_ioExceptions; - class297.NetCache_socket = null; - } - } - - NetCache.NetCache_loadTime = 0; - NetCache.field3138 = WorldMapID.currentTimeMillis(); - return; - } - - NetCache.NetCache_pendingWritesQueue.addLast(var2); - NetCache.NetCache_pendingWrites.put(var2, var2.key); - ++NetCache.NetCache_pendingWritesCount; - --NetCache.NetCache_pendingResponsesCount; - } - } - - NetCache.NetCache_pendingPriorityWrites.put(var2, var2.key); - ++NetCache.NetCache_pendingPriorityWritesCount; - --NetCache.NetCache_pendingPriorityResponsesCount; - } - } } diff --git a/runescape-client/src/main/java/GZipDecompressor.java b/runescape-client/src/main/java/GZipDecompressor.java index b2d17d9bb7..581241acee 100644 --- a/runescape-client/src/main/java/GZipDecompressor.java +++ b/runescape-client/src/main/java/GZipDecompressor.java @@ -1,19 +1,26 @@ import java.util.zip.Inflater; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lw") +@ObfuscatedName("lg") @Implements("GZipDecompressor") public class GZipDecompressor { - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lgm;" + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -145527417 ) - @Export("midiPcmStream") - public static MidiPcmStream midiPcmStream; - @ObfuscatedName("f") + @Export("SpriteBuffer_spriteWidth") + public static int SpriteBuffer_spriteWidth; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 443544687 + ) + @Export("RunException_revision") + public static int RunException_revision; + @ObfuscatedName("c") @Export("inflater") Inflater inflater; @@ -28,10 +35,10 @@ public class GZipDecompressor { GZipDecompressor(int var1, int var2, int var3) { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lkq;[BI)V", - garbageValue = "367442477" + signature = "(Lkp;[BI)V", + garbageValue = "163268169" ) @Export("decompress") public void decompress(Buffer var1, byte[] var2) { diff --git a/runescape-client/src/main/java/GameObject.java b/runescape-client/src/main/java/GameObject.java index 1e595a0a38..60a28d5506 100644 --- a/runescape-client/src/main/java/GameObject.java +++ b/runescape-client/src/main/java/GameObject.java @@ -4,89 +4,89 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("el") +@ObfuscatedName("ea") @Implements("GameObject") public final class GameObject { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1053912573 + intValue = -940773831 ) @Export("plane") int plane; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 684195751 + intValue = 2132625949 ) @Export("height") int height; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -2140499041 + intValue = -2072532473 ) @Export("centerX") int centerX; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1955373001 + intValue = 1479439291 ) @Export("centerY") int centerY; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lep;" + signature = "Leq;" ) @Export("entity") public Entity entity; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -472959783 + intValue = -638708115 ) @Export("orientation") int orientation; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1045037505 + intValue = -1848719161 ) @Export("startX") int startX; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 820155369 + intValue = 1367330545 ) @Export("endX") int endX; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1317685703 + intValue = 170965517 ) @Export("startY") int startY; - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1799608733 + intValue = -281386629 ) @Export("endY") int endY; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 262139045 + intValue = 459315211 ) - int field1909; - @ObfuscatedName("o") + int field1931; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -792485469 + intValue = 1057625291 ) @Export("lastDrawn") int lastDrawn; @ObfuscatedName("v") @ObfuscatedGetter( - longValue = -9063285699696577959L + longValue = 3023307687483633369L ) @Export("tag") public long tag; - @ObfuscatedName("k") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1504732917 + intValue = -1037464563 ) @Export("flags") int flags; @@ -96,35 +96,120 @@ public final class GameObject { this.flags = 0; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lgo;S)V", - garbageValue = "-26939" + signature = "(II)Liw;", + garbageValue = "-1799291125" ) - public static void method3296(Huffman var0) { - class206.huffman = var0; + @Export("getEnum") + public static EnumDefinition getEnum(int var0) { + EnumDefinition var1 = (EnumDefinition)EnumDefinition.EnumDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = GrandExchangeOfferAgeComparator.EnumDefinition_archive.takeFile(8, var0); + var1 = new EnumDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + EnumDefinition.EnumDefinition_cached.put(var1, (long)var0); + return var1; + } } - @ObfuscatedName("hd") + @ObfuscatedName("fk") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "1099485994" + signature = "(Lip;IIII)V", + garbageValue = "-1299121306" ) - static boolean method3298() { - return (Client.drawPlayerNames & 1) != 0; + @Export("addSequenceSoundEffect") + static void addSequenceSoundEffect(SequenceDefinition var0, int var1, int var2, int var3) { + if (Client.soundEffectCount < 50 && Client.areaSoundEffectVolume != 0) { + if (var0.soundEffects != null && var1 < var0.soundEffects.length) { + int var4 = var0.soundEffects[var1]; + if (var4 != 0) { + int var5 = var4 >> 8; + int var6 = var4 >> 4 & 7; + int var7 = var4 & 15; + Client.soundEffectIds[Client.soundEffectCount] = var5; + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6; + Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; + Client.soundEffects[Client.soundEffectCount] = null; + int var8 = (var2 - 64) / 128; + int var9 = (var3 - 64) / 128; + Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16); + ++Client.soundEffectCount; + } + } + } } - @ObfuscatedName("if") + @ObfuscatedName("ij") @ObfuscatedSignature( - signature = "(IIIIB)V", - garbageValue = "3" + signature = "(B)V", + garbageValue = "101" ) - static final void method3297(int var0, int var1, int var2, int var3) { - for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { - if (Client.rootWidgetWidths[var4] + Client.rootWidgetXs[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetHeights[var4] + Client.rootWidgetYs[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { - Client.field833[var4] = true; + static void method3360() { + int var0; + int var2; + int var3; + for (var0 = 0; var0 < Client.menuOptionsCount; ++var0) { + var2 = Client.menuOpcodes[var0]; + boolean var1 = var2 == 57 || var2 == 58 || var2 == 1007 || var2 == 25 || var2 == 30; + if (var1) { + if (var0 < Client.menuOptionsCount - 1) { + for (var3 = var0; var3 < Client.menuOptionsCount - 1; ++var3) { + Client.menuActions[var3] = Client.menuActions[var3 + 1]; + Client.menuTargets[var3] = Client.menuTargets[var3 + 1]; + Client.menuOpcodes[var3] = Client.menuOpcodes[var3 + 1]; + Client.menuIdentifiers[var3] = Client.menuIdentifiers[var3 + 1]; + Client.menuArguments1[var3] = Client.menuArguments1[var3 + 1]; + Client.menuArguments2[var3] = Client.menuArguments2[var3 + 1]; + Client.menuShiftClick[var3] = Client.menuShiftClick[var3 + 1]; + } + } + + --var0; + --Client.menuOptionsCount; } } + var0 = InterfaceParent.menuWidth / 2 + ArchiveDiskAction.menuX; + int var6 = SecureRandomCallable.menuY; + var2 = class1.fontBold12.stringWidth("Choose Option"); + + int var4; + for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { + var4 = class1.fontBold12.stringWidth(VerticalAlignment.method4426(var3)); + if (var4 > var2) { + var2 = var4; + } + } + + var2 += 8; + var3 = Client.menuOptionsCount * 15 + 22; + var4 = var0 - var2 / 2; + if (var4 + var2 > Username.canvasWidth) { + var4 = Username.canvasWidth - var2; + } + + if (var4 < 0) { + var4 = 0; + } + + int var5 = var6; + if (var3 + var6 > WorldMapData_1.canvasHeight) { + var5 = WorldMapData_1.canvasHeight - var3; + } + + if (var5 < 0) { + var5 = 0; + } + + ArchiveDiskAction.menuX = var4; + SecureRandomCallable.menuY = var5; + InterfaceParent.menuWidth = var2; + Message.menuHeight = Client.menuOptionsCount * 15 + 22; } } diff --git a/runescape-client/src/main/java/GameShell.java b/runescape-client/src/main/java/GameShell.java index d9bcc00df2..bd48217c00 100644 --- a/runescape-client/src/main/java/GameShell.java +++ b/runescape-client/src/main/java/GameShell.java @@ -18,185 +18,181 @@ import java.awt.event.WindowEvent; import java.awt.event.WindowListener; import java.awt.image.ImageObserver; import java.net.URL; -import java.security.SecureRandom; -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bj") +@ObfuscatedName("bf") @Implements("GameShell") public abstract class GameShell extends Applet implements Runnable, FocusListener, WindowListener { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lfl;" + signature = "Lff;" ) @Export("taskHandler") protected static TaskHandler taskHandler; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lbj;" + signature = "Lbf;" ) @Export("gameShell") static GameShell gameShell; - @ObfuscatedName("p") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -641610179 + intValue = 196022413 ) @Export("GameShell_redundantStartThreadCount") static int GameShell_redundantStartThreadCount; - @ObfuscatedName("b") + @ObfuscatedName("e") @ObfuscatedGetter( - longValue = 9100784568139966685L + longValue = 528235064491181747L ) @Export("stopTimeMs") static long stopTimeMs; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("isKilled") static boolean isKilled; - @ObfuscatedName("d") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1686581025 - ) - @Export("gameCyclesToDo") - static int gameCyclesToDo; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 777361689 + intValue = -1437299021 ) @Export("cycleDurationMillis") static int cycleDurationMillis; - @ObfuscatedName("o") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -224666491 + intValue = 1661201835 ) @Export("fiveOrOne") static int fiveOrOne; - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1353428271 + intValue = 71022173 ) @Export("fps") protected static int fps; - @ObfuscatedName("l") + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "Lfu;" + ) + @Export("clock") + static Clock clock; + @ObfuscatedName("v") @Export("graphicsTickTimes") static long[] graphicsTickTimes; - @ObfuscatedName("j") - @Export("clientTickTimes") - static long[] clientTickTimes; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1909325521 + intValue = 1251279017 ) - @Export("clientTickTimeIdx") - static int clientTickTimeIdx; - @ObfuscatedName("an") + @Export("graphicsTickTimeIdx") + static int graphicsTickTimeIdx; + @ObfuscatedName("k") + @Export("clientTickTimes") + static long[] clientTickTimes; + @ObfuscatedName("ax") + @Export("fontHelvetica13") + static java.awt.Font fontHelvetica13; + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 2131484097 + intValue = -2072327309 ) - static int field442; - @ObfuscatedName("ag") - @Export("null_string") - protected static String null_string; - @ObfuscatedName("aj") + static int field467; + @ObfuscatedName("ao") @Export("volatileFocus") static volatile boolean volatileFocus; - @ObfuscatedName("ax") - @Export("hasFocus") - protected static boolean hasFocus; - @ObfuscatedName("af") + @ObfuscatedName("ag") @ObfuscatedGetter( - longValue = -7455668371205512405L + longValue = 8963656007047949345L ) @Export("garbageCollectorLastCollectionTime") static long garbageCollectorLastCollectionTime; - @ObfuscatedName("ap") + @ObfuscatedName("ai") @ObfuscatedGetter( - longValue = 4016569584123468349L + longValue = 9016661795378889985L ) @Export("garbageCollectorLastCheckTimeMs") static long garbageCollectorLastCheckTimeMs; - @ObfuscatedName("a") + @ObfuscatedName("bw") + static String field477; + @ObfuscatedName("g") @Export("hasErrored") boolean hasErrored; - @ObfuscatedName("u") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1294552549 + intValue = -1999078243 ) @Export("contentWidth") protected int contentWidth; - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1325726667 + intValue = 1778726039 ) @Export("contentHeight") protected int contentHeight; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 301736505 + intValue = -1382967399 ) @Export("canvasX") int canvasX; - @ObfuscatedName("m") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -380682277 + intValue = 2050862529 ) @Export("canvasY") int canvasY; - @ObfuscatedName("q") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 177005865 + intValue = 2042423139 ) - int field422; - @ObfuscatedName("aa") + int field459; + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -973414545 + intValue = 96857059 ) - int field419; - @ObfuscatedName("av") + int field464; + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -1421773905 + intValue = -460678809 ) @Export("maxCanvasWidth") int maxCanvasWidth; - @ObfuscatedName("aw") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -1295726035 + intValue = 875531909 ) @Export("maxCanvasHeight") int maxCanvasHeight; @ObfuscatedName("au") @Export("frame") Frame frame; - @ObfuscatedName("ah") + @ObfuscatedName("ay") @Export("canvas") java.awt.Canvas canvas; - @ObfuscatedName("aq") - volatile boolean field441; - @ObfuscatedName("ar") + @ObfuscatedName("aa") + volatile boolean field466; + @ObfuscatedName("ak") @Export("resizeCanvasNextFrame") boolean resizeCanvasNextFrame; - @ObfuscatedName("az") + @ObfuscatedName("ac") @Export("isCanvasInvalid") volatile boolean isCanvasInvalid; - @ObfuscatedName("ay") + @ObfuscatedName("aw") @ObfuscatedGetter( - longValue = -550233093924080547L + longValue = -8817424516804380497L ) - volatile long field418; + volatile long field470; @ObfuscatedName("al") @ObfuscatedSignature( - signature = "Lad;" + signature = "Lao;" ) @Export("mouseWheelHandler") MouseWheelHandler mouseWheelHandler; - @ObfuscatedName("ae") + @ObfuscatedName("ad") @Export("clipboard") Clipboard clipboard; - @ObfuscatedName("ad") + @ObfuscatedName("am") @Export("eventQueue") final EventQueue eventQueue; @@ -210,7 +206,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene fps = 0; graphicsTickTimes = new long[32]; clientTickTimes = new long[32]; - field442 = 500; + field467 = 500; volatileFocus = true; garbageCollectorLastCollectionTime = -1L; garbageCollectorLastCheckTimeMs = -1L; @@ -220,10 +216,10 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.hasErrored = false; this.canvasX = 0; this.canvasY = 0; - this.field441 = true; + this.field466 = true; this.resizeCanvasNextFrame = false; this.isCanvasInvalid = false; - this.field418 = 0L; + this.field470 = 0L; EventQueue var1 = null; try { @@ -232,34 +228,34 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } this.eventQueue = var1; - FriendLoginUpdate.method5300(new DevicePcmPlayerProvider()); + UserComparator9.method3462(new DevicePcmPlayerProvider()); } - @ObfuscatedName("a") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-472959783" + garbageValue = "-184957247" ) @Export("setMaxCanvasSize") protected final void setMaxCanvasSize(int var1, int var2) { if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { - this.method936(); + this.method947(); } this.maxCanvasWidth = var1; this.maxCanvasHeight = var2; } - @ObfuscatedName("d") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Ljava/lang/Object;B)V", - garbageValue = "-24" + signature = "(Ljava/lang/Object;I)V", + garbageValue = "-1941582772" ) @Export("post") final void post(Object var1) { if (this.eventQueue != null) { for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { - ServerBuild.method4111(1L); + FriendLoginUpdate.method5325(1L); } if (var1 != null) { @@ -269,10 +265,10 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } - @ObfuscatedName("c") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)Lfs;", - garbageValue = "-1343369981" + signature = "(I)Lfi;", + garbageValue = "-1591236478" ) @Export("mouseWheel") protected MouseWheel mouseWheel() { @@ -284,41 +280,44 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene return this.mouseWheelHandler; } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-2116975887" + signature = "(B)V", + garbageValue = "75" ) @Export("setUpClipboard") protected void setUpClipboard() { this.clipboard = this.getToolkit().getSystemClipboard(); } - @ObfuscatedName("l") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Ljava/lang/String;S)V", - garbageValue = "-9007" + signature = "(Ljava/lang/String;I)V", + garbageValue = "794890574" ) @Export("clipboardSetString") protected void clipboardSetString(String var1) { this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-54" + signature = "(I)V", + garbageValue = "-1563804954" ) @Export("setUpKeyboard") protected final void setUpKeyboard() { - WorldMapData_1.method722(); - GrandExchangeOfferTotalQuantityComparator.method93(this.canvas); + UserComparator4.method3451(); + java.awt.Canvas var1 = this.canvas; + var1.setFocusTraversalKeysEnabled(false); + var1.addKeyListener(KeyHandler.KeyHandler_instance); + var1.addFocusListener(KeyHandler.KeyHandler_instance); } - @ObfuscatedName("j") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-57" + signature = "(I)V", + garbageValue = "-1024883115" ) @Export("setUpMouse") protected final void setUpMouse() { @@ -328,18 +327,18 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene var1.addFocusListener(MouseHandler.MouseHandler_instance); } - @ObfuscatedName("n") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-92" + signature = "(I)V", + garbageValue = "-1230297818" ) @Export("resizeCanvas") final void resizeCanvas() { Container var1 = this.container(); if (var1 != null) { Bounds var2 = this.getFrameContentBounds(); - this.contentWidth = Math.max(var2.highX, this.field422); - this.contentHeight = Math.max(var2.highY, this.field419); + this.contentWidth = Math.max(var2.highX, this.field459); + this.contentHeight = Math.max(var2.highY, this.field464); if (this.contentWidth <= 0) { this.contentWidth = 1; } @@ -348,43 +347,43 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.contentHeight = 1; } - GrandExchangeOfferTotalQuantityComparator.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); - AttackOption.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); - this.canvasX = (this.contentWidth - GrandExchangeOfferTotalQuantityComparator.canvasWidth) / 2; + Username.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); + WorldMapData_1.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); + this.canvasX = (this.contentWidth - Username.canvasWidth) / 2; this.canvasY = 0; - this.canvas.setSize(GrandExchangeOfferTotalQuantityComparator.canvasWidth, AttackOption.canvasHeight); - IgnoreList.rasterProvider = new RasterProvider(GrandExchangeOfferTotalQuantityComparator.canvasWidth, AttackOption.canvasHeight, this.canvas); + this.canvas.setSize(Username.canvasWidth, WorldMapData_1.canvasHeight); + DevicePcmPlayerProvider.rasterProvider = new RasterProvider(Username.canvasWidth, WorldMapData_1.canvasHeight, this.canvas); if (var1 == this.frame) { Insets var3 = this.frame.getInsets(); - this.canvas.setLocation(this.canvasX + var3.left, var3.top + this.canvasY); + this.canvas.setLocation(var3.left + this.canvasX, this.canvasY + var3.top); } else { this.canvas.setLocation(this.canvasX, this.canvasY); } - this.field441 = true; + this.field466 = true; this.resizeGame(); } } - @ObfuscatedName("u") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1309389764" + garbageValue = "1781530375" ) @Export("resizeGame") protected abstract void resizeGame(); - @ObfuscatedName("z") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "14" + signature = "(I)V", + garbageValue = "-1864888047" ) @Export("clearBackground") void clearBackground() { int var1 = this.canvasX; int var2 = this.canvasY; - int var3 = this.contentWidth - GrandExchangeOfferTotalQuantityComparator.canvasWidth - var1; - int var4 = this.contentHeight - AttackOption.canvasHeight - var2; + int var3 = this.contentWidth - Username.canvasWidth - var1; + int var4 = this.contentHeight - WorldMapData_1.canvasHeight - var2; if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { try { Container var5 = this.container(); @@ -419,40 +418,43 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } - @ObfuscatedName("h") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1861012974" + garbageValue = "-557275570" ) @Export("replaceCanvas") final void replaceCanvas() { - ArchiveDiskAction.method4120(this.canvas); java.awt.Canvas var1 = this.canvas; - var1.removeMouseListener(MouseHandler.MouseHandler_instance); - var1.removeMouseMotionListener(MouseHandler.MouseHandler_instance); - var1.removeFocusListener(MouseHandler.MouseHandler_instance); + var1.removeKeyListener(KeyHandler.KeyHandler_instance); + var1.removeFocusListener(KeyHandler.KeyHandler_instance); + KeyHandler.field387 = -1; + java.awt.Canvas var2 = this.canvas; + var2.removeMouseListener(MouseHandler.MouseHandler_instance); + var2.removeMouseMotionListener(MouseHandler.MouseHandler_instance); + var2.removeFocusListener(MouseHandler.MouseHandler_instance); MouseHandler.MouseHandler_currentButtonVolatile = 0; if (this.mouseWheelHandler != null) { this.mouseWheelHandler.removeFrom(this.canvas); } this.addCanvas(); - GrandExchangeOfferTotalQuantityComparator.method93(this.canvas); - java.awt.Canvas var2 = this.canvas; - var2.addMouseListener(MouseHandler.MouseHandler_instance); - var2.addMouseMotionListener(MouseHandler.MouseHandler_instance); - var2.addFocusListener(MouseHandler.MouseHandler_instance); + java.awt.Canvas var3 = this.canvas; + var3.setFocusTraversalKeysEnabled(false); + var3.addKeyListener(KeyHandler.KeyHandler_instance); + var3.addFocusListener(KeyHandler.KeyHandler_instance); + BuddyRankComparator.method3505(this.canvas); if (this.mouseWheelHandler != null) { this.mouseWheelHandler.addTo(this.canvas); } - this.method936(); + this.method947(); } - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(IIII)V", - garbageValue = "1709387242" + signature = "(IIIB)V", + garbageValue = "0" ) @Export("startThread") protected final void startThread(int var1, int var2, int var3) { @@ -469,9 +471,9 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } gameShell = this; - GrandExchangeOfferTotalQuantityComparator.canvasWidth = var1; - AttackOption.canvasHeight = var2; - RunException.RunException_revision = var3; + Username.canvasWidth = var1; + WorldMapData_1.canvasHeight = var2; + GZipDecompressor.RunException_revision = var3; RunException.RunException_applet = this; if (taskHandler == null) { taskHandler = new TaskHandler(); @@ -479,16 +481,16 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene taskHandler.newThreadTask(this, 1); } catch (Exception var5) { - DesktopPlatformInfoProvider.RunException_sendStackTrace((String)null, var5); + class225.RunException_sendStackTrace((String)null, var5); this.error("crash"); } } - @ObfuscatedName("aa") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1793942402" + signature = "(B)V", + garbageValue = "6" ) @Export("addCanvas") final synchronized void addCanvas() { @@ -498,47 +500,47 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene var1.remove(this.canvas); } - GrandExchangeOfferTotalQuantityComparator.canvasWidth = Math.max(var1.getWidth(), this.field422); - AttackOption.canvasHeight = Math.max(var1.getHeight(), this.field419); + Username.canvasWidth = Math.max(var1.getWidth(), this.field459); + WorldMapData_1.canvasHeight = Math.max(var1.getHeight(), this.field464); Insets var2; if (this.frame != null) { var2 = this.frame.getInsets(); - GrandExchangeOfferTotalQuantityComparator.canvasWidth -= var2.left + var2.right; - AttackOption.canvasHeight -= var2.top + var2.bottom; + Username.canvasWidth -= var2.left + var2.right; + WorldMapData_1.canvasHeight -= var2.top + var2.bottom; } this.canvas = new Canvas(this); var1.setBackground(Color.BLACK); var1.setLayout((LayoutManager)null); var1.add(this.canvas); - this.canvas.setSize(GrandExchangeOfferTotalQuantityComparator.canvasWidth, AttackOption.canvasHeight); + this.canvas.setSize(Username.canvasWidth, WorldMapData_1.canvasHeight); this.canvas.setVisible(true); this.canvas.setBackground(Color.BLACK); if (var1 == this.frame) { var2 = this.frame.getInsets(); - this.canvas.setLocation(this.canvasX + var2.left, var2.top + this.canvasY); + this.canvas.setLocation(this.canvasX + var2.left, this.canvasY + var2.top); } else { this.canvas.setLocation(this.canvasX, this.canvasY); } this.canvas.addFocusListener(this); this.canvas.requestFocus(); - this.field441 = true; - if (IgnoreList.rasterProvider != null && GrandExchangeOfferTotalQuantityComparator.canvasWidth == IgnoreList.rasterProvider.width && AttackOption.canvasHeight == IgnoreList.rasterProvider.height) { - ((RasterProvider)IgnoreList.rasterProvider).setComponent(this.canvas); - IgnoreList.rasterProvider.drawFull(0, 0); + this.field466 = true; + if (DevicePcmPlayerProvider.rasterProvider != null && Username.canvasWidth == DevicePcmPlayerProvider.rasterProvider.width && WorldMapData_1.canvasHeight == DevicePcmPlayerProvider.rasterProvider.height) { + ((RasterProvider)DevicePcmPlayerProvider.rasterProvider).setComponent(this.canvas); + DevicePcmPlayerProvider.rasterProvider.drawFull(0, 0); } else { - IgnoreList.rasterProvider = new RasterProvider(GrandExchangeOfferTotalQuantityComparator.canvasWidth, AttackOption.canvasHeight, this.canvas); + DevicePcmPlayerProvider.rasterProvider = new RasterProvider(Username.canvasWidth, WorldMapData_1.canvasHeight, this.canvas); } this.isCanvasInvalid = false; - this.field418 = WorldMapID.currentTimeMillis(); + this.field470 = WorldMapIcon_0.currentTimeMillis(); } - @ObfuscatedName("av") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1830524310" + garbageValue = "1249538229" ) @Export("checkHost") protected final boolean checkHost() { @@ -567,52 +569,52 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } - @ObfuscatedName("aw") + @ObfuscatedName("ax") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "-25" + garbageValue = "34" ) @Export("clientTick") void clientTick() { - long var1 = WorldMapID.currentTimeMillis(); - long var3 = clientTickTimes[clientTickTimeIdx]; - clientTickTimes[clientTickTimeIdx] = var1; - clientTickTimeIdx = clientTickTimeIdx + 1 & 31; + long var1 = WorldMapIcon_0.currentTimeMillis(); + long var3 = clientTickTimes[class14.clientTickTimeIdx]; + clientTickTimes[class14.clientTickTimeIdx] = var1; + class14.clientTickTimeIdx = class14.clientTickTimeIdx + 1 & 31; if (var3 != 0L && var1 > var3) { } synchronized(this) { - hasFocus = volatileFocus; + GrandExchangeOfferTotalQuantityComparator.hasFocus = volatileFocus; } this.doCycle(); } - @ObfuscatedName("as") + @ObfuscatedName("aj") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-2091999250" + garbageValue = "44654688" ) @Export("graphicsTick") void graphicsTick() { Container var1 = this.container(); - long var2 = WorldMapID.currentTimeMillis(); - long var4 = graphicsTickTimes[class30.graphicsTickTimeIdx]; - graphicsTickTimes[class30.graphicsTickTimeIdx] = var2; - class30.graphicsTickTimeIdx = class30.graphicsTickTimeIdx + 1 & 31; - if (0L != var4 && var2 > var4) { + long var2 = WorldMapIcon_0.currentTimeMillis(); + long var4 = graphicsTickTimes[graphicsTickTimeIdx]; + graphicsTickTimes[graphicsTickTimeIdx] = var2; + graphicsTickTimeIdx = graphicsTickTimeIdx + 1 & 31; + if (var4 != 0L && var2 > var4) { int var6 = (int)(var2 - var4); fps = ((var6 >> 1) + 32000) / var6; } - if (++field442 - 1 > 50) { - field442 -= 50; - this.field441 = true; - this.canvas.setSize(GrandExchangeOfferTotalQuantityComparator.canvasWidth, AttackOption.canvasHeight); + if (++field467 - 1 > 50) { + field467 -= 50; + this.field466 = true; + this.canvas.setSize(Username.canvasWidth, WorldMapData_1.canvasHeight); this.canvas.setVisible(true); if (var1 == this.frame) { Insets var7 = this.frame.getInsets(); - this.canvas.setLocation(var7.left + this.canvasX, this.canvasY + var7.top); + this.canvas.setLocation(this.canvasX + var7.left, this.canvasY + var7.top); } else { this.canvas.setLocation(this.canvasX, this.canvasY); } @@ -622,21 +624,21 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.replaceCanvas(); } - this.method998(); - this.draw(this.field441); - if (this.field441) { + this.method938(); + this.draw(this.field466); + if (this.field466) { this.clearBackground(); } - this.field441 = false; + this.field466 = false; } - @ObfuscatedName("ak") + @ObfuscatedName("au") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-1" + signature = "(I)V", + garbageValue = "847743243" ) - final void method998() { + final void method938() { Bounds var1 = this.getFrameContentBounds(); if (var1.highX != this.contentWidth || var1.highY != this.contentHeight || this.resizeCanvasNextFrame) { this.resizeCanvas(); @@ -645,19 +647,19 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } - @ObfuscatedName("au") + @ObfuscatedName("ay") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "24" + garbageValue = "-92" ) - final void method936() { + final void method947() { this.resizeCanvasNextFrame = true; } - @ObfuscatedName("ah") + @ObfuscatedName("aa") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "12" + garbageValue = "-46" ) @Export("kill") final synchronized void kill() { @@ -688,91 +690,91 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } - this.vmethod1290(); + this.vmethod1478(); } } - @ObfuscatedName("ao") + @ObfuscatedName("as") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "557803519" + garbageValue = "159835862" ) @Export("setUp") protected abstract void setUp(); - @ObfuscatedName("ae") + @ObfuscatedName("ak") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1971545072" + garbageValue = "1684911639" ) @Export("doCycle") protected abstract void doCycle(); - @ObfuscatedName("ad") + @ObfuscatedName("ac") @ObfuscatedSignature( signature = "(ZI)V", - garbageValue = "-1655647135" + garbageValue = "-1486807503" ) @Export("draw") protected abstract void draw(boolean var1); - @ObfuscatedName("aj") + @ObfuscatedName("aw") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1818676977" + garbageValue = "-2144356516" ) @Export("kill0") protected abstract void kill0(); - @ObfuscatedName("ax") + @ObfuscatedName("ar") @ObfuscatedSignature( - signature = "(ILjava/lang/String;ZB)V", - garbageValue = "58" + signature = "(ILjava/lang/String;ZI)V", + garbageValue = "-1421329320" ) @Export("drawInitial") protected final void drawInitial(int var1, String var2, boolean var3) { try { Graphics var4 = this.canvas.getGraphics(); - if (NetSocket.fontHelvetica13 == null) { - NetSocket.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); - WorldMapSprite.loginScreenFontMetrics = this.canvas.getFontMetrics(NetSocket.fontHelvetica13); + if (fontHelvetica13 == null) { + fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); + class42.loginScreenFontMetrics = this.canvas.getFontMetrics(fontHelvetica13); } if (var3) { var4.setColor(Color.black); - var4.fillRect(0, 0, GrandExchangeOfferTotalQuantityComparator.canvasWidth, AttackOption.canvasHeight); + var4.fillRect(0, 0, Username.canvasWidth, WorldMapData_1.canvasHeight); } Color var5 = new Color(140, 17, 17); try { - if (class189.field2333 == null) { - class189.field2333 = this.canvas.createImage(304, 34); + if (WorldMapRegion.field254 == null) { + WorldMapRegion.field254 = this.canvas.createImage(304, 34); } - Graphics var6 = class189.field2333.getGraphics(); + Graphics var6 = WorldMapRegion.field254.getGraphics(); var6.setColor(var5); var6.drawRect(0, 0, 303, 33); var6.fillRect(2, 2, var1 * 3, 30); var6.setColor(Color.black); var6.drawRect(1, 1, 301, 31); var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); - var6.setFont(NetSocket.fontHelvetica13); + var6.setFont(fontHelvetica13); var6.setColor(Color.white); - var6.drawString(var2, (304 - WorldMapSprite.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); - var4.drawImage(class189.field2333, GrandExchangeOfferTotalQuantityComparator.canvasWidth / 2 - 152, AttackOption.canvasHeight / 2 - 18, (ImageObserver)null); + var6.drawString(var2, (304 - class42.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); + var4.drawImage(WorldMapRegion.field254, Username.canvasWidth / 2 - 152, WorldMapData_1.canvasHeight / 2 - 18, (ImageObserver)null); } catch (Exception var9) { - int var7 = GrandExchangeOfferTotalQuantityComparator.canvasWidth / 2 - 152; - int var8 = AttackOption.canvasHeight / 2 - 18; + int var7 = Username.canvasWidth / 2 - 152; + int var8 = WorldMapData_1.canvasHeight / 2 - 18; var4.setColor(var5); var4.drawRect(var7, var8, 303, 33); var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); var4.setColor(Color.black); var4.drawRect(var7 + 1, var8 + 1, 301, 31); var4.fillRect(var7 + var1 * 3 + 2, var8 + 2, 300 - var1 * 3, 30); - var4.setFont(NetSocket.fontHelvetica13); + var4.setFont(fontHelvetica13); var4.setColor(Color.white); - var4.drawString(var2, var7 + (304 - WorldMapSprite.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); + var4.drawString(var2, var7 + (304 - class42.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); } } catch (Exception var10) { this.canvas.repaint(); @@ -780,21 +782,21 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } - @ObfuscatedName("at") + @ObfuscatedName("av") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "21" + garbageValue = "-36" ) - protected final void method947() { - class189.field2333 = null; - NetSocket.fontHelvetica13 = null; - WorldMapSprite.loginScreenFontMetrics = null; + protected final void method952() { + WorldMapRegion.field254 = null; + fontHelvetica13 = null; + class42.loginScreenFontMetrics = null; } - @ObfuscatedName("af") + @ObfuscatedName("al") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "-2001390999" + signature = "(Ljava/lang/String;B)V", + garbageValue = "-33" ) @Export("error") protected void error(String var1) { @@ -810,26 +812,26 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } - @ObfuscatedName("ap") + @ObfuscatedName("ad") @ObfuscatedSignature( signature = "(I)Ljava/awt/Container;", - garbageValue = "-1758438210" + garbageValue = "103754322" ) @Export("container") Container container() { return (Container)(this.frame != null ? this.frame : this); } - @ObfuscatedName("ai") + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(I)Llh;", - garbageValue = "1983468330" + signature = "(I)Lll;", + garbageValue = "1892805538" ) @Export("getFrameContentBounds") Bounds getFrameContentBounds() { Container var1 = this.container(); - int var2 = Math.max(var1.getWidth(), this.field422); - int var3 = Math.max(var1.getHeight(), this.field419); + int var2 = Math.max(var1.getWidth(), this.field459); + int var3 = Math.max(var1.getHeight(), this.field464); if (this.frame != null) { Insets var4 = this.frame.getInsets(); var2 -= var4.right + var4.left; @@ -839,29 +841,29 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene return new Bounds(var2, var3); } - @ObfuscatedName("am") + @ObfuscatedName("ao") @ObfuscatedSignature( signature = "(B)Z", - garbageValue = "67" + garbageValue = "101" ) @Export("hasFrame") protected final boolean hasFrame() { return this.frame != null; } - @ObfuscatedName("bj") + @ObfuscatedName("an") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1677674321" + signature = "(B)V", + garbageValue = "-2" ) - protected abstract void vmethod1290(); + protected abstract void vmethod1478(); public final synchronized void paint(Graphics var1) { if (this == gameShell && !isKilled) { - this.field441 = true; - if (WorldMapID.currentTimeMillis() - this.field418 > 1000L) { + this.field466 = true; + if (WorldMapIcon_0.currentTimeMillis() - this.field470 > 1000L) { Rectangle var2 = var1.getClipBounds(); - if (var2 == null || var2.width >= GrandExchangeOfferTotalQuantityComparator.canvasWidth && var2.height >= AttackOption.canvasHeight) { + if (var2 == null || var2.width >= Username.canvasWidth && var2.height >= WorldMapData_1.canvasHeight) { this.isCanvasInvalid = true; } } @@ -871,18 +873,56 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene public final void destroy() { if (this == gameShell && !isKilled) { - stopTimeMs = WorldMapID.currentTimeMillis(); - ServerBuild.method4111(5000L); + stopTimeMs = WorldMapIcon_0.currentTimeMillis(); + FriendLoginUpdate.method5325(5000L); this.kill(); } } + public final void start() { + if (this == gameShell && !isKilled) { + stopTimeMs = 0L; + } + } + + public final void focusGained(FocusEvent var1) { + volatileFocus = true; + this.field466 = true; + } + + public final void windowClosed(WindowEvent var1) { + } + + public final void windowDeactivated(WindowEvent var1) { + } + + public final void windowDeiconified(WindowEvent var1) { + } + + public final void windowIconified(WindowEvent var1) { + } + + public final void windowOpened(WindowEvent var1) { + } + + public final void stop() { + if (this == gameShell && !isKilled) { + stopTimeMs = WorldMapIcon_0.currentTimeMillis() + 4000L; + } + } + + public abstract void init(); + + public final void update(Graphics var1) { + this.paint(var1); + } + public void run() { try { if (TaskHandler.javaVendor != null) { String var1 = TaskHandler.javaVendor.toLowerCase(); if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { - String var2 = TaskHandler.javaVersion; + String var2 = class216.javaVersion; if (var2.equals("1.1") || var2.startsWith("1.1.") || var2.equals("1.2") || var2.startsWith("1.2.") || var2.equals("1.3") || var2.startsWith("1.3.") || var2.equals("1.4") || var2.startsWith("1.4.") || var2.equals("1.5") || var2.startsWith("1.5.") || var2.equals("1.6.0")) { this.error("wrongjava"); return; @@ -890,11 +930,11 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene if (var2.startsWith("1.6.0_")) { int var3; - for (var3 = 6; var3 < var2.length() && class237.isDigit(var2.charAt(var3)); ++var3) { + for (var3 = 6; var3 < var2.length() && class14.isDigit(var2.charAt(var3)); ++var3) { } String var4 = var2.substring(6, var3); - if (SecureRandomFuture.isNumber(var4) && ArchiveDiskActionHandler.parseInt(var4) < 10) { + if (class248.isNumber(var4) && VerticalAlignment.parseInt(var4) < 10) { this.error("wrongjava"); return; } @@ -907,12 +947,12 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.setFocusCycleRoot(true); this.addCanvas(); this.setUp(); - Varps.clock = class30.method540(); + clock = Client.method1432(); - while (0L == stopTimeMs || WorldMapID.currentTimeMillis() < stopTimeMs) { - gameCyclesToDo = Varps.clock.wait(cycleDurationMillis, fiveOrOne); + while (stopTimeMs == 0L || WorldMapIcon_0.currentTimeMillis() < stopTimeMs) { + Fonts.gameCyclesToDo = clock.wait(cycleDurationMillis, fiveOrOne); - for (int var5 = 0; var5 < gameCyclesToDo; ++var5) { + for (int var5 = 0; var5 < Fonts.gameCyclesToDo; ++var5) { this.clientTick(); } @@ -920,210 +960,159 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.post(this.canvas); } } catch (Exception var6) { - DesktopPlatformInfoProvider.RunException_sendStackTrace((String)null, var6); + class225.RunException_sendStackTrace((String)null, var6); this.error("crash"); } this.kill(); } - public final void start() { - if (this == gameShell && !isKilled) { - stopTimeMs = 0L; - } + public final void windowClosing(WindowEvent var1) { + this.destroy(); } - public final void update(Graphics var1) { - this.paint(var1); - } - - public final void stop() { - if (this == gameShell && !isKilled) { - stopTimeMs = WorldMapID.currentTimeMillis() + 4000L; - } - } - - public final void focusGained(FocusEvent var1) { - volatileFocus = true; - this.field441 = true; + public final void windowActivated(WindowEvent var1) { } public final void focusLost(FocusEvent var1) { volatileFocus = false; } - public final void windowActivated(WindowEvent var1) { - } - - public final void windowClosing(WindowEvent var1) { - this.destroy(); - } - - public final void windowDeactivated(WindowEvent var1) { - } - - public final void windowDeiconified(WindowEvent var1) { - } - - public final void windowOpened(WindowEvent var1) { - } - - public abstract void init(); - - public final void windowIconified(WindowEvent var1) { - } - - public final void windowClosed(WindowEvent var1) { - } - - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)Ljava/security/SecureRandom;", - garbageValue = "115447225" + signature = "(Lii;II)Lgr;", + garbageValue = "-1004911552" ) - static SecureRandom method1069() { - SecureRandom var0 = new SecureRandom(); - var0.nextInt(); - return var0; - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-693907391" - ) - @Export("getVarbit") - public static int getVarbit(int var0) { - VarbitDefinition var1 = UserComparator9.method3319(var0); - int var2 = var1.baseVar; - int var3 = var1.startBit; - int var4 = var1.endBit; - int var5 = Varps.Varps_masks[var4 - var3]; - return Varps.Varps_main[var2] >> var3 & var5; - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "907753362" - ) - @Export("addChatMessage") - static void addChatMessage(int var0, String var1, String var2, String var3) { - ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); - if (var4 == null) { - var4 = new ChatChannel(); - Messages.Messages_channels.put(var0, var4); - } - - Message var5 = var4.addMessage(var0, var1, var2, var3); - Messages.Messages_hashTable.put(var5, (long)var5.count); - Messages.Messages_queue.add(var5); - Client.chatCycle = Client.cycleCntr; + static MusicPatch method1067(AbstractArchive var0, int var1) { + byte[] var2 = var0.takeFileFlat(var1); + return var2 == null ? null : new MusicPatch(var2); } @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IIII)I", - garbageValue = "-1840068050" + signature = "(Ljava/lang/CharSequence;I)I", + garbageValue = "-32048125" ) - @Export("hslToRgb") - static final int hslToRgb(int var0, int var1, int var2) { - if (var2 > 179) { - var1 /= 2; + @Export("hashString") + public static int hashString(CharSequence var0) { + int var1 = var0.length(); + int var2 = 0; + + for (int var3 = 0; var3 < var1; ++var3) { + var2 = (var2 << 5) - var2 + TextureProvider.charToByteCp1252(var0.charAt(var3)); } - if (var2 > 192) { - var1 /= 2; - } - - if (var2 > 217) { - var1 /= 2; - } - - if (var2 > 243) { - var1 /= 2; - } - - int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; - return var3; + return var2; } - @ObfuscatedName("m") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(ILcu;ZB)I", - garbageValue = "34" + signature = "(IIIZII)J", + garbageValue = "1623349797" ) - static int method1068(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { - var3 = Tile.getWidget(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.itemId; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { - var3 = Tile.getWidget(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); - if (var3.itemId != -1) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.itemQuantity; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - } + @Export("calculateTag") + public static long calculateTag(int var0, int var1, int var2, boolean var3, int var4) { + long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17; + if (var3) { + var5 |= 65536L; + } - return 1; - } else if (var0 == ScriptOpcodes.IF_HASSUB) { - int var5 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var5); - if (var4 != null) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - } + return var5; + } - return 1; - } else if (var0 == ScriptOpcodes.IF_GETTOP) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.rootInterface; - return 1; + @ObfuscatedName("ff") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "856923102" + ) + @Export("getLoginError") + static void getLoginError(int var0) { + if (var0 == -3) { + Tiles.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); + } else if (var0 == -2) { + Tiles.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); + } else if (var0 == -1) { + Tiles.setLoginResponseString("No response from server.", "Please try using a different world.", ""); + } else if (var0 == 3) { + Login.loginIndex = 3; + Login.field1193 = 1; + } else if (var0 == 4) { + Login.loginIndex = 12; + Login.field1165 = 0; + } else if (var0 == 5) { + Login.field1193 = 2; + Tiles.setLoginResponseString("Your account has not logged out from its last", "session or the server is too busy right now.", "Please try again in a few minutes."); + } else if (var0 == 68 || !Client.onMobile && var0 == 6) { + Tiles.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); + } else if (var0 == 7) { + Tiles.setLoginResponseString("This world is full.", "Please use a different world.", ""); + } else if (var0 == 8) { + Tiles.setLoginResponseString("Unable to connect.", "Login server offline.", ""); + } else if (var0 == 9) { + Tiles.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); + } else if (var0 == 10) { + Tiles.setLoginResponseString("Unable to connect.", "Bad session id.", ""); + } else if (var0 == 11) { + Tiles.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); + } else if (var0 == 12) { + Tiles.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); + } else if (var0 == 13) { + Tiles.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); + } else if (var0 == 14) { + Tiles.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 16) { + Tiles.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); + } else if (var0 == 17) { + Tiles.setLoginResponseString("You are standing in a members-only area.", "To play on this world move to a free area first", ""); + } else if (var0 == 18) { + Login.loginIndex = 12; + Login.field1165 = 1; + } else if (var0 == 19) { + Tiles.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); + } else if (var0 == 20) { + Tiles.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); + } else if (var0 == 22) { + Tiles.setLoginResponseString("Malformed login packet.", "Please try again.", ""); + } else if (var0 == 23) { + Tiles.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 24) { + Tiles.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); + } else if (var0 == 25) { + Tiles.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); + } else if (var0 == 26) { + Tiles.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); + } else if (var0 == 27) { + Tiles.setLoginResponseString("", "Service unavailable.", ""); + } else if (var0 == 31) { + Tiles.setLoginResponseString("Your account must have a displayname set", "in order to play the game. Please set it", "via the website, or the main game."); + } else if (var0 == 32) { + Tiles.setLoginResponseString("Your attempt to log into your account was", "unsuccessful. Don't worry, you can sort", "this out by visiting the billing system."); + } else if (var0 == 37) { + Tiles.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); + } else if (var0 == 38) { + Tiles.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); + } else if (var0 == 55) { + Login.loginIndex = 8; } else { - return 2; - } - } - - @ObfuscatedName("kd") - @ObfuscatedSignature( - signature = "(IS)V", - garbageValue = "-12664" - ) - @Export("Widget_resetModelFrames") - static final void Widget_resetModelFrames(int var0) { - if (MusicPatch.loadInterface(var0)) { - Widget[] var1 = UserComparator7.Widget_interfaceComponents[var0]; - - for (int var2 = 0; var2 < var1.length; ++var2) { - Widget var3 = var1[var2]; - if (var3 != null) { - var3.modelFrame = 0; - var3.modelFrameCycle = 0; - } + if (var0 == 56) { + Tiles.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); + Projectile.updateGameState(11); + return; } - } - } + if (var0 == 57) { + Tiles.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); + Projectile.updateGameState(11); + return; + } - @ObfuscatedName("kh") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-120" - ) - @Export("FriendSystem_invalidateIgnoreds") - static final void FriendSystem_invalidateIgnoreds() { - Iterator var0 = Messages.Messages_hashTable.iterator(); - - while (var0.hasNext()) { - Message var1 = (Message)var0.next(); - var1.clearIsFromIgnored(); - } - - if (Calendar.clanChat != null) { - Calendar.clanChat.invalidateIgnoreds(); + if (var0 == 61) { + Login.loginIndex = 7; + } else { + Tiles.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); + } } + Projectile.updateGameState(10); } } diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index 8169910b07..27a1ffe422 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -1,60 +1,65 @@ -import java.applet.Applet; -import java.net.URL; +import java.lang.management.GarbageCollectorMXBean; +import java.lang.management.ManagementFactory; +import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import netscape.javascript.JSObject; -@ObfuscatedName("x") +@ObfuscatedName("l") @Implements("GrandExchangeEvent") public class GrandExchangeEvent { - @ObfuscatedName("ss") - @ObfuscatedSignature( - signature = "Lld;" + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -1568217923 ) - @Export("worldMap") - static WorldMap worldMap; - @ObfuscatedName("bs") + static int field45; + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "Lhe;" + ) + @Export("NetCache_currentResponse") + public static NetFileRequest NetCache_currentResponse; + @ObfuscatedName("bn") @ObfuscatedSignature( signature = "Lli;" ) @Export("worldSelectLeftSprite") static IndexedSprite worldSelectLeftSprite; - @ObfuscatedName("kx") - @ObfuscatedGetter( - intValue = -830703967 + @ObfuscatedName("dj") + @ObfuscatedSignature( + signature = "Lia;" ) - @Export("menuX") - static int menuX; - @ObfuscatedName("f") + @Export("archive0") + static Archive archive0; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -492844339 + intValue = 1956147033 ) @Export("world") public final int world; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - longValue = 6772397130790099757L + longValue = 7213176078958271683L ) @Export("age") public final long age; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Ld;" + signature = "Lm;" ) @Export("grandExchangeOffer") public final GrandExchangeOffer grandExchangeOffer; - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("offerName") String offerName; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("previousOfferName") String previousOfferName; @ObfuscatedSignature( - signature = "(Lkq;BI)V" + signature = "(Lkp;BI)V" ) GrandExchangeEvent(Buffer var1, byte var2, int var3) { this.offerName = var1.readStringCp1252NullTerminated(); @@ -64,8 +69,8 @@ public class GrandExchangeEvent { int var4 = var1.readInt(); int var5 = var1.readInt(); this.grandExchangeOffer = new GrandExchangeOffer(); - this.grandExchangeOffer.method99(2); - this.grandExchangeOffer.method100(var2); + this.grandExchangeOffer.method120(2); + this.grandExchangeOffer.method112(var2); this.grandExchangeOffer.unitPrice = var4; this.grandExchangeOffer.totalQuantity = var5; this.grandExchangeOffer.currentQuantity = 0; @@ -73,98 +78,145 @@ public class GrandExchangeEvent { this.grandExchangeOffer.id = var3; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(I)Ljava/lang/String;", - garbageValue = "-859042126" + garbageValue = "1646612919" ) @Export("getOfferName") public String getOfferName() { return this.offerName; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)Ljava/lang/String;", - garbageValue = "342302982" + garbageValue = "-81405509" ) @Export("getPreviousOfferName") public String getPreviousOfferName() { return this.previousOfferName; } - @ObfuscatedName("w") + @ObfuscatedName("i") + public static int method96(long var0) { + return (int)(var0 >>> 0 & 127L); + } + + @ObfuscatedName("aw") @ObfuscatedSignature( - signature = "(Ljava/lang/String;ILjava/lang/String;B)Z", - garbageValue = "-128" + signature = "(II)I", + garbageValue = "193251724" ) - static boolean method79(String var0, int var1, String var2) { - if (var1 == 0) { - try { - if (!class50.field410.startsWith("win")) { - throw new Exception(); - } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { - throw new Exception(); - } else { - String var14 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; - - for (int var4 = 0; var4 < var0.length(); ++var4) { - if (var14.indexOf(var0.charAt(var4)) == -1) { - throw new Exception(); - } - } - - Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); - return true; - } - } catch (Throwable var8) { - return false; - } - } else if (var1 == 1) { - try { - Applet var7 = class50.applet; - Object[] var5 = new Object[]{(new URL(class50.applet.getCodeBase(), var0)).toString()}; - Object var13 = JSObject.getWindow(var7).call(var2, var5); - return var13 != null; - } catch (Throwable var9) { - return false; - } - } else if (var1 == 2) { - try { - class50.applet.getAppletContext().showDocument(new URL(class50.applet.getCodeBase(), var0), "_blank"); - return true; - } catch (Exception var10) { - return false; - } - } else if (var1 == 3) { - try { - Applet var3 = class50.applet; - JSObject.getWindow(var3).call("loggedout", (Object[])null); - } catch (Throwable var12) { - } - - try { - class50.applet.getAppletContext().showDocument(new URL(class50.applet.getCodeBase(), var0), "_top"); - return true; - } catch (Exception var11) { - return false; - } - } else { - throw new IllegalArgumentException(); - } + static int method97(int var0) { + return (int)Math.pow(2.0D, (double)((float)var0 / 256.0F + 7.0F)); } @ObfuscatedName("at") @ObfuscatedSignature( - signature = "(ILht;ZI)V", - garbageValue = "1641094625" + signature = "(I)I", + garbageValue = "550527389" ) - static void method80(int var0, Coord var1, boolean var2) { - WorldMapArea var3 = Canvas.getWorldMap().getMapArea(var0); - int var4 = Message.localPlayer.plane; - int var5 = MusicPatchPcmStream.baseX * 64 + (Message.localPlayer.x >> 7); - int var6 = ScriptEvent.baseY * 64 + (Message.localPlayer.y >> 7); - Coord var7 = new Coord(var4, var5, var6); - Canvas.getWorldMap().method6373(var3, var7, var1, var2); + @Export("getGcDuration") + protected static int getGcDuration() { + int var0 = 0; + if (SecureRandomFuture.garbageCollector == null || !SecureRandomFuture.garbageCollector.isValid()) { + try { + Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); + + while (var1.hasNext()) { + GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); + if (var2.isValid()) { + SecureRandomFuture.garbageCollector = var2; + GameShell.garbageCollectorLastCheckTimeMs = -1L; + GameShell.garbageCollectorLastCollectionTime = -1L; + } + } + } catch (Throwable var11) { + } + } + + if (SecureRandomFuture.garbageCollector != null) { + long var9 = WorldMapIcon_0.currentTimeMillis(); + long var3 = SecureRandomFuture.garbageCollector.getCollectionTime(); + if (-1L != GameShell.garbageCollectorLastCollectionTime) { + long var5 = var3 - GameShell.garbageCollectorLastCollectionTime; + long var7 = var9 - GameShell.garbageCollectorLastCheckTimeMs; + if (var7 != 0L) { + var0 = (int)(var5 * 100L / var7); + } + } + + GameShell.garbageCollectorLastCollectionTime = var3; + GameShell.garbageCollectorLastCheckTimeMs = var9; + } + + return var0; + } + + @ObfuscatedName("gy") + @ObfuscatedSignature( + signature = "(Lbx;I)V", + garbageValue = "2089906351" + ) + static final void method88(Actor var0) { + if (var0.field986 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > GraphicsDefaults.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { + int var1 = var0.field986 - var0.field985; + int var2 = Client.cycle - var0.field985; + int var3 = var0.field981 * 128 + var0.field942 * 2013925376; + int var4 = var0.field957 * 128 + var0.field942 * 2013925376; + int var5 = var0.field961 * 128 + var0.field942 * 2013925376; + int var6 = var0.field991 * 128 + var0.field942 * 2013925376; + var0.x = (var2 * var5 + var3 * (var1 - var2)) / var1; + var0.y = (var6 * var2 + var4 * (var1 - var2)) / var1; + } + + var0.field997 = 0; + var0.orientation = var0.field987; + var0.rotation = var0.orientation; + } + + @ObfuscatedName("jd") + @ObfuscatedSignature( + signature = "(Lhn;I)V", + garbageValue = "948929027" + ) + static final void method93(Widget var0) { + int var1 = var0.contentType; + if (var1 == 324) { + if (Client.field910 == -1) { + Client.field910 = var0.spriteId2; + Client.field911 = var0.spriteId; + } + + if (Client.playerAppearance.isFemale) { + var0.spriteId2 = Client.field910; + } else { + var0.spriteId2 = Client.field911; + } + + } else if (var1 == 325) { + if (Client.field910 == -1) { + Client.field910 = var0.spriteId2; + Client.field911 = var0.spriteId; + } + + if (Client.playerAppearance.isFemale) { + var0.spriteId2 = Client.field911; + } else { + var0.spriteId2 = Client.field910; + } + + } else if (var1 == 327) { + var0.modelAngleX = 150; + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; + var0.modelType = 5; + var0.modelId = 0; + } else if (var1 == 328) { + var0.modelAngleX = 150; + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; + var0.modelType = 5; + var0.modelId = 1; + } } } diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java index a5b6da7169..913a6287b8 100644 --- a/runescape-client/src/main/java/GrandExchangeEvents.java +++ b/runescape-client/src/main/java/GrandExchangeEvents.java @@ -1,35 +1,34 @@ +import java.awt.Toolkit; +import java.awt.datatransfer.Clipboard; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.Transferable; +import java.awt.datatransfer.UnsupportedFlavorException; +import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("e") +@ObfuscatedName("d") @Implements("GrandExchangeEvents") public class GrandExchangeEvents { - @ObfuscatedName("nn") - @ObfuscatedGetter( - intValue = -1329032007 - ) - static int field31; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("GrandExchangeEvents_ageComparator") public static Comparator GrandExchangeEvents_ageComparator; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("GrandExchangeEvents_priceComparator") public static Comparator GrandExchangeEvents_priceComparator; - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("GrandExchangeEvents_nameComparator") public static Comparator GrandExchangeEvents_nameComparator; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("GrandExchangeEvents_quantityComparator") public static Comparator GrandExchangeEvents_quantityComparator; - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("events") public final List events; @@ -42,7 +41,7 @@ public class GrandExchangeEvents { } @ObfuscatedSignature( - signature = "(Lkq;Z)V", + signature = "(Lkp;Z)V", garbageValue = "1" ) public GrandExchangeEvents(Buffer var1, boolean var2) { @@ -64,10 +63,10 @@ public class GrandExchangeEvents { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/util/Comparator;ZB)V", - garbageValue = "30" + signature = "(Ljava/util/Comparator;ZI)V", + garbageValue = "-221925974" ) @Export("sort") public void sort(Comparator var1, boolean var2) { @@ -81,492 +80,609 @@ public class GrandExchangeEvents { @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lbm;II)V", - garbageValue = "-1987798280" + signature = "(Lbf;I)V", + garbageValue = "-711075472" ) - @Export("runScript") - static void runScript(ScriptEvent var0, int var1) { - Object[] var2 = var0.args; - Script var3; - int var17; - if (HorizontalAlignment.isWorldMapEvent(var0.type)) { - WorldMapLabel.worldMapEvent = (WorldMapEvent)var2[0]; - WorldMapElement var4 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(WorldMapLabel.worldMapEvent.mapElement); - var3 = class16.getWorldMapScript(var0.type, var4.objectId, var4.category); + @Export("doCycleTitle") + static void doCycleTitle(GameShell var0) { + if (Login.worldSelectOpen) { + class208.method4019(var0); } else { - var17 = (Integer)var2[0]; - var3 = SecureRandomCallable.getScript(var17); - } + if ((MouseHandler.MouseHandler_lastButton == 1 || !ArchiveLoader.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { + WorldMapSection2.clientPreferences.titleMusicDisabled = !WorldMapSection2.clientPreferences.titleMusicDisabled; + WorldMapData_1.savePreferences(); + if (!WorldMapSection2.clientPreferences.titleMusicDisabled) { + class162.method3523(MouseHandler.archive6, "scape main", "", 255, false); + } else { + class197.midiPcmStream.clear(); + class197.field2414 = 1; + UserComparator5.musicTrackArchive = null; + } + } - if (var3 != null) { - class188.Interpreter_intStackSize = 0; - class65.Interpreter_stringStackSize = 0; - var17 = -1; - int[] var5 = var3.opcodes; - int[] var6 = var3.intOperands; - byte var7 = -1; - Interpreter.Interpreter_frameDepth = 0; - Interpreter.field1077 = false; + if (Client.gameState != 5) { + if (-1L == Login.field1180) { + Login.field1180 = WorldMapIcon_0.currentTimeMillis() + 1000L; + } - try { - int var10; - try { - Interpreter.Interpreter_intLocals = new int[var3.localIntCount]; - int var8 = 0; - class247.Interpreter_stringLocals = new String[var3.localStringCount]; - int var9 = 0; + long var1 = WorldMapIcon_0.currentTimeMillis(); + if (AbstractRasterProvider.method6151() && Login.field1194 == -1L) { + Login.field1194 = var1; + if (Login.field1194 > Login.field1180) { + Login.field1180 = Login.field1194; + } + } - int var11; - String var18; - for (var10 = 1; var10 < var2.length; ++var10) { - if (var2[var10] instanceof Integer) { - var11 = (Integer)var2[var10]; - if (var11 == -2147483647) { - var11 = var0.mouseX; + if (Client.gameState == 10 || Client.gameState == 11) { + int var3; + if (Language.Language_EN == FriendLoginUpdate.clientLanguage) { + if (MouseHandler.MouseHandler_lastButton == 1 || !ArchiveLoader.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { + var3 = Login.xPadding + 5; + short var4 = 463; + byte var5 = 100; + byte var6 = 35; + if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var5 + var3 && MouseHandler.MouseHandler_lastPressedY >= var4 && MouseHandler.MouseHandler_lastPressedY <= var4 + var6) { + World.method1762(); + return; } + } - if (var11 == -2147483646) { - var11 = var0.mouseY; - } - - if (var11 == -2147483645) { - var11 = var0.widget != null ? var0.widget.id : -1; - } - - if (var11 == -2147483644) { - var11 = var0.opIndex; - } - - if (var11 == -2147483643) { - var11 = var0.widget != null ? var0.widget.childIndex : -1; - } - - if (var11 == -2147483642) { - var11 = var0.dragTarget != null ? var0.dragTarget.id : -1; - } - - if (var11 == -2147483641) { - var11 = var0.dragTarget != null ? var0.dragTarget.childIndex : -1; - } - - if (var11 == -2147483640) { - var11 = var0.keyTyped; - } - - if (var11 == -2147483639) { - var11 = var0.keyPressed; - } - - Interpreter.Interpreter_intLocals[var8++] = var11; - } else if (var2[var10] instanceof String) { - var18 = (String)var2[var10]; - if (var18.equals("event_opbase")) { - var18 = var0.targetName; - } - - class247.Interpreter_stringLocals[var9++] = var18; + if (World.World_request != null) { + World.method1762(); } } - var10 = 0; - Interpreter.field1079 = var0.field557; + var3 = MouseHandler.MouseHandler_lastButton; + int var20 = MouseHandler.MouseHandler_lastPressedX; + int var21 = MouseHandler.MouseHandler_lastPressedY; + if (var3 == 0) { + var20 = MouseHandler.MouseHandler_x; + var21 = MouseHandler.MouseHandler_y; + } - while (true) { - ++var10; - if (var10 > var1) { - throw new RuntimeException(); + if (!ArchiveLoader.mouseCam && var3 == 4) { + var3 = 1; + } + + short var24; + int var25; + if (Login.loginIndex == 0) { + boolean var26 = false; + + while (SoundSystem.isKeyDown()) { + if (RouteStrategy.field2102 == 84) { + var26 = true; + } } - ++var17; - int var29 = var5[var17]; - int var20; - if (var29 >= 100) { - boolean var32; - if (var3.intOperands[var17] == 1) { - var32 = true; - } else { - var32 = false; - } + var25 = class96.loginBoxCenter - 80; + var24 = 291; + if (var3 == 1 && var20 >= var25 - 75 && var20 <= var25 + 75 && var21 >= var24 - 20 && var21 <= var24 + 20) { + class215.openURL(class42.method809("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); + } - var20 = Frames.method3281(var29, var3, var32); - switch(var20) { - case 0: - return; - case 1: - default: - break; - case 2: - throw new IllegalStateException(); - } - } else if (var29 == 0) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var6[var17]; - } else if (var29 == ScriptOpcodes.GET_VARP) { - var11 = var6[var17]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Varps.Varps_main[var11]; - } else if (var29 == ScriptOpcodes.SET_VARP) { - var11 = var6[var17]; - Varps.Varps_main[var11] = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - BufferedSink.changeGameOptions(var11); - } else if (var29 == ScriptOpcodes.SCONST) { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3.stringOperands[var17]; - } else if (var29 == ScriptOpcodes.JUMP) { - var17 += var6[var17]; - } else if (var29 == ScriptOpcodes.IF_ICMPNE) { - class188.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.IF_ICMPEQ) { - class188.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.IF_ICMPLT) { - class188.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.IF_ICMPGT) { - class188.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.RETURN) { - if (Interpreter.Interpreter_frameDepth == 0) { - return; - } - - ScriptFrame var34 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; - var3 = var34.script; - var5 = var3.opcodes; - var6 = var3.intOperands; - var17 = var34.pc; - Interpreter.Interpreter_intLocals = var34.intLocals; - class247.Interpreter_stringLocals = var34.stringLocals; - } else if (var29 == ScriptOpcodes.GET_VARBIT) { - var11 = var6[var17]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = GameShell.getVarbit(var11); - } else if (var29 == ScriptOpcodes.SET_VARBIT) { - var11 = var6[var17]; - ChatChannel.method2259(var11, Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); - } else if (var29 == ScriptOpcodes.IF_ICMPLE) { - class188.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.IF_ICMPGE) { - class188.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.ILOAD) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Interpreter.Interpreter_intLocals[var6[var17]]; - } else if (var29 == ScriptOpcodes.ISTORE) { - Interpreter.Interpreter_intLocals[var6[var17]] = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - } else if (var29 == ScriptOpcodes.SLOAD) { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = class247.Interpreter_stringLocals[var6[var17]]; - } else if (var29 == ScriptOpcodes.SSTORE) { - class247.Interpreter_stringLocals[var6[var17]] = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - } else if (var29 == ScriptOpcodes.JOIN_STRING) { - var11 = var6[var17]; - class65.Interpreter_stringStackSize -= var11; - String var31 = User.method5086(Interpreter.Interpreter_stringStack, class65.Interpreter_stringStackSize, var11); - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var31; - } else if (var29 == ScriptOpcodes.POP_INT) { - --class188.Interpreter_intStackSize; - } else if (var29 == ScriptOpcodes.POP_STRING) { - --class65.Interpreter_stringStackSize; - } else { - int var15; - if (var29 != ScriptOpcodes.INVOKE) { - if (var29 == ScriptOpcodes.GET_VARC_INT) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = MilliClock.varcs.getInt(var6[var17]); - } else if (var29 == ScriptOpcodes.SET_VARC_INT) { - MilliClock.varcs.setInt(var6[var17], Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); - } else if (var29 == ScriptOpcodes.DEFINE_ARRAY) { - var11 = var6[var17] >> 16; - var20 = var6[var17] & 65535; - int var21 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - if (var21 < 0 || var21 > 5000) { - throw new RuntimeException(); - } - - Interpreter.Interpreter_arrayLengths[var11] = var21; - byte var22 = -1; - if (var20 == 105) { - var22 = 0; - } - - for (var15 = 0; var15 < var21; ++var15) { - Interpreter.Interpreter_arrays[var11][var15] = var22; - } - } else if (var29 == ScriptOpcodes.GET_ARRAY_INT) { - var11 = var6[var17]; - var20 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { - throw new RuntimeException(); - } - - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var11][var20]; - } else if (var29 == ScriptOpcodes.SET_ARRAY_INT) { - var11 = var6[var17]; - class188.Interpreter_intStackSize -= 2; - var20 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { - throw new RuntimeException(); - } - - Interpreter.Interpreter_arrays[var11][var20] = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - } else if (var29 == ScriptOpcodes.GET_VARC_STRING_OLD) { - var18 = MilliClock.varcs.getStringOld(var6[var17]); - if (var18 == null) { - var18 = "null"; - } - - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var18; - } else if (var29 == ScriptOpcodes.SET_VARC_STRING_OLD) { - MilliClock.varcs.setStringOld(var6[var17], Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]); - } else if (var29 == ScriptOpcodes.GET_VARC_STRING) { - var18 = MilliClock.varcs.getString(var6[var17]); - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var18; - } else if (var29 == ScriptOpcodes.SET_VARC_STRING) { - MilliClock.varcs.setString(var6[var17], Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]); + var25 = class96.loginBoxCenter + 80; + if (var3 == 1 && var20 >= var25 - 75 && var20 <= var25 + 75 && var21 >= var24 - 20 && var21 <= var24 + 20 || var26) { + if ((Client.worldProperties & 33554432) != 0) { + Login.Login_response0 = ""; + Login.Login_response1 = "This is a Beta world."; + Login.Login_response2 = "Your normal account will not be affected."; + Login.Login_response3 = ""; + Login.loginIndex = 1; + class81.method2099(); + } else if ((Client.worldProperties & 4) != 0) { + if ((Client.worldProperties & 1024) != 0) { + Login.Login_response1 = "This is a High Risk PvP world."; + Login.Login_response2 = "Players can attack each other almost everywhere"; + Login.Login_response3 = "and the Protect Item prayer won't work."; } else { - if (var29 != ScriptOpcodes.SWITCH) { - throw new IllegalStateException(); + Login.Login_response1 = "This is a PvP world."; + Login.Login_response2 = "Players can attack each other"; + Login.Login_response3 = "almost everywhere."; + } + + Login.Login_response0 = "Warning!"; + Login.loginIndex = 1; + class81.method2099(); + } else if ((Client.worldProperties & 1024) != 0) { + Login.Login_response1 = "This is a High Risk world."; + Login.Login_response2 = "The Protect Item prayer will"; + Login.Login_response3 = "not work on this world."; + Login.Login_response0 = "Warning!"; + Login.loginIndex = 1; + class81.method2099(); + } else { + ViewportMouse.Login_promptCredentials(false); + } + } + } else { + short var7; + int var22; + if (Login.loginIndex == 1) { + while (true) { + if (!SoundSystem.isKeyDown()) { + var22 = class96.loginBoxCenter - 80; + var7 = 321; + if (var3 == 1 && var20 >= var22 - 75 && var20 <= var22 + 75 && var21 >= var7 - 20 && var21 <= var7 + 20) { + ViewportMouse.Login_promptCredentials(false); } - IterableNodeHashTable var33 = var3.switches[var6[var17]]; - IntegerNode var30 = (IntegerNode)var33.get((long)Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); - if (var30 != null) { - var17 += var30.integer; + var22 = class96.loginBoxCenter + 80; + if (var3 == 1 && var20 >= var22 - 75 && var20 <= var22 + 75 && var21 >= var7 - 20 && var21 <= var7 + 20) { + Login.loginIndex = 0; } + break; + } + + if (RouteStrategy.field2102 == 84) { + ViewportMouse.Login_promptCredentials(false); + } else if (RouteStrategy.field2102 == 13) { + Login.loginIndex = 0; + } + } + } else { + short var23; + if (Login.loginIndex == 2) { + var23 = 201; + var22 = var23 + 52; + if (var3 == 1 && var21 >= var22 - 12 && var21 < var22 + 2) { + Login.currentLoginField = 0; + } + + var22 += 15; + if (var3 == 1 && var21 >= var22 - 12 && var21 < var22 + 2) { + Login.currentLoginField = 1; + } + + var22 += 15; + var23 = 361; + if (Login.field1175 != null) { + var25 = Login.field1175.highX / 2; + if (var3 == 1 && var20 >= Login.field1175.lowX - var25 && var20 <= var25 + Login.field1175.lowX && var21 >= var23 - 15 && var21 < var23) { + switch(Login.field1193) { + case 1: + Tiles.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); + Login.loginIndex = 5; + return; + case 2: + class215.openURL("https://support.runescape.com/hc/en-gb", true, false); + } + } + } + + var25 = class96.loginBoxCenter - 80; + var24 = 321; + if (var3 == 1 && var20 >= var25 - 75 && var20 <= var25 + 75 && var21 >= var24 - 20 && var21 <= var24 + 20) { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + Tiles.setLoginResponseString("", "Please enter your username/email address.", ""); + return; + } + + if (Login.Login_password.length() == 0) { + Tiles.setLoginResponseString("", "Please enter your password.", ""); + return; + } + + Tiles.setLoginResponseString("", "Connecting to server...", ""); + UserComparator3.method3497(false); + Projectile.updateGameState(20); + return; + } + + var25 = Login.loginBoxX + 180 + 80; + if (var3 == 1 && var20 >= var25 - 75 && var20 <= var25 + 75 && var21 >= var24 - 20 && var21 <= var24 + 20) { + Login.loginIndex = 0; + Login.Login_username = ""; + Login.Login_password = ""; + Frames.field1885 = 0; + LoginScreenAnimation.otp = ""; + Login.field1185 = true; + } + + var25 = class96.loginBoxCenter + -117; + var24 = 277; + Login.field1183 = var20 >= var25 && var20 < var25 + class216.field2559 && var21 >= var24 && var21 < var24 + AbstractWorldMapData.field190; + if (var3 == 1 && Login.field1183) { + Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; + if (!Client.Login_isUsernameRemembered && WorldMapSection2.clientPreferences.rememberedUsername != null) { + WorldMapSection2.clientPreferences.rememberedUsername = null; + WorldMapData_1.savePreferences(); + } + } + + var25 = class96.loginBoxCenter + 24; + var24 = 277; + Login.field1184 = var20 >= var25 && var20 < var25 + class216.field2559 && var21 >= var24 && var21 < var24 + AbstractWorldMapData.field190; + if (var3 == 1 && Login.field1184) { + WorldMapSection2.clientPreferences.hideUsername = !WorldMapSection2.clientPreferences.hideUsername; + if (!WorldMapSection2.clientPreferences.hideUsername) { + Login.Login_username = ""; + WorldMapSection2.clientPreferences.rememberedUsername = null; + class81.method2099(); + } + + WorldMapData_1.savePreferences(); + } + + while (true) { + Transferable var10; + int var11; + do { + while (true) { + label870: + do { + while (true) { + while (SoundSystem.isKeyDown()) { + if (RouteStrategy.field2102 != 13) { + if (Login.currentLoginField != 0) { + continue label870; + } + + DirectByteArrayCopier.method4004(class51.field432); + if (RouteStrategy.field2102 == 85 && Login.Login_username.length() > 0) { + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (RouteStrategy.field2102 == 84 || RouteStrategy.field2102 == 80) { + Login.currentLoginField = 1; + } + + if (class238.method4414(class51.field432) && Login.Login_username.length() < 320) { + Login.Login_username = Login.Login_username + class51.field432; + } + } else { + Login.loginIndex = 0; + Login.Login_username = ""; + Login.Login_password = ""; + Frames.field1885 = 0; + LoginScreenAnimation.otp = ""; + Login.field1185 = true; + } + } + + return; + } + } while(Login.currentLoginField != 1); + + if (RouteStrategy.field2102 == 85 && Login.Login_password.length() > 0) { + Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); + } else if (RouteStrategy.field2102 == 84 || RouteStrategy.field2102 == 80) { + Login.currentLoginField = 0; + if (RouteStrategy.field2102 == 84) { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + Tiles.setLoginResponseString("", "Please enter your username/email address.", ""); + return; + } + + if (Login.Login_password.length() == 0) { + Tiles.setLoginResponseString("", "Please enter your password.", ""); + return; + } + + Tiles.setLoginResponseString("", "Connecting to server...", ""); + UserComparator3.method3497(false); + Projectile.updateGameState(20); + return; + } + } + + if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && RouteStrategy.field2102 == 67) { + Clipboard var9 = Toolkit.getDefaultToolkit().getSystemClipboard(); + var10 = var9.getContents(Username.client); + var11 = 20 - Login.Login_password.length(); + break; + } + + if (BuddyRankComparator.method3510(class51.field432) && class238.method4414(class51.field432) && Login.Login_password.length() < 20) { + Login.Login_password = Login.Login_password + class51.field432; + } + } + } while(var11 <= 0); + + try { + String var12 = (String)var10.getTransferData(DataFlavor.stringFlavor); + int var13 = Math.min(var11, var12.length()); + + for (int var14 = 0; var14 < var13; ++var14) { + if (!BuddyRankComparator.method3510(var12.charAt(var14)) || !class238.method4414(var12.charAt(var14))) { + Login.loginIndex = 3; + return; + } + } + + Login.Login_password = Login.Login_password + var12.substring(0, var13); + } catch (UnsupportedFlavorException var18) { + } catch (IOException var19) { + } + } + } else if (Login.loginIndex == 3) { + var22 = Login.loginBoxX + 180; + var7 = 276; + if (var3 == 1 && var20 >= var22 - 75 && var20 <= var22 + 75 && var21 >= var7 - 20 && var21 <= var7 + 20) { + ViewportMouse.Login_promptCredentials(false); + } + + var22 = Login.loginBoxX + 180; + var7 = 326; + if (var3 == 1 && var20 >= var22 - 75 && var20 <= var22 + 75 && var21 >= var7 - 20 && var21 <= var7 + 20) { + Tiles.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); + Login.loginIndex = 5; + return; } } else { - var11 = var6[var17]; - Script var12 = SecureRandomCallable.getScript(var11); - int[] var13 = new int[var12.localIntCount]; - String[] var14 = new String[var12.localStringCount]; + int var15; + if (Login.loginIndex == 4) { + var22 = Login.loginBoxX + 180 - 80; + var7 = 321; + if (var3 == 1 && var20 >= var22 - 75 && var20 <= var22 + 75 && var21 >= var7 - 20 && var21 <= var7 + 20) { + LoginScreenAnimation.otp.trim(); + if (LoginScreenAnimation.otp.length() != 6) { + Tiles.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); + return; + } - for (var15 = 0; var15 < var12.intArgumentCount; ++var15) { - var13[var15] = Interpreter.Interpreter_intStack[var15 + (class188.Interpreter_intStackSize - var12.intArgumentCount)]; + Frames.field1885 = Integer.parseInt(LoginScreenAnimation.otp); + LoginScreenAnimation.otp = ""; + UserComparator3.method3497(true); + Tiles.setLoginResponseString("", "Connecting to server...", ""); + Projectile.updateGameState(20); + return; + } + + if (var3 == 1 && var20 >= Login.loginBoxX + 180 - 9 && var20 <= Login.loginBoxX + 180 + 130 && var21 >= 263 && var21 <= 296) { + Login.field1185 = !Login.field1185; + } + + if (var3 == 1 && var20 >= Login.loginBoxX + 180 - 34 && var20 <= Login.loginBoxX + 34 + 180 && var21 >= 351 && var21 <= 363) { + class215.openURL(class42.method809("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); + } + + var22 = Login.loginBoxX + 180 + 80; + if (var3 == 1 && var20 >= var22 - 75 && var20 <= var22 + 75 && var21 >= var7 - 20 && var21 <= var7 + 20) { + Login.loginIndex = 0; + Login.Login_username = ""; + Login.Login_password = ""; + Frames.field1885 = 0; + LoginScreenAnimation.otp = ""; + } + + while (SoundSystem.isKeyDown()) { + boolean var8 = false; + + for (var15 = 0; var15 < "1234567890".length(); ++var15) { + if (class51.field432 == "1234567890".charAt(var15)) { + var8 = true; + break; + } + } + + if (RouteStrategy.field2102 == 13) { + Login.loginIndex = 0; + Login.Login_username = ""; + Login.Login_password = ""; + Frames.field1885 = 0; + LoginScreenAnimation.otp = ""; + } else { + if (RouteStrategy.field2102 == 85 && LoginScreenAnimation.otp.length() > 0) { + LoginScreenAnimation.otp = LoginScreenAnimation.otp.substring(0, LoginScreenAnimation.otp.length() - 1); + } + + if (RouteStrategy.field2102 == 84) { + LoginScreenAnimation.otp.trim(); + if (LoginScreenAnimation.otp.length() != 6) { + Tiles.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); + return; + } + + Frames.field1885 = Integer.parseInt(LoginScreenAnimation.otp); + LoginScreenAnimation.otp = ""; + UserComparator3.method3497(true); + Tiles.setLoginResponseString("", "Connecting to server...", ""); + Projectile.updateGameState(20); + return; + } + + if (var8 && LoginScreenAnimation.otp.length() < 6) { + LoginScreenAnimation.otp = LoginScreenAnimation.otp + class51.field432; + } + } + } + } else if (Login.loginIndex == 5) { + var22 = Login.loginBoxX + 180 - 80; + var7 = 321; + if (var3 == 1 && var20 >= var22 - 75 && var20 <= var22 + 75 && var21 >= var7 - 20 && var21 <= var7 + 20) { + WorldMapSection2.method344(); + return; + } + + var22 = Login.loginBoxX + 180 + 80; + if (var3 == 1 && var20 >= var22 - 75 && var20 <= var22 + 75 && var21 >= var7 - 20 && var21 <= var7 + 20) { + ViewportMouse.Login_promptCredentials(true); + } + + var24 = 361; + if (WorldMapCacheName.field315 != null) { + var15 = WorldMapCacheName.field315.highX / 2; + if (var3 == 1 && var20 >= WorldMapCacheName.field315.lowX - var15 && var20 <= var15 + WorldMapCacheName.field315.lowX && var21 >= var24 - 15 && var21 < var24) { + class215.openURL(class42.method809("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); + } + } + + while (SoundSystem.isKeyDown()) { + boolean var27 = false; + + for (int var16 = 0; var16 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var16) { + if (class51.field432 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var16)) { + var27 = true; + break; + } + } + + if (RouteStrategy.field2102 == 13) { + ViewportMouse.Login_promptCredentials(true); + } else { + if (RouteStrategy.field2102 == 85 && Login.Login_username.length() > 0) { + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (RouteStrategy.field2102 == 84) { + WorldMapSection2.method344(); + return; + } + + if (var27 && Login.Login_username.length() < 320) { + Login.Login_username = Login.Login_username + class51.field432; + } + } + } + } else if (Login.loginIndex != 6) { + if (Login.loginIndex == 7) { + var22 = Login.loginBoxX + 180 - 80; + var7 = 321; + if (var3 == 1 && var20 >= var22 - 75 && var20 <= var22 + 75 && var21 >= var7 - 20 && var21 <= var7 + 20) { + class215.openURL(class42.method809("secure", true) + "m=dob/set_dob.ws", true, false); + Tiles.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); + Login.loginIndex = 6; + return; + } + + var22 = Login.loginBoxX + 180 + 80; + if (var3 == 1 && var20 >= var22 - 75 && var20 <= var22 + 75 && var21 >= var7 - 20 && var21 <= var7 + 20) { + ViewportMouse.Login_promptCredentials(true); + } + } else if (Login.loginIndex == 8) { + var22 = Login.loginBoxX + 180 - 80; + var7 = 321; + if (var3 == 1 && var20 >= var22 - 75 && var20 <= var22 + 75 && var21 >= var7 - 20 && var21 <= var7 + 20) { + class215.openURL("https://www.jagex.com/terms/privacy", true, false); + Tiles.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); + Login.loginIndex = 6; + return; + } + + var22 = Login.loginBoxX + 180 + 80; + if (var3 == 1 && var20 >= var22 - 75 && var20 <= var22 + 75 && var21 >= var7 - 20 && var21 <= var7 + 20) { + ViewportMouse.Login_promptCredentials(true); + } + } else if (Login.loginIndex == 12) { + String var17 = ""; + switch(Login.field1165) { + case 0: + var17 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; + break; + case 1: + var17 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; + break; + default: + ViewportMouse.Login_promptCredentials(false); + } + + var25 = Login.loginBoxX + 180; + var24 = 276; + if (var3 == 1 && var20 >= var25 - 75 && var20 <= var25 + 75 && var21 >= var24 - 20 && var21 <= var24 + 20) { + class215.openURL(var17, true, false); + Tiles.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); + Login.loginIndex = 6; + return; + } + + var25 = Login.loginBoxX + 180; + var24 = 326; + if (var3 == 1 && var20 >= var25 - 75 && var20 <= var25 + 75 && var21 >= var24 - 20 && var21 <= var24 + 20) { + ViewportMouse.Login_promptCredentials(false); + } + } else if (Login.loginIndex == 24) { + var22 = Login.loginBoxX + 180; + var7 = 301; + if (var3 == 1 && var20 >= var22 - 75 && var20 <= var22 + 75 && var21 >= var7 - 20 && var21 <= var7 + 20) { + ViewportMouse.Login_promptCredentials(false); + } + } + } else { + while (true) { + do { + if (!SoundSystem.isKeyDown()) { + var23 = 321; + if (var3 == 1 && var21 >= var23 - 20 && var21 <= var23 + 20) { + ViewportMouse.Login_promptCredentials(true); + } + + return; + } + } while(RouteStrategy.field2102 != 84 && RouteStrategy.field2102 != 13); + + ViewportMouse.Login_promptCredentials(true); + } } - - for (var15 = 0; var15 < var12.stringArgumentCount; ++var15) { - var14[var15] = Interpreter.Interpreter_stringStack[var15 + (class65.Interpreter_stringStackSize - var12.stringArgumentCount)]; - } - - class188.Interpreter_intStackSize -= var12.intArgumentCount; - class65.Interpreter_stringStackSize -= var12.stringArgumentCount; - ScriptFrame var19 = new ScriptFrame(); - var19.script = var3; - var19.pc = var17; - var19.intLocals = Interpreter.Interpreter_intLocals; - var19.stringLocals = class247.Interpreter_stringLocals; - Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var19; - var3 = var12; - var5 = var12.opcodes; - var6 = var12.intOperands; - var17 = -1; - Interpreter.Interpreter_intLocals = var13; - class247.Interpreter_stringLocals = var14; } } } - } catch (Exception var27) { - StringBuilder var24 = new StringBuilder(30); - var24.append("").append(var3.key).append(" "); - for (var10 = Interpreter.Interpreter_frameDepth - 1; var10 >= 0; --var10) { - var24.append("").append(Interpreter.Interpreter_frames[var10].script.key).append(" "); - } - - var24.append("").append(var7); - DesktopPlatformInfoProvider.RunException_sendStackTrace(var24.toString(), var27); } - } finally { - if (Interpreter.field1077) { - Interpreter.field1078 = true; - Clock.method3488(); - Interpreter.field1078 = false; - Interpreter.field1077 = false; - } - } } } - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-146870643" - ) - @Export("ItemContainer_getCount") - static int ItemContainer_getCount(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var2 == null) { - return 0; - } else { - return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; - } + @ObfuscatedName("m") + @Export("Entity_unpackID") + public static int Entity_unpackID(long var0) { + return (int)(var0 >>> 17 & 4294967295L); } - @ObfuscatedName("p") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(CB)Z", - garbageValue = "0" + signature = "(Lbg;I)V", + garbageValue = "-1842266265" ) - static boolean method76(char var0) { - for (int var1 = 0; var1 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var1) { - if (var0 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var1)) { - return true; - } + @Export("changeWorld") + static void changeWorld(World var0) { + if (var0.isMembersOnly() != Client.isMembersWorld) { + Client.isMembersWorld = var0.isMembersOnly(); + WorldMapLabelSize.method197(var0.isMembersOnly()); } - return false; + NetSocket.worldHost = var0.host; + Client.worldId = var0.id; + Client.worldProperties = var0.properties; + WorldMapLabelSize.port1 = Client.gameBuild == 0 ? 43594 : var0.id + 40000; + Client.port2 = Client.gameBuild == 0 ? 443 : var0.id + 50000; + WorldMapSection2.port3 = WorldMapLabelSize.port1; } - @ObfuscatedName("aq") + @ObfuscatedName("jr") @ObfuscatedSignature( - signature = "(ILcu;ZI)I", - garbageValue = "1983355550" + signature = "(Lhn;Lif;IIZI)V", + garbageValue = "-1029339816" ) - static int method72(int var0, Script var1, boolean var2) { - int var3; - int var4; - if (var0 == ScriptOpcodes.ADD) { - class188.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var4 + var3; - return 1; - } else if (var0 == ScriptOpcodes.SUB) { - class188.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 - var4; - return 1; - } else if (var0 == ScriptOpcodes.MULTIPLY) { - class188.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 * var4; - return 1; - } else if (var0 == ScriptOpcodes.DIV) { - class188.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 / var4; - return 1; - } else if (var0 == ScriptOpcodes.RANDOM) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); - return 1; - } else if (var0 == ScriptOpcodes.RANDOMINC) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); - return 1; - } else if (var0 == ScriptOpcodes.INTERPOLATE) { - class188.Interpreter_intStackSize -= 5; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - int var5 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2]; - int var6 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 3]; - int var7 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 4]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5); - return 1; - } else if (var0 == ScriptOpcodes.ADDPERCENT) { - class188.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 + var4 * var3 / 100; - return 1; - } else if (var0 == ScriptOpcodes.SETBIT) { - class188.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 | 1 << var4; - return 1; - } else if (var0 == ScriptOpcodes.CLEARBIT) { - class188.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); - return 1; - } else if (var0 == ScriptOpcodes.TESTBIT) { - class188.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.MOD) { - class188.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 % var4; - return 1; - } else if (var0 == ScriptOpcodes.POW) { - class188.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; + @Export("addWidgetItemMenuItem") + static final void addWidgetItemMenuItem(Widget var0, ItemDefinition var1, int var2, int var3, boolean var4) { + String[] var5 = var1.inventoryActions; + byte var6 = -1; + String var7 = null; + if (var5 != null && var5[var3] != null) { if (var3 == 0) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + var6 = 33; + } else if (var3 == 1) { + var6 = 34; + } else if (var3 == 2) { + var6 = 35; + } else if (var3 == 3) { + var6 = 36; } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); + var6 = 37; } - return 1; - } else if (var0 == ScriptOpcodes.INVPOW) { - class188.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - if (var3 == 0) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - return 1; - } else { - switch(var4) { - case 0: - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; - break; - case 1: - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3; - break; - case 2: - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); - break; - case 3: - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); - break; - case 4: - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); - break; - default: - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); - } - - return 1; - } - } else if (var0 == ScriptOpcodes.AND) { - class188.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 & var4; - return 1; - } else if (var0 == ScriptOpcodes.OR) { - class188.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 | var4; - return 1; - } else if (var0 == ScriptOpcodes.SCALE) { - class188.Interpreter_intStackSize -= 3; - long var9 = (long)Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - long var11 = (long)Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - long var13 = (long)Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = (int)(var13 * var9 / var11); - return 1; - } else { - return 2; + var7 = var5[var3]; + } else if (var3 == 4) { + var6 = 37; + var7 = "Drop"; } + + if (var6 != -1 && var7 != null) { + class160.insertMenuItem(var7, PacketWriter.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); + } + } } diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java index c969bb3fa2..4074907bb2 100644 --- a/runescape-client/src/main/java/GrandExchangeOffer.java +++ b/runescape-client/src/main/java/GrandExchangeOffer.java @@ -4,56 +4,51 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("d") +@ObfuscatedName("m") @Implements("GrandExchangeOffer") public class GrandExchangeOffer { - @ObfuscatedName("x") + @ObfuscatedName("du") + @ObfuscatedSignature( + signature = "Lia;" + ) + @Export("archive11") + static Archive archive11; + @ObfuscatedName("hd") @ObfuscatedGetter( - intValue = -1279002911 + intValue = -1999981463 ) - @Export("musicTrackFileId") - static int musicTrackFileId; - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "Lli;" - ) - static IndexedSprite field64; - @ObfuscatedName("fa") - @ObfuscatedSignature( - signature = "Lko;" - ) - @Export("fontBold12") - static Font fontBold12; - @ObfuscatedName("f") + @Export("cameraPitch") + static int cameraPitch; + @ObfuscatedName("c") @Export("state") byte state; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 903381877 + intValue = 1202522813 ) @Export("id") public int id; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1525595903 + intValue = -286950223 ) @Export("unitPrice") public int unitPrice; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -181305079 + intValue = -191142567 ) @Export("totalQuantity") public int totalQuantity; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1020605845 + intValue = -1418175861 ) @Export("currentQuantity") public int currentQuantity; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 824366687 + intValue = 45465727 ) @Export("currentPrice") public int currentPrice; @@ -62,7 +57,7 @@ public class GrandExchangeOffer { } @ObfuscatedSignature( - signature = "(Lkq;Z)V", + signature = "(Lkp;Z)V", garbageValue = "0" ) public GrandExchangeOffer(Buffer var1, boolean var2) { @@ -74,42 +69,42 @@ public class GrandExchangeOffer { this.currentPrice = var1.readInt(); } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-519143415" + signature = "(B)I", + garbageValue = "-51" ) @Export("status") public int status() { return this.state & 7; } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-1944649855" + signature = "(B)I", + garbageValue = "-96" ) @Export("type") public int type() { return (this.state & 8) == 8 ? 1 : 0; } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-26019402" + signature = "(IB)V", + garbageValue = "-38" ) - void method99(int var1) { + void method120(int var1) { this.state &= -8; this.state = (byte)(this.state | var1 & 7); } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-1969903695" + garbageValue = "-59985742" ) - void method100(int var1) { + void method112(int var1) { this.state &= -9; if (var1 == 1) { this.state = (byte)(this.state | 8); @@ -117,34 +112,65 @@ public class GrandExchangeOffer { } - @ObfuscatedName("y") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "-2077652257" + signature = "(IB)I", + garbageValue = "-27" ) - static final void method114(int var0, int var1, int var2, int var3) { - for (int var4 = var1; var4 <= var3 + var1; ++var4) { - for (int var5 = var0; var5 <= var0 + var2; ++var5) { - if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { - Tiles.field496[0][var5][var4] = 127; - if (var0 == var5 && var5 > 0) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; - } + public static int method128(int var0) { + long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; + int var1 = (int)(var2 >>> 0 & 127L); + return var1; + } - if (var5 == var0 + var2 && var5 < 103) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; - } - - if (var4 == var1 && var4 > 0) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; - } - - if (var4 == var3 + var1 && var4 < 103) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(I)Z", + garbageValue = "1764789679" + ) + public static boolean method129() { + try { + if (class197.field2414 == 2) { + if (FileSystem.musicTrack == null) { + FileSystem.musicTrack = MusicTrack.readTrack(UserComparator5.musicTrackArchive, class197.musicTrackGroupId, class83.musicTrackFileId); + if (FileSystem.musicTrack == null) { + return false; } } + + if (class197.soundCache == null) { + class197.soundCache = new SoundCache(UserComparator10.soundEffectsArchive, class197.musicSamplesArchive); + } + + if (class197.midiPcmStream.loadMusicTrack(FileSystem.musicTrack, class197.musicPatchesArchive, class197.soundCache, 22050)) { + class197.midiPcmStream.clearAll(); + class197.midiPcmStream.setPcmStreamVolume(AttackOption.musicTrackVolume); + class197.midiPcmStream.setMusicTrack(FileSystem.musicTrack, KeyHandler.musicTrackBoolean); + class197.field2414 = 0; + FileSystem.musicTrack = null; + class197.soundCache = null; + UserComparator5.musicTrackArchive = null; + return true; + } } + } catch (Exception var1) { + var1.printStackTrace(); + class197.midiPcmStream.clear(); + class197.field2414 = 0; + FileSystem.musicTrack = null; + class197.soundCache = null; + UserComparator5.musicTrackArchive = null; } + return false; + } + + @ObfuscatedName("kn") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "1055020085" + ) + static void method127(int var0) { + Client.oculusOrbState = var0; } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java index c4f2205c6d..598cc5ad7d 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java @@ -7,39 +7,603 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("v") @Implements("GrandExchangeOfferAgeComparator") final class GrandExchangeOfferAgeComparator implements Comparator { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lx;Lx;I)I", - garbageValue = "-119535735" + signature = "Lii;" + ) + @Export("EnumDefinition_archive") + public static AbstractArchive EnumDefinition_archive; + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(Ll;Ll;I)I", + garbageValue = "1533624032" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.age < var2.age ? -1 : (var2.age == var1.age ? 0 : 1); } - public boolean equals(Object var1) { - return super.equals(var1); - } - public int compare(Object var1, Object var2) { return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "2135681337" - ) - public static void method147() { - class117.reflectionChecks = new IterableNodeDeque(); + public boolean equals(Object var1) { + return super.equals(var1); } - @ObfuscatedName("x") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "28" + signature = "(I)V", + garbageValue = "-370455307" ) - public static void method146() { - StructDefinition.StructDefinition_cached.clear(); + public static void method162() { + class96.reflectionChecks = new IterableNodeDeque(); + } + + @ObfuscatedName("ja") + @ObfuscatedSignature( + signature = "([Lhn;IIIIIIII)V", + garbageValue = "-442172669" + ) + @Export("updateInterface") + static final void updateInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + for (int var8 = 0; var8 < var0.length; ++var8) { + Widget var9 = var0[var8]; + if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || WorldMapIcon_0.getWidgetClickMask(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { + if (var9.isIf3) { + if (VarcInt.isComponentHidden(var9)) { + continue; + } + } else if (var9.type == 0 && var9 != GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1 && VarcInt.isComponentHidden(var9)) { + continue; + } + + int var10 = var9.x + var6; + int var11 = var7 + var9.y; + int var12; + int var13; + int var14; + int var15; + int var17; + int var18; + if (var9.type == 2) { + var12 = var2; + var13 = var3; + var14 = var4; + var15 = var5; + } else { + int var16; + if (var9.type == 9) { + var16 = var10; + var17 = var11; + var18 = var10 + var9.width; + int var19 = var11 + var9.height; + if (var18 < var10) { + var16 = var18; + var18 = var10; + } + + if (var19 < var11) { + var17 = var19; + var19 = var11; + } + + ++var18; + ++var19; + var12 = var16 > var2 ? var16 : var2; + var13 = var17 > var3 ? var17 : var3; + var14 = var18 < var4 ? var18 : var4; + var15 = var19 < var5 ? var19 : var5; + } else { + var16 = var10 + var9.width; + var17 = var11 + var9.height; + var12 = var10 > var2 ? var10 : var2; + var13 = var11 > var3 ? var11 : var3; + var14 = var16 < var4 ? var16 : var4; + var15 = var17 < var5 ? var17 : var5; + } + } + + if (var9 == Client.clickedWidget) { + Client.field827 = true; + Client.field864 = var10; + Client.field829 = var11; + } + + boolean var32 = false; + if (var9.field2646) { + switch(Client.field808) { + case 0: + var32 = true; + case 1: + default: + break; + case 2: + if (Client.field664 == var9.id >>> 16) { + var32 = true; + } + break; + case 3: + if (var9.id == Client.field664) { + var32 = true; + } + } + } + + if (var32 || !var9.isIf3 || var12 < var14 && var13 < var15) { + if (var9.isIf3) { + ScriptEvent var26; + if (var9.noClickThrough) { + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { + if (var26.isMouseInputEvent) { + var26.remove(); + var26.widget.containsMouse = false; + } + } + + if (SequenceDefinition.widgetDragDuration == 0) { + Client.clickedWidget = null; + Client.clickedWidgetParent = null; + } + + if (!Client.isMenuOpen) { + class96.addCancelMenuEntry(); + } + } + } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { + if (var26.isMouseInputEvent && var26.widget.onScroll == var26.args) { + var26.remove(); + } + } + } + } + + var17 = MouseHandler.MouseHandler_x; + var18 = MouseHandler.MouseHandler_y; + if (MouseHandler.MouseHandler_lastButton != 0) { + var17 = MouseHandler.MouseHandler_lastPressedX; + var18 = MouseHandler.MouseHandler_lastPressedY; + } + + boolean var33 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; + if (var9.contentType == 1337) { + if (!Client.isLoading && !Client.isMenuOpen && var33) { + WorldMapSection0.addSceneMenuOptions(var17, var18, var12, var13); + } + } else if (var9.contentType == 1338) { + class267.checkIfMinimapClicked(var9, var10, var11); + } else { + if (var9.contentType == 1400) { + WorldMapIcon_0.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var33, var10, var11, var9.width, var9.height); + } + + if (!Client.isMenuOpen && var33) { + if (var9.contentType == 1400) { + WorldMapIcon_0.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); + } else { + ViewportMouse.method3060(var9, var17 - var10, var18 - var11); + } + } + + boolean var21; + int var23; + if (var32) { + for (int var20 = 0; var20 < var9.field2702.length; ++var20) { + var21 = false; + boolean var22 = false; + if (!var21 && var9.field2702[var20] != null) { + for (var23 = 0; var23 < var9.field2702[var20].length; ++var23) { + boolean var24 = false; + if (var9.field2711 != null) { + var24 = KeyHandler.KeyHandler_pressedKeys[var9.field2702[var20][var23]]; + } + + if (MusicPatchNode.method3902(var9.field2702[var20][var23]) || var24) { + var21 = true; + if (var9.field2711 != null && var9.field2711[var20] > Client.cycle) { + break; + } + + byte var25 = var9.field2648[var20][var23]; + if (var25 == 0 || ((var25 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var25 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var25 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var25 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { + var22 = true; + break; + } + } + } + } + + if (var22) { + if (var20 < 10) { + NPC.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); + } else if (var20 == 10) { + WorldMapManager.Widget_runOnTargetLeave(); + MusicPatchNode.selectSpell(var9.id, var9.childIndex, class83.method2108(WorldMapIcon_0.getWidgetClickMask(var9)), var9.itemId); + Client.selectedSpellActionName = PcmPlayer.method2542(var9); + if (Client.selectedSpellActionName == null) { + Client.selectedSpellActionName = "null"; + } + + Client.selectedSpellName = var9.dataText + PacketWriter.colorStartTag(16777215); + } + + var23 = var9.field2649[var20]; + if (var9.field2711 == null) { + var9.field2711 = new int[var9.field2702.length]; + } + + if (var9.field2560 == null) { + var9.field2560 = new int[var9.field2702.length]; + } + + if (var23 != 0) { + if (var9.field2711[var20] == 0) { + var9.field2711[var20] = var23 + Client.cycle + var9.field2560[var20]; + } else { + var9.field2711[var20] = var23 + Client.cycle; + } + } else { + var9.field2711[var20] = Integer.MAX_VALUE; + } + } + + if (!var21 && var9.field2711 != null) { + var9.field2711[var20] = 0; + } + } + } + + if (var9.isIf3) { + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + var33 = true; + } else { + var33 = false; + } + + boolean var34 = false; + if ((MouseHandler.MouseHandler_currentButton == 1 || !ArchiveLoader.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var33) { + var34 = true; + } + + var21 = false; + if ((MouseHandler.MouseHandler_lastButton == 1 || !ArchiveLoader.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { + var21 = true; + } + + if (var21) { + Strings.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11); + } + + if (var9.contentType == 1400) { + WorldMapIcon_0.worldMap.method6363(var17, var18, var33 & var34, var33 & var21); + } + + if (Client.clickedWidget != null && var9 != Client.clickedWidget && var33 && GrandExchangeOfferWorldComparator.method76(WorldMapIcon_0.getWidgetClickMask(var9))) { + Client.draggedOnWidget = var9; + } + + if (var9 == Client.clickedWidgetParent) { + Client.field824 = true; + Client.field919 = var10; + Client.field826 = var11; + } + + if (var9.hasListener) { + ScriptEvent var27; + if (var33 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { + var27 = new ScriptEvent(); + var27.isMouseInputEvent = true; + var27.widget = var9; + var27.mouseY = Client.mouseWheelRotation; + var27.args = var9.onScroll; + Client.scriptEvents.addFirst(var27); + } + + if (Client.clickedWidget != null || class185.dragInventoryWidget != null || Client.isMenuOpen) { + var21 = false; + var34 = false; + var33 = false; + } + + if (!var9.isClicked && var21) { + var9.isClicked = true; + if (var9.onClick != null) { + var27 = new ScriptEvent(); + var27.isMouseInputEvent = true; + var27.widget = var9; + var27.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; + var27.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; + var27.args = var9.onClick; + Client.scriptEvents.addFirst(var27); + } + } + + if (var9.isClicked && var34 && var9.onClickRepeat != null) { + var27 = new ScriptEvent(); + var27.isMouseInputEvent = true; + var27.widget = var9; + var27.mouseX = MouseHandler.MouseHandler_x - var10; + var27.mouseY = MouseHandler.MouseHandler_y - var11; + var27.args = var9.onClickRepeat; + Client.scriptEvents.addFirst(var27); + } + + if (var9.isClicked && !var34) { + var9.isClicked = false; + if (var9.onRelease != null) { + var27 = new ScriptEvent(); + var27.isMouseInputEvent = true; + var27.widget = var9; + var27.mouseX = MouseHandler.MouseHandler_x - var10; + var27.mouseY = MouseHandler.MouseHandler_y - var11; + var27.args = var9.onRelease; + Client.field847.addFirst(var27); + } + } + + if (var34 && var9.onHold != null) { + var27 = new ScriptEvent(); + var27.isMouseInputEvent = true; + var27.widget = var9; + var27.mouseX = MouseHandler.MouseHandler_x - var10; + var27.mouseY = MouseHandler.MouseHandler_y - var11; + var27.args = var9.onHold; + Client.scriptEvents.addFirst(var27); + } + + if (!var9.containsMouse && var33) { + var9.containsMouse = true; + if (var9.onMouseOver != null) { + var27 = new ScriptEvent(); + var27.isMouseInputEvent = true; + var27.widget = var9; + var27.mouseX = MouseHandler.MouseHandler_x - var10; + var27.mouseY = MouseHandler.MouseHandler_y - var11; + var27.args = var9.onMouseOver; + Client.scriptEvents.addFirst(var27); + } + } + + if (var9.containsMouse && var33 && var9.onMouseRepeat != null) { + var27 = new ScriptEvent(); + var27.isMouseInputEvent = true; + var27.widget = var9; + var27.mouseX = MouseHandler.MouseHandler_x - var10; + var27.mouseY = MouseHandler.MouseHandler_y - var11; + var27.args = var9.onMouseRepeat; + Client.scriptEvents.addFirst(var27); + } + + if (var9.containsMouse && !var33) { + var9.containsMouse = false; + if (var9.onMouseLeave != null) { + var27 = new ScriptEvent(); + var27.isMouseInputEvent = true; + var27.widget = var9; + var27.mouseX = MouseHandler.MouseHandler_x - var10; + var27.mouseY = MouseHandler.MouseHandler_y - var11; + var27.args = var9.onMouseLeave; + Client.field847.addFirst(var27); + } + } + + if (var9.onTimer != null) { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onTimer; + Client.field846.addFirst(var27); + } + + ScriptEvent var28; + int var35; + int var36; + if (var9.onVarTransmit != null && Client.field833 > var9.field2706) { + if (var9.varTransmitTriggers != null && Client.field833 - var9.field2706 <= 32) { + label849: + for (var35 = var9.field2706; var35 < Client.field833; ++var35) { + var23 = Client.field832[var35 & 31]; + + for (var36 = 0; var36 < var9.varTransmitTriggers.length; ++var36) { + if (var23 == var9.varTransmitTriggers[var36]) { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.onVarTransmit; + Client.scriptEvents.addFirst(var28); + break label849; + } + } + } + } else { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onVarTransmit; + Client.scriptEvents.addFirst(var27); + } + + var9.field2706 = Client.field833; + } + + if (var9.onInvTransmit != null && Client.field835 > var9.field2570) { + if (var9.invTransmitTriggers != null && Client.field835 - var9.field2570 <= 32) { + label825: + for (var35 = var9.field2570; var35 < Client.field835; ++var35) { + var23 = Client.changedItemContainers[var35 & 31]; + + for (var36 = 0; var36 < var9.invTransmitTriggers.length; ++var36) { + if (var23 == var9.invTransmitTriggers[var36]) { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.onInvTransmit; + Client.scriptEvents.addFirst(var28); + break label825; + } + } + } + } else { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onInvTransmit; + Client.scriptEvents.addFirst(var27); + } + + var9.field2570 = Client.field835; + } + + if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field2708) { + if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field2708 <= 32) { + label801: + for (var35 = var9.field2708; var35 < Client.changedSkillsCount; ++var35) { + var23 = Client.changedSkills[var35 & 31]; + + for (var36 = 0; var36 < var9.statTransmitTriggers.length; ++var36) { + if (var23 == var9.statTransmitTriggers[var36]) { + var28 = new ScriptEvent(); + var28.widget = var9; + var28.args = var9.onStatTransmit; + Client.scriptEvents.addFirst(var28); + break label801; + } + } + } + } else { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onStatTransmit; + Client.scriptEvents.addFirst(var27); + } + + var9.field2708 = Client.changedSkillsCount; + } + + if (Client.chatCycle > var9.field2705 && var9.onChatTransmit != null) { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onChatTransmit; + Client.scriptEvents.addFirst(var27); + } + + if (Client.field839 > var9.field2705 && var9.onFriendTransmit != null) { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onFriendTransmit; + Client.scriptEvents.addFirst(var27); + } + + if (Client.field823 > var9.field2705 && var9.onClanTransmit != null) { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onClanTransmit; + Client.scriptEvents.addFirst(var27); + } + + if (Client.field841 > var9.field2705 && var9.onStockTransmit != null) { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onStockTransmit; + Client.scriptEvents.addFirst(var27); + } + + if (Client.field842 > var9.field2705 && var9.field2674 != null) { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.field2674; + Client.scriptEvents.addFirst(var27); + } + + if (Client.field795 > var9.field2705 && var9.onMiscTransmit != null) { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onMiscTransmit; + Client.scriptEvents.addFirst(var27); + } + + var9.field2705 = Client.cycleCntr; + if (var9.onKey != null) { + for (var35 = 0; var35 < Client.field762; ++var35) { + ScriptEvent var29 = new ScriptEvent(); + var29.widget = var9; + var29.keyTyped = Client.field869[var35]; + var29.keyPressed = Client.field868[var35]; + var29.args = var9.onKey; + Client.scriptEvents.addFirst(var29); + } + } + } + } + + if (!var9.isIf3) { + if (Client.clickedWidget != null || class185.dragInventoryWidget != null || Client.isMenuOpen) { + continue; + } + + if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + if (var9.mouseOverRedirect >= 0) { + GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; + } else { + GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1 = var9; + } + } + + if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + VarbitDefinition.field3296 = var9; + } + + if (var9.scrollHeight > var9.height) { + VarcInt.method4485(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); + } + } + + if (var9.type == 0) { + updateInterface(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); + if (var9.children != null) { + updateInterface(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); + } + + InterfaceParent var30 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); + if (var30 != null) { + if (var30.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { + for (ScriptEvent var31 = (ScriptEvent)Client.scriptEvents.last(); var31 != null; var31 = (ScriptEvent)Client.scriptEvents.previous()) { + if (var31.isMouseInputEvent) { + var31.remove(); + var31.widget.containsMouse = false; + } + } + + if (SequenceDefinition.widgetDragDuration == 0) { + Client.clickedWidget = null; + Client.clickedWidgetParent = null; + } + + if (!Client.isMenuOpen) { + class96.addCancelMenuEntry(); + } + } + + WorldMapDecoration.updateRootInterface(var30.group, var12, var13, var14, var15, var10, var11); + } + } + } + } + } + } + + } + + @ObfuscatedName("kc") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)V", + garbageValue = "-1093482480" + ) + @Export("Clan_joinChat") + static final void Clan_joinChat(String var0) { + if (!var0.equals("")) { + PacketBufferNode var1 = TilePaint.getPacketBufferNode(ClientPacket.field2252, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var0)); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); + } } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java index e1b019c331..723d26fa44 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java @@ -1,291 +1,507 @@ -import java.io.File; import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("o") +@ObfuscatedName("h") @Implements("GrandExchangeOfferNameComparator") final class GrandExchangeOfferNameComparator implements Comparator { - @ObfuscatedName("i") - @Export("FileSystem_cacheDir") - static File FileSystem_cacheDir; - @ObfuscatedName("ef") + @ObfuscatedName("dg") @ObfuscatedSignature( - signature = "Lif;" + signature = "Lia;" ) - @Export("archive17") - static Archive archive17; + @Export("archive9") + static Archive archive9; - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lx;Lx;I)I", - garbageValue = "1230238028" + signature = "(Ll;Ll;B)I", + garbageValue = "48" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.getOfferName().compareTo(var2.getOfferName()); } - public boolean equals(Object var1) { - return super.equals(var1); - } - public int compare(Object var1, Object var2) { return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(Lhz;III)[Lls;", - garbageValue = "-1409771005" - ) - @Export("SpriteBuffer_getSpriteArray") - public static Sprite[] SpriteBuffer_getSpriteArray(AbstractArchive var0, int var1, int var2) { - if (!HitSplatDefinition.method4586(var0, var1, var2)) { - return null; - } else { - Sprite[] var4 = new Sprite[class325.SpriteBuffer_spriteCount]; - - for (int var5 = 0; var5 < class325.SpriteBuffer_spriteCount; ++var5) { - Sprite var6 = var4[var5] = new Sprite(); - var6.width = class325.SpriteBuffer_spriteWidth; - var6.height = class325.SpriteBuffer_spriteHeight; - var6.xOffset = class325.SpriteBuffer_xOffsets[var5]; - var6.yOffset = class325.SpriteBuffer_yOffsets[var5]; - var6.subWidth = UserComparator1.SpriteBuffer_spriteWidths[var5]; - var6.subHeight = class325.SpriteBuffer_spriteHeights[var5]; - int var7 = var6.subWidth * var6.subHeight; - byte[] var8 = class290.SpriteBuffer_pixels[var5]; - var6.pixels = new int[var7]; - - for (int var9 = 0; var9 < var7; ++var9) { - var6.pixels[var9] = class268.SpriteBuffer_spritePalette[var8[var9] & 255]; - } - } - - Message.method1223(); - return var4; - } + public boolean equals(Object var1) { + return super.equals(var1); } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(ILcu;ZB)I", - garbageValue = "-68" + signature = "(Lem;[Lfv;I)V", + garbageValue = "1041712074" ) - static int method134(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var3 = Tile.getWidget(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); - } else { - var3 = var2 ? UserComparator7.field1946 : class197.field2398; + static final void method152(Scene var0, CollisionMap[] var1) { + int var2; + int var3; + int var4; + int var5; + for (var2 = 0; var2 < 4; ++var2) { + for (var3 = 0; var3 < 104; ++var3) { + for (var4 = 0; var4 < 104; ++var4) { + if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) == 1) { + var5 = var2; + if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { + var5 = var2 - 1; + } + + if (var5 >= 0) { + var1[var5].setBlockedByFloor(var3, var4); + } + } + } + } } - String var4 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - int[] var5 = null; - if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { - int var6 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - if (var6 > 0) { - for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]) { + Tiles.field512 += (int)(Math.random() * 5.0D) - 2; + if (Tiles.field512 < -8) { + Tiles.field512 = -8; + } + + if (Tiles.field512 > 8) { + Tiles.field512 = 8; + } + + Tiles.field519 += (int)(Math.random() * 5.0D) - 2; + if (Tiles.field519 < -16) { + Tiles.field519 = -16; + } + + if (Tiles.field519 > 16) { + Tiles.field519 = 16; + } + + int var9; + int var10; + int var11; + int var12; + int var13; + int var14; + int var15; + int var16; + int[] var10000; + int var17; + int var18; + for (var2 = 0; var2 < 4; ++var2) { + byte[][] var42 = InterfaceParent.field565[var2]; + var9 = (int)Math.sqrt(5100.0D); + var10 = var9 * 768 >> 8; + + int var19; + int var20; + for (var11 = 1; var11 < 103; ++var11) { + for (var12 = 1; var12 < 103; ++var12) { + var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11]; + var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1]; + var15 = (int)Math.sqrt((double)(var14 * var14 + var13 * var13 + 65536)); + var16 = (var13 << 8) / var15; + var17 = 65536 / var15; + var18 = (var14 << 8) / var15; + var19 = (var16 * -50 + var18 * -50 + var17 * -10) / var10 + 96; + var20 = (var42[var12][var11 + 1] >> 3) + (var42[var12 - 1][var11] >> 2) + (var42[var12][var11 - 1] >> 2) + (var42[var12 + 1][var11] >> 3) + (var42[var12][var11] >> 1); + Tiles.field509[var12][var11] = var19 - var20; } } - var4 = var4.substring(0, var4.length() - 1); - } - - Object[] var8 = new Object[var4.length() + 1]; - - int var7; - for (var7 = var8.length - 1; var7 >= 1; --var7) { - if (var4.charAt(var7 - 1) == 's') { - var8[var7] = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - } else { - var8[var7] = new Integer(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); - } - } - - var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - if (var7 != -1) { - var8[0] = new Integer(var7); - } else { - var8 = null; - } - - if (var0 == ScriptOpcodes.CC_SETONCLICK) { - var3.onClick = var8; - } else if (var0 == ScriptOpcodes.CC_SETONHOLD) { - var3.onHold = var8; - } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { - var3.onRelease = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { - var3.onMouseOver = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { - var3.onMouseLeave = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDRAG) { - var3.onDrag = var8; - } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { - var3.onTargetLeave = var8; - } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { - var3.onVarTransmit = var8; - var3.varTransmitTriggers = var5; - } else if (var0 == ScriptOpcodes.CC_SETONTIMER) { - var3.onTimer = var8; - } else if (var0 == ScriptOpcodes.CC_SETONOP) { - var3.onOp = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { - var3.onDragComplete = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { - var3.onClickRepeat = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { - var3.onMouseRepeat = var8; - } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { - var3.onInvTransmit = var8; - var3.invTransmitTriggers = var5; - } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { - var3.onStatTransmit = var8; - var3.statTransmitTriggers = var5; - } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { - var3.onTargetEnter = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { - var3.onScroll = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { - var3.onChatTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONKEY) { - var3.onKey = var8; - } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { - var3.onFriendTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { - var3.onClanTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { - var3.onMiscTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { - var3.onDialogAbort = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { - var3.onSubChange = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { - var3.onStockTransmit = var8; - } else if (var0 == 1426) { - var3.field2562 = var8; - } else { - if (var0 != ScriptOpcodes.CC_SETONRESIZE) { - return 2; + for (var11 = 0; var11 < 104; ++var11) { + class268.Tiles_hue[var11] = 0; + HorizontalAlignment.Tiles_saturation[var11] = 0; + class30.Tiles_lightness[var11] = 0; + class40.Tiles_hueMultiplier[var11] = 0; + TileItemPile.field1529[var11] = 0; } - var3.onResize = var8; - } - - var3.hasListener = true; - return 1; - } - - @ObfuscatedName("jc") - @ObfuscatedSignature( - signature = "(Lha;III)V", - garbageValue = "527227897" - ) - @Export("clickWidget") - static final void clickWidget(Widget var0, int var1, int var2) { - if (Client.clickedWidget == null && !Client.isMenuOpen) { - if (var0 != null) { - Widget var4 = StudioGame.method4116(var0); - if (var4 == null) { - var4 = var0.parent; - } - - if (var4 != null) { - Client.clickedWidget = var0; - var4 = StudioGame.method4116(var0); - if (var4 == null) { - var4 = var0.parent; + for (var11 = -5; var11 < 109; ++var11) { + for (var12 = 0; var12 < 104; ++var12) { + var13 = var11 + 5; + int var10002; + if (var13 >= 0 && var13 < 104) { + var14 = Tiles.field502[var2][var13][var12] & 255; + if (var14 > 0) { + FloorUnderlayDefinition var43 = GraphicsObject.method2055(var14 - 1); + var10000 = class268.Tiles_hue; + var10000[var12] += var43.hue; + var10000 = HorizontalAlignment.Tiles_saturation; + var10000[var12] += var43.saturation; + var10000 = class30.Tiles_lightness; + var10000[var12] += var43.lightness; + var10000 = class40.Tiles_hueMultiplier; + var10000[var12] += var43.hueMultiplier; + var10002 = TileItemPile.field1529[var12]++; + } } - Client.clickedWidgetParent = var4; - Client.widgetClickX = var1; - Client.widgetClickY = var2; - WorldMapSection2.widgetDragDuration = 0; - Client.isDraggingWidget = false; - int var5 = GrandExchangeOfferOwnWorldComparator.method1288(); - if (var5 != -1) { - BuddyRankComparator.method3361(var5); + var14 = var11 - 5; + if (var14 >= 0 && var14 < 104) { + var15 = Tiles.field502[var2][var14][var12] & 255; + if (var15 > 0) { + FloorUnderlayDefinition var44 = GraphicsObject.method2055(var15 - 1); + var10000 = class268.Tiles_hue; + var10000[var12] -= var44.hue; + var10000 = HorizontalAlignment.Tiles_saturation; + var10000[var12] -= var44.saturation; + var10000 = class30.Tiles_lightness; + var10000[var12] -= var44.lightness; + var10000 = class40.Tiles_hueMultiplier; + var10000[var12] -= var44.hueMultiplier; + var10002 = TileItemPile.field1529[var12]--; + } + } + } + + if (var11 >= 1 && var11 < 103) { + var12 = 0; + var13 = 0; + var14 = 0; + var15 = 0; + var16 = 0; + + for (var17 = -5; var17 < 109; ++var17) { + var18 = var17 + 5; + if (var18 >= 0 && var18 < 104) { + var12 += class268.Tiles_hue[var18]; + var13 += HorizontalAlignment.Tiles_saturation[var18]; + var14 += class30.Tiles_lightness[var18]; + var15 += class40.Tiles_hueMultiplier[var18]; + var16 += TileItemPile.field1529[var18]; + } + + var19 = var17 - 5; + if (var19 >= 0 && var19 < 104) { + var12 -= class268.Tiles_hue[var19]; + var13 -= HorizontalAlignment.Tiles_saturation[var19]; + var14 -= class30.Tiles_lightness[var19]; + var15 -= class40.Tiles_hueMultiplier[var19]; + var16 -= TileItemPile.field1529[var19]; + } + + if (var17 >= 1 && var17 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var11][var17] & 2) != 0 || (Tiles.Tiles_renderFlags[var2][var11][var17] & 16) == 0)) { + if (var2 < Tiles.Tiles_minPlane) { + Tiles.Tiles_minPlane = var2; + } + + var20 = Tiles.field502[var2][var11][var17] & 255; + int var21 = Tiles.field514[var2][var11][var17] & 255; + if (var20 > 0 || var21 > 0) { + int var22 = Tiles.Tiles_heights[var2][var11][var17]; + int var23 = Tiles.Tiles_heights[var2][var11 + 1][var17]; + int var24 = Tiles.Tiles_heights[var2][var11 + 1][var17 + 1]; + int var25 = Tiles.Tiles_heights[var2][var11][var17 + 1]; + int var26 = Tiles.field509[var11][var17]; + int var27 = Tiles.field509[var11 + 1][var17]; + int var28 = Tiles.field509[var11 + 1][var17 + 1]; + int var29 = Tiles.field509[var11][var17 + 1]; + int var30 = -1; + int var31 = -1; + int var32; + int var33; + if (var20 > 0) { + var32 = var12 * 256 / var15; + var33 = var13 / var16; + int var34 = var14 / var16; + var30 = class192.hslToRgb(var32, var33, var34); + var32 = var32 + Tiles.field512 & 255; + var34 += Tiles.field519; + if (var34 < 0) { + var34 = 0; + } else if (var34 > 255) { + var34 = 255; + } + + var31 = class192.hslToRgb(var32, var33, var34); + } + + if (var2 > 0) { + boolean var47 = true; + if (var20 == 0 && Tiles.field507[var2][var11][var17] != 0) { + var47 = false; + } + + if (var21 > 0 && !ArchiveLoader.FloorUnderlayDefinition_get(var21 - 1).hideUnderlay) { + var47 = false; + } + + if (var47 && var23 == var22 && var22 == var24 && var25 == var22) { + var10000 = UrlRequest.field1940[var2][var11]; + var10000[var17] |= 2340; + } + } + + var32 = 0; + if (var31 != -1) { + var32 = Rasterizer3D.Rasterizer3D_colorPalette[DynamicObject.method2286(var31, 96)]; + } + + if (var21 == 0) { + var0.addTile(var2, var11, var17, 0, 0, -1, var22, var23, var24, var25, DynamicObject.method2286(var30, var26), DynamicObject.method2286(var30, var27), DynamicObject.method2286(var30, var28), DynamicObject.method2286(var30, var29), 0, 0, 0, 0, var32, 0); + } else { + var33 = Tiles.field507[var2][var11][var17] + 1; + byte var48 = Tiles.field518[var2][var11][var17]; + FloorOverlayDefinition var35 = ArchiveLoader.FloorUnderlayDefinition_get(var21 - 1); + int var36 = var35.texture; + int var37; + int var38; + int var39; + int var40; + if (var36 >= 0) { + var38 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var36); + var37 = -1; + } else if (var35.primaryRgb == 16711935) { + var37 = -2; + var36 = -1; + var38 = -2; + } else { + var37 = class192.hslToRgb(var35.hue, var35.saturation, var35.lightness); + var39 = var35.hue + Tiles.field512 & 255; + var40 = var35.lightness + Tiles.field519; + if (var40 < 0) { + var40 = 0; + } else if (var40 > 255) { + var40 = 255; + } + + var38 = class192.hslToRgb(var39, var35.saturation, var40); + } + + var39 = 0; + if (var38 != -2) { + var39 = Rasterizer3D.Rasterizer3D_colorPalette[WorldMapRegion.method564(var38, 96)]; + } + + if (var35.secondaryRgb != -1) { + var40 = var35.secondaryHue + Tiles.field512 & 255; + int var41 = var35.secondaryLightness + Tiles.field519; + if (var41 < 0) { + var41 = 0; + } else if (var41 > 255) { + var41 = 255; + } + + var38 = class192.hslToRgb(var40, var35.secondarySaturation, var41); + var39 = Rasterizer3D.Rasterizer3D_colorPalette[WorldMapRegion.method564(var38, 96)]; + } + + var0.addTile(var2, var11, var17, var33, var48, var36, var22, var23, var24, var25, DynamicObject.method2286(var30, var26), DynamicObject.method2286(var30, var27), DynamicObject.method2286(var30, var28), DynamicObject.method2286(var30, var29), WorldMapRegion.method564(var37, var26), WorldMapRegion.method564(var37, var27), WorldMapRegion.method564(var37, var28), WorldMapRegion.method564(var37, var29), var32, var39); + } + } + } + } + } + } + + for (var11 = 1; var11 < 103; ++var11) { + for (var12 = 1; var12 < 103; ++var12) { + if ((Tiles.Tiles_renderFlags[var2][var12][var11] & 8) != 0) { + var17 = 0; + } else if (var2 > 0 && (Tiles.Tiles_renderFlags[1][var12][var11] & 2) != 0) { + var17 = var2 - 1; + } else { + var17 = var2; } - return; + var0.setTileMinPlane(var2, var12, var11, var17); } } + Tiles.field502[var2] = null; + Tiles.field514[var2] = null; + Tiles.field507[var2] = null; + Tiles.field518[var2] = null; + InterfaceParent.field565[var2] = null; } - } - @ObfuscatedName("kn") - @ObfuscatedSignature( - signature = "(Lha;B)Z", - garbageValue = "26" - ) - static final boolean method136(Widget var0) { - int var1 = var0.contentType; - if (var1 == 205) { - Client.logoutTimer = 250; - return true; - } else { - int var2; - int var3; - if (var1 >= 300 && var1 <= 313) { - var2 = (var1 - 300) / 2; - var3 = var1 & 1; - Client.playerAppearance.changeAppearance(var2, var3 == 1); - } + var0.method3186(-50, -10, -50); - if (var1 >= 314 && var1 <= 323) { - var2 = (var1 - 314) / 2; - var3 = var1 & 1; - Client.playerAppearance.method3978(var2, var3 == 1); - } - - if (var1 == 324) { - Client.playerAppearance.changeSex(false); - } - - if (var1 == 325) { - Client.playerAppearance.changeSex(true); - } - - if (var1 == 326) { - PacketBufferNode var4 = class2.getPacketBufferNode(ClientPacket.field2232, Client.packetWriter.isaacCipher); - Client.playerAppearance.write(var4.packetBuffer); - Client.packetWriter.addNode(var4); - return true; - } else { - return false; - } - } - } - - @ObfuscatedName("kl") - @ObfuscatedSignature( - signature = "(IIIILls;Lhy;I)V", - garbageValue = "1019176627" - ) - @Export("drawSpriteOnMinimap") - static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) { - if (var4 != null) { - int var6 = Client.camAngleY & 2047; - int var7 = var3 * var3 + var2 * var2; - if (var7 <= 6400) { - int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; - int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; - int var10 = var9 * var2 + var3 * var8 >> 16; - int var11 = var3 * var9 - var8 * var2 >> 16; - if (var7 > 2500) { - var4.method6251(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths); - } else { - var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); + for (var2 = 0; var2 < 104; ++var2) { + for (var3 = 0; var3 < 104; ++var3) { + if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { + var0.setLinkBelow(var2, var3); } - } } + + var2 = 1; + var3 = 2; + var4 = 4; + + for (var5 = 0; var5 < 4; ++var5) { + if (var5 > 0) { + var2 <<= 3; + var3 <<= 3; + var4 <<= 3; + } + + for (int var6 = 0; var6 <= var5; ++var6) { + for (int var7 = 0; var7 <= 104; ++var7) { + for (int var8 = 0; var8 <= 104; ++var8) { + short var46; + if ((UrlRequest.field1940[var6][var8][var7] & var2) != 0) { + var9 = var7; + var10 = var7; + var11 = var6; + + for (var12 = var6; var9 > 0 && (UrlRequest.field1940[var6][var8][var9 - 1] & var2) != 0; --var9) { + } + + while (var10 < 104 && (UrlRequest.field1940[var6][var8][var10 + 1] & var2) != 0) { + ++var10; + } + + label444: + while (var11 > 0) { + for (var13 = var9; var13 <= var10; ++var13) { + if ((UrlRequest.field1940[var11 - 1][var8][var13] & var2) == 0) { + break label444; + } + } + + --var11; + } + + label433: + while (var12 < var5) { + for (var13 = var9; var13 <= var10; ++var13) { + if ((UrlRequest.field1940[var12 + 1][var8][var13] & var2) == 0) { + break label433; + } + } + + ++var12; + } + + var13 = (var10 - var9 + 1) * (var12 + 1 - var11); + if (var13 >= 8) { + var46 = 240; + var15 = Tiles.Tiles_heights[var12][var8][var9] - var46; + var16 = Tiles.Tiles_heights[var11][var8][var9]; + Scene.Scene_addOccluder(var5, 1, var8 * 128, var8 * 128, var9 * 128, var10 * 128 + 128, var15, var16); + + for (var17 = var11; var17 <= var12; ++var17) { + for (var18 = var9; var18 <= var10; ++var18) { + var10000 = UrlRequest.field1940[var17][var8]; + var10000[var18] &= ~var2; + } + } + } + } + + if ((UrlRequest.field1940[var6][var8][var7] & var3) != 0) { + var9 = var8; + var10 = var8; + var11 = var6; + + for (var12 = var6; var9 > 0 && (UrlRequest.field1940[var6][var9 - 1][var7] & var3) != 0; --var9) { + } + + while (var10 < 104 && (UrlRequest.field1940[var6][var10 + 1][var7] & var3) != 0) { + ++var10; + } + + label497: + while (var11 > 0) { + for (var13 = var9; var13 <= var10; ++var13) { + if ((UrlRequest.field1940[var11 - 1][var13][var7] & var3) == 0) { + break label497; + } + } + + --var11; + } + + label486: + while (var12 < var5) { + for (var13 = var9; var13 <= var10; ++var13) { + if ((UrlRequest.field1940[var12 + 1][var13][var7] & var3) == 0) { + break label486; + } + } + + ++var12; + } + + var13 = (var10 - var9 + 1) * (var12 + 1 - var11); + if (var13 >= 8) { + var46 = 240; + var15 = Tiles.Tiles_heights[var12][var9][var7] - var46; + var16 = Tiles.Tiles_heights[var11][var9][var7]; + Scene.Scene_addOccluder(var5, 2, var9 * 128, var10 * 128 + 128, var7 * 128, var7 * 128, var15, var16); + + for (var17 = var11; var17 <= var12; ++var17) { + for (var18 = var9; var18 <= var10; ++var18) { + var10000 = UrlRequest.field1940[var17][var18]; + var10000[var7] &= ~var3; + } + } + } + } + + if ((UrlRequest.field1940[var6][var8][var7] & var4) != 0) { + var9 = var8; + var10 = var8; + var11 = var7; + + for (var12 = var7; var11 > 0 && (UrlRequest.field1940[var6][var8][var11 - 1] & var4) != 0; --var11) { + } + + while (var12 < 104 && (UrlRequest.field1940[var6][var8][var12 + 1] & var4) != 0) { + ++var12; + } + + label550: + while (var9 > 0) { + for (var13 = var11; var13 <= var12; ++var13) { + if ((UrlRequest.field1940[var6][var9 - 1][var13] & var4) == 0) { + break label550; + } + } + + --var9; + } + + label539: + while (var10 < 104) { + for (var13 = var11; var13 <= var12; ++var13) { + if ((UrlRequest.field1940[var6][var10 + 1][var13] & var4) == 0) { + break label539; + } + } + + ++var10; + } + + if ((var12 - var11 + 1) * (var10 - var9 + 1) >= 4) { + var13 = Tiles.Tiles_heights[var6][var9][var11]; + Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13); + + for (var14 = var9; var14 <= var10; ++var14) { + for (var15 = var11; var15 <= var12; ++var15) { + var10000 = UrlRequest.field1940[var6][var14]; + var10000[var15] &= ~var4; + } + } + } + } + } + } + } + } + + } + + @ObfuscatedName("je") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "1818346399" + ) + static final void method150(int var0) { + if (ScriptFrame.loadInterface(var0)) { + WorldMapEvent.drawModelComponents(WorldMapLabel.Widget_interfaceComponents[var0], -1); + } } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java index dd83a9eea9..78d7ef4b5c 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java @@ -1,3 +1,6 @@ +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; @@ -5,30 +8,31 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bb") +@ObfuscatedName("bd") @Implements("GrandExchangeOfferOwnWorldComparator") public class GrandExchangeOfferOwnWorldComparator implements Comparator { - @ObfuscatedName("rs") + @ObfuscatedName("qo") @ObfuscatedGetter( - intValue = 756915395 + intValue = -1780442240 ) - static int field623; - @ObfuscatedName("eu") - static int[] field626; - @ObfuscatedName("gf") - @Export("regionMapArchives") - static byte[][] regionMapArchives; - @ObfuscatedName("f") + static int field640; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -153755923 + ) + @Export("cacheGamebuild") + public static int cacheGamebuild; + @ObfuscatedName("c") @Export("filterWorlds") boolean filterWorlds; GrandExchangeOfferOwnWorldComparator() { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lx;Lx;I)I", - garbageValue = "-1149746990" + signature = "(Ll;Ll;I)I", + garbageValue = "231872829" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -57,12 +61,187 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { return super.equals(var1); } - @ObfuscatedName("ik") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-524151860" + signature = "(Ljava/lang/String;Ljava/lang/String;II)Ljava/io/File;", + garbageValue = "295022584" ) - static final int method1288() { - return Client.menuOptionsCount - 1; + public static File method1311(String var0, String var1, int var2) { + String var3 = var2 == 0 ? "" : "" + var2; + JagexCache.JagexCache_locationFile = new File(UserComparator4.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var3 + ".dat"); + String var4 = null; + String var5 = null; + boolean var6 = false; + Buffer var8; + int var11; + File var27; + if (JagexCache.JagexCache_locationFile.exists()) { + try { + AccessFile var7 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); + + int var9; + for (var8 = new Buffer((int)var7.length()); var8.offset < var8.array.length; var8.offset += var9) { + var9 = var7.read(var8.array, var8.offset, var8.array.length - var8.offset); + if (var9 == -1) { + throw new IOException(); + } + } + + var8.offset = 0; + var9 = var8.readUnsignedByte(); + if (var9 < 1 || var9 > 3) { + throw new IOException("" + var9); + } + + int var10 = 0; + if (var9 > 1) { + var10 = var8.readUnsignedByte(); + } + + if (var9 <= 2) { + var4 = var8.readStringCp1252NullCircumfixed(); + if (var10 == 1) { + var5 = var8.readStringCp1252NullCircumfixed(); + } + } else { + var4 = var8.readCESU8(); + if (var10 == 1) { + var5 = var8.readCESU8(); + } + } + + var7.close(); + } catch (IOException var25) { + var25.printStackTrace(); + } + + if (var4 != null) { + var27 = new File(var4); + if (!var27.exists()) { + var4 = null; + } + } + + if (var4 != null) { + var27 = new File(var4, "test.dat"); + + boolean var28; + try { + RandomAccessFile var15 = new RandomAccessFile(var27, "rw"); + var11 = var15.read(); + var15.seek(0L); + var15.write(var11); + var15.seek(0L); + var15.close(); + var27.delete(); + var28 = true; + } catch (Exception var23) { + var28 = false; + } + + if (!var28) { + var4 = null; + } + } + } + + if (var4 == null && var2 == 0) { + label159: + for (int var16 = 0; var16 < class42.field373.length; ++var16) { + for (int var17 = 0; var17 < ChatChannel.field1291.length; ++var17) { + File var18 = new File(ChatChannel.field1291[var17] + class42.field373[var16] + File.separatorChar + var0 + File.separatorChar); + if (var18.exists()) { + File var19 = new File(var18, "test.dat"); + + boolean var29; + try { + RandomAccessFile var12 = new RandomAccessFile(var19, "rw"); + int var13 = var12.read(); + var12.seek(0L); + var12.write(var13); + var12.seek(0L); + var12.close(); + var19.delete(); + var29 = true; + } catch (Exception var22) { + var29 = false; + } + + if (var29) { + var4 = var18.toString(); + var6 = true; + break label159; + } + } + } + } + } + + if (var4 == null) { + var4 = UserComparator4.userHomeDirectory + File.separatorChar + "jagexcache" + var3 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; + var6 = true; + } + + File var26; + if (var5 != null) { + var26 = new File(var5); + var27 = new File(var4); + + try { + File[] var33 = var26.listFiles(); + File[] var31 = var33; + + for (var11 = 0; var11 < var31.length; ++var11) { + File var30 = var31[var11]; + File var20 = new File(var27, var30.getName()); + boolean var14 = var30.renameTo(var20); + if (!var14) { + throw new IOException(); + } + } + } catch (Exception var24) { + var24.printStackTrace(); + } + + var6 = true; + } + + if (var6) { + var26 = new File(var4); + var8 = null; + + try { + AccessFile var34 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); + Buffer var32 = new Buffer(500); + var32.writeByte(3); + var32.writeByte(var8 != null ? 1 : 0); + var32.writeCESU8(var26.getPath()); + if (var8 != null) { + var32.writeCESU8(""); + } + + var34.write(var32.array, 0, var32.offset); + var34.close(); + } catch (IOException var21) { + var21.printStackTrace(); + } + } + + return new File(var4); + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "110" + ) + static void method1308() { + Players.Players_count = 0; + + for (int var0 = 0; var0 < 2048; ++var0) { + Players.field1235[var0] = null; + Players.field1237[var0] = 1; + } + } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java index 6f3cd77596..f93f5157b1 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java @@ -1,47 +1,20 @@ -import java.awt.Component; -import java.awt.image.BufferedImage; -import java.awt.image.PixelGrabber; -import java.io.ByteArrayInputStream; -import java.io.IOException; import java.util.Comparator; -import javax.imageio.ImageIO; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("a") +@ObfuscatedName("j") @Implements("GrandExchangeOfferTotalQuantityComparator") final class GrandExchangeOfferTotalQuantityComparator implements Comparator { - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -113248427 - ) - @Export("canvasWidth") - public static int canvasWidth; - @ObfuscatedName("dw") - @ObfuscatedSignature( - signature = "Lif;" - ) - @Export("archive15") - static Archive archive15; - @ObfuscatedName("fh") - @ObfuscatedGetter( - intValue = 780531471 - ) - static int field47; - @ObfuscatedName("gv") - @ObfuscatedSignature( - signature = "Lls;" - ) - @Export("compass") - static Sprite compass; + @ObfuscatedName("at") + @Export("hasFocus") + protected static boolean hasFocus; - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lx;Lx;I)I", - garbageValue = "-247020264" + signature = "(Ll;Ll;B)I", + garbageValue = "14" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -56,38 +29,200 @@ final class GrandExchangeOfferTotalQuantityComparator implements Comparator { return super.equals(var1); } - @ObfuscatedName("f") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "([BI)Lls;", - garbageValue = "-146383667" + signature = "(Lkp;Ljava/lang/String;I)I", + garbageValue = "1410846723" ) - @Export("convertJpgToSprite") - public static final Sprite convertJpgToSprite(byte[] var0) { - BufferedImage var1 = null; - - try { - var1 = ImageIO.read(new ByteArrayInputStream(var0)); - int var2 = var1.getWidth(); - int var3 = var1.getHeight(); - int[] var4 = new int[var3 * var2]; - PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2); - var5.grabPixels(); - return new Sprite(var4, var2, var3); - } catch (IOException var7) { - } catch (InterruptedException var8) { - } - - return new Sprite(0, 0); + public static int method104(Buffer var0, String var1) { + int var2 = var0.offset; + byte[] var3 = ServerPacket.method3680(var1); + var0.writeSmartByteShort(var3.length); + var0.offset += class210.huffman.compress(var3, 0, var3.length, var0.array, var0.offset); + return var0.offset - var2; } - @ObfuscatedName("i") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ljava/awt/Component;I)V", - garbageValue = "-1494911511" + signature = "(II)[B", + garbageValue = "-265400137" ) - static void method93(Component var0) { - var0.setFocusTraversalKeysEnabled(false); - var0.addKeyListener(KeyHandler.KeyHandler_instance); - var0.addFocusListener(KeyHandler.KeyHandler_instance); + @Export("ByteArrayPool_getArray") + public static synchronized byte[] ByteArrayPool_getArray(int var0) { + return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); + } + + @ObfuscatedName("jw") + @ObfuscatedSignature( + signature = "(Lhn;IB)I", + garbageValue = "1" + ) + static final int method106(Widget var0, int var1) { + if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { + try { + int[] var2 = var0.cs1Instructions[var1]; + int var3 = 0; + int var4 = 0; + byte var5 = 0; + + while (true) { + int var6 = var2[var4++]; + int var7 = 0; + byte var8 = 0; + if (var6 == 0) { + return var3; + } + + if (var6 == 1) { + var7 = Client.currentLevels[var2[var4++]]; + } + + if (var6 == 2) { + var7 = Client.levels[var2[var4++]]; + } + + if (var6 == 3) { + var7 = Client.experience[var2[var4++]]; + } + + int var9; + Widget var10; + int var11; + int var12; + if (var6 == 4) { + var9 = var2[var4++] << 16; + var9 += var2[var4++]; + var10 = Varps.getWidget(var9); + var11 = var2[var4++]; + if (var11 != -1 && (!HealthBarDefinition.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { + if (var11 + 1 == var10.itemIds[var12]) { + var7 += var10.itemQuantities[var12]; + } + } + } + } + + if (var6 == 5) { + var7 = Varps.Varps_main[var2[var4++]]; + } + + if (var6 == 6) { + var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; + } + + if (var6 == 7) { + var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; + } + + if (var6 == 8) { + var7 = class192.localPlayer.combatLevel; + } + + if (var6 == 9) { + for (var9 = 0; var9 < 25; ++var9) { + if (Skills.Skills_enabled[var9]) { + var7 += Client.levels[var9]; + } + } + } + + if (var6 == 10) { + var9 = var2[var4++] << 16; + var9 += var2[var4++]; + var10 = Varps.getWidget(var9); + var11 = var2[var4++]; + if (var11 != -1 && (!HealthBarDefinition.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { + if (var11 + 1 == var10.itemIds[var12]) { + var7 = 999999999; + break; + } + } + } + } + + if (var6 == 11) { + var7 = Client.runEnergy; + } + + if (var6 == 12) { + var7 = Client.weight; + } + + if (var6 == 13) { + var9 = Varps.Varps_main[var2[var4++]]; + int var13 = var2[var4++]; + var7 = (var9 & 1 << var13) != 0 ? 1 : 0; + } + + if (var6 == 14) { + var9 = var2[var4++]; + var7 = GrandExchangeOfferUnitPriceComparator.getVarbit(var9); + } + + if (var6 == 15) { + var8 = 1; + } + + if (var6 == 16) { + var8 = 2; + } + + if (var6 == 17) { + var8 = 3; + } + + if (var6 == 18) { + var7 = Messages.baseX * 64 + (class192.localPlayer.x >> 7); + } + + if (var6 == 19) { + var7 = Language.baseY * 64 + (class192.localPlayer.y >> 7); + } + + if (var6 == 20) { + var7 = var2[var4++]; + } + + if (var8 == 0) { + if (var5 == 0) { + var3 += var7; + } + + if (var5 == 1) { + var3 -= var7; + } + + if (var5 == 2 && var7 != 0) { + var3 /= var7; + } + + if (var5 == 3) { + var3 *= var7; + } + + var5 = 0; + } else { + var5 = var8; + } + } + } catch (Exception var14) { + return -1; + } + } else { + return -2; + } + } + + @ObfuscatedName("jx") + @ObfuscatedSignature( + signature = "(III)V", + garbageValue = "-4522127" + ) + static void method105(int var0, int var1) { + MenuAction var2 = WorldMapRegion.tempMenuAction; + UserComparator10.menuAction(var2.param0, var2.param1, var2.opcode, var2.identifier, var2.action, var2.action, var0, var1); + WorldMapRegion.tempMenuAction = null; } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java index 7a4cf24848..e0b929c07d 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java @@ -1,29 +1,26 @@ -import java.io.BufferedReader; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringReader; -import java.io.StringWriter; import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("c") +@ObfuscatedName("p") @Implements("GrandExchangeOfferUnitPriceComparator") final class GrandExchangeOfferUnitPriceComparator implements Comparator { - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = 815964443 - ) - @Export("KitDefinition_fileCount") - public static int KitDefinition_fileCount; - - @ObfuscatedName("f") + @ObfuscatedName("ar") + @Export("null_string") + protected static String null_string; + @ObfuscatedName("la") @ObfuscatedSignature( - signature = "(Lx;Lx;B)I", - garbageValue = "114" + signature = "Lhn;" + ) + @Export("mousedOverWidgetIf1") + static Widget mousedOverWidgetIf1; + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(Ll;Ll;B)I", + garbageValue = "0" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -38,139 +35,139 @@ final class GrandExchangeOfferUnitPriceComparator implements Comparator { return super.equals(var1); } - @ObfuscatedName("i") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IB)Lit;", - garbageValue = "62" + signature = "(II)I", + garbageValue = "-2056490791" ) - @Export("WorldMapElement_get") - public static WorldMapElement WorldMapElement_get(int var0) { - return var0 >= 0 && var0 < WorldMapElement.WorldMapElement_cached.length && WorldMapElement.WorldMapElement_cached[var0] != null ? WorldMapElement.WorldMapElement_cached[var0] : new WorldMapElement(var0); - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(Lkq;Ljava/lang/String;B)I", - garbageValue = "0" - ) - public static int method122(Buffer var0, String var1) { - int var2 = var0.offset; - byte[] var3 = RouteStrategy.method3566(var1); - var0.writeSmartByteShort(var3.length); - var0.offset += class206.huffman.compress(var3, 0, var3.length, var0.array, var0.offset); - return var0.offset - var2; - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "(Ljava/lang/Throwable;B)Ljava/lang/String;", - garbageValue = "41" - ) - static String method124(Throwable var0) throws IOException { - String var1; - if (var0 instanceof RunException) { - RunException var2 = (RunException)var0; - var1 = var2.message + " | "; - var0 = var2.throwable; + @Export("getVarbit") + public static int getVarbit(int var0) { + VarbitDefinition var2 = (VarbitDefinition)VarbitDefinition.VarbitDefinition_cached.get((long)var0); + VarbitDefinition var1; + if (var2 != null) { + var1 = var2; } else { - var1 = ""; - } - - StringWriter var12 = new StringWriter(); - PrintWriter var3 = new PrintWriter(var12); - var0.printStackTrace(var3); - var3.close(); - String var4 = var12.toString(); - BufferedReader var5 = new BufferedReader(new StringReader(var4)); - String var6 = var5.readLine(); - - while (true) { - while (true) { - String var7 = var5.readLine(); - if (var7 == null) { - var1 = var1 + "| " + var6; - return var1; - } - - int var8 = var7.indexOf(40); - int var9 = var7.indexOf(41, var8 + 1); - if (var8 >= 0 && var9 >= 0) { - String var10 = var7.substring(var8 + 1, var9); - int var11 = var10.indexOf(".java:"); - if (var11 >= 0) { - var10 = var10.substring(0, var11) + var10.substring(var11 + 5); - var1 = var1 + var10 + ' '; - continue; - } - - var7 = var7.substring(0, var8); - } - - var7 = var7.trim(); - var7 = var7.substring(var7.lastIndexOf(32) + 1); - var7 = var7.substring(var7.lastIndexOf(9) + 1); - var1 = var1 + var7 + ' '; - } - } - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-2098166290" - ) - static int method118(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var2 == null) { - return 0; - } else if (var1 == -1) { - return 0; - } else { - int var3 = 0; - - for (int var4 = 0; var4 < var2.quantities.length; ++var4) { - if (var2.ids[var4] == var1) { - var3 += var2.quantities[var4]; - } + byte[] var7 = class287.VarbitDefinition_archive.takeFile(14, var0); + var2 = new VarbitDefinition(); + if (var7 != null) { + var2.decode(new Buffer(var7)); } - return var3; + VarbitDefinition.VarbitDefinition_cached.put(var2, (long)var0); + var1 = var2; } + + int var3 = var1.baseVar; + int var4 = var1.startBit; + int var5 = var1.endBit; + int var6 = Varps.Varps_masks[var5 - var4]; + return Varps.Varps_main[var3] >> var4 & var6; } - @ObfuscatedName("d") + @ObfuscatedName("ez") @ObfuscatedSignature( - signature = "(Lha;IIII)V", - garbageValue = "673237004" + signature = "(I)Lly;", + garbageValue = "-710096744" ) - @Export("Widget_setKeyRate") - static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { - if (var0.field2631 == null) { - throw new RuntimeException(); - } else { - var0.field2631[var1] = var2; - var0.field2670[var1] = var3; - } + @Export("getWorldMap") + static WorldMap getWorldMap() { + return WorldMapIcon_0.worldMap; } - @ObfuscatedName("ix") + @ObfuscatedName("gt") + @ObfuscatedSignature( + signature = "(IIIIZI)V", + garbageValue = "2147483647" + ) + @Export("setViewportShape") + static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { + if (var2 < 1) { + var2 = 1; + } + + if (var3 < 1) { + var3 = 1; + } + + int var5 = var3 - 334; + int var6; + if (var5 < 0) { + var6 = Client.field908; + } else if (var5 >= 100) { + var6 = Client.field897; + } else { + var6 = (Client.field897 - Client.field908) * var5 / 100 + Client.field908; + } + + int var7 = var3 * var6 * 512 / (var2 * 334); + int var8; + int var9; + short var10; + if (var7 < Client.field819) { + var10 = Client.field819; + var6 = var10 * var2 * 334 / (var3 * 512); + if (var6 > Client.field673) { + var6 = Client.field673; + var8 = var3 * var6 * 512 / (var10 * 334); + var9 = (var2 - var8) / 2; + if (var4) { + Rasterizer2D.Rasterizer2D_resetClip(); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); + Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); + } + + var0 += var9; + var2 -= var9 * 2; + } + } else if (var7 > Client.field903) { + var10 = Client.field903; + var6 = var10 * var2 * 334 / (var3 * 512); + if (var6 < Client.field900) { + var6 = Client.field900; + var8 = var10 * var2 * 334 / (var6 * 512); + var9 = (var3 - var8) / 2; + if (var4) { + Rasterizer2D.Rasterizer2D_resetClip(); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); + } + + var1 += var9; + var3 -= var9 * 2; + } + } + + Client.viewportZoom = var3 * var6 / 334; + if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { + CollisionMap.method3650(var2, var3); + } + + Client.viewportOffsetX = var0; + Client.viewportOffsetY = var1; + Client.viewportWidth = var2; + Client.viewportHeight = var3; + } + + @ObfuscatedName("gf") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1132135504" + garbageValue = "-1156773916" ) - @Export("Widget_runOnTargetLeave") - static void Widget_runOnTargetLeave() { - if (Client.isSpellSelected) { - Widget var0 = BZip2State.getWidgetChild(WorldMapDecoration.selectedSpellWidget, Client.selectedSpellChildIndex); - if (var0 != null && var0.onTargetLeave != null) { - ScriptEvent var1 = new ScriptEvent(); - var1.widget = var0; - var1.args = var0.onTargetLeave; - Client.runScriptEvent(var1); - } + static void method141() { + if (class192.localPlayer.x >> 7 == Client.destinationX && class192.localPlayer.y >> 7 == Client.destinationY) { + Client.destinationX = 0; + } - Client.isSpellSelected = false; - LoginPacket.invalidateWidget(var0); + } + + @ObfuscatedName("ir") + @ObfuscatedSignature( + signature = "(IIIZI)V", + garbageValue = "-1682009725" + ) + static final void method135(int var0, int var1, int var2, boolean var3) { + if (ScriptFrame.loadInterface(var0)) { + FloorUnderlayDefinition.resizeInterface(WorldMapLabel.Widget_interfaceComponents[var0], -1, var1, var2, var3); } } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java index 4e95d4cae0..ad0a4fcb74 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java @@ -4,123 +4,415 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("b") +@ObfuscatedName("g") @Implements("GrandExchangeOfferWorldComparator") final class GrandExchangeOfferWorldComparator implements Comparator { - @ObfuscatedName("dn") + @ObfuscatedName("df") @ObfuscatedSignature( - signature = "Lif;" + signature = "Lia;" ) - @Export("archive6") - static Archive archive6; + @Export("archive2") + static Archive archive2; - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lx;Lx;I)I", - garbageValue = "1333549485" + signature = "(Ll;Ll;I)I", + garbageValue = "250420083" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.world < var2.world ? -1 : (var2.world == var1.world ? 0 : 1); } - public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); - } - public boolean equals(Object var1) { return super.equals(var1); } - @ObfuscatedName("b") + public int compare(Object var1, Object var2) { + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + } + + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1794257509" + signature = "(II)Z", + garbageValue = "362180230" ) - static void method70(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var1 != null) { - var1.remove(); + public static boolean method76(int var0) { + return (var0 >> 20 & 1) != 0; + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(Lhn;IIII)V", + garbageValue = "1571239297" + ) + @Export("Widget_setKeyRate") + static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { + if (var0.field2649 == null) { + throw new RuntimeException(); + } else { + var0.field2649[var1] = var2; + var0.field2560[var1] = var3; } } - @ObfuscatedName("hr") + @ObfuscatedName("hn") @ObfuscatedSignature( - signature = "(ZLkl;I)V", - garbageValue = "386675414" + signature = "(Lgy;I)V", + garbageValue = "356089511" ) - static final void method71(boolean var0, PacketBuffer var1) { - while (true) { - if (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { - int var2 = var1.readBits(15); - if (var2 != 32767) { - boolean var3 = false; - if (Client.npcs[var2] == null) { - Client.npcs[var2] = new NPC(); - var3 = true; - } + static final void method77(class185 var0) { + PacketBuffer var1 = Client.packetWriter.packetBuffer; + int var2; + int var3; + int var4; + int var5; + int var6; + int var7; + int var8; + if (class185.field2314 == var0) { + var2 = var1.method5771(); + var3 = (var2 >> 4 & 7) + SecureRandomCallable.field531; + var4 = (var2 & 7) + FontName.field3663; + var5 = var1.method5606(); + var6 = var5 >> 2; + var7 = var5 & 3; + var8 = Client.field743[var6]; + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { + Skills.updatePendingSpawn(Clock.Client_plane, var3, var4, var8, -1, var6, var7, 0, -1); + } - NPC var4 = Client.npcs[var2]; - Client.npcIndices[++Client.npcCount - 1] = var2; - var4.npcCycle = Client.cycle; - int var5; - if (var0) { - var5 = var1.readBits(8); - if (var5 > 127) { - var5 -= 256; - } - } else { - var5 = var1.readBits(5); - if (var5 > 15) { - var5 -= 32; - } + } else { + int var9; + int var10; + if (class185.field2327 == var0) { + var2 = var1.method5740(); + var3 = var1.method5606(); + var4 = var1.readUnsignedByte(); + var5 = (var4 >> 4 & 7) + SecureRandomCallable.field531; + var6 = (var4 & 7) + FontName.field3663; + var7 = var1.readUnsignedByte(); + var8 = var7 >> 4 & 15; + var9 = var7 & 7; + if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { + var10 = var8 + 1; + if (class192.localPlayer.pathX[0] >= var5 - var10 && class192.localPlayer.pathX[0] <= var5 + var10 && class192.localPlayer.pathY[0] >= var6 - var10 && class192.localPlayer.pathY[0] <= var6 + var10 && Client.areaSoundEffectVolume != 0 && var9 > 0 && Client.soundEffectCount < 50) { + Client.soundEffectIds[Client.soundEffectCount] = var2; + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var9; + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var3; + Client.soundEffects[Client.soundEffectCount] = null; + Client.soundLocations[Client.soundEffectCount] = var8 + (var6 << 8) + (var5 << 16); + ++Client.soundEffectCount; } - - int var6 = Client.defaultRotations[var1.readBits(3)]; - if (var3) { - var4.orientation = var4.rotation = var6; - } - - int var7 = var1.readBits(1); - int var8 = var1.readBits(1); - if (var8 == 1) { - Client.field720[++Client.field673 - 1] = var2; - } - - var4.definition = AbstractUserComparator.getNpcDefinition(var1.readBits(14)); - int var9; - if (var0) { - var9 = var1.readBits(8); - if (var9 > 127) { - var9 -= 256; - } - } else { - var9 = var1.readBits(5); - if (var9 > 15) { - var9 -= 32; - } - } - - var4.field925 = var4.definition.size; - var4.field968 = var4.definition.rotation; - if (var4.field968 == 0) { - var4.rotation = 0; - } - - var4.walkSequence = var4.definition.walkSequence; - var4.walkBackSequence = var4.definition.walkBackSequence; - var4.walkLeftSequence = var4.definition.walkLeftSequence; - var4.walkRightSequence = var4.definition.walkRightSequence; - var4.readySequence = var4.definition.readySequence; - var4.turnLeftSequence = var4.definition.turnLeftSequence; - var4.turnRightSequence = var4.definition.turnRightSequence; - var4.method2045(Message.localPlayer.pathX[0] + var5, Message.localPlayer.pathY[0] + var9, var7 == 1); - continue; } } - var1.exportIndex(); - return; + TileItem var32; + if (class185.field2322 == var0) { + var2 = var1.method5762(); + var3 = var1.method5605(); + var4 = (var3 >> 4 & 7) + SecureRandomCallable.field531; + var5 = (var3 & 7) + FontName.field3663; + if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { + NodeDeque var31 = Client.groundItems[Clock.Client_plane][var4][var5]; + if (var31 != null) { + for (var32 = (TileItem)var31.last(); var32 != null; var32 = (TileItem)var31.previous()) { + if ((var2 & 32767) == var32.id) { + var32.remove(); + break; + } + } + + if (var31.last() == null) { + Client.groundItems[Clock.Client_plane][var4][var5] = null; + } + + WorldMapEvent.updateItemPile(var4, var5); + } + } + + } else if (class185.field2317 == var0) { + var2 = var1.method5614(); + var3 = var1.method5605(); + var4 = (var3 >> 4 & 7) + SecureRandomCallable.field531; + var5 = (var3 & 7) + FontName.field3663; + var6 = var1.method5614(); + if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { + var32 = new TileItem(); + var32.id = var2; + var32.quantity = var6; + if (Client.groundItems[Clock.Client_plane][var4][var5] == null) { + Client.groundItems[Clock.Client_plane][var4][var5] = new NodeDeque(); + } + + Client.groundItems[Clock.Client_plane][var4][var5].addFirst(var32); + WorldMapEvent.updateItemPile(var4, var5); + } + + } else { + int var11; + if (class185.field2316 == var0) { + var2 = var1.readUnsignedShort(); + var3 = var1.method5605(); + var4 = var3 >> 2; + var5 = var3 & 3; + var6 = Client.field743[var4]; + var7 = var1.method5606(); + var8 = (var7 >> 4 & 7) + SecureRandomCallable.field531; + var9 = (var7 & 7) + FontName.field3663; + if (var8 >= 0 && var9 >= 0 && var8 < 103 && var9 < 103) { + if (var6 == 0) { + BoundaryObject var33 = ServerBuild.scene.method3177(Clock.Client_plane, var8, var9); + if (var33 != null) { + var11 = GrandExchangeEvents.Entity_unpackID(var33.tag); + if (var4 == 2) { + var33.entity1 = new DynamicObject(var11, 2, var5 + 4, Clock.Client_plane, var8, var9, var2, false, var33.entity1); + var33.entity2 = new DynamicObject(var11, 2, var5 + 1 & 3, Clock.Client_plane, var8, var9, var2, false, var33.entity2); + } else { + var33.entity1 = new DynamicObject(var11, var4, var5, Clock.Client_plane, var8, var9, var2, false, var33.entity1); + } + } + } + + if (var6 == 1) { + WallDecoration var42 = ServerBuild.scene.method3178(Clock.Client_plane, var8, var9); + if (var42 != null) { + var11 = GrandExchangeEvents.Entity_unpackID(var42.tag); + if (var4 != 4 && var4 != 5) { + if (var4 == 6) { + var42.entity1 = new DynamicObject(var11, 4, var5 + 4, Clock.Client_plane, var8, var9, var2, false, var42.entity1); + } else if (var4 == 7) { + var42.entity1 = new DynamicObject(var11, 4, (var5 + 2 & 3) + 4, Clock.Client_plane, var8, var9, var2, false, var42.entity1); + } else if (var4 == 8) { + var42.entity1 = new DynamicObject(var11, 4, var5 + 4, Clock.Client_plane, var8, var9, var2, false, var42.entity1); + var42.entity2 = new DynamicObject(var11, 4, (var5 + 2 & 3) + 4, Clock.Client_plane, var8, var9, var2, false, var42.entity2); + } + } else { + var42.entity1 = new DynamicObject(var11, 4, var5, Clock.Client_plane, var8, var9, var2, false, var42.entity1); + } + } + } + + if (var6 == 2) { + GameObject var43 = ServerBuild.scene.method3203(Clock.Client_plane, var8, var9); + if (var4 == 11) { + var4 = 10; + } + + if (var43 != null) { + var43.entity = new DynamicObject(GrandExchangeEvents.Entity_unpackID(var43.tag), var4, var5, Clock.Client_plane, var8, var9, var2, false, var43.entity); + } + } + + if (var6 == 3) { + FloorDecoration var44 = ServerBuild.scene.getFloorDecoration(Clock.Client_plane, var8, var9); + if (var44 != null) { + var44.entity = new DynamicObject(GrandExchangeEvents.Entity_unpackID(var44.tag), 22, var5, Clock.Client_plane, var8, var9, var2, false, var44.entity); + } + } + } + + } else if (class185.field2323 == var0) { + var2 = var1.method5605(); + var3 = var2 >> 2; + var4 = var2 & 3; + var5 = Client.field743[var3]; + var6 = var1.method5762(); + var7 = var1.readUnsignedByte(); + var8 = (var7 >> 4 & 7) + SecureRandomCallable.field531; + var9 = (var7 & 7) + FontName.field3663; + if (var8 >= 0 && var9 >= 0 && var8 < 104 && var9 < 104) { + Skills.updatePendingSpawn(Clock.Client_plane, var8, var9, var5, var6, var3, var4, 0, -1); + } + + } else { + int var12; + int var13; + int var14; + if (class185.field2320 == var0) { + var2 = var1.method5605(); + var3 = (var2 >> 4 & 7) + SecureRandomCallable.field531; + var4 = (var2 & 7) + FontName.field3663; + byte var37 = var1.readByte(); + var6 = var1.method5740(); + byte var38 = var1.method5618(); + byte var39 = var1.method5780(); + var9 = var1.method5605(); + var10 = var9 >> 2; + var11 = var9 & 3; + var12 = Client.field743[var10]; + var13 = var1.method5762(); + var14 = var1.method5614(); + byte var15 = var1.method5618(); + int var16 = var1.method5740(); + Player var17; + if (var14 == Client.localPlayerIndex) { + var17 = class192.localPlayer; + } else { + var17 = Client.players[var14]; + } + + if (var17 != null) { + ObjectDefinition var18 = Occluder.getObjectDefinition(var16); + int var19; + int var20; + if (var11 != 1 && var11 != 3) { + var19 = var18.sizeX; + var20 = var18.sizeY; + } else { + var19 = var18.sizeY; + var20 = var18.sizeX; + } + + int var21 = var3 + (var19 >> 1); + int var22 = var3 + (var19 + 1 >> 1); + int var23 = var4 + (var20 >> 1); + int var24 = var4 + (var20 + 1 >> 1); + int[][] var25 = Tiles.Tiles_heights[Clock.Client_plane]; + int var26 = var25[var22][var24] + var25[var22][var23] + var25[var21][var23] + var25[var21][var24] >> 2; + int var27 = (var3 << 7) + (var19 << 6); + int var28 = (var4 << 7) + (var20 << 6); + Model var29 = var18.getModel(var10, var11, var25, var27, var26, var28); + if (var29 != null) { + Skills.updatePendingSpawn(Clock.Client_plane, var3, var4, var12, -1, 0, 0, var6 + 1, var13 + 1); + var17.animationCycleStart = var6 + Client.cycle; + var17.animationCycleEnd = var13 + Client.cycle; + var17.model0 = var29; + var17.field622 = var3 * 128 + var19 * 64; + var17.field620 = var4 * 128 + var20 * 64; + var17.tileHeight2 = var26; + byte var30; + if (var37 > var39) { + var30 = var37; + var37 = var39; + var39 = var30; + } + + if (var38 > var15) { + var30 = var38; + var38 = var15; + var15 = var30; + } + + var17.field626 = var37 + var3; + var17.field628 = var39 + var3; + var17.field627 = var4 + var38; + var17.field629 = var4 + var15; + } + } + } + + if (class185.field2318 == var0) { + var2 = var1.readShort(); + var3 = var1.readUnsignedByte(); + var4 = var1.method5771(); + var5 = (var4 >> 4 & 7) + SecureRandomCallable.field531; + var6 = (var4 & 7) + FontName.field3663; + var7 = var1.method5771() * 4; + var8 = var1.method5762(); + var9 = var1.method5771() * 4; + var10 = var1.readUnsignedShort(); + var11 = var1.method5606(); + byte var40 = var1.method5609(); + byte var41 = var1.method5618(); + var14 = var1.readUnsignedShort(); + var13 = var41 + var5; + var12 = var40 + var6; + if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104 && var13 >= 0 && var12 >= 0 && var13 < 104 && var12 < 104 && var14 != 65535) { + var5 = var5 * 128 + 64; + var6 = var6 * 128 + 64; + var13 = var13 * 128 + 64; + var12 = var12 * 128 + 64; + Projectile var34 = new Projectile(var14, Clock.Client_plane, var5, var6, WorldMapSectionType.getTileHeight(var5, var6, Clock.Client_plane) - var7, var10 + Client.cycle, var8 + Client.cycle, var11, var3, var2, var9); + var34.setDestination(var13, var12, WorldMapSectionType.getTileHeight(var13, var12, Clock.Client_plane) - var9, var10 + Client.cycle); + Client.projectiles.addFirst(var34); + } + + } else if (class185.field2315 != var0) { + if (class185.field2319 == var0) { + var2 = var1.method5762(); + var3 = var1.method5771(); + var4 = (var3 >> 4 & 7) + SecureRandomCallable.field531; + var5 = (var3 & 7) + FontName.field3663; + var6 = var1.readUnsignedByte(); + var7 = var1.method5614(); + if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { + var4 = var4 * 128 + 64; + var5 = var5 * 128 + 64; + GraphicsObject var45 = new GraphicsObject(var7, Clock.Client_plane, var4, var5, WorldMapSectionType.getTileHeight(var4, var5, Clock.Client_plane) - var6, var2, Client.cycle); + Client.graphicsObjects.addFirst(var45); + } + + } + } else { + var2 = var1.method5740(); + var3 = var1.method5762(); + var4 = var1.method5614(); + var5 = var1.method5771(); + var6 = (var5 >> 4 & 7) + SecureRandomCallable.field531; + var7 = (var5 & 7) + FontName.field3663; + if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { + NodeDeque var35 = Client.groundItems[Clock.Client_plane][var6][var7]; + if (var35 != null) { + for (TileItem var36 = (TileItem)var35.last(); var36 != null; var36 = (TileItem)var35.previous()) { + if ((var2 & 32767) == var36.id && var4 == var36.quantity) { + var36.quantity = var3; + break; + } + } + + WorldMapEvent.updateItemPile(var6, var7); + } + } + + } + } + } + } + } + + @ObfuscatedName("iv") + @ObfuscatedSignature( + signature = "(IIIIIIB)V", + garbageValue = "-87" + ) + static final void method74(int var0, int var1, int var2, int var3, int var4, int var5) { + int var6 = var2 - var0; + int var7 = var3 - var1; + int var8 = var6 >= 0 ? var6 : -var6; + int var9 = var7 >= 0 ? var7 : -var7; + int var10 = var8; + if (var8 < var9) { + var10 = var9; + } + + if (var10 != 0) { + int var11 = (var6 << 16) / var10; + int var12 = (var7 << 16) / var10; + if (var12 <= var11) { + var11 = -var11; + } else { + var12 = -var12; + } + + int var13 = var5 * var12 >> 17; + int var14 = var5 * var12 + 1 >> 17; + int var15 = var5 * var11 >> 17; + int var16 = var5 * var11 + 1 >> 17; + var0 -= Rasterizer2D.Rasterizer2D_xClipStart; + var1 -= Rasterizer2D.Rasterizer2D_yClipStart; + int var17 = var0 + var13; + int var18 = var0 - var14; + int var19 = var0 + var6 - var14; + int var20 = var0 + var6 + var13; + int var21 = var15 + var1; + int var22 = var1 - var16; + int var23 = var7 + var1 - var16; + int var24 = var15 + var7 + var1; + Rasterizer3D.method3066(var17, var18, var19); + Rasterizer3D.method3123(var21, var22, var23, var17, var18, var19, var4); + Rasterizer3D.method3066(var17, var19, var20); + Rasterizer3D.method3123(var21, var23, var24, var17, var19, var20, var4); } } } diff --git a/runescape-client/src/main/java/GraphicsDefaults.java b/runescape-client/src/main/java/GraphicsDefaults.java index 766a80069e..3e581bc4b7 100644 --- a/runescape-client/src/main/java/GraphicsDefaults.java +++ b/runescape-client/src/main/java/GraphicsDefaults.java @@ -1,93 +1,95 @@ +import java.util.Date; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("kc") +@ObfuscatedName("lj") @Implements("GraphicsDefaults") public class GraphicsDefaults { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1707006757 + intValue = -2019117197 ) @Export("compass") public int compass; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 990004197 + intValue = 1099214959 ) - public int field3803; - @ObfuscatedName("y") + public int field3796; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1541922539 + intValue = 1016295027 ) @Export("mapScenes") public int mapScenes; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1405131859 + intValue = -153404939 ) @Export("headIconsPk") public int headIconsPk; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1085795545 - ) - public int field3798; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -1754657277 - ) - public int field3807; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -939471917 - ) - public int field3804; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -773091265 - ) - public int field3805; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = -1993061967 - ) - public int field3806; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = -1849016603 + intValue = 382264229 ) public int field3799; - @ObfuscatedName("c") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 735486601 + intValue = -1961256143 ) - public int field3808; + public int field3800; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 185996655 + ) + public int field3803; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 875223521 + ) + public int field3802; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -979917091 + ) + public int field3805; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 1753253309 + ) + public int field3804; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 519795879 + ) + public int field3795; public GraphicsDefaults() { this.compass = -1; - this.field3803 = -1; + this.field3796 = -1; this.mapScenes = -1; this.headIconsPk = -1; - this.field3798 = -1; - this.field3807 = -1; - this.field3804 = -1; - this.field3805 = -1; - this.field3806 = -1; this.field3799 = -1; - this.field3808 = -1; + this.field3800 = -1; + this.field3803 = -1; + this.field3802 = -1; + this.field3805 = -1; + this.field3804 = -1; + this.field3795 = -1; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lhz;B)V", - garbageValue = "-29" + signature = "(Lii;I)V", + garbageValue = "-1404571691" ) @Export("decode") public void decode(AbstractArchive var1) { - byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3796.group); + byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3793.group); Buffer var3 = new Buffer(var2); while (true) { @@ -101,44 +103,220 @@ public class GraphicsDefaults { var3.readMedium(); break; case 2: - this.compass = var3.method5560(); - this.field3803 = var3.method5560(); - this.mapScenes = var3.method5560(); - this.headIconsPk = var3.method5560(); - this.field3798 = var3.method5560(); - this.field3807 = var3.method5560(); - this.field3804 = var3.method5560(); - this.field3805 = var3.method5560(); - this.field3806 = var3.method5560(); - this.field3799 = var3.method5560(); - this.field3808 = var3.method5560(); + this.compass = var3.method5593(); + this.field3796 = var3.method5593(); + this.mapScenes = var3.method5593(); + this.headIconsPk = var3.method5593(); + this.field3799 = var3.method5593(); + this.field3800 = var3.method5593(); + this.field3803 = var3.method5593(); + this.field3802 = var3.method5593(); + this.field3805 = var3.method5593(); + this.field3804 = var3.method5593(); + this.field3795 = var3.method5593(); } } } - @ObfuscatedName("w") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "([BB)V", - garbageValue = "-116" + signature = "(IB)Lip;", + garbageValue = "14" ) - @Export("ByteArrayPool_release") - public static synchronized void ByteArrayPool_release(byte[] var0) { - if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < 1000) { - ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; - } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < 250) { - ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; - } else if (var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) { - ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; + @Export("SequenceDefinition_get") + public static SequenceDefinition SequenceDefinition_get(int var0) { + SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; } else { - if (ByteArrayPool.ByteArrayPool_arrays != null) { - for (int var1 = 0; var1 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var1) { - if (var0.length == ByteArrayPool.ByteArrayPool_alternativeSizes[var1] && Interpreter.ByteArrayPool_altSizeArrayCounts[var1] < ByteArrayPool.ByteArrayPool_arrays[var1].length) { - ByteArrayPool.ByteArrayPool_arrays[var1][Interpreter.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; - return; - } - } + byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0); + var1 = new SequenceDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); } + var1.postDecode(); + SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + signature = "(ILce;ZB)I", + garbageValue = "64" + ) + static int method5955(int var0, Script var1, boolean var2) { + String var3; + int var4; + if (var0 == ScriptOpcodes.APPEND_NUM) { + var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3 + var4; + return 1; + } else { + String var9; + if (var0 == ScriptOpcodes.APPEND) { + Message.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize + 1]; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3 + var9; + return 1; + } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { + var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3 + ItemContainer.intToString(var4, true); + return 1; + } else if (var0 == ScriptOpcodes.LOWERCASE) { + var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3.toLowerCase(); + return 1; + } else { + int var6; + int var10; + if (var0 == ScriptOpcodes.FROMDATE) { + var10 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + long var11 = 86400000L * ((long)var10 + 11745L); + Interpreter.Interpreter_calendar.setTime(new Date(var11)); + var6 = Interpreter.Interpreter_calendar.get(5); + int var16 = Interpreter.Interpreter_calendar.get(2); + int var8 = Interpreter.Interpreter_calendar.get(1); + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var16] + "-" + var8; + return 1; + } else if (var0 != ScriptOpcodes.TEXT_GENDER) { + if (var0 == ScriptOpcodes.TOSTRING) { + var10 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = Integer.toString(var10); + return 1; + } else if (var0 == ScriptOpcodes.COMPARE) { + Message.Interpreter_stringStackSize -= 2; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = WorldMapData_1.method712(Client.compareStrings(Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize + 1], FriendLoginUpdate.clientLanguage)); + return 1; + } else { + int var5; + byte[] var13; + Font var14; + if (var0 == ScriptOpcodes.PARAHEIGHT) { + var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + class320.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + var13 = MouseHandler.archive13.takeFile(var5, 0); + var14 = new Font(var13); + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var14.lineCount(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.PARAWIDTH) { + var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + class320.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + var13 = MouseHandler.archive13.takeFile(var5, 0); + var14 = new Font(var13); + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var14.lineWidth(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { + Message.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize + 1]; + if (Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1) { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3; + } else { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var9; + } + + return 1; + } else if (var0 == ScriptOpcodes.ESCAPE) { + var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); + return 1; + } else if (var0 == ScriptOpcodes.APPEND_CHAR) { + var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3 + (char)var4; + return 1; + } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { + var10 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Skills.isCharPrintable((char)var10) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { + var10 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = ArchiveDiskAction.isAlphaNumeric((char)var10) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { + var10 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = ClanChat.isCharAlphabetic((char)var10) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { + var10 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = class14.isDigit((char)var10) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.STRING_LENGTH) { + var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + if (var3 != null) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.length(); + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.SUBSTRING) { + var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + class320.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3.substring(var4, var5); + return 1; + } else if (var0 == ScriptOpcodes.REMOVETAGS) { + var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + StringBuilder var17 = new StringBuilder(var3.length()); + boolean var15 = false; + + for (var6 = 0; var6 < var3.length(); ++var6) { + char var7 = var3.charAt(var6); + if (var7 == '<') { + var15 = true; + } else if (var7 == '>') { + var15 = false; + } else if (!var15) { + var17.append(var7); + } + } + + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var17.toString(); + return 1; + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { + var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.indexOf(var4); + return 1; + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { + Message.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.indexOf(var9, var5); + return 1; + } else if (var0 == ScriptOpcodes.UPPERCASE) { + var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3.toUpperCase(); + return 1; + } else { + return 2; + } + } + } else { + Message.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize + 1]; + if (class192.localPlayer.appearance != null && class192.localPlayer.appearance.isFemale) { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var9; + } else { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3; + } + + return 1; + } + } } } } diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java index ba6c0d6a84..c6a555b88a 100644 --- a/runescape-client/src/main/java/GraphicsObject.java +++ b/runescape-client/src/main/java/GraphicsObject.java @@ -1,73 +1,74 @@ +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLConnection; +import java.util.Random; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bp") +@ObfuscatedName("br") @Implements("GraphicsObject") public final class GraphicsObject extends Entity { - @ObfuscatedName("gp") - @ObfuscatedSignature( - signature = "[Lls;" - ) - @Export("headIconPrayerSprites") - static Sprite[] headIconPrayerSprites; - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1192844989 + intValue = 1800757053 ) @Export("id") int id; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1714996375 + intValue = 815583153 ) @Export("cycleStart") int cycleStart; - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "Liv;" - ) - @Export("sequenceDefinition") - SequenceDefinition sequenceDefinition; - @ObfuscatedName("w") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1267418181 + intValue = 497499711 ) @Export("plane") int plane; - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -474548897 + intValue = -1418605465 ) @Export("x") int x; - @ObfuscatedName("b") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 60095829 + intValue = -744262401 ) @Export("y") int y; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 464992447 + intValue = -1599899605 ) @Export("height") int height; - @ObfuscatedName("x") + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "Lip;" + ) + @Export("sequenceDefinition") + SequenceDefinition sequenceDefinition; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -945304711 + intValue = 715957131 ) @Export("frame") int frame; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 53235765 + intValue = 1558881033 ) @Export("frameCycle") int frameCycle; - @ObfuscatedName("d") + @ObfuscatedName("m") @Export("isFinished") boolean isFinished; @@ -81,20 +82,20 @@ public final class GraphicsObject extends Entity { this.y = var4; this.height = var5; this.cycleStart = var7 + var6; - int var8 = ClientPacket.SpotAnimationDefinition_get(this.id).sequence; + int var8 = class65.SpotAnimationDefinition_get(this.id).sequence; if (var8 != -1) { this.isFinished = false; - this.sequenceDefinition = WorldMapSection0.SequenceDefinition_get(var8); + this.sequenceDefinition = GraphicsDefaults.SequenceDefinition_get(var8); } else { this.isFinished = true; } } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "0" + signature = "(II)V", + garbageValue = "65536" ) @Export("advance") final void advance(int var1) { @@ -113,14 +114,14 @@ public final class GraphicsObject extends Entity { } } - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)Ldw;", - garbageValue = "822221372" + signature = "(I)Ldx;", + garbageValue = "-2133076860" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = ClientPacket.SpotAnimationDefinition_get(this.id); + SpotAnimationDefinition var1 = class65.SpotAnimationDefinition_get(this.id); Model var2; if (!this.isFinished) { var2 = var1.getModel(this.frame); @@ -131,77 +132,203 @@ public final class GraphicsObject extends Entity { return var2 == null ? null : var2; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lkl;I)V", - garbageValue = "-2045791963" + signature = "(B)[Lih;", + garbageValue = "-51" ) - @Export("updatePlayer") - static final void updatePlayer(PacketBuffer var0) { - var0.importIndex(); - int var1 = Client.localPlayerIndex; - Player var2 = Message.localPlayer = Client.players[var1] = new Player(); - var2.index = var1; - int var3 = var0.readBits(30); - byte var4 = (byte)(var3 >> 28); - int var5 = var3 >> 14 & 16383; - int var6 = var3 & 16383; - var2.pathX[0] = var5 - MusicPatchPcmStream.baseX * 64; - var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); - var2.pathY[0] = var6 - ScriptEvent.baseY * 64; - var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); - UrlRequest.Client_plane = var2.plane = var4; - if (Players.field1228[var1] != null) { - var2.read(Players.field1228[var1]); - } - - Players.Players_count = 0; - Players.Players_indices[++Players.Players_count - 1] = var1; - Players.field1230[var1] = 0; - Players.Players_emptyIdxCount = 0; - - for (int var7 = 1; var7 < 2048; ++var7) { - if (var1 != var7) { - int var8 = var0.readBits(18); - int var9 = var8 >> 16; - int var10 = var8 >> 8 & 597; - int var11 = var8 & 597; - Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); - Players.Players_orientations[var7] = 0; - Players.Players_targetIndices[var7] = -1; - Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7; - Players.field1230[var7] = 0; - } - } - - var0.exportIndex(); + static HorizontalAlignment[] method2064() { + return new HorizontalAlignment[]{HorizontalAlignment.field3454, HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field3451}; } - @ObfuscatedName("y") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lkq;I)Ljava/lang/String;", - garbageValue = "2062021922" + signature = "(Lii;B)V", + garbageValue = "66" ) - public static String method2028(Buffer var0) { - return class195.method3664(var0, 32767); + public static void method2063(AbstractArchive var0) { + StructDefinition.StructDefinition_archive = var0; } - @ObfuscatedName("lo") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1979767282" + signature = "(JLjava/lang/String;I)I", + garbageValue = "-2060202992" ) - static void method2030() { - if (class215.field2534 != null) { - Client.field749 = Client.cycle; - class215.field2534.method4304(); + static final int method2060(long var0, String var2) { + Random var3 = new Random(); + Buffer var4 = new Buffer(128); + Buffer var5 = new Buffer(128); + int[] var6 = new int[]{var3.nextInt(), var3.nextInt(), (int)(var0 >> 32), (int)var0}; + var4.writeByte(10); - for (int var0 = 0; var0 < Client.players.length; ++var0) { - if (Client.players[var0] != null) { - class215.field2534.method4303(MusicPatchPcmStream.baseX * 64 + (Client.players[var0].x >> 7), ScriptEvent.baseY * 64 + (Client.players[var0].y >> 7)); + int var7; + for (var7 = 0; var7 < 4; ++var7) { + var4.writeInt(var3.nextInt()); + } + + var4.writeInt(var6[0]); + var4.writeInt(var6[1]); + var4.writeLong(var0); + var4.writeLong(0L); + + for (var7 = 0; var7 < 4; ++var7) { + var4.writeInt(var3.nextInt()); + } + + var4.encryptRsa(class80.field1123, class80.field1120); + var5.writeByte(10); + + for (var7 = 0; var7 < 3; ++var7) { + var5.writeInt(var3.nextInt()); + } + + var5.writeLong(var3.nextLong()); + var5.writeLongMedium(var3.nextLong()); + if (Client.randomDatData != null) { + var5.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); + } else { + byte[] var8 = new byte[24]; + + try { + JagexCache.JagexCache_randomDat.seek(0L); + JagexCache.JagexCache_randomDat.readFully(var8); + + int var9; + for (var9 = 0; var9 < 24 && var8[var9] == 0; ++var9) { + } + + if (var9 >= 24) { + throw new IOException(); + } + } catch (Exception var24) { + for (int var10 = 0; var10 < 24; ++var10) { + var8[var10] = -1; } } + + var5.writeBytes(var8, 0, var8.length); } + var5.writeLong(var3.nextLong()); + var5.encryptRsa(class80.field1123, class80.field1120); + var7 = Buddy.stringCp1252NullTerminatedByteSize(var2); + if (var7 % 8 != 0) { + var7 += 8 - var7 % 8; + } + + Buffer var25 = new Buffer(var7); + var25.writeStringCp1252NullTerminated(var2); + var25.offset = var7; + var25.xteaEncryptAll(var6); + Buffer var18 = new Buffer(var25.offset + var4.offset + var5.offset + 5); + var18.writeByte(2); + var18.writeByte(var4.offset); + var18.writeBytes(var4.array, 0, var4.offset); + var18.writeByte(var5.offset); + var18.writeBytes(var5.array, 0, var5.offset); + var18.writeShort(var25.offset); + var18.writeBytes(var25.array, 0, var25.offset); + String var20 = Frames.method3340(var18.array); + + try { + URL var11 = new URL(class42.method809("services", false) + "m=accountappeal/login.ws"); + URLConnection var12 = var11.openConnection(); + var12.setDoInput(true); + var12.setDoOutput(true); + var12.setConnectTimeout(5000); + OutputStreamWriter var13 = new OutputStreamWriter(var12.getOutputStream()); + var13.write("data2=" + ArchiveDiskAction.method4216(var20) + "&dest=" + ArchiveDiskAction.method4216("passwordchoice.ws")); + var13.flush(); + InputStream var14 = var12.getInputStream(); + var18 = new Buffer(new byte[1000]); + + do { + int var15 = var14.read(var18.array, var18.offset, 1000 - var18.offset); + if (var15 == -1) { + var13.close(); + var14.close(); + String var21 = new String(var18.array); + if (var21.startsWith("OFFLINE")) { + return 4; + } else if (var21.startsWith("WRONG")) { + return 7; + } else if (var21.startsWith("RELOAD")) { + return 3; + } else if (var21.startsWith("Not permitted for social network accounts.")) { + return 6; + } else { + var18.xteaDecryptAll(var6); + + while (var18.offset > 0 && var18.array[var18.offset - 1] == 0) { + --var18.offset; + } + + var21 = new String(var18.array, 0, var18.offset); + boolean var16; + if (var21 == null) { + var16 = false; + } else { + label107: { + try { + new URL(var21); + } catch (MalformedURLException var22) { + var16 = false; + break label107; + } + + var16 = true; + } + } + + if (var16) { + class215.openURL(var21, true, false); + return 2; + } else { + return 5; + } + } + } + + var18.offset += var15; + } while(var18.offset < 1000); + + return 5; + } catch (Throwable var23) { + var23.printStackTrace(); + return 5; + } + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(IB)Lix;", + garbageValue = "52" + ) + public static FloorUnderlayDefinition method2055(int var0) { + FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0); + var1 = new FloorUnderlayDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2), var0); + } + + var1.postDecode(); + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("ic") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;Ljava/lang/String;IIIIS)V", + garbageValue = "3604" + ) + @Export("insertMenuItemNoShift") + public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { + class160.insertMenuItem(var0, var1, var2, var3, var4, var5, false); } } diff --git a/runescape-client/src/main/java/HealthBar.java b/runescape-client/src/main/java/HealthBar.java index f67cff7ebb..c79732f148 100644 --- a/runescape-client/src/main/java/HealthBar.java +++ b/runescape-client/src/main/java/HealthBar.java @@ -3,40 +3,40 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("co") +@ObfuscatedName("cp") @Implements("HealthBar") public class HealthBar extends Node { - @ObfuscatedName("d") + @ObfuscatedName("dt") @ObfuscatedSignature( - signature = "Ldk;" + signature = "Lia;" ) - @Export("soundSystem") - static SoundSystem soundSystem; - @ObfuscatedName("y") + @Export("archive10") + static Archive archive10; + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lio;" + signature = "Liy;" ) @Export("definition") HealthBarDefinition definition; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Ljl;" + signature = "Ljj;" ) @Export("updates") IterableNodeDeque updates; @ObfuscatedSignature( - signature = "(Lio;)V" + signature = "(Liy;)V" ) HealthBar(HealthBarDefinition var1) { this.updates = new IterableNodeDeque(); this.definition = var1; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "76773386" + signature = "(IIIIS)V", + garbageValue = "6521" ) @Export("put") void put(int var1, int var2, int var3, int var4) { @@ -69,10 +69,10 @@ public class HealthBar extends Node { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(II)Lbu;", - garbageValue = "-2132773081" + signature = "(II)Lbh;", + garbageValue = "-1345078848" ) @Export("get") HealthBarUpdate get(int var1) { @@ -94,13 +94,13 @@ public class HealthBar extends Node { } } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "1427646863" + garbageValue = "-818833492" ) @Export("isEmpty") boolean isEmpty() { - return this.updates.method4843(); + return this.updates.method4886(); } } diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java index 908f292e91..4dba405735 100644 --- a/runescape-client/src/main/java/HealthBarDefinition.java +++ b/runescape-client/src/main/java/HealthBarDefinition.java @@ -4,89 +4,88 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("io") +@ObfuscatedName("iy") @Implements("HealthBarDefinition") public class HealthBarDefinition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) @Export("HealthBarDefinition_archive") - static AbstractArchive HealthBarDefinition_archive; - @ObfuscatedName("i") + public static AbstractArchive HealthBarDefinition_archive; + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) @Export("HitSplatDefinition_spritesArchive") - static AbstractArchive HitSplatDefinition_spritesArchive; - @ObfuscatedName("y") + public static AbstractArchive HitSplatDefinition_spritesArchive; + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("HealthBarDefinition_cached") - static EvictingDualNodeHashTable HealthBarDefinition_cached; - @ObfuscatedName("w") + public static EvictingDualNodeHashTable HealthBarDefinition_cached; + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("HealthBarDefinition_cachedSprites") - static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; - @ObfuscatedName("p") + public static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1167570567 + intValue = -1117339079 ) - public int field3249; - @ObfuscatedName("x") + public int field3275; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 718576883 + intValue = 1485041687 ) @Export("int1") public int int1; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -34727519 + intValue = -1134400629 ) @Export("int2") public int int2; - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1802618683 + intValue = 1866957287 ) @Export("int3") public int int3; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -2121240959 + intValue = -1867870977 ) - @Export("int4") - public int int4; - @ObfuscatedName("o") + public int field3283; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 727277 + intValue = -1689196735 ) @Export("int5") public int int5; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1886911471 + intValue = -69680089 ) @Export("frontSpriteID") int frontSpriteID; - @ObfuscatedName("k") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 821957921 + intValue = 2086615621 ) @Export("backSpriteID") int backSpriteID; - @ObfuscatedName("s") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1979565365 + intValue = 111327577 ) @Export("width") public int width; - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -158138215 + intValue = 1970632159 ) @Export("widthPadding") public int widthPadding; @@ -100,7 +99,7 @@ public class HealthBarDefinition extends DualNode { this.int1 = 255; this.int2 = 255; this.int3 = -1; - this.int4 = 1; + this.field3283 = 1; this.int5 = 70; this.frontSpriteID = -1; this.backSpriteID = -1; @@ -108,10 +107,10 @@ public class HealthBarDefinition extends DualNode { this.widthPadding = 0; } - @ObfuscatedName("y") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lkq;B)V", - garbageValue = "-127" + signature = "(Lkp;I)V", + garbageValue = "-2130379460" ) @Export("decode") void decode(Buffer var1) { @@ -125,10 +124,10 @@ public class HealthBarDefinition extends DualNode { } } - @ObfuscatedName("w") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkq;IB)V", - garbageValue = "21" + signature = "(Lkp;II)V", + garbageValue = "-1944435606" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -145,9 +144,9 @@ public class HealthBarDefinition extends DualNode { } else if (var2 == 6) { var1.readUnsignedByte(); } else if (var2 == 7) { - this.frontSpriteID = var1.method5560(); + this.frontSpriteID = var1.method5593(); } else if (var2 == 8) { - this.backSpriteID = var1.method5560(); + this.backSpriteID = var1.method5593(); } else if (var2 == 11) { this.int3 = var1.readUnsignedShort(); } else if (var2 == 14) { @@ -158,10 +157,10 @@ public class HealthBarDefinition extends DualNode { } - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(I)Lls;", - garbageValue = "470645524" + signature = "(B)Llt;", + garbageValue = "87" ) @Export("getFrontSprite") public Sprite getFrontSprite() { @@ -172,7 +171,7 @@ public class HealthBarDefinition extends DualNode { if (var1 != null) { return var1; } else { - var1 = FloorUnderlayDefinition.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0); + var1 = WorldMapSection1.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0); if (var1 != null) { HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID); } @@ -182,10 +181,10 @@ public class HealthBarDefinition extends DualNode { } } - @ObfuscatedName("b") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(I)Lls;", - garbageValue = "-1178717952" + signature = "(B)Llt;", + garbageValue = "19" ) @Export("getBackSprite") public Sprite getBackSprite() { @@ -196,7 +195,7 @@ public class HealthBarDefinition extends DualNode { if (var1 != null) { return var1; } else { - var1 = FloorUnderlayDefinition.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0); + var1 = WorldMapSection1.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0); if (var1 != null) { HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); } @@ -205,4 +204,65 @@ public class HealthBarDefinition extends DualNode { } } } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(IB)Lif;", + garbageValue = "89" + ) + @Export("ItemDefinition_get") + public static ItemDefinition ItemDefinition_get(int var0) { + ItemDefinition var1 = (ItemDefinition)ItemDefinition.ItemDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = ItemDefinition.ItemDefinition_archive.takeFile(10, var0); + var1 = new ItemDefinition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + var1.post(); + if (var1.noteTemplate != -1) { + var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note)); + } + + if (var1.notedId != -1) { + var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId)); + } + + if (var1.placeholderTemplate != -1) { + var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder)); + } + + if (!class298.ItemDefinition_inMembersWorld && var1.isMembersOnly) { + var1.name = "Members object"; + var1.isTradable = false; + var1.groundActions = null; + var1.inventoryActions = null; + var1.shiftClickIndex = -1; + var1.team = 0; + if (var1.params != null) { + boolean var3 = false; + + for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { + ParamDefinition var5 = PacketBufferNode.getParamDefinition((int)var4.key); + if (var5.autoDisable) { + var4.remove(); + } else { + var3 = true; + } + } + + if (!var3) { + var1.params = null; + } + } + } + + ItemDefinition.ItemDefinition_cached.put(var1, (long)var0); + return var1; + } + } } diff --git a/runescape-client/src/main/java/HealthBarUpdate.java b/runescape-client/src/main/java/HealthBarUpdate.java index 17a2ca0ba7..34bcabe676 100644 --- a/runescape-client/src/main/java/HealthBarUpdate.java +++ b/runescape-client/src/main/java/HealthBarUpdate.java @@ -1,33 +1,35 @@ +import java.util.Date; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bu") +@ObfuscatedName("bh") @Implements("HealthBarUpdate") public class HealthBarUpdate extends Node { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1629160111 + intValue = 2058375931 ) @Export("cycle") int cycle; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 618660317 + intValue = -309904715 ) @Export("health") int health; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -717144759 + intValue = 362852511 ) @Export("health2") int health2; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 938888871 + intValue = 1829739139 ) @Export("cycleOffset") int cycleOffset; @@ -39,10 +41,10 @@ public class HealthBarUpdate extends Node { this.cycleOffset = var4; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "2118505733" + signature = "(IIIIB)V", + garbageValue = "-75" ) @Export("set") void set(int var1, int var2, int var3, int var4) { @@ -51,4 +53,62 @@ public class HealthBarUpdate extends Node { this.health2 = var3; this.cycleOffset = var4; } + + @ObfuscatedName("c") + static boolean method1757(long var0) { + return Tile.method2926(var0) == 2; + } + + @ObfuscatedName("c") + public static String method1758(long var0) { + Calendar.Calendar_calendar.setTime(new Date(var0)); + int var2 = Calendar.Calendar_calendar.get(7); + int var3 = Calendar.Calendar_calendar.get(5); + int var4 = Calendar.Calendar_calendar.get(2); + int var5 = Calendar.Calendar_calendar.get(1); + int var6 = Calendar.Calendar_calendar.get(11); + int var7 = Calendar.Calendar_calendar.get(12); + int var8 = Calendar.Calendar_calendar.get(13); + return Calendar.DAYS_OF_THE_WEEK[var2 - 1] + ", " + var3 / 10 + var3 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var4] + "-" + var5 + " " + var6 / 10 + var6 % 10 + ":" + var7 / 10 + var7 % 10 + ":" + var8 / 10 + var8 % 10 + " GMT"; + } + + @ObfuscatedName("as") + @ObfuscatedSignature( + signature = "(ILce;ZI)I", + garbageValue = "-601302979" + ) + static int method1759(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.GETWINDOWMODE) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Friend.getWindowedMode(); + return 1; + } else { + int var3; + if (var0 == ScriptOpcodes.SETWINDOWMODE) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + if (var3 == 1 || var3 == 2) { + VertexNormal.setWindowedMode(var3); + } + + return 1; + } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = WorldMapSection2.clientPreferences.windowMode; + return 1; + } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { + if (var0 == 5310) { + --class320.Interpreter_intStackSize; + return 1; + } else { + return 2; + } + } else { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + if (var3 == 1 || var3 == 2) { + WorldMapSection2.clientPreferences.windowMode = var3; + WorldMapData_1.savePreferences(); + } + + return 1; + } + } + } } diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index af4fbfeea8..8f47208f62 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -4,119 +4,120 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("id") +@ObfuscatedName("il") @Implements("HitSplatDefinition") public class HitSplatDefinition extends DualNode { - @ObfuscatedName("qv") - @ObfuscatedGetter( - intValue = -2106163673 - ) - static int field3312; - @ObfuscatedName("f") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) - @Export("HitSplatDefinition_archive") - public static AbstractArchive HitSplatDefinition_archive; - @ObfuscatedName("i") + public static AbstractArchive field3329; + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) - public static AbstractArchive field3290; - @ObfuscatedName("w") + @Export("HitSplatDefinition_fontsArchive") + public static AbstractArchive HitSplatDefinition_fontsArchive; + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("HitSplatDefinition_cached") public static EvictingDualNodeHashTable HitSplatDefinition_cached; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("HitSplatDefinition_cachedSprites") public static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("HitSplatDefinition_cachedFonts") public static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; - @ObfuscatedName("o") + @ObfuscatedName("hs") @ObfuscatedGetter( - intValue = 62489831 + intValue = -1943215083 + ) + @Export("cameraX") + static int cameraX; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -36563091 ) @Export("fontId") int fontId; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -167444243 + intValue = -549916475 ) @Export("textColor") public int textColor; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 491261365 - ) - public int field3298; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -1424505111 - ) - int field3296; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -1928448761 - ) - int field3300; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -524634903 - ) - int field3291; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -930676135 - ) - int field3302; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1984037709 + intValue = -795329979 ) - public int field3303; - @ObfuscatedName("u") + public int field3328; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 2001520185 + intValue = 2007057893 ) - public int field3304; - @ObfuscatedName("z") + int field3339; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1759745425 + intValue = 1439710291 ) - public int field3305; - @ObfuscatedName("h") - String field3306; - @ObfuscatedName("m") + int field3324; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1901137879 + intValue = -378798801 ) - public int field3299; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 411378659 - ) - public int field3308; - @ObfuscatedName("r") - @Export("transforms") - public int[] transforms; + int field3331; @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -42681817 + intValue = -403504011 + ) + int field3332; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 1748437233 + ) + public int field3323; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = 1149201175 + ) + public int field3334; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -600429647 + ) + public int field3335; + @ObfuscatedName("b") + String field3322; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -960133159 + ) + public int field3337; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 465425557 + ) + public int field3338; + @ObfuscatedName("a") + @Export("transforms") + public int[] transforms; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -1372204811 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("aa") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 380242275 + intValue = 1090071963 ) @Export("transformVarp") int transformVarp; @@ -127,31 +128,31 @@ public class HitSplatDefinition extends DualNode { HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20); } - HitSplatDefinition() { + public HitSplatDefinition() { this.fontId = -1; this.textColor = 16777215; - this.field3298 = 70; - this.field3296 = -1; - this.field3300 = -1; - this.field3291 = -1; - this.field3302 = -1; - this.field3303 = 0; - this.field3304 = 0; - this.field3305 = -1; - this.field3306 = ""; - this.field3299 = -1; - this.field3308 = 0; + this.field3328 = 70; + this.field3339 = -1; + this.field3324 = -1; + this.field3331 = -1; + this.field3332 = -1; + this.field3323 = 0; + this.field3334 = 0; + this.field3335 = -1; + this.field3322 = ""; + this.field3337 = -1; + this.field3338 = 0; this.transformVarbit = -1; this.transformVarp = -1; } - @ObfuscatedName("i") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lkq;I)V", - garbageValue = "-13234196" + signature = "(Lkp;I)V", + garbageValue = "1729846192" ) @Export("decode") - void decode(Buffer var1) { + public void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { @@ -162,41 +163,41 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("y") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lkq;II)V", - garbageValue = "-1783175438" + signature = "(Lkp;II)V", + garbageValue = "-1144577894" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - this.fontId = var1.method5560(); + this.fontId = var1.method5593(); } else if (var2 == 2) { this.textColor = var1.readMedium(); } else if (var2 == 3) { - this.field3296 = var1.method5560(); + this.field3339 = var1.method5593(); } else if (var2 == 4) { - this.field3291 = var1.method5560(); + this.field3331 = var1.method5593(); } else if (var2 == 5) { - this.field3300 = var1.method5560(); + this.field3324 = var1.method5593(); } else if (var2 == 6) { - this.field3302 = var1.method5560(); + this.field3332 = var1.method5593(); } else if (var2 == 7) { - this.field3303 = var1.readShort(); + this.field3323 = var1.readShort(); } else if (var2 == 8) { - this.field3306 = var1.readStringCp1252NullCircumfixed(); + this.field3322 = var1.readStringCp1252NullCircumfixed(); } else if (var2 == 9) { - this.field3298 = var1.readUnsignedShort(); + this.field3328 = var1.readUnsignedShort(); } else if (var2 == 10) { - this.field3304 = var1.readShort(); + this.field3334 = var1.readShort(); } else if (var2 == 11) { - this.field3305 = 0; + this.field3335 = 0; } else if (var2 == 12) { - this.field3299 = var1.readUnsignedByte(); + this.field3337 = var1.readUnsignedByte(); } else if (var2 == 13) { - this.field3308 = var1.readShort(); + this.field3338 = var1.readShort(); } else if (var2 == 14) { - this.field3305 = var1.readUnsignedShort(); + this.field3335 = var1.readUnsignedShort(); } else if (var2 == 17 || var2 == 18) { this.transformVarbit = var1.readUnsignedShort(); if (this.transformVarbit == 65535) { @@ -231,16 +232,16 @@ public class HitSplatDefinition extends DualNode { } - @ObfuscatedName("w") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(S)Lid;", - garbageValue = "1000" + signature = "(B)Lil;", + garbageValue = "105" ) @Export("transform") public final HitSplatDefinition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = GameShell.getVarbit(this.transformVarbit); + var1 = GrandExchangeOfferUnitPriceComparator.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -252,17 +253,36 @@ public class HitSplatDefinition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? MusicPatchNode.method3815(var2) : null; + if (var2 != -1) { + HitSplatDefinition var4 = (HitSplatDefinition)HitSplatDefinition_cached.get((long)var2); + HitSplatDefinition var3; + if (var4 != null) { + var3 = var4; + } else { + byte[] var5 = class49.HitSplatDefinition_archive.takeFile(32, var2); + var4 = new HitSplatDefinition(); + if (var5 != null) { + var4.decode(new Buffer(var5)); + } + + HitSplatDefinition_cached.put(var4, (long)var2); + var3 = var4; + } + + return var3; + } else { + return null; + } } - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(II)Ljava/lang/String;", - garbageValue = "384079116" + garbageValue = "1185099535" ) @Export("getString") public String getString(int var1) { - String var2 = this.field3306; + String var2 = this.field3322; while (true) { int var3 = var2.indexOf("%1"); @@ -270,26 +290,26 @@ public class HitSplatDefinition extends DualNode { return var2; } - var2 = var2.substring(0, var3) + class65.intToString(var1, false) + var2.substring(var3 + 2); + var2 = var2.substring(0, var3) + ItemContainer.intToString(var1, false) + var2.substring(var3 + 2); } } - @ObfuscatedName("b") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(B)Lls;", - garbageValue = "1" + signature = "(I)Llt;", + garbageValue = "1146038763" ) - public Sprite method4600() { - if (this.field3296 < 0) { + public Sprite method4649() { + if (this.field3339 < 0) { return null; } else { - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3296); + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3339); if (var1 != null) { return var1; } else { - var1 = FloorUnderlayDefinition.SpriteBuffer_getSprite(field3290, this.field3296, 0); + var1 = WorldMapSection1.SpriteBuffer_getSprite(field3329, this.field3339, 0); if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3296); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3339); } return var1; @@ -297,68 +317,22 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)Lls;", - garbageValue = "1869434079" + signature = "(B)Llt;", + garbageValue = "127" ) - public Sprite method4576() { - if (this.field3300 < 0) { + public Sprite method4650() { + if (this.field3324 < 0) { return null; } else { - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3300); + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3324); if (var1 != null) { return var1; } else { - var1 = FloorUnderlayDefinition.SpriteBuffer_getSprite(field3290, this.field3300, 0); + var1 = WorldMapSection1.SpriteBuffer_getSprite(field3329, this.field3324, 0); if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3300); - } - - return var1; - } - } - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(B)Lls;", - garbageValue = "-53" - ) - public Sprite method4587() { - if (this.field3291 < 0) { - return null; - } else { - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3291); - if (var1 != null) { - return var1; - } else { - var1 = FloorUnderlayDefinition.SpriteBuffer_getSprite(field3290, this.field3291, 0); - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3291); - } - - return var1; - } - } - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - signature = "(B)Lls;", - garbageValue = "-100" - ) - public Sprite method4596() { - if (this.field3302 < 0) { - return null; - } else { - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3302); - if (var1 != null) { - return var1; - } else { - var1 = FloorUnderlayDefinition.SpriteBuffer_getSprite(field3290, this.field3302, 0); - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3302); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3324); } return var1; @@ -368,8 +342,54 @@ public class HitSplatDefinition extends DualNode { @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(B)Lko;", - garbageValue = "-24" + signature = "(B)Llt;", + garbageValue = "125" + ) + public Sprite method4651() { + if (this.field3331 < 0) { + return null; + } else { + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3331); + if (var1 != null) { + return var1; + } else { + var1 = WorldMapSection1.SpriteBuffer_getSprite(field3329, this.field3331, 0); + if (var1 != null) { + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3331); + } + + return var1; + } + } + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "(B)Llt;", + garbageValue = "-109" + ) + public Sprite method4652() { + if (this.field3332 < 0) { + return null; + } else { + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3332); + if (var1 != null) { + return var1; + } else { + var1 = WorldMapSection1.SpriteBuffer_getSprite(field3329, this.field3332, 0); + if (var1 != null) { + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3332); + } + + return var1; + } + } + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(I)Lko;", + garbageValue = "-643633719" ) @Export("getFont") public Font getFont() { @@ -380,7 +400,7 @@ public class HitSplatDefinition extends DualNode { if (var1 != null) { return var1; } else { - var1 = class14.method160(field3290, class206.HitSplatDefinition_fontsArchive, this.fontId, 0); + var1 = FaceNormal.method3335(field3329, HitSplatDefinition_fontsArchive, this.fontId, 0); if (var1 != null) { HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId); } @@ -389,86 +409,4 @@ public class HitSplatDefinition extends DualNode { } } } - - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "(Lhz;III)Z", - garbageValue = "-1590564834" - ) - public static boolean method4586(AbstractArchive var0, int var1, int var2) { - byte[] var3 = var0.takeFile(var1, var2); - if (var3 == null) { - return false; - } else { - AbstractWorldMapIcon.SpriteBuffer_decode(var3); - return true; - } - } - - @ObfuscatedName("hq") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1358506990" - ) - static final void method4612() { - PacketBuffer var0 = Client.packetWriter.packetBuffer; - var0.importIndex(); - int var1 = var0.readBits(8); - int var2; - if (var1 < Client.npcCount) { - for (var2 = var1; var2 < Client.npcCount; ++var2) { - Client.field745[++Client.field815 - 1] = Client.npcIndices[var2]; - } - } - - if (var1 > Client.npcCount) { - throw new RuntimeException(""); - } else { - Client.npcCount = 0; - - for (var2 = 0; var2 < var1; ++var2) { - int var3 = Client.npcIndices[var2]; - NPC var4 = Client.npcs[var3]; - int var5 = var0.readBits(1); - if (var5 == 0) { - Client.npcIndices[++Client.npcCount - 1] = var3; - var4.npcCycle = Client.cycle; - } else { - int var6 = var0.readBits(2); - if (var6 == 0) { - Client.npcIndices[++Client.npcCount - 1] = var3; - var4.npcCycle = Client.cycle; - Client.field720[++Client.field673 - 1] = var3; - } else { - int var7; - int var8; - if (var6 == 1) { - Client.npcIndices[++Client.npcCount - 1] = var3; - var4.npcCycle = Client.cycle; - var7 = var0.readBits(3); - var4.method2044(var7, (byte)1); - var8 = var0.readBits(1); - if (var8 == 1) { - Client.field720[++Client.field673 - 1] = var3; - } - } else if (var6 == 2) { - Client.npcIndices[++Client.npcCount - 1] = var3; - var4.npcCycle = Client.cycle; - var7 = var0.readBits(3); - var4.method2044(var7, (byte)2); - var8 = var0.readBits(3); - var4.method2044(var8, (byte)2); - int var9 = var0.readBits(1); - if (var9 == 1) { - Client.field720[++Client.field673 - 1] = var3; - } - } else if (var6 == 3) { - Client.field745[++Client.field815 - 1] = var3; - } - } - } - } - - } - } } diff --git a/runescape-client/src/main/java/HorizontalAlignment.java b/runescape-client/src/main/java/HorizontalAlignment.java index 9ea3b65f84..63744c8e27 100644 --- a/runescape-client/src/main/java/HorizontalAlignment.java +++ b/runescape-client/src/main/java/HorizontalAlignment.java @@ -4,35 +4,38 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iz") +@ObfuscatedName("ih") @Implements("HorizontalAlignment") public enum HorizontalAlignment implements Enumerated { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Liz;" + signature = "Lih;" ) - field3425(0, 0), - @ObfuscatedName("i") + field3454(0, 0), + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Liz;" + signature = "Lih;" ) @Export("HorizontalAlignment_centered") - HorizontalAlignment_centered(2, 1), - @ObfuscatedName("y") + HorizontalAlignment_centered(1, 1), + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Liz;" + signature = "Lih;" ) - field3424(1, 2); + field3451(2, 2); - @ObfuscatedName("w") + @ObfuscatedName("p") + @Export("Tiles_saturation") + static int[] Tiles_saturation; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -618314265 + intValue = 1955816399 ) @Export("value") public final int value; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 345899471 + intValue = -458653859 ) @Export("id") final int id; @@ -42,173 +45,177 @@ public enum HorizontalAlignment implements Enumerated { this.id = var4; } - @ObfuscatedName("i") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "-57" + garbageValue = "1" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("f") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "1134986404" + signature = "(I)[Llt;", + garbageValue = "831261948" ) - @Export("isWorldMapEvent") - public static boolean isWorldMapEvent(int var0) { - return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17; + public static Sprite[] method4783() { + Sprite[] var0 = new Sprite[class326.SpriteBuffer_spriteCount]; + + for (int var1 = 0; var1 < class326.SpriteBuffer_spriteCount; ++var1) { + Sprite var2 = var0[var1] = new Sprite(); + var2.width = GZipDecompressor.SpriteBuffer_spriteWidth; + var2.height = class326.SpriteBuffer_spriteHeight; + var2.xOffset = Huffman.SpriteBuffer_xOffsets[var1]; + var2.yOffset = NPC.SpriteBuffer_yOffsets[var1]; + var2.subWidth = class326.SpriteBuffer_spriteWidths[var1]; + var2.subHeight = class326.SpriteBuffer_spriteHeights[var1]; + int var3 = var2.subHeight * var2.subWidth; + byte[] var4 = class326.SpriteBuffer_pixels[var1]; + var2.pixels = new int[var3]; + + for (int var5 = 0; var5 < var3; ++var5) { + var2.pixels[var5] = class326.SpriteBuffer_spritePalette[var4[var5] & 255]; + } + } + + DynamicObject.method2292(); + return var0; } - @ObfuscatedName("hv") + @ObfuscatedName("iu") @ObfuscatedSignature( - signature = "(IIIIII)V", - garbageValue = "1599088353" + signature = "(Liz;IIII)V", + garbageValue = "1310795801" ) - @Export("drawObject") - static final void drawObject(int var0, int var1, int var2, int var3, int var4) { - long var5 = class14.scene.getBoundaryObjectTag(var0, var1, var2); - int var7; - int var8; - int var9; - int var10; - int var12; - int var13; - if (var5 != 0L) { - var7 = class14.scene.getObjectFlags(var0, var1, var2, var5); - var8 = var7 >> 6 & 3; - var9 = var7 & 31; - var10 = var3; - if (class42.method790(var5)) { - var10 = var4; + @Export("addNpcToMenu") + static final void addNpcToMenu(NPCDefinition var0, int var1, int var2, int var3) { + if (Client.menuOptionsCount < 400) { + if (var0.transforms != null) { + var0 = var0.transform(); } - int[] var11 = Language.sceneMinimapSprite.pixels; - var12 = var1 * 4 + (103 - var2) * 2048 + 24624; - var13 = class2.Entity_unpackID(var5); - ObjectDefinition var14 = Coord.getObjectDefinition(var13); - if (var14.mapSceneId != -1) { - IndexedSprite var15 = class162.mapSceneSprites[var14.mapSceneId]; - if (var15 != null) { - int var16 = (var14.sizeX * 4 - var15.subWidth) / 2; - int var17 = (var14.sizeY * 4 - var15.subHeight) / 2; - var15.drawAt(var16 + var1 * 4 + 48, var17 + (104 - var2 - var14.sizeY) * 4 + 48); - } - } else { - if (var9 == 0 || var9 == 2) { - if (var8 == 0) { - var11[var12] = var10; - var11[var12 + 512] = var10; - var11[var12 + 1024] = var10; - var11[var12 + 1536] = var10; - } else if (var8 == 1) { - var11[var12] = var10; - var11[var12 + 1] = var10; - var11[var12 + 2] = var10; - var11[var12 + 3] = var10; - } else if (var8 == 2) { - var11[var12 + 3] = var10; - var11[var12 + 512 + 3] = var10; - var11[var12 + 1024 + 3] = var10; - var11[var12 + 1536 + 3] = var10; - } else if (var8 == 3) { - var11[var12 + 1536] = var10; - var11[var12 + 1536 + 1] = var10; - var11[var12 + 1536 + 2] = var10; - var11[var12 + 1536 + 3] = var10; - } - } + if (var0 != null) { + if (var0.isInteractable) { + if (!var0.isFollower || Client.followerIndex == var1) { + String var4 = var0.name; + int var7; + int var8; + if (var0.combatLevel != 0) { + var7 = var0.combatLevel; + var8 = class192.localPlayer.combatLevel; + int var9 = var8 - var7; + String var6; + if (var9 < -9) { + var6 = PacketWriter.colorStartTag(16711680); + } else if (var9 < -6) { + var6 = PacketWriter.colorStartTag(16723968); + } else if (var9 < -3) { + var6 = PacketWriter.colorStartTag(16740352); + } else if (var9 < 0) { + var6 = PacketWriter.colorStartTag(16756736); + } else if (var9 > 9) { + var6 = PacketWriter.colorStartTag(65280); + } else if (var9 > 6) { + var6 = PacketWriter.colorStartTag(4259584); + } else if (var9 > 3) { + var6 = PacketWriter.colorStartTag(8453888); + } else if (var9 > 0) { + var6 = PacketWriter.colorStartTag(12648192); + } else { + var6 = PacketWriter.colorStartTag(16776960); + } - if (var9 == 3) { - if (var8 == 0) { - var11[var12] = var10; - } else if (var8 == 1) { - var11[var12 + 3] = var10; - } else if (var8 == 2) { - var11[var12 + 1536 + 3] = var10; - } else if (var8 == 3) { - var11[var12 + 1536] = var10; - } - } + var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")"; + } + + if (var0.isFollower && Client.followerOpsLowPriority) { + GraphicsObject.insertMenuItemNoShift("Examine", PacketWriter.colorStartTag(16776960) + var4, 1003, var1, var2, var3); + } + + if (Client.isItemSelected == 1) { + GraphicsObject.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + PacketWriter.colorStartTag(16776960) + var4, 7, var1, var2, var3); + } else if (Client.isSpellSelected) { + if ((NetSocket.selectedSpellFlags & 2) == 2) { + GraphicsObject.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + PacketWriter.colorStartTag(16776960) + var4, 8, var1, var2, var3); + } + } else { + int var10 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0; + String[] var11 = var0.actions; + if (var11 != null) { + for (var7 = 4; var7 >= 0; --var7) { + if (var11[var7] != null && !var11[var7].equalsIgnoreCase("Attack")) { + var8 = 0; + if (var7 == 0) { + var8 = var10 + 9; + } + + if (var7 == 1) { + var8 = var10 + 10; + } + + if (var7 == 2) { + var8 = var10 + 11; + } + + if (var7 == 3) { + var8 = var10 + 12; + } + + if (var7 == 4) { + var8 = var10 + 13; + } + + GraphicsObject.insertMenuItemNoShift(var11[var7], PacketWriter.colorStartTag(16776960) + var4, var8, var1, var2, var3); + } + } + } + + if (var11 != null) { + for (var7 = 4; var7 >= 0; --var7) { + if (var11[var7] != null && var11[var7].equalsIgnoreCase("Attack")) { + short var12 = 0; + if (AttackOption.AttackOption_hidden != Client.npcAttackOption) { + if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class192.localPlayer.combatLevel) { + var12 = 2000; + } + + var8 = 0; + if (var7 == 0) { + var8 = var12 + 9; + } + + if (var7 == 1) { + var8 = var12 + 10; + } + + if (var7 == 2) { + var8 = var12 + 11; + } + + if (var7 == 3) { + var8 = var12 + 12; + } + + if (var7 == 4) { + var8 = var12 + 13; + } + + GraphicsObject.insertMenuItemNoShift(var11[var7], PacketWriter.colorStartTag(16776960) + var4, var8, var1, var2, var3); + } + } + } + } + + if (!var0.isFollower || !Client.followerOpsLowPriority) { + GraphicsObject.insertMenuItemNoShift("Examine", PacketWriter.colorStartTag(16776960) + var4, 1003, var1, var2, var3); + } + } - if (var9 == 2) { - if (var8 == 3) { - var11[var12] = var10; - var11[var12 + 512] = var10; - var11[var12 + 1024] = var10; - var11[var12 + 1536] = var10; - } else if (var8 == 0) { - var11[var12] = var10; - var11[var12 + 1] = var10; - var11[var12 + 2] = var10; - var11[var12 + 3] = var10; - } else if (var8 == 1) { - var11[var12 + 3] = var10; - var11[var12 + 512 + 3] = var10; - var11[var12 + 1024 + 3] = var10; - var11[var12 + 1536 + 3] = var10; - } else if (var8 == 2) { - var11[var12 + 1536] = var10; - var11[var12 + 1536 + 1] = var10; - var11[var12 + 1536 + 2] = var10; - var11[var12 + 1536 + 3] = var10; } } } } - - var5 = class14.scene.getGameObjectTag(var0, var1, var2); - if (var5 != 0L) { - var7 = class14.scene.getObjectFlags(var0, var1, var2, var5); - var8 = var7 >> 6 & 3; - var9 = var7 & 31; - var10 = class2.Entity_unpackID(var5); - ObjectDefinition var24 = Coord.getObjectDefinition(var10); - int var19; - if (var24.mapSceneId != -1) { - IndexedSprite var18 = class162.mapSceneSprites[var24.mapSceneId]; - if (var18 != null) { - var13 = (var24.sizeX * 4 - var18.subWidth) / 2; - var19 = (var24.sizeY * 4 - var18.subHeight) / 2; - var18.drawAt(var1 * 4 + var13 + 48, (104 - var2 - var24.sizeY) * 4 + var19 + 48); - } - } else if (var9 == 9) { - var12 = 15658734; - if (class42.method790(var5)) { - var12 = 15597568; - } - - int[] var23 = Language.sceneMinimapSprite.pixels; - var19 = var1 * 4 + (103 - var2) * 2048 + 24624; - if (var8 != 0 && var8 != 2) { - var23[var19] = var12; - var23[var19 + 1 + 512] = var12; - var23[var19 + 1024 + 2] = var12; - var23[var19 + 1536 + 3] = var12; - } else { - var23[var19 + 1536] = var12; - var23[var19 + 1 + 1024] = var12; - var23[var19 + 512 + 2] = var12; - var23[var19 + 3] = var12; - } - } - } - - var5 = class14.scene.getFloorDecorationTag(var0, var1, var2); - if (0L != var5) { - var7 = class2.Entity_unpackID(var5); - ObjectDefinition var20 = Coord.getObjectDefinition(var7); - if (var20.mapSceneId != -1) { - IndexedSprite var21 = class162.mapSceneSprites[var20.mapSceneId]; - if (var21 != null) { - var10 = (var20.sizeX * 4 - var21.subWidth) / 2; - int var22 = (var20.sizeY * 4 - var21.subHeight) / 2; - var21.drawAt(var1 * 4 + var10 + 48, var22 + (104 - var2 - var20.sizeY) * 4 + 48); - } - } - } - } } diff --git a/runescape-client/src/main/java/Huffman.java b/runescape-client/src/main/java/Huffman.java index 0397b39281..8ccb6bf41d 100644 --- a/runescape-client/src/main/java/Huffman.java +++ b/runescape-client/src/main/java/Huffman.java @@ -3,16 +3,19 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("go") +@ObfuscatedName("hc") @Implements("Huffman") public class Huffman { - @ObfuscatedName("f") + @ObfuscatedName("e") + @Export("SpriteBuffer_xOffsets") + public static int[] SpriteBuffer_xOffsets; + @ObfuscatedName("c") @Export("masks") int[] masks; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("bits") byte[] bits; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("keys") int[] keys; @@ -41,7 +44,7 @@ public class Huffman { for (var10 = var6 - 1; var10 >= 1; --var10) { var11 = var3[var10]; - if (var8 != var11) { + if (var11 != var8) { break; } @@ -99,10 +102,10 @@ public class Huffman { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "([BII[BII)I", - garbageValue = "918574893" + signature = "([BII[BIS)I", + garbageValue = "4203" ) @Export("compress") int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) { @@ -120,7 +123,7 @@ public class Huffman { int var11 = var7 >> 3; int var12 = var7 & 7; var6 &= -var12 >> 31; - int var13 = (var12 + var10 - 1 >> 3) + var11; + int var13 = (var10 + var12 - 1 >> 3) + var11; var12 += 24; var4[var11] = (byte)(var6 |= var9 >>> var12); if (var11 < var13) { @@ -150,10 +153,10 @@ public class Huffman { return (var7 + 7 >> 3) - var5; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "([BI[BIII)I", - garbageValue = "273462814" + garbageValue = "275908175" ) @Export("decompress") int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) { @@ -293,213 +296,4 @@ public class Huffman { return var7 + 1 - var2; } } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "2034773594" - ) - public static void method3917() { - VarbitDefinition.VarbitDefinition_cached.clear(); - } - - @ObfuscatedName("ig") - @ObfuscatedSignature( - signature = "(IIIIB)V", - garbageValue = "-1" - ) - @Export("addSceneMenuOptions") - static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { - if (Client.isItemSelected == 0 && !Client.isSpellSelected) { - class1.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); - } - - long var4 = -1L; - long var6 = -1L; - - int var8; - for (var8 = 0; var8 < class192.method3654(); ++var8) { - long var9 = class14.method152(var8); - if (var9 != var6) { - var6 = var9; - int var23 = class288.method5334(ViewportMouse.ViewportMouse_entityTags[var8]); - int var12 = var23; - int var13 = class117.method2760(var8); - int var14 = CollisionMap.method3555(var8); - int var15 = WorldMapSection2.method322(var8); - if (var14 == 2 && class14.scene.getObjectFlags(UrlRequest.Client_plane, var23, var13, var9) >= 0) { - ObjectDefinition var16 = Coord.getObjectDefinition(var15); - if (var16.transforms != null) { - var16 = var16.transform(); - } - - if (var16 == null) { - continue; - } - - if (Client.isItemSelected == 1) { - class1.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + NPC.colorStartTag(65535) + var16.name, 1, var15, var23, var13); - } else if (Client.isSpellSelected) { - if ((ReflectionCheck.selectedSpellFlags & 4) == 4) { - class1.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + NPC.colorStartTag(65535) + var16.name, 2, var15, var23, var13); - } - } else { - String[] var24 = var16.actions; - if (var24 != null) { - for (int var25 = 4; var25 >= 0; --var25) { - if (var24[var25] != null) { - short var19 = 0; - if (var25 == 0) { - var19 = 3; - } - - if (var25 == 1) { - var19 = 4; - } - - if (var25 == 2) { - var19 = 5; - } - - if (var25 == 3) { - var19 = 6; - } - - if (var25 == 4) { - var19 = 1001; - } - - class1.insertMenuItemNoShift(var24[var25], NPC.colorStartTag(65535) + var16.name, var19, var15, var12, var13); - } - } - } - - class1.insertMenuItemNoShift("Examine", NPC.colorStartTag(65535) + var16.name, 1002, var16.id, var12, var13); - } - } - - int var17; - NPC var18; - Player var20; - int[] var31; - int var33; - if (var14 == 1) { - NPC var28 = Client.npcs[var15]; - if (var28 == null) { - continue; - } - - if (var28.definition.size == 1 && (var28.x & 127) == 64 && (var28.y & 127) == 64) { - for (var17 = 0; var17 < Client.npcCount; ++var17) { - var18 = Client.npcs[Client.npcIndices[var17]]; - if (var18 != null && var18 != var28 && var18.definition.size == 1 && var18.x == var28.x && var28.y == var18.y) { - DefaultsGroup.addNpcToMenu(var18.definition, Client.npcIndices[var17], var12, var13); - } - } - - var17 = Players.Players_count; - var31 = Players.Players_indices; - - for (var33 = 0; var33 < var17; ++var33) { - var20 = Client.players[var31[var33]]; - if (var20 != null && var28.x == var20.x && var20.y == var28.y) { - class30.addPlayerToMenu(var20, var31[var33], var12, var13); - } - } - } - - DefaultsGroup.addNpcToMenu(var28.definition, var15, var12, var13); - } - - if (var14 == 0) { - Player var29 = Client.players[var15]; - if (var29 == null) { - continue; - } - - if ((var29.x & 127) == 64 && (var29.y & 127) == 64) { - for (var17 = 0; var17 < Client.npcCount; ++var17) { - var18 = Client.npcs[Client.npcIndices[var17]]; - if (var18 != null && var18.definition.size == 1 && var29.x == var18.x && var18.y == var29.y) { - DefaultsGroup.addNpcToMenu(var18.definition, Client.npcIndices[var17], var12, var13); - } - } - - var17 = Players.Players_count; - var31 = Players.Players_indices; - - for (var33 = 0; var33 < var17; ++var33) { - var20 = Client.players[var31[var33]]; - if (var20 != null && var20 != var29 && var20.x == var29.x && var20.y == var29.y) { - class30.addPlayerToMenu(var20, var31[var33], var12, var13); - } - } - } - - if (var15 != Client.combatTargetPlayerIndex) { - class30.addPlayerToMenu(var29, var15, var12, var13); - } else { - var4 = var9; - } - } - - if (var14 == 3) { - NodeDeque var30 = Client.groundItems[UrlRequest.Client_plane][var12][var13]; - if (var30 != null) { - for (TileItem var34 = (TileItem)var30.first(); var34 != null; var34 = (TileItem)var30.next()) { - ItemDefinition var32 = PacketBufferNode.ItemDefinition_get(var34.id); - if (Client.isItemSelected == 1) { - class1.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + NPC.colorStartTag(16748608) + var32.name, 16, var34.id, var12, var13); - } else if (Client.isSpellSelected) { - if ((ReflectionCheck.selectedSpellFlags & 1) == 1) { - class1.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + NPC.colorStartTag(16748608) + var32.name, 17, var34.id, var12, var13); - } - } else { - String[] var26 = var32.groundActions; - - for (int var27 = 4; var27 >= 0; --var27) { - if (var26 != null && var26[var27] != null) { - byte var21 = 0; - if (var27 == 0) { - var21 = 18; - } - - if (var27 == 1) { - var21 = 19; - } - - if (var27 == 2) { - var21 = 20; - } - - if (var27 == 3) { - var21 = 21; - } - - if (var27 == 4) { - var21 = 22; - } - - class1.insertMenuItemNoShift(var26[var27], NPC.colorStartTag(16748608) + var32.name, var21, var34.id, var12, var13); - } else if (var27 == 2) { - class1.insertMenuItemNoShift("Take", NPC.colorStartTag(16748608) + var32.name, 20, var34.id, var12, var13); - } - } - - class1.insertMenuItemNoShift("Examine", NPC.colorStartTag(16748608) + var32.name, 1004, var34.id, var12, var13); - } - } - } - } - } - } - - if (-1L != var4) { - var8 = class288.method5334(var4); - int var22 = (int)(var4 >>> 7 & 127L); - Player var11 = Client.players[Client.combatTargetPlayerIndex]; - class30.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var22); - } - - } } diff --git a/runescape-client/src/main/java/IgnoreList.java b/runescape-client/src/main/java/IgnoreList.java index ff3d540870..d97344bbc1 100644 --- a/runescape-client/src/main/java/IgnoreList.java +++ b/runescape-client/src/main/java/IgnoreList.java @@ -1,62 +1,50 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ju") +@ObfuscatedName("jf") @Implements("IgnoreList") public class IgnoreList extends UserList { - @ObfuscatedName("ac") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Llk;" - ) - @Export("rasterProvider") - public static AbstractRasterProvider rasterProvider; - @ObfuscatedName("af") - @ObfuscatedGetter( - intValue = 171916373 - ) - static int field3579; - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "Lll;" + signature = "Lmv;" ) @Export("loginType") final LoginType loginType; @ObfuscatedSignature( - signature = "(Lll;)V" + signature = "(Lmv;)V" ) public IgnoreList(LoginType var1) { super(400); this.loginType = var1; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)Ljy;", - garbageValue = "68" + signature = "(S)Ljk;", + garbageValue = "30683" ) @Export("newInstance") User newInstance() { return new Ignored(); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IB)[Ljy;", - garbageValue = "32" + signature = "(IB)[Ljk;", + garbageValue = "19" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new Ignored[var1]; } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkq;II)V", - garbageValue = "1755489735" + signature = "(Lkp;II)V", + garbageValue = "1147655369" ) @Export("read") public void read(Buffer var1, int var2) { diff --git a/runescape-client/src/main/java/Ignored.java b/runescape-client/src/main/java/Ignored.java index 96aaa652e9..b0a3438b20 100644 --- a/runescape-client/src/main/java/Ignored.java +++ b/runescape-client/src/main/java/Ignored.java @@ -4,17 +4,18 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("je") +@ObfuscatedName("jp") @Implements("Ignored") public class Ignored extends User { - @ObfuscatedName("rq") - @ObfuscatedGetter( - intValue = 220663936 + @ObfuscatedName("gg") + @ObfuscatedSignature( + signature = "[Llt;" ) - static int field3589; - @ObfuscatedName("f") + @Export("headIconPkSprites") + static Sprite[] headIconPkSprites; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 53560497 + intValue = -1391988611 ) @Export("id") int id; @@ -22,20 +23,20 @@ public class Ignored extends User { Ignored() { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lje;I)I", - garbageValue = "1201655164" + signature = "(Ljp;I)I", + garbageValue = "-2090061914" ) @Export("compareTo_ignored") int compareTo_ignored(Ignored var1) { return this.id - var1.id; } - @ObfuscatedName("ay") + @ObfuscatedName("az") @ObfuscatedSignature( - signature = "(Ljy;S)I", - garbageValue = "9221" + signature = "(Ljk;I)I", + garbageValue = "-746331144" ) @Export("compareTo_user") public int compareTo_user(User var1) { @@ -45,4 +46,31 @@ public class Ignored extends User { public int compareTo(Object var1) { return this.compareTo_ignored((Ignored)var1); } + + @ObfuscatedName("ho") + @ObfuscatedSignature( + signature = "(IIB)V", + garbageValue = "5" + ) + static final void method5213(int var0, int var1) { + if (Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) { + if (Client.showMouseOverText) { + int var2 = Client.menuOptionsCount - 1; + String var4; + if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) { + var4 = "Use" + " " + Client.selectedItemName + " " + "->"; + } else if (Client.isSpellSelected && Client.menuOptionsCount < 2) { + var4 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " " + "->"; + } else { + var4 = VerticalAlignment.method4426(var2); + } + + if (Client.menuOptionsCount > 2) { + var4 = var4 + PacketWriter.colorStartTag(16777215) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options"; + } + + class1.fontBold12.drawRandomAlphaAndSpacing(var4, var0 + 4, var1 + 15, 16777215, 0, Client.cycle / 1000); + } + } + } } diff --git a/runescape-client/src/main/java/IndexedSprite.java b/runescape-client/src/main/java/IndexedSprite.java index 7e59e40c33..37983eed12 100644 --- a/runescape-client/src/main/java/IndexedSprite.java +++ b/runescape-client/src/main/java/IndexedSprite.java @@ -5,32 +5,32 @@ import net.runelite.mapping.ObfuscatedName; @ObfuscatedName("li") @Implements("IndexedSprite") public final class IndexedSprite extends Rasterizer2D { - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("pixels") public byte[] pixels; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("palette") public int[] palette; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("subWidth") public int subWidth; - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("subHeight") public int subHeight; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("xOffset") public int xOffset; - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("yOffset") public int yOffset; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("width") public int width; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("height") public int height; - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("normalize") public void normalize() { if (this.subWidth != this.width || this.subHeight != this.height) { @@ -51,7 +51,7 @@ public final class IndexedSprite extends Rasterizer2D { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("shiftColors") public void shiftColors(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.palette.length; ++var4) { @@ -84,7 +84,7 @@ public final class IndexedSprite extends Rasterizer2D { } - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; @@ -130,8 +130,8 @@ public final class IndexedSprite extends Rasterizer2D { } } - @ObfuscatedName("p") - public void method6124(int var1, int var2, int var3, int var4) { + @ObfuscatedName("i") + public void method6162(int var1, int var2, int var3, int var4) { int var5 = this.subWidth; int var6 = this.subHeight; int var7 = 0; @@ -192,7 +192,7 @@ public final class IndexedSprite extends Rasterizer2D { IndexedSprite_something(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var7, var8, var13, var14, var3, var4, var11, var12, var5); } - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("IndexedSprite_two") static void IndexedSprite_two(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = -(var5 >> 2); @@ -246,7 +246,7 @@ public final class IndexedSprite extends Rasterizer2D { } - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("IndexedSprite_something") static void IndexedSprite_something(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { int var12 = var3; diff --git a/runescape-client/src/main/java/Instrument.java b/runescape-client/src/main/java/Instrument.java index eef18aba3f..947d1d6d8d 100644 --- a/runescape-client/src/main/java/Instrument.java +++ b/runescape-client/src/main/java/Instrument.java @@ -4,112 +4,112 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dp") +@ObfuscatedName("dq") @Implements("Instrument") public class Instrument { - @ObfuscatedName("j") + @ObfuscatedName("q") @Export("Instrument_samples") static int[] Instrument_samples; - @ObfuscatedName("n") + @ObfuscatedName("z") @Export("Instrument_noise") static int[] Instrument_noise; - @ObfuscatedName("u") + @ObfuscatedName("y") @Export("Instrument_sine") static int[] Instrument_sine; - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("Instrument_phases") static int[] Instrument_phases; - @ObfuscatedName("m") + @ObfuscatedName("r") @Export("Instrument_delays") static int[] Instrument_delays; - @ObfuscatedName("g") + @ObfuscatedName("s") @Export("Instrument_volumeSteps") static int[] Instrument_volumeSteps; - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("Instrument_pitchSteps") static int[] Instrument_pitchSteps; - @ObfuscatedName("q") + @ObfuscatedName("u") @Export("Instrument_pitchBaseSteps") static int[] Instrument_pitchBaseSteps; - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Ldo;" + signature = "Lds;" ) @Export("pitch") SoundEnvelope pitch; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Ldo;" + signature = "Lds;" ) @Export("volume") SoundEnvelope volume; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Ldo;" + signature = "Lds;" ) @Export("pitchModifier") SoundEnvelope pitchModifier; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Ldo;" + signature = "Lds;" ) @Export("pitchModifierAmplitude") SoundEnvelope pitchModifierAmplitude; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Ldo;" + signature = "Lds;" ) @Export("volumeMultiplier") SoundEnvelope volumeMultiplier; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Ldo;" + signature = "Lds;" ) @Export("volumeMultiplierAmplitude") SoundEnvelope volumeMultiplierAmplitude; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Ldo;" + signature = "Lds;" ) @Export("release") SoundEnvelope release; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Ldo;" + signature = "Lds;" ) @Export("attack") SoundEnvelope attack; - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("oscillatorVolume") int[] oscillatorVolume; - @ObfuscatedName("d") + @ObfuscatedName("m") @Export("oscillatorPitch") int[] oscillatorPitch; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("oscillatorDelays") int[] oscillatorDelays; - @ObfuscatedName("o") + @ObfuscatedName("h") @Export("delayTime") int delayTime; @ObfuscatedName("v") @Export("delayDecay") int delayDecay; - @ObfuscatedName("k") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Ldh;" + signature = "Ldf;" ) @Export("filter") AudioFilter filter; - @ObfuscatedName("s") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Ldo;" + signature = "Lds;" ) @Export("filterEnvelope") SoundEnvelope filterEnvelope; - @ObfuscatedName("l") + @ObfuscatedName("w") @Export("duration") int duration; - @ObfuscatedName("t") + @ObfuscatedName("k") @Export("offset") int offset; @@ -146,10 +146,10 @@ public class Instrument { this.offset = 0; } - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("synthesize") final int[] synthesize(int var1, int var2) { - class300.clearIntArray(Instrument_samples, 0, var1); + class301.clearIntArray(Instrument_samples, 0, var1); if (var2 < 10) { return Instrument_samples; } else { @@ -353,7 +353,7 @@ public class Instrument { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("evaluateWave") final int evaluateWave(int var1, int var2, int var3) { if (var3 == 1) { @@ -367,9 +367,9 @@ public class Instrument { } } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkq;)V" + signature = "(Lkp;)V" ) @Export("decode") final void decode(Buffer var1) { @@ -421,6 +421,6 @@ public class Instrument { this.offset = var1.readUnsignedShort(); this.filter = new AudioFilter(); this.filterEnvelope = new SoundEnvelope(); - this.filter.method2713(var1, this.filterEnvelope); + this.filter.method2769(var1, this.filterEnvelope); } } diff --git a/runescape-client/src/main/java/IntHashTable.java b/runescape-client/src/main/java/IntHashTable.java index 5835c15279..2fb6123301 100644 --- a/runescape-client/src/main/java/IntHashTable.java +++ b/runescape-client/src/main/java/IntHashTable.java @@ -3,12 +3,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lq") +@ObfuscatedName("lk") @Implements("IntHashTable") public class IntHashTable { - @ObfuscatedName("a") - public static short[] field4010; - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("array") int[] array; @@ -34,10 +32,10 @@ public class IntHashTable { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "409094237" + signature = "(IB)I", + garbageValue = "-113" ) @Export("get") public int get(int var1) { diff --git a/runescape-client/src/main/java/IntegerNode.java b/runescape-client/src/main/java/IntegerNode.java index cbdd8190ce..f0e4e4024a 100644 --- a/runescape-client/src/main/java/IntegerNode.java +++ b/runescape-client/src/main/java/IntegerNode.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("gx") +@ObfuscatedName("fc") @Implements("IntegerNode") public class IntegerNode extends Node { - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("integer") public int integer; diff --git a/runescape-client/src/main/java/InterfaceParent.java b/runescape-client/src/main/java/InterfaceParent.java index 3414c28be1..e86620f77d 100644 --- a/runescape-client/src/main/java/InterfaceParent.java +++ b/runescape-client/src/main/java/InterfaceParent.java @@ -3,49 +3,209 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; +import netscape.javascript.JSObject; -@ObfuscatedName("bz") +@ObfuscatedName("be") @Implements("InterfaceParent") public class InterfaceParent extends Node { - @ObfuscatedName("f") + @ObfuscatedName("ps") + @ObfuscatedSignature( + signature = "Ljl;" + ) + @Export("clanChat") + static ClanChat clanChat; + @ObfuscatedName("l") + static byte[][][] field565; + @ObfuscatedName("gz") + @ObfuscatedSignature( + signature = "[Lli;" + ) + @Export("modIconSprites") + static IndexedSprite[] modIconSprites; + @ObfuscatedName("kx") @ObfuscatedGetter( - intValue = 1533834755 + intValue = 311386537 + ) + @Export("menuWidth") + static int menuWidth; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 741333459 ) @Export("group") int group; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 642122867 + intValue = 1361979275 ) @Export("type") int type; - @ObfuscatedName("y") - boolean field546; + @ObfuscatedName("o") + boolean field568; InterfaceParent() { - this.field546 = false; + this.field568 = false; } - @ObfuscatedName("fs") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "472182360" + signature = "(IIIZIZI)V", + garbageValue = "-753308840" ) - @Export("logOut") - static final void logOut() { - Client.packetWriter.close(); - class81.method2063(); - class14.scene.clear(); + @Export("doWorldSorting") + static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) { + if (var0 < var1) { + int var6 = (var0 + var1) / 2; + int var7 = var0; + World var8 = class96.World_worlds[var6]; + class96.World_worlds[var6] = class96.World_worlds[var1]; + class96.World_worlds[var1] = var8; - for (int var0 = 0; var0 < 4; ++var0) { - Client.collisionMaps[var0].clear(); + for (int var9 = var0; var9 < var1; ++var9) { + if (class1.method19(class96.World_worlds[var9], var8, var2, var3, var4, var5) <= 0) { + World var10 = class96.World_worlds[var9]; + class96.World_worlds[var9] = class96.World_worlds[var7]; + class96.World_worlds[var7++] = var10; + } + } + + class96.World_worlds[var1] = class96.World_worlds[var7]; + class96.World_worlds[var7] = var8; + doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); + doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); + } + + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "(ILce;ZI)I", + garbageValue = "-332647401" + ) + static int method1191(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { + var3 = Varps.getWidget(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.itemId; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { + var3 = Varps.getWidget(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); + if (var3.itemId != -1) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.IF_HASSUB) { + int var5 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var5); + if (var4 != null) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.IF_GETTOP) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.rootInterface; + return 1; + } else { + return 2; + } + } + + @ObfuscatedName("gs") + @ObfuscatedSignature( + signature = "(Lba;III)V", + garbageValue = "1714214597" + ) + @Export("performPlayerAnimation") + static void performPlayerAnimation(Player var0, int var1, int var2) { + if (var0.sequence == var1 && var1 != -1) { + int var3 = GraphicsDefaults.SequenceDefinition_get(var1).field3516; + if (var3 == 1) { + var0.sequenceFrame = 0; + var0.sequenceFrameCycle = 0; + var0.sequenceDelay = var2; + var0.field983 = 0; + } + + if (var3 == 2) { + var0.field983 = 0; + } + } else if (var1 == -1 || var0.sequence == -1 || GraphicsDefaults.SequenceDefinition_get(var1).field3508 >= GraphicsDefaults.SequenceDefinition_get(var0.sequence).field3508) { + var0.sequence = var1; + var0.sequenceFrame = 0; + var0.sequenceFrameCycle = 0; + var0.sequenceDelay = var2; + var0.field983 = 0; + var0.field998 = var0.pathLength; + } + + } + + @ObfuscatedName("iz") + @ObfuscatedSignature( + signature = "(Lhn;III)V", + garbageValue = "-749720569" + ) + @Export("alignWidgetPosition") + static void alignWidgetPosition(Widget var0, int var1, int var2) { + if (var0.xAlignment == 0) { + var0.x = var0.rawX; + } else if (var0.xAlignment == 1) { + var0.x = var0.rawX + (var1 - var0.width) / 2; + } else if (var0.xAlignment == 2) { + var0.x = var1 - var0.width - var0.rawX; + } else if (var0.xAlignment == 3) { + var0.x = var0.rawX * var1 >> 14; + } else if (var0.xAlignment == 4) { + var0.x = (var0.rawX * var1 >> 14) + (var1 - var0.width) / 2; + } else { + var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); + } + + if (var0.yAlignment == 0) { + var0.y = var0.rawY; + } else if (var0.yAlignment == 1) { + var0.y = (var2 - var0.height) / 2 + var0.rawY; + } else if (var0.yAlignment == 2) { + var0.y = var2 - var0.height - var0.rawY; + } else if (var0.yAlignment == 3) { + var0.y = var2 * var0.rawY >> 14; + } else if (var0.yAlignment == 4) { + var0.y = (var2 * var0.rawY >> 14) + (var2 - var0.height) / 2; + } else { + var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); + } + + } + + @ObfuscatedName("kr") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;B)V", + garbageValue = "-53" + ) + static void method1192(String var0) { + GameShell.field477 = var0; + + try { + String var1 = Username.client.getParameter(Integer.toString(18)); + String var2 = Username.client.getParameter(Integer.toString(13)); + String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; + if (var0.length() == 0) { + var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; + } else { + var3 = var3 + "; Expires=" + HealthBarUpdate.method1758(WorldMapIcon_0.currentTimeMillis() + 94608000000L) + "; Max-Age=" + 94608000L; + } + + Client var4 = Username.client; + String var5 = "document.cookie=\"" + var3 + "\""; + JSObject.getWindow(var4).eval(var5); + } catch (Throwable var6) { } - System.gc(); - BoundaryObject.method3273(2); - Client.currentTrackGroupId = -1; - Client.field767 = false; - WorldMapSectionType.method236(); - class195.updateGameState(10); } } diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index 18167641f1..4d922b89e5 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -1,69 +1,59 @@ -import java.lang.management.GarbageCollectorMXBean; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bt") +@ObfuscatedName("bo") @Implements("Interpreter") public class Interpreter { - @ObfuscatedName("sn") - @ObfuscatedSignature( - signature = "Lbf;" - ) - @Export("clientPreferences") - static ClientPreferences clientPreferences; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("Interpreter_intLocals") static int[] Interpreter_intLocals; - @ObfuscatedName("p") + @ObfuscatedName("e") + @Export("Interpreter_stringLocals") + static String[] Interpreter_stringLocals; + @ObfuscatedName("i") @Export("Interpreter_arrayLengths") static int[] Interpreter_arrayLengths; - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("Interpreter_arrays") static int[][] Interpreter_arrays; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("Interpreter_intStack") static int[] Interpreter_intStack; - @ObfuscatedName("x") - @Export("ByteArrayPool_altSizeArrayCounts") - static int[] ByteArrayPool_altSizeArrayCounts; - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("Interpreter_stringStack") static String[] Interpreter_stringStack; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1511874989 + intValue = 918473247 ) @Export("Interpreter_frameDepth") static int Interpreter_frameDepth; - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "[Lbk;" + signature = "[Lbb;" ) @Export("Interpreter_frames") static ScriptFrame[] Interpreter_frames; - @ObfuscatedName("s") + @ObfuscatedName("x") @Export("Interpreter_calendar") static java.util.Calendar Interpreter_calendar; - @ObfuscatedName("l") + @ObfuscatedName("w") @Export("Interpreter_MONTHS") static final String[] Interpreter_MONTHS; - @ObfuscatedName("j") - static boolean field1077; - @ObfuscatedName("n") - static boolean field1078; - @ObfuscatedName("u") + @ObfuscatedName("q") + static boolean field1094; + @ObfuscatedName("z") + static boolean field1095; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1660358445 + intValue = 1093173165 ) - static int field1079; - @ObfuscatedName("g") - static final double field1083; - @ObfuscatedName("at") - @Export("garbageCollector") - static GarbageCollectorMXBean garbageCollector; + static int field1088; + @ObfuscatedName("s") + static final double field1097; static { Interpreter_arrayLengths = new int[5]; @@ -74,141 +64,121 @@ public class Interpreter { Interpreter_frames = new ScriptFrame[50]; Interpreter_calendar = java.util.Calendar.getInstance(); Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; - field1077 = false; - field1078 = false; - field1079 = 0; - field1083 = Math.log(2.0D); + field1094 = false; + field1095 = false; + field1088 = 0; + field1097 = Math.log(2.0D); } - @ObfuscatedName("i") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(CLgs;I)C", - garbageValue = "813318592" + signature = "([Lbg;II[I[IB)V", + garbageValue = "-20" ) - @Export("standardizeChar") - static char standardizeChar(char var0, Language var1) { - if (var0 >= 192 && var0 <= 255) { - if (var0 >= 192 && var0 <= 198) { - return 'A'; + @Export("sortWorlds") + static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) { + if (var1 < var2) { + int var5 = var1 - 1; + int var6 = var2 + 1; + int var7 = (var2 + var1) / 2; + World var8 = var0[var7]; + var0[var7] = var0[var1]; + var0[var1] = var8; + + while (var5 < var6) { + boolean var9 = true; + + int var10; + int var11; + int var12; + do { + --var6; + + for (var10 = 0; var10 < 4; ++var10) { + if (var3[var10] == 2) { + var11 = var0[var6].index; + var12 = var8.index; + } else if (var3[var10] == 1) { + var11 = var0[var6].population; + var12 = var8.population; + if (var11 == -1 && var4[var10] == 1) { + var11 = 2001; + } + + if (var12 == -1 && var4[var10] == 1) { + var12 = 2001; + } + } else if (var3[var10] == 3) { + var11 = var0[var6].isMembersOnly() ? 1 : 0; + var12 = var8.isMembersOnly() ? 1 : 0; + } else { + var11 = var0[var6].id; + var12 = var8.id; + } + + if (var11 != var12) { + if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { + var9 = false; + } + break; + } + + if (var10 == 3) { + var9 = false; + } + } + } while(var9); + + var9 = true; + + do { + ++var5; + + for (var10 = 0; var10 < 4; ++var10) { + if (var3[var10] == 2) { + var11 = var0[var5].index; + var12 = var8.index; + } else if (var3[var10] == 1) { + var11 = var0[var5].population; + var12 = var8.population; + if (var11 == -1 && var4[var10] == 1) { + var11 = 2001; + } + + if (var12 == -1 && var4[var10] == 1) { + var12 = 2001; + } + } else if (var3[var10] == 3) { + var11 = var0[var5].isMembersOnly() ? 1 : 0; + var12 = var8.isMembersOnly() ? 1 : 0; + } else { + var11 = var0[var5].id; + var12 = var8.id; + } + + if (var12 != var11) { + if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { + var9 = false; + } + break; + } + + if (var10 == 3) { + var9 = false; + } + } + } while(var9); + + if (var5 < var6) { + World var13 = var0[var5]; + var0[var5] = var0[var6]; + var0[var6] = var13; + } } - if (var0 == 199) { - return 'C'; - } - - if (var0 >= 200 && var0 <= 203) { - return 'E'; - } - - if (var0 >= 204 && var0 <= 207) { - return 'I'; - } - - if (var0 == 209 && var1 != Language.Language_ES) { - return 'N'; - } - - if (var0 >= 210 && var0 <= 214) { - return 'O'; - } - - if (var0 >= 217 && var0 <= 220) { - return 'U'; - } - - if (var0 == 221) { - return 'Y'; - } - - if (var0 == 223) { - return 's'; - } - - if (var0 >= 224 && var0 <= 230) { - return 'a'; - } - - if (var0 == 231) { - return 'c'; - } - - if (var0 >= 232 && var0 <= 235) { - return 'e'; - } - - if (var0 >= 236 && var0 <= 239) { - return 'i'; - } - - if (var0 == 241 && var1 != Language.Language_ES) { - return 'n'; - } - - if (var0 >= 242 && var0 <= 246) { - return 'o'; - } - - if (var0 >= 249 && var0 <= 252) { - return 'u'; - } - - if (var0 == 253 || var0 == 255) { - return 'y'; - } + sortWorlds(var0, var1, var6, var3, var4); + sortWorlds(var0, var6 + 1, var2, var3, var4); } - if (var0 == 338) { - return 'O'; - } else if (var0 == 339) { - return 'o'; - } else if (var0 == 376) { - return 'Y'; - } else { - return var0; - } - } - - @ObfuscatedName("fl") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-2098747776" - ) - static void method2020() { - Client.packetWriter.clearBuffer(); - Client.packetWriter.packetBuffer.offset = 0; - Client.packetWriter.serverPacket = null; - Client.packetWriter.field1300 = null; - Client.packetWriter.field1301 = null; - Client.packetWriter.field1299 = null; - Client.packetWriter.serverPacketLength = 0; - Client.packetWriter.field1298 = 0; - Client.rebootTimer = 0; - WorldMapData_1.method708(); - Client.minimapState = 0; - Client.destinationX = 0; - - int var0; - for (var0 = 0; var0 < 2048; ++var0) { - Client.players[var0] = null; - } - - Message.localPlayer = null; - - for (var0 = 0; var0 < Client.npcs.length; ++var0) { - NPC var1 = Client.npcs[var0]; - if (var1 != null) { - var1.targetIndex = -1; - var1.false0 = false; - } - } - - ItemContainer.itemContainers = new NodeHashTable(32); - class195.updateGameState(30); - - for (var0 = 0; var0 < 100; ++var0) { - Client.field833[var0] = true; - } - - class219.method4076(); } } diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java index b27f369006..55e4c7292f 100644 --- a/runescape-client/src/main/java/InvDefinition.java +++ b/runescape-client/src/main/java/InvDefinition.java @@ -4,24 +4,24 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ip") +@ObfuscatedName("id") @Implements("InvDefinition") public class InvDefinition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) @Export("InvDefinition_archive") - static AbstractArchive InvDefinition_archive; - @ObfuscatedName("i") + public static AbstractArchive InvDefinition_archive; + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("InvDefinition_cached") static EvictingDualNodeHashTable InvDefinition_cached; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -2110300501 + intValue = -1229670201 ) @Export("size") public int size; @@ -34,10 +34,10 @@ public class InvDefinition extends DualNode { this.size = 0; } - @ObfuscatedName("y") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lkq;I)V", - garbageValue = "-1721962305" + signature = "(Lkp;I)V", + garbageValue = "1060242106" ) @Export("decode") void decode(Buffer var1) { @@ -51,10 +51,10 @@ public class InvDefinition extends DualNode { } } - @ObfuscatedName("w") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkq;II)V", - garbageValue = "-1369640921" + signature = "(Lkp;II)V", + garbageValue = "774565733" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -63,30 +63,4 @@ public class InvDefinition extends DualNode { } } - - @ObfuscatedName("ks") - @ObfuscatedSignature( - signature = "(IIIILls;Lhy;B)V", - garbageValue = "-108" - ) - @Export("worldToMinimap") - static final void worldToMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) { - int var6 = var3 * var3 + var2 * var2; - if (var6 > 4225 && var6 < 90000) { - int var7 = Client.camAngleY & 2047; - int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; - int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; - int var10 = var3 * var8 + var9 * var2 >> 16; - int var11 = var3 * var9 - var8 * var2 >> 16; - double var12 = Math.atan2((double)var10, (double)var11); - int var14 = var5.width / 2 - 25; - int var15 = (int)(Math.sin(var12) * (double)var14); - int var16 = (int)(Math.cos(var12) * (double)var14); - byte var17 = 20; - class40.redHintArrowSprite.method6167(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); - } else { - GrandExchangeOfferNameComparator.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); - } - - } } diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java index 607de9db52..5561bf1aa7 100644 --- a/runescape-client/src/main/java/IsaacCipher.java +++ b/runescape-client/src/main/java/IsaacCipher.java @@ -4,42 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lr") +@ObfuscatedName("lw") @Implements("IsaacCipher") public final class IsaacCipher { - @ObfuscatedName("iz") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1001005683 - ) - @Export("selectedItemId") - static int selectedItemId; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 1472427877 + intValue = -1084674035 ) @Export("valuesRemaining") int valuesRemaining; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("results") int[] results; - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("mm") int[] mm; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 342610409 + intValue = 1881052481 ) @Export("aa") int aa; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1405069549 + intValue = 1182669169 ) @Export("bb") int bb; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1673829147 + intValue = -1353155945 ) @Export("cc") int cc; @@ -52,13 +46,13 @@ public final class IsaacCipher { this.results[var2] = var1[var2]; } - this.method6307(); + this.method6314(); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-111" + signature = "(S)I", + garbageValue = "32137" ) @Export("nextInt") public final int nextInt() { @@ -70,12 +64,12 @@ public final class IsaacCipher { return this.results[--this.valuesRemaining]; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-1728742409" + signature = "(B)I", + garbageValue = "1" ) - public final int method6305() { + public final int method6307() { if (this.valuesRemaining == 0) { this.generateMoreResults(); this.valuesRemaining = 256; @@ -84,10 +78,10 @@ public final class IsaacCipher { return this.results[this.valuesRemaining - 1]; } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-60" + signature = "(I)V", + garbageValue = "16776960" ) @Export("generateMoreResults") final void generateMoreResults() { @@ -109,18 +103,18 @@ public final class IsaacCipher { this.aa += this.mm[var1 + 128 & 255]; int var3; - this.mm[var1] = var3 = this.mm[(var2 & 1020) >> 2] + this.bb + this.aa; + this.mm[var1] = var3 = this.mm[(var2 & 1020) >> 2] + this.aa + this.bb; this.results[var1] = this.bb = this.mm[(var3 >> 8 & 1020) >> 2] + var2; } } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "756706735" + garbageValue = "-1817393668" ) - final void method6307() { + final void method6314() { int var9 = -1640531527; int var8 = -1640531527; int var7 = -1640531527; diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java index 816b01e56e..c092e200bd 100644 --- a/runescape-client/src/main/java/ItemContainer.java +++ b/runescape-client/src/main/java/ItemContainer.java @@ -1,27 +1,32 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bc") +@ObfuscatedName("bl") @Implements("ItemContainer") public class ItemContainer extends Node { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lle;" + signature = "Lln;" ) @Export("itemContainers") static NodeHashTable itemContainers; - @ObfuscatedName("dg") - @ObfuscatedGetter( - longValue = 151185411405630583L + @ObfuscatedName("h") + @ObfuscatedSignature( + signature = "Lli;" ) - static long field519; - @ObfuscatedName("i") + static IndexedSprite field547; + @ObfuscatedName("be") + @ObfuscatedSignature( + signature = "[Lli;" + ) + @Export("worldSelectArrows") + static IndexedSprite[] worldSelectArrows; + @ObfuscatedName("t") @Export("ids") int[] ids; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("quantities") int[] quantities; @@ -34,15 +39,66 @@ public class ItemContainer extends Node { this.quantities = new int[]{0}; } - @ObfuscatedName("jf") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "-83" + signature = "(IZB)Ljava/lang/String;", + garbageValue = "-71" ) - @Export("runIntfCloseListeners") - static final void runIntfCloseListeners(int var0, int var1) { - if (MusicPatch.loadInterface(var0)) { - DynamicObject.runComponentCloseListeners(UserComparator7.Widget_interfaceComponents[var0], var1); + @Export("intToString") + public static String intToString(int var0, boolean var1) { + return var1 && var0 >= 0 ? Actor.method1741(var0, 10, var1) : Integer.toString(var0); + } + + @ObfuscatedName("gu") + @ObfuscatedSignature( + signature = "(ZI)V", + garbageValue = "-1888961685" + ) + @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.field942 * 367011904 == 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 = GameShell.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); + var2.playerCycle = Client.cycle; + ServerBuild.scene.drawEntity(Clock.Client_plane, var2.x, var2.y, WorldMapSectionType.getTileHeight(var2.field942 * 2013925376 - 64 + var2.x, var2.field942 * 2013925376 - 64 + var2.y, Clock.Client_plane), var2.field942 * 2013925376 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); + } + } + } + + } + + @ObfuscatedName("kp") + @ObfuscatedSignature( + signature = "(Lhn;I)Lhn;", + garbageValue = "701959243" + ) + static Widget method1184(Widget var0) { + int var2 = WorldMapIcon_0.getWidgetClickMask(var0); + int var1 = var2 >> 17 & 7; + int var3 = var1; + if (var1 == 0) { + return null; + } else { + for (int var4 = 0; var4 < var3; ++var4) { + var0 = Varps.getWidget(var0.parentId); + if (var0 == null) { + return null; + } + } + + return var0; } } } diff --git a/runescape-client/src/main/java/ItemDefinition.java b/runescape-client/src/main/java/ItemDefinition.java index 1184a3a8b5..b0f875fae8 100644 --- a/runescape-client/src/main/java/ItemDefinition.java +++ b/runescape-client/src/main/java/ItemDefinition.java @@ -4,294 +4,297 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ii") +@ObfuscatedName("if") @Implements("ItemDefinition") public class ItemDefinition extends DualNode { - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" + ) + @Export("ItemDefinition_archive") + public static AbstractArchive ItemDefinition_archive; + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "Lii;" ) @Export("ItemDefinition_modelArchive") - static AbstractArchive ItemDefinition_modelArchive; - @ObfuscatedName("x") - @Export("ItemDefinition_inMembersWorld") - static boolean ItemDefinition_inMembersWorld; - @ObfuscatedName("a") + public static AbstractArchive ItemDefinition_modelArchive; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1592128497 + intValue = 1524909813 ) @Export("ItemDefinition_fileCount") public static int ItemDefinition_fileCount; - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("ItemDefinition_cached") - static EvictingDualNodeHashTable ItemDefinition_cached; - @ObfuscatedName("c") + public static EvictingDualNodeHashTable ItemDefinition_cached; + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("ItemDefinition_cachedModels") - static EvictingDualNodeHashTable ItemDefinition_cachedModels; - @ObfuscatedName("o") + public static EvictingDualNodeHashTable ItemDefinition_cachedModels; + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("ItemDefinition_cachedSprites") - static EvictingDualNodeHashTable ItemDefinition_cachedSprites; - @ObfuscatedName("dl") + public static EvictingDualNodeHashTable ItemDefinition_cachedSprites; + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lif;" + signature = "Lko;" ) - @Export("archive1") - static Archive archive1; - @ObfuscatedName("k") + @Export("ItemDefinition_fontPlain11") + public static Font ItemDefinition_fontPlain11; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1070204959 + intValue = -536446943 ) @Export("id") public int id; - @ObfuscatedName("s") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -693135883 + intValue = -406504769 ) @Export("model") int model; - @ObfuscatedName("l") + @ObfuscatedName("w") @Export("name") public String name; - @ObfuscatedName("t") + @ObfuscatedName("k") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("j") + @ObfuscatedName("q") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("n") + @ObfuscatedName("z") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("u") + @ObfuscatedName("y") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 785772529 + intValue = 2019539597 ) @Export("zoom2d") public int zoom2d; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -848519743 + intValue = 1726268201 ) @Export("xan2d") public int xan2d; - @ObfuscatedName("m") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1979835091 + intValue = 93819839 ) @Export("yan2d") public int yan2d; - @ObfuscatedName("g") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 130944553 + intValue = 2090410293 ) @Export("zan2d") public int zan2d; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -977084785 + intValue = 205349077 ) @Export("offsetX2d") public int offsetX2d; - @ObfuscatedName("q") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -631330381 + intValue = -178910167 ) @Export("offsetY2d") public int offsetY2d; - @ObfuscatedName("aa") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 440066331 + intValue = 1045591487 ) @Export("isStackable") public int isStackable; - @ObfuscatedName("av") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -186300413 + intValue = 335051861 ) @Export("price") public int price; - @ObfuscatedName("aw") + @ObfuscatedName("az") @Export("isMembersOnly") public boolean isMembersOnly; - @ObfuscatedName("as") + @ObfuscatedName("ax") @Export("groundActions") public String[] groundActions; - @ObfuscatedName("ak") + @ObfuscatedName("aj") @Export("inventoryActions") public String[] inventoryActions; - @ObfuscatedName("ah") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -1938570583 + intValue = 1996888449 ) @Export("shiftClickIndex") int shiftClickIndex; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -1452164645 + intValue = -665766999 ) @Export("maleModel") int maleModel; - @ObfuscatedName("ao") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 195242013 + intValue = -1666037601 ) @Export("maleModel1") int maleModel1; - @ObfuscatedName("an") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 1805803195 + intValue = 1212173465 ) @Export("maleOffset") int maleOffset; - @ObfuscatedName("ar") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -992390513 + intValue = -1350778211 ) @Export("femaleModel") int femaleModel; - @ObfuscatedName("az") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -1602872537 + intValue = 1772230311 ) @Export("femaleModel1") int femaleModel1; - @ObfuscatedName("ay") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = 1432685421 + intValue = -1256641587 ) @Export("femaleOffset") int femaleOffset; - @ObfuscatedName("ag") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -567109747 + intValue = -1552928441 ) @Export("maleModel2") int maleModel2; - @ObfuscatedName("ac") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -1467762471 + intValue = 2068450997 ) @Export("femaleModel2") int femaleModel2; @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 543483201 + intValue = -1141752707 ) @Export("maleHeadModel") int maleHeadModel; - @ObfuscatedName("ae") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -93642959 + intValue = -659175095 ) @Export("maleHeadModel2") int maleHeadModel2; - @ObfuscatedName("ad") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -685966397 + intValue = -1827024377 ) @Export("femaleHeadModel") int femaleHeadModel; - @ObfuscatedName("aj") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 1572395247 + intValue = -1593898643 ) @Export("femaleHeadModel2") int femaleHeadModel2; - @ObfuscatedName("ax") + @ObfuscatedName("at") @Export("countobj") int[] countobj; - @ObfuscatedName("at") + @ObfuscatedName("an") @Export("countco") int[] countco; - @ObfuscatedName("af") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -345365193 + intValue = -1326162955 ) @Export("note") public int note; - @ObfuscatedName("ap") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = -120980907 + intValue = -1734525481 ) @Export("noteTemplate") public int noteTemplate; - @ObfuscatedName("ai") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 537794657 + intValue = 978982797 ) @Export("resizeX") int resizeX; - @ObfuscatedName("am") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 710858879 + intValue = 4324563 ) @Export("resizeY") int resizeY; - @ObfuscatedName("ab") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -1994951249 + intValue = 232741831 ) @Export("resizeZ") int resizeZ; - @ObfuscatedName("bj") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = -740674709 + intValue = -916763617 ) @Export("ambient") public int ambient; - @ObfuscatedName("bg") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = 1117780027 + intValue = 1642665557 ) @Export("contrast") public int contrast; - @ObfuscatedName("bw") + @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = -1310493757 + intValue = 1763887503 ) @Export("team") public int team; @ObfuscatedName("bk") @ObfuscatedSignature( - signature = "Llc;" + signature = "Llp;" ) @Export("params") IterableNodeHashTable params; - @ObfuscatedName("bl") + @ObfuscatedName("bb") @Export("isTradable") public boolean isTradable; - @ObfuscatedName("bq") + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = 1520856187 + intValue = -1331779555 ) @Export("unnotedId") int unnotedId; - @ObfuscatedName("bx") + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = 480654725 + intValue = 1529334619 ) @Export("notedId") int notedId; - @ObfuscatedName("bc") + @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = 1889081019 + intValue = 1795625835 ) @Export("placeholder") public int placeholder; @ObfuscatedName("by") @ObfuscatedGetter( - intValue = -50574295 + intValue = -1321250167 ) @Export("placeholderTemplate") public int placeholderTemplate; @@ -343,19 +346,19 @@ public class ItemDefinition extends DualNode { this.placeholderTemplate = -1; } - @ObfuscatedName("y") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "41" + signature = "(I)V", + garbageValue = "1252611790" ) @Export("post") void post() { } - @ObfuscatedName("w") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkq;I)V", - garbageValue = "874687185" + signature = "(Lkp;B)V", + garbageValue = "-72" ) @Export("decode") void decode(Buffer var1) { @@ -369,10 +372,10 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Lkq;II)V", - garbageValue = "-1294049187" + signature = "(Lkp;IB)V", + garbageValue = "24" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -479,7 +482,7 @@ public class ItemDefinition extends DualNode { } else if (var2 == 113) { this.ambient = var1.readByte(); } else if (var2 == 114) { - this.contrast = var1.readByte(); + this.contrast = var1.readByte() * 5; } else if (var2 == 115) { this.team = var1.readUnsignedByte(); } else if (var2 == 139) { @@ -491,16 +494,16 @@ public class ItemDefinition extends DualNode { } else if (var2 == 149) { this.placeholderTemplate = var1.readUnsignedShort(); } else if (var2 == 249) { - this.params = Calendar.readStringIntParameters(var1, this.params); + this.params = MouseRecorder.readStringIntParameters(var1, this.params); } } } - @ObfuscatedName("b") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lii;Lii;I)V", - garbageValue = "-1450285007" + signature = "(Lif;Lif;B)V", + garbageValue = "4" ) @Export("genCert") void genCert(ItemDefinition var1, ItemDefinition var2) { @@ -521,10 +524,10 @@ public class ItemDefinition extends DualNode { this.isStackable = 1; } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lii;Lii;B)V", - garbageValue = "33" + signature = "(Lif;Lif;B)V", + garbageValue = "14" ) @Export("genBought") void genBought(ItemDefinition var1, ItemDefinition var2) { @@ -565,10 +568,10 @@ public class ItemDefinition extends DualNode { this.price = 0; } - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lii;Lii;B)V", - garbageValue = "54" + signature = "(Lif;Lif;B)V", + garbageValue = "0" ) @Export("genPlaceholder") void genPlaceholder(ItemDefinition var1, ItemDefinition var2) { @@ -590,10 +593,10 @@ public class ItemDefinition extends DualNode { this.isTradable = false; } - @ObfuscatedName("a") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(II)Ldd;", - garbageValue = "1663251439" + signature = "(IB)Ldg;", + garbageValue = "2" ) @Export("getModelData") public final ModelData getModelData(int var1) { @@ -608,7 +611,7 @@ public class ItemDefinition extends DualNode { } if (var2 != -1) { - return PacketBufferNode.ItemDefinition_get(var2).getModelData(1); + return HealthBarDefinition.ItemDefinition_get(var2).getModelData(1); } } @@ -636,10 +639,10 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(II)Ldw;", - garbageValue = "1098912111" + signature = "(II)Ldx;", + garbageValue = "1199706901" ) @Export("getModel") public final Model getModel(int var1) { @@ -653,7 +656,7 @@ public class ItemDefinition extends DualNode { } if (var2 != -1) { - return PacketBufferNode.ItemDefinition_get(var2).getModel(1); + return HealthBarDefinition.ItemDefinition_get(var2).getModel(1); } } @@ -682,7 +685,7 @@ public class ItemDefinition extends DualNode { } } - var5 = var6.toModel(this.ambient + 64, this.contrast * 5 + 768, -50, -10, -50); + var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); var5.isSingleTile = true; ItemDefinition_cachedModels.put(var5, (long)this.id); return var5; @@ -690,10 +693,10 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("c") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II)Lii;", - garbageValue = "-519915564" + signature = "(IB)Lif;", + garbageValue = "25" ) @Export("getCountObj") public ItemDefinition getCountObj(int var1) { @@ -707,17 +710,17 @@ public class ItemDefinition extends DualNode { } if (var2 != -1) { - return PacketBufferNode.ItemDefinition_get(var2); + return HealthBarDefinition.ItemDefinition_get(var2); } } return this; } - @ObfuscatedName("t") + @ObfuscatedName("h") @ObfuscatedSignature( signature = "(ZI)Z", - garbageValue = "-90397002" + garbageValue = "-1615353166" ) @Export("hasNoValidModel") public final boolean hasNoValidModel(boolean var1) { @@ -750,12 +753,12 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("j") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(ZB)Ldd;", - garbageValue = "-26" + signature = "(ZI)Ldg;", + garbageValue = "-695579037" ) - public final ModelData method4703(boolean var1) { + public final ModelData method4732(boolean var1) { int var2 = this.maleModel; int var3 = this.maleModel1; int var4 = this.maleModel2; @@ -809,9 +812,9 @@ public class ItemDefinition extends DualNode { @ObfuscatedName("n") @ObfuscatedSignature( signature = "(ZI)Z", - garbageValue = "517363999" + garbageValue = "509539526" ) - public final boolean method4692(boolean var1) { + public final boolean method4731(boolean var1) { int var2 = this.maleHeadModel; int var3 = this.maleHeadModel2; if (var1) { @@ -835,12 +838,12 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(ZI)Ldd;", - garbageValue = "-451251342" + signature = "(ZI)Ldg;", + garbageValue = "709869485" ) - public final ModelData method4661(boolean var1) { + public final ModelData method4741(boolean var1) { int var2 = this.maleHeadModel; int var3 = this.maleHeadModel2; if (var1) { @@ -875,30 +878,43 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("z") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "1" + signature = "(III)I", + garbageValue = "16856082" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return class83.method2071(this.params, var1, var2); + IterableNodeHashTable var4 = this.params; + int var3; + if (var4 == null) { + var3 = var2; + } else { + IntegerNode var5 = (IntegerNode)var4.get((long)var1); + if (var5 == null) { + var3 = var2; + } else { + var3 = var5.integer; + } + } + + return var3; } - @ObfuscatedName("h") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-513455254" + signature = "(ILjava/lang/String;B)Ljava/lang/String;", + garbageValue = "-22" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return class14.method151(this.params, var1, var2); + return FloorDecoration.method2914(this.params, var1, var2); } - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1952337242" + garbageValue = "840008410" ) @Export("getShiftClickIndex") public int getShiftClickIndex() { @@ -913,72 +929,18 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("p") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-989883641" + signature = "(IB)I", + garbageValue = "-108" ) - public static void method4715(int var0) { - if (var0 != -1) { - if (Widget.Widget_loadedInterfaces[var0]) { - FriendLoginUpdate.Widget_archive.clearFilesGroup(var0); - if (UserComparator7.Widget_interfaceComponents[var0] != null) { - boolean var1 = true; - - for (int var2 = 0; var2 < UserComparator7.Widget_interfaceComponents[var0].length; ++var2) { - if (UserComparator7.Widget_interfaceComponents[var0][var2] != null) { - if (UserComparator7.Widget_interfaceComponents[var0][var2].type != 2) { - UserComparator7.Widget_interfaceComponents[var0][var2] = null; - } else { - var1 = false; - } - } - } - - if (var1) { - UserComparator7.Widget_interfaceComponents[var0] = null; - } - - Widget.Widget_loadedInterfaces[var0] = false; - } - } + @Export("Messages_getLastChatID") + static int Messages_getLastChatID(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); + if (var1 == null) { + return -1; + } else { + return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; } } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(ZB)V", - garbageValue = "30" - ) - @Export("Login_promptCredentials") - static void Login_promptCredentials(boolean var0) { - Login.Login_response1 = ""; - Login.Login_response2 = "Enter your username/email & password."; - Login.Login_response3 = ""; - Login.loginIndex = 2; - if (var0) { - Login.Login_password = ""; - } - - if (Login.Login_username == null || Login.Login_username.length() <= 0) { - if (Interpreter.clientPreferences.rememberedUsername != null) { - Login.Login_username = Interpreter.clientPreferences.rememberedUsername; - Client.Login_isUsernameRemembered = true; - } else { - Client.Login_isUsernameRemembered = false; - } - } - - WorldMapCacheName.method618(); - } - - @ObfuscatedName("gb") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-1424977093" - ) - @Export("getWindowedMode") - static int getWindowedMode() { - return Client.isResizable ? 2 : 1; - } } diff --git a/runescape-client/src/main/java/IterableDualNodeQueue.java b/runescape-client/src/main/java/IterableDualNodeQueue.java index 43004b0b92..f94d0711ad 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueue.java +++ b/runescape-client/src/main/java/IterableDualNodeQueue.java @@ -4,18 +4,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ji") +@ObfuscatedName("jb") @Implements("IterableDualNodeQueue") public class IterableDualNodeQueue implements Iterable { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lgw;" + signature = "Lfa;" ) @Export("sentinel") public DualNode sentinel; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lgw;" + signature = "Lfa;" ) @Export("head") DualNode head; @@ -26,7 +26,7 @@ public class IterableDualNodeQueue implements Iterable { this.sentinel.nextDual = this.sentinel; } - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("clear") public void clear() { while (this.sentinel.previousDual != this.sentinel) { @@ -35,9 +35,9 @@ public class IterableDualNodeQueue implements Iterable { } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lgw;)V" + signature = "(Lfa;)V" ) @Export("add") public void add(DualNode var1) { @@ -51,9 +51,9 @@ public class IterableDualNodeQueue implements Iterable { var1.previousDual.nextDual = var1; } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "()Lgw;" + signature = "()Lfa;" ) @Export("removeLast") public DualNode removeLast() { @@ -66,18 +66,18 @@ public class IterableDualNodeQueue implements Iterable { } } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "()Lgw;" + signature = "()Lfa;" ) @Export("last") public DualNode last() { return this.previousOrLast((DualNode)null); } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lgw;)Lgw;" + signature = "(Lfa;)Lfa;" ) @Export("previousOrLast") DualNode previousOrLast(DualNode var1) { @@ -97,9 +97,9 @@ public class IterableDualNodeQueue implements Iterable { } } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "()Lgw;" + signature = "()Lfa;" ) @Export("previous") public DualNode previous() { @@ -117,9 +117,9 @@ public class IterableDualNodeQueue implements Iterable { return new IterableDualNodeQueueIterator(this); } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lgw;Lgw;)V" + signature = "(Lfa;Lfa;)V" ) @Export("DualNodeDeque_addBefore") public static void DualNodeDeque_addBefore(DualNode var0, DualNode var1) { diff --git a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java index eaf67c8ce8..c83798d148 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java +++ b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java @@ -4,30 +4,30 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jo") +@ObfuscatedName("jg") @Implements("IterableDualNodeQueueIterator") public class IterableDualNodeQueueIterator implements Iterator { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lji;" + signature = "Ljb;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lgw;" + signature = "Lfa;" ) @Export("head") DualNode head; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgw;" + signature = "Lfa;" ) @Export("last") DualNode last; @ObfuscatedSignature( - signature = "(Lji;)V" + signature = "(Ljb;)V" ) IterableDualNodeQueueIterator(IterableDualNodeQueue var1) { this.last = null; @@ -36,19 +36,6 @@ public class IterableDualNodeQueueIterator implements Iterator { this.last = null; } - public Object next() { - DualNode var1 = this.head; - if (var1 == this.queue.sentinel) { - var1 = null; - this.head = null; - } else { - this.head = var1.previousDual; - } - - this.last = var1; - return var1; - } - public boolean hasNext() { return this.queue.sentinel != this.head; } @@ -61,4 +48,17 @@ public class IterableDualNodeQueueIterator implements Iterator { this.last = null; } } + + public Object next() { + DualNode var1 = this.head; + if (var1 == this.queue.sentinel) { + var1 = null; + this.head = null; + } else { + this.head = var1.previousDual; + } + + this.last = var1; + return var1; + } } diff --git a/runescape-client/src/main/java/IterableNodeDeque.java b/runescape-client/src/main/java/IterableNodeDeque.java index 66f7beaceb..1b354a91db 100644 --- a/runescape-client/src/main/java/IterableNodeDeque.java +++ b/runescape-client/src/main/java/IterableNodeDeque.java @@ -5,20 +5,20 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jl") +@ObfuscatedName("jj") @Implements("IterableNodeDeque") public class IterableNodeDeque implements Iterable, Collection { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lgk;" + signature = "Lft;" ) @Export("sentinel") Node sentinel; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lgk;" + signature = "Lft;" ) - Node field3499; + Node field3528; public IterableNodeDeque() { this.sentinel = new Node(); @@ -26,7 +26,7 @@ public class IterableNodeDeque implements Iterable, Collection { this.sentinel.next = this.sentinel; } - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("rsClear") public void rsClear() { while (this.sentinel.previous != this.sentinel) { @@ -35,9 +35,9 @@ public class IterableNodeDeque implements Iterable, Collection { } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lgk;)V" + signature = "(Lft;)V" ) @Export("addFirst") public void addFirst(Node var1) { @@ -51,9 +51,9 @@ public class IterableNodeDeque implements Iterable, Collection { var1.previous.next = var1; } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lgk;)V" + signature = "(Lft;)V" ) @Export("addLast") public void addLast(Node var1) { @@ -67,20 +67,20 @@ public class IterableNodeDeque implements Iterable, Collection { var1.previous.next = var1; } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "()Lgk;" + signature = "()Lft;" ) @Export("last") public Node last() { - return this.method4847((Node)null); + return this.method4884((Node)null); } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lgk;)Lgk;" + signature = "(Lft;)Lft;" ) - Node method4847(Node var1) { + Node method4884(Node var1) { Node var2; if (var1 == null) { var2 = this.sentinel.previous; @@ -89,32 +89,32 @@ public class IterableNodeDeque implements Iterable, Collection { } if (var2 == this.sentinel) { - this.field3499 = null; + this.field3528 = null; return null; } else { - this.field3499 = var2.previous; + this.field3528 = var2.previous; return var2; } } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "()Lgk;" + signature = "()Lft;" ) @Export("previous") public Node previous() { - Node var1 = this.field3499; + Node var1 = this.field3528; if (var1 == this.sentinel) { - this.field3499 = null; + this.field3528 = null; return null; } else { - this.field3499 = var1.previous; + this.field3528 = var1.previous; return var1; } } - @ObfuscatedName("x") - int method4842() { + @ObfuscatedName("l") + int method4885() { int var1 = 0; for (Node var2 = this.sentinel.previous; var2 != this.sentinel; var2 = var2.previous) { @@ -124,17 +124,17 @@ public class IterableNodeDeque implements Iterable, Collection { return var1; } - @ObfuscatedName("a") - public boolean method4843() { + @ObfuscatedName("j") + public boolean method4886() { return this.sentinel.previous == this.sentinel; } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "()[Lgk;" + signature = "()[Lft;" ) - Node[] method4844() { - Node[] var1 = new Node[this.method4842()]; + Node[] method4887() { + Node[] var1 = new Node[this.method4885()]; int var2 = 0; for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { @@ -144,25 +144,25 @@ public class IterableNodeDeque implements Iterable, Collection { return var1; } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Lgk;)Z" + signature = "(Lft;)Z" ) - boolean method4848(Node var1) { + boolean method4891(Node var1) { this.addFirst(var1); return true; } public Object[] toArray() { - return this.method4844(); + return this.method4887(); } - public Iterator iterator() { - return new IterableNodeDequeDescendingIterator(this); + public boolean removeAll(Collection var1) { + throw new RuntimeException(); } public boolean isEmpty() { - return this.method4843(); + return this.method4886(); } public Object[] toArray(Object[] var1) { @@ -183,30 +183,6 @@ public class IterableNodeDeque implements Iterable, Collection { throw new RuntimeException(); } - public void clear() { - this.rsClear(); - } - - public boolean equals(Object var1) { - return super.equals(var1); - } - - public int hashCode() { - return super.hashCode(); - } - - public int size() { - return this.method4842(); - } - - public boolean add(Object var1) { - return this.method4848((Node)var1); - } - - public boolean removeAll(Collection var1) { - throw new RuntimeException(); - } - public boolean addAll(Collection var1) { throw new RuntimeException(); } @@ -215,13 +191,37 @@ public class IterableNodeDeque implements Iterable, Collection { throw new RuntimeException(); } + public Iterator iterator() { + return new IterableNodeDequeDescendingIterator(this); + } + + public boolean equals(Object var1) { + return super.equals(var1); + } + + public void clear() { + this.rsClear(); + } + + public int hashCode() { + return super.hashCode(); + } + + public int size() { + return this.method4885(); + } + public boolean contains(Object var1) { throw new RuntimeException(); } - @ObfuscatedName("w") + public boolean add(Object var1) { + return this.method4891((Node)var1); + } + + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Lgk;Lgk;)V" + signature = "(Lft;Lft;)V" ) @Export("IterableNodeDeque_addBefore") public static void IterableNodeDeque_addBefore(Node var0, Node var1) { diff --git a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java index 55f7a370d0..146371d524 100644 --- a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java +++ b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java @@ -4,38 +4,38 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ja") +@ObfuscatedName("jv") @Implements("IterableNodeDequeDescendingIterator") public class IterableNodeDequeDescendingIterator implements Iterator { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Ljl;" + signature = "Ljj;" ) @Export("deque") IterableNodeDeque deque; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lgk;" + signature = "Lft;" ) - Node field3509; - @ObfuscatedName("y") + Node field3538; + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgk;" + signature = "Lft;" ) @Export("last") Node last; @ObfuscatedSignature( - signature = "(Ljl;)V" + signature = "(Ljj;)V" ) IterableNodeDequeDescendingIterator(IterableNodeDeque var1) { this.last = null; this.setDeque(var1); } - @ObfuscatedName("c") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Ljl;)V" + signature = "(Ljj;)V" ) @Export("setDeque") void setDeque(IterableNodeDeque var1) { @@ -43,32 +43,36 @@ public class IterableNodeDequeDescendingIterator implements Iterator { this.start(); } - @ObfuscatedName("o") + @ObfuscatedName("m") @Export("start") void start() { - this.field3509 = this.deque != null ? this.deque.sentinel.previous : null; + this.field3538 = this.deque != null ? this.deque.sentinel.previous : null; this.last = null; } + public boolean hasNext() { + return this.deque.sentinel != this.field3538; + } + public Object next() { - Node var1 = this.field3509; + Node var1 = this.field3538; if (var1 == this.deque.sentinel) { var1 = null; - this.field3509 = null; + this.field3538 = null; } else { - this.field3509 = var1.previous; + this.field3538 = var1.previous; } this.last = var1; return var1; } - public boolean hasNext() { - return this.deque.sentinel != this.field3509; - } - public void remove() { - this.last.remove(); - this.last = null; + if (this.last == null) { + throw new IllegalStateException(); + } else { + this.last.remove(); + this.last = null; + } } } diff --git a/runescape-client/src/main/java/IterableNodeHashTable.java b/runescape-client/src/main/java/IterableNodeHashTable.java index 74e65d17d0..6b9948ea7d 100644 --- a/runescape-client/src/main/java/IterableNodeHashTable.java +++ b/runescape-client/src/main/java/IterableNodeHashTable.java @@ -4,31 +4,31 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lc") +@ObfuscatedName("lp") @Implements("IterableNodeHashTable") public final class IterableNodeHashTable implements Iterable { - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("size") int size; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "[Lgk;" + signature = "[Lft;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgk;" + signature = "Lft;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lgk;" + signature = "Lft;" ) @Export("current") Node current; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("index") int index; @@ -45,9 +45,9 @@ public final class IterableNodeHashTable implements Iterable { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(J)Lgk;" + signature = "(J)Lft;" ) @Export("get") public Node get(long var1) { @@ -65,9 +65,9 @@ public final class IterableNodeHashTable implements Iterable { return null; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lgk;J)V" + signature = "(Lft;J)V" ) @Export("put") public void put(Node var1, long var2) { @@ -83,7 +83,7 @@ public final class IterableNodeHashTable implements Iterable { var1.key = var2; } - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("clear") public void clear() { for (int var1 = 0; var1 < this.size; ++var1) { @@ -103,9 +103,9 @@ public final class IterableNodeHashTable implements Iterable { this.current = null; } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "()Lgk;" + signature = "()Lft;" ) @Export("first") public Node first() { @@ -113,9 +113,9 @@ public final class IterableNodeHashTable implements Iterable { return this.next(); } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "()Lgk;" + signature = "()Lft;" ) @Export("next") public Node next() { diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java index 1e260028e2..f65ef3d2b8 100644 --- a/runescape-client/src/main/java/IterableNodeHashTableIterator.java +++ b/runescape-client/src/main/java/IterableNodeHashTableIterator.java @@ -4,33 +4,33 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("la") +@ObfuscatedName("lu") @Implements("IterableNodeHashTableIterator") public class IterableNodeHashTableIterator implements Iterator { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Llc;" + signature = "Llp;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lgk;" + signature = "Lft;" ) @Export("head") Node head; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("index") int index; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lgk;" + signature = "Lft;" ) @Export("last") Node last; @ObfuscatedSignature( - signature = "(Llc;)V" + signature = "(Llp;)V" ) IterableNodeHashTableIterator(IterableNodeHashTable var1) { this.last = null; @@ -38,7 +38,7 @@ public class IterableNodeHashTableIterator implements Iterator { this.start(); } - @ObfuscatedName("c") + @ObfuscatedName("j") @Export("start") void start() { this.head = this.hashTable.buckets[0].previous; diff --git a/runescape-client/src/main/java/JagexCache.java b/runescape-client/src/main/java/JagexCache.java index a029bcfff1..37c51fa9a5 100644 --- a/runescape-client/src/main/java/JagexCache.java +++ b/runescape-client/src/main/java/JagexCache.java @@ -4,43 +4,187 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("fr") +@ObfuscatedName("fm") @Implements("JagexCache") public class JagexCache { - @ObfuscatedName("p") + @ObfuscatedName("e") + @Export("JagexCache_locationFile") + static File JagexCache_locationFile; + @ObfuscatedName("i") @Export("cacheDir") - static File cacheDir; - @ObfuscatedName("b") + public static File cacheDir; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -593345699 + intValue = -27692753 ) @Export("idxCount") public static int idxCount; - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Lmy;" + signature = "Lme;" ) @Export("JagexCache_randomDat") public static BufferedFile JagexCache_randomDat; @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lmy;" + signature = "Lme;" ) @Export("JagexCache_dat2File") public static BufferedFile JagexCache_dat2File; - @ObfuscatedName("k") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lmy;" + signature = "Lme;" ) @Export("JagexCache_idx255File") public static BufferedFile JagexCache_idx255File; - @ObfuscatedName("t") - static String[] field2024; + @ObfuscatedName("gs") + @Export("xteaKeys") + static int[][] xteaKeys; static { JagexCache_randomDat = null; JagexCache_dat2File = null; JagexCache_idx255File = null; } + + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "(ILce;ZI)I", + garbageValue = "-462100671" + ) + static int method3566(int var0, Script var1, boolean var2) { + boolean var3 = true; + Widget var4; + if (var0 >= 2000) { + var0 -= 1000; + var4 = Varps.getWidget(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); + var3 = false; + } else { + var4 = var2 ? class186.field2331 : MidiPcmStream.field2444; + } + + int var11; + if (var0 == ScriptOpcodes.CC_SETOP) { + var11 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] - 1; + if (var11 >= 0 && var11 <= 9) { + var4.setAction(var11, Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]); + return 1; + } else { + --Message.Interpreter_stringStackSize; + return 1; + } + } else { + int var6; + if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { + class320.Interpreter_intStackSize -= 2; + var11 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var6 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + var4.parent = SpriteMask.getWidgetChild(var11, var6); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { + var4.isScrollBar = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { + var4.dragZoneSize = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { + var4.dragThreshold = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { + var4.dataText = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { + var4.spellActionName = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { + var4.actions = null; + return 1; + } else if (var0 == 1308) { + var4.field2713 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 1309) { + --class320.Interpreter_intStackSize; + return 1; + } else { + int var7; + byte[] var9; + if (var0 != ScriptOpcodes.CC_SETOPKEY) { + byte var5; + if (var0 == ScriptOpcodes.CC_SETOPTKEY) { + class320.Interpreter_intStackSize -= 2; + var5 = 10; + var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]}; + byte[] var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]}; + ClanChat.Widget_setKey(var4, var5, var9, var10); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { + class320.Interpreter_intStackSize -= 3; + var11 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize] - 1; + var6 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + var7 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 2]; + if (var11 >= 0 && var11 <= 9) { + GrandExchangeOfferWorldComparator.Widget_setKeyRate(var4, var11, var6, var7); + return 1; + } else { + throw new RuntimeException(); + } + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { + var5 = 10; + var6 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + GrandExchangeOfferWorldComparator.Widget_setKeyRate(var4, var5, var6, var7); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { + --class320.Interpreter_intStackSize; + var11 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize] - 1; + if (var11 >= 0 && var11 <= 9) { + class192.Widget_setKeyIgnoreHeld(var4, var11); + return 1; + } else { + throw new RuntimeException(); + } + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { + var5 = 10; + class192.Widget_setKeyIgnoreHeld(var4, var5); + return 1; + } else { + return 2; + } + } else { + byte[] var8 = null; + var9 = null; + if (var3) { + class320.Interpreter_intStackSize -= 10; + + for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + class320.Interpreter_intStackSize] >= 0; var7 += 2) { + } + + if (var7 > 0) { + var8 = new byte[var7 / 2]; + var9 = new byte[var7 / 2]; + + for (var7 -= 2; var7 >= 0; var7 -= 2) { + var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class320.Interpreter_intStackSize]; + var9[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class320.Interpreter_intStackSize + 1]; + } + } + } else { + class320.Interpreter_intStackSize -= 2; + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]}; + var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]}; + } + + var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] - 1; + if (var7 >= 0 && var7 <= 9) { + ClanChat.Widget_setKey(var4, var7, var8, var9); + return 1; + } else { + throw new RuntimeException(); + } + } + } + } + } } diff --git a/runescape-client/src/main/java/KeyHandler.java b/runescape-client/src/main/java/KeyHandler.java index 9f34fd86ef..d1b902b856 100644 --- a/runescape-client/src/main/java/KeyHandler.java +++ b/runescape-client/src/main/java/KeyHandler.java @@ -8,97 +8,88 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aj") +@ObfuscatedName("at") @Implements("KeyHandler") public final class KeyHandler implements KeyListener, FocusListener { - @ObfuscatedName("sz") - @ObfuscatedGetter( - intValue = 1848557625 - ) - @Export("foundItemIdCount") - static int foundItemIdCount; - @ObfuscatedName("f") + @ObfuscatedName("rm") @ObfuscatedSignature( - signature = "Laj;" + signature = "Lbu;" + ) + @Export("friendSystem") + public static FriendSystem friendSystem; + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "Lat;" ) @Export("KeyHandler_instance") - public static KeyHandler KeyHandler_instance; - @ObfuscatedName("ca") + static KeyHandler KeyHandler_instance; + @ObfuscatedName("p") + @Export("musicTrackBoolean") + public static boolean musicTrackBoolean; + @ObfuscatedName("cf") @Export("KeyHandler_pressedKeys") public static boolean[] KeyHandler_pressedKeys; - @ObfuscatedName("ck") - public static int[] field371; - @ObfuscatedName("ce") - @ObfuscatedGetter( - intValue = 2031779971 - ) - public static int field372; @ObfuscatedName("cu") - @ObfuscatedGetter( - intValue = 1093649123 - ) - public static int field373; - @ObfuscatedName("cg") - static char[] field385; - @ObfuscatedName("ct") - static int[] field375; - @ObfuscatedName("cr") - public static int[] field376; + static int[] field399; @ObfuscatedName("cy") @ObfuscatedGetter( - intValue = -805709065 + intValue = 703429313 ) - public static int field377; - @ObfuscatedName("cz") + static int field400; + @ObfuscatedName("ce") @ObfuscatedGetter( - intValue = -924316299 + intValue = -1486976357 ) - public static int field378; - @ObfuscatedName("cm") + static int field387; + @ObfuscatedName("cw") + static char[] field410; + @ObfuscatedName("cq") + static int[] field403; + @ObfuscatedName("ci") + public static int[] field404; + @ObfuscatedName("ca") @ObfuscatedGetter( - intValue = -1721204763 + intValue = -617516983 ) - public static int field386; + public static int field405; + @ObfuscatedName("cc") + @ObfuscatedGetter( + intValue = 1714214597 + ) + static int field406; + @ObfuscatedName("ch") + @ObfuscatedGetter( + intValue = -168140991 + ) + static int field407; + @ObfuscatedName("cx") + @ObfuscatedGetter( + intValue = 1711084141 + ) + static int field408; @ObfuscatedName("cl") @ObfuscatedGetter( - intValue = 485156941 - ) - public static int field380; - @ObfuscatedName("ci") - @ObfuscatedGetter( - intValue = 1979458191 + intValue = -1956753403 ) @Export("KeyHandler_idleCycles") - public static volatile int KeyHandler_idleCycles; - @ObfuscatedName("cc") + static volatile int KeyHandler_idleCycles; + @ObfuscatedName("cs") @Export("KeyHandler_keyCodes") static int[] KeyHandler_keyCodes; - @ObfuscatedName("kz") - @ObfuscatedGetter( - intValue = -1228958525 - ) - @Export("menuWidth") - static int menuWidth; - @ObfuscatedName("lq") - @ObfuscatedGetter( - intValue = -1751180227 - ) - @Export("selectedItemSlot") - static int selectedItemSlot; static { KeyHandler_instance = new KeyHandler(); KeyHandler_pressedKeys = new boolean[112]; - field371 = new int[128]; - field372 = 0; - field373 = 0; - field385 = new char[128]; - field375 = new int[128]; - field376 = new int[128]; - field377 = 0; - field378 = 0; - field386 = 0; - field380 = 0; + field399 = new int[128]; + field400 = 0; + field387 = 0; + field410 = new char[128]; + field403 = new int[128]; + field404 = new int[128]; + field405 = 0; + field406 = 0; + field407 = 0; + field408 = 0; KeyHandler_idleCycles = 0; KeyHandler_keyCodes = new int[]{-1, -1, -1, -1, -1, -1, -1, -1, 85, 80, 84, -1, 91, -1, -1, -1, 81, 82, 86, -1, -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, -1, -1, 83, 104, 105, 103, 102, 96, 98, 97, 99, -1, -1, -1, -1, -1, -1, -1, 25, 16, 17, 18, 19, 20, 21, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, 48, 68, 66, 50, 34, 51, 52, 53, 39, 54, 55, 56, 70, 69, 40, 41, 32, 35, 49, 36, 38, 67, 33, 65, 37, 64, -1, -1, -1, -1, -1, 228, 231, 227, 233, 224, 219, 225, 230, 226, 232, 89, 87, -1, 88, 229, 90, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, -1, -1, -1, 101, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 100, -1, 87, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; } @@ -118,21 +109,21 @@ public final class KeyHandler implements KeyListener, FocusListener { var2 = -1; } - if (field373 >= 0 && var2 >= 0) { - field371[field373] = var2; - field373 = field373 + 1 & 127; - if (field372 == field373) { - field373 = -1; + if (field387 >= 0 && var2 >= 0) { + field399[field387] = var2; + field387 = field387 + 1 & 127; + if (field387 == field400) { + field387 = -1; } } int var3; if (var2 >= 0) { - var3 = field386 + 1 & 127; - if (var3 != field378) { - field375[field386] = var2; - field385[field386] = 0; - field386 = var3; + var3 = field407 + 1 & 127; + if (var3 != field406) { + field403[field407] = var2; + field410[field407] = 0; + field407 = var3; } } @@ -144,27 +135,6 @@ public final class KeyHandler implements KeyListener, FocusListener { } - public final synchronized void keyReleased(KeyEvent var1) { - if (KeyHandler_instance != null) { - int var2 = var1.getKeyCode(); - if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { - var2 = KeyHandler_keyCodes[var2] & -129; - } else { - var2 = -1; - } - - if (field373 >= 0 && var2 >= 0) { - field371[field373] = ~var2; - field373 = field373 + 1 & 127; - if (field372 == field373) { - field373 = -1; - } - } - } - - var1.consume(); - } - public final void keyTyped(KeyEvent var1) { if (KeyHandler_instance != null) { char var2 = var1.getKeyChar(); @@ -173,15 +143,15 @@ public final class KeyHandler implements KeyListener, FocusListener { if (var2 > 0 && var2 < 128 || var2 >= 160 && var2 <= 255) { var3 = true; } else { - label63: { + label59: { if (var2 != 0) { - char[] var7 = class287.cp1252AsciiExtension; + char[] var7 = class288.cp1252AsciiExtension; for (int var5 = 0; var5 < var7.length; ++var5) { char var6 = var7[var5]; - if (var6 == var2) { + if (var2 == var6) { var3 = true; - break label63; + break label59; } } } @@ -191,11 +161,11 @@ public final class KeyHandler implements KeyListener, FocusListener { } if (var3) { - int var4 = field386 + 1 & 127; - if (var4 != field378) { - field375[field386] = -1; - field385[field386] = var2; - field386 = var4; + int var4 = field407 + 1 & 127; + if (var4 != field406) { + field403[field407] = -1; + field410[field407] = var2; + field407 = var4; } } } @@ -206,7 +176,7 @@ public final class KeyHandler implements KeyListener, FocusListener { public final synchronized void focusLost(FocusEvent var1) { if (KeyHandler_instance != null) { - field373 = -1; + field387 = -1; } } @@ -214,217 +184,180 @@ public final class KeyHandler implements KeyListener, FocusListener { public final void focusGained(FocusEvent var1) { } - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-1237064123" - ) - @Export("isKeyDown") - public static final boolean isKeyDown() { - synchronized(KeyHandler_instance) { - if (field380 == field378) { - return false; + public final synchronized void keyReleased(KeyEvent var1) { + if (KeyHandler_instance != null) { + int var2 = var1.getKeyCode(); + if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { + var2 = KeyHandler_keyCodes[var2] & -129; } else { - VertexNormal.field1732 = field375[field378]; - TileItemPile.field1521 = field385[field378]; - field378 = field378 + 1 & 127; - return true; - } - } - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "(IIIZII)J", - garbageValue = "2043386608" - ) - @Export("calculateTag") - public static long calculateTag(int var0, int var1, int var2, boolean var3, int var4) { - long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17; - if (var3) { - var5 |= 65536L; - } - - return var5; - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "(Lbe;I)V", - garbageValue = "1892265582" - ) - @Export("changeWorld") - static void changeWorld(World var0) { - if (var0.isMembersOnly() != Client.isMembersWorld) { - Client.isMembersWorld = var0.isMembersOnly(); - class32.method557(var0.isMembersOnly()); - } - - CollisionMap.worldHost = var0.host; - Client.worldId = var0.id; - Client.worldProperties = var0.properties; - class197.port1 = Client.gameBuild == 0 ? 43594 : var0.id + 40000; - MouseRecorder.port2 = Client.gameBuild == 0 ? 443 : var0.id + 50000; - WorldMapData_1.port3 = class197.port1; - } - - @ObfuscatedName("hn") - @ObfuscatedSignature( - signature = "(IIII)V", - garbageValue = "-616372241" - ) - @Export("worldToScreen") - static final void worldToScreen(int var0, int var1, int var2) { - if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { - int var3 = ScriptEvent.getTileHeight(var0, var1, UrlRequest.Client_plane) - var2; - var0 -= MusicPatchNode2.cameraX; - var3 -= class60.cameraY; - var1 -= UserComparator9.cameraZ; - int var4 = Rasterizer3D.Rasterizer3D_sine[ViewportMouse.cameraPitch]; - int var5 = Rasterizer3D.Rasterizer3D_cosine[ViewportMouse.cameraPitch]; - int var6 = Rasterizer3D.Rasterizer3D_sine[WorldMapLabelSize.cameraYaw]; - int var7 = Rasterizer3D.Rasterizer3D_cosine[WorldMapLabelSize.cameraYaw]; - int var8 = var6 * var1 + var0 * var7 >> 16; - var1 = var7 * var1 - var0 * var6 >> 16; - var0 = var8; - var8 = var3 * var5 - var4 * var1 >> 16; - var1 = var3 * var4 + var5 * var1 >> 16; - if (var1 >= 50) { - Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; - Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2; - } else { - Client.viewportTempX = -1; - Client.viewportTempY = -1; + var2 = -1; } - } else { - Client.viewportTempX = -1; - Client.viewportTempY = -1; - } - } - - @ObfuscatedName("iu") - @ObfuscatedSignature( - signature = "(IIIILjava/lang/String;I)V", - garbageValue = "2129619749" - ) - @Export("widgetDefaultMenuAction") - static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { - Widget var5 = BZip2State.getWidgetChild(var1, var2); - if (var5 != null) { - if (var5.onOp != null) { - ScriptEvent var6 = new ScriptEvent(); - var6.widget = var5; - var6.opIndex = var0; - var6.targetName = var4; - var6.args = var5.onOp; - Client.runScriptEvent(var6); - } - - boolean var11 = true; - if (var5.contentType > 0) { - var11 = GrandExchangeOfferNameComparator.method136(var5); - } - - if (var11) { - int var8 = WorldMapSection0.getWidgetClickMask(var5); - int var9 = var0 - 1; - boolean var7 = (var8 >> var9 + 1 & 1) != 0; - if (var7) { - PacketBufferNode var10; - if (var0 == 1) { - var10 = class2.getPacketBufferNode(ClientPacket.field2279, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 2) { - var10 = class2.getPacketBufferNode(ClientPacket.field2254, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 3) { - var10 = class2.getPacketBufferNode(ClientPacket.field2240, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 4) { - var10 = class2.getPacketBufferNode(ClientPacket.field2205, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 5) { - var10 = class2.getPacketBufferNode(ClientPacket.field2262, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 6) { - var10 = class2.getPacketBufferNode(ClientPacket.field2204, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 7) { - var10 = class2.getPacketBufferNode(ClientPacket.field2186, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 8) { - var10 = class2.getPacketBufferNode(ClientPacket.field2242, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 9) { - var10 = class2.getPacketBufferNode(ClientPacket.field2255, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 10) { - var10 = class2.getPacketBufferNode(ClientPacket.field2200, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - + if (field387 >= 0 && var2 >= 0) { + field399[field387] = ~var2; + field387 = field387 + 1 & 127; + if (field387 == field400) { + field387 = -1; } } } + + var1.consume(); } - @ObfuscatedName("le") + @ObfuscatedName("t") + public static boolean method850(long var0) { + return var0 != 0L && !WorldMapData_1.method732(var0); + } + + @ObfuscatedName("hg") + @ObfuscatedSignature( + signature = "(ZLks;B)V", + garbageValue = "77" + ) + @Export("updateNpcs") + static final void updateNpcs(boolean var0, PacketBuffer var1) { + Client.field766 = 0; + Client.field690 = 0; + ClientPreferences.method1852(); + + int var2; + while (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { + var2 = var1.readBits(15); + if (var2 == 32767) { + break; + } + + boolean var3 = false; + if (Client.npcs[var2] == null) { + Client.npcs[var2] = new NPC(); + var3 = true; + } + + NPC var4 = Client.npcs[var2]; + Client.npcIndices[++Client.npcCount - 1] = var2; + var4.npcCycle = Client.cycle; + int var5; + if (var0) { + var5 = var1.readBits(8); + if (var5 > 127) { + var5 -= 256; + } + } else { + var5 = var1.readBits(5); + if (var5 > 15) { + var5 -= 32; + } + } + + var4.definition = NetCache.getNpcDefinition(var1.readBits(14)); + int var6 = Client.defaultRotations[var1.readBits(3)]; + if (var3) { + var4.orientation = var4.rotation = var6; + } + + int var7 = var1.readBits(1); + int var8 = var1.readBits(1); + if (var8 == 1) { + Client.field867[++Client.field690 - 1] = var2; + } + + int var9; + if (var0) { + var9 = var1.readBits(8); + if (var9 > 127) { + var9 -= 256; + } + } else { + var9 = var1.readBits(5); + if (var9 > 15) { + var9 -= 32; + } + } + + var4.field942 = var4.definition.size * 64; + var4.field975 = var4.definition.rotation; + if (var4.field975 == 0) { + var4.rotation = 0; + } + + var4.walkSequence = var4.definition.walkSequence; + var4.walkBackSequence = var4.definition.walkBackSequence; + var4.walkLeftSequence = var4.definition.walkLeftSequence; + var4.walkRightSequence = var4.definition.walkRightSequence; + var4.readySequence = var4.definition.readySequence; + var4.turnLeftSequence = var4.definition.turnLeftSequence; + var4.turnRightSequence = var4.definition.turnRightSequence; + var4.method2077(class192.localPlayer.pathX[0] + var9, class192.localPlayer.pathY[0] + var5, var7 == 1); + } + + var1.exportIndex(); + class49.method866(var1); + + for (var2 = 0; var2 < Client.field766; ++var2) { + int var10 = Client.field828[var2]; + if (Client.npcs[var10].npcCycle != Client.cycle) { + Client.npcs[var10].definition = null; + Client.npcs[var10] = null; + } + } + + if (var1.offset != Client.packetWriter.serverPacketLength) { + throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); + } else { + for (var2 = 0; var2 < Client.npcCount; ++var2) { + if (Client.npcs[Client.npcIndices[var2]] == null) { + throw new RuntimeException(var2 + "," + Client.npcCount); + } + } + + } + } + + @ObfuscatedName("jz") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1409617805" + garbageValue = "1886684971" ) - static void method835() { - if (Client.oculusOrbState == 1) { - Client.field751 = true; + static final void method848() { + PacketBufferNode var0 = TilePaint.getPacketBufferNode(ClientPacket.field2298, Client.packetWriter.isaacCipher); + Client.packetWriter.addNode(var0); + + for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { + if (var1.type == 0 || var1.type == 3) { + class185.closeInterface(var1, true); + } + } + + if (Client.meslayerContinueWidget != null) { + NPCDefinition.invalidateWidget(Client.meslayerContinueWidget); + Client.meslayerContinueWidget = null; + } + + } + + @ObfuscatedName("kl") + @ObfuscatedSignature( + signature = "(IIIILlt;Lhf;S)V", + garbageValue = "19802" + ) + @Export("worldToMinimap") + static final void worldToMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) { + int var6 = var3 * var3 + var2 * var2; + if (var6 > 4225 && var6 < 90000) { + int var7 = Client.camAngleY & 2047; + int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; + int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; + int var10 = var9 * var2 + var3 * var8 >> 16; + int var11 = var3 * var9 - var8 * var2 >> 16; + double var12 = Math.atan2((double)var10, (double)var11); + int var14 = var5.width / 2 - 25; + int var15 = (int)(Math.sin(var12) * (double)var14); + int var16 = (int)(Math.cos(var12) * (double)var14); + byte var17 = 20; + ArchiveLoader.redHintArrowSprite.method6242(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); + } else { + Script.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); } } diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index e041280775..2e981ef871 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -4,52 +4,52 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ix") +@ObfuscatedName("io") @Implements("KitDefinition") public class KitDefinition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) @Export("KitDefinition_archive") public static AbstractArchive KitDefinition_archive; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) @Export("KitDefinition_modelsArchive") public static AbstractArchive KitDefinition_modelsArchive; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("KitDefinition_cached") - public static EvictingDualNodeHashTable KitDefinition_cached; - @ObfuscatedName("p") + static EvictingDualNodeHashTable KitDefinition_cached; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -81480953 + intValue = -1923547411 ) @Export("bodypartID") public int bodypartID; - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("models2") int[] models2; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("d") + @ObfuscatedName("m") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("models") int[] models; - @ObfuscatedName("o") + @ObfuscatedName("h") @Export("nonSelectable") public boolean nonSelectable; @@ -63,10 +63,10 @@ public class KitDefinition extends DualNode { this.nonSelectable = false; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lkq;B)V", - garbageValue = "2" + signature = "(Lkp;B)V", + garbageValue = "1" ) @Export("decode") void decode(Buffer var1) { @@ -80,10 +80,10 @@ public class KitDefinition extends DualNode { } } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkq;II)V", - garbageValue = "1044469626" + signature = "(Lkp;II)V", + garbageValue = "1396664482" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -126,10 +126,10 @@ public class KitDefinition extends DualNode { } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "963507021" + garbageValue = "16777215" ) @Export("ready") public boolean ready() { @@ -148,10 +148,10 @@ public class KitDefinition extends DualNode { } } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(I)Ldd;", - garbageValue = "-2124691524" + signature = "(I)Ldg;", + garbageValue = "847526652" ) @Export("getModelData") public ModelData getModelData() { @@ -188,12 +188,12 @@ public class KitDefinition extends DualNode { } } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-2147315248" + garbageValue = "-464506453" ) - public boolean method4430() { + public boolean method4533() { boolean var1 = true; for (int var2 = 0; var2 < 5; ++var2) { @@ -205,10 +205,10 @@ public class KitDefinition extends DualNode { return var1; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)Ldd;", - garbageValue = "285543831" + signature = "(I)Ldg;", + garbageValue = "-2095950315" ) @Export("getKitDefinitionModels") public ModelData getKitDefinitionModels() { @@ -238,26 +238,100 @@ public class KitDefinition extends DualNode { return var5; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(II)Lis;", - garbageValue = "-2132150843" + signature = "(IIIIB)V", + garbageValue = "116" ) - @Export("StructDefinition_getStructDefinition") - public static StructDefinition StructDefinition_getStructDefinition(int var0) { - StructDefinition var1 = (StructDefinition)StructDefinition.StructDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = StructDefinition.StructDefinition_archive.takeFile(34, var0); - var1 = new StructDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); + static final void method4532(int var0, int var1, int var2, int var3) { + for (int var4 = var1; var4 <= var3 + var1; ++var4) { + for (int var5 = var0; var5 <= var0 + var2; ++var5) { + if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { + InterfaceParent.field565[0][var5][var4] = 127; + if (var0 == var5 && var5 > 0) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; + } + + if (var0 + var2 == var5 && var5 < 103) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; + } + + if (var4 == var1 && var4 > 0) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; + } + + if (var4 == var3 + var1 && var4 < 103) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; + } + } + } + } + + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "(Ljava/lang/CharSequence;IZB)I", + garbageValue = "93" + ) + @Export("parseIntCustomRadix") + static int parseIntCustomRadix(CharSequence var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { + boolean var3 = false; + boolean var4 = false; + int var5 = 0; + int var6 = var0.length(); + + for (int var7 = 0; var7 < var6; ++var7) { + char var8 = var0.charAt(var7); + if (var7 == 0) { + if (var8 == '-') { + var3 = true; + continue; + } + + if (var8 == '+') { + continue; + } + } + + int var10; + if (var8 >= '0' && var8 <= '9') { + var10 = var8 - '0'; + } else if (var8 >= 'A' && var8 <= 'Z') { + var10 = var8 - '7'; + } else { + if (var8 < 'a' || var8 > 'z') { + throw new NumberFormatException(); + } + + var10 = var8 - 'W'; + } + + if (var10 >= var1) { + throw new NumberFormatException(); + } + + if (var3) { + var10 = -var10; + } + + int var9 = var10 + var5 * var1; + if (var9 / var1 != var5) { + throw new NumberFormatException(); + } + + var5 = var9; + var4 = true; } - var1.postDecode(); - StructDefinition.StructDefinition_cached.put(var1, (long)var0); - return var1; + if (!var4) { + throw new NumberFormatException(); + } else { + return var5; + } + } else { + throw new IllegalArgumentException("" + var1); } } } diff --git a/runescape-client/src/main/java/Language.java b/runescape-client/src/main/java/Language.java index 6b3c75006b..dc9d863197 100644 --- a/runescape-client/src/main/java/Language.java +++ b/runescape-client/src/main/java/Language.java @@ -5,109 +5,114 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gs") +@ObfuscatedName("gl") @Implements("Language") public class Language implements Enumerated { - @ObfuscatedName("pg") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lls;" - ) - @Export("sceneMinimapSprite") - static Sprite sceneMinimapSprite; - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Lgs;" + signature = "Lgl;" ) @Export("Language_EN") public static final Language Language_EN; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lgs;" + signature = "Lgl;" ) @Export("Language_DE") static final Language Language_DE; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgs;" + signature = "Lgl;" ) @Export("Language_FR") public static final Language Language_FR; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lgs;" + signature = "Lgl;" ) @Export("Language_PT") static final Language Language_PT; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lgs;" + signature = "Lgl;" ) @Export("Language_NL") static final Language Language_NL; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lgs;" + signature = "Lgl;" ) @Export("Language_ES") public static final Language Language_ES; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lgs;" + signature = "Lgl;" ) @Export("Language_ES_MX") static final Language Language_ES_MX; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "[Lgs;" + signature = "[Lgl;" ) @Export("Language_valuesOrdered") - public static final Language[] Language_valuesOrdered; - @ObfuscatedName("hr") + static final Language[] Language_valuesOrdered; + @ObfuscatedName("fy") @ObfuscatedGetter( - intValue = 1873129621 + intValue = -175340917 ) - @Export("oculusOrbFocalPointY") - static int oculusOrbFocalPointY; - @ObfuscatedName("x") - final String field2342; - @ObfuscatedName("a") + @Export("baseY") + static int baseY; + @ObfuscatedName("fq") + @ObfuscatedGetter( + intValue = 714439481 + ) + static int field2359; + @ObfuscatedName("jm") + @ObfuscatedSignature( + signature = "Ldr;" + ) + @Export("textureProvider") + static TextureProvider textureProvider; + @ObfuscatedName("l") + final String field2361; + @ObfuscatedName("j") @Export("language") final String language; - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1397403577 + intValue = 1330726969 ) @Export("id") final int id; static { - Language_EN = new Language("EN", "en", "English", class192.field2369, 0, "GB"); - Language_DE = new Language("DE", "de", "German", class192.field2369, 1, "DE"); - Language_FR = new Language("FR", "fr", "French", class192.field2369, 2, "FR"); - Language_PT = new Language("PT", "pt", "Portuguese", class192.field2369, 3, "BR"); - Language_NL = new Language("NL", "nl", "Dutch", class192.field2360, 4, "NL"); - Language_ES = new Language("ES", "es", "Spanish", class192.field2360, 5, "ES"); - Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", class192.field2369, 6, "MX"); - Language[] var0 = new Language[]{Language_PT, Language_FR, Language_ES, Language_ES_MX, Language_NL, Language_DE, Language_EN}; + Language_EN = new Language("EN", "en", "English", class192.field2380, 0, "GB"); + Language_DE = new Language("DE", "de", "German", class192.field2380, 1, "DE"); + Language_FR = new Language("FR", "fr", "French", class192.field2380, 2, "FR"); + Language_PT = new Language("PT", "pt", "Portuguese", class192.field2380, 3, "BR"); + Language_NL = new Language("NL", "nl", "Dutch", class192.field2382, 4, "NL"); + Language_ES = new Language("ES", "es", "Spanish", class192.field2382, 5, "ES"); + Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", class192.field2380, 6, "MX"); + Language[] var0 = method3716(); Language_valuesOrdered = new Language[var0.length]; - Language[] var2 = var0; + Language[] var1 = var0; - for (int var3 = 0; var3 < var2.length; ++var3) { - Language var4 = var2[var3]; - if (Language_valuesOrdered[var4.id] != null) { + for (int var2 = 0; var2 < var1.length; ++var2) { + Language var3 = var1[var2]; + if (Language_valuesOrdered[var3.id] != null) { throw new IllegalStateException(); } - Language_valuesOrdered[var4.id] = var4; + Language_valuesOrdered[var3.id] = var3; } } @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lgb;ILjava/lang/String;)V" + signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lgp;ILjava/lang/String;)V" ) Language(String var1, String var2, String var3, class192 var4, int var5, String var6) { - this.field2342 = var1; + this.field2361 = var1; this.language = var2; this.id = var5; if (var6 != null) { @@ -118,20 +123,20 @@ public class Language implements Enumerated { } - @ObfuscatedName("f") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", - garbageValue = "-1974687232" + signature = "(B)Ljava/lang/String;", + garbageValue = "-101" ) @Export("getLanguage") String getLanguage() { return this.language; } - @ObfuscatedName("i") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "-57" + garbageValue = "1" ) @Export("rsOrdinal") public int rsOrdinal() { @@ -142,538 +147,30 @@ public class Language implements Enumerated { return this.getLanguage().toLowerCase(Locale.ENGLISH); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "525966126" + signature = "(II)Ljava/lang/String;", + garbageValue = "1944388851" ) - static int method3627(int var0, int var1) { - FloorOverlayDefinition var2 = Messages.FloorUnderlayDefinition_get(var0); - if (var2 == null) { - return var1; - } else if (var2.secondaryRgb >= 0) { - return var2.secondaryRgb | -16777216; - } else { - int var3; - if (var2.texture >= 0) { - var3 = class80.method2053(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var2.texture), 96); - return Rasterizer3D.Rasterizer3D_colorPalette[var3] | -16777216; - } else if (var2.primaryRgb == 16711935) { - return var1; - } else { - var3 = Varcs.method2168(var2.hue, var2.saturation, var2.lightness); - int var4 = class80.method2053(var3, 96); - return Rasterizer3D.Rasterizer3D_colorPalette[var4] | -16777216; - } - } + static String method3728(int var0) { + return ""; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "([BIIB)Ljava/lang/String;", - garbageValue = "-119" + signature = "(I)[Lgl;", + garbageValue = "-78751663" ) - public static String method3636(byte[] var0, int var1, int var2) { - StringBuilder var3 = new StringBuilder(); - - for (int var4 = var1; var4 < var2 + var1; var4 += 3) { - int var5 = var0[var4] & 255; - var3.append(class289.field3634[var5 >>> 2]); - if (var4 < var2 - 1) { - int var6 = var0[var4 + 1] & 255; - var3.append(class289.field3634[(var5 & 3) << 4 | var6 >>> 4]); - if (var4 < var2 - 2) { - int var7 = var0[var4 + 2] & 255; - var3.append(class289.field3634[(var6 & 15) << 2 | var7 >>> 6]).append(class289.field3634[var7 & 63]); - } else { - var3.append(class289.field3634[(var6 & 15) << 2]).append("="); - } - } else { - var3.append(class289.field3634[(var5 & 3) << 4]).append("=="); - } - } - - return var3.toString(); + static Language[] method3716() { + return new Language[]{Language_PT, Language_NL, Language_DE, Language_EN, Language_ES_MX, Language_ES, Language_FR}; } - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lej;[Lfp;S)V", - garbageValue = "-23635" + signature = "(II)Lgl;", + garbageValue = "523180108" ) - static final void method3624(Scene var0, CollisionMap[] var1) { - int var2; - int var3; - int var4; - int var5; - for (var2 = 0; var2 < 4; ++var2) { - for (var3 = 0; var3 < 104; ++var3) { - for (var4 = 0; var4 < 104; ++var4) { - if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) == 1) { - var5 = var2; - if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { - var5 = var2 - 1; - } - - if (var5 >= 0) { - var1[var5].setBlockedByFloor(var3, var4); - } - } - } - } - } - - Tiles.field505 += (int)(Math.random() * 5.0D) - 2; - if (Tiles.field505 < -8) { - Tiles.field505 = -8; - } - - if (Tiles.field505 > 8) { - Tiles.field505 = 8; - } - - Tiles.field492 += (int)(Math.random() * 5.0D) - 2; - if (Tiles.field492 < -16) { - Tiles.field492 = -16; - } - - if (Tiles.field492 > 16) { - Tiles.field492 = 16; - } - - int var9; - int var10; - int var11; - int var12; - int var13; - int var14; - int var15; - int var16; - int[] var10000; - int var17; - int var18; - for (var2 = 0; var2 < 4; ++var2) { - byte[][] var42 = Tiles.field496[var2]; - var9 = (int)Math.sqrt(5100.0D); - var10 = var9 * 768 >> 8; - - int var19; - int var20; - for (var11 = 1; var11 < 103; ++var11) { - for (var12 = 1; var12 < 103; ++var12) { - var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11]; - var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1]; - var15 = (int)Math.sqrt((double)(var13 * var13 + var14 * var14 + 65536)); - var16 = (var13 << 8) / var15; - var17 = 65536 / var15; - var18 = (var14 << 8) / var15; - var19 = (var18 * -50 + var16 * -50 + var17 * -10) / var10 + 96; - var20 = (var42[var12][var11 + 1] >> 3) + (var42[var12 - 1][var11] >> 2) + (var42[var12][var11 - 1] >> 2) + (var42[var12 + 1][var11] >> 3) + (var42[var12][var11] >> 1); - ArchiveLoader.field512[var12][var11] = var19 - var20; - } - } - - for (var11 = 0; var11 < 104; ++var11) { - UrlRequest.Tiles_hue[var11] = 0; - MenuAction.Tiles_saturation[var11] = 0; - PacketBufferNode.Tiles_lightness[var11] = 0; - Tiles.Tiles_hueMultiplier[var11] = 0; - Varcs.field1244[var11] = 0; - } - - for (var11 = -5; var11 < 109; ++var11) { - for (var12 = 0; var12 < 104; ++var12) { - var13 = var11 + 5; - int var10002; - if (var13 >= 0 && var13 < 104) { - var14 = class14.field88[var2][var13][var12] & 255; - if (var14 > 0) { - FloorUnderlayDefinition var43 = WorldMapArea.method405(var14 - 1); - var10000 = UrlRequest.Tiles_hue; - var10000[var12] += var43.hue; - var10000 = MenuAction.Tiles_saturation; - var10000[var12] += var43.saturation; - var10000 = PacketBufferNode.Tiles_lightness; - var10000[var12] += var43.lightness; - var10000 = Tiles.Tiles_hueMultiplier; - var10000[var12] += var43.hueMultiplier; - var10002 = Varcs.field1244[var12]++; - } - } - - var14 = var11 - 5; - if (var14 >= 0 && var14 < 104) { - var15 = class14.field88[var2][var14][var12] & 255; - if (var15 > 0) { - FloorUnderlayDefinition var44 = WorldMapArea.method405(var15 - 1); - var10000 = UrlRequest.Tiles_hue; - var10000[var12] -= var44.hue; - var10000 = MenuAction.Tiles_saturation; - var10000[var12] -= var44.saturation; - var10000 = PacketBufferNode.Tiles_lightness; - var10000[var12] -= var44.lightness; - var10000 = Tiles.Tiles_hueMultiplier; - var10000[var12] -= var44.hueMultiplier; - var10002 = Varcs.field1244[var12]--; - } - } - } - - if (var11 >= 1 && var11 < 103) { - var12 = 0; - var13 = 0; - var14 = 0; - var15 = 0; - var16 = 0; - - for (var17 = -5; var17 < 109; ++var17) { - var18 = var17 + 5; - if (var18 >= 0 && var18 < 104) { - var12 += UrlRequest.Tiles_hue[var18]; - var13 += MenuAction.Tiles_saturation[var18]; - var14 += PacketBufferNode.Tiles_lightness[var18]; - var15 += Tiles.Tiles_hueMultiplier[var18]; - var16 += Varcs.field1244[var18]; - } - - var19 = var17 - 5; - if (var19 >= 0 && var19 < 104) { - var12 -= UrlRequest.Tiles_hue[var19]; - var13 -= MenuAction.Tiles_saturation[var19]; - var14 -= PacketBufferNode.Tiles_lightness[var19]; - var15 -= Tiles.Tiles_hueMultiplier[var19]; - var16 -= Varcs.field1244[var19]; - } - - if (var17 >= 1 && var17 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var11][var17] & 2) != 0 || (Tiles.Tiles_renderFlags[var2][var11][var17] & 16) == 0)) { - if (var2 < Tiles.Tiles_minPlane) { - Tiles.Tiles_minPlane = var2; - } - - var20 = class14.field88[var2][var11][var17] & 255; - int var21 = Tiles.field498[var2][var11][var17] & 255; - if (var20 > 0 || var21 > 0) { - int var22 = Tiles.Tiles_heights[var2][var11][var17]; - int var23 = Tiles.Tiles_heights[var2][var11 + 1][var17]; - int var24 = Tiles.Tiles_heights[var2][var11 + 1][var17 + 1]; - int var25 = Tiles.Tiles_heights[var2][var11][var17 + 1]; - int var26 = ArchiveLoader.field512[var11][var17]; - int var27 = ArchiveLoader.field512[var11 + 1][var17]; - int var28 = ArchiveLoader.field512[var11 + 1][var17 + 1]; - int var29 = ArchiveLoader.field512[var11][var17 + 1]; - int var30 = -1; - int var31 = -1; - int var32; - int var33; - if (var20 > 0) { - var32 = var12 * 256 / var15; - var33 = var13 / var16; - int var34 = var14 / var16; - var30 = GameShell.hslToRgb(var32, var33, var34); - var32 = var32 + Tiles.field505 & 255; - var34 += Tiles.field492; - if (var34 < 0) { - var34 = 0; - } else if (var34 > 255) { - var34 = 255; - } - - var31 = GameShell.hslToRgb(var32, var33, var34); - } - - if (var2 > 0) { - boolean var47 = true; - if (var20 == 0 && Tiles.field494[var2][var11][var17] != 0) { - var47 = false; - } - - if (var21 > 0 && !Messages.FloorUnderlayDefinition_get(var21 - 1).hideUnderlay) { - var47 = false; - } - - if (var47 && var23 == var22 && var22 == var24 && var22 == var25) { - var10000 = Tiles.field501[var2][var11]; - var10000[var17] |= 2340; - } - } - - var32 = 0; - if (var31 != -1) { - var32 = Rasterizer3D.Rasterizer3D_colorPalette[class32.method555(var31, 96)]; - } - - if (var21 == 0) { - var0.addTile(var2, var11, var17, 0, 0, -1, var22, var23, var24, var25, class32.method555(var30, var26), class32.method555(var30, var27), class32.method555(var30, var28), class32.method555(var30, var29), 0, 0, 0, 0, var32, 0); - } else { - var33 = Tiles.field494[var2][var11][var17] + 1; - byte var48 = Tiles.field493[var2][var11][var17]; - FloorOverlayDefinition var35 = Messages.FloorUnderlayDefinition_get(var21 - 1); - int var36 = var35.texture; - int var37; - int var38; - int var39; - int var40; - if (var36 >= 0) { - var38 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var36); - var37 = -1; - } else if (var35.primaryRgb == 16711935) { - var37 = -2; - var36 = -1; - var38 = -2; - } else { - var37 = GameShell.hslToRgb(var35.hue, var35.saturation, var35.lightness); - var39 = var35.hue + Tiles.field505 & 255; - var40 = var35.lightness + Tiles.field492; - if (var40 < 0) { - var40 = 0; - } else if (var40 > 255) { - var40 = 255; - } - - var38 = GameShell.hslToRgb(var39, var35.saturation, var40); - } - - var39 = 0; - if (var38 != -2) { - var39 = Rasterizer3D.Rasterizer3D_colorPalette[ScriptEvent.method1184(var38, 96)]; - } - - if (var35.secondaryRgb != -1) { - var40 = var35.secondaryHue + Tiles.field505 & 255; - int var41 = var35.secondaryLightness + Tiles.field492; - if (var41 < 0) { - var41 = 0; - } else if (var41 > 255) { - var41 = 255; - } - - var38 = GameShell.hslToRgb(var40, var35.secondarySaturation, var41); - var39 = Rasterizer3D.Rasterizer3D_colorPalette[ScriptEvent.method1184(var38, 96)]; - } - - var0.addTile(var2, var11, var17, var33, var48, var36, var22, var23, var24, var25, class32.method555(var30, var26), class32.method555(var30, var27), class32.method555(var30, var28), class32.method555(var30, var29), ScriptEvent.method1184(var37, var26), ScriptEvent.method1184(var37, var27), ScriptEvent.method1184(var37, var28), ScriptEvent.method1184(var37, var29), var32, var39); - } - } - } - } - } - } - - for (var11 = 1; var11 < 103; ++var11) { - for (var12 = 1; var12 < 103; ++var12) { - if ((Tiles.Tiles_renderFlags[var2][var12][var11] & 8) != 0) { - var17 = 0; - } else if (var2 > 0 && (Tiles.Tiles_renderFlags[1][var12][var11] & 2) != 0) { - var17 = var2 - 1; - } else { - var17 = var2; - } - - var0.setTileMinPlane(var2, var12, var11, var17); - } - } - - class14.field88[var2] = null; - Tiles.field498[var2] = null; - Tiles.field494[var2] = null; - Tiles.field493[var2] = null; - Tiles.field496[var2] = null; - } - - var0.method3191(-50, -10, -50); - - for (var2 = 0; var2 < 104; ++var2) { - for (var3 = 0; var3 < 104; ++var3) { - if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { - var0.setLinkBelow(var2, var3); - } - } - } - - var2 = 1; - var3 = 2; - var4 = 4; - - for (var5 = 0; var5 < 4; ++var5) { - if (var5 > 0) { - var2 <<= 3; - var3 <<= 3; - var4 <<= 3; - } - - for (int var6 = 0; var6 <= var5; ++var6) { - for (int var7 = 0; var7 <= 104; ++var7) { - for (int var8 = 0; var8 <= 104; ++var8) { - short var46; - if ((Tiles.field501[var6][var8][var7] & var2) != 0) { - var9 = var7; - var10 = var7; - var11 = var6; - - for (var12 = var6; var9 > 0 && (Tiles.field501[var6][var8][var9 - 1] & var2) != 0; --var9) { - } - - while (var10 < 104 && (Tiles.field501[var6][var8][var10 + 1] & var2) != 0) { - ++var10; - } - - label462: - while (var11 > 0) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((Tiles.field501[var11 - 1][var8][var13] & var2) == 0) { - break label462; - } - } - - --var11; - } - - label451: - while (var12 < var5) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((Tiles.field501[var12 + 1][var8][var13] & var2) == 0) { - break label451; - } - } - - ++var12; - } - - var13 = (var10 - var9 + 1) * (var12 + 1 - var11); - if (var13 >= 8) { - var46 = 240; - var15 = Tiles.Tiles_heights[var12][var8][var9] - var46; - var16 = Tiles.Tiles_heights[var11][var8][var9]; - Scene.Scene_addOccluder(var5, 1, var8 * 128, var8 * 128, var9 * 128, var10 * 128 + 128, var15, var16); - - for (var17 = var11; var17 <= var12; ++var17) { - for (var18 = var9; var18 <= var10; ++var18) { - var10000 = Tiles.field501[var17][var8]; - var10000[var18] &= ~var2; - } - } - } - } - - if ((Tiles.field501[var6][var8][var7] & var3) != 0) { - var9 = var8; - var10 = var8; - var11 = var6; - - for (var12 = var6; var9 > 0 && (Tiles.field501[var6][var9 - 1][var7] & var3) != 0; --var9) { - } - - while (var10 < 104 && (Tiles.field501[var6][var10 + 1][var7] & var3) != 0) { - ++var10; - } - - label515: - while (var11 > 0) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((Tiles.field501[var11 - 1][var13][var7] & var3) == 0) { - break label515; - } - } - - --var11; - } - - label504: - while (var12 < var5) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((Tiles.field501[var12 + 1][var13][var7] & var3) == 0) { - break label504; - } - } - - ++var12; - } - - var13 = (var10 - var9 + 1) * (var12 + 1 - var11); - if (var13 >= 8) { - var46 = 240; - var15 = Tiles.Tiles_heights[var12][var9][var7] - var46; - var16 = Tiles.Tiles_heights[var11][var9][var7]; - Scene.Scene_addOccluder(var5, 2, var9 * 128, var10 * 128 + 128, var7 * 128, var7 * 128, var15, var16); - - for (var17 = var11; var17 <= var12; ++var17) { - for (var18 = var9; var18 <= var10; ++var18) { - var10000 = Tiles.field501[var17][var18]; - var10000[var7] &= ~var3; - } - } - } - } - - if ((Tiles.field501[var6][var8][var7] & var4) != 0) { - var9 = var8; - var10 = var8; - var11 = var7; - - for (var12 = var7; var11 > 0 && (Tiles.field501[var6][var8][var11 - 1] & var4) != 0; --var11) { - } - - while (var12 < 104 && (Tiles.field501[var6][var8][var12 + 1] & var4) != 0) { - ++var12; - } - - label568: - while (var9 > 0) { - for (var13 = var11; var13 <= var12; ++var13) { - if ((Tiles.field501[var6][var9 - 1][var13] & var4) == 0) { - break label568; - } - } - - --var9; - } - - label557: - while (var10 < 104) { - for (var13 = var11; var13 <= var12; ++var13) { - if ((Tiles.field501[var6][var10 + 1][var13] & var4) == 0) { - break label557; - } - } - - ++var10; - } - - if ((var12 - var11 + 1) * (var10 - var9 + 1) >= 4) { - var13 = Tiles.Tiles_heights[var6][var9][var11]; - Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13); - - for (var14 = var9; var14 <= var10; ++var14) { - for (var15 = var11; var15 <= var12; ++var15) { - var10000 = Tiles.field501[var6][var14]; - var10000[var15] &= ~var4; - } - } - } - } - } - } - } - } - - } - - @ObfuscatedName("fq") - @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "-38759309" - ) - static void method3634(int var0, int var1) { - int[] var2 = new int[9]; - - for (int var3 = 0; var3 < var2.length; ++var3) { - int var4 = var3 * 32 + 15 + 128; - int var5 = var4 * 3 + 600; - int var7 = Rasterizer3D.Rasterizer3D_sine[var4]; - int var6 = WorldMapManager.method635(var5, var1); - var2[var3] = var6 * var7 >> 16; - } - - Scene.Scene_buildVisiblityMap(var2, 500, 800, var0 * 334 / var1, 334); + public static Language method3711(int var0) { + return var0 >= 0 && var0 < Language_valuesOrdered.length ? Language_valuesOrdered[var0] : null; } } diff --git a/runescape-client/src/main/java/Link.java b/runescape-client/src/main/java/Link.java index 9d52062d22..48e4d1024b 100644 --- a/runescape-client/src/main/java/Link.java +++ b/runescape-client/src/main/java/Link.java @@ -3,23 +3,23 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gj") +@ObfuscatedName("fq") @Implements("Link") public class Link { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfq;" ) @Export("previous") public Link previous; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfq;" ) @Export("next") public Link next; - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("remove") public void remove() { if (this.next != null) { diff --git a/runescape-client/src/main/java/LinkDeque.java b/runescape-client/src/main/java/LinkDeque.java index 406b8bc3cd..62456139d7 100644 --- a/runescape-client/src/main/java/LinkDeque.java +++ b/runescape-client/src/main/java/LinkDeque.java @@ -3,18 +3,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jw") +@ObfuscatedName("jr") @Implements("LinkDeque") public class LinkDeque { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfq;" ) @Export("sentinel") Link sentinel; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lfq;" ) @Export("current") Link current; @@ -25,9 +25,9 @@ public class LinkDeque { this.sentinel.next = this.sentinel; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lgj;)V" + signature = "(Lfq;)V" ) @Export("addFirst") public void addFirst(Link var1) { @@ -41,9 +41,9 @@ public class LinkDeque { var1.previous.next = var1; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "()Lgj;" + signature = "()Lfq;" ) @Export("last") public Link last() { @@ -57,9 +57,9 @@ public class LinkDeque { } } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "()Lgj;" + signature = "()Lfq;" ) @Export("previous") public Link previous() { diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java index 0a340889e4..191de0964c 100644 --- a/runescape-client/src/main/java/Login.java +++ b/runescape-client/src/main/java/Login.java @@ -1,4 +1,3 @@ -import java.security.SecureRandom; import java.text.DecimalFormat; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; @@ -6,161 +5,140 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cs") +@ObfuscatedName("ct") @Implements("Login") public class Login { - @ObfuscatedName("i") - static boolean field1173; - @ObfuscatedName("y") + @ObfuscatedName("t") + static boolean field1163; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 263999523 + intValue = 1501257187 ) @Export("xPadding") static int xPadding; - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "[Lli;" - ) - @Export("runesSprite") - static IndexedSprite[] runesSprite; - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lli;" - ) - @Export("titleboxSprite") - static IndexedSprite titleboxSprite; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "Lli;" ) @Export("titlebuttonSprite") static IndexedSprite titlebuttonSprite; - @ObfuscatedName("a") - @ObfuscatedSignature( - signature = "Lli;" - ) - @Export("logoSprite") - static IndexedSprite logoSprite; @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lex;" + signature = "Llt;" ) - @Export("World_request") - static UrlRequest World_request; - @ObfuscatedName("v") + @Export("leftTitleSprite") + static Sprite leftTitleSprite; + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lli;" + signature = "[Lli;" ) - @Export("options_buttons_2Sprite") - static IndexedSprite options_buttons_2Sprite; - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Lli;" - ) - static IndexedSprite field1162; - @ObfuscatedName("u") + @Export("title_muteSprite") + static IndexedSprite[] title_muteSprite; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1796142123 + intValue = -130819791 ) @Export("loginBoxX") static int loginBoxX; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 853386151 + intValue = -515852009 ) @Export("Login_loadingPercent") static int Login_loadingPercent; - @ObfuscatedName("m") + @ObfuscatedName("r") @Export("Login_loadingText") static String Login_loadingText; - @ObfuscatedName("as") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 2047015599 + intValue = 591976709 ) - static int field1167; - @ObfuscatedName("ah") + static int field1165; + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -421620705 + intValue = -366456801 ) - static int field1181; - @ObfuscatedName("ar") + static int field1193; + @ObfuscatedName("aq") + @ObfuscatedSignature( + signature = "Lll;" + ) + static Bounds field1175; + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -996897081 + intValue = -2042925581 ) @Export("loginIndex") static int loginIndex; - @ObfuscatedName("az") + @ObfuscatedName("ac") @Export("Login_response0") static String Login_response0; - @ObfuscatedName("ay") + @ObfuscatedName("aw") @Export("Login_response1") static String Login_response1; - @ObfuscatedName("ag") + @ObfuscatedName("ar") @Export("Login_response2") static String Login_response2; - @ObfuscatedName("ac") + @ObfuscatedName("av") @Export("Login_response3") static String Login_response3; @ObfuscatedName("al") @Export("Login_username") static String Login_username; - @ObfuscatedName("ae") + @ObfuscatedName("ad") @Export("Login_password") static String Login_password; - @ObfuscatedName("ai") - static boolean field1186; - @ObfuscatedName("am") - static boolean field1182; - @ObfuscatedName("bg") - static boolean field1178; - @ObfuscatedName("bw") + @ObfuscatedName("ab") + static boolean field1183; + @ObfuscatedName("ap") + static boolean field1184; + @ObfuscatedName("bf") + static boolean field1185; + @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = -436671027 + intValue = 2063292443 ) @Export("currentLoginField") static int currentLoginField; - @ObfuscatedName("bx") + @ObfuscatedName("bp") @Export("worldSelectOpen") static boolean worldSelectOpen; - @ObfuscatedName("bn") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = 1729150303 + intValue = -921814137 ) @Export("hoveredWorldIndex") static int hoveredWorldIndex; - @ObfuscatedName("bb") + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = 1430406405 + intValue = 1630219319 ) @Export("worldSelectPage") static int worldSelectPage; - @ObfuscatedName("bh") + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = 552421487 + intValue = -2032377127 ) @Export("worldSelectPagesCount") static int worldSelectPagesCount; - @ObfuscatedName("bu") + @ObfuscatedName("bh") @ObfuscatedGetter( - longValue = 1507915071699624777L + longValue = 5886153640443907315L ) - static long field1158; - @ObfuscatedName("be") + static long field1180; + @ObfuscatedName("bg") @ObfuscatedGetter( - longValue = 8918979635006641127L + longValue = 3027012337338464175L ) - static long field1187; - @ObfuscatedName("eh") - @Export("secureRandom") - static SecureRandom secureRandom; + static long field1194; static { xPadding = 0; loginBoxX = xPadding + 202; Login_loadingPercent = 10; Login_loadingText = ""; - field1167 = -1; - field1181 = 1; + field1165 = -1; + field1193 = 1; loginIndex = 0; Login_response0 = ""; Login_response1 = ""; @@ -168,9 +146,9 @@ public class Login { Login_response3 = ""; Login_username = ""; Login_password = ""; - field1186 = false; - field1182 = false; - field1178 = true; + field1183 = false; + field1184 = false; + field1185 = true; currentLoginField = 0; worldSelectOpen = false; hoveredWorldIndex = -1; @@ -178,16 +156,7 @@ public class Login { worldSelectPagesCount = 0; new DecimalFormat("##0.00"); new class162(); - field1158 = -1L; - field1187 = -1L; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "1893655286" - ) - public static boolean method2119(int var0) { - return (var0 >> 21 & 1) != 0; + field1180 = -1L; + field1194 = -1L; } } diff --git a/runescape-client/src/main/java/LoginPacket.java b/runescape-client/src/main/java/LoginPacket.java index f73f3ac5f4..f4e6730374 100644 --- a/runescape-client/src/main/java/LoginPacket.java +++ b/runescape-client/src/main/java/LoginPacket.java @@ -3,57 +3,56 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("fm") +@ObfuscatedName("ge") @Implements("LoginPacket") -public class LoginPacket implements class175 { - @ObfuscatedName("f") +public class LoginPacket implements class181 { + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lfm;" + signature = "Lge;" ) - public static final LoginPacket field2282; - @ObfuscatedName("i") + public static final LoginPacket field2310; + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lfm;" + signature = "Lge;" ) - static final LoginPacket field2288; - @ObfuscatedName("y") + static final LoginPacket field2307; + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lfm;" + signature = "Lge;" ) - public static final LoginPacket field2285; - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lfm;" - ) - public static final LoginPacket field2283; - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lfm;" - ) - static final LoginPacket field2284; + public static final LoginPacket field2308; @ObfuscatedName("e") @ObfuscatedSignature( - signature = "[Lfm;" + signature = "Lge;" + ) + public static final LoginPacket field2313; + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "Lge;" + ) + static final LoginPacket field2306; + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "[Lge;" ) @Export("LoginPacket_indexedValues") static final LoginPacket[] LoginPacket_indexedValues; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1664908847 + intValue = 707604483 ) @Export("id") public final int id; static { - field2282 = new LoginPacket(14, 0); - field2288 = new LoginPacket(15, 4); - field2285 = new LoginPacket(16, -2); - field2283 = new LoginPacket(18, -2); - field2284 = new LoginPacket(27, 0); + field2310 = new LoginPacket(14, 0); + field2307 = new LoginPacket(15, 4); + field2308 = new LoginPacket(16, -2); + field2313 = new LoginPacket(18, -2); + field2306 = new LoginPacket(27, 0); LoginPacket_indexedValues = new LoginPacket[32]; - LoginPacket[] var0 = new LoginPacket[]{field2288, field2285, field2282, field2283, field2284}; + LoginPacket[] var0 = new LoginPacket[]{field2310, field2306, field2308, field2313, field2307}; LoginPacket[] var1 = var0; for (int var2 = 0; var2 < var1.length; ++var2) { @@ -69,93 +68,4 @@ public class LoginPacket implements class175 { LoginPacket(int var1, int var2) { this.id = var1; } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(II)Lbs;", - garbageValue = "-2092272344" - ) - @Export("Messages_getMessage") - static Message Messages_getMessage(int var0) { - return (Message)Messages.Messages_hashTable.get((long)var0); - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(ILcu;ZI)I", - garbageValue = "-1470208015" - ) - static int method3575(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var3 = Tile.getWidget(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); - } else { - var3 = var2 ? UserComparator7.field1946 : class197.field2398; - } - - if (var0 == ScriptOpcodes.CC_CALLONRESIZE) { - if (Interpreter.field1079 >= 10) { - throw new RuntimeException(); - } else if (var3.onResize == null) { - return 0; - } else { - ScriptEvent var4 = new ScriptEvent(); - var4.widget = var3; - var4.args = var3.onResize; - var4.field557 = Interpreter.field1079 + 1; - Client.scriptEvents.addFirst(var4); - return 1; - } - } else { - return 2; - } - } - - @ObfuscatedName("ht") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "5" - ) - static final void method3574() { - Client.field678 = 0; - int var0 = MusicPatchPcmStream.baseX * 64 + (Message.localPlayer.x >> 7); - int var1 = ScriptEvent.baseY * 64 + (Message.localPlayer.y >> 7); - if (var0 >= 3053 && var0 <= 3156 && var1 >= 3056 && var1 <= 3136) { - Client.field678 = 1; - } - - if (var0 >= 3072 && var0 <= 3118 && var1 >= 9492 && var1 <= 9535) { - Client.field678 = 1; - } - - if (Client.field678 == 1 && var0 >= 3139 && var0 <= 3199 && var1 >= 3008 && var1 <= 3062) { - Client.field678 = 0; - } - - } - - @ObfuscatedName("ja") - @ObfuscatedSignature( - signature = "(IIIZB)V", - garbageValue = "58" - ) - static final void method3572(int var0, int var1, int var2, boolean var3) { - if (MusicPatch.loadInterface(var0)) { - FloorOverlayDefinition.resizeInterface(UserComparator7.Widget_interfaceComponents[var0], -1, var1, var2, var3); - } - } - - @ObfuscatedName("jj") - @ObfuscatedSignature( - signature = "(Lha;B)V", - garbageValue = "67" - ) - @Export("invalidateWidget") - static void invalidateWidget(Widget var0) { - if (var0.cycle == Client.field832) { - Client.field833[var0.rootIndex] = true; - } - - } } diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index 46edc9bf4d..96421ff8e6 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -3,209 +3,213 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bd") +@ObfuscatedName("bz") @Implements("LoginScreenAnimation") public class LoginScreenAnimation { - @ObfuscatedName("f") + @ObfuscatedName("bq") + @Export("otp") + static String otp; + @ObfuscatedName("c") @ObfuscatedSignature( signature = "[Lli;" ) @Export("sprites") IndexedSprite[] sprites; - @ObfuscatedName("e") - int[] field1009; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -225886709 - ) - int field1008; - @ObfuscatedName("a") - int[] field1016; @ObfuscatedName("d") - int[] field1012; - @ObfuscatedName("c") - int[] field1013; - @ObfuscatedName("o") - int[] field1014; + int[] field1025; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -630386699 + ) + int field1031; + @ObfuscatedName("j") + int[] field1027; + @ObfuscatedName("m") + int[] field1028; + @ObfuscatedName("p") + int[] field1033; + @ObfuscatedName("h") + int[] field1029; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1086641703 - ) - int field1005; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -937900497 - ) - int field1011; - @ObfuscatedName("s") - int[] field1017; - @ObfuscatedName("l") - int[] field1018; - @ObfuscatedName("t") - int[] field1019; - @ObfuscatedName("j") - int[] field1020; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 142712185 + intValue = -598170965 ) int field1021; - @ObfuscatedName("u") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1690408336 + intValue = -1894077161 ) - int field1022; + int field1032; + @ObfuscatedName("x") + int[] field1040; + @ObfuscatedName("w") + int[] field1034; + @ObfuscatedName("k") + int[] field1035; + @ObfuscatedName("q") + int[] field1030; @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -431156339 + intValue = 1981807145 ) - int field1023; + int field1037; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = 1837953616 + ) + int field1038; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -1636512933 + ) + int field1039; @ObfuscatedSignature( signature = "([Lli;)V" ) LoginScreenAnimation(IndexedSprite[] var1) { - this.field1009 = new int[256]; - this.field1008 = 0; - this.field1005 = 0; - this.field1011 = 0; + this.field1025 = new int[256]; + this.field1031 = 0; this.field1021 = 0; - this.field1022 = 0; - this.field1023 = 0; + this.field1032 = 0; + this.field1037 = 0; + this.field1038 = 0; + this.field1039 = 0; this.sprites = var1; this.initColors(); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-309533051" + garbageValue = "956561052" ) @Export("initColors") void initColors() { - this.field1012 = new int[256]; + this.field1028 = new int[256]; int var1; for (var1 = 0; var1 < 64; ++var1) { - this.field1012[var1] = var1 * 262144; + this.field1028[var1] = var1 * 262144; } for (var1 = 0; var1 < 64; ++var1) { - this.field1012[var1 + 64] = var1 * 1024 + 16711680; + this.field1028[var1 + 64] = var1 * 1024 + 16711680; } for (var1 = 0; var1 < 64; ++var1) { - this.field1012[var1 + 128] = var1 * 4 + 16776960; + this.field1028[var1 + 128] = var1 * 4 + 16776960; } for (var1 = 0; var1 < 64; ++var1) { - this.field1012[var1 + 192] = 16777215; + this.field1028[var1 + 192] = 16777215; } - this.field1013 = new int[256]; + this.field1033 = new int[256]; for (var1 = 0; var1 < 64; ++var1) { - this.field1013[var1] = var1 * 1024; + this.field1033[var1] = var1 * 1024; } for (var1 = 0; var1 < 64; ++var1) { - this.field1013[var1 + 64] = var1 * 4 + 65280; + this.field1033[var1 + 64] = var1 * 4 + 65280; } for (var1 = 0; var1 < 64; ++var1) { - this.field1013[var1 + 128] = var1 * 262144 + 65535; + this.field1033[var1 + 128] = var1 * 262144 + 65535; } for (var1 = 0; var1 < 64; ++var1) { - this.field1013[var1 + 192] = 16777215; + this.field1033[var1 + 192] = 16777215; } - this.field1014 = new int[256]; + this.field1029 = new int[256]; for (var1 = 0; var1 < 64; ++var1) { - this.field1014[var1] = var1 * 4; + this.field1029[var1] = var1 * 4; } for (var1 = 0; var1 < 64; ++var1) { - this.field1014[var1 + 64] = var1 * 262144 + 255; + this.field1029[var1 + 64] = var1 * 262144 + 255; } for (var1 = 0; var1 < 64; ++var1) { - this.field1014[var1 + 128] = var1 * 1024 + 16711935; + this.field1029[var1 + 128] = var1 * 1024 + 16711935; } for (var1 = 0; var1 < 64; ++var1) { - this.field1014[var1 + 192] = 16777215; + this.field1029[var1 + 192] = 16777215; } - this.field1016 = new int[256]; - this.field1021 = 0; - this.field1019 = new int[32768]; - this.field1020 = new int[32768]; - this.method1824((IndexedSprite)null); - this.field1017 = new int[32768]; - this.field1018 = new int[32768]; + this.field1027 = new int[256]; + this.field1037 = 0; + this.field1035 = new int[32768]; + this.field1030 = new int[32768]; + this.method1811((IndexedSprite)null); + this.field1040 = new int[32768]; + this.field1034 = new int[32768]; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "140208699" + garbageValue = "-1696836035" ) - void method1812() { - this.field1012 = null; - this.field1013 = null; - this.field1014 = null; - this.field1016 = null; - this.field1019 = null; - this.field1020 = null; - this.field1017 = null; - this.field1018 = null; - this.field1021 = 0; - this.field1022 = 0; + void method1834() { + this.field1028 = null; + this.field1033 = null; + this.field1029 = null; + this.field1027 = null; + this.field1035 = null; + this.field1030 = null; + this.field1040 = null; + this.field1034 = null; + this.field1037 = 0; + this.field1038 = 0; } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-211420525" + garbageValue = "-321629645" ) @Export("draw") void draw(int var1, int var2) { - if (this.field1017 == null) { + if (this.field1040 == null) { this.initColors(); } - if (this.field1023 == 0) { - this.field1023 = var2; + if (this.field1039 == 0) { + this.field1039 = var2; } - int var3 = var2 - this.field1023; + int var3 = var2 - this.field1039; if (var3 >= 256) { var3 = 0; } - this.field1023 = var2; + this.field1039 = var2; if (var3 > 0) { - this.method1807(var3); + this.method1806(var3); } - this.method1809(var1); + this.method1838(var1); } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(IB)V", - garbageValue = "0" + garbageValue = "1" ) - final void method1807(int var1) { - this.field1021 += 128 * var1; + final void method1806(int var1) { + this.field1037 += var1 * 128; int var2; - if (this.field1021 > this.field1019.length) { - this.field1021 -= this.field1019.length; + if (this.field1037 > this.field1035.length) { + this.field1037 -= this.field1035.length; var2 = (int)(Math.random() * 12.0D); - this.method1824(this.sprites[var2]); + this.method1811(this.sprites[var2]); } var2 = 0; @@ -214,12 +218,12 @@ public class LoginScreenAnimation { int var6; for (int var5 = 0; var5 < var4; ++var5) { - var6 = this.field1017[var3 + var2] - this.field1019[var2 + this.field1021 & this.field1019.length - 1] * var1 / 6; + var6 = this.field1040[var3 + var2] - this.field1035[var2 + this.field1037 & this.field1035.length - 1] * var1 / 6; if (var6 < 0) { var6 = 0; } - this.field1017[var2++] = var6; + this.field1040[var2++] = var6; } byte var15 = 10; @@ -233,42 +237,42 @@ public class LoginScreenAnimation { for (int var9 = 0; var9 < 128; ++var9) { var10 = (int)(Math.random() * 100.0D); if (var10 < 50 && var9 > var15 && var9 < var6) { - this.field1017[var8 + var9] = 255; + this.field1040[var8 + var9] = 255; } else { - this.field1017[var9 + var8] = 0; + this.field1040[var9 + var8] = 0; } } } - if (this.field1005 * 16 > 0) { - this.field1005 = this.field1005 * 16 - var1 * 4; + if (this.field1021 * 16 > 0) { + this.field1021 = this.field1021 * 16 - var1 * 4; } - if (this.field1011 * 16 > 0) { - this.field1011 = this.field1011 * 16 - var1 * 4; + if (this.field1032 * 16 > 0) { + this.field1032 = this.field1032 * 16 - var1 * 4; } - if (this.field1005 * 16 == 0 && this.field1011 * 16 == 0) { + if (this.field1021 * 16 == 0 && this.field1032 * 16 == 0) { var7 = (int)(Math.random() * (double)(2000 / var1)); if (var7 == 0) { - this.field1005 = 1024; + this.field1021 = 1024; } if (var7 == 1) { - this.field1011 = 1024; + this.field1032 = 1024; } } for (var7 = 0; var7 < 256 - var1; ++var7) { - this.field1009[var7] = this.field1009[var7 + var1]; + this.field1025[var7] = this.field1025[var7 + var1]; } for (var7 = 256 - var1; var7 < 256; ++var7) { - this.field1009[var7] = (int)(Math.sin((double)this.field1008 / 14.0D) * 16.0D + Math.sin((double)this.field1008 / 15.0D) * 14.0D + Math.sin((double)this.field1008 / 16.0D) * 12.0D); - ++this.field1008; + this.field1025[var7] = (int)(Math.sin((double)this.field1031 / 14.0D) * 16.0D + Math.sin((double)this.field1031 / 15.0D) * 14.0D + Math.sin((double)this.field1031 / 16.0D) * 12.0D); + ++this.field1031; } - this.field1022 = this.field1022 * 10000 + var1 * 10000; + this.field1038 = this.field1038 * 10000 + 10000 * var1; var7 = ((Client.cycle & 1) + var1) / 2; if (var7 > 0) { short var16 = 128; @@ -278,13 +282,13 @@ public class LoginScreenAnimation { int var11; int var12; int var13; - for (var11 = 0; var11 < this.field1022 * 100; ++var11) { + for (var11 = 0; var11 < this.field1038 * 100; ++var11) { var12 = (int)(Math.random() * (double)var10) + var17; var13 = (int)(Math.random() * (double)var16) + var16; - this.field1017[var12 + (var13 << 7)] = 192; + this.field1040[var12 + (var13 << 7)] = 192; } - this.field1022 = 0; + this.field1038 = 0; int var14; for (var11 = 0; var11 < 256; ++var11) { @@ -293,15 +297,15 @@ public class LoginScreenAnimation { for (var14 = -var7; var14 < 128; ++var14) { if (var14 + var7 < 128) { - var12 += this.field1017[var13 + var14 + var7]; + var12 += this.field1040[var7 + var13 + var14]; } if (var14 - (var7 + 1) >= 0) { - var12 -= this.field1017[var13 + var14 - (var7 + 1)]; + var12 -= this.field1040[var13 + var14 - (var7 + 1)]; } if (var14 >= 0) { - this.field1018[var13 + var14] = var12 / (var7 * 2 + 1); + this.field1034[var14 + var13] = var12 / (var7 * 2 + 1); } } } @@ -312,15 +316,15 @@ public class LoginScreenAnimation { for (var13 = -var7; var13 < 256; ++var13) { var14 = var13 * 128; if (var13 + var7 < 256) { - var12 += this.field1018[var14 + var11 + var7 * 128]; + var12 += this.field1034[var14 + var11 + var7 * 128]; } if (var13 - (var7 + 1) >= 0) { - var12 -= this.field1018[var14 + var11 - (var7 + 1) * 128]; + var12 -= this.field1034[var14 + var11 - (var7 + 1) * 128]; } if (var13 >= 0) { - this.field1017[var11 + var14] = var12 / (var7 * 2 + 1); + this.field1040[var14 + var11] = var12 / (var7 * 2 + 1); } } } @@ -328,66 +332,66 @@ public class LoginScreenAnimation { } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(IIII)I", - garbageValue = "2136023093" + garbageValue = "-2098157242" ) - final int method1808(int var1, int var2, int var3) { + final int method1807(int var1, int var2, int var3) { int var4 = 256 - var3; - return (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) + (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) >> 8; + return (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) + (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) >> 8; } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1234876855" + signature = "(IB)V", + garbageValue = "124" ) - final void method1809(int var1) { - int var2 = this.field1016.length; - if (this.field1005 * 16 > 0) { - this.method1810(this.field1005 * 16, this.field1013); - } else if (this.field1011 * 16 > 0) { - this.method1810(this.field1011 * 16, this.field1014); + final void method1838(int var1) { + int var2 = this.field1027.length; + if (this.field1021 * 16 > 0) { + this.method1809(this.field1021 * 16, this.field1033); + } else if (this.field1032 * 16 > 0) { + this.method1809(this.field1032 * 16, this.field1029); } else { for (int var3 = 0; var3 < var2; ++var3) { - this.field1016[var3] = this.field1012[var3]; + this.field1027[var3] = this.field1028[var3]; } } - this.method1811(var1); + this.method1816(var1); } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I[IB)V", - garbageValue = "3" + signature = "(I[II)V", + garbageValue = "1172962335" ) - final void method1810(int var1, int[] var2) { - int var3 = this.field1016.length; + final void method1809(int var1, int[] var2) { + int var3 = this.field1027.length; for (int var4 = 0; var4 < var3; ++var4) { if (var1 > 768) { - this.field1016[var4] = this.method1808(this.field1012[var4], var2[var4], 1024 - var1); + this.field1027[var4] = this.method1807(this.field1028[var4], var2[var4], 1024 - var1); } else if (var1 > 256) { - this.field1016[var4] = var2[var4]; + this.field1027[var4] = var2[var4]; } else { - this.field1016[var4] = this.method1808(var2[var4], this.field1012[var4], 256 - var1); + this.field1027[var4] = this.method1807(var2[var4], this.field1028[var4], 256 - var1); } } } - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1586915597" + garbageValue = "910695492" ) - final void method1811(int var1) { + final void method1816(int var1) { int var2 = 0; for (int var3 = 1; var3 < 255; ++var3) { - int var4 = (256 - var3) * this.field1009[var3] / 256; + int var4 = (256 - var3) * this.field1025[var3] / 256; int var5 = var4 + var1; int var6 = 0; int var7 = 128; @@ -396,22 +400,22 @@ public class LoginScreenAnimation { var5 = 0; } - if (var5 + 128 >= IgnoreList.rasterProvider.width) { - var7 = IgnoreList.rasterProvider.width - var5; + if (var5 + 128 >= DevicePcmPlayerProvider.rasterProvider.width) { + var7 = DevicePcmPlayerProvider.rasterProvider.width - var5; } - int var8 = var5 + (var3 + 8) * IgnoreList.rasterProvider.width; + int var8 = var5 + (var3 + 8) * DevicePcmPlayerProvider.rasterProvider.width; var2 += var6; for (int var9 = var6; var9 < var7; ++var9) { - int var10 = this.field1017[var2++]; + int var10 = this.field1040[var2++]; int var11 = var8 % Rasterizer2D.Rasterizer2D_width; if (var10 != 0 && var11 >= Rasterizer2D.Rasterizer2D_xClipStart && var11 < Rasterizer2D.Rasterizer2D_xClipEnd) { int var12 = var10; int var13 = 256 - var10; - var10 = this.field1016[var10]; - int var14 = IgnoreList.rasterProvider.pixels[var8]; - IgnoreList.rasterProvider.pixels[var8++] = -16777216 | (var13 * (var14 & 65280) + var12 * (var10 & 65280) & 16711680) + ((var14 & 16711935) * var13 + (var10 & 16711935) * var12 & -16711936) >> 8; + var10 = this.field1027[var10]; + int var14 = DevicePcmPlayerProvider.rasterProvider.pixels[var8]; + DevicePcmPlayerProvider.rasterProvider.pixels[var8++] = -16777216 | (var12 * (var10 & 65280) + var13 * (var14 & 65280) & 16711680) + ((var10 & 16711935) * var12 + (var14 & 16711935) * var13 & -16711936) >> 8; } else { ++var8; } @@ -422,21 +426,21 @@ public class LoginScreenAnimation { } - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(Lli;I)V", - garbageValue = "-1419079809" + garbageValue = "16711935" ) - final void method1824(IndexedSprite var1) { + final void method1811(IndexedSprite var1) { int var2; - for (var2 = 0; var2 < this.field1019.length; ++var2) { - this.field1019[var2] = 0; + for (var2 = 0; var2 < this.field1035.length; ++var2) { + this.field1035[var2] = 0; } int var3; for (var2 = 0; var2 < 5000; ++var2) { var3 = (int)(Math.random() * 128.0D * 256.0D); - this.field1019[var3] = (int)(Math.random() * 256.0D); + this.field1035[var3] = (int)(Math.random() * 256.0D); } int var4; @@ -445,13 +449,13 @@ public class LoginScreenAnimation { for (var3 = 1; var3 < 255; ++var3) { for (var4 = 1; var4 < 127; ++var4) { var5 = var4 + (var3 << 7); - this.field1020[var5] = (this.field1019[var5 - 128] + this.field1019[var5 + 1] + this.field1019[var5 + 128] + this.field1019[var5 - 1]) / 4; + this.field1030[var5] = (this.field1035[var5 + 1] + this.field1035[var5 - 128] + this.field1035[var5 + 128] + this.field1035[var5 - 1]) / 4; } } - int[] var8 = this.field1019; - this.field1019 = this.field1020; - this.field1020 = var8; + int[] var8 = this.field1035; + this.field1035 = this.field1030; + this.field1030 = var8; } if (var1 != null) { @@ -463,7 +467,7 @@ public class LoginScreenAnimation { var5 = var4 + var1.xOffset + 16; int var6 = var3 + var1.yOffset + 16; int var7 = var5 + (var6 << 7); - this.field1019[var7] = 0; + this.field1035[var7] = 0; } } } @@ -471,27 +475,381 @@ public class LoginScreenAnimation { } - @ObfuscatedName("f") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)[Lfi;", - garbageValue = "-1862845897" + signature = "(ILce;ZI)I", + garbageValue = "1539324178" ) - public static class179[] method1832() { - return new class179[]{class179.field2291, class179.field2290, class179.field2292, class179.field2289, class179.field2293, class179.field2294, class179.field2295, class179.field2296, class179.field2297, class179.field2298}; + static int method1835(int var0, Script var1, boolean var2) { + if (var0 < 1000) { + return WorldMapAreaData.method706(var0, var1, var2); + } else if (var0 < 1100) { + return MenuAction.method2106(var0, var1, var2); + } else if (var0 < 1200) { + return class2.method34(var0, var1, var2); + } else if (var0 < 1300) { + return Players.method2203(var0, var1, var2); + } else if (var0 < 1400) { + return JagexCache.method3566(var0, var1, var2); + } else if (var0 < 1500) { + return Player.method1300(var0, var1, var2); + } else if (var0 < 1600) { + return PacketBufferNode.method3697(var0, var1, var2); + } else if (var0 < 1700) { + return UserList.method5212(var0, var1, var2); + } else if (var0 < 1800) { + return NPCDefinition.method4818(var0, var1, var2); + } else if (var0 < 1900) { + return WorldMapData_0.method175(var0, var1, var2); + } else if (var0 < 2000) { + return class42.method810(var0, var1, var2); + } else if (var0 < 2100) { + return MenuAction.method2106(var0, var1, var2); + } else if (var0 < 2200) { + return class2.method34(var0, var1, var2); + } else if (var0 < 2300) { + return Players.method2203(var0, var1, var2); + } else if (var0 < 2400) { + return JagexCache.method3566(var0, var1, var2); + } else if (var0 < 2500) { + return Player.method1300(var0, var1, var2); + } else if (var0 < 2600) { + return NetSocket.method3608(var0, var1, var2); + } else if (var0 < 2700) { + return ViewportMouse.method3037(var0, var1, var2); + } else if (var0 < 2800) { + return InterfaceParent.method1191(var0, var1, var2); + } else if (var0 < 2900) { + return Players.method2200(var0, var1, var2); + } else if (var0 < 3000) { + return class42.method810(var0, var1, var2); + } else if (var0 < 3200) { + return UserComparator5.method3491(var0, var1, var2); + } else if (var0 < 3300) { + return WallDecoration.method3357(var0, var1, var2); + } else if (var0 < 3400) { + return SecureRandomFuture.method2169(var0, var1, var2); + } else if (var0 < 3500) { + return class223.method4193(var0, var1, var2); + } else if (var0 < 3700) { + return MusicPatch.method3962(var0, var1, var2); + } else if (var0 < 4000) { + return StructDefinition.method4627(var0, var1, var2); + } else if (var0 < 4100) { + return TileItemPile.method2834(var0, var1, var2); + } else if (var0 < 4200) { + return GraphicsDefaults.method5955(var0, var1, var2); + } else if (var0 < 4300) { + return class215.method4100(var0, var1, var2); + } else if (var0 < 5100) { + return method1808(var0, var1, var2); + } else if (var0 < 5400) { + return HealthBarUpdate.method1759(var0, var1, var2); + } else if (var0 < 5600) { + return FriendSystem.method1920(var0, var1, var2); + } else if (var0 < 5700) { + return WorldMapSectionType.method245(var0, var1, var2); + } else if (var0 < 6300) { + return ReflectionCheck.method2348(var0, var1, var2); + } else if (var0 < 6600) { + return WorldMapCacheName.method633(var0, var1, var2); + } else { + return var0 < 6700 ? UrlRequest.method3382(var0, var1, var2) : 2; + } } @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1841438031" + signature = "(Ljava/lang/String;I)V", + garbageValue = "-2014430142" ) - static void method1831() { - Players.Players_count = 0; + static final void method1837(String var0) { + class60.method1188(var0 + " is already on your friend list"); + } - for (int var0 = 0; var0 < 2048; ++var0) { - Players.field1228[var0] = null; - Players.field1231[var0] = 1; + @ObfuscatedName("aq") + @ObfuscatedSignature( + signature = "(ILce;ZI)I", + garbageValue = "580848394" + ) + static int method1808(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.publicChatMode; + return 1; + } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { + class320.Interpreter_intStackSize -= 3; + Client.publicChatMode = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + WorldMapSectionType.privateChatMode = UserComparator9.method3461(Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]); + if (WorldMapSectionType.privateChatMode == null) { + WorldMapSectionType.privateChatMode = PrivateChatMode.field3790; + } + + Client.tradeChatMode = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 2]; + PacketBufferNode var18 = TilePaint.getPacketBufferNode(ClientPacket.field2283, Client.packetWriter.isaacCipher); + var18.packetBuffer.writeByte(Client.publicChatMode); + var18.packetBuffer.writeByte(WorldMapSectionType.privateChatMode.field3787); + var18.packetBuffer.writeByte(Client.tradeChatMode); + Client.packetWriter.addNode(var18); + return 1; + } else { + String var3; + int var4; + if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { + var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + class320.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + int var5 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + PacketBufferNode var6 = TilePaint.getPacketBufferNode(ClientPacket.field2271, Client.packetWriter.isaacCipher); + var6.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var3) + 2); + var6.packetBuffer.writeStringCp1252NullTerminated(var3); + var6.packetBuffer.writeByte(var4 - 1); + var6.packetBuffer.writeByte(var5); + Client.packetWriter.addNode(var6); + return 1; + } else { + int var10; + if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { + class320.Interpreter_intStackSize -= 2; + var10 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + Message var15 = WorldMapRectangle.Messages_getByChannelAndID(var10, var4); + if (var15 != null) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var15.count; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var15.cycle; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var15.sender != null ? var15.sender : ""; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var15.prefix != null ? var15.prefix : ""; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var15.text != null ? var15.text : ""; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var15.isFromFriend() ? 1 : (var15.isFromIgnored() ? 2 : 0); + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { + var10 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Message var16 = class43.Messages_getMessage(var10); + if (var16 != null) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var16.type; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var16.cycle; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var16.sender != null ? var16.sender : ""; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var16.prefix != null ? var16.prefix : ""; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var16.text != null ? var16.text : ""; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var16.isFromFriend() ? 1 : (var16.isFromIgnored() ? 2 : 0); + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { + if (WorldMapSectionType.privateChatMode == null) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = WorldMapSectionType.privateChatMode.field3787; + } + + return 1; + } else if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { + var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + String var14 = var3.toLowerCase(); + byte var17 = 0; + if (var14.startsWith("yellow:")) { + var17 = 0; + var3 = var3.substring("yellow:".length()); + } else if (var14.startsWith("red:")) { + var17 = 1; + var3 = var3.substring("red:".length()); + } else if (var14.startsWith("green:")) { + var17 = 2; + var3 = var3.substring("green:".length()); + } else if (var14.startsWith("cyan:")) { + var17 = 3; + var3 = var3.substring("cyan:".length()); + } else if (var14.startsWith("purple:")) { + var17 = 4; + var3 = var3.substring("purple:".length()); + } else if (var14.startsWith("white:")) { + var17 = 5; + var3 = var3.substring("white:".length()); + } else if (var14.startsWith("flash1:")) { + var17 = 6; + var3 = var3.substring("flash1:".length()); + } else if (var14.startsWith("flash2:")) { + var17 = 7; + var3 = var3.substring("flash2:".length()); + } else if (var14.startsWith("flash3:")) { + var17 = 8; + var3 = var3.substring("flash3:".length()); + } else if (var14.startsWith("glow1:")) { + var17 = 9; + var3 = var3.substring("glow1:".length()); + } else if (var14.startsWith("glow2:")) { + var17 = 10; + var3 = var3.substring("glow2:".length()); + } else if (var14.startsWith("glow3:")) { + var17 = 11; + var3 = var3.substring("glow3:".length()); + } else if (FriendLoginUpdate.clientLanguage != Language.Language_EN) { + if (var14.startsWith("yellow:")) { + var17 = 0; + var3 = var3.substring("yellow:".length()); + } else if (var14.startsWith("red:")) { + var17 = 1; + var3 = var3.substring("red:".length()); + } else if (var14.startsWith("green:")) { + var17 = 2; + var3 = var3.substring("green:".length()); + } else if (var14.startsWith("cyan:")) { + var17 = 3; + var3 = var3.substring("cyan:".length()); + } else if (var14.startsWith("purple:")) { + var17 = 4; + var3 = var3.substring("purple:".length()); + } else if (var14.startsWith("white:")) { + var17 = 5; + var3 = var3.substring("white:".length()); + } else if (var14.startsWith("flash1:")) { + var17 = 6; + var3 = var3.substring("flash1:".length()); + } else if (var14.startsWith("flash2:")) { + var17 = 7; + var3 = var3.substring("flash2:".length()); + } else if (var14.startsWith("flash3:")) { + var17 = 8; + var3 = var3.substring("flash3:".length()); + } else if (var14.startsWith("glow1:")) { + var17 = 9; + var3 = var3.substring("glow1:".length()); + } else if (var14.startsWith("glow2:")) { + var17 = 10; + var3 = var3.substring("glow2:".length()); + } else if (var14.startsWith("glow3:")) { + var17 = 11; + var3 = var3.substring("glow3:".length()); + } + } + + var14 = var3.toLowerCase(); + byte var7 = 0; + if (var14.startsWith("wave:")) { + var7 = 1; + var3 = var3.substring("wave:".length()); + } else if (var14.startsWith("wave2:")) { + var7 = 2; + var3 = var3.substring("wave2:".length()); + } else if (var14.startsWith("shake:")) { + var7 = 3; + var3 = var3.substring("shake:".length()); + } else if (var14.startsWith("scroll:")) { + var7 = 4; + var3 = var3.substring("scroll:".length()); + } else if (var14.startsWith("slide:")) { + var7 = 5; + var3 = var3.substring("slide:".length()); + } else if (FriendLoginUpdate.clientLanguage != Language.Language_EN) { + if (var14.startsWith("wave:")) { + var7 = 1; + var3 = var3.substring("wave:".length()); + } else if (var14.startsWith("wave2:")) { + var7 = 2; + var3 = var3.substring("wave2:".length()); + } else if (var14.startsWith("shake:")) { + var7 = 3; + var3 = var3.substring("shake:".length()); + } else if (var14.startsWith("scroll:")) { + var7 = 4; + var3 = var3.substring("scroll:".length()); + } else if (var14.startsWith("slide:")) { + var7 = 5; + var3 = var3.substring("slide:".length()); + } + } + + PacketBufferNode var8 = TilePaint.getPacketBufferNode(ClientPacket.field2263, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeByte(0); + int var9 = var8.packetBuffer.offset; + var8.packetBuffer.writeByte(var4); + var8.packetBuffer.writeByte(var17); + var8.packetBuffer.writeByte(var7); + GrandExchangeOfferTotalQuantityComparator.method104(var8.packetBuffer, var3); + var8.packetBuffer.writeLengthByte(var8.packetBuffer.offset - var9); + Client.packetWriter.addNode(var8); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { + Message.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize]; + String var12 = Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize + 1]; + PacketBufferNode var11 = TilePaint.getPacketBufferNode(ClientPacket.field2241, Client.packetWriter.isaacCipher); + var11.packetBuffer.writeShort(0); + int var13 = var11.packetBuffer.offset; + var11.packetBuffer.writeStringCp1252NullTerminated(var3); + GrandExchangeOfferTotalQuantityComparator.method104(var11.packetBuffer, var12); + var11.packetBuffer.writeLengthShort(var11.packetBuffer.offset - var13); + Client.packetWriter.addNode(var11); + return 1; + } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { + if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.tradeChatMode; + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { + var10 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = class51.Messages_getHistorySize(var10); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { + var10 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = class13.Messages_getNextChatID(var10); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { + var10 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = ItemDefinition.Messages_getLastChatID(var10); + return 1; + } else if (var0 == ScriptOpcodes.DOCHEAT) { + var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + NetCache.doCheat(var3); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { + Client.field780 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize].toLowerCase().trim(); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = Client.field780; + return 1; + } else if (var0 == ScriptOpcodes.DEBUGMES) { + var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + System.out.println(var3); + return 1; + } else { + return 2; + } + } else { + if (class192.localPlayer != null && class192.localPlayer.username != null) { + var3 = class192.localPlayer.username.getName(); + } else { + var3 = ""; + } + + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3; + return 1; + } + } } + } + @ObfuscatedName("gk") + @ObfuscatedSignature( + signature = "(I)Z", + garbageValue = "115582492" + ) + static boolean method1819() { + return (Client.drawPlayerNames & 1) != 0; } } diff --git a/runescape-client/src/main/java/LoginType.java b/runescape-client/src/main/java/LoginType.java index 125f33c18b..9890f42cad 100644 --- a/runescape-client/src/main/java/LoginType.java +++ b/runescape-client/src/main/java/LoginType.java @@ -4,95 +4,89 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ll") +@ObfuscatedName("mv") @Implements("LoginType") public class LoginType { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lll;" + signature = "Lmv;" ) @Export("oldscape") public static final LoginType oldscape; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lll;" + signature = "Lmv;" ) - static final LoginType field4023; - @ObfuscatedName("y") + static final LoginType field4034; + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lll;" - ) - static final LoginType field4025; - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lll;" - ) - static final LoginType field4026; - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lll;" - ) - static final LoginType field4028; - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Lll;" - ) - static final LoginType field4024; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lll;" - ) - static final LoginType field4027; - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lll;" + signature = "Lmv;" ) static final LoginType field4030; - @ObfuscatedName("a") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lll;" + signature = "Lmv;" ) - public static final LoginType field4031; - @ObfuscatedName("lb") + static final LoginType field4031; + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lcq;" + signature = "Lmv;" ) - @Export("tempMenuAction") - static MenuAction tempMenuAction; + static final LoginType field4032; + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "Lmv;" + ) + static final LoginType field4033; @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = -1388330399 + @ObfuscatedSignature( + signature = "Lmv;" ) - public final int field4029; - @ObfuscatedName("c") - final String field4033; + static final LoginType field4028; + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "Lmv;" + ) + static final LoginType field4035; + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "Lmv;" + ) + public static final LoginType field4029; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -1632113899 + ) + final int field4037; + @ObfuscatedName("p") + final String field4038; static { - oldscape = new LoginType(6, 0, "", ""); - field4023 = new LoginType(2, 1, "", ""); - field4025 = new LoginType(3, 2, "", ""); - field4026 = new LoginType(8, 3, "", ""); - field4028 = new LoginType(1, 4, "", ""); - field4024 = new LoginType(4, 5, "", ""); - field4027 = new LoginType(5, 6, "", ""); - field4030 = new LoginType(0, 7, "", ""); - field4031 = new LoginType(7, -1, "", "", true, new LoginType[]{oldscape, field4023, field4025, field4028, field4026}); + oldscape = new LoginType(0, 0, "", ""); + field4034 = new LoginType(2, 1, "", ""); + field4030 = new LoginType(7, 2, "", ""); + field4031 = new LoginType(8, 3, "", ""); + field4032 = new LoginType(4, 4, "", ""); + field4033 = new LoginType(6, 5, "", ""); + field4028 = new LoginType(5, 6, "", ""); + field4035 = new LoginType(3, 7, "", ""); + field4029 = new LoginType(1, -1, "", "", true, new LoginType[]{oldscape, field4034, field4030, field4032, field4031}); } LoginType(int var1, int var2, String var3, String var4) { - this.field4029 = var1; - this.field4033 = var4; + this.field4037 = var1; + this.field4038 = var4; } @ObfuscatedSignature( - signature = "(IILjava/lang/String;Ljava/lang/String;Z[Lll;)V" + signature = "(IILjava/lang/String;Ljava/lang/String;Z[Lmv;)V" ) LoginType(int var1, int var2, String var3, String var4, boolean var5, LoginType[] var6) { - this.field4029 = var1; - this.field4033 = var4; + this.field4037 = var1; + this.field4038 = var4; } public String toString() { - return this.field4033; + return this.field4038; } } diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java index 0a9ac68ec9..2ed5714563 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -1,4 +1,3 @@ -import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; @@ -6,440 +5,156 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("cq") +@ObfuscatedName("ck") @Implements("MenuAction") public class MenuAction { @ObfuscatedName("c") - @Export("Tiles_saturation") - static int[] Tiles_saturation; - @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 1017693045 - ) - static int field1133; - @ObfuscatedName("fv") - @ObfuscatedSignature( - signature = "Lfu;" - ) - @Export("socketTask") - static Task socketTask; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 1602431119 + intValue = -171831145 ) @Export("param0") int param0; - @ObfuscatedName("i") + @ObfuscatedName("t") + @Export("action") + String action; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 2095911709 + intValue = -923254575 ) @Export("param1") int param1; - @ObfuscatedName("y") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1872419161 + intValue = -1388301791 ) @Export("opcode") int opcode; - @ObfuscatedName("w") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -445186717 + intValue = 455082071 ) @Export("identifier") int identifier; - @ObfuscatedName("p") - @Export("action") - String action; MenuAction() { } - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)[B", - garbageValue = "-369177149" + signature = "(Lks;I)V", + garbageValue = "-1231997766" ) - public static byte[] method2068() { - byte[] var0 = new byte[24]; + @Export("updatePlayer") + static final void updatePlayer(PacketBuffer var0) { + var0.importIndex(); + int var1 = Client.localPlayerIndex; + Player var2 = class192.localPlayer = Client.players[var1] = new Player(); + var2.index = var1; + int var3 = var0.readBits(30); + byte var4 = (byte)(var3 >> 28); + int var5 = var3 >> 14 & 16383; + int var6 = var3 & 16383; + var2.pathX[0] = var5 - Messages.baseX * 64; + var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); + var2.pathY[0] = var6 - Language.baseY * 64; + var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); + Clock.Client_plane = var2.plane = var4; + if (Players.field1235[var1] != null) { + var2.read(Players.field1235[var1]); + } - try { - JagexCache.JagexCache_randomDat.seek(0L); - JagexCache.JagexCache_randomDat.readFully(var0); + Players.Players_count = 0; + Players.Players_indices[++Players.Players_count - 1] = var1; + Players.field1236[var1] = 0; + Players.Players_emptyIdxCount = 0; - int var1; - for (var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) { - } - - if (var1 >= 24) { - throw new IOException(); - } - } catch (Exception var4) { - for (int var2 = 0; var2 < 24; ++var2) { - var0[var2] = -1; + for (int var7 = 1; var7 < 2048; ++var7) { + if (var1 != var7) { + int var8 = var0.readBits(18); + int var9 = var8 >> 16; + int var10 = var8 >> 8 & 597; + int var11 = var8 & 597; + Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); + Players.Players_orientations[var7] = 0; + Players.Players_targetIndices[var7] = -1; + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7; + Players.field1236[var7] = 0; } } - return var0; + var0.exportIndex(); } - @ObfuscatedName("au") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(ILcu;ZI)I", - garbageValue = "-1293771000" + signature = "(ILce;ZI)I", + garbageValue = "1513709763" ) - static int method2069(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.FRIEND_COUNT) { - if (Message.friendSystem.field1045 == 0) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -2; - } else if (Message.friendSystem.field1045 == 1) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Message.friendSystem.friendsList.getSize(); + static int method2106(int var0, Script var1, boolean var2) { + int var3 = -1; + Widget var4; + if (var0 >= 2000) { + var0 -= 1000; + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + var4 = Varps.getWidget(var3); + } else { + var4 = var2 ? class186.field2331 : MidiPcmStream.field2444; + } + + if (var0 == ScriptOpcodes.CC_SETPOSITION) { + class320.Interpreter_intStackSize -= 4; + var4.rawX = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var4.rawY = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + var4.xAlignment = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 2]; + var4.yAlignment = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 3]; + NPCDefinition.invalidateWidget(var4); + Username.client.alignWidget(var4); + if (var3 != -1 && var4.type == 0) { + WorldMapIcon_1.revalidateWidgetScroll(WorldMapLabel.Widget_interfaceComponents[var3 >> 16], var4, false); } return 1; - } else { - int var3; - if (var0 == ScriptOpcodes.FRIEND_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - if (Message.friendSystem.method1844() && var3 >= 0 && var3 < Message.friendSystem.friendsList.getSize()) { - Friend var8 = (Friend)Message.friendSystem.friendsList.get(var3); - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var8.getName(); - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var8.getPreviousName(); - } else { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - if (Message.friendSystem.method1844() && var3 >= 0 && var3 < Message.friendSystem.friendsList.getSize()) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = ((Buddy)Message.friendSystem.friendsList.get(var3)).world; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - if (Message.friendSystem.method1844() && var3 >= 0 && var3 < Message.friendSystem.friendsList.getSize()) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = ((Buddy)Message.friendSystem.friendsList.get(var3)).rank; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else { - String var5; - if (var0 == ScriptOpcodes.FRIEND_SETRANK) { - var5 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - int var6 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - BoundaryObject.method3274(var5, var6); - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_ADD) { - var5 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - Message.friendSystem.addFriend(var5); - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_DEL) { - var5 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - Message.friendSystem.removeFriend(var5); - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_ADD) { - var5 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - Message.friendSystem.addIgnore(var5); - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_DEL) { - var5 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - Message.friendSystem.removeIgnore(var5); - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_TEST) { - var5 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - var5 = WorldMapManager.method662(var5); - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Message.friendSystem.isFriended(new Username(var5, class188.loginType), false) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { - if (Calendar.clanChat != null) { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = Calendar.clanChat.name; - } else { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { - if (Calendar.clanChat != null) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Calendar.clanChat.getSize(); - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - if (Calendar.clanChat != null && var3 < Calendar.clanChat.getSize()) { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = Calendar.clanChat.get(var3).getUsername().getName(); - } else { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - if (Calendar.clanChat != null && var3 < Calendar.clanChat.getSize()) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = ((Buddy)Calendar.clanChat.get(var3)).getWorld(); - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - if (Calendar.clanChat != null && var3 < Calendar.clanChat.getSize()) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = ((Buddy)Calendar.clanChat.get(var3)).rank; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Calendar.clanChat != null ? Calendar.clanChat.minKick : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { - var5 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - WorldMapIcon_1.clanKickUser(var5); - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Calendar.clanChat != null ? Calendar.clanChat.rank : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { - var5 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - WorldMapSection2.Clan_joinChat(var5); - return 1; - } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { - class3.Clan_leaveChat(); - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { - if (!Message.friendSystem.method1844()) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Message.friendSystem.ignoreList.getSize(); - } - - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - if (Message.friendSystem.method1844() && var3 >= 0 && var3 < Message.friendSystem.ignoreList.getSize()) { - Ignored var4 = (Ignored)Message.friendSystem.ignoreList.get(var3); - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var4.getName(); - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var4.getPreviousName(); - } else { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_TEST) { - var5 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - var5 = WorldMapManager.method662(var5); - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Message.friendSystem.isIgnored(new Username(var5, class188.loginType)) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - if (Calendar.clanChat != null && var3 < Calendar.clanChat.getSize() && Calendar.clanChat.get(var3).getUsername().equals(Message.localPlayer.username)) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { - if (Calendar.clanChat != null && Calendar.clanChat.owner != null) { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = Calendar.clanChat.owner; - } else { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - if (Calendar.clanChat != null && var3 < Calendar.clanChat.getSize() && ((ClanMate)Calendar.clanChat.get(var3)).isFriend()) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { - if (var0 == 3628) { - Message.friendSystem.friendsList.removeComparator(); - return 1; - } else { - boolean var7; - if (var0 == 3629) { - var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - Message.friendSystem.friendsList.addComparator(new UserComparator1(var7)); - return 1; - } else if (var0 == 3630) { - var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - Message.friendSystem.friendsList.addComparator(new UserComparator2(var7)); - return 1; - } else if (var0 == 3631) { - var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - Message.friendSystem.friendsList.addComparator(new UserComparator3(var7)); - return 1; - } else if (var0 == 3632) { - var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - Message.friendSystem.friendsList.addComparator(new UserComparator4(var7)); - return 1; - } else if (var0 == 3633) { - var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - Message.friendSystem.friendsList.addComparator(new UserComparator5(var7)); - return 1; - } else if (var0 == 3634) { - var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - Message.friendSystem.friendsList.addComparator(new UserComparator6(var7)); - return 1; - } else if (var0 == 3635) { - var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - Message.friendSystem.friendsList.addComparator(new UserComparator7(var7)); - return 1; - } else if (var0 == 3636) { - var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - Message.friendSystem.friendsList.addComparator(new UserComparator8(var7)); - return 1; - } else if (var0 == 3637) { - var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - Message.friendSystem.friendsList.addComparator(new UserComparator9(var7)); - return 1; - } else if (var0 == 3638) { - var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - Message.friendSystem.friendsList.addComparator(new UserComparator10(var7)); - return 1; - } else if (var0 == 3639) { - Message.friendSystem.friendsList.sort(); - return 1; - } else if (var0 == 3640) { - Message.friendSystem.ignoreList.removeComparator(); - return 1; - } else if (var0 == 3641) { - var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - Message.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); - return 1; - } else if (var0 == 3642) { - var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - Message.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); - return 1; - } else if (var0 == 3643) { - Message.friendSystem.ignoreList.sort(); - return 1; - } else if (var0 == 3644) { - if (Calendar.clanChat != null) { - Calendar.clanChat.removeComparator(); - } - - return 1; - } else if (var0 == 3645) { - var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - if (Calendar.clanChat != null) { - Calendar.clanChat.addComparator(new UserComparator1(var7)); - } - - return 1; - } else if (var0 == 3646) { - var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - if (Calendar.clanChat != null) { - Calendar.clanChat.addComparator(new UserComparator2(var7)); - } - - return 1; - } else if (var0 == 3647) { - var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - if (Calendar.clanChat != null) { - Calendar.clanChat.addComparator(new UserComparator3(var7)); - } - - return 1; - } else if (var0 == 3648) { - var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - if (Calendar.clanChat != null) { - Calendar.clanChat.addComparator(new UserComparator4(var7)); - } - - return 1; - } else if (var0 == 3649) { - var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - if (Calendar.clanChat != null) { - Calendar.clanChat.addComparator(new UserComparator5(var7)); - } - - return 1; - } else if (var0 == 3650) { - var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - if (Calendar.clanChat != null) { - Calendar.clanChat.addComparator(new UserComparator6(var7)); - } - - return 1; - } else if (var0 == 3651) { - var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - if (Calendar.clanChat != null) { - Calendar.clanChat.addComparator(new UserComparator7(var7)); - } - - return 1; - } else if (var0 == 3652) { - var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - if (Calendar.clanChat != null) { - Calendar.clanChat.addComparator(new UserComparator8(var7)); - } - - return 1; - } else if (var0 == 3653) { - var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - if (Calendar.clanChat != null) { - Calendar.clanChat.addComparator(new UserComparator9(var7)); - } - - return 1; - } else if (var0 == 3654) { - var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - if (Calendar.clanChat != null) { - Calendar.clanChat.addComparator(new UserComparator10(var7)); - } - - return 1; - } else if (var0 == 3655) { - if (Calendar.clanChat != null) { - Calendar.clanChat.sort(); - } - - return 1; - } else if (var0 == 3656) { - var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - Message.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); - return 1; - } else if (var0 == 3657) { - var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - if (Calendar.clanChat != null) { - Calendar.clanChat.addComparator(new BuddyRankComparator(var7)); - } - - return 1; - } else { - return 2; - } - } - } else { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - if (Calendar.clanChat != null && var3 < Calendar.clanChat.getSize() && ((ClanMate)Calendar.clanChat.get(var3)).isIgnored()) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } + } else if (var0 == ScriptOpcodes.CC_SETSIZE) { + class320.Interpreter_intStackSize -= 4; + var4.rawWidth = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var4.rawHeight = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + var4.widthAlignment = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 2]; + var4.heightAlignment = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 3]; + NPCDefinition.invalidateWidget(var4); + Username.client.alignWidget(var4); + if (var3 != -1 && var4.type == 0) { + WorldMapIcon_1.revalidateWidgetScroll(WorldMapLabel.Widget_interfaceComponents[var3 >> 16], var4, false); } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETHIDE) { + boolean var5 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + if (var5 != var4.isHidden) { + var4.isHidden = var5; + NPCDefinition.invalidateWidget(var4); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { + var4.noClickThrough = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { + var4.noScrollThrough = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + return 1; + } else { + return 2; } } + + @ObfuscatedName("kg") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-879378563" + ) + @Export("Clan_leaveChat") + static final void Clan_leaveChat() { + PacketBufferNode var0 = TilePaint.getPacketBufferNode(ClientPacket.field2252, Client.packetWriter.isaacCipher); + var0.packetBuffer.writeByte(0); + Client.packetWriter.addNode(var0); + } } diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java index 1c3a54306b..959c1cf5b6 100644 --- a/runescape-client/src/main/java/Message.java +++ b/runescape-client/src/main/java/Message.java @@ -1,75 +1,68 @@ -import java.io.File; -import java.io.RandomAccessFile; +import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bs") +@ObfuscatedName("bn") @Implements("Message") public class Message extends DualNode { - @ObfuscatedName("rp") - @ObfuscatedSignature( - signature = "Lbi;" - ) - @Export("friendSystem") - public static FriendSystem friendSystem; - @ObfuscatedName("bz") - @ObfuscatedSignature( - signature = "[Lli;" - ) - @Export("worldSelectArrows") - static IndexedSprite[] worldSelectArrows; - @ObfuscatedName("jg") - @ObfuscatedSignature( - signature = "Lbn;" - ) - @Export("localPlayer") - static Player localPlayer; - @ObfuscatedName("f") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 2145696747 + intValue = -1052025849 + ) + @Export("Interpreter_stringStackSize") + static int Interpreter_stringStackSize; + @ObfuscatedName("kn") + @ObfuscatedGetter( + intValue = -757596803 + ) + @Export("menuHeight") + static int menuHeight; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 586338987 ) @Export("count") int count; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1217348159 + intValue = -1201129701 ) @Export("cycle") int cycle; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1995619175 + intValue = 213775829 ) @Export("type") int type; - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("sender") String sender; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Ljc;" + signature = "Ljz;" ) @Export("senderUsername") Username senderUsername; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Ljf;" + signature = "Lju;" ) @Export("isFromFriend0") TriBool isFromFriend0; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Ljf;" + signature = "Lju;" ) @Export("isFromIgnored0") TriBool isFromIgnored0; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("prefix") String prefix; - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("text") String text; @@ -79,15 +72,14 @@ public class Message extends DualNode { this.set(var1, var2, var3, var4); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-220493658" + garbageValue = "-1939777476" ) @Export("set") void set(int var1, String var2, String var3, String var4) { - int var5 = ++Messages.Messages_count - 1; - this.count = var5; + this.count = class4.method57(); this.cycle = Client.cycle; this.type = var1; this.sender = var2; @@ -98,20 +90,20 @@ public class Message extends DualNode { this.clearIsFromIgnored(); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1286059763" + garbageValue = "503642535" ) @Export("clearIsFromFriend") void clearIsFromFriend() { this.isFromFriend0 = TriBool.TriBool_unknown; } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-2036111403" + signature = "(B)Z", + garbageValue = "0" ) @Export("isFromFriend") final boolean isFromFriend() { @@ -122,30 +114,30 @@ public class Message extends DualNode { return this.isFromFriend0 == TriBool.TriBool_true; } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-928158145" + signature = "(B)V", + garbageValue = "1" ) @Export("fillIsFromFriend") void fillIsFromFriend() { - this.isFromFriend0 = friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isFromFriend0 = KeyHandler.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "450069868" + garbageValue = "-2064859672" ) @Export("clearIsFromIgnored") void clearIsFromIgnored() { this.isFromIgnored0 = TriBool.TriBool_unknown; } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1235036606" + garbageValue = "-435736879" ) @Export("isFromIgnored") final boolean isFromIgnored() { @@ -156,395 +148,75 @@ public class Message extends DualNode { return this.isFromIgnored0 == TriBool.TriBool_true; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "80" + signature = "(I)V", + garbageValue = "-1506874350" ) @Export("fillIsFromIgnored") void fillIsFromIgnored() { - this.isFromIgnored0 = friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isFromIgnored0 = KeyHandler.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1271622880" + garbageValue = "-1639936728" ) @Export("fillSenderUsername") final void fillSenderUsername() { if (this.sender != null) { - this.senderUsername = new Username(WorldMapManager.method662(this.sender), class188.loginType); + this.senderUsername = new Username(MouseRecorder.method1207(this.sender), class192.loginType); } else { this.senderUsername = null; } } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)Ljava/io/File;", - garbageValue = "25" + signature = "(I)[Lic;", + garbageValue = "16777215" ) - @Export("getFile") - static File getFile(String var0) { - if (!FileSystem.FileSystem_hasPermissions) { - throw new RuntimeException(""); - } else { - File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); - if (var1 != null) { - return var1; - } else { - File var2 = new File(GrandExchangeOfferNameComparator.FileSystem_cacheDir, var0); - RandomAccessFile var3 = null; - - try { - File var4 = new File(var2.getParent()); - if (!var4.exists()) { - throw new RuntimeException(""); - } else { - var3 = new RandomAccessFile(var2, "rw"); - int var5 = var3.read(); - var3.seek(0L); - var3.write(var5); - var3.seek(0L); - var3.close(); - FileSystem.FileSystem_cacheFiles.put(var0, var2); - return var2; - } - } catch (Exception var8) { - try { - if (var3 != null) { - var3.close(); - var3 = null; - } - } catch (Exception var7) { - } - - throw new RuntimeException(); - } - } - } + static VerticalAlignment[] method1229() { + return new VerticalAlignment[]{VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field3198, VerticalAlignment.field3196}; } - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1512311180" + signature = "(B)V", + garbageValue = "-71" ) - public static void method1223() { - class325.SpriteBuffer_xOffsets = null; - class325.SpriteBuffer_yOffsets = null; - UserComparator1.SpriteBuffer_spriteWidths = null; - class325.SpriteBuffer_spriteHeights = null; - class268.SpriteBuffer_spritePalette = null; - class290.SpriteBuffer_pixels = null; + static void method1228() { + Iterator var0 = Messages.Messages_hashTable.iterator(); + + while (var0.hasNext()) { + Message var1 = (Message)var0.next(); + var1.clearIsFromFriend(); + } + } - @ObfuscatedName("fw") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(Liv;IIII)V", - garbageValue = "-860249391" + signature = "(III)V", + garbageValue = "1913324083" ) - @Export("addSequenceSoundEffect") - static void addSequenceSoundEffect(SequenceDefinition var0, int var1, int var2, int var3) { - if (Client.soundEffectCount < 50 && Client.areaSoundEffectVolume != 0) { - if (var0.soundEffects != null && var1 < var0.soundEffects.length) { - int var4 = var0.soundEffects[var1]; - if (var4 != 0) { - int var5 = var4 >> 8; - int var6 = var4 >> 4 & 7; - int var7 = var4 & 15; - Client.soundEffectIds[Client.soundEffectCount] = var5; - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6; - Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; - Client.soundEffects[Client.soundEffectCount] = null; - int var8 = (var2 - 64) / 128; - int var9 = (var3 - 64) / 128; - Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16); - ++Client.soundEffectCount; - } - } - } + public static final void method1246(int var0, int var1) { + ViewportMouse.ViewportMouse_x = var0; + ViewportMouse.ViewportMouse_y = var1; + ViewportMouse.ViewportMouse_isInViewport = true; + ViewportMouse.ViewportMouse_entityCount = 0; + ViewportMouse.ViewportMouse_false0 = false; } - @ObfuscatedName("gx") + @ObfuscatedName("jb") @ObfuscatedSignature( - signature = "(Lbv;IB)V", - garbageValue = "58" + signature = "(B)Z", + garbageValue = "-53" ) - @Export("updateActorSequence") - static final void updateActorSequence(Actor var0, int var1) { - SequenceDefinition var2; - int var11; - if (var0.field950 > Client.cycle) { - ScriptEvent.method1180(var0); - } else if (var0.field969 >= Client.cycle) { - WorldMapSectionType.method239(var0); - } else { - var0.movementSequence = var0.readySequence; - if (var0.pathLength == 0) { - var0.field980 = 0; - } else { - label416: { - if (var0.sequence != -1 && var0.sequenceDelay == 0) { - var2 = WorldMapSection0.SequenceDefinition_get(var0.sequence); - if (var0.field926 > 0 && var2.field3478 == 0) { - ++var0.field980; - break label416; - } - - if (var0.field926 <= 0 && var2.field3493 == 0) { - ++var0.field980; - break label416; - } - } - - var11 = var0.x; - int var12 = var0.y; - int var4 = var0.pathX[var0.pathLength - 1] * 128 + var0.field925 * 64; - int var5 = var0.pathY[var0.pathLength - 1] * 128 + var0.field925 * 64; - if (var11 < var4) { - if (var12 < var5) { - var0.orientation = 1280; - } else if (var12 > var5) { - var0.orientation = 1792; - } else { - var0.orientation = 1536; - } - } else if (var11 > var4) { - if (var12 < var5) { - var0.orientation = 768; - } else if (var12 > var5) { - var0.orientation = 256; - } else { - var0.orientation = 512; - } - } else if (var12 < var5) { - var0.orientation = 1024; - } else if (var12 > var5) { - var0.orientation = 0; - } - - byte var6 = var0.pathTraversed[var0.pathLength - 1]; - if (var4 - var11 <= 256 && var4 - var11 >= -256 && var5 - var12 <= 256 && var5 - var12 >= -256) { - int var7 = var0.orientation - var0.rotation & 2047; - if (var7 > 1024) { - var7 -= 2048; - } - - int var8 = var0.walkBackSequence; - if (var7 >= -256 && var7 <= 256) { - var8 = var0.walkSequence; - } else if (var7 >= 256 && var7 < 768) { - var8 = var0.walkRightSequence; - } else if (var7 >= -768 && var7 <= -256) { - var8 = var0.walkLeftSequence; - } - - if (var8 == -1) { - var8 = var0.walkSequence; - } - - var0.movementSequence = var8; - int var9 = 4; - boolean var10 = true; - if (var0 instanceof NPC) { - var10 = ((NPC)var0).definition.isClickable; - } - - if (var10) { - if (var0.rotation != var0.orientation && var0.targetIndex == -1 && var0.field968 != 0) { - var9 = 2; - } - - if (var0.pathLength > 2) { - var9 = 6; - } - - if (var0.pathLength > 3) { - var9 = 8; - } - - if (var0.field980 > 0 && var0.pathLength > 1) { - var9 = 8; - --var0.field980; - } - } else { - if (var0.pathLength > 1) { - var9 = 6; - } - - if (var0.pathLength > 2) { - var9 = 8; - } - - if (var0.field980 > 0 && var0.pathLength > 1) { - var9 = 8; - --var0.field980; - } - } - - if (var6 == 2) { - var9 <<= 1; - } - - if (var9 >= 8 && var0.movementSequence == var0.walkSequence && var0.runSequence != -1) { - var0.movementSequence = var0.runSequence; - } - - if (var11 != var4 || var5 != var12) { - if (var11 < var4) { - var0.x += var9; - if (var0.x > var4) { - var0.x = var4; - } - } else if (var11 > var4) { - var0.x -= var9; - if (var0.x < var4) { - var0.x = var4; - } - } - - if (var12 < var5) { - var0.y += var9; - if (var0.y > var5) { - var0.y = var5; - } - } else if (var12 > var5) { - var0.y -= var9; - if (var0.y < var5) { - var0.y = var5; - } - } - } - - if (var4 == var0.x && var5 == var0.y) { - --var0.pathLength; - if (var0.field926 > 0) { - --var0.field926; - } - } - } else { - var0.x = var4; - var0.y = var5; - --var0.pathLength; - if (var0.field926 > 0) { - --var0.field926; - } - } - } - } - } - - if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { - var0.sequence = -1; - var0.spotAnimation = -1; - var0.field950 = 0; - var0.field969 = 0; - var0.x = var0.pathX[0] * 128 + var0.field925 * 64; - var0.y = var0.pathY[0] * 128 + var0.field925 * 64; - var0.method1742(); - } - - if (localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { - var0.sequence = -1; - var0.spotAnimation = -1; - var0.field950 = 0; - var0.field969 = 0; - var0.x = var0.pathX[0] * 128 + var0.field925 * 64; - var0.y = var0.pathY[0] * 128 + var0.field925 * 64; - var0.method1742(); - } - - class3.method48(var0); - var0.isWalking = false; - if (var0.movementSequence != -1) { - var2 = WorldMapSection0.SequenceDefinition_get(var0.movementSequence); - if (var2 != null && var2.frameIds != null) { - ++var0.movementFrameCycle; - if (var0.movementFrame < var2.frameIds.length && var0.movementFrameCycle > var2.frameLengths[var0.movementFrame]) { - var0.movementFrameCycle = 1; - ++var0.movementFrame; - addSequenceSoundEffect(var2, var0.movementFrame, var0.x, var0.y); - } - - if (var0.movementFrame >= var2.frameIds.length) { - var0.movementFrameCycle = 0; - var0.movementFrame = 0; - addSequenceSoundEffect(var2, var0.movementFrame, var0.x, var0.y); - } - } else { - var0.movementSequence = -1; - } - } - - if (var0.spotAnimation != -1 && Client.cycle >= var0.field943) { - if (var0.spotAnimationFrame < 0) { - var0.spotAnimationFrame = 0; - } - - var11 = ClientPacket.SpotAnimationDefinition_get(var0.spotAnimation).sequence; - if (var11 != -1) { - SequenceDefinition var3 = WorldMapSection0.SequenceDefinition_get(var11); - if (var3 != null && var3.frameIds != null) { - ++var0.spotAnimationFrameCycle; - if (var0.spotAnimationFrame < var3.frameIds.length && var0.spotAnimationFrameCycle > var3.frameLengths[var0.spotAnimationFrame]) { - var0.spotAnimationFrameCycle = 1; - ++var0.spotAnimationFrame; - addSequenceSoundEffect(var3, var0.spotAnimationFrame, var0.x, var0.y); - } - - if (var0.spotAnimationFrame >= var3.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var3.frameIds.length)) { - var0.spotAnimation = -1; - } - } else { - var0.spotAnimation = -1; - } - } else { - var0.spotAnimation = -1; - } - } - - if (var0.sequence != -1 && var0.sequenceDelay <= 1) { - var2 = WorldMapSection0.SequenceDefinition_get(var0.sequence); - if (var2.field3478 == 1 && var0.field926 > 0 && var0.field950 <= Client.cycle && var0.field969 < Client.cycle) { - var0.sequenceDelay = 1; - return; - } - } - - if (var0.sequence != -1 && var0.sequenceDelay == 0) { - var2 = WorldMapSection0.SequenceDefinition_get(var0.sequence); - if (var2 != null && var2.frameIds != null) { - ++var0.sequenceFrameCycle; - if (var0.sequenceFrame < var2.frameIds.length && var0.sequenceFrameCycle > var2.frameLengths[var0.sequenceFrame]) { - var0.sequenceFrameCycle = 1; - ++var0.sequenceFrame; - addSequenceSoundEffect(var2, var0.sequenceFrame, var0.x, var0.y); - } - - if (var0.sequenceFrame >= var2.frameIds.length) { - var0.sequenceFrame -= var2.frameCount; - ++var0.field958; - if (var0.field958 >= var2.field3496) { - var0.sequence = -1; - } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var2.frameIds.length) { - addSequenceSoundEffect(var2, var0.sequenceFrame, var0.x, var0.y); - } else { - var0.sequence = -1; - } - } - - var0.isWalking = var2.field3488; - } else { - var0.sequence = -1; - } - } - - if (var0.sequenceDelay > 0) { - --var0.sequenceDelay; - } - + @Export("getTapToDrop") + static boolean getTapToDrop() { + return Client.tapToDrop; } } diff --git a/runescape-client/src/main/java/Messages.java b/runescape-client/src/main/java/Messages.java index 27ba77cf62..834444852b 100644 --- a/runescape-client/src/main/java/Messages.java +++ b/runescape-client/src/main/java/Messages.java @@ -1,5 +1,12 @@ -import java.io.File; +import java.io.ByteArrayInputStream; import java.io.IOException; +import java.io.InvalidClassException; +import java.io.ObjectInputStream; +import java.io.OptionalDataException; +import java.io.StreamCorruptedException; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; import net.runelite.mapping.Export; @@ -7,31 +14,38 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; -@ObfuscatedName("ce") +@ObfuscatedName("cy") @Implements("Messages") public class Messages { - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("Messages_channels") static final Map Messages_channels; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Llc;" + signature = "Llp;" ) @Export("Messages_hashTable") static final IterableNodeHashTable Messages_hashTable; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lji;" + signature = "Ljb;" ) @Export("Messages_queue") static final IterableDualNodeQueue Messages_queue; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -984405515 + intValue = 679666473 ) @Export("Messages_count") static int Messages_count; + @ObfuscatedName("fa") + @ObfuscatedGetter( + intValue = -334817875 + ) + @Export("baseX") + static int baseX; static { Messages_channels = new HashMap(); @@ -40,118 +54,125 @@ public class Messages { Messages_count = 0; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "-2062774197" + signature = "(IB)Lij;", + garbageValue = "126" ) - public static boolean method2240(int var0) { - return var0 >= WorldMapDecorationType.field2719.id && var0 <= WorldMapDecorationType.field2708.id || var0 == WorldMapDecorationType.field2707.id; - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(Lhz;I)V", - garbageValue = "2079698916" - ) - public static void method2227(AbstractArchive var0) { - StructDefinition.StructDefinition_archive = var0; - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(IB)Lib;", - garbageValue = "83" - ) - @Export("FloorUnderlayDefinition_get") - public static FloorOverlayDefinition FloorUnderlayDefinition_get(int var0) { - FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); + @Export("VarpDefinition_get") + public static VarpDefinition VarpDefinition_get(int var0) { + VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); if (var1 != null) { return var1; } else { - byte[] var2 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var0); - var1 = new FloorOverlayDefinition(); + byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); + var1 = new VarpDefinition(); if (var2 != null) { - var1.decode(new Buffer(var2), var0); + var1.decode(new Buffer(var2)); } - var1.postDecode(); - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0); + VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); return var1; } } - @ObfuscatedName("w") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;ZI)Lmk;", - garbageValue = "1038906134" + signature = "(Lks;I)V", + garbageValue = "1739946612" ) - @Export("getPreferencesFile") - public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { - File var3 = new File(JagexCache.cacheDir, "preferences" + var0 + ".dat"); - if (var3.exists()) { - try { - AccessFile var10 = new AccessFile(var3, "rw", 10000L); - return var10; - } catch (IOException var9) { + @Export("performReflectionCheck") + public static void performReflectionCheck(PacketBuffer var0) { + ReflectionCheck var1 = (ReflectionCheck)class96.reflectionChecks.last(); + if (var1 != null) { + int var2 = var0.offset; + var0.writeInt(var1.id); + + for (int var3 = 0; var3 < var1.size; ++var3) { + if (var1.creationErrors[var3] != 0) { + var0.writeByte(var1.creationErrors[var3]); + } else { + try { + int var4 = var1.operations[var3]; + Field var5; + int var6; + if (var4 == 0) { + var5 = var1.fields[var3]; + var6 = Reflection.getInt(var5, (Object)null); + var0.writeByte(0); + var0.writeInt(var6); + } else if (var4 == 1) { + var5 = var1.fields[var3]; + Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); + var0.writeByte(0); + } else if (var4 == 2) { + var5 = var1.fields[var3]; + var6 = var5.getModifiers(); + var0.writeByte(0); + var0.writeInt(var6); + } + + Method var25; + if (var4 != 3) { + if (var4 == 4) { + var25 = var1.methods[var3]; + var6 = var25.getModifiers(); + var0.writeByte(0); + var0.writeInt(var6); + } + } else { + var25 = var1.methods[var3]; + byte[][] var10 = var1.arguments[var3]; + Object[] var7 = new Object[var10.length]; + + for (int var8 = 0; var8 < var10.length; ++var8) { + ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); + var7[var8] = var9.readObject(); + } + + Object var11 = Reflection.invoke(var25, (Object)null, var7); + if (var11 == null) { + var0.writeByte(0); + } else if (var11 instanceof Number) { + var0.writeByte(1); + var0.writeLong(((Number)var11).longValue()); + } else if (var11 instanceof String) { + var0.writeByte(2); + var0.writeStringCp1252NullTerminated((String)var11); + } else { + var0.writeByte(4); + } + } + } catch (ClassNotFoundException var13) { + var0.writeByte(-10); + } catch (InvalidClassException var14) { + var0.writeByte(-11); + } catch (StreamCorruptedException var15) { + var0.writeByte(-12); + } catch (OptionalDataException var16) { + var0.writeByte(-13); + } catch (IllegalAccessException var17) { + var0.writeByte(-14); + } catch (IllegalArgumentException var18) { + var0.writeByte(-15); + } catch (InvocationTargetException var19) { + var0.writeByte(-16); + } catch (SecurityException var20) { + var0.writeByte(-17); + } catch (IOException var21) { + var0.writeByte(-18); + } catch (NullPointerException var22) { + var0.writeByte(-19); + } catch (Exception var23) { + var0.writeByte(-20); + } catch (Throwable var24) { + var0.writeByte(-21); + } + } } + + var0.writeCrc(var2); + var1.remove(); } - - String var4 = ""; - if (VertexNormal.cacheGamebuild == 33) { - var4 = "_rc"; - } else if (VertexNormal.cacheGamebuild == 34) { - var4 = "_wip"; - } - - File var5 = new File(ReflectionCheck.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); - AccessFile var6; - if (!var2 && var5.exists()) { - try { - var6 = new AccessFile(var5, "rw", 10000L); - return var6; - } catch (IOException var8) { - } - } - - try { - var6 = new AccessFile(var3, "rw", 10000L); - return var6; - } catch (IOException var7) { - throw new RuntimeException(); - } - } - - @ObfuscatedName("it") - @ObfuscatedSignature( - signature = "(Lcq;III)V", - garbageValue = "-1826909304" - ) - static final void method2231(MenuAction var0, int var1, int var2) { - AbstractWorldMapData.menuAction(var0.param0, var0.param1, var0.opcode, var0.identifier, var0.action, var0.action, var1, var2); - } - - @ObfuscatedName("jo") - @ObfuscatedSignature( - signature = "([Lha;Lha;ZI)V", - garbageValue = "1663251439" - ) - @Export("revalidateWidgetScroll") - static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { - int var3 = var1.scrollWidth != 0 ? var1.scrollWidth : var1.width; - int var4 = var1.scrollHeight != 0 ? var1.scrollHeight : var1.height; - FloorOverlayDefinition.resizeInterface(var0, var1.id, var3, var4, var2); - if (var1.children != null) { - FloorOverlayDefinition.resizeInterface(var1.children, var1.id, var3, var4, var2); - } - - InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); - if (var5 != null) { - LoginPacket.method3572(var5.group, var3, var4, var2); - } - - if (var1.contentType == 1337) { - } - } } diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java index f71371349c..6508f167e2 100644 --- a/runescape-client/src/main/java/MidiFileReader.java +++ b/runescape-client/src/main/java/MidiFileReader.java @@ -3,38 +3,38 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gr") +@ObfuscatedName("gg") @Implements("MidiFileReader") public class MidiFileReader { - @ObfuscatedName("d") - static final byte[] field2457; - @ObfuscatedName("f") + @ObfuscatedName("m") + static final byte[] field2477; + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lkq;" + signature = "Lkp;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("division") int division; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("trackStarts") int[] trackStarts; - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("trackPositions") int[] trackPositions; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("trackLengths") int[] trackLengths; - @ObfuscatedName("b") - int[] field2453; - @ObfuscatedName("e") - int field2451; - @ObfuscatedName("a") - long field2459; + @ObfuscatedName("g") + int[] field2473; + @ObfuscatedName("d") + int field2474; + @ObfuscatedName("j") + long field2476; static { - field2457 = new byte[]{2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; + field2477 = new byte[]{2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; } MidiFileReader(byte[] var1) { @@ -46,14 +46,14 @@ public class MidiFileReader { this.buffer = new Buffer((byte[])null); } - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("parse") void parse(byte[] var1) { this.buffer.array = var1; this.buffer.offset = 10; int var2 = this.buffer.readUnsignedShort(); this.division = this.buffer.readUnsignedShort(); - this.field2451 = 500000; + this.field2474 = 500000; this.trackStarts = new int[var2]; Buffer var10000; @@ -70,7 +70,7 @@ public class MidiFileReader { var10000 = this.buffer; } - this.field2459 = 0L; + this.field2476 = 0L; this.trackPositions = new int[var2]; for (var3 = 0; var3 < var2; ++var3) { @@ -78,50 +78,50 @@ public class MidiFileReader { } this.trackLengths = new int[var2]; - this.field2453 = new int[var2]; + this.field2473 = new int[var2]; } - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("clear") void clear() { this.buffer.array = null; this.trackStarts = null; this.trackPositions = null; this.trackLengths = null; - this.field2453 = null; + this.field2473 = null; } - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("isReady") boolean isReady() { return this.buffer.array != null; } - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("trackCount") int trackCount() { return this.trackPositions.length; } - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("gotoTrack") void gotoTrack(int var1) { this.buffer.offset = this.trackPositions[var1]; } - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("markTrackPosition") void markTrackPosition(int var1) { this.trackPositions[var1] = this.buffer.offset; } - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("setTrackDone") void setTrackDone() { this.buffer.offset = -1; } - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("readTrackLength") void readTrackLength(int var1) { int var2 = this.buffer.readVarInt(); @@ -129,36 +129,36 @@ public class MidiFileReader { var10000[var1] += var2; } - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("readMessage") int readMessage(int var1) { int var2 = this.readMessage0(var1); return var2; } - @ObfuscatedName("d") + @ObfuscatedName("m") @Export("readMessage0") int readMessage0(int var1) { byte var2 = this.buffer.array[this.buffer.offset]; int var5; if (var2 < 0) { var5 = var2 & 255; - this.field2453[var1] = var5; + this.field2473[var1] = var5; ++this.buffer.offset; } else { - var5 = this.field2453[var1]; + var5 = this.field2473[var1]; } if (var5 != 240 && var5 != 247) { - return this.method3828(var1, var5); + return this.method3914(var1, var5); } else { int var3 = this.buffer.readVarInt(); if (var5 == 247 && var3 > 0) { int var4 = this.buffer.array[this.buffer.offset] & 255; if (var4 >= 241 && var4 <= 243 || var4 == 246 || var4 == 248 || var4 >= 250 && var4 <= 252 || var4 == 254) { ++this.buffer.offset; - this.field2453[var1] = var4; - return this.method3828(var1, var4); + this.field2473[var1] = var4; + return this.method3914(var1, var4); } } @@ -168,8 +168,8 @@ public class MidiFileReader { } } - @ObfuscatedName("c") - int method3828(int var1, int var2) { + @ObfuscatedName("p") + int method3914(int var1, int var2) { int var4; if (var2 == 255) { int var7 = this.buffer.readUnsignedByte(); @@ -183,8 +183,8 @@ public class MidiFileReader { int var5 = this.buffer.readMedium(); var4 -= 3; int var6 = this.trackLengths[var1]; - this.field2459 += (long)var6 * (long)(this.field2451 - var5); - this.field2451 = var5; + this.field2476 += (long)var6 * (long)(this.field2474 - var5); + this.field2474 = var5; var10000 = this.buffer; var10000.offset += var4; return 2; @@ -194,7 +194,7 @@ public class MidiFileReader { return 3; } } else { - byte var3 = field2457[var2 - 128]; + byte var3 = field2477[var2 - 128]; var4 = var2; if (var3 >= 1) { var4 = var2 | this.buffer.readUnsignedByte() << 8; @@ -208,12 +208,12 @@ public class MidiFileReader { } } - @ObfuscatedName("o") - long method3829(int var1) { - return this.field2459 + (long)var1 * (long)this.field2451; + @ObfuscatedName("h") + long method3917(int var1) { + return this.field2476 + (long)var1 * (long)this.field2474; } - @ObfuscatedName("l") + @ObfuscatedName("v") @Export("getPrioritizedTrack") int getPrioritizedTrack() { int var1 = this.trackPositions.length; @@ -230,7 +230,7 @@ public class MidiFileReader { return var2; } - @ObfuscatedName("t") + @ObfuscatedName("n") @Export("isDone") boolean isDone() { int var1 = this.trackPositions.length; @@ -244,15 +244,15 @@ public class MidiFileReader { return true; } - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("reset") void reset(long var1) { - this.field2459 = var1; + this.field2476 = var1; int var3 = this.trackPositions.length; for (int var4 = 0; var4 < var3; ++var4) { this.trackLengths[var4] = 0; - this.field2453[var4] = 0; + this.field2473[var4] = 0; this.buffer.offset = this.trackStarts[var4]; this.readTrackLength(var4); this.trackPositions[var4] = this.buffer.offset; diff --git a/runescape-client/src/main/java/MidiPcmStream.java b/runescape-client/src/main/java/MidiPcmStream.java index 804a38c472..3a4b12325c 100644 --- a/runescape-client/src/main/java/MidiPcmStream.java +++ b/runescape-client/src/main/java/MidiPcmStream.java @@ -3,157 +3,161 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("gm") +@ObfuscatedName("gw") @Implements("MidiPcmStream") public class MidiPcmStream extends PcmStream { - @ObfuscatedName("f") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lle;" + signature = "Lhn;" + ) + static Widget field2444; + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "Lln;" ) @Export("musicPatches") NodeHashTable musicPatches; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1491011005 + intValue = -758577325 ) - int field2401; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = -1592176192 - ) - int field2402; - @ObfuscatedName("p") - int[] field2405; - @ObfuscatedName("b") - int[] field2404; - @ObfuscatedName("e") - int[] field2408; - @ObfuscatedName("x") - int[] field2406; - @ObfuscatedName("a") - int[] field2407; - @ObfuscatedName("d") - int[] field2414; - @ObfuscatedName("c") - int[] field2410; + int field2434; @ObfuscatedName("o") - int[] field2426; - @ObfuscatedName("v") - int[] field2411; - @ObfuscatedName("u") - int[] field2412; - @ObfuscatedName("z") - int[] field2413; - @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -1685666624 + ) + int field2419; + @ObfuscatedName("e") int[] field2417; - @ObfuscatedName("m") - int[] field2415; + @ObfuscatedName("i") + int[] field2421; @ObfuscatedName("g") - int[] field2416; + int[] field2440; + @ObfuscatedName("d") + int[] field2423; + @ObfuscatedName("l") + int[] field2443; + @ObfuscatedName("j") + int[] field2418; + @ObfuscatedName("m") + int[] field2426; + @ObfuscatedName("p") + int[] field2420; + @ObfuscatedName("h") + int[] field2428; + @ObfuscatedName("y") + int[] field2429; + @ObfuscatedName("f") + int[] field2437; + @ObfuscatedName("b") + int[] field2431; @ObfuscatedName("r") - int[] field2425; - @ObfuscatedName("q") + int[] field2432; + @ObfuscatedName("s") + int[] field2433; + @ObfuscatedName("a") + int[] field2422; + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "[[Lgl;" + signature = "[[Lgu;" ) - MusicPatchNode[][] field2418; - @ObfuscatedName("aa") + MusicPatchNode[][] field2435; + @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "[[Lgl;" + signature = "[[Lgu;" ) - MusicPatchNode[][] field2419; - @ObfuscatedName("av") + MusicPatchNode[][] field2436; + @ObfuscatedName("af") @ObfuscatedSignature( - signature = "Lgr;" + signature = "Lgg;" ) @Export("midiFile") MidiFileReader midiFile; - @ObfuscatedName("aw") - boolean field2403; - @ObfuscatedName("as") + @ObfuscatedName("az") + boolean field2438; + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 1794419739 + intValue = -2133377523 ) @Export("track") int track; - @ObfuscatedName("ak") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 198679967 + intValue = 2127527165 ) @Export("trackLength") int trackLength; @ObfuscatedName("au") @ObfuscatedGetter( - longValue = 2302108536441075195L + longValue = -7268027990425382261L ) - long field2409; - @ObfuscatedName("ah") + long field2441; + @ObfuscatedName("ay") @ObfuscatedGetter( - longValue = 307933058588373345L + longValue = 1615665924720735765L ) - long field2400; - @ObfuscatedName("aq") + long field2442; + @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "Lgy;" + signature = "Lgd;" ) @Export("patchStream") MusicPatchPcmStream patchStream; public MidiPcmStream() { - this.field2401 = 256; - this.field2402 = -727379968; - this.field2405 = new int[16]; - this.field2404 = new int[16]; - this.field2408 = new int[16]; - this.field2406 = new int[16]; - this.field2407 = new int[16]; - this.field2414 = new int[16]; - this.field2410 = new int[16]; - this.field2426 = new int[16]; - this.field2411 = new int[16]; - this.field2412 = new int[16]; - this.field2413 = new int[16]; + this.field2434 = 256; + this.field2419 = -727379968; this.field2417 = new int[16]; - this.field2415 = new int[16]; - this.field2416 = new int[16]; - this.field2425 = new int[16]; - this.field2418 = new MusicPatchNode[16][128]; - this.field2419 = new MusicPatchNode[16][128]; + this.field2421 = new int[16]; + this.field2440 = new int[16]; + this.field2423 = new int[16]; + this.field2443 = new int[16]; + this.field2418 = new int[16]; + this.field2426 = new int[16]; + this.field2420 = new int[16]; + this.field2428 = new int[16]; + this.field2429 = new int[16]; + this.field2437 = new int[16]; + this.field2431 = new int[16]; + this.field2432 = new int[16]; + this.field2433 = new int[16]; + this.field2422 = new int[16]; + this.field2435 = new MusicPatchNode[16][128]; + this.field2436 = new MusicPatchNode[16][128]; this.midiFile = new MidiFileReader(); this.patchStream = new MusicPatchPcmStream(this); this.musicPatches = new NodeHashTable(128); - this.method3713(); + this.method3878(); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(IB)V", - garbageValue = "-114" + garbageValue = "0" ) @Export("setPcmStreamVolume") public synchronized void setPcmStreamVolume(int var1) { - this.field2401 = var1; + this.field2434 = var1; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-493640241" + signature = "(B)I", + garbageValue = "-102" ) - public int method3692() { - return this.field2401; + public int method3764() { + return this.field2434; } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lgh;Lhz;Ldx;IB)Z", - garbageValue = "-70" + signature = "(Lgk;Lii;Ldv;II)Z", + garbageValue = "1923256640" ) @Export("loadMusicTrack") synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) { - var1.method3909(); + var1.method3993(); boolean var5 = true; int[] var6 = null; if (var4 > 0) { @@ -164,24 +168,16 @@ public class MidiPcmStream extends PcmStream { int var8 = (int)var7.key; MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)var8); if (var9 == null) { - byte[] var11 = var2.takeFileFlat(var8); - MusicPatch var10; - if (var11 == null) { - var10 = null; - } else { - var10 = new MusicPatch(var11); - } - - var9 = var10; - if (var10 == null) { + var9 = GameShell.method1067(var2, var8); + if (var9 == null) { var5 = false; continue; } - this.musicPatches.put(var10, (long)var8); + this.musicPatches.put(var9, (long)var8); } - if (!var9.method3868(var3, var7.byteArray, var6)) { + if (!var9.method3952(var3, var7.byteArray, var6)) { var5 = false; } } @@ -193,10 +189,10 @@ public class MidiPcmStream extends PcmStream { return var5; } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "2127021512" + signature = "(B)V", + garbageValue = "0" ) @Export("clearAll") synchronized void clearAll() { @@ -206,10 +202,10 @@ public class MidiPcmStream extends PcmStream { } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1176927011" + garbageValue = "-457364523" ) @Export("removeAll") public synchronized void removeAll() { @@ -219,65 +215,65 @@ public class MidiPcmStream extends PcmStream { } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "()Ldl;" + signature = "()Ldn;" ) @Export("firstSubStream") protected synchronized PcmStream firstSubStream() { return this.patchStream; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "()Ldl;" + signature = "()Ldn;" ) @Export("nextSubStream") protected synchronized PcmStream nextSubStream() { return null; } - @ObfuscatedName("x") - protected synchronized int vmethod3889() { + @ObfuscatedName("l") + protected synchronized int vmethod3965() { return 0; } - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("fill") protected synchronized void fill(int[] var1, int var2, int var3) { if (this.midiFile.isReady()) { - int var4 = this.midiFile.division * this.field2402 * 1000000 / (DirectByteArrayCopier.field2490 * -168449264); + int var4 = this.midiFile.division * this.field2419 * 1000000 / PcmPlayer.field1398; do { - long var5 = this.field2409 + (long)var4 * (long)var3; - if (this.field2400 - var5 >= 0L) { - this.field2409 = var5; + long var5 = this.field2441 + (long)var3 * (long)var4; + if (this.field2442 - var5 >= 0L) { + this.field2441 = var5; break; } - int var7 = (int)((this.field2400 - this.field2409 + (long)var4 - 1L) / (long)var4); - this.field2409 += (long)var4 * (long)var7; + int var7 = (int)(((long)var4 + (this.field2442 - this.field2441) - 1L) / (long)var4); + this.field2441 += (long)var7 * (long)var4; this.patchStream.fill(var1, var2, var7); var2 += var7; var3 -= var7; - this.method3726(); + this.method3796(); } while(this.midiFile.isReady()); } this.patchStream.fill(var1, var2, var3); } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lgh;ZI)V", - garbageValue = "-1969795469" + signature = "(Lgk;ZI)V", + garbageValue = "1689083592" ) @Export("setMusicTrack") synchronized void setMusicTrack(MusicTrack var1, boolean var2) { this.clear(); this.midiFile.parse(var1.midi); - this.field2403 = var2; - this.field2409 = 0L; + this.field2438 = var2; + this.field2441 = 0L; int var3 = this.midiFile.trackCount(); for (int var4 = 0; var4 < var3; ++var4) { @@ -288,248 +284,248 @@ public class MidiPcmStream extends PcmStream { this.track = this.midiFile.getPrioritizedTrack(); this.trackLength = this.midiFile.trackLengths[this.track]; - this.field2400 = this.midiFile.method3829(this.trackLength); + this.field2442 = this.midiFile.method3917(this.trackLength); } - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("skip") protected synchronized void skip(int var1) { if (this.midiFile.isReady()) { - int var2 = this.midiFile.division * this.field2402 * 1000000 / (DirectByteArrayCopier.field2490 * -168449264); + int var2 = this.midiFile.division * this.field2419 * 1000000 / PcmPlayer.field1398; do { - long var3 = (long)var2 * (long)var1 + this.field2409; - if (this.field2400 - var3 >= 0L) { - this.field2409 = var3; + long var3 = this.field2441 + (long)var1 * (long)var2; + if (this.field2442 - var3 >= 0L) { + this.field2441 = var3; break; } - int var5 = (int)(((long)var2 + (this.field2400 - this.field2409) - 1L) / (long)var2); - this.field2409 += (long)var2 * (long)var5; + int var5 = (int)((this.field2442 - this.field2441 + (long)var2 - 1L) / (long)var2); + this.field2441 += (long)var5 * (long)var2; this.patchStream.skip(var5); var1 -= var5; - this.method3726(); + this.method3796(); } while(this.midiFile.isReady()); } this.patchStream.skip(var1); } - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1463582858" + signature = "(B)V", + garbageValue = "-18" ) @Export("clear") public synchronized void clear() { this.midiFile.clear(); - this.method3713(); + this.method3878(); } - @ObfuscatedName("l") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1439399631" + garbageValue = "-261574167" ) @Export("isReady") public synchronized boolean isReady() { return this.midiFile.isReady(); } - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "1663251439" - ) - public synchronized void method3765(int var1, int var2) { - this.method3784(var1, var2); - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "44" - ) - void method3784(int var1, int var2) { - this.field2406[var1] = var2; - this.field2414[var1] = var2 & -128; - this.method3703(var1, var2); - } - @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "1182045133" + signature = "(IIB)V", + garbageValue = "89" ) - void method3703(int var1, int var2) { - if (var2 != this.field2407[var1]) { - this.field2407[var1] = var2; + public synchronized void method3819(int var1, int var2) { + this.method3772(var1, var2); + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(IIB)V", + garbageValue = "101" + ) + void method3772(int var1, int var2) { + this.field2423[var1] = var2; + this.field2418[var1] = var2 & -128; + this.method3773(var1, var2); + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "(IIS)V", + garbageValue = "29980" + ) + void method3773(int var1, int var2) { + if (var2 != this.field2443[var1]) { + this.field2443[var1] = var2; for (int var3 = 0; var3 < 128; ++var3) { - this.field2419[var1][var3] = null; + this.field2436[var1][var3] = null; } } } - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(IIII)V", - garbageValue = "1071625485" + garbageValue = "547070105" ) - void method3704(int var1, int var2, int var3) { - this.method3735(var1, var2, 64); - if ((this.field2412[var1] & 2) != 0) { + void method3774(int var1, int var2, int var3) { + this.method3887(var1, var2, 64); + if ((this.field2429[var1] & 2) != 0) { for (MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) { - if (var4.field2444 == var1 && var4.field2441 < 0) { - this.field2418[var1][var4.field2432] = null; - this.field2418[var1][var2] = var4; - int var5 = (var4.field2434 * var4.field2437 >> 12) + var4.field2435; - var4.field2435 += var2 - var4.field2432 << 8; - var4.field2434 = var5 - var4.field2435; - var4.field2437 = 4096; - var4.field2432 = var2; + if (var4.field2447 == var1 && var4.field2459 < 0) { + this.field2435[var1][var4.field2450] = null; + this.field2435[var1][var2] = var4; + int var5 = (var4.field2454 * var4.field2455 >> 12) + var4.field2446; + var4.field2446 += var2 - var4.field2450 << 8; + var4.field2454 = var5 - var4.field2446; + var4.field2455 = 4096; + var4.field2450 = var2; return; } } } - MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2407[var1]); + MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2443[var1]); if (var9 != null) { RawSound var8 = var9.rawSounds[var2]; if (var8 != null) { MusicPatchNode var6 = new MusicPatchNode(); - var6.field2444 = var1; + var6.field2447 = var1; var6.patch = var9; var6.rawSound = var8; - var6.field2430 = var9.field2462[var2]; - var6.field2436 = var9.field2468[var2]; - var6.field2432 = var2; - var6.field2433 = var3 * var3 * var9.field2466[var2] * var9.field2467 + 1024 >> 11; - var6.field2442 = var9.field2470[var2] & 255; - var6.field2435 = (var2 << 8) - (var9.field2464[var2] & 32767); - var6.field2446 = 0; - var6.field2439 = 0; - var6.field2440 = 0; - var6.field2441 = -1; - var6.field2438 = 0; - if (this.field2415[var1] == 0) { - var6.stream = RawPcmStream.method2582(var8, this.method3736(var6), this.method3719(var6), this.method3720(var6)); + var6.field2445 = var9.field2487[var2]; + var6.field2449 = var9.field2485[var2]; + var6.field2450 = var2; + var6.field2451 = var3 * var3 * var9.field2486[var2] * var9.field2488 + 1024 >> 11; + var6.field2457 = var9.field2482[var2] & 255; + var6.field2446 = (var2 << 8) - (var9.field2483[var2] & 32767); + var6.field2456 = 0; + var6.field2448 = 0; + var6.field2458 = 0; + var6.field2459 = -1; + var6.field2460 = 0; + if (this.field2432[var1] == 0) { + var6.stream = RawPcmStream.method2673(var8, this.method3788(var6), this.method3789(var6), this.method3790(var6)); } else { - var6.stream = RawPcmStream.method2582(var8, this.method3736(var6), 0, this.method3720(var6)); - this.method3764(var6, var9.field2464[var2] < 0); + var6.stream = RawPcmStream.method2673(var8, this.method3788(var6), 0, this.method3790(var6)); + this.method3775(var6, var9.field2483[var2] < 0); } - if (var9.field2464[var2] < 0) { + if (var9.field2483[var2] < 0) { var6.stream.setNumLoops(-1); } - if (var6.field2436 >= 0) { - MusicPatchNode var7 = this.field2419[var1][var6.field2436]; - if (var7 != null && var7.field2441 < 0) { - this.field2418[var1][var7.field2432] = null; - var7.field2441 = 0; + if (var6.field2449 >= 0) { + MusicPatchNode var7 = this.field2436[var1][var6.field2449]; + if (var7 != null && var7.field2459 < 0) { + this.field2435[var1][var7.field2450] = null; + var7.field2459 = 0; } - this.field2419[var1][var6.field2436] = var6; + this.field2436[var1][var6.field2449] = var6; } this.patchStream.queue.addFirst(var6); - this.field2418[var1][var2] = var6; + this.field2435[var1][var2] = var6; } } } @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(Lgl;ZI)V", - garbageValue = "-1980997647" + signature = "(Lgu;ZI)V", + garbageValue = "-1328035462" ) - void method3764(MusicPatchNode var1, boolean var2) { + void method3775(MusicPatchNode var1, boolean var2) { int var3 = var1.rawSound.samples.length; int var4; - if (var2 && var1.rawSound.field1352) { + if (var2 && var1.rawSound.field1379) { int var5 = var3 + var3 - var1.rawSound.start; - var4 = (int)((long)var5 * (long)this.field2415[var1.field2444] >> 6); + var4 = (int)((long)var5 * (long)this.field2432[var1.field2447] >> 6); var3 <<= 8; if (var4 >= var3) { var4 = var3 + var3 - 1 - var4; - var1.stream.method2555(); + var1.stream.method2710(); } } else { - var4 = (int)((long)this.field2415[var1.field2444] * (long)var3 >> 6); + var4 = (int)((long)var3 * (long)this.field2432[var1.field2447] >> 6); } - var1.stream.method2554(var4); + var1.stream.method2622(var4); } - @ObfuscatedName("h") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(IIII)V", - garbageValue = "-717323373" + signature = "(IIIB)V", + garbageValue = "-128" ) - void method3735(int var1, int var2, int var3) { - MusicPatchNode var4 = this.field2418[var1][var2]; + void method3887(int var1, int var2, int var3) { + MusicPatchNode var4 = this.field2435[var1][var2]; if (var4 != null) { - this.field2418[var1][var2] = null; - if ((this.field2412[var1] & 2) != 0) { + this.field2435[var1][var2] = null; + if ((this.field2429[var1] & 2) != 0) { for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var5.field2444 == var4.field2444 && var5.field2441 < 0 && var5 != var4) { - var4.field2441 = 0; + if (var5.field2447 == var4.field2447 && var5.field2459 < 0 && var4 != var5) { + var4.field2459 = 0; break; } } } else { - var4.field2441 = 0; + var4.field2459 = 0; } } } - @ObfuscatedName("m") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(IIII)V", - garbageValue = "1882331860" + garbageValue = "-666904173" ) - void method3707(int var1, int var2, int var3) { + void method3777(int var1, int var2, int var3) { } - @ObfuscatedName("aa") - @ObfuscatedSignature( - signature = "(IIS)V", - garbageValue = "14904" - ) - void method3729(int var1, int var2) { - } - - @ObfuscatedName("av") + @ObfuscatedName("a") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "1757965931" + garbageValue = "-700125854" ) - void method3709(int var1, int var2) { - this.field2410[var1] = var2; + void method3778(int var1, int var2) { } - @ObfuscatedName("ay") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "0" + signature = "(III)V", + garbageValue = "1537654694" ) - void method3794(int var1) { + void method3779(int var1, int var2) { + this.field2426[var1] = var2; + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "-1595965237" + ) + void method3780(int var1) { for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var1 < 0 || var2.field2444 == var1) { + if (var1 < 0 || var2.field2447 == var1) { if (var2.stream != null) { - var2.stream.method2559(DirectByteArrayCopier.field2490 * -168449264 / 100); - if (var2.stream.method2563()) { + var2.stream.method2619(PcmPlayer.field1398 / 100); + if (var2.stream.method2712()) { this.patchStream.mixer.addSubStream(var2.stream); } - var2.method3809(); + var2.method3896(); } - if (var2.field2441 < 0) { - this.field2418[var2.field2444][var2.field2432] = null; + if (var2.field2459 < 0) { + this.field2435[var2.field2447][var2.field2450] = null; } var2.remove(); @@ -538,107 +534,107 @@ public class MidiPcmStream extends PcmStream { } - @ObfuscatedName("ag") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "80676363" - ) - void method3711(int var1) { - if (var1 >= 0) { - this.field2405[var1] = 12800; - this.field2404[var1] = 8192; - this.field2408[var1] = 16383; - this.field2410[var1] = 8192; - this.field2426[var1] = 0; - this.field2411[var1] = 8192; - this.method3714(var1); - this.method3806(var1); - this.field2412[var1] = 0; - this.field2413[var1] = 32767; - this.field2417[var1] = 256; - this.field2415[var1] = 0; - this.method3717(var1, 8192); - } else { - for (var1 = 0; var1 < 16; ++var1) { - this.method3711(var1); - } - - } - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "89058460" - ) - void method3712(int var1) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if ((var1 < 0 || var2.field2444 == var1) && var2.field2441 < 0) { - this.field2418[var2.field2444][var2.field2432] = null; - var2.field2441 = 0; - } - } - - } - - @ObfuscatedName("ad") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "140896410" - ) - void method3713() { - this.method3794(-1); - this.method3711(-1); - - int var1; - for (var1 = 0; var1 < 16; ++var1) { - this.field2407[var1] = this.field2406[var1]; - } - - for (var1 = 0; var1 < 16; ++var1) { - this.field2414[var1] = this.field2406[var1] & -128; - } - - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-2012572160" - ) - void method3714(int var1) { - if ((this.field2412[var1] & 2) != 0) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var2.field2444 == var1 && this.field2418[var1][var2.field2432] == null && var2.field2441 < 0) { - var2.field2441 = 0; - } - } - } - - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-4452190" - ) - void method3806(int var1) { - if ((this.field2412[var1] & 4) != 0) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var2.field2444 == var1) { - var2.field2447 = 0; - } - } - } - - } - @ObfuscatedName("af") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-1796286061" + garbageValue = "-1470820319" ) - void method3697(int var1) { + void method3787(int var1) { + if (var1 >= 0) { + this.field2417[var1] = 12800; + this.field2421[var1] = 8192; + this.field2440[var1] = 16383; + this.field2426[var1] = 8192; + this.field2420[var1] = 0; + this.field2428[var1] = 8192; + this.method3784(var1); + this.method3785(var1); + this.field2429[var1] = 0; + this.field2437[var1] = 32767; + this.field2431[var1] = 256; + this.field2432[var1] = 0; + this.method3771(var1, 8192); + } else { + for (var1 = 0; var1 < 16; ++var1) { + this.method3787(var1); + } + + } + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + signature = "(IB)V", + garbageValue = "112" + ) + void method3795(int var1) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { + if ((var1 < 0 || var2.field2447 == var1) && var2.field2459 < 0) { + this.field2435[var2.field2447][var2.field2450] = null; + var2.field2459 = 0; + } + } + + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1072017255" + ) + void method3878() { + this.method3780(-1); + this.method3787(-1); + + int var1; + for (var1 = 0; var1 < 16; ++var1) { + this.field2443[var1] = this.field2423[var1]; + } + + for (var1 = 0; var1 < 16; ++var1) { + this.field2418[var1] = this.field2423[var1] & -128; + } + + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "131749797" + ) + void method3784(int var1) { + if ((this.field2429[var1] & 2) != 0) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { + if (var2.field2447 == var1 && this.field2435[var1][var2.field2450] == null && var2.field2459 < 0) { + var2.field2459 = 0; + } + } + } + + } + + @ObfuscatedName("an") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "2050872328" + ) + void method3785(int var1) { + if ((this.field2429[var1] & 4) != 0) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { + if (var2.field2447 == var1) { + var2.field2465 = 0; + } + } + } + + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "1369588293" + ) + void method3786(int var1) { int var2 = var1 & 240; int var3; int var4; @@ -647,289 +643,289 @@ public class MidiPcmStream extends PcmStream { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; - this.method3735(var3, var4, var5); + this.method3887(var3, var4, var5); } else if (var2 == 144) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; if (var5 > 0) { - this.method3704(var3, var4, var5); + this.method3774(var3, var4, var5); } else { - this.method3735(var3, var4, 64); + this.method3887(var3, var4, 64); } } else if (var2 == 160) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; - this.method3707(var3, var4, var5); + this.method3777(var3, var4, var5); } else if (var2 == 176) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; if (var4 == 0) { - this.field2414[var3] = (var5 << 14) + (this.field2414[var3] & -2080769); + this.field2418[var3] = (var5 << 14) + (this.field2418[var3] & -2080769); } if (var4 == 32) { - this.field2414[var3] = (var5 << 7) + (this.field2414[var3] & -16257); + this.field2418[var3] = (var5 << 7) + (this.field2418[var3] & -16257); } if (var4 == 1) { - this.field2426[var3] = (var5 << 7) + (this.field2426[var3] & -16257); + this.field2420[var3] = (var5 << 7) + (this.field2420[var3] & -16257); } if (var4 == 33) { - this.field2426[var3] = var5 + (this.field2426[var3] & -128); + this.field2420[var3] = var5 + (this.field2420[var3] & -128); } if (var4 == 5) { - this.field2411[var3] = (var5 << 7) + (this.field2411[var3] & -16257); + this.field2428[var3] = (var5 << 7) + (this.field2428[var3] & -16257); } if (var4 == 37) { - this.field2411[var3] = var5 + (this.field2411[var3] & -128); + this.field2428[var3] = var5 + (this.field2428[var3] & -128); } if (var4 == 7) { - this.field2405[var3] = (var5 << 7) + (this.field2405[var3] & -16257); + this.field2417[var3] = (var5 << 7) + (this.field2417[var3] & -16257); } if (var4 == 39) { - this.field2405[var3] = var5 + (this.field2405[var3] & -128); + this.field2417[var3] = var5 + (this.field2417[var3] & -128); } if (var4 == 10) { - this.field2404[var3] = (var5 << 7) + (this.field2404[var3] & -16257); + this.field2421[var3] = (var5 << 7) + (this.field2421[var3] & -16257); } if (var4 == 42) { - this.field2404[var3] = var5 + (this.field2404[var3] & -128); + this.field2421[var3] = var5 + (this.field2421[var3] & -128); } if (var4 == 11) { - this.field2408[var3] = (var5 << 7) + (this.field2408[var3] & -16257); + this.field2440[var3] = (var5 << 7) + (this.field2440[var3] & -16257); } if (var4 == 43) { - this.field2408[var3] = var5 + (this.field2408[var3] & -128); + this.field2440[var3] = var5 + (this.field2440[var3] & -128); } int[] var10000; if (var4 == 64) { if (var5 >= 64) { - var10000 = this.field2412; + var10000 = this.field2429; var10000[var3] |= 1; } else { - var10000 = this.field2412; + var10000 = this.field2429; var10000[var3] &= -2; } } if (var4 == 65) { if (var5 >= 64) { - var10000 = this.field2412; + var10000 = this.field2429; var10000[var3] |= 2; } else { - this.method3714(var3); - var10000 = this.field2412; + this.method3784(var3); + var10000 = this.field2429; var10000[var3] &= -3; } } if (var4 == 99) { - this.field2413[var3] = (var5 << 7) + (this.field2413[var3] & 127); + this.field2437[var3] = (var5 << 7) + (this.field2437[var3] & 127); } if (var4 == 98) { - this.field2413[var3] = (this.field2413[var3] & 16256) + var5; + this.field2437[var3] = (this.field2437[var3] & 16256) + var5; } if (var4 == 101) { - this.field2413[var3] = (var5 << 7) + (this.field2413[var3] & 127) + 16384; + this.field2437[var3] = (var5 << 7) + (this.field2437[var3] & 127) + 16384; } if (var4 == 100) { - this.field2413[var3] = (this.field2413[var3] & 16256) + var5 + 16384; + this.field2437[var3] = (this.field2437[var3] & 16256) + var5 + 16384; } if (var4 == 120) { - this.method3794(var3); + this.method3780(var3); } if (var4 == 121) { - this.method3711(var3); + this.method3787(var3); } if (var4 == 123) { - this.method3712(var3); + this.method3795(var3); } int var6; if (var4 == 6) { - var6 = this.field2413[var3]; + var6 = this.field2437[var3]; if (var6 == 16384) { - this.field2417[var3] = (var5 << 7) + (this.field2417[var3] & -16257); + this.field2431[var3] = (var5 << 7) + (this.field2431[var3] & -16257); } } if (var4 == 38) { - var6 = this.field2413[var3]; + var6 = this.field2437[var3]; if (var6 == 16384) { - this.field2417[var3] = var5 + (this.field2417[var3] & -128); + this.field2431[var3] = var5 + (this.field2431[var3] & -128); } } if (var4 == 16) { - this.field2415[var3] = (var5 << 7) + (this.field2415[var3] & -16257); + this.field2432[var3] = (var5 << 7) + (this.field2432[var3] & -16257); } if (var4 == 48) { - this.field2415[var3] = var5 + (this.field2415[var3] & -128); + this.field2432[var3] = var5 + (this.field2432[var3] & -128); } if (var4 == 81) { if (var5 >= 64) { - var10000 = this.field2412; + var10000 = this.field2429; var10000[var3] |= 4; } else { - this.method3806(var3); - var10000 = this.field2412; + this.method3785(var3); + var10000 = this.field2429; var10000[var3] &= -5; } } if (var4 == 17) { - this.method3717(var3, (var5 << 7) + (this.field2416[var3] & -16257)); + this.method3771(var3, (var5 << 7) + (this.field2433[var3] & -16257)); } if (var4 == 49) { - this.method3717(var3, var5 + (this.field2416[var3] & -128)); + this.method3771(var3, var5 + (this.field2433[var3] & -128)); } } else if (var2 == 192) { var3 = var1 & 15; var4 = var1 >> 8 & 127; - this.method3703(var3, var4 + this.field2414[var3]); + this.method3773(var3, var4 + this.field2418[var3]); } else if (var2 == 208) { var3 = var1 & 15; var4 = var1 >> 8 & 127; - this.method3729(var3, var4); + this.method3778(var3, var4); } else if (var2 == 224) { var3 = var1 & 15; var4 = (var1 >> 8 & 127) + (var1 >> 9 & 16256); - this.method3709(var3, var4); + this.method3779(var3, var4); } else { var2 = var1 & 255; if (var2 == 255) { - this.method3713(); + this.method3878(); } } } + @ObfuscatedName("ab") + @ObfuscatedSignature( + signature = "(IIS)V", + garbageValue = "-26086" + ) + void method3771(int var1, int var2) { + this.field2433[var1] = var2; + this.field2422[var1] = (int)(2097152.0D * Math.pow(2.0D, (double)var2 * 5.4931640625E-4D) + 0.5D); + } + @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "1984762268" + signature = "(Lgu;I)I", + garbageValue = "-1438350668" ) - void method3717(int var1, int var2) { - this.field2416[var1] = var2; - this.field2425[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D); - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - signature = "(Lgl;S)I", - garbageValue = "-5445" - ) - int method3736(MusicPatchNode var1) { - int var2 = (var1.field2437 * var1.field2434 >> 12) + var1.field2435; - var2 += (this.field2410[var1.field2444] - 8192) * this.field2417[var1.field2444] >> 12; - MusicPatchNode2 var3 = var1.field2430; + int method3788(MusicPatchNode var1) { + int var2 = (var1.field2455 * var1.field2454 >> 12) + var1.field2446; + var2 += (this.field2426[var1.field2447] - 8192) * this.field2431[var1.field2447] >> 12; + MusicPatchNode2 var3 = var1.field2445; int var4; - if (var3.field2383 > 0 && (var3.field2382 > 0 || this.field2426[var1.field2444] > 0)) { - var4 = var3.field2382 << 2; - int var5 = var3.field2380 << 1; - if (var1.field2443 < var5) { - var4 = var4 * var1.field2443 / var5; + if (var3.field2405 > 0 && (var3.field2398 > 0 || this.field2420[var1.field2447] > 0)) { + var4 = var3.field2398 << 2; + int var5 = var3.field2406 << 1; + if (var1.field2461 < var5) { + var4 = var4 * var1.field2461 / var5; } - var4 += this.field2426[var1.field2444] >> 7; - double var6 = Math.sin(0.01227184630308513D * (double)(var1.field2427 & 511)); + var4 += this.field2420[var1.field2447] >> 7; + double var6 = Math.sin(0.01227184630308513D * (double)(var1.field2453 & 511)); var2 += (int)(var6 * (double)var4); } - var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, 3.255208333333333E-4D * (double)var2) / (double)(DirectByteArrayCopier.field2490 * -168449264) + 0.5D); + var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)PcmPlayer.field1398 + 0.5D); return var4 < 1 ? 1 : var4; } - @ObfuscatedName("am") + @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(Lgl;I)I", - garbageValue = "623001818" + signature = "(Lgu;I)I", + garbageValue = "-1402395014" ) - int method3719(MusicPatchNode var1) { - MusicPatchNode2 var2 = var1.field2430; - int var3 = this.field2405[var1.field2444] * this.field2408[var1.field2444] + 4096 >> 13; + int method3789(MusicPatchNode var1) { + MusicPatchNode2 var2 = var1.field2445; + int var3 = this.field2440[var1.field2447] * this.field2417[var1.field2447] + 4096 >> 13; var3 = var3 * var3 + 16384 >> 15; - var3 = var3 * var1.field2433 + 16384 >> 15; - var3 = var3 * this.field2401 + 128 >> 8; - if (var2.field2378 > 0) { - var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field2378 * 1.953125E-5D * (double)(var1.field2446 * 128)) + 0.5D); + var3 = var3 * var1.field2451 + 16384 >> 15; + var3 = var3 * this.field2434 + 128 >> 8; + if (var2.field2404 > 0) { + var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field2404 * (double)(var1.field2456 * 128) * 1.953125E-5D) + 0.5D); } int var4; int var5; int var6; int var7; - if (var2.field2385 != null) { - var4 = var1.field2439; - var5 = var2.field2385[var1.field2440 * 4 + 1]; - if (var1.field2440 * 4 < var2.field2385.length - 2) { - var6 = (var2.field2385[var1.field2440 * 4] & 255) << 8; - var7 = (var2.field2385[var1.field2440 * 4 + 2] & 255) << 8; - var5 += (var2.field2385[var1.field2440 * 4 + 3] - var5) * (var4 - var6) / (var7 - var6); + if (var2.field2402 != null) { + var4 = var1.field2448; + var5 = var2.field2402[var1.field2458 * 4 + 1]; + if (var1.field2458 * 4 < var2.field2402.length - 2) { + var6 = (var2.field2402[var1.field2458 * 4] & 255) << 8; + var7 = (var2.field2402[var1.field2458 * 4 + 2] & 255) << 8; + var5 += (var2.field2402[var1.field2458 * 4 + 3] - var5) * (var4 - var6) / (var7 - var6); } var3 = var5 * var3 + 32 >> 6; } - if (var1.field2441 > 0 && var2.field2377 != null) { - var4 = var1.field2441; - var5 = var2.field2377[var1.field2438 * 4 + 1]; - if (var1.field2438 * 4 < var2.field2377.length - 2) { - var6 = (var2.field2377[var1.field2438 * 4] & 255) << 8; - var7 = (var2.field2377[var1.field2438 * 4 + 2] & 255) << 8; - var5 += (var4 - var6) * (var2.field2377[var1.field2438 * 4 + 3] - var5) / (var7 - var6); + if (var1.field2459 > 0 && var2.field2399 != null) { + var4 = var1.field2459; + var5 = var2.field2399[var1.field2460 * 2 + 1]; + if (var1.field2460 * 2 < var2.field2399.length - 2) { + var6 = (var2.field2399[var1.field2460 * 2] & 255) << 8; + var7 = (var2.field2399[var1.field2460 * 2 + 2] & 255) << 8; + var5 += (var2.field2399[var1.field2460 * 2 + 3] - var5) * (var4 - var6) / (var7 - var6); } - var3 = var3 * var5 + 32 >> 6; + var3 = var5 * var3 + 32 >> 6; } return var3; } - @ObfuscatedName("ab") + @ObfuscatedName("bq") @ObfuscatedSignature( - signature = "(Lgl;I)I", - garbageValue = "1450694998" + signature = "(Lgu;I)I", + garbageValue = "1626929968" ) - int method3720(MusicPatchNode var1) { - int var2 = this.field2404[var1.field2444]; - return var2 < 8192 ? var2 * var1.field2442 + 32 >> 6 : 16384 - ((128 - var1.field2442) * (16384 - var2) + 32 >> 6); + int method3790(MusicPatchNode var1) { + int var2 = this.field2421[var1.field2447]; + return var2 < 8192 ? var2 * var1.field2457 + 32 >> 6 : 16384 - ((128 - var1.field2457) * (16384 - var2) + 32 >> 6); } - @ObfuscatedName("bj") + @ObfuscatedName("bf") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-796746518" + garbageValue = "1319413335" ) - void method3726() { + void method3796() { int var1 = this.track; int var2 = this.trackLength; long var3; - for (var3 = this.field2400; var2 == this.trackLength; var3 = this.midiFile.method3829(var2)) { + for (var3 = this.field2442; var2 == this.trackLength; var3 = this.midiFile.method3917(var2)) { while (var2 == this.midiFile.trackLengths[var1]) { this.midiFile.gotoTrack(var1); int var5 = this.midiFile.readMessage(var1); @@ -937,8 +933,8 @@ public class MidiPcmStream extends PcmStream { this.midiFile.setTrackDone(); this.midiFile.markTrackPosition(var1); if (this.midiFile.isDone()) { - if (!this.field2403 || var2 == 0) { - this.method3713(); + if (!this.field2438 || var2 == 0) { + this.method3878(); this.midiFile.clear(); return; } @@ -949,7 +945,7 @@ public class MidiPcmStream extends PcmStream { } if ((var5 & 128) != 0) { - this.method3697(var5); + this.method3786(var5); } this.midiFile.readTrackLength(var1); @@ -962,20 +958,20 @@ public class MidiPcmStream extends PcmStream { this.track = var1; this.trackLength = var2; - this.field2400 = var3; + this.field2442 = var3; } - @ObfuscatedName("bg") + @ObfuscatedName("bc") @ObfuscatedSignature( - signature = "(Lgl;B)Z", - garbageValue = "26" + signature = "(Lgu;B)Z", + garbageValue = "-27" ) - boolean method3767(MusicPatchNode var1) { + boolean method3822(MusicPatchNode var1) { if (var1.stream == null) { - if (var1.field2441 >= 0) { + if (var1.field2459 >= 0) { var1.remove(); - if (var1.field2436 > 0 && var1 == this.field2419[var1.field2444][var1.field2436]) { - this.field2419[var1.field2444][var1.field2436] = null; + if (var1.field2449 > 0 && var1 == this.field2436[var1.field2447][var1.field2449]) { + this.field2436[var1.field2447][var1.field2449] = null; } } @@ -985,669 +981,103 @@ public class MidiPcmStream extends PcmStream { } } - @ObfuscatedName("bw") + @ObfuscatedName("bk") @ObfuscatedSignature( - signature = "(Lgl;[IIII)Z", - garbageValue = "1744795521" + signature = "(Lgu;[IIIB)Z", + garbageValue = "12" ) - boolean method3728(MusicPatchNode var1, int[] var2, int var3, int var4) { - var1.field2431 = DirectByteArrayCopier.field2490 * -168449264 / 100; - if (var1.field2441 < 0 || var1.stream != null && !var1.stream.method2653()) { - int var5 = var1.field2437; + boolean method3848(MusicPatchNode var1, int[] var2, int var3, int var4) { + var1.field2464 = PcmPlayer.field1398 / 100; + if (var1.field2459 < 0 || var1.stream != null && !var1.stream.method2674()) { + int var5 = var1.field2455; if (var5 > 0) { - var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.field2411[var1.field2444] * 4.921259842519685E-4D) + 0.5D); + var5 -= (int)(16.0D * Math.pow(2.0D, 4.921259842519685E-4D * (double)this.field2428[var1.field2447]) + 0.5D); if (var5 < 0) { var5 = 0; } - var1.field2437 = var5; + var1.field2455 = var5; } - var1.stream.method2615(this.method3736(var1)); - MusicPatchNode2 var6 = var1.field2430; + var1.stream.method2660(this.method3788(var1)); + MusicPatchNode2 var6 = var1.field2445; boolean var7 = false; - ++var1.field2443; - var1.field2427 += var6.field2383; - double var8 = 5.086263020833333E-6D * (double)((var1.field2432 - 60 << 8) + (var1.field2434 * var1.field2437 >> 12)); - if (var6.field2378 > 0) { - if (var6.field2384 > 0) { - var1.field2446 = var1.field2446 * 29114368 + (int)(128.0D * Math.pow(2.0D, (double)var6.field2384 * var8) + 0.5D) * 1845721216; + ++var1.field2461; + var1.field2453 += var6.field2405; + double var8 = (double)((var1.field2450 - 60 << 8) + (var1.field2455 * var1.field2454 >> 12)) * 5.086263020833333E-6D; + if (var6.field2404 > 0) { + if (var6.field2403 > 0) { + var1.field2456 = var1.field2456 * -1540341760 + (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2403) + 0.5D) * 457728128; } else { - var1.field2446 = var1.field2446 * 29114368 + 29114368; + var1.field2456 = var1.field2456 * -1540341760 + -1540341760; } } - if (var6.field2385 != null) { - if (var6.field2387 > 0) { - var1.field2439 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2387 * var8) + 0.5D); + if (var6.field2402 != null) { + if (var6.field2401 > 0) { + var1.field2448 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2401) + 0.5D); } else { - var1.field2439 += 128; + var1.field2448 += 128; } - while (var1.field2440 * 4 < var6.field2385.length - 2 && var1.field2439 > (var6.field2385[var1.field2440 * 4 + 2] & 255) << 8) { - var1.field2440 = var1.field2440 * 4 + 2; + while (var1.field2458 * 4 < var6.field2402.length - 2 && var1.field2448 > (var6.field2402[var1.field2458 * 4 + 2] & 255) << 8) { + var1.field2458 = var1.field2458 * 4 + 2; } - if (var1.field2440 * 4 == var6.field2385.length - 2 && var6.field2385[var1.field2440 * 4 + 1] == 0) { + if (var1.field2458 * 4 == var6.field2402.length - 2 && var6.field2402[var1.field2458 * 4 + 1] == 0) { var7 = true; } } - if (var1.field2441 >= 0 && var6.field2377 != null && (this.field2412[var1.field2444] & 1) == 0 && (var1.field2436 < 0 || var1 != this.field2419[var1.field2444][var1.field2436])) { - if (var6.field2376 > 0) { - var1.field2441 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2376) + 0.5D); + if (var1.field2459 >= 0 && var6.field2399 != null && (this.field2429[var1.field2447] & 1) == 0 && (var1.field2449 < 0 || var1 != this.field2436[var1.field2447][var1.field2449])) { + if (var6.field2400 > 0) { + var1.field2459 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2400 * var8) + 0.5D); } else { - var1.field2441 += 128; + var1.field2459 += 128; } - while (var1.field2438 * 4 < var6.field2377.length - 2 && var1.field2441 > (var6.field2377[var1.field2438 * 4 + 2] & 255) << 8) { - var1.field2438 = var1.field2438 * 4 + 2; + while (var1.field2460 * 2 < var6.field2399.length - 2 && var1.field2459 > (var6.field2399[var1.field2460 * 2 + 2] & 255) << 8) { + var1.field2460 = var1.field2460 * 4 + 4; } - if (var1.field2438 * 4 == var6.field2377.length - 2) { + if (var1.field2460 * 2 == var6.field2399.length - 2) { var7 = true; } } if (var7) { - var1.stream.method2559(var1.field2431); + var1.stream.method2619(var1.field2464); if (var2 != null) { var1.stream.fill(var2, var3, var4); } else { var1.stream.skip(var4); } - if (var1.stream.method2563()) { + if (var1.stream.method2712()) { this.patchStream.mixer.addSubStream(var1.stream); } - var1.method3809(); - if (var1.field2441 >= 0) { + var1.method3896(); + if (var1.field2459 >= 0) { var1.remove(); - if (var1.field2436 > 0 && var1 == this.field2419[var1.field2444][var1.field2436]) { - this.field2419[var1.field2444][var1.field2436] = null; + if (var1.field2449 > 0 && var1 == this.field2436[var1.field2447][var1.field2449]) { + this.field2436[var1.field2447][var1.field2449] = null; } } return true; } else { - var1.stream.method2668(var1.field2431, this.method3719(var1), this.method3720(var1)); + var1.stream.method2618(var1.field2464, this.method3789(var1), this.method3790(var1)); return false; } } else { - var1.method3809(); + var1.method3896(); var1.remove(); - if (var1.field2436 > 0 && var1 == this.field2419[var1.field2444][var1.field2436]) { - this.field2419[var1.field2444][var1.field2436] = null; + if (var1.field2449 > 0 && var1 == this.field2436[var1.field2447][var1.field2449]) { + this.field2436[var1.field2447][var1.field2449] = null; } return true; } } - - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(ILcu;ZB)I", - garbageValue = "-120" - ) - static int method3737(int var0, Script var1, boolean var2) { - int var4 = -1; - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var4 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - var3 = Tile.getWidget(var4); - } else { - var3 = var2 ? UserComparator7.field1946 : class197.field2398; - } - - if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { - class188.Interpreter_intStackSize -= 2; - var3.scrollX = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - if (var3.scrollX > var3.scrollWidth - var3.width) { - var3.scrollX = var3.scrollWidth - var3.width; - } - - if (var3.scrollX < 0) { - var3.scrollX = 0; - } - - var3.scrollY = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - if (var3.scrollY > var3.scrollHeight - var3.height) { - var3.scrollY = var3.scrollHeight - var3.height; - } - - if (var3.scrollY < 0) { - var3.scrollY = 0; - } - - LoginPacket.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { - var3.color = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - LoginPacket.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETFILL) { - var3.fill = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - LoginPacket.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTRANS) { - var3.transparencyTop = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - LoginPacket.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { - var3.lineWid = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - LoginPacket.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { - var3.spriteId2 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - LoginPacket.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { - var3.spriteAngle = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - LoginPacket.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTILING) { - var3.spriteTiling = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - LoginPacket.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODEL) { - var3.modelType = 1; - var3.modelId = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - LoginPacket.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { - class188.Interpreter_intStackSize -= 6; - var3.modelOffsetX = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var3.modelOffsetY = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - var3.modelAngleX = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2]; - var3.modelAngleY = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 3]; - var3.modelAngleZ = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 4]; - var3.modelZoom = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 5]; - LoginPacket.invalidateWidget(var3); - return 1; - } else { - int var8; - if (var0 == ScriptOpcodes.CC_SETMODELANIM) { - var8 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - if (var8 != var3.sequenceId) { - var3.sequenceId = var8; - var3.modelFrame = 0; - var3.modelFrameCycle = 0; - LoginPacket.invalidateWidget(var3); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { - var3.modelOrthog = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - LoginPacket.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXT) { - String var7 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - if (!var7.equals(var3.text)) { - var3.text = var7; - LoginPacket.invalidateWidget(var3); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { - var3.fontId = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - LoginPacket.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { - class188.Interpreter_intStackSize -= 3; - var3.textXAlignment = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var3.textYAlignment = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - var3.textLineHeight = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2]; - LoginPacket.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { - var3.textShadowed = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - LoginPacket.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { - var3.outline = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - LoginPacket.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { - var3.spriteShadow = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - LoginPacket.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { - var3.spriteFlipV = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - LoginPacket.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { - var3.spriteFlipH = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - LoginPacket.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { - class188.Interpreter_intStackSize -= 2; - var3.scrollWidth = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var3.scrollHeight = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - LoginPacket.invalidateWidget(var3); - if (var4 != -1 && var3.type == 0) { - Messages.revalidateWidgetScroll(UserComparator7.Widget_interfaceComponents[var4 >> 16], var3, false); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { - WorldMapRectangle.resumePauseWidget(var3.id, var3.childIndex); - Client.meslayerContinueWidget = var3; - LoginPacket.invalidateWidget(var3); - return 1; - } else if (var0 == 1122) { - var3.spriteId = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - LoginPacket.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { - var3.color2 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - LoginPacket.invalidateWidget(var3); - return 1; - } else if (var0 == 1124) { - var3.transparencyBot = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - LoginPacket.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETFILLMODE) { - var8 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - FillMode var6 = (FillMode)DynamicObject.findEnumerated(ModelData0.FillMode_values(), var8); - if (var6 != null) { - var3.fillMode = var6; - LoginPacket.invalidateWidget(var3); - } - - return 1; - } else { - boolean var5; - if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { - var5 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - var3.field2676 = var5; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { - var5 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - var3.modelTransparency = var5; - return 1; - } else { - return 2; - } - } - } - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(Lko;Lko;Lko;I)V", - garbageValue = "702202184" - ) - @Export("drawTitle") - static void drawTitle(Font var0, Font var1, Font var2) { - Login.xPadding = (GrandExchangeOfferTotalQuantityComparator.canvasWidth - 765) / 2; - Login.loginBoxX = Login.xPadding + 202; - Script.loginBoxCenter = Login.loginBoxX + 180; - if (Login.worldSelectOpen) { - class42.method781(var0, var1); - } else { - UrlRequest.leftTitleSprite.drawAt(Login.xPadding, 0); - ScriptFrame.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); - int var4; - if (Client.gameState == 0 || Client.gameState == 5) { - byte var3 = 20; - var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); - var4 = 253 - var3; - Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); - Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); - Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); - Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); - var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); - } - - String var6; - String var7; - String var8; - short var27; - int var28; - short var29; - if (Client.gameState == 20) { - Login.titleboxSprite.drawAt(Login.loginBoxX + 180 - Login.titleboxSprite.subWidth / 2, 271 - Login.titleboxSprite.subHeight / 2); - var27 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var27, 16776960, 0); - var28 = var27 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var28, 16776960, 0); - var28 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var28, 16776960, 0); - var28 += 15; - var28 += 7; - if (Login.loginIndex != 4) { - var0.draw("Login: ", Login.loginBoxX + 180 - 110, var28, 16777215, 0); - var29 = 200; - if (Interpreter.clientPreferences.hideUsername) { - var8 = Login.Login_username; - var7 = UserComparator6.method3370('*', var8.length()); - var6 = var7; - } else { - var6 = Login.Login_username; - } - - for (var6 = var6; var0.stringWidth(var6) > var29; var6 = var6.substring(0, var6.length() - 1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var6), Login.loginBoxX + 180 - 70, var28, 16777215, 0); - var28 += 15; - var8 = Login.Login_password; - var7 = UserComparator6.method3370('*', var8.length()); - - String var9; - for (var9 = var7; var0.stringWidth(var9) > var29; var9 = var9.substring(1)) { - } - - var0.draw("Password: " + var9, Login.loginBoxX + 180 - 108, var28, 16777215, 0); - var28 += 15; - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { - Login.titleboxSprite.drawAt(Login.loginBoxX, 171); - short var18; - if (Login.loginIndex == 0) { - var27 = 251; - var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var27, 16776960, 0); - var28 = var27 + 30; - var4 = Login.loginBoxX + 180 - 80; - var18 = 291; - Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); - var0.drawLines("New User", var4 - 73, var18 - 20, 144, 40, 16777215, 0, 1, 1, 0); - var4 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); - var0.drawLines("Existing User", var4 - 73, var18 - 20, 144, 40, 16777215, 0, 1, 1, 0); - } else if (Login.loginIndex == 1) { - var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); - var27 = 236; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var27, 16777215, 0); - var28 = var27 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var28, 16777215, 0); - var28 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var28, 16777215, 0); - var28 += 15; - var4 = Login.loginBoxX + 180 - 80; - var18 = 321; - Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); - var0.drawCentered("Continue", var4, var18 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); - var0.drawCentered("Cancel", var4, var18 + 5, 16777215, 0); - } else { - String var5; - int var21; - if (Login.loginIndex == 2) { - var27 = 201; - var0.drawCentered(Login.Login_response1, Script.loginBoxCenter, var27, 16776960, 0); - var28 = var27 + 15; - var0.drawCentered(Login.Login_response2, Script.loginBoxCenter, var28, 16776960, 0); - var28 += 15; - var0.drawCentered(Login.Login_response3, Script.loginBoxCenter, var28, 16776960, 0); - var28 += 15; - var28 += 7; - var0.draw("Login: ", Script.loginBoxCenter - 110, var28, 16777215, 0); - var29 = 200; - var5 = Interpreter.clientPreferences.hideUsername ? StructDefinition.method4551(Login.Login_username) : Login.Login_username; - - for (var6 = var5; var0.stringWidth(var6) > var29; var6 = var6.substring(1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var6) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? NPC.colorStartTag(16776960) + "|" : ""), Script.loginBoxCenter - 70, var28, 16777215, 0); - var28 += 15; - - for (var7 = StructDefinition.method4551(Login.Login_password); var0.stringWidth(var7) > var29; var7 = var7.substring(1)) { - } - - var0.draw("Password: " + var7 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? NPC.colorStartTag(16776960) + "|" : ""), Script.loginBoxCenter - 108, var28, 16777215, 0); - var28 += 15; - var27 = 277; - var21 = Script.loginBoxCenter + -117; - boolean var10 = Client.Login_isUsernameRemembered; - boolean var11 = Login.field1186; - IndexedSprite var30 = var10 ? (var11 ? Login.field1162 : Login.options_buttons_2Sprite) : (var11 ? GrandExchangeOffer.field64 : class218.options_buttons_0Sprite); - var30.drawAt(var21, var27); - var21 = var21 + var30.subWidth + 5; - var1.draw("Remember username", var21, var27 + 13, 16776960, 0); - var21 = Script.loginBoxCenter + 24; - boolean var14 = Interpreter.clientPreferences.hideUsername; - boolean var15 = Login.field1182; - IndexedSprite var13 = var14 ? (var15 ? Login.field1162 : Login.options_buttons_2Sprite) : (var15 ? GrandExchangeOffer.field64 : class218.options_buttons_0Sprite); - var13.drawAt(var21, var27); - var21 = var21 + var13.subWidth + 5; - var1.draw("Hide username", var21, var27 + 13, 16776960, 0); - var28 = var27 + 15; - int var16 = Script.loginBoxCenter - 80; - short var17 = 321; - Login.titlebuttonSprite.drawAt(var16 - 73, var17 - 20); - var0.drawCentered("Login", var16, var17 + 5, 16777215, 0); - var16 = Script.loginBoxCenter + 80; - Login.titlebuttonSprite.drawAt(var16 - 73, var17 - 20); - var0.drawCentered("Cancel", var16, var17 + 5, 16777215, 0); - var27 = 357; - switch(Login.field1181) { - case 2: - DevicePcmPlayerProvider.field391 = "Having trouble logging in?"; - break; - default: - DevicePcmPlayerProvider.field391 = "Can't login? Click here."; - } - - class267.field3521 = new Bounds(Script.loginBoxCenter, var27, var1.stringWidth(DevicePcmPlayerProvider.field391), 11); - class197.field2397 = new Bounds(Script.loginBoxCenter, var27, var1.stringWidth("Still having trouble logging in?"), 11); - var1.drawCentered(DevicePcmPlayerProvider.field391, Script.loginBoxCenter, var27, 16777215, 0); - } else if (Login.loginIndex == 3) { - var27 = 201; - var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var27, 16776960, 0); - var28 = var27 + 20; - var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var28, 16776960, 0); - var28 += 15; - var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var28, 16776960, 0); - var28 += 15; - var4 = Login.loginBoxX + 180; - var18 = 276; - Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); - var2.drawCentered("Try again", var4, var18 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180; - var18 = 326; - Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); - var2.drawCentered("Forgotten password?", var4, var18 + 5, 16777215, 0); - } else if (Login.loginIndex == 4) { - var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); - var27 = 236; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var27, 16777215, 0); - var28 = var27 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var28, 16777215, 0); - var28 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var28, 16777215, 0); - var28 += 15; - var5 = "PIN: "; - var7 = class80.otp; - var6 = UserComparator6.method3370('*', var7.length()); - var0.draw(var5 + var6 + (Client.cycle % 40 < 20 ? NPC.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var28, 16777215, 0); - var28 -= 8; - var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var28, 16776960, 0); - var28 += 15; - var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var28, 16776960, 0); - var21 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; - int var23 = var28 - var0.ascent; - IndexedSprite var24; - if (Login.field1178) { - var24 = Login.options_buttons_2Sprite; - } else { - var24 = class218.options_buttons_0Sprite; - } - - var24.drawAt(var21, var23); - var28 += 15; - int var31 = Login.loginBoxX + 180 - 80; - short var25 = 321; - Login.titlebuttonSprite.drawAt(var31 - 73, var25 - 20); - var0.drawCentered("Continue", var31, var25 + 5, 16777215, 0); - var31 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var31 - 73, var25 - 20); - var0.drawCentered("Cancel", var31, var25 + 5, 16777215, 0); - var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var25 + 36, 255, 0); - } else { - int var26; - short var33; - if (Login.loginIndex == 5) { - var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); - var27 = 221; - var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var27, 16776960, 0); - var28 = var27 + 15; - var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var28, 16776960, 0); - var28 += 15; - var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var28, 16776960, 0); - var28 += 15; - var28 += 14; - var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var28, 16777215, 0); - var29 = 174; - if (Interpreter.clientPreferences.hideUsername) { - var8 = Login.Login_username; - var7 = UserComparator6.method3370('*', var8.length()); - var6 = var7; - } else { - var6 = Login.Login_username; - } - - for (var6 = var6; var0.stringWidth(var6) > var29; var6 = var6.substring(1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var6) + (Client.cycle % 40 < 20 ? NPC.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var28, 16777215, 0); - var28 += 15; - var26 = Login.loginBoxX + 180 - 80; - var33 = 321; - Login.titlebuttonSprite.drawAt(var26 - 73, var33 - 20); - var0.drawCentered("Recover", var26, var33 + 5, 16777215, 0); - var26 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var26 - 73, var33 - 20); - var0.drawCentered("Back", var26, var33 + 5, 16777215, 0); - var33 = 356; - var1.drawCentered("Still having trouble logging in?", Script.loginBoxCenter, var33, 268435455, 0); - } else if (Login.loginIndex == 6) { - var27 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var27, 16776960, 0); - var28 = var27 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var28, 16776960, 0); - var28 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var28, 16776960, 0); - var28 += 15; - var4 = Login.loginBoxX + 180; - var18 = 321; - Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); - var0.drawCentered("Back", var4, var18 + 5, 16777215, 0); - } else if (Login.loginIndex == 7) { - var27 = 216; - var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var27, 16776960, 0); - var28 = var27 + 15; - var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var28, 16776960, 0); - var28 += 15; - var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var28, 16776960, 0); - var28 += 15; - var4 = Login.loginBoxX + 180 - 80; - var18 = 321; - Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); - var0.drawCentered("Set Date of Birth", var4, var18 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); - var0.drawCentered("Back", var4, var18 + 5, 16777215, 0); - } else if (Login.loginIndex == 8) { - var27 = 216; - var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var27, 16776960, 0); - var28 = var27 + 15; - var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var28, 16776960, 0); - var28 += 15; - var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var28, 16776960, 0); - var28 += 15; - var4 = Login.loginBoxX + 180 - 80; - var18 = 321; - Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); - var0.drawCentered("Privacy Policy", var4, var18 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); - var0.drawCentered("Back", var4, var18 + 5, 16777215, 0); - } else if (Login.loginIndex == 12) { - var27 = 201; - String var22 = ""; - var5 = ""; - var6 = ""; - switch(Login.field1167) { - case 0: - var22 = "Your account has been disabled."; - var5 = Strings.field2798; - var6 = ""; - break; - case 1: - var22 = "Account locked as we suspect it has been stolen."; - var5 = Strings.field2837; - var6 = ""; - break; - default: - ItemDefinition.Login_promptCredentials(false); - } - - var0.drawCentered(var22, Login.loginBoxX + 180, var27, 16776960, 0); - var28 = var27 + 15; - var2.drawCentered(var5, Login.loginBoxX + 180, var28, 16776960, 0); - var28 += 15; - var2.drawCentered(var6, Login.loginBoxX + 180, var28, 16776960, 0); - var28 += 15; - var26 = Login.loginBoxX + 180; - var33 = 276; - Login.titlebuttonSprite.drawAt(var26 - 73, var33 - 20); - var0.drawCentered("Support Page", var26, var33 + 5, 16777215, 0); - var26 = Login.loginBoxX + 180; - var33 = 326; - Login.titlebuttonSprite.drawAt(var26 - 73, var33 - 20); - var0.drawCentered("Back", var26, var33 + 5, 16777215, 0); - } else if (Login.loginIndex == 24) { - var27 = 221; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var27, 16777215, 0); - var28 = var27 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var28, 16777215, 0); - var28 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var28, 16777215, 0); - var28 += 15; - var4 = Login.loginBoxX + 180; - var18 = 301; - Login.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); - var0.drawCentered("Ok", var4, var18 + 5, 16777215, 0); - } - } - } - } - - if (Client.gameState >= 10) { - int[] var19 = new int[4]; - Rasterizer2D.Rasterizer2D_getClipArray(var19); - Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, AttackOption.canvasHeight); - StructDefinition.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); - StructDefinition.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); - Rasterizer2D.Rasterizer2D_setClipArray(var19); - } - - class30.title_muteSprite[Interpreter.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); - if (Client.gameState > 5 && Varps.clientLanguage == Language.Language_EN) { - if (class54.field483 != null) { - var28 = Login.xPadding + 5; - var29 = 463; - byte var32 = 100; - byte var20 = 35; - class54.field483.drawAt(var28, var29); - var0.drawCentered("World" + " " + Client.worldId, var32 / 2 + var28, var20 / 2 + var29 - 2, 16777215, 0); - if (Login.World_request != null) { - var1.drawCentered("Loading...", var32 / 2 + var28, var20 / 2 + var29 + 12, 16777215, 0); - } else { - var1.drawCentered("Click to switch", var32 / 2 + var28, var20 / 2 + var29 + 12, 16777215, 0); - } - } else { - class54.field483 = Canvas.SpriteBuffer_getIndexedSpriteByName(class3.archive8, "sl_button", ""); - } - } - - } - } } diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java index 17039b622a..79153cf8c8 100644 --- a/runescape-client/src/main/java/MilliClock.java +++ b/runescape-client/src/main/java/MilliClock.java @@ -4,143 +4,176 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fy") +@ObfuscatedName("fj") @Implements("MilliClock") public class MilliClock extends Clock { - @ObfuscatedName("oj") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lck;" + signature = "[Lme;" ) - @Export("varcs") - static Varcs varcs; + @Export("JagexCache_idxFiles") + public static BufferedFile[] JagexCache_idxFiles; + @ObfuscatedName("b") + public static String field2015; + @ObfuscatedName("db") + @ObfuscatedSignature( + signature = "Lia;" + ) + @Export("archive12") + static Archive archive12; + @ObfuscatedName("c") + long[] field2011; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 1924438695 + ) + int field2009; @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "Lhz;" + @ObfuscatedGetter( + intValue = 990081357 ) - @Export("Widget_fontsArchive") - static AbstractArchive Widget_fontsArchive; - @ObfuscatedName("f") - long[] field2005; + int field2008; + @ObfuscatedName("e") + @ObfuscatedGetter( + longValue = 1282621302724329393L + ) + long field2013; @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1395433479 + intValue = -552407369 ) - int field1999; - @ObfuscatedName("y") + int field2012; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -814171189 + intValue = 1470332853 ) - int field1998; - @ObfuscatedName("w") - @ObfuscatedGetter( - longValue = 7702672897497334159L - ) - long field1996; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 1971877303 - ) - int field1997; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -1477924713 - ) - int field2001; + int field2014; MilliClock() { - this.field2005 = new long[10]; - this.field1999 = 256; - this.field1998 = 1; - this.field1997 = 0; - this.field1996 = WorldMapID.currentTimeMillis(); + this.field2011 = new long[10]; + this.field2009 = 256; + this.field2008 = 1; + this.field2012 = 0; + this.field2013 = WorldMapIcon_0.currentTimeMillis(); for (int var1 = 0; var1 < 10; ++var1) { - this.field2005[var1] = this.field1996; + this.field2011[var1] = this.field2013; } } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "4" + garbageValue = "29" ) @Export("mark") public void mark() { for (int var1 = 0; var1 < 10; ++var1) { - this.field2005[var1] = 0L; + this.field2011[var1] = 0L; } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "670539248" + garbageValue = "-561232674" ) @Export("wait") public int wait(int var1, int var2) { - int var3 = this.field1999; - int var4 = this.field1998; - this.field1999 = 300; - this.field1998 = 1; - this.field1996 = WorldMapID.currentTimeMillis(); - if (0L == this.field2005[this.field2001]) { - this.field1999 = var3; - this.field1998 = var4; - } else if (this.field1996 > this.field2005[this.field2001]) { - this.field1999 = (int)((long)(var1 * 2560) / (this.field1996 - this.field2005[this.field2001])); + int var3 = this.field2009; + int var4 = this.field2008; + this.field2009 = 300; + this.field2008 = 1; + this.field2013 = WorldMapIcon_0.currentTimeMillis(); + if (this.field2011[this.field2014] == 0L) { + this.field2009 = var3; + this.field2008 = var4; + } else if (this.field2013 > this.field2011[this.field2014]) { + this.field2009 = (int)((long)(var1 * 2560) / (this.field2013 - this.field2011[this.field2014])); } - if (this.field1999 < 25) { - this.field1999 = 25; + if (this.field2009 < 25) { + this.field2009 = 25; } - if (this.field1999 > 256) { - this.field1999 = 256; - this.field1998 = (int)((long)var1 - (this.field1996 - this.field2005[this.field2001]) / 10L); + if (this.field2009 > 256) { + this.field2009 = 256; + this.field2008 = (int)((long)var1 - (this.field2013 - this.field2011[this.field2014]) / 10L); } - if (this.field1998 > var1) { - this.field1998 = var1; + if (this.field2008 > var1) { + this.field2008 = var1; } - this.field2005[this.field2001] = this.field1996; - this.field2001 = (this.field2001 + 1) % 10; + this.field2011[this.field2014] = this.field2013; + this.field2014 = (this.field2014 + 1) % 10; int var5; - if (this.field1998 > 1) { + if (this.field2008 > 1) { for (var5 = 0; var5 < 10; ++var5) { - if (this.field2005[var5] != 0L) { - this.field2005[var5] += (long)this.field1998; + if (0L != this.field2011[var5]) { + this.field2011[var5] += (long)this.field2008; } } } - if (this.field1998 < var2) { - this.field1998 = var2; + if (this.field2008 < var2) { + this.field2008 = var2; } - ServerBuild.method4111((long)this.field1998); + FriendLoginUpdate.method5325((long)this.field2008); - for (var5 = 0; this.field1997 < 256; this.field1997 += this.field1999) { + for (var5 = 0; this.field2012 < 256; this.field2012 += this.field2009) { ++var5; } - this.field1997 &= 255; + this.field2012 &= 255; return var5; } - @ObfuscatedName("f") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "176449942" + signature = "(III)Lce;", + garbageValue = "-230494464" ) - static int method3447(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var2 == null) { - return -1; + static Script method3529(int var0, int var1) { + Script var2 = (Script)Script.Script_cached.get((long)(var0 << 16)); + if (var2 != null) { + return var2; } else { - return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; + String var3 = String.valueOf(var0); + int var4 = archive12.getGroupId(var3); + if (var4 == -1) { + return null; + } else { + byte[] var5 = archive12.takeFileFlat(var4); + if (var5 != null) { + if (var5.length <= 1) { + return null; + } + + var2 = Clock.newScript(var5); + if (var2 != null) { + Script.Script_cached.put(var2, (long)(var0 << 16)); + return var2; + } + } + + return null; + } } } + + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1997111110" + ) + public static void method3535() { + Widget.Widget_cachedSprites.clear(); + Widget.Widget_cachedModels.clear(); + Widget.Widget_cachedFonts.clear(); + Widget.Widget_cachedSpriteMasks.clear(); + } } diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java index 797228b5c8..4e975675b8 100644 --- a/runescape-client/src/main/java/Model.java +++ b/runescape-client/src/main/java/Model.java @@ -3,180 +3,180 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dw") +@ObfuscatedName("dx") @Implements("Model") public class Model extends Entity { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Ldw;" + signature = "Ldx;" ) @Export("Model_sharedSequenceModel") static Model Model_sharedSequenceModel; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("Model_sharedSequenceModelFaceAlphas") static byte[] Model_sharedSequenceModelFaceAlphas; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Ldw;" + signature = "Ldx;" ) @Export("Model_sharedSpotAnimationModel") static Model Model_sharedSpotAnimationModel; - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("Model_sharedSpotAnimationModelFaceAlphas") static byte[] Model_sharedSpotAnimationModelFaceAlphas; - @ObfuscatedName("ag") - static boolean[] field1657; - @ObfuscatedName("ac") - static boolean[] field1683; + @ObfuscatedName("ar") + static boolean[] field1673; + @ObfuscatedName("av") + static boolean[] field1696; @ObfuscatedName("al") @Export("modelViewportXs") static int[] modelViewportXs; - @ObfuscatedName("ae") + @ObfuscatedName("ad") @Export("modelViewportYs") static int[] modelViewportYs; - @ObfuscatedName("ad") - static int[] field1710; - @ObfuscatedName("aj") - static int[] field1670; - @ObfuscatedName("ax") - static int[] field1691; - @ObfuscatedName("at") - static int[] field1689; - @ObfuscatedName("ap") - static int[] field1651; - @ObfuscatedName("ai") - static int[][] field1692; @ObfuscatedName("am") - static int[] field1705; - @ObfuscatedName("ab") - static int[][] field1694; - @ObfuscatedName("bj") - static int[] field1695; - @ObfuscatedName("bg") - static int[] field1696; - @ObfuscatedName("bw") - static int[] field1697; - @ObfuscatedName("bk") - static int[] field1698; - @ObfuscatedName("bl") static int[] field1699; - @ObfuscatedName("bq") + @ObfuscatedName("ao") static int[] field1700; - @ObfuscatedName("bx") + @ObfuscatedName("at") + static int[] field1701; + @ObfuscatedName("an") + static int[] field1693; + @ObfuscatedName("ai") + static int[] field1704; + @ObfuscatedName("ab") + static int[][] field1722; + @ObfuscatedName("ap") + static int[] field1670; + @ObfuscatedName("ah") + static int[][] field1707; + @ObfuscatedName("bq") + static int[] field1708; + @ObfuscatedName("bf") + static int[] field1709; + @ObfuscatedName("bc") + static int[] field1684; + @ObfuscatedName("bk") + static int[] field1711; + @ObfuscatedName("bb") + static int[] field1712; + @ObfuscatedName("bi") + static int[] field1719; + @ObfuscatedName("bp") @Export("Model_transformTempX") static int Model_transformTempX; - @ObfuscatedName("bc") + @ObfuscatedName("bl") @Export("Model_transformTempY") static int Model_transformTempY; @ObfuscatedName("by") @Export("Model_transformTempZ") static int Model_transformTempZ; - @ObfuscatedName("bz") - static boolean field1704; - @ObfuscatedName("bs") + @ObfuscatedName("be") + static boolean field1717; + @ObfuscatedName("bn") @Export("Model_sine") static int[] Model_sine; - @ObfuscatedName("ba") + @ObfuscatedName("bm") @Export("Model_cosine") static int[] Model_cosine; - @ObfuscatedName("bn") - static int[] field1709; - @ObfuscatedName("bb") - static int[] field1675; - @ObfuscatedName("p") + @ObfuscatedName("ba") + static int[] field1713; + @ObfuscatedName("bd") + static int[] field1723; + @ObfuscatedName("i") @Export("verticesCount") int verticesCount; - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("verticesX") int[] verticesX; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("verticesY") int[] verticesY; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("indicesCount") int indicesCount; - @ObfuscatedName("d") + @ObfuscatedName("m") @Export("indices1") int[] indices1; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("indices2") int[] indices2; - @ObfuscatedName("o") + @ObfuscatedName("h") @Export("indices3") int[] indices3; @ObfuscatedName("v") @Export("faceColors1") int[] faceColors1; - @ObfuscatedName("k") + @ObfuscatedName("n") @Export("faceColors2") int[] faceColors2; - @ObfuscatedName("s") + @ObfuscatedName("x") @Export("faceColors3") int[] faceColors3; - @ObfuscatedName("l") + @ObfuscatedName("w") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("t") + @ObfuscatedName("k") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("j") - byte[] field1703; - @ObfuscatedName("n") + @ObfuscatedName("q") + byte[] field1686; + @ObfuscatedName("z") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("u") - byte field1662; - @ObfuscatedName("z") - int field1688; - @ObfuscatedName("h") - int[] field1664; - @ObfuscatedName("m") - int[] field1665; - @ObfuscatedName("g") - int[] field1693; + @ObfuscatedName("y") + byte field1675; + @ObfuscatedName("f") + int field1676; + @ObfuscatedName("b") + int[] field1677; @ObfuscatedName("r") + int[] field1678; + @ObfuscatedName("s") + int[] field1656; + @ObfuscatedName("a") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("q") + @ObfuscatedName("u") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("aa") + @ObfuscatedName("ae") @Export("isSingleTile") public boolean isSingleTile; - @ObfuscatedName("av") + @ObfuscatedName("af") @Export("boundsType") int boundsType; - @ObfuscatedName("aw") + @ObfuscatedName("az") @Export("bottomY") int bottomY; - @ObfuscatedName("as") + @ObfuscatedName("ax") @Export("xzRadius") int xzRadius; - @ObfuscatedName("ak") + @ObfuscatedName("aj") @Export("diameter") int diameter; @ObfuscatedName("au") @Export("radius") int radius; - @ObfuscatedName("ah") + @ObfuscatedName("ay") @Export("xMid") int xMid; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("yMid") int yMid; - @ObfuscatedName("ao") + @ObfuscatedName("aq") @Export("zMid") int zMid; - @ObfuscatedName("an") + @ObfuscatedName("as") @Export("xMidOffset") int xMidOffset; - @ObfuscatedName("ar") + @ObfuscatedName("ak") @Export("yMidOffset") int yMidOffset; - @ObfuscatedName("az") + @ObfuscatedName("ac") @Export("zMidOffset") int zMidOffset; @@ -185,36 +185,36 @@ public class Model extends Entity { Model_sharedSequenceModelFaceAlphas = new byte[1]; Model_sharedSpotAnimationModel = new Model(); Model_sharedSpotAnimationModelFaceAlphas = new byte[1]; - field1657 = new boolean[4700]; - field1683 = new boolean[4700]; + field1673 = new boolean[4700]; + field1696 = new boolean[4700]; modelViewportXs = new int[4700]; modelViewportYs = new int[4700]; - field1710 = new int[4700]; - field1670 = new int[4700]; - field1691 = new int[4700]; - field1689 = new int[4700]; - field1651 = new int[1600]; - field1692 = new int[1600][512]; - field1705 = new int[12]; - field1694 = new int[12][2000]; - field1695 = new int[2000]; - field1696 = new int[2000]; - field1697 = new int[12]; - field1698 = new int[10]; - field1699 = new int[10]; - field1700 = new int[10]; - field1704 = true; + field1699 = new int[4700]; + field1700 = new int[4700]; + field1701 = new int[4700]; + field1693 = new int[4700]; + field1704 = new int[1600]; + field1722 = new int[1600][512]; + field1670 = new int[12]; + field1707 = new int[12][2000]; + field1708 = new int[2000]; + field1709 = new int[2000]; + field1684 = new int[12]; + field1711 = new int[10]; + field1712 = new int[10]; + field1719 = new int[10]; + field1717 = true; Model_sine = Rasterizer3D.Rasterizer3D_sine; Model_cosine = Rasterizer3D.Rasterizer3D_cosine; - field1709 = Rasterizer3D.Rasterizer3D_colorPalette; - field1675 = Rasterizer3D.field1760; + field1713 = Rasterizer3D.Rasterizer3D_colorPalette; + field1723 = Rasterizer3D.field1778; } Model() { this.verticesCount = 0; this.indicesCount = 0; - this.field1662 = 0; - this.field1688 = 0; + this.field1675 = 0; + this.field1676 = 0; this.isSingleTile = false; this.xMidOffset = -1; this.yMidOffset = -1; @@ -222,13 +222,13 @@ public class Model extends Entity { } @ObfuscatedSignature( - signature = "([Ldw;I)V" + signature = "([Ldx;I)V" ) public Model(Model[] var1, int var2) { this.verticesCount = 0; this.indicesCount = 0; - this.field1662 = 0; - this.field1688 = 0; + this.field1675 = 0; + this.field1676 = 0; this.isSingleTile = false; this.xMidOffset = -1; this.yMidOffset = -1; @@ -239,8 +239,8 @@ public class Model extends Entity { boolean var6 = false; this.verticesCount = 0; this.indicesCount = 0; - this.field1688 = 0; - this.field1662 = -1; + this.field1676 = 0; + this.field1675 = -1; int var7; Model var8; @@ -249,22 +249,22 @@ public class Model extends Entity { if (var8 != null) { this.verticesCount += var8.verticesCount; this.indicesCount += var8.indicesCount; - this.field1688 += var8.field1688; + this.field1676 += var8.field1676; if (var8.faceRenderPriorities != null) { var3 = true; } else { - if (this.field1662 == -1) { - this.field1662 = var8.field1662; + if (this.field1675 == -1) { + this.field1675 = var8.field1675; } - if (this.field1662 != var8.field1662) { + if (this.field1675 != var8.field1675) { var3 = true; } } var4 |= var8.faceAlphas != null; var5 |= var8.faceTextures != null; - var6 |= var8.field1703 != null; + var6 |= var8.field1686 != null; } } @@ -290,18 +290,18 @@ public class Model extends Entity { } if (var6) { - this.field1703 = new byte[this.indicesCount]; + this.field1686 = new byte[this.indicesCount]; } - if (this.field1688 > 0) { - this.field1664 = new int[this.field1688]; - this.field1665 = new int[this.field1688]; - this.field1693 = new int[this.field1688]; + if (this.field1676 > 0) { + this.field1677 = new int[this.field1676]; + this.field1678 = new int[this.field1676]; + this.field1656 = new int[this.field1676]; } this.verticesCount = 0; this.indicesCount = 0; - this.field1688 = 0; + this.field1676 = 0; for (var7 = 0; var7 < var2; ++var7) { var8 = var1[var7]; @@ -318,7 +318,7 @@ public class Model extends Entity { if (var8.faceRenderPriorities != null) { this.faceRenderPriorities[this.indicesCount] = var8.faceRenderPriorities[var9]; } else { - this.faceRenderPriorities[this.indicesCount] = var8.field1662; + this.faceRenderPriorities[this.indicesCount] = var8.field1675; } } @@ -335,21 +335,21 @@ public class Model extends Entity { } if (var6) { - if (var8.field1703 != null && var8.field1703[var9] != -1) { - this.field1703[this.indicesCount] = (byte)(this.field1688 + var8.field1703[var9]); + if (var8.field1686 != null && var8.field1686[var9] != -1) { + this.field1686[this.indicesCount] = (byte)(this.field1676 + var8.field1686[var9]); } else { - this.field1703[this.indicesCount] = -1; + this.field1686[this.indicesCount] = -1; } } ++this.indicesCount; } - for (var9 = 0; var9 < var8.field1688; ++var9) { - this.field1664[this.field1688] = this.verticesCount + var8.field1664[var9]; - this.field1665[this.field1688] = this.verticesCount + var8.field1665[var9]; - this.field1693[this.field1688] = this.verticesCount + var8.field1693[var9]; - ++this.field1688; + for (var9 = 0; var9 < var8.field1676; ++var9) { + this.field1677[this.field1676] = this.verticesCount + var8.field1677[var9]; + this.field1678[this.field1676] = this.verticesCount + var8.field1678[var9]; + this.field1656[this.field1676] = this.verticesCount + var8.field1656[var9]; + ++this.field1676; } for (var9 = 0; var9 < var8.verticesCount; ++var9) { @@ -363,9 +363,9 @@ public class Model extends Entity { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "([[IIIIZI)Ldw;" + signature = "([[IIIIZI)Ldx;" ) @Export("contourGround") public Model contourGround(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { @@ -387,7 +387,7 @@ public class Model extends Entity { var11 = new Model(); var11.verticesCount = this.verticesCount; var11.indicesCount = this.indicesCount; - var11.field1688 = this.field1688; + var11.field1676 = this.field1676; var11.verticesX = this.verticesX; var11.verticesZ = this.verticesZ; var11.indices1 = this.indices1; @@ -398,12 +398,12 @@ public class Model extends Entity { var11.faceColors3 = this.faceColors3; var11.faceRenderPriorities = this.faceRenderPriorities; var11.faceAlphas = this.faceAlphas; - var11.field1703 = this.field1703; + var11.field1686 = this.field1686; var11.faceTextures = this.faceTextures; - var11.field1662 = this.field1662; - var11.field1664 = this.field1664; - var11.field1665 = this.field1665; - var11.field1693 = this.field1693; + var11.field1675 = this.field1675; + var11.field1677 = this.field1677; + var11.field1678 = this.field1678; + var11.field1656 = this.field1656; var11.vertexLabels = this.vertexLabels; var11.faceLabelsAlpha = this.faceLabelsAlpha; var11.isSingleTile = this.isSingleTile; @@ -461,9 +461,9 @@ public class Model extends Entity { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Z)Ldw;" + signature = "(Z)Ldx;" ) @Export("toSharedSequenceModel") public Model toSharedSequenceModel(boolean var1) { @@ -474,9 +474,9 @@ public class Model extends Entity { return this.buildSharedModel(var1, Model_sharedSequenceModel, Model_sharedSequenceModelFaceAlphas); } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Z)Ldw;" + signature = "(Z)Ldx;" ) @Export("toSharedSpotAnimationModel") public Model toSharedSpotAnimationModel(boolean var1) { @@ -487,15 +487,15 @@ public class Model extends Entity { return this.buildSharedModel(var1, Model_sharedSpotAnimationModel, Model_sharedSpotAnimationModelFaceAlphas); } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(ZLdw;[B)Ldw;" + signature = "(ZLdx;[B)Ldx;" ) @Export("buildSharedModel") Model buildSharedModel(boolean var1, Model var2, byte[] var3) { var2.verticesCount = this.verticesCount; var2.indicesCount = this.indicesCount; - var2.field1688 = this.field1688; + var2.field1676 = this.field1676; if (var2.verticesX == null || var2.verticesX.length < this.verticesCount) { var2.verticesX = new int[this.verticesCount + 100]; var2.verticesY = new int[this.verticesCount + 100]; @@ -531,12 +531,12 @@ public class Model extends Entity { var2.faceColors2 = this.faceColors2; var2.faceColors3 = this.faceColors3; var2.faceRenderPriorities = this.faceRenderPriorities; - var2.field1703 = this.field1703; + var2.field1686 = this.field1686; var2.faceTextures = this.faceTextures; - var2.field1662 = this.field1662; - var2.field1664 = this.field1664; - var2.field1665 = this.field1665; - var2.field1693 = this.field1693; + var2.field1675 = this.field1675; + var2.field1677 = this.field1677; + var2.field1678 = this.field1678; + var2.field1656 = this.field1656; var2.vertexLabels = this.vertexLabels; var2.faceLabelsAlpha = this.faceLabelsAlpha; var2.isSingleTile = this.isSingleTile; @@ -544,7 +544,7 @@ public class Model extends Entity { return var2; } - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("calculateBoundingBox") void calculateBoundingBox(int var1) { if (this.xMidOffset == -1) { @@ -558,9 +558,9 @@ public class Model extends Entity { int var9 = Model_sine[var1]; for (int var10 = 0; var10 < this.verticesCount; ++var10) { - int var11 = Rasterizer3D.method3015(this.verticesX[var10], this.verticesZ[var10], var8, var9); + int var11 = Rasterizer3D.method3083(this.verticesX[var10], this.verticesZ[var10], var8, var9); int var12 = this.verticesY[var10]; - int var13 = Rasterizer3D.method3016(this.verticesX[var10], this.verticesZ[var10], var8, var9); + int var13 = Rasterizer3D.method3084(this.verticesX[var10], this.verticesZ[var10], var8, var9); if (var11 < var2) { var2 = var11; } @@ -608,7 +608,7 @@ public class Model extends Entity { } } - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("calculateBoundsCylinder") public void calculateBoundsCylinder() { if (this.boundsType != 1) { @@ -641,8 +641,8 @@ public class Model extends Entity { } } - @ObfuscatedName("e") - void method2906() { + @ObfuscatedName("d") + void method2950() { if (this.boundsType != 2) { this.boundsType = 2; this.xzRadius = 0; @@ -663,22 +663,22 @@ public class Model extends Entity { } } - @ObfuscatedName("x") - public int method2893() { + @ObfuscatedName("l") + public int method2952() { this.calculateBoundsCylinder(); return this.xzRadius; } - @ObfuscatedName("d") + @ObfuscatedName("m") @Export("resetBounds") void resetBounds() { this.boundsType = 0; this.xMidOffset = -1; } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Leq;I)V" + signature = "(Les;I)V" ) @Export("animate") public void animate(Frames var1, int var2) { @@ -700,9 +700,9 @@ public class Model extends Entity { } } - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(Leq;ILeq;I[I)V" + signature = "(Les;ILes;I[I)V" ) @Export("animate2") public void animate2(Frames var1, int var2, Frames var3, int var4, int[] var5) { @@ -752,7 +752,7 @@ public class Model extends Entity { } } - @ObfuscatedName("l") + @ObfuscatedName("v") @Export("transform") void transform(int var1, int[] var2, int var3, int var4, int var5) { int var6 = var2.length; @@ -920,7 +920,7 @@ public class Model extends Entity { } } - @ObfuscatedName("t") + @ObfuscatedName("n") @Export("rotateY90Ccw") public void rotateY90Ccw() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { @@ -932,7 +932,7 @@ public class Model extends Entity { this.resetBounds(); } - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("rotateY180") public void rotateY180() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { @@ -943,7 +943,7 @@ public class Model extends Entity { this.resetBounds(); } - @ObfuscatedName("n") + @ObfuscatedName("w") @Export("rotateY270Ccw") public void rotateY270Ccw() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { @@ -955,7 +955,7 @@ public class Model extends Entity { this.resetBounds(); } - @ObfuscatedName("u") + @ObfuscatedName("q") @Export("rotateZ") public void rotateZ(int var1) { int var2 = Model_sine[var1]; @@ -985,7 +985,7 @@ public class Model extends Entity { this.resetBounds(); } - @ObfuscatedName("h") + @ObfuscatedName("y") @Export("scale") public void scale(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { @@ -997,11 +997,11 @@ public class Model extends Entity { this.resetBounds(); } - @ObfuscatedName("m") - public final void method2907(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - field1651[0] = -1; + @ObfuscatedName("f") + public final void method2946(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + field1704[0] = -1; if (this.boundsType != 2 && this.boundsType != 1) { - this.method2906(); + this.method2950(); } int var8 = Rasterizer3D.Rasterizer3D_clipMidX; @@ -1044,13 +1044,13 @@ public class Model extends Entity { var22 += var7; var23 = var21 * var17 - var22 * var16 >> 16; var22 = var21 * var16 + var22 * var17 >> 16; - field1710[var19] = var22 - var18; + field1699[var19] = var22 - var18; modelViewportXs[var19] = var20 * Rasterizer3D.Rasterizer3D_zoom / var22 + var8; modelViewportYs[var19] = var23 * Rasterizer3D.Rasterizer3D_zoom / var22 + var9; - if (this.field1688 > 0) { - field1670[var19] = var20; - field1691[var19] = var23; - field1689[var19] = var22; + if (this.field1676 > 0) { + field1700[var19] = var20; + field1701[var19] = var23; + field1693[var19] = var22; } } @@ -1061,11 +1061,11 @@ public class Model extends Entity { } - @ObfuscatedName("aa") - public final void method2905(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - field1651[0] = -1; + @ObfuscatedName("a") + public final void method2938(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + field1704[0] = -1; if (this.boundsType != 2 && this.boundsType != 1) { - this.method2906(); + this.method2950(); } int var9 = Rasterizer3D.Rasterizer3D_clipMidX; @@ -1108,13 +1108,13 @@ public class Model extends Entity { var23 += var7; var24 = var22 * var18 - var23 * var17 >> 16; var23 = var22 * var17 + var23 * var18 >> 16; - field1710[var20] = var23 - var19; + field1699[var20] = var23 - var19; modelViewportXs[var20] = var9 + var21 * Rasterizer3D.Rasterizer3D_zoom / var8; modelViewportYs[var20] = var10 + var24 * Rasterizer3D.Rasterizer3D_zoom / var8; - if (this.field1688 > 0) { - field1670[var20] = var21; - field1691[var20] = var24; - field1689[var20] = var23; + if (this.field1676 > 0) { + field1700[var20] = var21; + field1701[var20] = var24; + field1693[var20] = var23; } } @@ -1125,13 +1125,13 @@ public class Model extends Entity { } - @ObfuscatedName("av") + @ObfuscatedName("u") @Export("draw0") final void draw0(boolean var1, boolean var2, boolean var3, long var4) { if (this.diameter < 1600) { int var6; for (var6 = 0; var6 < this.diameter; ++var6) { - field1651[var6] = 0; + field1704[var6] = 0; } var6 = var3 ? 20 : 5; @@ -1154,47 +1154,47 @@ public class Model extends Entity { var11 = modelViewportXs[var8]; var12 = modelViewportXs[var27]; var13 = modelViewportXs[var10]; - int var14; - if (var1 && (var11 == -5000 || var12 == -5000 || var13 == -5000)) { - var14 = field1670[var8]; - var15 = field1670[var27]; - var16 = field1670[var10]; - int var17 = field1691[var8]; - var18 = field1691[var27]; - int var19 = field1691[var10]; - int var20 = field1689[var8]; - int var21 = field1689[var27]; - int var22 = field1689[var10]; - var14 -= var15; + int var28; + if (!var1 || var11 != -5000 && var12 != -5000 && var13 != -5000) { + if (var2 && TextureProvider.method2811(modelViewportYs[var8], modelViewportYs[var27], modelViewportYs[var10], var11, var12, var13, var6)) { + ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var4; + var2 = false; + } + + if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var27]) - (var13 - var12) * (modelViewportYs[var8] - modelViewportYs[var27]) > 0) { + field1696[var7] = false; + if (var11 >= 0 && var12 >= 0 && var13 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var13 <= Rasterizer3D.Rasterizer3D_clipWidth) { + field1673[var7] = false; + } else { + field1673[var7] = true; + } + + var28 = (field1699[var8] + field1699[var27] + field1699[var10]) / 3 + this.radius; + field1722[var28][field1704[var28]++] = var7; + } + } else { + var28 = field1700[var8]; + var15 = field1700[var27]; + var16 = field1700[var10]; + int var17 = field1701[var8]; + var18 = field1701[var27]; + int var19 = field1701[var10]; + int var20 = field1693[var8]; + int var21 = field1693[var27]; + int var22 = field1693[var10]; + var28 -= var15; var16 -= var15; var17 -= var18; var19 -= var18; var20 -= var21; var22 -= var21; int var23 = var17 * var22 - var20 * var19; - int var24 = var20 * var16 - var14 * var22; - int var25 = var14 * var19 - var17 * var16; + int var24 = var20 * var16 - var28 * var22; + int var25 = var28 * var19 - var17 * var16; if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { - field1683[var7] = true; - int var26 = (field1710[var8] + field1710[var27] + field1710[var10]) / 3 + this.radius; - field1692[var26][field1651[var26]++] = var7; - } - } else { - if (var2 && WorldMapData_1.method699(modelViewportYs[var8], modelViewportYs[var27], modelViewportYs[var10], var11, var12, var13, var6)) { - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var4; - var2 = false; - } - - if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var27]) - (var13 - var12) * (modelViewportYs[var8] - modelViewportYs[var27]) > 0) { - field1683[var7] = false; - if (var11 >= 0 && var12 >= 0 && var13 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var13 <= Rasterizer3D.Rasterizer3D_clipWidth) { - field1657[var7] = false; - } else { - field1657[var7] = true; - } - - var14 = (field1710[var8] + field1710[var27] + field1710[var10]) / 3 + this.radius; - field1692[var14][field1651[var14]++] = var7; + field1696[var7] = true; + int var26 = (field1699[var8] + field1699[var27] + field1699[var10]) / 3 + this.radius; + field1722[var26][field1704[var26]++] = var7; } } } @@ -1203,144 +1203,144 @@ public class Model extends Entity { int[] var9; if (this.faceRenderPriorities == null) { for (var7 = this.diameter - 1; var7 >= 0; --var7) { - var8 = field1651[var7]; + var8 = field1704[var7]; if (var8 > 0) { - var9 = field1692[var7]; + var9 = field1722[var7]; for (var10 = 0; var10 < var8; ++var10) { - this.method2926(var9[var10]); + this.method2992(var9[var10]); } } } } else { for (var7 = 0; var7 < 12; ++var7) { - field1705[var7] = 0; - field1697[var7] = 0; + field1670[var7] = 0; + field1684[var7] = 0; } for (var7 = this.diameter - 1; var7 >= 0; --var7) { - var8 = field1651[var7]; + var8 = field1704[var7]; if (var8 > 0) { - var9 = field1692[var7]; + var9 = field1722[var7]; for (var10 = 0; var10 < var8; ++var10) { var11 = var9[var10]; - byte var33 = this.faceRenderPriorities[var11]; - var13 = field1705[var33]++; - field1694[var33][var13] = var11; - if (var33 < 10) { - int[] var10000 = field1697; - var10000[var33] += var7; - } else if (var33 == 10) { - field1695[var13] = var7; + byte var32 = this.faceRenderPriorities[var11]; + var13 = field1670[var32]++; + field1707[var32][var13] = var11; + if (var32 < 10) { + int[] var10000 = field1684; + var10000[var32] += var7; + } else if (var32 == 10) { + field1708[var13] = var7; } else { - field1696[var13] = var7; + field1709[var13] = var7; } } } } var7 = 0; - if (field1705[1] > 0 || field1705[2] > 0) { - var7 = (field1697[1] + field1697[2]) / (field1705[1] + field1705[2]); + if (field1670[1] > 0 || field1670[2] > 0) { + var7 = (field1684[1] + field1684[2]) / (field1670[1] + field1670[2]); } var8 = 0; - if (field1705[3] > 0 || field1705[4] > 0) { - var8 = (field1697[3] + field1697[4]) / (field1705[3] + field1705[4]); + if (field1670[3] > 0 || field1670[4] > 0) { + var8 = (field1684[3] + field1684[4]) / (field1670[3] + field1670[4]); } var27 = 0; - if (field1705[6] > 0 || field1705[8] > 0) { - var27 = (field1697[8] + field1697[6]) / (field1705[8] + field1705[6]); + if (field1670[6] > 0 || field1670[8] > 0) { + var27 = (field1684[8] + field1684[6]) / (field1670[8] + field1670[6]); } var11 = 0; - var12 = field1705[10]; - int[] var30 = field1694[10]; - int[] var31 = field1695; + var12 = field1670[10]; + int[] var29 = field1707[10]; + int[] var30 = field1708; if (var11 == var12) { var11 = 0; - var12 = field1705[11]; - var30 = field1694[11]; - var31 = field1696; + var12 = field1670[11]; + var29 = field1707[11]; + var30 = field1709; } if (var11 < var12) { - var10 = var31[var11]; + var10 = var30[var11]; } else { var10 = -1000; } for (var15 = 0; var15 < 10; ++var15) { while (var15 == 0 && var10 > var7) { - this.method2926(var30[var11++]); - if (var11 == var12 && var30 != field1694[11]) { + this.method2992(var29[var11++]); + if (var11 == var12 && var29 != field1707[11]) { var11 = 0; - var12 = field1705[11]; - var30 = field1694[11]; - var31 = field1696; + var12 = field1670[11]; + var29 = field1707[11]; + var30 = field1709; } if (var11 < var12) { - var10 = var31[var11]; + var10 = var30[var11]; } else { var10 = -1000; } } while (var15 == 3 && var10 > var8) { - this.method2926(var30[var11++]); - if (var11 == var12 && var30 != field1694[11]) { + this.method2992(var29[var11++]); + if (var11 == var12 && var29 != field1707[11]) { var11 = 0; - var12 = field1705[11]; - var30 = field1694[11]; - var31 = field1696; + var12 = field1670[11]; + var29 = field1707[11]; + var30 = field1709; } if (var11 < var12) { - var10 = var31[var11]; + var10 = var30[var11]; } else { var10 = -1000; } } while (var15 == 5 && var10 > var27) { - this.method2926(var30[var11++]); - if (var11 == var12 && var30 != field1694[11]) { + this.method2992(var29[var11++]); + if (var11 == var12 && var29 != field1707[11]) { var11 = 0; - var12 = field1705[11]; - var30 = field1694[11]; - var31 = field1696; + var12 = field1670[11]; + var29 = field1707[11]; + var30 = field1709; } if (var11 < var12) { - var10 = var31[var11]; + var10 = var30[var11]; } else { var10 = -1000; } } - var16 = field1705[var15]; - int[] var32 = field1694[var15]; + var16 = field1670[var15]; + int[] var31 = field1707[var15]; for (var18 = 0; var18 < var16; ++var18) { - this.method2926(var32[var18]); + this.method2992(var31[var18]); } } while (var10 != -1000) { - this.method2926(var30[var11++]); - if (var11 == var12 && var30 != field1694[11]) { + this.method2992(var29[var11++]); + if (var11 == var12 && var29 != field1707[11]) { var11 = 0; - var30 = field1694[11]; - var12 = field1705[11]; - var31 = field1696; + var29 = field1707[11]; + var12 = field1670[11]; + var30 = field1709; } if (var11 < var12) { - var10 = var31[var11]; + var10 = var30[var11]; } else { var10 = -1000; } @@ -1350,15 +1350,15 @@ public class Model extends Entity { } } - @ObfuscatedName("aw") - final void method2926(int var1) { - if (field1683[var1]) { - this.method2909(var1); + @ObfuscatedName("ae") + final void method2992(int var1) { + if (field1696[var1]) { + this.method2988(var1); } else { int var2 = this.indices1[var1]; int var3 = this.indices2[var1]; int var4 = this.indices3[var1]; - Rasterizer3D.field1751 = field1657[var1]; + Rasterizer3D.field1761 = field1673[var1]; if (this.faceAlphas == null) { Rasterizer3D.Rasterizer3D_alpha = 0; } else { @@ -1369,11 +1369,11 @@ public class Model extends Entity { int var5; int var6; int var7; - if (this.field1703 != null && this.field1703[var1] != -1) { - int var8 = this.field1703[var1] & 255; - var5 = this.field1664[var8]; - var6 = this.field1665[var8]; - var7 = this.field1693[var8]; + if (this.field1686 != null && this.field1686[var1] != -1) { + int var8 = this.field1686[var1] & 255; + var5 = this.field1677[var8]; + var6 = this.field1678[var8]; + var7 = this.field1656[var8]; } else { var5 = var2; var6 = var3; @@ -1381,30 +1381,30 @@ public class Model extends Entity { } if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3010(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1670[var5], field1670[var6], field1670[var7], field1691[var5], field1691[var6], field1691[var7], field1689[var5], field1689[var6], field1689[var7], this.faceTextures[var1]); + Rasterizer3D.method3078(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1700[var5], field1700[var6], field1700[var7], field1701[var5], field1701[var6], field1701[var7], field1693[var5], field1693[var6], field1693[var7], this.faceTextures[var1]); } else { - Rasterizer3D.method3010(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field1670[var5], field1670[var6], field1670[var7], field1691[var5], field1691[var6], field1691[var7], field1689[var5], field1689[var6], field1689[var7], this.faceTextures[var1]); + Rasterizer3D.method3078(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field1700[var5], field1700[var6], field1700[var7], field1701[var5], field1701[var6], field1701[var7], field1693[var5], field1693[var6], field1693[var7], this.faceTextures[var1]); } } else if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3008(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field1709[this.faceColors1[var1]]); + Rasterizer3D.method3123(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field1713[this.faceColors1[var1]]); } else { - Rasterizer3D.method3000(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); + Rasterizer3D.method3116(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); } } } - @ObfuscatedName("as") - final void method2909(int var1) { + @ObfuscatedName("af") + final void method2988(int var1) { int var2 = Rasterizer3D.Rasterizer3D_clipMidX; int var3 = Rasterizer3D.Rasterizer3D_clipMidY; int var4 = 0; int var5 = this.indices1[var1]; int var6 = this.indices2[var1]; int var7 = this.indices3[var1]; - int var8 = field1689[var5]; - int var9 = field1689[var6]; - int var10 = field1689[var7]; + int var8 = field1693[var5]; + int var9 = field1693[var6]; + int var10 = field1693[var7]; if (this.faceAlphas == null) { Rasterizer3D.Rasterizer3D_alpha = 0; } else { @@ -1416,96 +1416,96 @@ public class Model extends Entity { int var13; int var14; if (var8 >= 50) { - field1698[var4] = modelViewportXs[var5]; - field1699[var4] = modelViewportYs[var5]; - field1700[var4++] = this.faceColors1[var1]; + field1711[var4] = modelViewportXs[var5]; + field1712[var4] = modelViewportYs[var5]; + field1719[var4++] = this.faceColors1[var1]; } else { - var11 = field1670[var5]; - var12 = field1691[var5]; + var11 = field1700[var5]; + var12 = field1701[var5]; var13 = this.faceColors1[var1]; if (var10 >= 50) { - var14 = field1675[var10 - var8] * (50 - var8); - field1698[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1670[var7] - var11) * var14 >> 16)) / 50; - field1699[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1691[var7] - var12) * var14 >> 16)) / 50; - field1700[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); + var14 = field1723[var10 - var8] * (50 - var8); + field1711[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1700[var7] - var11) * var14 >> 16)) / 50; + field1712[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1701[var7] - var12) * var14 >> 16)) / 50; + field1719[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); } if (var9 >= 50) { - var14 = field1675[var9 - var8] * (50 - var8); - field1698[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1670[var6] - var11) * var14 >> 16)) / 50; - field1699[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1691[var6] - var12) * var14 >> 16)) / 50; - field1700[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); + var14 = field1723[var9 - var8] * (50 - var8); + field1711[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1700[var6] - var11) * var14 >> 16)) / 50; + field1712[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1701[var6] - var12) * var14 >> 16)) / 50; + field1719[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); } } if (var9 >= 50) { - field1698[var4] = modelViewportXs[var6]; - field1699[var4] = modelViewportYs[var6]; - field1700[var4++] = this.faceColors2[var1]; + field1711[var4] = modelViewportXs[var6]; + field1712[var4] = modelViewportYs[var6]; + field1719[var4++] = this.faceColors2[var1]; } else { - var11 = field1670[var6]; - var12 = field1691[var6]; + var11 = field1700[var6]; + var12 = field1701[var6]; var13 = this.faceColors2[var1]; if (var8 >= 50) { - var14 = field1675[var8 - var9] * (50 - var9); - field1698[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1670[var5] - var11) * var14 >> 16)) / 50; - field1699[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1691[var5] - var12) * var14 >> 16)) / 50; - field1700[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); + var14 = field1723[var8 - var9] * (50 - var9); + field1711[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1700[var5] - var11) * var14 >> 16)) / 50; + field1712[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1701[var5] - var12) * var14 >> 16)) / 50; + field1719[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); } if (var10 >= 50) { - var14 = field1675[var10 - var9] * (50 - var9); - field1698[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1670[var7] - var11) * var14 >> 16)) / 50; - field1699[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1691[var7] - var12) * var14 >> 16)) / 50; - field1700[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); + var14 = field1723[var10 - var9] * (50 - var9); + field1711[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1700[var7] - var11) * var14 >> 16)) / 50; + field1712[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1701[var7] - var12) * var14 >> 16)) / 50; + field1719[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); } } if (var10 >= 50) { - field1698[var4] = modelViewportXs[var7]; - field1699[var4] = modelViewportYs[var7]; - field1700[var4++] = this.faceColors3[var1]; + field1711[var4] = modelViewportXs[var7]; + field1712[var4] = modelViewportYs[var7]; + field1719[var4++] = this.faceColors3[var1]; } else { - var11 = field1670[var7]; - var12 = field1691[var7]; + var11 = field1700[var7]; + var12 = field1701[var7]; var13 = this.faceColors3[var1]; if (var9 >= 50) { - var14 = field1675[var9 - var10] * (50 - var10); - field1698[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1670[var6] - var11) * var14 >> 16)) / 50; - field1699[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1691[var6] - var12) * var14 >> 16)) / 50; - field1700[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); + var14 = field1723[var9 - var10] * (50 - var10); + field1711[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1700[var6] - var11) * var14 >> 16)) / 50; + field1712[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1701[var6] - var12) * var14 >> 16)) / 50; + field1719[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); } if (var8 >= 50) { - var14 = field1675[var8 - var10] * (50 - var10); - field1698[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1670[var5] - var11) * var14 >> 16)) / 50; - field1699[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1691[var5] - var12) * var14 >> 16)) / 50; - field1700[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); + var14 = field1723[var8 - var10] * (50 - var10); + field1711[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1700[var5] - var11) * var14 >> 16)) / 50; + field1712[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1701[var5] - var12) * var14 >> 16)) / 50; + field1719[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); } } - var11 = field1698[0]; - var12 = field1698[1]; - var13 = field1698[2]; - var14 = field1699[0]; - int var15 = field1699[1]; - int var16 = field1699[2]; - Rasterizer3D.field1751 = false; + var11 = field1711[0]; + var12 = field1711[1]; + var13 = field1711[2]; + var14 = field1712[0]; + int var15 = field1712[1]; + int var16 = field1712[2]; + Rasterizer3D.field1761 = false; int var17; int var18; int var19; int var20; if (var4 == 3) { if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field1751 = true; + Rasterizer3D.field1761 = true; } if (this.faceTextures != null && this.faceTextures[var1] != -1) { - if (this.field1703 != null && this.field1703[var1] != -1) { - var20 = this.field1703[var1] & 255; - var17 = this.field1664[var20]; - var18 = this.field1665[var20]; - var19 = this.field1693[var20]; + if (this.field1686 != null && this.field1686[var1] != -1) { + var20 = this.field1686[var1] & 255; + var17 = this.field1677[var20]; + var18 = this.field1678[var20]; + var19 = this.field1656[var20]; } else { var17 = var5; var18 = var6; @@ -1513,28 +1513,28 @@ public class Model extends Entity { } if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3010(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1670[var17], field1670[var18], field1670[var19], field1691[var17], field1691[var18], field1691[var19], field1689[var17], field1689[var18], field1689[var19], this.faceTextures[var1]); + Rasterizer3D.method3078(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1700[var17], field1700[var18], field1700[var19], field1701[var17], field1701[var18], field1701[var19], field1693[var17], field1693[var18], field1693[var19], this.faceTextures[var1]); } else { - Rasterizer3D.method3010(var14, var15, var16, var11, var12, var13, field1700[0], field1700[1], field1700[2], field1670[var17], field1670[var18], field1670[var19], field1691[var17], field1691[var18], field1691[var19], field1689[var17], field1689[var18], field1689[var19], this.faceTextures[var1]); + Rasterizer3D.method3078(var14, var15, var16, var11, var12, var13, field1719[0], field1719[1], field1719[2], field1700[var17], field1700[var18], field1700[var19], field1701[var17], field1701[var18], field1701[var19], field1693[var17], field1693[var18], field1693[var19], this.faceTextures[var1]); } } else if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3008(var14, var15, var16, var11, var12, var13, field1709[this.faceColors1[var1]]); + Rasterizer3D.method3123(var14, var15, var16, var11, var12, var13, field1713[this.faceColors1[var1]]); } else { - Rasterizer3D.method3000(var14, var15, var16, var11, var12, var13, field1700[0], field1700[1], field1700[2]); + Rasterizer3D.method3116(var14, var15, var16, var11, var12, var13, field1719[0], field1719[1], field1719[2]); } } if (var4 == 4) { - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field1698[3] < 0 || field1698[3] > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field1751 = true; + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field1711[3] < 0 || field1711[3] > Rasterizer3D.Rasterizer3D_clipWidth) { + Rasterizer3D.field1761 = true; } if (this.faceTextures != null && this.faceTextures[var1] != -1) { - if (this.field1703 != null && this.field1703[var1] != -1) { - var20 = this.field1703[var1] & 255; - var17 = this.field1664[var20]; - var18 = this.field1665[var20]; - var19 = this.field1693[var20]; + if (this.field1686 != null && this.field1686[var1] != -1) { + var20 = this.field1686[var1] & 255; + var17 = this.field1677[var20]; + var18 = this.field1678[var20]; + var19 = this.field1656[var20]; } else { var17 = var5; var18 = var6; @@ -1543,28 +1543,28 @@ public class Model extends Entity { short var21 = this.faceTextures[var1]; if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3010(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1670[var17], field1670[var18], field1670[var19], field1691[var17], field1691[var18], field1691[var19], field1689[var17], field1689[var18], field1689[var19], var21); - Rasterizer3D.method3010(var14, var16, field1699[3], var11, var13, field1698[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1670[var17], field1670[var18], field1670[var19], field1691[var17], field1691[var18], field1691[var19], field1689[var17], field1689[var18], field1689[var19], var21); + Rasterizer3D.method3078(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1700[var17], field1700[var18], field1700[var19], field1701[var17], field1701[var18], field1701[var19], field1693[var17], field1693[var18], field1693[var19], var21); + Rasterizer3D.method3078(var14, var16, field1712[3], var11, var13, field1711[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1700[var17], field1700[var18], field1700[var19], field1701[var17], field1701[var18], field1701[var19], field1693[var17], field1693[var18], field1693[var19], var21); } else { - Rasterizer3D.method3010(var14, var15, var16, var11, var12, var13, field1700[0], field1700[1], field1700[2], field1670[var17], field1670[var18], field1670[var19], field1691[var17], field1691[var18], field1691[var19], field1689[var17], field1689[var18], field1689[var19], var21); - Rasterizer3D.method3010(var14, var16, field1699[3], var11, var13, field1698[3], field1700[0], field1700[2], field1700[3], field1670[var17], field1670[var18], field1670[var19], field1691[var17], field1691[var18], field1691[var19], field1689[var17], field1689[var18], field1689[var19], var21); + Rasterizer3D.method3078(var14, var15, var16, var11, var12, var13, field1719[0], field1719[1], field1719[2], field1700[var17], field1700[var18], field1700[var19], field1701[var17], field1701[var18], field1701[var19], field1693[var17], field1693[var18], field1693[var19], var21); + Rasterizer3D.method3078(var14, var16, field1712[3], var11, var13, field1711[3], field1719[0], field1719[2], field1719[3], field1700[var17], field1700[var18], field1700[var19], field1701[var17], field1701[var18], field1701[var19], field1693[var17], field1693[var18], field1693[var19], var21); } } else if (this.faceColors3[var1] == -1) { - var17 = field1709[this.faceColors1[var1]]; - Rasterizer3D.method3008(var14, var15, var16, var11, var12, var13, var17); - Rasterizer3D.method3008(var14, var16, field1699[3], var11, var13, field1698[3], var17); + var17 = field1713[this.faceColors1[var1]]; + Rasterizer3D.method3123(var14, var15, var16, var11, var12, var13, var17); + Rasterizer3D.method3123(var14, var16, field1712[3], var11, var13, field1711[3], var17); } else { - Rasterizer3D.method3000(var14, var15, var16, var11, var12, var13, field1700[0], field1700[1], field1700[2]); - Rasterizer3D.method3000(var14, var16, field1699[3], var11, var13, field1698[3], field1700[0], field1700[2], field1700[3]); + Rasterizer3D.method3116(var14, var15, var16, var11, var12, var13, field1719[0], field1719[1], field1719[2]); + Rasterizer3D.method3116(var14, var16, field1712[3], var11, var13, field1711[3], field1719[0], field1719[2], field1719[3]); } } } - @ObfuscatedName("ch") + @ObfuscatedName("cn") @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { - field1651[0] = -1; + field1704[0] = -1; if (this.boundsType != 1) { this.calculateBoundsCylinder(); } @@ -1594,74 +1594,109 @@ public class Model extends Entity { var25 = true; } - boolean var26 = var25 || this.field1688 > 0; - int var27 = class218.method4074(); - int var28 = TileItemPile.method2797(); - boolean var29 = ViewportMouse.ViewportMouse_isInViewport; - boolean var31 = class42.method790(var9); + boolean var26 = var25 || this.field1676 > 0; + int var27 = MusicPatchNode.method3903(); + int var28 = ViewportMouse.ViewportMouse_y; + boolean var30 = Decimator.method2601(); + boolean var31 = KeyHandler.method850(var9); boolean var32 = false; - int var34; - int var35; int var36; - if (var31 && var29) { + int var37; + int var38; + int var39; + int var40; + int var41; + int var45; + int var49; + if (var31 && var30) { boolean var33 = false; - if (field1704) { - var33 = MusicPatchNode.method3813(this, var6, var7, var8); + if (field1717) { + boolean var34; + if (!Decimator.method2601()) { + var34 = false; + } else { + MouseRecorder.method1209(); + var36 = this.xMid + var6; + var37 = var7 + this.yMid; + var38 = var8 + this.zMid; + var39 = this.xMidOffset; + var40 = this.yMidOffset; + var41 = this.zMidOffset; + int var42 = ViewportMouse.field1729 - var36; + int var43 = ViewportMouse.field1731 - var37; + int var44 = ViewportMouse.field1736 - var38; + if (Math.abs(var42) > var39 + UserComparator7.field1978) { + var34 = false; + } else if (Math.abs(var43) > var40 + class4.field26) { + var34 = false; + } else if (Math.abs(var44) > var41 + class43.field381) { + var34 = false; + } else if (Math.abs(var44 * ViewportMouse.field1733 - var43 * ViewportMouse.field1742) > var40 * class43.field381 + var41 * class4.field26) { + var34 = false; + } else if (Math.abs(var42 * ViewportMouse.field1742 - var44 * TextureProvider.field1512) > var41 * UserComparator7.field1978 + var39 * class43.field381) { + var34 = false; + } else if (Math.abs(var43 * TextureProvider.field1512 - var42 * ViewportMouse.field1733) > var39 * class4.field26 + var40 * UserComparator7.field1978) { + var34 = false; + } else { + var34 = true; + } + } + + var33 = var34; } else { - var34 = var12 - var13; - if (var34 <= 50) { - var34 = 50; + var49 = var12 - var13; + if (var49 <= 50) { + var49 = 50; } if (var15 > 0) { var16 /= var14; - var17 /= var34; + var17 /= var49; } else { var17 /= var14; - var16 /= var34; + var16 /= var49; } if (var18 > 0) { var22 /= var14; - var20 /= var34; + var20 /= var49; } else { var20 /= var14; - var22 /= var34; + var22 /= var49; } - var35 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; + var45 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; var36 = var28 - Rasterizer3D.Rasterizer3D_clipMidY; - if (var35 > var16 && var35 < var17 && var36 > var22 && var36 < var20) { + if (var45 > var16 && var45 < var17 && var36 > var22 && var36 < var20) { var33 = true; } } if (var33) { if (this.isSingleTile) { - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var9; + UserComparator9.method3460(var9); } else { var32 = true; } } } - int var46 = Rasterizer3D.Rasterizer3D_clipMidX; - var34 = Rasterizer3D.Rasterizer3D_clipMidY; - var35 = 0; + int var48 = Rasterizer3D.Rasterizer3D_clipMidX; + var49 = Rasterizer3D.Rasterizer3D_clipMidY; + var45 = 0; var36 = 0; if (var1 != 0) { - var35 = Model_sine[var1]; + var45 = Model_sine[var1]; var36 = Model_cosine[var1]; } - for (int var37 = 0; var37 < this.verticesCount; ++var37) { - int var38 = this.verticesX[var37]; - int var39 = this.verticesY[var37]; - int var40 = this.verticesZ[var37]; - int var41; + for (var37 = 0; var37 < this.verticesCount; ++var37) { + var38 = this.verticesX[var37]; + var39 = this.verticesY[var37]; + var40 = this.verticesZ[var37]; if (var1 != 0) { - var41 = var40 * var35 + var38 * var36 >> 16; - var40 = var40 * var36 - var38 * var35 >> 16; + var41 = var40 * var45 + var38 * var36 >> 16; + var40 = var40 * var36 - var38 * var45 >> 16; var38 = var41; } @@ -1673,25 +1708,25 @@ public class Model extends Entity { var38 = var41; var41 = var3 * var39 - var40 * var2 >> 16; var40 = var39 * var2 + var3 * var40 >> 16; - field1710[var37] = var40 - var12; + field1699[var37] = var40 - var12; if (var40 >= 50) { - modelViewportXs[var37] = var38 * Rasterizer3D.Rasterizer3D_zoom / var40 + var46; - modelViewportYs[var37] = var41 * Rasterizer3D.Rasterizer3D_zoom / var40 + var34; + modelViewportXs[var37] = var38 * Rasterizer3D.Rasterizer3D_zoom / var40 + var48; + modelViewportYs[var37] = var41 * Rasterizer3D.Rasterizer3D_zoom / var40 + var49; } else { modelViewportXs[var37] = -5000; var24 = true; } if (var26) { - field1670[var37] = var38; - field1691[var37] = var41; - field1689[var37] = var40; + field1700[var37] = var38; + field1701[var37] = var41; + field1693[var37] = var40; } } try { this.draw0(var24, var32, this.isSingleTile, var9); - } catch (Exception var45) { + } catch (Exception var47) { } } diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java index 1d4a309cd6..f676a41146 100644 --- a/runescape-client/src/main/java/ModelData.java +++ b/runescape-client/src/main/java/ModelData.java @@ -3,134 +3,134 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dd") +@ObfuscatedName("dg") @Implements("ModelData") public class ModelData extends Entity { - @ObfuscatedName("an") - static int[] field1558; - @ObfuscatedName("ar") + @ObfuscatedName("as") static int[] field1559; - @ObfuscatedName("az") - static int field1554; - @ObfuscatedName("ay") + @ObfuscatedName("ak") + static int[] field1547; + @ObfuscatedName("ac") + static int field1571; + @ObfuscatedName("aw") @Export("ModelData_sine") static int[] ModelData_sine; - @ObfuscatedName("ag") + @ObfuscatedName("ar") @Export("ModelData_cosine") static int[] ModelData_cosine; - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("verticesCount") int verticesCount; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("verticesX") int[] verticesX; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("verticesY") int[] verticesY; - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("faceCount") int faceCount; - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("indices1") int[] indices1; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("indices2") int[] indices2; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("indices3") int[] indices3; - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("faceRenderTypes") byte[] faceRenderTypes; - @ObfuscatedName("d") + @ObfuscatedName("m") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("o") + @ObfuscatedName("h") @Export("textureCoords") byte[] textureCoords; @ObfuscatedName("v") @Export("faceColors") short[] faceColors; - @ObfuscatedName("k") + @ObfuscatedName("n") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("s") + @ObfuscatedName("x") @Export("priority") byte priority; - @ObfuscatedName("l") + @ObfuscatedName("w") @Export("textureTriangleCount") int textureTriangleCount; - @ObfuscatedName("t") + @ObfuscatedName("k") @Export("textureRenderTypes") byte[] textureRenderTypes; - @ObfuscatedName("j") + @ObfuscatedName("q") @Export("texTriangleX") short[] texTriangleX; - @ObfuscatedName("n") + @ObfuscatedName("z") @Export("texTriangleY") short[] texTriangleY; - @ObfuscatedName("u") + @ObfuscatedName("y") @Export("texTriangleZ") short[] texTriangleZ; - @ObfuscatedName("z") + @ObfuscatedName("f") @Export("vertexSkins") int[] vertexSkins; - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("faceSkins") int[] faceSkins; - @ObfuscatedName("m") + @ObfuscatedName("r") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("g") + @ObfuscatedName("s") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "[Les;" + signature = "[Let;" ) @Export("faceNormals") FaceNormal[] faceNormals; - @ObfuscatedName("q") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "[Ldm;" + signature = "[Ldp;" ) @Export("vertexNormals") VertexNormal[] vertexNormals; - @ObfuscatedName("aa") + @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "[Ldm;" + signature = "[Ldp;" ) - VertexNormal[] field1549; - @ObfuscatedName("av") + VertexNormal[] field1561; + @ObfuscatedName("af") @Export("ambient") public short ambient; - @ObfuscatedName("aw") + @ObfuscatedName("az") @Export("contrast") public short contrast; - @ObfuscatedName("as") + @ObfuscatedName("ax") @Export("isBoundsCalculated") boolean isBoundsCalculated; - @ObfuscatedName("ak") - int field1550; + @ObfuscatedName("aj") + int field1563; @ObfuscatedName("au") - int field1527; - @ObfuscatedName("ah") - int field1555; + int field1570; + @ObfuscatedName("ay") + int field1567; + @ObfuscatedName("aa") + int field1537; @ObfuscatedName("aq") - int field1541; - @ObfuscatedName("ao") - int field1529; + int field1569; static { - field1558 = new int[10000]; field1559 = new int[10000]; - field1554 = 0; + field1547 = new int[10000]; + field1571 = 0; ModelData_sine = Rasterizer3D.Rasterizer3D_sine; ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; } @@ -143,7 +143,7 @@ public class ModelData extends Entity { } @ObfuscatedSignature( - signature = "([Ldd;I)V" + signature = "([Ldg;I)V" ) public ModelData(ModelData[] var1, int var2) { this.verticesCount = 0; @@ -274,18 +274,18 @@ public class ModelData extends Entity { } this.faceColors[this.faceCount] = var10.faceColors[var11]; - this.indices1[this.faceCount] = this.method2802(var10, var10.indices1[var11]); - this.indices2[this.faceCount] = this.method2802(var10, var10.indices2[var11]); - this.indices3[this.faceCount] = this.method2802(var10, var10.indices3[var11]); + this.indices1[this.faceCount] = this.method2847(var10, var10.indices1[var11]); + this.indices2[this.faceCount] = this.method2847(var10, var10.indices2[var11]); + this.indices3[this.faceCount] = this.method2847(var10, var10.indices3[var11]); ++this.faceCount; } for (var11 = 0; var11 < var10.textureTriangleCount; ++var11) { byte var12 = this.textureRenderTypes[this.textureTriangleCount] = var10.textureRenderTypes[var11]; if (var12 == 0) { - this.texTriangleX[this.textureTriangleCount] = (short)this.method2802(var10, var10.texTriangleX[var11]); - this.texTriangleY[this.textureTriangleCount] = (short)this.method2802(var10, var10.texTriangleY[var11]); - this.texTriangleZ[this.textureTriangleCount] = (short)this.method2802(var10, var10.texTriangleZ[var11]); + this.texTriangleX[this.textureTriangleCount] = (short)this.method2847(var10, var10.texTriangleX[var11]); + this.texTriangleY[this.textureTriangleCount] = (short)this.method2847(var10, var10.texTriangleY[var11]); + this.texTriangleZ[this.textureTriangleCount] = (short)this.method2847(var10, var10.texTriangleZ[var11]); } ++this.textureTriangleCount; @@ -301,15 +301,15 @@ public class ModelData extends Entity { this.priority = 0; this.isBoundsCalculated = false; if (var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) { - this.method2822(var1); + this.method2840(var1); } else { - this.method2801(var1); + this.method2841(var1); } } @ObfuscatedSignature( - signature = "(Ldd;ZZZZ)V", + signature = "(Ldg;ZZZZ)V", garbageValue = "1" ) public ModelData(ModelData var1, boolean var2, boolean var3, boolean var4, boolean var5) { @@ -375,13 +375,13 @@ public class ModelData extends Entity { this.faceLabelsAlpha = var1.faceLabelsAlpha; this.vertexNormals = var1.vertexNormals; this.faceNormals = var1.faceNormals; - this.field1549 = var1.field1549; + this.field1561 = var1.field1561; this.ambient = var1.ambient; this.contrast = var1.contrast; } - @ObfuscatedName("i") - void method2822(byte[] var1) { + @ObfuscatedName("t") + void method2840(byte[] var1) { Buffer var2 = new Buffer(var1); Buffer var3 = new Buffer(var1); Buffer var4 = new Buffer(var1); @@ -686,8 +686,8 @@ public class ModelData extends Entity { } - @ObfuscatedName("y") - void method2801(byte[] var1) { + @ObfuscatedName("o") + void method2841(byte[] var1) { boolean var2 = false; boolean var3 = false; Buffer var4 = new Buffer(var1); @@ -963,11 +963,11 @@ public class ModelData extends Entity { } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Ldd;I)I" + signature = "(Ldg;I)I" ) - final int method2802(ModelData var1, int var2) { + final int method2847(ModelData var1, int var2) { int var3 = -1; int var4 = var1.verticesX[var2]; int var5 = var1.verticesY[var2]; @@ -994,11 +994,11 @@ public class ModelData extends Entity { return var3; } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "()Ldd;" + signature = "()Ldg;" ) - public ModelData method2803() { + public ModelData method2845() { ModelData var1 = new ModelData(); if (this.faceRenderTypes != null) { var1.faceRenderTypes = new byte[this.faceCount]; @@ -1038,16 +1038,16 @@ public class ModelData extends Entity { return var1; } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "([[IIIIZI)Ldd;" + signature = "([[IIIIZI)Ldg;" ) - public ModelData method2804(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { + public ModelData method2838(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { this.calculateBounds(); - int var7 = var2 + this.field1527; - int var8 = var2 + this.field1555; - int var9 = var4 + this.field1529; - int var10 = var4 + this.field1541; + int var7 = var2 + this.field1570; + int var8 = var2 + this.field1567; + int var9 = var4 + this.field1569; + int var10 = var4 + this.field1537; if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { var7 >>= 7; var8 = var8 + 127 >> 7; @@ -1132,8 +1132,8 @@ public class ModelData extends Entity { } } - @ObfuscatedName("e") - void method2805() { + @ObfuscatedName("d") + void method2846() { int[] var1; int var2; int var10002; @@ -1193,8 +1193,8 @@ public class ModelData extends Entity { } - @ObfuscatedName("x") - public void method2872() { + @ObfuscatedName("l") + public void method2862() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { int var2 = this.verticesX[var1]; this.verticesX[var1] = this.verticesZ[var1]; @@ -1204,8 +1204,8 @@ public class ModelData extends Entity { this.invalidate(); } - @ObfuscatedName("d") - public void method2807() { + @ObfuscatedName("m") + public void method2848() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { this.verticesX[var1] = -this.verticesX[var1]; this.verticesZ[var1] = -this.verticesZ[var1]; @@ -1214,8 +1214,8 @@ public class ModelData extends Entity { this.invalidate(); } - @ObfuscatedName("c") - public void method2798() { + @ObfuscatedName("p") + public void method2903() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { int var2 = this.verticesZ[var1]; this.verticesZ[var1] = this.verticesX[var1]; @@ -1225,8 +1225,8 @@ public class ModelData extends Entity { this.invalidate(); } - @ObfuscatedName("o") - public void method2809(int var1) { + @ObfuscatedName("h") + public void method2850(int var1) { int var2 = ModelData_sine[var1]; int var3 = ModelData_cosine[var1]; @@ -1239,7 +1239,7 @@ public class ModelData extends Entity { this.invalidate(); } - @ObfuscatedName("l") + @ObfuscatedName("v") @Export("changeOffset") public void changeOffset(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { @@ -1254,7 +1254,7 @@ public class ModelData extends Entity { this.invalidate(); } - @ObfuscatedName("t") + @ObfuscatedName("n") @Export("recolor") public void recolor(short var1, short var2) { for (int var3 = 0; var3 < this.faceCount; ++var3) { @@ -1265,7 +1265,7 @@ public class ModelData extends Entity { } - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("retexture") public void retexture(short var1, short var2) { if (this.faceTextures != null) { @@ -1278,8 +1278,8 @@ public class ModelData extends Entity { } } - @ObfuscatedName("n") - public void method2817() { + @ObfuscatedName("w") + public void method2854() { int var1; for (var1 = 0; var1 < this.verticesCount; ++var1) { this.verticesZ[var1] = -this.verticesZ[var1]; @@ -1294,7 +1294,7 @@ public class ModelData extends Entity { this.invalidate(); } - @ObfuscatedName("u") + @ObfuscatedName("q") @Export("resize") public void resize(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { @@ -1382,52 +1382,52 @@ public class ModelData extends Entity { } } - @ObfuscatedName("h") + @ObfuscatedName("y") @Export("invalidate") void invalidate() { this.vertexNormals = null; - this.field1549 = null; + this.field1561 = null; this.faceNormals = null; this.isBoundsCalculated = false; } - @ObfuscatedName("m") + @ObfuscatedName("f") @Export("calculateBounds") void calculateBounds() { if (!this.isBoundsCalculated) { super.height = 0; - this.field1550 = 0; - this.field1527 = 999999; - this.field1555 = -999999; - this.field1541 = -99999; - this.field1529 = 99999; + this.field1563 = 0; + this.field1570 = 999999; + this.field1567 = -999999; + this.field1537 = -99999; + this.field1569 = 99999; for (int var1 = 0; var1 < this.verticesCount; ++var1) { int var2 = this.verticesX[var1]; int var3 = this.verticesY[var1]; int var4 = this.verticesZ[var1]; - if (var2 < this.field1527) { - this.field1527 = var2; + if (var2 < this.field1570) { + this.field1570 = var2; } - if (var2 > this.field1555) { - this.field1555 = var2; + if (var2 > this.field1567) { + this.field1567 = var2; } - if (var4 < this.field1529) { - this.field1529 = var4; + if (var4 < this.field1569) { + this.field1569 = var4; } - if (var4 > this.field1541) { - this.field1541 = var4; + if (var4 > this.field1537) { + this.field1537 = var4; } if (-var3 > super.height) { super.height = -var3; } - if (var3 > this.field1550) { - this.field1550 = var3; + if (var3 > this.field1563) { + this.field1563 = var3; } } @@ -1435,9 +1435,9 @@ public class ModelData extends Entity { } } - @ObfuscatedName("av") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(IIIII)Ldw;" + signature = "(IIIII)Ldx;" ) @Export("toModel") public final Model toModel(int var1, int var2, int var3, int var4, int var5) { @@ -1458,38 +1458,38 @@ public class ModelData extends Entity { } } - var8.field1688 = 0; + var8.field1676 = 0; for (var10 = 0; var10 < this.textureTriangleCount; ++var10) { if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { - ++var8.field1688; + ++var8.field1676; } } - var8.field1664 = new int[var8.field1688]; - var8.field1665 = new int[var8.field1688]; - var8.field1693 = new int[var8.field1688]; + var8.field1677 = new int[var8.field1676]; + var8.field1678 = new int[var8.field1676]; + var8.field1656 = new int[var8.field1676]; var10 = 0; int var11; for (var11 = 0; var11 < this.textureTriangleCount; ++var11) { if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { - var8.field1664[var10] = this.texTriangleX[var11] & '\uffff'; - var8.field1665[var10] = this.texTriangleY[var11] & '\uffff'; - var8.field1693[var10] = this.texTriangleZ[var11] & '\uffff'; + var8.field1677[var10] = this.texTriangleX[var11] & '\uffff'; + var8.field1678[var10] = this.texTriangleY[var11] & '\uffff'; + var8.field1656[var10] = this.texTriangleZ[var11] & '\uffff'; var9[var11] = var10++; } else { var9[var11] = -1; } } - var8.field1703 = new byte[this.faceCount]; + var8.field1686 = new byte[this.faceCount]; for (var11 = 0; var11 < this.faceCount; ++var11) { if (this.textureCoords[var11] != -1) { - var8.field1703[var11] = (byte)var9[this.textureCoords[var11] & 255]; + var8.field1686[var11] = (byte)var9[this.textureCoords[var11] & 255]; } else { - var8.field1703[var11] = -1; + var8.field1686[var11] = -1; } } } @@ -1532,7 +1532,7 @@ public class ModelData extends Entity { if (var17 == 1) { var19 = this.faceNormals[var16]; var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; - var8.faceColors1[var16] = method2864(this.faceColors[var16] & '\uffff', var14); + var8.faceColors1[var16] = method2911(this.faceColors[var16] & '\uffff', var14); var8.faceColors3[var16] = -1; } else if (var17 == 3) { var8.faceColors1[var16] = 128; @@ -1542,69 +1542,69 @@ public class ModelData extends Entity { } } else { int var15 = this.faceColors[var16] & '\uffff'; - if (this.field1549 != null && this.field1549[this.indices1[var16]] != null) { - var13 = this.field1549[this.indices1[var16]]; + if (this.field1561 != null && this.field1561[this.indices1[var16]] != null) { + var13 = this.field1561[this.indices1[var16]]; } else { var13 = this.vertexNormals[this.indices1[var16]]; } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors1[var16] = method2864(var15, var14); - if (this.field1549 != null && this.field1549[this.indices2[var16]] != null) { - var13 = this.field1549[this.indices2[var16]]; + var8.faceColors1[var16] = method2911(var15, var14); + if (this.field1561 != null && this.field1561[this.indices2[var16]] != null) { + var13 = this.field1561[this.indices2[var16]]; } else { var13 = this.vertexNormals[this.indices2[var16]]; } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors2[var16] = method2864(var15, var14); - if (this.field1549 != null && this.field1549[this.indices3[var16]] != null) { - var13 = this.field1549[this.indices3[var16]]; + var8.faceColors2[var16] = method2911(var15, var14); + if (this.field1561 != null && this.field1561[this.indices3[var16]] != null) { + var13 = this.field1561[this.indices3[var16]]; } else { var13 = this.vertexNormals[this.indices3[var16]]; } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors3[var16] = method2864(var15, var14); + var8.faceColors3[var16] = method2911(var15, var14); } } else if (var17 != 0) { if (var17 == 1) { var19 = this.faceNormals[var16]; var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; - var8.faceColors1[var16] = method2830(var14); + var8.faceColors1[var16] = method2861(var14); var8.faceColors3[var16] = -1; } else { var8.faceColors3[var16] = -2; } } else { - if (this.field1549 != null && this.field1549[this.indices1[var16]] != null) { - var13 = this.field1549[this.indices1[var16]]; + if (this.field1561 != null && this.field1561[this.indices1[var16]] != null) { + var13 = this.field1561[this.indices1[var16]]; } else { var13 = this.vertexNormals[this.indices1[var16]]; } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors1[var16] = method2830(var14); - if (this.field1549 != null && this.field1549[this.indices2[var16]] != null) { - var13 = this.field1549[this.indices2[var16]]; + var8.faceColors1[var16] = method2861(var14); + if (this.field1561 != null && this.field1561[this.indices2[var16]] != null) { + var13 = this.field1561[this.indices2[var16]]; } else { var13 = this.vertexNormals[this.indices2[var16]]; } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors2[var16] = method2830(var14); - if (this.field1549 != null && this.field1549[this.indices3[var16]] != null) { - var13 = this.field1549[this.indices3[var16]]; + var8.faceColors2[var16] = method2861(var14); + if (this.field1561 != null && this.field1561[this.indices3[var16]] != null) { + var13 = this.field1561[this.indices3[var16]]; } else { var13 = this.vertexNormals[this.indices3[var16]]; } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors3[var16] = method2830(var14); + var8.faceColors3[var16] = method2861(var14); } } - this.method2805(); + this.method2846(); var8.verticesCount = this.verticesCount; var8.verticesX = this.verticesX; var8.verticesY = this.verticesY; @@ -1615,16 +1615,16 @@ public class ModelData extends Entity { var8.indices3 = this.indices3; var8.faceRenderPriorities = this.faceRenderPriorities; var8.faceAlphas = this.faceAlphas; - var8.field1662 = this.priority; + var8.field1675 = this.priority; var8.vertexLabels = this.vertexLabels; var8.faceLabelsAlpha = this.faceLabelsAlpha; var8.faceTextures = this.faceTextures; return var8; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lhz;II)Ldd;" + signature = "(Lii;II)Ldg;" ) @Export("ModelData_get") public static ModelData ModelData_get(AbstractArchive var0, int var1, int var2) { @@ -1632,16 +1632,16 @@ public class ModelData extends Entity { return var3 == null ? null : new ModelData(var3); } - @ObfuscatedName("aa") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(Ldd;Ldd;IIIZ)V" + signature = "(Ldg;Ldg;IIIZ)V" ) - static void method2818(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { + static void method2849(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { var0.calculateBounds(); var0.calculateVertexNormals(); var1.calculateBounds(); var1.calculateVertexNormals(); - ++field1554; + ++field1571; int var6 = 0; int[] var7 = var1.verticesX; int var8 = var1.verticesCount; @@ -1651,30 +1651,30 @@ public class ModelData extends Entity { VertexNormal var10 = var0.vertexNormals[var9]; if (var10.magnitude != 0) { int var11 = var0.verticesY[var9] - var3; - if (var11 <= var1.field1550) { + if (var11 <= var1.field1563) { int var12 = var0.verticesX[var9] - var2; - if (var12 >= var1.field1527 && var12 <= var1.field1555) { + if (var12 >= var1.field1570 && var12 <= var1.field1567) { int var13 = var0.verticesZ[var9] - var4; - if (var13 >= var1.field1529 && var13 <= var1.field1541) { + if (var13 >= var1.field1569 && var13 <= var1.field1537) { for (int var14 = 0; var14 < var8; ++var14) { VertexNormal var15 = var1.vertexNormals[var14]; if (var12 == var7[var14] && var13 == var1.verticesZ[var14] && var11 == var1.verticesY[var14] && var15.magnitude != 0) { - if (var0.field1549 == null) { - var0.field1549 = new VertexNormal[var0.verticesCount]; + if (var0.field1561 == null) { + var0.field1561 = new VertexNormal[var0.verticesCount]; } - if (var1.field1549 == null) { - var1.field1549 = new VertexNormal[var8]; + if (var1.field1561 == null) { + var1.field1561 = new VertexNormal[var8]; } - VertexNormal var16 = var0.field1549[var9]; + VertexNormal var16 = var0.field1561[var9]; if (var16 == null) { - var16 = var0.field1549[var9] = new VertexNormal(var10); + var16 = var0.field1561[var9] = new VertexNormal(var10); } - VertexNormal var17 = var1.field1549[var14]; + VertexNormal var17 = var1.field1561[var14]; if (var17 == null) { - var17 = var1.field1549[var14] = new VertexNormal(var15); + var17 = var1.field1561[var14] = new VertexNormal(var15); } var16.x += var15.x; @@ -1686,8 +1686,8 @@ public class ModelData extends Entity { var17.z += var10.z; var17.magnitude += var10.magnitude; ++var6; - field1558[var9] = field1554; - field1559[var14] = field1554; + field1559[var9] = field1571; + field1547[var14] = field1571; } } } @@ -1698,7 +1698,7 @@ public class ModelData extends Entity { if (var6 >= 3 && var5) { for (var9 = 0; var9 < var0.faceCount; ++var9) { - if (field1558[var0.indices1[var9]] == field1554 && field1558[var0.indices2[var9]] == field1554 && field1558[var0.indices3[var9]] == field1554) { + if (field1559[var0.indices1[var9]] == field1571 && field1559[var0.indices2[var9]] == field1571 && field1559[var0.indices3[var9]] == field1571) { if (var0.faceRenderTypes == null) { var0.faceRenderTypes = new byte[var0.faceCount]; } @@ -1708,7 +1708,7 @@ public class ModelData extends Entity { } for (var9 = 0; var9 < var1.faceCount; ++var9) { - if (field1554 == field1559[var1.indices1[var9]] && field1554 == field1559[var1.indices2[var9]] && field1554 == field1559[var1.indices3[var9]]) { + if (field1571 == field1547[var1.indices1[var9]] && field1571 == field1547[var1.indices2[var9]] && field1571 == field1547[var1.indices3[var9]]) { if (var1.faceRenderTypes == null) { var1.faceRenderTypes = new byte[var1.faceCount]; } @@ -1720,8 +1720,8 @@ public class ModelData extends Entity { } } - @ObfuscatedName("aw") - static final int method2864(int var0, int var1) { + @ObfuscatedName("ae") + static final int method2911(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; if (var1 < 2) { var1 = 2; @@ -1732,8 +1732,8 @@ public class ModelData extends Entity { return (var0 & 65408) + var1; } - @ObfuscatedName("as") - static final int method2830(int var0) { + @ObfuscatedName("af") + static final int method2861(int var0) { if (var0 < 2) { var0 = 2; } else if (var0 > 126) { diff --git a/runescape-client/src/main/java/ModelData0.java b/runescape-client/src/main/java/ModelData0.java index 49769680b2..b8ed2b3ddf 100644 --- a/runescape-client/src/main/java/ModelData0.java +++ b/runescape-client/src/main/java/ModelData0.java @@ -1,146 +1,35 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ew") +@ObfuscatedName("el") @Implements("ModelData0") public class ModelData0 { - @ObfuscatedName("df") - @ObfuscatedSignature( - signature = "Lky;" - ) - @Export("js5Socket") - static AbstractSocket js5Socket; - ModelData0() { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "-54" + signature = "(IIII)I", + garbageValue = "-1209977249" ) - public static int method3266(int var0, int var1) { - int var2; - for (var2 = 1; var1 > 1; var1 >>= 1) { - if ((var1 & 1) != 0) { - var2 = var0 * var2; - } - - var0 *= var0; - } - - if (var1 == 1) { - return var0 * var2; + public static int method3322(int var0, int var1, int var2) { + var2 &= 3; + if (var2 == 0) { + return var0; + } else if (var2 == 1) { + return var1; } else { - return var2; + return var2 == 2 ? 7 - var0 : 7 - var1; } } - @ObfuscatedName("f") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(I)[Llg;", - garbageValue = "-19364585" + signature = "(Ljava/lang/String;I)V", + garbageValue = "-1996001757" ) - @Export("FillMode_values") - public static FillMode[] FillMode_values() { - return new FillMode[]{FillMode.field3850, FillMode.SOLID, FillMode.field3853}; - } - - @ObfuscatedName("fr") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "-21" - ) - @Export("getLoginError") - static void getLoginError(int var0) { - if (var0 == -3) { - AbstractWorldMapData.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); - } else if (var0 == -2) { - AbstractWorldMapData.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); - } else if (var0 == -1) { - AbstractWorldMapData.setLoginResponseString("No response from server.", "Please try using a different world.", ""); - } else if (var0 == 3) { - Login.loginIndex = 3; - Login.field1181 = 1; - } else if (var0 == 4) { - Login.loginIndex = 12; - Login.field1167 = 0; - } else if (var0 == 5) { - Login.field1181 = 2; - AbstractWorldMapData.setLoginResponseString("Your account has not logged out from its last", "session or the server is too busy right now.", "Please try again in a few minutes."); - } else if (var0 == 68 || !Client.onMobile && var0 == 6) { - AbstractWorldMapData.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); - } else if (var0 == 7) { - AbstractWorldMapData.setLoginResponseString("This world is full.", "Please use a different world.", ""); - } else if (var0 == 8) { - AbstractWorldMapData.setLoginResponseString("Unable to connect.", "Login server offline.", ""); - } else if (var0 == 9) { - AbstractWorldMapData.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); - } else if (var0 == 10) { - AbstractWorldMapData.setLoginResponseString("Unable to connect.", "Bad session id.", ""); - } else if (var0 == 11) { - AbstractWorldMapData.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); - } else if (var0 == 12) { - AbstractWorldMapData.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); - } else if (var0 == 13) { - AbstractWorldMapData.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); - } else if (var0 == 14) { - AbstractWorldMapData.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 16) { - AbstractWorldMapData.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); - } else if (var0 == 17) { - AbstractWorldMapData.setLoginResponseString("You are standing in a members-only area.", "To play on this world move to a free area first", ""); - } else if (var0 == 18) { - Login.loginIndex = 12; - Login.field1167 = 1; - } else if (var0 == 19) { - AbstractWorldMapData.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); - } else if (var0 == 20) { - AbstractWorldMapData.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); - } else if (var0 == 22) { - AbstractWorldMapData.setLoginResponseString("Malformed login packet.", "Please try again.", ""); - } else if (var0 == 23) { - AbstractWorldMapData.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 24) { - AbstractWorldMapData.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); - } else if (var0 == 25) { - AbstractWorldMapData.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); - } else if (var0 == 26) { - AbstractWorldMapData.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); - } else if (var0 == 27) { - AbstractWorldMapData.setLoginResponseString("", "Service unavailable.", ""); - } else if (var0 == 31) { - AbstractWorldMapData.setLoginResponseString("Your account must have a displayname set", "in order to play the game. Please set it", "via the website, or the main game."); - } else if (var0 == 32) { - AbstractWorldMapData.setLoginResponseString("Your attempt to log into your account was", "unsuccessful. Don't worry, you can sort", "this out by visiting the billing system."); - } else if (var0 == 37) { - AbstractWorldMapData.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); - } else if (var0 == 38) { - AbstractWorldMapData.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); - } else if (var0 == 55) { - Login.loginIndex = 8; - } else { - if (var0 == 56) { - AbstractWorldMapData.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); - class195.updateGameState(11); - return; - } - - if (var0 == 57) { - AbstractWorldMapData.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); - class195.updateGameState(11); - return; - } - - if (var0 == 61) { - Login.loginIndex = 7; - } else { - AbstractWorldMapData.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); - } - } - - class195.updateGameState(10); + static final void method3323(String var0) { + class60.method1188(var0 + " is already on your ignore list"); } } diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java index 6e0e16217d..be908b904a 100644 --- a/runescape-client/src/main/java/MouseHandler.java +++ b/runescape-client/src/main/java/MouseHandler.java @@ -9,117 +9,129 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bg") +@ObfuscatedName("bc") @Implements("MouseHandler") public class MouseHandler implements MouseListener, MouseMotionListener, FocusListener { - @ObfuscatedName("y") - @ObfuscatedGetter( - longValue = 6391782561924892503L - ) - @Export("MouseHandler_millis") - public static long MouseHandler_millis; - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lbg;" + signature = "Lbc;" ) @Export("MouseHandler_instance") public static MouseHandler MouseHandler_instance; - @ObfuscatedName("b") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1020768775 + intValue = 860995379 ) @Export("MouseHandler_idleCycles") public static volatile int MouseHandler_idleCycles; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 389551181 + intValue = 1865926071 ) @Export("MouseHandler_currentButtonVolatile") - public static volatile int MouseHandler_currentButtonVolatile; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 1844911271 - ) - @Export("MouseHandler_y") - public static int MouseHandler_y; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 1784326917 - ) - @Export("MouseHandler_xVolatile") - public static volatile int MouseHandler_xVolatile; + static volatile int MouseHandler_currentButtonVolatile; @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 421105959 + intValue = -1402384101 + ) + @Export("MouseHandler_xVolatile") + static volatile int MouseHandler_xVolatile; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1430604587 ) @Export("MouseHandler_yVolatile") - public static volatile int MouseHandler_yVolatile; - @ObfuscatedName("c") + static volatile int MouseHandler_yVolatile; + @ObfuscatedName("j") @ObfuscatedGetter( - longValue = 5982585687992088541L + longValue = -854050918642271107L ) @Export("MouseHandler_lastMovedVolatile") - public static volatile long MouseHandler_lastMovedVolatile; - @ObfuscatedName("o") + static volatile long MouseHandler_lastMovedVolatile; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -2063190937 + intValue = 1497113395 ) @Export("MouseHandler_currentButton") public static int MouseHandler_currentButton; - @ObfuscatedName("v") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 651144281 + intValue = -500582999 ) @Export("MouseHandler_x") public static int MouseHandler_x; - @ObfuscatedName("k") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 417223015 + intValue = 207473425 + ) + @Export("MouseHandler_y") + public static int MouseHandler_y; + @ObfuscatedName("v") + @ObfuscatedGetter( + longValue = 1304573896200149721L + ) + @Export("MouseHandler_millis") + public static long MouseHandler_millis; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -806145355 ) @Export("MouseHandler_lastButtonVolatile") - public static volatile int MouseHandler_lastButtonVolatile; - @ObfuscatedName("s") + static volatile int MouseHandler_lastButtonVolatile; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1302280877 + intValue = -1118071489 ) @Export("MouseHandler_lastPressedXVolatile") - public static volatile int MouseHandler_lastPressedXVolatile; - @ObfuscatedName("l") + static volatile int MouseHandler_lastPressedXVolatile; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 563945569 + intValue = 2125266789 ) @Export("MouseHandler_lastPressedYVolatile") - public static volatile int MouseHandler_lastPressedYVolatile; - @ObfuscatedName("t") + static volatile int MouseHandler_lastPressedYVolatile; + @ObfuscatedName("k") @ObfuscatedGetter( - longValue = -2443087496811736215L + longValue = 3042635196210425157L ) @Export("MouseHandler_lastPressedTimeMillisVolatile") - public static volatile long MouseHandler_lastPressedTimeMillisVolatile; - @ObfuscatedName("j") + static volatile long MouseHandler_lastPressedTimeMillisVolatile; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1154411121 + intValue = 2023315893 ) @Export("MouseHandler_lastButton") public static int MouseHandler_lastButton; - @ObfuscatedName("n") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -235347877 + intValue = 527604791 ) @Export("MouseHandler_lastPressedX") public static int MouseHandler_lastPressedX; - @ObfuscatedName("u") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -983973497 + intValue = 403246047 ) @Export("MouseHandler_lastPressedY") public static int MouseHandler_lastPressedY; - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedGetter( - longValue = 231265162038800951L + longValue = -7854079785308338285L ) @Export("MouseHandler_lastPressedTimeMillis") public static long MouseHandler_lastPressedTimeMillis; + @ObfuscatedName("dd") + @ObfuscatedSignature( + signature = "Lia;" + ) + @Export("archive6") + static Archive archive6; + @ObfuscatedName("dh") + @ObfuscatedSignature( + signature = "Lia;" + ) + @Export("archive13") + static Archive archive13; static { MouseHandler_instance = new MouseHandler(); @@ -145,10 +157,10 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi MouseHandler() { } - @ObfuscatedName("f") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Ljava/awt/event/MouseEvent;I)I", - garbageValue = "-1130050743" + signature = "(Ljava/awt/event/MouseEvent;B)I", + garbageValue = "6" ) @Export("getButton") final int getButton(MouseEvent var1) { @@ -170,16 +182,10 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi } - public final synchronized void mousePressed(MouseEvent var1) { + public final synchronized void mouseReleased(MouseEvent var1) { if (MouseHandler_instance != null) { MouseHandler_idleCycles = 0; - MouseHandler_lastPressedXVolatile = var1.getX(); - MouseHandler_lastPressedYVolatile = var1.getY(); - MouseHandler_lastPressedTimeMillisVolatile = WorldMapID.currentTimeMillis(); - MouseHandler_lastButtonVolatile = this.getButton(var1); - if (MouseHandler_lastButtonVolatile != 0) { - MouseHandler_currentButtonVolatile = MouseHandler_lastButtonVolatile; - } + MouseHandler_currentButtonVolatile = 0; } if (var1.isPopupTrigger()) { @@ -188,13 +194,6 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi } - public final void mouseClicked(MouseEvent var1) { - if (var1.isPopupTrigger()) { - var1.consume(); - } - - } - public final synchronized void mouseEntered(MouseEvent var1) { this.mouseMoved(var1); } @@ -209,8 +208,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi } - public final synchronized void mouseDragged(MouseEvent var1) { - this.mouseMoved(var1); + public final void focusGained(FocusEvent var1) { } public final synchronized void focusLost(FocusEvent var1) { @@ -220,13 +218,20 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi } - public final void focusGained(FocusEvent var1) { + public final synchronized void mouseDragged(MouseEvent var1) { + this.mouseMoved(var1); } - public final synchronized void mouseReleased(MouseEvent var1) { + public final synchronized void mousePressed(MouseEvent var1) { if (MouseHandler_instance != null) { MouseHandler_idleCycles = 0; - MouseHandler_currentButtonVolatile = 0; + MouseHandler_lastPressedXVolatile = var1.getX(); + MouseHandler_lastPressedYVolatile = var1.getY(); + MouseHandler_lastPressedTimeMillisVolatile = WorldMapIcon_0.currentTimeMillis(); + MouseHandler_lastButtonVolatile = this.getButton(var1); + if (MouseHandler_lastButtonVolatile != 0) { + MouseHandler_currentButtonVolatile = MouseHandler_lastButtonVolatile; + } } if (var1.isPopupTrigger()) { @@ -235,118 +240,147 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi } - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-996326189" - ) - @Export("Messages_getHistorySize") - static int Messages_getHistorySize(int var0) { - ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); - return var1 == null ? 0 : var1.size(); - } - - @ObfuscatedName("hy") - @ObfuscatedSignature( - signature = "(Lbn;I)Z", - garbageValue = "1190752161" - ) - static boolean method1073(Player var0) { - if (Client.drawPlayerNames == 0) { - return false; - } else if (Message.localPlayer == var0) { - boolean var1 = (Client.drawPlayerNames & 8) != 0; - return var1; - } else { - return class83.method2072() || GameObject.method3298() && var0.isFriend() || class2.method27() && var0.isClanMember(); + public final void mouseClicked(MouseEvent var1) { + if (var1.isPopupTrigger()) { + var1.consume(); } + } - @ObfuscatedName("ip") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "1279523682" + signature = "(IIB)I", + garbageValue = "-49" ) - static final boolean method1074(int var0) { - if (var0 < 0) { - return false; - } else { - int var1 = Client.menuOpcodes[var0]; - if (var1 >= 2000) { - var1 -= 2000; - } - - return var1 == 1007; + public static int method1111(int var0, int var1) { + int var2; + if (var1 > var0) { + var2 = var0; + var0 = var1; + var1 = var2; } + + while (var1 != 0) { + var2 = var0 % var1; + var0 = var1; + var1 = var2; + } + + return var0; } - @ObfuscatedName("ke") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "([Lha;II)V", - garbageValue = "-1916906326" + signature = "(Lbg;Lbg;IZB)I", + garbageValue = "-55" ) - @Export("drawModelComponents") - static final void drawModelComponents(Widget[] var0, int var1) { - for (int var2 = 0; var2 < var0.length; ++var2) { - Widget var3 = var0[var2]; - if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !Varcs.isComponentHidden(var3))) { - int var5; - if (var3.type == 0) { - if (!var3.isIf3 && Varcs.isComponentHidden(var3) && var3 != class16.mousedOverWidgetIf1) { - continue; - } - - drawModelComponents(var0, var3.id); - if (var3.children != null) { - drawModelComponents(var3.children, var3.id); - } - - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); - if (var4 != null) { - var5 = var4.group; - if (MusicPatch.loadInterface(var5)) { - drawModelComponents(UserComparator7.Widget_interfaceComponents[var5], -1); - } - } + @Export("compareWorlds") + static int compareWorlds(World var0, World var1, int var2, boolean var3) { + if (var2 == 1) { + int var4 = var0.population; + int var5 = var1.population; + if (!var3) { + if (var4 == -1) { + var4 = 2001; } - if (var3.type == 6) { - if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { - boolean var7 = WorldMapData_0.runCs1(var3); - if (var7) { - var5 = var3.sequenceId2; - } else { - var5 = var3.sequenceId; - } + if (var5 == -1) { + var5 = 2001; + } + } - if (var5 != -1) { - SequenceDefinition var6 = WorldMapSection0.SequenceDefinition_get(var5); + return var4 - var5; + } else if (var2 == 2) { + return var0.location - var1.location; + } else if (var2 == 3) { + if (var0.activity.equals("-")) { + if (var1.activity.equals("-")) { + return 0; + } else { + return var3 ? -1 : 1; + } + } else if (var1.activity.equals("-")) { + return var3 ? 1 : -1; + } else { + return var0.activity.compareTo(var1.activity); + } + } else if (var2 == 4) { + return var0.method1787() ? (var1.method1787() ? 0 : 1) : (var1.method1787() ? -1 : 0); + } else if (var2 == 5) { + return var0.method1760() ? (var1.method1760() ? 0 : 1) : (var1.method1760() ? -1 : 0); + } else if (var2 == 6) { + return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0); + } else if (var2 == 7) { + return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0); + } else { + return var0.id - var1.id; + } + } - for (var3.modelFrameCycle += Client.field690; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; LoginPacket.invalidateWidget(var3)) { - var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; - ++var3.modelFrame; - if (var3.modelFrame >= var6.frameIds.length) { - var3.modelFrame -= var6.frameCount; - if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { - var3.modelFrame = 0; - } - } - } - } + @ObfuscatedName("fw") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1248000942" + ) + static void method1110() { + Client.packetWriter.clearBuffer(); + Client.packetWriter.packetBuffer.offset = 0; + Client.packetWriter.serverPacket = null; + Client.packetWriter.field1309 = null; + Client.packetWriter.field1305 = null; + Client.packetWriter.field1307 = null; + Client.packetWriter.serverPacketLength = 0; + Client.packetWriter.field1299 = 0; + Client.rebootTimer = 0; + Client.menuOptionsCount = 0; + Client.isMenuOpen = false; + Client.minimapState = 0; + Client.destinationX = 0; + + int var0; + for (var0 = 0; var0 < 2048; ++var0) { + Client.players[var0] = null; + } + + class192.localPlayer = null; + + for (var0 = 0; var0 < Client.npcs.length; ++var0) { + NPC var1 = Client.npcs[var0]; + if (var1 != null) { + var1.targetIndex = -1; + var1.false0 = false; + } + } + + WorldMapLabelSize.method198(); + Projectile.updateGameState(30); + + for (var0 = 0; var0 < 100; ++var0) { + Client.field851[var0] = true; + } + + class238.method4415(); + } + + @ObfuscatedName("iq") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;Lhn;I)Ljava/lang/String;", + garbageValue = "-1667382468" + ) + static String method1096(String var0, Widget var1) { + if (var0.indexOf("%") != -1) { + for (int var2 = 1; var2 <= 5; ++var2) { + while (true) { + int var3 = var0.indexOf("%" + var2); + if (var3 == -1) { + break; } - if (var3.field2607 != 0 && !var3.isIf3) { - int var8 = var3.field2607 >> 16; - var5 = var3.field2607 << 16 >> 16; - var8 *= Client.field690; - var5 *= Client.field690; - var3.modelAngleX = var8 + var3.modelAngleX & 2047; - var3.modelAngleY = var5 + var3.modelAngleY & 2047; - LoginPacket.invalidateWidget(var3); - } + var0 = var0.substring(0, var3) + WorldMapID.method570(GrandExchangeOfferTotalQuantityComparator.method106(var1, var2 - 1)) + var0.substring(var3 + 2); } } } + return var0; } } diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java index 499bf7f62f..af17b9d6bc 100644 --- a/runescape-client/src/main/java/MouseRecorder.java +++ b/runescape-client/src/main/java/MouseRecorder.java @@ -1,49 +1,31 @@ -import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bo") +@ObfuscatedName("bt") @Implements("MouseRecorder") public class MouseRecorder implements Runnable { - @ObfuscatedName("bo") - @ObfuscatedGetter( - intValue = 1462457493 - ) - static int field564; - @ObfuscatedName("dt") - @ObfuscatedSignature( - signature = "Lif;" - ) - @Export("archive7") - static Archive archive7; - @ObfuscatedName("ee") - @ObfuscatedGetter( - intValue = -365482057 - ) - @Export("port2") - static int port2; - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("isRunning") boolean isRunning; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("lock") Object lock; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -134768521 + intValue = 114290231 ) @Export("index") int index; - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("xs") int[] xs; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("ys") int[] ys; - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("millis") long[] millis; @@ -57,7 +39,7 @@ public class MouseRecorder implements Runnable { } public void run() { - for (; this.isRunning; ServerBuild.method4111(50L)) { + for (; this.isRunning; FriendLoginUpdate.method5325(50L)) { synchronized(this.lock) { if (this.index < 500) { this.xs[this.index] = MouseHandler.MouseHandler_x; @@ -70,57 +52,149 @@ public class MouseRecorder implements Runnable { } - @ObfuscatedName("f") + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(Lkp;Llp;B)Llp;", + garbageValue = "-44" + ) + @Export("readStringIntParameters") + static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { + int var2 = var0.readUnsignedByte(); + int var3; + if (var1 == null) { + var3 = DynamicObject.method2293(var2); + var1 = new IterableNodeHashTable(var3); + } + + for (var3 = 0; var3 < var2; ++var3) { + boolean var4 = var0.readUnsignedByte() == 1; + int var5 = var0.readMedium(); + Object var6; + if (var4) { + var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); + } else { + var6 = new IntegerNode(var0.readInt()); + } + + var1.put((Node)var6, (long)var5); + } + + return var1; + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(Lii;Lii;Lii;Lgw;I)Z", + garbageValue = "1360847882" + ) + public static boolean method1208(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, MidiPcmStream var3) { + class197.musicPatchesArchive = var0; + class197.musicSamplesArchive = var1; + UserComparator10.soundEffectsArchive = var2; + class197.midiPcmStream = var3; + return true; + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "-64" + ) + static final void method1209() { + if (!ViewportMouse.ViewportMouse_false0) { + int var0 = Scene.Scene_cameraPitchSine; + int var1 = Scene.Scene_cameraPitchCosine; + int var2 = Scene.Scene_cameraYawSine; + int var3 = Scene.Scene_cameraYawCosine; + byte var4 = 50; + short var5 = 3500; + int var6 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var4 / Rasterizer3D.Rasterizer3D_zoom; + int var7 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var4 / Rasterizer3D.Rasterizer3D_zoom; + int var8 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var5 / Rasterizer3D.Rasterizer3D_zoom; + int var9 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var5 / Rasterizer3D.Rasterizer3D_zoom; + int var10 = Rasterizer3D.method3087(var7, var4, var1, var0); + int var11 = Rasterizer3D.method3088(var7, var4, var1, var0); + var7 = var10; + var10 = Rasterizer3D.method3087(var9, var5, var1, var0); + int var12 = Rasterizer3D.method3088(var9, var5, var1, var0); + var9 = var10; + var10 = Rasterizer3D.method3112(var6, var11, var3, var2); + var11 = Rasterizer3D.method3086(var6, var11, var3, var2); + var6 = var10; + var10 = Rasterizer3D.method3112(var8, var12, var3, var2); + var12 = Rasterizer3D.method3086(var8, var12, var3, var2); + ViewportMouse.field1729 = (var10 + var6) / 2; + ViewportMouse.field1731 = (var9 + var7) / 2; + ViewportMouse.field1736 = (var11 + var12) / 2; + TextureProvider.field1512 = (var10 - var6) / 2; + ViewportMouse.field1733 = (var9 - var7) / 2; + ViewportMouse.field1742 = (var12 - var11) / 2; + UserComparator7.field1978 = Math.abs(TextureProvider.field1512); + class4.field26 = Math.abs(ViewportMouse.field1733); + class43.field381 = Math.abs(ViewportMouse.field1742); + } + } + + @ObfuscatedName("gd") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "1809769909" + garbageValue = "1367330545" ) - @Export("loadWorlds") - static boolean loadWorlds() { - try { - if (Login.World_request == null) { - Login.World_request = BufferedNetSocket.urlRequester.request(new URL(TextureProvider.field1510)); - } else if (Login.World_request.isDone()) { - byte[] var0 = Login.World_request.getResponse(); - Buffer var1 = new Buffer(var0); - var1.readInt(); - World.World_count = var1.readUnsignedShort(); - class162.World_worlds = new World[World.World_count]; - - World var3; - for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { - var3 = class162.World_worlds[var2] = new World(); - var3.id = var1.readUnsignedShort(); - var3.properties = var1.readInt(); - var3.host = var1.readStringCp1252NullTerminated(); - var3.activity = var1.readStringCp1252NullTerminated(); - var3.location = var1.readUnsignedByte(); - var3.population = var1.readShort(); - } - - class192.sortWorlds(class162.World_worlds, 0, class162.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); - Login.World_request = null; - return true; - } - } catch (Exception var4) { - var4.printStackTrace(); - Login.World_request = null; - } - - return false; + static boolean method1210() { + return (Client.drawPlayerNames & 4) != 0; } - @ObfuscatedName("i") + @ObfuscatedName("hc") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "171278603" + signature = "(IIIB)V", + garbageValue = "5" ) - static void method1187() { - for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var0.obj != null) { - var0.set(); + @Export("worldToScreen") + static final void worldToScreen(int var0, int var1, int var2) { + if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { + int var3 = WorldMapSectionType.getTileHeight(var0, var1, Clock.Client_plane) - var2; + var0 -= HitSplatDefinition.cameraX; + var3 -= class51.cameraY; + var1 -= Actor.cameraZ; + int var4 = Rasterizer3D.Rasterizer3D_sine[GrandExchangeOffer.cameraPitch]; + int var5 = Rasterizer3D.Rasterizer3D_cosine[GrandExchangeOffer.cameraPitch]; + int var6 = Rasterizer3D.Rasterizer3D_sine[FriendSystem.cameraYaw]; + int var7 = Rasterizer3D.Rasterizer3D_cosine[FriendSystem.cameraYaw]; + int var8 = var6 * var1 + var0 * var7 >> 16; + var1 = var7 * var1 - var0 * var6 >> 16; + var0 = var8; + var8 = var5 * var3 - var4 * var1 >> 16; + var1 = var3 * var4 + var5 * var1 >> 16; + if (var1 >= 50) { + Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; + Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2; + } else { + Client.viewportTempX = -1; + Client.viewportTempY = -1; + } + + } else { + Client.viewportTempX = -1; + Client.viewportTempY = -1; + } + } + + @ObfuscatedName("lr") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "1867958927" + ) + static String method1207(String var0) { + PlayerType[] var1 = SecureRandomFuture.PlayerType_values(); + + for (int var2 = 0; var2 < var1.length; ++var2) { + PlayerType var3 = var1[var2]; + if (var3.modIcon != -1 && var0.startsWith(Language.method3728(var3.modIcon))) { + var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); + break; } } + return var0; } } diff --git a/runescape-client/src/main/java/MouseWheel.java b/runescape-client/src/main/java/MouseWheel.java index c8dd0b2d66..0506330537 100644 --- a/runescape-client/src/main/java/MouseWheel.java +++ b/runescape-client/src/main/java/MouseWheel.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fs") +@ObfuscatedName("fi") @Implements("MouseWheel") public interface MouseWheel { - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "582157405" + signature = "(B)I", + garbageValue = "-3" ) @Export("useRotation") int useRotation(); diff --git a/runescape-client/src/main/java/MouseWheelHandler.java b/runescape-client/src/main/java/MouseWheelHandler.java index 10c2abc110..d72bfd91ea 100644 --- a/runescape-client/src/main/java/MouseWheelHandler.java +++ b/runescape-client/src/main/java/MouseWheelHandler.java @@ -7,12 +7,12 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ad") +@ObfuscatedName("ao") @Implements("MouseWheelHandler") public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 430182525 + intValue = -895443251 ) @Export("rotation") int rotation; @@ -21,30 +21,30 @@ public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { this.rotation = 0; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(Ljava/awt/Component;I)V", - garbageValue = "-2097643643" + garbageValue = "1202794162" ) @Export("addTo") void addTo(Component var1) { var1.addMouseWheelListener(this); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Ljava/awt/Component;I)V", - garbageValue = "-1609249963" + signature = "(Ljava/awt/Component;B)V", + garbageValue = "57" ) @Export("removeFrom") void removeFrom(Component var1) { var1.removeMouseWheelListener(this); } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "582157405" + signature = "(B)I", + garbageValue = "-3" ) @Export("useRotation") public synchronized int useRotation() { diff --git a/runescape-client/src/main/java/MusicPatch.java b/runescape-client/src/main/java/MusicPatch.java index a27d4cefad..939d540bd4 100644 --- a/runescape-client/src/main/java/MusicPatch.java +++ b/runescape-client/src/main/java/MusicPatch.java @@ -3,56 +3,52 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("gp") +@ObfuscatedName("gr") @Implements("MusicPatch") public class MusicPatch extends Node { - @ObfuscatedName("ob") - @ObfuscatedSignature( - signature = "Lfs;" - ) - @Export("mouseWheel") - static MouseWheel mouseWheel; - @ObfuscatedName("v") + @ObfuscatedName("iz") @ObfuscatedGetter( - intValue = 1771553099 + intValue = -185966491 ) - static int field2472; - @ObfuscatedName("f") + @Export("selectedItemId") + static int selectedItemId; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1175859389 + intValue = -1990358497 ) - int field2467; - @ObfuscatedName("i") + int field2488; + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "[Lcc;" + signature = "[Lcv;" ) @Export("rawSounds") RawSound[] rawSounds; - @ObfuscatedName("y") - short[] field2464; - @ObfuscatedName("w") - byte[] field2466; - @ObfuscatedName("p") - byte[] field2470; - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "[Lgt;" - ) - MusicPatchNode2[] field2462; + @ObfuscatedName("o") + short[] field2483; @ObfuscatedName("e") - byte[] field2468; - @ObfuscatedName("x") - int[] field2469; + byte[] field2486; + @ObfuscatedName("i") + byte[] field2482; + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "[Lgf;" + ) + MusicPatchNode2[] field2487; + @ObfuscatedName("d") + byte[] field2485; + @ObfuscatedName("l") + int[] field2489; MusicPatch(byte[] var1) { this.rawSounds = new RawSound[128]; - this.field2464 = new short[128]; - this.field2466 = new byte[128]; - this.field2470 = new byte[128]; - this.field2462 = new MusicPatchNode2[128]; - this.field2468 = new byte[128]; - this.field2469 = new int[128]; + this.field2483 = new short[128]; + this.field2486 = new byte[128]; + this.field2482 = new byte[128]; + this.field2487 = new MusicPatchNode2[128]; + this.field2485 = new byte[128]; + this.field2489 = new int[128]; Buffer var2 = new Buffer(var1); int var3; @@ -132,13 +128,13 @@ public class MusicPatch extends Node { var38 = var37[var14] = new MusicPatchNode2(); int var16 = var2.readUnsignedByte(); if (var16 > 0) { - var38.field2385 = new byte[var16 * 2]; + var38.field2402 = new byte[var16 * 2]; } var16 = var2.readUnsignedByte(); if (var16 > 0) { - var38.field2377 = new byte[var16 * 2 + 2]; - var38.field2377[1] = 64; + var38.field2399 = new byte[var16 * 2 + 2]; + var38.field2399[1] = 64; } } @@ -165,7 +161,7 @@ public class MusicPatch extends Node { int var20; for (var20 = 0; var20 < 128; ++var20) { var19 += var2.readUnsignedByte(); - this.field2464[var20] = (short)var19; + this.field2483[var20] = (short)var19; } var19 = 0; @@ -173,7 +169,7 @@ public class MusicPatch extends Node { short[] var48; for (var20 = 0; var20 < 128; ++var20) { var19 += var2.readUnsignedByte(); - var48 = this.field2464; + var48 = this.field2483; var48[var20] = (short)(var48[var20] + (var19 << 8)); } @@ -193,9 +189,9 @@ public class MusicPatch extends Node { var22 = var2.readVarInt(); } - var48 = this.field2464; + var48 = this.field2483; var48[var23] = (short)(var48[var23] + ((var22 - 1 & 2) << 14)); - this.field2469[var23] = var22; + this.field2489[var23] = var22; --var20; } @@ -205,7 +201,7 @@ public class MusicPatch extends Node { int var24; for (var24 = 0; var24 < 128; ++var24) { - if (this.field2469[var24] != 0) { + if (this.field2489[var24] != 0) { if (var20 == 0) { if (var21 < var4.length) { var20 = var4[var21++]; @@ -216,7 +212,7 @@ public class MusicPatch extends Node { var23 = var2.array[var5++] - 1; } - this.field2468[var24] = (byte)var23; + this.field2485[var24] = (byte)var23; --var20; } } @@ -226,7 +222,7 @@ public class MusicPatch extends Node { var24 = 0; for (int var25 = 0; var25 < 128; ++var25) { - if (this.field2469[var25] != 0) { + if (this.field2489[var25] != 0) { if (var20 == 0) { if (var21 < var7.length) { var20 = var7[var21++]; @@ -237,7 +233,7 @@ public class MusicPatch extends Node { var24 = var2.array[var8++] + 16 << 2; } - this.field2470[var25] = (byte)var24; + this.field2482[var25] = (byte)var24; --var20; } } @@ -248,7 +244,7 @@ public class MusicPatch extends Node { int var26; for (var26 = 0; var26 < 128; ++var26) { - if (this.field2469[var26] != 0) { + if (this.field2489[var26] != 0) { if (var20 == 0) { var40 = var37[var36[var21]]; if (var21 < var10.length) { @@ -258,7 +254,7 @@ public class MusicPatch extends Node { } } - this.field2462[var26] = var40; + this.field2487[var26] = var40; --var20; } } @@ -276,30 +272,30 @@ public class MusicPatch extends Node { var20 = -1; } - if (this.field2469[var27] > 0) { + if (this.field2489[var27] > 0) { var26 = var2.readUnsignedByte() + 1; } } - this.field2466[var27] = (byte)var26; + this.field2486[var27] = (byte)var26; --var20; } - this.field2467 = var2.readUnsignedByte() + 1; + this.field2488 = var2.readUnsignedByte() + 1; MusicPatchNode2 var28; int var29; for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2385 != null) { - for (var29 = 1; var29 < var28.field2385.length; var29 += 2) { - var28.field2385[var29] = var2.readByte(); + if (var28.field2402 != null) { + for (var29 = 1; var29 < var28.field2402.length; var29 += 2) { + var28.field2402[var29] = var2.readByte(); } } - if (var28.field2377 != null) { - for (var29 = 3; var29 < var28.field2377.length - 2; var29 += 2) { - var28.field2377[var29] = var2.readByte(); + if (var28.field2399 != null) { + for (var29 = 3; var29 < var28.field2399.length - 2; var29 += 2) { + var28.field2399[var29] = var2.readByte(); } } } @@ -318,24 +314,24 @@ public class MusicPatch extends Node { for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2377 != null) { + if (var28.field2399 != null) { var19 = 0; - for (var29 = 2; var29 < var28.field2377.length; var29 += 2) { - var19 = 1 + var19 + var2.readUnsignedByte(); - var28.field2377[var29] = (byte)var19; + for (var29 = 2; var29 < var28.field2399.length; var29 += 2) { + var19 = var19 + 1 + var2.readUnsignedByte(); + var28.field2399[var29] = (byte)var19; } } } for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2385 != null) { + if (var28.field2402 != null) { var19 = 0; - for (var29 = 2; var29 < var28.field2385.length; var29 += 2) { + for (var29 = 2; var29 < var28.field2402.length; var29 += 2) { var19 = var19 + 1 + var2.readUnsignedByte(); - var28.field2385[var29] = (byte)var19; + var28.field2402[var29] = (byte)var19; } } } @@ -351,7 +347,7 @@ public class MusicPatch extends Node { var45[0] = (byte)var19; for (var27 = 2; var27 < var45.length; var27 += 2) { - var19 = var19 + 1 + var2.readUnsignedByte(); + var19 = 1 + var19 + var2.readUnsignedByte(); var45[var27] = (byte)var19; } @@ -359,7 +355,7 @@ public class MusicPatch extends Node { byte var41 = var45[1]; for (var29 = 0; var29 < var44; ++var29) { - this.field2466[var29] = (byte)(var41 * this.field2466[var29] + 32 >> 6); + this.field2486[var29] = (byte)(var41 * this.field2486[var29] + 32 >> 6); } for (var29 = 2; var29 < var45.length; var29 += 2) { @@ -368,8 +364,8 @@ public class MusicPatch extends Node { var32 = var41 * (var30 - var44) + (var30 - var44) / 2; for (var33 = var44; var33 < var30; ++var33) { - var34 = WorldMapData_0.method164(var32, var30 - var44); - this.field2466[var33] = (byte)(var34 * this.field2466[var33] + 32 >> 6); + var34 = WorldMapLabel.method440(var32, var30 - var44); + this.field2486[var33] = (byte)(var34 * this.field2486[var33] + 32 >> 6); var32 += var31 - var41; } @@ -378,7 +374,7 @@ public class MusicPatch extends Node { } for (var42 = var44; var42 < 128; ++var42) { - this.field2466[var42] = (byte)(var41 * this.field2466[var42] + 32 >> 6); + this.field2486[var42] = (byte)(var41 * this.field2486[var42] + 32 >> 6); } var38 = null; @@ -397,7 +393,7 @@ public class MusicPatch extends Node { int var47 = var39[1] << 1; for (var29 = 0; var29 < var44; ++var29) { - var42 = var47 + (this.field2470[var29] & 255); + var42 = var47 + (this.field2482[var29] & 255); if (var42 < 0) { var42 = 0; } @@ -406,7 +402,7 @@ public class MusicPatch extends Node { var42 = 128; } - this.field2470[var29] = (byte)var42; + this.field2482[var29] = (byte)var42; } int var43; @@ -416,8 +412,8 @@ public class MusicPatch extends Node { var32 = var47 * (var30 - var44) + (var30 - var44) / 2; for (var33 = var44; var33 < var30; ++var33) { - var34 = WorldMapData_0.method164(var32, var30 - var44); - int var35 = var34 + (this.field2470[var33] & 255); + var34 = WorldMapLabel.method440(var32, var30 - var44); + int var35 = var34 + (this.field2482[var33] & 255); if (var35 < 0) { var35 = 0; } @@ -426,7 +422,7 @@ public class MusicPatch extends Node { var35 = 128; } - this.field2470[var33] = (byte)var35; + this.field2482[var33] = (byte)var35; var32 += var43 - var47; } @@ -435,7 +431,7 @@ public class MusicPatch extends Node { } for (var42 = var44; var42 < 128; ++var42) { - var43 = var47 + (this.field2470[var42] & 255); + var43 = var47 + (this.field2482[var42] & 255); if (var43 < 0) { var43 = 0; } @@ -444,64 +440,64 @@ public class MusicPatch extends Node { var43 = 128; } - this.field2470[var42] = (byte)var43; + this.field2482[var42] = (byte)var43; } Object var46 = null; } for (var27 = 0; var27 < var12; ++var27) { - var37[var27].field2378 = var2.readUnsignedByte(); + var37[var27].field2404 = var2.readUnsignedByte(); } for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2385 != null) { - var28.field2387 = var2.readUnsignedByte(); + if (var28.field2402 != null) { + var28.field2401 = var2.readUnsignedByte(); } - if (var28.field2377 != null) { - var28.field2376 = var2.readUnsignedByte(); + if (var28.field2399 != null) { + var28.field2400 = var2.readUnsignedByte(); } - if (var28.field2378 > 0) { - var28.field2384 = var2.readUnsignedByte(); + if (var28.field2404 > 0) { + var28.field2403 = var2.readUnsignedByte(); } } for (var27 = 0; var27 < var12; ++var27) { - var37[var27].field2383 = var2.readUnsignedByte(); + var37[var27].field2405 = var2.readUnsignedByte(); } for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2383 > 0) { - var28.field2382 = var2.readUnsignedByte(); + if (var28.field2405 > 0) { + var28.field2398 = var2.readUnsignedByte(); } } for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2382 > 0) { - var28.field2380 = var2.readUnsignedByte(); + if (var28.field2398 > 0) { + var28.field2406 = var2.readUnsignedByte(); } } } - @ObfuscatedName("f") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Ldx;[B[II)Z", - garbageValue = "-402294564" + signature = "(Ldv;[B[IB)Z", + garbageValue = "83" ) - boolean method3868(SoundCache var1, byte[] var2, int[] var3) { + boolean method3952(SoundCache var1, byte[] var2, int[] var3) { boolean var4 = true; int var5 = 0; RawSound var6 = null; for (int var7 = 0; var7 < 128; ++var7) { if (var2 == null || var2[var7] != 0) { - int var8 = this.field2469[var7]; + int var8 = this.field2489[var7]; if (var8 != 0) { if (var5 != var8) { var5 = var8--; @@ -518,7 +514,7 @@ public class MusicPatch extends Node { if (var6 != null) { this.rawSounds[var7] = var6; - this.field2469[var7] = 0; + this.field2489[var7] = 0; } } } @@ -527,54 +523,373 @@ public class MusicPatch extends Node { return var4; } - @ObfuscatedName("i") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "7" + signature = "(I)V", + garbageValue = "-979915375" ) @Export("clear") void clear() { - this.field2469 = null; + this.field2489 = null; } - @ObfuscatedName("w") + @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "0" + signature = "(ILce;ZI)I", + garbageValue = "-1621076022" ) - @Export("loadInterface") - public static boolean loadInterface(int var0) { - if (Widget.Widget_loadedInterfaces[var0]) { - return true; - } else if (!FriendLoginUpdate.Widget_archive.tryLoadGroup(var0)) { - return false; - } else { - int var1 = FriendLoginUpdate.Widget_archive.getGroupFileCount(var0); - if (var1 == 0) { - Widget.Widget_loadedInterfaces[var0] = true; - return true; + static int method3962(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.FRIEND_COUNT) { + if (KeyHandler.friendSystem.field1063 == 0) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -2; + } else if (KeyHandler.friendSystem.field1063 == 1) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; } else { - if (UserComparator7.Widget_interfaceComponents[var0] == null) { - UserComparator7.Widget_interfaceComponents[var0] = new Widget[var1]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = KeyHandler.friendSystem.friendsList.getSize(); + } + + return 1; + } else { + int var3; + if (var0 == ScriptOpcodes.FRIEND_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + if (KeyHandler.friendSystem.method1857() && var3 >= 0 && var3 < KeyHandler.friendSystem.friendsList.getSize()) { + Friend var8 = (Friend)KeyHandler.friendSystem.friendsList.get(var3); + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var8.getName(); + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var8.getPreviousName(); + } else { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; } - for (int var2 = 0; var2 < var1; ++var2) { - if (UserComparator7.Widget_interfaceComponents[var0][var2] == null) { - byte[] var3 = FriendLoginUpdate.Widget_archive.takeFile(var0, var2); - if (var3 != null) { - UserComparator7.Widget_interfaceComponents[var0][var2] = new Widget(); - UserComparator7.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); - if (var3[0] == -1) { - UserComparator7.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); - } else { - UserComparator7.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + if (KeyHandler.friendSystem.method1857() && var3 >= 0 && var3 < KeyHandler.friendSystem.friendsList.getSize()) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = ((Buddy)KeyHandler.friendSystem.friendsList.get(var3)).world; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + if (KeyHandler.friendSystem.method1857() && var3 >= 0 && var3 < KeyHandler.friendSystem.friendsList.getSize()) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = ((Buddy)KeyHandler.friendSystem.friendsList.get(var3)).rank; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else { + String var5; + if (var0 == ScriptOpcodes.FRIEND_SETRANK) { + var5 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + int var6 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + BZip2State.method5833(var5, var6); + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_ADD) { + var5 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + KeyHandler.friendSystem.addFriend(var5); + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_DEL) { + var5 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + KeyHandler.friendSystem.removeFriend(var5); + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_ADD) { + var5 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + KeyHandler.friendSystem.addIgnore(var5); + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_DEL) { + var5 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + KeyHandler.friendSystem.removeIgnore(var5); + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_TEST) { + var5 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + var5 = MouseRecorder.method1207(var5); + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = KeyHandler.friendSystem.isFriended(new Username(var5, class192.loginType), false) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { + if (InterfaceParent.clanChat != null) { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = InterfaceParent.clanChat.name; + } else { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { + if (InterfaceParent.clanChat != null) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = InterfaceParent.clanChat.getSize(); + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + if (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize()) { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = InterfaceParent.clanChat.get(var3).getUsername().getName(); + } else { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + if (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize()) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = ((Buddy)InterfaceParent.clanChat.get(var3)).getWorld(); + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + if (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize()) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = ((Buddy)InterfaceParent.clanChat.get(var3)).rank; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = InterfaceParent.clanChat != null ? InterfaceParent.clanChat.minKick : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { + var5 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + WorldMapID.clanKickUser(var5); + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = InterfaceParent.clanChat != null ? InterfaceParent.clanChat.rank : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { + var5 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + GrandExchangeOfferAgeComparator.Clan_joinChat(var5); + return 1; + } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { + MenuAction.Clan_leaveChat(); + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { + if (!KeyHandler.friendSystem.method1857()) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = KeyHandler.friendSystem.ignoreList.getSize(); + } + + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + if (KeyHandler.friendSystem.method1857() && var3 >= 0 && var3 < KeyHandler.friendSystem.ignoreList.getSize()) { + Ignored var4 = (Ignored)KeyHandler.friendSystem.ignoreList.get(var3); + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var4.getName(); + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var4.getPreviousName(); + } else { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_TEST) { + var5 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + var5 = MouseRecorder.method1207(var5); + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = KeyHandler.friendSystem.isIgnored(new Username(var5, class192.loginType)) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + if (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize() && InterfaceParent.clanChat.get(var3).getUsername().equals(class192.localPlayer.username)) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { + if (InterfaceParent.clanChat != null && InterfaceParent.clanChat.owner != null) { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = InterfaceParent.clanChat.owner; + } else { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + if (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize() && ((ClanMate)InterfaceParent.clanChat.get(var3)).isFriend()) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { + if (var0 == 3628) { + KeyHandler.friendSystem.friendsList.removeComparator(); + return 1; + } else { + boolean var7; + if (var0 == 3629) { + var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + KeyHandler.friendSystem.friendsList.addComparator(new UserComparator1(var7)); + return 1; + } else if (var0 == 3630) { + var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + KeyHandler.friendSystem.friendsList.addComparator(new UserComparator2(var7)); + return 1; + } else if (var0 == 3631) { + var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + KeyHandler.friendSystem.friendsList.addComparator(new UserComparator3(var7)); + return 1; + } else if (var0 == 3632) { + var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + KeyHandler.friendSystem.friendsList.addComparator(new UserComparator4(var7)); + return 1; + } else if (var0 == 3633) { + var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + KeyHandler.friendSystem.friendsList.addComparator(new UserComparator5(var7)); + return 1; + } else if (var0 == 3634) { + var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + KeyHandler.friendSystem.friendsList.addComparator(new UserComparator6(var7)); + return 1; + } else if (var0 == 3635) { + var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + KeyHandler.friendSystem.friendsList.addComparator(new UserComparator7(var7)); + return 1; + } else if (var0 == 3636) { + var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + KeyHandler.friendSystem.friendsList.addComparator(new UserComparator8(var7)); + return 1; + } else if (var0 == 3637) { + var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + KeyHandler.friendSystem.friendsList.addComparator(new UserComparator9(var7)); + return 1; + } else if (var0 == 3638) { + var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + KeyHandler.friendSystem.friendsList.addComparator(new UserComparator10(var7)); + return 1; + } else if (var0 == 3639) { + KeyHandler.friendSystem.friendsList.sort(); + return 1; + } else if (var0 == 3640) { + KeyHandler.friendSystem.ignoreList.removeComparator(); + return 1; + } else if (var0 == 3641) { + var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + KeyHandler.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); + return 1; + } else if (var0 == 3642) { + var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + KeyHandler.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); + return 1; + } else if (var0 == 3643) { + KeyHandler.friendSystem.ignoreList.sort(); + return 1; + } else if (var0 == 3644) { + if (InterfaceParent.clanChat != null) { + InterfaceParent.clanChat.removeComparator(); } + + return 1; + } else if (var0 == 3645) { + var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + if (InterfaceParent.clanChat != null) { + InterfaceParent.clanChat.addComparator(new UserComparator1(var7)); + } + + return 1; + } else if (var0 == 3646) { + var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + if (InterfaceParent.clanChat != null) { + InterfaceParent.clanChat.addComparator(new UserComparator2(var7)); + } + + return 1; + } else if (var0 == 3647) { + var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + if (InterfaceParent.clanChat != null) { + InterfaceParent.clanChat.addComparator(new UserComparator3(var7)); + } + + return 1; + } else if (var0 == 3648) { + var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + if (InterfaceParent.clanChat != null) { + InterfaceParent.clanChat.addComparator(new UserComparator4(var7)); + } + + return 1; + } else if (var0 == 3649) { + var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + if (InterfaceParent.clanChat != null) { + InterfaceParent.clanChat.addComparator(new UserComparator5(var7)); + } + + return 1; + } else if (var0 == 3650) { + var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + if (InterfaceParent.clanChat != null) { + InterfaceParent.clanChat.addComparator(new UserComparator6(var7)); + } + + return 1; + } else if (var0 == 3651) { + var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + if (InterfaceParent.clanChat != null) { + InterfaceParent.clanChat.addComparator(new UserComparator7(var7)); + } + + return 1; + } else if (var0 == 3652) { + var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + if (InterfaceParent.clanChat != null) { + InterfaceParent.clanChat.addComparator(new UserComparator8(var7)); + } + + return 1; + } else if (var0 == 3653) { + var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + if (InterfaceParent.clanChat != null) { + InterfaceParent.clanChat.addComparator(new UserComparator9(var7)); + } + + return 1; + } else if (var0 == 3654) { + var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + if (InterfaceParent.clanChat != null) { + InterfaceParent.clanChat.addComparator(new UserComparator10(var7)); + } + + return 1; + } else if (var0 == 3655) { + if (InterfaceParent.clanChat != null) { + InterfaceParent.clanChat.sort(); + } + + return 1; + } else if (var0 == 3656) { + var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + KeyHandler.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); + return 1; + } else if (var0 == 3657) { + var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + if (InterfaceParent.clanChat != null) { + InterfaceParent.clanChat.addComparator(new BuddyRankComparator(var7)); + } + + return 1; + } else { + return 2; } } - } + } else { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + if (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize() && ((ClanMate)InterfaceParent.clanChat.get(var3)).isIgnored()) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + } - Widget.Widget_loadedInterfaces[var0] = true; - return true; + return 1; + } } } } diff --git a/runescape-client/src/main/java/MusicPatchNode.java b/runescape-client/src/main/java/MusicPatchNode.java index ee792d5c82..7fb09624f3 100644 --- a/runescape-client/src/main/java/MusicPatchNode.java +++ b/runescape-client/src/main/java/MusicPatchNode.java @@ -4,196 +4,186 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gl") +@ObfuscatedName("gu") @Implements("MusicPatchNode") public class MusicPatchNode extends Node { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1668563715 + intValue = 158121519 ) - int field2444; - @ObfuscatedName("i") + int field2447; + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lgp;" + signature = "Lgr;" ) @Export("patch") MusicPatch patch; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lcc;" + signature = "Lcv;" ) @Export("rawSound") RawSound rawSound; - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lgt;" - ) - MusicPatchNode2 field2430; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 1764102469 - ) - int field2436; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 1904799079 - ) - int field2432; @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -520754743 + @ObfuscatedSignature( + signature = "Lgf;" ) - int field2433; - @ObfuscatedName("x") + MusicPatchNode2 field2445; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 2093202959 + intValue = -1663286447 ) - int field2442; - @ObfuscatedName("a") + int field2449; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -583711797 + intValue = -816079619 ) - int field2435; + int field2450; @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1078533747 + intValue = 1312167649 ) - int field2434; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 1604483671 - ) - int field2437; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 850603648 - ) - int field2446; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -2031818959 - ) - int field2439; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -2089703245 - ) - int field2440; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 1525536893 - ) - int field2441; + int field2451; @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 2143994261 + intValue = 109203307 ) - int field2438; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 1974206537 - ) - int field2443; + int field2457; @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1464754039 + intValue = -1309254043 ) - int field2427; + int field2446; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -83070697 + ) + int field2454; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -280788283 + ) + int field2455; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 1453033600 + ) + int field2456; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -1758842307 + ) + int field2448; @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -1607529919 + ) + int field2458; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 1043883777 + ) + int field2459; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 1085218982 + ) + int field2460; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 559765115 + ) + int field2461; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 586713195 + ) + int field2453; + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Ldg;" + signature = "Lde;" ) @Export("stream") RawPcmStream stream; - @ObfuscatedName("u") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -322620881 + intValue = -923217515 ) - int field2431; - @ObfuscatedName("h") + int field2464; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -966369817 + intValue = -1975530933 ) - int field2447; + int field2465; MusicPatchNode() { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "300" + signature = "(I)V", + garbageValue = "-1631381229" ) - void method3809() { + void method3896() { this.patch = null; this.rawSound = null; - this.field2430 = null; + this.field2445 = null; this.stream = null; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(II)Lid;", - garbageValue = "1715328596" + signature = "(B)[Lhx;", + garbageValue = "-72" ) - public static HitSplatDefinition method3815(int var0) { - HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); - var1 = new HitSplatDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); - return var1; - } + public static StudioGame[] method3898() { + return new StudioGame[]{StudioGame.game5, StudioGame.stellardawn, StudioGame.game4, StudioGame.runescape, StudioGame.oldscape, StudioGame.game3}; } - @ObfuscatedName("b") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "512753699" + garbageValue = "55138406" ) - public static int method3814() { - return KeyHandler.KeyHandler_idleCycles; + static final int method3903() { + return ViewportMouse.ViewportMouse_x; } - @ObfuscatedName("j") + @ObfuscatedName("ii") @ObfuscatedSignature( - signature = "(Ldw;IIIS)Z", - garbageValue = "-6878" + signature = "(IIIIB)V", + garbageValue = "18" ) - static final boolean method3813(Model var0, int var1, int var2, int var3) { - boolean var4 = ViewportMouse.ViewportMouse_isInViewport; - if (!var4) { - return false; - } else { - WorldMapEvent.method764(); - int var5 = var0.xMid + var1; - int var6 = var2 + var0.yMid; - int var7 = var3 + var0.zMid; - int var8 = var0.xMidOffset; - int var9 = var0.yMidOffset; - int var10 = var0.zMidOffset; - int var11 = ViewportMouse.field1717 - var5; - int var12 = class30.field245 - var6; - int var13 = ViewportMouse.field1718 - var7; - if (Math.abs(var11) > var8 + ViewportMouse.field1720) { - return false; - } else if (Math.abs(var12) > var9 + class247.field3261) { - return false; - } else if (Math.abs(var13) > var10 + MusicPatch.field2472) { - return false; - } else if (Math.abs(var13 * WorldMapCacheName.field293 - var12 * class40.field336) > var9 * MusicPatch.field2472 + var10 * class247.field3261) { - return false; - } else if (Math.abs(var11 * class40.field336 - var13 * ViewportMouse.field1719) > var8 * MusicPatch.field2472 + var10 * ViewportMouse.field1720) { - return false; - } else { - return Math.abs(var12 * ViewportMouse.field1719 - var11 * WorldMapCacheName.field293) <= var8 * class247.field3261 + var9 * ViewportMouse.field1720; + @Export("selectSpell") + static void selectSpell(int var0, int var1, int var2, int var3) { + Widget var4 = SpriteMask.getWidgetChild(var0, var1); + if (var4 != null && var4.onTargetEnter != null) { + ScriptEvent var5 = new ScriptEvent(); + var5.widget = var4; + var5.args = var4.onTargetEnter; + class4.runScriptEvent(var5); + } + + Client.field802 = var3; + Client.isSpellSelected = true; + FontName.selectedSpellWidget = var0; + Client.selectedSpellChildIndex = var1; + NetSocket.selectedSpellFlags = var2; + NPCDefinition.invalidateWidget(var4); + } + + @ObfuscatedName("ji") + @ObfuscatedSignature( + signature = "(II)Z", + garbageValue = "-1594747914" + ) + static boolean method3902(int var0) { + for (int var1 = 0; var1 < Client.field762; ++var1) { + if (Client.field869[var1] == var0) { + return true; } } + + return false; } } diff --git a/runescape-client/src/main/java/MusicPatchNode2.java b/runescape-client/src/main/java/MusicPatchNode2.java index b24700bd89..c556b85cc2 100644 --- a/runescape-client/src/main/java/MusicPatchNode2.java +++ b/runescape-client/src/main/java/MusicPatchNode2.java @@ -1,109 +1,50 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gt") +@ObfuscatedName("gf") @Implements("MusicPatchNode2") public class MusicPatchNode2 { - @ObfuscatedName("dz") - @ObfuscatedSignature( - signature = "Lif;" - ) - @Export("archive19") - static Archive archive19; - @ObfuscatedName("hx") + @ObfuscatedName("c") + byte[] field2402; + @ObfuscatedName("t") + byte[] field2399; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1785627297 + intValue = -1514989189 ) - @Export("cameraX") - static int cameraX; - @ObfuscatedName("f") - byte[] field2385; - @ObfuscatedName("i") - byte[] field2377; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = 1329513341 - ) - int field2378; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 12708137 - ) - int field2387; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 1693996309 - ) - int field2376; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 1410109429 - ) - int field2384; + int field2404; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 2019355135 + intValue = -781980409 ) - int field2382; - @ObfuscatedName("x") + int field2401; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 27248727 + intValue = 684160431 ) - int field2383; - @ObfuscatedName("a") + int field2400; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1172401863 + intValue = 1588792851 ) - int field2380; + int field2403; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 768856751 + ) + int field2398; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -758187287 + ) + int field2405; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -665826863 + ) + int field2406; MusicPatchNode2() { } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-69" - ) - static void method3669() { - class14.field88 = null; - Tiles.field498 = null; - Tiles.field494 = null; - Tiles.field493 = null; - Tiles.field501 = null; - Tiles.field496 = null; - ArchiveLoader.field512 = null; - UrlRequest.Tiles_hue = null; - MenuAction.Tiles_saturation = null; - PacketBufferNode.Tiles_lightness = null; - Tiles.Tiles_hueMultiplier = null; - Varcs.field1244 = null; - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "1" - ) - public static void method3668() { - SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); - SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(Lkq;J)V" - ) - static void method3670(Buffer var0, long var1) { - var1 /= 10L; - if (var1 < 0L) { - var1 = 0L; - } else if (var1 > 65535L) { - var1 = 65535L; - } - - var0.writeShort((int)var1); - } } diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java index 3634bce1fd..49eaa5f53d 100644 --- a/runescape-client/src/main/java/MusicPatchPcmStream.java +++ b/runescape-client/src/main/java/MusicPatchPcmStream.java @@ -1,39 +1,32 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gy") +@ObfuscatedName("gd") @Implements("MusicPatchPcmStream") public class MusicPatchPcmStream extends PcmStream { - @ObfuscatedName("fb") - @ObfuscatedGetter( - intValue = 310366357 - ) - @Export("baseX") - static int baseX; - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lgw;" ) @Export("superStream") MidiPcmStream superStream; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Ljs;" + signature = "Ljw;" ) @Export("queue") NodeDeque queue; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lcy;" + signature = "Lch;" ) @Export("mixer") PcmStreamMixer mixer; @ObfuscatedSignature( - signature = "(Lgm;)V" + signature = "(Lgw;)V" ) MusicPatchPcmStream(MidiPcmStream var1) { this.queue = new NodeDeque(); @@ -41,48 +34,48 @@ public class MusicPatchPcmStream extends PcmStream { this.superStream = var1; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lgl;[IIIII)V", - garbageValue = "2129262150" + signature = "(Lgu;[IIIII)V", + garbageValue = "-1926827063" ) - void method3879(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { - if ((this.superStream.field2412[var1.field2444] & 4) != 0 && var1.field2441 < 0) { - int var6 = this.superStream.field2425[var1.field2444] / (DirectByteArrayCopier.field2490 * -168449264); + void method3968(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { + if ((this.superStream.field2429[var1.field2447] & 4) != 0 && var1.field2459 < 0) { + int var6 = this.superStream.field2422[var1.field2447] / PcmPlayer.field1398; while (true) { - int var7 = (var6 + 1048575 - var1.field2447) / var6; + int var7 = (var6 + 1048575 - var1.field2465) / var6; if (var7 > var4) { - var1.field2447 += var4 * var6; + var1.field2465 += var6 * var4; break; } var1.stream.fill(var2, var3, var7); var3 += var7; var4 -= var7; - var1.field2447 += var6 * var7 - 1048576; - int var8 = DirectByteArrayCopier.field2490 * -168449264 / 100; + var1.field2465 += var7 * var6 - 1048576; + int var8 = PcmPlayer.field1398 / 100; int var9 = 262144 / var6; if (var9 < var8) { var8 = var9; } RawPcmStream var10 = var1.stream; - if (this.superStream.field2415[var1.field2444] == 0) { - var1.stream = RawPcmStream.method2582(var1.rawSound, var10.method2561(), var10.method2609(), var10.method2553()); + if (this.superStream.field2432[var1.field2447] == 0) { + var1.stream = RawPcmStream.method2673(var1.rawSound, var10.method2621(), var10.method2612(), var10.method2613()); } else { - var1.stream = RawPcmStream.method2582(var1.rawSound, var10.method2561(), 0, var10.method2553()); - this.superStream.method3764(var1, var1.patch.field2464[var1.field2432] < 0); - var1.stream.method2557(var8, var10.method2609()); + var1.stream = RawPcmStream.method2673(var1.rawSound, var10.method2621(), 0, var10.method2613()); + this.superStream.method3775(var1, var1.patch.field2483[var1.field2450] < 0); + var1.stream.method2614(var8, var10.method2612()); } - if (var1.patch.field2464[var1.field2432] < 0) { + if (var1.patch.field2483[var1.field2450] < 0) { var1.stream.setNumLoops(-1); } - var10.method2559(var8); + var10.method2619(var8); var10.fill(var2, var3, var5 - var3); - if (var10.method2563()) { + if (var10.method2712()) { this.mixer.addSubStream(var10); } } @@ -91,38 +84,38 @@ public class MusicPatchPcmStream extends PcmStream { var1.stream.fill(var2, var3, var4); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lgl;II)V", - garbageValue = "-1324133665" + signature = "(Lgu;II)V", + garbageValue = "1369494496" ) - void method3880(MusicPatchNode var1, int var2) { - if ((this.superStream.field2412[var1.field2444] & 4) != 0 && var1.field2441 < 0) { - int var3 = this.superStream.field2425[var1.field2444] / (DirectByteArrayCopier.field2490 * -168449264); - int var4 = (var3 + 1048575 - var1.field2447) / var3; - var1.field2447 = var3 * var2 + var1.field2447 & 1048575; + void method3972(MusicPatchNode var1, int var2) { + if ((this.superStream.field2429[var1.field2447] & 4) != 0 && var1.field2459 < 0) { + int var3 = this.superStream.field2422[var1.field2447] / PcmPlayer.field1398; + int var4 = (var3 + 1048575 - var1.field2465) / var3; + var1.field2465 = var3 * var2 + var1.field2465 & 1048575; if (var4 <= var2) { - if (this.superStream.field2415[var1.field2444] == 0) { - var1.stream = RawPcmStream.method2582(var1.rawSound, var1.stream.method2561(), var1.stream.method2609(), var1.stream.method2553()); + if (this.superStream.field2432[var1.field2447] == 0) { + var1.stream = RawPcmStream.method2673(var1.rawSound, var1.stream.method2621(), var1.stream.method2612(), var1.stream.method2613()); } else { - var1.stream = RawPcmStream.method2582(var1.rawSound, var1.stream.method2561(), 0, var1.stream.method2553()); - this.superStream.method3764(var1, var1.patch.field2464[var1.field2432] < 0); + var1.stream = RawPcmStream.method2673(var1.rawSound, var1.stream.method2621(), 0, var1.stream.method2613()); + this.superStream.method3775(var1, var1.patch.field2483[var1.field2450] < 0); } - if (var1.patch.field2464[var1.field2432] < 0) { + if (var1.patch.field2483[var1.field2450] < 0) { var1.stream.setNumLoops(-1); } - var2 = var1.field2447 / var3; + var2 = var1.field2465 / var3; } } var1.stream.skip(var2); } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "()Ldl;" + signature = "()Ldn;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { @@ -134,9 +127,9 @@ public class MusicPatchPcmStream extends PcmStream { } } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "()Ldl;" + signature = "()Ldn;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { @@ -151,85 +144,58 @@ public class MusicPatchPcmStream extends PcmStream { return var1.stream; } - @ObfuscatedName("x") - protected int vmethod3889() { + @ObfuscatedName("l") + protected int vmethod3965() { return 0; } - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("fill") protected void fill(int[] var1, int var2, int var3) { this.mixer.fill(var1, var2, var3); for (MusicPatchNode var6 = (MusicPatchNode)this.queue.last(); var6 != null; var6 = (MusicPatchNode)this.queue.previous()) { - if (!this.superStream.method3767(var6)) { + if (!this.superStream.method3822(var6)) { int var4 = var2; int var5 = var3; do { - if (var5 <= var6.field2431) { - this.method3879(var6, var1, var4, var5, var5 + var4); - var6.field2431 -= var5; + if (var5 <= var6.field2464) { + this.method3968(var6, var1, var4, var5, var5 + var4); + var6.field2464 -= var5; break; } - this.method3879(var6, var1, var4, var6.field2431, var5 + var4); - var4 += var6.field2431; - var5 -= var6.field2431; - } while(!this.superStream.method3728(var6, var1, var4, var5)); + this.method3968(var6, var1, var4, var6.field2464, var4 + var5); + var4 += var6.field2464; + var5 -= var6.field2464; + } while(!this.superStream.method3848(var6, var1, var4, var5)); } } } - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("skip") protected void skip(int var1) { this.mixer.skip(var1); for (MusicPatchNode var3 = (MusicPatchNode)this.queue.last(); var3 != null; var3 = (MusicPatchNode)this.queue.previous()) { - if (!this.superStream.method3767(var3)) { + if (!this.superStream.method3822(var3)) { int var2 = var1; do { - if (var2 <= var3.field2431) { - this.method3880(var3, var2); - var3.field2431 -= var2; + if (var2 <= var3.field2464) { + this.method3972(var3, var2); + var3.field2464 -= var2; break; } - this.method3880(var3, var3.field2431); - var2 -= var3.field2431; - } while(!this.superStream.method3728(var3, (int[])null, 0, var2)); + this.method3972(var3, var3.field2464); + var2 -= var3.field2464; + } while(!this.superStream.method3848(var3, (int[])null, 0, var2)); } } } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(I)[Lhp;", - garbageValue = "1994123729" - ) - @Export("PlayerType_values") - public static PlayerType[] PlayerType_values() { - return new PlayerType[]{PlayerType.PlayerType_ironman, PlayerType.PlayerType_normal, PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_ultimateIronman}; - } - - @ObfuscatedName("im") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "96" - ) - static final void method3898(int var0) { - if (var0 >= 0) { - int var1 = Client.menuArguments1[var0]; - int var2 = Client.menuArguments2[var0]; - int var3 = Client.menuOpcodes[var0]; - int var4 = Client.menuIdentifiers[var0]; - String var5 = Client.menuActions[var0]; - String var6 = Client.menuTargets[var0]; - AbstractWorldMapData.menuAction(var1, var2, var3, var4, var5, var6, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); - } - } } diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java index d9e863a09c..2e017c956b 100644 --- a/runescape-client/src/main/java/MusicTrack.java +++ b/runescape-client/src/main/java/MusicTrack.java @@ -3,21 +3,21 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gh") +@ObfuscatedName("gk") @Implements("MusicTrack") public class MusicTrack extends Node { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lle;" + signature = "Lln;" ) @Export("table") NodeHashTable table; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("midi") byte[] midi; @ObfuscatedSignature( - signature = "(Lkq;)V" + signature = "(Lkp;)V" ) MusicTrack(Buffer var1) { var1.offset = var1.array.length - 3; @@ -196,7 +196,7 @@ public class MusicTrack extends Node { int[] var59 = new int[128]; var28 = 0; - label229: + label219: for (int var60 = 0; var60 < var2; ++var60) { var51.writeInt(1297379947); var51.offset += 4; @@ -218,7 +218,7 @@ public class MusicTrack extends Node { var51.writeByte(47); var51.writeByte(0); var51.writeLengthInt(var51.offset - var61); - continue label229; + continue label219; } if (var64 == 23) { @@ -335,8 +335,8 @@ public class MusicTrack extends Node { } - @ObfuscatedName("i") - void method3909() { + @ObfuscatedName("t") + void method3993() { if (this.table == null) { this.table = new NodeHashTable(16); int[] var1 = new int[16]; @@ -416,15 +416,15 @@ public class MusicTrack extends Node { } } - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("clear") void clear() { this.table = null; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lhz;II)Lgh;" + signature = "(Lii;II)Lgk;" ) @Export("readTrack") static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) { diff --git a/runescape-client/src/main/java/NPC.java b/runescape-client/src/main/java/NPC.java index 1eed5272e4..ae8d1dfb03 100644 --- a/runescape-client/src/main/java/NPC.java +++ b/runescape-client/src/main/java/NPC.java @@ -1,20 +1,17 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cp") +@ObfuscatedName("cg") @Implements("NPC") public final class NPC extends Actor { - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 390634291 - ) - public static int field1103; - @ObfuscatedName("f") + @ObfuscatedName("i") + @Export("SpriteBuffer_yOffsets") + public static int[] SpriteBuffer_yOffsets; + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Liw;" + signature = "Liz;" ) @Export("definition") NPCDefinition definition; @@ -22,12 +19,12 @@ public final class NPC extends Actor { NPC() { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(IBI)V", - garbageValue = "-1410732452" + garbageValue = "-1099283793" ) - final void method2044(int var1, byte var2) { + final void method2083(int var1, byte var2) { int var3 = super.pathX[0]; int var4 = super.pathY[0]; if (var1 == 0) { @@ -66,7 +63,7 @@ public final class NPC extends Actor { --var4; } - if (super.sequence != -1 && WorldMapSection0.SequenceDefinition_get(super.sequence).field3493 == 1) { + if (super.sequence != -1 && GraphicsDefaults.SequenceDefinition_get(super.sequence).field3524 == 1) { super.sequence = -1; } @@ -85,13 +82,13 @@ public final class NPC extends Actor { super.pathTraversed[0] = var2; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IIZI)V", - garbageValue = "-619180263" + signature = "(IIZB)V", + garbageValue = "0" ) - final void method2045(int var1, int var2, boolean var3) { - if (super.sequence != -1 && WorldMapSection0.SequenceDefinition_get(super.sequence).field3493 == 1) { + final void method2077(int var1, int var2, boolean var3) { + if (super.sequence != -1 && GraphicsDefaults.SequenceDefinition_get(super.sequence).field3524 == 1) { super.sequence = -1; } @@ -117,26 +114,26 @@ public final class NPC extends Actor { } super.pathLength = 0; - super.field926 = 0; - super.field980 = 0; + super.field998 = 0; + super.field997 = 0; super.pathX[0] = var1; super.pathY[0] = var2; - super.x = super.field925 * 64 + super.pathX[0] * 128; - super.y = super.field925 * 64 + super.pathY[0] * 128; + super.x = super.pathX[0] * 128 + super.field942 * 2013925376; + super.y = super.pathY[0] * 128 + super.field942 * 2013925376; } - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)Ldw;", - garbageValue = "822221372" + signature = "(I)Ldx;", + garbageValue = "-2133076860" ) @Export("getModel") protected final Model getModel() { if (this.definition == null) { return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? WorldMapSection0.SequenceDefinition_get(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence != -1 && (super.readySequence != super.movementSequence || var1 == null) ? WorldMapSection0.SequenceDefinition_get(super.movementSequence) : null; + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? GraphicsDefaults.SequenceDefinition_get(super.sequence) : null; + SequenceDefinition var2 = super.movementSequence != -1 && (super.movementSequence != super.readySequence || var1 == null) ? GraphicsDefaults.SequenceDefinition_get(super.movementSequence) : null; Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); if (var3 == null) { return null; @@ -144,9 +141,9 @@ public final class NPC extends Actor { var3.calculateBoundsCylinder(); super.defaultHeight = var3.height; if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { - Model var4 = ClientPacket.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); + Model var4 = class65.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); if (var4 != null) { - var4.offsetBy(0, -super.field963, 0); + var4.offsetBy(0, -super.field980, 0); Model[] var5 = new Model[]{var3, var4}; var3 = new Model(var5, 2); } @@ -161,23 +158,146 @@ public final class NPC extends Actor { } } - @ObfuscatedName("l") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(S)Z", - garbageValue = "3163" + signature = "(I)Z", + garbageValue = "-515224238" ) @Export("isVisible") final boolean isVisible() { return this.definition != null; } - @ObfuscatedName("i") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(IB)Ljava/lang/String;", - garbageValue = "66" + signature = "(II)Z", + garbageValue = "-728200028" ) - @Export("colorStartTag") - static String colorStartTag(int var0) { - return ""; + public static boolean method2088(int var0) { + return (var0 >> 21 & 1) != 0; + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-213957915" + ) + static void method2079() { + Login.loginIndex = 24; + Tiles.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); + } + + @ObfuscatedName("ib") + @ObfuscatedSignature( + signature = "(IIIILjava/lang/String;I)V", + garbageValue = "-1867991224" + ) + @Export("widgetDefaultMenuAction") + static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { + Widget var5 = SpriteMask.getWidgetChild(var1, var2); + if (var5 != null) { + if (var5.onOp != null) { + ScriptEvent var6 = new ScriptEvent(); + var6.widget = var5; + var6.opIndex = var0; + var6.targetName = var4; + var6.args = var5.onOp; + class4.runScriptEvent(var6); + } + + boolean var11 = true; + if (var5.contentType > 0) { + var11 = BufferedSink.method5915(var5); + } + + if (var11) { + int var8 = WorldMapIcon_0.getWidgetClickMask(var5); + int var9 = var0 - 1; + boolean var7 = (var8 >> var9 + 1 & 1) != 0; + if (var7) { + PacketBufferNode var10; + if (var0 == 1) { + var10 = TilePaint.getPacketBufferNode(ClientPacket.field2234, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 2) { + var10 = TilePaint.getPacketBufferNode(ClientPacket.field2209, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 3) { + var10 = TilePaint.getPacketBufferNode(ClientPacket.field2205, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 4) { + var10 = TilePaint.getPacketBufferNode(ClientPacket.field2273, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 5) { + var10 = TilePaint.getPacketBufferNode(ClientPacket.field2237, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 6) { + var10 = TilePaint.getPacketBufferNode(ClientPacket.field2257, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 7) { + var10 = TilePaint.getPacketBufferNode(ClientPacket.field2204, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 8) { + var10 = TilePaint.getPacketBufferNode(ClientPacket.field2254, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 9) { + var10 = TilePaint.getPacketBufferNode(ClientPacket.field2212, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 10) { + var10 = TilePaint.getPacketBufferNode(ClientPacket.field2303, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + } + } + } } } diff --git a/runescape-client/src/main/java/NPCDefinition.java b/runescape-client/src/main/java/NPCDefinition.java index 257779c1b7..d61902331a 100644 --- a/runescape-client/src/main/java/NPCDefinition.java +++ b/runescape-client/src/main/java/NPCDefinition.java @@ -3,186 +3,187 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("iw") +@ObfuscatedName("iz") @Implements("NPCDefinition") public class NPCDefinition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) @Export("NpcDefinition_archive") public static AbstractArchive NpcDefinition_archive; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) @Export("NpcDefinition_modelArchive") public static AbstractArchive NpcDefinition_modelArchive; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("NpcDefinition_cached") - static EvictingDualNodeHashTable NpcDefinition_cached; - @ObfuscatedName("w") + public static EvictingDualNodeHashTable NpcDefinition_cached; + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("NpcDefinition_cachedModels") - static EvictingDualNodeHashTable NpcDefinition_cachedModels; - @ObfuscatedName("p") + public static EvictingDualNodeHashTable NpcDefinition_cachedModels; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1437394053 + intValue = 1707921153 ) @Export("id") public int id; - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("name") public String name; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1272907781 + intValue = 1764786613 ) @Export("size") public int size; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("models") int[] models; - @ObfuscatedName("a") - int[] field3436; - @ObfuscatedName("d") + @ObfuscatedName("j") + int[] field3467; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -643490475 + intValue = -1040050113 ) @Export("readySequence") public int readySequence; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1453036441 + intValue = -710216927 ) @Export("turnLeftSequence") public int turnLeftSequence; - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1313837071 + intValue = -188091011 ) @Export("turnRightSequence") public int turnRightSequence; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -2006817371 + intValue = -987219047 ) @Export("walkSequence") public int walkSequence; - @ObfuscatedName("k") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 868075509 + intValue = -444402749 ) @Export("walkBackSequence") public int walkBackSequence; - @ObfuscatedName("s") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1582057393 + intValue = 1834649411 ) @Export("walkLeftSequence") public int walkLeftSequence; - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1584002895 + intValue = 703794891 ) @Export("walkRightSequence") public int walkRightSequence; - @ObfuscatedName("t") + @ObfuscatedName("k") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("j") + @ObfuscatedName("q") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("n") + @ObfuscatedName("z") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("u") + @ObfuscatedName("y") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("z") + @ObfuscatedName("f") @Export("actions") public String[] actions; - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("drawMapDot") public boolean drawMapDot; - @ObfuscatedName("m") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1760974573 + intValue = 1620337361 ) @Export("combatLevel") public int combatLevel; - @ObfuscatedName("g") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -674853701 + intValue = 629834407 ) @Export("widthScale") int widthScale; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 2021062483 + intValue = -867665195 ) @Export("heightScale") int heightScale; - @ObfuscatedName("q") + @ObfuscatedName("u") @Export("isVisible") public boolean isVisible; - @ObfuscatedName("aa") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -2035323497 + intValue = 1609629677 ) @Export("ambient") int ambient; - @ObfuscatedName("av") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 577893051 + intValue = 56751531 ) @Export("contrast") int contrast; - @ObfuscatedName("aw") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 1527639479 + intValue = -1994920091 ) @Export("headIconPrayer") public int headIconPrayer; - @ObfuscatedName("as") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 1588998257 + intValue = -247642311 ) @Export("rotation") public int rotation; - @ObfuscatedName("ak") + @ObfuscatedName("aj") @Export("transforms") public int[] transforms; @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -1212272583 + intValue = 1674933673 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("ah") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 529914747 + intValue = -912879563 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("isInteractable") public boolean isInteractable; - @ObfuscatedName("ao") + @ObfuscatedName("aq") @Export("isClickable") public boolean isClickable; - @ObfuscatedName("an") + @ObfuscatedName("as") @Export("isFollower") public boolean isFollower; - @ObfuscatedName("ar") + @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "Llc;" + signature = "Llp;" ) @Export("params") IterableNodeHashTable params; @@ -219,19 +220,19 @@ public class NPCDefinition extends DualNode { this.isFollower = false; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1780745030" + signature = "(B)V", + garbageValue = "37" ) @Export("postDecode") void postDecode() { } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkq;I)V", - garbageValue = "643365222" + signature = "(Lkp;I)V", + garbageValue = "44812768" ) @Export("decode") void decode(Buffer var1) { @@ -245,10 +246,10 @@ public class NPCDefinition extends DualNode { } } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Lkq;II)V", - garbageValue = "731646474" + signature = "(Lkp;IB)V", + garbageValue = "-38" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -303,10 +304,10 @@ public class NPCDefinition extends DualNode { } } else if (var2 == 60) { var3 = var1.readUnsignedByte(); - this.field3436 = new int[var3]; + this.field3467 = new int[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.field3436[var4] = var1.readUnsignedShort(); + this.field3467[var4] = var1.readUnsignedShort(); } } else if (var2 == 93) { this.drawMapDot = false; @@ -334,7 +335,7 @@ public class NPCDefinition extends DualNode { } else if (var2 == 111) { this.isFollower = true; } else if (var2 == 249) { - this.params = Calendar.readStringIntParameters(var1, this.params); + this.params = MouseRecorder.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); @@ -370,10 +371,10 @@ public class NPCDefinition extends DualNode { } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Liv;ILiv;IB)Ldw;", - garbageValue = "3" + signature = "(Lip;ILip;IB)Ldx;", + garbageValue = "-1" ) @Export("getModel") public final Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { @@ -444,23 +445,23 @@ public class NPCDefinition extends DualNode { } } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(B)Ldd;", - garbageValue = "-58" + signature = "(I)Ldg;", + garbageValue = "1870202783" ) @Export("getModelData") public final ModelData getModelData() { if (this.transforms != null) { NPCDefinition var1 = this.transform(); return var1 == null ? null : var1.getModelData(); - } else if (this.field3436 == null) { + } else if (this.field3467 == null) { return null; } else { boolean var5 = false; - for (int var2 = 0; var2 < this.field3436.length; ++var2) { - if (!NpcDefinition_modelArchive.tryLoadFile(this.field3436[var2], 0)) { + for (int var2 = 0; var2 < this.field3467.length; ++var2) { + if (!NpcDefinition_modelArchive.tryLoadFile(this.field3467[var2], 0)) { var5 = true; } } @@ -468,10 +469,10 @@ public class NPCDefinition extends DualNode { if (var5) { return null; } else { - ModelData[] var6 = new ModelData[this.field3436.length]; + ModelData[] var6 = new ModelData[this.field3467.length]; - for (int var3 = 0; var3 < this.field3436.length; ++var3) { - var6[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field3436[var3], 0); + for (int var3 = 0; var3 < this.field3467.length; ++var3) { + var6[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field3467[var3], 0); } ModelData var7; @@ -499,16 +500,16 @@ public class NPCDefinition extends DualNode { } } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(B)Liw;", - garbageValue = "47" + signature = "(B)Liz;", + garbageValue = "38" ) @Export("transform") public final NPCDefinition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = GameShell.getVarbit(this.transformVarbit); + var1 = GrandExchangeOfferUnitPriceComparator.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -520,13 +521,13 @@ public class NPCDefinition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? AbstractUserComparator.getNpcDefinition(var2) : null; + return var2 != -1 ? NetCache.getNpcDefinition(var2) : null; } - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-251479822" + garbageValue = "780898227" ) @Export("transformIsVisible") public boolean transformIsVisible() { @@ -535,7 +536,7 @@ public class NPCDefinition extends DualNode { } else { int var1 = -1; if (this.transformVarbit != -1) { - var1 = GameShell.getVarbit(this.transformVarbit); + var1 = GrandExchangeOfferUnitPriceComparator.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -548,23 +549,62 @@ public class NPCDefinition extends DualNode { } } - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "-1643903914" + garbageValue = "-2108676246" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return class83.method2071(this.params, var1, var2); + return class185.method3686(this.params, var1, var2); } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "1559227627" + garbageValue = "2127208203" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return class14.method151(this.params, var1, var2); + return FloorDecoration.method2914(this.params, var1, var2); + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(ILce;ZI)I", + garbageValue = "879039654" + ) + static int method4818(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? class186.field2331 : MidiPcmStream.field2444; + if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.itemId; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { + if (var3.itemId != -1) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_GETID) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.childIndex; + return 1; + } else { + return 2; + } + } + + @ObfuscatedName("jf") + @ObfuscatedSignature( + signature = "(Lhn;I)V", + garbageValue = "285871086" + ) + @Export("invalidateWidget") + static void invalidateWidget(Widget var0) { + if (var0.cycle == Client.field850) { + Client.field851[var0.rootIndex] = true; + } + } } diff --git a/runescape-client/src/main/java/NanoClock.java b/runescape-client/src/main/java/NanoClock.java index 3b9abee3dc..63db9fec69 100644 --- a/runescape-client/src/main/java/NanoClock.java +++ b/runescape-client/src/main/java/NanoClock.java @@ -4,12 +4,12 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fn") +@ObfuscatedName("fz") @Implements("NanoClock") public class NanoClock extends Clock { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedGetter( - longValue = -5525829969784461379L + longValue = 5230398222733750155L ) @Export("lastTimeNano") long lastTimeNano; @@ -18,34 +18,34 @@ public class NanoClock extends Clock { this.lastTimeNano = System.nanoTime(); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "4" + garbageValue = "29" ) @Export("mark") public void mark() { this.lastTimeNano = System.nanoTime(); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "670539248" + garbageValue = "-561232674" ) @Export("wait") public int wait(int var1, int var2) { - long var3 = 1000000L * (long)var2; + long var3 = (long)var2 * 1000000L; long var5 = this.lastTimeNano - System.nanoTime(); if (var5 < var3) { var5 = var3; } - ServerBuild.method4111(var5 / 1000000L); + FriendLoginUpdate.method5325(var5 / 1000000L); long var7 = System.nanoTime(); int var9; - for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += (long)var1 * 1000000L) { + for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += 1000000L * (long)var1) { ++var9; } diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java index e97d852ece..2c6197d839 100644 --- a/runescape-client/src/main/java/NetCache.java +++ b/runescape-client/src/main/java/NetCache.java @@ -5,117 +5,111 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ie") +@ObfuscatedName("ib") @Implements("NetCache") public class NetCache { - @ObfuscatedName("i") + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "Lkr;" + ) + @Export("NetCache_socket") + public static AbstractSocket NetCache_socket; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1630504157 + intValue = 840388525 ) @Export("NetCache_loadTime") public static int NetCache_loadTime; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = 7111206406061673093L + longValue = -4475695681289819083L ) - public static long field3138; - @ObfuscatedName("w") + public static long field3170; + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lle;" + signature = "Lln;" ) @Export("NetCache_pendingPriorityWrites") public static NodeHashTable NetCache_pendingPriorityWrites; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1216011111 + intValue = 1544867723 ) @Export("NetCache_pendingPriorityWritesCount") public static int NetCache_pendingPriorityWritesCount; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lle;" + signature = "Lln;" ) @Export("NetCache_pendingPriorityResponses") public static NodeHashTable NetCache_pendingPriorityResponses; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1365764657 + intValue = 562199049 ) @Export("NetCache_pendingPriorityResponsesCount") public static int NetCache_pendingPriorityResponsesCount; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Lin;" + signature = "Ljq;" ) @Export("NetCache_pendingWritesQueue") public static DualNodeDeque NetCache_pendingWritesQueue; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lle;" + signature = "Lln;" ) @Export("NetCache_pendingWrites") - static NodeHashTable NetCache_pendingWrites; - @ObfuscatedName("d") + public static NodeHashTable NetCache_pendingWrites; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -2110572147 + intValue = 1327913125 ) @Export("NetCache_pendingWritesCount") public static int NetCache_pendingWritesCount; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lle;" + signature = "Lln;" ) @Export("NetCache_pendingResponses") public static NodeHashTable NetCache_pendingResponses; - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 756706735 + intValue = 818633537 ) @Export("NetCache_pendingResponsesCount") public static int NetCache_pendingResponsesCount; - @ObfuscatedName("s") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lkq;" + signature = "Lkp;" ) @Export("NetCache_responseHeaderBuffer") public static Buffer NetCache_responseHeaderBuffer; - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "Lkq;" - ) - @Export("NetCache_responseArchiveBuffer") - public static Buffer NetCache_responseArchiveBuffer; - @ObfuscatedName("t") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -910401727 + intValue = -1652930621 ) - public static int field3150; - @ObfuscatedName("n") - @Export("NetCache_crc") - public static CRC32 NetCache_crc; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lkq;" - ) - @Export("NetCache_reference") - public static Buffer NetCache_reference; + public static int field3181; @ObfuscatedName("z") + @Export("NetCache_crc") + static CRC32 NetCache_crc; + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "[Lif;" + signature = "[Lia;" ) @Export("NetCache_archives") - public static Archive[] NetCache_archives; - @ObfuscatedName("h") - public static byte field3145; - @ObfuscatedName("m") + static Archive[] NetCache_archives; + @ObfuscatedName("b") + public static byte field3184; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 483863755 + intValue = -287174121 ) @Export("NetCache_crcMismatches") public static int NetCache_crcMismatches; - @ObfuscatedName("g") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1880063005 + intValue = -1375722445 ) @Export("NetCache_ioExceptions") public static int NetCache_ioExceptions; @@ -132,11 +126,96 @@ public class NetCache { NetCache_pendingResponses = new NodeHashTable(4096); NetCache_pendingResponsesCount = 0; NetCache_responseHeaderBuffer = new Buffer(8); - field3150 = 0; + field3181 = 0; NetCache_crc = new CRC32(); NetCache_archives = new Archive[256]; - field3145 = 0; + field3184 = 0; NetCache_crcMismatches = 0; NetCache_ioExceptions = 0; } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(II)Liz;", + garbageValue = "79077079" + ) + @Export("getNpcDefinition") + public static NPCDefinition getNpcDefinition(int var0) { + NPCDefinition var1 = (NPCDefinition)NPCDefinition.NpcDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = NPCDefinition.NpcDefinition_archive.takeFile(9, var0); + var1 = new NPCDefinition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); + NPCDefinition.NpcDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("ft") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)V", + garbageValue = "-824025022" + ) + @Export("doCheat") + static final void doCheat(String var0) { + if (var0.equalsIgnoreCase("toggleroof")) { + WorldMapSection2.clientPreferences.roofsHidden = !WorldMapSection2.clientPreferences.roofsHidden; + WorldMapData_1.savePreferences(); + if (WorldMapSection2.clientPreferences.roofsHidden) { + ClientPreferences.addGameMessage(99, "", "Roofs are now all hidden"); + } else { + ClientPreferences.addGameMessage(99, "", "Roofs will only be removed selectively"); + } + } + + if (var0.equalsIgnoreCase("displayfps")) { + Client.displayFps = !Client.displayFps; + } + + if (var0.equalsIgnoreCase("renderself")) { + Client.renderSelf = !Client.renderSelf; + } + + if (var0.equalsIgnoreCase("mouseovertext")) { + Client.showMouseOverText = !Client.showMouseOverText; + } + + if (Client.staffModLevel >= 2) { + if (var0.equalsIgnoreCase("errortest")) { + throw new RuntimeException(); + } + + if (var0.equalsIgnoreCase("showcoord")) { + WorldMapIcon_0.worldMap.showCoord = !WorldMapIcon_0.worldMap.showCoord; + } + + if (var0.equalsIgnoreCase("fpson")) { + Client.displayFps = true; + } + + if (var0.equalsIgnoreCase("fpsoff")) { + Client.displayFps = false; + } + + if (var0.equalsIgnoreCase("gc")) { + System.gc(); + } + + if (var0.equalsIgnoreCase("clientdrop")) { + WorldMapIcon_1.method308(); + } + } + + PacketBufferNode var1 = TilePaint.getPacketBufferNode(ClientPacket.field2270, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(var0.length() + 1); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); + } } diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java index 6485d12d5f..ca85f673c9 100644 --- a/runescape-client/src/main/java/NetFileRequest.java +++ b/runescape-client/src/main/java/NetFileRequest.java @@ -4,56 +4,53 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ho") +@ObfuscatedName("he") @Implements("NetFileRequest") public class NetFileRequest extends DualNode { - @ObfuscatedName("cv") - @Export("mouseCam") - static boolean mouseCam; - @ObfuscatedName("f") + @ObfuscatedName("fn") @ObfuscatedSignature( - signature = "Lif;" + signature = "Lfw;" + ) + @Export("socketTask") + static Task socketTask; + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "Lia;" ) @Export("archive") - public Archive archive; - @ObfuscatedName("i") + Archive archive; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1793018397 + intValue = -335622229 ) @Export("crc") - public int crc; - @ObfuscatedName("y") + int crc; + @ObfuscatedName("o") @Export("padding") - public byte padding; + byte padding; NetFileRequest() { } - @ObfuscatedName("kz") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZI)Ljava/lang/String;", - garbageValue = "1995619175" + signature = "([I[IB)V", + garbageValue = "100" ) - static String method4121(String var0, boolean var1) { - String var2 = var1 ? "https://" : "http://"; - if (Client.gameBuild == 1) { - var0 = var0 + "-wtrc"; - } else if (Client.gameBuild == 2) { - var0 = var0 + "-wtqa"; - } else if (Client.gameBuild == 3) { - var0 = var0 + "-wtwip"; - } else if (Client.gameBuild == 5) { - var0 = var0 + "-wti"; - } else if (Client.gameBuild == 4) { - var0 = "local"; - } + public static void method4217(int[] var0, int[] var1) { + if (var0 != null && var1 != null) { + ByteArrayPool.ByteArrayPool_alternativeSizes = var0; + VerticalAlignment.ByteArrayPool_altSizeArrayCounts = new int[var0.length]; + ByteArrayPool.ByteArrayPool_arrays = new byte[var0.length][][]; - String var3 = ""; - if (UserComparator10.field1943 != null) { - var3 = "/p=" + UserComparator10.field1943; - } + for (int var2 = 0; var2 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var2) { + ByteArrayPool.ByteArrayPool_arrays[var2] = new byte[var1[var2]][]; + } - String var4 = "runescape.com"; - return var2 + var0 + "." + var4 + "/l=" + Varps.clientLanguage + "/a=" + MouseRecorder.field564 + var3 + "/"; + } else { + ByteArrayPool.ByteArrayPool_alternativeSizes = null; + VerticalAlignment.ByteArrayPool_altSizeArrayCounts = null; + ByteArrayPool.ByteArrayPool_arrays = null; + } } } diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index ec40168a07..cd998ca5c8 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -8,76 +8,95 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("fa") +@ObfuscatedName("fe") @Implements("NetSocket") public final class NetSocket extends AbstractSocket implements Runnable { - @ObfuscatedName("qg") + @ObfuscatedName("sd") @ObfuscatedSignature( - signature = "Lcw;" + signature = "Llv;" ) - @Export("pcmPlayer1") - static PcmPlayer pcmPlayer1; - @ObfuscatedName("as") - @Export("fontHelvetica13") - static java.awt.Font fontHelvetica13; - @ObfuscatedName("f") + @Export("platformInfo") + static PlatformInfo platformInfo; + @ObfuscatedName("dq") + @ObfuscatedSignature( + signature = "Lia;" + ) + @Export("archive5") + static Archive archive5; + @ObfuscatedName("ep") + @Export("worldHost") + static String worldHost; + @ObfuscatedName("fi") + @ObfuscatedSignature( + signature = "Lkz;" + ) + @Export("WorldMapElement_fonts") + static Fonts WorldMapElement_fonts; + @ObfuscatedName("mj") + @ObfuscatedGetter( + intValue = -1177586883 + ) + @Export("selectedSpellFlags") + static int selectedSpellFlags; + @ObfuscatedName("c") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("outputStream") OutputStream outputStream; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("socket") Socket socket; - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("isClosed") boolean isClosed; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lfl;" + signature = "Lff;" ) @Export("taskHandler") TaskHandler taskHandler; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lfu;" + signature = "Lfw;" ) @Export("task") Task task; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("outBuffer") byte[] outBuffer; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1287462685 + intValue = -602302945 ) @Export("outLength") int outLength; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -533628629 + intValue = -578221925 ) @Export("outOffset") int outOffset; - @ObfuscatedName("d") + @ObfuscatedName("m") @Export("exceptionWriting") boolean exceptionWriting; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1191664447 + intValue = 1215285735 ) @Export("bufferLength") final int bufferLength; - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 693906147 + intValue = 639451829 ) @Export("maxPacketLength") final int maxPacketLength; @ObfuscatedSignature( - signature = "(Ljava/net/Socket;Lfl;I)V" + signature = "(Ljava/net/Socket;Lff;I)V" ) public NetSocket(Socket var1, TaskHandler var2, int var3) throws IOException { this.isClosed = false; @@ -96,10 +115,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { this.outputStream = this.socket.getOutputStream(); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-647274291" + garbageValue = "-259367480" ) @Export("close") public void close() { @@ -111,7 +130,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { if (this.task != null) { while (this.task.status == 0) { - ServerBuild.method4111(1L); + FriendLoginUpdate.method5325(1L); } if (this.task.status == 1) { @@ -126,30 +145,30 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "2115277231" + signature = "(B)I", + garbageValue = "-108" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { return this.isClosed ? 0 : this.inputStream.read(); } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-972484659" + garbageValue = "2004103994" ) @Export("available") public int available() throws IOException { return this.isClosed ? 0 : this.inputStream.available(); } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "497635177" + garbageValue = "-624446357" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { @@ -160,10 +179,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "([BIII)I", - garbageValue = "-1642271193" + garbageValue = "1847434030" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { @@ -185,10 +204,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "([BIIB)V", - garbageValue = "59" + signature = "([BIII)V", + garbageValue = "1797414909" ) @Export("write0") void write0(byte[] var1, int var2, int var3) throws IOException { @@ -220,10 +239,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "-340382115" + garbageValue = "977025272" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { @@ -301,88 +320,700 @@ public final class NetSocket extends AbstractSocket implements Runnable { break; } } catch (Exception var12) { - DesktopPlatformInfoProvider.RunException_sendStackTrace((String)null, var12); + class225.RunException_sendStackTrace((String)null, var12); } } - @ObfuscatedName("f") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(CB)B", - garbageValue = "11" + signature = "(ILky;Lia;I)V", + garbageValue = "595015097" ) - @Export("charToByteCp1252") - public static byte charToByteCp1252(char var0) { - byte var1; - if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) { - var1 = (byte)var0; - } else if (var0 == 8364) { - var1 = -128; - } else if (var0 == 8218) { - var1 = -126; - } else if (var0 == 402) { - var1 = -125; - } else if (var0 == 8222) { - var1 = -124; - } else if (var0 == 8230) { - var1 = -123; - } else if (var0 == 8224) { - var1 = -122; - } else if (var0 == 8225) { - var1 = -121; - } else if (var0 == 710) { - var1 = -120; - } else if (var0 == 8240) { - var1 = -119; - } else if (var0 == 352) { - var1 = -118; - } else if (var0 == 8249) { - var1 = -117; - } else if (var0 == 338) { - var1 = -116; - } else if (var0 == 381) { - var1 = -114; - } else if (var0 == 8216) { - var1 = -111; - } else if (var0 == 8217) { - var1 = -110; - } else if (var0 == 8220) { - var1 = -109; - } else if (var0 == 8221) { - var1 = -108; - } else if (var0 == 8226) { - var1 = -107; - } else if (var0 == 8211) { - var1 = -106; - } else if (var0 == 8212) { - var1 = -105; - } else if (var0 == 732) { - var1 = -104; - } else if (var0 == 8482) { - var1 = -103; - } else if (var0 == 353) { - var1 = -102; - } else if (var0 == 8250) { - var1 = -101; - } else if (var0 == 339) { - var1 = -100; - } else if (var0 == 382) { - var1 = -98; - } else if (var0 == 376) { - var1 = -97; - } else { - var1 = 63; + static void method3613(int var0, ArchiveDisk var1, Archive var2) { + byte[] var3 = null; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + for (ArchiveDiskAction var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var5 != null; var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { + if (var5.key == (long)var0 && var1 == var5.archiveDisk && var5.type == 0) { + var3 = var5.data; + break; + } + } } - return var1; + if (var3 != null) { + var2.load(var1, var0, var3, true); + } else { + byte[] var4 = var1.read(var0); + var2.load(var1, var0, var4, true); + } } - @ObfuscatedName("av") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1769273024" + garbageValue = "-1753470455" ) - public static void method3525() { - ItemDefinition.ItemDefinition_cachedSprites.clear(); + static void method3595() { + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { + if (ArchiveDiskActionHandler.field3150 == 0) { + class218.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); + class218.ArchiveDiskActionHandler_thread.setDaemon(true); + class218.ArchiveDiskActionHandler_thread.start(); + class218.ArchiveDiskActionHandler_thread.setPriority(5); + } + + ArchiveDiskActionHandler.field3150 = 600; + } + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(Lko;Lko;Lko;B)V", + garbageValue = "-120" + ) + @Export("drawTitle") + static void drawTitle(Font var0, Font var1, Font var2) { + Login.xPadding = (Username.canvasWidth - 765) / 2; + Login.loginBoxX = Login.xPadding + 202; + class96.loginBoxCenter = Login.loginBoxX + 180; + int var6; + int var9; + byte var23; + int var24; + int var26; + int var33; + int var41; + if (Login.worldSelectOpen) { + Archive var32; + if (UserComparator6.worldSelectBackSprites == null) { + var32 = UserComparator8.archive8; + var33 = var32.getGroupId("sl_back"); + var6 = var32.getFileId(var33, ""); + Sprite[] var7; + if (!class228.method4199(var32, var33, var6)) { + var7 = null; + } else { + var7 = HorizontalAlignment.method4783(); + } + + UserComparator6.worldSelectBackSprites = var7; + } + + if (ReflectionCheck.worldSelectFlagSprites == null) { + ReflectionCheck.worldSelectFlagSprites = FaceNormal.method3336(UserComparator8.archive8, "sl_flags", ""); + } + + int var38; + if (ItemContainer.worldSelectArrows == null) { + var32 = UserComparator8.archive8; + var33 = var32.getGroupId("sl_arrows"); + var6 = var32.getFileId(var33, ""); + IndexedSprite[] var35; + if (!class228.method4199(var32, var33, var6)) { + var35 = null; + } else { + IndexedSprite[] var29 = new IndexedSprite[class326.SpriteBuffer_spriteCount]; + + for (var38 = 0; var38 < class326.SpriteBuffer_spriteCount; ++var38) { + IndexedSprite var30 = var29[var38] = new IndexedSprite(); + var30.width = GZipDecompressor.SpriteBuffer_spriteWidth; + var30.height = class326.SpriteBuffer_spriteHeight; + var30.xOffset = Huffman.SpriteBuffer_xOffsets[var38]; + var30.yOffset = NPC.SpriteBuffer_yOffsets[var38]; + var30.subWidth = class326.SpriteBuffer_spriteWidths[var38]; + var30.subHeight = class326.SpriteBuffer_spriteHeights[var38]; + var30.palette = class326.SpriteBuffer_spritePalette; + var30.pixels = class326.SpriteBuffer_pixels[var38]; + } + + DynamicObject.method2292(); + var35 = var29; + } + + ItemContainer.worldSelectArrows = var35; + } + + if (DynamicObject.worldSelectStars == null) { + DynamicObject.worldSelectStars = FaceNormal.method3336(UserComparator8.archive8, "sl_stars", ""); + } + + if (GrandExchangeEvent.worldSelectLeftSprite == null) { + GrandExchangeEvent.worldSelectLeftSprite = class16.SpriteBuffer_getIndexedSpriteByName(UserComparator8.archive8, "leftarrow", ""); + } + + if (class32.worldSelectRightSprite == null) { + class32.worldSelectRightSprite = class16.SpriteBuffer_getIndexedSpriteByName(UserComparator8.archive8, "rightarrow", ""); + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); + var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); + if (DynamicObject.worldSelectStars != null) { + DynamicObject.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); + var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); + DynamicObject.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); + var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); + } + + if (ItemContainer.worldSelectArrows != null) { + var41 = Login.xPadding + 280; + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { + ItemContainer.worldSelectArrows[2].drawAt(var41, 4); + } else { + ItemContainer.worldSelectArrows[0].drawAt(var41, 4); + } + + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { + ItemContainer.worldSelectArrows[3].drawAt(var41 + 15, 4); + } else { + ItemContainer.worldSelectArrows[1].drawAt(var41 + 15, 4); + } + + var0.draw("World", var41 + 32, 17, 16777215, -1); + var24 = Login.xPadding + 390; + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { + ItemContainer.worldSelectArrows[2].drawAt(var24, 4); + } else { + ItemContainer.worldSelectArrows[0].drawAt(var24, 4); + } + + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { + ItemContainer.worldSelectArrows[3].drawAt(var24 + 15, 4); + } else { + ItemContainer.worldSelectArrows[1].drawAt(var24 + 15, 4); + } + + var0.draw("Players", var24 + 32, 17, 16777215, -1); + var33 = Login.xPadding + 500; + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { + ItemContainer.worldSelectArrows[2].drawAt(var33, 4); + } else { + ItemContainer.worldSelectArrows[0].drawAt(var33, 4); + } + + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { + ItemContainer.worldSelectArrows[3].drawAt(var33 + 15, 4); + } else { + ItemContainer.worldSelectArrows[1].drawAt(var33 + 15, 4); + } + + var0.draw("Location", var33 + 32, 17, 16777215, -1); + var6 = Login.xPadding + 610; + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { + ItemContainer.worldSelectArrows[2].drawAt(var6, 4); + } else { + ItemContainer.worldSelectArrows[0].drawAt(var6, 4); + } + + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { + ItemContainer.worldSelectArrows[3].drawAt(var6 + 15, 4); + } else { + ItemContainer.worldSelectArrows[1].drawAt(var6 + 15, 4); + } + + var0.draw("Type", var6 + 32, 17, 16777215, -1); + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); + var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); + Login.hoveredWorldIndex = -1; + if (UserComparator6.worldSelectBackSprites != null) { + var23 = 88; + byte var45 = 19; + var33 = 765 / (var23 + 1) - 1; + var6 = 480 / (var45 + 1); + + int var37; + do { + var26 = var6; + var37 = var33; + if (var6 * (var33 - 1) >= World.World_count) { + --var33; + } + + if (var33 * (var6 - 1) >= World.World_count) { + --var6; + } + + if (var33 * (var6 - 1) >= World.World_count) { + --var6; + } + } while(var6 != var26 || var37 != var33); + + var26 = (765 - var23 * var33) / (var33 + 1); + if (var26 > 5) { + var26 = 5; + } + + var37 = (480 - var45 * var6) / (var6 + 1); + if (var37 > 5) { + var37 = 5; + } + + var9 = (765 - var33 * var23 - var26 * (var33 - 1)) / 2; + var38 = (480 - var45 * var6 - var37 * (var6 - 1)) / 2; + int var11 = (var6 + World.World_count - 1) / var6; + Login.worldSelectPagesCount = var11 - var33; + if (GrandExchangeEvent.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { + GrandExchangeEvent.worldSelectLeftSprite.drawAt(8, WorldMapData_1.canvasHeight / 2 - GrandExchangeEvent.worldSelectLeftSprite.subHeight / 2); + } + + if (class32.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { + class32.worldSelectRightSprite.drawAt(Username.canvasWidth - class32.worldSelectRightSprite.subWidth - 8, WorldMapData_1.canvasHeight / 2 - class32.worldSelectRightSprite.subHeight / 2); + } + + int var12 = var38 + 23; + int var13 = var9 + Login.xPadding; + int var14 = 0; + boolean var15 = false; + int var16 = Login.worldSelectPage; + + int var17; + for (var17 = var6 * var16; var17 < World.World_count && var16 - Login.worldSelectPage < var33; ++var17) { + World var31 = class96.World_worlds[var17]; + boolean var19 = true; + String var20 = Integer.toString(var31.population); + if (var31.population == -1) { + var20 = "OFF"; + var19 = false; + } else if (var31.population > 1980) { + var20 = "FULL"; + var19 = false; + } + + int var22 = 0; + byte var21; + if (var31.isBeta()) { + if (var31.isMembersOnly()) { + var21 = 7; + } else { + var21 = 6; + } + } else if (var31.isDeadman()) { + var22 = 16711680; + if (var31.isMembersOnly()) { + var21 = 5; + } else { + var21 = 4; + } + } else if (var31.method1767()) { + if (var31.isMembersOnly()) { + var21 = 9; + } else { + var21 = 8; + } + } else if (var31.isPvp()) { + if (var31.isMembersOnly()) { + var21 = 3; + } else { + var21 = 2; + } + } else if (var31.isMembersOnly()) { + var21 = 1; + } else { + var21 = 0; + } + + if (MouseHandler.MouseHandler_x >= var13 && MouseHandler.MouseHandler_y >= var12 && MouseHandler.MouseHandler_x < var13 + var23 && MouseHandler.MouseHandler_y < var12 + var45 && var19) { + Login.hoveredWorldIndex = var17; + UserComparator6.worldSelectBackSprites[var21].drawTransOverlayAt(var13, var12, 128, 16777215); + var15 = true; + } else { + UserComparator6.worldSelectBackSprites[var21].drawAt(var13, var12); + } + + if (ReflectionCheck.worldSelectFlagSprites != null) { + ReflectionCheck.worldSelectFlagSprites[(var31.isMembersOnly() ? 8 : 0) + var31.location].drawAt(var13 + 29, var12); + } + + var0.drawCentered(Integer.toString(var31.id), var13 + 15, var45 / 2 + var12 + 5, var22, -1); + var1.drawCentered(var20, var13 + 60, var45 / 2 + var12 + 5, 268435455, -1); + var12 = var12 + var37 + var45; + ++var14; + if (var14 >= var6) { + var12 = var38 + 23; + var13 = var13 + var23 + var26; + var14 = 0; + ++var16; + } + } + + if (var15) { + var17 = var1.stringWidth(class96.World_worlds[Login.hoveredWorldIndex].activity) + 6; + int var18 = var1.ascent + 8; + int var39 = MouseHandler.MouseHandler_y + 25; + if (var39 + var18 > 480) { + var39 = MouseHandler.MouseHandler_y - 25 - var18; + } + + Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var17 / 2, var39, var17, var18, 16777120); + Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var17 / 2, var39, var17, var18, 0); + var1.drawCentered(class96.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var39 + var1.ascent + 4, 0, -1); + } + } + + DevicePcmPlayerProvider.rasterProvider.drawFull(0, 0); + } else { + Login.leftTitleSprite.drawAt(Login.xPadding, 0); + class32.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + FloorDecoration.logoSprite.drawAt(Login.xPadding + 382 - FloorDecoration.logoSprite.subWidth / 2, 18); + if (Client.gameState == 0 || Client.gameState == 5) { + var23 = 20; + var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var23, 16777215, -1); + var24 = 253 - var23; + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var24, 304, 34, 9179409); + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var24 + 1, 302, 32, 0); + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var24 + 2, Login.Login_loadingPercent * 3, 30, 9179409); + Rasterizer2D.Rasterizer2D_fillRectangle(Login.Login_loadingPercent * 3 + (Login.loginBoxX + 180 - 150), var24 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); + var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var23, 16777215, -1); + } + + String var25; + String var27; + short var40; + short var42; + if (Client.gameState == 20) { + ScriptFrame.titleboxSprite.drawAt(Login.loginBoxX + 180 - ScriptFrame.titleboxSprite.subWidth / 2, 271 - ScriptFrame.titleboxSprite.subHeight / 2); + var40 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var40, 16776960, 0); + var41 = var40 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var41, 16776960, 0); + var41 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var41, 16776960, 0); + var41 += 15; + var41 += 7; + if (Login.loginIndex != 4) { + var0.draw("Login: ", Login.loginBoxX + 180 - 110, var41, 16777215, 0); + var42 = 200; + + for (var25 = AttackOption.method2115(); var0.stringWidth(var25) > var42; var25 = var25.substring(0, var25.length() - 1)) { + } + + var0.draw(AbstractFont.escapeBrackets(var25), Login.loginBoxX + 180 - 70, var41, 16777215, 0); + var41 += 15; + + for (var27 = WorldMapSection2.method321(Login.Login_password); var0.stringWidth(var27) > var42; var27 = var27.substring(1)) { + } + + var0.draw("Password: " + var27, Login.loginBoxX + 180 - 108, var41, 16777215, 0); + var41 += 15; + } + } + + if (Client.gameState == 10 || Client.gameState == 11) { + ScriptFrame.titleboxSprite.drawAt(Login.loginBoxX, 171); + short var5; + if (Login.loginIndex == 0) { + var40 = 251; + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var40, 16776960, 0); + var41 = var40 + 30; + var24 = Login.loginBoxX + 180 - 80; + var5 = 291; + Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); + var0.drawLines("New User", var24 - 73, var5 - 20, 144, 40, 16777215, 0, 1, 1, 0); + var24 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); + var0.drawLines("Existing User", var24 - 73, var5 - 20, 144, 40, 16777215, 0, 1, 1, 0); + } else if (Login.loginIndex == 1) { + var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); + var40 = 236; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var40, 16777215, 0); + var41 = var40 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var41, 16777215, 0); + var41 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var41, 16777215, 0); + var41 += 15; + var24 = Login.loginBoxX + 180 - 80; + var5 = 321; + Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); + var0.drawCentered("Continue", var24, var5 + 5, 16777215, 0); + var24 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); + var0.drawCentered("Cancel", var24, var5 + 5, 16777215, 0); + } else if (Login.loginIndex == 2) { + var40 = 201; + var0.drawCentered(Login.Login_response1, class96.loginBoxCenter, var40, 16776960, 0); + var41 = var40 + 15; + var0.drawCentered(Login.Login_response2, class96.loginBoxCenter, var41, 16776960, 0); + var41 += 15; + var0.drawCentered(Login.Login_response3, class96.loginBoxCenter, var41, 16776960, 0); + var41 += 15; + var41 += 7; + var0.draw("Login: ", class96.loginBoxCenter - 110, var41, 16777215, 0); + var42 = 200; + + for (var25 = AttackOption.method2115(); var0.stringWidth(var25) > var42; var25 = var25.substring(1)) { + } + + var0.draw(AbstractFont.escapeBrackets(var25) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? PacketWriter.colorStartTag(16776960) + "|" : ""), class96.loginBoxCenter - 70, var41, 16777215, 0); + var41 += 15; + + for (var27 = WorldMapSection2.method321(Login.Login_password); var0.stringWidth(var27) > var42; var27 = var27.substring(1)) { + } + + var0.draw("Password: " + var27 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? PacketWriter.colorStartTag(16776960) + "|" : ""), class96.loginBoxCenter - 108, var41, 16777215, 0); + var41 += 15; + var40 = 277; + var26 = class96.loginBoxCenter + -117; + IndexedSprite var28 = SecureRandomFuture.method2171(Client.Login_isUsernameRemembered, Login.field1183); + var28.drawAt(var26, var40); + var26 = var26 + var28.subWidth + 5; + var1.draw("Remember username", var26, var40 + 13, 16776960, 0); + var26 = class96.loginBoxCenter + 24; + var28 = SecureRandomFuture.method2171(WorldMapSection2.clientPreferences.hideUsername, Login.field1184); + var28.drawAt(var26, var40); + var26 = var26 + var28.subWidth + 5; + var1.draw("Hide username", var26, var40 + 13, 16776960, 0); + var41 = var40 + 15; + var9 = class96.loginBoxCenter - 80; + short var10 = 321; + Login.titlebuttonSprite.drawAt(var9 - 73, var10 - 20); + var0.drawCentered("Login", var9, var10 + 5, 16777215, 0); + var9 = class96.loginBoxCenter + 80; + Login.titlebuttonSprite.drawAt(var9 - 73, var10 - 20); + var0.drawCentered("Cancel", var9, var10 + 5, 16777215, 0); + var40 = 357; + switch(Login.field1193) { + case 2: + class14.field101 = "Having trouble logging in?"; + break; + default: + class14.field101 = "Can't login? Click here."; + } + + Login.field1175 = new Bounds(class96.loginBoxCenter, var40, var1.stringWidth(class14.field101), 11); + WorldMapCacheName.field315 = new Bounds(class96.loginBoxCenter, var40, var1.stringWidth("Still having trouble logging in?"), 11); + var1.drawCentered(class14.field101, class96.loginBoxCenter, var40, 16777215, 0); + } else if (Login.loginIndex == 3) { + var40 = 201; + var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var40, 16776960, 0); + var41 = var40 + 20; + var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var41, 16776960, 0); + var41 += 15; + var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var41, 16776960, 0); + var41 += 15; + var24 = Login.loginBoxX + 180; + var5 = 276; + Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); + var2.drawCentered("Try again", var24, var5 + 5, 16777215, 0); + var24 = Login.loginBoxX + 180; + var5 = 326; + Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); + var2.drawCentered("Forgotten password?", var24, var5 + 5, 16777215, 0); + } else { + short var8; + if (Login.loginIndex == 4) { + var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); + var40 = 236; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var40, 16777215, 0); + var41 = var40 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var41, 16777215, 0); + var41 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var41, 16777215, 0); + var41 += 15; + var0.draw("PIN: " + WorldMapSection2.method321(LoginScreenAnimation.otp) + (Client.cycle % 40 < 20 ? PacketWriter.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var41, 16777215, 0); + var41 -= 8; + var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var41, 16776960, 0); + var41 += 15; + var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var41, 16776960, 0); + var24 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; + var33 = var41 - var0.ascent; + IndexedSprite var44; + if (Login.field1185) { + var44 = DirectByteArrayCopier.options_buttons_2Sprite; + } else { + var44 = WorldMapSprite.options_buttons_0Sprite; + } + + var44.drawAt(var24, var33); + var41 += 15; + var26 = Login.loginBoxX + 180 - 80; + var8 = 321; + Login.titlebuttonSprite.drawAt(var26 - 73, var8 - 20); + var0.drawCentered("Continue", var26, var8 + 5, 16777215, 0); + var26 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var26 - 73, var8 - 20); + var0.drawCentered("Cancel", var26, var8 + 5, 16777215, 0); + var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var8 + 36, 255, 0); + } else if (Login.loginIndex == 5) { + var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); + var40 = 221; + var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var40, 16776960, 0); + var41 = var40 + 15; + var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var41, 16776960, 0); + var41 += 15; + var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var41, 16776960, 0); + var41 += 15; + var41 += 14; + var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var41, 16777215, 0); + var42 = 174; + + for (var25 = AttackOption.method2115(); var0.stringWidth(var25) > var42; var25 = var25.substring(1)) { + } + + var0.draw(AbstractFont.escapeBrackets(var25) + (Client.cycle % 40 < 20 ? PacketWriter.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var41, 16777215, 0); + var41 += 15; + var6 = Login.loginBoxX + 180 - 80; + short var43 = 321; + Login.titlebuttonSprite.drawAt(var6 - 73, var43 - 20); + var0.drawCentered("Recover", var6, var43 + 5, 16777215, 0); + var6 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var6 - 73, var43 - 20); + var0.drawCentered("Back", var6, var43 + 5, 16777215, 0); + var43 = 356; + var1.drawCentered("Still having trouble logging in?", class96.loginBoxCenter, var43, 268435455, 0); + } else if (Login.loginIndex == 6) { + var40 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var40, 16776960, 0); + var41 = var40 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var41, 16776960, 0); + var41 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var41, 16776960, 0); + var41 += 15; + var24 = Login.loginBoxX + 180; + var5 = 321; + Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); + var0.drawCentered("Back", var24, var5 + 5, 16777215, 0); + } else if (Login.loginIndex == 7) { + var40 = 216; + var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var40, 16776960, 0); + var41 = var40 + 15; + var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var41, 16776960, 0); + var41 += 15; + var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var41, 16776960, 0); + var41 += 15; + var24 = Login.loginBoxX + 180 - 80; + var5 = 321; + Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); + var0.drawCentered("Set Date of Birth", var24, var5 + 5, 16777215, 0); + var24 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); + var0.drawCentered("Back", var24, var5 + 5, 16777215, 0); + } else if (Login.loginIndex == 8) { + var40 = 216; + var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var40, 16776960, 0); + var41 = var40 + 15; + var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var41, 16776960, 0); + var41 += 15; + var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var41, 16776960, 0); + var41 += 15; + var24 = Login.loginBoxX + 180 - 80; + var5 = 321; + Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); + var0.drawCentered("Privacy Policy", var24, var5 + 5, 16777215, 0); + var24 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); + var0.drawCentered("Back", var24, var5 + 5, 16777215, 0); + } else if (Login.loginIndex == 12) { + var40 = 201; + String var4 = ""; + var25 = ""; + var27 = ""; + switch(Login.field1165) { + case 0: + var4 = "Your account has been disabled."; + var25 = Strings.field3045; + var27 = ""; + break; + case 1: + var4 = "Account locked as we suspect it has been stolen."; + var25 = Strings.field2808; + var27 = ""; + break; + default: + ViewportMouse.Login_promptCredentials(false); + } + + var0.drawCentered(var4, Login.loginBoxX + 180, var40, 16776960, 0); + var41 = var40 + 15; + var2.drawCentered(var25, Login.loginBoxX + 180, var41, 16776960, 0); + var41 += 15; + var2.drawCentered(var27, Login.loginBoxX + 180, var41, 16776960, 0); + var41 += 15; + var26 = Login.loginBoxX + 180; + var8 = 276; + Login.titlebuttonSprite.drawAt(var26 - 73, var8 - 20); + var0.drawCentered("Support Page", var26, var8 + 5, 16777215, 0); + var26 = Login.loginBoxX + 180; + var8 = 326; + Login.titlebuttonSprite.drawAt(var26 - 73, var8 - 20); + var0.drawCentered("Back", var26, var8 + 5, 16777215, 0); + } else if (Login.loginIndex == 24) { + var40 = 221; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var40, 16777215, 0); + var41 = var40 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var41, 16777215, 0); + var41 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var41, 16777215, 0); + var41 += 15; + var24 = Login.loginBoxX + 180; + var5 = 301; + Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); + var0.drawCentered("Ok", var24, var5 + 5, 16777215, 0); + } + } + } + + if (Client.gameState >= 10) { + int[] var3 = new int[4]; + Rasterizer2D.Rasterizer2D_getClipArray(var3); + Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, WorldMapData_1.canvasHeight); + WorldMapLabelSize.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); + WorldMapLabelSize.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); + Rasterizer2D.Rasterizer2D_setClipArray(var3); + } + + Login.title_muteSprite[WorldMapSection2.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); + if (Client.gameState > 5 && Language.Language_EN == FriendLoginUpdate.clientLanguage) { + if (WorldMapDecorationType.field2739 != null) { + var41 = Login.xPadding + 5; + var42 = 463; + byte var36 = 100; + byte var34 = 35; + WorldMapDecorationType.field2739.drawAt(var41, var42); + var0.drawCentered("World" + " " + Client.worldId, var36 / 2 + var41, var34 / 2 + var42 - 2, 16777215, 0); + if (World.World_request != null) { + var1.drawCentered("Loading...", var36 / 2 + var41, var34 / 2 + var42 + 12, 16777215, 0); + } else { + var1.drawCentered("Click to switch", var36 / 2 + var41, var34 / 2 + var42 + 12, 16777215, 0); + } + } else { + WorldMapDecorationType.field2739 = class16.SpriteBuffer_getIndexedSpriteByName(UserComparator8.archive8, "sl_button", ""); + } + } + + } + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "(ILce;ZI)I", + garbageValue = "1157828358" + ) + static int method3608(int var0, Script var1, boolean var2) { + Widget var3 = Varps.getWidget(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); + if (var0 == ScriptOpcodes.IF_GETX) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.x; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETY) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.y; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.width; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.height; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETHIDE) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETLAYER) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.parentId; + return 1; + } else { + return 2; + } } } diff --git a/runescape-client/src/main/java/Node.java b/runescape-client/src/main/java/Node.java index ecc0fd99f8..d959aa69b5 100644 --- a/runescape-client/src/main/java/Node.java +++ b/runescape-client/src/main/java/Node.java @@ -3,26 +3,26 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gk") +@ObfuscatedName("ft") @Implements("Node") public class Node { - @ObfuscatedName("cr") + @ObfuscatedName("ci") @Export("key") public long key; - @ObfuscatedName("cy") + @ObfuscatedName("ca") @ObfuscatedSignature( - signature = "Lgk;" + signature = "Lft;" ) @Export("previous") public Node previous; - @ObfuscatedName("cz") + @ObfuscatedName("cc") @ObfuscatedSignature( - signature = "Lgk;" + signature = "Lft;" ) @Export("next") public Node next; - @ObfuscatedName("fu") + @ObfuscatedName("fz") @Export("remove") public void remove() { if (this.next != null) { @@ -33,7 +33,7 @@ public class Node { } } - @ObfuscatedName("fl") + @ObfuscatedName("fj") @Export("hasNext") public boolean hasNext() { return this.next != null; diff --git a/runescape-client/src/main/java/NodeDeque.java b/runescape-client/src/main/java/NodeDeque.java index d71a78dcbe..df52270398 100644 --- a/runescape-client/src/main/java/NodeDeque.java +++ b/runescape-client/src/main/java/NodeDeque.java @@ -3,18 +3,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("js") +@ObfuscatedName("jw") @Implements("NodeDeque") public class NodeDeque { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lgk;" + signature = "Lft;" ) @Export("sentinel") public Node sentinel; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lgk;" + signature = "Lft;" ) @Export("current") Node current; @@ -25,7 +25,7 @@ public class NodeDeque { this.sentinel.next = this.sentinel; } - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("clear") public void clear() { while (true) { @@ -39,9 +39,9 @@ public class NodeDeque { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lgk;)V" + signature = "(Lft;)V" ) @Export("addFirst") public void addFirst(Node var1) { @@ -55,9 +55,9 @@ public class NodeDeque { var1.previous.next = var1; } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lgk;)V" + signature = "(Lft;)V" ) @Export("addLast") public void addLast(Node var1) { @@ -71,9 +71,9 @@ public class NodeDeque { var1.previous.next = var1; } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "()Lgk;" + signature = "()Lft;" ) @Export("removeLast") public Node removeLast() { @@ -86,9 +86,9 @@ public class NodeDeque { } } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "()Lgk;" + signature = "()Lft;" ) @Export("removeFirst") public Node removeFirst() { @@ -101,9 +101,9 @@ public class NodeDeque { } } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "()Lgk;" + signature = "()Lft;" ) @Export("last") public Node last() { @@ -117,9 +117,9 @@ public class NodeDeque { } } - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "()Lgk;" + signature = "()Lft;" ) @Export("first") public Node first() { @@ -133,9 +133,9 @@ public class NodeDeque { } } - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "()Lgk;" + signature = "()Lft;" ) @Export("previous") public Node previous() { @@ -149,9 +149,9 @@ public class NodeDeque { } } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "()Lgk;" + signature = "()Lft;" ) @Export("next") public Node next() { @@ -165,9 +165,9 @@ public class NodeDeque { } } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Lgk;Lgk;)V" + signature = "(Lft;Lft;)V" ) @Export("NodeDeque_addBefore") public static void NodeDeque_addBefore(Node var0, Node var1) { diff --git a/runescape-client/src/main/java/NodeHashTable.java b/runescape-client/src/main/java/NodeHashTable.java index 32eb84bd36..bf64f0fc2e 100644 --- a/runescape-client/src/main/java/NodeHashTable.java +++ b/runescape-client/src/main/java/NodeHashTable.java @@ -3,31 +3,31 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("le") +@ObfuscatedName("ln") @Implements("NodeHashTable") public final class NodeHashTable { - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("size") int size; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "[Lgk;" + signature = "[Lft;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgk;" + signature = "Lft;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lgk;" + signature = "Lft;" ) @Export("current") Node current; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("index") int index; @@ -44,9 +44,9 @@ public final class NodeHashTable { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(J)Lgk;" + signature = "(J)Lft;" ) @Export("get") public Node get(long var1) { @@ -64,9 +64,9 @@ public final class NodeHashTable { return null; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lgk;J)V" + signature = "(Lft;J)V" ) @Export("put") public void put(Node var1, long var2) { @@ -82,9 +82,9 @@ public final class NodeHashTable { var1.key = var2; } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "()Lgk;" + signature = "()Lft;" ) @Export("first") public Node first() { @@ -92,9 +92,9 @@ public final class NodeHashTable { return this.next(); } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "()Lgk;" + signature = "()Lft;" ) @Export("next") public Node next() { diff --git a/runescape-client/src/main/java/ObjectDefinition.java b/runescape-client/src/main/java/ObjectDefinition.java index 843e6b2c25..a491c58219 100644 --- a/runescape-client/src/main/java/ObjectDefinition.java +++ b/runescape-client/src/main/java/ObjectDefinition.java @@ -4,263 +4,257 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ig") +@ObfuscatedName("ir") @Implements("ObjectDefinition") public class ObjectDefinition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("ObjectDefinition_isLowDetail") public static boolean ObjectDefinition_isLowDetail; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) @Export("ObjectDefinition_archive") public static AbstractArchive ObjectDefinition_archive; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) @Export("ObjectDefinition_modelsArchive") public static AbstractArchive ObjectDefinition_modelsArchive; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("ObjectDefinition_cached") - static EvictingDualNodeHashTable ObjectDefinition_cached; - @ObfuscatedName("p") + public static EvictingDualNodeHashTable ObjectDefinition_cached; + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("ObjectDefinition_cachedModelData") public static EvictingDualNodeHashTable ObjectDefinition_cachedModelData; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("ObjectDefinition_cachedEntities") - static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; - @ObfuscatedName("e") + public static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("ObjectDefinition_cachedModels") - static EvictingDualNodeHashTable ObjectDefinition_cachedModels; - @ObfuscatedName("x") + public static EvictingDualNodeHashTable ObjectDefinition_cachedModels; + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "[Ldd;" + signature = "[Ldg;" ) - static ModelData[] field3316; - @ObfuscatedName("gc") - @ObfuscatedSignature( - signature = "[Lls;" - ) - @Export("crossSprites") - static Sprite[] crossSprites; - @ObfuscatedName("a") + static ModelData[] field3350; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 380155021 + intValue = 2072131509 ) @Export("id") public int id; - @ObfuscatedName("d") + @ObfuscatedName("m") @Export("modelIds") int[] modelIds; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("models") int[] models; - @ObfuscatedName("o") + @ObfuscatedName("h") @Export("name") public String name; @ObfuscatedName("v") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("k") + @ObfuscatedName("n") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("s") + @ObfuscatedName("x") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("l") + @ObfuscatedName("w") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("t") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -682227109 + intValue = 1829764731 ) @Export("sizeX") public int sizeX; - @ObfuscatedName("j") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 598448161 + intValue = -494400193 ) @Export("sizeY") public int sizeY; - @ObfuscatedName("n") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -19779137 + intValue = -1227717711 ) @Export("interactType") public int interactType; - @ObfuscatedName("u") + @ObfuscatedName("y") @Export("boolean1") public boolean boolean1; - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 532107779 + intValue = 1341583163 ) @Export("int1") public int int1; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 893657291 + intValue = 488634624 ) @Export("clipType") int clipType; - @ObfuscatedName("m") + @ObfuscatedName("r") @Export("nonFlatShading") boolean nonFlatShading; - @ObfuscatedName("g") + @ObfuscatedName("s") @Export("modelClipped") public boolean modelClipped; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1184328289 + intValue = -634385779 ) @Export("animationId") public int animationId; - @ObfuscatedName("q") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 34352155 + intValue = -2070397181 ) @Export("int2") public int int2; - @ObfuscatedName("aa") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -1957249099 + intValue = -1331237225 ) @Export("ambient") int ambient; - @ObfuscatedName("av") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 2137656901 + intValue = -1829035153 ) @Export("contrast") int contrast; - @ObfuscatedName("aw") + @ObfuscatedName("az") @Export("actions") public String[] actions; - @ObfuscatedName("as") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 139097985 + intValue = 1312514055 ) @Export("mapIconId") public int mapIconId; - @ObfuscatedName("ak") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -1108089965 + intValue = -649237353 ) @Export("mapSceneId") public int mapSceneId; @ObfuscatedName("au") @Export("isRotated") boolean isRotated; - @ObfuscatedName("ah") + @ObfuscatedName("ay") @Export("clipped") public boolean clipped; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -1422335407 + intValue = -1009238409 ) @Export("modelSizeX") int modelSizeX; - @ObfuscatedName("ao") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -4639683 + intValue = -2029101183 ) @Export("modelHeight") int modelHeight; - @ObfuscatedName("an") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -782763969 + intValue = 1016061481 ) @Export("modelSizeY") int modelSizeY; - @ObfuscatedName("ar") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -1759322099 + intValue = 71581615 ) @Export("offsetX") int offsetX; - @ObfuscatedName("az") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 548923493 + intValue = 1543134169 ) @Export("offsetHeight") int offsetHeight; - @ObfuscatedName("ay") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = 1567534237 + intValue = 2126649085 ) @Export("offsetY") int offsetY; - @ObfuscatedName("ag") + @ObfuscatedName("ar") @Export("boolean2") public boolean boolean2; - @ObfuscatedName("ac") + @ObfuscatedName("av") @Export("isSolid") boolean isSolid; @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -879946961 + intValue = 605311825 ) @Export("int3") public int int3; - @ObfuscatedName("ae") + @ObfuscatedName("ad") @Export("transforms") public int[] transforms; - @ObfuscatedName("ad") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -1292334105 + intValue = -1009717649 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("aj") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 1597795119 + intValue = -1539805801 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("ax") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 1540397 + intValue = -1082211877 ) @Export("ambientSoundId") public int ambientSoundId; - @ObfuscatedName("at") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -632541059 + intValue = 1026380067 ) @Export("int4") public int int4; - @ObfuscatedName("af") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 2107243609 + intValue = 1425123591 ) @Export("int5") public int int5; - @ObfuscatedName("ap") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = -2056982537 + intValue = 1479787487 ) @Export("int6") public int int6; - @ObfuscatedName("ai") + @ObfuscatedName("ab") @Export("soundEffectIds") public int[] soundEffectIds; - @ObfuscatedName("am") + @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "Llc;" + signature = "Llp;" ) @Export("params") IterableNodeHashTable params; @@ -271,7 +265,7 @@ public class ObjectDefinition extends DualNode { ObjectDefinition_cachedModelData = new EvictingDualNodeHashTable(500); ObjectDefinition_cachedEntities = new EvictingDualNodeHashTable(30); ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30); - field3316 = new ModelData[4]; + field3350 = new ModelData[4]; } ObjectDefinition() { @@ -281,7 +275,7 @@ public class ObjectDefinition extends DualNode { this.interactType = 2; this.boolean1 = true; this.int1 = -1; - this.clipType = -1; + this.clipType = -256; this.nonFlatShading = false; this.modelClipped = false; this.animationId = -1; @@ -310,10 +304,10 @@ public class ObjectDefinition extends DualNode { this.int6 = 0; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "17" + garbageValue = "40" ) @Export("postDecode") void postDecode() { @@ -336,10 +330,10 @@ public class ObjectDefinition extends DualNode { } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkq;B)V", - garbageValue = "-87" + signature = "(Lkp;I)V", + garbageValue = "-647574663" ) @Export("decode") void decode(Buffer var1) { @@ -353,10 +347,10 @@ public class ObjectDefinition extends DualNode { } } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Lkq;II)V", - garbageValue = "1455704216" + signature = "(Lkp;IB)V", + garbageValue = "-47" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -366,7 +360,7 @@ public class ObjectDefinition extends DualNode { var3 = var1.readUnsignedByte(); if (var3 > 0) { if (this.modelIds != null && !ObjectDefinition_isLowDetail) { - var1.offset += var3 * 3; + var1.offset += 3 * var3; } else { this.models = new int[var3]; this.modelIds = new int[var3]; @@ -383,7 +377,7 @@ public class ObjectDefinition extends DualNode { var3 = var1.readUnsignedByte(); if (var3 > 0) { if (this.modelIds != null && !ObjectDefinition_isLowDetail) { - var1.offset += 2 * var3; + var1.offset += var3 * 2; } else { this.models = null; this.modelIds = new int[var3]; @@ -422,7 +416,7 @@ public class ObjectDefinition extends DualNode { } else if (var2 == 29) { this.ambient = var1.readByte(); } else if (var2 == 39) { - this.contrast = var1.readByte(); + this.contrast = var1.readByte() * 25; } else if (var2 >= 30 && var2 < 35) { this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { @@ -487,11 +481,11 @@ public class ObjectDefinition extends DualNode { this.soundEffectIds[var4] = var1.readUnsignedShort(); } } else if (var2 == 81) { - this.clipType = var1.readUnsignedByte() * 256; + this.clipType = var1.readUnsignedByte() * 65536; } else if (var2 == 82) { this.mapIconId = var1.readUnsignedShort(); } else if (var2 == 249) { - this.params = Calendar.readStringIntParameters(var1, this.params); + this.params = MouseRecorder.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); @@ -527,12 +521,12 @@ public class ObjectDefinition extends DualNode { } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "-1084171011" + garbageValue = "428047551" ) - public final boolean method4616(int var1) { + public final boolean method4675(int var1) { if (this.models != null) { for (int var4 = 0; var4 < this.models.length; ++var4) { if (this.models[var4] == var1) { @@ -556,10 +550,10 @@ public class ObjectDefinition extends DualNode { } } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "2142303046" + garbageValue = "1267876034" ) @Export("needsModelFiles") public final boolean needsModelFiles() { @@ -576,10 +570,10 @@ public class ObjectDefinition extends DualNode { } } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(II[[IIIIB)Lep;", - garbageValue = "-20" + signature = "(II[[IIIII)Leq;", + garbageValue = "2062511915" ) @Export("getEntity") public final Entity getEntity(int var1, int var2, int[][] var3, int var4, int var5, int var6) { @@ -598,10 +592,10 @@ public class ObjectDefinition extends DualNode { } if (!this.nonFlatShading) { - var9 = var10.toModel(this.ambient + 64, this.contrast * 25 + 768, -50, -10, -50); + var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); } else { var10.ambient = (short)(this.ambient + 64); - var10.contrast = (short)(this.contrast * 25 + 768); + var10.contrast = (short)(this.contrast + 768); var10.calculateVertexNormals(); var9 = var10; } @@ -610,24 +604,24 @@ public class ObjectDefinition extends DualNode { } if (this.nonFlatShading) { - var9 = ((ModelData)var9).method2803(); + var9 = ((ModelData)var9).method2845(); } - if (this.clipType * 65536 >= 0) { + if (this.clipType * 256 >= 0) { if (var9 instanceof Model) { - var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType * 65536); + var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType * 256); } else if (var9 instanceof ModelData) { - var9 = ((ModelData)var9).method2804(var3, var4, var5, var6, true, this.clipType * 65536); + var9 = ((ModelData)var9).method2838(var3, var4, var5, var6, true, this.clipType * 256); } } return (Entity)var9; } - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(II[[IIIII)Ldw;", - garbageValue = "287773376" + signature = "(II[[IIIII)Ldx;", + garbageValue = "-463745511" ) @Export("getModel") public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5, int var6) { @@ -645,21 +639,21 @@ public class ObjectDefinition extends DualNode { return null; } - var9 = var10.toModel(this.ambient + 64, this.contrast * 25 + 768, -50, -10, -50); + var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); ObjectDefinition_cachedModels.put(var9, var7); } - if (this.clipType * 65536 >= 0) { - var9 = var9.contourGround(var3, var4, var5, var6, true, this.clipType * 65536); + if (this.clipType * 256 >= 0) { + var9 = var9.contourGround(var3, var4, var5, var6, true, this.clipType * 256); } return var9; } - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(II[[IIIILiv;II)Ldw;", - garbageValue = "-1136799681" + signature = "(II[[IIIILip;IB)Ldx;", + garbageValue = "1" ) @Export("getModelDynamic") public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, int var5, int var6, SequenceDefinition var7, int var8) { @@ -677,11 +671,11 @@ public class ObjectDefinition extends DualNode { return null; } - var11 = var12.toModel(this.ambient + 64, this.contrast * 25 + 768, -50, -10, -50); + var11 = var12.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); ObjectDefinition_cachedModels.put(var11, var9); } - if (var7 == null && this.clipType * 65536 == -1) { + if (var7 == null && this.clipType * 256 == -1) { return var11; } else { if (var7 != null) { @@ -690,18 +684,18 @@ public class ObjectDefinition extends DualNode { var11 = var11.toSharedSequenceModel(true); } - if (this.clipType * 65536 >= 0) { - var11 = var11.contourGround(var3, var4, var5, var6, false, this.clipType * 65536); + if (this.clipType * 256 >= 0) { + var11 = var11.contourGround(var3, var4, var5, var6, false, this.clipType * 256); } return var11; } } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IIB)Ldd;", - garbageValue = "0" + signature = "(III)Ldg;", + garbageValue = "-220875015" ) @Export("getModelData") final ModelData getModelData(int var1, int var2) { @@ -739,19 +733,19 @@ public class ObjectDefinition extends DualNode { } if (var4) { - var3.method2817(); + var3.method2854(); } ObjectDefinition_cachedModelData.put(var3, (long)var7); } if (var5 > 1) { - field3316[var6] = var3; + field3350[var6] = var3; } } if (var5 > 1) { - var3 = new ModelData(field3316, var5); + var3 = new ModelData(field3350, var5); } } else { int var9 = -1; @@ -781,7 +775,7 @@ public class ObjectDefinition extends DualNode { } if (var10) { - var3.method2817(); + var3.method2854(); } ObjectDefinition_cachedModelData.put(var3, (long)var5); @@ -801,19 +795,19 @@ public class ObjectDefinition extends DualNode { var11 = true; } - ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, null == this.recolorFrom, null == this.retextureFrom, true); + ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, this.recolorFrom == null, this.retextureFrom == null, true); if (var1 == 4 && var2 > 3) { - var8.method2809(256); + var8.method2850(256); var8.changeOffset(45, 0, -45); } var2 &= 3; if (var2 == 1) { - var8.method2872(); + var8.method2862(); } else if (var2 == 2) { - var8.method2807(); + var8.method2848(); } else if (var2 == 3) { - var8.method2798(); + var8.method2903(); } if (this.recolorFrom != null) { @@ -839,16 +833,16 @@ public class ObjectDefinition extends DualNode { return var8; } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)Lig;", - garbageValue = "1498998552" + signature = "(I)Lir;", + garbageValue = "-211089753" ) @Export("transform") public final ObjectDefinition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = GameShell.getVarbit(this.transformVarbit); + var1 = GrandExchangeOfferUnitPriceComparator.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -860,33 +854,46 @@ public class ObjectDefinition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? Coord.getObjectDefinition(var2) : null; + return var2 != -1 ? Occluder.getObjectDefinition(var2) : null; } - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "0" + signature = "(III)I", + garbageValue = "1049536476" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return class83.method2071(this.params, var1, var2); + IterableNodeHashTable var4 = this.params; + int var3; + if (var4 == null) { + var3 = var2; + } else { + IntegerNode var5 = (IntegerNode)var4.get((long)var1); + if (var5 == null) { + var3 = var2; + } else { + var3 = var5.integer; + } + } + + return var3; } - @ObfuscatedName("l") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "166992225" + garbageValue = "162927924" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return class14.method151(this.params, var1, var2); + return FloorDecoration.method2914(this.params, var1, var2); } - @ObfuscatedName("j") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "2014883324" + garbageValue = "143000287" ) @Export("hasSound") public boolean hasSound() { @@ -895,7 +902,7 @@ public class ObjectDefinition extends DualNode { } else { for (int var1 = 0; var1 < this.transforms.length; ++var1) { if (this.transforms[var1] != -1) { - ObjectDefinition var2 = Coord.getObjectDefinition(this.transforms[var1]); + ObjectDefinition var2 = Occluder.getObjectDefinition(this.transforms[var1]); if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { return true; } diff --git a/runescape-client/src/main/java/ObjectNode.java b/runescape-client/src/main/java/ObjectNode.java index 44d9d8b8ff..1cc7951dcb 100644 --- a/runescape-client/src/main/java/ObjectNode.java +++ b/runescape-client/src/main/java/ObjectNode.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ga") +@ObfuscatedName("fy") @Implements("ObjectNode") public class ObjectNode extends Node { - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("obj") public final Object obj; diff --git a/runescape-client/src/main/java/ObjectSound.java b/runescape-client/src/main/java/ObjectSound.java index 0fe556b3c6..c485935123 100644 --- a/runescape-client/src/main/java/ObjectSound.java +++ b/runescape-client/src/main/java/ObjectSound.java @@ -4,87 +4,87 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("br") +@ObfuscatedName("bv") @Implements("ObjectSound") public final class ObjectSound extends Node { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Ljs;" + signature = "Ljw;" ) @Export("objectSounds") static NodeDeque objectSounds; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1656698135 + intValue = -1573103385 ) @Export("plane") int plane; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1779559040 + intValue = 1434930617 ) @Export("x") int x; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -718591763 + intValue = 1295537280 ) @Export("y") int y; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 787274277 + intValue = 393514941 ) - int field1064; - @ObfuscatedName("b") + int field1069; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1137525137 + intValue = -840891776 ) - int field1052; - @ObfuscatedName("e") + int field1080; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 245525821 + intValue = 210061871 ) - int field1053; - @ObfuscatedName("x") + int field1070; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1263233623 + intValue = 2754531 ) @Export("soundEffectId") int soundEffectId; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Ldg;" + signature = "Lde;" ) @Export("stream1") RawPcmStream stream1; - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -938588117 + intValue = -1469470179 ) - int field1060; - @ObfuscatedName("c") + int field1074; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1891052931 + intValue = -1106113547 ) - int field1061; - @ObfuscatedName("o") + int field1075; + @ObfuscatedName("h") @Export("soundEffectIds") int[] soundEffectIds; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 2003220669 + intValue = -52141537 ) - int field1055; - @ObfuscatedName("k") + int field1077; + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Ldg;" + signature = "Lde;" ) @Export("stream2") RawPcmStream stream2; - @ObfuscatedName("s") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lig;" + signature = "Lir;" ) @Export("obj") ObjectDefinition obj; @@ -96,10 +96,10 @@ public final class ObjectSound extends Node { ObjectSound() { } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "448933263" + garbageValue = "-280548434" ) @Export("set") void set() { @@ -107,22 +107,119 @@ public final class ObjectSound extends Node { ObjectDefinition var2 = this.obj.transform(); if (var2 != null) { this.soundEffectId = var2.ambientSoundId; - this.field1053 = var2.int4 * 128; - this.field1060 = var2.int5; - this.field1061 = var2.int6; + this.field1070 = var2.int4 * 128; + this.field1074 = var2.int5; + this.field1075 = var2.int6; this.soundEffectIds = var2.soundEffectIds; } else { this.soundEffectId = -1; - this.field1053 = 0; - this.field1060 = 0; - this.field1061 = 0; + this.field1070 = 0; + this.field1074 = 0; + this.field1075 = 0; this.soundEffectIds = null; } if (var1 != this.soundEffectId && this.stream1 != null) { - Tiles.pcmStreamMixer.removeSubStream(this.stream1); + class2.pcmStreamMixer.removeSubStream(this.stream1); this.stream1 = null; } } + + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "(IIILir;II)V", + garbageValue = "1319023386" + ) + static void method1931(int var0, int var1, int var2, ObjectDefinition var3, int var4) { + ObjectSound var5 = new ObjectSound(); + var5.plane = var0; + var5.x = var1 * 128; + var5.y = var2 * 16384; + int var6 = var3.sizeX; + int var7 = var3.sizeY; + if (var4 == 1 || var4 == 3) { + var6 = var3.sizeY; + var7 = var3.sizeX; + } + + var5.field1069 = (var6 + var1) * 128; + var5.field1080 = (var7 + var2) * 16384; + var5.soundEffectId = var3.ambientSoundId; + var5.field1070 = var3.int4 * 128; + var5.field1074 = var3.int5; + var5.field1075 = var3.int6; + var5.soundEffectIds = var3.soundEffectIds; + if (var3.transforms != null) { + var5.obj = var3; + var5.set(); + } + + objectSounds.addFirst(var5); + if (var5.soundEffectIds != null) { + var5.field1077 = var5.field1074 + (int)(Math.random() * (double)(var5.field1075 - var5.field1074)); + } + + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(IB)V", + garbageValue = "1" + ) + public static void method1933(int var0) { + if (var0 != -1) { + if (class197.Widget_loadedInterfaces[var0]) { + class197.Widget_archive.clearFilesGroup(var0); + if (WorldMapLabel.Widget_interfaceComponents[var0] != null) { + boolean var1 = true; + + for (int var2 = 0; var2 < WorldMapLabel.Widget_interfaceComponents[var0].length; ++var2) { + if (WorldMapLabel.Widget_interfaceComponents[var0][var2] != null) { + if (WorldMapLabel.Widget_interfaceComponents[var0][var2].type != 2) { + WorldMapLabel.Widget_interfaceComponents[var0][var2] = null; + } else { + var1 = false; + } + } + } + + if (var1) { + WorldMapLabel.Widget_interfaceComponents[var0] = null; + } + + class197.Widget_loadedInterfaces[var0] = false; + } + } + } + } + + @ObfuscatedName("jv") + @ObfuscatedSignature( + signature = "(ZI)V", + garbageValue = "-1074092886" + ) + @Export("setTapToDrop") + static void setTapToDrop(boolean var0) { + Client.tapToDrop = var0; + } + + @ObfuscatedName("lh") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "1" + ) + static void method1934() { + if (class218.field2716 != null) { + Client.field888 = Client.cycle; + class218.field2716.method4395(); + + for (int var0 = 0; var0 < Client.players.length; ++var0) { + if (Client.players[var0] != null) { + class218.field2716.method4408(Messages.baseX * 64 + (Client.players[var0].x >> 7), Language.baseY * 64 + (Client.players[var0].y >> 7)); + } + } + } + + } } diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java index 58de607017..b27901b2a9 100644 --- a/runescape-client/src/main/java/Occluder.java +++ b/runescape-client/src/main/java/Occluder.java @@ -4,240 +4,150 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("en") +@ObfuscatedName("er") @Implements("Occluder") public final class Occluder { - @ObfuscatedName("ix") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1520705785 - ) - @Export("selectedItemWidget") - static int selectedItemWidget; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -2004521327 + intValue = -1590617607 ) @Export("minTileX") int minTileX; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1674295637 + intValue = -547083531 ) @Export("maxTileX") int maxTileX; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1042040177 + intValue = -50213873 ) @Export("minTileY") int minTileY; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1841371547 + intValue = 468551341 ) @Export("maxTileY") int maxTileY; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 261600229 + intValue = 1458013883 ) @Export("type") int type; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -471906197 + intValue = 1331967011 ) @Export("minX") int minX; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1905687081 + intValue = -455782375 ) @Export("maxX") int maxX; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -528006911 + intValue = 819505963 ) @Export("minZ") int minZ; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1092367399 + intValue = 1618672975 ) @Export("maxZ") int maxZ; - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1309728231 + intValue = -1033011613 ) @Export("minY") int minY; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1242772351 + intValue = -1435330577 ) @Export("maxY") int maxY; - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 574320151 + intValue = 681234965 ) - int field1877; + int field1891; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1784945639 + intValue = 460124457 ) - int field1878; + int field1900; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -947874837 + ) + int field1901; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -1101467095 + ) + int field1903; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -1920736103 + ) + int field1904; @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -894832855 + intValue = -1277839357 ) - int field1879; - @ObfuscatedName("s") + int field1889; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -350981301 + intValue = 461878441 ) - int field1880; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -186008605 - ) - int field1881; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 512854933 - ) - int field1875; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -503970767 - ) - int field1872; + int field1905; Occluder() { } - @ObfuscatedName("ka") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lha;IIIB)V", - garbageValue = "1" + signature = "(IB)Lir;", + garbageValue = "-54" ) - @Export("drawMinimap") - static final void drawMinimap(Widget var0, int var1, int var2, int var3) { - WorldMapLabel.playPcmPlayers(); - SpriteMask var4 = var0.getSpriteMask(false); - if (var4 != null) { - Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); - if (Client.minimapState != 2 && Client.minimapState != 5) { - int var5 = Client.camAngleY & 2047; - int var6 = Message.localPlayer.x / 32 + 48; - int var7 = 464 - Message.localPlayer.y / 32; - Language.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); - - int var8; - int var9; - int var10; - for (var8 = 0; var8 < Client.mapIconCount; ++var8) { - var9 = Client.mapIconXs[var8] * 4 + 2 - Message.localPlayer.x / 32; - var10 = Client.mapIconYs[var8] * 4 + 2 - Message.localPlayer.y / 32; - GrandExchangeOfferNameComparator.drawSpriteOnMinimap(var1, var2, var9, var10, Client.mapIcons[var8], var4); - } - - int var11; - int var12; - for (var8 = 0; var8 < 104; ++var8) { - for (var9 = 0; var9 < 104; ++var9) { - NodeDeque var15 = Client.groundItems[UrlRequest.Client_plane][var8][var9]; - if (var15 != null) { - var11 = var8 * 4 + 2 - Message.localPlayer.x / 32; - var12 = var9 * 4 + 2 - Message.localPlayer.y / 32; - GrandExchangeOfferNameComparator.drawSpriteOnMinimap(var1, var2, var11, var12, WorldMapLabel.mapDotSprites[0], var4); - } - } - } - - for (var8 = 0; var8 < Client.npcCount; ++var8) { - NPC var16 = Client.npcs[Client.npcIndices[var8]]; - if (var16 != null && var16.isVisible()) { - NPCDefinition var18 = var16.definition; - if (var18 != null && var18.transforms != null) { - var18 = var18.transform(); - } - - if (var18 != null && var18.drawMapDot && var18.isInteractable) { - var11 = var16.x / 32 - Message.localPlayer.x / 32; - var12 = var16.y / 32 - Message.localPlayer.y / 32; - GrandExchangeOfferNameComparator.drawSpriteOnMinimap(var1, var2, var11, var12, WorldMapLabel.mapDotSprites[1], var4); - } - } - } - - var8 = Players.Players_count; - int[] var19 = Players.Players_indices; - - for (var10 = 0; var10 < var8; ++var10) { - Player var17 = Client.players[var19[var10]]; - if (var17 != null && var17.isVisible() && !var17.isHidden && var17 != Message.localPlayer) { - var12 = var17.x / 32 - Message.localPlayer.x / 32; - int var13 = var17.y / 32 - Message.localPlayer.y / 32; - boolean var14 = false; - if (Message.localPlayer.team != 0 && var17.team != 0 && var17.team == Message.localPlayer.team) { - var14 = true; - } - - if (var17.isFriend()) { - GrandExchangeOfferNameComparator.drawSpriteOnMinimap(var1, var2, var12, var13, WorldMapLabel.mapDotSprites[3], var4); - } else if (var14) { - GrandExchangeOfferNameComparator.drawSpriteOnMinimap(var1, var2, var12, var13, WorldMapLabel.mapDotSprites[4], var4); - } else if (var17.isClanMember()) { - GrandExchangeOfferNameComparator.drawSpriteOnMinimap(var1, var2, var12, var13, WorldMapLabel.mapDotSprites[5], var4); - } else { - GrandExchangeOfferNameComparator.drawSpriteOnMinimap(var1, var2, var12, var13, WorldMapLabel.mapDotSprites[2], var4); - } - } - } - - if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { - if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { - NPC var20 = Client.npcs[Client.hintArrowNpcIndex]; - if (var20 != null) { - var11 = var20.x / 32 - Message.localPlayer.x / 32; - var12 = var20.y / 32 - Message.localPlayer.y / 32; - InvDefinition.worldToMinimap(var1, var2, var11, var12, Varps.mapMarkerSprites[1], var4); - } - } - - if (Client.hintArrowType == 2) { - var10 = Client.hintArrowX * 4 - MusicPatchPcmStream.baseX * 256 + 2 - Message.localPlayer.x / 32; - var11 = Client.hintArrowY * 4 - ScriptEvent.baseY * 256 + 2 - Message.localPlayer.y / 32; - InvDefinition.worldToMinimap(var1, var2, var10, var11, Varps.mapMarkerSprites[1], var4); - } - - if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { - Player var21 = Client.players[Client.hintArrowPlayerIndex]; - if (var21 != null) { - var11 = var21.x / 32 - Message.localPlayer.x / 32; - var12 = var21.y / 32 - Message.localPlayer.y / 32; - InvDefinition.worldToMinimap(var1, var2, var11, var12, Varps.mapMarkerSprites[1], var4); - } - } - } - - if (Client.destinationX != 0) { - var10 = Client.destinationX * 4 + 2 - Message.localPlayer.x / 32; - var11 = Client.destinationY * 4 + 2 - Message.localPlayer.y / 32; - GrandExchangeOfferNameComparator.drawSpriteOnMinimap(var1, var2, var10, var11, Varps.mapMarkerSprites[0], var4); - } - - if (!Message.localPlayer.isHidden) { - Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215); - } - } else { - Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); + @Export("getObjectDefinition") + public static ObjectDefinition getObjectDefinition(int var0) { + ObjectDefinition var1 = (ObjectDefinition)ObjectDefinition.ObjectDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = ObjectDefinition.ObjectDefinition_archive.takeFile(6, var0); + var1 = new ObjectDefinition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); } - Client.field834[var3] = true; + var1.postDecode(); + if (var1.isSolid) { + var1.interactType = 0; + var1.boolean1 = false; + } + + ObjectDefinition.ObjectDefinition_cached.put(var1, (long)var0); + return var1; } } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(I)[Lgb;", + garbageValue = "1401703013" + ) + @Export("ServerPacket_values") + public static ServerPacket[] ServerPacket_values() { + return new ServerPacket[]{ServerPacket.field2127, ServerPacket.field2129, ServerPacket.field2168, ServerPacket.field2118, ServerPacket.field2119, ServerPacket.field2120, ServerPacket.field2121, ServerPacket.field2122, ServerPacket.field2123, ServerPacket.field2124, ServerPacket.field2159, ServerPacket.field2126, ServerPacket.field2165, ServerPacket.field2145, ServerPacket.field2200, ServerPacket.field2169, ServerPacket.field2131, ServerPacket.field2132, ServerPacket.field2117, ServerPacket.field2134, ServerPacket.field2135, ServerPacket.field2136, ServerPacket.field2137, ServerPacket.field2138, ServerPacket.field2139, ServerPacket.field2140, ServerPacket.field2141, ServerPacket.field2142, ServerPacket.field2181, ServerPacket.field2151, ServerPacket.field2173, ServerPacket.field2146, ServerPacket.field2178, ServerPacket.field2183, ServerPacket.field2172, ServerPacket.field2150, ServerPacket.field2148, ServerPacket.field2152, ServerPacket.field2153, ServerPacket.field2125, ServerPacket.field2143, ServerPacket.field2116, ServerPacket.field2157, ServerPacket.field2144, ServerPacket.field2115, ServerPacket.field2160, ServerPacket.field2161, ServerPacket.field2149, ServerPacket.field2163, ServerPacket.field2164, ServerPacket.field2133, ServerPacket.field2166, ServerPacket.field2128, ServerPacket.field2156, ServerPacket.field2162, ServerPacket.field2155, ServerPacket.field2171, ServerPacket.field2193, ServerPacket.field2167, ServerPacket.field2174, ServerPacket.field2175, ServerPacket.field2176, ServerPacket.field2177, ServerPacket.field2154, ServerPacket.field2179, ServerPacket.field2180, ServerPacket.field2158, ServerPacket.field2182, ServerPacket.field2130, ServerPacket.field2184, ServerPacket.field2187, ServerPacket.field2186, ServerPacket.field2147, ServerPacket.field2188, ServerPacket.field2189, ServerPacket.field2190, ServerPacket.field2191, ServerPacket.field2192, ServerPacket.field2170, ServerPacket.field2194, ServerPacket.field2195, ServerPacket.field2196, ServerPacket.field2197, ServerPacket.field2198, ServerPacket.field2199, ServerPacket.field2185}; + } } diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java index 60df722322..855132456a 100644 --- a/runescape-client/src/main/java/PacketBuffer.java +++ b/runescape-client/src/main/java/PacketBuffer.java @@ -4,86 +4,86 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kl") +@ObfuscatedName("ks") @Implements("PacketBuffer") public class PacketBuffer extends Buffer { - @ObfuscatedName("i") - static final int[] field3699; - @ObfuscatedName("f") + @ObfuscatedName("t") + static final int[] field3700; + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Llr;" + signature = "Llw;" ) @Export("isaacCipher") IsaacCipher isaacCipher; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 113356883 + intValue = 929089357 ) @Export("bitIndex") int bitIndex; static { - field3699 = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1}; + field3700 = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1}; } public PacketBuffer(int var1) { super(var1); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "([II)V", - garbageValue = "1103059700" + garbageValue = "17531083" ) @Export("newIsaacCipher") public void newIsaacCipher(int[] var1) { this.isaacCipher = new IsaacCipher(var1); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Llr;I)V", - garbageValue = "66749042" + signature = "(Llw;I)V", + garbageValue = "-1301005678" ) @Export("setIsaacCipher") public void setIsaacCipher(IsaacCipher var1) { this.isaacCipher = var1; } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "278121039" + garbageValue = "-2035139507" ) @Export("writeByteIsaac") public void writeByteIsaac(int var1) { super.array[++super.offset - 1] = (byte)(var1 + this.isaacCipher.nextInt()); } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-288227059" + garbageValue = "2077105215" ) @Export("readByteIsaac") public int readByteIsaac() { return super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(B)Z", - garbageValue = "-44" + garbageValue = "106" ) - public boolean method5492() { - int var1 = super.array[super.offset] - this.isaacCipher.method6305() & 255; + public boolean method5539() { + int var1 = super.array[super.offset] - this.isaacCipher.method6307() & 255; return var1 >= 128; } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "27" + signature = "(I)I", + garbageValue = "1485152943" ) @Export("readSmartByteShortIsaac") public int readSmartByteShortIsaac() { @@ -91,32 +91,32 @@ public class PacketBuffer extends Buffer { return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255); } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "-1375824422" + garbageValue = "-1172597525" ) - public void method5494(byte[] var1, int var2, int var3) { + public void method5525(byte[] var1, int var2, int var3) { for (int var4 = 0; var4 < var3; ++var4) { var1[var4 + var2] = (byte)(super.array[++super.offset - 1] - this.isaacCipher.nextInt()); } } - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1633102130" + signature = "(B)V", + garbageValue = "109" ) @Export("importIndex") public void importIndex() { this.bitIndex = super.offset * 8; } - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-804748280" + signature = "(IS)I", + garbageValue = "7617" ) @Export("readBits") public int readBits(int var1) { @@ -125,33 +125,33 @@ public class PacketBuffer extends Buffer { int var4 = 0; for (this.bitIndex += var1; var1 > var3; var3 = 8) { - var4 += (super.array[var2++] & field3699[var3]) << var1 - var3; + var4 += (super.array[var2++] & field3700[var3]) << var1 - var3; var1 -= var3; } if (var3 == var1) { - var4 += super.array[var2] & field3699[var3]; + var4 += super.array[var2] & field3700[var3]; } else { - var4 += super.array[var2] >> var3 - var1 & field3699[var1]; + var4 += super.array[var2] >> var3 - var1 & field3700[var1]; } return var4; } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1487381592" + signature = "(B)V", + garbageValue = "74" ) @Export("exportIndex") public void exportIndex() { super.offset = (this.bitIndex + 7) / 8; } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "8" + signature = "(II)I", + garbageValue = "2094986039" ) @Export("bitsRemaining") public int bitsRemaining(int var1) { diff --git a/runescape-client/src/main/java/PacketBufferNode.java b/runescape-client/src/main/java/PacketBufferNode.java index c03d531a00..41b4a81e2f 100644 --- a/runescape-client/src/main/java/PacketBufferNode.java +++ b/runescape-client/src/main/java/PacketBufferNode.java @@ -3,51 +3,44 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("fz") +@ObfuscatedName("gs") @Implements("PacketBufferNode") public class PacketBufferNode extends Node { - @ObfuscatedName("rf") - @ObfuscatedGetter( - intValue = -1075361135 - ) - static int field2310; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "[Lfz;" + signature = "[Lgs;" ) @Export("PacketBufferNode_packetBufferNodes") - public static PacketBufferNode[] PacketBufferNode_packetBufferNodes; - @ObfuscatedName("b") + static PacketBufferNode[] PacketBufferNode_packetBufferNodes; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1681870953 + intValue = -1322970171 ) @Export("PacketBufferNode_packetBufferNodeCount") - public static int PacketBufferNode_packetBufferNodeCount; - @ObfuscatedName("o") - @Export("Tiles_lightness") - static int[] Tiles_lightness; - @ObfuscatedName("f") + static int PacketBufferNode_packetBufferNodeCount; + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lfh;" + signature = "Lgi;" ) @Export("clientPacket") public ClientPacket clientPacket; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1093975901 + intValue = 631809601 ) @Export("clientPacketLength") public int clientPacketLength; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lkl;" + signature = "Lks;" ) @Export("packetBuffer") public PacketBuffer packetBuffer; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 468956445 + intValue = -1165954463 ) @Export("index") public int index; @@ -57,10 +50,13 @@ public class PacketBufferNode extends Node { PacketBufferNode_packetBufferNodeCount = 0; } - @ObfuscatedName("i") + PacketBufferNode() { + } + + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-2117853277" + garbageValue = "660241360" ) @Export("release") public void release() { @@ -69,73 +65,66 @@ public class PacketBufferNode extends Node { } } - @ObfuscatedName("i") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IB)Lii;", - garbageValue = "57" + signature = "(II)Lis;", + garbageValue = "-694311044" ) - @Export("ItemDefinition_get") - public static ItemDefinition ItemDefinition_get(int var0) { - ItemDefinition var1 = (ItemDefinition)ItemDefinition.ItemDefinition_cached.get((long)var0); + @Export("getParamDefinition") + public static ParamDefinition getParamDefinition(int var0) { + ParamDefinition var1 = (ParamDefinition)ParamDefinition.ParamDefinition_cached.get((long)var0); if (var1 != null) { return var1; } else { - byte[] var2 = UserComparator10.ItemDefinition_archive.takeFile(10, var0); - var1 = new ItemDefinition(); - var1.id = var0; + byte[] var2 = ParamDefinition.ParamDefinition_archive.takeFile(11, var0); + var1 = new ParamDefinition(); if (var2 != null) { var1.decode(new Buffer(var2)); } - var1.post(); - if (var1.noteTemplate != -1) { - var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note)); - } - - if (var1.notedId != -1) { - var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId)); - } - - if (var1.placeholderTemplate != -1) { - var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder)); - } - - if (!ItemDefinition.ItemDefinition_inMembersWorld && var1.isMembersOnly) { - var1.name = "Members object"; - var1.isTradable = false; - var1.groundActions = null; - var1.inventoryActions = null; - var1.shiftClickIndex = -1; - var1.team = 0; - if (var1.params != null) { - boolean var3 = false; - - for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { - ParamDefinition var5 = WorldMapIcon_1.getParamDefinition((int)var4.key); - if (var5.autoDisable) { - var4.remove(); - } else { - var3 = true; - } - } - - if (!var3) { - var1.params = null; - } - } - } - - ItemDefinition.ItemDefinition_cached.put(var1, (long)var0); + var1.postDecode(); + ParamDefinition.ParamDefinition_cached.put(var1, (long)var0); return var1; } } - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1234199679" + signature = "(II)Lim;", + garbageValue = "1232972358" ) - public static void method3587() { - FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); + @Export("WorldMapElement_get") + public static WorldMapElement WorldMapElement_get(int var0) { + return var0 >= 0 && var0 < WorldMapElement.WorldMapElement_cached.length && WorldMapElement.WorldMapElement_cached[var0] != null ? WorldMapElement.WorldMapElement_cached[var0] : new WorldMapElement(var0); + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "(ILce;ZI)I", + garbageValue = "1259067102" + ) + static int method3697(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? class186.field2331 : MidiPcmStream.field2444; + if (var0 == ScriptOpcodes.CC_GETX) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.x; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETY) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.y; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.width; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.height; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETHIDE) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETLAYER) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.parentId; + return 1; + } else { + return 2; + } } } diff --git a/runescape-client/src/main/java/PacketWriter.java b/runescape-client/src/main/java/PacketWriter.java index 0552f2c77b..0a47735dd1 100644 --- a/runescape-client/src/main/java/PacketWriter.java +++ b/runescape-client/src/main/java/PacketWriter.java @@ -5,85 +5,91 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cr") +@ObfuscatedName("ci") @Implements("PacketWriter") public class PacketWriter { - @ObfuscatedName("f") + @ObfuscatedName("or") @ObfuscatedSignature( - signature = "Lky;" + signature = "Lfi;" + ) + @Export("mouseWheel") + static MouseWheel mouseWheel; + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "Lkr;" ) @Export("socket") AbstractSocket socket; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Ljl;" + signature = "Ljj;" ) @Export("packetBufferNodes") IterableNodeDeque packetBufferNodes; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1004782805 + intValue = -1477926037 ) @Export("bufferSize") int bufferSize; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lkq;" + signature = "Lkp;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Llr;" + signature = "Llw;" ) @Export("isaacCipher") public IsaacCipher isaacCipher; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lkl;" + signature = "Lks;" ) @Export("packetBuffer") PacketBuffer packetBuffer; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lfw;" + signature = "Lgb;" ) @Export("serverPacket") ServerPacket serverPacket; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -374140173 + intValue = -184650797 ) @Export("serverPacketLength") int serverPacketLength; - @ObfuscatedName("a") - boolean field1297; - @ObfuscatedName("d") + @ObfuscatedName("j") + boolean field1301; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -597988403 + intValue = 1725214527 ) - int field1298; - @ObfuscatedName("c") + int field1299; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1139758715 + intValue = 1544276091 ) @Export("pendingWrites") int pendingWrites; - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Lfw;" + signature = "Lgb;" ) - ServerPacket field1300; + ServerPacket field1309; @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lfw;" + signature = "Lgb;" ) - ServerPacket field1301; - @ObfuscatedName("k") + ServerPacket field1305; + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lfw;" + signature = "Lgb;" ) - ServerPacket field1299; + ServerPacket field1307; PacketWriter() { this.packetBufferNodes = new IterableNodeDeque(); @@ -92,15 +98,15 @@ public class PacketWriter { this.packetBuffer = new PacketBuffer(40000); this.serverPacket = null; this.serverPacketLength = 0; - this.field1297 = true; - this.field1298 = 0; + this.field1301 = true; + this.field1299 = 0; this.pendingWrites = 0; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "-39" + garbageValue = "-10" ) @Export("clearBuffer") final void clearBuffer() { @@ -108,10 +114,10 @@ public class PacketWriter { this.bufferSize = 0; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1865358367" + garbageValue = "-1781270612" ) @Export("flush") final void flush() throws IOException { @@ -136,10 +142,10 @@ public class PacketWriter { } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lfz;I)V", - garbageValue = "-2113796206" + signature = "(Lgs;I)V", + garbageValue = "1684104708" ) @Export("addNode") public final void addNode(PacketBufferNode var1) { @@ -149,20 +155,20 @@ public class PacketWriter { this.bufferSize += var1.index; } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Lky;I)V", - garbageValue = "-180486775" + signature = "(Lkr;I)V", + garbageValue = "1771129210" ) @Export("setSocket") void setSocket(AbstractSocket var1) { this.socket = var1; } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1795782145" + garbageValue = "711577469" ) @Export("close") void close() { @@ -173,23 +179,54 @@ public class PacketWriter { } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-2001412741" + signature = "(B)V", + garbageValue = "-91" ) @Export("removeSocket") void removeSocket() { this.socket = null; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)Lky;", - garbageValue = "-160473860" + signature = "(B)Lkr;", + garbageValue = "106" ) @Export("getSocket") AbstractSocket getSocket() { return this.socket; } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(IS)Liy;", + garbageValue = "-7105" + ) + public static HealthBarDefinition method2329(int var0) { + HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var0); + var1 = new HealthBarDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(IB)Ljava/lang/String;", + garbageValue = "16" + ) + @Export("colorStartTag") + static String colorStartTag(int var0) { + return ""; + } } diff --git a/runescape-client/src/main/java/ParamDefinition.java b/runescape-client/src/main/java/ParamDefinition.java index 1655bfae4d..39d01bea1f 100644 --- a/runescape-client/src/main/java/ParamDefinition.java +++ b/runescape-client/src/main/java/ParamDefinition.java @@ -4,39 +4,34 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ij") +@ObfuscatedName("is") @Implements("ParamDefinition") public class ParamDefinition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) @Export("ParamDefinition_archive") public static AbstractArchive ParamDefinition_archive; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("ParamDefinition_cached") static EvictingDualNodeHashTable ParamDefinition_cached; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 975160711 - ) - public static int field3275; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("type") char type; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -2128344831 + intValue = -2044093609 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("autoDisable") boolean autoDisable; @@ -48,19 +43,19 @@ public class ParamDefinition extends DualNode { this.autoDisable = true; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "1" + signature = "(I)V", + garbageValue = "2127914016" ) @Export("postDecode") void postDecode() { } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkq;I)V", - garbageValue = "1148377951" + signature = "(Lkp;B)V", + garbageValue = "-2" ) @Export("decode") void decode(Buffer var1) { @@ -74,15 +69,15 @@ public class ParamDefinition extends DualNode { } } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Lkq;II)V", - garbageValue = "-301062602" + signature = "(Lkp;II)V", + garbageValue = "-372343900" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - this.type = AbstractArchive.method4124(var1.readByte()); + this.type = ServerBuild.method4209(var1.readByte()); } else if (var2 == 2) { this.defaultInt = var1.readInt(); } else if (var2 == 4) { @@ -93,51 +88,13 @@ public class ParamDefinition extends DualNode { } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-22777972" + garbageValue = "1143023141" ) @Export("isString") public boolean isString() { return this.type == 's'; } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "([Ljava/lang/String;[SIII)V", - garbageValue = "1392375255" - ) - @Export("sortItemsByName") - public static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) { - if (var2 < var3) { - int var4 = (var3 + var2) / 2; - int var5 = var2; - String var6 = var0[var4]; - var0[var4] = var0[var3]; - var0[var3] = var6; - short var7 = var1[var4]; - var1[var4] = var1[var3]; - var1[var3] = var7; - - for (int var8 = var2; var8 < var3; ++var8) { - if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { - String var9 = var0[var8]; - var0[var8] = var0[var5]; - var0[var5] = var9; - short var10 = var1[var8]; - var1[var8] = var1[var5]; - var1[var5++] = var10; - } - } - - var0[var3] = var0[var5]; - var0[var5] = var6; - var1[var3] = var1[var5]; - var1[var5] = var7; - sortItemsByName(var0, var1, var2, var5 - 1); - sortItemsByName(var0, var1, var5 + 1, var3); - } - - } } diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java index 8e95a55584..861a18aac9 100644 --- a/runescape-client/src/main/java/PcmPlayer.java +++ b/runescape-client/src/main/java/PcmPlayer.java @@ -4,190 +4,204 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cw") +@ObfuscatedName("dw") @Implements("PcmPlayer") public class PcmPlayer { - @ObfuscatedName("k") + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 565160271 + ) + public static int field1398; + @ObfuscatedName("g") + @Export("PcmPlayer_stereo") + protected static boolean PcmPlayer_stereo; + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "Lcx;" + ) + @Export("pcmPlayerProvider") + static class99 pcmPlayerProvider; + @ObfuscatedName("n") @Export("samples") protected int[] samples; - @ObfuscatedName("s") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Ldl;" + signature = "Ldn;" ) @Export("stream") PcmStream stream; - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 870880097 + intValue = -1255248085 ) - int field1372; - @ObfuscatedName("t") + int field1397; + @ObfuscatedName("k") @ObfuscatedGetter( - longValue = -2578951154982885373L + longValue = -2367758414961315653L ) @Export("timeMs") long timeMs; - @ObfuscatedName("j") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1002919953 + intValue = 1798201523 ) @Export("capacity") int capacity; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 1574476853 - ) - int field1373; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -87074955 - ) - int field1376; @ObfuscatedName("z") @ObfuscatedGetter( - longValue = 4761654115835358543L + intValue = 1072458633 ) - long field1377; - @ObfuscatedName("h") + int field1401; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 500699263 + intValue = -247116181 ) - int field1371; - @ObfuscatedName("m") + int field1403; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1630467439 + longValue = -3370414855018982157L ) - int field1382; - @ObfuscatedName("g") + long field1396; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1827156113 + intValue = 3489373 ) - int field1380; + int field1404; @ObfuscatedName("r") @ObfuscatedGetter( - longValue = -9078760105487350149L + intValue = -92983435 ) - long field1381; - @ObfuscatedName("q") - boolean field1378; + int field1405; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -658746403 + ) + int field1406; + @ObfuscatedName("a") + @ObfuscatedGetter( + longValue = -227900645038569121L + ) + long field1407; + @ObfuscatedName("u") + boolean field1408; @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 199004789 + intValue = 858322217 ) - int field1375; - @ObfuscatedName("ah") + int field1409; + @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "[Ldl;" + signature = "[Ldn;" ) - PcmStream[] field1384; - @ObfuscatedName("aq") + PcmStream[] field1410; + @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "[Ldl;" + signature = "[Ldn;" ) - PcmStream[] field1385; + PcmStream[] field1411; protected PcmPlayer() { - this.field1372 = 32; - this.timeMs = WorldMapID.currentTimeMillis(); - this.field1377 = 0L; - this.field1371 = 0; - this.field1382 = 0; - this.field1380 = 0; - this.field1381 = 0L; - this.field1378 = true; - this.field1375 = 0; - this.field1384 = new PcmStream[8]; - this.field1385 = new PcmStream[8]; + this.field1397 = 32; + this.timeMs = WorldMapIcon_0.currentTimeMillis(); + this.field1396 = 0L; + this.field1404 = 0; + this.field1405 = 0; + this.field1406 = 0; + this.field1407 = 0L; + this.field1408 = true; + this.field1409 = 0; + this.field1410 = new PcmStream[8]; + this.field1411 = new PcmStream[8]; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "15" + garbageValue = "-111" ) @Export("init") protected void init() throws Exception { } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "797185937" + garbageValue = "-871749312" ) @Export("open") protected void open(int var1) throws Exception { } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "2013132005" + garbageValue = "-164846701" ) @Export("position") protected int position() throws Exception { return this.capacity; } - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("write") protected void write() throws Exception { } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "390" + signature = "(I)V", + garbageValue = "1942741652" ) @Export("close") protected void close() { } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1127195595" + garbageValue = "2088617942" ) @Export("discard") protected void discard() throws Exception { } - @ObfuscatedName("aq") + @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "(Ldl;I)V", - garbageValue = "-126312603" + signature = "(Ldn;I)V", + garbageValue = "1817340933" ) @Export("setStream") public final synchronized void setStream(PcmStream var1) { this.stream = var1; } - @ObfuscatedName("ao") + @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "23" + signature = "(I)V", + garbageValue = "1301441901" ) @Export("run") public final synchronized void run() { if (this.samples != null) { - long var1 = WorldMapID.currentTimeMillis(); + long var1 = WorldMapIcon_0.currentTimeMillis(); try { - if (this.field1377 != 0L) { - if (var1 < this.field1377) { + if (0L != this.field1396) { + if (var1 < this.field1396) { return; } this.open(this.capacity); - this.field1377 = 0L; - this.field1378 = true; + this.field1396 = 0L; + this.field1408 = true; } int var3 = this.position(); - if (this.field1380 - var3 > this.field1371) { - this.field1371 = this.field1380 - var3; + if (this.field1406 - var3 > this.field1404) { + this.field1404 = this.field1406 - var3; } - int var4 = this.field1376 + this.field1373; + int var4 = this.field1401 + this.field1403; if (var4 + 256 > 16384) { var4 = 16128; } @@ -201,10 +215,10 @@ public class PcmPlayer { this.close(); this.open(this.capacity); var3 = 0; - this.field1378 = true; + this.field1408 = true; if (var4 + 256 > this.capacity) { var4 = this.capacity - 256; - this.field1376 = var4 - this.field1373; + this.field1403 = var4 - this.field1401; } } @@ -214,28 +228,28 @@ public class PcmPlayer { var3 += 256; } - if (var1 > this.field1381) { - if (!this.field1378) { - if (this.field1371 == 0 && this.field1382 == 0) { + if (var1 > this.field1407) { + if (!this.field1408) { + if (this.field1404 == 0 && this.field1405 == 0) { this.close(); - this.field1377 = var1 + 2000L; + this.field1396 = 2000L + var1; return; } - this.field1376 = Math.min(this.field1382, this.field1371); - this.field1382 = this.field1371; + this.field1403 = Math.min(this.field1405, this.field1404); + this.field1405 = this.field1404; } else { - this.field1378 = false; + this.field1408 = false; } - this.field1371 = 0; - this.field1381 = 2000L + var1; + this.field1404 = 0; + this.field1407 = 2000L + var1; } - this.field1380 = var3; + this.field1406 = var3; } catch (Exception var7) { this.close(); - this.field1377 = 2000L + var1; + this.field1396 = var1 + 2000L; } try { @@ -243,9 +257,9 @@ public class PcmPlayer { var1 = this.timeMs; } - while (var1 > this.timeMs + 5000L) { + while (var1 > 5000L + this.timeMs) { this.skip(256); - this.timeMs += (long)(256000 / (DirectByteArrayCopier.field2490 * -168449264)); + this.timeMs += (long)(256000 / field1398); } } catch (Exception var6) { this.timeMs = var1; @@ -254,57 +268,57 @@ public class PcmPlayer { } } - @ObfuscatedName("an") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "63" - ) - public final void method2472() { - this.field1378 = true; - } - - @ObfuscatedName("ar") + @ObfuscatedName("au") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-536403943" + garbageValue = "-569274041" + ) + public final void method2489() { + this.field1408 = true; + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "2064649037" ) @Export("tryDiscard") public final synchronized void tryDiscard() { - this.field1378 = true; + this.field1408 = true; try { this.discard(); } catch (Exception var2) { this.close(); - this.field1377 = WorldMapID.currentTimeMillis() + 2000L; + this.field1396 = WorldMapIcon_0.currentTimeMillis() + 2000L; } } - @ObfuscatedName("az") + @ObfuscatedName("aa") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-991727159" + garbageValue = "-1437480002" ) @Export("shutdown") public final synchronized void shutdown() { - if (HealthBar.soundSystem != null) { + if (UserComparator2.soundSystem != null) { boolean var1 = true; for (int var2 = 0; var2 < 2; ++var2) { - if (this == HealthBar.soundSystem.players[var2]) { - HealthBar.soundSystem.players[var2] = null; + if (this == UserComparator2.soundSystem.players[var2]) { + UserComparator2.soundSystem.players[var2] = null; } - if (HealthBar.soundSystem.players[var2] != null) { + if (UserComparator2.soundSystem.players[var2] != null) { var1 = false; } } if (var1) { - FriendSystem.soundSystemExecutor.shutdownNow(); - FriendSystem.soundSystemExecutor = null; - HealthBar.soundSystem = null; + Frames.soundSystemExecutor.shutdownNow(); + Frames.soundSystemExecutor = null; + UserComparator2.soundSystem = null; } } @@ -312,16 +326,16 @@ public class PcmPlayer { this.samples = null; } - @ObfuscatedName("ay") + @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1228622505" + signature = "(IB)V", + garbageValue = "6" ) @Export("skip") final void skip(int var1) { - this.field1375 -= var1; - if (this.field1375 < 0) { - this.field1375 = 0; + this.field1409 -= var1; + if (this.field1409 < 0) { + this.field1409 = 0; } if (this.stream != null) { @@ -330,20 +344,20 @@ public class PcmPlayer { } - @ObfuscatedName("ag") + @ObfuscatedName("as") @Export("fill") final void fill(int[] var1, int var2) { int var3 = var2; - if (SoundCache.PcmPlayer_stereo) { + if (PcmPlayer_stereo) { var3 = var2 << 1; } - class300.clearIntArray(var1, 0, var3); - this.field1375 -= var2; - if (this.stream != null && this.field1375 <= 0) { - this.field1375 += DirectByteArrayCopier.field2490 * -168449264 >> 4; - ChatChannel.PcmStream_disable(this.stream); - this.method2432(this.stream, this.stream.vmethod2716()); + class301.clearIntArray(var1, 0, var3); + this.field1409 -= var2; + if (this.stream != null && this.field1409 <= 0) { + this.field1409 += field1398 >> 4; + class65.PcmStream_disable(this.stream); + this.method2494(this.stream, this.stream.vmethod2777()); int var4 = 0; int var5 = 255; @@ -365,7 +379,7 @@ public class PcmPlayer { if ((var9 & 1) != 0) { var5 &= ~(1 << var7); var10 = null; - PcmStream var11 = this.field1384[var7]; + PcmStream var11 = this.field1410[var7]; label98: while (true) { @@ -381,33 +395,33 @@ public class PcmPlayer { var11 = var11.after; } else { var11.active = true; - int var13 = var11.vmethod3889(); + int var13 = var11.vmethod3965(); var4 += var13; if (var12 != null) { var12.position += var13; } - if (var4 >= this.field1372) { + if (var4 >= this.field1397) { break label104; } PcmStream var14 = var11.firstSubStream(); if (var14 != null) { - for (int var15 = var11.field1454; var14 != null; var14 = var11.nextSubStream()) { - this.method2432(var14, var15 * var14.vmethod2716() >> 8); + for (int var15 = var11.field1478; var14 != null; var14 = var11.nextSubStream()) { + this.method2494(var14, var15 * var14.vmethod2777() >> 8); } } PcmStream var18 = var11.after; var11.after = null; if (var10 == null) { - this.field1384[var7] = var18; + this.field1410[var7] = var18; } else { var10.after = var18; } if (var18 == null) { - this.field1385[var7] = var10; + this.field1411[var7] = var10; } var11 = var18; @@ -422,9 +436,9 @@ public class PcmPlayer { } for (var6 = 0; var6 < 8; ++var6) { - PcmStream var16 = this.field1384[var6]; - PcmStream[] var17 = this.field1384; - this.field1385[var6] = null; + PcmStream var16 = this.field1410[var6]; + PcmStream[] var17 = this.field1410; + this.field1411[var6] = null; for (var17[var6] = null; var16 != null; var16 = var10) { var10 = var16.after; @@ -433,39 +447,39 @@ public class PcmPlayer { } } - if (this.field1375 < 0) { - this.field1375 = 0; + if (this.field1409 < 0) { + this.field1409 = 0; } if (this.stream != null) { this.stream.fill(var1, 0, var2); } - this.timeMs = WorldMapID.currentTimeMillis(); + this.timeMs = WorldMapIcon_0.currentTimeMillis(); } - @ObfuscatedName("al") + @ObfuscatedName("ac") @ObfuscatedSignature( - signature = "(Ldl;II)V", - garbageValue = "-919759733" + signature = "(Ldn;II)V", + garbageValue = "-1216223626" ) - final void method2432(PcmStream var1, int var2) { + final void method2494(PcmStream var1, int var2) { int var3 = var2 >> 5; - PcmStream var4 = this.field1385[var3]; + PcmStream var4 = this.field1411[var3]; if (var4 == null) { - this.field1384[var3] = var1; + this.field1410[var3] = var1; } else { var4.after = var1; } - this.field1385[var3] = var1; - var1.field1454 = var2; + this.field1411[var3] = var1; + var1.field1478 = var2; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "1686341177" + garbageValue = "-526155431" ) @Export("changeWorldSelectSorting") static void changeWorldSelectSorting(int var0, int var1) { @@ -485,6 +499,19 @@ public class PcmPlayer { World.World_sortOption1 = var2; World.World_sortOption2 = var3; - class192.sortWorlds(class162.World_worlds, 0, class162.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); + Interpreter.sortWorlds(class96.World_worlds, 0, class96.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); + } + + @ObfuscatedName("ki") + @ObfuscatedSignature( + signature = "(Lhn;I)Ljava/lang/String;", + garbageValue = "-1826088891" + ) + static String method2542(Widget var0) { + if (class83.method2108(WorldMapIcon_0.getWidgetClickMask(var0)) == 0) { + return null; + } else { + return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; + } } } diff --git a/runescape-client/src/main/java/PcmStream.java b/runescape-client/src/main/java/PcmStream.java index 16869375ed..aa1c9ceaf6 100644 --- a/runescape-client/src/main/java/PcmStream.java +++ b/runescape-client/src/main/java/PcmStream.java @@ -3,23 +3,23 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dl") +@ObfuscatedName("dn") @Implements("PcmStream") public abstract class PcmStream extends Node { @ObfuscatedName("w") @Export("active") volatile boolean active; - @ObfuscatedName("t") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Ldl;" + signature = "Ldn;" ) @Export("after") PcmStream after; - @ObfuscatedName("j") - int field1454; - @ObfuscatedName("n") + @ObfuscatedName("q") + int field1478; + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Lds;" + signature = "Ldd;" ) @Export("sound") AbstractSound sound; @@ -28,37 +28,37 @@ public abstract class PcmStream extends Node { this.active = true; } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "()Ldl;" + signature = "()Ldn;" ) @Export("firstSubStream") protected abstract PcmStream firstSubStream(); - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "()Ldl;" + signature = "()Ldn;" ) @Export("nextSubStream") protected abstract PcmStream nextSubStream(); - @ObfuscatedName("x") - protected abstract int vmethod3889(); + @ObfuscatedName("l") + protected abstract int vmethod3965(); - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("fill") protected abstract void fill(int[] var1, int var2, int var3); - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("skip") protected abstract void skip(int var1); - @ObfuscatedName("at") - int vmethod2716() { + @ObfuscatedName("ag") + int vmethod2777() { return 255; } - @ObfuscatedName("fn") + @ObfuscatedName("fs") @Export("update") final void update(int[] var1, int var2, int var3) { if (this.active) { diff --git a/runescape-client/src/main/java/PcmStreamMixer.java b/runescape-client/src/main/java/PcmStreamMixer.java index c4d83305c4..3303d2cf3a 100644 --- a/runescape-client/src/main/java/PcmStreamMixer.java +++ b/runescape-client/src/main/java/PcmStreamMixer.java @@ -3,152 +3,152 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cy") +@ObfuscatedName("ch") @Implements("PcmStreamMixer") public class PcmStreamMixer extends PcmStream { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Ljs;" + signature = "Ljw;" ) @Export("subStreams") NodeDeque subStreams; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Ljs;" + signature = "Ljw;" ) - NodeDeque field1303; - @ObfuscatedName("y") - int field1305; - @ObfuscatedName("p") - int field1306; + NodeDeque field1327; + @ObfuscatedName("o") + int field1329; + @ObfuscatedName("e") + int field1328; public PcmStreamMixer() { this.subStreams = new NodeDeque(); - this.field1303 = new NodeDeque(); - this.field1305 = 0; - this.field1306 = -1; + this.field1327 = new NodeDeque(); + this.field1329 = 0; + this.field1328 = -1; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ldl;)V" + signature = "(Ldn;)V" ) @Export("addSubStream") public final synchronized void addSubStream(PcmStream var1) { this.subStreams.addLast(var1); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Ldl;)V" + signature = "(Ldn;)V" ) @Export("removeSubStream") public final synchronized void removeSubStream(PcmStream var1) { var1.remove(); } - @ObfuscatedName("y") - void method2300() { - if (this.field1305 > 0) { - for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field1303.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field1303.previous()) { - var1.field1410 -= this.field1305; + @ObfuscatedName("o") + void method2352() { + if (this.field1329 > 0) { + for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field1327.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field1327.previous()) { + var1.field1435 -= this.field1329; } - this.field1306 -= this.field1305; - this.field1305 = 0; + this.field1328 -= this.field1329; + this.field1329 = 0; } } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Lgk;Ldf;)V" + signature = "(Lft;Ldi;)V" ) - void method2309(Node var1, PcmStreamMixerListener var2) { - while (this.field1303.sentinel != var1 && ((PcmStreamMixerListener)var1).field1410 <= var2.field1410) { + void method2353(Node var1, PcmStreamMixerListener var2) { + while (this.field1327.sentinel != var1 && ((PcmStreamMixerListener)var1).field1435 <= var2.field1435) { var1 = var1.previous; } NodeDeque.NodeDeque_addBefore(var2, var1); - this.field1306 = ((PcmStreamMixerListener)this.field1303.sentinel.previous).field1410; + this.field1328 = ((PcmStreamMixerListener)this.field1327.sentinel.previous).field1435; } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Ldf;)V" + signature = "(Ldi;)V" ) - void method2302(PcmStreamMixerListener var1) { + void method2354(PcmStreamMixerListener var1) { var1.remove(); var1.remove2(); - Node var2 = this.field1303.sentinel.previous; - if (var2 == this.field1303.sentinel) { - this.field1306 = -1; + Node var2 = this.field1327.sentinel.previous; + if (var2 == this.field1327.sentinel) { + this.field1328 = -1; } else { - this.field1306 = ((PcmStreamMixerListener)var2).field1410; + this.field1328 = ((PcmStreamMixerListener)var2).field1435; } } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "()Ldl;" + signature = "()Ldn;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { return (PcmStream)this.subStreams.last(); } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "()Ldl;" + signature = "()Ldn;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { return (PcmStream)this.subStreams.previous(); } - @ObfuscatedName("x") - protected int vmethod3889() { + @ObfuscatedName("l") + protected int vmethod3965() { return 0; } - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("fill") public final synchronized void fill(int[] var1, int var2, int var3) { do { - if (this.field1306 < 0) { + if (this.field1328 < 0) { this.updateSubStreams(var1, var2, var3); return; } - if (var3 + this.field1305 < this.field1306) { - this.field1305 += var3; + if (var3 + this.field1329 < this.field1328) { + this.field1329 += var3; this.updateSubStreams(var1, var2, var3); return; } - int var4 = this.field1306 - this.field1305; + int var4 = this.field1328 - this.field1329; this.updateSubStreams(var1, var2, var4); var2 += var4; var3 -= var4; - this.field1305 += var4; - this.method2300(); - PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field1303.last(); + this.field1329 += var4; + this.method2352(); + PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field1327.last(); synchronized(var5) { int var7 = var5.update(); if (var7 < 0) { - var5.field1410 = 0; - this.method2302(var5); + var5.field1435 = 0; + this.method2354(var5); } else { - var5.field1410 = var7; - this.method2309(var5.previous, var5); + var5.field1435 = var7; + this.method2353(var5.previous, var5); } } } while(var3 != 0); } - @ObfuscatedName("d") + @ObfuscatedName("m") @Export("updateSubStreams") void updateSubStreams(int[] var1, int var2, int var3) { for (PcmStream var4 = (PcmStream)this.subStreams.last(); var4 != null; var4 = (PcmStream)this.subStreams.previous()) { @@ -157,42 +157,42 @@ public class PcmStreamMixer extends PcmStream { } - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("skip") public final synchronized void skip(int var1) { do { - if (this.field1306 < 0) { + if (this.field1328 < 0) { this.skipSubStreams(var1); return; } - if (this.field1305 + var1 < this.field1306) { - this.field1305 += var1; + if (this.field1329 + var1 < this.field1328) { + this.field1329 += var1; this.skipSubStreams(var1); return; } - int var2 = this.field1306 - this.field1305; + int var2 = this.field1328 - this.field1329; this.skipSubStreams(var2); var1 -= var2; - this.field1305 += var2; - this.method2300(); - PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field1303.last(); + this.field1329 += var2; + this.method2352(); + PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field1327.last(); synchronized(var3) { int var5 = var3.update(); if (var5 < 0) { - var3.field1410 = 0; - this.method2302(var3); + var3.field1435 = 0; + this.method2354(var3); } else { - var3.field1410 = var5; - this.method2309(var3.previous, var3); + var3.field1435 = var5; + this.method2353(var3.previous, var3); } } } while(var1 != 0); } - @ObfuscatedName("o") + @ObfuscatedName("h") @Export("skipSubStreams") void skipSubStreams(int var1) { for (PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) { diff --git a/runescape-client/src/main/java/PcmStreamMixerListener.java b/runescape-client/src/main/java/PcmStreamMixerListener.java index dd9c888307..26dc054880 100644 --- a/runescape-client/src/main/java/PcmStreamMixerListener.java +++ b/runescape-client/src/main/java/PcmStreamMixerListener.java @@ -3,19 +3,19 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("df") +@ObfuscatedName("di") @Implements("PcmStreamMixerListener") public abstract class PcmStreamMixerListener extends Node { - @ObfuscatedName("f") - int field1410; + @ObfuscatedName("c") + int field1435; - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("remove2") abstract void remove2(); - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lcy;)I" + signature = "(Lch;)I" ) @Export("update") abstract int update(); diff --git a/runescape-client/src/main/java/PendingSpawn.java b/runescape-client/src/main/java/PendingSpawn.java index e6e10180cd..9b953d8f66 100644 --- a/runescape-client/src/main/java/PendingSpawn.java +++ b/runescape-client/src/main/java/PendingSpawn.java @@ -2,76 +2,89 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bh") +@ObfuscatedName("bs") @Implements("PendingSpawn") public final class PendingSpawn extends Node { - @ObfuscatedName("f") + @ObfuscatedName("sx") + @ObfuscatedSignature( + signature = "Ld;" + ) + @Export("grandExchangeEvents") + static GrandExchangeEvents grandExchangeEvents; + @ObfuscatedName("hu") @ObfuscatedGetter( - intValue = 844166729 + intValue = -1923954935 + ) + @Export("oculusOrbFocalPointX") + static int oculusOrbFocalPointX; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -1349370787 ) @Export("plane") int plane; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 377421093 + intValue = 304063961 ) @Export("type") int type; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1257246671 + intValue = -340804777 ) @Export("x") int x; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1319343831 + intValue = 1612075495 ) @Export("y") int y; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 2111575223 + intValue = 1762819513 ) @Export("objectId") int objectId; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -135346951 + intValue = 51558137 ) - int field911; - @ObfuscatedName("e") + int field935; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -2066167261 + intValue = 1078181875 ) - int field912; - @ObfuscatedName("x") + int field924; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -530727913 + intValue = 869281397 ) @Export("id") int id; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1202721073 + intValue = -186510347 ) @Export("orientation") int orientation; - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1258720415 + intValue = 1858623199 ) - int field918; - @ObfuscatedName("c") + int field933; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1975686607 + intValue = -260343907 ) @Export("delay") int delay; - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 614220967 + intValue = 1816335395 ) @Export("hitpoints") int hitpoints; @@ -80,4 +93,29 @@ public final class PendingSpawn extends Node { this.delay = 0; this.hitpoints = -1; } + + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "(I)Llt;", + garbageValue = "-728987489" + ) + static Sprite method1738() { + Sprite var0 = new Sprite(); + var0.width = GZipDecompressor.SpriteBuffer_spriteWidth; + var0.height = class326.SpriteBuffer_spriteHeight; + var0.xOffset = Huffman.SpriteBuffer_xOffsets[0]; + var0.yOffset = NPC.SpriteBuffer_yOffsets[0]; + var0.subWidth = class326.SpriteBuffer_spriteWidths[0]; + var0.subHeight = class326.SpriteBuffer_spriteHeights[0]; + int var1 = var0.subWidth * var0.subHeight; + byte[] var2 = class326.SpriteBuffer_pixels[0]; + var0.pixels = new int[var1]; + + for (int var3 = 0; var3 < var1; ++var3) { + var0.pixels[var3] = class326.SpriteBuffer_spritePalette[var2[var3] & 255]; + } + + DynamicObject.method2292(); + return var0; + } } diff --git a/runescape-client/src/main/java/PlatformInfo.java b/runescape-client/src/main/java/PlatformInfo.java index f742e4ec75..efbba6f3de 100644 --- a/runescape-client/src/main/java/PlatformInfo.java +++ b/runescape-client/src/main/java/PlatformInfo.java @@ -4,188 +4,188 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lx") +@ObfuscatedName("lv") @Implements("PlatformInfo") public class PlatformInfo extends Node { - @ObfuscatedName("ah") - @ObfuscatedGetter( - intValue = -156500797 - ) - int field3910; - @ObfuscatedName("aq") - boolean field3900; - @ObfuscatedName("ao") - @ObfuscatedGetter( - intValue = -2023762537 - ) - int field3912; - @ObfuscatedName("an") - @ObfuscatedGetter( - intValue = -1361201989 - ) - int field3928; - @ObfuscatedName("ar") - @ObfuscatedGetter( - intValue = 582354969 - ) - int field3914; - @ObfuscatedName("az") - @ObfuscatedGetter( - intValue = -1969903695 - ) - int field3916; @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 885412383 - ) - int field3901; - @ObfuscatedName("ag") - boolean field3919; - @ObfuscatedName("ac") - @ObfuscatedGetter( - intValue = -1571360447 - ) - int field3918; - @ObfuscatedName("al") - @ObfuscatedGetter( - intValue = 1817663209 - ) - int field3929; - @ObfuscatedName("ad") - @ObfuscatedGetter( - intValue = -855226187 + intValue = 673816071 ) int field3911; - @ObfuscatedName("aj") + @ObfuscatedName("aa") + boolean field3904; + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -180398763 + intValue = 1159209885 ) - int field3921; - @ObfuscatedName("ax") - String field3904; - @ObfuscatedName("at") - String field3923; - @ObfuscatedName("af") - String field3924; - @ObfuscatedName("ap") - String field3917; - @ObfuscatedName("ai") + int field3913; + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 35861657 + intValue = 2116751685 ) - int field3926; + int field3914; + @ObfuscatedName("ak") + @ObfuscatedGetter( + intValue = -1612963129 + ) + int field3915; + @ObfuscatedName("ac") + @ObfuscatedGetter( + intValue = -544797125 + ) + int field3916; + @ObfuscatedName("aw") + @ObfuscatedGetter( + intValue = 1024722961 + ) + int field3917; + @ObfuscatedName("ar") + boolean field3935; + @ObfuscatedName("av") + @ObfuscatedGetter( + intValue = 1351692389 + ) + int field3919; + @ObfuscatedName("al") + @ObfuscatedGetter( + intValue = 2094154461 + ) + int field3920; @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -1513302613 + intValue = 555115055 ) - int field3927; - @ObfuscatedName("ab") + int field3921; + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -225133915 + intValue = -2000907591 ) int field3922; - @ObfuscatedName("bj") - @ObfuscatedGetter( - intValue = -1211564883 - ) - int field3902; - @ObfuscatedName("bg") - String field3930; - @ObfuscatedName("bw") - String field3931; - @ObfuscatedName("bk") - int[] field3925; - @ObfuscatedName("bl") - @ObfuscatedGetter( - intValue = -2107690227 - ) - int field3933; - @ObfuscatedName("bq") + @ObfuscatedName("at") String field3934; + @ObfuscatedName("an") + String field3924; + @ObfuscatedName("ag") + String field3907; + @ObfuscatedName("ai") + String field3926; + @ObfuscatedName("ab") + @ObfuscatedGetter( + intValue = -2099364457 + ) + int field3927; + @ObfuscatedName("ap") + @ObfuscatedGetter( + intValue = 1890356539 + ) + int field3928; + @ObfuscatedName("ah") + @ObfuscatedGetter( + intValue = -1529496749 + ) + int field3929; + @ObfuscatedName("bq") + @ObfuscatedGetter( + intValue = -735779413 + ) + int field3930; + @ObfuscatedName("bf") + String field3931; + @ObfuscatedName("bc") + String field3932; + @ObfuscatedName("bk") + int[] field3933; + @ObfuscatedName("bb") + @ObfuscatedGetter( + intValue = -1285130001 + ) + int field3923; + @ObfuscatedName("bi") + String field3906; PlatformInfo(int var1, boolean var2, int var3, int var4, int var5, int var6, int var7, boolean var8, int var9, int var10, int var11, int var12, String var13, String var14, String var15, String var16, int var17, int var18, int var19, int var20, String var21, String var22, int[] var23, int var24, String var25) { - this.field3925 = new int[3]; - this.field3910 = var1; - this.field3900 = var2; - this.field3912 = var3; - this.field3928 = var4; - this.field3914 = var5; + this.field3933 = new int[3]; + this.field3911 = var1; + this.field3904 = var2; + this.field3913 = var3; + this.field3914 = var4; + this.field3915 = var5; this.field3916 = var6; - this.field3901 = var7; - this.field3919 = var8; - this.field3918 = var9; - this.field3929 = var10; - this.field3911 = var11; - this.field3921 = var12; - this.field3904 = var13; - this.field3923 = var14; - this.field3924 = var15; - this.field3917 = var16; - this.field3926 = var17; - this.field3927 = var18; - this.field3922 = var19; - this.field3902 = var20; - this.field3930 = var21; - this.field3931 = var22; - this.field3925 = var23; - this.field3933 = var24; - this.field3934 = var25; + this.field3917 = var7; + this.field3935 = var8; + this.field3919 = var9; + this.field3920 = var10; + this.field3921 = var11; + this.field3922 = var12; + this.field3934 = var13; + this.field3924 = var14; + this.field3907 = var15; + this.field3926 = var16; + this.field3927 = var17; + this.field3928 = var18; + this.field3929 = var19; + this.field3930 = var20; + this.field3931 = var21; + this.field3932 = var22; + this.field3933 = var23; + this.field3923 = var24; + this.field3906 = var25; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lkq;I)V", - garbageValue = "273462814" + signature = "(Lkp;I)V", + garbageValue = "-119977532" ) @Export("write") public void write(Buffer var1) { var1.writeByte(8); - var1.writeByte(this.field3910); - var1.writeByte(this.field3900 ? 1 : 0); - var1.writeShort(this.field3912); - var1.writeByte(this.field3928); + var1.writeByte(this.field3911); + var1.writeByte(this.field3904 ? 1 : 0); + var1.writeShort(this.field3913); var1.writeByte(this.field3914); + var1.writeByte(this.field3915); var1.writeByte(this.field3916); - var1.writeByte(this.field3901); - var1.writeByte(this.field3919 ? 1 : 0); - var1.writeShort(this.field3918); - var1.writeByte(this.field3929); - var1.writeMedium(this.field3911); - var1.writeShort(this.field3921); - var1.writeStringCp1252NullCircumfixed(this.field3904); - var1.writeStringCp1252NullCircumfixed(this.field3923); + var1.writeByte(this.field3917); + var1.writeByte(this.field3935 ? 1 : 0); + var1.writeShort(this.field3919); + var1.writeByte(this.field3920); + var1.writeMedium(this.field3921); + var1.writeShort(this.field3922); + var1.writeStringCp1252NullCircumfixed(this.field3934); var1.writeStringCp1252NullCircumfixed(this.field3924); - var1.writeStringCp1252NullCircumfixed(this.field3917); - var1.writeByte(this.field3927); - var1.writeShort(this.field3926); - var1.writeStringCp1252NullCircumfixed(this.field3930); + var1.writeStringCp1252NullCircumfixed(this.field3907); + var1.writeStringCp1252NullCircumfixed(this.field3926); + var1.writeByte(this.field3928); + var1.writeShort(this.field3927); var1.writeStringCp1252NullCircumfixed(this.field3931); - var1.writeByte(this.field3922); - var1.writeByte(this.field3902); + var1.writeStringCp1252NullCircumfixed(this.field3932); + var1.writeByte(this.field3929); + var1.writeByte(this.field3930); - for (int var2 = 0; var2 < this.field3925.length; ++var2) { - var1.writeInt(this.field3925[var2]); + for (int var2 = 0; var2 < this.field3933.length; ++var2) { + var1.writeInt(this.field3933[var2]); } - var1.writeInt(this.field3933); - var1.writeStringCp1252NullCircumfixed(this.field3934); + var1.writeInt(this.field3923); + var1.writeStringCp1252NullCircumfixed(this.field3906); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "19008325" + signature = "(B)I", + garbageValue = "0" ) @Export("size") public int size() { byte var1 = 39; - int var2 = var1 + class290.method5375(this.field3904); - var2 += class290.method5375(this.field3923); - var2 += class290.method5375(this.field3924); - var2 += class290.method5375(this.field3917); - var2 += class290.method5375(this.field3930); - var2 += class290.method5375(this.field3931); - var2 += class290.method5375(this.field3934); + int var2 = var1 + DirectByteArrayCopier.method4012(this.field3934); + var2 += DirectByteArrayCopier.method4012(this.field3924); + var2 += DirectByteArrayCopier.method4012(this.field3907); + var2 += DirectByteArrayCopier.method4012(this.field3926); + var2 += DirectByteArrayCopier.method4012(this.field3931); + var2 += DirectByteArrayCopier.method4012(this.field3932); + var2 += DirectByteArrayCopier.method4012(this.field3906); return var2; } } diff --git a/runescape-client/src/main/java/PlatformInfoProvider.java b/runescape-client/src/main/java/PlatformInfoProvider.java index 7a6afddfcf..5ea4609603 100644 --- a/runescape-client/src/main/java/PlatformInfoProvider.java +++ b/runescape-client/src/main/java/PlatformInfoProvider.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ly") +@ObfuscatedName("lz") @Implements("PlatformInfoProvider") public interface PlatformInfoProvider { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)Llx;", - garbageValue = "-83" + signature = "(I)Llv;", + garbageValue = "-1317089795" ) @Export("get") PlatformInfo get(); diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index 42d872d635..38cc66e09f 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -5,155 +5,155 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bn") +@ObfuscatedName("ba") @Implements("Player") public final class Player extends Actor { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Ljc;" + signature = "Ljz;" ) @Export("username") Username username; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lhh;" + signature = "Lhp;" ) @Export("appearance") PlayerAppearance appearance; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1331202431 + intValue = -791182983 ) @Export("headIconPk") int headIconPk; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -977239285 + intValue = -2135485127 ) @Export("headIconPrayer") int headIconPrayer; - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("actions") String[] actions; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 2063784201 + intValue = 1334071439 ) @Export("combatLevel") int combatLevel; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 431369415 + intValue = 31608153 ) @Export("skillLevel") int skillLevel; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1361668867 + intValue = -595586759 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 633706155 + intValue = 492199091 ) @Export("animationCycleStart") int animationCycleStart; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 477981213 + intValue = 1158770925 ) @Export("animationCycleEnd") int animationCycleEnd; - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 771140369 + intValue = -1060371069 ) - int field601; + int field622; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 762347849 + intValue = 1973913223 ) @Export("tileHeight2") int tileHeight2; - @ObfuscatedName("k") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1786689969 + intValue = -89254999 ) - int field603; - @ObfuscatedName("s") + int field620; + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Ldw;" + signature = "Ldx;" ) @Export("model0") Model model0; - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1075037713 + intValue = 94473955 ) - int field605; - @ObfuscatedName("t") + int field626; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1536061617 + intValue = 1646253599 ) - int field606; - @ObfuscatedName("j") + int field627; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -103180295 + intValue = 18993525 ) - int field607; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -1426578557 - ) - int field608; - @ObfuscatedName("u") - @Export("isUnanimated") - boolean isUnanimated; + int field628; @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 897057987 + intValue = 1302670611 + ) + int field629; + @ObfuscatedName("y") + @Export("isUnanimated") + boolean isUnanimated; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -1851536029 ) @Export("team") int team; - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("isHidden") boolean isHidden; - @ObfuscatedName("m") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 617269877 + intValue = 418590373 ) @Export("plane") int plane; - @ObfuscatedName("g") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1252308221 + intValue = -895014683 ) @Export("index") int index; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Ljf;" + signature = "Lju;" ) @Export("isFriendTriBool") TriBool isFriendTriBool; - @ObfuscatedName("q") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Ljf;" + signature = "Lju;" ) @Export("isInClanChat") TriBool isInClanChat; - @ObfuscatedName("aa") - boolean field616; - @ObfuscatedName("av") + @ObfuscatedName("ae") + boolean field621; + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -1337085729 + intValue = 1551600703 ) @Export("tileX") int tileX; - @ObfuscatedName("aw") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 469043067 + intValue = 212383731 ) @Export("tileY") int tileY; @@ -176,13 +176,13 @@ public final class Player extends Actor { this.isHidden = false; this.isFriendTriBool = TriBool.TriBool_unknown; this.isInClanChat = TriBool.TriBool_unknown; - this.field616 = false; + this.field621 = false; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lkq;B)V", - garbageValue = "-42" + signature = "(Lkp;B)V", + garbageValue = "20" ) @Export("read") final void read(Buffer var1) { @@ -209,7 +209,7 @@ public final class Player extends Actor { } if (var4[var5] >= 512) { - int var8 = PacketBufferNode.ItemDefinition_get(var4[var5] - 512).team; + int var8 = HealthBarDefinition.ItemDefinition_get(var4[var5] - 512).team; if (var8 != 0) { this.team = var8; } @@ -221,7 +221,7 @@ public final class Player extends Actor { for (var6 = 0; var6 < 5; ++var6) { var7 = var1.readUnsignedByte(); - if (var7 < 0 || var7 >= WorldMapSection1.field269[var6].length) { + if (var7 < 0 || var7 >= PlayerAppearance.field2545[var6].length) { var7 = 0; } @@ -264,10 +264,10 @@ public final class Player extends Actor { super.runSequence = -1; } - this.username = new Username(var1.readStringCp1252NullTerminated(), class188.loginType); + this.username = new Username(var1.readStringCp1252NullTerminated(), class192.loginType); this.clearIsFriend(); this.clearIsInClanChat(); - if (this == Message.localPlayer) { + if (this == class192.localPlayer) { RunException.localPlayerName = this.username.getName(); } @@ -285,10 +285,10 @@ public final class Player extends Actor { this.appearance.update(var4, var9, var2 == 1, var3); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-2131627106" + garbageValue = "-1723343174" ) @Export("isFriend") boolean isFriend() { @@ -299,30 +299,30 @@ public final class Player extends Actor { return this.isFriendTriBool == TriBool.TriBool_true; } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1114296910" + signature = "(B)V", + garbageValue = "-55" ) @Export("clearIsFriend") void clearIsFriend() { this.isFriendTriBool = TriBool.TriBool_unknown; } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1782009211" + garbageValue = "-379994373" ) @Export("checkIsFriend") void checkIsFriend() { - this.isFriendTriBool = Message.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isFriendTriBool = KeyHandler.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "60" + signature = "(I)Z", + garbageValue = "-1808500524" ) @Export("isClanMember") boolean isClanMember() { @@ -333,48 +333,48 @@ public final class Player extends Actor { return this.isInClanChat == TriBool.TriBool_true; } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "66" + signature = "(I)V", + garbageValue = "752660623" ) @Export("clearIsInClanChat") void clearIsInClanChat() { this.isInClanChat = TriBool.TriBool_unknown; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-188049254" + garbageValue = "2107067145" ) @Export("updateIsInClanChat") void updateIsInClanChat() { - this.isInClanChat = Calendar.clanChat != null && Calendar.clanChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isInClanChat = InterfaceParent.clanChat != null && InterfaceParent.clanChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-416425004" + garbageValue = "2147227009" ) @Export("transformedSize") int transformedSize() { - return this.appearance != null && this.appearance.npcTransformId != -1 ? AbstractUserComparator.getNpcDefinition(this.appearance.npcTransformId).size : 1; + return this.appearance != null && this.appearance.npcTransformId != -1 ? NetCache.getNpcDefinition(this.appearance.npcTransformId).size : 1; } - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)Ldw;", - garbageValue = "822221372" + signature = "(I)Ldx;", + garbageValue = "-2133076860" ) @Export("getModel") protected final Model getModel() { if (this.appearance == null) { return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? WorldMapSection0.SequenceDefinition_get(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence != -1 && !this.isUnanimated && (super.movementSequence != super.readySequence || var1 == null) ? WorldMapSection0.SequenceDefinition_get(super.movementSequence) : null; + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? GraphicsDefaults.SequenceDefinition_get(super.sequence) : null; + SequenceDefinition var2 = super.movementSequence != -1 && !this.isUnanimated && (super.movementSequence != super.readySequence || var1 == null) ? GraphicsDefaults.SequenceDefinition_get(super.movementSequence) : null; Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); if (var3 == null) { return null; @@ -384,9 +384,9 @@ public final class Player extends Actor { Model var4; Model[] var5; if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { - var4 = ClientPacket.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); + var4 = class65.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); if (var4 != null) { - var4.offsetBy(0, -super.field963, 0); + var4.offsetBy(0, -super.field980, 0); var5 = new Model[]{var3, var4}; var3 = new Model(var5, 2); } @@ -399,7 +399,7 @@ public final class Player extends Actor { if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { var4 = this.model0; - var4.offsetBy(this.field601 * 4096 - super.x, this.tileHeight2 - this.tileHeight, this.field603 * 4096 - super.y); + var4.offsetBy(this.field622 * 4096 - super.x, this.tileHeight2 - this.tileHeight, this.field620 * 4096 - super.y); if (super.orientation == 512) { var4.rotateY90Ccw(); var4.rotateY90Ccw(); @@ -424,7 +424,7 @@ public final class Player extends Actor { var4.rotateY90Ccw(); } - var4.offsetBy(super.x - this.field601 * 4096, this.tileHeight - this.tileHeight2, super.y - this.field603 * 4096); + var4.offsetBy(super.x - this.field622 * 4096, this.tileHeight - this.tileHeight2, super.y - this.field620 * 4096); } } @@ -434,17 +434,17 @@ public final class Player extends Actor { } } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IIBI)V", - garbageValue = "1025899356" + signature = "(IIBB)V", + garbageValue = "74" ) - final void method1261(int var1, int var2, byte var3) { - if (super.sequence != -1 && WorldMapSection0.SequenceDefinition_get(super.sequence).field3493 == 1) { + final void method1266(int var1, int var2, byte var3) { + if (super.sequence != -1 && GraphicsDefaults.SequenceDefinition_get(super.sequence).field3524 == 1) { super.sequence = -1; } - super.field960 = -1; + super.field967 = -1; if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) { if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) { if (var3 == 2) { @@ -454,381 +454,57 @@ public final class Player extends Actor { int var7 = this.transformedSize(); if (var5 >= var7 && var5 < 104 - var7 && var6 >= var7 && var6 < 104 - var7 && var1 >= var7 && var1 < 104 - var7 && var2 >= var7 && var2 < 104 - var7) { int var9 = this.transformedSize(); - Client.field902.approxDestinationX = var1; - Client.field902.approxDestinationY = var2; - Client.field902.approxDestinationSizeX = 1; - Client.field902.approxDestinationSizeY = 1; - class65 var10 = Client.field902; - class65 var11 = var10; + Client.field809.approxDestinationX = var1; + Client.field809.approxDestinationY = var2; + Client.field809.approxDestinationSizeX = 1; + Client.field809.approxDestinationSizeY = 1; + class65 var10 = Client.field809; CollisionMap var12 = Client.collisionMaps[this.plane]; - int[] var13 = Client.field903; - int[] var14 = Client.field730; + int[] var13 = Client.field920; + int[] var14 = Client.field921; int var15 = 0; - label733: + label244: while (true) { int var16; if (var15 >= 128) { - int var17; - int var18; - byte var20; - int var21; - int var22; - int var24; - int var26; - int var27; - int var28; - int var29; - boolean var35; - int var37; - int var38; - int var40; + boolean var34; if (var9 == 1) { - var35 = class14.method158(var5, var6, var10, var12); + var34 = UserList.method5167(var5, var6, var10, var12); + } else if (var9 == 2) { + var34 = World.method1770(var5, var6, var10, var12); } else { - byte var19; - byte var23; - int[][] var34; - boolean var36; - if (var9 == 2) { - var17 = var5; - var18 = var6; - var19 = 64; - var20 = 64; - var21 = var5 - var19; - var22 = var6 - var20; - class173.directions[var19][var20] = 99; - class173.distances[var19][var20] = 0; - var23 = 0; - var24 = 0; - class173.bufferX[var23] = var5; - var40 = var23 + 1; - class173.bufferY[var23] = var6; - var34 = var12.flags; - - while (true) { - if (var24 == var40) { - class268.field3524 = var17; - class173.field2072 = var18; - var36 = false; - break; - } - - var17 = class173.bufferX[var24]; - var18 = class173.bufferY[var24]; - var24 = var24 + 1 & 4095; - var37 = var17 - var21; - var38 = var18 - var22; - var26 = var17 - var12.xInset; - var27 = var18 - var12.yInset; - if (var11.hasArrived(2, var17, var18, var12)) { - class268.field3524 = var17; - class173.field2072 = var18; - var36 = true; - break; - } - - var28 = class173.distances[var37][var38] + 1; - if (var37 > 0 && class173.directions[var37 - 1][var38] == 0 && (var34[var26 - 1][var27] & 19136782) == 0 && (var34[var26 - 1][var27 + 1] & 19136824) == 0) { - class173.bufferX[var40] = var17 - 1; - class173.bufferY[var40] = var18; - var40 = var40 + 1 & 4095; - class173.directions[var37 - 1][var38] = 2; - class173.distances[var37 - 1][var38] = var28; - } - - if (var37 < 126 && class173.directions[var37 + 1][var38] == 0 && (var34[var26 + 2][var27] & 19136899) == 0 && (var34[var26 + 2][var27 + 1] & 19136992) == 0) { - class173.bufferX[var40] = var17 + 1; - class173.bufferY[var40] = var18; - var40 = var40 + 1 & 4095; - class173.directions[var37 + 1][var38] = 8; - class173.distances[var37 + 1][var38] = var28; - } - - if (var38 > 0 && class173.directions[var37][var38 - 1] == 0 && (var34[var26][var27 - 1] & 19136782) == 0 && (var34[var26 + 1][var27 - 1] & 19136899) == 0) { - class173.bufferX[var40] = var17; - class173.bufferY[var40] = var18 - 1; - var40 = var40 + 1 & 4095; - class173.directions[var37][var38 - 1] = 1; - class173.distances[var37][var38 - 1] = var28; - } - - if (var38 < 126 && class173.directions[var37][var38 + 1] == 0 && (var34[var26][var27 + 2] & 19136824) == 0 && (var34[var26 + 1][var27 + 2] & 19136992) == 0) { - class173.bufferX[var40] = var17; - class173.bufferY[var40] = var18 + 1; - var40 = var40 + 1 & 4095; - class173.directions[var37][var38 + 1] = 4; - class173.distances[var37][var38 + 1] = var28; - } - - if (var37 > 0 && var38 > 0 && class173.directions[var37 - 1][var38 - 1] == 0 && (var34[var26 - 1][var27] & 19136830) == 0 && (var34[var26 - 1][var27 - 1] & 19136782) == 0 && (var34[var26][var27 - 1] & 19136911) == 0) { - class173.bufferX[var40] = var17 - 1; - class173.bufferY[var40] = var18 - 1; - var40 = var40 + 1 & 4095; - class173.directions[var37 - 1][var38 - 1] = 3; - class173.distances[var37 - 1][var38 - 1] = var28; - } - - if (var37 < 126 && var38 > 0 && class173.directions[var37 + 1][var38 - 1] == 0 && (var34[var26 + 1][var27 - 1] & 19136911) == 0 && (var34[var26 + 2][var27 - 1] & 19136899) == 0 && (var34[var26 + 2][var27] & 19136995) == 0) { - class173.bufferX[var40] = var17 + 1; - class173.bufferY[var40] = var18 - 1; - var40 = var40 + 1 & 4095; - class173.directions[var37 + 1][var38 - 1] = 9; - class173.distances[var37 + 1][var38 - 1] = var28; - } - - if (var37 > 0 && var38 < 126 && class173.directions[var37 - 1][var38 + 1] == 0 && (var34[var26 - 1][var27 + 1] & 19136830) == 0 && (var34[var26 - 1][var27 + 2] & 19136824) == 0 && (var34[var26][var27 + 2] & 19137016) == 0) { - class173.bufferX[var40] = var17 - 1; - class173.bufferY[var40] = var18 + 1; - var40 = var40 + 1 & 4095; - class173.directions[var37 - 1][var38 + 1] = 6; - class173.distances[var37 - 1][var38 + 1] = var28; - } - - if (var37 < 126 && var38 < 126 && class173.directions[var37 + 1][var38 + 1] == 0 && (var34[var26 + 1][var27 + 2] & 19137016) == 0 && (var34[var26 + 2][var27 + 2] & 19136992) == 0 && (var34[var26 + 2][var27 + 1] & 19136995) == 0) { - class173.bufferX[var40] = var17 + 1; - class173.bufferY[var40] = var18 + 1; - var40 = var40 + 1 & 4095; - class173.directions[var37 + 1][var38 + 1] = 12; - class173.distances[var37 + 1][var38 + 1] = var28; - } - } - - var35 = var36; - } else { - var17 = var5; - var18 = var6; - var19 = 64; - var20 = 64; - var21 = var5 - var19; - var22 = var6 - var20; - class173.directions[var19][var20] = 99; - class173.distances[var19][var20] = 0; - var23 = 0; - var24 = 0; - class173.bufferX[var23] = var5; - var40 = var23 + 1; - class173.bufferY[var23] = var6; - var34 = var12.flags; - - label711: - while (true) { - label709: - while (true) { - do { - do { - do { - label686: - do { - if (var24 == var40) { - class268.field3524 = var17; - class173.field2072 = var18; - var36 = false; - break label711; - } - - var17 = class173.bufferX[var24]; - var18 = class173.bufferY[var24]; - var24 = var24 + 1 & 4095; - var37 = var17 - var21; - var38 = var18 - var22; - var26 = var17 - var12.xInset; - var27 = var18 - var12.yInset; - if (var11.hasArrived(var9, var17, var18, var12)) { - class268.field3524 = var17; - class173.field2072 = var18; - var36 = true; - break label711; - } - - var28 = class173.distances[var37][var38] + 1; - if (var37 > 0 && class173.directions[var37 - 1][var38] == 0 && (var34[var26 - 1][var27] & 19136782) == 0 && (var34[var26 - 1][var27 + var9 - 1] & 19136824) == 0) { - var29 = 1; - - while (true) { - if (var29 >= var9 - 1) { - class173.bufferX[var40] = var17 - 1; - class173.bufferY[var40] = var18; - var40 = var40 + 1 & 4095; - class173.directions[var37 - 1][var38] = 2; - class173.distances[var37 - 1][var38] = var28; - break; - } - - if ((var34[var26 - 1][var29 + var27] & 19136830) != 0) { - break; - } - - ++var29; - } - } - - if (var37 < 128 - var9 && class173.directions[var37 + 1][var38] == 0 && (var34[var9 + var26][var27] & 19136899) == 0 && (var34[var9 + var26][var9 + var27 - 1] & 19136992) == 0) { - var29 = 1; - - while (true) { - if (var29 >= var9 - 1) { - class173.bufferX[var40] = var17 + 1; - class173.bufferY[var40] = var18; - var40 = var40 + 1 & 4095; - class173.directions[var37 + 1][var38] = 8; - class173.distances[var37 + 1][var38] = var28; - break; - } - - if ((var34[var9 + var26][var29 + var27] & 19136995) != 0) { - break; - } - - ++var29; - } - } - - if (var38 > 0 && class173.directions[var37][var38 - 1] == 0 && (var34[var26][var27 - 1] & 19136782) == 0 && (var34[var26 + var9 - 1][var27 - 1] & 19136899) == 0) { - var29 = 1; - - while (true) { - if (var29 >= var9 - 1) { - class173.bufferX[var40] = var17; - class173.bufferY[var40] = var18 - 1; - var40 = var40 + 1 & 4095; - class173.directions[var37][var38 - 1] = 1; - class173.distances[var37][var38 - 1] = var28; - break; - } - - if ((var34[var29 + var26][var27 - 1] & 19136911) != 0) { - break; - } - - ++var29; - } - } - - if (var38 < 128 - var9 && class173.directions[var37][var38 + 1] == 0 && (var34[var26][var9 + var27] & 19136824) == 0 && (var34[var9 + var26 - 1][var9 + var27] & 19136992) == 0) { - var29 = 1; - - while (true) { - if (var29 >= var9 - 1) { - class173.bufferX[var40] = var17; - class173.bufferY[var40] = var18 + 1; - var40 = var40 + 1 & 4095; - class173.directions[var37][var38 + 1] = 4; - class173.distances[var37][var38 + 1] = var28; - break; - } - - if ((var34[var26 + var29][var9 + var27] & 19137016) != 0) { - break; - } - - ++var29; - } - } - - if (var37 > 0 && var38 > 0 && class173.directions[var37 - 1][var38 - 1] == 0 && (var34[var26 - 1][var27 - 1] & 19136782) == 0) { - var29 = 1; - - while (true) { - if (var29 >= var9) { - class173.bufferX[var40] = var17 - 1; - class173.bufferY[var40] = var18 - 1; - var40 = var40 + 1 & 4095; - class173.directions[var37 - 1][var38 - 1] = 3; - class173.distances[var37 - 1][var38 - 1] = var28; - break; - } - - if ((var34[var26 - 1][var29 + (var27 - 1)] & 19136830) != 0 || (var34[var29 + (var26 - 1)][var27 - 1] & 19136911) != 0) { - break; - } - - ++var29; - } - } - - if (var37 < 128 - var9 && var38 > 0 && class173.directions[var37 + 1][var38 - 1] == 0 && (var34[var26 + var9][var27 - 1] & 19136899) == 0) { - var29 = 1; - - while (true) { - if (var29 >= var9) { - class173.bufferX[var40] = var17 + 1; - class173.bufferY[var40] = var18 - 1; - var40 = var40 + 1 & 4095; - class173.directions[var37 + 1][var38 - 1] = 9; - class173.distances[var37 + 1][var38 - 1] = var28; - break; - } - - if ((var34[var26 + var9][var29 + (var27 - 1)] & 19136995) != 0 || (var34[var29 + var26][var27 - 1] & 19136911) != 0) { - break; - } - - ++var29; - } - } - - if (var37 > 0 && var38 < 128 - var9 && class173.directions[var37 - 1][var38 + 1] == 0 && (var34[var26 - 1][var9 + var27] & 19136824) == 0) { - for (var29 = 1; var29 < var9; ++var29) { - if ((var34[var26 - 1][var27 + var29] & 19136830) != 0 || (var34[var29 + (var26 - 1)][var27 + var9] & 19137016) != 0) { - continue label686; - } - } - - class173.bufferX[var40] = var17 - 1; - class173.bufferY[var40] = var18 + 1; - var40 = var40 + 1 & 4095; - class173.directions[var37 - 1][var38 + 1] = 6; - class173.distances[var37 - 1][var38 + 1] = var28; - } - } while(var37 >= 128 - var9); - } while(var38 >= 128 - var9); - } while(class173.directions[var37 + 1][var38 + 1] != 0); - } while((var34[var9 + var26][var9 + var27] & 19136992) != 0); - - for (var29 = 1; var29 < var9; ++var29) { - if ((var34[var29 + var26][var9 + var27] & 19137016) != 0 || (var34[var26 + var9][var27 + var29] & 19136995) != 0) { - continue label709; - } - } - - class173.bufferX[var40] = var17 + 1; - class173.bufferY[var40] = var18 + 1; - var40 = var40 + 1 & 4095; - class173.directions[var37 + 1][var38 + 1] = 12; - class173.distances[var37 + 1][var38 + 1] = var28; - } - } - - var35 = var36; - } + var34 = WorldMapDecoration.method346(var5, var6, var9, var10, var12); } int var8; - label774: { + label265: { var16 = var5 - 64; - var17 = var6 - 64; - var18 = class268.field3524; - var37 = class173.field2072; - if (!var35) { - var38 = Integer.MAX_VALUE; + int var17 = var6 - 64; + int var18 = ChatChannel.field1289; + int var19 = class173.field2093; + int var20; + int var21; + int var23; + if (!var34) { + var20 = Integer.MAX_VALUE; var21 = Integer.MAX_VALUE; - byte var39 = 10; - var40 = var11.approxDestinationX; - var24 = var11.approxDestinationY; - int var25 = var11.approxDestinationSizeX; - var26 = var11.approxDestinationSizeY; + byte var22 = 10; + var23 = var10.approxDestinationX; + int var24 = var10.approxDestinationY; + int var25 = var10.approxDestinationSizeX; + int var26 = var10.approxDestinationSizeY; - for (var27 = var40 - var39; var27 <= var39 + var40; ++var27) { - for (var28 = var24 - var39; var28 <= var39 + var24; ++var28) { - var29 = var27 - var16; + for (int var27 = var23 - var22; var27 <= var23 + var22; ++var27) { + for (int var28 = var24 - var22; var28 <= var24 + var22; ++var28) { + int var29 = var27 - var16; int var30 = var28 - var17; if (var29 >= 0 && var30 >= 0 && var29 < 128 && var30 < 128 && class173.distances[var29][var30] < 100) { int var31 = 0; - if (var27 < var40) { - var31 = var40 - var27; - } else if (var27 > var40 + var25 - 1) { - var31 = var27 - (var25 + var40 - 1); + if (var27 < var23) { + var31 = var23 - var27; + } else if (var27 > var23 + var25 - 1) { + var31 = var27 - (var23 + var25 - 1); } int var32 = 0; @@ -839,35 +515,36 @@ public final class Player extends Actor { } int var33 = var31 * var31 + var32 * var32; - if (var33 < var38 || var38 == var33 && class173.distances[var29][var30] < var21) { - var38 = var33; + if (var33 < var20 || var33 == var20 && class173.distances[var29][var30] < var21) { + var20 = var33; var21 = class173.distances[var29][var30]; var18 = var27; - var37 = var28; + var19 = var28; } } } } - if (var38 == Integer.MAX_VALUE) { + if (var20 == Integer.MAX_VALUE) { var8 = -1; - break label774; + break label265; } } - if (var5 == var18 && var6 == var37) { + if (var18 == var5 && var19 == var6) { var8 = 0; } else { - var20 = 0; - class173.bufferX[var20] = var18; - var38 = var20 + 1; - class173.bufferY[var20] = var37; + byte var36 = 0; + class173.bufferX[var36] = var18; + var20 = var36 + 1; + class173.bufferY[var36] = var19; - for (var21 = var22 = class173.directions[var18 - var16][var37 - var17]; var5 != var18 || var6 != var37; var21 = class173.directions[var18 - var16][var37 - var17]) { - if (var22 != var21) { - var22 = var21; - class173.bufferX[var38] = var18; - class173.bufferY[var38++] = var37; + int var37; + for (var21 = var37 = class173.directions[var18 - var16][var19 - var17]; var18 != var5 || var6 != var19; var21 = class173.directions[var18 - var16][var19 - var17]) { + if (var21 != var37) { + var37 = var21; + class173.bufferX[var20] = var18; + class173.bufferY[var20++] = var19; } if ((var21 & 2) != 0) { @@ -877,23 +554,23 @@ public final class Player extends Actor { } if ((var21 & 1) != 0) { - ++var37; + ++var19; } else if ((var21 & 4) != 0) { - --var37; + --var19; } } - var40 = 0; + var23 = 0; - while (var38-- > 0) { - var13[var40] = class173.bufferX[var38]; - var14[var40++] = class173.bufferY[var38]; - if (var40 >= var13.length) { + while (var20-- > 0) { + var13[var23] = class173.bufferX[var20]; + var14[var23++] = class173.bufferY[var20]; + if (var23 >= var13.length) { break; } } - var8 = var40; + var8 = var23; } } @@ -906,10 +583,10 @@ public final class Player extends Actor { while (true) { if (var16 >= var15 - 1) { - break label733; + break label244; } - var4.method1246(Client.field903[var16], Client.field730[var16], (byte)2); + var4.method1268(Client.field920[var16], Client.field921[var16], (byte)2); ++var16; } } @@ -924,7 +601,7 @@ public final class Player extends Actor { } } - this.method1246(var1, var2, var3); + this.method1268(var1, var2, var3); } else { this.resetPath(var1, var2); } @@ -934,29 +611,29 @@ public final class Player extends Actor { } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "16" + signature = "(III)V", + garbageValue = "-1389622886" ) @Export("resetPath") void resetPath(int var1, int var2) { super.pathLength = 0; - super.field926 = 0; - super.field980 = 0; + super.field998 = 0; + super.field997 = 0; super.pathX[0] = var1; super.pathY[0] = var2; int var3 = this.transformedSize(); - super.x = var3 * 64 + super.pathX[0] * 128; + super.x = super.pathX[0] * 128 + var3 * 64; super.y = var3 * 64 + super.pathY[0] * 128; } - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedSignature( signature = "(IIBI)V", - garbageValue = "-1970800516" + garbageValue = "1525296434" ) - final void method1246(int var1, int var2, byte var3) { + final void method1268(int var1, int var2, byte var3) { if (super.pathLength < 9) { ++super.pathLength; } @@ -972,178 +649,124 @@ public final class Player extends Actor { super.pathTraversed[0] = var3; } - @ObfuscatedName("l") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(S)Z", - garbageValue = "3163" + signature = "(I)Z", + garbageValue = "-515224238" ) @Export("isVisible") final boolean isVisible() { return this.appearance != null; } - @ObfuscatedName("y") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "4" + signature = "(ILce;ZI)I", + garbageValue = "348475587" ) - public static boolean method1278(int var0) { - return (var0 >> 20 & 1) != 0; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(IZIZB)V", - garbageValue = "91" - ) - @Export("sortWorldList") - static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { - if (class162.World_worlds != null) { - class269.doWorldSorting(0, class162.World_worlds.length - 1, var0, var1, var2, var3); - } - - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(Lbe;Lbe;IZI)I", - garbageValue = "261221289" - ) - @Export("compareWorlds") - static int compareWorlds(World var0, World var1, int var2, boolean var3) { - if (var2 == 1) { - int var4 = var0.population; - int var5 = var1.population; - if (!var3) { - if (var4 == -1) { - var4 = 2001; - } - - if (var5 == -1) { - var5 = 2001; - } - } - - return var4 - var5; - } else if (var2 == 2) { - return var0.location - var1.location; - } else if (var2 == 3) { - if (var0.activity.equals("-")) { - if (var1.activity.equals("-")) { - return 0; - } else { - return var3 ? -1 : 1; - } - } else if (var1.activity.equals("-")) { - return var3 ? 1 : -1; - } else { - return var0.activity.compareTo(var1.activity); - } - } else if (var2 == 4) { - return var0.method1780() ? (var1.method1780() ? 0 : 1) : (var1.method1780() ? -1 : 0); - } else if (var2 == 5) { - return var0.method1782() ? (var1.method1782() ? 0 : 1) : (var1.method1782() ? -1 : 0); - } else if (var2 == 6) { - return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0); - } else if (var2 == 7) { - return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0); + static int method1300(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var3 = Varps.getWidget(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); } else { - return var0.id - var1.id; + var3 = var2 ? class186.field2331 : MidiPcmStream.field2444; } - } - @ObfuscatedName("ae") - @ObfuscatedSignature( - signature = "(ILcu;ZI)I", - garbageValue = "400713711" - ) - static int method1277(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { - class188.Interpreter_intStackSize -= 2; - Client.field879 = (short)class40.method762(Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]); - if (Client.field879 <= 0) { - Client.field879 = 256; + String var4 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + int[] var5 = null; + if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { + int var6 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + if (var6 > 0) { + for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]) { + } } - Client.field880 = (short)class40.method762(Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]); - if (Client.field880 <= 0) { - Client.field880 = 256; - } + var4 = var4.substring(0, var4.length() - 1); + } - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { - class188.Interpreter_intStackSize -= 2; - Client.zoomHeight = (short)Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - if (Client.zoomHeight <= 0) { - Client.zoomHeight = 256; - } + Object[] var8 = new Object[var4.length() + 1]; - Client.zoomWidth = (short)Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - if (Client.zoomWidth <= 0) { - Client.zoomWidth = 320; - } - - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { - class188.Interpreter_intStackSize -= 4; - Client.field796 = (short)Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - if (Client.field796 <= 0) { - Client.field796 = 1; - } - - Client.field884 = (short)Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - if (Client.field884 <= 0) { - Client.field884 = 32767; - } else if (Client.field884 < Client.field796) { - Client.field884 = Client.field796; - } - - Client.field804 = (short)Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2]; - if (Client.field804 <= 0) { - Client.field804 = 1; - } - - Client.field886 = (short)Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 3]; - if (Client.field886 <= 0) { - Client.field886 = 32767; - } else if (Client.field886 < Client.field804) { - Client.field886 = Client.field804; - } - - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { - if (Client.viewportWidget != null) { - Frames.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.viewportWidth; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.viewportHeight; + int var7; + for (var7 = var8.length - 1; var7 >= 1; --var7) { + if (var4.charAt(var7 - 1) == 's') { + var8[var7] = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; + var8[var7] = new Integer(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); + } + } + + var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + if (var7 != -1) { + var8[0] = new Integer(var7); + } else { + var8 = null; + } + + if (var0 == ScriptOpcodes.CC_SETONCLICK) { + var3.onClick = var8; + } else if (var0 == ScriptOpcodes.CC_SETONHOLD) { + var3.onHold = var8; + } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { + var3.onRelease = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { + var3.onMouseOver = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { + var3.onMouseLeave = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDRAG) { + var3.onDrag = var8; + } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { + var3.onTargetLeave = var8; + } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { + var3.onVarTransmit = var8; + var3.varTransmitTriggers = var5; + } else if (var0 == ScriptOpcodes.CC_SETONTIMER) { + var3.onTimer = var8; + } else if (var0 == ScriptOpcodes.CC_SETONOP) { + var3.onOp = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { + var3.onDragComplete = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { + var3.onClickRepeat = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { + var3.onMouseRepeat = var8; + } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { + var3.onInvTransmit = var8; + var3.invTransmitTriggers = var5; + } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { + var3.onStatTransmit = var8; + var3.statTransmitTriggers = var5; + } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { + var3.onTargetEnter = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { + var3.onScroll = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { + var3.onChatTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONKEY) { + var3.onKey = var8; + } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { + var3.onFriendTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { + var3.onClanTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { + var3.onMiscTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { + var3.onDialogAbort = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { + var3.onSubChange = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { + var3.onStockTransmit = var8; + } else if (var0 == 1426) { + var3.field2674 = var8; + } else { + if (var0 != ScriptOpcodes.CC_SETONRESIZE) { + return 2; } - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.zoomHeight; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.zoomWidth; - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.method1740(Client.field879); - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.method1740(Client.field880); - return 1; - } else if (var0 == 6220) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 6221) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 6222) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = GrandExchangeOfferTotalQuantityComparator.canvasWidth; - return 1; - } else if (var0 == 6223) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = AttackOption.canvasHeight; - return 1; - } else { - return 2; + var3.onResize = var8; } + + var3.hasListener = true; + return 1; } } diff --git a/runescape-client/src/main/java/PlayerAppearance.java b/runescape-client/src/main/java/PlayerAppearance.java index eb15fddccb..d252124d3e 100644 --- a/runescape-client/src/main/java/PlayerAppearance.java +++ b/runescape-client/src/main/java/PlayerAppearance.java @@ -4,61 +4,63 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hh") +@ObfuscatedName("hp") @Implements("PlayerAppearance") public class PlayerAppearance { - @ObfuscatedName("e") - public static short[] field2525; - @ObfuscatedName("c") + @ObfuscatedName("rb") + @ObfuscatedGetter( + intValue = 68473183 + ) + static int field2549; + @ObfuscatedName("l") + public static short[][] field2545; + @ObfuscatedName("j") + public static short[] field2547; + @ObfuscatedName("p") @Export("equipmentIndices") static final int[] equipmentIndices; - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("PlayerAppearance_cachedModels") - static EvictingDualNodeHashTable PlayerAppearance_cachedModels; - @ObfuscatedName("ge") - @ObfuscatedGetter( - intValue = 699213191 - ) - static int field2520; - @ObfuscatedName("f") + public static EvictingDualNodeHashTable PlayerAppearance_cachedModels; + @ObfuscatedName("c") @Export("equipment") int[] equipment; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("bodyColors") int[] bodyColors; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("isFemale") public boolean isFemale; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1174257501 + intValue = 925869529 ) @Export("npcTransformId") public int npcTransformId; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - longValue = -2597773278271595335L + longValue = -8371390842284104293L ) @Export("hash") long hash; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - longValue = 2966991994388499477L + longValue = 5198838895924808709L ) - long field2527; + long field2544; static { equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10}; PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "([I[IZII)V", - garbageValue = "602057306" + garbageValue = "-1314477676" ) @Export("update") public void update(int[] var1, int[] var2, boolean var3, int var4) { @@ -66,9 +68,9 @@ public class PlayerAppearance { var1 = new int[12]; for (int var5 = 0; var5 < 7; ++var5) { - for (int var6 = 0; var6 < GrandExchangeOfferUnitPriceComparator.KitDefinition_fileCount; ++var6) { - KitDefinition var7 = class191.KitDefinition_get(var6); - if (var7 != null && !var7.nonSelectable && (var3 ? 7 : 0) + var5 == var7.bodypartID) { + for (int var6 = 0; var6 < CollisionMap.KitDefinition_fileCount; ++var6) { + KitDefinition var7 = WorldMapSection2.KitDefinition_get(var6); + if (var7 != null && !var7.nonSelectable && var7.bodypartID == (var3 ? 7 : 0) + var5) { var1[equipmentIndices[var5]] = var6 + 256; break; } @@ -83,10 +85,10 @@ public class PlayerAppearance { this.setHash(); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(IZI)V", - garbageValue = "-559741299" + garbageValue = "1565149766" ) @Export("changeAppearance") public void changeAppearance(int var1, boolean var2) { @@ -100,17 +102,17 @@ public class PlayerAppearance { if (!var2) { --var3; if (var3 < 0) { - var3 = GrandExchangeOfferUnitPriceComparator.KitDefinition_fileCount - 1; + var3 = CollisionMap.KitDefinition_fileCount - 1; } } else { ++var3; - if (var3 >= GrandExchangeOfferUnitPriceComparator.KitDefinition_fileCount) { + if (var3 >= CollisionMap.KitDefinition_fileCount) { var3 = 0; } } - var4 = class191.KitDefinition_get(var3); - } while(var4 == null || var4.nonSelectable || var4.bodypartID != var1 + (this.isFemale ? 7 : 0)); + var4 = WorldMapSection2.KitDefinition_get(var3); + } while(var4 == null || var4.nonSelectable || var4.bodypartID != (this.isFemale ? 7 : 0) + var1); this.equipment[equipmentIndices[var1]] = var3 + 256; this.setHash(); @@ -118,50 +120,37 @@ public class PlayerAppearance { } } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IZB)V", - garbageValue = "-113" + signature = "(IZI)V", + garbageValue = "1120894554" ) - public void method3978(int var1, boolean var2) { + public void method4066(int var1, boolean var2) { int var3 = this.bodyColors[var1]; - boolean var4; if (!var2) { do { --var3; if (var3 < 0) { - var3 = WorldMapSection1.field269[var1].length - 1; + var3 = field2545[var1].length - 1; } - - if (var1 == 4 && var3 >= 8) { - var4 = false; - } else { - var4 = true; - } - } while(!var4); + } while(!FileSystem.method3572(var1, var3)); } else { do { ++var3; - if (var3 >= WorldMapSection1.field269[var1].length) { + if (var3 >= field2545[var1].length) { var3 = 0; } - - if (var1 == 4 && var3 >= 8) { - var4 = false; - } else { - var4 = true; - } - } while(!var4); + } while(!FileSystem.method3572(var1, var3)); } this.bodyColors[var1] = var3; this.setHash(); } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(ZB)V", - garbageValue = "89" + signature = "(ZI)V", + garbageValue = "-1200198186" ) @Export("changeSex") public void changeSex(boolean var1) { @@ -170,10 +159,10 @@ public class PlayerAppearance { } } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkq;B)V", - garbageValue = "6" + signature = "(Lkp;I)V", + garbageValue = "2032757019" ) @Export("write") public void write(Buffer var1) { @@ -195,10 +184,10 @@ public class PlayerAppearance { } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-479447540" + signature = "(B)V", + garbageValue = "-104" ) @Export("setHash") void setHash() { @@ -240,15 +229,15 @@ public class PlayerAppearance { } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Liv;ILiv;II)Ldw;", - garbageValue = "-1547884581" + signature = "(Lip;ILip;IB)Ldx;", + garbageValue = "66" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { if (this.npcTransformId != -1) { - return AbstractUserComparator.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); + return NetCache.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); } else { long var5 = this.hash; int[] var7 = this.equipment; @@ -277,18 +266,18 @@ public class PlayerAppearance { int var11; for (int var10 = 0; var10 < 12; ++var10) { var11 = var7[var10]; - if (var11 >= 256 && var11 < 512 && !class191.KitDefinition_get(var11 - 256).ready()) { + if (var11 >= 256 && var11 < 512 && !WorldMapSection2.KitDefinition_get(var11 - 256).ready()) { var9 = true; } - if (var11 >= 512 && !PacketBufferNode.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { + if (var11 >= 512 && !HealthBarDefinition.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { var9 = true; } } if (var9) { - if (-1L != this.field2527) { - var8 = (Model)PlayerAppearance_cachedModels.get(this.field2527); + if (this.field2544 != -1L) { + var8 = (Model)PlayerAppearance_cachedModels.get(this.field2544); } if (var8 == null) { @@ -305,14 +294,14 @@ public class PlayerAppearance { var13 = var7[var12]; ModelData var14; if (var13 >= 256 && var13 < 512) { - var14 = class191.KitDefinition_get(var13 - 256).getModelData(); + var14 = WorldMapSection2.KitDefinition_get(var13 - 256).getModelData(); if (var14 != null) { var16[var11++] = var14; } } if (var13 >= 512) { - var14 = PacketBufferNode.ItemDefinition_get(var13 - 512).method4703(this.isFemale); + var14 = HealthBarDefinition.ItemDefinition_get(var13 - 512).method4732(this.isFemale); if (var14 != null) { var16[var11++] = var14; } @@ -322,18 +311,18 @@ public class PlayerAppearance { ModelData var18 = new ModelData(var16, var11); for (var13 = 0; var13 < 5; ++var13) { - if (this.bodyColors[var13] < WorldMapSection1.field269[var13].length) { - var18.recolor(field2525[var13], WorldMapSection1.field269[var13][this.bodyColors[var13]]); + if (this.bodyColors[var13] < field2545[var13].length) { + var18.recolor(WorldMapLabelSize.field128[var13], field2545[var13][this.bodyColors[var13]]); } - if (this.bodyColors[var13] < CollisionMap.field2066[var13].length) { - var18.recolor(IntHashTable.field4010[var13], CollisionMap.field2066[var13][this.bodyColors[var13]]); + if (this.bodyColors[var13] < class208.field2514[var13].length) { + var18.recolor(field2547[var13], class208.field2514[var13][this.bodyColors[var13]]); } } var8 = var18.toModel(64, 850, -30, -50, -30); PlayerAppearance_cachedModels.put(var8, var5); - this.field2527 = var5; + this.field2544 = var5; } } @@ -354,26 +343,26 @@ public class PlayerAppearance { } } - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(B)Ldd;", - garbageValue = "7" + signature = "(I)Ldg;", + garbageValue = "1124292416" ) @Export("getModelData") ModelData getModelData() { if (this.npcTransformId != -1) { - return AbstractUserComparator.getNpcDefinition(this.npcTransformId).getModelData(); + return NetCache.getNpcDefinition(this.npcTransformId).getModelData(); } else { boolean var1 = false; int var3; for (int var2 = 0; var2 < 12; ++var2) { var3 = this.equipment[var2]; - if (var3 >= 256 && var3 < 512 && !class191.KitDefinition_get(var3 - 256).method4430()) { + if (var3 >= 256 && var3 < 512 && !WorldMapSection2.KitDefinition_get(var3 - 256).method4533()) { var1 = true; } - if (var3 >= 512 && !PacketBufferNode.ItemDefinition_get(var3 - 512).method4692(this.isFemale)) { + if (var3 >= 512 && !HealthBarDefinition.ItemDefinition_get(var3 - 512).method4731(this.isFemale)) { var1 = true; } } @@ -389,14 +378,14 @@ public class PlayerAppearance { var5 = this.equipment[var4]; ModelData var6; if (var5 >= 256 && var5 < 512) { - var6 = class191.KitDefinition_get(var5 - 256).getKitDefinitionModels(); + var6 = WorldMapSection2.KitDefinition_get(var5 - 256).getKitDefinitionModels(); if (var6 != null) { var7[var3++] = var6; } } if (var5 >= 512) { - var6 = PacketBufferNode.ItemDefinition_get(var5 - 512).method4661(this.isFemale); + var6 = HealthBarDefinition.ItemDefinition_get(var5 - 512).method4741(this.isFemale); if (var6 != null) { var7[var3++] = var6; } @@ -406,12 +395,12 @@ public class PlayerAppearance { ModelData var8 = new ModelData(var7, var3); for (var5 = 0; var5 < 5; ++var5) { - if (this.bodyColors[var5] < WorldMapSection1.field269[var5].length) { - var8.recolor(field2525[var5], WorldMapSection1.field269[var5][this.bodyColors[var5]]); + if (this.bodyColors[var5] < field2545[var5].length) { + var8.recolor(WorldMapLabelSize.field128[var5], field2545[var5][this.bodyColors[var5]]); } - if (this.bodyColors[var5] < CollisionMap.field2066[var5].length) { - var8.recolor(IntHashTable.field4010[var5], CollisionMap.field2066[var5][this.bodyColors[var5]]); + if (this.bodyColors[var5] < class208.field2514[var5].length) { + var8.recolor(field2547[var5], class208.field2514[var5][this.bodyColors[var5]]); } } @@ -420,23 +409,49 @@ public class PlayerAppearance { } } - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "37" + signature = "(I)I", + garbageValue = "34382709" ) @Export("getChatHeadId") public int getChatHeadId() { - return this.npcTransformId == -1 ? (this.equipment[0] << 15) + this.equipment[1] + (this.equipment[11] << 5) + (this.equipment[8] << 10) + (this.bodyColors[0] << 25) + (this.bodyColors[4] << 20) : 305419896 + AbstractUserComparator.getNpcDefinition(this.npcTransformId).id; + return this.npcTransformId == -1 ? (this.equipment[0] << 15) + this.equipment[1] + (this.equipment[11] << 5) + (this.equipment[8] << 10) + (this.bodyColors[0] << 25) + (this.bodyColors[4] << 20) : 305419896 + NetCache.getNpcDefinition(this.npcTransformId).id; } - @ObfuscatedName("kv") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1145606712" + signature = "(IIIII)V", + garbageValue = "-905088016" ) - static final void method4011() { - Client.field862 = Client.cycleCntr; - Projectile.ClanChat_inClanChat = true; + @Export("itemContainerSetItem") + static void itemContainerSetItem(int var0, int var1, int var2, int var3) { + ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var4 == null) { + var4 = new ItemContainer(); + ItemContainer.itemContainers.put(var4, (long)var0); + } + + if (var4.ids.length <= var1) { + int[] var5 = new int[var1 + 1]; + int[] var6 = new int[var1 + 1]; + + int var7; + for (var7 = 0; var7 < var4.ids.length; ++var7) { + var5[var7] = var4.ids[var7]; + var6[var7] = var4.quantities[var7]; + } + + for (var7 = var4.ids.length; var7 < var1; ++var7) { + var5[var7] = -1; + var6[var7] = 0; + } + + var4.ids = var5; + var4.quantities = var6; + } + + var4.ids[var1] = var2; + var4.quantities[var1] = var3; } } diff --git a/runescape-client/src/main/java/PlayerType.java b/runescape-client/src/main/java/PlayerType.java index e2730f4dc1..f7b299af0c 100644 --- a/runescape-client/src/main/java/PlayerType.java +++ b/runescape-client/src/main/java/PlayerType.java @@ -4,62 +4,62 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hp") +@ObfuscatedName("hu") @Implements("PlayerType") public enum PlayerType implements Enumerated { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhu;" ) @Export("PlayerType_normal") PlayerType_normal(0, -1, true, false, true), - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhu;" ) @Export("PlayerType_playerModerator") PlayerType_playerModerator(1, 0, true, true, true), - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhu;" ) @Export("PlayerType_jagexModerator") PlayerType_jagexModerator(2, 1, true, true, false), - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhu;" ) @Export("PlayerType_ironman") PlayerType_ironman(3, 2, false, false, true), - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhu;" ) @Export("PlayerType_ultimateIronman") PlayerType_ultimateIronman(4, 3, false, false, true), - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhu;" ) @Export("PlayerType_hardcoreIronman") PlayerType_hardcoreIronman(5, 10, false, false, true); - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1619956353 + intValue = 82247459 ) @Export("id") final int id; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -441584621 + intValue = 583511619 ) @Export("modIcon") public final int modIcon; - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("isPrivileged") public final boolean isPrivileged; - @ObfuscatedName("d") + @ObfuscatedName("m") @Export("isUser") public final boolean isUser; @@ -70,13 +70,22 @@ public enum PlayerType implements Enumerated { this.isUser = var7; } - @ObfuscatedName("i") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "-57" + garbageValue = "1" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "([BI)Laf;", + garbageValue = "1601863224" + ) + static WorldMapSprite method4204(byte[] var0) { + return var0 == null ? new WorldMapSprite() : new WorldMapSprite(class14.convertJpgToSprite(var0).pixels); + } } diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java index 531d2593f5..3c40c103d5 100644 --- a/runescape-client/src/main/java/Players.java +++ b/runescape-client/src/main/java/Players.java @@ -3,65 +3,66 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("cx") +@ObfuscatedName("cz") @Implements("Players") public class Players { - @ObfuscatedName("y") - static byte[] field1230; - @ObfuscatedName("w") - static byte[] field1231; - @ObfuscatedName("p") + @ObfuscatedName("o") + static byte[] field1236; + @ObfuscatedName("e") + static byte[] field1237; + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "[Lkq;" + signature = "[Lkp;" ) - static Buffer[] field1228; - @ObfuscatedName("b") + static Buffer[] field1235; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 563300255 + intValue = 896237733 ) @Export("Players_count") static int Players_count; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("Players_indices") static int[] Players_indices; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -2029432023 + intValue = 1595990081 ) @Export("Players_emptyIdxCount") static int Players_emptyIdxCount; - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("Players_emptyIndices") static int[] Players_emptyIndices; - @ObfuscatedName("d") + @ObfuscatedName("m") @Export("Players_regions") static int[] Players_regions; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("Players_orientations") static int[] Players_orientations; - @ObfuscatedName("o") + @ObfuscatedName("h") @Export("Players_targetIndices") static int[] Players_targetIndices; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1629507645 + intValue = -564068269 ) @Export("Players_pendingUpdateCount") static int Players_pendingUpdateCount; - @ObfuscatedName("k") + @ObfuscatedName("n") @Export("Players_pendingUpdateIndices") static int[] Players_pendingUpdateIndices; - @ObfuscatedName("s") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lkq;" + signature = "Lkp;" ) - static Buffer field1242; + static Buffer field1248; static { - field1230 = new byte[2048]; - field1231 = new byte[2048]; - field1228 = new Buffer[2048]; + field1236 = new byte[2048]; + field1237 = new byte[2048]; + field1235 = new Buffer[2048]; Players_count = 0; Players_indices = new int[2048]; Players_emptyIdxCount = 0; @@ -71,53 +72,138 @@ public class Players { Players_targetIndices = new int[2048]; Players_pendingUpdateCount = 0; Players_pendingUpdateIndices = new int[2048]; - field1242 = new Buffer(new byte[5000]); + field1248 = new Buffer(new byte[5000]); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "([I[II)V", - garbageValue = "635493100" + signature = "(B)V", + garbageValue = "1" ) - public static void method2161(int[] var0, int[] var1) { - if (var0 != null && var1 != null) { - ByteArrayPool.ByteArrayPool_alternativeSizes = var0; - Interpreter.ByteArrayPool_altSizeArrayCounts = new int[var0.length]; - ByteArrayPool.ByteArrayPool_arrays = new byte[var0.length][][]; + static void method2179() { + Tiles.field502 = null; + Tiles.field514 = null; + Tiles.field507 = null; + Tiles.field518 = null; + UrlRequest.field1940 = null; + InterfaceParent.field565 = null; + Tiles.field509 = null; + class268.Tiles_hue = null; + HorizontalAlignment.Tiles_saturation = null; + class30.Tiles_lightness = null; + class40.Tiles_hueMultiplier = null; + TileItemPile.field1529 = null; + } - for (int var2 = 0; var2 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var2) { - ByteArrayPool.ByteArrayPool_arrays[var2] = new byte[var1[var2]][]; + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "(ILce;ZB)I", + garbageValue = "41" + ) + static int method2203(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var3 = Varps.getWidget(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); + } else { + var3 = var2 ? class186.field2331 : MidiPcmStream.field2444; + } + + NPCDefinition.invalidateWidget(var3); + if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { + if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { + var3.modelType = 2; + var3.modelId = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { + var3.modelType = 3; + var3.modelId = class192.localPlayer.appearance.getChatHeadId(); + return 1; + } else { + return 2; + } + } else { + class320.Interpreter_intStackSize -= 2; + int var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + int var5 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + var3.itemId = var4; + var3.itemQuantity = var5; + ItemDefinition var6 = HealthBarDefinition.ItemDefinition_get(var4); + var3.modelAngleX = var6.xan2d; + var3.modelAngleY = var6.yan2d; + var3.modelAngleZ = var6.zan2d; + var3.modelOffsetX = var6.offsetX2d; + var3.modelOffsetY = var6.offsetY2d; + var3.modelZoom = var6.zoom2d; + if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) { + var3.itemQuantityMode = 0; + } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | 1 == var6.isStackable) { + var3.itemQuantityMode = 1; + } else { + var3.itemQuantityMode = 2; } - } else { - ByteArrayPool.ByteArrayPool_alternativeSizes = null; - Interpreter.ByteArrayPool_altSizeArrayCounts = null; - ByteArrayPool.ByteArrayPool_arrays = null; + if (var3.field2627 > 0) { + var3.modelZoom = var3.modelZoom * 32 / var3.field2627; + } else if (var3.rawWidth > 0) { + var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; + } + + return 1; } } - @ObfuscatedName("ax") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "98747389" + signature = "(ILce;ZI)I", + garbageValue = "-603173589" ) - @Export("runWidgetOnLoadListener") - static void runWidgetOnLoadListener(int var0) { - if (var0 != -1) { - if (MusicPatch.loadInterface(var0)) { - Widget[] var1 = UserComparator7.Widget_interfaceComponents[var0]; - - for (int var2 = 0; var2 < var1.length; ++var2) { - Widget var3 = var1[var2]; - if (var3.onLoad != null) { - ScriptEvent var4 = new ScriptEvent(); - var4.widget = var3; - var4.args = var3.onLoad; - GrandExchangeEvents.runScript(var4, 5000000); - } + static int method2200(int var0, Script var1, boolean var2) { + Widget var3 = Varps.getWidget(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); + if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = class83.method2108(WorldMapIcon_0.getWidgetClickMask(var3)); + return 1; + } else if (var0 != ScriptOpcodes.IF_GETOP) { + if (var0 == ScriptOpcodes.IF_GETOPBASE) { + if (var3.dataText == null) { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3.dataText; } + return 1; + } else { + return 2; } + } else { + int var4 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + --var4; + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3.actions[var4]; + } else { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + } + + return 1; } } + + @ObfuscatedName("jo") + @ObfuscatedSignature( + signature = "(I)Z", + garbageValue = "1574244944" + ) + static boolean method2201() { + return Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; + } + + @ObfuscatedName("kb") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1351198777" + ) + static final void method2189() { + Client.field823 = Client.cycleCntr; + FileSystem.ClanChat_inClanChat = true; + } } diff --git a/runescape-client/src/main/java/PrivateChatMode.java b/runescape-client/src/main/java/PrivateChatMode.java index c22cafebd8..1333a55ff2 100644 --- a/runescape-client/src/main/java/PrivateChatMode.java +++ b/runescape-client/src/main/java/PrivateChatMode.java @@ -1,122 +1,63 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ku") +@ObfuscatedName("kx") @Implements("PrivateChatMode") public class PrivateChatMode { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lku;" + signature = "Lkx;" ) - static final PrivateChatMode field3790; - @ObfuscatedName("i") + static final PrivateChatMode field3788; + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lku;" + signature = "Lkx;" ) - public static final PrivateChatMode field3791; - @ObfuscatedName("y") + public static final PrivateChatMode field3790; + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lku;" + signature = "Lkx;" ) - static final PrivateChatMode field3792; - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Lho;" - ) - @Export("NetCache_currentResponse") - public static NetFileRequest NetCache_currentResponse; - @ObfuscatedName("w") + static final PrivateChatMode field3789; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1903603553 + intValue = 1866307707 ) - public final int field3793; + public final int field3787; static { - field3790 = new PrivateChatMode(0); - field3791 = new PrivateChatMode(1); - field3792 = new PrivateChatMode(2); + field3788 = new PrivateChatMode(0); + field3790 = new PrivateChatMode(1); + field3789 = new PrivateChatMode(2); } PrivateChatMode(int var1) { - this.field3793 = var1; + this.field3787 = var1; } - @ObfuscatedName("p") + @ObfuscatedName("ld") @ObfuscatedSignature( - signature = "(Lkq;IIIIIII)V", - garbageValue = "-1462890137" + signature = "(B)V", + garbageValue = "-78" ) - @Export("loadTerrain") - static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var7; - if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { - Tiles.Tiles_renderFlags[var1][var2][var3] = 0; - - while (true) { - var7 = var0.readUnsignedByte(); - if (var7 == 0) { - if (var1 == 0) { - int[] var8 = Tiles.Tiles_heights[0][var2]; - int var11 = var2 + var4 + 932731; - int var12 = var3 + var5 + 556238; - int var13 = CollisionMap.method3530(45365 + var11, 91923 + var12, 4) - 128 + (CollisionMap.method3530(var11 + 10294, var12 + 37821, 2) - 128 >> 1) + (CollisionMap.method3530(var11, var12, 1) - 128 >> 2); - var13 = (int)(0.3D * (double)var13) + 35; - if (var13 < 10) { - var13 = 10; - } else if (var13 > 60) { - var13 = 60; - } - - var8[var3] = -var13 * 8; - } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; - } - break; - } - - if (var7 == 1) { - int var14 = var0.readUnsignedByte(); - if (var14 == 1) { - var14 = 0; - } - - if (var1 == 0) { - Tiles.Tiles_heights[0][var2][var3] = -var14 * 8; - } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var14 * 8; - } - break; - } - - if (var7 <= 49) { - Tiles.field498[var1][var2][var3] = var0.readByte(); - Tiles.field494[var1][var2][var3] = (byte)((var7 - 2) / 4); - Tiles.field493[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); - } else if (var7 <= 81) { - Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); - } else { - class14.field88[var1][var2][var3] = (byte)(var7 - 81); - } + static void method5952() { + if (Client.field728 && class192.localPlayer != null) { + int var0 = class192.localPlayer.pathX[0]; + int var1 = class192.localPlayer.pathY[0]; + if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) { + return; } - } else { - while (true) { - var7 = var0.readUnsignedByte(); - if (var7 == 0) { - break; - } - if (var7 == 1) { - var0.readUnsignedByte(); - break; - } - - if (var7 <= 49) { - var0.readUnsignedByte(); - } + PendingSpawn.oculusOrbFocalPointX = class192.localPlayer.x; + int var2 = WorldMapSectionType.getTileHeight(class192.localPlayer.x, class192.localPlayer.y, Clock.Client_plane) - Client.camFollowHeight; + if (var2 < WorldMapSectionType.field166) { + WorldMapSectionType.field166 = var2; } + + Skeleton.oculusOrbFocalPointY = class192.localPlayer.y; + Client.field728 = false; } } diff --git a/runescape-client/src/main/java/Projectile.java b/runescape-client/src/main/java/Projectile.java index 0656f3a10f..548ada0e50 100644 --- a/runescape-client/src/main/java/Projectile.java +++ b/runescape-client/src/main/java/Projectile.java @@ -4,135 +4,129 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ch") +@ObfuscatedName("cb") @Implements("Projectile") public final class Projectile extends Entity { - @ObfuscatedName("pu") - @Export("ClanChat_inClanChat") - static boolean ClanChat_inClanChat; - @ObfuscatedName("gq") - @Export("regionLandArchives") - static byte[][] regionLandArchives; - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1703591311 + intValue = 915213611 ) @Export("id") int id; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -845014759 + intValue = 378032649 ) @Export("plane") int plane; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -328168931 + intValue = -1585922035 ) @Export("sourceX") int sourceX; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1855488401 + intValue = -1462535825 ) @Export("sourceY") int sourceY; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 737715987 + intValue = 1681715111 ) @Export("sourceZ") int sourceZ; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 2134502189 + intValue = 903870771 ) @Export("endHeight") int endHeight; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1548140981 + intValue = -1250439791 ) @Export("cycleStart") int cycleStart; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 880668883 + intValue = -1640896565 ) @Export("cycleEnd") int cycleEnd; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1309211807 + intValue = 2117578399 ) @Export("slope") int slope; - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 293583689 + intValue = -544986491 ) @Export("startHeight") int startHeight; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -829767875 + intValue = -1226806671 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("o") + @ObfuscatedName("h") @Export("isMoving") boolean isMoving; @ObfuscatedName("v") @Export("x") double x; - @ObfuscatedName("k") + @ObfuscatedName("n") @Export("y") double y; - @ObfuscatedName("s") + @ObfuscatedName("x") @Export("z") double z; - @ObfuscatedName("l") + @ObfuscatedName("w") @Export("speedX") double speedX; - @ObfuscatedName("t") + @ObfuscatedName("k") @Export("speedY") double speedY; - @ObfuscatedName("j") + @ObfuscatedName("q") @Export("speed") double speed; - @ObfuscatedName("n") + @ObfuscatedName("z") @Export("speedZ") double speedZ; - @ObfuscatedName("u") + @ObfuscatedName("y") @Export("accelerationZ") double accelerationZ; - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -361002303 + intValue = -347740869 ) @Export("yaw") int yaw; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1134638097 + intValue = -1566997977 ) @Export("pitch") int pitch; - @ObfuscatedName("m") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "Liv;" + signature = "Lip;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("g") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1878850511 + intValue = -1565551535 ) @Export("frame") int frame; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -321232817 + intValue = -449479451 ) @Export("frameCycle") int frameCycle; @@ -153,19 +147,19 @@ public final class Projectile extends Entity { this.targetIndex = var10; this.endHeight = var11; this.isMoving = false; - int var12 = ClientPacket.SpotAnimationDefinition_get(this.id).sequence; + int var12 = class65.SpotAnimationDefinition_get(this.id).sequence; if (var12 != -1) { - this.sequenceDefinition = WorldMapSection0.SequenceDefinition_get(var12); + this.sequenceDefinition = GraphicsDefaults.SequenceDefinition_get(var12); } else { this.sequenceDefinition = null; } } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IIIIS)V", - garbageValue = "3907" + signature = "(IIIII)V", + garbageValue = "-8439776" ) @Export("setDestination") final void setDestination(int var1, int var2, int var3, int var4) { @@ -173,34 +167,34 @@ public final class Projectile extends Entity { if (!this.isMoving) { var5 = (double)(var1 - this.sourceX); double var7 = (double)(var2 - this.sourceY); - double var9 = Math.sqrt(var7 * var7 + var5 * var5); - this.x = (double)this.sourceX + var5 * (double)this.startHeight / var9; - this.y = var7 * (double)this.startHeight / var9 + (double)this.sourceY; + double var9 = Math.sqrt(var5 * var5 + var7 * var7); + this.x = (double)this.startHeight * var5 / var9 + (double)this.sourceX; + this.y = (double)this.startHeight * var7 / var9 + (double)this.sourceY; this.z = (double)this.sourceZ; } var5 = (double)(this.cycleEnd + 1 - var4); this.speedX = ((double)var1 - this.x) / var5; this.speedY = ((double)var2 - this.y) / var5; - this.speed = Math.sqrt(this.speedX * this.speedX + this.speedY * this.speedY); + this.speed = Math.sqrt(this.speedY * this.speedY + this.speedX * this.speedX); if (!this.isMoving) { - this.speedZ = -this.speed * Math.tan((double)this.slope * 0.02454369D); + this.speedZ = -this.speed * Math.tan(0.02454369D * (double)this.slope); } - this.accelerationZ = 2.0D * ((double)var3 - this.z - this.speedZ * var5) / (var5 * var5); + this.accelerationZ = ((double)var3 - this.z - this.speedZ * var5) * 2.0D / (var5 * var5); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-1141116795" + garbageValue = "-1466465553" ) @Export("advance") final void advance(int var1) { this.isMoving = true; - this.x += this.speedX * (double)var1; - this.y += this.speedY * (double)var1; - this.z += (double)var1 * this.accelerationZ * 0.5D * (double)var1 + this.speedZ * (double)var1; + this.x += (double)var1 * this.speedX; + this.y += (double)var1 * this.speedY; + this.z += (double)var1 * this.speedZ + (double)var1 * (double)var1 * this.accelerationZ * 0.5D; this.speedZ += (double)var1 * this.accelerationZ; this.yaw = (int)(Math.atan2(this.speedX, this.speedY) * 325.949D) + 1024 & 2047; this.pitch = (int)(Math.atan2(this.speedZ, this.speed) * 325.949D) & 2047; @@ -226,14 +220,14 @@ public final class Projectile extends Entity { } } - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)Ldw;", - garbageValue = "822221372" + signature = "(I)Ldx;", + garbageValue = "-2133076860" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = ClientPacket.SpotAnimationDefinition_get(this.id); + SpotAnimationDefinition var1 = class65.SpotAnimationDefinition_get(this.id); Model var2 = var1.getModel(this.frame); if (var2 == null) { return null; @@ -243,16 +237,112 @@ public final class Projectile extends Entity { } } - @ObfuscatedName("l") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(II)Ljava/lang/String;", - garbageValue = "919404016" + signature = "(CI)Z", + garbageValue = "1588389252" ) - static final String method2129(int var0) { - if (var0 < 100000) { - return "" + var0 + ""; + public static final boolean method2160(char var0) { + if (Character.isISOControl(var0)) { + return false; + } else if (ArchiveDiskAction.isAlphaNumeric(var0)) { + return true; } else { - return var0 < 10000000 ? "" + var0 / 1000 + "K" + "" : "" + var0 / 1000000 + "M" + ""; + char[] var1 = class339.field4042; + + int var2; + char var3; + for (var2 = 0; var2 < var1.length; ++var2) { + var3 = var1[var2]; + if (var0 == var3) { + return true; + } + } + + var1 = class339.field4041; + + for (var2 = 0; var2 < var1.length; ++var2) { + var3 = var1[var2]; + if (var0 == var3) { + return true; + } + } + + return false; + } + } + + @ObfuscatedName("ex") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "-2129018303" + ) + @Export("updateGameState") + static void updateGameState(int var0) { + if (var0 != Client.gameState) { + if (Client.gameState == 0) { + Username.client.method952(); + } + + if (var0 == 20 || var0 == 40 || var0 == 45) { + Client.loginState = 0; + Client.field679 = 0; + Client.field680 = 0; + Client.timer.method5062(var0); + if (var0 != 20) { + UserComparator3.method3497(false); + } + } + + if (var0 != 20 && var0 != 40 && ClientPreferences.field1052 != null) { + ClientPreferences.field1052.close(); + ClientPreferences.field1052 = null; + } + + if (Client.gameState == 25) { + Client.field695 = 0; + Client.field791 = 0; + Client.field884 = 1; + Client.field700 = 0; + Client.field733 = 1; + } + + if (var0 != 5 && var0 != 10) { + if (var0 == 20) { + ClientPacket.method3683(HealthBar.archive10, UserComparator8.archive8, true, Client.gameState == 11 ? 4 : 0); + } else if (var0 == 11) { + ClientPacket.method3683(HealthBar.archive10, UserComparator8.archive8, false, 4); + } else if (Login.field1163) { + ScriptFrame.titleboxSprite = null; + Login.titlebuttonSprite = null; + class16.runesSprite = null; + Login.leftTitleSprite = null; + class32.rightTitleSprite = null; + FloorDecoration.logoSprite = null; + Login.title_muteSprite = null; + WorldMapSprite.options_buttons_0Sprite = null; + DirectByteArrayCopier.options_buttons_2Sprite = null; + UserComparator6.worldSelectBackSprites = null; + ReflectionCheck.worldSelectFlagSprites = null; + ItemContainer.worldSelectArrows = null; + DynamicObject.worldSelectStars = null; + WorldMapDecorationType.field2739 = null; + WorldMapLabelSize.loginScreenRunesAnimation.method1834(); + class197.field2414 = 1; + UserComparator5.musicTrackArchive = null; + class197.musicTrackGroupId = -1; + class83.musicTrackFileId = -1; + AttackOption.musicTrackVolume = 0; + KeyHandler.musicTrackBoolean = false; + class197.field2412 = 2; + TextureProvider.method2833(true); + Login.field1163 = false; + } + } else { + ClientPacket.method3683(HealthBar.archive10, UserComparator8.archive8, true, 0); + } + + Client.gameState = var0; } } } diff --git a/runescape-client/src/main/java/RasterProvider.java b/runescape-client/src/main/java/RasterProvider.java index 70d2289f10..752f63e08b 100644 --- a/runescape-client/src/main/java/RasterProvider.java +++ b/runescape-client/src/main/java/RasterProvider.java @@ -14,13 +14,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ab") +@ObfuscatedName("bq") @Implements("RasterProvider") public final class RasterProvider extends AbstractRasterProvider { - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("component") Component component; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("image") Image image; @@ -36,40 +36,40 @@ public final class RasterProvider extends AbstractRasterProvider { this.apply(); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/awt/Component;B)V", - garbageValue = "127" + signature = "(Ljava/awt/Component;I)V", + garbageValue = "864264783" ) @Export("setComponent") final void setComponent(Component var1) { this.component = var1; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "1570881200" + garbageValue = "-529782293" ) @Export("drawFull") public final void drawFull(int var1, int var2) { this.drawFull0(this.component.getGraphics(), var1, var2); } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIIIB)V", - garbageValue = "-116" + signature = "(IIIII)V", + garbageValue = "934582222" ) @Export("draw") public final void draw(int var1, int var2, int var3, int var4) { this.draw0(this.component.getGraphics(), var1, var2, var3, var4); } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(Ljava/awt/Graphics;III)V", - garbageValue = "-89476481" + garbageValue = "1734419092" ) @Export("drawFull0") final void drawFull0(Graphics var1, int var2, int var3) { @@ -81,10 +81,10 @@ public final class RasterProvider extends AbstractRasterProvider { } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(Ljava/awt/Graphics;IIIII)V", - garbageValue = "691576069" + garbageValue = "-288564327" ) @Export("draw0") final void draw0(Graphics var1, int var2, int var3, int var4, int var5) { diff --git a/runescape-client/src/main/java/Rasterizer2D.java b/runescape-client/src/main/java/Rasterizer2D.java index 09d2830bfd..e66e616213 100644 --- a/runescape-client/src/main/java/Rasterizer2D.java +++ b/runescape-client/src/main/java/Rasterizer2D.java @@ -3,28 +3,28 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lj") +@ObfuscatedName("lb") @Implements("Rasterizer2D") public class Rasterizer2D extends DualNode { - @ObfuscatedName("av") + @ObfuscatedName("af") @Export("Rasterizer2D_pixels") public static int[] Rasterizer2D_pixels; - @ObfuscatedName("aw") + @ObfuscatedName("az") @Export("Rasterizer2D_width") public static int Rasterizer2D_width; - @ObfuscatedName("as") + @ObfuscatedName("ax") @Export("Rasterizer2D_height") public static int Rasterizer2D_height; - @ObfuscatedName("ak") + @ObfuscatedName("aj") @Export("Rasterizer2D_yClipStart") public static int Rasterizer2D_yClipStart; @ObfuscatedName("au") @Export("Rasterizer2D_yClipEnd") public static int Rasterizer2D_yClipEnd; - @ObfuscatedName("ah") + @ObfuscatedName("ay") @Export("Rasterizer2D_xClipStart") public static int Rasterizer2D_xClipStart; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("Rasterizer2D_xClipEnd") public static int Rasterizer2D_xClipEnd; @@ -38,7 +38,7 @@ public class Rasterizer2D extends DualNode { protected Rasterizer2D() { } - @ObfuscatedName("cc") + @ObfuscatedName("dl") @Export("Rasterizer2D_replace") public static void Rasterizer2D_replace(int[] var0, int var1, int var2) { Rasterizer2D_pixels = var0; @@ -47,7 +47,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_setClip(0, 0, var1, var2); } - @ObfuscatedName("cv") + @ObfuscatedName("dv") @Export("Rasterizer2D_resetClip") public static void Rasterizer2D_resetClip() { Rasterizer2D_xClipStart = 0; @@ -56,7 +56,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_yClipEnd = Rasterizer2D_height; } - @ObfuscatedName("cw") + @ObfuscatedName("do") @Export("Rasterizer2D_setClip") public static void Rasterizer2D_setClip(int var0, int var1, int var2, int var3) { if (var0 < 0) { @@ -81,7 +81,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_yClipEnd = var3; } - @ObfuscatedName("do") + @ObfuscatedName("di") @Export("Rasterizer2D_expandClip") public static void Rasterizer2D_expandClip(int var0, int var1, int var2, int var3) { if (Rasterizer2D_xClipStart < var0) { @@ -102,7 +102,7 @@ public class Rasterizer2D extends DualNode { } - @ObfuscatedName("dk") + @ObfuscatedName("dc") @Export("Rasterizer2D_getClipArray") public static void Rasterizer2D_getClipArray(int[] var0) { var0[0] = Rasterizer2D_xClipStart; @@ -111,7 +111,7 @@ public class Rasterizer2D extends DualNode { var0[3] = Rasterizer2D_yClipEnd; } - @ObfuscatedName("dx") + @ObfuscatedName("dj") @Export("Rasterizer2D_setClipArray") public static void Rasterizer2D_setClipArray(int[] var0) { Rasterizer2D_xClipStart = var0[0]; @@ -236,7 +236,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("di") + @ObfuscatedName("dn") @Export("Rasterizer2D_drawCircleAlpha") public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, int var3, int var4) { if (var4 != 0) { @@ -349,7 +349,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("dr") + @ObfuscatedName("dy") @Export("Rasterizer2D_fillRectangleAlpha") public static void Rasterizer2D_fillRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { if (var0 < Rasterizer2D_xClipStart) { @@ -387,7 +387,7 @@ public class Rasterizer2D extends DualNode { } - @ObfuscatedName("dg") + @ObfuscatedName("dq") @Export("Rasterizer2D_fillRectangle") public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int var3, int var4) { if (var0 < Rasterizer2D_xClipStart) { @@ -421,7 +421,7 @@ public class Rasterizer2D extends DualNode { } - @ObfuscatedName("dh") + @ObfuscatedName("dd") @Export("Rasterizer2D_fillRectangleGradient") public static void Rasterizer2D_fillRectangleGradient(int var0, int var1, int var2, int var3, int var4, int var5) { if (var2 > 0 && var3 > 0) { @@ -465,7 +465,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("dl") + @ObfuscatedName("dr") @Export("Rasterizer2D_fillRectangleGradientAlpha") public static void Rasterizer2D_fillRectangleGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (var2 > 0 && var3 > 0) { @@ -523,7 +523,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("da") + @ObfuscatedName("dk") @ObfuscatedSignature( signature = "(IIIIII[BIZ)V", garbageValue = "1" @@ -604,7 +604,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("dp") + @ObfuscatedName("dg") @Export("Rasterizer2D_drawRectangle") public static void Rasterizer2D_drawRectangle(int var0, int var1, int var2, int var3, int var4) { Rasterizer2D_drawHorizontalLine(var0, var1, var2, var4); @@ -613,7 +613,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_drawVerticalLine(var0 + var2 - 1, var1, var3, var4); } - @ObfuscatedName("ds") + @ObfuscatedName("dt") @Export("Rasterizer2D_drawRectangleAlpha") public static void Rasterizer2D_drawRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { Rasterizer2D_drawHorizontalLineAlpha(var0, var1, var2, var4, var5); @@ -625,7 +625,7 @@ public class Rasterizer2D extends DualNode { } - @ObfuscatedName("db") + @ObfuscatedName("du") @Export("Rasterizer2D_drawHorizontalLine") public static void Rasterizer2D_drawHorizontalLine(int var0, int var1, int var2, int var3) { if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { @@ -647,7 +647,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("dn") + @ObfuscatedName("db") @Export("Rasterizer2D_drawHorizontalLineAlpha") static void Rasterizer2D_drawHorizontalLineAlpha(int var0, int var1, int var2, int var3, int var4) { if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { @@ -677,7 +677,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("dt") + @ObfuscatedName("dh") @Export("Rasterizer2D_drawVerticalLine") public static void Rasterizer2D_drawVerticalLine(int var0, int var1, int var2, int var3) { if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { @@ -699,7 +699,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("dc") + @ObfuscatedName("dz") @Export("Rasterizer2D_drawVerticalLineAlpha") static void Rasterizer2D_drawVerticalLineAlpha(int var0, int var1, int var2, int var3, int var4) { if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { @@ -730,7 +730,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("dd") + @ObfuscatedName("dx") @Export("Rasterizer2D_drawLine") public static void Rasterizer2D_drawLine(int var0, int var1, int var2, int var3, int var4) { var2 -= var0; @@ -812,7 +812,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("dv") + @ObfuscatedName("da") @Export("Rasterizer2D_setPixel") static void Rasterizer2D_setPixel(int var0, int var1, int var2) { if (var0 >= Rasterizer2D_xClipStart && var1 >= Rasterizer2D_yClipStart && var0 < Rasterizer2D_xClipEnd && var1 < Rasterizer2D_yClipEnd) { @@ -820,7 +820,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("du") + @ObfuscatedName("dp") @Export("Rasterizer2D_fillMaskedRectangle") public static void Rasterizer2D_fillMaskedRectangle(int var0, int var1, int var2, int[] var3, int[] var4) { int var5 = var0 + Rasterizer2D_width * var1; diff --git a/runescape-client/src/main/java/Rasterizer3D.java b/runescape-client/src/main/java/Rasterizer3D.java index 2f14972278..78c5dd3843 100644 --- a/runescape-client/src/main/java/Rasterizer3D.java +++ b/runescape-client/src/main/java/Rasterizer3D.java @@ -3,92 +3,92 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("et") +@ObfuscatedName("ey") @Implements("Rasterizer3D") public class Rasterizer3D extends Rasterizer2D { - @ObfuscatedName("f") - static boolean field1751; - @ObfuscatedName("i") - static boolean field1758; - @ObfuscatedName("y") + @ObfuscatedName("c") + static boolean field1761; + @ObfuscatedName("t") + static boolean field1755; + @ObfuscatedName("o") @Export("Rasterizer3D_isLowDetailTexture") static boolean Rasterizer3D_isLowDetailTexture; - @ObfuscatedName("w") - public static boolean field1739; - @ObfuscatedName("p") + @ObfuscatedName("e") + public static boolean field1762; + @ObfuscatedName("i") @Export("Rasterizer3D_alpha") static int Rasterizer3D_alpha; - @ObfuscatedName("o") + @ObfuscatedName("h") @Export("Rasterizer3D_zoom") public static int Rasterizer3D_zoom; @ObfuscatedName("v") @Export("Rasterizer3D_clipMidX") static int Rasterizer3D_clipMidX; - @ObfuscatedName("k") + @ObfuscatedName("n") @Export("Rasterizer3D_clipMidY") static int Rasterizer3D_clipMidY; - @ObfuscatedName("s") + @ObfuscatedName("x") @Export("Rasterizer3D_clipWidth") static int Rasterizer3D_clipWidth; - @ObfuscatedName("l") + @ObfuscatedName("w") @Export("Rasterizer3D_clipHeight") static int Rasterizer3D_clipHeight; - @ObfuscatedName("t") + @ObfuscatedName("k") @Export("Rasterizer3D_clipNegativeMidX") static int Rasterizer3D_clipNegativeMidX; - @ObfuscatedName("j") + @ObfuscatedName("q") @Export("Rasterizer3D_clipMidX2") static int Rasterizer3D_clipMidX2; - @ObfuscatedName("n") + @ObfuscatedName("z") @Export("Rasterizer3D_clipNegativeMidY") static int Rasterizer3D_clipNegativeMidY; - @ObfuscatedName("u") + @ObfuscatedName("y") @Export("Rasterizer3D_clipMidY2") static int Rasterizer3D_clipMidY2; - @ObfuscatedName("z") + @ObfuscatedName("f") @Export("Rasterizer3D_rowOffsets") static int[] Rasterizer3D_rowOffsets; - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("Rasterizer3D_colorPalette") public static int[] Rasterizer3D_colorPalette; - @ObfuscatedName("m") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "Lev;" + signature = "Lep;" ) @Export("Rasterizer3D_textureLoader") public static TextureLoader Rasterizer3D_textureLoader; - @ObfuscatedName("g") - static int[] field1737; - @ObfuscatedName("r") - static int[] field1760; - @ObfuscatedName("q") + @ObfuscatedName("s") + static int[] field1777; + @ObfuscatedName("a") + static int[] field1778; + @ObfuscatedName("u") @Export("Rasterizer3D_sine") public static int[] Rasterizer3D_sine; - @ObfuscatedName("aa") + @ObfuscatedName("ae") @Export("Rasterizer3D_cosine") public static int[] Rasterizer3D_cosine; static { - field1751 = false; - field1758 = false; + field1761 = false; + field1755 = false; Rasterizer3D_isLowDetailTexture = false; - field1739 = true; + field1762 = true; Rasterizer3D_alpha = 0; Rasterizer3D_zoom = 512; Rasterizer3D_rowOffsets = new int[1024]; Rasterizer3D_colorPalette = new int[65536]; - field1737 = new int[512]; - field1760 = new int[2048]; + field1777 = new int[512]; + field1778 = new int[2048]; Rasterizer3D_sine = new int[2048]; Rasterizer3D_cosine = new int[2048]; int var0; for (var0 = 1; var0 < 512; ++var0) { - field1737[var0] = 32768 / var0; + field1777[var0] = 32768 / var0; } for (var0 = 1; var0 < 2048; ++var0) { - field1760[var0] = 65536 / var0; + field1778[var0] = 65536 / var0; } for (var0 = 0; var0 < 2048; ++var0) { @@ -98,42 +98,32 @@ public class Rasterizer3D extends Rasterizer2D { } - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("Rasterizer3D_setClipFromRasterizer2D") public static final void Rasterizer3D_setClipFromRasterizer2D() { Rasterizer3D_setClip(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd); } - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("Rasterizer3D_setClip") static final void Rasterizer3D_setClip(int var0, int var1, int var2, int var3) { Rasterizer3D_clipWidth = var2 - var0; Rasterizer3D_clipHeight = var3 - var1; Rasterizer3D_method3(); - int var4; - int var5; if (Rasterizer3D_rowOffsets.length < Rasterizer3D_clipHeight) { - var5 = Rasterizer3D_clipHeight; - --var5; - var5 |= var5 >>> 1; - var5 |= var5 >>> 2; - var5 |= var5 >>> 4; - var5 |= var5 >>> 8; - var5 |= var5 >>> 16; - var4 = var5 + 1; - Rasterizer3D_rowOffsets = new int[var4]; + Rasterizer3D_rowOffsets = new int[DynamicObject.method2293(Rasterizer3D_clipHeight)]; } - var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; + int var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; - for (var5 = 0; var5 < Rasterizer3D_clipHeight; ++var5) { + for (int var5 = 0; var5 < Rasterizer3D_clipHeight; ++var5) { Rasterizer3D_rowOffsets[var5] = var4; var4 += Rasterizer2D.Rasterizer2D_width; } } - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("Rasterizer3D_method3") public static final void Rasterizer3D_method3() { Rasterizer3D_clipMidX = Rasterizer3D_clipWidth / 2; @@ -144,8 +134,8 @@ public class Rasterizer3D extends Rasterizer2D { Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; } - @ObfuscatedName("w") - public static final void method3086(int var0, int var1) { + @ObfuscatedName("e") + public static final void method3101(int var0, int var1) { int var2 = Rasterizer3D_rowOffsets[0]; int var3 = var2 / Rasterizer2D.Rasterizer2D_width; int var4 = var2 - var3 * Rasterizer2D.Rasterizer2D_width; @@ -157,22 +147,22 @@ public class Rasterizer3D extends Rasterizer2D { Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lev;)V" + signature = "(Lep;)V" ) @Export("Rasterizer3D_setTextureLoader") public static final void Rasterizer3D_setTextureLoader(TextureLoader var0) { Rasterizer3D_textureLoader = var0; } - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("Rasterizer3D_setBrightness") public static final void Rasterizer3D_setBrightness(double var0) { Rasterizer3D_buildPalette(var0, 0, 512); } - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("Rasterizer3D_buildPalette") static final void Rasterizer3D_buildPalette(double var0, int var2, int var3) { int var4 = var2 * 128; @@ -251,7 +241,7 @@ public class Rasterizer3D extends Rasterizer2D { } - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("Rasterizer3D_brighten") static int Rasterizer3D_brighten(int var0, double var1) { double var3 = (double)(var0 >> 16) / 256.0D; @@ -266,13 +256,13 @@ public class Rasterizer3D extends Rasterizer2D { return var11 + (var10 << 8) + (var9 << 16); } - @ObfuscatedName("a") - public static void method3078(int var0, int var1, int var2) { - field1751 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; + @ObfuscatedName("j") + public static void method3066(int var0, int var1, int var2) { + field1761 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; } - @ObfuscatedName("d") - static final void method3000(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + @ObfuscatedName("m") + static final void method3116(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = var4 - var3; int var10 = var1 - var0; int var11 = var5 - var3; @@ -487,35 +477,7 @@ public class Rasterizer3D extends Rasterizer2D { var2 = 0; } - if ((var2 == var1 || var16 >= var15) && (var2 != var1 || var16 <= var17)) { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var0; - if (var0 < 0) { - return; - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var3 >> 14, var7, var19); - var3 += var16; - var5 += var17; - var7 += var20; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); - var3 += var16; - var4 += var15; - var7 += var20; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } else { + if (var2 != var1 && var16 < var15 || var2 == var1 && var16 > var17) { var0 -= var2; var2 -= var1; var1 = Rasterizer3D_rowOffsets[var1]; @@ -543,6 +505,34 @@ public class Rasterizer3D extends Rasterizer2D { var7 += var20; var1 += Rasterizer2D.Rasterizer2D_width; } + } else { + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var3 >> 14, var7, var19); + var3 += var16; + var5 += var17; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); + var3 += var16; + var4 += var15; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; + } } } else { var5 = var4 <<= 14; @@ -777,10 +767,10 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("Rasterizer3D_vertAlpha") static final void Rasterizer3D_vertAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (field1751) { + if (field1761) { if (var5 > Rasterizer3D_clipWidth) { var5 = Rasterizer3D_clipWidth; } @@ -796,7 +786,7 @@ public class Rasterizer3D extends Rasterizer2D { int var8; int var9; int var10; - if (field1739) { + if (field1762) { var3 = var5 - var4 >> 2; var7 <<= 2; if (Rasterizer3D_alpha == 0) { @@ -880,8 +870,8 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("o") - public static final void method3008(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("h") + public static final void method3123(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { int var7 = 0; if (var0 != var1) { var7 = (var4 - var3 << 14) / (var1 - var0); @@ -921,33 +911,7 @@ public class Rasterizer3D extends Rasterizer2D { var1 = 0; } - if (var0 != var1 && var9 < var7 || var0 == var1 && var9 > var8) { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var4 >> 14); - var5 += var9; - var4 += var8; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); - var5 += var9; - var3 += var7; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } else { + if ((var0 == var1 || var9 >= var7) && (var0 != var1 || var9 <= var8)) { var2 -= var1; var1 -= var0; var0 = Rasterizer3D_rowOffsets[var0]; @@ -973,6 +937,32 @@ public class Rasterizer3D extends Rasterizer2D { var3 += var7; var0 += Rasterizer2D.Rasterizer2D_width; } + } else { + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var4 >> 14); + var5 += var9; + var4 += var8; + var0 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); + var5 += var9; + var3 += var7; + var0 += Rasterizer2D.Rasterizer2D_width; + } } } else { var4 = var3 <<= 14; @@ -988,33 +978,7 @@ public class Rasterizer3D extends Rasterizer2D { var2 = 0; } - if ((var0 == var2 || var9 >= var7) && (var0 != var2 || var8 <= var7)) { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); - var5 += var8; - var3 += var7; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var4 >> 14); - var4 += var9; - var3 += var7; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } else { + if (var0 != var2 && var9 < var7 || var0 == var2 && var8 > var7) { var1 -= var2; var2 -= var0; var0 = Rasterizer3D_rowOffsets[var0]; @@ -1040,6 +1004,32 @@ public class Rasterizer3D extends Rasterizer2D { var3 += var7; var0 += Rasterizer2D.Rasterizer2D_width; } + } else { + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); + var5 += var8; + var3 += var7; + var0 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var4 >> 14); + var4 += var9; + var3 += var7; + var0 += Rasterizer2D.Rasterizer2D_width; + } } } } @@ -1067,33 +1057,7 @@ public class Rasterizer3D extends Rasterizer2D { var2 = 0; } - if (var2 != var1 && var7 < var8 || var2 == var1 && var7 > var9) { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var0; - if (var0 < 0) { - return; - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var5 >> 14); - var3 += var7; - var5 += var9; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); - var3 += var7; - var4 += var8; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } else { + if ((var2 == var1 || var7 >= var8) && (var2 != var1 || var7 <= var9)) { var0 -= var2; var2 -= var1; var1 = Rasterizer3D_rowOffsets[var1]; @@ -1119,6 +1083,32 @@ public class Rasterizer3D extends Rasterizer2D { var4 += var8; var1 += Rasterizer2D.Rasterizer2D_width; } + } else { + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var5 >> 14); + var3 += var7; + var5 += var9; + var1 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); + var3 += var7; + var4 += var8; + var1 += Rasterizer2D.Rasterizer2D_width; + } } } else { var5 = var4 <<= 14; @@ -1336,10 +1326,10 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("l") + @ObfuscatedName("v") @Export("Rasterizer3D_horizAlpha") static final void Rasterizer3D_horizAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5) { - if (field1751) { + if (field1761) { if (var5 > Rasterizer3D_clipWidth) { var5 = Rasterizer3D_clipWidth; } @@ -1431,16 +1421,16 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("t") - static final void method3010(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) { + @ObfuscatedName("n") + static final void method3078(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) { int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); int var20; if (var19 == null) { var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); - method3000(var0, var1, var2, var3, var4, var5, method3014(var20, var6), method3014(var20, var7), method3014(var20, var8)); + method3116(var0, var1, var2, var3, var4, var5, method3082(var20, var6), method3082(var20, var7), method3082(var20, var8)); } else { Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); - field1758 = Rasterizer3D_textureLoader.vmethod3284(var18); + field1755 = Rasterizer3D_textureLoader.vmethod3347(var18); var20 = var4 - var3; int var21 = var1 - var0; int var22 = var5 - var3; @@ -1512,41 +1502,7 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; var35 += var37 * var41; var38 += var40 * var41; - if ((var0 == var1 || var28 >= var26) && (var0 != var1 || var28 <= var27)) { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var28; - var4 += var27; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var28; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } else { + if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) { var2 -= var1; var1 -= var0; var0 = Rasterizer3D_rowOffsets[var0]; @@ -1580,6 +1536,40 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; var38 += var40; } + } else { + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var4 += var27; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } } } else { var4 = var3 <<= 14; @@ -1600,41 +1590,7 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; var35 += var37 * var41; var38 += var40 * var41; - if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var27; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var4 += var28; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } else { + if ((var0 == var2 || var28 >= var26) && (var0 != var2 || var27 <= var26)) { var1 -= var2; var2 -= var0; var0 = Rasterizer3D_rowOffsets[var0]; @@ -1668,6 +1624,40 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; var38 += var40; } + } else { + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var27; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var4 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } } } } @@ -1701,41 +1691,7 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; var35 += var37 * var41; var38 += var40 * var41; - if ((var2 == var1 || var26 >= var27) && (var2 != var1 || var26 <= var28)) { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var0; - if (var0 < 0) { - return; - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var26; - var5 += var28; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var26; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } else { + if (var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) { var0 -= var2; var2 -= var1; var1 = Rasterizer3D_rowOffsets[var1]; @@ -1769,6 +1725,40 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; var38 += var40; } + } else { + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var5 += var28; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } } } else { var5 = var4 <<= 14; @@ -2052,10 +2042,10 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("Rasterizer3D_iDontKnow") static final void Rasterizer3D_iDontKnow(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14) { - if (field1751) { + if (field1761) { if (var6 > Rasterizer3D_clipWidth) { var6 = Rasterizer3D_clipWidth; } @@ -2119,7 +2109,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; var8 <<= 3; var15 = var7 >> 8; - if (field1758) { + if (field1755) { if (var17 > 0) { do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; @@ -2314,7 +2304,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; var8 <<= 3; var15 = var7 >> 8; - if (field1758) { + if (field1755) { if (var17 > 0) { do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; @@ -2473,17 +2463,17 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("n") + @ObfuscatedName("w") @Export("drawTexturedTile") static final void drawTexturedTile(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) { int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); int var20; if (var19 == null) { var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); - method3000(var0, var1, var2, var3, var4, var5, method3014(var20, var6), method3014(var20, var7), method3014(var20, var8)); + method3116(var0, var1, var2, var3, var4, var5, method3082(var20, var6), method3082(var20, var7), method3082(var20, var8)); } else { Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); - field1758 = Rasterizer3D_textureLoader.vmethod3284(var18); + field1755 = Rasterizer3D_textureLoader.vmethod3347(var18); var20 = var4 - var3; int var21 = var1 - var0; int var22 = var5 - var3; @@ -2555,41 +2545,7 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; var35 += var37 * var41; var38 += var40 * var41; - if ((var0 == var1 || var28 >= var26) && (var0 != var1 || var28 <= var27)) { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var28; - var4 += var27; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var28; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } else { + if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) { var2 -= var1; var1 -= var0; var0 = Rasterizer3D_rowOffsets[var0]; @@ -2623,6 +2579,40 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; var38 += var40; } + } else { + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var4 += var27; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } } } else { var4 = var3 <<= 14; @@ -2744,41 +2734,7 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; var35 += var37 * var41; var38 += var40 * var41; - if ((var2 == var1 || var26 >= var27) && (var2 != var1 || var26 <= var28)) { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var0; - if (var0 < 0) { - return; - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var26; - var5 += var28; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var26; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } else { + if (var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) { var0 -= var2; var2 -= var1; var1 = Rasterizer3D_rowOffsets[var1]; @@ -2812,6 +2768,40 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; var38 += var40; } + } else { + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var5 += var28; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } } } else { var5 = var4 <<= 14; @@ -3095,10 +3085,10 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("u") + @ObfuscatedName("q") @Export("Rasterizer3D_textureAlpha") static final void Rasterizer3D_textureAlpha(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14) { - if (field1751) { + if (field1761) { if (var6 > Rasterizer3D_clipWidth) { var6 = Rasterizer3D_clipWidth; } @@ -3151,7 +3141,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; var8 <<= 3; var15 = var7 >> 8; - if (field1758) { + if (field1755) { if (var17 > 0) { do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; @@ -3294,7 +3284,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; var8 <<= 3; var15 = var7 >> 8; - if (field1758) { + if (field1755) { if (var17 > 0) { do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; @@ -3412,7 +3402,7 @@ public class Rasterizer3D extends Rasterizer2D { } @ObfuscatedName("z") - static final int method3014(int var0, int var1) { + static final int method3082(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; if (var1 < 2) { var1 = 2; @@ -3423,33 +3413,33 @@ public class Rasterizer3D extends Rasterizer2D { return (var0 & 65408) + var1; } - @ObfuscatedName("h") - static final int method3015(int var0, int var1, int var2, int var3) { + @ObfuscatedName("y") + static final int method3083(int var0, int var1, int var2, int var3) { return var0 * var2 + var3 * var1 >> 16; } - @ObfuscatedName("m") - static final int method3016(int var0, int var1, int var2, int var3) { + @ObfuscatedName("f") + static final int method3084(int var0, int var1, int var2, int var3) { return var2 * var1 - var3 * var0 >> 16; } - @ObfuscatedName("aa") - static final int method3017(int var0, int var1, int var2, int var3) { + @ObfuscatedName("a") + static final int method3112(int var0, int var1, int var2, int var3) { return var0 * var2 - var3 * var1 >> 16; } - @ObfuscatedName("av") - static final int method3083(int var0, int var1, int var2, int var3) { + @ObfuscatedName("u") + static final int method3086(int var0, int var1, int var2, int var3) { return var3 * var0 + var2 * var1 >> 16; } - @ObfuscatedName("aw") - static final int method3019(int var0, int var1, int var2, int var3) { + @ObfuscatedName("ae") + static final int method3087(int var0, int var1, int var2, int var3) { return var0 * var2 + var3 * var1 >> 16; } - @ObfuscatedName("as") - static final int method3020(int var0, int var1, int var2, int var3) { + @ObfuscatedName("af") + static final int method3088(int var0, int var1, int var2, int var3) { return var2 * var1 - var3 * var0 >> 16; } } diff --git a/runescape-client/src/main/java/RawPcmStream.java b/runescape-client/src/main/java/RawPcmStream.java index a53c9252ef..7cb88a066e 100644 --- a/runescape-client/src/main/java/RawPcmStream.java +++ b/runescape-client/src/main/java/RawPcmStream.java @@ -3,107 +3,107 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dg") +@ObfuscatedName("de") @Implements("RawPcmStream") public class RawPcmStream extends PcmStream { - @ObfuscatedName("f") - int field1428; - @ObfuscatedName("i") - int field1426; - @ObfuscatedName("y") - int field1427; - @ObfuscatedName("p") - int field1432; - @ObfuscatedName("b") - int field1429; + @ObfuscatedName("c") + int field1462; + @ObfuscatedName("t") + int field1463; + @ObfuscatedName("o") + int field1452; @ObfuscatedName("e") - int field1430; - @ObfuscatedName("x") - int field1431; - @ObfuscatedName("a") + int field1464; + @ObfuscatedName("i") + int field1454; + @ObfuscatedName("g") + int field1455; + @ObfuscatedName("d") + int field1456; + @ObfuscatedName("l") @Export("numLoops") int numLoops; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("start") int start; - @ObfuscatedName("c") + @ObfuscatedName("m") @Export("end") int end; - @ObfuscatedName("o") - boolean field1435; + @ObfuscatedName("p") + boolean field1450; + @ObfuscatedName("h") + int field1461; @ObfuscatedName("v") - int field1437; - @ObfuscatedName("k") - int field1436; - @ObfuscatedName("s") - int field1438; - @ObfuscatedName("l") - int field1439; + int field1460; + @ObfuscatedName("n") + int field1453; + @ObfuscatedName("x") + int field1451; @ObfuscatedSignature( - signature = "(Lcc;III)V" + signature = "(Lcv;III)V" ) RawPcmStream(RawSound var1, int var2, int var3, int var4) { super.sound = var1; this.start = var1.start; this.end = var1.end; - this.field1435 = var1.field1352; - this.field1426 = var2; - this.field1427 = var3; - this.field1432 = var4; - this.field1428 = 0; - this.method2543(); + this.field1450 = var1.field1379; + this.field1463 = var2; + this.field1452 = var3; + this.field1464 = var4; + this.field1462 = 0; + this.method2607(); } @ObfuscatedSignature( - signature = "(Lcc;II)V" + signature = "(Lcv;II)V" ) RawPcmStream(RawSound var1, int var2, int var3) { super.sound = var1; this.start = var1.start; this.end = var1.end; - this.field1435 = var1.field1352; - this.field1426 = var2; - this.field1427 = var3; - this.field1432 = 8192; - this.field1428 = 0; - this.method2543(); + this.field1450 = var1.field1379; + this.field1463 = var2; + this.field1452 = var3; + this.field1464 = 8192; + this.field1462 = 0; + this.method2607(); } - @ObfuscatedName("p") - void method2543() { - this.field1429 = this.field1427; - this.field1430 = method2552(this.field1427, this.field1432); - this.field1431 = method2693(this.field1427, this.field1432); + @ObfuscatedName("i") + void method2607() { + this.field1454 = this.field1452; + this.field1455 = method2728(this.field1452, this.field1464); + this.field1456 = method2603(this.field1452, this.field1464); } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "()Ldl;" + signature = "()Ldn;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { return null; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "()Ldl;" + signature = "()Ldn;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { return null; } - @ObfuscatedName("x") - protected int vmethod3889() { - return this.field1427 == 0 && this.field1437 == 0 ? 0 : 1; + @ObfuscatedName("l") + protected int vmethod3965() { + return this.field1452 == 0 && this.field1461 == 0 ? 0 : 1; } - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("fill") public synchronized void fill(int[] var1, int var2, int var3) { - if (this.field1427 == 0 && this.field1437 == 0) { + if (this.field1452 == 0 && this.field1461 == 0) { this.skip(var3); } else { RawSound var4 = (RawSound)super.sound; @@ -117,163 +117,163 @@ public class RawPcmStream extends PcmStream { int var9 = var2; var3 += var2; - if (this.field1428 < 0) { - if (this.field1426 <= 0) { - this.method2679(); + if (this.field1462 < 0) { + if (this.field1463 <= 0) { + this.method2616(); this.remove(); return; } - this.field1428 = 0; + this.field1462 = 0; } - if (this.field1428 >= var7) { - if (this.field1426 >= 0) { - this.method2679(); + if (this.field1462 >= var7) { + if (this.field1463 >= 0) { + this.method2616(); this.remove(); return; } - this.field1428 = var7 - 1; + this.field1462 = var7 - 1; } if (this.numLoops < 0) { - if (this.field1435) { - if (this.field1426 < 0) { - var9 = this.method2570(var1, var2, var5, var3, var4.samples[this.start]); - if (this.field1428 >= var5) { + if (this.field1450) { + if (this.field1463 < 0) { + var9 = this.method2630(var1, var2, var5, var3, var4.samples[this.start]); + if (this.field1462 >= var5) { return; } - this.field1428 = var5 + var5 - 1 - this.field1428; - this.field1426 = -this.field1426; + this.field1462 = var5 + var5 - 1 - this.field1462; + this.field1463 = -this.field1463; } while (true) { - var9 = this.method2569(var1, var9, var6, var3, var4.samples[this.end - 1]); - if (this.field1428 < var6) { + var9 = this.method2608(var1, var9, var6, var3, var4.samples[this.end - 1]); + if (this.field1462 < var6) { return; } - this.field1428 = var6 + var6 - 1 - this.field1428; - this.field1426 = -this.field1426; - var9 = this.method2570(var1, var9, var5, var3, var4.samples[this.start]); - if (this.field1428 >= var5) { + this.field1462 = var6 + var6 - 1 - this.field1462; + this.field1463 = -this.field1463; + var9 = this.method2630(var1, var9, var5, var3, var4.samples[this.start]); + if (this.field1462 >= var5) { return; } - this.field1428 = var5 + var5 - 1 - this.field1428; - this.field1426 = -this.field1426; + this.field1462 = var5 + var5 - 1 - this.field1462; + this.field1463 = -this.field1463; } - } else if (this.field1426 < 0) { + } else if (this.field1463 < 0) { while (true) { - var9 = this.method2570(var1, var9, var5, var3, var4.samples[this.end - 1]); - if (this.field1428 >= var5) { + var9 = this.method2630(var1, var9, var5, var3, var4.samples[this.end - 1]); + if (this.field1462 >= var5) { return; } - this.field1428 = var6 - 1 - (var6 - 1 - this.field1428) % var8; + this.field1462 = var6 - 1 - (var6 - 1 - this.field1462) % var8; } } else { while (true) { - var9 = this.method2569(var1, var9, var6, var3, var4.samples[this.start]); - if (this.field1428 < var6) { + var9 = this.method2608(var1, var9, var6, var3, var4.samples[this.start]); + if (this.field1462 < var6) { return; } - this.field1428 = var5 + (this.field1428 - var5) % var8; + this.field1462 = var5 + (this.field1462 - var5) % var8; } } } else { if (this.numLoops > 0) { - if (this.field1435) { - label122: { - if (this.field1426 < 0) { - var9 = this.method2570(var1, var2, var5, var3, var4.samples[this.start]); - if (this.field1428 >= var5) { + if (this.field1450) { + label146: { + if (this.field1463 < 0) { + var9 = this.method2630(var1, var2, var5, var3, var4.samples[this.start]); + if (this.field1462 >= var5) { return; } - this.field1428 = var5 + var5 - 1 - this.field1428; - this.field1426 = -this.field1426; + this.field1462 = var5 + var5 - 1 - this.field1462; + this.field1463 = -this.field1463; if (--this.numLoops == 0) { - break label122; + break label146; } } do { - var9 = this.method2569(var1, var9, var6, var3, var4.samples[this.end - 1]); - if (this.field1428 < var6) { + var9 = this.method2608(var1, var9, var6, var3, var4.samples[this.end - 1]); + if (this.field1462 < var6) { return; } - this.field1428 = var6 + var6 - 1 - this.field1428; - this.field1426 = -this.field1426; + this.field1462 = var6 + var6 - 1 - this.field1462; + this.field1463 = -this.field1463; if (--this.numLoops == 0) { break; } - var9 = this.method2570(var1, var9, var5, var3, var4.samples[this.start]); - if (this.field1428 >= var5) { + var9 = this.method2630(var1, var9, var5, var3, var4.samples[this.start]); + if (this.field1462 >= var5) { return; } - this.field1428 = var5 + var5 - 1 - this.field1428; - this.field1426 = -this.field1426; + this.field1462 = var5 + var5 - 1 - this.field1462; + this.field1463 = -this.field1463; } while(--this.numLoops != 0); } } else { int var10; - if (this.field1426 < 0) { + if (this.field1463 < 0) { while (true) { - var9 = this.method2570(var1, var9, var5, var3, var4.samples[this.end - 1]); - if (this.field1428 >= var5) { + var9 = this.method2630(var1, var9, var5, var3, var4.samples[this.end - 1]); + if (this.field1462 >= var5) { return; } - var10 = (var6 - 1 - this.field1428) / var8; + var10 = (var6 - 1 - this.field1462) / var8; if (var10 >= this.numLoops) { - this.field1428 += var8 * this.numLoops; + this.field1462 += var8 * this.numLoops; this.numLoops = 0; break; } - this.field1428 += var8 * var10; + this.field1462 += var8 * var10; this.numLoops -= var10; } } else { while (true) { - var9 = this.method2569(var1, var9, var6, var3, var4.samples[this.start]); - if (this.field1428 < var6) { + var9 = this.method2608(var1, var9, var6, var3, var4.samples[this.start]); + if (this.field1462 < var6) { return; } - var10 = (this.field1428 - var5) / var8; + var10 = (this.field1462 - var5) / var8; if (var10 >= this.numLoops) { - this.field1428 -= var8 * this.numLoops; + this.field1462 -= var8 * this.numLoops; this.numLoops = 0; break; } - this.field1428 -= var8 * var10; + this.field1462 -= var8 * var10; this.numLoops -= var10; } } } } - if (this.field1426 < 0) { - this.method2570(var1, var9, 0, var3, 0); - if (this.field1428 < 0) { - this.field1428 = -1; - this.method2679(); + if (this.field1463 < 0) { + this.method2630(var1, var9, 0, var3, 0); + if (this.field1462 < 0) { + this.field1462 = -1; + this.method2616(); this.remove(); } } else { - this.method2569(var1, var9, var7, var3, 0); - if (this.field1428 >= var7) { - this.field1428 = var7; - this.method2679(); + this.method2608(var1, var9, var7, var3, 0); + if (this.field1462 >= var7) { + this.field1462 = var7; + this.method2616(); this.remove(); } } @@ -282,33 +282,33 @@ public class RawPcmStream extends PcmStream { } } - @ObfuscatedName("d") + @ObfuscatedName("m") @Export("setNumLoops") public synchronized void setNumLoops(int var1) { this.numLoops = var1; } - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("skip") public synchronized void skip(int var1) { - if (this.field1437 > 0) { - if (var1 >= this.field1437) { - if (this.field1427 == Integer.MIN_VALUE) { - this.field1427 = 0; - this.field1431 = 0; - this.field1430 = 0; - this.field1429 = 0; + if (this.field1461 > 0) { + if (var1 >= this.field1461) { + if (this.field1452 == Integer.MIN_VALUE) { + this.field1452 = 0; + this.field1456 = 0; + this.field1455 = 0; + this.field1454 = 0; this.remove(); - var1 = this.field1437; + var1 = this.field1461; } - this.field1437 = 0; - this.method2543(); + this.field1461 = 0; + this.method2607(); } else { - this.field1429 += this.field1436 * var1; - this.field1430 += this.field1438 * var1; - this.field1431 += this.field1439 * var1; - this.field1437 -= var1; + this.field1454 += this.field1460 * var1; + this.field1455 += this.field1453 * var1; + this.field1456 += this.field1451 * var1; + this.field1461 -= var1; } } @@ -321,130 +321,130 @@ public class RawPcmStream extends PcmStream { this.numLoops = 0; } - if (this.field1428 < 0) { - if (this.field1426 <= 0) { - this.method2679(); + if (this.field1462 < 0) { + if (this.field1463 <= 0) { + this.method2616(); this.remove(); return; } - this.field1428 = 0; + this.field1462 = 0; } - if (this.field1428 >= var5) { - if (this.field1426 >= 0) { - this.method2679(); + if (this.field1462 >= var5) { + if (this.field1463 >= 0) { + this.method2616(); this.remove(); return; } - this.field1428 = var5 - 1; + this.field1462 = var5 - 1; } - this.field1428 += this.field1426 * var1; + this.field1462 += this.field1463 * var1; if (this.numLoops < 0) { - if (!this.field1435) { - if (this.field1426 < 0) { - if (this.field1428 >= var3) { + if (!this.field1450) { + if (this.field1463 < 0) { + if (this.field1462 >= var3) { return; } - this.field1428 = var4 - 1 - (var4 - 1 - this.field1428) % var6; + this.field1462 = var4 - 1 - (var4 - 1 - this.field1462) % var6; } else { - if (this.field1428 < var4) { + if (this.field1462 < var4) { return; } - this.field1428 = var3 + (this.field1428 - var3) % var6; + this.field1462 = var3 + (this.field1462 - var3) % var6; } } else { - if (this.field1426 < 0) { - if (this.field1428 >= var3) { + if (this.field1463 < 0) { + if (this.field1462 >= var3) { return; } - this.field1428 = var3 + var3 - 1 - this.field1428; - this.field1426 = -this.field1426; + this.field1462 = var3 + var3 - 1 - this.field1462; + this.field1463 = -this.field1463; } - while (this.field1428 >= var4) { - this.field1428 = var4 + var4 - 1 - this.field1428; - this.field1426 = -this.field1426; - if (this.field1428 >= var3) { + while (this.field1462 >= var4) { + this.field1462 = var4 + var4 - 1 - this.field1462; + this.field1463 = -this.field1463; + if (this.field1462 >= var3) { return; } - this.field1428 = var3 + var3 - 1 - this.field1428; - this.field1426 = -this.field1426; + this.field1462 = var3 + var3 - 1 - this.field1462; + this.field1463 = -this.field1463; } } } else { if (this.numLoops > 0) { - if (this.field1435) { - label124: { - if (this.field1426 < 0) { - if (this.field1428 >= var3) { + if (this.field1450) { + label125: { + if (this.field1463 < 0) { + if (this.field1462 >= var3) { return; } - this.field1428 = var3 + var3 - 1 - this.field1428; - this.field1426 = -this.field1426; + this.field1462 = var3 + var3 - 1 - this.field1462; + this.field1463 = -this.field1463; if (--this.numLoops == 0) { - break label124; + break label125; } } do { - if (this.field1428 < var4) { + if (this.field1462 < var4) { return; } - this.field1428 = var4 + var4 - 1 - this.field1428; - this.field1426 = -this.field1426; + this.field1462 = var4 + var4 - 1 - this.field1462; + this.field1463 = -this.field1463; if (--this.numLoops == 0) { break; } - if (this.field1428 >= var3) { + if (this.field1462 >= var3) { return; } - this.field1428 = var3 + var3 - 1 - this.field1428; - this.field1426 = -this.field1426; + this.field1462 = var3 + var3 - 1 - this.field1462; + this.field1463 = -this.field1463; } while(--this.numLoops != 0); } } else { - label156: { + label157: { int var7; - if (this.field1426 < 0) { - if (this.field1428 >= var3) { + if (this.field1463 < 0) { + if (this.field1462 >= var3) { return; } - var7 = (var4 - 1 - this.field1428) / var6; + var7 = (var4 - 1 - this.field1462) / var6; if (var7 >= this.numLoops) { - this.field1428 += var6 * this.numLoops; + this.field1462 += var6 * this.numLoops; this.numLoops = 0; - break label156; + break label157; } - this.field1428 += var6 * var7; + this.field1462 += var6 * var7; this.numLoops -= var7; } else { - if (this.field1428 < var4) { + if (this.field1462 < var4) { return; } - var7 = (this.field1428 - var3) / var6; + var7 = (this.field1462 - var3) / var6; if (var7 >= this.numLoops) { - this.field1428 -= var6 * this.numLoops; + this.field1462 -= var6 * this.numLoops; this.numLoops = 0; - break label156; + break label157; } - this.field1428 -= var6 * var7; + this.field1462 -= var6 * var7; this.numLoops -= var7; } @@ -453,51 +453,51 @@ public class RawPcmStream extends PcmStream { } } - if (this.field1426 < 0) { - if (this.field1428 < 0) { - this.field1428 = -1; - this.method2679(); + if (this.field1463 < 0) { + if (this.field1462 < 0) { + this.field1462 = -1; + this.method2616(); this.remove(); } - } else if (this.field1428 >= var5) { - this.field1428 = var5; - this.method2679(); + } else if (this.field1462 >= var5) { + this.field1462 = var5; + this.method2616(); this.remove(); } } } - @ObfuscatedName("o") - public synchronized void method2578(int var1) { - this.method2551(var1 << 6, this.method2553()); + @ObfuscatedName("h") + public synchronized void method2665(int var1) { + this.method2629(var1 << 6, this.method2613()); } - @ObfuscatedName("l") - synchronized void method2550(int var1) { - this.method2551(var1, this.method2553()); - } - - @ObfuscatedName("t") - synchronized void method2551(int var1, int var2) { - this.field1427 = var1; - this.field1432 = var2; - this.field1437 = 0; - this.method2543(); - } - - @ObfuscatedName("j") - public synchronized int method2609() { - return this.field1427 == Integer.MIN_VALUE ? 0 : this.field1427; + @ObfuscatedName("v") + synchronized void method2610(int var1) { + this.method2629(var1, this.method2613()); } @ObfuscatedName("n") - public synchronized int method2553() { - return this.field1432 < 0 ? -1 : this.field1432; + synchronized void method2629(int var1, int var2) { + this.field1452 = var1; + this.field1464 = var2; + this.field1461 = 0; + this.method2607(); } - @ObfuscatedName("u") - public synchronized void method2554(int var1) { + @ObfuscatedName("x") + public synchronized int method2612() { + return this.field1452 == Integer.MIN_VALUE ? 0 : this.field1452; + } + + @ObfuscatedName("w") + public synchronized int method2613() { + return this.field1464 < 0 ? -1 : this.field1464; + } + + @ObfuscatedName("q") + public synchronized void method2622(int var1) { int var2 = ((RawSound)super.sound).samples.length << 8; if (var1 < -1) { var1 = -1; @@ -507,7 +507,7 @@ public class RawPcmStream extends PcmStream { var1 = var2; } - this.field1428 = var1; + this.field1462 = var1; } @ObfuscatedName("z") @@ -515,249 +515,249 @@ public class RawPcmStream extends PcmStream { signature = "(Z)V", garbageValue = "1" ) - public synchronized void method2555() { - this.field1426 = (this.field1426 ^ this.field1426 >> 31) + (this.field1426 >>> 31); - this.field1426 = -this.field1426; + public synchronized void method2710() { + this.field1463 = (this.field1463 ^ this.field1463 >> 31) + (this.field1463 >>> 31); + this.field1463 = -this.field1463; } - @ObfuscatedName("h") - void method2679() { - if (this.field1437 != 0) { - if (this.field1427 == Integer.MIN_VALUE) { - this.field1427 = 0; + @ObfuscatedName("y") + void method2616() { + if (this.field1461 != 0) { + if (this.field1452 == Integer.MIN_VALUE) { + this.field1452 = 0; } - this.field1437 = 0; - this.method2543(); + this.field1461 = 0; + this.method2607(); } } - @ObfuscatedName("m") - public synchronized void method2557(int var1, int var2) { - this.method2668(var1, var2, this.method2553()); + @ObfuscatedName("f") + public synchronized void method2614(int var1, int var2) { + this.method2618(var1, var2, this.method2613()); } - @ObfuscatedName("aa") - public synchronized void method2668(int var1, int var2, int var3) { + @ObfuscatedName("a") + public synchronized void method2618(int var1, int var2, int var3) { if (var1 == 0) { - this.method2551(var2, var3); + this.method2629(var2, var3); } else { - int var4 = method2552(var2, var3); - int var5 = method2693(var2, var3); - if (var4 == this.field1430 && var5 == this.field1431) { - this.field1437 = 0; + int var4 = method2728(var2, var3); + int var5 = method2603(var2, var3); + if (var4 == this.field1455 && var5 == this.field1456) { + this.field1461 = 0; } else { - int var6 = var2 - this.field1429; - if (this.field1429 - var2 > var6) { - var6 = this.field1429 - var2; + int var6 = var2 - this.field1454; + if (this.field1454 - var2 > var6) { + var6 = this.field1454 - var2; } - if (var4 - this.field1430 > var6) { - var6 = var4 - this.field1430; + if (var4 - this.field1455 > var6) { + var6 = var4 - this.field1455; } - if (this.field1430 - var4 > var6) { - var6 = this.field1430 - var4; + if (this.field1455 - var4 > var6) { + var6 = this.field1455 - var4; } - if (var5 - this.field1431 > var6) { - var6 = var5 - this.field1431; + if (var5 - this.field1456 > var6) { + var6 = var5 - this.field1456; } - if (this.field1431 - var5 > var6) { - var6 = this.field1431 - var5; + if (this.field1456 - var5 > var6) { + var6 = this.field1456 - var5; } if (var1 > var6) { var1 = var6; } - this.field1437 = var1; - this.field1427 = var2; - this.field1432 = var3; - this.field1436 = (var2 - this.field1429) / var1; - this.field1438 = (var4 - this.field1430) / var1; - this.field1439 = (var5 - this.field1431) / var1; + this.field1461 = var1; + this.field1452 = var2; + this.field1464 = var3; + this.field1460 = (var2 - this.field1454) / var1; + this.field1453 = (var4 - this.field1455) / var1; + this.field1451 = (var5 - this.field1456) / var1; } } } - @ObfuscatedName("av") - public synchronized void method2559(int var1) { + @ObfuscatedName("u") + public synchronized void method2619(int var1) { if (var1 == 0) { - this.method2550(0); + this.method2610(0); this.remove(); - } else if (this.field1430 == 0 && this.field1431 == 0) { - this.field1437 = 0; - this.field1427 = 0; - this.field1429 = 0; + } else if (this.field1455 == 0 && this.field1456 == 0) { + this.field1461 = 0; + this.field1452 = 0; + this.field1454 = 0; this.remove(); } else { - int var2 = -this.field1429; - if (this.field1429 > var2) { - var2 = this.field1429; + int var2 = -this.field1454; + if (this.field1454 > var2) { + var2 = this.field1454; } - if (-this.field1430 > var2) { - var2 = -this.field1430; + if (-this.field1455 > var2) { + var2 = -this.field1455; } - if (this.field1430 > var2) { - var2 = this.field1430; + if (this.field1455 > var2) { + var2 = this.field1455; } - if (-this.field1431 > var2) { - var2 = -this.field1431; + if (-this.field1456 > var2) { + var2 = -this.field1456; } - if (this.field1431 > var2) { - var2 = this.field1431; + if (this.field1456 > var2) { + var2 = this.field1456; } if (var1 > var2) { var1 = var2; } - this.field1437 = var1; - this.field1427 = Integer.MIN_VALUE; - this.field1436 = -this.field1429 / var1; - this.field1438 = -this.field1430 / var1; - this.field1439 = -this.field1431 / var1; + this.field1461 = var1; + this.field1452 = Integer.MIN_VALUE; + this.field1460 = -this.field1454 / var1; + this.field1453 = -this.field1455 / var1; + this.field1451 = -this.field1456 / var1; } } - @ObfuscatedName("ay") - public synchronized void method2615(int var1) { - if (this.field1426 < 0) { - this.field1426 = -var1; - } else { - this.field1426 = var1; - } - - } - - @ObfuscatedName("ag") - public synchronized int method2561() { - return this.field1426 < 0 ? -this.field1426 : this.field1426; - } - @ObfuscatedName("ae") - public boolean method2653() { - return this.field1428 < 0 || this.field1428 >= ((RawSound)super.sound).samples.length << 8; - } - - @ObfuscatedName("ad") - public boolean method2563() { - return this.field1437 != 0; - } - - @ObfuscatedName("aj") - int method2569(int[] var1, int var2, int var3, int var4, int var5) { - while (true) { - if (this.field1437 > 0) { - int var6 = var2 + this.field1437; - if (var6 > var4) { - var6 = var4; - } - - this.field1437 += var2; - if (this.field1426 == 256 && (this.field1428 & 255) == 0) { - if (SoundCache.PcmPlayer_stereo) { - var2 = method2581(0, ((RawSound)super.sound).samples, var1, this.field1428, var2, this.field1430, this.field1431, this.field1438, this.field1439, 0, var6, var3, this); - } else { - var2 = method2614(((RawSound)super.sound).samples, var1, this.field1428, var2, this.field1429, this.field1436, 0, var6, var3, this); - } - } else if (SoundCache.PcmPlayer_stereo) { - var2 = method2585(0, 0, ((RawSound)super.sound).samples, var1, this.field1428, var2, this.field1430, this.field1431, this.field1438, this.field1439, 0, var6, var3, this, this.field1426, var5); - } else { - var2 = method2584(0, 0, ((RawSound)super.sound).samples, var1, this.field1428, var2, this.field1429, this.field1436, 0, var6, var3, this, this.field1426, var5); - } - - this.field1437 -= var2; - if (this.field1437 != 0) { - return var2; - } - - if (!this.method2571()) { - continue; - } - - return var4; - } - - if (this.field1426 == 256 && (this.field1428 & 255) == 0) { - if (SoundCache.PcmPlayer_stereo) { - return method2573(0, ((RawSound)super.sound).samples, var1, this.field1428, var2, this.field1430, this.field1431, 0, var4, var3, this); - } - - return method2572(((RawSound)super.sound).samples, var1, this.field1428, var2, this.field1429, 0, var4, var3, this); - } - - if (SoundCache.PcmPlayer_stereo) { - return method2577(0, 0, ((RawSound)super.sound).samples, var1, this.field1428, var2, this.field1430, this.field1431, 0, var4, var3, this, this.field1426, var5); - } - - return method2576(0, 0, ((RawSound)super.sound).samples, var1, this.field1428, var2, this.field1429, 0, var4, var3, this, this.field1426, var5); + public synchronized void method2660(int var1) { + if (this.field1463 < 0) { + this.field1463 = -var1; + } else { + this.field1463 = var1; } + } - @ObfuscatedName("ax") - int method2570(int[] var1, int var2, int var3, int var4, int var5) { - while (true) { - if (this.field1437 > 0) { - int var6 = var2 + this.field1437; - if (var6 > var4) { - var6 = var4; - } + @ObfuscatedName("af") + public synchronized int method2621() { + return this.field1463 < 0 ? -this.field1463 : this.field1463; + } - this.field1437 += var2; - if (this.field1426 == -256 && (this.field1428 & 255) == 0) { - if (SoundCache.PcmPlayer_stereo) { - var2 = method2556(0, ((RawSound)super.sound).samples, var1, this.field1428, var2, this.field1430, this.field1431, this.field1438, this.field1439, 0, var6, var3, this); - } else { - var2 = method2542(((RawSound)super.sound).samples, var1, this.field1428, var2, this.field1429, this.field1436, 0, var6, var3, this); - } - } else if (SoundCache.PcmPlayer_stereo) { - var2 = method2587(0, 0, ((RawSound)super.sound).samples, var1, this.field1428, var2, this.field1430, this.field1431, this.field1438, this.field1439, 0, var6, var3, this, this.field1426, var5); - } else { - var2 = method2568(0, 0, ((RawSound)super.sound).samples, var1, this.field1428, var2, this.field1429, this.field1436, 0, var6, var3, this, this.field1426, var5); - } + @ObfuscatedName("av") + public boolean method2674() { + return this.field1462 < 0 || this.field1462 >= ((RawSound)super.sound).samples.length << 8; + } - this.field1437 -= var2; - if (this.field1437 != 0) { - return var2; - } - - if (!this.method2571()) { - continue; - } - - return var4; - } - - if (this.field1426 == -256 && (this.field1428 & 255) == 0) { - if (SoundCache.PcmPlayer_stereo) { - return method2575(0, ((RawSound)super.sound).samples, var1, this.field1428, var2, this.field1430, this.field1431, 0, var4, var3, this); - } - - return method2689(((RawSound)super.sound).samples, var1, this.field1428, var2, this.field1429, 0, var4, var3, this); - } - - if (SoundCache.PcmPlayer_stereo) { - return method2579(0, 0, ((RawSound)super.sound).samples, var1, this.field1428, var2, this.field1430, this.field1431, 0, var4, var3, this, this.field1426, var5); - } - - return method2629(0, 0, ((RawSound)super.sound).samples, var1, this.field1428, var2, this.field1429, 0, var4, var3, this, this.field1426, var5); - } + @ObfuscatedName("al") + public boolean method2712() { + return this.field1461 != 0; } @ObfuscatedName("at") - int vmethod2716() { - int var1 = this.field1429 * 3 >> 6; + int method2608(int[] var1, int var2, int var3, int var4, int var5) { + while (true) { + if (this.field1461 > 0) { + int var6 = var2 + this.field1461; + if (var6 > var4) { + var6 = var4; + } + + this.field1461 += var2; + if (this.field1463 == 256 && (this.field1462 & 255) == 0) { + if (PcmPlayer.PcmPlayer_stereo) { + var2 = method2641(0, ((RawSound)super.sound).samples, var1, this.field1462, var2, this.field1455, this.field1456, this.field1453, this.field1451, 0, var6, var3, this); + } else { + var2 = method2640(((RawSound)super.sound).samples, var1, this.field1462, var2, this.field1454, this.field1460, 0, var6, var3, this); + } + } else if (PcmPlayer.PcmPlayer_stereo) { + var2 = method2738(0, 0, ((RawSound)super.sound).samples, var1, this.field1462, var2, this.field1455, this.field1456, this.field1453, this.field1451, 0, var6, var3, this, this.field1463, var5); + } else { + var2 = method2644(0, 0, ((RawSound)super.sound).samples, var1, this.field1462, var2, this.field1454, this.field1460, 0, var6, var3, this, this.field1463, var5); + } + + this.field1461 -= var2; + if (this.field1461 != 0) { + return var2; + } + + if (!this.method2631()) { + continue; + } + + return var4; + } + + if (this.field1463 == 256 && (this.field1462 & 255) == 0) { + if (PcmPlayer.PcmPlayer_stereo) { + return method2638(0, ((RawSound)super.sound).samples, var1, this.field1462, var2, this.field1455, this.field1456, 0, var4, var3, this); + } + + return method2681(((RawSound)super.sound).samples, var1, this.field1462, var2, this.field1454, 0, var4, var3, this); + } + + if (PcmPlayer.PcmPlayer_stereo) { + return method2688(0, 0, ((RawSound)super.sound).samples, var1, this.field1462, var2, this.field1455, this.field1456, 0, var4, var3, this, this.field1463, var5); + } + + return method2636(0, 0, ((RawSound)super.sound).samples, var1, this.field1462, var2, this.field1454, 0, var4, var3, this, this.field1463, var5); + } + } + + @ObfuscatedName("an") + int method2630(int[] var1, int var2, int var3, int var4, int var5) { + while (true) { + if (this.field1461 > 0) { + int var6 = var2 + this.field1461; + if (var6 > var4) { + var6 = var4; + } + + this.field1461 += var2; + if (this.field1463 == -256 && (this.field1462 & 255) == 0) { + if (PcmPlayer.PcmPlayer_stereo) { + var2 = method2747(0, ((RawSound)super.sound).samples, var1, this.field1462, var2, this.field1455, this.field1456, this.field1453, this.field1451, 0, var6, var3, this); + } else { + var2 = method2642(((RawSound)super.sound).samples, var1, this.field1462, var2, this.field1454, this.field1460, 0, var6, var3, this); + } + } else if (PcmPlayer.PcmPlayer_stereo) { + var2 = method2647(0, 0, ((RawSound)super.sound).samples, var1, this.field1462, var2, this.field1455, this.field1456, this.field1453, this.field1451, 0, var6, var3, this, this.field1463, var5); + } else { + var2 = method2646(0, 0, ((RawSound)super.sound).samples, var1, this.field1462, var2, this.field1454, this.field1460, 0, var6, var3, this, this.field1463, var5); + } + + this.field1461 -= var2; + if (this.field1461 != 0) { + return var2; + } + + if (!this.method2631()) { + continue; + } + + return var4; + } + + if (this.field1463 == -256 && (this.field1462 & 255) == 0) { + if (PcmPlayer.PcmPlayer_stereo) { + return method2635(0, ((RawSound)super.sound).samples, var1, this.field1462, var2, this.field1455, this.field1456, 0, var4, var3, this); + } + + return method2743(((RawSound)super.sound).samples, var1, this.field1462, var2, this.field1454, 0, var4, var3, this); + } + + if (PcmPlayer.PcmPlayer_stereo) { + return method2639(0, 0, ((RawSound)super.sound).samples, var1, this.field1462, var2, this.field1455, this.field1456, 0, var4, var3, this, this.field1463, var5); + } + + return method2708(0, 0, ((RawSound)super.sound).samples, var1, this.field1462, var2, this.field1454, 0, var4, var3, this, this.field1463, var5); + } + } + + @ObfuscatedName("ag") + int vmethod2777() { + int var1 = this.field1454 * 3 >> 6; var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); if (this.numLoops == 0) { - var1 -= var1 * this.field1428 / (((RawSound)super.sound).samples.length << 8); + var1 -= var1 * this.field1462 / (((RawSound)super.sound).samples.length << 8); } else if (this.numLoops >= 0) { var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; } @@ -765,9 +765,9 @@ public class RawPcmStream extends PcmStream { return var1 > 255 ? 255 : var1; } - @ObfuscatedName("af") - boolean method2571() { - int var1 = this.field1427; + @ObfuscatedName("ai") + boolean method2631() { + int var1 = this.field1452; int var2; int var3; if (var1 == Integer.MIN_VALUE) { @@ -775,97 +775,97 @@ public class RawPcmStream extends PcmStream { var2 = 0; var1 = 0; } else { - var2 = method2552(var1, this.field1432); - var3 = method2693(var1, this.field1432); + var2 = method2728(var1, this.field1464); + var3 = method2603(var1, this.field1464); } - if (var1 == this.field1429 && var2 == this.field1430 && var3 == this.field1431) { - if (this.field1427 == Integer.MIN_VALUE) { - this.field1427 = 0; - this.field1431 = 0; - this.field1430 = 0; - this.field1429 = 0; + if (var1 == this.field1454 && var2 == this.field1455 && var3 == this.field1456) { + if (this.field1452 == Integer.MIN_VALUE) { + this.field1452 = 0; + this.field1456 = 0; + this.field1455 = 0; + this.field1454 = 0; this.remove(); return true; } else { - this.method2543(); + this.method2607(); return false; } } else { - if (this.field1429 < var1) { - this.field1436 = 1; - this.field1437 = var1 - this.field1429; - } else if (this.field1429 > var1) { - this.field1436 = -1; - this.field1437 = this.field1429 - var1; + if (this.field1454 < var1) { + this.field1460 = 1; + this.field1461 = var1 - this.field1454; + } else if (this.field1454 > var1) { + this.field1460 = -1; + this.field1461 = this.field1454 - var1; } else { - this.field1436 = 0; + this.field1460 = 0; } - if (this.field1430 < var2) { - this.field1438 = 1; - if (this.field1437 == 0 || this.field1437 > var2 - this.field1430) { - this.field1437 = var2 - this.field1430; + if (this.field1455 < var2) { + this.field1453 = 1; + if (this.field1461 == 0 || this.field1461 > var2 - this.field1455) { + this.field1461 = var2 - this.field1455; } - } else if (this.field1430 > var2) { - this.field1438 = -1; - if (this.field1437 == 0 || this.field1437 > this.field1430 - var2) { - this.field1437 = this.field1430 - var2; + } else if (this.field1455 > var2) { + this.field1453 = -1; + if (this.field1461 == 0 || this.field1461 > this.field1455 - var2) { + this.field1461 = this.field1455 - var2; } } else { - this.field1438 = 0; + this.field1453 = 0; } - if (this.field1431 < var3) { - this.field1439 = 1; - if (this.field1437 == 0 || this.field1437 > var3 - this.field1431) { - this.field1437 = var3 - this.field1431; + if (this.field1456 < var3) { + this.field1451 = 1; + if (this.field1461 == 0 || this.field1461 > var3 - this.field1456) { + this.field1461 = var3 - this.field1456; } - } else if (this.field1431 > var3) { - this.field1439 = -1; - if (this.field1437 == 0 || this.field1437 > this.field1431 - var3) { - this.field1437 = this.field1431 - var3; + } else if (this.field1456 > var3) { + this.field1451 = -1; + if (this.field1461 == 0 || this.field1461 > this.field1456 - var3) { + this.field1461 = this.field1456 - var3; } } else { - this.field1439 = 0; + this.field1451 = 0; } return false; } } - @ObfuscatedName("f") - static int method2552(int var0, int var1) { + @ObfuscatedName("c") + static int method2728(int var0, int var1) { return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D); } - @ObfuscatedName("i") - static int method2693(int var0, int var1) { + @ObfuscatedName("t") + static int method2603(int var0, int var1) { return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D); } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lcc;II)Ldg;" + signature = "(Lcv;II)Lde;" ) @Export("createRawPcmStream") public static RawPcmStream createRawPcmStream(RawSound var0, int var1, int var2) { - return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(DirectByteArrayCopier.field2490 * 334942784)), var2 << 6) : null; + return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(PcmPlayer.field1398 * 100)), var2 << 6) : null; } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Lcc;III)Ldg;" + signature = "(Lcv;III)Lde;" ) - public static RawPcmStream method2582(RawSound var0, int var1, int var2, int var3) { + public static RawPcmStream method2673(RawSound var0, int var1, int var2, int var3) { return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, var1, var2, var3) : null; } - @ObfuscatedName("ap") + @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "([B[IIIIIIILdg;)I" + signature = "([B[IIIIIIILde;)I" ) - static int method2572(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method2681(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { var2 >>= 8; var7 >>= 8; var4 <<= 2; @@ -888,15 +888,15 @@ public class RawPcmStream extends PcmStream { var10001 = var3++; } - var8.field1428 = var2 << 8; + var8.field1462 = var2 << 8; return var3; } - @ObfuscatedName("ai") + @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "(I[B[IIIIIIIILdg;)I" + signature = "(I[B[IIIIIIIILde;)I" ) - static int method2573(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + static int method2638(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { var3 >>= 8; var9 >>= 8; var5 <<= 2; @@ -939,15 +939,15 @@ public class RawPcmStream extends PcmStream { var10001 = var4++; } - var10.field1428 = var3 << 8; + var10.field1462 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("am") + @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "([B[IIIIIIILdg;)I" + signature = "([B[IIIIIIILde;)I" ) - static int method2689(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method2743(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { var2 >>= 8; var7 >>= 8; var4 <<= 2; @@ -970,15 +970,15 @@ public class RawPcmStream extends PcmStream { var10001 = var3++; } - var8.field1428 = var2 << 8; + var8.field1462 = var2 << 8; return var3; } - @ObfuscatedName("ab") + @ObfuscatedName("bq") @ObfuscatedSignature( - signature = "(I[B[IIIIIIIILdg;)I" + signature = "(I[B[IIIIIIIILde;)I" ) - static int method2575(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + static int method2635(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { var3 >>= 8; var9 >>= 8; var5 <<= 2; @@ -1021,15 +1021,15 @@ public class RawPcmStream extends PcmStream { var10001 = var4++; } - var10.field1428 = var3 << 8; + var10.field1462 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("bj") + @ObfuscatedName("bf") @ObfuscatedSignature( - signature = "(II[B[IIIIIIILdg;II)I" + signature = "(II[B[IIIIIIILde;II)I" ) - static int method2576(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { + static int method2636(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 257) / var11) > var8) { var7 = var8; } @@ -1054,15 +1054,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; } - var10.field1428 = var4; + var10.field1462 = var4; return var5; } - @ObfuscatedName("bg") + @ObfuscatedName("bc") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIILdg;II)I" + signature = "(II[B[IIIIIIIILde;II)I" ) - static int method2577(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + static int method2688(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { var8 = var9; } @@ -1096,15 +1096,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += var0 * var7 >> 6; } - var11.field1428 = var4; + var11.field1462 = var4; return var5 >> 1; } - @ObfuscatedName("bw") + @ObfuscatedName("bk") @ObfuscatedSignature( - signature = "(II[B[IIIIIIILdg;II)I" + signature = "(II[B[IIIIIIILde;II)I" ) - static int method2629(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { + static int method2708(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { if (var11 == 0 || (var7 = var5 + (var11 + (var9 + 256 - var4)) / var11) > var8) { var7 = var8; } @@ -1129,15 +1129,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; } - var10.field1428 = var4; + var10.field1462 = var4; return var5; } - @ObfuscatedName("bk") + @ObfuscatedName("bb") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIILdg;II)I" + signature = "(II[B[IIIIIIIILde;II)I" ) - static int method2579(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + static int method2639(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { var8 = var9; } @@ -1169,15 +1169,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += var0 * var7 >> 6; } - var11.field1428 = var4; + var11.field1462 = var4; return var5 >> 1; } - @ObfuscatedName("bl") + @ObfuscatedName("bi") @ObfuscatedSignature( - signature = "([B[IIIIIIIILdg;)I" + signature = "([B[IIIIIIIILde;)I" ) - static int method2614(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method2640(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { var2 >>= 8; var8 >>= 8; var4 <<= 2; @@ -1186,8 +1186,8 @@ public class RawPcmStream extends PcmStream { var6 = var7; } - var9.field1430 += var9.field1438 * (var6 - var3); - var9.field1431 += var9.field1439 * (var6 - var3); + var9.field1455 += var9.field1453 * (var6 - var3); + var9.field1456 += var9.field1451 * (var6 - var3); int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { @@ -1209,16 +1209,16 @@ public class RawPcmStream extends PcmStream { var1[var10001] += var0[var2++] * var4; } - var9.field1429 = var4 >> 2; - var9.field1428 = var2 << 8; + var9.field1454 = var4 >> 2; + var9.field1462 = var2 << 8; return var3; } - @ObfuscatedName("bq") + @ObfuscatedName("bp") @ObfuscatedSignature( - signature = "(I[B[IIIIIIIIIILdg;)I" + signature = "(I[B[IIIIIIIIIILde;)I" ) - static int method2581(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { + static int method2641(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { var3 >>= 8; var11 >>= 8; var5 <<= 2; @@ -1229,7 +1229,7 @@ public class RawPcmStream extends PcmStream { var9 = var10; } - var12.field1429 += var12.field1436 * (var9 - var4); + var12.field1454 += var12.field1460 * (var9 - var4); var4 <<= 1; var9 <<= 1; @@ -1274,17 +1274,17 @@ public class RawPcmStream extends PcmStream { var2[var10001] += var13 * var6; } - var12.field1430 = var5 >> 2; - var12.field1431 = var6 >> 2; - var12.field1428 = var3 << 8; + var12.field1455 = var5 >> 2; + var12.field1456 = var6 >> 2; + var12.field1462 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("bx") + @ObfuscatedName("bl") @ObfuscatedSignature( - signature = "([B[IIIIIIIILdg;)I" + signature = "([B[IIIIIIIILde;)I" ) - static int method2542(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method2642(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { var2 >>= 8; var8 >>= 8; var4 <<= 2; @@ -1293,8 +1293,8 @@ public class RawPcmStream extends PcmStream { var6 = var7; } - var9.field1430 += var9.field1438 * (var6 - var3); - var9.field1431 += var9.field1439 * (var6 - var3); + var9.field1455 += var9.field1453 * (var6 - var3); + var9.field1456 += var9.field1451 * (var6 - var3); int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { @@ -1316,16 +1316,16 @@ public class RawPcmStream extends PcmStream { var1[var10001] += var0[var2--] * var4; } - var9.field1429 = var4 >> 2; - var9.field1428 = var2 << 8; + var9.field1454 = var4 >> 2; + var9.field1462 = var2 << 8; return var3; } - @ObfuscatedName("bc") + @ObfuscatedName("by") @ObfuscatedSignature( - signature = "(I[B[IIIIIIIIIILdg;)I" + signature = "(I[B[IIIIIIIIIILde;)I" ) - static int method2556(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { + static int method2747(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { var3 >>= 8; var11 >>= 8; var5 <<= 2; @@ -1336,7 +1336,7 @@ public class RawPcmStream extends PcmStream { var9 = var10; } - var12.field1429 += var12.field1436 * (var9 - var4); + var12.field1454 += var12.field1460 * (var9 - var4); var4 <<= 1; var9 <<= 1; @@ -1381,19 +1381,19 @@ public class RawPcmStream extends PcmStream { var2[var10001] += var13 * var6; } - var12.field1430 = var5 >> 2; - var12.field1431 = var6 >> 2; - var12.field1428 = var3 << 8; + var12.field1455 = var5 >> 2; + var12.field1456 = var6 >> 2; + var12.field1462 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("by") + @ObfuscatedName("be") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIILdg;II)I" + signature = "(II[B[IIIIIIIILde;II)I" ) - static int method2584(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { - var11.field1430 -= var11.field1438 * var5; - var11.field1431 -= var11.field1439 * var5; + static int method2644(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + var11.field1455 -= var11.field1453 * var5; + var11.field1456 -= var11.field1451 * var5; if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { var8 = var9; } @@ -1420,19 +1420,19 @@ public class RawPcmStream extends PcmStream { var6 += var7; } - var11.field1430 += var11.field1438 * var5; - var11.field1431 += var11.field1439 * var5; - var11.field1429 = var6; - var11.field1428 = var4; + var11.field1455 += var11.field1453 * var5; + var11.field1456 += var11.field1451 * var5; + var11.field1454 = var6; + var11.field1462 = var4; return var5; } - @ObfuscatedName("bz") + @ObfuscatedName("bw") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIIIILdg;II)I" + signature = "(II[B[IIIIIIIIIILde;II)I" ) - static int method2585(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { - var13.field1429 -= var5 * var13.field1436; + static int method2738(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { + var13.field1454 -= var5 * var13.field1460; if (var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) { var10 = var11; } @@ -1471,20 +1471,20 @@ public class RawPcmStream extends PcmStream { } var5 >>= 1; - var13.field1429 += var13.field1436 * var5; - var13.field1430 = var6; - var13.field1431 = var7; - var13.field1428 = var4; + var13.field1454 += var13.field1460 * var5; + var13.field1455 = var6; + var13.field1456 = var7; + var13.field1462 = var4; return var5; } - @ObfuscatedName("bm") + @ObfuscatedName("bt") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIILdg;II)I" + signature = "(II[B[IIIIIIIILde;II)I" ) - static int method2568(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { - var11.field1430 -= var11.field1438 * var5; - var11.field1431 -= var11.field1439 * var5; + static int method2646(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + var11.field1455 -= var11.field1453 * var5; + var11.field1456 -= var11.field1451 * var5; if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { var8 = var9; } @@ -1511,19 +1511,19 @@ public class RawPcmStream extends PcmStream { var6 += var7; } - var11.field1430 += var11.field1438 * var5; - var11.field1431 += var11.field1439 * var5; - var11.field1429 = var6; - var11.field1428 = var4; + var11.field1455 += var11.field1453 * var5; + var11.field1456 += var11.field1451 * var5; + var11.field1454 = var6; + var11.field1462 = var4; return var5; } - @ObfuscatedName("bo") + @ObfuscatedName("bn") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIIIILdg;II)I" + signature = "(II[B[IIIIIIIIIILde;II)I" ) - static int method2587(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { - var13.field1429 -= var5 * var13.field1436; + static int method2647(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { + var13.field1454 -= var5 * var13.field1460; if (var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) { var10 = var11; } @@ -1560,10 +1560,10 @@ public class RawPcmStream extends PcmStream { } var5 >>= 1; - var13.field1429 += var13.field1436 * var5; - var13.field1430 = var6; - var13.field1431 = var7; - var13.field1428 = var4; + var13.field1454 += var13.field1460 * var5; + var13.field1455 = var6; + var13.field1456 = var7; + var13.field1462 = var4; return var5; } } diff --git a/runescape-client/src/main/java/RawSound.java b/runescape-client/src/main/java/RawSound.java index a365fda282..11dd92d328 100644 --- a/runescape-client/src/main/java/RawSound.java +++ b/runescape-client/src/main/java/RawSound.java @@ -3,23 +3,23 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cc") +@ObfuscatedName("cv") @Implements("RawSound") public class RawSound extends AbstractSound { - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("sampleRate") public int sampleRate; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("samples") public byte[] samples; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("start") public int start; - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("end") int end; - @ObfuscatedName("p") - public boolean field1352; + @ObfuscatedName("i") + public boolean field1379; RawSound(int var1, byte[] var2, int var3, int var4) { this.sampleRate = var1; @@ -33,12 +33,12 @@ public class RawSound extends AbstractSound { this.samples = var2; this.start = var3; this.end = var4; - this.field1352 = var5; + this.field1379 = var5; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ldr;)Lcc;" + signature = "(Ldj;)Lcv;" ) @Export("resample") public RawSound resample(Decimator var1) { diff --git a/runescape-client/src/main/java/ReflectionCheck.java b/runescape-client/src/main/java/ReflectionCheck.java index 46c131034d..936ad7319d 100644 --- a/runescape-client/src/main/java/ReflectionCheck.java +++ b/runescape-client/src/main/java/ReflectionCheck.java @@ -5,56 +5,148 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("dn") +@ObfuscatedName("cc") @Implements("ReflectionCheck") public class ReflectionCheck extends Node { - @ObfuscatedName("v") + @ObfuscatedName("qz") + @ObfuscatedGetter( + intValue = -799338112 + ) + static int field1319; + @ObfuscatedName("by") @ObfuscatedSignature( - signature = "Lko;" + signature = "[Lli;" ) - @Export("ItemDefinition_fontPlain11") - static Font ItemDefinition_fontPlain11; - @ObfuscatedName("m") - @Export("userHomeDirectory") - static String userHomeDirectory; - @ObfuscatedName("mp") + @Export("worldSelectFlagSprites") + static IndexedSprite[] worldSelectFlagSprites; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -942024519 - ) - @Export("selectedSpellFlags") - static int selectedSpellFlags; - @ObfuscatedName("f") - @Export("intReplaceValues") - int[] intReplaceValues; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -1153531937 + intValue = -677956283 ) @Export("id") int id; - @ObfuscatedName("y") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1226139147 + intValue = 1081173073 ) @Export("size") int size; - @ObfuscatedName("w") + @ObfuscatedName("o") @Export("operations") int[] operations; - @ObfuscatedName("p") + @ObfuscatedName("e") @Export("creationErrors") int[] creationErrors; - @ObfuscatedName("b") + @ObfuscatedName("i") @Export("fields") Field[] fields; - @ObfuscatedName("e") + @ObfuscatedName("g") + @Export("intReplaceValues") + int[] intReplaceValues; + @ObfuscatedName("d") @Export("methods") Method[] methods; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("arguments") byte[][][] arguments; ReflectionCheck() { } + + @ObfuscatedName("av") + @ObfuscatedSignature( + signature = "(ILce;ZI)I", + garbageValue = "1634047659" + ) + static int method2348(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { + class320.Interpreter_intStackSize -= 2; + Client.field908 = (short)GrandExchangeEvent.method97(Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]); + if (Client.field908 <= 0) { + Client.field908 = 256; + } + + Client.field897 = (short)GrandExchangeEvent.method97(Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]); + if (Client.field897 <= 0) { + Client.field897 = 256; + } + + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { + class320.Interpreter_intStackSize -= 2; + Client.zoomHeight = (short)Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + if (Client.zoomHeight <= 0) { + Client.zoomHeight = 256; + } + + Client.zoomWidth = (short)Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + if (Client.zoomWidth <= 0) { + Client.zoomWidth = 320; + } + + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { + class320.Interpreter_intStackSize -= 4; + Client.field900 = (short)Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + if (Client.field900 <= 0) { + Client.field900 = 1; + } + + Client.field673 = (short)Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + if (Client.field673 <= 0) { + Client.field673 = 32767; + } else if (Client.field673 < Client.field900) { + Client.field673 = Client.field900; + } + + Client.field819 = (short)Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 2]; + if (Client.field819 <= 0) { + Client.field819 = 1; + } + + Client.field903 = (short)Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 3]; + if (Client.field903 <= 0) { + Client.field903 = 32767; + } else if (Client.field903 < Client.field819) { + Client.field903 = Client.field819; + } + + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { + if (Client.viewportWidget != null) { + GrandExchangeOfferUnitPriceComparator.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.viewportWidth; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.viewportHeight; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; + } + + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.zoomHeight; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.zoomWidth; + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = UserComparator3.method3499(Client.field908); + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = UserComparator3.method3499(Client.field897); + return 1; + } else if (var0 == 6220) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 6221) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 6222) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Username.canvasWidth; + return 1; + } else if (var0 == 6223) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = WorldMapData_1.canvasHeight; + return 1; + } else { + return 2; + } + } } diff --git a/runescape-client/src/main/java/RouteStrategy.java b/runescape-client/src/main/java/RouteStrategy.java index 16372facda..bfe4d3ff54 100644 --- a/runescape-client/src/main/java/RouteStrategy.java +++ b/runescape-client/src/main/java/RouteStrategy.java @@ -4,30 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fx") +@ObfuscatedName("fk") @Implements("RouteStrategy") public abstract class RouteStrategy { - @ObfuscatedName("f") + @ObfuscatedName("cz") @ObfuscatedGetter( - intValue = 1026996041 + intValue = -1462817165 + ) + public static int field2102; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -1839542313 ) @Export("approxDestinationX") public int approxDestinationX; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 229527517 + intValue = 1525294437 ) @Export("approxDestinationY") public int approxDestinationY; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 309902599 + intValue = -860662491 ) @Export("approxDestinationSizeX") public int approxDestinationSizeX; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 762948669 + intValue = -1587561283 ) @Export("approxDestinationSizeY") public int approxDestinationSizeY; @@ -35,86 +40,170 @@ public abstract class RouteStrategy { protected RouteStrategy() { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IIILfp;I)Z", - garbageValue = "1339159810" + signature = "(IIILfv;B)Z", + garbageValue = "50" ) @Export("hasArrived") - public abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4); + protected abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4); - @ObfuscatedName("p") + @ObfuscatedName("ht") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)[B", - garbageValue = "959122064" + signature = "(IIIII)V", + garbageValue = "-47058796" ) - public static byte[] method3566(CharSequence var0) { - int var1 = var0.length(); - byte[] var2 = new byte[var1]; + static final void method3662(int var0, int var1, int var2, int var3) { + TileItemPile.method2835(); + } - for (int var3 = 0; var3 < var1; ++var3) { - char var4 = var0.charAt(var3); - if (var4 > 0 && var4 < 128 || var4 >= 160 && var4 <= 255) { - var2[var3] = (byte)var4; - } else if (var4 == 8364) { - var2[var3] = -128; - } else if (var4 == 8218) { - var2[var3] = -126; - } else if (var4 == 402) { - var2[var3] = -125; - } else if (var4 == 8222) { - var2[var3] = -124; - } else if (var4 == 8230) { - var2[var3] = -123; - } else if (var4 == 8224) { - var2[var3] = -122; - } else if (var4 == 8225) { - var2[var3] = -121; - } else if (var4 == 710) { - var2[var3] = -120; - } else if (var4 == 8240) { - var2[var3] = -119; - } else if (var4 == 352) { - var2[var3] = -118; - } else if (var4 == 8249) { - var2[var3] = -117; - } else if (var4 == 338) { - var2[var3] = -116; - } else if (var4 == 381) { - var2[var3] = -114; - } else if (var4 == 8216) { - var2[var3] = -111; - } else if (var4 == 8217) { - var2[var3] = -110; - } else if (var4 == 8220) { - var2[var3] = -109; - } else if (var4 == 8221) { - var2[var3] = -108; - } else if (var4 == 8226) { - var2[var3] = -107; - } else if (var4 == 8211) { - var2[var3] = -106; - } else if (var4 == 8212) { - var2[var3] = -105; - } else if (var4 == 732) { - var2[var3] = -104; - } else if (var4 == 8482) { - var2[var3] = -103; - } else if (var4 == 353) { - var2[var3] = -102; - } else if (var4 == 8250) { - var2[var3] = -101; - } else if (var4 == 339) { - var2[var3] = -100; - } else if (var4 == 382) { - var2[var3] = -98; - } else if (var4 == 376) { - var2[var3] = -97; + @ObfuscatedName("hl") + @ObfuscatedSignature( + signature = "(IIIIIB)V", + garbageValue = "67" + ) + @Export("drawObject") + static final void drawObject(int var0, int var1, int var2, int var3, int var4) { + long var5 = ServerBuild.scene.getBoundaryObjectTag(var0, var1, var2); + int var7; + int var8; + int var9; + int var10; + int var12; + int var13; + if (var5 != 0L) { + var7 = ServerBuild.scene.getObjectFlags(var0, var1, var2, var5); + var8 = var7 >> 6 & 3; + var9 = var7 & 31; + var10 = var3; + if (KeyHandler.method850(var5)) { + var10 = var4; + } + + int[] var11 = WorldMapRectangle.sceneMinimapSprite.pixels; + var12 = var1 * 4 + (103 - var2) * 2048 + 24624; + var13 = GrandExchangeEvents.Entity_unpackID(var5); + ObjectDefinition var14 = Occluder.getObjectDefinition(var13); + if (var14.mapSceneId != -1) { + IndexedSprite var15 = VertexNormal.mapSceneSprites[var14.mapSceneId]; + if (var15 != null) { + int var16 = (var14.sizeX * 4 - var15.subWidth) / 2; + int var17 = (var14.sizeY * 4 - var15.subHeight) / 2; + var15.drawAt(var16 + var1 * 4 + 48, (104 - var2 - var14.sizeY) * 4 + var17 + 48); + } } else { - var2[var3] = 63; + if (var9 == 0 || var9 == 2) { + if (var8 == 0) { + var11[var12] = var10; + var11[var12 + 512] = var10; + var11[var12 + 1024] = var10; + var11[var12 + 1536] = var10; + } else if (var8 == 1) { + var11[var12] = var10; + var11[var12 + 1] = var10; + var11[var12 + 2] = var10; + var11[var12 + 3] = var10; + } else if (var8 == 2) { + var11[var12 + 3] = var10; + var11[var12 + 512 + 3] = var10; + var11[var12 + 1024 + 3] = var10; + var11[var12 + 1536 + 3] = var10; + } else if (var8 == 3) { + var11[var12 + 1536] = var10; + var11[var12 + 1536 + 1] = var10; + var11[var12 + 1536 + 2] = var10; + var11[var12 + 1536 + 3] = var10; + } + } + + if (var9 == 3) { + if (var8 == 0) { + var11[var12] = var10; + } else if (var8 == 1) { + var11[var12 + 3] = var10; + } else if (var8 == 2) { + var11[var12 + 1536 + 3] = var10; + } else if (var8 == 3) { + var11[var12 + 1536] = var10; + } + } + + if (var9 == 2) { + if (var8 == 3) { + var11[var12] = var10; + var11[var12 + 512] = var10; + var11[var12 + 1024] = var10; + var11[var12 + 1536] = var10; + } else if (var8 == 0) { + var11[var12] = var10; + var11[var12 + 1] = var10; + var11[var12 + 2] = var10; + var11[var12 + 3] = var10; + } else if (var8 == 1) { + var11[var12 + 3] = var10; + var11[var12 + 512 + 3] = var10; + var11[var12 + 1024 + 3] = var10; + var11[var12 + 1536 + 3] = var10; + } else if (var8 == 2) { + var11[var12 + 1536] = var10; + var11[var12 + 1536 + 1] = var10; + var11[var12 + 1536 + 2] = var10; + var11[var12 + 1536 + 3] = var10; + } + } + } + } + + var5 = ServerBuild.scene.getGameObjectTag(var0, var1, var2); + if (0L != var5) { + var7 = ServerBuild.scene.getObjectFlags(var0, var1, var2, var5); + var8 = var7 >> 6 & 3; + var9 = var7 & 31; + var10 = GrandExchangeEvents.Entity_unpackID(var5); + ObjectDefinition var24 = Occluder.getObjectDefinition(var10); + int var19; + if (var24.mapSceneId != -1) { + IndexedSprite var18 = VertexNormal.mapSceneSprites[var24.mapSceneId]; + if (var18 != null) { + var13 = (var24.sizeX * 4 - var18.subWidth) / 2; + var19 = (var24.sizeY * 4 - var18.subHeight) / 2; + var18.drawAt(var13 + var1 * 4 + 48, var19 + (104 - var2 - var24.sizeY) * 4 + 48); + } + } else if (var9 == 9) { + var12 = 15658734; + if (KeyHandler.method850(var5)) { + var12 = 15597568; + } + + int[] var23 = WorldMapRectangle.sceneMinimapSprite.pixels; + var19 = var1 * 4 + (103 - var2) * 2048 + 24624; + if (var8 != 0 && var8 != 2) { + var23[var19] = var12; + var23[var19 + 1 + 512] = var12; + var23[var19 + 1024 + 2] = var12; + var23[var19 + 1536 + 3] = var12; + } else { + var23[var19 + 1536] = var12; + var23[var19 + 1 + 1024] = var12; + var23[var19 + 512 + 2] = var12; + var23[var19 + 3] = var12; + } + } + } + + var5 = ServerBuild.scene.getFloorDecorationTag(var0, var1, var2); + if (var5 != 0L) { + var7 = GrandExchangeEvents.Entity_unpackID(var5); + ObjectDefinition var20 = Occluder.getObjectDefinition(var7); + if (var20.mapSceneId != -1) { + IndexedSprite var21 = VertexNormal.mapSceneSprites[var20.mapSceneId]; + if (var21 != null) { + var10 = (var20.sizeX * 4 - var21.subWidth) / 2; + int var22 = (var20.sizeY * 4 - var21.subHeight) / 2; + var21.drawAt(var10 + var1 * 4 + 48, var22 + (104 - var2 - var20.sizeY) * 4 + 48); + } } } - return var2; } } diff --git a/runescape-client/src/main/java/RunException.java b/runescape-client/src/main/java/RunException.java index f558191de1..4ff4530872 100644 --- a/runescape-client/src/main/java/RunException.java +++ b/runescape-client/src/main/java/RunException.java @@ -4,31 +4,25 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("mg") +@ObfuscatedName("mo") @Implements("RunException") public class RunException extends RuntimeException { - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("RunException_applet") public static Applet RunException_applet; - @ObfuscatedName("i") + @ObfuscatedName("o") @Export("localPlayerName") public static String localPlayerName; - @ObfuscatedName("y") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1500109333 - ) - @Export("RunException_revision") - public static int RunException_revision; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -706960701 + intValue = 83275543 ) @Export("clientType") public static int clientType; - @ObfuscatedName("p") + @ObfuscatedName("g") @Export("message") String message; - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("throwable") Throwable throwable; diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java index f6bbf3a9d0..503ff1e55b 100644 --- a/runescape-client/src/main/java/Scene.java +++ b/runescape-client/src/main/java/Scene.java @@ -3,188 +3,188 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ej") +@ObfuscatedName("em") @Implements("Scene") public class Scene { - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("Scene_isLowDetail") public static boolean Scene_isLowDetail; - @ObfuscatedName("s") + @ObfuscatedName("x") @Export("tileUpdateCount") static int tileUpdateCount; - @ObfuscatedName("l") + @ObfuscatedName("w") @Export("Scene_plane") static int Scene_plane; - @ObfuscatedName("t") + @ObfuscatedName("k") @Export("Scene_drawnCount") static int Scene_drawnCount; - @ObfuscatedName("j") + @ObfuscatedName("q") @Export("Scene_cameraXTileMin") static int Scene_cameraXTileMin; - @ObfuscatedName("n") + @ObfuscatedName("z") @Export("Scene_cameraXTileMax") static int Scene_cameraXTileMax; - @ObfuscatedName("u") + @ObfuscatedName("y") @Export("Scene_cameraYTileMin") static int Scene_cameraYTileMin; - @ObfuscatedName("z") + @ObfuscatedName("f") @Export("Scene_cameraYTileMax") static int Scene_cameraYTileMax; - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("Scene_cameraXTile") static int Scene_cameraXTile; - @ObfuscatedName("m") + @ObfuscatedName("r") @Export("Scene_cameraYTile") static int Scene_cameraYTile; - @ObfuscatedName("g") + @ObfuscatedName("s") @Export("Scene_cameraX") static int Scene_cameraX; - @ObfuscatedName("r") + @ObfuscatedName("a") @Export("Scene_cameraY") static int Scene_cameraY; - @ObfuscatedName("q") + @ObfuscatedName("u") @Export("Scene_cameraZ") static int Scene_cameraZ; - @ObfuscatedName("aa") + @ObfuscatedName("ae") @Export("Scene_cameraPitchSine") static int Scene_cameraPitchSine; - @ObfuscatedName("av") + @ObfuscatedName("af") @Export("Scene_cameraPitchCosine") static int Scene_cameraPitchCosine; - @ObfuscatedName("aw") + @ObfuscatedName("az") @Export("Scene_cameraYawSine") static int Scene_cameraYawSine; - @ObfuscatedName("as") + @ObfuscatedName("ax") @Export("Scene_cameraYawCosine") static int Scene_cameraYawCosine; - @ObfuscatedName("ak") + @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "[Lel;" + signature = "[Lea;" ) @Export("gameObjects") static GameObject[] gameObjects; @ObfuscatedName("au") @Export("checkClick") static boolean checkClick; - @ObfuscatedName("ah") + @ObfuscatedName("ay") @Export("Scene_selectedPlane") static int Scene_selectedPlane; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("Scene_selectedScreenX") static int Scene_selectedScreenX; - @ObfuscatedName("ao") + @ObfuscatedName("aq") @Export("Scene_selectedScreenY") static int Scene_selectedScreenY; - @ObfuscatedName("an") + @ObfuscatedName("as") @Export("Scene_selectedX") public static int Scene_selectedX; - @ObfuscatedName("ar") + @ObfuscatedName("ak") @Export("Scene_selectedY") public static int Scene_selectedY; - @ObfuscatedName("az") + @ObfuscatedName("ac") @Export("viewportWalking") static boolean viewportWalking; - @ObfuscatedName("ac") + @ObfuscatedName("av") @Export("Scene_planesCount") static int Scene_planesCount; @ObfuscatedName("al") @Export("Scene_planeOccluderCounts") static int[] Scene_planeOccluderCounts; - @ObfuscatedName("ae") + @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "[[Len;" + signature = "[[Ler;" ) @Export("Scene_planeOccluders") static Occluder[][] Scene_planeOccluders; - @ObfuscatedName("ad") + @ObfuscatedName("am") @Export("Scene_currentOccludersCount") static int Scene_currentOccludersCount; - @ObfuscatedName("aj") + @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "[Len;" + signature = "[Ler;" ) @Export("Scene_currentOccluders") static Occluder[] Scene_currentOccluders; - @ObfuscatedName("ax") + @ObfuscatedName("at") @ObfuscatedSignature( - signature = "Ljs;" + signature = "Ljw;" ) @Export("Scene_tilesDeque") static NodeDeque Scene_tilesDeque; - @ObfuscatedName("at") - static final int[] field1823; - @ObfuscatedName("af") - static final int[] field1778; - @ObfuscatedName("ap") - static final int[] field1805; + @ObfuscatedName("an") + static final int[] field1842; + @ObfuscatedName("ag") + static final int[] field1843; @ObfuscatedName("ai") - static final int[] field1841; - @ObfuscatedName("am") - static final int[] field1827; + static final int[] field1844; @ObfuscatedName("ab") - static final int[] field1828; - @ObfuscatedName("bj") - static final int[] field1789; - @ObfuscatedName("bc") + static final int[] field1845; + @ObfuscatedName("ap") + static final int[] field1846; + @ObfuscatedName("ah") + static final int[] field1847; + @ObfuscatedName("bq") + static final int[] field1848; + @ObfuscatedName("bl") @Export("visibilityMap") static boolean[][][][] visibilityMap; @ObfuscatedName("by") @Export("visibleTiles") static boolean[][] visibleTiles; - @ObfuscatedName("bz") + @ObfuscatedName("be") @Export("Scene_viewportXCenter") static int Scene_viewportXCenter; - @ObfuscatedName("bm") + @ObfuscatedName("bw") @Export("Scene_viewportYCenter") static int Scene_viewportYCenter; - @ObfuscatedName("bo") + @ObfuscatedName("bt") @Export("Scene_viewportXMin") static int Scene_viewportXMin; - @ObfuscatedName("bs") + @ObfuscatedName("bn") @Export("Scene_viewportYMin") static int Scene_viewportYMin; - @ObfuscatedName("ba") + @ObfuscatedName("bm") @Export("Scene_viewportXMax") static int Scene_viewportXMax; - @ObfuscatedName("bn") + @ObfuscatedName("ba") @Export("Scene_viewportYMax") static int Scene_viewportYMax; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("planes") int planes; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("xSize") int xSize; - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("ySize") int ySize; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("tileHeights") int[][][] tileHeights; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "[[[Ldy;" + signature = "[[[Ldz;" ) @Export("tiles") Tile[][][] tiles; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("minPlane") int minPlane; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("tempGameObjectsCount") int tempGameObjectsCount; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "[Lel;" + signature = "[Lea;" ) @Export("tempGameObjects") GameObject[] tempGameObjects; - @ObfuscatedName("d") - int[][][] field1786; - @ObfuscatedName("bq") + @ObfuscatedName("m") + int[][][] field1805; + @ObfuscatedName("bi") @Export("tileShape2D") int[][] tileShape2D; - @ObfuscatedName("bx") + @ObfuscatedName("bp") @Export("tileRotation2D") int[][] tileRotation2D; @@ -206,13 +206,13 @@ public class Scene { Scene_currentOccludersCount = 0; Scene_currentOccluders = new Occluder[500]; Scene_tilesDeque = new NodeDeque(); - field1823 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; - field1778 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; - field1805 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; - field1841 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; - field1827 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; - field1828 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; - field1789 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; + field1842 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; + field1843 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; + field1844 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; + field1845 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; + field1846 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; + field1847 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; + field1848 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; visibilityMap = new boolean[8][32][51][51]; } @@ -226,12 +226,12 @@ public class Scene { this.xSize = var2; this.ySize = var3; this.tiles = new Tile[var1][var2][var3]; - this.field1786 = new int[var1][var2 + 1][var3 + 1]; + this.field1805 = new int[var1][var2 + 1][var3 + 1]; this.tileHeights = var4; this.clear(); } - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("clear") public void clear() { int var1; @@ -264,7 +264,7 @@ public class Scene { } - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("init") public void init(int var1) { this.minPlane = var1; @@ -279,7 +279,7 @@ public class Scene { } - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("setLinkBelow") public void setLinkBelow(int var1, int var2) { Tile var3 = this.tiles[0][var1][var2]; @@ -291,9 +291,7 @@ public class Scene { for (int var6 = 0; var6 < var5.gameObjectsCount; ++var6) { GameObject var7 = var5.gameObjects[var6]; - long var9 = var7.tag; - boolean var8 = class268.method5012(var9) == 2; - if (var8 && var7.startX == var1 && var2 == var7.startY) { + if (HealthBarUpdate.method1757(var7.tag) && var7.startX == var1 && var2 == var7.startY) { --var7.plane; } } @@ -308,7 +306,7 @@ public class Scene { this.tiles[3][var1][var2] = null; } - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("setTileMinPlane") public void setTileMinPlane(int var1, int var2, int var3, int var4) { Tile var5 = this.tiles[var1][var2][var3]; @@ -317,7 +315,7 @@ public class Scene { } } - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("addTile") public void addTile(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20) { TilePaint var21; @@ -355,9 +353,9 @@ public class Scene { } } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(IIIILep;JI)V" + signature = "(IIIILeq;JI)V" ) @Export("newFloorDecoration") public void newFloorDecoration(int var1, int var2, int var3, int var4, Entity var5, long var6, int var8) { @@ -377,15 +375,15 @@ public class Scene { } } - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(IIIILep;JLep;Lep;)V" + signature = "(IIIILeq;JLeq;Leq;)V" ) @Export("newGroundItemPile") public void newGroundItemPile(int var1, int var2, int var3, int var4, Entity var5, long var6, Entity var8, Entity var9) { TileItemPile var10 = new TileItemPile(); var10.first = var5; - var10.x = var2 * 134217728 + 67108864; + var10.x = var2 * 128 + 64; var10.y = var3 * 128 + 64; var10.tileHeight = var4; var10.tag = var6; @@ -413,9 +411,9 @@ public class Scene { this.tiles[var1][var2][var3].tileItemPile = var10; } - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IIIILep;Lep;IIJI)V" + signature = "(IIIILeq;Leq;IIJI)V" ) @Export("newBoundaryObject") public void newBoundaryObject(int var1, int var2, int var3, int var4, Entity var5, Entity var6, int var7, int var8, long var9, int var11) { @@ -424,7 +422,7 @@ public class Scene { var12.tag = var9; var12.flags = var11; var12.x = var2 * 128 + 64; - var12.y = var3 * 128 + 64; + var12.y = var3 * 134217728 + 67108864; var12.tileHeight = var4; var12.entity1 = var5; var12.entity2 = var6; @@ -441,9 +439,9 @@ public class Scene { } } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IIIILep;Lep;IIIIJI)V" + signature = "(IIIILeq;Leq;IIIIJI)V" ) @Export("newWallDecoration") public void newWallDecoration(int var1, int var2, int var3, int var4, Entity var5, Entity var6, int var7, int var8, int var9, int var10, long var11, int var13) { @@ -452,7 +450,7 @@ public class Scene { var14.tag = var11; var14.flags = var13; var14.x = var2 * 128 + 64; - var14.y = var3 * 128 + 64; + var14.y = var3 * -2013265920 + 1140850688; var14.tileHeight = var4; var14.entity1 = var5; var14.entity2 = var6; @@ -471,11 +469,11 @@ public class Scene { } } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(IIIIIILep;IJI)Z" + signature = "(IIIIIILeq;IJI)Z" ) - public boolean method3141(int var1, int var2, int var3, int var4, int var5, int var6, Entity var7, int var8, long var9, int var11) { + public boolean method3165(int var1, int var2, int var3, int var4, int var5, int var6, Entity var7, int var8, long var9, int var11) { if (var7 == null) { return true; } else { @@ -485,9 +483,9 @@ public class Scene { } } - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(IIIIILep;IJZ)Z" + signature = "(IIIIILeq;IJZ)Z" ) @Export("drawEntity") public boolean drawEntity(int var1, int var2, int var3, int var4, int var5, Entity var6, int var7, long var8, boolean var10) { @@ -524,18 +522,18 @@ public class Scene { } } - @ObfuscatedName("l") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(IIIIILep;IJIIII)Z" + signature = "(IIIIILeq;IJIIII)Z" ) @Export("addNullableObject") public boolean addNullableObject(int var1, int var2, int var3, int var4, int var5, Entity var6, int var7, long var8, int var10, int var11, int var12, int var13) { return var6 == null ? true : this.newGameObject(var1, var10, var11, var12 - var10 + 1, var13 - var11 + 1, var2, var3, var4, var6, var7, true, var8, 0); } - @ObfuscatedName("t") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(IIIIIIIILep;IZJI)Z" + signature = "(IIIIIIIILeq;IZJI)Z" ) @Export("newGameObject") boolean newGameObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, Entity var9, int var10, boolean var11, long var12, int var14) { @@ -546,8 +544,8 @@ public class Scene { return false; } - Tile var23 = this.tiles[var1][var15][var16]; - if (var23 != null && var23.gameObjectsCount >= 5) { + Tile var17 = this.tiles[var1][var15][var16]; + if (var17 != null && var17.gameObjectsCount >= 5) { return false; } } @@ -568,7 +566,7 @@ public class Scene { var21.endY = var3 + var5 - 1; for (var16 = var2; var16 < var2 + var4; ++var16) { - for (int var17 = var3; var17 < var3 + var5; ++var17) { + for (int var22 = var3; var22 < var3 + var5; ++var22) { int var18 = 0; if (var16 > var2) { ++var18; @@ -578,25 +576,25 @@ public class Scene { var18 += 4; } - if (var17 > var3) { + if (var22 > var3) { var18 += 8; } - if (var17 < var3 + var5 - 1) { + if (var22 < var3 + var5 - 1) { var18 += 2; } for (int var19 = var1; var19 >= 0; --var19) { - if (this.tiles[var19][var16][var17] == null) { - this.tiles[var19][var16][var17] = new Tile(var19, var16, var17); + if (this.tiles[var19][var16][var22] == null) { + this.tiles[var19][var16][var22] = new Tile(var19, var16, var22); } } - Tile var22 = this.tiles[var1][var16][var17]; - var22.gameObjects[var22.gameObjectsCount] = var21; - var22.gameObjectEdgeMasks[var22.gameObjectsCount] = var18; - var22.gameObjectsEdgeMask |= var18; - ++var22.gameObjectsCount; + Tile var23 = this.tiles[var1][var16][var22]; + var23.gameObjects[var23.gameObjectsCount] = var21; + var23.gameObjectEdgeMasks[var23.gameObjectsCount] = var18; + var23.gameObjectsEdgeMask |= var18; + ++var23.gameObjectsCount; } } @@ -607,7 +605,7 @@ public class Scene { return true; } - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("clearTempGameObjects") public void clearTempGameObjects() { for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { @@ -619,9 +617,9 @@ public class Scene { this.tempGameObjectsCount = 0; } - @ObfuscatedName("n") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lel;)V" + signature = "(Lea;)V" ) @Export("removeGameObject") void removeGameObject(GameObject var1) { @@ -655,8 +653,8 @@ public class Scene { } - @ObfuscatedName("u") - public void method3109(int var1, int var2, int var3, int var4) { + @ObfuscatedName("q") + public void method3171(int var1, int var2, int var3, int var4) { Tile var5 = this.tiles[var1][var2][var3]; if (var5 != null) { WallDecoration var6 = var5.wallDecoration; @@ -676,7 +674,7 @@ public class Scene { } } - @ObfuscatedName("h") + @ObfuscatedName("y") @Export("removeWallDecoration") public void removeWallDecoration(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -685,16 +683,14 @@ public class Scene { } } - @ObfuscatedName("m") + @ObfuscatedName("f") @Export("removeGameObject") public void removeGameObject(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; if (var4 != null) { for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { GameObject var6 = var4.gameObjects[var5]; - long var8 = var6.tag; - boolean var7 = class268.method5012(var8) == 2; - if (var7 && var2 == var6.startX && var3 == var6.startY) { + if (HealthBarUpdate.method1757(var6.tag) && var2 == var6.startX && var3 == var6.startY) { this.removeGameObject(var6); return; } @@ -703,7 +699,7 @@ public class Scene { } } - @ObfuscatedName("aa") + @ObfuscatedName("a") @Export("removeFloorDecoration") public void removeFloorDecoration(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -712,7 +708,7 @@ public class Scene { } } - @ObfuscatedName("av") + @ObfuscatedName("u") @Export("removeGroundItemPile") public void removeGroundItemPile(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -721,38 +717,36 @@ public class Scene { } } - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "(III)Ler;" + signature = "(III)Leu;" ) - public BoundaryObject method3112(int var1, int var2, int var3) { + public BoundaryObject method3177(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 == null ? null : var4.boundaryObject; } - @ObfuscatedName("as") + @ObfuscatedName("af") @ObfuscatedSignature( - signature = "(III)Lee;" + signature = "(III)Len;" ) - public WallDecoration method3113(int var1, int var2, int var3) { + public WallDecoration method3178(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 == null ? null : var4.wallDecoration; } - @ObfuscatedName("ak") + @ObfuscatedName("az") @ObfuscatedSignature( - signature = "(III)Lel;" + signature = "(III)Lea;" ) - public GameObject method3114(int var1, int var2, int var3) { + public GameObject method3203(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; if (var4 == null) { return null; } else { for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { GameObject var6 = var4.gameObjects[var5]; - long var8 = var6.tag; - boolean var7 = class268.method5012(var8) == 2; - if (var7 && var2 == var6.startX && var3 == var6.startY) { + if (HealthBarUpdate.method1757(var6.tag) && var2 == var6.startX && var3 == var6.startY) { return var6; } } @@ -761,7 +755,7 @@ public class Scene { } } - @ObfuscatedName("au") + @ObfuscatedName("ax") @ObfuscatedSignature( signature = "(III)Ldu;" ) @@ -771,21 +765,21 @@ public class Scene { return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; } - @ObfuscatedName("ah") + @ObfuscatedName("aj") @Export("getBoundaryObjectTag") public long getBoundaryObjectTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; } - @ObfuscatedName("aq") + @ObfuscatedName("au") @Export("getWallDecorationTag") public long getWallDecorationTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; } - @ObfuscatedName("ao") + @ObfuscatedName("ay") @Export("getGameObjectTag") public long getGameObjectTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -794,9 +788,7 @@ public class Scene { } else { for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { GameObject var6 = var4.gameObjects[var5]; - long var8 = var6.tag; - boolean var7 = class268.method5012(var8) == 2; - if (var7 && var2 == var6.startX && var3 == var6.startY) { + if (HealthBarUpdate.method1757(var6.tag) && var2 == var6.startX && var3 == var6.startY) { return var6.tag; } } @@ -805,14 +797,14 @@ public class Scene { } } - @ObfuscatedName("an") + @ObfuscatedName("aa") @Export("getFloorDecorationTag") public long getFloorDecorationTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; } - @ObfuscatedName("ar") + @ObfuscatedName("aq") @Export("getObjectFlags") public int getObjectFlags(int var1, int var2, int var3, long var4) { Tile var6 = this.tiles[var1][var2][var3]; @@ -835,8 +827,8 @@ public class Scene { } } - @ObfuscatedName("az") - public void method3191(int var1, int var2, int var3) { + @ObfuscatedName("as") + public void method3186(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.planes; ++var4) { for (int var5 = 0; var5 < this.xSize; ++var5) { for (int var6 = 0; var6 < this.ySize; ++var6) { @@ -846,11 +838,11 @@ public class Scene { ModelData var10; if (var8 != null && var8.entity1 instanceof ModelData) { ModelData var9 = (ModelData)var8.entity1; - this.method3123(var9, var4, var5, var6, 1, 1); + this.method3212(var9, var4, var5, var6, 1, 1); if (var8.entity2 instanceof ModelData) { var10 = (ModelData)var8.entity2; - this.method3123(var10, var4, var5, var6, 1, 1); - ModelData.method2818(var9, var10, 0, 0, 0, false); + this.method3212(var10, var4, var5, var6, 1, 1); + ModelData.method2849(var9, var10, 0, 0, 0, false); var8.entity2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); } @@ -861,7 +853,7 @@ public class Scene { GameObject var14 = var7.gameObjects[var12]; if (var14 != null && var14.entity instanceof ModelData) { ModelData var11 = (ModelData)var14.entity; - this.method3123(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); + this.method3212(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); var14.entity = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); } } @@ -869,7 +861,7 @@ public class Scene { FloorDecoration var13 = var7.floorDecoration; if (var13 != null && var13.entity instanceof ModelData) { var10 = (ModelData)var13.entity; - this.method3205(var10, var4, var5, var6); + this.method3187(var10, var4, var5, var6); var13.entity = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); } } @@ -879,18 +871,18 @@ public class Scene { } - @ObfuscatedName("ay") + @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "(Ldd;III)V" + signature = "(Ldg;III)V" ) - void method3205(ModelData var1, int var2, int var3, int var4) { + void method3187(ModelData var1, int var2, int var3, int var4) { Tile var5; ModelData var6; if (var3 < this.xSize) { var5 = this.tiles[var2][var3 + 1][var4]; if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { var6 = (ModelData)var5.floorDecoration.entity; - ModelData.method2818(var1, var6, 128, 0, 0, true); + ModelData.method2849(var1, var6, 128, 0, 0, true); } } @@ -898,7 +890,7 @@ public class Scene { var5 = this.tiles[var2][var3][var4 + 1]; if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { var6 = (ModelData)var5.floorDecoration.entity; - ModelData.method2818(var1, var6, 0, 0, 128, true); + ModelData.method2849(var1, var6, 0, 0, 128, true); } } @@ -906,7 +898,7 @@ public class Scene { var5 = this.tiles[var2][var3 + 1][var4 + 1]; if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { var6 = (ModelData)var5.floorDecoration.entity; - ModelData.method2818(var1, var6, 128, 0, 128, true); + ModelData.method2849(var1, var6, 128, 0, 128, true); } } @@ -914,17 +906,17 @@ public class Scene { var5 = this.tiles[var2][var3 + 1][var4 - 1]; if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { var6 = (ModelData)var5.floorDecoration.entity; - ModelData.method2818(var1, var6, 128, 0, -128, true); + ModelData.method2849(var1, var6, 128, 0, -128, true); } } } - @ObfuscatedName("ag") + @ObfuscatedName("ac") @ObfuscatedSignature( - signature = "(Ldd;IIIII)V" + signature = "(Ldg;IIIII)V" ) - void method3123(ModelData var1, int var2, int var3, int var4, int var5, int var6) { + void method3212(ModelData var1, int var2, int var3, int var4, int var5, int var6) { boolean var7 = true; int var8 = var3; int var9 = var3 + var5; @@ -945,12 +937,12 @@ public class Scene { ModelData var18; if (var17.entity1 instanceof ModelData) { var18 = (ModelData)var17.entity1; - ModelData.method2818(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); + ModelData.method2849(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); } if (var17.entity2 instanceof ModelData) { var18 = (ModelData)var17.entity2; - ModelData.method2818(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); + ModelData.method2849(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); } } @@ -960,7 +952,7 @@ public class Scene { ModelData var20 = (ModelData)var19.entity; int var21 = var19.endX - var19.startX + 1; int var22 = var19.endY - var19.startY + 1; - ModelData.method2818(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); + ModelData.method2849(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); } } } @@ -976,7 +968,7 @@ public class Scene { } - @ObfuscatedName("ac") + @ObfuscatedName("aw") @Export("drawTileMinimap") public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, int var6) { Tile var7 = this.tiles[var4][var5][var6]; @@ -1041,10 +1033,10 @@ public class Scene { } } - @ObfuscatedName("ad") + @ObfuscatedName("al") @Export("menuOpen") public void menuOpen(int var1, int var2, int var3, boolean var4) { - if (!method3092() || var4) { + if (!method3321() || var4) { checkClick = true; viewportWalking = var4; Scene_selectedPlane = var1; @@ -1055,13 +1047,13 @@ public class Scene { } } - @ObfuscatedName("aj") + @ObfuscatedName("ad") @Export("setViewportWalking") public void setViewportWalking() { viewportWalking = true; } - @ObfuscatedName("af") + @ObfuscatedName("at") @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { if (var1 < 0) { @@ -1258,9 +1250,9 @@ public class Scene { checkClick = false; } - @ObfuscatedName("ap") + @ObfuscatedName("an") @ObfuscatedSignature( - signature = "(Ldy;Z)V" + signature = "(Ldz;Z)V" ) @Export("drawTile") void drawTile(Tile var1, boolean var2) { @@ -1354,16 +1346,16 @@ public class Scene { if (var3.linkedBelowTile != null) { var9 = var3.linkedBelowTile; if (var9.paint != null) { - if (!this.method3138(0, var4, var5)) { + if (!this.method3218(0, var4, var5)) { this.drawTileUnderlay(var9.paint, 0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - } else if (var9.model != null && !this.method3138(0, var4, var5)) { + } else if (var9.model != null && !this.method3218(0, var4, var5)) { this.drawTileOverlay(var9.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } var10 = var9.boundaryObject; if (var10 != null) { - var10.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x * 4096 - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y * 4096 - Scene_cameraZ, var10.tag); + var10.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x * 4096 - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y * 64 - Scene_cameraZ, var10.tag); } for (var11 = 0; var11 < var9.gameObjectsCount; ++var11) { @@ -1376,13 +1368,13 @@ public class Scene { var20 = false; if (var3.paint != null) { - if (!this.method3138(var7, var4, var5)) { + if (!this.method3218(var7, var4, var5)) { var20 = true; if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { this.drawTileUnderlay(var3.paint, var7, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } } - } else if (var3.model != null && !this.method3138(var7, var4, var5)) { + } else if (var3.model != null && !this.method3218(var7, var4, var5)) { var20 = true; this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } @@ -1404,49 +1396,49 @@ public class Scene { var21 += 6; } - var11 = field1823[var21]; - var3.field1641 = field1805[var21]; + var11 = field1842[var21]; + var3.field1652 = field1844[var21]; } if (var31 != null) { - if ((var31.orientationA & field1778[var21]) != 0) { + if ((var31.orientationA & field1843[var21]) != 0) { if (var31.orientationA == 16) { var3.drawGameObjectEdges = 3; - var3.field1630 = field1841[var21]; - var3.field1640 = 3 - var3.field1630; + var3.field1650 = field1845[var21]; + var3.field1640 = 3 - var3.field1650; } else if (var31.orientationA == 32) { var3.drawGameObjectEdges = 6; - var3.field1630 = field1827[var21]; - var3.field1640 = 6 - var3.field1630; + var3.field1650 = field1846[var21]; + var3.field1640 = 6 - var3.field1650; } else if (var31.orientationA == 64) { var3.drawGameObjectEdges = 12; - var3.field1630 = field1828[var21]; - var3.field1640 = 12 - var3.field1630; + var3.field1650 = field1847[var21]; + var3.field1640 = 12 - var3.field1650; } else { var3.drawGameObjectEdges = 9; - var3.field1630 = field1789[var21]; - var3.field1640 = 9 - var3.field1630; + var3.field1650 = field1848[var21]; + var3.field1640 = 9 - var3.field1650; } } else { var3.drawGameObjectEdges = 0; } - if ((var31.orientationA & var11) != 0 && !this.method3139(var7, var4, var5, var31.orientationA)) { - var31.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x * 4096 - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y * 4096 - Scene_cameraZ, var31.tag); + if ((var31.orientationA & var11) != 0 && !this.method3204(var7, var4, var5, var31.orientationA)) { + var31.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x * 4096 - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y * 64 - Scene_cameraZ, var31.tag); } - if ((var31.orientationB & var11) != 0 && !this.method3139(var7, var4, var5, var31.orientationB)) { - var31.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x * 4096 - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y * 4096 - Scene_cameraZ, var31.tag); + if ((var31.orientationB & var11) != 0 && !this.method3204(var7, var4, var5, var31.orientationB)) { + var31.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x * 4096 - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y * 64 - Scene_cameraZ, var31.tag); } } - if (var13 != null && !this.method3170(var7, var4, var5, var13.entity1.height)) { + if (var13 != null && !this.method3205(var7, var4, var5, var13.entity1.height)) { if ((var13.orientation & var11) != 0) { - var13.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.xOffset + (var13.x * 4096 - Scene_cameraX), var13.tileHeight - Scene_cameraY, var13.yOffset + (var13.y * 4096 - Scene_cameraZ), var13.tag); + var13.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.xOffset + (var13.x * 4096 - Scene_cameraX), var13.tileHeight - Scene_cameraY, var13.y * 64 - Scene_cameraZ + var13.yOffset, var13.tag); } else if (var13.orientation == 256) { var14 = var13.x * 4096 - Scene_cameraX; var15 = var13.tileHeight - Scene_cameraY; - var16 = var13.y * 4096 - Scene_cameraZ; + var16 = var13.y * 64 - Scene_cameraZ; var17 = var13.orientation2; if (var17 != 1 && var17 != 2) { var18 = var14; @@ -1478,15 +1470,15 @@ public class Scene { TileItemPile var23 = var3.tileItemPile; if (var23 != null && var23.height == 0) { if (var23.second != null) { - var23.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x * 64 - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y * 4096 - Scene_cameraZ, var23.tag); + var23.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x * 4096 - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y * 4096 - Scene_cameraZ, var23.tag); } if (var23.third != null) { - var23.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x * 64 - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y * 4096 - Scene_cameraZ, var23.tag); + var23.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x * 4096 - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y * 4096 - Scene_cameraZ, var23.tag); } if (var23.first != null) { - var23.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x * 64 - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y * 4096 - Scene_cameraZ, var23.tag); + var23.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x * 4096 - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y * 4096 - Scene_cameraZ, var23.tag); } } } @@ -1528,7 +1520,7 @@ public class Scene { var20 = true; for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { - if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field1630) { + if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field1650) { var20 = false; break; } @@ -1536,8 +1528,8 @@ public class Scene { if (var20) { var10 = var3.boundaryObject; - if (!this.method3139(var7, var4, var5, var10.orientationA)) { - var10.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x * 4096 - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y * 4096 - Scene_cameraZ, var10.tag); + if (!this.method3204(var7, var4, var5, var10.orientationA)) { + var10.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x * 4096 - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y * 64 - Scene_cameraZ, var10.tag); } var3.drawGameObjectEdges = 0; @@ -1601,9 +1593,9 @@ public class Scene { var15 = Scene_cameraYTile - var12.startY; var16 = var12.endY - Scene_cameraYTile; if (var16 > var15) { - var12.field1909 = var24 + var16; + var12.field1931 = var24 + var16; } else { - var12.field1909 = var24 + var15; + var12.field1931 = var24 + var15; } } } @@ -1615,10 +1607,10 @@ public class Scene { for (var24 = 0; var24 < var21; ++var24) { GameObject var35 = gameObjects[var24]; if (var35.lastDrawn != Scene_drawnCount) { - if (var35.field1909 > var11) { - var11 = var35.field1909; + if (var35.field1931 > var11) { + var11 = var35.field1931; var25 = var24; - } else if (var11 == var35.field1909) { + } else if (var11 == var35.field1931) { var15 = var35.centerX - Scene_cameraX; var16 = var35.centerY - Scene_cameraZ; var17 = gameObjects[var25].centerX - Scene_cameraX; @@ -1636,7 +1628,7 @@ public class Scene { GameObject var33 = gameObjects[var25]; var33.lastDrawn = Scene_drawnCount; - if (!this.method3200(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.entity.height)) { + if (!this.method3206(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.entity.height)) { var33.entity.draw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.height - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); } @@ -1696,27 +1688,27 @@ public class Scene { TileItemPile var32 = var3.tileItemPile; if (var32 != null && var32.height != 0) { if (var32.second != null) { - var32.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x * 64 - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y * 4096 - Scene_cameraZ, var32.tag); + var32.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x * 4096 - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y * 4096 - Scene_cameraZ, var32.tag); } if (var32.third != null) { - var32.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x * 64 - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y * 4096 - Scene_cameraZ, var32.tag); + var32.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x * 4096 - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y * 4096 - Scene_cameraZ, var32.tag); } if (var32.first != null) { - var32.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x * 64 - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y * 4096 - Scene_cameraZ, var32.tag); + var32.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x * 4096 - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y * 4096 - Scene_cameraZ, var32.tag); } } - if (var3.field1641 != 0) { + if (var3.field1652 != 0) { WallDecoration var29 = var3.wallDecoration; - if (var29 != null && !this.method3170(var7, var4, var5, var29.entity1.height)) { - if ((var29.orientation & var3.field1641) != 0) { - var29.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.xOffset + (var29.x * 4096 - Scene_cameraX), var29.tileHeight - Scene_cameraY, var29.yOffset + (var29.y * 4096 - Scene_cameraZ), var29.tag); + if (var29 != null && !this.method3205(var7, var4, var5, var29.entity1.height)) { + if ((var29.orientation & var3.field1652) != 0) { + var29.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.xOffset + (var29.x * 4096 - Scene_cameraX), var29.tileHeight - Scene_cameraY, var29.y * 64 - Scene_cameraZ + var29.yOffset, var29.tag); } else if (var29.orientation == 256) { var11 = var29.x * 4096 - Scene_cameraX; var25 = var29.tileHeight - Scene_cameraY; - var24 = var29.y * 4096 - Scene_cameraZ; + var24 = var29.y * 64 - Scene_cameraZ; var14 = var29.orientation2; if (var14 != 1 && var14 != 2) { var15 = var11; @@ -1740,12 +1732,12 @@ public class Scene { BoundaryObject var27 = var3.boundaryObject; if (var27 != null) { - if ((var27.orientationB & var3.field1641) != 0 && !this.method3139(var7, var4, var5, var27.orientationB)) { - var27.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x * 4096 - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y * 4096 - Scene_cameraZ, var27.tag); + if ((var27.orientationB & var3.field1652) != 0 && !this.method3204(var7, var4, var5, var27.orientationB)) { + var27.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x * 4096 - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y * 64 - Scene_cameraZ, var27.tag); } - if ((var27.orientationA & var3.field1641) != 0 && !this.method3139(var7, var4, var5, var27.orientationA)) { - var27.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x * 4096 - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y * 4096 - Scene_cameraZ, var27.tag); + if ((var27.orientationA & var3.field1652) != 0 && !this.method3204(var7, var4, var5, var27.orientationA)) { + var27.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x * 4096 - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y * 64 - Scene_cameraZ, var27.tag); } } } @@ -1788,9 +1780,9 @@ public class Scene { } } - @ObfuscatedName("ai") + @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "(Lef;IIIIIII)V" + signature = "(Lee;IIIIIII)V" ) @Export("drawTileUnderlay") void drawTileUnderlay(TilePaint var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { @@ -1844,9 +1836,9 @@ public class Scene { Rasterizer3D.Rasterizer3D_alpha = 0; int var30; if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { - Rasterizer3D.field1751 = false; + Rasterizer3D.field1761 = false; if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field1751 = true; + Rasterizer3D.field1761 = true; } if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { @@ -1856,7 +1848,7 @@ public class Scene { if (var1.texture == -1) { if (var1.neColor != 12345678) { - Rasterizer3D.method3000(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); + Rasterizer3D.method3116(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); } } else if (!Scene_isLowDetail) { if (var1.isFlat) { @@ -1866,14 +1858,14 @@ public class Scene { } } else { var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); - Rasterizer3D.method3000(var27, var29, var25, var26, var28, var24, method3135(var30, var1.neColor), method3135(var30, var1.nwColor), method3135(var30, var1.seColor)); + Rasterizer3D.method3116(var27, var29, var25, var26, var28, var24, method3274(var30, var1.neColor), method3274(var30, var1.nwColor), method3274(var30, var1.seColor)); } } if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { - Rasterizer3D.field1751 = false; + Rasterizer3D.field1761 = false; if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field1751 = true; + Rasterizer3D.field1761 = true; } if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { @@ -1883,13 +1875,13 @@ public class Scene { if (var1.texture == -1) { if (var1.swColor != 12345678) { - Rasterizer3D.method3000(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor); + Rasterizer3D.method3116(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor); } } else if (!Scene_isLowDetail) { Rasterizer3D.drawTexturedTile(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); } else { var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); - Rasterizer3D.method3000(var23, var25, var29, var22, var24, var28, method3135(var30, var1.swColor), method3135(var30, var1.seColor), method3135(var30, var1.nwColor)); + Rasterizer3D.method3116(var23, var25, var29, var22, var24, var28, method3274(var30, var1.swColor), method3274(var30, var1.seColor), method3274(var30, var1.nwColor)); } } @@ -1899,9 +1891,9 @@ public class Scene { } } - @ObfuscatedName("am") + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(Ldv;IIIIII)V" + signature = "(Ldt;IIIIII)V" ) @Export("drawTileOverlay") void drawTileOverlay(TileModel var1, int var2, int var3, int var4, int var5, int var6, int var7) { @@ -1926,13 +1918,13 @@ public class Scene { } if (var1.triangleTextureId != null) { - TileModel.field1580[var9] = var10; - TileModel.field1564[var9] = var13; - TileModel.field1582[var9] = var12; + TileModel.field1575[var9] = var10; + TileModel.field1593[var9] = var13; + TileModel.field1594[var9] = var12; } - TileModel.field1578[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; - TileModel.field1579[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; + TileModel.field1590[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; + TileModel.field1584[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; } Rasterizer3D.Rasterizer3D_alpha = 0; @@ -1942,16 +1934,16 @@ public class Scene { var10 = var1.faceX[var9]; var11 = var1.faceY[var9]; var12 = var1.faceZ[var9]; - var13 = TileModel.field1578[var10]; - int var14 = TileModel.field1578[var11]; - int var15 = TileModel.field1578[var12]; - int var16 = TileModel.field1579[var10]; - int var17 = TileModel.field1579[var11]; - int var18 = TileModel.field1579[var12]; + var13 = TileModel.field1590[var10]; + int var14 = TileModel.field1590[var11]; + int var15 = TileModel.field1590[var12]; + int var16 = TileModel.field1584[var10]; + int var17 = TileModel.field1584[var11]; + int var18 = TileModel.field1584[var12]; if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { - Rasterizer3D.field1751 = false; + Rasterizer3D.field1761 = false; if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field1751 = true; + Rasterizer3D.field1761 = true; } if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { @@ -1962,23 +1954,23 @@ public class Scene { if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { if (!Scene_isLowDetail) { if (var1.isFlat) { - Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1580[0], TileModel.field1580[1], TileModel.field1580[3], TileModel.field1564[0], TileModel.field1564[1], TileModel.field1564[3], TileModel.field1582[0], TileModel.field1582[1], TileModel.field1582[3], var1.triangleTextureId[var9]); + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1575[0], TileModel.field1575[1], TileModel.field1575[3], TileModel.field1593[0], TileModel.field1593[1], TileModel.field1593[3], TileModel.field1594[0], TileModel.field1594[1], TileModel.field1594[3], var1.triangleTextureId[var9]); } else { - Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1580[var10], TileModel.field1580[var11], TileModel.field1580[var12], TileModel.field1564[var10], TileModel.field1564[var11], TileModel.field1564[var12], TileModel.field1582[var10], TileModel.field1582[var11], TileModel.field1582[var12], var1.triangleTextureId[var9]); + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1575[var10], TileModel.field1575[var11], TileModel.field1575[var12], TileModel.field1593[var10], TileModel.field1593[var11], TileModel.field1593[var12], TileModel.field1594[var10], TileModel.field1594[var11], TileModel.field1594[var12], var1.triangleTextureId[var9]); } } else { int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); - Rasterizer3D.method3000(var16, var17, var18, var13, var14, var15, method3135(var19, var1.triangleColorA[var9]), method3135(var19, var1.triangleColorB[var9]), method3135(var19, var1.triangleColorC[var9])); + Rasterizer3D.method3116(var16, var17, var18, var13, var14, var15, method3274(var19, var1.triangleColorA[var9]), method3274(var19, var1.triangleColorB[var9]), method3274(var19, var1.triangleColorC[var9])); } } else if (var1.triangleColorA[var9] != 12345678) { - Rasterizer3D.method3000(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); + Rasterizer3D.method3116(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); } } } } - @ObfuscatedName("bg") + @ObfuscatedName("ah") @Export("occlude") void occlude() { int var1 = Scene_planeOccluderCounts[Scene_plane]; @@ -2017,20 +2009,20 @@ public class Scene { if (var13) { var9 = Scene_cameraX - var4.minX; if (var9 > 32) { - var4.field1877 = 1; + var4.field1891 = 1; } else { if (var9 >= -32) { continue; } - var4.field1877 = 2; + var4.field1891 = 2; var9 = -var9; } - var4.field1880 = (var4.minZ - Scene_cameraZ << 8) / var9; - var4.field1881 = (var4.maxZ - Scene_cameraZ << 8) / var9; - var4.field1875 = (var4.minY - Scene_cameraY << 8) / var9; - var4.field1872 = (var4.maxY - Scene_cameraY << 8) / var9; + var4.field1903 = (var4.minZ - Scene_cameraZ << 8) / var9; + var4.field1904 = (var4.maxZ - Scene_cameraZ << 8) / var9; + var4.field1889 = (var4.minY - Scene_cameraY << 8) / var9; + var4.field1905 = (var4.maxY - Scene_cameraY << 8) / var9; Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } @@ -2059,20 +2051,20 @@ public class Scene { if (var13) { var9 = Scene_cameraZ - var4.minZ; if (var9 > 32) { - var4.field1877 = 3; + var4.field1891 = 3; } else { if (var9 >= -32) { continue; } - var4.field1877 = 4; + var4.field1891 = 4; var9 = -var9; } - var4.field1878 = (var4.minX - Scene_cameraX << 8) / var9; - var4.field1879 = (var4.maxX - Scene_cameraX << 8) / var9; - var4.field1875 = (var4.minY - Scene_cameraY << 8) / var9; - var4.field1872 = (var4.maxY - Scene_cameraY << 8) / var9; + var4.field1900 = (var4.minX - Scene_cameraX << 8) / var9; + var4.field1901 = (var4.maxX - Scene_cameraX << 8) / var9; + var4.field1889 = (var4.minY - Scene_cameraY << 8) / var9; + var4.field1905 = (var4.maxY - Scene_cameraY << 8) / var9; Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } @@ -2113,11 +2105,11 @@ public class Scene { } if (var10) { - var4.field1877 = 5; - var4.field1878 = (var4.minX - Scene_cameraX << 8) / var5; - var4.field1879 = (var4.maxX - Scene_cameraX << 8) / var5; - var4.field1880 = (var4.minZ - Scene_cameraZ << 8) / var5; - var4.field1881 = (var4.maxZ - Scene_cameraZ << 8) / var5; + var4.field1891 = 5; + var4.field1900 = (var4.minX - Scene_cameraX << 8) / var5; + var4.field1901 = (var4.maxX - Scene_cameraX << 8) / var5; + var4.field1903 = (var4.minZ - Scene_cameraZ << 8) / var5; + var4.field1904 = (var4.maxZ - Scene_cameraZ << 8) / var5; Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } @@ -2127,9 +2119,9 @@ public class Scene { } - @ObfuscatedName("bw") - boolean method3138(int var1, int var2, int var3) { - int var4 = this.field1786[var1][var2][var3]; + @ObfuscatedName("bq") + boolean method3218(int var1, int var2, int var3) { + int var4 = this.field1805[var1][var2][var3]; if (var4 == -Scene_drawnCount) { return false; } else if (var4 == Scene_drawnCount) { @@ -2137,19 +2129,19 @@ public class Scene { } else { int var5 = var2 << 7; int var6 = var3 << 7; - if (this.method3142(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method3142(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method3142(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method3142(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { - this.field1786[var1][var2][var3] = Scene_drawnCount; + if (this.method3207(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method3207(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method3207(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method3207(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { + this.field1805[var1][var2][var3] = Scene_drawnCount; return true; } else { - this.field1786[var1][var2][var3] = -Scene_drawnCount; + this.field1805[var1][var2][var3] = -Scene_drawnCount; return false; } } } - @ObfuscatedName("bk") - boolean method3139(int var1, int var2, int var3, int var4) { - if (!this.method3138(var1, var2, var3)) { + @ObfuscatedName("bf") + boolean method3204(int var1, int var2, int var3, int var4) { + if (!this.method3218(var1, var2, var3)) { return false; } else { int var5 = var2 << 7; @@ -2161,30 +2153,30 @@ public class Scene { if (var4 < 16) { if (var4 == 1) { if (var5 > Scene_cameraX) { - if (!this.method3142(var5, var7, var6)) { + if (!this.method3207(var5, var7, var6)) { return false; } - if (!this.method3142(var5, var7, var6 + 128)) { + if (!this.method3207(var5, var7, var6 + 128)) { return false; } } if (var1 > 0) { - if (!this.method3142(var5, var8, var6)) { + if (!this.method3207(var5, var8, var6)) { return false; } - if (!this.method3142(var5, var8, var6 + 128)) { + if (!this.method3207(var5, var8, var6 + 128)) { return false; } } - if (!this.method3142(var5, var9, var6)) { + if (!this.method3207(var5, var9, var6)) { return false; } - if (!this.method3142(var5, var9, var6 + 128)) { + if (!this.method3207(var5, var9, var6 + 128)) { return false; } @@ -2193,30 +2185,30 @@ public class Scene { if (var4 == 2) { if (var6 < Scene_cameraZ) { - if (!this.method3142(var5, var7, var6 + 128)) { + if (!this.method3207(var5, var7, var6 + 128)) { return false; } - if (!this.method3142(var5 + 128, var7, var6 + 128)) { + if (!this.method3207(var5 + 128, var7, var6 + 128)) { return false; } } if (var1 > 0) { - if (!this.method3142(var5, var8, var6 + 128)) { + if (!this.method3207(var5, var8, var6 + 128)) { return false; } - if (!this.method3142(var5 + 128, var8, var6 + 128)) { + if (!this.method3207(var5 + 128, var8, var6 + 128)) { return false; } } - if (!this.method3142(var5, var9, var6 + 128)) { + if (!this.method3207(var5, var9, var6 + 128)) { return false; } - if (!this.method3142(var5 + 128, var9, var6 + 128)) { + if (!this.method3207(var5 + 128, var9, var6 + 128)) { return false; } @@ -2225,30 +2217,30 @@ public class Scene { if (var4 == 4) { if (var5 < Scene_cameraX) { - if (!this.method3142(var5 + 128, var7, var6)) { + if (!this.method3207(var5 + 128, var7, var6)) { return false; } - if (!this.method3142(var5 + 128, var7, var6 + 128)) { + if (!this.method3207(var5 + 128, var7, var6 + 128)) { return false; } } if (var1 > 0) { - if (!this.method3142(var5 + 128, var8, var6)) { + if (!this.method3207(var5 + 128, var8, var6)) { return false; } - if (!this.method3142(var5 + 128, var8, var6 + 128)) { + if (!this.method3207(var5 + 128, var8, var6 + 128)) { return false; } } - if (!this.method3142(var5 + 128, var9, var6)) { + if (!this.method3207(var5 + 128, var9, var6)) { return false; } - if (!this.method3142(var5 + 128, var9, var6 + 128)) { + if (!this.method3207(var5 + 128, var9, var6 + 128)) { return false; } @@ -2257,30 +2249,30 @@ public class Scene { if (var4 == 8) { if (var6 > Scene_cameraZ) { - if (!this.method3142(var5, var7, var6)) { + if (!this.method3207(var5, var7, var6)) { return false; } - if (!this.method3142(var5 + 128, var7, var6)) { + if (!this.method3207(var5 + 128, var7, var6)) { return false; } } if (var1 > 0) { - if (!this.method3142(var5, var8, var6)) { + if (!this.method3207(var5, var8, var6)) { return false; } - if (!this.method3142(var5 + 128, var8, var6)) { + if (!this.method3207(var5 + 128, var8, var6)) { return false; } } - if (!this.method3142(var5, var9, var6)) { + if (!this.method3207(var5, var9, var6)) { return false; } - if (!this.method3142(var5 + 128, var9, var6)) { + if (!this.method3207(var5 + 128, var9, var6)) { return false; } @@ -2288,49 +2280,49 @@ public class Scene { } } - if (!this.method3142(var5 + 64, var10, var6 + 64)) { + if (!this.method3207(var5 + 64, var10, var6 + 64)) { return false; } else if (var4 == 16) { - return this.method3142(var5, var9, var6 + 128); + return this.method3207(var5, var9, var6 + 128); } else if (var4 == 32) { - return this.method3142(var5 + 128, var9, var6 + 128); + return this.method3207(var5 + 128, var9, var6 + 128); } else if (var4 == 64) { - return this.method3142(var5 + 128, var9, var6); + return this.method3207(var5 + 128, var9, var6); } else if (var4 == 128) { - return this.method3142(var5, var9, var6); + return this.method3207(var5, var9, var6); } else { return true; } } } - @ObfuscatedName("bl") - boolean method3170(int var1, int var2, int var3, int var4) { - if (!this.method3138(var1, var2, var3)) { + @ObfuscatedName("bc") + boolean method3205(int var1, int var2, int var3, int var4) { + if (!this.method3218(var1, var2, var3)) { return false; } else { int var5 = var2 << 7; int var6 = var3 << 7; - return this.method3142(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method3142(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method3142(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method3142(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); + return this.method3207(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method3207(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method3207(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method3207(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); } } - @ObfuscatedName("bq") - boolean method3200(int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("bk") + boolean method3206(int var1, int var2, int var3, int var4, int var5, int var6) { int var7; int var8; if (var3 == var2 && var5 == var4) { - if (!this.method3138(var1, var2, var4)) { + if (!this.method3218(var1, var2, var4)) { return false; } else { var7 = var2 << 7; var8 = var4 << 7; - return this.method3142(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method3142(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method3142(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method3142(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); + return this.method3207(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method3207(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method3207(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method3207(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); } } else { for (var7 = var2; var7 <= var3; ++var7) { for (var8 = var4; var8 <= var5; ++var8) { - if (this.field1786[var1][var7][var8] == -Scene_drawnCount) { + if (this.field1805[var1][var7][var8] == -Scene_drawnCount) { return false; } } @@ -2339,17 +2331,17 @@ public class Scene { var7 = (var2 << 7) + 1; var8 = (var4 << 7) + 2; int var9 = this.tileHeights[var1][var2][var4] - var6; - if (!this.method3142(var7, var9, var8)) { + if (!this.method3207(var7, var9, var8)) { return false; } else { int var10 = (var3 << 7) - 1; - if (!this.method3142(var10, var9, var8)) { + if (!this.method3207(var10, var9, var8)) { return false; } else { int var11 = (var5 << 7) - 1; - if (!this.method3142(var7, var9, var11)) { + if (!this.method3207(var7, var9, var11)) { return false; - } else if (!this.method3142(var10, var9, var11)) { + } else if (!this.method3207(var10, var9, var11)) { return false; } else { return true; @@ -2359,8 +2351,8 @@ public class Scene { } } - @ObfuscatedName("bx") - boolean method3142(int var1, int var2, int var3) { + @ObfuscatedName("bb") + boolean method3207(int var1, int var2, int var3) { for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { Occluder var5 = Scene_currentOccluders[var4]; int var6; @@ -2368,57 +2360,57 @@ public class Scene { int var8; int var9; int var10; - if (var5.field1877 == 1) { + if (var5.field1891 == 1) { var6 = var5.minX - var1; if (var6 > 0) { - var7 = (var6 * var5.field1880 >> 8) + var5.minZ; - var8 = (var6 * var5.field1881 >> 8) + var5.maxZ; - var9 = (var6 * var5.field1875 >> 8) + var5.minY; - var10 = (var6 * var5.field1872 >> 8) + var5.maxY; + var7 = (var6 * var5.field1903 >> 8) + var5.minZ; + var8 = (var6 * var5.field1904 >> 8) + var5.maxZ; + var9 = (var6 * var5.field1889 >> 8) + var5.minY; + var10 = (var6 * var5.field1905 >> 8) + var5.maxY; if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field1877 == 2) { + } else if (var5.field1891 == 2) { var6 = var1 - var5.minX; if (var6 > 0) { - var7 = (var6 * var5.field1880 >> 8) + var5.minZ; - var8 = (var6 * var5.field1881 >> 8) + var5.maxZ; - var9 = (var6 * var5.field1875 >> 8) + var5.minY; - var10 = (var6 * var5.field1872 >> 8) + var5.maxY; + var7 = (var6 * var5.field1903 >> 8) + var5.minZ; + var8 = (var6 * var5.field1904 >> 8) + var5.maxZ; + var9 = (var6 * var5.field1889 >> 8) + var5.minY; + var10 = (var6 * var5.field1905 >> 8) + var5.maxY; if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field1877 == 3) { + } else if (var5.field1891 == 3) { var6 = var5.minZ - var3; if (var6 > 0) { - var7 = (var6 * var5.field1878 >> 8) + var5.minX; - var8 = (var6 * var5.field1879 >> 8) + var5.maxX; - var9 = (var6 * var5.field1875 >> 8) + var5.minY; - var10 = (var6 * var5.field1872 >> 8) + var5.maxY; + var7 = (var6 * var5.field1900 >> 8) + var5.minX; + var8 = (var6 * var5.field1901 >> 8) + var5.maxX; + var9 = (var6 * var5.field1889 >> 8) + var5.minY; + var10 = (var6 * var5.field1905 >> 8) + var5.maxY; if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field1877 == 4) { + } else if (var5.field1891 == 4) { var6 = var3 - var5.minZ; if (var6 > 0) { - var7 = (var6 * var5.field1878 >> 8) + var5.minX; - var8 = (var6 * var5.field1879 >> 8) + var5.maxX; - var9 = (var6 * var5.field1875 >> 8) + var5.minY; - var10 = (var6 * var5.field1872 >> 8) + var5.maxY; + var7 = (var6 * var5.field1900 >> 8) + var5.minX; + var8 = (var6 * var5.field1901 >> 8) + var5.maxX; + var9 = (var6 * var5.field1889 >> 8) + var5.minY; + var10 = (var6 * var5.field1905 >> 8) + var5.maxY; if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field1877 == 5) { + } else if (var5.field1891 == 5) { var6 = var2 - var5.minY; if (var6 > 0) { - var7 = (var6 * var5.field1878 >> 8) + var5.minX; - var8 = (var6 * var5.field1879 >> 8) + var5.maxX; - var9 = (var6 * var5.field1880 >> 8) + var5.minZ; - var10 = (var6 * var5.field1881 >> 8) + var5.maxZ; + var7 = (var6 * var5.field1900 >> 8) + var5.minX; + var8 = (var6 * var5.field1901 >> 8) + var5.maxX; + var9 = (var6 * var5.field1903 >> 8) + var5.minZ; + var10 = (var6 * var5.field1904 >> 8) + var5.maxZ; if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { return true; } @@ -2429,7 +2421,7 @@ public class Scene { return false; } - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("Scene_addOccluder") public static void Scene_addOccluder(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { Occluder var8 = new Occluder(); @@ -2447,7 +2439,7 @@ public class Scene { Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; } - @ObfuscatedName("al") + @ObfuscatedName("ar") @Export("Scene_buildVisiblityMap") public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int var3, int var4) { Scene_viewportXMin = 0; @@ -2480,7 +2472,7 @@ public class Scene { boolean var14 = false; for (int var15 = -var1; var15 <= var2; var15 += 128) { - if (method3100(var12, var0[var8] + var15, var13)) { + if (method3190(var12, var0[var8] + var15, var13)) { var14 = true; break; } @@ -2531,8 +2523,8 @@ public class Scene { } - @ObfuscatedName("ae") - static boolean method3100(int var0, int var1, int var2) { + @ObfuscatedName("av") + static boolean method3190(int var0, int var1, int var2) { int var3 = var0 * Scene_cameraYawCosine + var2 * Scene_cameraYawSine >> 16; int var4 = var2 * Scene_cameraYawCosine - var0 * Scene_cameraYawSine >> 16; int var5 = var4 * Scene_cameraPitchCosine + Scene_cameraPitchSine * var1 >> 16; @@ -2546,19 +2538,19 @@ public class Scene { } } - @ObfuscatedName("ax") - public static boolean method3092() { + @ObfuscatedName("am") + public static boolean method3321() { return viewportWalking && Scene_selectedX != -1; } - @ObfuscatedName("at") - public static void method3150() { + @ObfuscatedName("ao") + public static void method3279() { Scene_selectedX = -1; viewportWalking = false; } @ObfuscatedName("ab") - static final int method3135(int var0, int var1) { + static final int method3274(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; if (var1 < 2) { var1 = 2; @@ -2569,7 +2561,7 @@ public class Scene { return (var0 & 65408) + var1; } - @ObfuscatedName("bj") + @ObfuscatedName("ap") @Export("containsBounds") static boolean containsBounds(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (var1 < var2 && var1 < var3 && var1 < var4) { diff --git a/runescape-client/src/main/java/Script.java b/runescape-client/src/main/java/Script.java index f86732d31a..8dfc6590c5 100644 --- a/runescape-client/src/main/java/Script.java +++ b/runescape-client/src/main/java/Script.java @@ -4,63 +4,51 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cu") +@ObfuscatedName("ce") @Implements("Script") public class Script extends DualNode { - @ObfuscatedName("st") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Le;" - ) - @Export("grandExchangeEvents") - static GrandExchangeEvents grandExchangeEvents; - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("Script_cached") static EvictingDualNodeHashTable Script_cached; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -1585175051 - ) - @Export("loginBoxCenter") - static int loginBoxCenter; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("opcodes") int[] opcodes; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("intOperands") int[] intOperands; - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("stringOperands") String[] stringOperands; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 465356471 + intValue = 1871581323 ) @Export("localIntCount") int localIntCount; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1243420491 + intValue = 822375411 ) @Export("localStringCount") int localStringCount; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -308424659 + intValue = -1252836573 ) @Export("intArgumentCount") int intArgumentCount; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -2632789 + intValue = -1735199639 ) @Export("stringArgumentCount") int stringArgumentCount; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "[Llc;" + signature = "[Llp;" ) @Export("switches") IterableNodeHashTable[] switches; @@ -72,34 +60,38 @@ public class Script extends DualNode { Script() { } - @ObfuscatedName("w") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IB)[Llc;", - garbageValue = "-1" + signature = "(IB)[Llp;", + garbageValue = "1" ) @Export("newIterableNodeHashTable") IterableNodeHashTable[] newIterableNodeHashTable(int var1) { return new IterableNodeHashTable[var1]; } - @ObfuscatedName("fj") + @ObfuscatedName("kh") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1158039075" + signature = "(IIIILlt;Lhf;I)V", + garbageValue = "631816704" ) - static final void method2244() { - if (Projectile.ClanChat_inClanChat) { - if (Calendar.clanChat != null) { - Calendar.clanChat.sort(); - } + @Export("drawSpriteOnMinimap") + static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) { + if (var4 != null) { + int var6 = Client.camAngleY & 2047; + int var7 = var3 * var3 + var2 * var2; + if (var7 <= 6400) { + int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; + int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; + int var10 = var3 * var8 + var9 * var2 >> 16; + int var11 = var3 * var9 - var8 * var2 >> 16; + if (var7 > 2500) { + var4.method6207(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths); + } else { + var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); + } - for (int var0 = 0; var0 < Players.Players_count; ++var0) { - Player var1 = Client.players[Players.Players_indices[var0]]; - var1.clearIsInClanChat(); } - - Projectile.ClanChat_inClanChat = false; } - } } diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java index cc89601b8a..eba0bf3bdb 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -1,77 +1,75 @@ +import java.security.SecureRandom; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bm") +@ObfuscatedName("bw") @Implements("ScriptEvent") public class ScriptEvent extends Node { - @ObfuscatedName("fw") - @ObfuscatedGetter( - intValue = -2041683927 - ) - @Export("baseY") - static int baseY; - @ObfuscatedName("f") + @ObfuscatedName("ef") + @Export("secureRandom") + static SecureRandom secureRandom; + @ObfuscatedName("c") @Export("args") Object[] args; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("isMouseInputEvent") boolean isMouseInputEvent; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lha;" + signature = "Lhn;" ) @Export("widget") Widget widget; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 884179391 + intValue = -1331050905 ) @Export("mouseX") int mouseX; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 990811435 + intValue = 1279210295 ) @Export("mouseY") int mouseY; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1259454631 + intValue = -1465065173 ) @Export("opIndex") int opIndex; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lha;" + signature = "Lhn;" ) @Export("dragTarget") Widget dragTarget; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 49600395 + intValue = -268491807 ) @Export("keyTyped") int keyTyped; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -601686953 + intValue = 1412457419 ) @Export("keyPressed") int keyPressed; - @ObfuscatedName("d") + @ObfuscatedName("m") @Export("targetName") String targetName; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1957089865 + intValue = 1385894557 ) - int field557; - @ObfuscatedName("o") + int field582; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1339404961 + intValue = -891059655 ) @Export("type") int type; @@ -80,118 +78,80 @@ public class ScriptEvent extends Node { this.type = 76; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "([Ljava/lang/Object;I)V", - garbageValue = "-2080962304" + garbageValue = "-2105798075" ) @Export("setArgs") public void setArgs(Object[] var1) { this.args = var1; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "33" + signature = "(II)V", + garbageValue = "350345560" ) @Export("setType") public void setType(int var1) { this.type = var1; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-9" + signature = "(Ljava/lang/CharSequence;II)I", + garbageValue = "2038755818" ) - public static void method1183() { - if (class297.NetCache_socket != null) { - class297.NetCache_socket.close(); - } - + public static int method1202(CharSequence var0, int var1) { + return KitDefinition.parseIntCustomRadix(var0, var1, true); } - @ObfuscatedName("t") + @ObfuscatedName("he") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-135239713" + signature = "(ILjava/lang/String;I)V", + garbageValue = "43843350" ) - static final int method1184(int var0, int var1) { - if (var0 == -2) { - return 12345678; - } else if (var0 == -1) { - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } + static void method1203(int var0, String var1) { + int var2 = Players.Players_count; + int[] var3 = Players.Players_indices; + boolean var4 = false; + Username var5 = new Username(var1, class192.loginType); - return var1; - } else { - var1 = (var0 & 127) * var1 / 128; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } + for (int var6 = 0; var6 < var2; ++var6) { + Player var7 = Client.players[var3[var6]]; + if (var7 != null && var7 != class192.localPlayer && var7.username != null && var7.username.equals(var5)) { + PacketBufferNode var8; + if (var0 == 1) { + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2282, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeByte(0); + var8.packetBuffer.writeShort(var3[var6]); + Client.packetWriter.addNode(var8); + } else if (var0 == 4) { + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2216, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeByte(0); + var8.packetBuffer.writeShortLE(var3[var6]); + Client.packetWriter.addNode(var8); + } else if (var0 == 6) { + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2221, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5787(var3[var6]); + var8.packetBuffer.writeByte(0); + Client.packetWriter.addNode(var8); + } else if (var0 == 7) { + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2266, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5787(var3[var6]); + var8.packetBuffer.method5602(0); + Client.packetWriter.addNode(var8); + } - return (var0 & 65408) + var1; - } - } - - @ObfuscatedName("gk") - @ObfuscatedSignature( - signature = "(Lbv;I)V", - garbageValue = "-2035180318" - ) - static final void method1180(Actor var0) { - int var1 = var0.field950 - Client.cycle; - int var2 = var0.field921 * 128 + var0.field925 * 64; - int var3 = var0.field966 * 128 + var0.field925 * 64; - var0.x += (var2 - var0.x) / var1; - var0.y += (var3 - var0.y) / var1; - var0.field980 = 0; - var0.orientation = var0.field970; - } - - @ObfuscatedName("hx") - @ObfuscatedSignature( - signature = "(IIII)I", - garbageValue = "1464658365" - ) - @Export("getTileHeight") - static final int getTileHeight(int var0, int var1, int var2) { - int var3 = var0 >> 7; - int var4 = var1 >> 7; - if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { - int var5 = var2; - if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { - var5 = var2 + 1; - } - - int var6 = var0 & 127; - int var7 = var1 & 127; - int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4] >> 7; - int var9 = var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] + Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) >> 7; - return var9 * var7 + var8 * (128 - var7) >> 7; - } else { - return 0; - } - } - - @ObfuscatedName("jv") - @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "103" - ) - static boolean method1185(int var0) { - for (int var1 = 0; var1 < Client.field849; ++var1) { - if (Client.field851[var1] == var0) { - return true; + var4 = true; + break; } } - return false; + if (!var4) { + ClientPreferences.addGameMessage(4, "", "Unable to find " + var1); + } + } } diff --git a/runescape-client/src/main/java/ScriptFrame.java b/runescape-client/src/main/java/ScriptFrame.java index 7ff4268129..6a320b4d64 100644 --- a/runescape-client/src/main/java/ScriptFrame.java +++ b/runescape-client/src/main/java/ScriptFrame.java @@ -3,39 +3,32 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bk") +@ObfuscatedName("bb") @Implements("ScriptFrame") public class ScriptFrame { - @ObfuscatedName("x") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lls;" + signature = "Lli;" ) - @Export("rightTitleSprite") - static Sprite rightTitleSprite; - @ObfuscatedName("fc") + @Export("titleboxSprite") + static IndexedSprite titleboxSprite; + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lko;" - ) - @Export("fontPlain12") - static Font fontPlain12; - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Lcu;" + signature = "Lce;" ) @Export("script") Script script; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -894059765 + intValue = -424456735 ) @Export("pc") int pc; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("intLocals") int[] intLocals; - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("stringLocals") String[] stringLocals; @@ -43,332 +36,308 @@ public class ScriptFrame { this.pc = -1; } - @ObfuscatedName("y") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "68267919" + signature = "(II)Z", + garbageValue = "1752318627" ) - public static int method1109(int var0) { - var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); - var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); - var0 = var0 + (var0 >>> 4) & 252645135; - var0 += var0 >>> 8; - var0 += var0 >>> 16; - return var0 & 255; - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "(CI)C", - garbageValue = "-1576497419" - ) - static char method1110(char var0) { - return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - signature = "(ILcu;ZI)I", - garbageValue = "1395741259" - ) - static int method1111(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; - return 1; + @Export("loadInterface") + public static boolean loadInterface(int var0) { + if (class197.Widget_loadedInterfaces[var0]) { + return true; + } else if (!class197.Widget_archive.tryLoadGroup(var0)) { + return false; } else { - int var12; - if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var12 == 0 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var12 == 2 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var12 == 5 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var12 == 1 ? 1 : 0; - return 1; + int var1 = class197.Widget_archive.getGroupFileCount(var0); + if (var1 == 0) { + class197.Widget_loadedInterfaces[var0] = true; + return true; } else { - boolean var13; - if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { - var13 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - if (Script.grandExchangeEvents != null) { - Script.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var13); - } + if (WorldMapLabel.Widget_interfaceComponents[var0] == null) { + WorldMapLabel.Widget_interfaceComponents[var0] = new Widget[var1]; + } - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { - var13 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - if (Script.grandExchangeEvents != null) { - Script.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { - class188.Interpreter_intStackSize -= 2; - var13 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize] == 1; - boolean var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1] == 1; - if (Script.grandExchangeEvents != null) { - Client.GrandExchangeEvents_worldComparator.filterWorlds = var4; - Script.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { - var13 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - if (Script.grandExchangeEvents != null) { - Script.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { - var13 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - if (Script.grandExchangeEvents != null) { - Script.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Script.grandExchangeEvents == null ? 0 : Script.grandExchangeEvents.events.size(); - return 1; - } else { - GrandExchangeEvent var11; - if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)Script.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var11.world; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)Script.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var11.getOfferName(); - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)Script.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var11.getPreviousOfferName(); - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)Script.grandExchangeEvents.events.get(var3); - long var5 = WorldMapID.currentTimeMillis() - TileItemPile.field1522 - var11.age; - int var7 = (int)(var5 / 3600000L); - int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); - int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); - String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var10; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)Script.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)Script.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)Script.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id; - return 1; - } else { - return 2; + for (int var2 = 0; var2 < var1; ++var2) { + if (WorldMapLabel.Widget_interfaceComponents[var0][var2] == null) { + byte[] var3 = class197.Widget_archive.takeFile(var0, var2); + if (var3 != null) { + WorldMapLabel.Widget_interfaceComponents[var0][var2] = new Widget(); + WorldMapLabel.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); + if (var3[0] == -1) { + WorldMapLabel.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); + } else { + WorldMapLabel.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); + } + } } } + + class197.Widget_loadedInterfaces[var0] = true; + return true; } } } - @ObfuscatedName("an") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(ILcu;ZI)I", - garbageValue = "-2033386176" + signature = "([BIII)Ljava/lang/String;", + garbageValue = "-1282364496" ) - static int method1112(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.OC_NAME) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = PacketBufferNode.ItemDefinition_get(var3).name; - return 1; - } else { - int var4; - ItemDefinition var5; - if (var0 == ScriptOpcodes.OC_OP) { - class188.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - var5 = PacketBufferNode.ItemDefinition_get(var3); - if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + @Export("decodeStringCp1252") + public static String decodeStringCp1252(byte[] var0, int var1, int var2) { + char[] var3 = new char[var2]; + int var4 = 0; + + for (int var5 = 0; var5 < var2; ++var5) { + int var6 = var0[var5 + var1] & 255; + if (var6 != 0) { + if (var6 >= 128 && var6 < 160) { + char var7 = class288.cp1252AsciiExtension[var6 - 128]; + if (var7 == 0) { + var7 = '?'; + } + + var6 = var7; } - return 1; - } else if (var0 == ScriptOpcodes.OC_IOP) { - class188.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - var5 = PacketBufferNode.ItemDefinition_get(var3); - if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_COST) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = PacketBufferNode.ItemDefinition_get(var3).price; - return 1; - } else if (var0 == ScriptOpcodes.OC_STACKABLE) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = PacketBufferNode.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; - return 1; - } else { - ItemDefinition var6; - if (var0 == ScriptOpcodes.OC_CERT) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - var6 = PacketBufferNode.ItemDefinition_get(var3); - if (var6.noteTemplate == -1 && var6.note >= 0) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var6.note; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_UNCERT) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - var6 = PacketBufferNode.ItemDefinition_get(var3); - if (var6.noteTemplate >= 0 && var6.note >= 0) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var6.note; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_MEMBERS) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = PacketBufferNode.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - var6 = PacketBufferNode.ItemDefinition_get(var3); - if (var6.placeholderTemplate == -1 && var6.placeholder >= 0) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var6.placeholder; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - var6 = PacketBufferNode.ItemDefinition_get(var3); - if (var6.placeholderTemplate >= 0 && var6.placeholder >= 0) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var6.placeholder; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_FIND) { - String var7 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - WorldMapSectionType.findItemDefinitions(var7, var4 == 1); - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = KeyHandler.foundItemIdCount; - return 1; - } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { - if (var0 == ScriptOpcodes.OC_FINDRESET) { - class189.foundItemIndex = 0; - return 1; - } else { - return 2; - } - } else { - if (class269.foundItemIds != null && class189.foundItemIndex < KeyHandler.foundItemIdCount) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = class269.foundItemIds[++class189.foundItemIndex - 1] & '\uffff'; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; - } - - return 1; - } + var3[var4++] = (char)var6; } } + + return new String(var3, 0, var4); } - @ObfuscatedName("fi") + @ObfuscatedName("gi") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "1546700501" + signature = "(Lbx;II)V", + garbageValue = "1584696624" ) - @Export("playSoundJingle") - static void playSoundJingle(int var0, int var1) { - if (Client.musicVolume != 0 && var0 != -1) { - class173.playMusicTrack(class48.archive11, var0, 0, Client.musicVolume, false); - Client.field767 = true; + @Export("updateActorSequence") + static final void updateActorSequence(Actor var0, int var1) { + if (var0.field985 >= Client.cycle) { + class185.method3685(var0); + } else if (var0.field986 >= Client.cycle) { + GrandExchangeEvent.method88(var0); + } else { + WorldMapRegion.method565(var0); + } + + if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { + var0.sequence = -1; + var0.spotAnimation = -1; + var0.field985 = 0; + var0.field986 = 0; + var0.x = var0.pathX[0] * 128 + var0.field942 * 2013925376; + var0.y = var0.pathY[0] * 128 + var0.field942 * 2013925376; + var0.method1740(); + } + + if (class192.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { + var0.sequence = -1; + var0.spotAnimation = -1; + var0.field985 = 0; + var0.field986 = 0; + var0.x = var0.pathX[0] * 128 + var0.field942 * 2013925376; + var0.y = var0.pathY[0] * 128 + var0.field942 * 2013925376; + var0.method1740(); + } + + int var5; + if (var0.field975 != 0) { + if (var0.targetIndex != -1) { + Object var2 = null; + if (var0.targetIndex < 32768) { + var2 = Client.npcs[var0.targetIndex]; + } else if (var0.targetIndex >= 32768) { + var2 = Client.players[var0.targetIndex - 32768]; + } + + if (var2 != null) { + int var6 = var0.x - ((Actor)var2).x; + int var4 = var0.y - ((Actor)var2).y; + if (var6 != 0 || var4 != 0) { + var0.orientation = (int)(Math.atan2((double)var6, (double)var4) * 325.949D) & 2047; + } + } else if (var0.false0) { + var0.targetIndex = -1; + var0.false0 = false; + } + } + + if (var0.field967 != -1 && (var0.pathLength == 0 || var0.field997 > 0)) { + var0.orientation = var0.field967; + var0.field967 = -1; + } + + var5 = var0.orientation - var0.rotation & 2047; + if (var5 == 0 && var0.false0) { + var0.targetIndex = -1; + var0.false0 = false; + } + + if (var5 != 0) { + ++var0.field956; + boolean var8; + if (var5 > 1024) { + var0.rotation -= var0.field975; + var8 = true; + if (var5 < var0.field975 || var5 > 2048 - var0.field975) { + var0.rotation = var0.orientation; + var8 = false; + } + + if (var0.movementSequence == var0.readySequence && (var0.field956 > 25 || var8)) { + if (var0.turnLeftSequence != -1) { + var0.movementSequence = var0.turnLeftSequence; + } else { + var0.movementSequence = var0.walkSequence; + } + } + } else { + var0.rotation += var0.field975; + var8 = true; + if (var5 < var0.field975 || var5 > 2048 - var0.field975) { + var0.rotation = var0.orientation; + var8 = false; + } + + if (var0.movementSequence == var0.readySequence && (var0.field956 > 25 || var8)) { + if (var0.turnRightSequence != -1) { + var0.movementSequence = var0.turnRightSequence; + } else { + var0.movementSequence = var0.walkSequence; + } + } + } + + var0.rotation &= 2047; + } else { + var0.field956 = 0; + } + } + + var0.isWalking = false; + SequenceDefinition var7; + if (var0.movementSequence != -1) { + var7 = GraphicsDefaults.SequenceDefinition_get(var0.movementSequence); + if (var7 != null && var7.frameIds != null) { + ++var0.movementFrameCycle; + if (var0.movementFrame < var7.frameIds.length && var0.movementFrameCycle > var7.frameLengths[var0.movementFrame]) { + var0.movementFrameCycle = 1; + ++var0.movementFrame; + GameObject.addSequenceSoundEffect(var7, var0.movementFrame, var0.x, var0.y); + } + + if (var0.movementFrame >= var7.frameIds.length) { + var0.movementFrameCycle = 0; + var0.movementFrame = 0; + GameObject.addSequenceSoundEffect(var7, var0.movementFrame, var0.x, var0.y); + } + } else { + var0.movementSequence = -1; + } + } + + if (var0.spotAnimation != -1 && Client.cycle >= var0.field979) { + if (var0.spotAnimationFrame < 0) { + var0.spotAnimationFrame = 0; + } + + var5 = class65.SpotAnimationDefinition_get(var0.spotAnimation).sequence; + if (var5 != -1) { + SequenceDefinition var3 = GraphicsDefaults.SequenceDefinition_get(var5); + if (var3 != null && var3.frameIds != null) { + ++var0.spotAnimationFrameCycle; + if (var0.spotAnimationFrame < var3.frameIds.length && var0.spotAnimationFrameCycle > var3.frameLengths[var0.spotAnimationFrame]) { + var0.spotAnimationFrameCycle = 1; + ++var0.spotAnimationFrame; + GameObject.addSequenceSoundEffect(var3, var0.spotAnimationFrame, var0.x, var0.y); + } + + if (var0.spotAnimationFrame >= var3.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var3.frameIds.length)) { + var0.spotAnimation = -1; + } + } else { + var0.spotAnimation = -1; + } + } else { + var0.spotAnimation = -1; + } + } + + if (var0.sequence != -1 && var0.sequenceDelay <= 1) { + var7 = GraphicsDefaults.SequenceDefinition_get(var0.sequence); + if (var7.field3523 == 1 && var0.field998 > 0 && var0.field985 <= Client.cycle && var0.field986 < Client.cycle) { + var0.sequenceDelay = 1; + return; + } + } + + if (var0.sequence != -1 && var0.sequenceDelay == 0) { + var7 = GraphicsDefaults.SequenceDefinition_get(var0.sequence); + if (var7 != null && var7.frameIds != null) { + ++var0.sequenceFrameCycle; + if (var0.sequenceFrame < var7.frameIds.length && var0.sequenceFrameCycle > var7.frameLengths[var0.sequenceFrame]) { + var0.sequenceFrameCycle = 1; + ++var0.sequenceFrame; + GameObject.addSequenceSoundEffect(var7, var0.sequenceFrame, var0.x, var0.y); + } + + if (var0.sequenceFrame >= var7.frameIds.length) { + var0.sequenceFrame -= var7.frameCount; + ++var0.field983; + if (var0.field983 >= var7.field3522) { + var0.sequence = -1; + } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var7.frameIds.length) { + GameObject.addSequenceSoundEffect(var7, var0.sequenceFrame, var0.x, var0.y); + } else { + var0.sequence = -1; + } + } + + var0.isWalking = var7.field3518; + } else { + var0.sequence = -1; + } + } + + if (var0.sequenceDelay > 0) { + --var0.sequenceDelay; } } - @ObfuscatedName("ki") + @ObfuscatedName("jj") @ObfuscatedSignature( - signature = "(IIII)Lbz;", - garbageValue = "-1435666355" + signature = "(Lhn;B)Z", + garbageValue = "-53" ) - static final InterfaceParent method1107(int var0, int var1, int var2) { - InterfaceParent var3 = new InterfaceParent(); - var3.group = var1; - var3.type = var2; - Client.interfaceParents.put(var3, (long)var0); - GameShell.Widget_resetModelFrames(var1); - Widget var4 = Tile.getWidget(var0); - LoginPacket.invalidateWidget(var4); - if (Client.meslayerContinueWidget != null) { - LoginPacket.invalidateWidget(Client.meslayerContinueWidget); - Client.meslayerContinueWidget = null; - } + @Export("runCs1") + static final boolean runCs1(Widget var0) { + if (var0.cs1Comparisons == null) { + return false; + } else { + for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { + int var2 = GrandExchangeOfferTotalQuantityComparator.method106(var0, var1); + int var3 = var0.cs1ComparisonValues[var1]; + if (var0.cs1Comparisons[var1] == 2) { + if (var2 >= var3) { + return false; + } + } else if (var0.cs1Comparisons[var1] == 3) { + if (var2 <= var3) { + return false; + } + } else if (var0.cs1Comparisons[var1] == 4) { + if (var3 == var2) { + return false; + } + } else if (var2 != var3) { + return false; + } + } - Strings.method4096(); - Messages.revalidateWidgetScroll(UserComparator7.Widget_interfaceComponents[var0 >> 16], var4, false); - Players.runWidgetOnLoadListener(var1); - if (Client.rootInterface != -1) { - ItemContainer.runIntfCloseListeners(Client.rootInterface, 1); + return true; } - - return var3; } } diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index 652e515374..2d38ab8f85 100644 --- a/runescape-client/src/main/java/SecureRandomCallable.java +++ b/runescape-client/src/main/java/SecureRandomCallable.java @@ -1,187 +1,46 @@ import java.util.concurrent.Callable; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bq") +@ObfuscatedName("bi") @Implements("SecureRandomCallable") public class SecureRandomCallable implements Callable { - @ObfuscatedName("de") + @ObfuscatedName("ey") @ObfuscatedSignature( - signature = "Lfu;" + signature = "Lia;" ) - @Export("js5SocketTask") - static Task js5SocketTask; - @ObfuscatedName("ej") + @Export("archive20") + static Archive archive20; + @ObfuscatedName("fd") + @ObfuscatedGetter( + intValue = 696755763 + ) + static int field530; + @ObfuscatedName("gq") + @ObfuscatedGetter( + intValue = 1829192953 + ) + static int field531; + @ObfuscatedName("gd") @ObfuscatedSignature( - signature = "Lkc;" + signature = "[Llt;" ) - @Export("spriteIds") - static GraphicsDefaults spriteIds; + @Export("headIconHintSprites") + static Sprite[] headIconHintSprites; + @ObfuscatedName("kk") + @ObfuscatedGetter( + intValue = -821699027 + ) + @Export("menuY") + static int menuY; SecureRandomCallable() { } public Object call() { - return GameShell.method1069(); - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(IB)Lcu;", - garbageValue = "-120" - ) - @Export("getScript") - static Script getScript(int var0) { - Script var1 = (Script)Script.Script_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = SoundSystem.archive12.takeFile(var0, 0); - if (var2 == null) { - return null; - } else { - var1 = Tiles.newScript(var2); - Script.Script_cached.put(var1, (long)var0); - return var1; - } - } - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(Lhz;II)Lli;", - garbageValue = "-210217349" - ) - public static IndexedSprite method1151(AbstractArchive var0, int var1) { - return !class4.method61(var0, var1) ? null : WorldMapDecoration.method327(); - } - - @ObfuscatedName("hg") - @ObfuscatedSignature( - signature = "(ZLkl;B)V", - garbageValue = "-23" - ) - @Export("loadRegions") - static final void loadRegions(boolean var0, PacketBuffer var1) { - Client.isInInstance = var0; - int var3; - int var4; - int var5; - int var6; - int var7; - int var8; - if (!Client.isInInstance) { - int var2 = var1.method5723(); - var3 = var1.method5582(); - var4 = var1.readUnsignedShort(); - Canvas.xteaKeys = new int[var4][4]; - - for (var5 = 0; var5 < var4; ++var5) { - for (var6 = 0; var6 < 4; ++var6) { - Canvas.xteaKeys[var5][var6] = var1.readInt(); - } - } - - WorldMapSection2.regions = new int[var4]; - SecureRandomFuture.regionMapArchiveIds = new int[var4]; - class222.regionLandArchiveIds = new int[var4]; - Projectile.regionLandArchives = new byte[var4][]; - GrandExchangeOfferOwnWorldComparator.regionMapArchives = new byte[var4][]; - boolean var16 = false; - if ((var3 / 8 == 48 || var3 / 8 == 49) && var2 / 8 == 48) { - var16 = true; - } - - if (var3 / 8 == 48 && var2 / 8 == 148) { - var16 = true; - } - - var4 = 0; - - for (var6 = (var3 - 6) / 8; var6 <= (var3 + 6) / 8; ++var6) { - for (var7 = (var2 - 6) / 8; var7 <= (var2 + 6) / 8; ++var7) { - var8 = var7 + (var6 << 8); - if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { - WorldMapSection2.regions[var4] = var8; - SecureRandomFuture.regionMapArchiveIds[var4] = AbstractWorldMapData.archive5.getGroupId("m" + var6 + "_" + var7); - class222.regionLandArchiveIds[var4] = AbstractWorldMapData.archive5.getGroupId("l" + var6 + "_" + var7); - ++var4; - } - } - } - - UserComparator8.method3327(var3, var2, true); - } else { - boolean var15 = var1.method5675() == 1; - var3 = var1.method5583(); - var4 = var1.readUnsignedShort(); - var5 = var1.readUnsignedShort(); - var1.importIndex(); - - int var9; - for (var6 = 0; var6 < 4; ++var6) { - for (var7 = 0; var7 < 13; ++var7) { - for (var8 = 0; var8 < 13; ++var8) { - var9 = var1.readBits(1); - if (var9 == 1) { - Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); - } else { - Client.instanceChunkTemplates[var6][var7][var8] = -1; - } - } - } - } - - var1.exportIndex(); - Canvas.xteaKeys = new int[var5][4]; - - for (var6 = 0; var6 < var5; ++var6) { - for (var7 = 0; var7 < 4; ++var7) { - Canvas.xteaKeys[var6][var7] = var1.readInt(); - } - } - - WorldMapSection2.regions = new int[var5]; - SecureRandomFuture.regionMapArchiveIds = new int[var5]; - class222.regionLandArchiveIds = new int[var5]; - Projectile.regionLandArchives = new byte[var5][]; - GrandExchangeOfferOwnWorldComparator.regionMapArchives = new byte[var5][]; - var5 = 0; - - for (var6 = 0; var6 < 4; ++var6) { - for (var7 = 0; var7 < 13; ++var7) { - for (var8 = 0; var8 < 13; ++var8) { - var9 = Client.instanceChunkTemplates[var6][var7][var8]; - if (var9 != -1) { - int var10 = var9 >> 14 & 1023; - int var11 = var9 >> 3 & 2047; - int var12 = (var10 / 8 << 8) + var11 / 8; - - int var13; - for (var13 = 0; var13 < var5; ++var13) { - if (WorldMapSection2.regions[var13] == var12) { - var12 = -1; - break; - } - } - - if (var12 != -1) { - WorldMapSection2.regions[var5] = var12; - var13 = var12 >> 8 & 255; - int var14 = var12 & 255; - SecureRandomFuture.regionMapArchiveIds[var5] = AbstractWorldMapData.archive5.getGroupId("m" + var13 + "_" + var14); - class222.regionLandArchiveIds[var5] = AbstractWorldMapData.archive5.getGroupId("l" + var13 + "_" + var14); - ++var5; - } - } - } - } - } - - UserComparator8.method3327(var4, var3, !var15); - } - + return class51.method896(); } } diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java index 080fd4b34f..6e76ae5cb8 100644 --- a/runescape-client/src/main/java/SecureRandomFuture.java +++ b/runescape-client/src/main/java/SecureRandomFuture.java @@ -1,3 +1,4 @@ +import java.lang.management.GarbageCollectorMXBean; import java.security.SecureRandom; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -6,17 +7,18 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("cn") +@ObfuscatedName("cm") @Implements("SecureRandomFuture") public class SecureRandomFuture { - @ObfuscatedName("gj") - @Export("regionMapArchiveIds") - static int[] regionMapArchiveIds; - @ObfuscatedName("f") + @ObfuscatedName("an") + @Export("garbageCollector") + static GarbageCollectorMXBean garbageCollector; + @ObfuscatedName("c") @Export("executor") ExecutorService executor; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("future") Future future; @@ -25,10 +27,10 @@ public class SecureRandomFuture { this.future = this.executor.submit(new SecureRandomCallable()); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-2111243469" + garbageValue = "-884286176" ) @Export("shutdown") void shutdown() { @@ -36,99 +38,182 @@ public class SecureRandomFuture { this.executor = null; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "5" + signature = "(I)Z", + garbageValue = "-1065937119" ) @Export("isDone") boolean isDone() { return this.future.isDone(); } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(B)Ljava/security/SecureRandom;", - garbageValue = "90" + signature = "(I)Ljava/security/SecureRandom;", + garbageValue = "519596197" ) @Export("get") SecureRandom get() { try { return (SecureRandom)this.future.get(); } catch (Exception var2) { - return GameShell.method1069(); + return class51.method896(); } } - @ObfuscatedName("i") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)Z", - garbageValue = "1990156878" + signature = "(B)[Lhu;", + garbageValue = "44" ) - @Export("isNumber") - public static boolean isNumber(CharSequence var0) { - boolean var2 = false; - boolean var3 = false; - int var4 = 0; - int var5 = var0.length(); - int var6 = 0; + @Export("PlayerType_values") + public static PlayerType[] PlayerType_values() { + return new PlayerType[]{PlayerType.PlayerType_normal, PlayerType.PlayerType_ultimateIronman, PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_ironman}; + } - boolean var1; - while (true) { - if (var6 >= var5) { - var1 = var3; - break; - } + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(ZZI)Lli;", + garbageValue = "-1201437930" + ) + static IndexedSprite method2171(boolean var0, boolean var1) { + return var0 ? (var1 ? VertexNormal.field1753 : DirectByteArrayCopier.options_buttons_2Sprite) : (var1 ? ItemContainer.field547 : WorldMapSprite.options_buttons_0Sprite); + } - label81: { - char var7 = var0.charAt(var6); - if (var6 == 0) { - if (var7 == '-') { - var2 = true; - break label81; + @ObfuscatedName("af") + @ObfuscatedSignature( + signature = "(ILce;ZI)I", + garbageValue = "1704416266" + ) + static int method2169(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CLIENTCLOCK) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.cycle; + return 1; + } else { + int var3; + int var4; + if (var0 == ScriptOpcodes.INV_GETOBJ) { + class320.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Varps.method4043(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INV_GETNUM) { + class320.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = UserComparator3.ItemContainer_getCount(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INV_TOTAL) { + class320.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = WorldMapSection2.method340(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INV_SIZE) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = SpotAnimationDefinition.getInvDefinition(var3).size; + return 1; + } else if (var0 == ScriptOpcodes.STAT) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; + return 1; + } else if (var0 == ScriptOpcodes.STAT_BASE) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.levels[var3]; + return 1; + } else if (var0 == ScriptOpcodes.STAT_XP) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.experience[var3]; + return 1; + } else { + int var5; + if (var0 == ScriptOpcodes.COORD) { + var3 = Clock.Client_plane; + var4 = Messages.baseX * 64 + (class192.localPlayer.x >> 7); + var5 = Language.baseY * 64 + (class192.localPlayer.y >> 7); + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); + return 1; + } else if (var0 == ScriptOpcodes.COORDX) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; + return 1; + } else if (var0 == ScriptOpcodes.COORDZ) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3 >> 28; + return 1; + } else if (var0 == ScriptOpcodes.COORDY) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3 & 16383; + return 1; + } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { + class320.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Varps.method4043(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { + class320.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = UserComparator3.ItemContainer_getCount(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { + class320.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = WorldMapSection2.method340(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { + if (Client.staffModLevel >= 2) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.staffModLevel; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; } - if (var7 == '+') { - break label81; + return 1; + } else if (var0 == ScriptOpcodes.REBOOTTIMER) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.rebootTimer; + return 1; + } else if (var0 == ScriptOpcodes.MAP_WORLD) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.worldId; + return 1; + } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.runEnergy; + return 1; + } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.weight; + return 1; + } else if (var0 == ScriptOpcodes.PLAYERMOD) { + if (Client.playerMod) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; } - } - int var9; - if (var7 >= '0' && var7 <= '9') { - var9 = var7 - '0'; - } else if (var7 >= 'A' && var7 <= 'Z') { - var9 = var7 - '7'; + return 1; + } else if (var0 == ScriptOpcodes.WORLDFLAGS) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.worldProperties; + return 1; + } else if (var0 == ScriptOpcodes.MOVECOORD) { + class320.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 2]; + int var6 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 3]; + var3 += var4 << 14; + var3 += var5 << 28; + var3 += var6; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3; + return 1; } else { - if (var7 < 'a' || var7 > 'z') { - var1 = false; - break; - } - - var9 = var7 - 'W'; + return 2; } - - if (var9 >= 10) { - var1 = false; - break; - } - - if (var2) { - var9 = -var9; - } - - int var8 = var4 * 10 + var9; - if (var4 != var8 / 10) { - var1 = false; - break; - } - - var4 = var8; - var3 = true; } - - ++var6; } - - return var1; } } diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index d9b7bb770f..992ef2f7cc 100644 --- a/runescape-client/src/main/java/SequenceDefinition.java +++ b/runescape-client/src/main/java/SequenceDefinition.java @@ -4,103 +4,98 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iv") +@ObfuscatedName("ip") @Implements("SequenceDefinition") public class SequenceDefinition extends DualNode { - @ObfuscatedName("qi") + @ObfuscatedName("no") @ObfuscatedGetter( - intValue = 364724224 + intValue = -1648433233 ) - static int field3477; - @ObfuscatedName("f") + @Export("widgetDragDuration") + static int widgetDragDuration; + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) @Export("SequenceDefinition_archive") - public static AbstractArchive SequenceDefinition_archive; - @ObfuscatedName("i") + static AbstractArchive SequenceDefinition_archive; + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lhz;" - ) - @Export("SequenceDefinition_animationsArchive") - public static AbstractArchive SequenceDefinition_animationsArchive; - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) @Export("SequenceDefinition_skeletonsArchive") - public static AbstractArchive SequenceDefinition_skeletonsArchive; - @ObfuscatedName("w") + static AbstractArchive SequenceDefinition_skeletonsArchive; + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("SequenceDefinition_cached") - static EvictingDualNodeHashTable SequenceDefinition_cached; - @ObfuscatedName("p") + public static EvictingDualNodeHashTable SequenceDefinition_cached; + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("SequenceDefinition_cachedFrames") - static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; - @ObfuscatedName("b") + public static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; + @ObfuscatedName("g") @Export("frameIds") public int[] frameIds; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("chatFrameIds") int[] chatFrameIds; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("frameLengths") public int[] frameLengths; - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("soundEffects") public int[] soundEffects; - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 626636947 + intValue = 767757023 ) @Export("frameCount") public int frameCount; - @ObfuscatedName("c") - int[] field3487; - @ObfuscatedName("o") - public boolean field3488; + @ObfuscatedName("p") + int[] field3517; + @ObfuscatedName("h") + public boolean field3518; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -796386043 + intValue = 180698695 ) - public int field3492; - @ObfuscatedName("k") + public int field3508; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -2083462623 + intValue = 1537834299 ) @Export("shield") public int shield; - @ObfuscatedName("s") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -520888257 + intValue = -698068841 ) @Export("weapon") public int weapon; - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -569309439 + intValue = -796705451 ) - public int field3496; - @ObfuscatedName("t") + public int field3522; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -877726895 + intValue = -2012869833 ) - public int field3478; - @ObfuscatedName("j") + public int field3523; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -134908293 + intValue = 1328326195 ) - public int field3493; - @ObfuscatedName("n") + public int field3524; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1454093345 + intValue = 738331183 ) - public int field3495; + public int field3516; static { SequenceDefinition_cached = new EvictingDualNodeHashTable(64); @@ -109,20 +104,20 @@ public class SequenceDefinition extends DualNode { SequenceDefinition() { this.frameCount = -1; - this.field3488 = false; - this.field3492 = 5; + this.field3518 = false; + this.field3508 = 5; this.shield = -1; this.weapon = -1; - this.field3496 = 99; - this.field3478 = -1; - this.field3493 = -1; - this.field3495 = 2; + this.field3522 = 99; + this.field3523 = -1; + this.field3524 = -1; + this.field3516 = 2; } - @ObfuscatedName("i") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkq;I)V", - garbageValue = "469124776" + signature = "(Lkp;B)V", + garbageValue = "-76" ) @Export("decode") void decode(Buffer var1) { @@ -136,10 +131,10 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("y") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Lkq;II)V", - garbageValue = "62604408" + signature = "(Lkp;II)V", + garbageValue = "-683003303" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -166,29 +161,29 @@ public class SequenceDefinition extends DualNode { this.frameCount = var1.readUnsignedShort(); } else if (var2 == 3) { var3 = var1.readUnsignedByte(); - this.field3487 = new int[var3 + 1]; + this.field3517 = new int[var3 + 1]; for (var4 = 0; var4 < var3; ++var4) { - this.field3487[var4] = var1.readUnsignedByte(); + this.field3517[var4] = var1.readUnsignedByte(); } - this.field3487[var3] = 9999999; + this.field3517[var3] = 9999999; } else if (var2 == 4) { - this.field3488 = true; + this.field3518 = true; } else if (var2 == 5) { - this.field3492 = var1.readUnsignedByte(); + this.field3508 = var1.readUnsignedByte(); } else if (var2 == 6) { this.shield = var1.readUnsignedShort(); } else if (var2 == 7) { this.weapon = var1.readUnsignedShort(); } else if (var2 == 8) { - this.field3496 = var1.readUnsignedByte(); + this.field3522 = var1.readUnsignedByte(); } else if (var2 == 9) { - this.field3478 = var1.readUnsignedByte(); + this.field3523 = var1.readUnsignedByte(); } else if (var2 == 10) { - this.field3493 = var1.readUnsignedByte(); + this.field3524 = var1.readUnsignedByte(); } else if (var2 == 11) { - this.field3495 = var1.readUnsignedByte(); + this.field3516 = var1.readUnsignedByte(); } else if (var2 == 12) { var3 = var1.readUnsignedByte(); this.chatFrameIds = new int[var3]; @@ -211,40 +206,40 @@ public class SequenceDefinition extends DualNode { } - @ObfuscatedName("w") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1097095520" + garbageValue = "145169378" ) @Export("postDecode") void postDecode() { - if (this.field3478 == -1) { - if (this.field3487 != null) { - this.field3478 = 2; + if (this.field3523 == -1) { + if (this.field3517 != null) { + this.field3523 = 2; } else { - this.field3478 = 0; + this.field3523 = 0; } } - if (this.field3493 == -1) { - if (this.field3487 != null) { - this.field3493 = 2; + if (this.field3524 == -1) { + if (this.field3517 != null) { + this.field3524 = 2; } else { - this.field3493 = 0; + this.field3524 = 0; } } } - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Ldw;II)Ldw;", - garbageValue = "903952456" + signature = "(Ldx;IB)Ldx;", + garbageValue = "4" ) @Export("transformActorModel") public Model transformActorModel(Model var1, int var2) { var2 = this.frameIds[var2]; - Frames var3 = class4.getFrames(var2 >> 16); + Frames var3 = EnumDefinition.getFrames(var2 >> 16); var2 &= 65535; if (var3 == null) { return var1.toSharedSequenceModel(true); @@ -255,15 +250,15 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Ldw;III)Ldw;", - garbageValue = "-118800541" + signature = "(Ldx;III)Ldx;", + garbageValue = "2024082639" ) @Export("transformObjectModel") Model transformObjectModel(Model var1, int var2, int var3) { var2 = this.frameIds[var2]; - Frames var4 = class4.getFrames(var2 >> 16); + Frames var4 = EnumDefinition.getFrames(var2 >> 16); var2 &= 65535; if (var4 == null) { return var1.toSharedSequenceModel(true); @@ -291,15 +286,15 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("e") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(Ldw;II)Ldw;", - garbageValue = "103025381" + signature = "(Ldx;II)Ldx;", + garbageValue = "-1856197357" ) @Export("transformSpotAnimationModel") Model transformSpotAnimationModel(Model var1, int var2) { var2 = this.frameIds[var2]; - Frames var3 = class4.getFrames(var2 >> 16); + Frames var3 = EnumDefinition.getFrames(var2 >> 16); var2 &= 65535; if (var3 == null) { return var1.toSharedSpotAnimationModel(true); @@ -310,21 +305,21 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("x") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Ldw;ILiv;IB)Ldw;", - garbageValue = "118" + signature = "(Ldx;ILip;IB)Ldx;", + garbageValue = "29" ) @Export("applyTransformations") public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, int var4) { var2 = this.frameIds[var2]; - Frames var5 = class4.getFrames(var2 >> 16); + Frames var5 = EnumDefinition.getFrames(var2 >> 16); var2 &= 65535; if (var5 == null) { return var3.transformActorModel(var1, var4); } else { var4 = var3.frameIds[var4]; - Frames var6 = class4.getFrames(var4 >> 16); + Frames var6 = EnumDefinition.getFrames(var4 >> 16); var4 &= 65535; Model var7; if (var6 == null) { @@ -333,21 +328,21 @@ public class SequenceDefinition extends DualNode { return var7; } else { var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); - var7.animate2(var5, var2, var6, var4, this.field3487); + var7.animate2(var5, var2, var6, var4, this.field3517); return var7; } } } - @ObfuscatedName("a") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ldw;IB)Ldw;", - garbageValue = "58" + signature = "(Ldx;II)Ldx;", + garbageValue = "221538890" ) @Export("transformWidgetModel") public Model transformWidgetModel(Model var1, int var2) { int var3 = this.frameIds[var2]; - Frames var4 = class4.getFrames(var3 >> 16); + Frames var4 = EnumDefinition.getFrames(var3 >> 16); var3 &= 65535; if (var4 == null) { return var1.toSharedSequenceModel(true); @@ -356,7 +351,7 @@ public class SequenceDefinition extends DualNode { int var6 = 0; if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { var6 = this.chatFrameIds[var2]; - var5 = class4.getFrames(var6 >> 16); + var5 = EnumDefinition.getFrames(var6 >> 16); var6 &= 65535; } @@ -373,42 +368,4 @@ public class SequenceDefinition extends DualNode { } } } - - @ObfuscatedName("hl") - @ObfuscatedSignature( - signature = "(Lbh;B)V", - garbageValue = "47" - ) - static final void method4821(PendingSpawn var0) { - long var1 = 0L; - int var3 = -1; - int var4 = 0; - int var5 = 0; - if (var0.type == 0) { - var1 = class14.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 1) { - var1 = class14.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 2) { - var1 = class14.scene.getGameObjectTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 3) { - var1 = class14.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); - } - - if (var1 != 0L) { - int var6 = class14.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); - var3 = class2.Entity_unpackID(var1); - var4 = var6 & 31; - var5 = var6 >> 6 & 3; - } - - var0.objectId = var3; - var0.field912 = var4; - var0.field911 = var5; - } } diff --git a/runescape-client/src/main/java/ServerBuild.java b/runescape-client/src/main/java/ServerBuild.java index 9b552dd300..d82920bade 100644 --- a/runescape-client/src/main/java/ServerBuild.java +++ b/runescape-client/src/main/java/ServerBuild.java @@ -4,47 +4,52 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hi") +@ObfuscatedName("hq") @Implements("ServerBuild") public class ServerBuild { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lhi;" + signature = "Lhq;" ) @Export("LIVE") - public static final ServerBuild LIVE; - @ObfuscatedName("i") + static final ServerBuild LIVE; + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lhi;" + signature = "Lhq;" ) @Export("BUILDLIVE") - public static final ServerBuild BUILDLIVE; - @ObfuscatedName("y") + static final ServerBuild BUILDLIVE; + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lhi;" + signature = "Lhq;" ) @Export("RC") - public static final ServerBuild RC; - @ObfuscatedName("w") + static final ServerBuild RC; + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lhi;" + signature = "Lhq;" ) @Export("WIP") - public static final ServerBuild WIP; - @ObfuscatedName("dv") - @ObfuscatedSignature( - signature = "Lif;" + static final ServerBuild WIP; + @ObfuscatedName("dc") + @ObfuscatedGetter( + longValue = 1863736648599346965L ) - @Export("archive10") - static Archive archive10; - @ObfuscatedName("p") + static long field3111; + @ObfuscatedName("gl") + @ObfuscatedSignature( + signature = "Lem;" + ) + @Export("scene") + static Scene scene; + @ObfuscatedName("i") @Export("name") public final String name; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 135493903 + intValue = 1460040921 ) - public final int field3081; + final int field3108; static { LIVE = new ServerBuild("LIVE", 0); @@ -55,19 +60,29 @@ public class ServerBuild { ServerBuild(String var1, int var2) { this.name = var1; - this.field3081 = var2; + this.field3108 = var2; } - @ObfuscatedName("f") - public static final void method4111(long var0) { - if (var0 > 0L) { - if (var0 % 10L == 0L) { - class188.method3604(var0 - 1L); - class188.method3604(1L); - } else { - class188.method3604(var0); + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(BI)C", + garbageValue = "798764142" + ) + public static char method4209(byte var0) { + int var1 = var0 & 255; + if (var1 == 0) { + throw new IllegalArgumentException("" + Integer.toString(var1, 16)); + } else { + if (var1 >= 128 && var1 < 160) { + char var2 = class288.cp1252AsciiExtension[var1 - 128]; + if (var2 == 0) { + var2 = '?'; + } + + var1 = var2; } + return (char)var1; } } } diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java index 974c752060..e2356246a0 100644 --- a/runescape-client/src/main/java/ServerPacket.java +++ b/runescape-client/src/main/java/ServerPacket.java @@ -3,541 +3,540 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("fw") +@ObfuscatedName("gb") @Implements("ServerPacket") public class ServerPacket { - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2120; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2087; - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2088; - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2144; - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2090; - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2091; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2142; - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2140; - @ObfuscatedName("a") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2094; - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2095; @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2096; - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2097; - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2098; - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2163; - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2159; - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2101; - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2149; - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2173; - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2104; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2105; - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2106; - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2138; - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2108; - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2109; - @ObfuscatedName("r") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2110; - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2162; - @ObfuscatedName("aa") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2112; - @ObfuscatedName("av") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2113; - @ObfuscatedName("aw") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2114; - @ObfuscatedName("as") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2089; - @ObfuscatedName("ak") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2116; - @ObfuscatedName("au") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2100; - @ObfuscatedName("ah") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2118; - @ObfuscatedName("aq") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2119; - @ObfuscatedName("ao") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2093; - @ObfuscatedName("an") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2121; - @ObfuscatedName("ar") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2122; - @ObfuscatedName("az") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2129; - @ObfuscatedName("ay") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2124; - @ObfuscatedName("ag") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2125; - @ObfuscatedName("ac") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2126; - @ObfuscatedName("al") - @ObfuscatedSignature( - signature = "Lfw;" + signature = "Lgb;" ) public static final ServerPacket field2127; - @ObfuscatedName("ae") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lfw;" + signature = "Lgb;" ) - public static final ServerPacket field2128; - @ObfuscatedName("ad") + public static final ServerPacket field2129; + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2164; - @ObfuscatedName("aj") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2130; - @ObfuscatedName("ax") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2153; - @ObfuscatedName("at") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2132; - @ObfuscatedName("af") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2111; - @ObfuscatedName("ap") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2134; - @ObfuscatedName("ai") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2135; - @ObfuscatedName("am") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2136; - @ObfuscatedName("ab") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2161; - @ObfuscatedName("bj") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2131; - @ObfuscatedName("bg") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2139; - @ObfuscatedName("bw") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2123; - @ObfuscatedName("bk") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2141; - @ObfuscatedName("bl") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2137; - @ObfuscatedName("bq") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2143; - @ObfuscatedName("bx") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2102; - @ObfuscatedName("bc") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2145; - @ObfuscatedName("by") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2146; - @ObfuscatedName("bz") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2147; - @ObfuscatedName("bm") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2148; - @ObfuscatedName("bo") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2169; - @ObfuscatedName("bs") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2170; - @ObfuscatedName("ba") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2151; - @ObfuscatedName("bn") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2152; - @ObfuscatedName("bb") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2133; - @ObfuscatedName("bh") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2154; - @ObfuscatedName("bv") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2155; - @ObfuscatedName("bu") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2156; - @ObfuscatedName("be") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2157; - @ObfuscatedName("bd") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2158; - @ObfuscatedName("bf") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2150; - @ObfuscatedName("bi") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2160; - @ObfuscatedName("br") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2099; - @ObfuscatedName("bt") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2086; - @ObfuscatedName("bp") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2117; - @ObfuscatedName("co") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2115; - @ObfuscatedName("cp") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2165; - @ObfuscatedName("cd") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2166; - @ObfuscatedName("cj") - @ObfuscatedSignature( - signature = "Lfw;" - ) - public static final ServerPacket field2167; - @ObfuscatedName("cq") - @ObfuscatedSignature( - signature = "Lfw;" + signature = "Lgb;" ) public static final ServerPacket field2168; - @ObfuscatedName("cb") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lfw;" + signature = "Lgb;" ) - public static final ServerPacket field2092; - @ObfuscatedName("cf") + public static final ServerPacket field2118; + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lfw;" + signature = "Lgb;" ) - public static final ServerPacket field2107; - @ObfuscatedName("cs") + public static final ServerPacket field2119; + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lfw;" + signature = "Lgb;" + ) + public static final ServerPacket field2120; + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2121; + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2122; + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2123; + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2124; + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2159; + @ObfuscatedName("h") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2126; + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2165; + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2145; + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2200; + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2169; + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2131; + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2132; + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2117; + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2134; + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2135; + @ObfuscatedName("b") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2136; + @ObfuscatedName("r") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2137; + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2138; + @ObfuscatedName("a") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2139; + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2140; + @ObfuscatedName("ae") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2141; + @ObfuscatedName("af") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2142; + @ObfuscatedName("az") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2181; + @ObfuscatedName("ax") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2151; + @ObfuscatedName("aj") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2173; + @ObfuscatedName("au") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2146; + @ObfuscatedName("ay") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2178; + @ObfuscatedName("aa") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2183; + @ObfuscatedName("aq") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2172; + @ObfuscatedName("as") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2150; + @ObfuscatedName("ak") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2148; + @ObfuscatedName("ac") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2152; + @ObfuscatedName("aw") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2153; + @ObfuscatedName("ar") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2125; + @ObfuscatedName("av") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2143; + @ObfuscatedName("al") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2116; + @ObfuscatedName("ad") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2157; + @ObfuscatedName("am") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2144; + @ObfuscatedName("ao") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2115; + @ObfuscatedName("at") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2160; + @ObfuscatedName("an") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2161; + @ObfuscatedName("ag") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2149; + @ObfuscatedName("ai") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2163; + @ObfuscatedName("ab") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2164; + @ObfuscatedName("ap") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2133; + @ObfuscatedName("ah") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2166; + @ObfuscatedName("bq") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2128; + @ObfuscatedName("bf") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2156; + @ObfuscatedName("bc") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2162; + @ObfuscatedName("bk") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2155; + @ObfuscatedName("bb") + @ObfuscatedSignature( + signature = "Lgb;" ) public static final ServerPacket field2171; - @ObfuscatedName("ch") + @ObfuscatedName("bi") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2193; + @ObfuscatedName("bp") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2167; + @ObfuscatedName("bl") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2174; + @ObfuscatedName("by") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2175; + @ObfuscatedName("be") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2176; + @ObfuscatedName("bw") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2177; + @ObfuscatedName("bt") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2154; + @ObfuscatedName("bn") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2179; + @ObfuscatedName("bm") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2180; + @ObfuscatedName("ba") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2158; + @ObfuscatedName("bd") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2182; + @ObfuscatedName("bs") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2130; + @ObfuscatedName("bx") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2184; + @ObfuscatedName("bh") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2187; + @ObfuscatedName("bg") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2186; + @ObfuscatedName("bz") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2147; + @ObfuscatedName("bj") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2188; + @ObfuscatedName("bu") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2189; + @ObfuscatedName("bv") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2190; + @ObfuscatedName("bo") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2191; + @ObfuscatedName("br") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2192; + @ObfuscatedName("cp") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2170; + @ObfuscatedName("cg") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2194; + @ObfuscatedName("cr") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2195; + @ObfuscatedName("co") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2196; + @ObfuscatedName("ck") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2197; + @ObfuscatedName("cn") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2198; + @ObfuscatedName("cd") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2199; + @ObfuscatedName("ct") + @ObfuscatedSignature( + signature = "Lgb;" + ) + public static final ServerPacket field2185; + @ObfuscatedName("cb") @ObfuscatedGetter( - intValue = 843552149 + intValue = -253091969 ) @Export("id") public final int id; - @ObfuscatedName("ca") + @ObfuscatedName("cf") @ObfuscatedGetter( - intValue = 1893776563 + intValue = -2142753579 ) @Export("length") public final int length; static { - field2120 = new ServerPacket(0, -2); - field2087 = new ServerPacket(1, -2); - field2088 = new ServerPacket(2, 1); - field2144 = new ServerPacket(3, 1); - field2090 = new ServerPacket(4, 2); - field2091 = new ServerPacket(5, 4); - field2142 = new ServerPacket(6, 5); - field2140 = new ServerPacket(7, 0); - field2094 = new ServerPacket(8, 2); - field2095 = new ServerPacket(9, 15); - field2096 = new ServerPacket(10, -2); - field2097 = new ServerPacket(11, 2); - field2098 = new ServerPacket(12, 2); - field2163 = new ServerPacket(13, 6); - field2159 = new ServerPacket(14, -2); - field2101 = new ServerPacket(15, 4); - field2149 = new ServerPacket(16, -2); - field2173 = new ServerPacket(17, 1); - field2104 = new ServerPacket(18, 8); - field2105 = new ServerPacket(19, -2); - field2106 = new ServerPacket(20, -2); - field2138 = new ServerPacket(21, 0); - field2108 = new ServerPacket(22, 3); - field2109 = new ServerPacket(23, 5); - field2110 = new ServerPacket(24, 0); - field2162 = new ServerPacket(25, -2); - field2112 = new ServerPacket(26, 4); - field2113 = new ServerPacket(27, 1); - field2114 = new ServerPacket(28, 0); - field2089 = new ServerPacket(29, 6); - field2116 = new ServerPacket(30, -2); - field2100 = new ServerPacket(31, 6); - field2118 = new ServerPacket(32, 0); - field2119 = new ServerPacket(33, 10); - field2093 = new ServerPacket(34, 20); - field2121 = new ServerPacket(35, 6); - field2122 = new ServerPacket(36, 6); - field2129 = new ServerPacket(37, -1); - field2124 = new ServerPacket(38, 8); - field2125 = new ServerPacket(39, 4); - field2126 = new ServerPacket(40, 7); - field2127 = new ServerPacket(41, 1); - field2128 = new ServerPacket(42, 8); - field2164 = new ServerPacket(43, 14); - field2130 = new ServerPacket(44, 10); - field2153 = new ServerPacket(45, -2); - field2132 = new ServerPacket(46, 2); - field2111 = new ServerPacket(47, -2); - field2134 = new ServerPacket(48, 5); - field2135 = new ServerPacket(49, 3); - field2136 = new ServerPacket(50, -2); - field2161 = new ServerPacket(51, -2); - field2131 = new ServerPacket(52, -1); - field2139 = new ServerPacket(53, -2); - field2123 = new ServerPacket(54, 7); - field2141 = new ServerPacket(55, 4); - field2137 = new ServerPacket(56, 2); - field2143 = new ServerPacket(57, 4); - field2102 = new ServerPacket(58, 6); - field2145 = new ServerPacket(59, -2); - field2146 = new ServerPacket(60, 2); - field2147 = new ServerPacket(61, 0); - field2148 = new ServerPacket(62, 5); - field2169 = new ServerPacket(63, -1); - field2170 = new ServerPacket(64, 12); - field2151 = new ServerPacket(65, 28); - field2152 = new ServerPacket(66, 6); - field2133 = new ServerPacket(67, 8); - field2154 = new ServerPacket(68, 6); - field2155 = new ServerPacket(69, -2); - field2156 = new ServerPacket(70, 5); - field2157 = new ServerPacket(71, 4); - field2158 = new ServerPacket(72, 0); - field2150 = new ServerPacket(73, -2); - field2160 = new ServerPacket(74, 6); - field2099 = new ServerPacket(75, -1); - field2086 = new ServerPacket(76, 6); - field2117 = new ServerPacket(77, 6); - field2115 = new ServerPacket(78, 2); - field2165 = new ServerPacket(79, -2); - field2166 = new ServerPacket(80, 1); - field2167 = new ServerPacket(81, -1); - field2168 = new ServerPacket(82, -2); - field2092 = new ServerPacket(83, -1); - field2107 = new ServerPacket(84, 2); - field2171 = new ServerPacket(85, 2); + field2127 = new ServerPacket(0, 6); + field2129 = new ServerPacket(1, 2); + field2168 = new ServerPacket(2, 1); + field2118 = new ServerPacket(3, 0); + field2119 = new ServerPacket(4, 2); + field2120 = new ServerPacket(5, 2); + field2121 = new ServerPacket(6, 12); + field2122 = new ServerPacket(7, -1); + field2123 = new ServerPacket(8, 6); + field2124 = new ServerPacket(9, -2); + field2159 = new ServerPacket(10, 4); + field2126 = new ServerPacket(11, -2); + field2165 = new ServerPacket(12, 10); + field2145 = new ServerPacket(13, 2); + field2200 = new ServerPacket(14, -2); + field2169 = new ServerPacket(15, -2); + field2131 = new ServerPacket(16, -2); + field2132 = new ServerPacket(17, -2); + field2117 = new ServerPacket(18, -1); + field2134 = new ServerPacket(19, 1); + field2135 = new ServerPacket(20, -1); + field2136 = new ServerPacket(21, 28); + field2137 = new ServerPacket(22, 0); + field2138 = new ServerPacket(23, 2); + field2139 = new ServerPacket(24, -1); + field2140 = new ServerPacket(25, -2); + field2141 = new ServerPacket(26, 8); + field2142 = new ServerPacket(27, -1); + field2181 = new ServerPacket(28, 0); + field2151 = new ServerPacket(29, -2); + field2173 = new ServerPacket(30, 5); + field2146 = new ServerPacket(31, -2); + field2178 = new ServerPacket(32, 2); + field2183 = new ServerPacket(33, 2); + field2172 = new ServerPacket(34, 3); + field2150 = new ServerPacket(35, -2); + field2148 = new ServerPacket(36, -2); + field2152 = new ServerPacket(37, 1); + field2153 = new ServerPacket(38, 3); + field2125 = new ServerPacket(39, 6); + field2143 = new ServerPacket(40, 7); + field2116 = new ServerPacket(41, -2); + field2157 = new ServerPacket(42, -2); + field2144 = new ServerPacket(43, 5); + field2115 = new ServerPacket(44, -2); + field2160 = new ServerPacket(45, 1); + field2161 = new ServerPacket(46, 4); + field2149 = new ServerPacket(47, -2); + field2163 = new ServerPacket(48, 1); + field2164 = new ServerPacket(49, 15); + field2133 = new ServerPacket(50, 8); + field2166 = new ServerPacket(51, 4); + field2128 = new ServerPacket(52, 6); + field2156 = new ServerPacket(53, 8); + field2162 = new ServerPacket(54, 4); + field2155 = new ServerPacket(55, -1); + field2171 = new ServerPacket(56, 4); + field2193 = new ServerPacket(57, 0); + field2167 = new ServerPacket(58, -2); + field2174 = new ServerPacket(59, 8); + field2175 = new ServerPacket(60, 4); + field2176 = new ServerPacket(61, 2); + field2177 = new ServerPacket(62, -2); + field2154 = new ServerPacket(63, 6); + field2179 = new ServerPacket(64, 6); + field2180 = new ServerPacket(65, 20); + field2158 = new ServerPacket(66, 6); + field2182 = new ServerPacket(67, -2); + field2130 = new ServerPacket(68, 6); + field2184 = new ServerPacket(69, 6); + field2187 = new ServerPacket(70, 14); + field2186 = new ServerPacket(71, 2); + field2147 = new ServerPacket(72, 7); + field2188 = new ServerPacket(73, 4); + field2189 = new ServerPacket(74, 2); + field2190 = new ServerPacket(75, 1); + field2191 = new ServerPacket(76, 6); + field2192 = new ServerPacket(77, 0); + field2170 = new ServerPacket(78, 0); + field2194 = new ServerPacket(79, 10); + field2195 = new ServerPacket(80, 5); + field2196 = new ServerPacket(81, 0); + field2197 = new ServerPacket(82, 5); + field2198 = new ServerPacket(83, 5); + field2199 = new ServerPacket(84, 6); + field2185 = new ServerPacket(85, -2); } ServerPacket(int var1, int var2) { @@ -545,95 +544,280 @@ public class ServerPacket { this.length = var2; } - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(ILcu;ZI)I", - garbageValue = "-939668271" + signature = "(Ljava/lang/CharSequence;I)[B", + garbageValue = "-64964867" ) - static int method3568(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? UserComparator7.field1946 : class197.field2398; - if (var0 == ScriptOpcodes.CC_GETSCROLLX) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.scrollX; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.scrollY; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETTEXT) { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3.text; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.scrollWidth; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.scrollHeight; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.modelZoom; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.modelAngleX; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.modelAngleZ; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.modelAngleY; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETTRANSTOP) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.transparencyTop; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETTRANSBOT) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.transparencyBot; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.color; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.color2; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETFILLMODE) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); - return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; - return 1; + public static byte[] method3680(CharSequence var0) { + int var1 = var0.length(); + byte[] var2 = new byte[var1]; + + for (int var3 = 0; var3 < var1; ++var3) { + char var4 = var0.charAt(var3); + if ((var4 <= 0 || var4 >= 128) && (var4 < 160 || var4 > 255)) { + if (var4 == 8364) { + var2[var3] = -128; + } else if (var4 == 8218) { + var2[var3] = -126; + } else if (var4 == 402) { + var2[var3] = -125; + } else if (var4 == 8222) { + var2[var3] = -124; + } else if (var4 == 8230) { + var2[var3] = -123; + } else if (var4 == 8224) { + var2[var3] = -122; + } else if (var4 == 8225) { + var2[var3] = -121; + } else if (var4 == 710) { + var2[var3] = -120; + } else if (var4 == 8240) { + var2[var3] = -119; + } else if (var4 == 352) { + var2[var3] = -118; + } else if (var4 == 8249) { + var2[var3] = -117; + } else if (var4 == 338) { + var2[var3] = -116; + } else if (var4 == 381) { + var2[var3] = -114; + } else if (var4 == 8216) { + var2[var3] = -111; + } else if (var4 == 8217) { + var2[var3] = -110; + } else if (var4 == 8220) { + var2[var3] = -109; + } else if (var4 == 8221) { + var2[var3] = -108; + } else if (var4 == 8226) { + var2[var3] = -107; + } else if (var4 == 8211) { + var2[var3] = -106; + } else if (var4 == 8212) { + var2[var3] = -105; + } else if (var4 == 732) { + var2[var3] = -104; + } else if (var4 == 8482) { + var2[var3] = -103; + } else if (var4 == 353) { + var2[var3] = -102; + } else if (var4 == 8250) { + var2[var3] = -101; + } else if (var4 == 339) { + var2[var3] = -100; + } else if (var4 == 382) { + var2[var3] = -98; + } else if (var4 == 376) { + var2[var3] = -97; + } else { + var2[var3] = 63; + } + } else { + var2[var3] = (byte)var4; + } + } + + return var2; + } + + @ObfuscatedName("io") + @ObfuscatedSignature( + signature = "(IIIIIIIII)V", + garbageValue = "-1920568939" + ) + @Export("drawWidgets") + static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + if (ScriptFrame.loadInterface(var0)) { + Entity.field1866 = null; + FloorOverlayDefinition.drawInterface(WorldMapLabel.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); + if (Entity.field1866 != null) { + FloorOverlayDefinition.drawInterface(Entity.field1866, -1412584499, var1, var2, var3, var4, WorldMapIcon_0.field142, UserComparator9.field1965, var7); + Entity.field1866 = null; + } + } else { - return 2; + if (var7 != -1) { + Client.field851[var7] = true; + } else { + for (int var8 = 0; var8 < 100; ++var8) { + Client.field851[var8] = true; + } + } + } } - @ObfuscatedName("n") + @ObfuscatedName("ju") @ObfuscatedSignature( - signature = "(ILcu;ZI)I", - garbageValue = "631365230" + signature = "(IB)V", + garbageValue = "104" ) - static int method3569(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? UserComparator7.field1946 : class197.field2398; - if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = class14.method157(WorldMapSection0.getWidgetClickMask(var3)); - return 1; - } else if (var0 != ScriptOpcodes.CC_GETOP) { - if (var0 == ScriptOpcodes.CC_GETOPBASE) { - if (var3.dataText == null) { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3.dataText; + @Export("changeGameOptions") + static final void changeGameOptions(int var0) { + BufferedSource.method5934(); + class188.method3708(); + int var1 = Messages.VarpDefinition_get(var0).type; + if (var1 != 0) { + int var2 = Varps.Varps_main[var0]; + if (var1 == 1) { + if (var2 == 1) { + Rasterizer3D.Rasterizer3D_setBrightness(0.9D); + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.9D); } - return 1; - } else { - return 2; - } - } else { - int var4 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - --var4; - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3.actions[var4]; - } else { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; + if (var2 == 2) { + Rasterizer3D.Rasterizer3D_setBrightness(0.8D); + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.8D); + } + + if (var2 == 3) { + Rasterizer3D.Rasterizer3D_setBrightness(0.7D); + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.7D); + } + + if (var2 == 4) { + Rasterizer3D.Rasterizer3D_setBrightness(0.6D); + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.6D); + } + + ItemDefinition.ItemDefinition_cachedSprites.clear(); + } + + if (var1 == 3) { + short var3 = 0; + if (var2 == 0) { + var3 = 255; + } + + if (var2 == 1) { + var3 = 192; + } + + if (var2 == 2) { + var3 = 128; + } + + if (var2 == 3) { + var3 = 64; + } + + if (var2 == 4) { + var3 = 0; + } + + if (var3 != Client.musicVolume) { + if (Client.musicVolume == 0 && Client.currentTrackGroupId != -1) { + Archive var4 = MouseHandler.archive6; + int var5 = Client.currentTrackGroupId; + class197.field2414 = 1; + UserComparator5.musicTrackArchive = var4; + class197.musicTrackGroupId = var5; + class83.musicTrackFileId = 0; + AttackOption.musicTrackVolume = var3; + KeyHandler.musicTrackBoolean = false; + class197.field2412 = 10000; + Client.field881 = false; + } else if (var3 == 0) { + class197.midiPcmStream.clear(); + class197.field2414 = 1; + UserComparator5.musicTrackArchive = null; + Client.field881 = false; + } else if (class197.field2414 != 0) { + AttackOption.musicTrackVolume = var3; + } else { + class197.midiPcmStream.setPcmStreamVolume(var3); + } + + Client.musicVolume = var3; + } + } + + if (var1 == 4) { + if (var2 == 0) { + Client.soundEffectVolume = 127; + } + + if (var2 == 1) { + Client.soundEffectVolume = 96; + } + + if (var2 == 2) { + Client.soundEffectVolume = 64; + } + + if (var2 == 3) { + Client.soundEffectVolume = 32; + } + + if (var2 == 4) { + Client.soundEffectVolume = 0; + } + } + + if (var1 == 5) { + Client.leftClickOpensMenu = var2; + } + + if (var1 == 6) { + Client.chatEffects = var2; + } + + if (var1 == 9) { + Client.field811 = var2; + } + + if (var1 == 10) { + if (var2 == 0) { + Client.areaSoundEffectVolume = 127; + } + + if (var2 == 1) { + Client.areaSoundEffectVolume = 96; + } + + if (var2 == 2) { + Client.areaSoundEffectVolume = 64; + } + + if (var2 == 3) { + Client.areaSoundEffectVolume = 32; + } + + if (var2 == 4) { + Client.areaSoundEffectVolume = 0; + } + } + + if (var1 == 17) { + Client.followerIndex = var2 & 65535; + } + + AttackOption[] var6; + if (var1 == 18) { + var6 = new AttackOption[]{AttackOption.AttackOption_hidden, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_leftClickWhereAvailable}; + Client.playerAttackOption = (AttackOption)WorldMapSection0.findEnumerated(var6, var2); + if (Client.playerAttackOption == null) { + Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + if (var1 == 19) { + if (var2 == -1) { + Client.combatTargetPlayerIndex = -1; + } else { + Client.combatTargetPlayerIndex = var2 & 2047; + } + } + + if (var1 == 22) { + var6 = new AttackOption[]{AttackOption.AttackOption_hidden, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_leftClickWhereAvailable}; + Client.npcAttackOption = (AttackOption)WorldMapSection0.findEnumerated(var6, var2); + if (Client.npcAttackOption == null) { + Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } } - return 1; } } } diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java index a7f73e3032..e6e2e72bd4 100644 --- a/runescape-client/src/main/java/Skeleton.java +++ b/runescape-client/src/main/java/Skeleton.java @@ -1,28 +1,40 @@ +import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ek") +@ObfuscatedName("ec") @Implements("Skeleton") public class Skeleton extends Node { - @ObfuscatedName("f") + @ObfuscatedName("hx") @ObfuscatedGetter( - intValue = 802738175 + intValue = 1721561941 + ) + @Export("oculusOrbFocalPointY") + static int oculusOrbFocalPointY; + @ObfuscatedName("jv") + @ObfuscatedSignature( + signature = "Lhn;" + ) + static Widget field1793; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -1632248683 ) @Export("id") int id; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1993583785 + intValue = 705396631 ) @Export("count") int count; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("transformTypes") int[] transformTypes; - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("labels") int[][] labels; @@ -50,23 +62,28 @@ public class Skeleton extends Node { } - @ObfuscatedName("aq") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1307556055" + garbageValue = "483242164" ) - protected static final void method3088() { - Varps.clock.mark(); + public static void method3152() { + FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); + } - int var0; - for (var0 = 0; var0 < 32; ++var0) { - GameShell.graphicsTickTimes[var0] = 0L; + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "(B)Ljava/lang/String;", + garbageValue = "91" + ) + static String method3153() { + String var0 = ""; + + Message var2; + for (Iterator var1 = Messages.Messages_hashTable.iterator(); var1.hasNext(); var0 = var0 + var2.sender + ':' + var2.text + '\n') { + var2 = (Message)var1.next(); } - for (var0 = 0; var0 < 32; ++var0) { - GameShell.clientTickTimes[var0] = 0L; - } - - GameShell.gameCyclesToDo = 0; + return var0; } } diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java index 0348c2e3de..069e7b0263 100644 --- a/runescape-client/src/main/java/Skills.java +++ b/runescape-client/src/main/java/Skills.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hv") +@ObfuscatedName("hm") @Implements("Skills") public class Skills { - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("Skills_enabled") public static final boolean[] Skills_enabled; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("Skills_experienceTable") public static int[] Skills_experienceTable; @@ -27,89 +27,52 @@ public class Skills { } - @ObfuscatedName("ao") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "([BI)[B", - garbageValue = "1842420439" + signature = "(CB)Z", + garbageValue = "88" ) - @Export("decompressBytes") - static final byte[] decompressBytes(byte[] var0) { - Buffer var1 = new Buffer(var0); - int var2 = var1.readUnsignedByte(); - int var3 = var1.readInt(); - if (var3 < 0 || AbstractArchive.field3118 != 0 && var3 > AbstractArchive.field3118) { - throw new RuntimeException(); - } else if (var2 == 0) { - byte[] var4 = new byte[var3]; - var1.readBytes(var4, 0, var3); - return var4; + @Export("isCharPrintable") + public static boolean isCharPrintable(char var0) { + if (var0 >= ' ' && var0 <= '~') { + return true; + } else if (var0 >= 160 && var0 <= 255) { + return true; } else { - int var6 = var1.readInt(); - if (var6 >= 0 && (AbstractArchive.field3118 == 0 || var6 <= AbstractArchive.field3118)) { - byte[] var5 = new byte[var6]; - if (var2 == 1) { - BZip2Decompressor.BZip2Decompressor_decompress(var5, var6, var0, var3, 9); - } else { - AbstractArchive.gzipDecompressor.decompress(var1, var5); - } - - return var5; - } else { - throw new RuntimeException(); - } + return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; } } - @ObfuscatedName("hp") + @ObfuscatedName("hw") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "381562265" + signature = "(IIIIIIIIII)V", + garbageValue = "730200228" ) - @Export("updateItemPile") - static final void updateItemPile(int var0, int var1) { - NodeDeque var2 = Client.groundItems[UrlRequest.Client_plane][var0][var1]; - if (var2 == null) { - class14.scene.removeGroundItemPile(UrlRequest.Client_plane, var0, var1); - } else { - long var3 = -99999999L; - TileItem var5 = null; + @Export("updatePendingSpawn") + static final void updatePendingSpawn(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + PendingSpawn var9 = null; - TileItem var6; - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { - ItemDefinition var7 = PacketBufferNode.ItemDefinition_get(var6.id); - long var8 = (long)var7.price; - if (var7.isStackable == 1) { - var8 *= (long)(var6.quantity + 1); - } - - if (var8 > var3) { - var3 = var8; - var5 = var6; - } - } - - if (var5 == null) { - class14.scene.removeGroundItemPile(UrlRequest.Client_plane, var0, var1); - } else { - var2.addLast(var5); - TileItem var12 = null; - TileItem var11 = null; - - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { - if (var5.id != var6.id) { - if (var12 == null) { - var12 = var6; - } - - if (var12.id != var6.id && var11 == null) { - var11 = var6; - } - } - } - - long var9 = KeyHandler.calculateTag(var0, var1, 3, false, 0); - class14.scene.newGroundItemPile(UrlRequest.Client_plane, var0, var1, ScriptEvent.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, UrlRequest.Client_plane), var5, var9, var12, var11); + for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { + var9 = var10; + break; } } + + if (var9 == null) { + var9 = new PendingSpawn(); + var9.plane = var0; + var9.type = var3; + var9.x = var1; + var9.y = var2; + WorldMapDecoration.method347(var9); + Client.pendingSpawns.addFirst(var9); + } + + var9.id = var4; + var9.field933 = var5; + var9.orientation = var6; + var9.delay = var7; + var9.hitpoints = var8; } } diff --git a/runescape-client/src/main/java/SoftWrapper.java b/runescape-client/src/main/java/SoftWrapper.java index c01cc3526a..4c7896d292 100644 --- a/runescape-client/src/main/java/SoftWrapper.java +++ b/runescape-client/src/main/java/SoftWrapper.java @@ -3,10 +3,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("fk") +@ObfuscatedName("ej") @Implements("SoftWrapper") public class SoftWrapper extends Wrapper { - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("ref") SoftReference ref; @@ -15,13 +15,13 @@ public class SoftWrapper extends Wrapper { this.ref = new SoftReference(var1); } - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("get") Object get() { return this.ref.get(); } - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("isSoft") boolean isSoft() { return true; diff --git a/runescape-client/src/main/java/SoundCache.java b/runescape-client/src/main/java/SoundCache.java index 3914bdbb15..379db3ef19 100644 --- a/runescape-client/src/main/java/SoundCache.java +++ b/runescape-client/src/main/java/SoundCache.java @@ -3,39 +3,36 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dx") +@ObfuscatedName("dv") @Implements("SoundCache") public class SoundCache { - @ObfuscatedName("b") - @Export("PcmPlayer_stereo") - public static boolean PcmPlayer_stereo; - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) @Export("soundEffectIndex") AbstractArchive soundEffectIndex; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) @Export("musicSampleIndex") AbstractArchive musicSampleIndex; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lle;" + signature = "Lln;" ) @Export("musicSamples") NodeHashTable musicSamples; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lle;" + signature = "Lln;" ) @Export("rawSounds") NodeHashTable rawSounds; @ObfuscatedSignature( - signature = "(Lhz;Lhz;)V" + signature = "(Lii;Lii;)V" ) public SoundCache(AbstractArchive var1, AbstractArchive var2) { this.musicSamples = new NodeHashTable(256); @@ -44,10 +41,10 @@ public class SoundCache { this.musicSampleIndex = var2; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(II[II)Lcc;", - garbageValue = "61086280" + signature = "(II[II)Lcv;", + garbageValue = "-2049722880" ) @Export("getSoundEffect0") RawSound getSoundEffect0(int var1, int var2, int[] var3) { @@ -75,10 +72,10 @@ public class SoundCache { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(II[II)Lcc;", - garbageValue = "-1521507818" + signature = "(II[II)Lcv;", + garbageValue = "-207683218" ) @Export("getMusicSample0") RawSound getMusicSample0(int var1, int var2, int[] var3) { @@ -112,10 +109,10 @@ public class SoundCache { } } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I[IB)Lcc;", - garbageValue = "0" + signature = "(I[II)Lcv;", + garbageValue = "-1171903623" ) @Export("getSoundEffect") public RawSound getSoundEffect(int var1, int[] var2) { @@ -128,10 +125,10 @@ public class SoundCache { } } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(I[IB)Lcc;", - garbageValue = "1" + signature = "(I[II)Lcv;", + garbageValue = "872034645" ) @Export("getMusicSample") public RawSound getMusicSample(int var1, int[] var2) { @@ -143,79 +140,4 @@ public class SoundCache { throw new RuntimeException(); } } - - @ObfuscatedName("fz") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "102" - ) - static final void method2509() { - if (UrlRequest.Client_plane != Client.field853) { - Client.field853 = UrlRequest.Client_plane; - int var0 = UrlRequest.Client_plane; - int[] var1 = Language.sceneMinimapSprite.pixels; - int var2 = var1.length; - - int var3; - for (var3 = 0; var3 < var2; ++var3) { - var1[var3] = 0; - } - - int var4; - int var5; - for (var3 = 1; var3 < 103; ++var3) { - var4 = (103 - var3) * 2048 + 24628; - - for (var5 = 1; var5 < 103; ++var5) { - if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { - class14.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3); - } - - if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { - class14.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3); - } - - var4 += 4; - } - } - - var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); - var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; - Language.sceneMinimapSprite.setRaster(); - - int var6; - for (var5 = 1; var5 < 103; ++var5) { - for (var6 = 1; var6 < 103; ++var6) { - if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { - HorizontalAlignment.drawObject(var0, var6, var5, var3, var4); - } - - if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { - HorizontalAlignment.drawObject(var0 + 1, var6, var5, var3, var4); - } - } - } - - Client.mapIconCount = 0; - - for (var5 = 0; var5 < 104; ++var5) { - for (var6 = 0; var6 < 104; ++var6) { - long var7 = class14.scene.getFloorDecorationTag(UrlRequest.Client_plane, var5, var6); - if (var7 != 0L) { - int var9 = class2.Entity_unpackID(var7); - int var10 = Coord.getObjectDefinition(var9).mapIconId; - if (var10 >= 0) { - Client.mapIcons[Client.mapIconCount] = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var10).getSpriteBool(false); - Client.mapIconXs[Client.mapIconCount] = var5; - Client.mapIconYs[Client.mapIconCount] = var6; - ++Client.mapIconCount; - } - } - } - } - - IgnoreList.rasterProvider.apply(); - } - - } } diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java index f147c1ed90..1b3f2a1355 100644 --- a/runescape-client/src/main/java/SoundEffect.java +++ b/runescape-client/src/main/java/SoundEffect.java @@ -3,24 +3,24 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cl") +@ObfuscatedName("cs") @Implements("SoundEffect") public class SoundEffect { - @ObfuscatedName("i") + @ObfuscatedName("t") + @Export("start") + int start; + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "[Ldp;" + signature = "[Ldq;" ) @Export("instruments") Instrument[] instruments; - @ObfuscatedName("y") - @Export("start") - int start; - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("end") int end; @ObfuscatedSignature( - signature = "(Lkq;)V" + signature = "(Lkp;)V" ) SoundEffect(Buffer var1) { this.instruments = new Instrument[10]; @@ -38,9 +38,9 @@ public class SoundEffect { this.end = var1.readUnsignedShort(); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "()Lcc;" + signature = "()Lcv;" ) @Export("toRawSound") public RawSound toRawSound() { @@ -48,7 +48,7 @@ public class SoundEffect { return new RawSound(22050, var1, this.start * 22050 / 1000, this.end * 22050 / 1000); } - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("calculateDelay") public final int calculateDelay() { int var1 = 9999999; @@ -83,7 +83,7 @@ public class SoundEffect { } } - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("mix") final byte[] mix() { int var1 = 0; @@ -122,9 +122,9 @@ public class SoundEffect { } } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lhz;II)Lcl;" + signature = "(Lii;II)Lcs;" ) @Export("readSoundEffect") public static SoundEffect readSoundEffect(AbstractArchive var0, int var1, int var2) { diff --git a/runescape-client/src/main/java/SoundEnvelope.java b/runescape-client/src/main/java/SoundEnvelope.java index e8595410ae..1bafcb04aa 100644 --- a/runescape-client/src/main/java/SoundEnvelope.java +++ b/runescape-client/src/main/java/SoundEnvelope.java @@ -3,42 +3,42 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("do") +@ObfuscatedName("ds") @Implements("SoundEnvelope") public class SoundEnvelope { - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("segments") int segments; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("durations") int[] durations; - @ObfuscatedName("y") - @Export("max") - int max; - @ObfuscatedName("w") + @ObfuscatedName("o") @Export("phases") int[] phases; - @ObfuscatedName("p") + @ObfuscatedName("e") @Export("start") int start; - @ObfuscatedName("b") + @ObfuscatedName("i") @Export("end") int end; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("form") int form; - @ObfuscatedName("a") + @ObfuscatedName("d") @Export("ticks") int ticks; - @ObfuscatedName("d") + @ObfuscatedName("l") @Export("phaseIndex") int phaseIndex; - @ObfuscatedName("c") + @ObfuscatedName("j") @Export("step") int step; - @ObfuscatedName("o") + @ObfuscatedName("m") @Export("amplitude") int amplitude; + @ObfuscatedName("p") + @Export("max") + int max; SoundEnvelope() { this.segments = 2; @@ -50,9 +50,9 @@ public class SoundEnvelope { this.phases[1] = 65535; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lkq;)V" + signature = "(Lkp;)V" ) @Export("decode") final void decode(Buffer var1) { @@ -62,9 +62,9 @@ public class SoundEnvelope { this.decodeSegments(var1); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lkq;)V" + signature = "(Lkp;)V" ) @Export("decodeSegments") final void decodeSegments(Buffer var1) { @@ -79,7 +79,7 @@ public class SoundEnvelope { } - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("reset") final void reset() { this.ticks = 0; @@ -89,7 +89,7 @@ public class SoundEnvelope { this.max = 0; } - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("doStep") final int doStep(int var1) { if (this.max >= this.ticks) { diff --git a/runescape-client/src/main/java/SoundSystem.java b/runescape-client/src/main/java/SoundSystem.java index a242f01c5e..0cd653bdf4 100644 --- a/runescape-client/src/main/java/SoundSystem.java +++ b/runescape-client/src/main/java/SoundSystem.java @@ -3,21 +3,12 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dk") +@ObfuscatedName("dl") @Implements("SoundSystem") public class SoundSystem implements Runnable { - @ObfuscatedName("r") - @Export("BZip2Decompressor_block") - static int[] BZip2Decompressor_block; - @ObfuscatedName("dq") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lif;" - ) - @Export("archive12") - static Archive archive12; - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "[Lcw;" + signature = "[Ldw;" ) @Export("players") volatile PcmPlayer[] players; @@ -35,52 +26,76 @@ public class SoundSystem implements Runnable { } } } catch (Exception var4) { - DesktopPlatformInfoProvider.RunException_sendStackTrace((String)null, var4); + class225.RunException_sendStackTrace((String)null, var4); } } - @ObfuscatedName("kf") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lha;B)V", - garbageValue = "9" + signature = "(Lii;Lii;Lii;Lii;I)V", + garbageValue = "-1591363880" ) - static final void method2507(Widget var0) { - int var1 = var0.contentType; - if (var1 == 324) { - if (Client.field893 == -1) { - Client.field893 = var0.spriteId2; - Client.field894 = var0.spriteId; - } + public static void method2562(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) { + class197.Widget_archive = var0; + Calendar.Widget_modelsArchive = var1; + Username.Widget_spritesArchive = var2; + class162.Widget_fontsArchive = var3; + WorldMapLabel.Widget_interfaceComponents = new Widget[class197.Widget_archive.getGroupCount()][]; + class197.Widget_loadedInterfaces = new boolean[class197.Widget_archive.getGroupCount()]; + } - if (Client.playerAppearance.isFemale) { - var0.spriteId2 = Client.field893; + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "(I)Z", + garbageValue = "-660130030" + ) + @Export("isKeyDown") + public static final boolean isKeyDown() { + synchronized(KeyHandler.KeyHandler_instance) { + if (KeyHandler.field408 == KeyHandler.field406) { + return false; } else { - var0.spriteId2 = Client.field894; + RouteStrategy.field2102 = KeyHandler.field403[KeyHandler.field406]; + class51.field432 = KeyHandler.field410[KeyHandler.field406]; + KeyHandler.field406 = KeyHandler.field406 + 1 & 127; + return true; } - - } else if (var1 == 325) { - if (Client.field893 == -1) { - Client.field893 = var0.spriteId2; - Client.field894 = var0.spriteId; - } - - if (Client.playerAppearance.isFemale) { - var0.spriteId2 = Client.field894; - } else { - var0.spriteId2 = Client.field893; - } - - } else if (var1 == 327) { - var0.modelAngleX = 150; - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; - var0.modelType = 5; - var0.modelId = 0; - } else if (var1 == 328) { - var0.modelAngleX = 150; - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; - var0.modelType = 5; - var0.modelId = 1; } } + + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1995069725" + ) + static void method2563() { + Messages.Messages_channels.clear(); + Messages.Messages_hashTable.clear(); + Messages.Messages_queue.clear(); + Messages.Messages_count = 0; + } + + @ObfuscatedName("aq") + @ObfuscatedSignature( + signature = "(Lir;I)Z", + garbageValue = "-676934548" + ) + static boolean method2565(ObjectDefinition var0) { + if (var0.transforms != null) { + int[] var1 = var0.transforms; + + for (int var2 = 0; var2 < var1.length; ++var2) { + int var3 = var1[var2]; + ObjectDefinition var4 = Occluder.getObjectDefinition(var3); + if (var4.mapIconId != -1) { + return true; + } + } + } else if (var0.mapIconId != -1) { + return true; + } + + return false; + } } diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index 50bd26b18d..f1b78f8ada 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -4,96 +4,89 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("il") +@ObfuscatedName("iu") @Implements("SpotAnimationDefinition") public class SpotAnimationDefinition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) @Export("SpotAnimationDefinition_archive") - static AbstractArchive SpotAnimationDefinition_archive; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lhz;" + public static AbstractArchive SpotAnimationDefinition_archive; + @ObfuscatedName("t") + @ObfuscatedGetter( + longValue = 3022449387448969611L ) - @Export("SpotAnimationDefinition_modelArchive") - static AbstractArchive SpotAnimationDefinition_modelArchive; - @ObfuscatedName("y") + static long field3250; + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("SpotAnimationDefinition_cached") static EvictingDualNodeHashTable SpotAnimationDefinition_cached; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("SpotAnimationDefinition_cachedModels") static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; - @ObfuscatedName("bm") - @ObfuscatedSignature( - signature = "[Lli;" - ) - @Export("worldSelectStars") - static IndexedSprite[] worldSelectStars; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -759874899 + intValue = -156986683 ) @Export("id") int id; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1353140191 + intValue = 1502425333 ) @Export("archive") int archive; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -2008719419 + intValue = -1520405285 ) @Export("sequence") public int sequence; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("d") + @ObfuscatedName("m") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1607590033 + intValue = -1086459563 ) @Export("widthScale") int widthScale; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1512970325 + intValue = 499917181 ) @Export("heightScale") int heightScale; - @ObfuscatedName("k") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1290166203 + intValue = 137606467 ) @Export("orientation") int orientation; - @ObfuscatedName("s") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1081769017 + intValue = -1988422047 ) @Export("ambient") int ambient; - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1724072869 + intValue = 31690663 ) @Export("contrast") int contrast; @@ -112,10 +105,10 @@ public class SpotAnimationDefinition extends DualNode { this.contrast = 0; } - @ObfuscatedName("y") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lkq;I)V", - garbageValue = "-580385210" + signature = "(Lkp;B)V", + garbageValue = "-90" ) @Export("decode") void decode(Buffer var1) { @@ -129,10 +122,10 @@ public class SpotAnimationDefinition extends DualNode { } } - @ObfuscatedName("w") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkq;IB)V", - garbageValue = "1" + signature = "(Lkp;IB)V", + garbageValue = "0" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -176,16 +169,16 @@ public class SpotAnimationDefinition extends DualNode { } - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(II)Ldw;", - garbageValue = "-858962749" + signature = "(II)Ldx;", + garbageValue = "-1614989668" ) @Export("getModel") public final Model getModel(int var1) { Model var2 = (Model)SpotAnimationDefinition_cachedModels.get((long)this.id); if (var2 == null) { - ModelData var3 = ModelData.ModelData_get(SpotAnimationDefinition_modelArchive, this.archive, 0); + ModelData var3 = ModelData.ModelData_get(ArchiveDiskActionHandler.SpotAnimationDefinition_modelArchive, this.archive, 0); if (var3 == null) { return null; } @@ -209,7 +202,7 @@ public class SpotAnimationDefinition extends DualNode { Model var5; if (this.sequence != -1 && var1 != -1) { - var5 = WorldMapSection0.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); + var5 = GraphicsDefaults.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); } else { var5 = var2.toSharedSpotAnimationModel(true); } @@ -237,4 +230,26 @@ public class SpotAnimationDefinition extends DualNode { return var5; } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(II)Lid;", + garbageValue = "-1522050004" + ) + @Export("getInvDefinition") + public static InvDefinition getInvDefinition(int var0) { + InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); + var1 = new InvDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + InvDefinition.InvDefinition_cached.put(var1, (long)var0); + return var1; + } + } } diff --git a/runescape-client/src/main/java/Sprite.java b/runescape-client/src/main/java/Sprite.java index 77d35ef6a5..5e82bf8a06 100644 --- a/runescape-client/src/main/java/Sprite.java +++ b/runescape-client/src/main/java/Sprite.java @@ -3,28 +3,28 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ls") +@ObfuscatedName("lt") @Implements("Sprite") public final class Sprite extends Rasterizer2D { - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("pixels") public int[] pixels; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("subWidth") public int subWidth; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("subHeight") public int subHeight; - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("xOffset") public int xOffset; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("yOffset") int yOffset; - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("width") public int width; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("height") public int height; @@ -43,9 +43,9 @@ public final class Sprite extends Rasterizer2D { Sprite() { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "()Lls;" + signature = "()Llt;" ) @Export("mirrorHorizontally") public Sprite mirrorHorizontally() { @@ -64,9 +64,9 @@ public final class Sprite extends Rasterizer2D { return var1; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "()Lls;" + signature = "()Llt;" ) @Export("copyNormalized") public Sprite copyNormalized() { @@ -81,13 +81,13 @@ public final class Sprite extends Rasterizer2D { return var1; } - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("setRaster") public void setRaster() { Rasterizer2D.Rasterizer2D_replace(this.pixels, this.subWidth, this.subHeight); } - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("normalize") public void normalize() { if (this.subWidth != this.width || this.subHeight != this.height) { @@ -107,7 +107,7 @@ public final class Sprite extends Rasterizer2D { } } - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("pad") public void pad(int var1) { if (this.subWidth != this.width || this.subHeight != this.height) { @@ -149,7 +149,7 @@ public final class Sprite extends Rasterizer2D { } } - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("flipHorizontally") public void flipHorizontally() { int[] var1 = new int[this.subWidth * this.subHeight]; @@ -165,7 +165,7 @@ public final class Sprite extends Rasterizer2D { this.xOffset = this.width - this.subWidth - this.xOffset; } - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("flipVertically") public void flipVertically() { int[] var1 = new int[this.subWidth * this.subHeight]; @@ -181,7 +181,7 @@ public final class Sprite extends Rasterizer2D { this.yOffset = this.height - this.subHeight - this.yOffset; } - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("outline") public void outline(int var1) { int[] var2 = new int[this.subWidth * this.subHeight]; @@ -209,7 +209,7 @@ public final class Sprite extends Rasterizer2D { this.pixels = var2; } - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("shadow") public void shadow(int var1) { for (int var2 = this.subHeight - 1; var2 > 0; --var2) { @@ -224,7 +224,7 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("d") + @ObfuscatedName("m") @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; @@ -270,7 +270,7 @@ public final class Sprite extends Rasterizer2D { } } - @ObfuscatedName("o") + @ObfuscatedName("h") @Export("drawTransBgAt") public void drawTransBgAt(int var1, int var2) { var1 += this.xOffset; @@ -316,7 +316,7 @@ public final class Sprite extends Rasterizer2D { } } - @ObfuscatedName("t") + @ObfuscatedName("n") @Export("drawScaledAt") public void drawScaledAt(int var1, int var2, int var3, int var4) { if (var3 > 0 && var4 > 0) { @@ -381,7 +381,7 @@ public final class Sprite extends Rasterizer2D { } } - @ObfuscatedName("n") + @ObfuscatedName("w") @Export("drawTransOverlayAt") public void drawTransOverlayAt(int var1, int var2, int var3, int var4) { if (var3 == 256) { @@ -477,7 +477,7 @@ public final class Sprite extends Rasterizer2D { } } - @ObfuscatedName("m") + @ObfuscatedName("f") @Export("drawTransScaledAt") public void drawTransScaledAt(int var1, int var2, int var3, int var4, int var5) { if (var3 > 0 && var4 > 0) { @@ -542,8 +542,8 @@ public final class Sprite extends Rasterizer2D { } } - @ObfuscatedName("av") - public void method6159(int var1, int var2, int var3) { + @ObfuscatedName("u") + public void method6201(int var1, int var2, int var3) { var1 += this.xOffset; var2 += this.yOffset; int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; @@ -584,16 +584,16 @@ public final class Sprite extends Rasterizer2D { if (var7 > 0 && var6 > 0) { if (var3 == 256) { - method6146(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); + method6197(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); } else { - method6161(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); + method6203(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); } } } - @ObfuscatedName("ak") - public void method6162(int var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("az") + public void method6280(int var1, int var2, int var3, int var4, int var5) { if (var3 > 0 && var4 > 0) { int var6 = this.subWidth; int var7 = this.subHeight; @@ -653,16 +653,16 @@ public final class Sprite extends Rasterizer2D { } if (var5 == 256) { - method6163(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); + method6255(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); } else { - method6164(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); + method6221(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); } } } - @ObfuscatedName("aq") - public void method6251(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { + @ObfuscatedName("au") + public void method6207(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { int var9 = var2 < 0 ? -var2 : 0; int var10 = var2 + this.subHeight <= var6 ? this.subHeight : var6 - var2; int var11 = var1 < 0 ? -var1 : 0; @@ -709,7 +709,7 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("ao") + @ObfuscatedName("ay") @Export("drawRotatedMaskedCenteredAround") public void drawRotatedMaskedCenteredAround(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int[] var9, int[] var10) { try { @@ -744,8 +744,8 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("an") - public void method6167(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { + @ObfuscatedName("aa") + public void method6242(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { try { int var10 = -var3 / 2; int var11 = -var4 / 2; @@ -783,13 +783,13 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("ar") - public void method6243(int var1, int var2, int var3, int var4) { - this.method6169(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); + @ObfuscatedName("aq") + public void method6210(int var1, int var2, int var3, int var4) { + this.method6211(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); } - @ObfuscatedName("az") - void method6169(int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("as") + void method6211(int var1, int var2, int var3, int var4, int var5, int var6) { if (var6 != 0) { var1 -= this.xOffset << 4; var2 -= this.yOffset << 4; @@ -1257,7 +1257,7 @@ public final class Sprite extends Rasterizer2D { } } - @ObfuscatedName("ay") + @ObfuscatedName("ak") @Export("drawScaledWorldmap") public void drawScaledWorldmap(int var1, int var2, int var3, int var4) { if (var3 <= this.width && var4 <= this.height) { @@ -1380,7 +1380,7 @@ public final class Sprite extends Rasterizer2D { } } - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("Sprite_draw") static void Sprite_draw(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7) { for (int var8 = -var5; var8 < 0; ++var8) { @@ -1400,7 +1400,7 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("l") + @ObfuscatedName("v") @Export("Sprite_drawTransBg") static void Sprite_drawTransBg(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = -(var5 >> 2); @@ -1453,7 +1453,7 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("Sprite_drawScaled") static void Sprite_drawScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { int var12 = var3; @@ -1479,7 +1479,7 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("u") + @ObfuscatedName("q") @Export("Sprite_drawTransOverlay") static void Sprite_drawTransOverlay(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { int var11 = 256 - var9; @@ -1505,7 +1505,7 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("h") + @ObfuscatedName("y") @Export("Sprite_drawTransparent") static void Sprite_drawTransparent(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { int var10 = 256 - var9; @@ -1527,7 +1527,7 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("aa") + @ObfuscatedName("a") @Export("Sprite_drawTransScaled") static void Sprite_drawTransScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { int var13 = 256 - var12; @@ -1555,8 +1555,8 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("aw") - static void method6146(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { + @ObfuscatedName("ae") + static void method6197(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { for (var8 = -var10; var8 < 0; ++var8) { for (var6 = -var9; var6 < 0; ++var6) { var0 = var4[var5++]; @@ -1577,8 +1577,8 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("as") - static void method6161(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13) { + @ObfuscatedName("af") + static void method6203(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13) { for (var8 = -var10; var8 < 0; ++var8) { for (var6 = -var9; var6 < 0; ++var6) { var0 = var4[var5++]; @@ -1601,8 +1601,8 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("au") - static void method6163(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { + @ObfuscatedName("ax") + static void method6255(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { for (int var16 = var3; var8 < 0; ++var8) { var7 = var15 * (var9 >> 16); @@ -1628,8 +1628,8 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("ah") - static void method6164(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16) { + @ObfuscatedName("aj") + static void method6221(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16) { for (int var17 = var3; var8 < 0; ++var8) { var7 = var15 * (var9 >> 16); diff --git a/runescape-client/src/main/java/SpriteMask.java b/runescape-client/src/main/java/SpriteMask.java index b556c0eb7e..1662659bc9 100644 --- a/runescape-client/src/main/java/SpriteMask.java +++ b/runescape-client/src/main/java/SpriteMask.java @@ -4,25 +4,25 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hy") +@ObfuscatedName("hf") @Implements("SpriteMask") public class SpriteMask extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -78819829 + intValue = -1040001761 ) @Export("width") public final int width; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -982399363 + intValue = -1175946867 ) @Export("height") public final int height; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("xWidths") public final int[] xWidths; - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("xStarts") public final int[] xStarts; @@ -33,10 +33,10 @@ public class SpriteMask extends DualNode { this.xStarts = var4; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IIB)Z", - garbageValue = "-24" + signature = "(III)Z", + garbageValue = "2110686779" ) @Export("contains") public boolean contains(int var1, int var2) { @@ -49,4 +49,100 @@ public class SpriteMask extends DualNode { return false; } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(IIB)Lhn;", + garbageValue = "-27" + ) + @Export("getWidgetChild") + public static Widget getWidgetChild(int var0, int var1) { + Widget var2 = Varps.getWidget(var0); + if (var1 == -1) { + return var2; + } else { + return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "398303875" + ) + public static int method4038() { + return ++MouseHandler.MouseHandler_idleCycles - 1; + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "([BI)V", + garbageValue = "-1864431963" + ) + @Export("SpriteBuffer_decode") + public static void SpriteBuffer_decode(byte[] var0) { + Buffer var1 = new Buffer(var0); + var1.offset = var0.length - 2; + class326.SpriteBuffer_spriteCount = var1.readUnsignedShort(); + Huffman.SpriteBuffer_xOffsets = new int[class326.SpriteBuffer_spriteCount]; + NPC.SpriteBuffer_yOffsets = new int[class326.SpriteBuffer_spriteCount]; + class326.SpriteBuffer_spriteWidths = new int[class326.SpriteBuffer_spriteCount]; + class326.SpriteBuffer_spriteHeights = new int[class326.SpriteBuffer_spriteCount]; + class326.SpriteBuffer_pixels = new byte[class326.SpriteBuffer_spriteCount][]; + var1.offset = var0.length - 7 - class326.SpriteBuffer_spriteCount * 8; + GZipDecompressor.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); + class326.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); + int var2 = (var1.readUnsignedByte() & 255) + 1; + + int var3; + for (var3 = 0; var3 < class326.SpriteBuffer_spriteCount; ++var3) { + Huffman.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class326.SpriteBuffer_spriteCount; ++var3) { + NPC.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class326.SpriteBuffer_spriteCount; ++var3) { + class326.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class326.SpriteBuffer_spriteCount; ++var3) { + class326.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); + } + + var1.offset = var0.length - 7 - class326.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; + class326.SpriteBuffer_spritePalette = new int[var2]; + + for (var3 = 1; var3 < var2; ++var3) { + class326.SpriteBuffer_spritePalette[var3] = var1.readMedium(); + if (class326.SpriteBuffer_spritePalette[var3] == 0) { + class326.SpriteBuffer_spritePalette[var3] = 1; + } + } + + var1.offset = 0; + + for (var3 = 0; var3 < class326.SpriteBuffer_spriteCount; ++var3) { + int var4 = class326.SpriteBuffer_spriteWidths[var3]; + int var5 = class326.SpriteBuffer_spriteHeights[var3]; + int var6 = var5 * var4; + byte[] var7 = new byte[var6]; + class326.SpriteBuffer_pixels[var3] = var7; + int var8 = var1.readUnsignedByte(); + int var9; + if (var8 == 0) { + for (var9 = 0; var9 < var6; ++var9) { + var7[var9] = var1.readByte(); + } + } else if (var8 == 1) { + for (var9 = 0; var9 < var4; ++var9) { + for (int var10 = 0; var10 < var5; ++var10) { + var7[var9 + var10 * var4] = var1.readByte(); + } + } + } + } + + } } diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java index 49fe359507..2be38cfcd5 100644 --- a/runescape-client/src/main/java/Strings.java +++ b/runescape-client/src/main/java/Strings.java @@ -1,129 +1,96 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hm") +@ObfuscatedName("hk") @Implements("Strings") public class Strings { @ObfuscatedName("bk") - public static String field2798; - @ObfuscatedName("ct") - public static String field2837; - @ObfuscatedName("jk") - public static String field2834; - @ObfuscatedName("jx") - public static String field3014; - @ObfuscatedName("jd") - public static String field3015; + public static String field3045; + @ObfuscatedName("cq") + public static String field2808; + @ObfuscatedName("ji") + public static String field3036; + @ObfuscatedName("jc") + public static String field3037; + @ObfuscatedName("jn") + public static String field2933; static { - field2798 = "Please visit the support page for assistance."; - field2837 = "Please visit the support page for assistance."; - field2834 = ""; - field3014 = "Page has opened in a new window."; - field3015 = "(Please check your popup blocker.)"; + field3045 = "Please visit the support page for assistance."; + field2808 = "Please visit the support page for assistance."; + field3036 = ""; + field3037 = "Page has opened in a new window."; + field2933 = "(Please check your popup blocker.)"; } - @ObfuscatedName("i") + @ObfuscatedName("jt") @ObfuscatedSignature( - signature = "([BILjava/lang/CharSequence;B)I", - garbageValue = "-83" + signature = "(Lhn;III)V", + garbageValue = "-1274264316" ) - public static int method4095(byte[] var0, int var1, CharSequence var2) { - int var3 = var2.length(); - int var4 = var1; + @Export("clickWidget") + static final void clickWidget(Widget var0, int var1, int var2) { + if (Client.clickedWidget == null && !Client.isMenuOpen) { + if (var0 != null) { + Widget var5 = var0; + int var7 = WorldMapIcon_0.getWidgetClickMask(var0); + int var6 = var7 >> 17 & 7; + int var8 = var6; + Widget var4; + if (var6 == 0) { + var4 = null; + } else { + int var9 = 0; - for (int var5 = 0; var5 < var3; ++var5) { - char var6 = var2.charAt(var5); - if (var6 <= 127) { - var0[var4++] = (byte)var6; - } else if (var6 <= 2047) { - var0[var4++] = (byte)(192 | var6 >> 6); - var0[var4++] = (byte)(128 | var6 & '?'); - } else { - var0[var4++] = (byte)(224 | var6 >> '\f'); - var0[var4++] = (byte)(128 | var6 >> 6 & 63); - var0[var4++] = (byte)(128 | var6 & '?'); - } - } + while (true) { + if (var9 >= var8) { + var4 = var5; + break; + } - return var4 - var1; - } + var5 = Varps.getWidget(var5.parentId); + if (var5 == null) { + var4 = null; + break; + } - @ObfuscatedName("id") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1938003429" - ) - static void method4096() { - int var0; - int var2; - int var3; - for (var0 = 0; var0 < Client.menuOptionsCount; ++var0) { - var2 = Client.menuOpcodes[var0]; - boolean var1 = var2 == 57 || var2 == 58 || var2 == 1007 || var2 == 25 || var2 == 30; - if (var1) { - if (var0 < Client.menuOptionsCount - 1) { - for (var3 = var0; var3 < Client.menuOptionsCount - 1; ++var3) { - Client.menuActions[var3] = Client.menuActions[var3 + 1]; - Client.menuTargets[var3] = Client.menuTargets[var3 + 1]; - Client.menuOpcodes[var3] = Client.menuOpcodes[var3 + 1]; - Client.menuIdentifiers[var3] = Client.menuIdentifiers[var3 + 1]; - Client.menuArguments1[var3] = Client.menuArguments1[var3 + 1]; - Client.menuArguments2[var3] = Client.menuArguments2[var3 + 1]; - Client.menuShiftClick[var3] = Client.menuShiftClick[var3 + 1]; + ++var9; } } - --var0; - --Client.menuOptionsCount; - } - } + Widget var10 = var4; + if (var4 == null) { + var10 = var0.parent; + } - var0 = KeyHandler.menuWidth / 2 + GrandExchangeEvent.menuX; - int var9 = WorldMapManager.menuY; - var2 = GrandExchangeOffer.fontBold12.stringWidth("Choose Option"); + if (var10 != null) { + Client.clickedWidget = var0; + var4 = ItemContainer.method1184(var0); + if (var4 == null) { + var4 = var0.parent; + } - for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { - Font var4 = GrandExchangeOffer.fontBold12; - String var5; - if (var3 < 0) { - var5 = ""; - } else if (Client.menuTargets[var3].length() > 0) { - var5 = Client.menuActions[var3] + " " + Client.menuTargets[var3]; - } else { - var5 = Client.menuActions[var3]; + Client.clickedWidgetParent = var4; + Client.widgetClickX = var1; + Client.widgetClickY = var2; + SequenceDefinition.widgetDragDuration = 0; + Client.isDraggingWidget = false; + int var11 = Client.menuOptionsCount - 1; + if (var11 != -1) { + WorldMapRegion.tempMenuAction = new MenuAction(); + WorldMapRegion.tempMenuAction.param0 = Client.menuArguments1[var11]; + WorldMapRegion.tempMenuAction.param1 = Client.menuArguments2[var11]; + WorldMapRegion.tempMenuAction.opcode = Client.menuOpcodes[var11]; + WorldMapRegion.tempMenuAction.identifier = Client.menuIdentifiers[var11]; + WorldMapRegion.tempMenuAction.action = Client.menuActions[var11]; + } + + return; + } } - int var6 = var4.stringWidth(var5); - if (var6 > var2) { - var2 = var6; - } } - - var2 += 8; - var3 = Client.menuOptionsCount * 15 + 22; - int var7 = var0 - var2 / 2; - if (var7 + var2 > GrandExchangeOfferTotalQuantityComparator.canvasWidth) { - var7 = GrandExchangeOfferTotalQuantityComparator.canvasWidth - var2; - } - - if (var7 < 0) { - var7 = 0; - } - - int var8 = var9; - if (var9 + var3 > AttackOption.canvasHeight) { - var8 = AttackOption.canvasHeight - var3; - } - - if (var8 < 0) { - var8 = 0; - } - - GrandExchangeEvent.menuX = var7; - WorldMapManager.menuY = var8; - KeyHandler.menuWidth = var2; - class54.menuHeight = Client.menuOptionsCount * 15 + 22; } } diff --git a/runescape-client/src/main/java/StructDefinition.java b/runescape-client/src/main/java/StructDefinition.java index af41f25c9a..f6a03a8fcc 100644 --- a/runescape-client/src/main/java/StructDefinition.java +++ b/runescape-client/src/main/java/StructDefinition.java @@ -2,31 +2,34 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("is") +@ObfuscatedName("it") @Implements("StructDefinition") public class StructDefinition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) @Export("StructDefinition_archive") static AbstractArchive StructDefinition_archive; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("StructDefinition_cached") static EvictingDualNodeHashTable StructDefinition_cached; - @ObfuscatedName("s") + @ObfuscatedName("be") + static String field3307; + @ObfuscatedName("gk") @ObfuscatedSignature( - signature = "Lbd;" + signature = "[Llt;" ) - @Export("loginScreenRunesAnimation") - static LoginScreenAnimation loginScreenRunesAnimation; - @ObfuscatedName("y") + @Export("mapMarkerSprites") + static Sprite[] mapMarkerSprites; + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Llc;" + signature = "Llp;" ) @Export("params") IterableNodeHashTable params; @@ -38,19 +41,19 @@ public class StructDefinition extends DualNode { StructDefinition() { } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1694399537" + garbageValue = "-2114792019" ) @Export("postDecode") void postDecode() { } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Lkq;I)V", - garbageValue = "-1313087587" + signature = "(Lkp;I)V", + garbageValue = "-215711258" ) @Export("decode") void decode(Buffer var1) { @@ -64,179 +67,182 @@ public class StructDefinition extends DualNode { } } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkq;IB)V", - garbageValue = "2" + signature = "(Lkp;IS)V", + garbageValue = "-16433" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 249) { - this.params = Calendar.readStringIntParameters(var1, this.params); + this.params = MouseRecorder.readStringIntParameters(var1, this.params); } } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "445815336" + garbageValue = "-1540042604" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return class83.method2071(this.params, var1, var2); + return class185.method3686(this.params, var1, var2); } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(ILjava/lang/String;B)Ljava/lang/String;", - garbageValue = "-8" + signature = "(ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "-32852937" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return class14.method151(this.params, var1, var2); + return FloorDecoration.method2914(this.params, var1, var2); } - @ObfuscatedName("j") + @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", - garbageValue = "1595091169" + signature = "(ILce;ZI)I", + garbageValue = "2113754677" ) - public static String method4551(CharSequence var0) { - return UserComparator6.method3370('*', var0.length()); - } + static int method4627(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; + return 1; + } else { + int var12; + if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var12 == 0 ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var12 == 2 ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var12 == 5 ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var12 == 1 ? 1 : 0; + return 1; + } else { + boolean var13; + if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { + var13 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + if (PendingSpawn.grandExchangeEvents != null) { + PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var13); + } - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "(IIB)Z", - garbageValue = "0" - ) - static final boolean method4546(int var0, int var1) { - ObjectDefinition var2 = Coord.getObjectDefinition(var0); - if (var1 == 11) { - var1 = 10; - } + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { + var13 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + if (PendingSpawn.grandExchangeEvents != null) { + PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var13); + } - if (var1 >= 5 && var1 <= 8) { - var1 = 4; - } + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { + class320.Interpreter_intStackSize -= 2; + var13 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize] == 1; + boolean var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1] == 1; + if (PendingSpawn.grandExchangeEvents != null) { + Client.GrandExchangeEvents_worldComparator.filterWorlds = var4; + PendingSpawn.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var13); + } - return var2.method4616(var1); - } + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { + var13 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + if (PendingSpawn.grandExchangeEvents != null) { + PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var13); + } - @ObfuscatedName("gj") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "363580597" - ) - static final void method4529() { - int var0 = SequenceDefinition.field3477 * 128 + 64; - int var1 = AbstractWorldMapData.field147 * 128 + 64; - int var2 = ScriptEvent.getTileHeight(var0, var1, UrlRequest.Client_plane) - Canvas.field397; - if (MusicPatchNode2.cameraX < var0) { - MusicPatchNode2.cameraX = (var0 - MusicPatchNode2.cameraX) * WorldMapData_0.field92 / 1000 + MusicPatchNode2.cameraX + HitSplatDefinition.field3312; - if (MusicPatchNode2.cameraX > var0) { - MusicPatchNode2.cameraX = var0; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { + var13 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + if (PendingSpawn.grandExchangeEvents != null) { + PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var13); + } + + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = PendingSpawn.grandExchangeEvents == null ? 0 : PendingSpawn.grandExchangeEvents.events.size(); + return 1; + } else { + GrandExchangeEvent var11; + if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var11.world; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var11.getOfferName(); + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var11.getPreviousOfferName(); + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); + long var5 = WorldMapIcon_0.currentTimeMillis() - class30.field274 - var11.age; + int var7 = (int)(var5 / 3600000L); + int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); + int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); + String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var10; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id; + return 1; + } else { + return 2; + } + } } } - - if (MusicPatchNode2.cameraX > var0) { - MusicPatchNode2.cameraX -= WorldMapData_0.field92 * (MusicPatchNode2.cameraX - var0) / 1000 + HitSplatDefinition.field3312; - if (MusicPatchNode2.cameraX < var0) { - MusicPatchNode2.cameraX = var0; - } - } - - if (class60.cameraY < var2) { - class60.cameraY = (var2 - class60.cameraY) * WorldMapData_0.field92 / 1000 + class60.cameraY + HitSplatDefinition.field3312; - if (class60.cameraY > var2) { - class60.cameraY = var2; - } - } - - if (class60.cameraY > var2) { - class60.cameraY -= WorldMapData_0.field92 * (class60.cameraY - var2) / 1000 + HitSplatDefinition.field3312; - if (class60.cameraY < var2) { - class60.cameraY = var2; - } - } - - if (UserComparator9.cameraZ < var1) { - UserComparator9.cameraZ = (var1 - UserComparator9.cameraZ) * WorldMapData_0.field92 / 1000 + UserComparator9.cameraZ + HitSplatDefinition.field3312; - if (UserComparator9.cameraZ > var1) { - UserComparator9.cameraZ = var1; - } - } - - if (UserComparator9.cameraZ > var1) { - UserComparator9.cameraZ -= WorldMapData_0.field92 * (UserComparator9.cameraZ - var1) / 1000 + HitSplatDefinition.field3312; - if (UserComparator9.cameraZ < var1) { - UserComparator9.cameraZ = var1; - } - } - - var0 = class80.field1111 * 128 + 64; - var1 = Ignored.field3589 * 16384 + 64; - var2 = ScriptEvent.getTileHeight(var0, var1, UrlRequest.Client_plane) - Client.field873; - int var3 = var0 - MusicPatchNode2.cameraX; - int var4 = var2 - class60.cameraY; - int var5 = var1 - UserComparator9.cameraZ; - int var6 = (int)Math.sqrt((double)(var5 * var5 + var3 * var3)); - int var7 = (int)(Math.atan2((double)var4, (double)var6) * 325.949D) & 2047; - int var8 = (int)(Math.atan2((double)var3, (double)var5) * -325.949D) & 2047; - if (var7 < 128) { - var7 = 128; - } - - if (var7 > 383) { - var7 = 383; - } - - if (ViewportMouse.cameraPitch < var7) { - ViewportMouse.cameraPitch = (var7 - ViewportMouse.cameraPitch) * GrandExchangeOfferOwnWorldComparator.field623 / 1000 + ViewportMouse.cameraPitch + PacketBufferNode.field2310; - if (ViewportMouse.cameraPitch > var7) { - ViewportMouse.cameraPitch = var7; - } - } - - if (ViewportMouse.cameraPitch > var7) { - ViewportMouse.cameraPitch -= GrandExchangeOfferOwnWorldComparator.field623 * (ViewportMouse.cameraPitch - var7) / 1000 + PacketBufferNode.field2310; - if (ViewportMouse.cameraPitch < var7) { - ViewportMouse.cameraPitch = var7; - } - } - - int var9 = var8 - WorldMapLabelSize.cameraYaw; - if (var9 > 1024) { - var9 -= 2048; - } - - if (var9 < -1024) { - var9 += 2048; - } - - if (var9 > 0) { - WorldMapLabelSize.cameraYaw = WorldMapLabelSize.cameraYaw + PacketBufferNode.field2310 + var9 * GrandExchangeOfferOwnWorldComparator.field623 / 1000; - WorldMapLabelSize.cameraYaw &= 2047; - } - - if (var9 < 0) { - WorldMapLabelSize.cameraYaw -= PacketBufferNode.field2310 + -var9 * GrandExchangeOfferOwnWorldComparator.field623 / 1000; - WorldMapLabelSize.cameraYaw &= 2047; - } - - int var10 = var8 - WorldMapLabelSize.cameraYaw; - if (var10 > 1024) { - var10 -= 2048; - } - - if (var10 < -1024) { - var10 += 2048; - } - - if (var10 < 0 && var9 > 0 || var10 > 0 && var9 < 0) { - WorldMapLabelSize.cameraYaw = var8; - } - } } diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java index 2441f5fbc2..4bc1864044 100644 --- a/runescape-client/src/main/java/StudioGame.java +++ b/runescape-client/src/main/java/StudioGame.java @@ -4,54 +4,52 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hq") +@ObfuscatedName("hx") @Implements("StudioGame") public enum StudioGame implements Enumerated { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lhq;" + signature = "Lhx;" ) @Export("runescape") runescape("runescape", "RuneScape", 0), - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lhq;" + signature = "Lhx;" ) @Export("stellardawn") stellardawn("stellardawn", "Stellar Dawn", 1), - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lhq;" + signature = "Lhx;" ) @Export("game3") game3("game3", "Game 3", 2), - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lhq;" + signature = "Lhx;" ) @Export("game4") game4("game4", "Game 4", 3), - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lhq;" + signature = "Lhx;" ) @Export("game5") game5("game5", "Game 5", 4), - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lhq;" + signature = "Lhx;" ) @Export("oldscape") oldscape("oldscape", "RuneScape 2007", 5); - @ObfuscatedName("h") - static String field3092; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("name") public final String name; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1105236049 + intValue = 905607023 ) @Export("id") final int id; @@ -61,172 +59,13 @@ public enum StudioGame implements Enumerated { this.id = var5; } - @ObfuscatedName("i") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "-57" + garbageValue = "1" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "(IIIIIZB)Lls;", - garbageValue = "16" - ) - @Export("getItemSprite") - public static final Sprite getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { - if (var1 == -1) { - var4 = 0; - } else if (var4 == 2 && var1 != 1) { - var4 = 1; - } - - long var6 = ((long)var4 << 40) + ((long)var2 << 38) + ((long)var1 << 16) + (long)var0 + ((long)var3 << 42); - Sprite var8; - if (!var5) { - var8 = (Sprite)ItemDefinition.ItemDefinition_cachedSprites.get(var6); - if (var8 != null) { - return var8; - } - } - - ItemDefinition var9 = PacketBufferNode.ItemDefinition_get(var0); - if (var1 > 1 && var9.countobj != null) { - int var10 = -1; - - for (int var11 = 0; var11 < 10; ++var11) { - if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { - var10 = var9.countobj[var11]; - } - } - - if (var10 != -1) { - var9 = PacketBufferNode.ItemDefinition_get(var10); - } - } - - Model var19 = var9.getModel(1); - if (var19 == null) { - return null; - } else { - Sprite var20 = null; - if (var9.noteTemplate != -1) { - var20 = getItemSprite(var9.note, 10, 1, 0, 0, true); - if (var20 == null) { - return null; - } - } else if (var9.notedId != -1) { - var20 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); - if (var20 == null) { - return null; - } - } else if (var9.placeholderTemplate != -1) { - var20 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); - if (var20 == null) { - return null; - } - } - - int[] var12 = Rasterizer2D.Rasterizer2D_pixels; - int var13 = Rasterizer2D.Rasterizer2D_width; - int var14 = Rasterizer2D.Rasterizer2D_height; - int[] var15 = new int[4]; - Rasterizer2D.Rasterizer2D_getClipArray(var15); - var8 = new Sprite(36, 32); - Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); - Rasterizer2D.Rasterizer2D_clear(); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - Rasterizer3D.method3086(16, 16); - Rasterizer3D.field1739 = false; - if (var9.placeholderTemplate != -1) { - var20.drawTransBgAt(0, 0); - } - - int var16 = var9.zoom2d; - if (var5) { - var16 = (int)(1.5D * (double)var16); - } else if (var2 == 2) { - var16 = (int)((double)var16 * 1.04D); - } - - int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; - int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; - var19.calculateBoundsCylinder(); - var19.method2907(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var19.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); - if (var9.notedId != -1) { - var20.drawTransBgAt(0, 0); - } - - if (var2 >= 1) { - var8.outline(1); - } - - if (var2 >= 2) { - var8.outline(16777215); - } - - if (var3 != 0) { - var8.shadow(var3); - } - - Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); - if (var9.noteTemplate != -1) { - var20.drawTransBgAt(0, 0); - } - - if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { - ReflectionCheck.ItemDefinition_fontPlain11.draw(Projectile.method2129(var1), 0, 9, 16776960, 1); - } - - if (!var5) { - ItemDefinition.ItemDefinition_cachedSprites.put(var8, var6); - } - - Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); - Rasterizer2D.Rasterizer2D_setClipArray(var15); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - Rasterizer3D.field1739 = true; - return var8; - } - } - - @ObfuscatedName("fa") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1629640167" - ) - static final void method4119() { - if (Client.logoutTimer > 0) { - InterfaceParent.logOut(); - } else { - Client.timer.method5025(); - class195.updateGameState(40); - VertexNormal.field1730 = Client.packetWriter.getSocket(); - Client.packetWriter.removeSocket(); - } - } - - @ObfuscatedName("kg") - @ObfuscatedSignature( - signature = "(Lha;I)Lha;", - garbageValue = "-525522937" - ) - static Widget method4116(Widget var0) { - int var1 = class339.method6563(WorldMapSection0.getWidgetClickMask(var0)); - if (var1 == 0) { - return null; - } else { - for (int var2 = 0; var2 < var1; ++var2) { - var0 = Tile.getWidget(var0.parentId); - if (var0 == null) { - return null; - } - } - - return var0; - } - } } diff --git a/runescape-client/src/main/java/Task.java b/runescape-client/src/main/java/Task.java index 07ab3d74d4..fe749efe44 100644 --- a/runescape-client/src/main/java/Task.java +++ b/runescape-client/src/main/java/Task.java @@ -4,31 +4,31 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fu") +@ObfuscatedName("fw") @Implements("Task") public class Task { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lfu;" + signature = "Lfw;" ) @Export("next") Task next; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("status") public volatile int status; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -2104654437 + intValue = 1842661257 ) @Export("type") int type; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("intArgument") public int intArgument; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("objectArgument") Object objectArgument; - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("result") public volatile Object result; diff --git a/runescape-client/src/main/java/TaskHandler.java b/runescape-client/src/main/java/TaskHandler.java index 69134c2f3e..07a527beb8 100644 --- a/runescape-client/src/main/java/TaskHandler.java +++ b/runescape-client/src/main/java/TaskHandler.java @@ -7,31 +7,28 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fl") +@ObfuscatedName("ff") @Implements("TaskHandler") public class TaskHandler implements Runnable { - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("javaVendor") public static String javaVendor; - @ObfuscatedName("i") - @Export("javaVersion") - public static String javaVersion; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lfu;" + signature = "Lfw;" ) @Export("current") Task current; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lfu;" + signature = "Lfw;" ) @Export("task") Task task; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("thread") Thread thread; - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("isClosed") boolean isClosed; @@ -40,11 +37,11 @@ public class TaskHandler implements Runnable { this.task = null; this.isClosed = false; javaVendor = "Unknown"; - javaVersion = "1.6"; + class216.javaVersion = "1.6"; try { javaVendor = System.getProperty("java.vendor"); - javaVersion = System.getProperty("java.version"); + class216.javaVersion = System.getProperty("java.version"); } catch (Exception var2) { } @@ -55,10 +52,10 @@ public class TaskHandler implements Runnable { this.thread.start(); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1570179220" + signature = "(B)V", + garbageValue = "-77" ) @Export("close") public final void close() { @@ -74,10 +71,10 @@ public class TaskHandler implements Runnable { } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IIILjava/lang/Object;B)Lfu;", - garbageValue = "-52" + signature = "(IIILjava/lang/Object;S)Lfw;", + garbageValue = "-10894" ) @Export("newTask") final Task newTask(int var1, int var2, int var3, Object var4) { @@ -98,20 +95,20 @@ public class TaskHandler implements Runnable { } } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ljava/lang/String;II)Lfu;", - garbageValue = "-1049494534" + signature = "(Ljava/lang/String;II)Lfw;", + garbageValue = "-260343907" ) @Export("newSocketTask") public final Task newSocketTask(String var1, int var2) { return this.newTask(1, var2, 0, var1); } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Ljava/lang/Runnable;II)Lfu;", - garbageValue = "1021104095" + signature = "(Ljava/lang/Runnable;II)Lfw;", + garbageValue = "70274663" ) @Export("newThreadTask") public final Task newThreadTask(Runnable var1, int var2) { @@ -166,64 +163,37 @@ public class TaskHandler implements Runnable { } } - @ObfuscatedName("gn") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "-1335905010" + signature = "(Lmv;I)I", + garbageValue = "1649958240" ) - @Export("doCheat") - static final void doCheat(String var0) { - if (var0.equalsIgnoreCase("toggleroof")) { - Interpreter.clientPreferences.roofsHidden = !Interpreter.clientPreferences.roofsHidden; - FriendSystem.savePreferences(); - if (Interpreter.clientPreferences.roofsHidden) { - class83.addGameMessage(99, "", "Roofs are now all hidden"); - } else { - class83.addGameMessage(99, "", "Roofs will only be removed selectively"); + public static final int method3540(LoginType var0) { + if (var0 == null) { + return 12; + } else { + switch(var0.field4037) { + case 6: + return 20; + default: + return 12; } } + } - if (var0.equalsIgnoreCase("displayfps")) { - Client.displayFps = !Client.displayFps; - } - - if (var0.equalsIgnoreCase("renderself")) { - Client.renderSelf = !Client.renderSelf; - } - - if (var0.equalsIgnoreCase("mouseovertext")) { - Client.showMouseOverText = !Client.showMouseOverText; - } - - if (Client.staffModLevel >= 2) { - if (var0.equalsIgnoreCase("errortest")) { - throw new RuntimeException(); - } - - if (var0.equalsIgnoreCase("showcoord")) { - GrandExchangeEvent.worldMap.showCoord = !GrandExchangeEvent.worldMap.showCoord; - } - - if (var0.equalsIgnoreCase("fpson")) { - Client.displayFps = true; - } - - if (var0.equalsIgnoreCase("fpsoff")) { - Client.displayFps = false; - } - - if (var0.equalsIgnoreCase("gc")) { - System.gc(); - } - - if (var0.equalsIgnoreCase("clientdrop")) { - StudioGame.method4119(); - } - } - - PacketBufferNode var1 = class2.getPacketBufferNode(ClientPacket.field2216, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(var0.length() + 1); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "(ILii;IIIZI)V", + garbageValue = "869410445" + ) + @Export("playMusicTrack") + public static void method3554(int var0, AbstractArchive var1, int var2, int var3, int var4, boolean var5) { + class197.field2414 = 1; + UserComparator5.musicTrackArchive = var1; + class197.musicTrackGroupId = var2; + class83.musicTrackFileId = var3; + AttackOption.musicTrackVolume = var4; + KeyHandler.musicTrackBoolean = var5; + class197.field2412 = var0; } } diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java index 150f8c0be4..86681ec149 100644 --- a/runescape-client/src/main/java/Texture.java +++ b/runescape-client/src/main/java/Texture.java @@ -3,46 +3,46 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dq") +@ObfuscatedName("db") @Implements("Texture") public class Texture extends Node { - @ObfuscatedName("s") + @ObfuscatedName("x") @Export("Texture_animatedPixels") static int[] Texture_animatedPixels; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("averageRGB") int averageRGB; - @ObfuscatedName("b") - boolean field1602; - @ObfuscatedName("e") + @ObfuscatedName("g") + boolean field1610; + @ObfuscatedName("d") @Export("fileIds") int[] fileIds; - @ObfuscatedName("x") - int[] field1598; - @ObfuscatedName("a") - int[] field1596; - @ObfuscatedName("d") - int[] field1603; - @ObfuscatedName("c") + @ObfuscatedName("l") + int[] field1612; + @ObfuscatedName("j") + int[] field1607; + @ObfuscatedName("m") + int[] field1613; + @ObfuscatedName("p") @Export("animationDirection") int animationDirection; - @ObfuscatedName("o") + @ObfuscatedName("h") @Export("animationSpeed") int animationSpeed; @ObfuscatedName("v") @Export("pixels") int[] pixels; - @ObfuscatedName("k") + @ObfuscatedName("n") @Export("isLoaded") boolean isLoaded; @ObfuscatedSignature( - signature = "(Lkq;)V" + signature = "(Lkp;)V" ) Texture(Buffer var1) { this.isLoaded = false; this.averageRGB = var1.readUnsignedShort(); - this.field1602 = var1.readUnsignedByte() == 1; + this.field1610 = var1.readUnsignedByte() == 1; int var2 = var1.readUnsignedByte(); if (var2 >= 1 && var2 <= 4) { this.fileIds = new int[var2]; @@ -53,25 +53,25 @@ public class Texture extends Node { } if (var2 > 1) { - this.field1598 = new int[var2 - 1]; + this.field1612 = new int[var2 - 1]; for (var3 = 0; var3 < var2 - 1; ++var3) { - this.field1598[var3] = var1.readUnsignedByte(); + this.field1612[var3] = var1.readUnsignedByte(); } } if (var2 > 1) { - this.field1596 = new int[var2 - 1]; + this.field1607 = new int[var2 - 1]; for (var3 = 0; var3 < var2 - 1; ++var3) { - this.field1596[var3] = var1.readUnsignedByte(); + this.field1607[var3] = var1.readUnsignedByte(); } } - this.field1603 = new int[var2]; + this.field1613 = new int[var2]; for (var3 = 0; var3 < var2; ++var3) { - this.field1603[var3] = var1.readInt(); + this.field1613[var3] = var1.readInt(); } this.animationDirection = var1.readUnsignedByte(); @@ -82,9 +82,9 @@ public class Texture extends Node { } } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(DILhz;)Z" + signature = "(DILii;)Z" ) @Export("load") boolean load(double var1, int var3, AbstractArchive var4) { @@ -99,55 +99,71 @@ public class Texture extends Node { this.pixels = new int[var5]; for (int var6 = 0; var6 < this.fileIds.length; ++var6) { - IndexedSprite var7 = SecureRandomCallable.method1151(var4, this.fileIds[var6]); + int var8 = this.fileIds[var6]; + byte[] var10 = var4.takeFileFlat(var8); + boolean var9; + if (var10 == null) { + var9 = false; + } else { + SpriteMask.SpriteBuffer_decode(var10); + var9 = true; + } + + IndexedSprite var7; + if (!var9) { + var7 = null; + } else { + var7 = class313.method5962(); + } + var7.normalize(); - byte[] var8 = var7.pixels; - int[] var9 = var7.palette; - int var10 = this.field1603[var6]; - if ((var10 & -16777216) == 16777216) { + var10 = var7.pixels; + int[] var11 = var7.palette; + int var12 = this.field1613[var6]; + if ((var12 & -16777216) == 16777216) { } - if ((var10 & -16777216) == 33554432) { + if ((var12 & -16777216) == 33554432) { } - int var11; - int var12; int var13; int var14; - if ((var10 & -16777216) == 50331648) { - var11 = var10 & 16711935; - var12 = var10 >> 8 & 255; + int var15; + int var16; + if ((var12 & -16777216) == 50331648) { + var13 = var12 & 16711935; + var14 = var12 >> 8 & 255; - for (var13 = 0; var13 < var9.length; ++var13) { - var14 = var9[var13]; - if (var14 >> 8 == (var14 & 65535)) { - var14 &= 255; - var9[var13] = var11 * var14 >> 8 & 16711935 | var12 * var14 & 65280; + for (var15 = 0; var15 < var11.length; ++var15) { + var16 = var11[var15]; + if (var16 >> 8 == (var16 & 65535)) { + var16 &= 255; + var11[var15] = var13 * var16 >> 8 & 16711935 | var14 * var16 & 65280; } } } - for (var11 = 0; var11 < var9.length; ++var11) { - var9[var11] = Rasterizer3D.Rasterizer3D_brighten(var9[var11], var1); + for (var13 = 0; var13 < var11.length; ++var13) { + var11[var13] = Rasterizer3D.Rasterizer3D_brighten(var11[var13], var1); } if (var6 == 0) { - var11 = 0; + var13 = 0; } else { - var11 = this.field1598[var6 - 1]; + var13 = this.field1612[var6 - 1]; } - if (var11 == 0) { + if (var13 == 0) { if (var3 == var7.subWidth) { - for (var12 = 0; var12 < var5; ++var12) { - this.pixels[var12] = var9[var8[var12] & 255]; + for (var14 = 0; var14 < var5; ++var14) { + this.pixels[var14] = var11[var10[var14] & 255]; } } else if (var7.subWidth == 64 && var3 == 128) { - var12 = 0; + var14 = 0; - for (var13 = 0; var13 < var3; ++var13) { - for (var14 = 0; var14 < var3; ++var14) { - this.pixels[var12++] = var9[var8[(var13 >> 1 << 6) + (var14 >> 1)] & 255]; + for (var15 = 0; var15 < var3; ++var15) { + for (var16 = 0; var16 < var3; ++var16) { + this.pixels[var14++] = var11[var10[(var15 >> 1 << 6) + (var16 >> 1)] & 255]; } } } else { @@ -155,36 +171,36 @@ public class Texture extends Node { throw new RuntimeException(); } - var12 = 0; + var14 = 0; - for (var13 = 0; var13 < var3; ++var13) { - for (var14 = 0; var14 < var3; ++var14) { - this.pixels[var12++] = var9[var8[(var14 << 1) + (var13 << 1 << 7)] & 255]; + for (var15 = 0; var15 < var3; ++var15) { + for (var16 = 0; var16 < var3; ++var16) { + this.pixels[var14++] = var11[var10[(var16 << 1) + (var15 << 1 << 7)] & 255]; } } } } - if (var11 == 1) { + if (var13 == 1) { } - if (var11 == 2) { + if (var13 == 2) { } - if (var11 == 3) { + if (var13 == 3) { } } return true; } - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("reset") void reset() { this.pixels = null; } - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("animate") void animate(int var1) { if (this.pixels != null) { diff --git a/runescape-client/src/main/java/TextureLoader.java b/runescape-client/src/main/java/TextureLoader.java index 19b5b3492b..e0b20248f5 100644 --- a/runescape-client/src/main/java/TextureLoader.java +++ b/runescape-client/src/main/java/TextureLoader.java @@ -3,36 +3,36 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ev") +@ObfuscatedName("ep") @Implements("TextureLoader") public interface TextureLoader { - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IS)[I", - garbageValue = "-13601" + signature = "(II)[I", + garbageValue = "1435702999" ) @Export("getTexturePixels") int[] getTexturePixels(int var1); - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(II)I", - garbageValue = "935962168" + garbageValue = "16615935" ) @Export("getAverageTextureRGB") int getAverageTextureRGB(int var1); - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "1307146254" - ) - boolean vmethod3284(int var1); - - @ObfuscatedName("b") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(IB)Z", - garbageValue = "0" + garbageValue = "1" + ) + boolean vmethod3347(int var1); + + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "(II)Z", + garbageValue = "2100936507" ) @Export("isLowDetail") boolean isLowDetail(int var1); diff --git a/runescape-client/src/main/java/TextureProvider.java b/runescape-client/src/main/java/TextureProvider.java index e5ffa2d2da..f0ec3a940b 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -1,56 +1,60 @@ +import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dt") +@ObfuscatedName("dr") @Implements("TextureProvider") public class TextureProvider implements TextureLoader { - @ObfuscatedName("bz") - static String field1510; - @ObfuscatedName("f") + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 1177508509 + ) + static int field1512; + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "[Ldq;" + signature = "[Ldb;" ) @Export("textures") Texture[] textures; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Ljs;" + signature = "Ljw;" ) @Export("deque") NodeDeque deque; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 580366883 + intValue = -113844159 ) @Export("capacity") int capacity; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1830310681 + intValue = -541291029 ) @Export("remaining") int remaining; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("brightness") double brightness; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 95221787 + intValue = -1626058997 ) @Export("textureSize") int textureSize; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) @Export("archive") AbstractArchive archive; @ObfuscatedSignature( - signature = "(Lhz;Lhz;IDI)V" + signature = "(Lii;Lii;IDI)V" ) public TextureProvider(AbstractArchive var1, AbstractArchive var2, int var3, double var4, int var6) { this.deque = new NodeDeque(); @@ -73,10 +77,10 @@ public class TextureProvider implements TextureLoader { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "16711935" + garbageValue = "-2116644963" ) @Export("getLoadedPercentage") public int getLoadedPercentage() { @@ -92,7 +96,7 @@ public class TextureProvider implements TextureLoader { for (int var7 = 0; var7 < var6.length; ++var7) { int var8 = var6[var7]; - if (this.archive.method4157(var8)) { + if (this.archive.method4224(var8)) { ++var2; } } @@ -106,17 +110,17 @@ public class TextureProvider implements TextureLoader { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("setBrightness") public void setBrightness(double var1) { this.brightness = var1; this.clear(); } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IS)[I", - garbageValue = "-13601" + signature = "(II)[I", + garbageValue = "1435702999" ) @Export("getTexturePixels") public int[] getTexturePixels(int var1) { @@ -146,39 +150,39 @@ public class TextureProvider implements TextureLoader { return null; } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(II)I", - garbageValue = "935962168" + garbageValue = "16615935" ) @Export("getAverageTextureRGB") public int getAverageTextureRGB(int var1) { return this.textures[var1] != null ? this.textures[var1].averageRGB : 0; } - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "1307146254" - ) - public boolean vmethod3284(int var1) { - return this.textures[var1].field1602; - } - - @ObfuscatedName("b") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(IB)Z", - garbageValue = "0" + garbageValue = "1" + ) + public boolean vmethod3347(int var1) { + return this.textures[var1].field1610; + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "(II)Z", + garbageValue = "2100936507" ) @Export("isLowDetail") public boolean isLowDetail(int var1) { return this.textureSize == 64; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-2025101230" + garbageValue = "-304646242" ) @Export("clear") public void clear() { @@ -192,10 +196,10 @@ public class TextureProvider implements TextureLoader { this.remaining = this.capacity; } - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1849730240" + garbageValue = "1864865553" ) @Export("animate") public void animate(int var1) { @@ -209,17 +213,124 @@ public class TextureProvider implements TextureLoader { } - @ObfuscatedName("i") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "67" + signature = "(CB)B", + garbageValue = "-59" ) - public static void method2796(int var0) { - if (class197.field2392 != 0) { - class197.musicTrackVolume = var0; + @Export("charToByteCp1252") + public static byte charToByteCp1252(char var0) { + byte var1; + if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) { + var1 = (byte)var0; + } else if (var0 == 8364) { + var1 = -128; + } else if (var0 == 8218) { + var1 = -126; + } else if (var0 == 402) { + var1 = -125; + } else if (var0 == 8222) { + var1 = -124; + } else if (var0 == 8230) { + var1 = -123; + } else if (var0 == 8224) { + var1 = -122; + } else if (var0 == 8225) { + var1 = -121; + } else if (var0 == 710) { + var1 = -120; + } else if (var0 == 8240) { + var1 = -119; + } else if (var0 == 352) { + var1 = -118; + } else if (var0 == 8249) { + var1 = -117; + } else if (var0 == 338) { + var1 = -116; + } else if (var0 == 381) { + var1 = -114; + } else if (var0 == 8216) { + var1 = -111; + } else if (var0 == 8217) { + var1 = -110; + } else if (var0 == 8220) { + var1 = -109; + } else if (var0 == 8221) { + var1 = -108; + } else if (var0 == 8226) { + var1 = -107; + } else if (var0 == 8211) { + var1 = -106; + } else if (var0 == 8212) { + var1 = -105; + } else if (var0 == 732) { + var1 = -104; + } else if (var0 == 8482) { + var1 = -103; + } else if (var0 == 353) { + var1 = -102; + } else if (var0 == 8250) { + var1 = -101; + } else if (var0 == 339) { + var1 = -100; + } else if (var0 == 382) { + var1 = -98; + } else if (var0 == 376) { + var1 = -97; } else { - GZipDecompressor.midiPcmStream.setPcmStreamVolume(var0); + var1 = 63; } + return var1; + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(ZI)V", + garbageValue = "1809197817" + ) + public static void method2833(boolean var0) { + if (NetCache.NetCache_socket != null) { + try { + Buffer var1 = new Buffer(4); + var1.writeByte(var0 ? 2 : 3); + var1.writeMedium(0); + NetCache.NetCache_socket.write(var1.array, 0, 4); + } catch (IOException var4) { + try { + NetCache.NetCache_socket.close(); + } catch (Exception var3) { + } + + ++NetCache.NetCache_ioExceptions; + NetCache.NetCache_socket = null; + } + + } + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(IIIIIIII)Z", + garbageValue = "1939701363" + ) + static final boolean method2811(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + int var7 = ViewportMouse.ViewportMouse_y + var6; + if (var7 < var0 && var7 < var1 && var7 < var2) { + return false; + } else { + var7 = ViewportMouse.ViewportMouse_y - var6; + if (var7 > var0 && var7 > var1 && var7 > var2) { + return false; + } else { + var7 = ViewportMouse.ViewportMouse_x + var6; + if (var7 < var3 && var7 < var4 && var7 < var5) { + return false; + } else { + var7 = ViewportMouse.ViewportMouse_x - var6; + return var7 <= var3 || var7 <= var4 || var7 <= var5; + } + } + } } } diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java index 4261bde4fd..b7f1c8026b 100644 --- a/runescape-client/src/main/java/Tile.java +++ b/runescape-client/src/main/java/Tile.java @@ -1,132 +1,135 @@ +import java.awt.Desktop; +import java.awt.Desktop.Action; +import java.net.URI; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dy") +@ObfuscatedName("dz") @Implements("Tile") public final class Tile extends Node { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1803176159 + intValue = -477020471 ) @Export("plane") int plane; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -2007130967 + intValue = -1716517237 ) @Export("x") int x; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1326950391 + intValue = 1137721201 ) @Export("y") int y; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -215553835 + intValue = -2077595523 ) @Export("originalPlane") int originalPlane; - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lef;" - ) - @Export("paint") - TilePaint paint; - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Ldv;" - ) - @Export("model") - TileModel model; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Ler;" - ) - @Export("boundaryObject") - BoundaryObject boundaryObject; - @ObfuscatedName("x") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "Lee;" ) + @Export("paint") + TilePaint paint; + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "Ldt;" + ) + @Export("model") + TileModel model; + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "Leu;" + ) + @Export("boundaryObject") + BoundaryObject boundaryObject; + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "Len;" + ) @Export("wallDecoration") WallDecoration wallDecoration; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "Ldu;" ) @Export("floorDecoration") FloorDecoration floorDecoration; - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Ldc;" + signature = "Ldk;" ) @Export("tileItemPile") TileItemPile tileItemPile; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1462066179 + intValue = -1422843585 ) @Export("gameObjectsCount") int gameObjectsCount; - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "[Lel;" + signature = "[Lea;" ) @Export("gameObjects") GameObject[] gameObjects; @ObfuscatedName("v") @Export("gameObjectEdgeMasks") int[] gameObjectEdgeMasks; - @ObfuscatedName("k") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 2119940373 + intValue = 848654297 ) @Export("gameObjectsEdgeMask") int gameObjectsEdgeMask; - @ObfuscatedName("s") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -322964403 + intValue = -2052178019 ) @Export("minPlane") int minPlane; - @ObfuscatedName("l") + @ObfuscatedName("w") @Export("drawPrimary") boolean drawPrimary; - @ObfuscatedName("t") + @ObfuscatedName("k") @Export("drawSecondary") boolean drawSecondary; - @ObfuscatedName("j") + @ObfuscatedName("q") @Export("drawGameObjects") boolean drawGameObjects; - @ObfuscatedName("n") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1942439905 + intValue = 902411349 ) @Export("drawGameObjectEdges") int drawGameObjectEdges; - @ObfuscatedName("u") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 413999433 + intValue = -381817665 ) - int field1630; - @ObfuscatedName("z") + int field1650; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1503891955 + intValue = 1422099387 ) int field1640; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1195282039 + intValue = -1581215505 ) - int field1641; - @ObfuscatedName("m") + int field1652; + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "Ldy;" + signature = "Ldz;" ) @Export("linkedBelowTile") Tile linkedBelowTile; @@ -140,22 +143,40 @@ public final class Tile extends Node { this.y = var3; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IB)Lha;", - garbageValue = "0" + signature = "(Ljava/lang/String;ZLjava/lang/String;ZB)V", + garbageValue = "20" ) - @Export("getWidget") - public static Widget getWidget(int var0) { - int var1 = var0 >> 16; - int var2 = var0 & 65535; - if (UserComparator7.Widget_interfaceComponents[var1] == null || UserComparator7.Widget_interfaceComponents[var1][var2] == null) { - boolean var3 = MusicPatch.loadInterface(var1); - if (!var3) { - return null; + static void method2927(String var0, boolean var1, String var2, boolean var3) { + if (var1) { + if (!var3 && Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { + try { + Desktop.getDesktop().browse(new URI(var0)); + return; + } catch (Exception var5) { + } } + + if (class51.field431.startsWith("win") && !var3) { + ClientPacket.method3682(var0, 0); + return; + } + + if (class51.field431.startsWith("mac")) { + class14.method174(var0, 1, var2); + return; + } + + ClientPacket.method3682(var0, 2); + } else { + ClientPacket.method3682(var0, 3); } - return UserComparator7.Widget_interfaceComponents[var1][var2]; + } + + @ObfuscatedName("l") + public static int method2926(long var0) { + return (int)(var0 >>> 14 & 3L); } } diff --git a/runescape-client/src/main/java/TileItem.java b/runescape-client/src/main/java/TileItem.java index 4f1fa3862c..9bd7d405c0 100644 --- a/runescape-client/src/main/java/TileItem.java +++ b/runescape-client/src/main/java/TileItem.java @@ -4,18 +4,24 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ca") +@ObfuscatedName("cf") @Implements("TileItem") public final class TileItem extends Entity { - @ObfuscatedName("f") + @ObfuscatedName("sf") + @ObfuscatedSignature( + signature = "Lky;" + ) + @Export("masterDisk") + static ArchiveDisk masterDisk; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -402020319 + intValue = -1909413627 ) @Export("id") int id; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 260716727 + intValue = -1504274747 ) @Export("quantity") int quantity; @@ -23,13 +29,13 @@ public final class TileItem extends Entity { TileItem() { } - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)Ldw;", - garbageValue = "822221372" + signature = "(I)Ldx;", + garbageValue = "-2133076860" ) @Export("getModel") protected final Model getModel() { - return PacketBufferNode.ItemDefinition_get(this.id).getModel(this.quantity); + return HealthBarDefinition.ItemDefinition_get(this.id).getModel(this.quantity); } } diff --git a/runescape-client/src/main/java/TileItemPile.java b/runescape-client/src/main/java/TileItemPile.java index a7b433f56c..9ac6e0bfd3 100644 --- a/runescape-client/src/main/java/TileItemPile.java +++ b/runescape-client/src/main/java/TileItemPile.java @@ -3,62 +3,64 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("dc") +@ObfuscatedName("dk") @Implements("TileItemPile") public final class TileItemPile { - @ObfuscatedName("so") - @ObfuscatedGetter( - longValue = 3482799438459679755L + @ObfuscatedName("n") + static int[] field1529; + @ObfuscatedName("dl") + @ObfuscatedSignature( + signature = "Lfw;" ) - static long field1522; - @ObfuscatedName("cn") - public static char field1521; - @ObfuscatedName("f") + @Export("js5SocketTask") + static Task js5SocketTask; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 2053459421 + intValue = -2033716223 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 972029952 + intValue = -1107292427 ) @Export("x") int x; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1850274101 + intValue = -23532387 ) @Export("y") int y; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lep;" + signature = "Leq;" ) @Export("first") Entity first; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lep;" + signature = "Leq;" ) @Export("second") Entity second; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lep;" + signature = "Leq;" ) @Export("third") Entity third; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - longValue = 6402708744668809381L + longValue = -3787059622854517303L ) @Export("tag") long tag; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 790929517 + intValue = -1744299723 ) @Export("height") int height; @@ -66,12 +68,175 @@ public final class TileItemPile { TileItemPile() { } - @ObfuscatedName("l") + @ObfuscatedName("c") + static double method2836(double var0) { + return Math.exp(-var0 * var0 / 2.0D) / Math.sqrt(6.283185307179586D); + } + + @ObfuscatedName("au") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-2014741616" + signature = "(ILce;ZB)I", + garbageValue = "-128" ) - static final int method2797() { - return ViewportMouse.ViewportMouse_y; + static int method2834(int var0, Script var1, boolean var2) { + int var3; + int var4; + if (var0 == ScriptOpcodes.ADD) { + class320.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3 + var4; + return 1; + } else if (var0 == ScriptOpcodes.SUB) { + class320.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3 - var4; + return 1; + } else if (var0 == ScriptOpcodes.MULTIPLY) { + class320.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var4 * var3; + return 1; + } else if (var0 == ScriptOpcodes.DIV) { + class320.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3 / var4; + return 1; + } else if (var0 == ScriptOpcodes.RANDOM) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); + return 1; + } else if (var0 == ScriptOpcodes.RANDOMINC) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); + return 1; + } else if (var0 == ScriptOpcodes.INTERPOLATE) { + class320.Interpreter_intStackSize -= 5; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + int var5 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 2]; + int var6 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 3]; + int var7 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 4]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5); + return 1; + } else if (var0 == ScriptOpcodes.ADDPERCENT) { + class320.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3 + var3 * var4 / 100; + return 1; + } else if (var0 == ScriptOpcodes.SETBIT) { + class320.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3 | 1 << var4; + return 1; + } else if (var0 == ScriptOpcodes.CLEARBIT) { + class320.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); + return 1; + } else if (var0 == ScriptOpcodes.TESTBIT) { + class320.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.MOD) { + class320.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3 % var4; + return 1; + } else if (var0 == ScriptOpcodes.POW) { + class320.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + if (var3 == 0) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); + } + + return 1; + } else if (var0 == ScriptOpcodes.INVPOW) { + class320.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + if (var3 == 0) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + return 1; + } else { + switch(var4) { + case 0: + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; + break; + case 1: + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3; + break; + case 2: + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); + break; + case 3: + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); + break; + case 4: + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); + break; + default: + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); + } + + return 1; + } + } else if (var0 == ScriptOpcodes.AND) { + class320.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3 & var4; + return 1; + } else if (var0 == ScriptOpcodes.OR) { + class320.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3 | var4; + return 1; + } else if (var0 == ScriptOpcodes.SCALE) { + class320.Interpreter_intStackSize -= 3; + long var9 = (long)Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + long var11 = (long)Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + long var13 = (long)Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 2]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = (int)(var9 * var13 / var11); + return 1; + } else { + return 2; + } + } + + @ObfuscatedName("gz") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "182557525" + ) + static final void method2835() { + Client.field759 = 0; + int var0 = Messages.baseX * 64 + (class192.localPlayer.x >> 7); + int var1 = Language.baseY * 64 + (class192.localPlayer.y >> 7); + if (var0 >= 3053 && var0 <= 3156 && var1 >= 3056 && var1 <= 3136) { + Client.field759 = 1; + } + + if (var0 >= 3072 && var0 <= 3118 && var1 >= 9492 && var1 <= 9535) { + Client.field759 = 1; + } + + if (Client.field759 == 1 && var0 >= 3139 && var0 <= 3199 && var1 >= 3008 && var1 <= 3062) { + Client.field759 = 0; + } + } } diff --git a/runescape-client/src/main/java/TileModel.java b/runescape-client/src/main/java/TileModel.java index 158d4a498c..3ea9f10a35 100644 --- a/runescape-client/src/main/java/TileModel.java +++ b/runescape-client/src/main/java/TileModel.java @@ -2,77 +2,77 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("dv") +@ObfuscatedName("dt") @Implements("TileModel") public final class TileModel { - @ObfuscatedName("l") - static int[] field1578; - @ObfuscatedName("t") - static int[] field1579; - @ObfuscatedName("j") - static int[] field1580; - @ObfuscatedName("n") - static int[] field1564; - @ObfuscatedName("u") - static int[] field1582; + @ObfuscatedName("w") + static int[] field1590; + @ObfuscatedName("k") + static int[] field1584; + @ObfuscatedName("q") + static int[] field1575; @ObfuscatedName("z") - static final int[][] field1569; - @ObfuscatedName("h") - static final int[][] field1584; + static int[] field1593; + @ObfuscatedName("y") + static int[] field1594; @ObfuscatedName("f") + static final int[][] field1595; + @ObfuscatedName("b") + static final int[][] field1592; + @ObfuscatedName("c") @Export("vertexX") int[] vertexX; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("vertexY") int[] vertexY; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("vertexZ") int[] vertexZ; - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("triangleColorA") int[] triangleColorA; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("triangleColorB") int[] triangleColorB; - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("triangleColorC") int[] triangleColorC; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("faceX") int[] faceX; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("faceY") int[] faceY; - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("faceZ") int[] faceZ; - @ObfuscatedName("d") + @ObfuscatedName("m") @Export("triangleTextureId") int[] triangleTextureId; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("isFlat") boolean isFlat; - @ObfuscatedName("o") + @ObfuscatedName("h") @Export("shape") int shape; @ObfuscatedName("v") @Export("rotation") int rotation; - @ObfuscatedName("k") + @ObfuscatedName("n") @Export("underlayRgb") int underlayRgb; - @ObfuscatedName("s") + @ObfuscatedName("x") @Export("overlayRgb") int overlayRgb; static { - field1578 = new int[6]; - field1579 = new int[6]; - field1580 = new int[6]; - field1564 = new int[6]; - field1582 = new int[6]; - field1569 = new int[][]{{1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 2, 6}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 13, 14}}; - field1584 = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}}; + field1590 = new int[6]; + field1584 = new int[6]; + field1575 = new int[6]; + field1593 = new int[6]; + field1594 = new int[6]; + field1595 = new int[][]{{1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 2, 6}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 13, 14}}; + field1592 = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}}; } TileModel(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19) { @@ -89,7 +89,7 @@ public final class TileModel { int var21 = var20 / 2; int var22 = var20 / 4; int var23 = var20 * 3 / 4; - int[] var24 = field1569[var1]; + int[] var24 = field1595[var1]; int var25 = var24.length; this.vertexX = new int[var25]; this.vertexY = new int[var25]; @@ -224,7 +224,7 @@ public final class TileModel { var27[var30] = var36; } - int[] var38 = field1584[var1]; + int[] var38 = field1592[var1]; var31 = var38.length / 4; this.faceX = new int[var31]; this.faceY = new int[var31]; diff --git a/runescape-client/src/main/java/TilePaint.java b/runescape-client/src/main/java/TilePaint.java index 931c8a9eb5..684bd4879c 100644 --- a/runescape-client/src/main/java/TilePaint.java +++ b/runescape-client/src/main/java/TilePaint.java @@ -2,46 +2,47 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ef") +@ObfuscatedName("ee") @Implements("TilePaint") public final class TilePaint { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 4463315 + intValue = 1255983765 ) @Export("swColor") int swColor; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 404094577 + intValue = -1109558685 ) @Export("seColor") int seColor; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1273471255 + intValue = -1229444571 ) @Export("neColor") int neColor; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1327164447 + intValue = -906668191 ) @Export("nwColor") int nwColor; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 111176121 + intValue = -2043941121 ) @Export("texture") int texture; - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("isFlat") boolean isFlat; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -387555393 + intValue = -860591445 ) @Export("rgb") int rgb; @@ -56,4 +57,52 @@ public final class TilePaint { this.rgb = var6; this.isFlat = var7; } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(Lhc;I)V", + garbageValue = "-1948306061" + ) + public static void method3150(Huffman var0) { + class210.huffman = var0; + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(Lii;Lii;Lii;I)V", + garbageValue = "811407537" + ) + public static void method3149(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { + SequenceDefinition.SequenceDefinition_archive = var0; + Canvas.SequenceDefinition_animationsArchive = var1; + SequenceDefinition.SequenceDefinition_skeletonsArchive = var2; + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(Lgi;Llw;I)Lgs;", + garbageValue = "-1858964465" + ) + @Export("getPacketBufferNode") + public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { + PacketBufferNode var2 = UserComparator5.method3488(); + var2.clientPacket = var0; + var2.clientPacketLength = var0.length; + if (var2.clientPacketLength == -1) { + var2.packetBuffer = new PacketBuffer(260); + } else if (var2.clientPacketLength == -2) { + var2.packetBuffer = new PacketBuffer(10000); + } else if (var2.clientPacketLength <= 18) { + var2.packetBuffer = new PacketBuffer(20); + } else if (var2.clientPacketLength <= 98) { + var2.packetBuffer = new PacketBuffer(100); + } else { + var2.packetBuffer = new PacketBuffer(260); + } + + var2.packetBuffer.setIsaacCipher(var1); + var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); + var2.index = 0; + return var2; + } } diff --git a/runescape-client/src/main/java/Tiles.java b/runescape-client/src/main/java/Tiles.java index 1ff17e0827..4af0637b54 100644 --- a/runescape-client/src/main/java/Tiles.java +++ b/runescape-client/src/main/java/Tiles.java @@ -3,496 +3,179 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bl") +@ObfuscatedName("bk") @Implements("Tiles") public final class Tiles { - @ObfuscatedName("qd") - @ObfuscatedSignature( - signature = "Lcy;" - ) - @Export("pcmStreamMixer") - static PcmStreamMixer pcmStreamMixer; - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("Tiles_heights") static int[][][] Tiles_heights; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("Tiles_renderFlags") static byte[][][] Tiles_renderFlags; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1383080381 + intValue = -118774103 ) @Export("Tiles_minPlane") static int Tiles_minPlane; - @ObfuscatedName("p") - static byte[][][] field498; - @ObfuscatedName("b") - static byte[][][] field494; @ObfuscatedName("e") - static byte[][][] field493; - @ObfuscatedName("x") - static byte[][][] field496; - @ObfuscatedName("v") - @Export("Tiles_hueMultiplier") - static int[] Tiles_hueMultiplier; - @ObfuscatedName("s") - static int[][][] field501; - @ObfuscatedName("n") - static final int[] field499; - @ObfuscatedName("u") - static final int[] field500; - @ObfuscatedName("z") - static final int[] field506; - @ObfuscatedName("h") - static final int[] field502; - @ObfuscatedName("m") - static final int[] field503; + static byte[][][] field502; + @ObfuscatedName("i") + static byte[][][] field514; @ObfuscatedName("g") - static final int[] field504; + static byte[][][] field507; + @ObfuscatedName("d") + static byte[][][] field518; + @ObfuscatedName("j") + static int[][] field509; + @ObfuscatedName("z") + static final int[] field508; + @ObfuscatedName("y") + static final int[] field513; + @ObfuscatedName("f") + static final int[] field506; + @ObfuscatedName("b") + static final int[] field516; @ObfuscatedName("r") + static final int[] field503; + @ObfuscatedName("s") + static final int[] field517; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -550988809 + intValue = -1347030255 ) - static int field505; - @ObfuscatedName("q") + static int field512; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -2113033627 + intValue = 563851447 ) - static int field492; + static int field519; + @ObfuscatedName("gm") + @Export("regionLandArchives") + static byte[][] regionLandArchives; static { Tiles_heights = new int[4][105][105]; Tiles_renderFlags = new byte[4][104][104]; Tiles_minPlane = 99; - field499 = new int[]{1, 2, 4, 8}; - field500 = new int[]{16, 32, 64, 128}; + field508 = new int[]{1, 2, 4, 8}; + field513 = new int[]{16, 32, 64, 128}; field506 = new int[]{1, 0, -1, 0}; - field502 = new int[]{0, -1, 0, 1}; + field516 = new int[]{0, -1, 0, 1}; field503 = new int[]{1, -1, -1, 1}; - field504 = new int[]{-1, -1, 1, 1}; - field505 = (int)(Math.random() * 17.0D) - 8; - field492 = (int)(Math.random() * 33.0D) - 16; + field517 = new int[]{-1, -1, 1, 1}; + field512 = (int)(Math.random() * 17.0D) - 8; + field519 = (int)(Math.random() * 33.0D) - 16; } - @ObfuscatedName("f") - public static final int method1121(double var0, double var2, double var4) { - double var6 = var4; - double var8 = var4; - double var10 = var4; - if (var2 != 0.0D) { - double var12; - if (var4 < 0.5D) { - var12 = var4 * (var2 + 1.0D); - } else { - var12 = var2 + var4 - var2 * var4; - } - - double var14 = var4 * 2.0D - var12; - double var16 = 0.3333333333333333D + var0; - if (var16 > 1.0D) { - --var16; - } - - double var20 = var0 - 0.3333333333333333D; - if (var20 < 0.0D) { - ++var20; - } - - if (6.0D * var16 < 1.0D) { - var6 = var14 + var16 * (var12 - var14) * 6.0D; - } else if (var16 * 2.0D < 1.0D) { - var6 = var12; - } else if (3.0D * var16 < 2.0D) { - var6 = var14 + (0.6666666666666666D - var16) * (var12 - var14) * 6.0D; - } else { - var6 = var14; - } - - if (var0 * 6.0D < 1.0D) { - var8 = var14 + (var12 - var14) * 6.0D * var0; - } else if (var0 * 2.0D < 1.0D) { - var8 = var12; - } else if (var0 * 3.0D < 2.0D) { - var8 = var14 + (0.6666666666666666D - var0) * (var12 - var14) * 6.0D; - } else { - var8 = var14; - } - - if (6.0D * var20 < 1.0D) { - var10 = var14 + 6.0D * (var12 - var14) * var20; - } else if (2.0D * var20 < 1.0D) { - var10 = var12; - } else if (3.0D * var20 < 2.0D) { - var10 = var14 + 6.0D * (0.6666666666666666D - var20) * (var12 - var14); - } else { - var10 = var14; - } - } - - int var22 = (int)(256.0D * var6); - int var13 = (int)(var8 * 256.0D); - int var23 = (int)(256.0D * var10); - int var15 = var23 + (var13 << 8) + (var22 << 16); - return var15; - } - - @ObfuscatedName("y") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "([BI)Lcu;", - garbageValue = "398974566" + signature = "(Ljava/lang/CharSequence;II[BII)I", + garbageValue = "-1076668980" ) - @Export("newScript") - static Script newScript(byte[] var0) { - Script var1 = new Script(); - Buffer var2 = new Buffer(var0); - var2.offset = var2.array.length - 2; - int var3 = var2.readUnsignedShort(); - int var4 = var2.array.length - 2 - var3 - 12; - var2.offset = var4; - int var5 = var2.readInt(); - var1.localIntCount = var2.readUnsignedShort(); - var1.localStringCount = var2.readUnsignedShort(); - var1.intArgumentCount = var2.readUnsignedShort(); - var1.stringArgumentCount = var2.readUnsignedShort(); - int var6 = var2.readUnsignedByte(); - int var7; - int var8; - if (var6 > 0) { - var1.switches = var1.newIterableNodeHashTable(var6); + @Export("encodeStringCp1252") + public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { + int var5 = var2 - var1; - for (var7 = 0; var7 < var6; ++var7) { - var8 = var2.readUnsignedShort(); - int var9; - int var11; - if (var8 > 0) { - var11 = var8 - 1; - var11 |= var11 >>> 1; - var11 |= var11 >>> 2; - var11 |= var11 >>> 4; - var11 |= var11 >>> 8; - var11 |= var11 >>> 16; - int var10 = var11 + 1; - var9 = var10; - } else { - var9 = 1; - } - - IterableNodeHashTable var13 = new IterableNodeHashTable(var9); - var1.switches[var7] = var13; - - while (var8-- > 0) { - var11 = var2.readInt(); - int var12 = var2.readInt(); - var13.put(new IntegerNode(var12), (long)var11); - } - } - } - - var2.offset = 0; - var2.readStringCp1252NullTerminatedOrNull(); - var1.opcodes = new int[var5]; - var1.intOperands = new int[var5]; - var1.stringOperands = new String[var5]; - - for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { - var8 = var2.readUnsignedShort(); - if (var8 == 3) { - var1.stringOperands[var7] = var2.readStringCp1252NullTerminated(); - } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { - var1.intOperands[var7] = var2.readInt(); + for (int var6 = 0; var6 < var5; ++var6) { + char var7 = var0.charAt(var6 + var1); + if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { + var3[var6 + var4] = (byte)var7; + } else if (var7 == 8364) { + var3[var6 + var4] = -128; + } else if (var7 == 8218) { + var3[var6 + var4] = -126; + } else if (var7 == 402) { + var3[var6 + var4] = -125; + } else if (var7 == 8222) { + var3[var6 + var4] = -124; + } else if (var7 == 8230) { + var3[var6 + var4] = -123; + } else if (var7 == 8224) { + var3[var6 + var4] = -122; + } else if (var7 == 8225) { + var3[var6 + var4] = -121; + } else if (var7 == 710) { + var3[var6 + var4] = -120; + } else if (var7 == 8240) { + var3[var6 + var4] = -119; + } else if (var7 == 352) { + var3[var6 + var4] = -118; + } else if (var7 == 8249) { + var3[var6 + var4] = -117; + } else if (var7 == 338) { + var3[var6 + var4] = -116; + } else if (var7 == 381) { + var3[var6 + var4] = -114; + } else if (var7 == 8216) { + var3[var6 + var4] = -111; + } else if (var7 == 8217) { + var3[var6 + var4] = -110; + } else if (var7 == 8220) { + var3[var6 + var4] = -109; + } else if (var7 == 8221) { + var3[var6 + var4] = -108; + } else if (var7 == 8226) { + var3[var6 + var4] = -107; + } else if (var7 == 8211) { + var3[var6 + var4] = -106; + } else if (var7 == 8212) { + var3[var6 + var4] = -105; + } else if (var7 == 732) { + var3[var6 + var4] = -104; + } else if (var7 == 8482) { + var3[var6 + var4] = -103; + } else if (var7 == 353) { + var3[var6 + var4] = -102; + } else if (var7 == 8250) { + var3[var6 + var4] = -101; + } else if (var7 == 339) { + var3[var6 + var4] = -100; + } else if (var7 == 382) { + var3[var6 + var4] = -98; + } else if (var7 == 376) { + var3[var6 + var4] = -97; } else { - var1.intOperands[var7] = var2.readUnsignedByte(); + var3[var6 + var4] = 63; } } - return var1; + return var5; } - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "-2042821190" + signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V", + garbageValue = "96" ) - static final void method1143(String var0) { - class83.addGameMessage(30, "", var0); + @Export("setLoginResponseString") + static void setLoginResponseString(String var0, String var1, String var2) { + Login.Login_response1 = var0; + Login.Login_response2 = var1; + Login.Login_response3 = var2; } - @ObfuscatedName("ar") + @ObfuscatedName("gg") @ObfuscatedSignature( - signature = "(ILcu;ZI)I", - garbageValue = "-697994458" + signature = "(I)V", + garbageValue = "1651271456" ) - static int method1144(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.publicChatMode; - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { - class188.Interpreter_intStackSize -= 3; - Client.publicChatMode = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - Calendar.privateChatMode = class50.method893(Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]); - if (Calendar.privateChatMode == null) { - Calendar.privateChatMode = PrivateChatMode.field3791; - } - - Client.tradeChatMode = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2]; - PacketBufferNode var18 = class2.getPacketBufferNode(ClientPacket.field2175, Client.packetWriter.isaacCipher); - var18.packetBuffer.writeByte(Client.publicChatMode); - var18.packetBuffer.writeByte(Calendar.privateChatMode.field3793); - var18.packetBuffer.writeByte(Client.tradeChatMode); - Client.packetWriter.addNode(var18); - return 1; - } else { - String var3; - int var4; - if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { - var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - class188.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - int var5 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - PacketBufferNode var6 = class2.getPacketBufferNode(ClientPacket.field2221, Client.packetWriter.isaacCipher); - var6.packetBuffer.writeByte(ViewportMouse.stringCp1252NullTerminatedByteSize(var3) + 2); - var6.packetBuffer.writeStringCp1252NullTerminated(var3); - var6.packetBuffer.writeByte(var4 - 1); - var6.packetBuffer.writeByte(var5); - Client.packetWriter.addNode(var6); - return 1; - } else { - int var10; - if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { - class188.Interpreter_intStackSize -= 2; - var10 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - Message var15 = class210.Messages_getByChannelAndID(var10, var4); - if (var15 != null) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var15.count; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var15.cycle; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var15.sender != null ? var15.sender : ""; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var15.prefix != null ? var15.prefix : ""; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var15.text != null ? var15.text : ""; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var15.isFromFriend() ? 1 : (var15.isFromIgnored() ? 2 : 0); + static final void method1156() { + for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { + if (var0.plane == Clock.Client_plane && !var0.isFinished) { + if (Client.cycle >= var0.cycleStart) { + var0.advance(Client.field707); + if (var0.isFinished) { + var0.remove(); } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + ServerBuild.scene.drawEntity(var0.plane, var0.x, var0.y, var0.height, 60, var0, 0, -1L, false); } - - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { - var10 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Message var16 = LoginPacket.Messages_getMessage(var10); - if (var16 != null) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var16.type; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var16.cycle; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var16.sender != null ? var16.sender : ""; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var16.prefix != null ? var16.prefix : ""; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var16.text != null ? var16.text : ""; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var16.isFromFriend() ? 1 : (var16.isFromIgnored() ? 2 : 0); - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { - if (Calendar.privateChatMode == null) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Calendar.privateChatMode.field3793; - } - - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { - var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - String var14 = var3.toLowerCase(); - byte var17 = 0; - if (var14.startsWith("yellow:")) { - var17 = 0; - var3 = var3.substring("yellow:".length()); - } else if (var14.startsWith("red:")) { - var17 = 1; - var3 = var3.substring("red:".length()); - } else if (var14.startsWith("green:")) { - var17 = 2; - var3 = var3.substring("green:".length()); - } else if (var14.startsWith("cyan:")) { - var17 = 3; - var3 = var3.substring("cyan:".length()); - } else if (var14.startsWith("purple:")) { - var17 = 4; - var3 = var3.substring("purple:".length()); - } else if (var14.startsWith("white:")) { - var17 = 5; - var3 = var3.substring("white:".length()); - } else if (var14.startsWith("flash1:")) { - var17 = 6; - var3 = var3.substring("flash1:".length()); - } else if (var14.startsWith("flash2:")) { - var17 = 7; - var3 = var3.substring("flash2:".length()); - } else if (var14.startsWith("flash3:")) { - var17 = 8; - var3 = var3.substring("flash3:".length()); - } else if (var14.startsWith("glow1:")) { - var17 = 9; - var3 = var3.substring("glow1:".length()); - } else if (var14.startsWith("glow2:")) { - var17 = 10; - var3 = var3.substring("glow2:".length()); - } else if (var14.startsWith("glow3:")) { - var17 = 11; - var3 = var3.substring("glow3:".length()); - } else if (Varps.clientLanguage != Language.Language_EN) { - if (var14.startsWith("yellow:")) { - var17 = 0; - var3 = var3.substring("yellow:".length()); - } else if (var14.startsWith("red:")) { - var17 = 1; - var3 = var3.substring("red:".length()); - } else if (var14.startsWith("green:")) { - var17 = 2; - var3 = var3.substring("green:".length()); - } else if (var14.startsWith("cyan:")) { - var17 = 3; - var3 = var3.substring("cyan:".length()); - } else if (var14.startsWith("purple:")) { - var17 = 4; - var3 = var3.substring("purple:".length()); - } else if (var14.startsWith("white:")) { - var17 = 5; - var3 = var3.substring("white:".length()); - } else if (var14.startsWith("flash1:")) { - var17 = 6; - var3 = var3.substring("flash1:".length()); - } else if (var14.startsWith("flash2:")) { - var17 = 7; - var3 = var3.substring("flash2:".length()); - } else if (var14.startsWith("flash3:")) { - var17 = 8; - var3 = var3.substring("flash3:".length()); - } else if (var14.startsWith("glow1:")) { - var17 = 9; - var3 = var3.substring("glow1:".length()); - } else if (var14.startsWith("glow2:")) { - var17 = 10; - var3 = var3.substring("glow2:".length()); - } else if (var14.startsWith("glow3:")) { - var17 = 11; - var3 = var3.substring("glow3:".length()); - } - } - - var14 = var3.toLowerCase(); - byte var7 = 0; - if (var14.startsWith("wave:")) { - var7 = 1; - var3 = var3.substring("wave:".length()); - } else if (var14.startsWith("wave2:")) { - var7 = 2; - var3 = var3.substring("wave2:".length()); - } else if (var14.startsWith("shake:")) { - var7 = 3; - var3 = var3.substring("shake:".length()); - } else if (var14.startsWith("scroll:")) { - var7 = 4; - var3 = var3.substring("scroll:".length()); - } else if (var14.startsWith("slide:")) { - var7 = 5; - var3 = var3.substring("slide:".length()); - } else if (Varps.clientLanguage != Language.Language_EN) { - if (var14.startsWith("wave:")) { - var7 = 1; - var3 = var3.substring("wave:".length()); - } else if (var14.startsWith("wave2:")) { - var7 = 2; - var3 = var3.substring("wave2:".length()); - } else if (var14.startsWith("shake:")) { - var7 = 3; - var3 = var3.substring("shake:".length()); - } else if (var14.startsWith("scroll:")) { - var7 = 4; - var3 = var3.substring("scroll:".length()); - } else if (var14.startsWith("slide:")) { - var7 = 5; - var3 = var3.substring("slide:".length()); - } - } - - PacketBufferNode var8 = class2.getPacketBufferNode(ClientPacket.field2249, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeByte(0); - int var9 = var8.packetBuffer.offset; - var8.packetBuffer.writeByte(var4); - var8.packetBuffer.writeByte(var17); - var8.packetBuffer.writeByte(var7); - GrandExchangeOfferUnitPriceComparator.method122(var8.packetBuffer, var3); - var8.packetBuffer.writeLengthByte(var8.packetBuffer.offset - var9); - Client.packetWriter.addNode(var8); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { - class65.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[class65.Interpreter_stringStackSize]; - String var12 = Interpreter.Interpreter_stringStack[class65.Interpreter_stringStackSize + 1]; - PacketBufferNode var11 = class2.getPacketBufferNode(ClientPacket.field2177, Client.packetWriter.isaacCipher); - var11.packetBuffer.writeShort(0); - int var13 = var11.packetBuffer.offset; - var11.packetBuffer.writeStringCp1252NullTerminated(var3); - GrandExchangeOfferUnitPriceComparator.method122(var11.packetBuffer, var12); - var11.packetBuffer.writeLengthShort(var11.packetBuffer.offset - var13); - Client.packetWriter.addNode(var11); - return 1; - } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { - if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.tradeChatMode; - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { - var10 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = MouseHandler.Messages_getHistorySize(var10); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { - var10 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = WorldMapSection0.Messages_getNextChatID(var10); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { - var10 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = AttackOption.Messages_getLastChatID(var10); - return 1; - } else if (var0 == ScriptOpcodes.DOCHEAT) { - var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - TaskHandler.doCheat(var3); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { - Client.field846 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize].toLowerCase().trim(); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = Client.field846; - return 1; - } else if (var0 == ScriptOpcodes.DEBUGMES) { - var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - System.out.println(var3); - return 1; - } else { - return 2; - } - } else { - if (Message.localPlayer != null && Message.localPlayer.username != null) { - var3 = Message.localPlayer.username.getName(); - } else { - var3 = ""; - } - - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3; - return 1; } + } else { + var0.remove(); } } + } } diff --git a/runescape-client/src/main/java/Timer.java b/runescape-client/src/main/java/Timer.java index 27b1751b18..f14a24bc27 100644 --- a/runescape-client/src/main/java/Timer.java +++ b/runescape-client/src/main/java/Timer.java @@ -4,161 +4,161 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jx") +@ObfuscatedName("jn") @Implements("Timer") public class Timer { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedGetter( - longValue = 1687468324454291725L + longValue = -5854066689636812733L ) - long field3560; - @ObfuscatedName("i") + long field3575; + @ObfuscatedName("t") @ObfuscatedGetter( - longValue = 7655978754782259035L + longValue = -7523897199781097135L ) - long field3554; - @ObfuscatedName("y") - public boolean field3555; - @ObfuscatedName("w") - @ObfuscatedGetter( - longValue = 1665338134164527579L - ) - long field3556; - @ObfuscatedName("p") - @ObfuscatedGetter( - longValue = -779441764559487179L - ) - long field3559; - @ObfuscatedName("b") - @ObfuscatedGetter( - longValue = 4469164127837216533L - ) - long field3558; + long field3568; + @ObfuscatedName("o") + public boolean field3569; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 602333417 + longValue = 1307131764923953489L ) - int field3562; - @ObfuscatedName("x") + long field3570; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1059100831 + longValue = -1356096473288243273L ) - int field3557; - @ObfuscatedName("a") + long field3571; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1625866105 + longValue = 7486360679644359965L ) - int field3561; + long field3567; @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -463850423 + intValue = 1117727777 ) - int field3563; + int field3572; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1378192309 + ) + int field3574; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -966098649 + ) + int field3573; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 895210041 + ) + int field3576; public Timer() { - this.field3560 = -1L; - this.field3554 = -1L; - this.field3555 = false; - this.field3556 = 0L; - this.field3559 = 0L; - this.field3558 = 0L; - this.field3562 = 0; - this.field3557 = 0; - this.field3561 = 0; - this.field3563 = 0; + this.field3575 = -1L; + this.field3568 = -1L; + this.field3569 = false; + this.field3570 = 0L; + this.field3571 = 0L; + this.field3567 = 0L; + this.field3572 = 0; + this.field3574 = 0; + this.field3573 = 0; + this.field3576 = 0; } - @ObfuscatedName("f") + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "40" + ) + public void method5044() { + this.field3575 = WorldMapIcon_0.currentTimeMillis(); + } + + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1677674321" + garbageValue = "-1041013158" ) - public void method5016() { - this.field3560 = WorldMapID.currentTimeMillis(); + public void method5045() { + if (this.field3575 != -1L) { + this.field3571 = WorldMapIcon_0.currentTimeMillis() - this.field3575; + this.field3575 = -1L; + } + + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "1882461656" + ) + public void method5062(int var1) { + this.field3568 = WorldMapIcon_0.currentTimeMillis(); + this.field3572 = var1; + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "2083921672" + ) + public void method5047() { + if (this.field3568 != -1L) { + this.field3570 = WorldMapIcon_0.currentTimeMillis() - this.field3568; + this.field3568 = -1L; + } + + ++this.field3573; + this.field3569 = true; } @ObfuscatedName("i") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "608753777" + garbageValue = "-510534855" ) - public void method5025() { - if (-1L != this.field3560) { - this.field3559 = WorldMapID.currentTimeMillis() - this.field3560; - this.field3560 = -1L; - } - + public void method5057() { + this.field3569 = false; + this.field3574 = 0; } - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "45949945" - ) - public void method5017(int var1) { - this.field3554 = WorldMapID.currentTimeMillis(); - this.field3562 = var1; - } - - @ObfuscatedName("w") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1761247014" + garbageValue = "-1911888392" ) - public void method5037() { - if (this.field3554 != -1L) { - this.field3556 = WorldMapID.currentTimeMillis() - this.field3554; - this.field3554 = -1L; - } - - ++this.field3561; - this.field3555 = true; + public void method5046() { + this.method5047(); } - @ObfuscatedName("p") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1677674321" - ) - public void method5039() { - this.field3555 = false; - this.field3557 = 0; - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "541541745" - ) - public void method5020() { - this.method5037(); - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(Lkq;I)V", - garbageValue = "1449461967" + signature = "(Lkp;I)V", + garbageValue = "-822547863" ) @Export("write") public void write(Buffer var1) { - MusicPatchNode2.method3670(var1, this.field3559); - MusicPatchNode2.method3670(var1, this.field3556); - MusicPatchNode2.method3670(var1, this.field3558); - var1.writeShort(this.field3562); - var1.writeShort(this.field3557); - var1.writeShort(this.field3561); - var1.writeShort(this.field3563); + DynamicObject.method2291(var1, this.field3571); + DynamicObject.method2291(var1, this.field3570); + DynamicObject.method2291(var1, this.field3567); + var1.writeShort(this.field3572); + var1.writeShort(this.field3574); + var1.writeShort(this.field3573); + var1.writeShort(this.field3576); } @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "([BIII)I", - garbageValue = "880088989" + signature = "([BIS)I", + garbageValue = "11848" ) - public static int method5033(byte[] var0, int var1, int var2) { + public static int method5068(byte[] var0, int var1) { int var3 = -1; - for (int var4 = var1; var4 < var2; ++var4) { + for (int var4 = 0; var4 < var1; ++var4) { var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; } diff --git a/runescape-client/src/main/java/TriBool.java b/runescape-client/src/main/java/TriBool.java index 48a6159660..ec733b9150 100644 --- a/runescape-client/src/main/java/TriBool.java +++ b/runescape-client/src/main/java/TriBool.java @@ -3,24 +3,24 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jf") +@ObfuscatedName("ju") @Implements("TriBool") public class TriBool { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Ljf;" + signature = "Lju;" ) @Export("TriBool_unknown") public static final TriBool TriBool_unknown; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Ljf;" + signature = "Lju;" ) @Export("TriBool_true") public static final TriBool TriBool_true; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Ljf;" + signature = "Lju;" ) @Export("TriBool_false") public static final TriBool TriBool_false; @@ -33,70 +33,4 @@ public class TriBool { TriBool() { } - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;IZB)I", - garbageValue = "29" - ) - @Export("parseIntCustomRadix") - static int parseIntCustomRadix(CharSequence var0, int var1, boolean var2) { - if (var1 >= 2 && var1 <= 36) { - boolean var3 = false; - boolean var4 = false; - int var5 = 0; - int var6 = var0.length(); - - for (int var7 = 0; var7 < var6; ++var7) { - char var8 = var0.charAt(var7); - if (var7 == 0) { - if (var8 == '-') { - var3 = true; - continue; - } - - if (var8 == '+') { - continue; - } - } - - int var10; - if (var8 >= '0' && var8 <= '9') { - var10 = var8 - '0'; - } else if (var8 >= 'A' && var8 <= 'Z') { - var10 = var8 - '7'; - } else { - if (var8 < 'a' || var8 > 'z') { - throw new NumberFormatException(); - } - - var10 = var8 - 'W'; - } - - if (var10 >= var1) { - throw new NumberFormatException(); - } - - if (var3) { - var10 = -var10; - } - - int var9 = var5 * var1 + var10; - if (var9 / var1 != var5) { - throw new NumberFormatException(); - } - - var5 = var9; - var4 = true; - } - - if (!var4) { - throw new NumberFormatException(); - } else { - return var5; - } - } else { - throw new IllegalArgumentException("" + var1); - } - } } diff --git a/runescape-client/src/main/java/UrlRequest.java b/runescape-client/src/main/java/UrlRequest.java index 5677c8accc..f0c0fb3a4b 100644 --- a/runescape-client/src/main/java/UrlRequest.java +++ b/runescape-client/src/main/java/UrlRequest.java @@ -1,35 +1,22 @@ import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ex") +@ObfuscatedName("eg") @Implements("UrlRequest") public class UrlRequest { - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lls;" - ) - @Export("leftTitleSprite") - static Sprite leftTitleSprite; - @ObfuscatedName("d") - @Export("Tiles_hue") - static int[] Tiles_hue; - @ObfuscatedName("jr") - @ObfuscatedGetter( - intValue = -1130751947 - ) - @Export("Client_plane") - static int Client_plane; - @ObfuscatedName("f") + @ObfuscatedName("x") + static int[][][] field1940; + @ObfuscatedName("c") @Export("url") final URL url; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("isDone0") volatile boolean isDone0; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("response0") volatile byte[] response0; @@ -37,23 +24,419 @@ public class UrlRequest { this.url = var1; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "186206860" + signature = "(B)Z", + garbageValue = "41" ) @Export("isDone") public boolean isDone() { return this.isDone0; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)[B", - garbageValue = "-2113635317" + signature = "(B)[B", + garbageValue = "0" ) @Export("getResponse") public byte[] getResponse() { return this.response0; } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "72" + ) + static void method3375() { + for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var0.stream1 != null) { + class2.pcmStreamMixer.removeSubStream(var0.stream1); + var0.stream1 = null; + } + + if (var0.stream2 != null) { + class2.pcmStreamMixer.removeSubStream(var0.stream2); + var0.stream2 = null; + } + } + + ObjectSound.objectSounds.clear(); + } + + @ObfuscatedName("ad") + @ObfuscatedSignature( + signature = "(ILce;ZI)I", + garbageValue = "416833363" + ) + static int method3382(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 6600) { + var3 = Clock.Client_plane; + int var9 = Messages.baseX * 64 + (class192.localPlayer.x >> 7); + int var5 = Language.baseY * 64 + (class192.localPlayer.y >> 7); + GrandExchangeOfferUnitPriceComparator.getWorldMap().method6371(var3, var9, var5, true); + return 1; + } else { + WorldMapArea var11; + if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + String var16 = ""; + var11 = GrandExchangeOfferUnitPriceComparator.getWorldMap().getMapArea(var3); + if (var11 != null) { + var16 = var11.getExternalName(); + } + + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var16; + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + GrandExchangeOfferUnitPriceComparator.getWorldMap().setCurrentMapAreaId(var3); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.getWorldMap().getZoomLevel(); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + GrandExchangeOfferUnitPriceComparator.getWorldMap().setZoomPercentage(var3); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.getWorldMap().isCacheLoaded() ? 1 : 0; + return 1; + } else { + Coord var15; + if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { + var15 = new Coord(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); + GrandExchangeOfferUnitPriceComparator.getWorldMap().setWorldMapPositionTarget(var15.x, var15.y); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { + var15 = new Coord(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); + GrandExchangeOfferUnitPriceComparator.getWorldMap().setWorldMapPositionTargetInstant(var15.x, var15.y); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { + var15 = new Coord(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); + GrandExchangeOfferUnitPriceComparator.getWorldMap().jumpToSourceCoord(var15.plane, var15.x, var15.y); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { + var15 = new Coord(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); + GrandExchangeOfferUnitPriceComparator.getWorldMap().jumpToSourceCoordInstant(var15.plane, var15.x, var15.y); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.getWorldMap().getDisplayX(); + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.getWorldMap().getDisplayY(); + return 1; + } else { + WorldMapArea var13; + if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + var13 = GrandExchangeOfferUnitPriceComparator.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var13.getOrigin().packed(); + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + var13 = GrandExchangeOfferUnitPriceComparator.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = (var13.getRegionHighX() - var13.getRegionLowX() + 1) * 64; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = (var13.getRegionHighY() - var13.getRegionLowY() + 1) * 64; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + var13 = GrandExchangeOfferUnitPriceComparator.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var13.getRegionLowX() * 64; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var13.getRegionLowY() * 64; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var13.getRegionHighX() * 64 + 64 - 1; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var13.getRegionHighY() * 64 + 64 - 1; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + var13 = GrandExchangeOfferUnitPriceComparator.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var13.getZoom(); + } + + return 1; + } else if (var0 == 6615) { + var15 = GrandExchangeOfferUnitPriceComparator.getWorldMap().getDisplayCoord(); + if (var15 == null) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var15.x; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var15.y; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.getWorldMap().currentMapAreaId(); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { + var15 = new Coord(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); + var13 = GrandExchangeOfferUnitPriceComparator.getWorldMap().getCurrentMapArea(); + if (var13 == null) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; + return 1; + } else { + int[] var14 = var13.position(var15.plane, var15.x, var15.y); + if (var14 == null) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var14[0]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var14[1]; + } + + return 1; + } + } else { + Coord var7; + if (var0 == 6618) { + var15 = new Coord(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); + var13 = GrandExchangeOfferUnitPriceComparator.getWorldMap().getCurrentMapArea(); + if (var13 == null) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; + return 1; + } else { + var7 = var13.coord(var15.x, var15.y); + if (var7 == null) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var7.packed(); + } + + return 1; + } + } else { + Coord var12; + if (var0 == 6619) { + class320.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var12 = new Coord(Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]); + WorldMapData_1.method731(var3, var12, false); + return 1; + } else if (var0 == 6620) { + class320.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var12 = new Coord(Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]); + WorldMapData_1.method731(var3, var12, true); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { + class320.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var12 = new Coord(Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]); + var11 = GrandExchangeOfferUnitPriceComparator.getWorldMap().getMapArea(var3); + if (var11 == null) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + return 1; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var11.containsCoord(var12.plane, var12.x, var12.y) ? 1 : 0; + return 1; + } + } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.getWorldMap().getDisplayWith(); + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.getWorldMap().getDisplayHeight(); + return 1; + } else if (var0 == 6623) { + var15 = new Coord(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); + var13 = GrandExchangeOfferUnitPriceComparator.getWorldMap().mapAreaAtCoord(var15.plane, var15.x, var15.y); + if (var13 == null) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var13.getId(); + } + + return 1; + } else if (var0 == 6624) { + GrandExchangeOfferUnitPriceComparator.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); + return 1; + } else if (var0 == 6625) { + GrandExchangeOfferUnitPriceComparator.getWorldMap().resetMaxFlashCount(); + return 1; + } else if (var0 == 6626) { + GrandExchangeOfferUnitPriceComparator.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); + return 1; + } else if (var0 == 6627) { + GrandExchangeOfferUnitPriceComparator.getWorldMap().resetCyclesPerFlash(); + return 1; + } else { + boolean var10; + if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { + var10 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + GrandExchangeOfferUnitPriceComparator.getWorldMap().setPerpetualFlash(var10); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + GrandExchangeOfferUnitPriceComparator.getWorldMap().flashElement(var3); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + GrandExchangeOfferUnitPriceComparator.getWorldMap().flashCategory(var3); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { + GrandExchangeOfferUnitPriceComparator.getWorldMap().stopCurrentFlashes(); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { + var10 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + GrandExchangeOfferUnitPriceComparator.getWorldMap().setElementsDisabled(var10); + return 1; + } else { + boolean var4; + if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { + class320.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1] == 1; + GrandExchangeOfferUnitPriceComparator.getWorldMap().disableElement(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { + class320.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1] == 1; + GrandExchangeOfferUnitPriceComparator.getWorldMap().setCategoryDisabled(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.getWorldMap().getElementsDisabled() ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.getWorldMap().isElementDisabled(var3) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; + return 1; + } else if (var0 == 6638) { + class320.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var12 = new Coord(Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]); + var7 = GrandExchangeOfferUnitPriceComparator.getWorldMap().method6411(var3, var12); + if (var7 == null) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var7.packed(); + } + + return 1; + } else { + AbstractWorldMapIcon var8; + if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { + var8 = GrandExchangeOfferUnitPriceComparator.getWorldMap().iconStart(); + if (var8 == null) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var8.getElement(); + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var8.coord2.packed(); + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { + var8 = GrandExchangeOfferUnitPriceComparator.getWorldMap().iconNext(); + if (var8 == null) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var8.getElement(); + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var8.coord2.packed(); + } + + return 1; + } else { + WorldMapElement var6; + if (var0 == ScriptOpcodes.MEC_TEXT) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + var6 = PacketBufferNode.WorldMapElement_get(var3); + if (var6.name == null) { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var6.name; + } + + return 1; + } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + var6 = PacketBufferNode.WorldMapElement_get(var3); + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var6.textSize; + return 1; + } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + var6 = PacketBufferNode.WorldMapElement_get(var3); + if (var6 == null) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var6.category; + } + + return 1; + } else if (var0 == ScriptOpcodes.MEC_SPRITE) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + var6 = PacketBufferNode.WorldMapElement_get(var3); + if (var6 == null) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var6.sprite1; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = WorldMapLabelSize.worldMapEvent.mapElement; + return 1; + } else if (var0 == 6698) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = WorldMapLabelSize.worldMapEvent.coord1.packed(); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = WorldMapLabelSize.worldMapEvent.coord2.packed(); + return 1; + } else { + return 2; + } + } + } + } + } + } + } + } + } + } + } + + @ObfuscatedName("hx") + @ObfuscatedSignature( + signature = "(IB)Z", + garbageValue = "124" + ) + static final boolean method3383(int var0) { + if (var0 < 0) { + return false; + } else { + int var1 = Client.menuOpcodes[var0]; + if (var1 >= 2000) { + var1 -= 2000; + } + + return var1 == 1007; + } + } } diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java index d646c2b516..47254c5cbb 100644 --- a/runescape-client/src/main/java/UrlRequester.java +++ b/runescape-client/src/main/java/UrlRequester.java @@ -9,18 +9,17 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("eo") +@ObfuscatedName("ei") @Implements("UrlRequester") public class UrlRequester implements Runnable { - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("thread") final Thread thread; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("isClosed") volatile boolean isClosed; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("requests") Queue requests; @@ -31,10 +30,10 @@ public class UrlRequester implements Runnable { this.thread.start(); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/net/URL;I)Lex;", - garbageValue = "-970365901" + signature = "(Ljava/net/URL;I)Leg;", + garbageValue = "-838754437" ) @Export("request") public UrlRequest request(URL var1) { @@ -46,10 +45,10 @@ public class UrlRequester implements Runnable { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1622964720" + garbageValue = "1550899791" ) @Export("close") public void close() { @@ -112,161 +111,70 @@ public class UrlRequester implements Runnable { } } catch (Exception var17) { - DesktopPlatformInfoProvider.RunException_sendStackTrace((String)null, var17); + class225.RunException_sendStackTrace((String)null, var17); } } } - @ObfuscatedName("x") + @ObfuscatedName("ih") @ObfuscatedSignature( - signature = "(ILcu;ZI)I", - garbageValue = "360397660" + signature = "(Lhn;IIZI)V", + garbageValue = "1992355059" ) - static int method3306(int var0, Script var1, boolean var2) { - boolean var3 = true; - Widget var4; - if (var0 >= 2000) { - var0 -= 1000; - var4 = Tile.getWidget(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); - var3 = false; - } else { - var4 = var2 ? UserComparator7.field1946 : class197.field2398; + @Export("alignWidgetSize") + static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { + int var4 = var0.width; + int var5 = var0.height; + if (var0.widthAlignment == 0) { + var0.width = var0.rawWidth; + } else if (var0.widthAlignment == 1) { + var0.width = var1 - var0.rawWidth; + } else if (var0.widthAlignment == 2) { + var0.width = var0.rawWidth * var1 >> 14; } - int var11; - if (var0 == ScriptOpcodes.CC_SETOP) { - var11 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] - 1; - if (var11 >= 0 && var11 <= 9) { - var4.setAction(var11, Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]); - return 1; - } else { - --class65.Interpreter_stringStackSize; - return 1; - } - } else { - int var6; - if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { - class188.Interpreter_intStackSize -= 2; - var11 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var6 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - var4.parent = BZip2State.getWidgetChild(var11, var6); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { - var4.isScrollBar = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { - var4.dragZoneSize = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { - var4.dragThreshold = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { - var4.dataText = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { - var4.spellActionName = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { - var4.actions = null; - return 1; - } else if (var0 == 1308) { - var4.field2602 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - return 1; - } else { - int var7; - byte[] var9; - if (var0 != ScriptOpcodes.CC_SETOPKEY) { - byte var5; - if (var0 == ScriptOpcodes.CC_SETOPTKEY) { - class188.Interpreter_intStackSize -= 2; - var5 = 10; - var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]}; - byte[] var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]}; - AttackOption.Widget_setKey(var4, var5, var9, var10); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { - class188.Interpreter_intStackSize -= 3; - var11 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize] - 1; - var6 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - var7 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2]; - if (var11 >= 0 && var11 <= 9) { - GrandExchangeOfferUnitPriceComparator.Widget_setKeyRate(var4, var11, var6, var7); - return 1; - } else { - throw new RuntimeException(); - } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { - var5 = 10; - var6 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - GrandExchangeOfferUnitPriceComparator.Widget_setKeyRate(var4, var5, var6, var7); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { - --class188.Interpreter_intStackSize; - var11 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize] - 1; - if (var11 >= 0 && var11 <= 9) { - WorldMapCacheName.Widget_setKeyIgnoreHeld(var4, var11); - return 1; - } else { - throw new RuntimeException(); - } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { - var5 = 10; - WorldMapCacheName.Widget_setKeyIgnoreHeld(var4, var5); - return 1; - } else { - return 2; - } - } else { - byte[] var8 = null; - var9 = null; - if (var3) { - class188.Interpreter_intStackSize -= 10; - - for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + class188.Interpreter_intStackSize] >= 0; var7 += 2) { - } - - if (var7 > 0) { - var8 = new byte[var7 / 2]; - var9 = new byte[var7 / 2]; - - for (var7 -= 2; var7 >= 0; var7 -= 2) { - var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class188.Interpreter_intStackSize]; - var9[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class188.Interpreter_intStackSize + 1]; - } - } - } else { - class188.Interpreter_intStackSize -= 2; - var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]}; - var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]}; - } - - var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] - 1; - if (var7 >= 0 && var7 <= 9) { - AttackOption.Widget_setKey(var4, var7, var8, var9); - return 1; - } else { - throw new RuntimeException(); - } - } - } + if (var0.heightAlignment == 0) { + var0.height = var0.rawHeight; + } else if (var0.heightAlignment == 1) { + var0.height = var2 - var0.rawHeight; + } else if (var0.heightAlignment == 2) { + var0.height = var2 * var0.rawHeight >> 14; } + + if (var0.widthAlignment == 4) { + var0.width = var0.field2589 * var0.height / var0.field2590; + } + + if (var0.heightAlignment == 4) { + var0.height = var0.field2590 * var0.width / var0.field2589; + } + + if (var0.contentType == 1337) { + Client.viewportWidget = var0; + } + + if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { + ScriptEvent var6 = new ScriptEvent(); + var6.widget = var0; + var6.args = var0.onResize; + Client.scriptEvents.addFirst(var6); + } + } - @ObfuscatedName("a") + @ObfuscatedName("kv") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;B)I", - garbageValue = "0" + signature = "(Lkp;II)V", + garbageValue = "372064004" ) - public static int method3299(CharSequence var0) { - int var1 = var0.length(); - int var2 = 0; - - for (int var3 = 0; var3 < var1; ++var3) { - var2 = (var2 << 5) - var2 + var0.charAt(var3); + static void method3373(Buffer var0, int var1) { + byte[] var2 = var0.array; + if (Client.randomDatData == null) { + Client.randomDatData = new byte[24]; } - return var2; + class301.writeRandomDat(var2, var1, Client.randomDatData, 0, 24); + WorldMapSprite.method427(var0, var1); } } diff --git a/runescape-client/src/main/java/User.java b/runescape-client/src/main/java/User.java index 022d496388..92aa48c6e3 100644 --- a/runescape-client/src/main/java/User.java +++ b/runescape-client/src/main/java/User.java @@ -3,18 +3,20 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jy") +@ObfuscatedName("jk") @Implements("User") public class User implements Comparable { - @ObfuscatedName("y") + @ObfuscatedName("v") + static boolean field3583; + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Ljc;" + signature = "Ljz;" ) @Export("username") Username username; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Ljc;" + signature = "Ljz;" ) @Export("previousUsername") Username previousUsername; @@ -22,40 +24,40 @@ public class User implements Comparable { User() { } - @ObfuscatedName("ao") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)Ljc;", - garbageValue = "-1900146803" + signature = "(B)Ljz;", + garbageValue = "-7" ) @Export("getUsername") public Username getUsername() { return this.username; } - @ObfuscatedName("an") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(I)Ljava/lang/String;", - garbageValue = "2043708876" + garbageValue = "1147653243" ) @Export("getName") public String getName() { return this.username == null ? "" : this.username.getName(); } - @ObfuscatedName("ar") + @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "(B)Ljava/lang/String;", - garbageValue = "16" + signature = "(I)Ljava/lang/String;", + garbageValue = "403246047" ) @Export("getPreviousName") public String getPreviousName() { return this.previousUsername == null ? "" : this.previousUsername.getName(); } - @ObfuscatedName("az") + @ObfuscatedName("af") @ObfuscatedSignature( - signature = "(Ljc;Ljc;B)V", - garbageValue = "116" + signature = "(Ljz;Ljz;I)V", + garbageValue = "1456948401" ) @Export("set") void set(Username var1, Username var2) { @@ -67,10 +69,10 @@ public class User implements Comparable { } } - @ObfuscatedName("ay") + @ObfuscatedName("az") @ObfuscatedSignature( - signature = "(Ljy;S)I", - garbageValue = "9221" + signature = "(Ljk;I)I", + garbageValue = "-746331144" ) @Export("compareTo_user") public int compareTo_user(User var1) { @@ -80,206 +82,4 @@ public class User implements Comparable { public int compareTo(Object var1) { return this.compareTo_user((User)var1); } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "([Ljava/lang/CharSequence;IIB)Ljava/lang/String;", - garbageValue = "69" - ) - public static String method5086(CharSequence[] var0, int var1, int var2) { - if (var2 == 0) { - return ""; - } else if (var2 == 1) { - CharSequence var3 = var0[var1]; - return var3 == null ? "null" : var3.toString(); - } else { - int var8 = var2 + var1; - int var4 = 0; - - for (int var5 = var1; var5 < var8; ++var5) { - CharSequence var6 = var0[var5]; - if (var6 == null) { - var4 += 4; - } else { - var4 += var6.length(); - } - } - - StringBuilder var9 = new StringBuilder(var4); - - for (int var10 = var1; var10 < var8; ++var10) { - CharSequence var7 = var0[var10]; - if (var7 == null) { - var9.append("null"); - } else { - var9.append(var7); - } - } - - return var9.toString(); - } - } - - @ObfuscatedName("jx") - @ObfuscatedSignature( - signature = "(Lha;II)I", - garbageValue = "-548892292" - ) - static final int method5076(Widget var0, int var1) { - if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { - try { - int[] var2 = var0.cs1Instructions[var1]; - int var3 = 0; - int var4 = 0; - byte var5 = 0; - - while (true) { - int var6 = var2[var4++]; - int var7 = 0; - byte var8 = 0; - if (var6 == 0) { - return var3; - } - - if (var6 == 1) { - var7 = Client.currentLevels[var2[var4++]]; - } - - if (var6 == 2) { - var7 = Client.levels[var2[var4++]]; - } - - if (var6 == 3) { - var7 = Client.experience[var2[var4++]]; - } - - int var9; - Widget var10; - int var11; - int var12; - if (var6 == 4) { - var9 = var2[var4++] << 16; - var9 += var2[var4++]; - var10 = Tile.getWidget(var9); - var11 = var2[var4++]; - if (var11 != -1 && (!PacketBufferNode.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { - for (var12 = 0; var12 < var10.itemIds.length; ++var12) { - if (var11 + 1 == var10.itemIds[var12]) { - var7 += var10.itemQuantities[var12]; - } - } - } - } - - if (var6 == 5) { - var7 = Varps.Varps_main[var2[var4++]]; - } - - if (var6 == 6) { - var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; - } - - if (var6 == 7) { - var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; - } - - if (var6 == 8) { - var7 = Message.localPlayer.combatLevel; - } - - if (var6 == 9) { - for (var9 = 0; var9 < 25; ++var9) { - if (Skills.Skills_enabled[var9]) { - var7 += Client.levels[var9]; - } - } - } - - if (var6 == 10) { - var9 = var2[var4++] << 16; - var9 += var2[var4++]; - var10 = Tile.getWidget(var9); - var11 = var2[var4++]; - if (var11 != -1 && (!PacketBufferNode.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { - for (var12 = 0; var12 < var10.itemIds.length; ++var12) { - if (var11 + 1 == var10.itemIds[var12]) { - var7 = 999999999; - break; - } - } - } - } - - if (var6 == 11) { - var7 = Client.runEnergy; - } - - if (var6 == 12) { - var7 = Client.weight; - } - - if (var6 == 13) { - var9 = Varps.Varps_main[var2[var4++]]; - int var13 = var2[var4++]; - var7 = (var9 & 1 << var13) != 0 ? 1 : 0; - } - - if (var6 == 14) { - var9 = var2[var4++]; - var7 = GameShell.getVarbit(var9); - } - - if (var6 == 15) { - var8 = 1; - } - - if (var6 == 16) { - var8 = 2; - } - - if (var6 == 17) { - var8 = 3; - } - - if (var6 == 18) { - var7 = MusicPatchPcmStream.baseX * 64 + (Message.localPlayer.x >> 7); - } - - if (var6 == 19) { - var7 = ScriptEvent.baseY * 64 + (Message.localPlayer.y >> 7); - } - - if (var6 == 20) { - var7 = var2[var4++]; - } - - if (var8 == 0) { - if (var5 == 0) { - var3 += var7; - } - - if (var5 == 1) { - var3 -= var7; - } - - if (var5 == 2 && var7 != 0) { - var3 /= var7; - } - - if (var5 == 3) { - var3 *= var7; - } - - var5 = 0; - } else { - var5 = var8; - } - } - } catch (Exception var14) { - return -1; - } - } else { - return -2; - } - } } diff --git a/runescape-client/src/main/java/UserComparator1.java b/runescape-client/src/main/java/UserComparator1.java index 654c84fcab..a432e6601c 100644 --- a/runescape-client/src/main/java/UserComparator1.java +++ b/runescape-client/src/main/java/UserComparator1.java @@ -4,13 +4,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lf") +@ObfuscatedName("lr") @Implements("UserComparator1") public class UserComparator1 implements Comparator { - @ObfuscatedName("b") - @Export("SpriteBuffer_spriteWidths") - public static int[] SpriteBuffer_spriteWidths; - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("reversed") final boolean reversed; @@ -18,10 +15,10 @@ public class UserComparator1 implements Comparator { this.reversed = var1; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljy;Ljy;B)I", - garbageValue = "67" + signature = "(Ljk;Ljk;I)I", + garbageValue = "-1803472234" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { diff --git a/runescape-client/src/main/java/UserComparator10.java b/runescape-client/src/main/java/UserComparator10.java index 12c578a793..3c4c809370 100644 --- a/runescape-client/src/main/java/UserComparator10.java +++ b/runescape-client/src/main/java/UserComparator10.java @@ -3,18 +3,16 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eh") +@ObfuscatedName("ew") @Implements("UserComparator10") public class UserComparator10 extends AbstractUserComparator { - @ObfuscatedName("b") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) - @Export("ItemDefinition_archive") - static AbstractArchive ItemDefinition_archive; - @ObfuscatedName("bm") - static String field1943; - @ObfuscatedName("f") + @Export("soundEffectsArchive") + static AbstractArchive soundEffectsArchive; + @ObfuscatedName("c") @Export("reversed") final boolean reversed; @@ -22,10 +20,10 @@ public class UserComparator10 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljt;Ljt;B)I", - garbageValue = "-21" + signature = "(Lje;Lje;I)I", + garbageValue = "1802952011" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -40,45 +38,801 @@ public class UserComparator10 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(Lhz;I)V", - garbageValue = "-1966676528" - ) - public static void method3335(AbstractArchive var0) { - InvDefinition.InvDefinition_archive = var0; - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(Lhz;Lhz;I)V", - garbageValue = "-854242738" - ) - public static void method3336(AbstractArchive var0, AbstractArchive var1) { - HealthBarDefinition.HealthBarDefinition_archive = var0; - HealthBarDefinition.HitSplatDefinition_spritesArchive = var1; - } - - @ObfuscatedName("gc") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "197475100" + garbageValue = "1451340880" ) - static final void method3337() { - for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { - if (var0.plane == UrlRequest.Client_plane && !var0.isFinished) { - if (Client.cycle >= var0.cycleStart) { - var0.advance(Client.field690); - if (var0.isFinished) { - var0.remove(); - } else { - class14.scene.drawEntity(var0.plane, var0.x, var0.y, var0.height, 60, var0, 0, -1L, false); - } + public static void method3476() { + synchronized(MouseHandler.MouseHandler_instance) { + MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; + MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; + MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; + MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; + MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; + MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; + MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; + MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; + MouseHandler.MouseHandler_lastButtonVolatile = 0; + } + } + + @ObfuscatedName("hr") + @ObfuscatedSignature( + signature = "(IIIILjava/lang/String;Ljava/lang/String;III)V", + garbageValue = "-2121954499" + ) + @Export("menuAction") + static final void menuAction(int var0, int var1, int var2, int var3, String var4, String var5, int var6, int var7) { + if (var2 >= 2000) { + var2 -= 2000; + } + + PacketBufferNode var8; + if (var2 == 1) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2267, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5787(class65.selectedItemSlot); + var8.packetBuffer.writeShortLE(MusicPatch.selectedItemId); + var8.packetBuffer.writeIntME(var3); + var8.packetBuffer.method5604(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeIntME(Language.baseY * 64 + var1); + var8.packetBuffer.method5623(FriendSystem.selectedItemWidget); + var8.packetBuffer.writeShortLE(Messages.baseX * 64 + var0); + Client.packetWriter.addNode(var8); + } else if (var2 == 2) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2223, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5624(FontName.selectedSpellWidget); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); + var8.packetBuffer.method5604(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeShort(Language.baseY * 64 + var1); + var8.packetBuffer.writeShortLE(Messages.baseX * 64 + var0); + Client.packetWriter.addNode(var8); + } else if (var2 == 3) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2236, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5602(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeShortLE(Language.baseY * 64 + var1); + var8.packetBuffer.writeShortLE(var3); + var8.packetBuffer.method5787(Messages.baseX * 64 + var0); + Client.packetWriter.addNode(var8); + } else if (var2 == 4) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2244, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShort(Messages.baseX * 64 + var0); + var8.packetBuffer.method5603(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.writeShort(Language.baseY * 64 + var1); + Client.packetWriter.addNode(var8); + } else if (var2 == 5) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2299, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShortLE(var3); + var8.packetBuffer.method5602(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method5787(Messages.baseX * 64 + var0); + var8.packetBuffer.writeShortLE(Language.baseY * 64 + var1); + Client.packetWriter.addNode(var8); + } else if (var2 == 6) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2294, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5787(Messages.baseX * 64 + var0); + var8.packetBuffer.method5787(Language.baseY * 64 + var1); + var8.packetBuffer.method5603(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeShortLE(var3); + Client.packetWriter.addNode(var8); + } else { + PacketBufferNode var9; + NPC var13; + if (var2 == 7) { + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = TilePaint.getPacketBufferNode(ClientPacket.field2206, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5602(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method5787(var3); + var9.packetBuffer.writeInt(FriendSystem.selectedItemWidget); + var9.packetBuffer.writeIntME(class65.selectedItemSlot); + var9.packetBuffer.writeIntME(MusicPatch.selectedItemId); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 8) { + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = TilePaint.getPacketBufferNode(ClientPacket.field2217, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5787(Client.selectedSpellChildIndex); + var9.packetBuffer.method5787(var3); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method5622(FontName.selectedSpellWidget); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 9) { + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = TilePaint.getPacketBufferNode(ClientPacket.field2279, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5787(var3); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 10) { + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = TilePaint.getPacketBufferNode(ClientPacket.field2211, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeIntME(var3); + var9.packetBuffer.method5604(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 11) { + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = TilePaint.getPacketBufferNode(ClientPacket.field2238, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShort(var3); + var9.packetBuffer.method5604(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 12) { + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = TilePaint.getPacketBufferNode(ClientPacket.field2239, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5604(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method5787(var3); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 13) { + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = TilePaint.getPacketBufferNode(ClientPacket.field2230, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5603(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var9); } } else { - var0.remove(); + Player var15; + if (var2 == 14) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = TilePaint.getPacketBufferNode(ClientPacket.field2290, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShort(MusicPatch.selectedItemId); + var9.packetBuffer.method5603(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.writeIntME(class65.selectedItemSlot); + var9.packetBuffer.method5624(FriendSystem.selectedItemWidget); + var9.packetBuffer.method5787(var3); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 15) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = TilePaint.getPacketBufferNode(ClientPacket.field2220, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method5623(FontName.selectedSpellWidget); + var9.packetBuffer.method5787(var3); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 16) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2272, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(Language.baseY * 64 + var1); + var8.packetBuffer.writeIntME(Messages.baseX * 64 + var0); + var8.packetBuffer.method5624(FriendSystem.selectedItemWidget); + var8.packetBuffer.writeShort(class65.selectedItemSlot); + var8.packetBuffer.writeIntME(MusicPatch.selectedItemId); + var8.packetBuffer.method5604(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeIntME(var3); + Client.packetWriter.addNode(var8); + } else if (var2 == 17) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2262, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5623(FontName.selectedSpellWidget); + var8.packetBuffer.writeShort(Language.baseY * 64 + var1); + var8.packetBuffer.method5787(Messages.baseX * 64 + var0); + var8.packetBuffer.method5787(var3); + var8.packetBuffer.method5787(Client.selectedSpellChildIndex); + var8.packetBuffer.method5604(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var8); + } else if (var2 == 18) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2231, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5787(Messages.baseX * 64 + var0); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.method5603(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeShortLE(Language.baseY * 64 + var1); + Client.packetWriter.addNode(var8); + } else if (var2 == 19) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2297, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShortLE(Messages.baseX * 64 + var0); + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method5787(var3); + var8.packetBuffer.writeShortLE(Language.baseY * 64 + var1); + Client.packetWriter.addNode(var8); + } else if (var2 == 20) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2224, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShortLE(Messages.baseX * 64 + var0); + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method5787(var3); + var8.packetBuffer.writeShortLE(Language.baseY * 64 + var1); + Client.packetWriter.addNode(var8); + } else if (var2 == 21) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2227, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShortLE(Language.baseY * 64 + var1); + var8.packetBuffer.writeShortLE(var3); + var8.packetBuffer.method5602(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeIntME(Messages.baseX * 64 + var0); + Client.packetWriter.addNode(var8); + } else if (var2 == 22) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2301, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5787(Messages.baseX * 64 + var0); + var8.packetBuffer.writeIntME(var3); + var8.packetBuffer.method5603(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeIntME(Language.baseY * 64 + var1); + Client.packetWriter.addNode(var8); + } else if (var2 == 23) { + if (Client.isMenuOpen) { + ServerBuild.scene.setViewportWalking(); + } else { + ServerBuild.scene.menuOpen(Clock.Client_plane, var0, var1, true); + } + } else { + PacketBufferNode var12; + Widget var16; + if (var2 == 24) { + var16 = Varps.getWidget(var1); + boolean var11 = true; + if (var16.contentType > 0) { + var11 = BufferedSink.method5915(var16); + } + + if (var11) { + var12 = TilePaint.getPacketBufferNode(ClientPacket.field2225, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var12); + } + } else { + if (var2 == 25) { + var16 = SpriteMask.getWidgetChild(var1, var0); + if (var16 != null) { + WorldMapManager.Widget_runOnTargetLeave(); + MusicPatchNode.selectSpell(var1, var0, class83.method2108(WorldMapIcon_0.getWidgetClickMask(var16)), var16.itemId); + Client.isItemSelected = 0; + Client.selectedSpellActionName = PcmPlayer.method2542(var16); + if (Client.selectedSpellActionName == null) { + Client.selectedSpellActionName = "null"; + } + + if (var16.isIf3) { + Client.selectedSpellName = var16.dataText + PacketWriter.colorStartTag(16777215); + } else { + Client.selectedSpellName = PacketWriter.colorStartTag(65280) + var16.spellName + PacketWriter.colorStartTag(16777215); + } + } + + return; + } + + if (var2 == 26) { + KeyHandler.method848(); + } else { + int var10; + Widget var14; + if (var2 == 28) { + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2225, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var8); + var14 = Varps.getWidget(var1); + if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { + var10 = var14.cs1Instructions[0][1]; + Varps.Varps_main[var10] = 1 - Varps.Varps_main[var10]; + ServerPacket.changeGameOptions(var10); + } + } else if (var2 == 29) { + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2225, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var8); + var14 = Varps.getWidget(var1); + if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { + var10 = var14.cs1Instructions[0][1]; + if (Varps.Varps_main[var10] != var14.cs1ComparisonValues[0]) { + Varps.Varps_main[var10] = var14.cs1ComparisonValues[0]; + ServerPacket.changeGameOptions(var10); + } + } + } else if (var2 == 30) { + if (Client.meslayerContinueWidget == null) { + WorldMapAreaData.resumePauseWidget(var1, var0); + Client.meslayerContinueWidget = SpriteMask.getWidgetChild(var1, var0); + NPCDefinition.invalidateWidget(Client.meslayerContinueWidget); + } + } else if (var2 == 31) { + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2232, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5787(MusicPatch.selectedItemId); + var8.packetBuffer.method5787(class65.selectedItemSlot); + var8.packetBuffer.method5624(var1); + var8.packetBuffer.method5787(var0); + var8.packetBuffer.writeIntME(var3); + var8.packetBuffer.method5622(FriendSystem.selectedItemWidget); + Client.packetWriter.addNode(var8); + Client.field751 = 0; + Skeleton.field1793 = Varps.getWidget(var1); + Client.field752 = var0; + } else if (var2 == 32) { + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2250, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShortLE(var0); + var8.packetBuffer.method5787(var3); + var8.packetBuffer.writeShortLE(Client.selectedSpellChildIndex); + var8.packetBuffer.method5622(var1); + var8.packetBuffer.method5622(FontName.selectedSpellWidget); + Client.packetWriter.addNode(var8); + Client.field751 = 0; + Skeleton.field1793 = Varps.getWidget(var1); + Client.field752 = var0; + } else if (var2 == 33) { + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2291, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(var0); + var8.packetBuffer.writeInt(var1); + var8.packetBuffer.writeIntME(var3); + Client.packetWriter.addNode(var8); + Client.field751 = 0; + Skeleton.field1793 = Varps.getWidget(var1); + Client.field752 = var0; + } else if (var2 == 34) { + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2302, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5787(var3); + var8.packetBuffer.writeIntME(var0); + var8.packetBuffer.method5622(var1); + Client.packetWriter.addNode(var8); + Client.field751 = 0; + Skeleton.field1793 = Varps.getWidget(var1); + Client.field752 = var0; + } else if (var2 == 35) { + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2259, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5787(var0); + var8.packetBuffer.writeIntME(var3); + var8.packetBuffer.method5623(var1); + Client.packetWriter.addNode(var8); + Client.field751 = 0; + Skeleton.field1793 = Varps.getWidget(var1); + Client.field752 = var0; + } else if (var2 == 36) { + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2248, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5622(var1); + var8.packetBuffer.writeShortLE(var0); + var8.packetBuffer.writeShortLE(var3); + Client.packetWriter.addNode(var8); + Client.field751 = 0; + Skeleton.field1793 = Varps.getWidget(var1); + Client.field752 = var0; + } else if (var2 == 37) { + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2226, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5624(var1); + var8.packetBuffer.writeShortLE(var3); + var8.packetBuffer.method5787(var0); + Client.packetWriter.addNode(var8); + Client.field751 = 0; + Skeleton.field1793 = Varps.getWidget(var1); + Client.field752 = var0; + } else { + if (var2 == 38) { + WorldMapManager.Widget_runOnTargetLeave(); + var16 = Varps.getWidget(var1); + Client.isItemSelected = 1; + class65.selectedItemSlot = var0; + FriendSystem.selectedItemWidget = var1; + MusicPatch.selectedItemId = var3; + NPCDefinition.invalidateWidget(var16); + Client.selectedItemName = PacketWriter.colorStartTag(16748608) + HealthBarDefinition.ItemDefinition_get(var3).name + PacketWriter.colorStartTag(16777215); + if (Client.selectedItemName == null) { + Client.selectedItemName = "null"; + } + + return; + } + + if (var2 == 39) { + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2253, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(var3); + var8.packetBuffer.writeShortLE(var0); + var8.packetBuffer.method5622(var1); + Client.packetWriter.addNode(var8); + Client.field751 = 0; + Skeleton.field1793 = Varps.getWidget(var1); + Client.field752 = var0; + } else if (var2 == 40) { + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2268, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5623(var1); + var8.packetBuffer.writeIntME(var3); + var8.packetBuffer.writeShortLE(var0); + Client.packetWriter.addNode(var8); + Client.field751 = 0; + Skeleton.field1793 = Varps.getWidget(var1); + Client.field752 = var0; + } else if (var2 == 41) { + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2269, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5624(var1); + var8.packetBuffer.method5787(var0); + var8.packetBuffer.method5787(var3); + Client.packetWriter.addNode(var8); + Client.field751 = 0; + Skeleton.field1793 = Varps.getWidget(var1); + Client.field752 = var0; + } else if (var2 == 42) { + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2215, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShortLE(var3); + var8.packetBuffer.method5622(var1); + var8.packetBuffer.writeShort(var0); + Client.packetWriter.addNode(var8); + Client.field751 = 0; + Skeleton.field1793 = Varps.getWidget(var1); + Client.field752 = var0; + } else if (var2 == 43) { + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2261, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5787(var0); + var8.packetBuffer.writeShortLE(var3); + var8.packetBuffer.method5624(var1); + Client.packetWriter.addNode(var8); + Client.field751 = 0; + Skeleton.field1793 = Varps.getWidget(var1); + Client.field752 = var0; + } else if (var2 == 44) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = TilePaint.getPacketBufferNode(ClientPacket.field2282, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 45) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = TilePaint.getPacketBufferNode(ClientPacket.field2296, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5787(var3); + var9.packetBuffer.method5602(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 46) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = TilePaint.getPacketBufferNode(ClientPacket.field2300, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5787(var3); + var9.packetBuffer.method5602(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 47) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = TilePaint.getPacketBufferNode(ClientPacket.field2216, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.writeShortLE(var3); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 48) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = TilePaint.getPacketBufferNode(ClientPacket.field2281, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5787(var3); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 49) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = TilePaint.getPacketBufferNode(ClientPacket.field2221, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5787(var3); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 50) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = TilePaint.getPacketBufferNode(ClientPacket.field2266, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5787(var3); + var9.packetBuffer.method5602(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 51) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = TilePaint.getPacketBufferNode(ClientPacket.field2243, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5603(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method5787(var3); + Client.packetWriter.addNode(var9); + } + } else { + label982: { + if (var2 != 57) { + if (var2 == 58) { + var16 = SpriteMask.getWidgetChild(var1, var0); + if (var16 != null) { + var9 = TilePaint.getPacketBufferNode(ClientPacket.field2264, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5787(Client.field802); + var9.packetBuffer.writeShortLE(var0); + var9.packetBuffer.method5623(var1); + var9.packetBuffer.writeShortLE(var16.itemId); + var9.packetBuffer.method5623(FontName.selectedSpellWidget); + var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); + Client.packetWriter.addNode(var9); + } + break label982; + } + + if (var2 == 1001) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2292, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5604(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeShortLE(Messages.baseX * 64 + var0); + var8.packetBuffer.writeIntME(var3); + var8.packetBuffer.writeShort(Language.baseY * 64 + var1); + Client.packetWriter.addNode(var8); + break label982; + } + + if (var2 == 1002) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2228, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShortLE(var3); + Client.packetWriter.addNode(var8); + break label982; + } + + if (var2 == 1003) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + var13 = Client.npcs[var3]; + if (var13 != null) { + NPCDefinition var17 = var13.definition; + if (var17.transforms != null) { + var17 = var17.transform(); + } + + if (var17 != null) { + var12 = TilePaint.getPacketBufferNode(ClientPacket.field2258, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeIntME(var17.id); + Client.packetWriter.addNode(var12); + } + } + break label982; + } + + if (var2 == 1004) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + var8 = TilePaint.getPacketBufferNode(ClientPacket.field2246, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var8); + break label982; + } + + if (var2 == 1005) { + var16 = Varps.getWidget(var1); + if (var16 != null && var16.itemQuantities[var0] >= 100000) { + ClientPreferences.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + HealthBarDefinition.ItemDefinition_get(var3).name); + } else { + var9 = TilePaint.getPacketBufferNode(ClientPacket.field2246, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var9); + } + + Client.field751 = 0; + Skeleton.field1793 = Varps.getWidget(var1); + Client.field752 = var0; + break label982; + } + + if (var2 != 1007) { + if (var2 == 1009 || var2 == 1008 || var2 == 1011 || var2 == 1010 || var2 == 1012) { + WorldMapIcon_0.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); + } + break label982; + } + } + + var16 = SpriteMask.getWidgetChild(var1, var0); + if (var16 != null) { + NPC.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); + } + } + } + } + } + } + } } } + if (Client.isItemSelected != 0) { + Client.isItemSelected = 0; + NPCDefinition.invalidateWidget(Varps.getWidget(FriendSystem.selectedItemWidget)); + } + + if (Client.isSpellSelected) { + WorldMapManager.Widget_runOnTargetLeave(); + } + + if (Skeleton.field1793 != null && Client.field751 == 0) { + NPCDefinition.invalidateWidget(Skeleton.field1793); + } + } } diff --git a/runescape-client/src/main/java/UserComparator2.java b/runescape-client/src/main/java/UserComparator2.java index 82bc09f938..e780066e2d 100644 --- a/runescape-client/src/main/java/UserComparator2.java +++ b/runescape-client/src/main/java/UserComparator2.java @@ -4,10 +4,22 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lv") +@ObfuscatedName("lh") @Implements("UserComparator2") public class UserComparator2 implements Comparator { - @ObfuscatedName("f") + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Ldl;" + ) + @Export("soundSystem") + static SoundSystem soundSystem; + @ObfuscatedName("dp") + @ObfuscatedSignature( + signature = "Lia;" + ) + @Export("archive18") + static Archive archive18; + @ObfuscatedName("c") @Export("reversed") final boolean reversed; @@ -15,21 +27,21 @@ public class UserComparator2 implements Comparator { this.reversed = var1; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljy;Ljy;I)I", - garbageValue = "870914586" + signature = "(Ljk;Ljk;I)I", + garbageValue = "258601457" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); } - public boolean equals(Object var1) { - return super.equals(var1); - } - public int compare(Object var1, Object var2) { return this.compare_bridged((User)var1, (User)var2); } + + public boolean equals(Object var1) { + return super.equals(var1); + } } diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java index 2f3d4be6e4..054a2154da 100644 --- a/runescape-client/src/main/java/UserComparator3.java +++ b/runescape-client/src/main/java/UserComparator3.java @@ -1,12 +1,15 @@ +import java.io.File; +import java.io.RandomAccessFile; +import java.util.LinkedHashMap; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ez") +@ObfuscatedName("fp") @Implements("UserComparator3") public class UserComparator3 extends AbstractUserComparator { - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("reversed") final boolean reversed; @@ -14,10 +17,10 @@ public class UserComparator3 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljt;Ljt;S)I", - garbageValue = "-14609" + signature = "(Lje;Lje;I)I", + garbageValue = "-1179985017" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -31,4 +34,114 @@ public class UserComparator3 extends AbstractUserComparator { public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)Ljava/io/File;", + garbageValue = "1177059768" + ) + @Export("getFile") + public static File getFile(String var0) { + if (!FileSystem.FileSystem_hasPermissions) { + throw new RuntimeException(""); + } else { + File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); + if (var1 != null) { + return var1; + } else { + File var2 = new File(FileSystem.FileSystem_cacheDir, var0); + RandomAccessFile var3 = null; + + try { + File var4 = new File(var2.getParent()); + if (!var4.exists()) { + throw new RuntimeException(""); + } else { + var3 = new RandomAccessFile(var2, "rw"); + int var5 = var3.read(); + var3.seek(0L); + var3.write(var5); + var3.seek(0L); + var3.close(); + FileSystem.FileSystem_cacheFiles.put(var0, var2); + return var2; + } + } catch (Exception var8) { + try { + if (var3 != null) { + var3.close(); + var3 = null; + } + } catch (Exception var7) { + } + + throw new RuntimeException(); + } + } + } + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(III)I", + garbageValue = "184774945" + ) + @Export("ItemContainer_getCount") + static int ItemContainer_getCount(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var2 == null) { + return 0; + } else { + return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; + } + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + signature = "(IB)I", + garbageValue = "-49" + ) + static int method3499(int var0) { + return (int)((Math.log((double)var0) / Interpreter.field1097 - 7.0D) * 256.0D); + } + + @ObfuscatedName("fu") + @ObfuscatedSignature( + signature = "(ZB)V", + garbageValue = "-62" + ) + static final void method3497(boolean var0) { + if (var0) { + Client.field682 = Login.field1185 ? class160.field1996 : class160.field1995; + } else { + LinkedHashMap var1 = WorldMapSection2.clientPreferences.parameters; + String var3 = Login.Login_username; + int var4 = var3.length(); + int var5 = 0; + + for (int var6 = 0; var6 < var4; ++var6) { + var5 = (var5 << 5) - var5 + var3.charAt(var6); + } + + Client.field682 = var1.containsKey(var5) ? class160.field1994 : class160.field1993; + } + + } + + @ObfuscatedName("fv") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "762095007" + ) + @Export("playPcmPlayers") + static final void playPcmPlayers() { + if (class43.pcmPlayer1 != null) { + class43.pcmPlayer1.run(); + } + + if (WorldMapLabelSize.pcmPlayer0 != null) { + WorldMapLabelSize.pcmPlayer0.run(); + } + + } } diff --git a/runescape-client/src/main/java/UserComparator4.java b/runescape-client/src/main/java/UserComparator4.java index bc6f03cf98..12dea3748b 100644 --- a/runescape-client/src/main/java/UserComparator4.java +++ b/runescape-client/src/main/java/UserComparator4.java @@ -1,13 +1,17 @@ +import java.io.IOException; import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ei") +@ObfuscatedName("ez") @Implements("UserComparator4") public class UserComparator4 implements Comparator { - @ObfuscatedName("f") + @ObfuscatedName("r") + @Export("userHomeDirectory") + public static String userHomeDirectory; + @ObfuscatedName("c") @Export("reversed") final boolean reversed; @@ -15,21 +19,93 @@ public class UserComparator4 implements Comparator { this.reversed = var1; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljt;Ljt;I)I", - garbageValue = "-949245767" + signature = "(Lje;Lje;I)I", + garbageValue = "-1549144493" ) @Export("compare_bridged") int compare_bridged(Buddy var1, Buddy var2) { return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; } + public boolean equals(Object var1) { + return super.equals(var1); + } + public int compare(Object var1, Object var2) { return this.compare_bridged((Buddy)var1, (Buddy)var2); } - public boolean equals(Object var1) { - return super.equals(var1); + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "80" + ) + static void method3451() { + if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { + KeyHandler.KeyHandler_keyCodes[186] = 57; + KeyHandler.KeyHandler_keyCodes[187] = 27; + KeyHandler.KeyHandler_keyCodes[188] = 71; + KeyHandler.KeyHandler_keyCodes[189] = 26; + KeyHandler.KeyHandler_keyCodes[190] = 72; + KeyHandler.KeyHandler_keyCodes[191] = 73; + KeyHandler.KeyHandler_keyCodes[192] = 58; + KeyHandler.KeyHandler_keyCodes[219] = 42; + KeyHandler.KeyHandler_keyCodes[220] = 74; + KeyHandler.KeyHandler_keyCodes[221] = 43; + KeyHandler.KeyHandler_keyCodes[222] = 59; + KeyHandler.KeyHandler_keyCodes[223] = 28; + } else { + KeyHandler.KeyHandler_keyCodes[44] = 71; + KeyHandler.KeyHandler_keyCodes[45] = 26; + KeyHandler.KeyHandler_keyCodes[46] = 72; + KeyHandler.KeyHandler_keyCodes[47] = 73; + KeyHandler.KeyHandler_keyCodes[59] = 57; + KeyHandler.KeyHandler_keyCodes[61] = 27; + KeyHandler.KeyHandler_keyCodes[91] = 42; + KeyHandler.KeyHandler_keyCodes[92] = 74; + KeyHandler.KeyHandler_keyCodes[93] = 43; + KeyHandler.KeyHandler_keyCodes[192] = 28; + KeyHandler.KeyHandler_keyCodes[222] = 58; + KeyHandler.KeyHandler_keyCodes[520] = 59; + } + + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(IIB)I", + garbageValue = "0" + ) + static final int method3450(int var0, int var1) { + int var2 = class289.method5358(var0 - 1, var1 - 1) + class289.method5358(var0 + 1, var1 - 1) + class289.method5358(var0 - 1, 1 + var1) + class289.method5358(1 + var0, var1 + 1); + int var3 = class289.method5358(var0 - 1, var1) + class289.method5358(1 + var0, var1) + class289.method5358(var0, var1 - 1) + class289.method5358(var0, var1 + 1); + int var4 = class289.method5358(var0, var1); + return var2 / 16 + var3 / 8 + var4 / 4; + } + + @ObfuscatedName("hp") + @ObfuscatedSignature( + signature = "(ZI)V", + garbageValue = "1183662404" + ) + static final void method3442(boolean var0) { + UserComparator3.playPcmPlayers(); + ++Client.packetWriter.pendingWrites; + if (Client.packetWriter.pendingWrites >= 50 || var0) { + Client.packetWriter.pendingWrites = 0; + if (!Client.field800 && Client.packetWriter.getSocket() != null) { + PacketBufferNode var1 = TilePaint.getPacketBufferNode(ClientPacket.field2247, Client.packetWriter.isaacCipher); + Client.packetWriter.addNode(var1); + + try { + Client.packetWriter.flush(); + } catch (IOException var3) { + Client.field800 = true; + } + } + + } } } diff --git a/runescape-client/src/main/java/UserComparator5.java b/runescape-client/src/main/java/UserComparator5.java index 274fd94b4b..720e611a54 100644 --- a/runescape-client/src/main/java/UserComparator5.java +++ b/runescape-client/src/main/java/UserComparator5.java @@ -2,11 +2,18 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ea") +@ObfuscatedName("fl") @Implements("UserComparator5") public class UserComparator5 extends AbstractUserComparator { - @ObfuscatedName("f") + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "Lii;" + ) + @Export("musicTrackArchive") + public static AbstractArchive musicTrackArchive; + @ObfuscatedName("c") @Export("reversed") final boolean reversed; @@ -14,10 +21,10 @@ public class UserComparator5 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljt;Ljt;B)I", - garbageValue = "-107" + signature = "(Lje;Lje;I)I", + garbageValue = "-1009483697" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -36,638 +43,375 @@ public class UserComparator5 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", - garbageValue = "-1884137445" + signature = "(I)Lgs;", + garbageValue = "-2093549834" ) - public static String method3352(CharSequence var0) { - int var1 = var0.length(); - StringBuilder var2 = new StringBuilder(var1); - - for (int var3 = 0; var3 < var1; ++var3) { - char var4 = var0.charAt(var3); - if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { - if (var4 == ' ') { - var2.append('+'); - } else { - byte var5 = NetSocket.charToByteCp1252(var4); - var2.append('%'); - int var6 = var5 >> 4 & 15; - if (var6 >= 10) { - var2.append((char)(var6 + 55)); - } else { - var2.append((char)(var6 + 48)); - } - - var6 = var5 & 15; - if (var6 >= 10) { - var2.append((char)(var6 + 55)); - } else { - var2.append((char)(var6 + 48)); - } - } - } else { - var2.append(var4); - } - } - - return var2.toString(); + public static PacketBufferNode method3488() { + return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; } - @ObfuscatedName("hu") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Lbv;IIIIIB)V", - garbageValue = "-1" + signature = "(ILce;ZB)I", + garbageValue = "0" ) - @Export("drawActor2d") - static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { - if (var0 != null && var0.isVisible()) { - if (var0 instanceof NPC) { - NPCDefinition var6 = ((NPC)var0).definition; - if (var6.transforms != null) { - var6 = var6.transform(); - } - - if (var6 == null) { - return; - } + static int method3491(int var0, Script var1, boolean var2) { + String var3; + if (var0 == ScriptOpcodes.MES) { + var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + ClientPreferences.addGameMessage(0, "", var3); + return 1; + } else if (var0 == ScriptOpcodes.ANIM) { + class320.Interpreter_intStackSize -= 2; + InterfaceParent.performPlayerAnimation(class192.localPlayer, Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]); + return 1; + } else if (var0 == ScriptOpcodes.IF_CLOSE) { + if (!Interpreter.field1095) { + Interpreter.field1094 = true; } - int var75 = Players.Players_count; - int[] var7 = Players.Players_indices; - byte var8 = 0; - if (var1 < var75 && var0.playerCycle == Client.cycle && MouseHandler.method1073((Player)var0)) { - Player var9 = (Player)var0; - if (var1 < var75) { - class206.getActorScreenLocation(var0, var0.defaultHeight + 15); - AbstractFont var10 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); - byte var11 = 9; - var10.drawCentered(var9.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var11, 16777215, 0); - var8 = 18; - } - } - - int var76 = -2; - int var15; - int var22; - int var23; - if (!var0.healthBars.method4843()) { - class206.getActorScreenLocation(var0, var0.defaultHeight + 15); - - for (HealthBar var87 = (HealthBar)var0.healthBars.last(); var87 != null; var87 = (HealthBar)var0.healthBars.previous()) { - HealthBarUpdate var77 = var87.get(Client.cycle); - if (var77 == null) { - if (var87.isEmpty()) { - var87.remove(); - } - } else { - HealthBarDefinition var12 = var87.definition; - Sprite var13 = var12.getBackSprite(); - Sprite var14 = var12.getFrontSprite(); - int var16 = 0; - if (var13 != null && var14 != null) { - if (var12.widthPadding * 2 < var14.subWidth) { - var16 = var12.widthPadding; - } - - var15 = var14.subWidth - var16 * 2; - } else { - var15 = var12.width; - } - - int var17 = 255; - boolean var18 = true; - int var19 = Client.cycle - var77.cycle; - int var20 = var15 * var77.health2 / var12.width; - int var21; - int var92; - if (var77.cycleOffset > var19) { - var21 = var12.int4 == 0 ? 0 : var12.int4 * (var19 / var12.int4); - var22 = var15 * var77.health / var12.width; - var92 = var21 * (var20 - var22) / var77.cycleOffset + var22; - } else { - var92 = var20; - var21 = var12.int5 + var77.cycleOffset - var19; - if (var12.int3 >= 0) { - var17 = (var21 << 8) / (var12.int5 - var12.int3); - } - } - - if (var77.health2 > 0 && var92 < 1) { - var92 = 1; - } - - if (var13 != null && var14 != null) { - if (var92 == var15) { - var92 += var16 * 2; - } else { - var92 += var16; - } - - var21 = var13.subHeight; - var76 += var21; - var22 = var2 + Client.viewportTempX - (var15 >> 1); - var23 = var3 + Client.viewportTempY - var76; - var22 -= var16; - if (var17 >= 0 && var17 < 255) { - var13.drawTransAt(var22, var23, var17); - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var92, var21 + var23); - var14.drawTransAt(var22, var23, var17); - } else { - var13.drawTransBgAt(var22, var23); - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var92 + var22, var21 + var23); - var14.drawTransBgAt(var22, var23); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); - var76 += 2; - } else { - var76 += 5; - if (Client.viewportTempX > -1) { - var21 = var2 + Client.viewportTempX - (var15 >> 1); - var22 = var3 + Client.viewportTempY - var76; - Rasterizer2D.Rasterizer2D_fillRectangle(var21, var22, var92, 5, 65280); - Rasterizer2D.Rasterizer2D_fillRectangle(var21 + var92, var22, var15 - var92, 5, 16711680); - } - - var76 += 2; - } - } - } - } - - if (var76 == -2) { - var76 += 7; - } - - var76 += var8; - if (var1 < var75) { - Player var88 = (Player)var0; - if (var88.isHidden) { - return; + return 1; + } else { + int var10; + if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { + var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + var10 = 0; + if (class248.isNumber(var3)) { + var10 = VerticalAlignment.parseInt(var3); } - if (var88.headIconPk != -1 || var88.headIconPrayer != -1) { - class206.getActorScreenLocation(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - if (var88.headIconPk != -1) { - var76 += 25; - class222.headIconPkSprites[var88.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); - } - - if (var88.headIconPrayer != -1) { - var76 += 25; - GraphicsObject.headIconPrayerSprites[var88.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); - } - } - } - - if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { - class206.getActorScreenLocation(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - var76 += WorldMapData_0.headIconHintSprites[1].subHeight; - WorldMapData_0.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); - } - } + PacketBufferNode var12 = TilePaint.getPacketBufferNode(ClientPacket.field2251, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeInt(var10); + Client.packetWriter.addNode(var12); + return 1; } else { - NPCDefinition var89 = ((NPC)var0).definition; - if (var89.transforms != null) { - var89 = var89.transform(); - } - - if (var89.headIconPrayer >= 0 && var89.headIconPrayer < GraphicsObject.headIconPrayerSprites.length) { - class206.getActorScreenLocation(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - GraphicsObject.headIconPrayerSprites[var89.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); - } - } - - if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { - class206.getActorScreenLocation(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - WorldMapData_0.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); - } - } - } - - if (var0.overheadText != null && (var1 >= var75 || !var0.field937 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { - class206.getActorScreenLocation(var0, var0.defaultHeight); - if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { - Client.overheadTextXOffsets[Client.overheadTextCount] = GrandExchangeOffer.fontBold12.stringWidth(var0.overheadText) / 2; - Client.overheadTextAscents[Client.overheadTextCount] = GrandExchangeOffer.fontBold12.ascent; - Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; - Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; - Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; - Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; - Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; - Client.overheadText[Client.overheadTextCount] = var0.overheadText; - ++Client.overheadTextCount; - } - } - - for (int var78 = 0; var78 < 4; ++var78) { - int var90 = var0.hitSplatCycles[var78]; - int var79 = var0.hitSplatTypes[var78]; - HitSplatDefinition var91 = null; - int var80 = 0; - if (var79 >= 0) { - if (var90 <= Client.cycle) { - continue; - } - - var91 = MusicPatchNode.method3815(var0.hitSplatTypes[var78]); - var80 = var91.field3298; - if (var91 != null && var91.transforms != null) { - var91 = var91.transform(); - if (var91 == null) { - var0.hitSplatCycles[var78] = -1; - continue; + PacketBufferNode var14; + if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { + var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + var14 = TilePaint.getPacketBufferNode(ClientPacket.field2280, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeByte(var3.length() + 1); + var14.packetBuffer.writeStringCp1252NullTerminated(var3); + Client.packetWriter.addNode(var14); + return 1; + } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { + var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + var14 = TilePaint.getPacketBufferNode(ClientPacket.field2203, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeByte(var3.length() + 1); + var14.packetBuffer.writeStringCp1252NullTerminated(var3); + Client.packetWriter.addNode(var14); + return 1; + } else { + String var7; + int var15; + if (var0 == ScriptOpcodes.OPPLAYER) { + var15 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + ScriptEvent.method1203(var15, var7); + return 1; + } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { + class320.Interpreter_intStackSize -= 3; + var15 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var10 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + int var9 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 2]; + Widget var13 = Varps.getWidget(var9); + Strings.clickWidget(var13, var15, var10); + return 1; + } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { + class320.Interpreter_intStackSize -= 2; + var15 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var10 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + Widget var11 = var2 ? class186.field2331 : MidiPcmStream.field2444; + Strings.clickWidget(var11, var15, var10); + return 1; + } else if (var0 == ScriptOpcodes.MOUSECAM) { + ArchiveLoader.mouseCam = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = WorldMapSection2.clientPreferences.roofsHidden ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { + WorldMapSection2.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + WorldMapData_1.savePreferences(); + return 1; + } else if (var0 == ScriptOpcodes.OPENURL) { + var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + boolean var4 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + class215.openURL(var3, var4, false); + return 1; + } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { + var15 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + var14 = TilePaint.getPacketBufferNode(ClientPacket.field2277, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeShort(var15); + Client.packetWriter.addNode(var14); + return 1; + } else if (var0 == ScriptOpcodes.BUG_REPORT) { + var15 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Message.Interpreter_stringStackSize -= 2; + var7 = Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize]; + String var5 = Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize + 1]; + if (var7.length() > 500) { + return 1; + } else if (var5.length() > 500) { + return 1; + } else { + PacketBufferNode var6 = TilePaint.getPacketBufferNode(ClientPacket.field2233, Client.packetWriter.isaacCipher); + var6.packetBuffer.writeShort(1 + Buddy.stringCp1252NullTerminatedByteSize(var7) + Buddy.stringCp1252NullTerminatedByteSize(var5)); + var6.packetBuffer.writeStringCp1252NullTerminated(var7); + var6.packetBuffer.method5602(var15); + var6.packetBuffer.writeStringCp1252NullTerminated(var5); + Client.packetWriter.addNode(var6); + return 1; + } + } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { + Client.shiftClickDrop = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { + Client.showMouseOverText = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.RENDERSELF) { + Client.renderSelf = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 3120) { + if (Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 1; + } else { + Client.drawPlayerNames &= -2; } - } - } else if (var90 < 0) { - continue; - } - var15 = var0.hitSplatTypes2[var78]; - HitSplatDefinition var81 = null; - if (var15 >= 0) { - var81 = MusicPatchNode.method3815(var15); - if (var81 != null && var81.transforms != null) { - var81 = var81.transform(); - } - } + return 1; + } else if (var0 == 3121) { + if (Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 2; + } else { + Client.drawPlayerNames &= -3; + } - if (var90 - var80 <= Client.cycle) { - if (var91 == null) { - var0.hitSplatCycles[var78] = -1; + return 1; + } else if (var0 == 3122) { + if (Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 4; + } else { + Client.drawPlayerNames &= -5; + } + + return 1; + } else if (var0 == 3123) { + if (Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 8; + } else { + Client.drawPlayerNames &= -9; + } + + return 1; + } else if (var0 == 3124) { + Client.drawPlayerNames = 0; + return 1; + } else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) { + Client.showMouseCross = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { + Client.showLoadingMessages = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.SETTAPTODROP) { + ObjectSound.setTapToDrop(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1); + return 1; + } else if (var0 == ScriptOpcodes.GETTAPTODROP) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Message.getTapToDrop() ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.SETOCULUSORBSPEED) { + class320.Interpreter_intStackSize -= 2; + Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + return 1; + } else if (var0 == 3130) { + class320.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 3131) { + --class320.Interpreter_intStackSize; + return 1; + } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Username.canvasWidth; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = WorldMapData_1.canvasHeight; + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { + --class320.Interpreter_intStackSize; + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { + class320.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 3136) { + Client.field808 = 3; + Client.field664 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + return 1; + } else if (var0 == 3137) { + Client.field808 = 2; + Client.field664 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + return 1; + } else if (var0 == 3138) { + Client.field808 = 0; + return 1; + } else if (var0 == 3139) { + Client.field808 = 1; + return 1; + } else if (var0 == 3140) { + Client.field808 = 3; + Client.field664 = var2 ? class186.field2331.id : MidiPcmStream.field2444.id; + return 1; } else { - class206.getActorScreenLocation(var0, var0.defaultHeight / 2); - if (Client.viewportTempX > -1) { - if (var78 == 1) { - Client.viewportTempY -= 20; + boolean var8; + if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { + var8 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + WorldMapSection2.clientPreferences.hideUsername = var8; + WorldMapData_1.savePreferences(); + return 1; + } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = WorldMapSection2.clientPreferences.hideUsername ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { + var8 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + Client.Login_isUsernameRemembered = var8; + if (!var8) { + WorldMapSection2.clientPreferences.rememberedUsername = ""; + WorldMapData_1.savePreferences(); } - if (var78 == 2) { - Client.viewportTempX -= 15; - Client.viewportTempY -= 10; + return 1; + } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; + return 1; + } else if (var0 == 3145) { + return 1; + } else if (var0 == ScriptOpcodes.SETTITLEMUSICENABLED) { + var8 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + if (var8 == WorldMapSection2.clientPreferences.titleMusicDisabled) { + WorldMapSection2.clientPreferences.titleMusicDisabled = !var8; + WorldMapData_1.savePreferences(); } - if (var78 == 3) { - Client.viewportTempX += 15; - Client.viewportTempY -= 10; - } - - Sprite var82 = null; - Sprite var83 = null; - Sprite var84 = null; - Sprite var85 = null; - var22 = 0; - var23 = 0; - int var24 = 0; - int var25 = 0; - int var26 = 0; - int var27 = 0; - int var28 = 0; - int var29 = 0; - Sprite var30 = null; - Sprite var31 = null; - Sprite var32 = null; - Sprite var33 = null; - int var34 = 0; - int var35 = 0; - int var36 = 0; - int var37 = 0; - int var38 = 0; - int var39 = 0; - int var40 = 0; - int var41 = 0; - int var42 = 0; - var82 = var91.method4600(); - int var43; - if (var82 != null) { - var22 = var82.subWidth; - var43 = var82.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var26 = var82.xOffset; - } - - var83 = var91.method4576(); - if (var83 != null) { - var23 = var83.subWidth; - var43 = var83.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var27 = var83.xOffset; - } - - var84 = var91.method4587(); - if (var84 != null) { - var24 = var84.subWidth; - var43 = var84.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var28 = var84.xOffset; - } - - var85 = var91.method4596(); - if (var85 != null) { - var25 = var85.subWidth; - var43 = var85.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var29 = var85.xOffset; - } - - if (var81 != null) { - var30 = var81.method4600(); - if (var30 != null) { - var34 = var30.subWidth; - var43 = var30.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var38 = var30.xOffset; - } - - var31 = var81.method4576(); - if (var31 != null) { - var35 = var31.subWidth; - var43 = var31.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var39 = var31.xOffset; - } - - var32 = var81.method4587(); - if (var32 != null) { - var36 = var32.subWidth; - var43 = var32.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var40 = var32.xOffset; - } - - var33 = var81.method4596(); - if (var33 != null) { - var37 = var33.subWidth; - var43 = var33.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var41 = var33.xOffset; - } - } - - Font var86 = var91.getFont(); - if (var86 == null) { - var86 = class3.fontPlain11; - } - - Font var44; - if (var81 != null) { - var44 = var81.getFont(); - if (var44 == null) { - var44 = class3.fontPlain11; - } - } else { - var44 = class3.fontPlain11; - } - - String var45 = null; - String var46 = null; - boolean var47 = false; - int var48 = 0; - var45 = var91.getString(var0.hitSplatValues[var78]); - int var93 = var86.stringWidth(var45); - if (var81 != null) { - var46 = var81.getString(var0.hitSplatValues2[var78]); - var48 = var44.stringWidth(var46); - } - - int var49 = 0; - int var50 = 0; - if (var23 > 0) { - if (var84 == null && var85 == null) { - var49 = 1; - } else { - var49 = var93 / var23 + 1; - } - } - - if (var81 != null && var35 > 0) { - if (var32 == null && var33 == null) { - var50 = 1; - } else { - var50 = var48 / var35 + 1; - } - } - - int var51 = 0; - int var52 = var51; - if (var22 > 0) { - var51 += var22; - } - - var51 += 2; - int var53 = var51; - if (var24 > 0) { - var51 += var24; - } - - int var54 = var51; - int var55 = var51; - int var56; - if (var23 > 0) { - var56 = var49 * var23; - var51 += var56; - var55 += (var56 - var93) / 2; - } else { - var51 += var93; - } - - var56 = var51; - if (var25 > 0) { - var51 += var25; - } - - int var57 = 0; - int var58 = 0; - int var59 = 0; - int var60 = 0; - int var61 = 0; - int var62; - if (var81 != null) { - var51 += 2; - var57 = var51; - if (var34 > 0) { - var51 += var34; - } - - var51 += 2; - var58 = var51; - if (var36 > 0) { - var51 += var36; - } - - var59 = var51; - var61 = var51; - if (var35 > 0) { - var62 = var35 * var50; - var51 += var62; - var61 += (var62 - var48) / 2; - } else { - var51 += var48; - } - - var60 = var51; - if (var37 > 0) { - var51 += var37; - } - } - - var62 = var0.hitSplatCycles[var78] - Client.cycle; - int var63 = var91.field3303 - var62 * var91.field3303 / var91.field3298; - int var64 = var62 * var91.field3304 / var91.field3298 + -var91.field3304; - int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1)); - int var66 = var64 + (var3 + Client.viewportTempY - 12); - int var67 = var66; - int var68 = var66 + var42; - int var69 = var66 + var91.field3308 + 15; - int var70 = var69 - var86.maxAscent; - int var71 = var69 + var86.maxDescent; - if (var70 < var66) { - var67 = var70; - } - - if (var71 > var68) { - var68 = var71; - } - - int var72 = 0; - int var73; - int var74; - if (var81 != null) { - var72 = var66 + var81.field3308 + 15; - var73 = var72 - var44.maxAscent; - var74 = var72 + var44.maxDescent; - if (var73 < var67) { - ; - } - - if (var74 > var68) { - ; - } - } - - var73 = 255; - if (var91.field3305 >= 0) { - var73 = (var62 << 8) / (var91.field3298 - var91.field3305); - } - - if (var73 >= 0 && var73 < 255) { - if (var82 != null) { - var82.drawTransAt(var65 + var52 - var26, var66, var73); - } - - if (var84 != null) { - var84.drawTransAt(var53 + var65 - var28, var66, var73); - } - - if (var83 != null) { - for (var74 = 0; var74 < var49; ++var74) { - var83.drawTransAt(var23 * var74 + (var65 + var54 - var27), var66, var73); - } - } - - if (var85 != null) { - var85.drawTransAt(var56 + var65 - var29, var66, var73); - } - - var86.drawAlpha(var45, var65 + var55, var69, var91.textColor, 0, var73); - if (var81 != null) { - if (var30 != null) { - var30.drawTransAt(var57 + var65 - var38, var66, var73); - } - - if (var32 != null) { - var32.drawTransAt(var65 + var58 - var40, var66, var73); - } - - if (var31 != null) { - for (var74 = 0; var74 < var50; ++var74) { - var31.drawTransAt(var74 * var35 + (var59 + var65 - var39), var66, var73); - } - } - - if (var33 != null) { - var33.drawTransAt(var65 + var60 - var41, var66, var73); - } - - var44.drawAlpha(var46, var65 + var61, var72, var81.textColor, 0, var73); - } - } else { - if (var82 != null) { - var82.drawTransBgAt(var52 + var65 - var26, var66); - } - - if (var84 != null) { - var84.drawTransBgAt(var53 + var65 - var28, var66); - } - - if (var83 != null) { - for (var74 = 0; var74 < var49; ++var74) { - var83.drawTransBgAt(var74 * var23 + (var54 + var65 - var27), var66); - } - } - - if (var85 != null) { - var85.drawTransBgAt(var56 + var65 - var29, var66); - } - - var86.draw(var45, var55 + var65, var69, var91.textColor | -16777216, 0); - if (var81 != null) { - if (var30 != null) { - var30.drawTransBgAt(var57 + var65 - var38, var66); - } - - if (var32 != null) { - var32.drawTransBgAt(var65 + var58 - var40, var66); - } - - if (var31 != null) { - for (var74 = 0; var74 < var50; ++var74) { - var31.drawTransBgAt(var74 * var35 + (var59 + var65 - var39), var66); - } - } - - if (var33 != null) { - var33.drawTransBgAt(var60 + var65 - var41, var66); - } - - var44.draw(var46, var61 + var65, var72, var81.textColor | -16777216, 0); - } - } + return 1; + } else if (var0 == ScriptOpcodes.GETTITLEMUSICENABLED) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = WorldMapSection2.clientPreferences.titleMusicDisabled ? 0 : 1; + return 1; + } else if (var0 == 3148) { + return 1; + } else if (var0 == 3149) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3150) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3151) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3152) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3153) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; + return 1; + } else if (var0 == 3154) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = class14.method170(); + return 1; + } else if (var0 == 3155) { + --Message.Interpreter_stringStackSize; + return 1; + } else if (var0 == 3156) { + return 1; + } else if (var0 == 3157) { + class320.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 3158) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3159) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3160) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3161) { + --class320.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3162) { + --class320.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3163) { + --Message.Interpreter_stringStackSize; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3164) { + --class320.Interpreter_intStackSize; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 == 3165) { + --class320.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3166) { + class320.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3167) { + class320.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3168) { + class320.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 == 3169) { + return 1; + } else if (var0 == 3170) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3171) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3172) { + --class320.Interpreter_intStackSize; + return 1; + } else if (var0 == 3173) { + --class320.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3174) { + --class320.Interpreter_intStackSize; + return 1; + } else if (var0 == 3175) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3176) { + return 1; + } else if (var0 == 3177) { + return 1; + } else if (var0 == 3178) { + --Message.Interpreter_stringStackSize; + return 1; + } else if (var0 == 3179) { + return 1; + } else if (var0 == 3180) { + --Message.Interpreter_stringStackSize; + return 1; + } else { + return 2; } } } } - } } } diff --git a/runescape-client/src/main/java/UserComparator6.java b/runescape-client/src/main/java/UserComparator6.java index 29cfb3aa15..a8dc50d7a7 100644 --- a/runescape-client/src/main/java/UserComparator6.java +++ b/runescape-client/src/main/java/UserComparator6.java @@ -2,18 +2,17 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ey") +@ObfuscatedName("fs") @Implements("UserComparator6") public class UserComparator6 extends AbstractUserComparator { - @ObfuscatedName("qy") + @ObfuscatedName("bl") @ObfuscatedSignature( - signature = "Lcw;" + signature = "[Llt;" ) - @Export("pcmPlayer0") - static PcmPlayer pcmPlayer0; - @ObfuscatedName("f") + @Export("worldSelectBackSprites") + static Sprite[] worldSelectBackSprites; + @ObfuscatedName("c") @Export("reversed") final boolean reversed; @@ -21,10 +20,10 @@ public class UserComparator6 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljt;Ljt;I)I", - garbageValue = "-226396145" + signature = "(Lje;Lje;B)I", + garbageValue = "-119" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -38,59 +37,4 @@ public class UserComparator6 extends AbstractUserComparator { public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(CII)Ljava/lang/String;", - garbageValue = "953231357" - ) - public static String method3370(char var0, int var1) { - char[] var2 = new char[var1]; - - for (int var3 = 0; var3 < var1; ++var3) { - var2[var3] = var0; - } - - return new String(var2); - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - signature = "(ILcu;ZI)I", - garbageValue = "1830751012" - ) - static int method3369(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.GETWINDOWMODE) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = ItemDefinition.getWindowedMode(); - return 1; - } else { - int var3; - if (var0 == ScriptOpcodes.SETWINDOWMODE) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - if (var3 == 1 || var3 == 2) { - class60.setWindowedMode(var3); - } - - return 1; - } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Interpreter.clientPreferences.windowMode; - return 1; - } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { - if (var0 == 5310) { - --class188.Interpreter_intStackSize; - return 1; - } else { - return 2; - } - } else { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - if (var3 == 1 || var3 == 2) { - Interpreter.clientPreferences.windowMode = var3; - FriendSystem.savePreferences(); - } - - return 1; - } - } - } } diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java index 639faa4ff2..1406cdd2e4 100644 --- a/runescape-client/src/main/java/UserComparator7.java +++ b/runescape-client/src/main/java/UserComparator7.java @@ -1,24 +1,18 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("eu") +@ObfuscatedName("ed") @Implements("UserComparator7") public class UserComparator7 extends AbstractUserComparator { - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "[[Lha;" + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -625495169 ) - @Export("Widget_interfaceComponents") - public static Widget[][] Widget_interfaceComponents; - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Lha;" - ) - static Widget field1946; - @ObfuscatedName("f") + static int field1978; + @ObfuscatedName("c") @Export("reversed") final boolean reversed; @@ -26,10 +20,10 @@ public class UserComparator7 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljt;Ljt;B)I", - garbageValue = "-30" + signature = "(Lje;Lje;I)I", + garbageValue = "1453601865" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -44,747 +38,12 @@ public class UserComparator7 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "([BIIIIIIILej;[Lfp;I)V", - garbageValue = "678267199" + signature = "(I)V", + garbageValue = "941993017" ) - static final void method3344(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, Scene var8, CollisionMap[] var9) { - Buffer var10 = new Buffer(var0); - int var11 = -1; - - while (true) { - int var12 = var10.method5558(); - if (var12 == 0) { - return; - } - - var11 += var12; - int var13 = 0; - - while (true) { - int var14 = var10.readUShortSmart(); - if (var14 == 0) { - break; - } - - var13 += var14 - 1; - int var15 = var13 & 63; - int var16 = var13 >> 6 & 63; - int var17 = var13 >> 12; - int var18 = var10.readUnsignedByte(); - int var19 = var18 >> 2; - int var20 = var18 & 3; - if (var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) { - ObjectDefinition var21 = Coord.getObjectDefinition(var11); - int var24 = var16 & 7; - int var25 = var15 & 7; - int var27 = var21.sizeX; - int var28 = var21.sizeY; - int var29; - if ((var20 & 1) == 1) { - var29 = var27; - var27 = var28; - var28 = var29; - } - - int var26 = var7 & 3; - int var23; - if (var26 == 0) { - var23 = var24; - } else if (var26 == 1) { - var23 = var25; - } else if (var26 == 2) { - var23 = 7 - var24 - (var27 - 1); - } else { - var23 = 7 - var25 - (var28 - 1); - } - - var29 = var23 + var2; - int var32 = var16 & 7; - int var33 = var15 & 7; - int var35 = var21.sizeX; - int var36 = var21.sizeY; - int var37; - if ((var20 & 1) == 1) { - var37 = var35; - var35 = var36; - var36 = var37; - } - - int var34 = var7 & 3; - int var31; - if (var34 == 0) { - var31 = var33; - } else if (var34 == 1) { - var31 = 7 - var32 - (var35 - 1); - } else if (var34 == 2) { - var31 = 7 - var33 - (var36 - 1); - } else { - var31 = var32; - } - - var37 = var31 + var3; - if (var29 > 0 && var37 > 0 && var29 < 103 && var37 < 103) { - int var38 = var1; - if ((Tiles.Tiles_renderFlags[1][var29][var37] & 2) == 2) { - var38 = var1 - 1; - } - - CollisionMap var39 = null; - if (var38 >= 0) { - var39 = var9[var38]; - } - - VarbitDefinition.method4500(var1, var29, var37, var11, var20 + var7 & 3, var19, var8, var39); - } - } - } - } - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - signature = "(ILcu;ZI)I", - garbageValue = "2063896690" - ) - static int method3345(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.LOGOUT) { - Client.logoutTimer = 250; - return 1; - } else { - return 2; - } - } - - @ObfuscatedName("ib") - @ObfuscatedSignature( - signature = "([Lha;IIIIIIIII)V", - garbageValue = "-1693835764" - ) - @Export("drawInterface") - static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - - for (int var9 = 0; var9 < var0.length; ++var9) { - Widget var10 = var0[var9]; - if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { - int var11; - if (var8 == -1) { - Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; - Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; - Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; - Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; - var11 = ++Client.rootWidgetCount - 1; - } else { - var11 = var8; - } - - var10.rootIndex = var11; - var10.cycle = Client.cycle; - if (!var10.isIf3 || !Varcs.isComponentHidden(var10)) { - if (var10.contentType > 0) { - SoundSystem.method2507(var10); - } - - int var12 = var10.x + var6; - int var13 = var7 + var10.y; - int var14 = var10.transparencyTop; - int var15; - int var16; - if (var10 == Client.clickedWidget) { - if (var1 != -1412584499 && !var10.isScrollBar) { - ClientPacket.field2223 = var0; - GrandExchangeEvents.field31 = var6; - class81.field1126 = var7; - continue; - } - - if (Client.isDraggingWidget && Client.field806) { - var15 = MouseHandler.MouseHandler_x; - var16 = MouseHandler.MouseHandler_y; - var15 -= Client.widgetClickX; - var16 -= Client.widgetClickY; - if (var15 < Client.field807) { - var15 = Client.field807; - } - - if (var15 + var10.width > Client.field807 + Client.clickedWidgetParent.width) { - var15 = Client.field807 + Client.clickedWidgetParent.width - var10.width; - } - - if (var16 < Client.field808) { - var16 = Client.field808; - } - - if (var16 + var10.height > Client.field808 + Client.clickedWidgetParent.height) { - var16 = Client.field808 + Client.clickedWidgetParent.height - var10.height; - } - - var12 = var15; - var13 = var16; - } - - if (!var10.isScrollBar) { - var14 = 128; - } - } - - int var17; - int var18; - int var20; - int var21; - int var22; - int var30; - if (var10.type == 2) { - var15 = var2; - var16 = var3; - var17 = var4; - var18 = var5; - } else if (var10.type == 9) { - var30 = var12; - var20 = var13; - var21 = var12 + var10.width; - var22 = var13 + var10.height; - if (var21 < var12) { - var30 = var21; - var21 = var12; - } - - if (var22 < var13) { - var20 = var22; - var22 = var13; - } - - ++var21; - ++var22; - var15 = var30 > var2 ? var30 : var2; - var16 = var20 > var3 ? var20 : var3; - var17 = var21 < var4 ? var21 : var4; - var18 = var22 < var5 ? var22 : var5; - } else { - var30 = var12 + var10.width; - var20 = var13 + var10.height; - var15 = var12 > var2 ? var12 : var2; - var16 = var13 > var3 ? var13 : var3; - var17 = var30 < var4 ? var30 : var4; - var18 = var20 < var5 ? var20 : var5; - } - - if (!var10.isIf3 || var15 < var17 && var16 < var18) { - if (var10.contentType != 0) { - if (var10.contentType == 1336) { - if (Client.displayFps) { - var13 += 15; - ScriptFrame.fontPlain12.drawRightAligned("Fps:" + GameShell.fps, var12 + var10.width, var13, 16776960, -1); - var13 += 15; - Runtime var38 = Runtime.getRuntime(); - var20 = (int)((var38.totalMemory() - var38.freeMemory()) / 1024L); - var21 = 16776960; - if (var20 > 327680 && !Client.isLowDetail) { - var21 = 16711680; - } - - ScriptFrame.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); - var13 += 15; - } - continue; - } - - if (var10.contentType == 1337) { - Client.viewportX = var12; - Client.viewportY = var13; - class192.drawEntities(var12, var13, var10.width, var10.height); - Client.field833[var10.rootIndex] = true; - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1338) { - Occluder.drawMinimap(var10, var12, var13, var11); - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1339) { - FriendSystem.drawCompass(var10, var12, var13, var11); - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1400) { - GrandExchangeEvent.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); - } - - if (var10.contentType == 1401) { - GrandExchangeEvent.worldMap.drawOverview(var12, var13, var10.width, var10.height); - } - - if (var10.contentType == 1402) { - StructDefinition.loginScreenRunesAnimation.draw(var12, Client.cycle); - } - } - - if (var10.type == 0) { - if (!var10.isIf3 && Varcs.isComponentHidden(var10) && var10 != class16.mousedOverWidgetIf1) { - continue; - } - - if (!var10.isIf3) { - if (var10.scrollY > var10.scrollHeight - var10.height) { - var10.scrollY = var10.scrollHeight - var10.height; - } - - if (var10.scrollY < 0) { - var10.scrollY = 0; - } - } - - drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); - if (var10.children != null) { - drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); - } - - InterfaceParent var19 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); - if (var19 != null) { - class13.drawWidgets(var19.group, var15, var16, var17, var18, var12, var13, var11); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - } - - if (Client.isResizable || Client.field835[var11] || Client.gameDrawingMode > 1) { - if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { - ClanMate.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); - } - - if (var10.type != 1) { - int var23; - int var24; - int var25; - int var26; - if (var10.type == 2) { - var30 = 0; - - for (var20 = 0; var20 < var10.rawHeight; ++var20) { - for (var21 = 0; var21 < var10.rawWidth; ++var21) { - var22 = var12 + var21 * (var10.paddingX + 32); - var23 = var13 + var20 * (var10.paddingY + 32); - if (var30 < 20) { - var22 += var10.inventoryXOffsets[var30]; - var23 += var10.inventoryYOffsets[var30]; - } - - if (var10.itemIds[var30] <= 0) { - if (var10.inventorySprites != null && var30 < 20) { - Sprite var45 = var10.getInventorySprite(var30); - if (var45 != null) { - var45.drawTransBgAt(var22, var23); - } else if (Widget.field2549) { - LoginPacket.invalidateWidget(var10); - } - } - } else { - boolean var39 = false; - boolean var40 = false; - var26 = var10.itemIds[var30] - 1; - if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == ClientPreferences.dragInventoryWidget && var30 == Client.dragItemSlotSource) { - Sprite var27; - if (Client.isItemSelected == 1 && var30 == KeyHandler.selectedItemSlot && var10.id == Occluder.selectedItemWidget) { - var27 = StudioGame.getItemSprite(var26, var10.itemQuantities[var30], 2, 0, 2, false); - } else { - var27 = StudioGame.getItemSprite(var26, var10.itemQuantities[var30], 1, 3153952, 2, false); - } - - if (var27 != null) { - if (var10 == ClientPreferences.dragInventoryWidget && var30 == Client.dragItemSlotSource) { - var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; - var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; - if (var24 < 5 && var24 > -5) { - var24 = 0; - } - - if (var25 < 5 && var25 > -5) { - var25 = 0; - } - - if (Client.itemDragDuration < 5) { - var24 = 0; - var25 = 0; - } - - var27.drawTransAt(var24 + var22, var25 + var23, 128); - if (var1 != -1) { - Widget var28 = var0[var1 & 65535]; - int var29; - if (var25 + var23 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { - var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field690 / 3; - if (var29 > Client.field690 * 10) { - var29 = Client.field690 * 10; - } - - if (var29 > var28.scrollY) { - var29 = var28.scrollY; - } - - var28.scrollY -= var29; - Client.draggedWidgetY += var29; - LoginPacket.invalidateWidget(var28); - } - - if (var23 + var25 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { - var29 = (var25 + var23 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field690 / 3; - if (var29 > Client.field690 * 10) { - var29 = Client.field690 * 10; - } - - if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { - var29 = var28.scrollHeight - var28.height - var28.scrollY; - } - - var28.scrollY += var29; - Client.draggedWidgetY -= var29; - LoginPacket.invalidateWidget(var28); - } - } - } else if (var10 == class192.field2372 && var30 == Client.field735) { - var27.drawTransAt(var22, var23, 128); - } else { - var27.drawTransBgAt(var22, var23); - } - } else { - LoginPacket.invalidateWidget(var10); - } - } - } - - ++var30; - } - } - } else if (var10.type == 3) { - if (WorldMapData_0.runCs1(var10)) { - var30 = var10.color2; - if (var10 == class16.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { - var30 = var10.mouseOverColor2; - } - } else { - var30 = var10.color; - if (var10 == class16.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { - var30 = var10.mouseOverColor; - } - } - - if (var10.fill) { - switch(var10.fillMode.value) { - case 1: - Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); - break; - case 2: - Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); - break; - default: - if (var14 == 0) { - Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var30); - } else { - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var30, 256 - (var14 & 255)); - } - } - } else if (var14 == 0) { - Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var30); - } else { - Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var30, 256 - (var14 & 255)); - } - } else { - Font var36; - if (var10.type == 4) { - var36 = var10.getFont(); - if (var36 == null) { - if (Widget.field2549) { - LoginPacket.invalidateWidget(var10); - } - } else { - String var43 = var10.text; - if (WorldMapData_0.runCs1(var10)) { - var20 = var10.color2; - if (var10 == class16.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { - var20 = var10.mouseOverColor2; - } - - if (var10.text2.length() > 0) { - var43 = var10.text2; - } - } else { - var20 = var10.color; - if (var10 == class16.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { - var20 = var10.mouseOverColor; - } - } - - if (var10.isIf3 && var10.itemId != -1) { - ItemDefinition var47 = PacketBufferNode.ItemDefinition_get(var10.itemId); - var43 = var47.name; - if (var43 == null) { - var43 = "null"; - } - - if ((var47.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { - var43 = NPC.colorStartTag(16748608) + var43 + "" + " " + 'x' + WorldMapSectionType.formatItemStacks(var10.itemQuantity); - } - } - - if (var10 == Client.meslayerContinueWidget) { - var43 = "Please wait..."; - var20 = var10.color; - } - - if (!var10.isIf3) { - var43 = class32.method553(var43, var10); - } - - var36.drawLines(var43, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); - } - } else if (var10.type == 5) { - Sprite var37; - if (!var10.isIf3) { - var37 = var10.getSprite(WorldMapData_0.runCs1(var10)); - if (var37 != null) { - var37.drawTransBgAt(var12, var13); - } else if (Widget.field2549) { - LoginPacket.invalidateWidget(var10); - } - } else { - if (var10.itemId != -1) { - var37 = StudioGame.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); - } else { - var37 = var10.getSprite(false); - } - - if (var37 == null) { - if (Widget.field2549) { - LoginPacket.invalidateWidget(var10); - } - } else { - var20 = var37.width; - var21 = var37.height; - if (!var10.spriteTiling) { - var22 = var10.width * 4096 / var20; - if (var10.spriteAngle != 0) { - var37.method6243(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); - } else if (var14 != 0) { - var37.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); - } else if (var20 == var10.width && var21 == var10.height) { - var37.drawTransBgAt(var12, var13); - } else { - var37.drawScaledAt(var12, var13, var10.width, var10.height); - } - } else { - Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); - var22 = (var20 - 1 + var10.width) / var20; - var23 = (var21 - 1 + var10.height) / var21; - - for (var24 = 0; var24 < var22; ++var24) { - for (var25 = 0; var25 < var23; ++var25) { - if (var10.spriteAngle != 0) { - var37.method6243(var20 / 2 + var12 + var24 * var20, var21 / 2 + var13 + var25 * var21, var10.spriteAngle, 4096); - } else if (var14 != 0) { - var37.drawTransAt(var12 + var24 * var20, var13 + var25 * var21, 256 - (var14 & 255)); - } else { - var37.drawTransBgAt(var12 + var20 * var24, var13 + var25 * var21); - } - } - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - } - } - } - } else { - ItemDefinition var32; - if (var10.type == 6) { - boolean var44 = WorldMapData_0.runCs1(var10); - if (var44) { - var20 = var10.sequenceId2; - } else { - var20 = var10.sequenceId; - } - - Model var41 = null; - var22 = 0; - if (var10.itemId != -1) { - var32 = PacketBufferNode.ItemDefinition_get(var10.itemId); - if (var32 != null) { - var32 = var32.getCountObj(var10.itemQuantity); - var41 = var32.getModel(1); - if (var41 != null) { - var41.calculateBoundsCylinder(); - var22 = var41.height / 2; - } else { - LoginPacket.invalidateWidget(var10); - } - } - } else if (var10.modelType == 5) { - if (var10.modelId == 0) { - var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); - } else { - var41 = Message.localPlayer.getModel(); - } - } else if (var20 == -1) { - var41 = var10.getModel((SequenceDefinition)null, -1, var44, Message.localPlayer.appearance); - if (var41 == null && Widget.field2549) { - LoginPacket.invalidateWidget(var10); - } - } else { - SequenceDefinition var46 = WorldMapSection0.SequenceDefinition_get(var20); - var41 = var10.getModel(var46, var10.modelFrame, var44, Message.localPlayer.appearance); - if (var41 == null && Widget.field2549) { - LoginPacket.invalidateWidget(var10); - } - } - - Rasterizer3D.method3086(var10.width / 2 + var12, var10.height / 2 + var13); - var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; - var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; - if (var41 != null) { - if (!var10.isIf3) { - var41.method2907(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); - } else { - var41.calculateBoundsCylinder(); - if (var10.modelOrthog) { - var41.method2905(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); - } else { - var41.method2907(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY); - } - } - } - - Rasterizer3D.Rasterizer3D_method3(); - } else { - if (var10.type == 7) { - var36 = var10.getFont(); - if (var36 == null) { - if (Widget.field2549) { - LoginPacket.invalidateWidget(var10); - } - continue; - } - - var20 = 0; - - for (var21 = 0; var21 < var10.rawHeight; ++var21) { - for (var22 = 0; var22 < var10.rawWidth; ++var22) { - if (var10.itemIds[var20] > 0) { - var32 = PacketBufferNode.ItemDefinition_get(var10.itemIds[var20] - 1); - String var33; - if (var32.isStackable != 1 && var10.itemQuantities[var20] == 1) { - var33 = NPC.colorStartTag(16748608) + var32.name + ""; - } else { - var33 = NPC.colorStartTag(16748608) + var32.name + "" + " " + 'x' + WorldMapSectionType.formatItemStacks(var10.itemQuantities[var20]); - } - - var25 = var12 + var22 * (var10.paddingX + 115); - var26 = var21 * (var10.paddingY + 12) + var13; - if (var10.textXAlignment == 0) { - var36.draw(var33, var25, var26, var10.color, var10.textShadowed ? 0 : -1); - } else if (var10.textXAlignment == 1) { - var36.drawCentered(var33, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1); - } else { - var36.drawRightAligned(var33, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); - } - } - - ++var20; - } - } - } - - if (var10.type == 8 && var10 == class14.field90 && Client.field674 == Client.field798) { - var30 = 0; - var20 = 0; - Font var31 = ScriptFrame.fontPlain12; - String var34 = var10.text; - - String var42; - for (var34 = class32.method553(var34, var10); var34.length() > 0; var20 = var20 + var31.ascent + 1) { - var24 = var34.indexOf("
"); - if (var24 != -1) { - var42 = var34.substring(0, var24); - var34 = var34.substring(var24 + 4); - } else { - var42 = var34; - var34 = ""; - } - - var25 = var31.stringWidth(var42); - if (var25 > var30) { - var30 = var25; - } - } - - var30 += 6; - var20 += 7; - var24 = var12 + var10.width - 5 - var30; - var25 = var13 + var10.height + 5; - if (var24 < var12 + 5) { - var24 = var12 + 5; - } - - if (var24 + var30 > var4) { - var24 = var4 - var30; - } - - if (var20 + var25 > var5) { - var25 = var5 - var20; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var30, var20, 16777120); - Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var30, var20, 0); - var34 = var10.text; - var26 = var25 + var31.ascent + 2; - - for (var34 = class32.method553(var34, var10); var34.length() > 0; var26 = var26 + var31.ascent + 1) { - int var35 = var34.indexOf("
"); - if (var35 != -1) { - var42 = var34.substring(0, var35); - var34 = var34.substring(var35 + 4); - } else { - var42 = var34; - var34 = ""; - } - - var31.draw(var42, var24 + 3, var26, 0, -1); - } - } - - if (var10.type == 9) { - if (var10.field2676) { - var30 = var12; - var20 = var13 + var10.height; - var21 = var12 + var10.width; - var22 = var13; - } else { - var30 = var12; - var20 = var13; - var21 = var12 + var10.width; - var22 = var13 + var10.height; - } - - if (var10.lineWid == 1) { - Rasterizer2D.Rasterizer2D_drawLine(var30, var20, var21, var22, var10.color); - } else { - DevicePcmPlayerProvider.method839(var30, var20, var21, var22, var10.color, var10.lineWid); - } - } - } - } - } - } - } - } - } - } - } - + public static void method3481() { + StructDefinition.StructDefinition_cached.clear(); } } diff --git a/runescape-client/src/main/java/UserComparator8.java b/runescape-client/src/main/java/UserComparator8.java index c6992c7059..4778372566 100644 --- a/runescape-client/src/main/java/UserComparator8.java +++ b/runescape-client/src/main/java/UserComparator8.java @@ -1,24 +1,19 @@ -import java.awt.Toolkit; -import java.awt.datatransfer.Clipboard; -import java.awt.datatransfer.DataFlavor; -import java.awt.datatransfer.Transferable; -import java.awt.datatransfer.UnsupportedFlavorException; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.net.MalformedURLException; import java.net.URL; -import java.net.URLConnection; -import java.util.Random; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ec") +@ObfuscatedName("ex") @Implements("UserComparator8") public class UserComparator8 extends AbstractUserComparator { - @ObfuscatedName("f") + @ObfuscatedName("dk") + @ObfuscatedSignature( + signature = "Lia;" + ) + @Export("archive8") + static Archive archive8; + @ObfuscatedName("c") @Export("reversed") final boolean reversed; @@ -26,10 +21,10 @@ public class UserComparator8 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljt;Ljt;I)I", - garbageValue = "1853867406" + signature = "(Lje;Lje;I)I", + garbageValue = "-1753489227" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -48,1071 +43,59 @@ public class UserComparator8 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)[Liz;", - garbageValue = "1856442222" + signature = "(I)Z", + garbageValue = "-257658019" ) - static HorizontalAlignment[] method3329() { - return new HorizontalAlignment[]{HorizontalAlignment.field3425, HorizontalAlignment.field3424, HorizontalAlignment.HorizontalAlignment_centered}; - } + @Export("loadWorlds") + static boolean loadWorlds() { + try { + if (World.World_request == null) { + World.World_request = WorldMapData_0.urlRequester.request(new URL(StructDefinition.field3307)); + } else if (World.World_request.isDone()) { + byte[] var0 = World.World_request.getResponse(); + Buffer var1 = new Buffer(var0); + var1.readInt(); + World.World_count = var1.readUnsignedShort(); + class96.World_worlds = new World[World.World_count]; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(II)Lim;", - garbageValue = "1724528275" - ) - @Export("VarpDefinition_get") - public static VarpDefinition VarpDefinition_get(int var0) { - VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); - var1 = new VarpDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); + World var3; + for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { + var3 = class96.World_worlds[var2] = new World(); + var3.id = var1.readUnsignedShort(); + var3.properties = var1.readInt(); + var3.host = var1.readStringCp1252NullTerminated(); + var3.activity = var1.readStringCp1252NullTerminated(); + var3.location = var1.readUnsignedByte(); + var3.population = var1.readShort(); + } + + Interpreter.sortWorlds(class96.World_worlds, 0, class96.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); + World.World_request = null; + return true; } - - VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); - return var1; + } catch (Exception var4) { + var4.printStackTrace(); + World.World_request = null; } + + return false; } - @ObfuscatedName("w") + @ObfuscatedName("ke") @ObfuscatedSignature( - signature = "(Lbj;I)V", - garbageValue = "1646849936" + signature = "(Lhn;IIIB)V", + garbageValue = "58" ) - @Export("doCycleTitle") - static void doCycleTitle(GameShell var0) { - if (Login.worldSelectOpen) { - class191.method3638(var0); - } else { - if ((MouseHandler.MouseHandler_lastButton == 1 || !NetFileRequest.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { - Interpreter.clientPreferences.titleMusicDisabled = !Interpreter.clientPreferences.titleMusicDisabled; - FriendSystem.savePreferences(); - if (!Interpreter.clientPreferences.titleMusicDisabled) { - Archive var1 = GrandExchangeOfferWorldComparator.archive6; - int var2 = var1.getGroupId("scape main"); - int var3 = var1.getFileId(var2, ""); - class173.playMusicTrack(var1, var2, var3, 255, false); - } else { - Actor.method1755(); - } - } - - if (Client.gameState != 5) { - if (Login.field1158 == -1L) { - Login.field1158 = WorldMapID.currentTimeMillis() + 1000L; - } - - long var33 = WorldMapID.currentTimeMillis(); - boolean var58; - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { - while (true) { - if (Client.archiveLoadersDone >= Client.archiveLoaders.size()) { - var58 = true; - break; - } - - ArchiveLoader var4 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); - if (!var4.isLoaded()) { - var58 = false; - break; - } - - ++Client.archiveLoadersDone; - } - } else { - var58 = true; - } - - if (var58 && Login.field1187 == -1L) { - Login.field1187 = var33; - if (Login.field1187 > Login.field1158) { - Login.field1158 = Login.field1187; - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { - int var35; - if (Language.Language_EN == Varps.clientLanguage) { - if (MouseHandler.MouseHandler_lastButton == 1 || !NetFileRequest.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { - var35 = Login.xPadding + 5; - short var5 = 463; - byte var6 = 100; - byte var7 = 35; - if (MouseHandler.MouseHandler_lastPressedX >= var35 && MouseHandler.MouseHandler_lastPressedX <= var6 + var35 && MouseHandler.MouseHandler_lastPressedY >= var5 && MouseHandler.MouseHandler_lastPressedY <= var7 + var5) { - class222.method4090(); - return; - } - } - - if (Login.World_request != null) { - class222.method4090(); - } - } - - var35 = MouseHandler.MouseHandler_lastButton; - int var59 = MouseHandler.MouseHandler_lastPressedX; - int var60 = MouseHandler.MouseHandler_lastPressedY; - if (var35 == 0) { - var59 = MouseHandler.MouseHandler_x; - var60 = MouseHandler.MouseHandler_y; - } - - if (!NetFileRequest.mouseCam && var35 == 4) { - var35 = 1; - } - - short var63; - int var64; - if (Login.loginIndex == 0) { - boolean var66 = false; - - while (KeyHandler.isKeyDown()) { - if (VertexNormal.field1732 == 84) { - var66 = true; - } - } - - var64 = Script.loginBoxCenter - 80; - var63 = 291; - if (var35 == 1 && var59 >= var64 - 75 && var59 <= var64 + 75 && var60 >= var63 - 20 && var60 <= var63 + 20) { - class13.openURL(NetFileRequest.method4121("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); - } - - var64 = Script.loginBoxCenter + 80; - if (var35 == 1 && var59 >= var64 - 75 && var59 <= var64 + 75 && var60 >= var63 - 20 && var60 <= var63 + 20 || var66) { - if ((Client.worldProperties & 33554432) != 0) { - Login.Login_response0 = ""; - Login.Login_response1 = "This is a Beta world."; - Login.Login_response2 = "Your normal account will not be affected."; - Login.Login_response3 = ""; - Login.loginIndex = 1; - WorldMapCacheName.method618(); - } else if ((Client.worldProperties & 4) != 0) { - if ((Client.worldProperties & 1024) != 0) { - Login.Login_response1 = "This is a High Risk PvP world."; - Login.Login_response2 = "Players can attack each other almost everywhere"; - Login.Login_response3 = "and the Protect Item prayer won't work."; - } else { - Login.Login_response1 = "This is a PvP world."; - Login.Login_response2 = "Players can attack each other"; - Login.Login_response3 = "almost everywhere."; - } - - Login.Login_response0 = "Warning!"; - Login.loginIndex = 1; - WorldMapCacheName.method618(); - } else if ((Client.worldProperties & 1024) != 0) { - Login.Login_response1 = "This is a High Risk world."; - Login.Login_response2 = "The Protect Item prayer will"; - Login.Login_response3 = "not work on this world."; - Login.Login_response0 = "Warning!"; - Login.loginIndex = 1; - WorldMapCacheName.method618(); - } else { - ItemDefinition.Login_promptCredentials(false); - } - } - } else { - short var8; - int var61; - if (Login.loginIndex == 1) { - while (true) { - if (!KeyHandler.isKeyDown()) { - var61 = Script.loginBoxCenter - 80; - var8 = 321; - if (var35 == 1 && var59 >= var61 - 75 && var59 <= var61 + 75 && var60 >= var8 - 20 && var60 <= var8 + 20) { - ItemDefinition.Login_promptCredentials(false); - } - - var61 = Script.loginBoxCenter + 80; - if (var35 == 1 && var59 >= var61 - 75 && var59 <= var61 + 75 && var60 >= var8 - 20 && var60 <= var8 + 20) { - Login.loginIndex = 0; - } - break; - } - - if (VertexNormal.field1732 == 84) { - ItemDefinition.Login_promptCredentials(false); - } else if (VertexNormal.field1732 == 13) { - Login.loginIndex = 0; - } - } - } else { - String var13; - short var62; - boolean var82; - if (Login.loginIndex == 2) { - var62 = 201; - var61 = var62 + 52; - if (var35 == 1 && var60 >= var61 - 12 && var60 < var61 + 2) { - Login.currentLoginField = 0; - } - - var61 += 15; - if (var35 == 1 && var60 >= var61 - 12 && var60 < var61 + 2) { - Login.currentLoginField = 1; - } - - var61 += 15; - var62 = 361; - if (class267.field3521 != null) { - var64 = class267.field3521.highX / 2; - if (var35 == 1 && var59 >= class267.field3521.lowX - var64 && var59 <= var64 + class267.field3521.lowX && var60 >= var62 - 15 && var60 < var62) { - switch(Login.field1181) { - case 1: - AbstractWorldMapData.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); - Login.loginIndex = 5; - return; - case 2: - class13.openURL("https://support.runescape.com/hc/en-gb", true, false); - } - } - } - - var64 = Script.loginBoxCenter - 80; - var63 = 321; - if (var35 == 1 && var59 >= var64 - 75 && var59 <= var64 + 75 && var60 >= var63 - 20 && var60 <= var63 + 20) { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - AbstractWorldMapData.setLoginResponseString("", "Please enter your username/email address.", ""); - return; - } - - if (Login.Login_password.length() == 0) { - AbstractWorldMapData.setLoginResponseString("", "Please enter your password.", ""); - return; - } - - AbstractWorldMapData.setLoginResponseString("", "Connecting to server...", ""); - AbstractWorldMapIcon.method612(false); - class195.updateGameState(20); - return; - } - - var64 = Login.loginBoxX + 180 + 80; - if (var35 == 1 && var59 >= var64 - 75 && var59 <= var64 + 75 && var60 >= var63 - 20 && var60 <= var63 + 20) { - Login.loginIndex = 0; - Login.Login_username = ""; - Login.Login_password = ""; - class266.field3517 = 0; - class80.otp = ""; - Login.field1178 = true; - } - - var64 = Script.loginBoxCenter + -117; - var63 = 277; - Login.field1186 = var59 >= var64 && var59 < var64 + IgnoreList.field3579 && var60 >= var63 && var60 < var63 + MenuAction.field1133; - if (var35 == 1 && Login.field1186) { - Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; - if (!Client.Login_isUsernameRemembered && Interpreter.clientPreferences.rememberedUsername != null) { - Interpreter.clientPreferences.rememberedUsername = null; - FriendSystem.savePreferences(); - } - } - - var64 = Script.loginBoxCenter + 24; - var63 = 277; - Login.field1182 = var59 >= var64 && var59 < var64 + IgnoreList.field3579 && var60 >= var63 && var60 < var63 + MenuAction.field1133; - if (var35 == 1 && Login.field1182) { - Interpreter.clientPreferences.hideUsername = !Interpreter.clientPreferences.hideUsername; - if (!Interpreter.clientPreferences.hideUsername) { - Login.Login_username = ""; - Interpreter.clientPreferences.rememberedUsername = null; - WorldMapCacheName.method618(); - } - - FriendSystem.savePreferences(); - } - - while (true) { - Transferable var11; - int var67; - do { - while (true) { - label1185: - do { - while (true) { - while (KeyHandler.isKeyDown()) { - if (VertexNormal.field1732 != 13) { - if (Login.currentLoginField != 0) { - continue label1185; - } - - GrandExchangeEvents.method76(TileItemPile.field1521); - if (VertexNormal.field1732 == 85 && Login.Login_username.length() > 0) { - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (VertexNormal.field1732 == 84 || VertexNormal.field1732 == 80) { - Login.currentLoginField = 1; - } - - if (class227.method4102(TileItemPile.field1521) && Login.Login_username.length() < 320) { - Login.Login_username = Login.Login_username + TileItemPile.field1521; - } - } else { - Login.loginIndex = 0; - Login.Login_username = ""; - Login.Login_password = ""; - class266.field3517 = 0; - class80.otp = ""; - Login.field1178 = true; - } - } - - return; - } - } while(Login.currentLoginField != 1); - - if (VertexNormal.field1732 == 85 && Login.Login_password.length() > 0) { - Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); - } else if (VertexNormal.field1732 == 84 || VertexNormal.field1732 == 80) { - Login.currentLoginField = 0; - if (VertexNormal.field1732 == 84) { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - AbstractWorldMapData.setLoginResponseString("", "Please enter your username/email address.", ""); - return; - } - - if (Login.Login_password.length() == 0) { - AbstractWorldMapData.setLoginResponseString("", "Please enter your password.", ""); - return; - } - - AbstractWorldMapData.setLoginResponseString("", "Connecting to server...", ""); - AbstractWorldMapIcon.method612(false); - class195.updateGameState(20); - return; - } - } - - if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && VertexNormal.field1732 == 67) { - Clipboard var10 = Toolkit.getDefaultToolkit().getSystemClipboard(); - var11 = var10.getContents(class206.client); - var67 = 20 - Login.Login_password.length(); - break; - } - - char var81 = TileItemPile.field1521; - if (var81 >= ' ' && var81 < 127 || var81 > 127 && var81 < 160 || var81 > 160 && var81 <= 255) { - var82 = true; - } else { - label1386: { - if (var81 != 0) { - char[] var38 = class287.cp1252AsciiExtension; - - for (int var39 = 0; var39 < var38.length; ++var39) { - char var69 = var38[var39]; - if (var69 == var81) { - var82 = true; - break label1386; - } - } - } - - var82 = false; - } - } - - if (var82 && class227.method4102(TileItemPile.field1521) && Login.Login_password.length() < 20) { - Login.Login_password = Login.Login_password + TileItemPile.field1521; - } - } - } while(var67 <= 0); - - try { - var13 = (String)var11.getTransferData(DataFlavor.stringFlavor); - int var71 = Math.min(var67, var13.length()); - - for (int var15 = 0; var15 < var71; ++var15) { - if (!class179.method3581(var13.charAt(var15)) || !class227.method4102(var13.charAt(var15))) { - Login.loginIndex = 3; - return; - } - } - - Login.Login_password = Login.Login_password + var13.substring(0, var71); - } catch (UnsupportedFlavorException var56) { - } catch (IOException var57) { - } - } - } else if (Login.loginIndex == 3) { - var61 = Login.loginBoxX + 180; - var8 = 276; - if (var35 == 1 && var59 >= var61 - 75 && var59 <= var61 + 75 && var60 >= var8 - 20 && var60 <= var8 + 20) { - ItemDefinition.Login_promptCredentials(false); - } - - var61 = Login.loginBoxX + 180; - var8 = 326; - if (var35 == 1 && var59 >= var61 - 75 && var59 <= var61 + 75 && var60 >= var8 - 20 && var60 <= var8 + 20) { - AbstractWorldMapData.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); - Login.loginIndex = 5; - return; - } - } else { - int var37; - if (Login.loginIndex == 4) { - var61 = Login.loginBoxX + 180 - 80; - var8 = 321; - if (var35 == 1 && var59 >= var61 - 75 && var59 <= var61 + 75 && var60 >= var8 - 20 && var60 <= var8 + 20) { - class80.otp.trim(); - if (class80.otp.length() != 6) { - AbstractWorldMapData.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); - return; - } - - class266.field3517 = Integer.parseInt(class80.otp); - class80.otp = ""; - AbstractWorldMapIcon.method612(true); - AbstractWorldMapData.setLoginResponseString("", "Connecting to server...", ""); - class195.updateGameState(20); - return; - } - - if (var35 == 1 && var59 >= Login.loginBoxX + 180 - 9 && var59 <= Login.loginBoxX + 180 + 130 && var60 >= 263 && var60 <= 296) { - Login.field1178 = !Login.field1178; - } - - if (var35 == 1 && var59 >= Login.loginBoxX + 180 - 34 && var59 <= Login.loginBoxX + 34 + 180 && var60 >= 351 && var60 <= 363) { - class13.openURL(NetFileRequest.method4121("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); - } - - var61 = Login.loginBoxX + 180 + 80; - if (var35 == 1 && var59 >= var61 - 75 && var59 <= var61 + 75 && var60 >= var8 - 20 && var60 <= var8 + 20) { - Login.loginIndex = 0; - Login.Login_username = ""; - Login.Login_password = ""; - class266.field3517 = 0; - class80.otp = ""; - } - - while (KeyHandler.isKeyDown()) { - boolean var9 = false; - - for (var37 = 0; var37 < "1234567890".length(); ++var37) { - if (TileItemPile.field1521 == "1234567890".charAt(var37)) { - var9 = true; - break; - } - } - - if (VertexNormal.field1732 == 13) { - Login.loginIndex = 0; - Login.Login_username = ""; - Login.Login_password = ""; - class266.field3517 = 0; - class80.otp = ""; - } else { - if (VertexNormal.field1732 == 85 && class80.otp.length() > 0) { - class80.otp = class80.otp.substring(0, class80.otp.length() - 1); - } - - if (VertexNormal.field1732 == 84) { - class80.otp.trim(); - if (class80.otp.length() != 6) { - AbstractWorldMapData.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); - return; - } - - class266.field3517 = Integer.parseInt(class80.otp); - class80.otp = ""; - AbstractWorldMapIcon.method612(true); - AbstractWorldMapData.setLoginResponseString("", "Connecting to server...", ""); - class195.updateGameState(20); - return; - } - - if (var9 && class80.otp.length() < 6) { - class80.otp = class80.otp + TileItemPile.field1521; - } - } - } - } else if (Login.loginIndex == 5) { - var61 = Login.loginBoxX + 180 - 80; - var8 = 321; - String var23; - if (var35 == 1 && var59 >= var61 - 75 && var59 <= var61 + 75 && var60 >= var8 - 20 && var60 <= var8 + 20) { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - AbstractWorldMapData.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); - } else { - long var40 = ArchiveLoader.method1156(); - byte var65; - if (var40 == 0L) { - var65 = 5; - } else { - var13 = Login.Login_username; - Random var42 = new Random(); - Buffer var83 = new Buffer(128); - Buffer var68 = new Buffer(128); - int[] var70 = new int[]{var42.nextInt(), var42.nextInt(), (int)(var40 >> 32), (int)var40}; - var83.writeByte(10); - - int var18; - for (var18 = 0; var18 < 4; ++var18) { - var83.writeInt(var42.nextInt()); - } - - var83.writeInt(var70[0]); - var83.writeInt(var70[1]); - var83.writeLong(var40); - var83.writeLong(0L); - - for (var18 = 0; var18 < 4; ++var18) { - var83.writeInt(var42.nextInt()); - } - - var83.encryptRsa(class80.field1109, class80.field1112); - var68.writeByte(10); - - for (var18 = 0; var18 < 3; ++var18) { - var68.writeInt(var42.nextInt()); - } - - var68.writeLong(var42.nextLong()); - var68.writeLongMedium(var42.nextLong()); - if (Client.randomDatData != null) { - var68.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); - } else { - byte[] var84 = MenuAction.method2068(); - var68.writeBytes(var84, 0, var84.length); - } - - var68.writeLong(var42.nextLong()); - var68.encryptRsa(class80.field1109, class80.field1112); - var18 = ViewportMouse.stringCp1252NullTerminatedByteSize(var13); - if (var18 % 8 != 0) { - var18 += 8 - var18 % 8; - } - - Buffer var72 = new Buffer(var18); - var72.writeStringCp1252NullTerminated(var13); - var72.offset = var18; - var72.xteaEncryptAll(var70); - Buffer var73 = new Buffer(var72.offset + var68.offset + var83.offset + 5); - var73.writeByte(2); - var73.writeByte(var83.offset); - var73.writeBytes(var83.array, 0, var83.offset); - var73.writeByte(var68.offset); - var73.writeBytes(var68.array, 0, var68.offset); - var73.writeShort(var72.offset); - var73.writeBytes(var72.array, 0, var72.offset); - byte[] var75 = var73.array; - String var74 = Language.method3636(var75, 0, var75.length); - var23 = var74; - - byte var12; - try { - URL var76 = new URL(NetFileRequest.method4121("services", false) + "m=accountappeal/login.ws"); - URLConnection var77 = var76.openConnection(); - var77.setDoInput(true); - var77.setDoOutput(true); - var77.setConnectTimeout(5000); - OutputStreamWriter var78 = new OutputStreamWriter(var77.getOutputStream()); - var78.write("data2=" + UserComparator5.method3352(var23) + "&dest=" + UserComparator5.method3352("passwordchoice.ws")); - var78.flush(); - InputStream var79 = var77.getInputStream(); - var73 = new Buffer(new byte[1000]); - - while (true) { - int var28 = var79.read(var73.array, var73.offset, 1000 - var73.offset); - if (var28 == -1) { - var78.close(); - var79.close(); - String var85 = new String(var73.array); - if (var85.startsWith("OFFLINE")) { - var12 = 4; - } else if (var85.startsWith("WRONG")) { - var12 = 7; - } else if (var85.startsWith("RELOAD")) { - var12 = 3; - } else if (var85.startsWith("Not permitted for social network accounts.")) { - var12 = 6; - } else { - var73.xteaDecryptAll(var70); - - while (var73.offset > 0 && var73.array[var73.offset - 1] == 0) { - --var73.offset; - } - - var85 = new String(var73.array, 0, var73.offset); - boolean var29; - if (var85 == null) { - var29 = false; - } else { - label1361: { - try { - new URL(var85); - } catch (MalformedURLException var52) { - var29 = false; - break label1361; - } - - var29 = true; - } - } - - if (var29) { - class13.openURL(var85, true, false); - var12 = 2; - } else { - var12 = 5; - } - } - break; - } - - var73.offset += var28; - if (var73.offset >= 1000) { - var12 = 5; - break; - } - } - } catch (Throwable var53) { - var53.printStackTrace(); - var12 = 5; - } - - var65 = var12; - } - - switch(var65) { - case 2: - AbstractWorldMapData.setLoginResponseString(Strings.field2834, Strings.field3014, Strings.field3015); - Login.loginIndex = 6; - break; - case 3: - AbstractWorldMapData.setLoginResponseString("", "Error connecting to server.", ""); - break; - case 4: - AbstractWorldMapData.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); - break; - case 5: - AbstractWorldMapData.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); - break; - case 6: - AbstractWorldMapData.setLoginResponseString("", "Error connecting to server.", ""); - break; - case 7: - AbstractWorldMapData.setLoginResponseString("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username."); - } - } - - return; - } - - var61 = Login.loginBoxX + 180 + 80; - if (var35 == 1 && var59 >= var61 - 75 && var59 <= var61 + 75 && var60 >= var8 - 20 && var60 <= var8 + 20) { - ItemDefinition.Login_promptCredentials(true); - } - - var63 = 361; - if (class197.field2397 != null) { - var37 = class197.field2397.highX / 2; - if (var35 == 1 && var59 >= class197.field2397.lowX - var37 && var59 <= var37 + class197.field2397.lowX && var60 >= var63 - 15 && var60 < var63) { - class13.openURL(NetFileRequest.method4121("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); - } - } - - while (KeyHandler.isKeyDown()) { - var82 = false; - - for (int var36 = 0; var36 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var36) { - if (TileItemPile.field1521 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var36)) { - var82 = true; - break; - } - } - - if (VertexNormal.field1732 == 13) { - ItemDefinition.Login_promptCredentials(true); - } else { - if (VertexNormal.field1732 == 85 && Login.Login_username.length() > 0) { - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (VertexNormal.field1732 == 84) { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - AbstractWorldMapData.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); - } else { - long var46 = ArchiveLoader.method1156(); - byte var80; - if (var46 == 0L) { - var80 = 5; - } else { - String var43 = Login.Login_username; - Random var16 = new Random(); - Buffer var17 = new Buffer(128); - Buffer var44 = new Buffer(128); - int[] var19 = new int[]{var16.nextInt(), var16.nextInt(), (int)(var46 >> 32), (int)var46}; - var17.writeByte(10); - - int var48; - for (var48 = 0; var48 < 4; ++var48) { - var17.writeInt(var16.nextInt()); - } - - var17.writeInt(var19[0]); - var17.writeInt(var19[1]); - var17.writeLong(var46); - var17.writeLong(0L); - - for (var48 = 0; var48 < 4; ++var48) { - var17.writeInt(var16.nextInt()); - } - - var17.encryptRsa(class80.field1109, class80.field1112); - var44.writeByte(10); - - for (var48 = 0; var48 < 3; ++var48) { - var44.writeInt(var16.nextInt()); - } - - var44.writeLong(var16.nextLong()); - var44.writeLongMedium(var16.nextLong()); - if (Client.randomDatData != null) { - var44.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); - } else { - byte[] var20 = MenuAction.method2068(); - var44.writeBytes(var20, 0, var20.length); - } - - var44.writeLong(var16.nextLong()); - var44.encryptRsa(class80.field1109, class80.field1112); - var48 = ViewportMouse.stringCp1252NullTerminatedByteSize(var43); - if (var48 % 8 != 0) { - var48 += 8 - var48 % 8; - } - - Buffer var21 = new Buffer(var48); - var21.writeStringCp1252NullTerminated(var43); - var21.offset = var48; - var21.xteaEncryptAll(var19); - Buffer var22 = new Buffer(var21.offset + var44.offset + var17.offset + 5); - var22.writeByte(2); - var22.writeByte(var17.offset); - var22.writeBytes(var17.array, 0, var17.offset); - var22.writeByte(var44.offset); - var22.writeBytes(var44.array, 0, var44.offset); - var22.writeShort(var21.offset); - var22.writeBytes(var21.array, 0, var21.offset); - byte[] var24 = var22.array; - var23 = Language.method3636(var24, 0, var24.length); - String var25 = var23; - - byte var14; - try { - URL var26 = new URL(NetFileRequest.method4121("services", false) + "m=accountappeal/login.ws"); - URLConnection var27 = var26.openConnection(); - var27.setDoInput(true); - var27.setDoOutput(true); - var27.setConnectTimeout(5000); - OutputStreamWriter var45 = new OutputStreamWriter(var27.getOutputStream()); - var45.write("data2=" + UserComparator5.method3352(var25) + "&dest=" + UserComparator5.method3352("passwordchoice.ws")); - var45.flush(); - InputStream var49 = var27.getInputStream(); - var22 = new Buffer(new byte[1000]); - - while (true) { - int var50 = var49.read(var22.array, var22.offset, 1000 - var22.offset); - if (var50 == -1) { - var45.close(); - var49.close(); - String var30 = new String(var22.array); - if (var30.startsWith("OFFLINE")) { - var14 = 4; - } else if (var30.startsWith("WRONG")) { - var14 = 7; - } else if (var30.startsWith("RELOAD")) { - var14 = 3; - } else if (var30.startsWith("Not permitted for social network accounts.")) { - var14 = 6; - } else { - var22.xteaDecryptAll(var19); - - while (var22.offset > 0 && var22.array[var22.offset - 1] == 0) { - --var22.offset; - } - - var30 = new String(var22.array, 0, var22.offset); - boolean var31; - if (var30 == null) { - var31 = false; - } else { - label1363: { - try { - new URL(var30); - } catch (MalformedURLException var54) { - var31 = false; - break label1363; - } - - var31 = true; - } - } - - if (var31) { - class13.openURL(var30, true, false); - var14 = 2; - } else { - var14 = 5; - } - } - break; - } - - var22.offset += var50; - if (var22.offset >= 1000) { - var14 = 5; - break; - } - } - } catch (Throwable var55) { - var55.printStackTrace(); - var14 = 5; - } - - var80 = var14; - } - - switch(var80) { - case 2: - AbstractWorldMapData.setLoginResponseString(Strings.field2834, Strings.field3014, Strings.field3015); - Login.loginIndex = 6; - break; - case 3: - AbstractWorldMapData.setLoginResponseString("", "Error connecting to server.", ""); - break; - case 4: - AbstractWorldMapData.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); - break; - case 5: - AbstractWorldMapData.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); - break; - case 6: - AbstractWorldMapData.setLoginResponseString("", "Error connecting to server.", ""); - break; - case 7: - AbstractWorldMapData.setLoginResponseString("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username."); - } - } - - return; - } - - if (var82 && Login.Login_username.length() < 320) { - Login.Login_username = Login.Login_username + TileItemPile.field1521; - } - } - } - } else if (Login.loginIndex != 6) { - if (Login.loginIndex == 7) { - var61 = Login.loginBoxX + 180 - 80; - var8 = 321; - if (var35 == 1 && var59 >= var61 - 75 && var59 <= var61 + 75 && var60 >= var8 - 20 && var60 <= var8 + 20) { - class13.openURL(NetFileRequest.method4121("secure", true) + "m=dob/set_dob.ws", true, false); - AbstractWorldMapData.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - Login.loginIndex = 6; - return; - } - - var61 = Login.loginBoxX + 180 + 80; - if (var35 == 1 && var59 >= var61 - 75 && var59 <= var61 + 75 && var60 >= var8 - 20 && var60 <= var8 + 20) { - ItemDefinition.Login_promptCredentials(true); - } - } else if (Login.loginIndex == 8) { - var61 = Login.loginBoxX + 180 - 80; - var8 = 321; - if (var35 == 1 && var59 >= var61 - 75 && var59 <= var61 + 75 && var60 >= var8 - 20 && var60 <= var8 + 20) { - class13.openURL("https://www.jagex.com/terms/privacy/#eight", true, false); - AbstractWorldMapData.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - Login.loginIndex = 6; - return; - } - - var61 = Login.loginBoxX + 180 + 80; - if (var35 == 1 && var59 >= var61 - 75 && var59 <= var61 + 75 && var60 >= var8 - 20 && var60 <= var8 + 20) { - ItemDefinition.Login_promptCredentials(true); - } - } else if (Login.loginIndex == 12) { - String var51 = ""; - switch(Login.field1167) { - case 0: - var51 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; - break; - case 1: - var51 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; - break; - default: - ItemDefinition.Login_promptCredentials(false); - } - - var64 = Login.loginBoxX + 180; - var63 = 276; - if (var35 == 1 && var59 >= var64 - 75 && var59 <= var64 + 75 && var60 >= var63 - 20 && var60 <= var63 + 20) { - class13.openURL(var51, true, false); - AbstractWorldMapData.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - Login.loginIndex = 6; - return; - } - - var64 = Login.loginBoxX + 180; - var63 = 326; - if (var35 == 1 && var59 >= var64 - 75 && var59 <= var64 + 75 && var60 >= var63 - 20 && var60 <= var63 + 20) { - ItemDefinition.Login_promptCredentials(false); - } - } else if (Login.loginIndex == 24) { - var61 = Login.loginBoxX + 180; - var8 = 301; - if (var35 == 1 && var59 >= var61 - 75 && var59 <= var61 + 75 && var60 >= var8 - 20 && var60 <= var8 + 20) { - ItemDefinition.Login_promptCredentials(false); - } - } - } else { - while (true) { - do { - if (!KeyHandler.isKeyDown()) { - var62 = 321; - if (var35 == 1 && var60 >= var62 - 20 && var60 <= var62 + 20) { - ItemDefinition.Login_promptCredentials(true); - } - - return; - } - } while(VertexNormal.field1732 != 84 && VertexNormal.field1732 != 13); - - ItemDefinition.Login_promptCredentials(true); - } - } - } - } - } - - } - } - } - } - - @ObfuscatedName("hb") - @ObfuscatedSignature( - signature = "(IIZS)V", - garbageValue = "16128" - ) - static final void method3327(int var0, int var1, boolean var2) { - if (!var2 || var0 != GrandExchangeOfferTotalQuantityComparator.field47 || ClanMate.field3567 != var1) { - GrandExchangeOfferTotalQuantityComparator.field47 = var0; - ClanMate.field3567 = var1; - class195.updateGameState(25); - class1.drawLoadingMessage("Loading - please wait.", true); - int var3 = MusicPatchPcmStream.baseX * 64; - int var4 = ScriptEvent.baseY * 64; - MusicPatchPcmStream.baseX = (var0 - 6) * 8; - ScriptEvent.baseY = (var1 - 6) * 8; - int var5 = MusicPatchPcmStream.baseX * 64 - var3; - int var6 = ScriptEvent.baseY * 64 - var4; - var3 = MusicPatchPcmStream.baseX * 64; - var4 = ScriptEvent.baseY * 64; - - int var7; - int var9; - int[] var10000; - for (var7 = 0; var7 < 32768; ++var7) { - NPC var8 = Client.npcs[var7]; - if (var8 != null) { - for (var9 = 0; var9 < 10; ++var9) { - var10000 = var8.pathX; - var10000[var9] -= var5; - var10000 = var8.pathY; - var10000[var9] -= var6; - } - - var8.x -= var5 * 128; - var8.y -= var6 * 128; - } - } - - for (var7 = 0; var7 < 2048; ++var7) { - Player var21 = Client.players[var7]; - if (var21 != null) { - for (var9 = 0; var9 < 10; ++var9) { - var10000 = var21.pathX; - var10000[var9] -= var5; - var10000 = var21.pathY; - var10000[var9] -= var6; - } - - var21.x -= var5 * 128; - var21.y -= var6 * 128; - } - } - - byte var20 = 0; - byte var18 = 104; - byte var22 = 1; - if (var5 < 0) { - var20 = 103; - var18 = -1; - var22 = -1; - } - - byte var10 = 0; - byte var11 = 104; - byte var12 = 1; - if (var6 < 0) { - var10 = 103; - var11 = -1; - var12 = -1; - } - - int var14; - for (int var13 = var20; var18 != var13; var13 += var22) { - for (var14 = var10; var14 != var11; var14 += var12) { - int var15 = var13 + var5; - int var16 = var6 + var14; - - for (int var17 = 0; var17 < 4; ++var17) { - if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { - Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; - } else { - Client.groundItems[var17][var13][var14] = null; - } - } - } - } - - for (PendingSpawn var19 = (PendingSpawn)Client.pendingSpawns.last(); var19 != null; var19 = (PendingSpawn)Client.pendingSpawns.previous()) { - var19.x -= var5; - var19.y -= var6; - if (var19.x < 0 || var19.y < 0 || var19.x >= 104 || var19.y >= 104) { - var19.remove(); - } - } - - if (Client.destinationX != 0) { - Client.destinationX -= var5; - Client.destinationY -= var6; - } - - Client.soundEffectCount = 0; - Client.isCameraLocked = false; - MusicPatchNode2.cameraX -= var5 << 7; - UserComparator9.cameraZ -= var6 << 7; - WorldMapSectionType.oculusOrbFocalPointX -= var5 << 7; - Language.oculusOrbFocalPointY -= var6 << 7; - Client.field853 = -1; - Client.graphicsObjects.clear(); - Client.projectiles.clear(); - - for (var14 = 0; var14 < 4; ++var14) { - Client.collisionMaps[var14].clear(); + @Export("drawCompass") + static final void drawCompass(Widget var0, int var1, int var2, int var3) { + SpriteMask var4 = var0.getSpriteMask(false); + if (var4 != null) { + if (Client.minimapState < 3) { + Entity.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths); + } else { + Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); } } diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java index 2d1da039b1..0dd74e8ed9 100644 --- a/runescape-client/src/main/java/UserComparator9.java +++ b/runescape-client/src/main/java/UserComparator9.java @@ -4,22 +4,15 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eg") +@ObfuscatedName("eo") @Implements("UserComparator9") public class UserComparator9 extends AbstractUserComparator { - @ObfuscatedName("et") - @ObfuscatedSignature( - signature = "Lif;" - ) - @Export("archive20") - static Archive archive20; - @ObfuscatedName("hg") + @ObfuscatedName("nx") @ObfuscatedGetter( - intValue = -864409125 + intValue = 76612023 ) - @Export("cameraZ") - static int cameraZ; - @ObfuscatedName("f") + static int field1965; + @ObfuscatedName("c") @Export("reversed") final boolean reversed; @@ -27,10 +20,10 @@ public class UserComparator9 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljt;Ljt;I)I", - garbageValue = "1918568840" + signature = "(Lje;Lje;I)I", + garbageValue = "-393804908" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -45,24 +38,57 @@ public class UserComparator9 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IB)Liq;", - garbageValue = "35" + signature = "(II)Lce;", + garbageValue = "-1024902697" ) - public static VarbitDefinition method3319(int var0) { - VarbitDefinition var1 = (VarbitDefinition)VarbitDefinition.VarbitDefinition_cached.get((long)var0); + @Export("getScript") + static Script getScript(int var0) { + Script var1 = (Script)Script.Script_cached.get((long)var0); if (var1 != null) { return var1; } else { - byte[] var2 = VarbitDefinition.VarbitDefinition_archive.takeFile(14, var0); - var1 = new VarbitDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); + byte[] var2 = MilliClock.archive12.takeFile(var0, 0); + if (var2 == null) { + return null; + } else { + var1 = Clock.newScript(var2); + Script.Script_cached.put(var1, (long)var0); + return var1; } - - VarbitDefinition.VarbitDefinition_cached.put(var1, (long)var0); - return var1; } } + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(II)Lkx;", + garbageValue = "-1930566086" + ) + public static PrivateChatMode method3461(int var0) { + PrivateChatMode[] var1 = class289.method5359(); + + for (int var2 = 0; var2 < var1.length; ++var2) { + PrivateChatMode var3 = var1[var2]; + if (var0 == var3.field3787) { + return var3; + } + } + + return null; + } + + @ObfuscatedName("v") + static final void method3460(long var0) { + ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var0; + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + signature = "(Lcx;I)V", + garbageValue = "1045276574" + ) + public static final void method3462(class99 var0) { + PcmPlayer.pcmPlayerProvider = var0; + } } diff --git a/runescape-client/src/main/java/UserList.java b/runescape-client/src/main/java/UserList.java index fd98109edc..d1491363be 100644 --- a/runescape-client/src/main/java/UserList.java +++ b/runescape-client/src/main/java/UserList.java @@ -8,40 +8,34 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("jb") +@ObfuscatedName("jm") @Implements("UserList") public abstract class UserList { - @ObfuscatedName("ba") - @ObfuscatedSignature( - signature = "Lli;" - ) - @Export("worldSelectRightSprite") - static IndexedSprite worldSelectRightSprite; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -2101264289 + intValue = -1736832459 ) @Export("capacity") final int capacity; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -82110221 + intValue = 114939403 ) @Export("size") int size; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "[Ljy;" + signature = "[Ljk;" ) @Export("array") User[] array; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("usernamesMap") HashMap usernamesMap; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("previousUsernamesMap") HashMap previousUsernamesMap; - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("comparator") Comparator comparator; @@ -54,26 +48,26 @@ public abstract class UserList { this.previousUsernamesMap = new HashMap(var1 / 8); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)Ljy;", - garbageValue = "68" + signature = "(S)Ljk;", + garbageValue = "30683" ) @Export("newInstance") abstract User newInstance(); - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IB)[Ljy;", - garbageValue = "32" + signature = "(IB)[Ljk;", + garbageValue = "19" ) @Export("newTypedArray") abstract User[] newTypedArray(int var1); - @ObfuscatedName("a") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "276707896" + garbageValue = "847313587" ) @Export("clear") public void clear() { @@ -83,30 +77,30 @@ public abstract class UserList { this.previousUsernamesMap.clear(); } - @ObfuscatedName("d") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "2" + signature = "(I)I", + garbageValue = "-444681526" ) @Export("getSize") public int getSize() { return this.size; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "-22" + signature = "(I)Z", + garbageValue = "-1093222971" ) @Export("isFull") public boolean isFull() { - return this.capacity == this.size; + return this.size == this.capacity; } - @ObfuscatedName("o") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Ljc;B)Z", - garbageValue = "-17" + signature = "(Ljz;I)Z", + garbageValue = "645077874" ) @Export("contains") public boolean contains(Username var1) { @@ -117,10 +111,10 @@ public abstract class UserList { } } - @ObfuscatedName("l") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Ljc;I)Ljy;", - garbageValue = "1801288220" + signature = "(Ljz;I)Ljk;", + garbageValue = "111553486" ) @Export("getByUsername") public User getByUsername(Username var1) { @@ -128,30 +122,30 @@ public abstract class UserList { return var2 != null ? var2 : this.getByPreviousUsername(var1); } - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(Ljc;I)Ljy;", - garbageValue = "-877412517" + signature = "(Ljz;I)Ljk;", + garbageValue = "-632690223" ) @Export("getByCurrentUsername") User getByCurrentUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); } - @ObfuscatedName("j") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Ljc;I)Ljy;", - garbageValue = "1064087548" + signature = "(Ljz;B)Ljk;", + garbageValue = "-97" ) @Export("getByPreviousUsername") User getByPreviousUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); } - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ljc;I)Z", - garbageValue = "1761929838" + signature = "(Ljz;I)Z", + garbageValue = "379093551" ) @Export("removeByUsername") public final boolean removeByUsername(Username var1) { @@ -164,10 +158,10 @@ public abstract class UserList { } } - @ObfuscatedName("u") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(Ljy;I)V", - garbageValue = "1344275485" + signature = "(Ljk;I)V", + garbageValue = "144802420" ) @Export("remove") final void remove(User var1) { @@ -178,20 +172,20 @@ public abstract class UserList { } } - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Ljc;I)Ljy;", - garbageValue = "-1788654627" + signature = "(Ljz;I)Ljk;", + garbageValue = "450603537" ) @Export("addLastNoPreviousUsername") User addLastNoPreviousUsername(Username var1) { return this.addLast(var1, (Username)null); } - @ObfuscatedName("h") + @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "(Ljc;Ljc;I)Ljy;", - garbageValue = "-814300512" + signature = "(Ljz;Ljz;B)Ljk;", + garbageValue = "0" ) @Export("addLast") User addLast(Username var1, Username var2) { @@ -206,10 +200,10 @@ public abstract class UserList { } } - @ObfuscatedName("m") + @ObfuscatedName("af") @ObfuscatedSignature( - signature = "(IS)Ljy;", - garbageValue = "-10703" + signature = "(II)Ljk;", + garbageValue = "1668205012" ) @Export("get") public final User get(int var1) { @@ -220,10 +214,10 @@ public abstract class UserList { } } - @ObfuscatedName("aa") + @ObfuscatedName("az") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "296571009" + garbageValue = "-1810920855" ) @Export("sort") public final void sort() { @@ -235,10 +229,10 @@ public abstract class UserList { } - @ObfuscatedName("av") + @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "(Ljy;Ljc;Ljc;B)V", - garbageValue = "-18" + signature = "(Ljk;Ljz;Ljz;I)V", + garbageValue = "-1039891004" ) @Export("changeName") final void changeName(User var1, Username var2, Username var3) { @@ -247,10 +241,10 @@ public abstract class UserList { this.mapPut(var1); } - @ObfuscatedName("aw") + @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "(Ljy;I)I", - garbageValue = "607308278" + signature = "(Ljk;I)I", + garbageValue = "-147054371" ) @Export("indexOf") final int indexOf(User var1) { @@ -263,10 +257,10 @@ public abstract class UserList { return -1; } - @ObfuscatedName("as") + @ObfuscatedName("au") @ObfuscatedSignature( - signature = "(Ljy;I)V", - garbageValue = "243308006" + signature = "(Ljk;I)V", + garbageValue = "1037986229" ) @Export("mapRemove") final void mapRemove(User var1) { @@ -280,20 +274,20 @@ public abstract class UserList { } } - @ObfuscatedName("ak") + @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "(Ljy;I)V", - garbageValue = "760547455" + signature = "(Ljk;B)V", + garbageValue = "127" ) @Export("arrayAddLast") final void arrayAddLast(User var1) { this.array[++this.size - 1] = var1; } - @ObfuscatedName("au") + @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "(Ljy;B)V", - garbageValue = "1" + signature = "(Ljk;I)V", + garbageValue = "2145132082" ) @Export("mapPut") final void mapPut(User var1) { @@ -307,10 +301,10 @@ public abstract class UserList { } - @ObfuscatedName("ah") + @ObfuscatedName("aq") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "486481485" + garbageValue = "45023574" ) @Export("arrayRemove") final void arrayRemove(int var1) { @@ -321,20 +315,20 @@ public abstract class UserList { } - @ObfuscatedName("aq") + @ObfuscatedName("as") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-25" + signature = "(I)V", + garbageValue = "186565478" ) @Export("removeComparator") public final void removeComparator() { this.comparator = null; } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "(Ljava/util/Comparator;B)V", - garbageValue = "-73" + signature = "(Ljava/util/Comparator;I)V", + garbageValue = "-144770664" ) @Export("addComparator") public final void addComparator(Comparator var1) { @@ -346,26 +340,164 @@ public abstract class UserList { } - @ObfuscatedName("j") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(ILcu;ZB)I", - garbageValue = "28" + signature = "(IILfk;Lfv;I)Z", + garbageValue = "715183629" ) - static int method5193(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? UserComparator7.field1946 : class197.field2398; - if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.itemId; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { - if (var3.itemId != -1) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.itemQuantity; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; + public static final boolean method5167(int var0, int var1, RouteStrategy var2, CollisionMap var3) { + int var4 = var0; + int var5 = var1; + byte var6 = 64; + byte var7 = 64; + int var8 = var0 - var6; + int var9 = var1 - var7; + class173.directions[var6][var7] = 99; + class173.distances[var6][var7] = 0; + byte var10 = 0; + int var11 = 0; + class173.bufferX[var10] = var0; + byte var10001 = var10; + int var18 = var10 + 1; + class173.bufferY[var10001] = var1; + int[][] var12 = var3.flags; + + while (var18 != var11) { + var4 = class173.bufferX[var11]; + var5 = class173.bufferY[var11]; + var11 = var11 + 1 & 4095; + int var16 = var4 - var8; + int var17 = var5 - var9; + int var13 = var4 - var3.xInset; + int var14 = var5 - var3.yInset; + if (var2.hasArrived(1, var4, var5, var3)) { + ChatChannel.field1289 = var4; + class173.field2093 = var5; + return true; } + int var15 = class173.distances[var16][var17] + 1; + if (var16 > 0 && class173.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136776) == 0) { + class173.bufferX[var18] = var4 - 1; + class173.bufferY[var18] = var5; + var18 = var18 + 1 & 4095; + class173.directions[var16 - 1][var17] = 2; + class173.distances[var16 - 1][var17] = var15; + } + + if (var16 < 127 && class173.directions[var16 + 1][var17] == 0 && (var12[var13 + 1][var14] & 19136896) == 0) { + class173.bufferX[var18] = var4 + 1; + class173.bufferY[var18] = var5; + var18 = var18 + 1 & 4095; + class173.directions[var16 + 1][var17] = 8; + class173.distances[var16 + 1][var17] = var15; + } + + if (var17 > 0 && class173.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { + class173.bufferX[var18] = var4; + class173.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class173.directions[var16][var17 - 1] = 1; + class173.distances[var16][var17 - 1] = var15; + } + + if (var17 < 127 && class173.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { + class173.bufferX[var18] = var4; + class173.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class173.directions[var16][var17 + 1] = 4; + class173.distances[var16][var17 + 1] = var15; + } + + if (var16 > 0 && var17 > 0 && class173.directions[var16 - 1][var17 - 1] == 0 && (var12[var13 - 1][var14 - 1] & 19136782) == 0 && (var12[var13 - 1][var14] & 19136776) == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { + class173.bufferX[var18] = var4 - 1; + class173.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class173.directions[var16 - 1][var17 - 1] = 3; + class173.distances[var16 - 1][var17 - 1] = var15; + } + + if (var16 < 127 && var17 > 0 && class173.directions[var16 + 1][var17 - 1] == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0 && (var12[var13 + 1][var14] & 19136896) == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { + class173.bufferX[var18] = var4 + 1; + class173.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class173.directions[var16 + 1][var17 - 1] = 9; + class173.distances[var16 + 1][var17 - 1] = var15; + } + + if (var16 > 0 && var17 < 127 && class173.directions[var16 - 1][var17 + 1] == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0 && (var12[var13 - 1][var14] & 19136776) == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { + class173.bufferX[var18] = var4 - 1; + class173.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class173.directions[var16 - 1][var17 + 1] = 6; + class173.distances[var16 - 1][var17 + 1] = var15; + } + + if (var16 < 127 && var17 < 127 && class173.directions[var16 + 1][var17 + 1] == 0 && (var12[var13 + 1][var14 + 1] & 19136992) == 0 && (var12[var13 + 1][var14] & 19136896) == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { + class173.bufferX[var18] = var4 + 1; + class173.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class173.directions[var16 + 1][var17 + 1] = 12; + class173.distances[var16 + 1][var17 + 1] = var15; + } + } + + ChatChannel.field1289 = var4; + class173.field2093 = var5; + return false; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "(ILce;ZI)I", + garbageValue = "-495480060" + ) + static int method5212(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? class186.field2331 : MidiPcmStream.field2444; + if (var0 == ScriptOpcodes.CC_GETSCROLLX) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.scrollX; return 1; - } else if (var0 == ScriptOpcodes.CC_GETID) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.childIndex; + } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.scrollY; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETTEXT) { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3.text; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.scrollWidth; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.scrollHeight; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.modelZoom; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.modelAngleX; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.modelAngleZ; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.modelAngleY; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETTRANSTOP) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.transparencyTop; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETTRANSBOT) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.transparencyBot; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.color; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.color2; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETFILLMODE) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; return 1; } else { return 2; diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java index f3bff91b51..7db9e28219 100644 --- a/runescape-client/src/main/java/Username.java +++ b/runescape-client/src/main/java/Username.java @@ -1,20 +1,39 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jc") +@ObfuscatedName("jz") @Implements("Username") public class Username implements Comparable { - @ObfuscatedName("f") + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "Lii;" + ) + @Export("Widget_spritesArchive") + static AbstractArchive Widget_spritesArchive; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -624446357 + ) + @Export("canvasWidth") + public static int canvasWidth; + @ObfuscatedName("ap") + @Export("client") + @ObfuscatedSignature( + signature = "Lclient;" + ) + static Client client; + @ObfuscatedName("c") @Export("name") String name; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("cleanName") String cleanName; @ObfuscatedSignature( - signature = "(Ljava/lang/String;Lll;)V" + signature = "(Ljava/lang/String;Lmv;)V" ) public Username(String var1, LoginType var2) { this.name = var1; @@ -22,187 +41,49 @@ public class Username implements Comparable { if (var1 == null) { var4 = null; } else { - label164: { - int var5 = 0; + int var5 = 0; - int var6; - boolean var7; - char var8; - for (var6 = var1.length(); var5 < var6; ++var5) { - var8 = var1.charAt(var5); - var7 = var8 == 160 || var8 == ' ' || var8 == '_' || var8 == '-'; - if (!var7) { - break; + int var6; + boolean var7; + char var8; + for (var6 = var1.length(); var5 < var6; ++var5) { + var8 = var1.charAt(var5); + var7 = var8 == 160 || var8 == ' ' || var8 == '_' || var8 == '-'; + if (!var7) { + break; + } + } + + while (var6 > var5) { + var8 = var1.charAt(var6 - 1); + var7 = var8 == 160 || var8 == ' ' || var8 == '_' || var8 == '-'; + if (!var7) { + break; + } + + --var6; + } + + int var13 = var6 - var5; + if (var13 >= 1 && var13 <= TaskHandler.method3540(var2)) { + StringBuilder var12 = new StringBuilder(var13); + + for (int var9 = var5; var9 < var6; ++var9) { + char var10 = var1.charAt(var9); + if (Projectile.method2160(var10)) { + char var11 = Decimator.method2597(var10); + if (var11 != 0) { + var12.append(var11); + } } } - while (var6 > var5) { - var8 = var1.charAt(var6 - 1); - var7 = var8 == 160 || var8 == ' ' || var8 == '_' || var8 == '-'; - if (!var7) { - break; - } - - --var6; + if (var12.length() == 0) { + var4 = null; + } else { + var4 = var12.toString(); } - - int var17 = var6 - var5; - if (var17 >= 1) { - byte var9; - if (var2 == null) { - var9 = 12; - } else { - switch(var2.field4029) { - case 4: - var9 = 20; - break; - default: - var9 = 12; - } - } - - if (var17 <= var9) { - StringBuilder var15 = new StringBuilder(var17); - - for (int var18 = var5; var18 < var6; ++var18) { - char var10 = var1.charAt(var18); - boolean var11; - if (Character.isISOControl(var10)) { - var11 = false; - } else if (class191.isAlphaNumeric(var10)) { - var11 = true; - } else { - char[] var16 = class338.field4037; - int var13 = 0; - - label117: - while (true) { - char var14; - if (var13 >= var16.length) { - var16 = class338.field4035; - - for (var13 = 0; var13 < var16.length; ++var13) { - var14 = var16[var13]; - if (var14 == var10) { - var11 = true; - break label117; - } - } - - var11 = false; - break; - } - - var14 = var16[var13]; - if (var10 == var14) { - var11 = true; - break; - } - - ++var13; - } - } - - if (var11) { - char var12; - switch(var10) { - case ' ': - case '-': - case '_': - case ' ': - var12 = '_'; - break; - case '#': - case '[': - case ']': - var12 = var10; - break; - case 'À': - case 'Á': - case 'Â': - case 'Ã': - case 'Ä': - case 'à': - case 'á': - case 'â': - case 'ã': - case 'ä': - var12 = 'a'; - break; - case 'Ç': - case 'ç': - var12 = 'c'; - break; - case 'È': - case 'É': - case 'Ê': - case 'Ë': - case 'è': - case 'é': - case 'ê': - case 'ë': - var12 = 'e'; - break; - case 'Í': - case 'Î': - case 'Ï': - case 'í': - case 'î': - case 'ï': - var12 = 'i'; - break; - case 'Ñ': - case 'ñ': - var12 = 'n'; - break; - case 'Ò': - case 'Ó': - case 'Ô': - case 'Õ': - case 'Ö': - case 'ò': - case 'ó': - case 'ô': - case 'õ': - case 'ö': - var12 = 'o'; - break; - case 'Ù': - case 'Ú': - case 'Û': - case 'Ü': - case 'ù': - case 'ú': - case 'û': - case 'ü': - var12 = 'u'; - break; - case 'ß': - var12 = 'b'; - break; - case 'ÿ': - case 'Ÿ': - var12 = 'y'; - break; - default: - var12 = Character.toLowerCase(var10); - } - - if (var12 != 0) { - var15.append(var12); - } - } - } - - if (var15.length() == 0) { - var4 = null; - } else { - var4 = var15.toString(); - } - break label164; - } - } - + } else { var4 = null; } } @@ -210,30 +91,30 @@ public class Username implements Comparable { this.cleanName = var4; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", - garbageValue = "-2024242176" + signature = "(B)Ljava/lang/String;", + garbageValue = "-49" ) @Export("getName") public String getName() { return this.name; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-190673782" + garbageValue = "750587090" ) @Export("hasCleanName") public boolean hasCleanName() { return this.cleanName != null; } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ljc;I)I", - garbageValue = "-2128174200" + signature = "(Ljz;B)I", + garbageValue = "-33" ) @Export("compareToTyped") public int compareToTyped(Username var1) { @@ -270,4 +151,14 @@ public class Username implements Comparable { public int compareTo(Object var1) { return this.compareToTyped((Username)var1); } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(IB)Z", + garbageValue = "-22" + ) + @Export("isWorldMapEvent") + public static boolean isWorldMapEvent(int var0) { + return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17; + } } diff --git a/runescape-client/src/main/java/Usernamed.java b/runescape-client/src/main/java/Usernamed.java index 7d03dcd218..d4109db473 100644 --- a/runescape-client/src/main/java/Usernamed.java +++ b/runescape-client/src/main/java/Usernamed.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jv") +@ObfuscatedName("jh") @Implements("Usernamed") public interface Usernamed { - @ObfuscatedName("lv") + @ObfuscatedName("ky") @ObfuscatedSignature( - signature = "(I)Ljc;", - garbageValue = "83008429" + signature = "(I)Ljz;", + garbageValue = "2135870107" ) @Export("username") Username username(); diff --git a/runescape-client/src/main/java/VarbitDefinition.java b/runescape-client/src/main/java/VarbitDefinition.java index 4799402966..3c2c36d203 100644 --- a/runescape-client/src/main/java/VarbitDefinition.java +++ b/runescape-client/src/main/java/VarbitDefinition.java @@ -7,33 +7,32 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("iq") @Implements("VarbitDefinition") public class VarbitDefinition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lhz;" - ) - @Export("VarbitDefinition_archive") - public static AbstractArchive VarbitDefinition_archive; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("VarbitDefinition_cached") - static EvictingDualNodeHashTable VarbitDefinition_cached; - @ObfuscatedName("y") + public static EvictingDualNodeHashTable VarbitDefinition_cached; + @ObfuscatedName("lz") + @ObfuscatedSignature( + signature = "Lhn;" + ) + static Widget field3296; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -254384539 + intValue = 1323501577 ) @Export("baseVar") public int baseVar; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1384432493 + intValue = 1019762327 ) @Export("startBit") public int startBit; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1295947567 + intValue = 1631697359 ) @Export("endBit") public int endBit; @@ -42,16 +41,13 @@ public class VarbitDefinition extends DualNode { VarbitDefinition_cached = new EvictingDualNodeHashTable(64); } - VarbitDefinition() { - } - - @ObfuscatedName("i") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lkq;I)V", - garbageValue = "-345578680" + signature = "(Lkp;I)V", + garbageValue = "2025380106" ) @Export("decode") - void decode(Buffer var1) { + public void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { @@ -62,10 +58,10 @@ public class VarbitDefinition extends DualNode { } } - @ObfuscatedName("y") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lkq;II)V", - garbageValue = "587356481" + signature = "(Lkp;II)V", + garbageValue = "-1332372720" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -76,393 +72,4 @@ public class VarbitDefinition extends DualNode { } } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(IIIIIILej;Lfp;I)V", - garbageValue = "1458091533" - ) - static final void method4500(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) { - if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) { - if (var0 < Tiles.Tiles_minPlane) { - Tiles.Tiles_minPlane = var0; - } - - ObjectDefinition var8 = Coord.getObjectDefinition(var3); - int var9; - int var10; - if (var4 != 1 && var4 != 3) { - var9 = var8.sizeX; - var10 = var8.sizeY; - } else { - var9 = var8.sizeY; - var10 = var8.sizeX; - } - - int var11; - int var12; - if (var9 + var1 <= 104) { - var11 = (var9 >> 1) + var1; - var12 = (var9 + 1 >> 1) + var1; - } else { - var11 = var1; - var12 = var1 + 1; - } - - int var13; - int var14; - if (var10 + var2 <= 104) { - var13 = (var10 >> 1) + var2; - var14 = var2 + (var10 + 1 >> 1); - } else { - var13 = var2; - var14 = var2 + 1; - } - - int[][] var15 = Tiles.Tiles_heights[var0]; - int var16 = var15[var11][var13] + var15[var12][var13] + var15[var11][var14] + var15[var12][var14] >> 2; - int var17 = (var1 << 7) + (var9 << 6); - int var18 = (var2 << 7) + (var10 << 6); - long var19 = KeyHandler.calculateTag(var1, var2, 2, var8.int1 == 0, var3); - int var21 = var5 + (var4 << 6); - if (var8.int3 == 1) { - var21 += 256; - } - - int var23; - int var24; - if (var8.hasSound()) { - ObjectSound var22 = new ObjectSound(); - var22.plane = var0; - var22.x = var1 * 16384; - var22.y = var2 * 128; - var23 = var8.sizeX; - var24 = var8.sizeY; - if (var4 == 1 || var4 == 3) { - var23 = var8.sizeY; - var24 = var8.sizeX; - } - - var22.field1064 = (var23 + var1) * 128; - var22.field1052 = (var24 + var2) * 128; - var22.soundEffectId = var8.ambientSoundId; - var22.field1053 = var8.int4 * 128; - var22.field1060 = var8.int5; - var22.field1061 = var8.int6; - var22.soundEffectIds = var8.soundEffectIds; - if (var8.transforms != null) { - var22.obj = var8; - var22.set(); - } - - ObjectSound.objectSounds.addFirst(var22); - if (var22.soundEffectIds != null) { - var22.field1055 = var22.field1060 + (int)(Math.random() * (double)(var22.field1061 - var22.field1060)); - } - } - - Object var34; - if (var5 == 22) { - if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { - if (var8.animationId == -1 && var8.transforms == null) { - var34 = var8.getEntity(22, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newFloorDecoration(var0, var1, var2, var16, (Entity)var34, var19, var21); - if (var8.interactType == 1 && var7 != null) { - var7.setBlockedByFloorDec(var1, var2); - } - - } - } else if (var5 != 10 && var5 != 11) { - int[] var10000; - if (var5 >= 12) { - if (var8.animationId == -1 && var8.transforms == null) { - var34 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.method3141(var0, var1, var2, var16, 1, 1, (Entity)var34, 0, var19, var21); - if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { - var10000 = Tiles.field501[var0][var1]; - var10000[var2] |= 2340; - } - - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - } else if (var5 == 0) { - if (var8.animationId == -1 && var8.transforms == null) { - var34 = var8.getEntity(0, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.field499[var4], 0, var19, var21); - if (var4 == 0) { - if (var8.clipped) { - Tiles.field496[var0][var1][var2] = 50; - Tiles.field496[var0][var1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = Tiles.field501[var0][var1]; - var10000[var2] |= 585; - } - } else if (var4 == 1) { - if (var8.clipped) { - Tiles.field496[var0][var1][var2 + 1] = 50; - Tiles.field496[var0][var1 + 1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = Tiles.field501[var0][var1]; - var10000[var2 + 1] |= 1170; - } - } else if (var4 == 2) { - if (var8.clipped) { - Tiles.field496[var0][var1 + 1][var2] = 50; - Tiles.field496[var0][var1 + 1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = Tiles.field501[var0][var1 + 1]; - var10000[var2] |= 585; - } - } else if (var4 == 3) { - if (var8.clipped) { - Tiles.field496[var0][var1][var2] = 50; - Tiles.field496[var0][var1 + 1][var2] = 50; - } - - if (var8.modelClipped) { - var10000 = Tiles.field501[var0][var1]; - var10000[var2] |= 1170; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3552(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method3109(var0, var1, var2, var8.int2); - } - - } else if (var5 == 1) { - if (var8.animationId == -1 && var8.transforms == null) { - var34 = var8.getEntity(1, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.field500[var4], 0, var19, var21); - if (var8.clipped) { - if (var4 == 0) { - Tiles.field496[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { - Tiles.field496[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { - Tiles.field496[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { - Tiles.field496[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3552(var1, var2, var5, var4, var8.boolean1); - } - - } else { - int var28; - if (var5 == 2) { - var28 = var4 + 1 & 3; - Object var29; - Object var30; - if (var8.animationId == -1 && var8.transforms == null) { - var29 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); - var30 = var8.getEntity(2, var28, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); - var30 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var29, (Entity)var30, Tiles.field499[var4], Tiles.field499[var28], var19, var21); - if (var8.modelClipped) { - if (var4 == 0) { - var10000 = Tiles.field501[var0][var1]; - var10000[var2] |= 585; - var10000 = Tiles.field501[var0][var1]; - var10000[1 + var2] |= 1170; - } else if (var4 == 1) { - var10000 = Tiles.field501[var0][var1]; - var10000[1 + var2] |= 1170; - var10000 = Tiles.field501[var0][var1 + 1]; - var10000[var2] |= 585; - } else if (var4 == 2) { - var10000 = Tiles.field501[var0][var1 + 1]; - var10000[var2] |= 585; - var10000 = Tiles.field501[var0][var1]; - var10000[var2] |= 1170; - } else if (var4 == 3) { - var10000 = Tiles.field501[var0][var1]; - var10000[var2] |= 1170; - var10000 = Tiles.field501[var0][var1]; - var10000[var2] |= 585; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3552(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method3109(var0, var1, var2, var8.int2); - } - - } else if (var5 == 3) { - if (var8.animationId == -1 && var8.transforms == null) { - var34 = var8.getEntity(3, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.field500[var4], 0, var19, var21); - if (var8.clipped) { - if (var4 == 0) { - Tiles.field496[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { - Tiles.field496[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { - Tiles.field496[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { - Tiles.field496[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3552(var1, var2, var5, var4, var8.boolean1); - } - - } else if (var5 == 9) { - if (var8.animationId == -1 && var8.transforms == null) { - var34 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.method3141(var0, var1, var2, var16, 1, 1, (Entity)var34, 0, var19, var21); - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method3109(var0, var1, var2, var8.int2); - } - - } else if (var5 == 4) { - if (var8.animationId == -1 && var8.transforms == null) { - var34 = var8.getEntity(4, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.field499[var4], 0, 0, 0, var19, var21); - } else { - long var31; - Object var33; - if (var5 == 5) { - var28 = 16; - var31 = var6.getBoundaryObjectTag(var0, var1, var2); - if (0L != var31) { - var28 = Coord.getObjectDefinition(class2.Entity_unpackID(var31)).int2; - } - - if (var8.animationId == -1 && var8.transforms == null) { - var33 = var8.getEntity(4, var4, var15, var17, var16, var18); - } else { - var33 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)null, Tiles.field499[var4], 0, var28 * Tiles.field506[var4], var28 * Tiles.field502[var4], var19, var21); - } else if (var5 == 6) { - var28 = 8; - var31 = var6.getBoundaryObjectTag(var0, var1, var2); - if (0L != var31) { - var28 = Coord.getObjectDefinition(class2.Entity_unpackID(var31)).int2 / 2; - } - - if (var8.animationId == -1 && var8.transforms == null) { - var33 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); - } else { - var33 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)null, 256, var4, var28 * Tiles.field503[var4], var28 * Tiles.field504[var4], var19, var21); - } else if (var5 == 7) { - var23 = var4 + 2 & 3; - if (var8.animationId == -1 && var8.transforms == null) { - var34 = var8.getEntity(4, var23 + 4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 4, var23 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var34, (Entity)null, 256, var23, 0, 0, var19, var21); - } else if (var5 == 8) { - var28 = 8; - var31 = var6.getBoundaryObjectTag(var0, var1, var2); - if (var31 != 0L) { - var28 = Coord.getObjectDefinition(class2.Entity_unpackID(var31)).int2 / 2; - } - - int var27 = var4 + 2 & 3; - Object var26; - if (var8.animationId == -1 && var8.transforms == null) { - var33 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); - var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); - } else { - var33 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); - var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)var26, 256, var4, var28 * Tiles.field503[var4], var28 * Tiles.field504[var4], var19, var21); - } - } - } - } else { - if (var8.animationId == -1 && var8.transforms == null) { - var34 = var8.getEntity(10, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - if (var34 != null && var6.method3141(var0, var1, var2, var16, var9, var10, (Entity)var34, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { - var23 = 15; - if (var34 instanceof Model) { - var23 = ((Model)var34).method2893() / 4; - if (var23 > 30) { - var23 = 30; - } - } - - for (var24 = 0; var24 <= var9; ++var24) { - for (int var25 = 0; var25 <= var10; ++var25) { - if (var23 > Tiles.field496[var0][var24 + var1][var25 + var2]) { - Tiles.field496[var0][var24 + var1][var25 + var2] = (byte)var23; - } - } - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - } - } - } } diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java index ee590bef8c..f6d2727552 100644 --- a/runescape-client/src/main/java/VarcInt.java +++ b/runescape-client/src/main/java/VarcInt.java @@ -3,22 +3,22 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ir") +@ObfuscatedName("ie") @Implements("VarcInt") public class VarcInt extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) @Export("VarcInt_archive") public static AbstractArchive VarcInt_archive; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("VarcInt_cached") - static EvictingDualNodeHashTable VarcInt_cached; - @ObfuscatedName("y") + public static EvictingDualNodeHashTable VarcInt_cached; + @ObfuscatedName("o") @Export("persist") public boolean persist; @@ -26,331 +26,90 @@ public class VarcInt extends DualNode { VarcInt_cached = new EvictingDualNodeHashTable(64); } - VarcInt() { + public VarcInt() { this.persist = false; } - @ObfuscatedName("i") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lkq;I)V", - garbageValue = "824733769" + signature = "(Lkp;I)V", + garbageValue = "-1301624128" ) - void method4388(Buffer var1) { + public void method4478(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.method4387(var1, var2); + this.method4477(var1, var2); } } - @ObfuscatedName("y") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lkq;II)V", - garbageValue = "-793810965" + signature = "(Lkp;IB)V", + garbageValue = "7" ) - void method4387(Buffer var1, int var2) { + void method4477(Buffer var1, int var2) { if (var2 == 2) { this.persist = true; } } - @ObfuscatedName("hk") + @ObfuscatedName("ig") @ObfuscatedSignature( - signature = "(IIIIIIII)V", - garbageValue = "11345169" + signature = "(Lhn;IIIIIIB)V", + garbageValue = "-50" ) - @Export("addPendingSpawnToScene") - static final void addPendingSpawnToScene(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) { - if (Client.isLowDetail && var0 != UrlRequest.Client_plane) { - return; + static final void method4485(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (Client.field712) { + Client.alternativeScrollbarWidth = 32; + } else { + Client.alternativeScrollbarWidth = 0; + } + + Client.field712 = false; + int var7; + if (MouseHandler.MouseHandler_currentButton == 1 || !ArchiveLoader.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { + if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { + var0.scrollY -= 4; + NPCDefinition.invalidateWidget(var0); + } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { + var0.scrollY += 4; + NPCDefinition.invalidateWidget(var0); + } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { + var7 = var3 * (var3 - 32) / var4; + if (var7 < 8) { + var7 = 8; + } + + int var8 = var6 - var2 - 16 - var7 / 2; + int var9 = var3 - 32 - var7; + var0.scrollY = var8 * (var4 - var3) / var9; + NPCDefinition.invalidateWidget(var0); + Client.field712 = true; } + } - long var7 = 0L; - boolean var9 = true; - boolean var10 = false; - boolean var11 = false; - if (var1 == 0) { - var7 = class14.scene.getBoundaryObjectTag(var0, var2, var3); - } - - if (var1 == 1) { - var7 = class14.scene.getWallDecorationTag(var0, var2, var3); - } - - if (var1 == 2) { - var7 = class14.scene.getGameObjectTag(var0, var2, var3); - } - - if (var1 == 3) { - var7 = class14.scene.getFloorDecorationTag(var0, var2, var3); - } - - int var12; - if (0L != var7) { - var12 = class14.scene.getObjectFlags(var0, var2, var3, var7); - int var39 = class2.Entity_unpackID(var7); - int var40 = var12 & 31; - int var41 = var12 >> 6 & 3; - ObjectDefinition var13; - if (var1 == 0) { - class14.scene.removeBoundaryObject(var0, var2, var3); - var13 = Coord.getObjectDefinition(var39); - if (var13.interactType != 0) { - Client.collisionMaps[var0].method3534(var2, var3, var40, var41, var13.boolean1); - } - } - - if (var1 == 1) { - class14.scene.removeWallDecoration(var0, var2, var3); - } - - if (var1 == 2) { - class14.scene.removeGameObject(var0, var2, var3); - var13 = Coord.getObjectDefinition(var39); - if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { - return; - } - - if (var13.interactType != 0) { - Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var41, var13.boolean1); - } - } - - if (var1 == 3) { - class14.scene.removeFloorDecoration(var0, var2, var3); - var13 = Coord.getObjectDefinition(var39); - if (var13.interactType == 1) { - Client.collisionMaps[var0].method3535(var2, var3); - } - } - } - - if (var4 >= 0) { - var12 = var0; - if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { - var12 = var0 + 1; - } - - Scene var42 = class14.scene; - CollisionMap var14 = Client.collisionMaps[var0]; - ObjectDefinition var15 = Coord.getObjectDefinition(var4); - int var16; - int var17; - if (var5 != 1 && var5 != 3) { - var16 = var15.sizeX; - var17 = var15.sizeY; - } else { - var16 = var15.sizeY; - var17 = var15.sizeX; - } - - int var18; - int var19; - if (var16 + var2 <= 104) { - var18 = (var16 >> 1) + var2; - var19 = var2 + (var16 + 1 >> 1); - } else { - var18 = var2; - var19 = var2 + 1; - } - - int var20; - int var21; - if (var3 + var17 <= 104) { - var20 = var3 + (var17 >> 1); - var21 = var3 + (var17 + 1 >> 1); - } else { - var20 = var3; - var21 = var3 + 1; - } - - int[][] var22 = Tiles.Tiles_heights[var12]; - int var23 = var22[var19][var21] + var22[var18][var20] + var22[var19][var20] + var22[var18][var21] >> 2; - int var24 = (var2 << 7) + (var16 << 6); - int var25 = (var3 << 7) + (var17 << 6); - long var26 = KeyHandler.calculateTag(var2, var3, 2, var15.int1 == 0, var4); - int var28 = (var5 << 6) + var6; - if (var15.int3 == 1) { - var28 += 256; - } - - Object var29; - if (var6 == 22) { - if (var15.animationId == -1 && var15.transforms == null) { - var29 = var15.getModel(22, var5, var22, var24, var23, var25); - } else { - var29 = new DynamicObject(var4, 22, var5, var12, var2, var3, var15.animationId, true, (Entity)null); - } - - var42.newFloorDecoration(var0, var2, var3, var23, (Entity)var29, var26, var28); - if (var15.interactType == 1) { - var14.setBlockedByFloorDec(var2, var3); - } - } else if (var6 != 10 && var6 != 11) { - if (var6 >= 12) { - if (var15.animationId == -1 && var15.transforms == null) { - var29 = var15.getModel(var6, var5, var22, var24, var23, var25); - } else { - var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, true, (Entity)null); - } - - var42.method3141(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28); - if (var15.interactType != 0) { - var14.addGameObject(var2, var3, var16, var17, var15.boolean1); - } - } else if (var6 == 0) { - if (var15.animationId == -1 && var15.transforms == null) { - var29 = var15.getModel(0, var5, var22, var24, var23, var25); - } else { - var29 = new DynamicObject(var4, 0, var5, var12, var2, var3, var15.animationId, true, (Entity)null); - } - - var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field499[var5], 0, var26, var28); - if (var15.interactType != 0) { - var14.method3552(var2, var3, var6, var5, var15.boolean1); - } - } else if (var6 == 1) { - if (var15.animationId == -1 && var15.transforms == null) { - var29 = var15.getModel(1, var5, var22, var24, var23, var25); - } else { - var29 = new DynamicObject(var4, 1, var5, var12, var2, var3, var15.animationId, true, (Entity)null); - } - - var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field500[var5], 0, var26, var28); - if (var15.interactType != 0) { - var14.method3552(var2, var3, var6, var5, var15.boolean1); - } - } else { - int var35; - if (var6 == 2) { - var35 = var5 + 1 & 3; - Object var30; - Object var31; - if (var15.animationId == -1 && var15.transforms == null) { - var30 = var15.getModel(2, var5 + 4, var22, var24, var23, var25); - var31 = var15.getModel(2, var35, var22, var24, var23, var25); - } else { - var30 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var15.animationId, true, (Entity)null); - var31 = new DynamicObject(var4, 2, var35, var12, var2, var3, var15.animationId, true, (Entity)null); - } - - var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var30, (Entity)var31, Tiles.field499[var5], Tiles.field499[var35], var26, var28); - if (var15.interactType != 0) { - var14.method3552(var2, var3, var6, var5, var15.boolean1); - } - } else if (var6 == 3) { - if (var15.animationId == -1 && var15.transforms == null) { - var29 = var15.getModel(3, var5, var22, var24, var23, var25); - } else { - var29 = new DynamicObject(var4, 3, var5, var12, var2, var3, var15.animationId, true, (Entity)null); - } - - var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field500[var5], 0, var26, var28); - if (var15.interactType != 0) { - var14.method3552(var2, var3, var6, var5, var15.boolean1); - } - } else if (var6 == 9) { - if (var15.animationId == -1 && var15.transforms == null) { - var29 = var15.getModel(var6, var5, var22, var24, var23, var25); - } else { - var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, true, (Entity)null); - } - - var42.method3141(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28); - if (var15.interactType != 0) { - var14.addGameObject(var2, var3, var16, var17, var15.boolean1); - } - } else if (var6 == 4) { - if (var15.animationId == -1 && var15.transforms == null) { - var29 = var15.getModel(4, var5, var22, var24, var23, var25); - } else { - var29 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, true, (Entity)null); - } - - var42.newWallDecoration(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field499[var5], 0, 0, 0, var26, var28); - } else { - Object var32; - long var36; - if (var6 == 5) { - var35 = 16; - var36 = var42.getBoundaryObjectTag(var0, var2, var3); - if (0L != var36) { - var35 = Coord.getObjectDefinition(class2.Entity_unpackID(var36)).int2; - } - - if (var15.animationId == -1 && var15.transforms == null) { - var32 = var15.getModel(4, var5, var22, var24, var23, var25); - } else { - var32 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, true, (Entity)null); - } - - var42.newWallDecoration(var0, var2, var3, var23, (Entity)var32, (Entity)null, Tiles.field499[var5], 0, var35 * Tiles.field506[var5], var35 * Tiles.field502[var5], var26, var28); - } else if (var6 == 6) { - var35 = 8; - var36 = var42.getBoundaryObjectTag(var0, var2, var3); - if (var36 != 0L) { - var35 = Coord.getObjectDefinition(class2.Entity_unpackID(var36)).int2 / 2; - } - - if (var15.animationId == -1 && var15.transforms == null) { - var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); - } else { - var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, true, (Entity)null); - } - - var42.newWallDecoration(var0, var2, var3, var23, (Entity)var32, (Entity)null, 256, var5, var35 * Tiles.field503[var5], var35 * Tiles.field504[var5], var26, var28); - } else if (var6 == 7) { - int var38 = var5 + 2 & 3; - if (var15.animationId == -1 && var15.transforms == null) { - var29 = var15.getModel(4, var38 + 4, var22, var24, var23, var25); - } else { - var29 = new DynamicObject(var4, 4, var38 + 4, var12, var2, var3, var15.animationId, true, (Entity)null); - } - - var42.newWallDecoration(var0, var2, var3, var23, (Entity)var29, (Entity)null, 256, var38, 0, 0, var26, var28); - } else if (var6 == 8) { - var35 = 8; - var36 = var42.getBoundaryObjectTag(var0, var2, var3); - if (0L != var36) { - var35 = Coord.getObjectDefinition(class2.Entity_unpackID(var36)).int2 / 2; - } - - int var34 = var5 + 2 & 3; - Object var33; - if (var15.animationId == -1 && var15.transforms == null) { - var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); - var33 = var15.getModel(4, var34 + 4, var22, var24, var23, var25); - } else { - var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, true, (Entity)null); - var33 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var15.animationId, true, (Entity)null); - } - - var42.newWallDecoration(var0, var2, var3, var23, (Entity)var32, (Entity)var33, 256, var5, var35 * Tiles.field503[var5], var35 * Tiles.field504[var5], var26, var28); - } - } - } - } else { - if (var15.animationId == -1 && var15.transforms == null) { - var29 = var15.getModel(10, var5, var22, var24, var23, var25); - } else { - var29 = new DynamicObject(var4, 10, var5, var12, var2, var3, var15.animationId, true, (Entity)null); - } - - if (var29 != null) { - var42.method3141(var0, var2, var3, var23, var16, var17, (Entity)var29, var6 == 11 ? 256 : 0, var26, var28); - } - - if (var15.interactType != 0) { - var14.addGameObject(var2, var3, var16, var17, var15.boolean1); - } - } + if (Client.mouseWheelRotation != 0) { + var7 = var0.width; + if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { + var0.scrollY += Client.mouseWheelRotation * 45; + NPCDefinition.invalidateWidget(var0); } } } + + @ObfuscatedName("kd") + @ObfuscatedSignature( + signature = "(Lhn;I)Z", + garbageValue = "-1381346816" + ) + @Export("isComponentHidden") + static boolean isComponentHidden(Widget var0) { + return var0.isHidden; + } } diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index 6bbb36603b..40c7f5eae7 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -9,54 +9,66 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ck") +@ObfuscatedName("cu") @Implements("Varcs") public class Varcs { - @ObfuscatedName("k") - static int[] field1244; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("intsPersistence") boolean[] intsPersistence; - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("map") Map map; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("strings") String[] strings; - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("unwrittenChanges") boolean unwrittenChanges; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - longValue = -327975599859265227L + longValue = -8646841017490334521L ) long field1249; Varcs() { this.unwrittenChanges = false; - int var1 = class2.archive2.getGroupFileCount(19); + int var1 = GrandExchangeOfferWorldComparator.archive2.getGroupFileCount(19); this.map = new HashMap(); this.intsPersistence = new boolean[var1]; int var2; for (var2 = 0; var2 < var1; ++var2) { - VarcInt var3 = class215.method4012(var2); + VarcInt var4 = (VarcInt)VarcInt.VarcInt_cached.get((long)var2); + VarcInt var3; + if (var4 != null) { + var3 = var4; + } else { + byte[] var5 = VarcInt.VarcInt_archive.takeFile(19, var2); + var4 = new VarcInt(); + if (var5 != null) { + var4.method4478(new Buffer(var5)); + } + + VarcInt.VarcInt_cached.put(var4, (long)var2); + var3 = var4; + } + this.intsPersistence[var2] = var3.persist; } var2 = 0; - if (class2.archive2.method4275(15)) { - var2 = class2.archive2.getGroupFileCount(15); + if (GrandExchangeOfferWorldComparator.archive2.method4348(15)) { + var2 = GrandExchangeOfferWorldComparator.archive2.getGroupFileCount(15); } this.strings = new String[var2]; this.read(); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "3" + signature = "(III)V", + garbageValue = "1547810829" ) @Export("setInt") void setInt(int var1, int var2) { @@ -67,10 +79,10 @@ public class Varcs { } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-303157039" + signature = "(IB)I", + garbageValue = "-66" ) @Export("getInt") int getInt(int var1) { @@ -78,20 +90,20 @@ public class Varcs { return var2 instanceof Integer ? (Integer)var2 : -1; } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(ILjava/lang/String;B)V", - garbageValue = "13" + signature = "(ILjava/lang/String;I)V", + garbageValue = "1774400510" ) @Export("setString") void setString(int var1, String var2) { this.map.put(var1, var2); } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(IB)Ljava/lang/String;", - garbageValue = "-14" + garbageValue = "104" ) @Export("getString") String getString(int var1) { @@ -99,30 +111,30 @@ public class Varcs { return var2 instanceof String ? (String)var2 : ""; } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(ILjava/lang/String;B)V", - garbageValue = "-90" + garbageValue = "-92" ) @Export("setStringOld") void setStringOld(int var1, String var2) { this.strings[var1] = var2; } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(II)Ljava/lang/String;", - garbageValue = "1933750533" + garbageValue = "-1676642086" ) @Export("getStringOld") String getStringOld(int var1) { return this.strings[var1]; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "2067478289" + garbageValue = "-1665078788" ) @Export("clearTransient") void clearTransient() { @@ -139,20 +151,20 @@ public class Varcs { } - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(ZI)Lmk;", - garbageValue = "2016445554" + signature = "(ZI)Lmx;", + garbageValue = "-6839896" ) @Export("getPreferencesFile") AccessFile getPreferencesFile(boolean var1) { - return Messages.getPreferencesFile("2", AbstractWorldMapIcon.field284.name, var1); + return WorldMapRectangle.getPreferencesFile("2", class14.field102.name, var1); } - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "-9804" + signature = "(I)V", + garbageValue = "-2046783551" ) @Export("write") void write() { @@ -172,81 +184,54 @@ public class Varcs { if (var7 instanceof Integer) { var2 += 4; } else if (var7 instanceof String) { - var2 += ViewportMouse.stringCp1252NullTerminatedByteSize((String)var7); + var2 += Buddy.stringCp1252NullTerminatedByteSize((String)var7); } ++var3; } } - Buffer var28 = new Buffer(var2); - var28.writeByte(2); - var28.writeShort(var3); - Iterator var29 = this.map.entrySet().iterator(); + Buffer var23 = new Buffer(var2); + var23.writeByte(2); + var23.writeShort(var3); + Iterator var24 = this.map.entrySet().iterator(); - label147: - while (true) { - Entry var17; - int var18; - do { - if (!var29.hasNext()) { - var1.write(var28.array, 0, var28.offset); - break label147; - } - - var17 = (Entry)var29.next(); - var18 = (Integer)var17.getKey(); - } while(!this.intsPersistence[var18]); - - var28.writeShort(var18); - Object var8 = var17.getValue(); - Class var10 = var8.getClass(); - class3[] var11 = new class3[]{class3.field19, class3.field9, class3.field10}; - class3[] var12 = var11; - int var13 = 0; - - class3 var9; - while (true) { - if (var13 >= var12.length) { - var9 = null; - break; - } - - class3 var14 = var12[var13]; - if (var10 == var14.field12) { - var9 = var14; - break; - } - - ++var13; + while (var24.hasNext()) { + Entry var12 = (Entry)var24.next(); + int var13 = (Integer)var12.getKey(); + if (this.intsPersistence[var13]) { + var23.writeShort(var13); + Object var8 = var12.getValue(); + class3 var9 = class3.method51(var8.getClass()); + var23.writeByte(var9.field18); + class3.method35(var8, var23); } - - var28.writeByte(var9.field11); - class3.method36(var8, var28); } - } catch (Exception var26) { + + var1.write(var23.array, 0, var23.offset); + } catch (Exception var21) { } finally { try { var1.close(); - } catch (Exception var25) { + } catch (Exception var20) { } } this.unwrittenChanges = false; - this.field1249 = WorldMapID.currentTimeMillis(); + this.field1249 = WorldMapIcon_0.currentTimeMillis(); } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1379037686" + garbageValue = "1384592680" ) @Export("read") void read() { AccessFile var1 = this.getPreferencesFile(false); - label226: { + label231: { try { byte[] var2 = new byte[(int)var1.length()]; @@ -259,63 +244,63 @@ public class Varcs { } Buffer var15 = new Buffer(var2); - if (var15.array.length - var15.offset < 1) { - return; - } + if (var15.array.length - var15.offset >= 1) { + int var16 = var15.readUnsignedByte(); + if (var16 >= 0 && var16 <= 2) { + int var7; + int var8; + int var9; + int var17; + if (var16 >= 2) { + var17 = var15.readUnsignedShort(); + var7 = 0; - int var16 = var15.readUnsignedByte(); - if (var16 >= 0 && var16 <= 2) { - int var7; - int var8; - int var9; - int var17; - if (var16 >= 2) { - var17 = var15.readUnsignedShort(); - var7 = 0; + while (true) { + if (var7 >= var17) { + break label231; + } - while (true) { - if (var7 >= var17) { - break label226; + var8 = var15.readUnsignedShort(); + var9 = var15.readUnsignedByte(); + class3[] var10 = new class3[]{class3.field15, class3.field22, class3.field16}; + class3 var11 = (class3)WorldMapSection0.findEnumerated(var10, var9); + Object var12 = var11.method38(var15); + if (this.intsPersistence[var8]) { + this.map.put(var8, var12); + } + + ++var7; + } + } else { + var17 = var15.readUnsignedShort(); + + for (var7 = 0; var7 < var17; ++var7) { + var8 = var15.readUnsignedShort(); + var9 = var15.readInt(); + if (this.intsPersistence[var8]) { + this.map.put(var8, var9); + } } - var8 = var15.readUnsignedShort(); - var9 = var15.readUnsignedByte(); - class3[] var10 = new class3[]{class3.field19, class3.field9, class3.field10}; - class3 var11 = (class3)DynamicObject.findEnumerated(var10, var9); - Object var12 = var11.method38(var15); - if (this.intsPersistence[var8]) { - this.map.put(var8, var12); + var7 = var15.readUnsignedShort(); + var8 = 0; + + while (true) { + if (var8 >= var7) { + break label231; + } + + var15.readUnsignedShort(); + var15.readStringCp1252NullTerminated(); + ++var8; } - - ++var7; - } - } else { - var17 = var15.readUnsignedShort(); - - for (var7 = 0; var7 < var17; ++var7) { - var8 = var15.readUnsignedShort(); - var9 = var15.readInt(); - if (this.intsPersistence[var8]) { - this.map.put(var8, var9); - } - } - - var7 = var15.readUnsignedShort(); - var8 = 0; - - while (true) { - if (var8 >= var7) { - break label226; - } - - var15.readUnsignedShort(); - var15.readStringCp1252NullTerminated(); - ++var8; } } + + return; } } catch (Exception var26) { - break label226; + break label231; } finally { try { var1.close(); @@ -330,71 +315,52 @@ public class Varcs { this.unwrittenChanges = false; } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "22" + signature = "(I)V", + garbageValue = "-2106283374" ) @Export("tryWrite") void tryWrite() { - if (this.unwrittenChanges && this.field1249 < WorldMapID.currentTimeMillis() - 60000L) { + if (this.unwrittenChanges && this.field1249 < WorldMapIcon_0.currentTimeMillis() - 60000L) { this.write(); } } - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-68240792" + garbageValue = "129228614" ) @Export("hasUnwrittenChanges") boolean hasUnwrittenChanges() { return this.unwrittenChanges; } - @ObfuscatedName("y") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IIIB)I", - garbageValue = "-58" + signature = "(Lii;Lii;I)Z", + garbageValue = "-141032975" ) - static int method2168(int var0, int var1, int var2) { - if (var2 > 179) { - var1 /= 2; + public static boolean method2212(AbstractArchive var0, AbstractArchive var1) { + WorldMapElement.WorldMapElement_archive = var1; + if (!var0.isFullyLoaded()) { + return false; + } else { + class218.WorldMapElement_count = var0.getGroupFileCount(35); + WorldMapElement.WorldMapElement_cached = new WorldMapElement[class218.WorldMapElement_count]; + + for (int var2 = 0; var2 < class218.WorldMapElement_count; ++var2) { + byte[] var3 = var0.takeFile(35, var2); + WorldMapElement.WorldMapElement_cached[var2] = new WorldMapElement(var2); + if (var3 != null) { + WorldMapElement.WorldMapElement_cached[var2].decode(new Buffer(var3)); + WorldMapElement.WorldMapElement_cached[var2].method4449(); + } + } + + return true; } - - if (var2 > 192) { - var1 /= 2; - } - - if (var2 > 217) { - var1 /= 2; - } - - if (var2 > 243) { - var1 /= 2; - } - - int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; - return var3; - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "-49926633" - ) - public static boolean method2195(int var0) { - return (var0 >> 31 & 1) != 0; - } - - @ObfuscatedName("kx") - @ObfuscatedSignature( - signature = "(Lha;I)Z", - garbageValue = "180184458" - ) - @Export("isComponentHidden") - static boolean isComponentHidden(Widget var0) { - return var0.isHidden; } } diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java index 4e9fff5231..1adbc53491 100644 --- a/runescape-client/src/main/java/VarpDefinition.java +++ b/runescape-client/src/main/java/VarpDefinition.java @@ -3,32 +3,31 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("im") +@ObfuscatedName("ij") @Implements("VarpDefinition") public class VarpDefinition extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) @Export("VarpDefinition_archive") - static AbstractArchive VarpDefinition_archive; - @ObfuscatedName("i") + public static AbstractArchive VarpDefinition_archive; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 187888889 + intValue = -836426175 ) @Export("VarpDefinition_fileCount") public static int VarpDefinition_fileCount; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("VarpDefinition_cached") static EvictingDualNodeHashTable VarpDefinition_cached; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 2035437867 + intValue = -1574872925 ) @Export("type") public int type; @@ -41,10 +40,10 @@ public class VarpDefinition extends DualNode { this.type = 0; } - @ObfuscatedName("y") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lkq;B)V", - garbageValue = "99" + signature = "(Lkp;B)V", + garbageValue = "10" ) @Export("decode") void decode(Buffer var1) { @@ -58,10 +57,10 @@ public class VarpDefinition extends DualNode { } } - @ObfuscatedName("w") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkq;II)V", - garbageValue = "1805954693" + signature = "(Lkp;IB)V", + garbageValue = "1" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -70,75 +69,4 @@ public class VarpDefinition extends DualNode { } } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - signature = "(ILcu;ZI)I", - garbageValue = "1208148197" - ) - static int method4347(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { - class188.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - int var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - if (!Client.isCameraLocked) { - Client.camAngleX = var3; - Client.camAngleY = var4; - } - - return 1; - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.camAngleX; - return 1; - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.camAngleY; - return 1; - } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - if (var3 < 0) { - var3 = 0; - } - - Client.camFollowHeight = var3; - return 1; - } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.camFollowHeight; - return 1; - } else { - return 2; - } - } - - @ObfuscatedName("ko") - @ObfuscatedSignature( - signature = "(Lbz;ZS)V", - garbageValue = "-3532" - ) - @Export("closeInterface") - static final void closeInterface(InterfaceParent var0, boolean var1) { - int var2 = var0.group; - int var3 = (int)var0.key; - var0.remove(); - if (var1) { - ItemDefinition.method4715(var2); - } - - for (IntegerNode var4 = (IntegerNode)Client.widgetClickMasks.first(); var4 != null; var4 = (IntegerNode)Client.widgetClickMasks.next()) { - if ((long)var2 == (var4.key >> 48 & 65535L)) { - var4.remove(); - } - } - - Widget var5 = Tile.getWidget(var3); - if (var5 != null) { - LoginPacket.invalidateWidget(var5); - } - - Strings.method4096(); - if (Client.rootInterface != -1) { - ItemContainer.runIntfCloseListeners(Client.rootInterface, 1); - } - - } } diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java index 1be2e7741e..ea0352f8e0 100644 --- a/runescape-client/src/main/java/Varps.java +++ b/runescape-client/src/main/java/Varps.java @@ -3,36 +3,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hu") +@ObfuscatedName("hb") @Implements("Varps") public class Varps { - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("Varps_masks") static int[] Varps_masks; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("Varps_temp") public static int[] Varps_temp; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("Varps_main") public static int[] Varps_main; - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Lfc;" - ) - @Export("clock") - static Clock clock; - @ObfuscatedName("by") - @ObfuscatedSignature( - signature = "Lgs;" - ) - @Export("clientLanguage") - static Language clientLanguage; - @ObfuscatedName("gh") - @ObfuscatedSignature( - signature = "[Lls;" - ) - @Export("mapMarkerSprites") - static Sprite[] mapMarkerSprites; static { Varps_masks = new int[32]; @@ -46,4 +28,37 @@ public class Varps { Varps_temp = new int[4000]; Varps_main = new int[4000]; } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(III)I", + garbageValue = "1638867489" + ) + static int method4043(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var2 == null) { + return -1; + } else { + return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; + } + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(II)Lhn;", + garbageValue = "1215015650" + ) + @Export("getWidget") + public static Widget getWidget(int var0) { + int var1 = var0 >> 16; + int var2 = var0 & 65535; + if (WorldMapLabel.Widget_interfaceComponents[var1] == null || WorldMapLabel.Widget_interfaceComponents[var1][var2] == null) { + boolean var3 = ScriptFrame.loadInterface(var1); + if (!var3) { + return null; + } + } + + return WorldMapLabel.Widget_interfaceComponents[var1][var2]; + } } diff --git a/runescape-client/src/main/java/VertexNormal.java b/runescape-client/src/main/java/VertexNormal.java index 5a3e319adf..0a2d7555f4 100644 --- a/runescape-client/src/main/java/VertexNormal.java +++ b/runescape-client/src/main/java/VertexNormal.java @@ -4,46 +4,52 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dm") +@ObfuscatedName("dp") @Implements("VertexNormal") public class VertexNormal { - @ObfuscatedName("l") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -914762705 + longValue = 1130865268298434617L ) - @Export("cacheGamebuild") - static int cacheGamebuild; - @ObfuscatedName("cx") - @ObfuscatedGetter( - intValue = -435303731 - ) - public static int field1732; - @ObfuscatedName("fq") + static long field1752; + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lky;" + signature = "Lli;" ) - static AbstractSocket field1730; - @ObfuscatedName("f") + static IndexedSprite field1753; + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "Lkp;" + ) + @Export("NetCache_responseArchiveBuffer") + public static Buffer NetCache_responseArchiveBuffer; + @ObfuscatedName("gu") + @ObfuscatedSignature( + signature = "[Lli;" + ) + @Export("mapSceneSprites") + static IndexedSprite[] mapSceneSprites; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 2142857667 + intValue = 707257177 ) @Export("x") int x; - @ObfuscatedName("i") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -62403169 + intValue = 1141720523 ) @Export("y") int y; - @ObfuscatedName("y") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -2087129489 + intValue = 1695799799 ) @Export("z") int z; - @ObfuscatedName("w") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1861306347 + intValue = 1198697941 ) @Export("magnitude") int magnitude; @@ -52,7 +58,7 @@ public class VertexNormal { } @ObfuscatedSignature( - signature = "(Ldm;)V" + signature = "(Ldp;)V" ) VertexNormal(VertexNormal var1) { this.x = var1.x; @@ -61,21 +67,38 @@ public class VertexNormal { this.magnitude = var1.magnitude; } - @ObfuscatedName("t") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1271488083" + signature = "(II)J", + garbageValue = "2082657015" ) - static final void method2996() { - Tiles.method1143("Your ignore list is full. Max of 100 for free users, and 400 for members"); + public static long method3063(int var0) { + return ViewportMouse.ViewportMouse_entityTags[var0]; } - @ObfuscatedName("kj") + @ObfuscatedName("gn") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-68" + signature = "(II)V", + garbageValue = "1221286239" ) - static final void method2995() { - Client.field711 = Client.cycleCntr; + @Export("setWindowedMode") + static void setWindowedMode(int var0) { + Client.field859 = 0L; + if (var0 >= 2) { + Client.isResizable = true; + } else { + Client.isResizable = false; + } + + if (Friend.getWindowedMode() == 1) { + Username.client.setMaxCanvasSize(765, 503); + } else { + Username.client.setMaxCanvasSize(7680, 2160); + } + + if (Client.gameState >= 25) { + class238.method4415(); + } + } } diff --git a/runescape-client/src/main/java/VerticalAlignment.java b/runescape-client/src/main/java/VerticalAlignment.java index b853864dc5..22b97d645b 100644 --- a/runescape-client/src/main/java/VerticalAlignment.java +++ b/runescape-client/src/main/java/VerticalAlignment.java @@ -4,35 +4,38 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ia") +@ObfuscatedName("ic") @Implements("VerticalAlignment") public enum VerticalAlignment implements Enumerated { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lia;" + signature = "Lic;" ) - field3170(0, 0), - @ObfuscatedName("i") + field3196(2, 0), + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lia;" + signature = "Lic;" ) @Export("VerticalAlignment_centered") - VerticalAlignment_centered(1, 1), - @ObfuscatedName("y") + VerticalAlignment_centered(0, 1), + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lia;" + signature = "Lic;" ) - field3169(2, 2); + field3198(1, 2); - @ObfuscatedName("w") + @ObfuscatedName("l") + @Export("ByteArrayPool_altSizeArrayCounts") + static int[] ByteArrayPool_altSizeArrayCounts; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -282491713 + intValue = 1614385539 ) @Export("value") public final int value; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1884067313 + intValue = 272968923 ) @Export("id") final int id; @@ -42,22 +45,68 @@ public enum VerticalAlignment implements Enumerated { this.id = var4; } - @ObfuscatedName("i") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "-57" + garbageValue = "1" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;II)I", - garbageValue = "1663251439" + signature = "(Ljava/lang/CharSequence;I)J", + garbageValue = "1244217494" ) - public static int method4326(CharSequence var0, int var1) { - return TriBool.parseIntCustomRadix(var0, var1, true); + public static long method4424(CharSequence var0) { + long var1 = 0L; + int var3 = var0.length(); + + for (int var4 = 0; var4 < var3; ++var4) { + var1 *= 37L; + char var5 = var0.charAt(var4); + if (var5 >= 'A' && var5 <= 'Z') { + var1 += (long)(var5 + 1 - 65); + } else if (var5 >= 'a' && var5 <= 'z') { + var1 += (long)(var5 + 1 - 97); + } else if (var5 >= '0' && var5 <= '9') { + var1 += (long)(var5 + 27 - 48); + } + + if (var1 >= 177917621779460413L) { + break; + } + } + + while (var1 % 37L == 0L && 0L != var1) { + var1 /= 37L; + } + + return var1; + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "(Ljava/lang/CharSequence;I)I", + garbageValue = "1671974094" + ) + @Export("parseInt") + public static int parseInt(CharSequence var0) { + return KitDefinition.parseIntCustomRadix(var0, 10, true); + } + + @ObfuscatedName("im") + @ObfuscatedSignature( + signature = "(IB)Ljava/lang/String;", + garbageValue = "116" + ) + static String method4426(int var0) { + if (var0 < 0) { + return ""; + } else { + return Client.menuTargets[var0].length() > 0 ? Client.menuActions[var0] + " " + Client.menuTargets[var0] : Client.menuActions[var0]; + } } } diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java index 00480af28a..8850f396da 100644 --- a/runescape-client/src/main/java/ViewportMouse.java +++ b/runescape-client/src/main/java/ViewportMouse.java @@ -3,63 +3,63 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("dz") +@ObfuscatedName("da") @Implements("ViewportMouse") public class ViewportMouse { - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("ViewportMouse_isInViewport") public static boolean ViewportMouse_isInViewport; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -52069035 + intValue = 1731432655 ) @Export("ViewportMouse_x") - public static int ViewportMouse_x; - @ObfuscatedName("y") + static int ViewportMouse_x; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -819033673 + intValue = 2096475085 ) @Export("ViewportMouse_y") - public static int ViewportMouse_y; - @ObfuscatedName("w") - @Export("ViewportMouse_false0") - public static boolean ViewportMouse_false0; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 945572255 - ) - static int field1717; + static int ViewportMouse_y; @ObfuscatedName("e") + @Export("ViewportMouse_false0") + static boolean ViewportMouse_false0; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -45541993 + intValue = 1611746101 ) - static int field1718; - @ObfuscatedName("x") + static int field1729; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1585979181 + intValue = -684242185 ) - static int field1719; - @ObfuscatedName("c") + static int field1731; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1002877627 + intValue = -658996083 ) - static int field1720; - @ObfuscatedName("k") + static int field1736; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1949057711 + intValue = 1011039225 + ) + static int field1733; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -1153902533 + ) + static int field1742; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -1095575825 ) @Export("ViewportMouse_entityCount") public static int ViewportMouse_entityCount; - @ObfuscatedName("s") + @ObfuscatedName("x") @Export("ViewportMouse_entityTags") public static long[] ViewportMouse_entityTags; - @ObfuscatedName("hb") - @ObfuscatedGetter( - intValue = -1167251555 - ) - @Export("cameraPitch") - static int cameraPitch; static { ViewportMouse_isInViewport = false; @@ -70,26 +70,274 @@ public class ViewportMouse { ViewportMouse_entityTags = new long[1000]; } - @ObfuscatedName("u") + @ObfuscatedName("t") + static double method3061(double var0, double var2, double var4) { + return TileItemPile.method2836((var0 - var2) / var4) / var4; + } + + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "1626465516" + signature = "(IIII)I", + garbageValue = "-1872781717" ) - public static int method2993(int var0) { - if (var0 > 0) { - return 1; + public static int method3059(int var0, int var1, int var2) { + var2 &= 3; + if (var2 == 0) { + return var1; + } else if (var2 == 1) { + return 7 - var0; } else { - return var0 < 0 ? -1 : 0; + return var2 == 2 ? 7 - var1 : var0; } } - @ObfuscatedName("bg") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)I", - garbageValue = "-8" + signature = "(ZI)V", + garbageValue = "-1104105387" ) - @Export("stringCp1252NullTerminatedByteSize") - public static int stringCp1252NullTerminatedByteSize(String var0) { - return var0.length() + 1; + @Export("Login_promptCredentials") + static void Login_promptCredentials(boolean var0) { + Login.Login_response1 = ""; + Login.Login_response2 = "Enter your username/email & password."; + Login.Login_response3 = ""; + Login.loginIndex = 2; + if (var0) { + Login.Login_password = ""; + } + + if (Login.Login_username == null || Login.Login_username.length() <= 0) { + if (WorldMapSection2.clientPreferences.rememberedUsername != null) { + Login.Login_username = WorldMapSection2.clientPreferences.rememberedUsername; + Client.Login_isUsernameRemembered = true; + } else { + Client.Login_isUsernameRemembered = false; + } + } + + class81.method2099(); + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "(ILce;ZI)I", + garbageValue = "1906637930" + ) + static int method3037(int var0, Script var1, boolean var2) { + Widget var3 = Varps.getWidget(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); + if (var0 == ScriptOpcodes.IF_GETSCROLLX) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.scrollX; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.scrollY; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETTEXT) { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3.text; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.scrollWidth; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.scrollHeight; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.modelZoom; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.modelAngleX; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.modelAngleZ; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.modelAngleY; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETTRANSTOP) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.transparencyTop; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETTRANSBOT) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.transparencyBot; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.color; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.color2; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETFILLMODE) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; + return 1; + } else { + return 2; + } + } + + @ObfuscatedName("jg") + @ObfuscatedSignature( + signature = "(Lhn;IIS)V", + garbageValue = "-7160" + ) + static final void method3060(Widget var0, int var1, int var2) { + if (var0.buttonType == 1) { + GraphicsObject.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); + } + + String var3; + if (var0.buttonType == 2 && !Client.isSpellSelected) { + var3 = PcmPlayer.method2542(var0); + if (var3 != null) { + GraphicsObject.insertMenuItemNoShift(var3, PacketWriter.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); + } + } + + if (var0.buttonType == 3) { + GraphicsObject.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); + } + + if (var0.buttonType == 4) { + GraphicsObject.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); + } + + if (var0.buttonType == 5) { + GraphicsObject.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); + } + + if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { + GraphicsObject.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); + } + + int var4; + int var13; + if (var0.type == 2) { + var13 = 0; + + for (var4 = 0; var4 < var0.height; ++var4) { + for (int var5 = 0; var5 < var0.width; ++var5) { + int var6 = (var0.paddingX + 32) * var5; + int var7 = (var0.paddingY + 32) * var4; + if (var13 < 20) { + var6 += var0.inventoryXOffsets[var13]; + var7 += var0.inventoryYOffsets[var13]; + } + + if (var1 >= var6 && var2 >= var7 && var1 < var6 + 32 && var2 < var7 + 32) { + Client.dragItemSlotDestination = var13; + FloorDecoration.field1604 = var0; + if (var0.itemIds[var13] > 0) { + ItemDefinition var8 = HealthBarDefinition.ItemDefinition_get(var0.itemIds[var13] - 1); + if (Client.isItemSelected == 1 && WorldMapManager.method673(WorldMapIcon_0.getWidgetClickMask(var0))) { + if (var0.id != FriendSystem.selectedItemWidget || var13 != class65.selectedItemSlot) { + GraphicsObject.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + PacketWriter.colorStartTag(16748608) + var8.name, 31, var8.id, var13, var0.id); + } + } else if (Client.isSpellSelected && WorldMapManager.method673(WorldMapIcon_0.getWidgetClickMask(var0))) { + if ((NetSocket.selectedSpellFlags & 16) == 16) { + GraphicsObject.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + PacketWriter.colorStartTag(16748608) + var8.name, 32, var8.id, var13, var0.id); + } + } else { + String[] var9 = var8.inventoryActions; + int var10 = -1; + if (Client.shiftClickDrop && Players.method2201()) { + var10 = var8.getShiftClickIndex(); + } + + int var11; + if (WorldMapManager.method673(WorldMapIcon_0.getWidgetClickMask(var0))) { + for (var11 = 4; var11 >= 3; --var11) { + if (var10 != var11) { + GrandExchangeEvents.addWidgetItemMenuItem(var0, var8, var13, var11, false); + } + } + } + + if (class268.method5042(WorldMapIcon_0.getWidgetClickMask(var0))) { + GraphicsObject.insertMenuItemNoShift("Use", PacketWriter.colorStartTag(16748608) + var8.name, 38, var8.id, var13, var0.id); + } + + if (WorldMapManager.method673(WorldMapIcon_0.getWidgetClickMask(var0))) { + for (var11 = 2; var11 >= 0; --var11) { + if (var11 != var10) { + GrandExchangeEvents.addWidgetItemMenuItem(var0, var8, var13, var11, false); + } + } + + if (var10 >= 0) { + GrandExchangeEvents.addWidgetItemMenuItem(var0, var8, var13, var10, true); + } + } + + var9 = var0.itemActions; + if (var9 != null) { + for (var11 = 4; var11 >= 0; --var11) { + if (var9[var11] != null) { + byte var12 = 0; + if (var11 == 0) { + var12 = 39; + } + + if (var11 == 1) { + var12 = 40; + } + + if (var11 == 2) { + var12 = 41; + } + + if (var11 == 3) { + var12 = 42; + } + + if (var11 == 4) { + var12 = 43; + } + + GraphicsObject.insertMenuItemNoShift(var9[var11], PacketWriter.colorStartTag(16748608) + var8.name, var12, var8.id, var13, var0.id); + } + } + } + + GraphicsObject.insertMenuItemNoShift("Examine", PacketWriter.colorStartTag(16748608) + var8.name, 1005, var8.id, var13, var0.id); + } + } + } + + ++var13; + } + } + } + + if (var0.isIf3) { + if (Client.isSpellSelected) { + if (NPC.method2088(WorldMapIcon_0.getWidgetClickMask(var0)) && (NetSocket.selectedSpellFlags & 32) == 32) { + GraphicsObject.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); + } + } else { + for (var13 = 9; var13 >= 5; --var13) { + String var14 = class80.method2098(var0, var13); + if (var14 != null) { + GraphicsObject.insertMenuItemNoShift(var14, var0.dataText, 1007, var13 + 1, var0.childIndex, var0.id); + } + } + + var3 = PcmPlayer.method2542(var0); + if (var3 != null) { + GraphicsObject.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); + } + + for (var4 = 4; var4 >= 0; --var4) { + String var15 = class80.method2098(var0, var4); + if (var15 != null) { + class160.insertMenuItem(var15, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.field2713); + } + } + + if (AttackOption.method2117(WorldMapIcon_0.getWidgetClickMask(var0))) { + GraphicsObject.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); + } + } + } + } } diff --git a/runescape-client/src/main/java/VorbisCodebook.java b/runescape-client/src/main/java/VorbisCodebook.java index dab773c45b..15366c7df6 100644 --- a/runescape-client/src/main/java/VorbisCodebook.java +++ b/runescape-client/src/main/java/VorbisCodebook.java @@ -2,23 +2,23 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("cm") +@ObfuscatedName("cl") @Implements("VorbisCodebook") public class VorbisCodebook { - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("dimensions") int dimensions; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("entries") int entries; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("lengthMap") int[] lengthMap; - @ObfuscatedName("w") - int[] field1312; - @ObfuscatedName("p") - float[][] field1310; - @ObfuscatedName("b") + @ObfuscatedName("e") + int[] field1334; + @ObfuscatedName("i") + float[][] field1335; + @ObfuscatedName("g") @Export("keys") int[] keys; @@ -35,7 +35,7 @@ public class VorbisCodebook { var2 = 0; for (var3 = VorbisSample.readBits(5) + 1; var2 < this.entries; ++var3) { - int var4 = VorbisSample.readBits(Frames.iLog(this.entries - var2)); + int var4 = VorbisSample.readBits(CollisionMap.iLog(this.entries - var2)); for (var5 = 0; var5 < var4; ++var5) { this.lengthMap[var2++] = var3; @@ -53,7 +53,7 @@ public class VorbisCodebook { } } - this.method2341(); + this.method2396(); var2 = VorbisSample.readBits(4); if (var2 > 0) { float var15 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); @@ -67,14 +67,14 @@ public class VorbisCodebook { var7 = this.entries * this.dimensions; } - this.field1312 = new int[var7]; + this.field1334 = new int[var7]; int var8; for (var8 = 0; var8 < var7; ++var8) { - this.field1312[var8] = VorbisSample.readBits(var5); + this.field1334[var8] = VorbisSample.readBits(var5); } - this.field1310 = new float[this.entries][this.dimensions]; + this.field1335 = new float[this.entries][this.dimensions]; float var9; int var10; int var11; @@ -85,8 +85,8 @@ public class VorbisCodebook { for (var11 = 0; var11 < this.dimensions; ++var11) { int var12 = var8 / var10 % var7; - float var13 = (float)this.field1312[var12] * var16 + var15 + var9; - this.field1310[var8][var11] = var13; + float var13 = (float)this.field1334[var12] * var16 + var15 + var9; + this.field1335[var8][var11] = var13; if (var6) { var9 = var13; } @@ -100,8 +100,8 @@ public class VorbisCodebook { var10 = var8 * this.dimensions; for (var11 = 0; var11 < this.dimensions; ++var11) { - float var17 = (float)this.field1312[var10] * var16 + var15 + var9; - this.field1310[var8][var11] = var17; + float var17 = (float)this.field1334[var10] * var16 + var15 + var9; + this.field1335[var8][var11] = var17; if (var6) { var9 = var17; } @@ -114,8 +114,8 @@ public class VorbisCodebook { } - @ObfuscatedName("i") - void method2341() { + @ObfuscatedName("t") + void method2396() { int[] var1 = new int[this.entries]; int[] var2 = new int[33]; @@ -208,8 +208,8 @@ public class VorbisCodebook { } - @ObfuscatedName("y") - int method2342() { + @ObfuscatedName("o") + int method2398() { int var1; for (var1 = 0; this.keys[var1] >= 0; var1 = VorbisSample.readBit() != 0 ? this.keys[var1] : var1 + 1) { } @@ -217,18 +217,41 @@ public class VorbisCodebook { return ~this.keys[var1]; } - @ObfuscatedName("w") - float[] method2349() { - return this.field1310[this.method2342()]; + @ObfuscatedName("e") + float[] method2397() { + return this.field1335[this.method2398()]; } - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("mapType1QuantValues") static int mapType1QuantValues(int var0, int var1) { - int var2; - for (var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; ModelData0.method3266(var2, var1) > var0; --var2) { - } + int var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; - return var2; + while (true) { + int var4 = var2; + int var5 = var1; + + int var6; + for (var6 = 1; var5 > 1; var5 >>= 1) { + if ((var5 & 1) != 0) { + var6 *= var4; + } + + var4 *= var4; + } + + int var3; + if (var5 == 1) { + var3 = var4 * var6; + } else { + var3 = var6; + } + + if (var3 <= var0) { + return var2; + } + + --var2; + } } } diff --git a/runescape-client/src/main/java/VorbisFloor.java b/runescape-client/src/main/java/VorbisFloor.java index ca164669e1..a31cc1bb92 100644 --- a/runescape-client/src/main/java/VorbisFloor.java +++ b/runescape-client/src/main/java/VorbisFloor.java @@ -2,43 +2,43 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("cv") +@ObfuscatedName("dm") @Implements("VorbisFloor") public class VorbisFloor { - @ObfuscatedName("f") - static final int[] field1358; - @ObfuscatedName("i") + @ObfuscatedName("c") + static final int[] field1384; + @ObfuscatedName("t") @Export("VorbisFloor_decibelStatics") static final float[] VorbisFloor_decibelStatics; - @ObfuscatedName("d") - static int[] field1359; - @ObfuscatedName("c") - static int[] field1366; + @ObfuscatedName("m") + static int[] field1387; + @ObfuscatedName("p") + static int[] field1390; + @ObfuscatedName("h") + static boolean[] field1389; @ObfuscatedName("o") - static boolean[] field1367; - @ObfuscatedName("y") - int[] field1365; - @ObfuscatedName("w") + int[] field1385; + @ObfuscatedName("e") @Export("multiplier") int multiplier; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("partitionClassList") int[] partitionClassList; - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("classDimensions") int[] classDimensions; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("classSubClasses") int[] classSubClasses; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("classMasterbooks") int[] classMasterbooks; - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("subclassBooks") int[][] subclassBooks; static { - field1358 = new int[]{256, 128, 86, 64}; + field1384 = new int[]{256, 128, 86, 64}; VorbisFloor_decibelStatics = new float[]{1.0649863E-7F, 1.1341951E-7F, 1.2079015E-7F, 1.2863978E-7F, 1.369995E-7F, 1.459025E-7F, 1.5538409E-7F, 1.6548181E-7F, 1.7623574E-7F, 1.8768856E-7F, 1.998856E-7F, 2.128753E-7F, 2.2670913E-7F, 2.4144197E-7F, 2.5713223E-7F, 2.7384212E-7F, 2.9163792E-7F, 3.1059022E-7F, 3.307741E-7F, 3.5226967E-7F, 3.7516213E-7F, 3.995423E-7F, 4.255068E-7F, 4.5315863E-7F, 4.8260745E-7F, 5.1397E-7F, 5.4737063E-7F, 5.829419E-7F, 6.208247E-7F, 6.611694E-7F, 7.041359E-7F, 7.4989464E-7F, 7.98627E-7F, 8.505263E-7F, 9.057983E-7F, 9.646621E-7F, 1.0273513E-6F, 1.0941144E-6F, 1.1652161E-6F, 1.2409384E-6F, 1.3215816E-6F, 1.4074654E-6F, 1.4989305E-6F, 1.5963394E-6F, 1.7000785E-6F, 1.8105592E-6F, 1.9282195E-6F, 2.053526E-6F, 2.1869757E-6F, 2.3290977E-6F, 2.4804558E-6F, 2.6416496E-6F, 2.813319E-6F, 2.9961443E-6F, 3.1908505E-6F, 3.39821E-6F, 3.619045E-6F, 3.8542307E-6F, 4.1047006E-6F, 4.371447E-6F, 4.6555283E-6F, 4.958071E-6F, 5.280274E-6F, 5.623416E-6F, 5.988857E-6F, 6.3780467E-6F, 6.7925284E-6F, 7.2339453E-6F, 7.704048E-6F, 8.2047E-6F, 8.737888E-6F, 9.305725E-6F, 9.910464E-6F, 1.0554501E-5F, 1.1240392E-5F, 1.1970856E-5F, 1.2748789E-5F, 1.3577278E-5F, 1.4459606E-5F, 1.5399271E-5F, 1.6400005E-5F, 1.7465769E-5F, 1.8600793E-5F, 1.9809577E-5F, 2.1096914E-5F, 2.2467912E-5F, 2.3928002E-5F, 2.5482977E-5F, 2.7139005E-5F, 2.890265E-5F, 3.078091E-5F, 3.2781227E-5F, 3.4911533E-5F, 3.718028E-5F, 3.9596467E-5F, 4.2169668E-5F, 4.491009E-5F, 4.7828602E-5F, 5.0936775E-5F, 5.424693E-5F, 5.7772202E-5F, 6.152657E-5F, 6.552491E-5F, 6.9783084E-5F, 7.4317984E-5F, 7.914758E-5F, 8.429104E-5F, 8.976875E-5F, 9.560242E-5F, 1.0181521E-4F, 1.0843174E-4F, 1.1547824E-4F, 1.2298267E-4F, 1.3097477E-4F, 1.3948625E-4F, 1.4855085E-4F, 1.5820454E-4F, 1.6848555E-4F, 1.7943469E-4F, 1.9109536E-4F, 2.0351382E-4F, 2.167393E-4F, 2.3082423E-4F, 2.4582449E-4F, 2.6179955E-4F, 2.7881275E-4F, 2.9693157E-4F, 3.1622787E-4F, 3.3677815E-4F, 3.5866388E-4F, 3.8197188E-4F, 4.0679457E-4F, 4.3323037E-4F, 4.613841E-4F, 4.913675E-4F, 5.2329927E-4F, 5.573062E-4F, 5.935231E-4F, 6.320936E-4F, 6.731706E-4F, 7.16917E-4F, 7.635063E-4F, 8.1312325E-4F, 8.6596457E-4F, 9.2223985E-4F, 9.821722E-4F, 0.0010459992F, 0.0011139743F, 0.0011863665F, 0.0012634633F, 0.0013455702F, 0.0014330129F, 0.0015261382F, 0.0016253153F, 0.0017309374F, 0.0018434235F, 0.0019632196F, 0.0020908006F, 0.0022266726F, 0.0023713743F, 0.0025254795F, 0.0026895993F, 0.0028643848F, 0.0030505287F, 0.003248769F, 0.0034598925F, 0.0036847359F, 0.0039241905F, 0.0041792067F, 0.004450795F, 0.004740033F, 0.005048067F, 0.0053761187F, 0.005725489F, 0.0060975635F, 0.0064938175F, 0.0069158226F, 0.0073652514F, 0.007843887F, 0.008353627F, 0.008896492F, 0.009474637F, 0.010090352F, 0.01074608F, 0.011444421F, 0.012188144F, 0.012980198F, 0.013823725F, 0.014722068F, 0.015678791F, 0.016697686F, 0.017782796F, 0.018938422F, 0.020169148F, 0.021479854F, 0.022875736F, 0.02436233F, 0.025945531F, 0.027631618F, 0.029427277F, 0.031339627F, 0.03337625F, 0.035545226F, 0.037855156F, 0.0403152F, 0.042935107F, 0.045725275F, 0.048696756F, 0.05186135F, 0.05523159F, 0.05882085F, 0.062643364F, 0.06671428F, 0.07104975F, 0.075666964F, 0.08058423F, 0.08582105F, 0.09139818F, 0.097337745F, 0.1036633F, 0.11039993F, 0.11757434F, 0.12521498F, 0.13335215F, 0.14201812F, 0.15124726F, 0.16107617F, 0.1715438F, 0.18269168F, 0.19456401F, 0.20720787F, 0.22067343F, 0.23501402F, 0.25028655F, 0.26655158F, 0.28387362F, 0.3023213F, 0.32196787F, 0.34289113F, 0.36517414F, 0.3889052F, 0.41417846F, 0.44109413F, 0.4697589F, 0.50028646F, 0.53279793F, 0.5674221F, 0.6042964F, 0.64356697F, 0.6853896F, 0.72993004F, 0.777365F, 0.8278826F, 0.88168305F, 0.9389798F, 1.0F}; } @@ -92,30 +92,30 @@ public class VorbisFloor { var5 += this.classDimensions[this.partitionClassList[var9]]; } - this.field1365 = new int[var5]; - this.field1365[0] = 0; - this.field1365[1] = 1 << var4; + this.field1385 = new int[var5]; + this.field1385[0] = 0; + this.field1385[1] = 1 << var4; var5 = 2; for (var9 = 0; var9 < var2; ++var9) { var7 = this.partitionClassList[var9]; for (int var8 = 0; var8 < this.classDimensions[var7]; ++var8) { - this.field1365[var5++] = VorbisSample.readBits(var4); + this.field1385[var5++] = VorbisSample.readBits(var4); } } - if (field1359 == null || field1359.length < var5) { - field1359 = new int[var5]; - field1366 = new int[var5]; - field1367 = new boolean[var5]; + if (field1387 == null || field1387.length < var5) { + field1387 = new int[var5]; + field1390 = new int[var5]; + field1389 = new boolean[var5]; } } } - @ObfuscatedName("y") - int method2402(int var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("o") + int method2472(int var1, int var2, int var3, int var4, int var5) { int var6 = var4 - var2; int var7 = var3 - var1; int var8 = var6 < 0 ? -var6 : var6; @@ -124,8 +124,8 @@ public class VorbisFloor { return var6 < 0 ? var2 - var10 : var10 + var2; } - @ObfuscatedName("w") - void method2403(int var1, int var2, int var3, int var4, float[] var5, int var6) { + @ObfuscatedName("e") + void method2481(int var1, int var2, int var3, int var4, float[] var5, int var6) { int var7 = var4 - var2; int var8 = var3 - var1; int var9 = var7 < 0 ? -var7 : var7; @@ -153,54 +153,54 @@ public class VorbisFloor { } - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("VarbisFloor_sort") void VarbisFloor_sort(int var1, int var2) { if (var1 < var2) { int var3 = var1; - int var4 = field1359[var1]; - int var5 = field1366[var1]; - boolean var6 = field1367[var1]; + int var4 = field1387[var1]; + int var5 = field1390[var1]; + boolean var6 = field1389[var1]; for (int var7 = var1 + 1; var7 <= var2; ++var7) { - int var8 = field1359[var7]; + int var8 = field1387[var7]; if (var8 < var4) { - field1359[var3] = var8; - field1366[var3] = field1366[var7]; - field1367[var3] = field1367[var7]; + field1387[var3] = var8; + field1390[var3] = field1390[var7]; + field1389[var3] = field1389[var7]; ++var3; - field1359[var7] = field1359[var3]; - field1366[var7] = field1366[var3]; - field1367[var7] = field1367[var3]; + field1387[var7] = field1387[var3]; + field1390[var7] = field1390[var3]; + field1389[var7] = field1389[var3]; } } - field1359[var3] = var4; - field1366[var3] = var5; - field1367[var3] = var6; + field1387[var3] = var4; + field1390[var3] = var5; + field1389[var3] = var6; this.VarbisFloor_sort(var1, var3 - 1); this.VarbisFloor_sort(var3 + 1, var2); } } - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("readSubmapFloor") boolean readSubmapFloor() { boolean var1 = VorbisSample.readBit() != 0; if (!var1) { return false; } else { - int var2 = this.field1365.length; + int var2 = this.field1385.length; int var3; for (var3 = 0; var3 < var2; ++var3) { - field1359[var3] = this.field1365[var3]; + field1387[var3] = this.field1385[var3]; } - var3 = field1358[this.multiplier - 1]; - int var4 = Frames.iLog(var3 - 1); - field1366[0] = VorbisSample.readBits(var4); - field1366[1] = VorbisSample.readBits(var4); + var3 = field1384[this.multiplier - 1]; + int var4 = CollisionMap.iLog(var3 - 1); + field1390[0] = VorbisSample.readBits(var4); + field1390[1] = VorbisSample.readBits(var4); int var5 = 2; for (int var6 = 0; var6 < this.partitionClassList.length; ++var6) { @@ -210,13 +210,13 @@ public class VorbisFloor { int var10 = (1 << var9) - 1; int var11 = 0; if (var9 > 0) { - var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method2342(); + var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method2398(); } for (int var12 = 0; var12 < var8; ++var12) { int var13 = this.subclassBooks[var7][var11 & var10]; var11 >>>= var9; - field1366[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method2342() : 0; + field1390[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method2398() : 0; } } @@ -224,12 +224,12 @@ public class VorbisFloor { } } - @ObfuscatedName("e") - void method2405(float[] var1, int var2) { - int var3 = this.field1365.length; - int var4 = field1358[this.multiplier - 1]; - boolean[] var5 = field1367; - field1367[1] = true; + @ObfuscatedName("d") + void method2464(float[] var1, int var2) { + int var3 = this.field1385.length; + int var4 = field1384[this.multiplier - 1]; + boolean[] var5 = field1389; + field1389[1] = true; var5[0] = true; int var6; @@ -238,37 +238,37 @@ public class VorbisFloor { int var9; int var10; for (var6 = 2; var6 < var3; ++var6) { - var7 = method2419(field1359, var6); - var8 = method2401(field1359, var6); - var9 = this.method2402(field1359[var7], field1366[var7], field1359[var8], field1366[var8], field1359[var6]); - var10 = field1366[var6]; + var7 = method2465(field1387, var6); + var8 = method2462(field1387, var6); + var9 = this.method2472(field1387[var7], field1390[var7], field1387[var8], field1390[var8], field1387[var6]); + var10 = field1390[var6]; int var11 = var4 - var9; int var13 = (var11 < var9 ? var11 : var9) << 1; if (var10 != 0) { - boolean[] var14 = field1367; - field1367[var8] = true; + boolean[] var14 = field1389; + field1389[var8] = true; var14[var7] = true; - field1367[var6] = true; + field1389[var6] = true; if (var10 >= var13) { - field1366[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; + field1390[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; } else { - field1366[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; + field1390[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; } } else { - field1367[var6] = false; - field1366[var6] = var9; + field1389[var6] = false; + field1390[var6] = var9; } } this.VarbisFloor_sort(0, var3 - 1); var6 = 0; - var7 = field1366[0] * this.multiplier; + var7 = field1390[0] * this.multiplier; for (var8 = 1; var8 < var3; ++var8) { - if (field1367[var8]) { - var9 = field1359[var8]; - var10 = field1366[var8] * this.multiplier; - this.method2403(var6, var7, var9, var10, var1, var2); + if (field1389[var8]) { + var9 = field1387[var8]; + var10 = field1390[var8] * this.multiplier; + this.method2481(var6, var7, var9, var10, var1, var2); if (var9 >= var2) { return; } @@ -286,8 +286,8 @@ public class VorbisFloor { } - @ObfuscatedName("f") - static int method2419(int[] var0, int var1) { + @ObfuscatedName("c") + static int method2465(int[] var0, int var1) { int var2 = var0[var1]; int var3 = -1; int var4 = Integer.MIN_VALUE; @@ -303,8 +303,8 @@ public class VorbisFloor { return var3; } - @ObfuscatedName("i") - static int method2401(int[] var0, int var1) { + @ObfuscatedName("t") + static int method2462(int[] var0, int var1) { int var2 = var0[var1]; int var3 = -1; int var4 = Integer.MAX_VALUE; diff --git a/runescape-client/src/main/java/VorbisMapping.java b/runescape-client/src/main/java/VorbisMapping.java index 0c5a60f87b..cf6a2c8ef5 100644 --- a/runescape-client/src/main/java/VorbisMapping.java +++ b/runescape-client/src/main/java/VorbisMapping.java @@ -2,19 +2,19 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("da") +@ObfuscatedName("dy") @Implements("VorbisMapping") public class VorbisMapping { - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("submaps") int submaps; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("mappingMux") int mappingMux; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("submapFloor") int[] submapFloor; - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("submapResidue") int[] submapResidue; diff --git a/runescape-client/src/main/java/VorbisResidue.java b/runescape-client/src/main/java/VorbisResidue.java index 93774b3806..57b07f9c64 100644 --- a/runescape-client/src/main/java/VorbisResidue.java +++ b/runescape-client/src/main/java/VorbisResidue.java @@ -2,28 +2,28 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("di") +@ObfuscatedName("dc") @Implements("VorbisResidue") public class VorbisResidue { - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("residueType") int residueType; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("begin") int begin; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("end") int end; - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("partitionSize") int partitionSize; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("classifications") int classifications; - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("classbook") int classbook; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("cascade") int[] cascade; @@ -56,8 +56,8 @@ public class VorbisResidue { } - @ObfuscatedName("f") - void method2531(float[] var1, int var2, boolean var3) { + @ObfuscatedName("c") + void method2587(float[] var1, int var2, boolean var3) { int var4; for (var4 = 0; var4 < var2; ++var4) { var1[var4] = 0.0F; @@ -76,7 +76,7 @@ public class VorbisResidue { int var10; int var11; if (var8 == 0) { - var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method2342(); + var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method2398(); for (var11 = var4 - 1; var11 >= 0; --var11) { if (var9 + var11 < var6) { @@ -98,7 +98,7 @@ public class VorbisResidue { var15 = this.partitionSize / var14.dimensions; for (int var16 = 0; var16 < var15; ++var16) { - float[] var17 = var14.method2349(); + float[] var17 = var14.method2397(); for (int var18 = 0; var18 < var14.dimensions; ++var18) { var1[var13 + var16 + var18 * var15] += var17[var18]; @@ -108,7 +108,7 @@ public class VorbisResidue { var15 = 0; while (var15 < this.partitionSize) { - float[] var19 = var14.method2349(); + float[] var19 = var14.method2397(); for (int var20 = 0; var20 < var14.dimensions; ++var20) { var1[var13 + var15] += var19[var20]; diff --git a/runescape-client/src/main/java/VorbisSample.java b/runescape-client/src/main/java/VorbisSample.java index f47e3f54cf..6191e6a761 100644 --- a/runescape-client/src/main/java/VorbisSample.java +++ b/runescape-client/src/main/java/VorbisSample.java @@ -3,115 +3,115 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ci") +@ObfuscatedName("cj") @Implements("VorbisSample") public class VorbisSample extends Node { - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("VorbisSample_bytes") static byte[] VorbisSample_bytes; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("VorbisSample_byteOffset") static int VorbisSample_byteOffset; - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("VorbisSample_bitOffset") static int VorbisSample_bitOffset; - @ObfuscatedName("d") + @ObfuscatedName("m") @Export("VorbisSample_blockSize0") static int VorbisSample_blockSize0; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("VorbisSample_blockSize1") static int VorbisSample_blockSize1; - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "[Lcm;" + signature = "[Lcl;" ) @Export("VorbisSample_codebooks") static VorbisCodebook[] VorbisSample_codebooks; @ObfuscatedName("v") @ObfuscatedSignature( - signature = "[Lcv;" + signature = "[Ldm;" ) @Export("VorbisSample_floors") static VorbisFloor[] VorbisSample_floors; - @ObfuscatedName("k") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "[Ldi;" + signature = "[Ldc;" ) @Export("VorbisSample_residues") static VorbisResidue[] VorbisSample_residues; - @ObfuscatedName("s") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "[Lda;" + signature = "[Ldy;" ) @Export("VorbisSample_mappings") static VorbisMapping[] VorbisSample_mappings; - @ObfuscatedName("l") + @ObfuscatedName("w") @Export("VorbisSample_blockFlags") static boolean[] VorbisSample_blockFlags; - @ObfuscatedName("t") + @ObfuscatedName("k") @Export("VorbisSample_mapping") static int[] VorbisSample_mapping; - @ObfuscatedName("j") - static boolean field1334; - @ObfuscatedName("m") - static float[] field1327; - @ObfuscatedName("g") - static float[] field1340; - @ObfuscatedName("r") - static float[] field1341; @ObfuscatedName("q") - static float[] field1342; - @ObfuscatedName("aa") - static float[] field1343; - @ObfuscatedName("av") - static float[] field1320; - @ObfuscatedName("aw") - static float[] field1345; - @ObfuscatedName("as") - static int[] field1346; - @ObfuscatedName("ak") - static int[] field1339; - @ObfuscatedName("f") - byte[][] field1317; - @ObfuscatedName("i") + static boolean field1362; + @ObfuscatedName("r") + static float[] field1363; + @ObfuscatedName("s") + static float[] field1364; + @ObfuscatedName("a") + static float[] field1341; + @ObfuscatedName("u") + static float[] field1357; + @ObfuscatedName("ae") + static float[] field1367; + @ObfuscatedName("af") + static float[] field1368; + @ObfuscatedName("az") + static float[] field1369; + @ObfuscatedName("ax") + static int[] field1370; + @ObfuscatedName("aj") + static int[] field1371; + @ObfuscatedName("c") + byte[][] field1359; + @ObfuscatedName("t") @Export("sampleRate") int sampleRate; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("sampleCount") int sampleCount; - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("start") int start; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("end") int end; - @ObfuscatedName("b") - boolean field1324; - @ObfuscatedName("n") - float[] field1335; - @ObfuscatedName("u") - int field1336; + @ObfuscatedName("g") + boolean field1346; @ObfuscatedName("z") - int field1337; - @ObfuscatedName("h") - boolean field1323; + float[] field1374; + @ObfuscatedName("y") + int field1353; + @ObfuscatedName("f") + int field1365; + @ObfuscatedName("b") + boolean field1355; @ObfuscatedName("au") @Export("samples") byte[] samples; - @ObfuscatedName("ah") - int field1349; - @ObfuscatedName("aq") - int field1347; + @ObfuscatedName("ay") + int field1373; + @ObfuscatedName("aa") + int field1344; static { - field1334 = false; + field1362 = false; } VorbisSample(byte[] var1) { this.read(var1); } - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("read") void read(byte[] var1) { Buffer var2 = new Buffer(var1); @@ -121,11 +121,11 @@ public class VorbisSample extends Node { this.end = var2.readInt(); if (this.end < 0) { this.end = ~this.end; - this.field1324 = true; + this.field1346 = true; } int var3 = var2.readInt(); - this.field1317 = new byte[var3][]; + this.field1359 = new byte[var3][]; for (int var4 = 0; var4 < var3; ++var4) { int var5 = 0; @@ -138,16 +138,16 @@ public class VorbisSample extends Node { byte[] var7 = new byte[var5]; var2.readBytes(var7, 0, var5); - this.field1317[var4] = var7; + this.field1359[var4] = var7; } } - @ObfuscatedName("e") - float[] method2371(int var1) { - VorbisSample_setData(this.field1317[var1], 0); + @ObfuscatedName("d") + float[] method2425(int var1) { + VorbisSample_setData(this.field1359[var1], 0); readBit(); - int var2 = readBits(Frames.iLog(VorbisSample_mapping.length - 1)); + int var2 = readBits(CollisionMap.iLog(VorbisSample_mapping.length - 1)); boolean var3 = VorbisSample_blockFlags[var2]; int var4 = var3 ? VorbisSample_blockSize1 : VorbisSample_blockSize0; boolean var5 = false; @@ -192,41 +192,41 @@ public class VorbisSample extends Node { for (var17 = 0; var17 < var14.submaps; ++var17) { VorbisResidue var18 = VorbisSample_residues[var14.submapResidue[var17]]; - float[] var19 = field1327; - var18.method2531(var19, var4 >> 1, var45); + float[] var19 = field1363; + var18.method2587(var19, var4 >> 1, var45); } int var40; if (!var15) { var17 = var14.mappingMux; var40 = var14.submapFloor[var17]; - VorbisSample_floors[var40].method2405(field1327, var4 >> 1); + VorbisSample_floors[var40].method2464(field1363, var4 >> 1); } - int var42; + int var41; if (var15) { for (var17 = var4 >> 1; var17 < var4; ++var17) { - field1327[var17] = 0.0F; + field1363[var17] = 0.0F; } } else { var17 = var4 >> 1; var40 = var4 >> 2; - var42 = var4 >> 3; - float[] var43 = field1327; + var41 = var4 >> 3; + float[] var20 = field1363; int var21; for (var21 = 0; var21 < var17; ++var21) { - var43[var21] *= 0.5F; + var20[var21] *= 0.5F; } for (var21 = var17; var21 < var4; ++var21) { - var43[var21] = -var43[var4 - var21 - 1]; + var20[var21] = -var20[var4 - var21 - 1]; } - float[] var44 = var3 ? field1343 : field1340; - float[] var22 = var3 ? field1320 : field1341; - float[] var23 = var3 ? field1345 : field1342; - int[] var24 = var3 ? field1339 : field1346; + float[] var44 = var3 ? field1367 : field1364; + float[] var22 = var3 ? field1368 : field1341; + float[] var23 = var3 ? field1369 : field1357; + int[] var24 = var3 ? field1371 : field1370; int var25; float var26; @@ -234,30 +234,30 @@ public class VorbisSample extends Node { float var28; float var29; for (var25 = 0; var25 < var40; ++var25) { - var26 = var43[var25 * 4] - var43[var4 - var25 * 4 - 1]; - var27 = var43[var25 * 4 + 2] - var43[var4 - var25 * 4 - 3]; + var26 = var20[var25 * 4] - var20[var4 - var25 * 4 - 1]; + var27 = var20[var25 * 4 + 2] - var20[var4 - var25 * 4 - 3]; var28 = var44[var25 * 2]; var29 = var44[var25 * 2 + 1]; - var43[var4 - var25 * 4 - 1] = var26 * var28 - var27 * var29; - var43[var4 - var25 * 4 - 3] = var26 * var29 + var27 * var28; + var20[var4 - var25 * 4 - 1] = var26 * var28 - var27 * var29; + var20[var4 - var25 * 4 - 3] = var26 * var29 + var27 * var28; } float var30; float var31; - for (var25 = 0; var25 < var42; ++var25) { - var26 = var43[var17 + var25 * 4 + 3]; - var27 = var43[var17 + var25 * 4 + 1]; - var28 = var43[var25 * 4 + 3]; - var29 = var43[var25 * 4 + 1]; - var43[var17 + var25 * 4 + 3] = var26 + var28; - var43[var17 + var25 * 4 + 1] = var27 + var29; + for (var25 = 0; var25 < var41; ++var25) { + var26 = var20[var17 + var25 * 4 + 3]; + var27 = var20[var17 + var25 * 4 + 1]; + var28 = var20[var25 * 4 + 3]; + var29 = var20[var25 * 4 + 1]; + var20[var17 + var25 * 4 + 3] = var26 + var28; + var20[var17 + var25 * 4 + 1] = var27 + var29; var30 = var44[var17 - 4 - var25 * 4]; var31 = var44[var17 - 3 - var25 * 4]; - var43[var25 * 4 + 3] = (var26 - var28) * var30 - (var27 - var29) * var31; - var43[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; + var20[var25 * 4 + 3] = (var26 - var28) * var30 - (var27 - var29) * var31; + var20[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; } - var25 = Frames.iLog(var4 - 1); + var25 = CollisionMap.iLog(var4 - 1); int var47; int var48; @@ -273,133 +273,133 @@ public class VorbisSample extends Node { for (int var32 = 0; var32 < var4 >> var47 + 4; ++var32) { int var33 = var32 * 4; - float var34 = var43[var51 - 1 - var33]; - float var35 = var43[var51 - 3 - var33]; - float var36 = var43[var52 - 1 - var33]; - float var37 = var43[var52 - 3 - var33]; - var43[var51 - 1 - var33] = var34 + var36; - var43[var51 - 3 - var33] = var35 + var37; + float var34 = var20[var51 - 1 - var33]; + float var35 = var20[var51 - 3 - var33]; + float var36 = var20[var52 - 1 - var33]; + float var37 = var20[var52 - 3 - var33]; + var20[var51 - 1 - var33] = var34 + var36; + var20[var51 - 3 - var33] = var35 + var37; float var38 = var44[var32 * var49]; float var39 = var44[var32 * var49 + 1]; - var43[var52 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39; - var43[var52 - 3 - var33] = (var35 - var37) * var38 + (var34 - var36) * var39; + var20[var52 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39; + var20[var52 - 3 - var33] = (var35 - var37) * var38 + (var34 - var36) * var39; } } } - for (var47 = 1; var47 < var42 - 1; ++var47) { + for (var47 = 1; var47 < var41 - 1; ++var47) { var48 = var24[var47]; if (var47 < var48) { var49 = var47 * 8; var50 = var48 * 8; - var30 = var43[var49 + 1]; - var43[var49 + 1] = var43[var50 + 1]; - var43[var50 + 1] = var30; - var30 = var43[var49 + 3]; - var43[var49 + 3] = var43[var50 + 3]; - var43[var50 + 3] = var30; - var30 = var43[var49 + 5]; - var43[var49 + 5] = var43[var50 + 5]; - var43[var50 + 5] = var30; - var30 = var43[var49 + 7]; - var43[var49 + 7] = var43[var50 + 7]; - var43[var50 + 7] = var30; + var30 = var20[var49 + 1]; + var20[var49 + 1] = var20[var50 + 1]; + var20[var50 + 1] = var30; + var30 = var20[var49 + 3]; + var20[var49 + 3] = var20[var50 + 3]; + var20[var50 + 3] = var30; + var30 = var20[var49 + 5]; + var20[var49 + 5] = var20[var50 + 5]; + var20[var50 + 5] = var30; + var30 = var20[var49 + 7]; + var20[var49 + 7] = var20[var50 + 7]; + var20[var50 + 7] = var30; } } for (var47 = 0; var47 < var17; ++var47) { - var43[var47] = var43[var47 * 2 + 1]; + var20[var47] = var20[var47 * 2 + 1]; } - for (var47 = 0; var47 < var42; ++var47) { - var43[var4 - 1 - var47 * 2] = var43[var47 * 4]; - var43[var4 - 2 - var47 * 2] = var43[var47 * 4 + 1]; - var43[var4 - var40 - 1 - var47 * 2] = var43[var47 * 4 + 2]; - var43[var4 - var40 - 2 - var47 * 2] = var43[var47 * 4 + 3]; + for (var47 = 0; var47 < var41; ++var47) { + var20[var4 - 1 - var47 * 2] = var20[var47 * 4]; + var20[var4 - 2 - var47 * 2] = var20[var47 * 4 + 1]; + var20[var4 - var40 - 1 - var47 * 2] = var20[var47 * 4 + 2]; + var20[var4 - var40 - 2 - var47 * 2] = var20[var47 * 4 + 3]; } - for (var47 = 0; var47 < var42; ++var47) { + for (var47 = 0; var47 < var41; ++var47) { var27 = var23[var47 * 2]; var28 = var23[var47 * 2 + 1]; - var29 = var43[var17 + var47 * 2]; - var30 = var43[var17 + var47 * 2 + 1]; - var31 = var43[var4 - 2 - var47 * 2]; - float var53 = var43[var4 - 1 - var47 * 2]; + var29 = var20[var17 + var47 * 2]; + var30 = var20[var17 + var47 * 2 + 1]; + var31 = var20[var4 - 2 - var47 * 2]; + float var53 = var20[var4 - 1 - var47 * 2]; float var54 = var28 * (var29 - var31) + var27 * (var30 + var53); - var43[var17 + var47 * 2] = (var29 + var31 + var54) * 0.5F; - var43[var4 - 2 - var47 * 2] = (var29 + var31 - var54) * 0.5F; + var20[var17 + var47 * 2] = (var29 + var31 + var54) * 0.5F; + var20[var4 - 2 - var47 * 2] = (var29 + var31 - var54) * 0.5F; var54 = var28 * (var30 + var53) - var27 * (var29 - var31); - var43[var17 + var47 * 2 + 1] = (var30 - var53 + var54) * 0.5F; - var43[var4 - 1 - var47 * 2] = (-var30 + var53 + var54) * 0.5F; + var20[var17 + var47 * 2 + 1] = (var30 - var53 + var54) * 0.5F; + var20[var4 - 1 - var47 * 2] = (-var30 + var53 + var54) * 0.5F; } for (var47 = 0; var47 < var40; ++var47) { - var43[var47] = var43[var17 + var47 * 2] * var22[var47 * 2] + var43[var17 + var47 * 2 + 1] * var22[var47 * 2 + 1]; - var43[var17 - 1 - var47] = var43[var17 + var47 * 2] * var22[var47 * 2 + 1] - var43[var17 + var47 * 2 + 1] * var22[var47 * 2]; + var20[var47] = var20[var17 + var47 * 2] * var22[var47 * 2] + var20[var17 + var47 * 2 + 1] * var22[var47 * 2 + 1]; + var20[var17 - 1 - var47] = var20[var17 + var47 * 2] * var22[var47 * 2 + 1] - var20[var17 + var47 * 2 + 1] * var22[var47 * 2]; } for (var47 = 0; var47 < var40; ++var47) { - var43[var47 + (var4 - var40)] = -var43[var47]; + var20[var47 + (var4 - var40)] = -var20[var47]; } for (var47 = 0; var47 < var40; ++var47) { - var43[var47] = var43[var40 + var47]; + var20[var47] = var20[var40 + var47]; } for (var47 = 0; var47 < var40; ++var47) { - var43[var40 + var47] = -var43[var40 - var47 - 1]; + var20[var40 + var47] = -var20[var40 - var47 - 1]; } for (var47 = 0; var47 < var40; ++var47) { - var43[var17 + var47] = var43[var4 - var47 - 1]; + var20[var17 + var47] = var20[var4 - var47 - 1]; } float[] var10000; for (var47 = var8; var47 < var9; ++var47) { var27 = (float)Math.sin(((double)(var47 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D); - var10000 = field1327; + var10000 = field1363; var10000[var47] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } for (var47 = var11; var47 < var12; ++var47) { var27 = (float)Math.sin(((double)(var47 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D); - var10000 = field1327; + var10000 = field1363; var10000[var47] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } } - float[] var41 = null; - if (this.field1336 > 0) { - var40 = var4 + this.field1336 >> 2; - var41 = new float[var40]; - int var20; - if (!this.field1323) { - for (var42 = 0; var42 < this.field1337; ++var42) { - var20 = var42 + (this.field1336 >> 1); - var41[var42] += this.field1335[var20]; + float[] var42 = null; + if (this.field1353 > 0) { + var40 = var4 + this.field1353 >> 2; + var42 = new float[var40]; + int var43; + if (!this.field1355) { + for (var41 = 0; var41 < this.field1365; ++var41) { + var43 = var41 + (this.field1353 >> 1); + var42[var41] += this.field1374[var43]; } } if (!var15) { - for (var42 = var8; var42 < var4 >> 1; ++var42) { - var20 = var41.length - (var4 >> 1) + var42; - var41[var20] += field1327[var42]; + for (var41 = var8; var41 < var4 >> 1; ++var41) { + var43 = var42.length - (var4 >> 1) + var41; + var42[var43] += field1363[var41]; } } } - float[] var46 = this.field1335; - this.field1335 = field1327; - field1327 = var46; - this.field1336 = var4; - this.field1337 = var12 - (var4 >> 1); - this.field1323 = var15; - return var41; + float[] var46 = this.field1374; + this.field1374 = field1363; + field1363 = var46; + this.field1353 = var4; + this.field1365 = var12 - (var4 >> 1); + this.field1355 = var15; + return var42; } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "([I)Lcc;" + signature = "([I)Lcv;" ) @Export("toRawSound") RawSound toRawSound(int[] var1) { @@ -407,21 +407,21 @@ public class VorbisSample extends Node { return null; } else { if (this.samples == null) { - this.field1336 = 0; - this.field1335 = new float[VorbisSample_blockSize1]; + this.field1353 = 0; + this.field1374 = new float[VorbisSample_blockSize1]; this.samples = new byte[this.sampleCount]; - this.field1349 = 0; - this.field1347 = 0; + this.field1373 = 0; + this.field1344 = 0; } - for (; this.field1347 < this.field1317.length; ++this.field1347) { + for (; this.field1344 < this.field1359.length; ++this.field1344) { if (var1 != null && var1[0] <= 0) { return null; } - float[] var2 = this.method2371(this.field1347); + float[] var2 = this.method2425(this.field1344); if (var2 != null) { - int var3 = this.field1349; + int var3 = this.field1373; int var4 = var2.length; if (var4 > this.sampleCount - var3) { var4 = this.sampleCount - var3; @@ -437,21 +437,21 @@ public class VorbisSample extends Node { } if (var1 != null) { - var1[0] -= var3 - this.field1349; + var1[0] -= var3 - this.field1373; } - this.field1349 = var3; + this.field1373 = var3; } } - this.field1335 = null; + this.field1374 = null; byte[] var7 = this.samples; this.samples = null; - return new RawSound(this.sampleRate, var7, this.start, this.end, this.field1324); + return new RawSound(this.sampleRate, var7, this.start, this.end, this.field1346); } } - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("float32Unpack") static float float32Unpack(int var0) { int var1 = var0 & 2097151; @@ -464,7 +464,7 @@ public class VorbisSample extends Node { return (float)((double)var1 * Math.pow(2.0D, (double)(var3 - 788))); } - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("VorbisSample_setData") static void VorbisSample_setData(byte[] var0, int var1) { VorbisSample_bytes = var0; @@ -472,7 +472,7 @@ public class VorbisSample extends Node { VorbisSample_bitOffset = 0; } - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("readBit") static int readBit() { int var0 = VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & 1; @@ -482,7 +482,7 @@ public class VorbisSample extends Node { return var0; } - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("readBits") static int readBits(int var0) { int var1 = 0; @@ -507,12 +507,12 @@ public class VorbisSample extends Node { return var1; } - @ObfuscatedName("b") - static void method2370(byte[] var0) { + @ObfuscatedName("g") + static void method2424(byte[] var0) { VorbisSample_setData(var0, 0); VorbisSample_blockSize0 = 1 << readBits(4); VorbisSample_blockSize1 = 1 << readBits(4); - field1327 = new float[VorbisSample_blockSize1]; + field1363 = new float[VorbisSample_blockSize1]; int var1; int var2; @@ -531,46 +531,37 @@ public class VorbisSample extends Node { var6[var7 * 2 + 1] = -((float)Math.sin((double)(var7 * 4) * 3.141592653589793D / (double)var2)); } - float[] var18 = new float[var3]; + float[] var12 = new float[var3]; for (int var8 = 0; var8 < var4; ++var8) { - var18[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); - var18[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); + var12[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); + var12[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); } - float[] var19 = new float[var4]; + float[] var13 = new float[var4]; for (int var9 = 0; var9 < var5; ++var9) { - var19[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2); - var19[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2)); + var13[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2); + var13[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2)); } - int[] var20 = new int[var5]; - int var10 = Frames.iLog(var5 - 1); + int[] var14 = new int[var5]; + int var10 = CollisionMap.iLog(var5 - 1); for (int var11 = 0; var11 < var5; ++var11) { - int var15 = var11; - int var16 = var10; - - int var17; - for (var17 = 0; var16 > 0; --var16) { - var17 = var17 << 1 | var15 & 1; - var15 >>>= 1; - } - - var20[var11] = var17; + var14[var11] = Widget.method4119(var11, var10); } if (var1 != 0) { - field1343 = var6; - field1320 = var18; - field1345 = var19; - field1339 = var20; + field1367 = var6; + field1368 = var12; + field1369 = var13; + field1371 = var14; } else { - field1340 = var6; - field1341 = var18; - field1342 = var19; - field1346 = var20; + field1364 = var6; + field1341 = var12; + field1357 = var13; + field1370 = var14; } } @@ -612,40 +603,40 @@ public class VorbisSample extends Node { VorbisSample_blockFlags = new boolean[var5]; VorbisSample_mapping = new int[var5]; - for (int var21 = 0; var21 < var5; ++var21) { - VorbisSample_blockFlags[var21] = readBit() != 0; + for (int var15 = 0; var15 < var5; ++var15) { + VorbisSample_blockFlags[var15] = readBit() != 0; readBits(16); readBits(16); - VorbisSample_mapping[var21] = readBits(8); + VorbisSample_mapping[var15] = readBits(8); } } - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(Lhz;)Z" + signature = "(Lii;)Z" ) - static boolean method2372(AbstractArchive var0) { - if (!field1334) { + static boolean method2450(AbstractArchive var0) { + if (!field1362) { byte[] var1 = var0.takeFile(0, 0); if (var1 == null) { return false; } - method2370(var1); - field1334 = true; + method2424(var1); + field1362 = true; } return true; } - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lhz;II)Lci;" + signature = "(Lii;II)Lcj;" ) @Export("readMusicSample") static VorbisSample readMusicSample(AbstractArchive var0, int var1, int var2) { - if (!method2372(var0)) { + if (!method2450(var0)) { var0.tryLoadFile(var1, var2); return null; } else { diff --git a/runescape-client/src/main/java/WallDecoration.java b/runescape-client/src/main/java/WallDecoration.java index 66bf2c5f5b..cbbc6b242c 100644 --- a/runescape-client/src/main/java/WallDecoration.java +++ b/runescape-client/src/main/java/WallDecoration.java @@ -3,73 +3,74 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ee") +@ObfuscatedName("en") @Implements("WallDecoration") public final class WallDecoration { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1682517589 + intValue = 1358140077 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 835715707 + intValue = 915149021 ) @Export("x") int x; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 196779483 + intValue = 357564416 ) @Export("y") int y; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1668025043 + intValue = -696517801 ) @Export("orientation") int orientation; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -36455913 + intValue = 748186775 ) @Export("orientation2") int orientation2; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1853023359 + intValue = 1886905411 ) @Export("xOffset") int xOffset; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1490962747 + intValue = -275876635 ) @Export("yOffset") int yOffset; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Lep;" + signature = "Leq;" ) @Export("entity1") public Entity entity1; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lep;" + signature = "Leq;" ) @Export("entity2") public Entity entity2; - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedGetter( - longValue = 7500452750327667815L + longValue = 1621741553403153851L ) @Export("tag") public long tag; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -265932947 + intValue = -183294239 ) @Export("flags") int flags; @@ -78,4 +79,65 @@ public final class WallDecoration { this.tag = 0L; this.flags = 0; } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(Lkp;I)Ljava/lang/String;", + garbageValue = "267409657" + ) + public static String method3356(Buffer var0) { + return method3358(var0, 32767); + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "(Lkp;II)Ljava/lang/String;", + garbageValue = "149938652" + ) + static String method3358(Buffer var0, int var1) { + try { + int var2 = var0.readUShortSmart(); + if (var2 > var1) { + var2 = var1; + } + + byte[] var3 = new byte[var2]; + var0.offset += class210.huffman.decompress(var0.array, var0.offset, var3, 0, var2); + String var4 = ScriptFrame.decodeStringCp1252(var3, 0, var2); + return var4; + } catch (Exception var6) { + return "Cabbage"; + } + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "777331787" + ) + public static void method3359() { + WorldMapElement.WorldMapElement_cachedSprites.clear(); + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + signature = "(ILce;ZI)I", + garbageValue = "2015482933" + ) + static int method3357(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.SOUND_SYNTH) { + class320.Interpreter_intStackSize -= 3; + AbstractWorldMapIcon.queueSoundEffect(Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 2]); + return 1; + } else if (var0 == ScriptOpcodes.SOUND_SONG) { + BufferedSink.playSong(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); + return 1; + } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { + class320.Interpreter_intStackSize -= 2; + class49.playSoundJingle(Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]); + return 1; + } else { + return 2; + } + } } diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index cf1d9aa78f..fb5d1fede8 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -4,688 +4,679 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ha") +@ObfuscatedName("hn") @Implements("Widget") public class Widget extends Node { - @ObfuscatedName("x") - @Export("Widget_loadedInterfaces") - static boolean[] Widget_loadedInterfaces; - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "Lhz;" - ) - @Export("Widget_modelsArchive") - static AbstractArchive Widget_modelsArchive; @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("Widget_cachedSprites") - public static EvictingDualNodeHashTable Widget_cachedSprites; - @ObfuscatedName("k") + static EvictingDualNodeHashTable Widget_cachedSprites; + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("Widget_cachedModels") - public static EvictingDualNodeHashTable Widget_cachedModels; - @ObfuscatedName("s") + static EvictingDualNodeHashTable Widget_cachedModels; + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("Widget_cachedFonts") - public static EvictingDualNodeHashTable Widget_cachedFonts; - @ObfuscatedName("l") + static EvictingDualNodeHashTable Widget_cachedFonts; + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("Widget_cachedSpriteMasks") - public static EvictingDualNodeHashTable Widget_cachedSpriteMasks; - @ObfuscatedName("t") - public static boolean field2549; - @ObfuscatedName("j") + static EvictingDualNodeHashTable Widget_cachedSpriteMasks; + @ObfuscatedName("k") + public static boolean field2697; + @ObfuscatedName("q") @Export("isIf3") public boolean isIf3; - @ObfuscatedName("n") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1299476265 + intValue = 966798893 ) @Export("id") public int id; - @ObfuscatedName("u") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -433623057 + intValue = -637939151 ) @Export("childIndex") public int childIndex; - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 169687735 + intValue = -1589308129 ) @Export("type") public int type; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1927968519 + intValue = -480153267 ) @Export("buttonType") public int buttonType; - @ObfuscatedName("m") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -300120459 + intValue = 1797201679 ) @Export("contentType") public int contentType; - @ObfuscatedName("g") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 526386257 + intValue = 488943743 ) @Export("xAlignment") public int xAlignment; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -881640361 + intValue = 77257793 ) @Export("yAlignment") public int yAlignment; - @ObfuscatedName("q") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1294049187 + intValue = -1510245031 ) @Export("widthAlignment") public int widthAlignment; - @ObfuscatedName("aa") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 282021115 + intValue = -1453424457 ) @Export("heightAlignment") public int heightAlignment; - @ObfuscatedName("av") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 1359404571 + intValue = -817220413 ) @Export("rawX") public int rawX; - @ObfuscatedName("aw") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 426334007 + intValue = -1957231607 ) @Export("rawY") public int rawY; - @ObfuscatedName("as") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 477325163 + intValue = 298003119 ) @Export("rawWidth") public int rawWidth; - @ObfuscatedName("ak") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -365864037 + intValue = -270154123 ) @Export("rawHeight") public int rawHeight; @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -2146904513 + intValue = 2093770327 ) @Export("x") public int x; - @ObfuscatedName("ah") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -787900839 + intValue = -227555657 ) @Export("y") public int y; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = 372029795 + intValue = -1253665371 ) @Export("width") public int width; - @ObfuscatedName("ao") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -1882269787 + intValue = -476310133 ) @Export("height") public int height; - @ObfuscatedName("an") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -1726055513 + intValue = -605973757 ) - public int field2617; - @ObfuscatedName("ar") + public int field2589; + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 227763001 + intValue = 955244305 ) - public int field2569; - @ObfuscatedName("az") + public int field2590; + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -782776051 + intValue = 1653380789 ) @Export("parentId") public int parentId; - @ObfuscatedName("ay") + @ObfuscatedName("aw") @Export("isHidden") public boolean isHidden; - @ObfuscatedName("ag") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 1944956525 + intValue = 536473649 ) @Export("scrollX") public int scrollX; - @ObfuscatedName("ac") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -405454075 + intValue = -612088835 ) @Export("scrollY") public int scrollY; @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -1082844581 + intValue = 559224257 ) @Export("scrollWidth") public int scrollWidth; - @ObfuscatedName("ae") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 557803519 + intValue = -193403105 ) @Export("scrollHeight") public int scrollHeight; - @ObfuscatedName("ad") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -1855119185 + intValue = -1950193909 ) @Export("color") public int color; - @ObfuscatedName("aj") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 1166086105 + intValue = -518404755 ) @Export("color2") public int color2; - @ObfuscatedName("ax") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 1149435031 + intValue = 277012843 ) @Export("mouseOverColor") public int mouseOverColor; - @ObfuscatedName("at") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -1092901165 + intValue = 699027547 ) @Export("mouseOverColor2") public int mouseOverColor2; - @ObfuscatedName("af") + @ObfuscatedName("ag") @Export("fill") public boolean fill; - @ObfuscatedName("ap") + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "Llg;" + signature = "Llf;" ) @Export("fillMode") public FillMode fillMode; - @ObfuscatedName("ai") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -808988025 + intValue = -2036464857 ) @Export("transparencyTop") public int transparencyTop; - @ObfuscatedName("am") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -2007030025 + intValue = -1652123329 ) @Export("transparencyBot") public int transparencyBot; - @ObfuscatedName("ab") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = 567629033 + intValue = -74460937 ) @Export("lineWid") public int lineWid; - @ObfuscatedName("bj") - public boolean field2676; - @ObfuscatedName("bg") + @ObfuscatedName("bq") + public boolean field2606; + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = 161600005 + intValue = 1818205057 ) @Export("spriteId2") public int spriteId2; - @ObfuscatedName("bw") + @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = 754156307 + intValue = 1993820815 ) @Export("spriteId") public int spriteId; @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = 515570621 + intValue = 2121453977 ) @Export("spriteAngle") public int spriteAngle; - @ObfuscatedName("bl") + @ObfuscatedName("bb") @Export("spriteTiling") public boolean spriteTiling; - @ObfuscatedName("bq") + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = -469270917 + intValue = 254544941 ) @Export("outline") public int outline; - @ObfuscatedName("bx") + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = 150600095 + intValue = -360859493 ) @Export("spriteShadow") public int spriteShadow; - @ObfuscatedName("bc") + @ObfuscatedName("bl") @Export("spriteFlipV") public boolean spriteFlipV; @ObfuscatedName("by") @Export("spriteFlipH") public boolean spriteFlipH; - @ObfuscatedName("bz") + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = -807433521 + intValue = 1914949917 ) @Export("modelType") public int modelType; - @ObfuscatedName("bm") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = -1129211799 + intValue = 1077227953 ) @Export("modelId") public int modelId; - @ObfuscatedName("bo") + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = 1125389583 + intValue = -1140271877 ) @Export("modelType2") int modelType2; - @ObfuscatedName("bs") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = -392341679 + intValue = 2003629181 ) @Export("modelId2") int modelId2; - @ObfuscatedName("ba") + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = 309774183 + intValue = -240596143 ) @Export("sequenceId") public int sequenceId; - @ObfuscatedName("bn") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = 942088921 + intValue = 1235474681 ) @Export("sequenceId2") public int sequenceId2; - @ObfuscatedName("bb") + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = -85793983 + intValue = -940655057 ) @Export("modelOffsetX") public int modelOffsetX; - @ObfuscatedName("bh") + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = 41223313 + intValue = -1529824909 ) @Export("modelOffsetY") public int modelOffsetY; - @ObfuscatedName("bv") + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = -1935540911 + intValue = 2062525789 ) @Export("modelAngleX") public int modelAngleX; - @ObfuscatedName("bu") + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = 1626422203 + intValue = -1899528959 ) @Export("modelAngleY") public int modelAngleY; - @ObfuscatedName("be") + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = -1986701179 + intValue = -844495371 ) @Export("modelAngleZ") public int modelAngleZ; - @ObfuscatedName("bd") + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = -2039159593 + intValue = -950068119 ) @Export("modelZoom") public int modelZoom; - @ObfuscatedName("bf") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = 558694563 + intValue = 291649371 ) - public int field2645; - @ObfuscatedName("bi") + public int field2627; + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = -1622987205 + intValue = -233029925 ) - public int field2607; - @ObfuscatedName("br") + public int field2696; + @ObfuscatedName("bv") @Export("modelOrthog") public boolean modelOrthog; - @ObfuscatedName("bt") + @ObfuscatedName("bo") @Export("modelTransparency") public boolean modelTransparency; - @ObfuscatedName("bp") + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = 1456776345 + intValue = -55381355 ) @Export("itemQuantityMode") public int itemQuantityMode; - @ObfuscatedName("co") + @ObfuscatedName("cp") @ObfuscatedGetter( - intValue = -600879771 + intValue = 364892773 ) @Export("fontId") public int fontId; - @ObfuscatedName("cp") + @ObfuscatedName("cg") @Export("text") public String text; - @ObfuscatedName("cd") + @ObfuscatedName("cr") @Export("text2") public String text2; - @ObfuscatedName("cj") + @ObfuscatedName("co") @ObfuscatedGetter( - intValue = -1209305235 + intValue = 252801441 ) @Export("textLineHeight") public int textLineHeight; - @ObfuscatedName("cq") + @ObfuscatedName("ck") @ObfuscatedGetter( - intValue = -188667201 + intValue = 17386837 ) @Export("textXAlignment") public int textXAlignment; - @ObfuscatedName("cb") + @ObfuscatedName("cn") @ObfuscatedGetter( - intValue = -116044435 + intValue = 1637258997 ) @Export("textYAlignment") public int textYAlignment; - @ObfuscatedName("cf") + @ObfuscatedName("cd") @Export("textShadowed") public boolean textShadowed; - @ObfuscatedName("cs") + @ObfuscatedName("ct") @ObfuscatedGetter( - intValue = -573415153 + intValue = 1431326299 ) @Export("paddingX") public int paddingX; - @ObfuscatedName("ch") + @ObfuscatedName("cb") @ObfuscatedGetter( - intValue = 1908229703 + intValue = -174543693 ) @Export("paddingY") public int paddingY; - @ObfuscatedName("ca") + @ObfuscatedName("cf") @Export("inventoryXOffsets") public int[] inventoryXOffsets; - @ObfuscatedName("cn") + @ObfuscatedName("cm") @Export("inventoryYOffsets") public int[] inventoryYOffsets; - @ObfuscatedName("cx") + @ObfuscatedName("cz") @Export("inventorySprites") public int[] inventorySprites; - @ObfuscatedName("ck") + @ObfuscatedName("cu") @Export("itemActions") public String[] itemActions; - @ObfuscatedName("ce") + @ObfuscatedName("cy") @ObfuscatedGetter( - intValue = -1025051947 + intValue = 1317072949 ) @Export("clickMask") public int clickMask; - @ObfuscatedName("cu") - public boolean field2625; - @ObfuscatedName("cg") - public byte[][] field2626; - @ObfuscatedName("ct") - public byte[][] field2629; - @ObfuscatedName("cm") - public int[] field2631; - @ObfuscatedName("cl") - public int[] field2670; - @ObfuscatedName("do") + @ObfuscatedName("ce") + public boolean field2646; + @ObfuscatedName("cw") + public byte[][] field2702; + @ObfuscatedName("cq") + public byte[][] field2648; + @ObfuscatedName("ch") + public int[] field2649; + @ObfuscatedName("cx") + public int[] field2560; + @ObfuscatedName("dm") @Export("dataText") public String dataText; - @ObfuscatedName("dk") + @ObfuscatedName("dw") @Export("actions") public String[] actions; - @ObfuscatedName("dx") + @ObfuscatedName("ds") @ObfuscatedSignature( - signature = "Lha;" + signature = "Lhn;" ) @Export("parent") public Widget parent; - @ObfuscatedName("de") + @ObfuscatedName("dl") @ObfuscatedGetter( - intValue = 1517424383 + intValue = 185265687 ) @Export("dragZoneSize") public int dragZoneSize; - @ObfuscatedName("df") + @ObfuscatedName("dv") @ObfuscatedGetter( - intValue = -1198293361 + intValue = -1309236317 ) @Export("dragThreshold") public int dragThreshold; - @ObfuscatedName("di") + @ObfuscatedName("do") @Export("isScrollBar") public boolean isScrollBar; - @ObfuscatedName("dr") + @ObfuscatedName("di") @Export("spellActionName") public String spellActionName; - @ObfuscatedName("dg") + @ObfuscatedName("dc") @Export("hasListener") public boolean hasListener; - @ObfuscatedName("dh") + @ObfuscatedName("dj") @Export("onLoad") public Object[] onLoad; - @ObfuscatedName("dl") + @ObfuscatedName("de") @Export("onClick") public Object[] onClick; - @ObfuscatedName("da") + @ObfuscatedName("df") @Export("onClickRepeat") public Object[] onClickRepeat; - @ObfuscatedName("dp") + @ObfuscatedName("dn") @Export("onRelease") public Object[] onRelease; - @ObfuscatedName("ds") + @ObfuscatedName("dy") @Export("onHold") public Object[] onHold; - @ObfuscatedName("db") + @ObfuscatedName("dq") @Export("onMouseOver") public Object[] onMouseOver; - @ObfuscatedName("dn") + @ObfuscatedName("dd") @Export("onMouseRepeat") public Object[] onMouseRepeat; - @ObfuscatedName("dt") + @ObfuscatedName("dr") @Export("onMouseLeave") public Object[] onMouseLeave; - @ObfuscatedName("dc") + @ObfuscatedName("dk") @Export("onDrag") public Object[] onDrag; - @ObfuscatedName("dd") + @ObfuscatedName("dg") @Export("onDragComplete") public Object[] onDragComplete; - @ObfuscatedName("dv") + @ObfuscatedName("dt") @Export("onTargetEnter") public Object[] onTargetEnter; @ObfuscatedName("du") @Export("onTargetLeave") public Object[] onTargetLeave; - @ObfuscatedName("dq") + @ObfuscatedName("db") @Export("onVarTransmit") public Object[] onVarTransmit; - @ObfuscatedName("dj") + @ObfuscatedName("dh") @Export("varTransmitTriggers") public int[] varTransmitTriggers; - @ObfuscatedName("dy") + @ObfuscatedName("dz") @Export("onInvTransmit") public Object[] onInvTransmit; - @ObfuscatedName("dw") + @ObfuscatedName("dx") @Export("invTransmitTriggers") public int[] invTransmitTriggers; - @ObfuscatedName("dz") + @ObfuscatedName("da") @Export("onStatTransmit") public Object[] onStatTransmit; - @ObfuscatedName("dm") + @ObfuscatedName("dp") @Export("statTransmitTriggers") public int[] statTransmitTriggers; - @ObfuscatedName("et") + @ObfuscatedName("ey") @Export("onTimer") public Object[] onTimer; - @ObfuscatedName("ef") + @ObfuscatedName("ee") @Export("onOp") public Object[] onOp; - @ObfuscatedName("ek") + @ObfuscatedName("ec") @Export("onScroll") public Object[] onScroll; - @ObfuscatedName("ej") + @ObfuscatedName("em") @Export("onChatTransmit") public Object[] onChatTransmit; - @ObfuscatedName("ew") + @ObfuscatedName("el") @Export("onKey") public Object[] onKey; - @ObfuscatedName("ep") + @ObfuscatedName("eq") @Export("onFriendTransmit") public Object[] onFriendTransmit; - @ObfuscatedName("er") + @ObfuscatedName("eu") @Export("onClanTransmit") public Object[] onClanTransmit; - @ObfuscatedName("es") + @ObfuscatedName("et") @Export("onMiscTransmit") public Object[] onMiscTransmit; - @ObfuscatedName("eq") + @ObfuscatedName("es") @Export("onDialogAbort") public Object[] onDialogAbort; - @ObfuscatedName("ev") + @ObfuscatedName("ep") @Export("onSubChange") public Object[] onSubChange; - @ObfuscatedName("en") + @ObfuscatedName("er") @Export("onResize") public Object[] onResize; - @ObfuscatedName("ee") + @ObfuscatedName("en") @Export("onStockTransmit") public Object[] onStockTransmit; - @ObfuscatedName("el") - public Object[] field2562; - @ObfuscatedName("eo") + @ObfuscatedName("ea") + public Object[] field2674; + @ObfuscatedName("ei") @Export("cs1Instructions") public int[][] cs1Instructions; - @ObfuscatedName("ex") + @ObfuscatedName("eg") @Export("cs1Comparisons") public int[] cs1Comparisons; - @ObfuscatedName("ei") + @ObfuscatedName("eh") @Export("cs1ComparisonValues") public int[] cs1ComparisonValues; - @ObfuscatedName("eg") + @ObfuscatedName("ev") @ObfuscatedGetter( - intValue = -131581019 + intValue = -855026753 ) @Export("mouseOverRedirect") public int mouseOverRedirect; - @ObfuscatedName("ec") + @ObfuscatedName("eb") @Export("spellName") public String spellName; - @ObfuscatedName("eh") + @ObfuscatedName("ef") @Export("buttonText") public String buttonText; - @ObfuscatedName("eu") + @ObfuscatedName("ek") @Export("itemIds") public int[] itemIds; - @ObfuscatedName("ea") + @ObfuscatedName("ej") @Export("itemQuantities") public int[] itemQuantities; @ObfuscatedName("ez") @ObfuscatedGetter( - intValue = 1299822723 + intValue = 145382301 ) @Export("itemId") public int itemId; - @ObfuscatedName("ed") + @ObfuscatedName("eo") @ObfuscatedGetter( - intValue = 1473504869 + intValue = -833257617 ) @Export("itemQuantity") public int itemQuantity; - @ObfuscatedName("ey") + @ObfuscatedName("ex") @ObfuscatedGetter( - intValue = 1336103723 + intValue = 835608255 ) @Export("modelFrame") public int modelFrame; - @ObfuscatedName("eb") + @ObfuscatedName("ew") @ObfuscatedGetter( - intValue = 699084427 + intValue = -925535589 ) @Export("modelFrameCycle") public int modelFrameCycle; - @ObfuscatedName("em") + @ObfuscatedName("ed") @ObfuscatedSignature( - signature = "[Lha;" + signature = "[Lhn;" ) @Export("children") public Widget[] children; - @ObfuscatedName("fd") + @ObfuscatedName("fl") @Export("containsMouse") public boolean containsMouse; - @ObfuscatedName("ff") + @ObfuscatedName("fp") @Export("isClicked") public boolean isClicked; - @ObfuscatedName("fe") + @ObfuscatedName("fx") @ObfuscatedGetter( - intValue = -871911491 + intValue = -1014136325 ) - public int field2583; - @ObfuscatedName("fk") + public int field2705; + @ObfuscatedName("fs") @ObfuscatedGetter( - intValue = 629520423 + intValue = 2094586807 ) - public int field2685; - @ObfuscatedName("fv") + public int field2706; + @ObfuscatedName("fn") @ObfuscatedGetter( - intValue = 1203722621 + intValue = -1366369507 ) - public int field2686; - @ObfuscatedName("fo") + public int field2570; + @ObfuscatedName("fh") @ObfuscatedGetter( - intValue = -1940308273 + intValue = -668838765 ) - public int field2687; - @ObfuscatedName("fq") + public int field2708; + @ObfuscatedName("fb") @ObfuscatedGetter( - intValue = 1802978635 + intValue = 604114463 ) @Export("rootIndex") public int rootIndex; - @ObfuscatedName("fn") + @ObfuscatedName("fz") @ObfuscatedGetter( - intValue = 1843642963 + intValue = -1831666503 ) @Export("cycle") public int cycle; - @ObfuscatedName("fy") - public int[] field2655; - @ObfuscatedName("fu") + @ObfuscatedName("fj") + public int[] field2711; + @ObfuscatedName("fw") @Export("noClickThrough") public boolean noClickThrough; - @ObfuscatedName("fl") + @ObfuscatedName("ff") @Export("noScrollThrough") public boolean noScrollThrough; - @ObfuscatedName("fr") - public boolean field2602; + @ObfuscatedName("fm") + public boolean field2713; static { Widget_cachedSprites = new EvictingDualNodeHashTable(200); Widget_cachedModels = new EvictingDualNodeHashTable(50); Widget_cachedFonts = new EvictingDualNodeHashTable(20); Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(8); - field2549 = false; + field2697 = false; } public Widget() { @@ -706,8 +697,8 @@ public class Widget extends Node { this.y = 0; this.width = 0; this.height = 0; - this.field2617 = 1; - this.field2569 = 1; + this.field2589 = 1; + this.field2590 = 1; this.parentId = -1; this.isHidden = false; this.scrollX = 0; @@ -723,7 +714,7 @@ public class Widget extends Node { this.transparencyTop = 0; this.transparencyBot = 0; this.lineWid = 1; - this.field2676 = false; + this.field2606 = false; this.spriteId2 = -1; this.spriteId = -1; this.spriteAngle = 0; @@ -742,8 +733,8 @@ public class Widget extends Node { this.modelAngleY = 0; this.modelAngleZ = 0; this.modelZoom = 100; - this.field2645 = 0; - this.field2607 = 0; + this.field2627 = 0; + this.field2696 = 0; this.modelOrthog = false; this.modelTransparency = false; this.itemQuantityMode = 2; @@ -757,7 +748,7 @@ public class Widget extends Node { this.paddingX = 0; this.paddingY = 0; this.clickMask = 0; - this.field2625 = false; + this.field2646 = false; this.dataText = ""; this.parent = null; this.dragZoneSize = 0; @@ -774,21 +765,21 @@ public class Widget extends Node { this.modelFrameCycle = 0; this.containsMouse = false; this.isClicked = false; - this.field2583 = -1; - this.field2685 = 0; - this.field2686 = 0; - this.field2687 = 0; + this.field2705 = -1; + this.field2706 = 0; + this.field2570 = 0; + this.field2708 = 0; this.rootIndex = -1; this.cycle = -1; this.noClickThrough = false; this.noScrollThrough = false; - this.field2602 = false; + this.field2713 = false; } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lkq;I)V", - garbageValue = "-1975844484" + signature = "(Lkp;I)V", + garbageValue = "-1287824768" ) @Export("decodeLegacy") void decodeLegacy(Buffer var1) { @@ -856,7 +847,7 @@ public class Widget extends Node { } if (this.type == 2) { - this.itemIds = new int[this.rawWidth * this.rawHeight]; + this.itemIds = new int[this.rawHeight * this.rawWidth]; this.itemQuantities = new int[this.rawWidth * this.rawHeight]; var4 = var1.readUnsignedByte(); if (var4 == 1) { @@ -1042,10 +1033,10 @@ public class Widget extends Node { } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lkq;B)V", - garbageValue = "-13" + signature = "(Lkp;I)V", + garbageValue = "2093742106" ) @Export("decode") void decode(Buffer var1) { @@ -1112,7 +1103,7 @@ public class Widget extends Node { this.modelOrthog = var1.readUnsignedByte() == 1; var1.readUnsignedShort(); if (this.widthAlignment != 0) { - this.field2645 = var1.readUnsignedShort(); + this.field2627 = var1.readUnsignedShort(); } if (this.heightAlignment != 0) { @@ -1143,7 +1134,7 @@ public class Widget extends Node { if (this.type == 9) { this.lineWid = var1.readUnsignedByte(); this.color = var1.readInt(); - this.field2676 = var1.readUnsignedByte() == 1; + this.field2606 = var1.readUnsignedByte() == 1; } this.clickMask = var1.readMedium(); @@ -1184,10 +1175,10 @@ public class Widget extends Node { this.statTransmitTriggers = this.readListenerTriggers(var1); } - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(Lkq;B)[Ljava/lang/Object;", - garbageValue = "19" + signature = "(Lkp;I)[Ljava/lang/Object;", + garbageValue = "2009798278" ) @Export("readListener") Object[] readListener(Buffer var1) { @@ -1211,10 +1202,10 @@ public class Widget extends Node { } } - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkq;I)[I", - garbageValue = "-417686868" + signature = "(Lkp;I)[I", + garbageValue = "1361123043" ) @Export("readListenerTriggers") int[] readListenerTriggers(Buffer var1) { @@ -1232,10 +1223,10 @@ public class Widget extends Node { } } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "1303509958" + signature = "(IIB)V", + garbageValue = "-16" ) @Export("swapItems") public void swapItems(int var1, int var2) { @@ -1247,14 +1238,14 @@ public class Widget extends Node { this.itemQuantities[var1] = var3; } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(ZB)Lls;", - garbageValue = "-9" + signature = "(ZB)Llt;", + garbageValue = "50" ) @Export("getSprite") public Sprite getSprite(boolean var1) { - field2549 = false; + field2697 = false; int var2; if (var1) { var2 = this.spriteId; @@ -1270,9 +1261,9 @@ public class Widget extends Node { if (var5 != null) { return var5; } else { - var5 = FloorUnderlayDefinition.SpriteBuffer_getSprite(BoundaryObject.Widget_spritesArchive, var2, 0); + var5 = WorldMapSection1.SpriteBuffer_getSprite(Username.Widget_spritesArchive, var2, 0); if (var5 == null) { - field2549 = true; + field2697 = true; return null; } else { if (this.spriteFlipV) { @@ -1306,14 +1297,14 @@ public class Widget extends Node { } } - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedSignature( signature = "(I)Lko;", - garbageValue = "-2105081267" + garbageValue = "-700257512" ) @Export("getFont") public Font getFont() { - field2549 = false; + field2697 = false; if (this.fontId == -1) { return null; } else { @@ -1321,11 +1312,11 @@ public class Widget extends Node { if (var1 != null) { return var1; } else { - var1 = class14.method160(BoundaryObject.Widget_spritesArchive, MilliClock.Widget_fontsArchive, this.fontId, 0); + var1 = FaceNormal.method3335(Username.Widget_spritesArchive, class162.Widget_fontsArchive, this.fontId, 0); if (var1 != null) { Widget_cachedFonts.put(var1, (long)this.fontId); } else { - field2549 = true; + field2697 = true; } return var1; @@ -1333,14 +1324,14 @@ public class Widget extends Node { } } - @ObfuscatedName("l") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(II)Lls;", - garbageValue = "517596117" + signature = "(II)Llt;", + garbageValue = "610412077" ) @Export("getInventorySprite") public Sprite getInventorySprite(int var1) { - field2549 = false; + field2697 = false; if (var1 >= 0 && var1 < this.inventorySprites.length) { int var2 = this.inventorySprites[var1]; if (var2 == -1) { @@ -1350,11 +1341,11 @@ public class Widget extends Node { if (var3 != null) { return var3; } else { - var3 = FloorUnderlayDefinition.SpriteBuffer_getSprite(BoundaryObject.Widget_spritesArchive, var2, 0); + var3 = WorldMapSection1.SpriteBuffer_getSprite(Username.Widget_spritesArchive, var2, 0); if (var3 != null) { Widget_cachedSprites.put(var3, (long)var2); } else { - field2549 = true; + field2697 = true; } return var3; @@ -1365,14 +1356,14 @@ public class Widget extends Node { } } - @ObfuscatedName("t") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Liv;IZLhh;I)Ldw;", - garbageValue = "-3726019" + signature = "(Lip;IZLhp;I)Ldx;", + garbageValue = "-1566575380" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerAppearance var4) { - field2549 = false; + field2697 = false; int var5; int var6; if (var3) { @@ -1392,9 +1383,9 @@ public class Widget extends Node { if (var7 == null) { ModelData var8; if (var5 == 1) { - var8 = ModelData.ModelData_get(Widget_modelsArchive, var6, 0); + var8 = ModelData.ModelData_get(Calendar.Widget_modelsArchive, var6, 0); if (var8 == null) { - field2549 = true; + field2697 = true; return null; } @@ -1402,9 +1393,9 @@ public class Widget extends Node { } if (var5 == 2) { - var8 = AbstractUserComparator.getNpcDefinition(var6).getModelData(); + var8 = NetCache.getNpcDefinition(var6).getModelData(); if (var8 == null) { - field2549 = true; + field2697 = true; return null; } @@ -1418,7 +1409,7 @@ public class Widget extends Node { var8 = var4.getModelData(); if (var8 == null) { - field2549 = true; + field2697 = true; return null; } @@ -1426,14 +1417,14 @@ public class Widget extends Node { } if (var5 == 4) { - ItemDefinition var9 = PacketBufferNode.ItemDefinition_get(var6); + ItemDefinition var9 = HealthBarDefinition.ItemDefinition_get(var6); var8 = var9.getModelData(10); if (var8 == null) { - field2549 = true; + field2697 = true; return null; } - var7 = var8.toModel(var9.ambient + 64, var9.contrast * 5 + 768, -50, -10, -50); + var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50); } Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); @@ -1447,10 +1438,10 @@ public class Widget extends Node { } } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(ZB)Lhy;", - garbageValue = "127" + signature = "(ZI)Lhf;", + garbageValue = "-1393385488" ) @Export("getSpriteMask") public SpriteMask getSpriteMask(boolean var1) { @@ -1462,7 +1453,7 @@ public class Widget extends Node { if (var2 == -1) { return null; } else { - long var3 = ((long)this.spriteShadow << 40) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipV ? 1L : 0L) << 38) + ((this.spriteFlipH ? 1L : 0L) << 39); + long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipV ? 1L : 0L) << 38); SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); if (var5 != null) { return var5; @@ -1506,10 +1497,10 @@ public class Widget extends Node { } } - @ObfuscatedName("n") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(ILjava/lang/String;I)V", - garbageValue = "1803915534" + signature = "(ILjava/lang/String;B)V", + garbageValue = "121" ) @Export("setAction") public void setAction(int var1, String var2) { @@ -1526,4 +1517,19 @@ public class Widget extends Node { this.actions[var1] = var2; } + + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "(III)I", + garbageValue = "-855485303" + ) + public static int method4119(int var0, int var1) { + int var2; + for (var2 = 0; var1 > 0; --var1) { + var2 = var2 << 1 | var0 & 1; + var0 >>>= 1; + } + + return var2; + } } diff --git a/runescape-client/src/main/java/World.java b/runescape-client/src/main/java/World.java index cbf77f79e5..51d06a88db 100644 --- a/runescape-client/src/main/java/World.java +++ b/runescape-client/src/main/java/World.java @@ -4,60 +4,66 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("be") +@ObfuscatedName("bg") @Implements("World") public class World { - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1287165751 + intValue = -1866587551 ) @Export("World_count") static int World_count; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 583854419 + intValue = 1158665881 ) @Export("World_listCount") static int World_listCount; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("World_sortOption2") static int[] World_sortOption2; - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("World_sortOption1") static int[] World_sortOption1; - @ObfuscatedName("c") + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Leg;" + ) + @Export("World_request") + static UrlRequest World_request; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1519088655 + intValue = 1411281577 ) @Export("id") int id; - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1545527697 + intValue = 2119129825 ) @Export("properties") int properties; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1058065385 + intValue = 2120621835 ) @Export("population") int population; - @ObfuscatedName("k") + @ObfuscatedName("n") @Export("host") String host; - @ObfuscatedName("s") + @ObfuscatedName("x") @Export("activity") String activity; - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -511848303 + intValue = 1248235399 ) @Export("location") int location; - @ObfuscatedName("t") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1131143169 + intValue = 1361119187 ) @Export("index") int index; @@ -72,92 +78,200 @@ public class World { World() { } - @ObfuscatedName("a") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(S)Z", - garbageValue = "-26711" + signature = "(B)Z", + garbageValue = "1" ) @Export("isMembersOnly") boolean isMembersOnly() { return (1 & this.properties) != 0; } - @ObfuscatedName("d") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-1453157769" + signature = "(B)Z", + garbageValue = "36" ) - boolean method1782() { + boolean method1760() { return (2 & this.properties) != 0; } - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-2060131341" + garbageValue = "-764508558" ) @Export("isPvp") boolean isPvp() { return (4 & this.properties) != 0; } - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "1753772408" + garbageValue = "1545787389" ) - boolean method1780() { + boolean method1787() { return (8 & this.properties) != 0; } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "1313707308" + signature = "(B)Z", + garbageValue = "1" ) @Export("isDeadman") boolean isDeadman() { return (536870912 & this.properties) != 0; } - @ObfuscatedName("t") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1940654935" + garbageValue = "1183174451" ) @Export("isBeta") boolean isBeta() { return (33554432 & this.properties) != 0; } - @ObfuscatedName("j") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-44264871" + garbageValue = "1307940370" ) - boolean method1775() { + boolean method1767() { return (1073741824 & this.properties) != 0; } - @ObfuscatedName("i") + @ObfuscatedName("t") + static final void method1801(long var0) { + try { + Thread.sleep(var0); + } catch (InterruptedException var3) { + } + + } + + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IB)Lik;", - garbageValue = "20" + signature = "(IILfk;Lfv;I)Z", + garbageValue = "-186074271" ) - @Export("getEnum") - public static EnumDefinition getEnum(int var0) { - EnumDefinition var1 = (EnumDefinition)EnumDefinition.EnumDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = class286.EnumDefinition_archive.takeFile(8, var0); - var1 = new EnumDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); + public static final boolean method1770(int var0, int var1, RouteStrategy var2, CollisionMap var3) { + int var4 = var0; + int var5 = var1; + byte var6 = 64; + byte var7 = 64; + int var8 = var0 - var6; + int var9 = var1 - var7; + class173.directions[var6][var7] = 99; + class173.distances[var6][var7] = 0; + byte var10 = 0; + int var11 = 0; + class173.bufferX[var10] = var0; + byte var10001 = var10; + int var18 = var10 + 1; + class173.bufferY[var10001] = var1; + int[][] var12 = var3.flags; + + while (var18 != var11) { + var4 = class173.bufferX[var11]; + var5 = class173.bufferY[var11]; + var11 = var11 + 1 & 4095; + int var16 = var4 - var8; + int var17 = var5 - var9; + int var13 = var4 - var3.xInset; + int var14 = var5 - var3.yInset; + if (var2.hasArrived(2, var4, var5, var3)) { + ChatChannel.field1289 = var4; + class173.field2093 = var5; + return true; } - EnumDefinition.EnumDefinition_cached.put(var1, (long)var0); - return var1; + int var15 = class173.distances[var16][var17] + 1; + if (var16 > 0 && class173.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) { + class173.bufferX[var18] = var4 - 1; + class173.bufferY[var18] = var5; + var18 = var18 + 1 & 4095; + class173.directions[var16 - 1][var17] = 2; + class173.distances[var16 - 1][var17] = var15; + } + + if (var16 < 126 && class173.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) { + class173.bufferX[var18] = var4 + 1; + class173.bufferY[var18] = var5; + var18 = var18 + 1 & 4095; + class173.directions[var16 + 1][var17] = 8; + class173.distances[var16 + 1][var17] = var15; + } + + if (var17 > 0 && class173.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) { + class173.bufferX[var18] = var4; + class173.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class173.directions[var16][var17 - 1] = 1; + class173.distances[var16][var17 - 1] = var15; + } + + if (var17 < 126 && class173.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) { + class173.bufferX[var18] = var4; + class173.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class173.directions[var16][var17 + 1] = 4; + class173.distances[var16][var17 + 1] = var15; + } + + if (var16 > 0 && var17 > 0 && class173.directions[var16 - 1][var17 - 1] == 0 && (var12[var13 - 1][var14] & 19136830) == 0 && (var12[var13 - 1][var14 - 1] & 19136782) == 0 && (var12[var13][var14 - 1] & 19136911) == 0) { + class173.bufferX[var18] = var4 - 1; + class173.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class173.directions[var16 - 1][var17 - 1] = 3; + class173.distances[var16 - 1][var17 - 1] = var15; + } + + if (var16 < 126 && var17 > 0 && class173.directions[var16 + 1][var17 - 1] == 0 && (var12[var13 + 1][var14 - 1] & 19136911) == 0 && (var12[var13 + 2][var14 - 1] & 19136899) == 0 && (var12[var13 + 2][var14] & 19136995) == 0) { + class173.bufferX[var18] = var4 + 1; + class173.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class173.directions[var16 + 1][var17 - 1] = 9; + class173.distances[var16 + 1][var17 - 1] = var15; + } + + if (var16 > 0 && var17 < 126 && class173.directions[var16 - 1][var17 + 1] == 0 && (var12[var13 - 1][var14 + 1] & 19136830) == 0 && (var12[var13 - 1][var14 + 2] & 19136824) == 0 && (var12[var13][var14 + 2] & 19137016) == 0) { + class173.bufferX[var18] = var4 - 1; + class173.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class173.directions[var16 - 1][var17 + 1] = 6; + class173.distances[var16 - 1][var17 + 1] = var15; + } + + if (var16 < 126 && var17 < 126 && class173.directions[var16 + 1][var17 + 1] == 0 && (var12[var13 + 1][var14 + 2] & 19137016) == 0 && (var12[var13 + 2][var14 + 2] & 19136992) == 0 && (var12[var13 + 2][var14 + 1] & 19136995) == 0) { + class173.bufferX[var18] = var4 + 1; + class173.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class173.directions[var16 + 1][var17 + 1] = 12; + class173.distances[var16 + 1][var17 + 1] = var15; + } } + + ChatChannel.field1289 = var4; + class173.field2093 = var5; + return false; + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1273195728" + ) + static void method1762() { + if (UserComparator8.loadWorlds()) { + Login.worldSelectOpen = true; + Login.worldSelectPage = 0; + Login.worldSelectPagesCount = 0; + } + } } diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index e55595ca52..05860ddd98 100644 --- a/runescape-client/src/main/java/WorldMap.java +++ b/runescape-client/src/main/java/WorldMap.java @@ -10,42 +10,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ld") +@ObfuscatedName("ly") @Implements("WorldMap") public class WorldMap { - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lkk;" + signature = "Lkq;" ) @Export("fontNameVerdana11") static final FontName fontNameVerdana11; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lkk;" + signature = "Lkq;" ) @Export("fontNameVerdana13") static final FontName fontNameVerdana13; - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Lkk;" + signature = "Lkq;" ) @Export("fontNameVerdana15") static final FontName fontNameVerdana15; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) @Export("WorldMap_archive") AbstractArchive WorldMap_archive; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) @Export("WorldMap_geographyArchive") AbstractArchive WorldMap_geographyArchive; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) @Export("WorldMap_groundArchive") AbstractArchive WorldMap_groundArchive; @@ -55,235 +55,235 @@ public class WorldMap { ) @Export("font") Font font; - @ObfuscatedName("k") + @ObfuscatedName("n") @Export("fonts") HashMap fonts; - @ObfuscatedName("s") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "[Lli;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("l") + @ObfuscatedName("w") @Export("details") HashMap details; - @ObfuscatedName("t") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Laa;" + signature = "Lae;" ) @Export("mainMapArea") WorldMapArea mainMapArea; - @ObfuscatedName("j") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Laa;" + signature = "Lae;" ) @Export("currentMapArea") WorldMapArea currentMapArea; - @ObfuscatedName("n") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Laa;" + signature = "Lae;" ) - WorldMapArea field3959; - @ObfuscatedName("u") + WorldMapArea field3960; + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lar;" + signature = "Lak;" ) @Export("worldMapManager") WorldMapManager worldMapManager; - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Llm;" + signature = "Lle;" ) @Export("cacheLoader") WorldMapArchiveLoader cacheLoader; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 769697825 + intValue = 1749919679 ) @Export("centerTileX") int centerTileX; - @ObfuscatedName("m") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1650708007 + intValue = -1342348205 ) @Export("centerTileY") int centerTileY; - @ObfuscatedName("g") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1898318821 + intValue = 1704242359 ) @Export("worldMapTargetX") int worldMapTargetX; - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1415231623 + intValue = 492760155 ) @Export("worldMapTargetY") int worldMapTargetY; - @ObfuscatedName("q") + @ObfuscatedName("u") @Export("zoom") float zoom; - @ObfuscatedName("aa") + @ObfuscatedName("ae") @Export("zoomTarget") float zoomTarget; - @ObfuscatedName("av") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -1100831923 + intValue = 945465343 ) @Export("worldMapDisplayWidth") int worldMapDisplayWidth; - @ObfuscatedName("aw") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -480393575 + intValue = -1711866961 ) @Export("worldMapDisplayHeight") int worldMapDisplayHeight; - @ObfuscatedName("as") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -971268509 + intValue = 1490885125 ) @Export("worldMapDisplayX") int worldMapDisplayX; - @ObfuscatedName("ak") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -763154973 + intValue = 203528323 ) @Export("worldMapDisplayY") int worldMapDisplayY; @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -258302625 + intValue = -762865251 ) @Export("maxFlashCount") int maxFlashCount; - @ObfuscatedName("ah") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -1236137625 + intValue = 770268231 ) @Export("cyclesPerFlash") int cyclesPerFlash; - @ObfuscatedName("aq") + @ObfuscatedName("aa") @Export("perpetualFlash") boolean perpetualFlash; - @ObfuscatedName("ao") + @ObfuscatedName("aq") @Export("flashingElements") HashSet flashingElements; - @ObfuscatedName("an") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -458343583 + intValue = 674929495 ) @Export("flashCount") int flashCount; - @ObfuscatedName("ar") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -710941377 + intValue = -981605543 ) @Export("flashCycle") int flashCycle; - @ObfuscatedName("az") - @ObfuscatedGetter( - intValue = 634143331 - ) - int field3978; - @ObfuscatedName("ay") - @ObfuscatedGetter( - intValue = -874414913 - ) - int field3979; - @ObfuscatedName("ag") - @ObfuscatedGetter( - intValue = 1920735327 - ) - int field3980; @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 1563619535 + intValue = -240935151 ) - int field3992; - @ObfuscatedName("al") + int field3979; + @ObfuscatedName("aw") @ObfuscatedGetter( - longValue = 4789234822527169759L - ) - long field3952; - @ObfuscatedName("ae") - @ObfuscatedGetter( - intValue = -1313666647 + intValue = 650254011 ) int field3982; + @ObfuscatedName("ar") + @ObfuscatedGetter( + intValue = 757767451 + ) + int field3977; + @ObfuscatedName("av") + @ObfuscatedGetter( + intValue = 1272678139 + ) + int field3951; + @ObfuscatedName("al") + @ObfuscatedGetter( + longValue = 5380026643916633153L + ) + long field3967; @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 914367019 + intValue = 950213411 ) int field3984; - @ObfuscatedName("aj") - boolean field3981; - @ObfuscatedName("af") + @ObfuscatedName("am") + @ObfuscatedGetter( + intValue = -1648273559 + ) + int field3969; + @ObfuscatedName("ao") + boolean field3986; + @ObfuscatedName("ag") @Export("enabledElements") HashSet enabledElements; - @ObfuscatedName("ap") + @ObfuscatedName("ai") @Export("enabledCategories") HashSet enabledCategories; - @ObfuscatedName("ai") + @ObfuscatedName("ab") @Export("enabledElementIds") HashSet enabledElementIds; - @ObfuscatedName("am") - HashSet field3989; - @ObfuscatedName("ab") + @ObfuscatedName("ap") + HashSet field3991; + @ObfuscatedName("ah") @Export("elementsDisabled") boolean elementsDisabled; - @ObfuscatedName("bj") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = -1635351133 + intValue = -1735294353 ) - int field3991; - @ObfuscatedName("bw") + int field3981; + @ObfuscatedName("bc") @Export("menuOpcodes") final int[] menuOpcodes; @ObfuscatedName("bk") - List field3946; - @ObfuscatedName("bl") + List field3995; + @ObfuscatedName("bb") @Export("iconIterator") Iterator iconIterator; - @ObfuscatedName("bq") - HashSet field3995; - @ObfuscatedName("bx") + @ObfuscatedName("bi") + HashSet field3997; + @ObfuscatedName("bp") @ObfuscatedSignature( - signature = "Lht;" + signature = "Lhj;" ) @Export("mouseCoord") Coord mouseCoord; - @ObfuscatedName("bc") + @ObfuscatedName("bl") @Export("showCoord") public boolean showCoord; @ObfuscatedName("by") @ObfuscatedSignature( - signature = "Lls;" + signature = "Llt;" ) @Export("sprite") Sprite sprite; - @ObfuscatedName("bz") + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = 366608429 + intValue = -1384358413 ) @Export("cachedPixelsPerTile") int cachedPixelsPerTile; - @ObfuscatedName("bm") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = 1813935141 + intValue = 1781840663 ) @Export("minCachedTileX") int minCachedTileX; - @ObfuscatedName("bo") + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = -3401919 + intValue = -1423775659 ) @Export("minCachedTileY") int minCachedTileY; - @ObfuscatedName("bs") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = 842619581 + intValue = 1004367461 ) - int field4002; + int field3959; static { fontNameVerdana11 = FontName.FontName_verdana11; @@ -304,30 +304,30 @@ public class WorldMap { this.flashingElements = null; this.flashCount = -1; this.flashCycle = -1; - this.field3978 = -1; this.field3979 = -1; - this.field3980 = -1; - this.field3992 = -1; - this.field3981 = true; + this.field3982 = -1; + this.field3977 = -1; + this.field3951 = -1; + this.field3986 = true; this.enabledElements = new HashSet(); this.enabledCategories = new HashSet(); this.enabledElementIds = new HashSet(); - this.field3989 = new HashSet(); + this.field3991 = new HashSet(); this.elementsDisabled = false; - this.field3991 = 0; + this.field3981 = 0; this.menuOpcodes = new int[]{1008, 1009, 1010, 1011, 1012}; - this.field3995 = new HashSet(); + this.field3997 = new HashSet(); this.mouseCoord = null; this.showCoord = false; this.minCachedTileX = -1; this.minCachedTileY = -1; - this.field4002 = -1; + this.field3959 = -1; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lhz;Lhz;Lhz;Lko;Ljava/util/HashMap;[Lli;I)V", - garbageValue = "1728699917" + signature = "(Lii;Lii;Lii;Lko;Ljava/util/HashMap;[Lli;B)V", + garbageValue = "50" ) @Export("init") public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var3, Font var4, HashMap var5, IndexedSprite[] var6) { @@ -341,7 +341,7 @@ public class WorldMap { this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_medium, var5.get(fontNameVerdana13)); this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_large, var5.get(fontNameVerdana15)); this.cacheLoader = new WorldMapArchiveLoader(var1); - int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field291.name); + int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field313.name); int[] var8 = this.WorldMap_archive.getGroupFileIds(var7); this.details = new HashMap(var8.length); @@ -356,22 +356,22 @@ public class WorldMap { } this.setCurrentMapArea(this.mainMapArea); - this.field3959 = null; + this.field3960 = null; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1661861008" + garbageValue = "-449283348" ) - public void method6357() { + public void method6499() { WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIZIIIII)V", - garbageValue = "46505249" + signature = "(IIZIIIIB)V", + garbageValue = "-1" ) @Export("onCycle") public void onCycle(int var1, int var2, boolean var3, int var4, int var5, int var6, int var7) { @@ -381,27 +381,27 @@ public class WorldMap { if (var3) { int var8 = (int)Math.ceil((double)((float)var6 / this.zoom)); int var9 = (int)Math.ceil((double)((float)var7 / this.zoom)); - List var10 = this.worldMapManager.method647(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, var4, var5, var6, var7, var1, var2); + List var10 = this.worldMapManager.method643(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, var4, var5, var6, var7, var1, var2); HashSet var11 = new HashSet(); Iterator var12; AbstractWorldMapIcon var13; ScriptEvent var14; WorldMapEvent var15; - for (var12 = var10.iterator(); var12.hasNext(); Client.runScriptEvent(var14)) { + for (var12 = var10.iterator(); var12.hasNext(); class4.runScriptEvent(var14)) { var13 = (AbstractWorldMapIcon)var12.next(); var11.add(var13); var14 = new ScriptEvent(); var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); var14.setArgs(new Object[]{var15, var1, var2}); - if (this.field3995.contains(var13)) { + if (this.field3997.contains(var13)) { var14.setType(17); } else { var14.setType(15); } } - var12 = this.field3995.iterator(); + var12 = this.field3997.iterator(); while (var12.hasNext()) { var13 = (AbstractWorldMapIcon)var12.next(); @@ -410,83 +410,72 @@ public class WorldMap { var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); var14.setArgs(new Object[]{var15, var1, var2}); var14.setType(16); - Client.runScriptEvent(var14); + class4.runScriptEvent(var14); } } - this.field3995 = var11; + this.field3997 = var11; } } } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(IIZZB)V", - garbageValue = "-96" + garbageValue = "3" ) - public void method6359(int var1, int var2, boolean var3, boolean var4) { - long var5 = WorldMapID.currentTimeMillis(); - this.method6423(var1, var2, var4, var5); + public void method6363(int var1, int var2, boolean var3, boolean var4) { + long var5 = WorldMapIcon_0.currentTimeMillis(); + this.method6454(var1, var2, var4, var5); if (!this.hasTarget() && (var4 || var3)) { if (var4) { - this.field3980 = var1; - this.field3992 = var2; - this.field3978 = this.centerTileX; - this.field3979 = this.centerTileY; + this.field3977 = var1; + this.field3951 = var2; + this.field3979 = this.centerTileX; + this.field3982 = this.centerTileY; } - if (this.field3978 != -1) { - int var7 = var1 - this.field3980; - int var8 = var2 - this.field3992; - this.setWorldMapPosition(this.field3978 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field3979, false); + if (this.field3979 != -1) { + int var7 = var1 - this.field3977; + int var8 = var2 - this.field3951; + this.setWorldMapPosition(this.field3979 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field3982, false); } } else { - this.method6532(); + this.method6368(); } if (var4) { - this.field3952 = var5; - this.field3982 = var1; - this.field3984 = var2; + this.field3967 = var5; + this.field3984 = var1; + this.field3969 = var2; } } - @ObfuscatedName("p") - void method6423(int var1, int var2, boolean var3, long var4) { + @ObfuscatedName("i") + void method6454(int var1, int var2, boolean var3, long var4) { if (this.currentMapArea != null) { int var6 = (int)((float)this.centerTileX + ((float)(var1 - this.worldMapDisplayX) - (float)this.getDisplayWith() * this.zoom / 2.0F) / this.zoom); int var7 = (int)((float)this.centerTileY - ((float)(var2 - this.worldMapDisplayY) - (float)this.getDisplayHeight() * this.zoom / 2.0F) / this.zoom); this.mouseCoord = this.currentMapArea.coord(var6 + this.currentMapArea.getRegionLowX() * 64, var7 + this.currentMapArea.getRegionLowY() * 64); if (this.mouseCoord != null && var3) { - boolean var8 = Client.staffModLevel >= 2; - int var10; - int var11; - if (var8 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { - int var14 = this.mouseCoord.x; - var10 = this.mouseCoord.y; - var11 = this.mouseCoord.plane; - PacketBufferNode var12 = class2.getPacketBufferNode(ClientPacket.field2251, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeIntME(var14); - var12.packetBuffer.writeShortLE(0); - var12.packetBuffer.writeIntME(var10); - var12.packetBuffer.method5569(var11); - Client.packetWriter.addNode(var12); + if (FloorOverlayDefinition.method4835() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { + WorldMapRegion.method563(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); } else { - boolean var9 = true; - if (this.field3981) { - var10 = var1 - this.field3982; - var11 = var2 - this.field3984; - if (var4 - this.field3952 > 500L || var10 < -25 || var10 > 25 || var11 < -25 || var11 > 25) { - var9 = false; + boolean var8 = true; + if (this.field3986) { + int var9 = var1 - this.field3984; + int var10 = var2 - this.field3969; + if (var4 - this.field3967 > 500L || var9 < -25 || var9 > 25 || var10 < -25 || var10 > 25) { + var8 = false; } } - if (var9) { - PacketBufferNode var13 = class2.getPacketBufferNode(ClientPacket.field2210, Client.packetWriter.isaacCipher); - var13.packetBuffer.writeShortLE(this.mouseCoord.packed()); - Client.packetWriter.addNode(var13); - this.field3952 = 0L; + if (var8) { + PacketBufferNode var11 = TilePaint.getPacketBufferNode(ClientPacket.field2278, Client.packetWriter.isaacCipher); + var11.packetBuffer.writeInt(this.mouseCoord.packed()); + Client.packetWriter.addNode(var11); + this.field3967 = 0L; } } } @@ -496,18 +485,18 @@ public class WorldMap { } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "826413742" + garbageValue = "-2064415632" ) @Export("smoothZoom") void smoothZoom() { - if (class215.field2534 != null) { + if (class218.field2716 != null) { this.zoom = this.zoomTarget; } else { if (this.zoom < this.zoomTarget) { - this.zoom = Math.min(this.zoomTarget, this.zoom / 30.0F + this.zoom); + this.zoom = Math.min(this.zoomTarget, this.zoom + this.zoom / 30.0F); } if (this.zoom > this.zoomTarget) { @@ -517,10 +506,10 @@ public class WorldMap { } } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "2135583041" + signature = "(B)V", + garbageValue = "4" ) @Export("scrollToTarget") void scrollToTarget() { @@ -536,7 +525,7 @@ public class WorldMap { } this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); - if (this.worldMapTargetX == this.centerTileX && this.centerTileY == this.worldMapTargetY) { + if (this.centerTileX == this.worldMapTargetX && this.centerTileY == this.worldMapTargetY) { this.worldMapTargetX = -1; this.worldMapTargetY = -1; } @@ -544,48 +533,48 @@ public class WorldMap { } } - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(IIZI)V", - garbageValue = "-2141502379" + garbageValue = "-1067746846" ) @Export("setWorldMapPosition") final void setWorldMapPosition(int var1, int var2, boolean var3) { this.centerTileX = var1; this.centerTileY = var2; - WorldMapID.currentTimeMillis(); + WorldMapIcon_0.currentTimeMillis(); if (var3) { - this.method6532(); + this.method6368(); } } - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "304166033" + garbageValue = "1954951497" ) - final void method6532() { - this.field3992 = -1; - this.field3980 = -1; + final void method6368() { + this.field3951 = -1; + this.field3977 = -1; + this.field3982 = -1; this.field3979 = -1; - this.field3978 = -1; } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1744394107" + garbageValue = "53671809" ) @Export("hasTarget") boolean hasTarget() { return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(IIII)Laa;", - garbageValue = "-1136090862" + signature = "(IIII)Lae;", + garbageValue = "1541741189" ) @Export("mapAreaAtCoord") public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) { @@ -603,12 +592,12 @@ public class WorldMap { return var5; } - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedSignature( signature = "(IIIZI)V", - garbageValue = "2020995373" + garbageValue = "508840243" ) - public void method6367(int var1, int var2, int var3, boolean var4) { + public void method6371(int var1, int var2, int var3, boolean var4) { WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); if (var5 == null) { if (!var4) { @@ -619,8 +608,8 @@ public class WorldMap { } boolean var6 = false; - if (var5 != this.field3959 || var4) { - this.field3959 = var5; + if (var5 != this.field3960 || var4) { + this.field3960 = var5; this.setCurrentMapArea(var5); var6 = true; } @@ -631,10 +620,10 @@ public class WorldMap { } - @ObfuscatedName("l") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "-41" + signature = "(II)V", + garbageValue = "1319547815" ) @Export("setCurrentMapAreaId") public void setCurrentMapAreaId(int var1) { @@ -645,30 +634,30 @@ public class WorldMap { } - @ObfuscatedName("t") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-1765160144" + signature = "(B)I", + garbageValue = "-125" ) @Export("currentMapAreaId") public int currentMapAreaId() { return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)Laa;", - garbageValue = "-987525690" + signature = "(I)Lae;", + garbageValue = "255797154" ) @Export("getCurrentMapArea") public WorldMapArea getCurrentMapArea() { return this.currentMapArea; } - @ObfuscatedName("n") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Laa;B)V", - garbageValue = "0" + signature = "(Lae;I)V", + garbageValue = "808158376" ) @Export("setCurrentMapArea") void setCurrentMapArea(WorldMapArea var1) { @@ -678,10 +667,10 @@ public class WorldMap { } } - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Laa;I)V", - garbageValue = "-2040877349" + signature = "(Lae;I)V", + garbageValue = "-1342819699" ) @Export("initializeWorldMapManager") void initializeWorldMapManager(WorldMapArea var1) { @@ -692,10 +681,10 @@ public class WorldMap { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(Laa;Lht;Lht;ZI)V", - garbageValue = "-118922828" + signature = "(Lae;Lhj;Lhj;ZS)V", + garbageValue = "256" ) - public void method6373(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { + public void method6377(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { if (var1 != null) { if (this.currentMapArea == null || var1 != this.currentMapArea) { this.initializeWorldMapManager(var1); @@ -710,10 +699,10 @@ public class WorldMap { } } - @ObfuscatedName("h") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(IIII)V", - garbageValue = "1542600271" + signature = "(IIIB)V", + garbageValue = "17" ) @Export("jump") void jump(int var1, int var2, int var3) { @@ -728,16 +717,16 @@ public class WorldMap { this.worldMapTargetY = -1; this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); this.zoomTarget = this.zoom; - this.field3946 = null; + this.field3995 = null; this.iconIterator = null; this.worldMapManager.clearIcons(); } } - @ObfuscatedName("m") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(IIIIII)V", - garbageValue = "-87641945" + garbageValue = "-1497062922" ) @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5) { @@ -771,20 +760,18 @@ public class WorldMap { int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); this.worldMapManager.drawTiles(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4); - boolean var10; if (!this.elementsDisabled) { - var10 = false; - if (var5 - this.field3991 > 100) { - this.field3991 = var5; + boolean var10 = false; + if (var5 - this.field3981 > 100) { + this.field3981 = var5; var10 = true; } - this.worldMapManager.drawElements(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4, this.field3989, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); + this.worldMapManager.drawElements(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4, this.field3991, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); } - this.method6377(var1, var2, var3, var4, var8, var9); - var10 = Client.staffModLevel >= 2; - if (var10 && this.showCoord && this.mouseCoord != null) { + this.method6381(var1, var2, var3, var4, var8, var9); + if (FloorOverlayDefinition.method4835() && this.showCoord && this.mouseCoord != null) { this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1); } @@ -796,18 +783,18 @@ public class WorldMap { } } - @ObfuscatedName("aa") + @ObfuscatedName("a") @ObfuscatedSignature( signature = "(IIIIIII)Z", - garbageValue = "-341847306" + garbageValue = "1871269432" ) - boolean method6514(int var1, int var2, int var3, int var4, int var5, int var6) { + boolean method6380(int var1, int var2, int var3, int var4, int var5, int var6) { if (this.sprite == null) { return true; } else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { return true; - } else if (this.field4002 != Client.field749) { + } else if (this.field3959 != Client.field888) { return true; } else if (var3 <= 0 && var4 <= 0) { return var3 + var1 < var5 || var2 + var4 < var6; @@ -819,13 +806,13 @@ public class WorldMap { } } - @ObfuscatedName("av") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(IIIIIIB)V", - garbageValue = "-53" + signature = "(IIIIIII)V", + garbageValue = "-1868764564" ) - void method6377(int var1, int var2, int var3, int var4, int var5, int var6) { - if (class215.field2534 != null) { + void method6381(int var1, int var2, int var3, int var4, int var5, int var6) { + if (class218.field2716 != null) { int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); int var8 = var3 + 512; int var9 = var4 + 512; @@ -834,9 +821,9 @@ public class WorldMap { var9 = (int)((float)var9 / var10); int var11 = this.getDisplayX() - var5 / 2 - var7; int var12 = this.getDisplayY() - var6 / 2 - var7; - int var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; + int var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); - if (this.method6514(var8, var9, var13, var14, var3, var4)) { + if (this.method6380(var8, var9, var13, var14, var3, var4)) { if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { Arrays.fill(this.sprite.pixels, 0); } else { @@ -846,26 +833,26 @@ public class WorldMap { this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; - class215.field2534.method4318(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); - this.field4002 = Client.field749; - var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; + class218.field2716.method4404(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); + this.field3959 = Client.field888; + var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); } Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); if (1.0F == var10) { - this.sprite.method6159(var13, var14, 192); + this.sprite.method6201(var13, var14, 192); } else { - this.sprite.method6162(var13, var14, (int)(var10 * (float)var8), (int)(var10 * (float)var9), 192); + this.sprite.method6280(var13, var14, (int)(var10 * (float)var8), (int)(var10 * (float)var9), 192); } } } - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedSignature( signature = "(IIIII)V", - garbageValue = "-2078512734" + garbageValue = "864377578" ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4) { @@ -881,20 +868,20 @@ public class WorldMap { } } - @ObfuscatedName("as") + @ObfuscatedName("af") @ObfuscatedSignature( signature = "(IB)V", - garbageValue = "3" + garbageValue = "23" ) @Export("setZoomPercentage") public void setZoomPercentage(int var1) { this.zoomTarget = this.getZoomFromPercentage(var1); } - @ObfuscatedName("ak") + @ObfuscatedName("az") @ObfuscatedSignature( - signature = "(IIIIIB)V", - garbageValue = "55" + signature = "(IIIIII)V", + garbageValue = "-1694224866" ) @Export("drawLoading") void drawLoading(int var1, int var2, int var3, int var4, int var5) { @@ -907,10 +894,10 @@ public class WorldMap { this.font.drawCentered("Loading...", var7, var8 + var6, -1, -1); } - @ObfuscatedName("au") + @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "(II)F", - garbageValue = "-1442342288" + signature = "(IB)F", + garbageValue = "-6" ) @Export("getZoomFromPercentage") float getZoomFromPercentage(int var1) { @@ -927,50 +914,50 @@ public class WorldMap { } } - @ObfuscatedName("ah") + @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "0" + signature = "(I)I", + garbageValue = "-1982956144" ) @Export("getZoomLevel") public int getZoomLevel() { - if ((double)this.zoomTarget == 1.0D) { + if (1.0D == (double)this.zoomTarget) { return 25; } else if ((double)this.zoomTarget == 1.5D) { return 37; - } else if ((double)this.zoomTarget == 2.0D) { + } else if (2.0D == (double)this.zoomTarget) { return 50; - } else if (3.0D == (double)this.zoomTarget) { + } else if ((double)this.zoomTarget == 3.0D) { return 75; } else { return 4.0D == (double)this.zoomTarget ? 100 : 200; } } - @ObfuscatedName("aq") + @ObfuscatedName("au") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1583418166" + signature = "(B)V", + garbageValue = "-15" ) @Export("loadCache") public void loadCache() { this.cacheLoader.load(); } - @ObfuscatedName("ao") + @ObfuscatedName("ay") @ObfuscatedSignature( signature = "(B)Z", - garbageValue = "9" + garbageValue = "62" ) @Export("isCacheLoaded") public boolean isCacheLoaded() { return this.cacheLoader.isLoaded(); } - @ObfuscatedName("an") + @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "(II)Laa;", - garbageValue = "-1454558464" + signature = "(II)Lae;", + garbageValue = "-583090673" ) @Export("getMapArea") public WorldMapArea getMapArea(int var1) { @@ -988,10 +975,10 @@ public class WorldMap { return var3; } - @ObfuscatedName("ar") + @ObfuscatedName("aq") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-1969437035" + garbageValue = "1378378704" ) @Export("setWorldMapPositionTarget") public void setWorldMapPositionTarget(int var1, int var2) { @@ -1001,10 +988,10 @@ public class WorldMap { } } - @ObfuscatedName("az") + @ObfuscatedName("as") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-1231977956" + garbageValue = "-1855899067" ) @Export("setWorldMapPositionTargetInstant") public void setWorldMapPositionTargetInstant(int var1, int var2) { @@ -1015,10 +1002,10 @@ public class WorldMap { } } - @ObfuscatedName("ay") + @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "(IIIB)V", - garbageValue = "37" + signature = "(IIII)V", + garbageValue = "100238164" ) @Export("jumpToSourceCoord") public void jumpToSourceCoord(int var1, int var2, int var3) { @@ -1031,10 +1018,10 @@ public class WorldMap { } } - @ObfuscatedName("ag") + @ObfuscatedName("ac") @ObfuscatedSignature( - signature = "(IIII)V", - garbageValue = "-429166705" + signature = "(IIIB)V", + garbageValue = "-50" ) @Export("jumpToSourceCoordInstant") public void jumpToSourceCoordInstant(int var1, int var2, int var3) { @@ -1047,60 +1034,60 @@ public class WorldMap { } } - @ObfuscatedName("ac") + @ObfuscatedName("aw") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-640061076" + garbageValue = "429030075" ) @Export("getDisplayX") public int getDisplayX() { return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; } - @ObfuscatedName("al") + @ObfuscatedName("ar") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1240183513" + garbageValue = "1683387381" ) @Export("getDisplayY") public int getDisplayY() { return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; } - @ObfuscatedName("ae") + @ObfuscatedName("av") @ObfuscatedSignature( - signature = "(I)Lht;", - garbageValue = "1271020652" + signature = "(I)Lhj;", + garbageValue = "663930185" ) @Export("getDisplayCoord") public Coord getDisplayCoord() { return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); } - @ObfuscatedName("ad") + @ObfuscatedName("al") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "310550352" + garbageValue = "-261888637" ) @Export("getDisplayWith") public int getDisplayWith() { return this.worldMapDisplayWidth; } - @ObfuscatedName("aj") + @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-238486844" + signature = "(B)I", + garbageValue = "73" ) @Export("getDisplayHeight") public int getDisplayHeight() { return this.worldMapDisplayHeight; } - @ObfuscatedName("ax") + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1755019724" + signature = "(IB)V", + garbageValue = "24" ) @Export("setMaxFlashCount") public void setMaxFlashCount(int var1) { @@ -1110,20 +1097,20 @@ public class WorldMap { } - @ObfuscatedName("at") + @ObfuscatedName("ao") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1329529501" + garbageValue = "80342748" ) @Export("resetMaxFlashCount") public void resetMaxFlashCount() { this.maxFlashCount = 3; } - @ObfuscatedName("af") + @ObfuscatedName("at") @ObfuscatedSignature( signature = "(IB)V", - garbageValue = "42" + garbageValue = "30" ) @Export("setCyclesPerFlash") public void setCyclesPerFlash(int var1) { @@ -1133,30 +1120,30 @@ public class WorldMap { } - @ObfuscatedName("ap") + @ObfuscatedName("an") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1817253337" + garbageValue = "1876711649" ) @Export("resetCyclesPerFlash") public void resetCyclesPerFlash() { this.cyclesPerFlash = 50; } - @ObfuscatedName("ai") + @ObfuscatedName("ag") @ObfuscatedSignature( signature = "(ZB)V", - garbageValue = "50" + garbageValue = "-15" ) @Export("setPerpetualFlash") public void setPerpetualFlash(boolean var1) { this.perpetualFlash = var1; } - @ObfuscatedName("am") + @ObfuscatedName("ai") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1830281477" + garbageValue = "1016061625" ) @Export("flashElement") public void flashElement(int var1) { @@ -1168,8 +1155,8 @@ public class WorldMap { @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "0" + signature = "(II)V", + garbageValue = "-1555254761" ) @Export("flashCategory") public void flashCategory(int var1) { @@ -1177,38 +1164,38 @@ public class WorldMap { this.flashCount = 0; this.flashCycle = 0; - for (int var2 = 0; var2 < class180.WorldMapElement_count; ++var2) { - if (GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var2) != null && GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var2).category == var1) { - this.flashingElements.add(GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var2).objectId); + for (int var2 = 0; var2 < class218.WorldMapElement_count; ++var2) { + if (PacketBufferNode.WorldMapElement_get(var2) != null && PacketBufferNode.WorldMapElement_get(var2).category == var1) { + this.flashingElements.add(PacketBufferNode.WorldMapElement_get(var2).objectId); } } } - @ObfuscatedName("bj") + @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "104" + signature = "(I)V", + garbageValue = "-1842650742" ) @Export("stopCurrentFlashes") public void stopCurrentFlashes() { this.flashingElements = null; } - @ObfuscatedName("bg") + @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "315793353" + signature = "(ZB)V", + garbageValue = "-18" ) @Export("setElementsDisabled") public void setElementsDisabled(boolean var1) { this.elementsDisabled = !var1; } - @ObfuscatedName("bw") + @ObfuscatedName("bq") @ObfuscatedSignature( signature = "(IZI)V", - garbageValue = "-1035576762" + garbageValue = "-486377130" ) @Export("disableElement") public void disableElement(int var1, boolean var2) { @@ -1218,13 +1205,13 @@ public class WorldMap { this.enabledElements.remove(var1); } - this.method6409(); + this.method6413(); } - @ObfuscatedName("bk") + @ObfuscatedName("bf") @ObfuscatedSignature( signature = "(IZI)V", - garbageValue = "-900905988" + garbageValue = "-2134751202" ) @Export("setCategoryDisabled") public void setCategoryDisabled(int var1, boolean var2) { @@ -1234,9 +1221,9 @@ public class WorldMap { this.enabledCategories.remove(var1); } - for (int var3 = 0; var3 < class180.WorldMapElement_count; ++var3) { - if (GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var3) != null && GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var3).category == var1) { - int var4 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var3).objectId; + for (int var3 = 0; var3 < class218.WorldMapElement_count; ++var3) { + if (PacketBufferNode.WorldMapElement_get(var3) != null && PacketBufferNode.WorldMapElement_get(var3).category == var1) { + int var4 = PacketBufferNode.WorldMapElement_get(var3).objectId; if (!var2) { this.enabledElementIds.add(var4); } else { @@ -1245,61 +1232,61 @@ public class WorldMap { } } - this.method6409(); + this.method6413(); } - @ObfuscatedName("bl") + @ObfuscatedName("bc") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-1450981799" + signature = "(B)Z", + garbageValue = "-85" ) @Export("getElementsDisabled") public boolean getElementsDisabled() { return !this.elementsDisabled; } - @ObfuscatedName("bq") + @ObfuscatedName("bk") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "-2012828359" + garbageValue = "1527323517" ) @Export("isElementDisabled") public boolean isElementDisabled(int var1) { return !this.enabledElements.contains(var1); } - @ObfuscatedName("bx") + @ObfuscatedName("bb") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "-521010176" + signature = "(IB)Z", + garbageValue = "73" ) @Export("isCategoryDisabled") public boolean isCategoryDisabled(int var1) { return !this.enabledCategories.contains(var1); } - @ObfuscatedName("bc") + @ObfuscatedName("bi") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1601699261" + signature = "(B)V", + garbageValue = "118" ) - void method6409() { - this.field3989.clear(); - this.field3989.addAll(this.enabledElements); - this.field3989.addAll(this.enabledElementIds); + void method6413() { + this.field3991.clear(); + this.field3991.addAll(this.enabledElements); + this.field3991.addAll(this.enabledElementIds); } - @ObfuscatedName("by") + @ObfuscatedName("bp") @ObfuscatedSignature( signature = "(IIIIIII)V", - garbageValue = "-1315174671" + garbageValue = "-1183696122" ) @Export("addElementMenuOptions") public void addElementMenuOptions(int var1, int var2, int var3, int var4, int var5, int var6) { if (this.cacheLoader.isLoaded()) { int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); - List var9 = this.worldMapManager.method647(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, var1, var2, var3, var4, var5, var6); + List var9 = this.worldMapManager.method643(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, var1, var2, var3, var4, var5, var6); if (!var9.isEmpty()) { Iterator var10 = var9.iterator(); @@ -1310,12 +1297,12 @@ public class WorldMap { } AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); - WorldMapElement var12 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var11.getElement()); + WorldMapElement var12 = PacketBufferNode.WorldMapElement_get(var11.getElement()); var13 = false; for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { if (var12.menuActions[var14] != null) { - class1.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); + GraphicsObject.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); var13 = true; } } @@ -1325,12 +1312,12 @@ public class WorldMap { } } - @ObfuscatedName("bz") + @ObfuscatedName("bl") @ObfuscatedSignature( - signature = "(ILht;I)Lht;", - garbageValue = "1569536165" + signature = "(ILhj;B)Lhj;", + garbageValue = "-33" ) - public Coord method6416(int var1, Coord var2) { + public Coord method6411(int var1, Coord var2) { if (!this.cacheLoader.isLoaded()) { return null; } else if (!this.worldMapManager.isLoaded()) { @@ -1356,7 +1343,7 @@ public class WorldMap { var8 = (AbstractWorldMapIcon)var7.next(); int var9 = var8.coord2.x - var2.x; int var10 = var8.coord2.y - var2.y; - var11 = var10 * var10 + var9 * var9; + var11 = var9 * var9 + var10 * var10; if (var11 == 0) { return var8.coord2; } @@ -1371,10 +1358,10 @@ public class WorldMap { } } - @ObfuscatedName("bm") + @ObfuscatedName("by") @ObfuscatedSignature( - signature = "(IILht;Lht;I)V", - garbageValue = "-268236233" + signature = "(IILhj;Lhj;B)V", + garbageValue = "-47" ) @Export("worldMapMenuAction") public void worldMapMenuAction(int var1, int var2, Coord var3, Coord var4) { @@ -1398,13 +1385,13 @@ public class WorldMap { var5.setType(14); } - Client.runScriptEvent(var5); + class4.runScriptEvent(var5); } - @ObfuscatedName("bo") + @ObfuscatedName("be") @ObfuscatedSignature( - signature = "(S)Lao;", - garbageValue = "-10343" + signature = "(I)Laq;", + garbageValue = "-2025058751" ) @Export("iconStart") public AbstractWorldMapIcon iconStart() { @@ -1414,23 +1401,23 @@ public class WorldMap { return null; } else { HashMap var1 = this.worldMapManager.buildIcons(); - this.field3946 = new LinkedList(); + this.field3995 = new LinkedList(); Iterator var2 = var1.values().iterator(); while (var2.hasNext()) { List var3 = (List)var2.next(); - this.field3946.addAll(var3); + this.field3995.addAll(var3); } - this.iconIterator = this.field3946.iterator(); + this.iconIterator = this.field3995.iterator(); return this.iconNext(); } } - @ObfuscatedName("bs") + @ObfuscatedName("bw") @ObfuscatedSignature( - signature = "(B)Lao;", - garbageValue = "88" + signature = "(I)Laq;", + garbageValue = "483386340" ) @Export("iconNext") public AbstractWorldMapIcon iconNext() { diff --git a/runescape-client/src/main/java/WorldMapArchiveLoader.java b/runescape-client/src/main/java/WorldMapArchiveLoader.java index 80b3161424..a51789887c 100644 --- a/runescape-client/src/main/java/WorldMapArchiveLoader.java +++ b/runescape-client/src/main/java/WorldMapArchiveLoader.java @@ -4,30 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lm") +@ObfuscatedName("le") @Implements("WorldMapArchiveLoader") public class WorldMapArchiveLoader { - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("cacheName") String cacheName; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) @Export("archive") AbstractArchive archive; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1143529111 + intValue = -1269889337 ) @Export("percentLoaded") int percentLoaded; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("loaded") boolean loaded; @ObfuscatedSignature( - signature = "(Lhz;)V" + signature = "(Lii;)V" ) WorldMapArchiveLoader(AbstractArchive var1) { this.percentLoaded = 0; @@ -35,10 +35,10 @@ public class WorldMapArchiveLoader { this.archive = var1; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "-1366439933" + signature = "(Ljava/lang/String;B)V", + garbageValue = "101" ) @Export("reset") void reset(String var1) { @@ -52,15 +52,15 @@ public class WorldMapArchiveLoader { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "1" + signature = "(I)I", + garbageValue = "-2006696210" ) @Export("load") int load() { if (this.percentLoaded < 33) { - if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field286.name, this.cacheName)) { + if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field309.name, this.cacheName)) { return this.percentLoaded; } @@ -68,7 +68,7 @@ public class WorldMapArchiveLoader { } if (this.percentLoaded == 33) { - if (this.archive.isValidFileName(WorldMapCacheName.field287.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field287.name, this.cacheName)) { + if (this.archive.isValidFileName(WorldMapCacheName.field310.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field310.name, this.cacheName)) { return this.percentLoaded; } @@ -76,7 +76,7 @@ public class WorldMapArchiveLoader { } if (this.percentLoaded == 66) { - if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field289.name)) { + if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field312.name)) { return this.percentLoaded; } @@ -87,20 +87,20 @@ public class WorldMapArchiveLoader { return this.percentLoaded; } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "146861594" + garbageValue = "-1868224122" ) @Export("isLoaded") boolean isLoaded() { return this.loaded; } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1697040105" + garbageValue = "170805497" ) @Export("getPercentLoaded") int getPercentLoaded() { diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java index 0e6ed61218..53c172de10 100644 --- a/runescape-client/src/main/java/WorldMapArea.java +++ b/runescape-client/src/main/java/WorldMapArea.java @@ -6,67 +6,67 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aa") +@ObfuscatedName("ae") @Implements("WorldMapArea") public class WorldMapArea { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -403509389 + intValue = -1410510983 ) @Export("id") int id; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("internalName") String internalName; - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("externalName") String externalName; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 857333611 + intValue = 925396111 ) @Export("backGroundColor") int backGroundColor; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -345776741 + intValue = 1226828671 ) @Export("zoom") int zoom; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lht;" + signature = "Lhj;" ) @Export("origin") Coord origin; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1441436013 + intValue = -371722199 ) @Export("regionLowX") int regionLowX; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -685952677 + intValue = 604865057 ) @Export("regionHighX") int regionHighX; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 143703109 + intValue = 274624123 ) @Export("regionLowY") int regionLowY; - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1106684175 + intValue = -1237300351 ) @Export("regionHighY") int regionHighY; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("isMain") boolean isMain; - @ObfuscatedName("o") + @ObfuscatedName("h") @Export("sections") LinkedList sections; @@ -82,10 +82,10 @@ public class WorldMapArea { this.isMain = false; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lkq;II)V", - garbageValue = "-1882227443" + signature = "(Lkp;II)V", + garbageValue = "-1829168908" ) @Export("read") public void read(Buffer var1, int var2) { @@ -107,28 +107,28 @@ public class WorldMapArea { this.setBounds(); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lkq;I)Laz;", - garbageValue = "383916658" + signature = "(Lkp;I)Lac;", + garbageValue = "933484364" ) @Export("readWorldMapSection") WorldMapSection readWorldMapSection(Buffer var1) { int var2 = var1.readUnsignedByte(); - WorldMapSectionType var3 = (WorldMapSectionType)DynamicObject.findEnumerated(WorldMapSectionType.method235(), var2); + WorldMapSectionType var3 = (WorldMapSectionType)WorldMapSection0.findEnumerated(WorldMapSectionType.method249(), var2); Object var4 = null; switch(var3.type) { case 0: - var4 = new WorldMapSection1(); + var4 = new WorldMapSection2(); break; case 1: - var4 = new WorldMapSection0(); - break; - case 2: var4 = new class42(); break; + case 2: + var4 = new WorldMapSection1(); + break; case 3: - var4 = new WorldMapSection2(); + var4 = new WorldMapSection0(); break; default: throw new IllegalStateException(""); @@ -138,10 +138,10 @@ public class WorldMapArea { return (WorldMapSection)var4; } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(IIII)Z", - garbageValue = "-1895835322" + garbageValue = "1328516343" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -159,10 +159,10 @@ public class WorldMapArea { return true; } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(III)Z", - garbageValue = "1579456955" + garbageValue = "-2019435161" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { @@ -190,10 +190,10 @@ public class WorldMapArea { } } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(IIII)[I", - garbageValue = "-722762456" + garbageValue = "371604426" ) @Export("position") public int[] position(int var1, int var2, int var3) { @@ -211,10 +211,10 @@ public class WorldMapArea { return var5.getBorderTileLengths(var1, var2, var3); } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(IIB)Lht;", - garbageValue = "78" + signature = "(III)Lhj;", + garbageValue = "-2147059798" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -232,10 +232,10 @@ public class WorldMapArea { return var4.coord(var1, var2); } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-6387744" + garbageValue = "-263455981" ) @Export("setBounds") void setBounds() { @@ -248,27 +248,27 @@ public class WorldMapArea { } - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1737975976" + garbageValue = "-650960366" ) @Export("getId") public int getId() { return this.id; } - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(S)Z", - garbageValue = "128" + signature = "(I)Z", + garbageValue = "2024226786" ) @Export("getIsMain") public boolean getIsMain() { return this.isMain; } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(B)Ljava/lang/String;", garbageValue = "1" @@ -278,70 +278,70 @@ public class WorldMapArea { return this.internalName; } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(I)Ljava/lang/String;", - garbageValue = "1973605030" + garbageValue = "2136692647" ) @Export("getExternalName") public String getExternalName() { return this.externalName; } - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "14" + garbageValue = "4" ) @Export("getBackGroundColor") int getBackGroundColor() { return this.backGroundColor; } - @ObfuscatedName("l") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "597434028" + garbageValue = "293375977" ) @Export("getZoom") public int getZoom() { return this.zoom; } - @ObfuscatedName("t") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1252580439" + garbageValue = "2073176457" ) @Export("getRegionLowX") public int getRegionLowX() { return this.regionLowX; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1887142799" + garbageValue = "-617672869" ) @Export("getRegionHighX") public int getRegionHighX() { return this.regionHighX; } - @ObfuscatedName("n") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-56288601" + garbageValue = "501195938" ) @Export("getRegionLowY") public int getRegionLowY() { return this.regionLowY; } - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1216154135" + garbageValue = "536883045" ) @Export("getRegionHighY") public int getRegionHighY() { @@ -351,162 +351,161 @@ public class WorldMapArea { @ObfuscatedName("z") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1826469414" + garbageValue = "1345983642" ) @Export("getOriginX") public int getOriginX() { return this.origin.x; } - @ObfuscatedName("h") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-1153099258" + signature = "(B)I", + garbageValue = "12" ) @Export("getOriginPlane") public int getOriginPlane() { return this.origin.plane; } - @ObfuscatedName("m") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "907548196" + garbageValue = "622743388" ) @Export("getOriginY") public int getOriginY() { return this.origin.y; } - @ObfuscatedName("aa") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)Lht;", - garbageValue = "1045101809" + signature = "(I)Lhj;", + garbageValue = "-2050948360" ) @Export("getOrigin") public Coord getOrigin() { return new Coord(this.origin); } - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(IIII)Lls;", - garbageValue = "905152692" - ) - static Sprite method381(int var0, int var1, int var2) { - DemotingHashTable var3 = WorldMapRegion.WorldMapRegion_cachedSprites; - long var4 = (long)(var2 << 16 | var0 << 8 | var1); - return (Sprite)var3.get(var4); - } + @ObfuscatedName("t") + @Export("base37DecodeLong") + public static String base37DecodeLong(long var0) { + if (var0 > 0L && var0 < 6582952005840035281L) { + if (var0 % 37L == 0L) { + return null; + } else { + int var2 = 0; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(IB)Liy;", - garbageValue = "80" - ) - public static FloorUnderlayDefinition method405(int var0) { - FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + for (long var3 = var0; 0L != var3; var3 /= 37L) { + ++var2; + } + + StringBuilder var5; + char var8; + for (var5 = new StringBuilder(var2); 0L != var0; var5.append(var8)) { + long var6 = var0; + var0 /= 37L; + var8 = class289.base37Table[(int)(var6 - 37L * var0)]; + if (var8 == '_') { + int var9 = var5.length() - 1; + var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); + var8 = 160; + } + } + + var5.reverse(); + var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); + return var5.toString(); + } } else { - byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0); - var1 = new FloorUnderlayDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2), var0); - } - - var1.postDecode(); - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); - return var1; + return null; } } - @ObfuscatedName("il") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(ILjava/lang/String;I)V", - garbageValue = "-2069103908" + signature = "(Lkp;IIIIIIS)V", + garbageValue = "4210" ) - static void method364(int var0, String var1) { - int var2 = Players.Players_count; - int[] var3 = Players.Players_indices; - boolean var4 = false; - Username var5 = new Username(var1, class188.loginType); + @Export("loadTerrain") + static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) { + int var7; + if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { + Tiles.Tiles_renderFlags[var1][var2][var3] = 0; - for (int var6 = 0; var6 < var2; ++var6) { - Player var7 = Client.players[var3[var6]]; - if (var7 != null && var7 != Message.localPlayer && var7.username != null && var7.username.equals(var5)) { - PacketBufferNode var8; - if (var0 == 1) { - var8 = class2.getPacketBufferNode(ClientPacket.field2222, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5746(var3[var6]); - var8.packetBuffer.method5569(0); - Client.packetWriter.addNode(var8); - } else if (var0 == 4) { - var8 = class2.getPacketBufferNode(ClientPacket.field2273, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5696(0); - var8.packetBuffer.writeIntME(var3[var6]); - Client.packetWriter.addNode(var8); - } else if (var0 == 6) { - var8 = class2.getPacketBufferNode(ClientPacket.field2214, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5720(0); - var8.packetBuffer.method5579(var3[var6]); - Client.packetWriter.addNode(var8); - } else if (var0 == 7) { - var8 = class2.getPacketBufferNode(ClientPacket.field2235, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5720(0); - var8.packetBuffer.method5746(var3[var6]); - Client.packetWriter.addNode(var8); + while (true) { + var7 = var0.readUnsignedByte(); + if (var7 == 0) { + if (var1 == 0) { + int[] var8 = Tiles.Tiles_heights[0][var2]; + int var11 = var2 + var4 + 932731; + int var12 = var3 + var5 + 556238; + int var13 = class3.method49(45365 + var11, 91923 + var12, 4) - 128 + (class3.method49(10294 + var11, var12 + 37821, 2) - 128 >> 1) + (class3.method49(var11, var12, 1) - 128 >> 2); + var13 = (int)((double)var13 * 0.3D) + 35; + if (var13 < 10) { + var13 = 10; + } else if (var13 > 60) { + var13 = 60; + } + + var8[var3] = -var13 * 8; + } else { + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; + } + break; } - var4 = true; - break; + if (var7 == 1) { + int var14 = var0.readUnsignedByte(); + if (var14 == 1) { + var14 = 0; + } + + if (var1 == 0) { + Tiles.Tiles_heights[0][var2][var3] = -var14 * 8; + } else { + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var14 * 8; + } + break; + } + + if (var7 <= 49) { + Tiles.field514[var1][var2][var3] = var0.readByte(); + Tiles.field507[var1][var2][var3] = (byte)((var7 - 2) / 4); + Tiles.field518[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); + } else if (var7 <= 81) { + Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); + } else { + Tiles.field502[var1][var2][var3] = (byte)(var7 - 81); + } } - } + } else { + while (true) { + var7 = var0.readUnsignedByte(); + if (var7 == 0) { + break; + } - if (!var4) { - class83.addGameMessage(4, "", "Unable to find " + var1); - } + if (var7 == 1) { + var0.readUnsignedByte(); + break; + } - } - - @ObfuscatedName("iq") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1140940631" - ) - static final void method404() { - boolean var0 = false; - - while (!var0) { - var0 = true; - - for (int var1 = 0; var1 < Client.menuOptionsCount - 1; ++var1) { - if (Client.menuOpcodes[var1] < 1000 && Client.menuOpcodes[var1 + 1] > 1000) { - String var2 = Client.menuTargets[var1]; - Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; - Client.menuTargets[var1 + 1] = var2; - String var3 = Client.menuActions[var1]; - Client.menuActions[var1] = Client.menuActions[var1 + 1]; - Client.menuActions[var1 + 1] = var3; - int var4 = Client.menuOpcodes[var1]; - Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; - Client.menuOpcodes[var1 + 1] = var4; - var4 = Client.menuArguments1[var1]; - Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; - Client.menuArguments1[var1 + 1] = var4; - var4 = Client.menuArguments2[var1]; - Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; - Client.menuArguments2[var1 + 1] = var4; - var4 = Client.menuIdentifiers[var1]; - Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; - Client.menuIdentifiers[var1 + 1] = var4; - boolean var5 = Client.menuShiftClick[var1]; - Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; - Client.menuShiftClick[var1 + 1] = var5; - var0 = false; + if (var7 <= 49) { + var0.readUnsignedByte(); } } } } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "20" + ) + static final void method425() { + class60.method1188("Your friend list is full. Max of 200 for free users, and 400 for members"); + } } diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index ea8c65c2c9..485f0a82ae 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -7,26 +7,26 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ay") +@ObfuscatedName("aw") @Implements("WorldMapAreaData") public class WorldMapAreaData extends WorldMapArea { @ObfuscatedName("v") @Export("worldMapData0Set") HashSet worldMapData0Set; - @ObfuscatedName("k") + @ObfuscatedName("n") @Export("worldMapData1Set") HashSet worldMapData1Set; - @ObfuscatedName("s") + @ObfuscatedName("x") @Export("iconList") List iconList; WorldMapAreaData() { } - @ObfuscatedName("cd") + @ObfuscatedName("cg") @ObfuscatedSignature( - signature = "(Lkq;Lkq;IZI)V", - garbageValue = "-466538568" + signature = "(Lkp;Lkp;IZS)V", + garbageValue = "-14333" ) @Export("init") void init(Buffer var1, Buffer var2, int var3, boolean var4) { @@ -65,10 +65,10 @@ public class WorldMapAreaData extends WorldMapArea { this.initIconsList(var2, var4); } - @ObfuscatedName("cj") + @ObfuscatedName("cr") @ObfuscatedSignature( - signature = "(Lkq;ZB)V", - garbageValue = "119" + signature = "(Lkp;ZI)V", + garbageValue = "-1209977249" ) @Export("initIconsList") void initIconsList(Buffer var1, boolean var2) { @@ -76,7 +76,7 @@ public class WorldMapAreaData extends WorldMapArea { int var3 = var1.readUnsignedShort(); for (int var4 = 0; var4 < var3; ++var4) { - int var5 = var1.method5560(); + int var5 = var1.method5593(); Coord var6 = new Coord(var1.readInt()); boolean var7 = var1.readUnsignedByte() == 1; if (var2 || !var7) { @@ -86,849 +86,118 @@ public class WorldMapAreaData extends WorldMapArea { } - @ObfuscatedName("i") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Ljava/lang/Throwable;Ljava/lang/String;)Lmg;" + signature = "(ILce;ZI)I", + garbageValue = "599780957" ) - @Export("newRunException") - public static RunException newRunException(Throwable var0, String var1) { - RunException var2; - if (var0 instanceof RunException) { - var2 = (RunException)var0; - var2.message = var2.message + ' ' + var1; - } else { - var2 = new RunException(var0, var1); - } - - return var2; - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "(Lkl;II)V", - garbageValue = "-1537977309" - ) - @Export("readPlayerUpdate") - static void readPlayerUpdate(PacketBuffer var0, int var1) { - boolean var2 = var0.readBits(1) == 1; - if (var2) { - Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; - } - - int var3 = var0.readBits(2); - Player var4 = Client.players[var1]; - if (var3 == 0) { - if (var2) { - var4.field616 = false; - } else if (Client.localPlayerIndex == var1) { + static int method706(int var0, Script var1, boolean var2) { + int var3; + int var4; + if (var0 == ScriptOpcodes.CC_CREATE) { + class320.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + int var5 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 2]; + if (var4 == 0) { throw new RuntimeException(); } else { - Players.Players_regions[var1] = (var4.plane << 28) + (ScriptEvent.baseY * 64 + var4.pathY[0] >> 13) + (MusicPatchPcmStream.baseX * 64 + var4.pathX[0] >> 13 << 14); - if (var4.field960 != -1) { - Players.Players_orientations[var1] = var4.field960; + Widget var6 = Varps.getWidget(var3); + if (var6.children == null) { + var6.children = new Widget[var5 + 1]; + } + + if (var6.children.length <= var5) { + Widget[] var7 = new Widget[var5 + 1]; + + for (int var8 = 0; var8 < var6.children.length; ++var8) { + var7[var8] = var6.children[var8]; + } + + var6.children = var7; + } + + if (var5 > 0 && var6.children[var5 - 1] == null) { + throw new RuntimeException("" + (var5 - 1)); } else { - Players.Players_orientations[var1] = var4.orientation; - } + Widget var12 = new Widget(); + var12.type = var4; + var12.parentId = var12.id = var6.id; + var12.childIndex = var5; + var12.isIf3 = true; + var6.children[var5] = var12; + if (var2) { + class186.field2331 = var12; + } else { + MidiPcmStream.field2444 = var12; + } - Players.Players_targetIndices[var1] = var4.targetIndex; - Client.players[var1] = null; - if (var0.readBits(1) != 0) { - WorldMapDecorationType.updateExternalPlayer(var0, var1); + NPCDefinition.invalidateWidget(var6); + return 1; } - } } else { - int var5; - int var6; - int var7; - if (var3 == 1) { - var5 = var0.readBits(3); - var6 = var4.pathX[0]; - var7 = var4.pathY[0]; - if (var5 == 0) { - --var6; - --var7; - } else if (var5 == 1) { - --var7; - } else if (var5 == 2) { - ++var6; - --var7; - } else if (var5 == 3) { - --var6; - } else if (var5 == 4) { - ++var6; - } else if (var5 == 5) { - --var6; - ++var7; - } else if (var5 == 6) { - ++var7; - } else if (var5 == 7) { - ++var6; - ++var7; - } - - if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { - if (var2) { - var4.field616 = true; - var4.tileX = var6; - var4.tileY = var7; + Widget var9; + if (var0 == ScriptOpcodes.CC_DELETE) { + var9 = var2 ? class186.field2331 : MidiPcmStream.field2444; + Widget var10 = Varps.getWidget(var9.id); + var10.children[var9.childIndex] = null; + NPCDefinition.invalidateWidget(var10); + return 1; + } else if (var0 == ScriptOpcodes.CC_DELETEALL) { + var9 = Varps.getWidget(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); + var9.children = null; + NPCDefinition.invalidateWidget(var9); + return 1; + } else if (var0 != ScriptOpcodes.CC_FIND) { + if (var0 == ScriptOpcodes.IF_FIND) { + var9 = Varps.getWidget(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); + if (var9 != null) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 1; + if (var2) { + class186.field2331 = var9; + } else { + MidiPcmStream.field2444 = var9; + } } else { - var4.field616 = false; - var4.method1261(var6, var7, Players.field1231[var1]); + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; } + + return 1; } else { - var4.resetPath(var6, var7); - var4.field616 = false; + return 2; } - - } else if (var3 == 2) { - var5 = var0.readBits(4); - var6 = var4.pathX[0]; - var7 = var4.pathY[0]; - if (var5 == 0) { - var6 -= 2; - var7 -= 2; - } else if (var5 == 1) { - --var6; - var7 -= 2; - } else if (var5 == 2) { - var7 -= 2; - } else if (var5 == 3) { - ++var6; - var7 -= 2; - } else if (var5 == 4) { - var6 += 2; - var7 -= 2; - } else if (var5 == 5) { - var6 -= 2; - --var7; - } else if (var5 == 6) { - var6 += 2; - --var7; - } else if (var5 == 7) { - var6 -= 2; - } else if (var5 == 8) { - var6 += 2; - } else if (var5 == 9) { - var6 -= 2; - ++var7; - } else if (var5 == 10) { - var6 += 2; - ++var7; - } else if (var5 == 11) { - var6 -= 2; - var7 += 2; - } else if (var5 == 12) { - --var6; - var7 += 2; - } else if (var5 == 13) { - var7 += 2; - } else if (var5 == 14) { - ++var6; - var7 += 2; - } else if (var5 == 15) { - var6 += 2; - var7 += 2; - } - - if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { - if (var2) { - var4.field616 = true; - var4.tileX = var6; - var4.tileY = var7; - } else { - var4.field616 = false; - var4.method1261(var6, var7, Players.field1231[var1]); - } - } else { - var4.resetPath(var6, var7); - var4.field616 = false; - } - } else { - var5 = var0.readBits(1); - int var8; - int var9; - int var10; - int var11; - if (var5 == 0) { - var6 = var0.readBits(12); - var7 = var6 >> 10; - var8 = var6 >> 5 & 31; - if (var8 > 15) { - var8 -= 32; - } - - var9 = var6 & 31; - if (var9 > 15) { - var9 -= 32; - } - - var10 = var8 + var4.pathX[0]; - var11 = var9 + var4.pathY[0]; - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { - var4.resetPath(var10, var11); - var4.field616 = false; - } else if (var2) { - var4.field616 = true; - var4.tileX = var10; - var4.tileY = var11; + class320.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + Widget var11 = SpriteMask.getWidgetChild(var3, var4); + if (var11 != null && var4 != -1) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 1; + if (var2) { + class186.field2331 = var11; } else { - var4.field616 = false; - var4.method1261(var10, var11, Players.field1231[var1]); + MidiPcmStream.field2444 = var11; } - - var4.plane = (byte)(var7 + var4.plane & 3); - if (Client.localPlayerIndex == var1) { - UrlRequest.Client_plane = var4.plane; - } - } else { - var6 = var0.readBits(30); - var7 = var6 >> 28; - var8 = var6 >> 14 & 16383; - var9 = var6 & 16383; - var10 = (MusicPatchPcmStream.baseX * 64 + var8 + var4.pathX[0] & 16383) - MusicPatchPcmStream.baseX * 64; - var11 = (ScriptEvent.baseY * 64 + var9 + var4.pathY[0] & 16383) - ScriptEvent.baseY * 64; - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { - var4.resetPath(var10, var11); - var4.field616 = false; - } else if (var2) { - var4.field616 = true; - var4.tileX = var10; - var4.tileY = var11; - } else { - var4.field616 = false; - var4.method1261(var10, var11, Players.field1231[var1]); - } - - var4.plane = (byte)(var7 + var4.plane & 3); - if (Client.localPlayerIndex == var1) { - UrlRequest.Client_plane = var4.plane; - } - + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; } + + return 1; } } } - @ObfuscatedName("h") + @ObfuscatedName("ia") @ObfuscatedSignature( - signature = "(ILcu;ZI)I", - garbageValue = "-1199061483" + signature = "(III)V", + garbageValue = "-1052520169" ) - static int method692(int var0, Script var1, boolean var2) { - Widget var3 = Tile.getWidget(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); - if (var0 == ScriptOpcodes.IF_GETSCROLLX) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.scrollX; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.scrollY; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETTEXT) { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3.text; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.scrollWidth; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.scrollHeight; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.modelZoom; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.modelAngleX; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.modelAngleZ; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.modelAngleY; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETTRANSTOP) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.transparencyTop; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETTRANSBOT) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.transparencyBot; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.color; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.color2; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETFILLMODE) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; - return 1; - } else { - return 2; - } - } - - @ObfuscatedName("gr") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-2018851224" - ) - static void method686() { - if (Client.renderSelf) { - class14.addPlayerToScene(Message.localPlayer, false); - } - - } - - @ObfuscatedName("jt") - @ObfuscatedSignature( - signature = "([Lha;IIIIIIIB)V", - garbageValue = "71" - ) - @Export("updateInterface") - static final void updateInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - for (int var8 = 0; var8 < var0.length; ++var8) { - Widget var9 = var0[var8]; - if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || WorldMapSection0.getWidgetClickMask(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { - if (var9.isIf3) { - if (Varcs.isComponentHidden(var9)) { - continue; - } - } else if (var9.type == 0 && var9 != class16.mousedOverWidgetIf1 && Varcs.isComponentHidden(var9)) { - continue; - } - - int var10 = var9.x + var6; - int var11 = var7 + var9.y; - int var12; - int var13; - int var14; - int var15; - int var17; - int var18; - if (var9.type == 2) { - var12 = var2; - var13 = var3; - var14 = var4; - var15 = var5; - } else { - int var16; - if (var9.type == 9) { - var16 = var10; - var17 = var11; - var18 = var10 + var9.width; - int var19 = var11 + var9.height; - if (var18 < var10) { - var16 = var18; - var18 = var10; - } - - if (var19 < var11) { - var17 = var19; - var19 = var11; - } - - ++var18; - ++var19; - var12 = var16 > var2 ? var16 : var2; - var13 = var17 > var3 ? var17 : var3; - var14 = var18 < var4 ? var18 : var4; - var15 = var19 < var5 ? var19 : var5; - } else { - var16 = var10 + var9.width; - var17 = var11 + var9.height; - var12 = var10 > var2 ? var10 : var2; - var13 = var11 > var3 ? var11 : var3; - var14 = var16 < var4 ? var16 : var4; - var15 = var17 < var5 ? var17 : var5; - } - } - - if (var9 == Client.clickedWidget) { - Client.field809 = true; - Client.field882 = var10; - Client.field811 = var11; - } - - boolean var32 = false; - if (var9.field2625) { - switch(Client.field790) { - case 0: - var32 = true; - case 1: - default: - break; - case 2: - if (Client.field791 == var9.id >>> 16) { - var32 = true; - } - break; - case 3: - if (var9.id == Client.field791) { - var32 = true; - } - } - } - - if (var32 || !var9.isIf3 || var12 < var14 && var13 < var15) { - if (var9.isIf3) { - ScriptEvent var26; - if (var9.noClickThrough) { - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { - if (var26.isMouseInputEvent) { - var26.remove(); - var26.widget.containsMouse = false; - } - } - - if (WorldMapSection2.widgetDragDuration == 0) { - Client.clickedWidget = null; - Client.clickedWidgetParent = null; - } - - if (!Client.isMenuOpen) { - Actor.addCancelMenuEntry(); - } - } - } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { - if (var26.isMouseInputEvent && var26.widget.onScroll == var26.args) { - var26.remove(); - } - } - } - } - - var17 = MouseHandler.MouseHandler_x; - var18 = MouseHandler.MouseHandler_y; - if (MouseHandler.MouseHandler_lastButton != 0) { - var17 = MouseHandler.MouseHandler_lastPressedX; - var18 = MouseHandler.MouseHandler_lastPressedY; - } - - boolean var33 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; - if (var9.contentType == 1337) { - if (!Client.isLoading && !Client.isMenuOpen && var33) { - Huffman.addSceneMenuOptions(var17, var18, var12, var13); - } - } else if (var9.contentType == 1338) { - AbstractUserComparator.checkIfMinimapClicked(var9, var10, var11); - } else { - if (var9.contentType == 1400) { - GrandExchangeEvent.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var33, var10, var11, var9.width, var9.height); - } - - if (!Client.isMenuOpen && var33) { - if (var9.contentType == 1400) { - GrandExchangeEvent.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); - } else { - AbstractWorldMapData.method263(var9, var17 - var10, var18 - var11); - } - } - - boolean var21; - int var23; - if (var32) { - for (int var20 = 0; var20 < var9.field2626.length; ++var20) { - var21 = false; - boolean var22 = false; - if (!var21 && var9.field2626[var20] != null) { - for (var23 = 0; var23 < var9.field2626[var20].length; ++var23) { - boolean var24 = false; - if (var9.field2655 != null) { - var24 = KeyHandler.KeyHandler_pressedKeys[var9.field2626[var20][var23]]; - } - - if (ScriptEvent.method1185(var9.field2626[var20][var23]) || var24) { - var21 = true; - if (var9.field2655 != null && var9.field2655[var20] > Client.cycle) { - break; - } - - byte var25 = var9.field2629[var20][var23]; - if (var25 == 0 || ((var25 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var25 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var25 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var25 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { - var22 = true; - break; - } - } - } - } - - if (var22) { - if (var20 < 10) { - KeyHandler.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); - } else if (var20 == 10) { - GrandExchangeOfferUnitPriceComparator.Widget_runOnTargetLeave(); - WorldMapData_0.selectSpell(var9.id, var9.childIndex, class14.method157(WorldMapSection0.getWidgetClickMask(var9)), var9.itemId); - Client.selectedSpellActionName = class60.method1167(var9); - if (Client.selectedSpellActionName == null) { - Client.selectedSpellActionName = "null"; - } - - Client.selectedSpellName = var9.dataText + NPC.colorStartTag(16777215); - } - - var23 = var9.field2631[var20]; - if (var9.field2655 == null) { - var9.field2655 = new int[var9.field2626.length]; - } - - if (var9.field2670 == null) { - var9.field2670 = new int[var9.field2626.length]; - } - - if (var23 != 0) { - if (var9.field2655[var20] == 0) { - var9.field2655[var20] = var23 + Client.cycle + var9.field2670[var20]; - } else { - var9.field2655[var20] = var23 + Client.cycle; - } - } else { - var9.field2655[var20] = Integer.MAX_VALUE; - } - } - - if (!var21 && var9.field2655 != null) { - var9.field2655[var20] = 0; - } - } - } - - if (var9.isIf3) { - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - var33 = true; - } else { - var33 = false; - } - - boolean var34 = false; - if ((MouseHandler.MouseHandler_currentButton == 1 || !NetFileRequest.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var33) { - var34 = true; - } - - var21 = false; - if ((MouseHandler.MouseHandler_lastButton == 1 || !NetFileRequest.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { - var21 = true; - } - - if (var21) { - GrandExchangeOfferNameComparator.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11); - } - - if (var9.contentType == 1400) { - GrandExchangeEvent.worldMap.method6359(var17, var18, var33 & var34, var33 & var21); - } - - if (Client.clickedWidget != null && var9 != Client.clickedWidget && var33 && Player.method1278(WorldMapSection0.getWidgetClickMask(var9))) { - Client.draggedOnWidget = var9; - } - - if (var9 == Client.clickedWidgetParent) { - Client.field806 = true; - Client.field807 = var10; - Client.field808 = var11; - } - - if (var9.hasListener) { - ScriptEvent var27; - if (var33 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { - var27 = new ScriptEvent(); - var27.isMouseInputEvent = true; - var27.widget = var9; - var27.mouseY = Client.mouseWheelRotation; - var27.args = var9.onScroll; - Client.scriptEvents.addFirst(var27); - } - - if (Client.clickedWidget != null || ClientPreferences.dragInventoryWidget != null || Client.isMenuOpen) { - var21 = false; - var34 = false; - var33 = false; - } - - if (!var9.isClicked && var21) { - var9.isClicked = true; - if (var9.onClick != null) { - var27 = new ScriptEvent(); - var27.isMouseInputEvent = true; - var27.widget = var9; - var27.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; - var27.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; - var27.args = var9.onClick; - Client.scriptEvents.addFirst(var27); - } - } - - if (var9.isClicked && var34 && var9.onClickRepeat != null) { - var27 = new ScriptEvent(); - var27.isMouseInputEvent = true; - var27.widget = var9; - var27.mouseX = MouseHandler.MouseHandler_x - var10; - var27.mouseY = MouseHandler.MouseHandler_y - var11; - var27.args = var9.onClickRepeat; - Client.scriptEvents.addFirst(var27); - } - - if (var9.isClicked && !var34) { - var9.isClicked = false; - if (var9.onRelease != null) { - var27 = new ScriptEvent(); - var27.isMouseInputEvent = true; - var27.widget = var9; - var27.mouseX = MouseHandler.MouseHandler_x - var10; - var27.mouseY = MouseHandler.MouseHandler_y - var11; - var27.args = var9.onRelease; - Client.field883.addFirst(var27); - } - } - - if (var34 && var9.onHold != null) { - var27 = new ScriptEvent(); - var27.isMouseInputEvent = true; - var27.widget = var9; - var27.mouseX = MouseHandler.MouseHandler_x - var10; - var27.mouseY = MouseHandler.MouseHandler_y - var11; - var27.args = var9.onHold; - Client.scriptEvents.addFirst(var27); - } - - if (!var9.containsMouse && var33) { - var9.containsMouse = true; - if (var9.onMouseOver != null) { - var27 = new ScriptEvent(); - var27.isMouseInputEvent = true; - var27.widget = var9; - var27.mouseX = MouseHandler.MouseHandler_x - var10; - var27.mouseY = MouseHandler.MouseHandler_y - var11; - var27.args = var9.onMouseOver; - Client.scriptEvents.addFirst(var27); - } - } - - if (var9.containsMouse && var33 && var9.onMouseRepeat != null) { - var27 = new ScriptEvent(); - var27.isMouseInputEvent = true; - var27.widget = var9; - var27.mouseX = MouseHandler.MouseHandler_x - var10; - var27.mouseY = MouseHandler.MouseHandler_y - var11; - var27.args = var9.onMouseRepeat; - Client.scriptEvents.addFirst(var27); - } - - if (var9.containsMouse && !var33) { - var9.containsMouse = false; - if (var9.onMouseLeave != null) { - var27 = new ScriptEvent(); - var27.isMouseInputEvent = true; - var27.widget = var9; - var27.mouseX = MouseHandler.MouseHandler_x - var10; - var27.mouseY = MouseHandler.MouseHandler_y - var11; - var27.args = var9.onMouseLeave; - Client.field883.addFirst(var27); - } - } - - if (var9.onTimer != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onTimer; - Client.field865.addFirst(var27); - } - - ScriptEvent var30; - int var35; - int var36; - if (var9.onVarTransmit != null && Client.field648 > var9.field2685) { - if (var9.varTransmitTriggers != null && Client.field648 - var9.field2685 <= 32) { - label883: - for (var35 = var9.field2685; var35 < Client.field648; ++var35) { - var23 = Client.field814[var35 & 31]; - - for (var36 = 0; var36 < var9.varTransmitTriggers.length; ++var36) { - if (var23 == var9.varTransmitTriggers[var36]) { - var30 = new ScriptEvent(); - var30.widget = var9; - var30.args = var9.onVarTransmit; - Client.scriptEvents.addFirst(var30); - break label883; - } - } - } - } else { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onVarTransmit; - Client.scriptEvents.addFirst(var27); - } - - var9.field2685 = Client.field648; - } - - if (var9.onInvTransmit != null && Client.field701 > var9.field2686) { - if (var9.invTransmitTriggers != null && Client.field701 - var9.field2686 <= 32) { - label859: - for (var35 = var9.field2686; var35 < Client.field701; ++var35) { - var23 = Client.changedItemContainers[var35 & 31]; - - for (var36 = 0; var36 < var9.invTransmitTriggers.length; ++var36) { - if (var23 == var9.invTransmitTriggers[var36]) { - var30 = new ScriptEvent(); - var30.widget = var9; - var30.args = var9.onInvTransmit; - Client.scriptEvents.addFirst(var30); - break label859; - } - } - } - } else { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onInvTransmit; - Client.scriptEvents.addFirst(var27); - } - - var9.field2686 = Client.field701; - } - - if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field2687) { - if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field2687 <= 32) { - label835: - for (var35 = var9.field2687; var35 < Client.changedSkillsCount; ++var35) { - var23 = Client.changedSkills[var35 & 31]; - - for (var36 = 0; var36 < var9.statTransmitTriggers.length; ++var36) { - if (var23 == var9.statTransmitTriggers[var36]) { - var30 = new ScriptEvent(); - var30.widget = var9; - var30.args = var9.onStatTransmit; - Client.scriptEvents.addFirst(var30); - break label835; - } - } - } - } else { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onStatTransmit; - Client.scriptEvents.addFirst(var27); - } - - var9.field2687 = Client.changedSkillsCount; - } - - if (Client.chatCycle > var9.field2583 && var9.onChatTransmit != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onChatTransmit; - Client.scriptEvents.addFirst(var27); - } - - if (Client.field711 > var9.field2583 && var9.onFriendTransmit != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onFriendTransmit; - Client.scriptEvents.addFirst(var27); - } - - if (Client.field862 > var9.field2583 && var9.onClanTransmit != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onClanTransmit; - Client.scriptEvents.addFirst(var27); - } - - if (Client.field823 > var9.field2583 && var9.onStockTransmit != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onStockTransmit; - Client.scriptEvents.addFirst(var27); - } - - if (Client.field860 > var9.field2583 && var9.field2562 != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.field2562; - Client.scriptEvents.addFirst(var27); - } - - if (Client.field825 > var9.field2583 && var9.onMiscTransmit != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onMiscTransmit; - Client.scriptEvents.addFirst(var27); - } - - var9.field2583 = Client.cycleCntr; - if (var9.onKey != null) { - for (var35 = 0; var35 < Client.field849; ++var35) { - ScriptEvent var31 = new ScriptEvent(); - var31.widget = var9; - var31.keyTyped = Client.field851[var35]; - var31.keyPressed = Client.field850[var35]; - var31.args = var9.onKey; - Client.scriptEvents.addFirst(var31); - } - } - } - } - - if (!var9.isIf3) { - if (Client.clickedWidget != null || ClientPreferences.dragInventoryWidget != null || Client.isMenuOpen) { - continue; - } - - if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - if (var9.mouseOverRedirect >= 0) { - class16.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; - } else { - class16.mousedOverWidgetIf1 = var9; - } - } - - if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - class14.field90 = var9; - } - - if (var9.scrollHeight > var9.height) { - WorldMapSection2.method321(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); - } - } - - if (var9.type == 0) { - updateInterface(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); - if (var9.children != null) { - updateInterface(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); - } - - InterfaceParent var28 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); - if (var28 != null) { - if (var28.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { - for (ScriptEvent var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) { - if (var29.isMouseInputEvent) { - var29.remove(); - var29.widget.containsMouse = false; - } - } - - if (WorldMapSection2.widgetDragDuration == 0) { - Client.clickedWidget = null; - Client.clickedWidgetParent = null; - } - - if (!Client.isMenuOpen) { - Actor.addCancelMenuEntry(); - } - } - - Buffer.updateRootInterface(var28.group, var12, var13, var14, var15, var10, var11); - } - } - } - } - } - } - + @Export("resumePauseWidget") + static void resumePauseWidget(int var0, int var1) { + PacketBufferNode var2 = TilePaint.getPacketBufferNode(ClientPacket.field2256, Client.packetWriter.isaacCipher); + var2.packetBuffer.writeShortLE(var1); + var2.packetBuffer.writeInt(var0); + Client.packetWriter.addNode(var2); } } diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java index 2393428d50..6e1a3d4843 100644 --- a/runescape-client/src/main/java/WorldMapCacheName.java +++ b/runescape-client/src/main/java/WorldMapCacheName.java @@ -1,149 +1,317 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("an") +@ObfuscatedName("as") @Implements("WorldMapCacheName") public class WorldMapCacheName { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lan;" + signature = "Las;" ) - public static final WorldMapCacheName field291; + public static final WorldMapCacheName field313; + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "Las;" + ) + public static final WorldMapCacheName field309; + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "Las;" + ) + public static final WorldMapCacheName field310; + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "Las;" + ) + static final WorldMapCacheName field311; @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lan;" + signature = "Las;" ) - public static final WorldMapCacheName field286; - @ObfuscatedName("y") + public static final WorldMapCacheName field312; + @ObfuscatedName("as") @ObfuscatedSignature( - signature = "Lan;" + signature = "Lll;" ) - public static final WorldMapCacheName field287; - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lan;" - ) - static final WorldMapCacheName field288; - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lan;" - ) - public static final WorldMapCacheName field289; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = -1099236205 - ) - static int field293; - @ObfuscatedName("b") + static Bounds field315; + @ObfuscatedName("g") @Export("name") public final String name; static { - field291 = new WorldMapCacheName("details"); - field286 = new WorldMapCacheName("compositemap"); - field287 = new WorldMapCacheName("compositetexture"); - field288 = new WorldMapCacheName("area"); - field289 = new WorldMapCacheName("labels"); + field313 = new WorldMapCacheName("details"); + field309 = new WorldMapCacheName("compositemap"); + field310 = new WorldMapCacheName("compositetexture"); + field311 = new WorldMapCacheName("area"); + field312 = new WorldMapCacheName("labels"); } WorldMapCacheName(String var1) { this.name = var1; } - @ObfuscatedName("y") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-61" + signature = "(I)V", + garbageValue = "1252673540" ) - static void method618() { - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { - Login.currentLoginField = 1; - } else { - Login.currentLoginField = 0; - } + public static void method635() { + VarpDefinition.VarpDefinition_cached.clear(); + } + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "(I)Lbg;", + garbageValue = "-1273347213" + ) + @Export("worldListStart") + static World worldListStart() { + World.World_listCount = 0; + return DefaultsGroup.getNextWorldListWorld(); } @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(ILhz;Ljava/lang/String;Ljava/lang/String;IZI)V", - garbageValue = "-1803872156" + signature = "(I)V", + garbageValue = "-1459366503" ) - public static void method616(int var0, AbstractArchive var1, String var2, String var3, int var4, boolean var5) { - int var6 = var1.getGroupId(var2); - int var7 = var1.getFileId(var6, var3); - class4.method59(var0, var1, var6, var7, var4, var5); + static void method634() { + Login.loginIndex = 24; + Tiles.setLoginResponseString("", "You were disconnected from the server.", ""); } - @ObfuscatedName("x") + @ObfuscatedName("al") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-574207472" + signature = "(ILce;ZB)I", + garbageValue = "8" ) - public static boolean method619() { - try { - if (class197.field2392 == 2) { - if (class197.musicTrack == null) { - class197.musicTrack = MusicTrack.readTrack(Coord.musicTrackArchive, class16.musicTrackGroupId, GrandExchangeOffer.musicTrackFileId); - if (class197.musicTrack == null) { - return false; - } - } - - if (class268.soundCache == null) { - class268.soundCache = new SoundCache(class197.soundEffectsArchive, class197.musicSamplesArchive); - } - - if (GZipDecompressor.midiPcmStream.loadMusicTrack(class197.musicTrack, class197.musicPatchesArchive, class268.soundCache, 22050)) { - GZipDecompressor.midiPcmStream.clearAll(); - GZipDecompressor.midiPcmStream.setPcmStreamVolume(class197.musicTrackVolume); - GZipDecompressor.midiPcmStream.setMusicTrack(class197.musicTrack, WorldMapDecoration.musicTrackBoolean); - class197.field2392 = 0; - class197.musicTrack = null; - class268.soundCache = null; - Coord.musicTrackArchive = null; - return true; - } - } - } catch (Exception var1) { - var1.printStackTrace(); - GZipDecompressor.midiPcmStream.clear(); - class197.field2392 = 0; - class197.musicTrack = null; - class268.soundCache = null; - Coord.musicTrackArchive = null; - } - - return false; - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(Lha;II)V", - garbageValue = "-1662716370" - ) - @Export("Widget_setKeyIgnoreHeld") - static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { - if (var0.field2626 == null) { - throw new RuntimeException(); + static int method633(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = UserComparator8.loadWorlds() ? 1 : 0; + return 1; } else { - if (var0.field2655 == null) { - var0.field2655 = new int[var0.field2626.length]; - } + World var3; + if (var0 == ScriptOpcodes.WORLDLIST_START) { + var3 = worldListStart(); + if (var3 != null) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.id; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.properties; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3.activity; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.location; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.population; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3.host; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + } - var0.field2655[var1] = Integer.MAX_VALUE; + return 1; + } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { + var3 = DefaultsGroup.getNextWorldListWorld(); + if (var3 != null) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.id; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.properties; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3.activity; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.location; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.population; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3.host; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else { + World var4; + int var5; + int var7; + if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { + var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + var4 = null; + + for (var5 = 0; var5 < World.World_count; ++var5) { + if (var7 == class96.World_worlds[var5].id) { + var4 = class96.World_worlds[var5]; + break; + } + } + + if (var4 != null) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var4.id; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var4.properties; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var4.activity; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var4.location; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var4.population; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var4.host; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { + class320.Interpreter_intStackSize -= 4; + var7 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + boolean var10 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1] == 1; + var5 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 2]; + boolean var6 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 3] == 1; + WorldMapDecoration.sortWorldList(var7, var10, var5, var6); + return 1; + } else if (var0 != ScriptOpcodes.GETWORLDINFO) { + if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { + Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + return 1; + } else { + int var8; + ParamDefinition var9; + if (var0 == ScriptOpcodes.NC_PARAM) { + class320.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + var9 = PacketBufferNode.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = NetCache.getNpcDefinition(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = NetCache.getNpcDefinition(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } else if (var0 == ScriptOpcodes.LC_PARAM) { + class320.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + var9 = PacketBufferNode.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = Occluder.getObjectDefinition(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Occluder.getObjectDefinition(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_PARAM) { + class320.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + var9 = PacketBufferNode.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = HealthBarDefinition.ItemDefinition_get(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = HealthBarDefinition.ItemDefinition_get(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { + class320.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + var9 = PacketBufferNode.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = Fonts.StructDefinition_getStructDefinition(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Fonts.StructDefinition_getStructDefinition(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } else if (var0 == ScriptOpcodes.ON_MOBILE) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLIENTTYPE) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.clientType & 3; + return 1; + } else if (var0 == 6520) { + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { + return 1; + } else if (var0 == 6522) { + --Message.Interpreter_stringStackSize; + --class320.Interpreter_intStackSize; + return 1; + } else if (var0 == 6523) { + --Message.Interpreter_stringStackSize; + --class320.Interpreter_intStackSize; + return 1; + } else if (var0 == ScriptOpcodes.BATTERYLEVEL) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; + return 1; + } else if (var0 == ScriptOpcodes.BATTERYCHARGING) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 1; + return 1; + } else if (var0 == ScriptOpcodes.WIFIAVAILABLE) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 1; + return 1; + } else { + return 2; + } + } + } else { + var7 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + if (var7 >= 0 && var7 < World.World_count) { + var4 = class96.World_worlds[var7]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var4.id; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var4.properties; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var4.activity; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var4.location; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var4.population; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var4.host; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } + } } } - @ObfuscatedName("n") + @ObfuscatedName("is") + @ObfuscatedSignature( + signature = "(II)Ljava/lang/String;", + garbageValue = "1758289835" + ) + @Export("formatItemStacks") + static final String formatItemStacks(int var0) { + String var1 = Integer.toString(var0); + + for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { + var1 = var1.substring(0, var2) + "," + var1.substring(var2); + } + + if (var1.length() > 9) { + return " " + PacketWriter.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; + } else { + return var1.length() > 6 ? " " + PacketWriter.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + PacketWriter.colorStartTag(16776960) + var1 + ""; + } + } + + @ObfuscatedName("lj") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "158917025" + garbageValue = "1011989365" ) - static final void method620() { - Tiles.method1143("You can't add yourself to your own ignore list"); + static void method636() { + if (Client.oculusOrbState == 1) { + Client.field728 = true; + } + } } diff --git a/runescape-client/src/main/java/WorldMapData_0.java b/runescape-client/src/main/java/WorldMapData_0.java index 9a43eda611..373571ef54 100644 --- a/runescape-client/src/main/java/WorldMapData_0.java +++ b/runescape-client/src/main/java/WorldMapData_0.java @@ -1,64 +1,74 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("l") +@ObfuscatedName("w") @Implements("WorldMapData_0") public class WorldMapData_0 extends AbstractWorldMapData { - @ObfuscatedName("qb") - @ObfuscatedGetter( - intValue = -1984844597 - ) - static int field92; - @ObfuscatedName("gy") + @ObfuscatedName("sk") + @Export("foundItemIds") + static short[] foundItemIds; + @ObfuscatedName("fm") @ObfuscatedSignature( - signature = "[Lls;" + signature = "Lei;" ) - @Export("headIconHintSprites") - static Sprite[] headIconHintSprites; + @Export("urlRequester") + static UrlRequester urlRequester; + @ObfuscatedName("fg") + @ObfuscatedSignature( + signature = "Lko;" + ) + @Export("fontPlain11") + static Font fontPlain11; + @ObfuscatedName("gh") + @ObfuscatedSignature( + signature = "[Llt;" + ) + @Export("crossSprites") + static Sprite[] crossSprites; WorldMapData_0() { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lkq;I)V", - garbageValue = "-2087111410" + signature = "(Lkp;B)V", + garbageValue = "-109" ) @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); - if (var2 != WorldMapID.field252.value) { + if (var2 != WorldMapID.field277.value) { throw new IllegalStateException(""); } else { super.minPlane = var1.readUnsignedByte(); super.planes = var1.readUnsignedByte(); - super.regionXLow = var1.readUnsignedShort() * 64; - super.regionYLow = var1.readUnsignedShort() * 4096; + super.regionXLow = var1.readUnsignedShort() * 4096; + super.regionYLow = var1.readUnsignedShort() * 64; super.regionX = var1.readUnsignedShort(); super.regionY = var1.readUnsignedShort(); - super.groupId = var1.method5560(); - super.fileId = var1.method5560(); + super.groupId = var1.method5593(); + super.fileId = var1.method5593(); } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lkq;I)V", - garbageValue = "1425420215" + signature = "(Lkp;S)V", + garbageValue = "-30591" ) @Export("readGeography") void readGeography(Buffer var1) { super.planes = Math.min(super.planes, 4); super.floorUnderlayIds = new short[1][64][64]; super.floorOverlayIds = new short[super.planes][64][64]; - super.field150 = new byte[super.planes][64][64]; - super.field149 = new byte[super.planes][64][64]; + super.field188 = new byte[super.planes][64][64]; + super.field175 = new byte[super.planes][64][64]; super.decorations = new WorldMapDecoration[super.planes][64][64][]; int var2 = var1.readUnsignedByte(); - if (var2 != class30.field246.value) { + if (var2 != class30.field270.value) { throw new IllegalStateException(""); } else { int var3 = var1.readUnsignedByte(); @@ -81,7 +91,7 @@ public class WorldMapData_0 extends AbstractWorldMapData { return false; } else { WorldMapData_0 var2 = (WorldMapData_0)var1; - return super.regionX == var2.regionX && super.regionY == var2.regionY; + return var2.regionX == super.regionX && var2.regionY == super.regionY; } } @@ -89,138 +99,77 @@ public class WorldMapData_0 extends AbstractWorldMapData { return super.regionX | super.regionY << 8; } + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(ILii;Ljava/lang/String;Ljava/lang/String;IZI)V", + garbageValue = "-1022524213" + ) + public static void method189(int var0, AbstractArchive var1, String var2, String var3, int var4, boolean var5) { + int var6 = var1.getGroupId(var2); + int var7 = var1.getFileId(var6, var3); + TaskHandler.method3554(var0, var1, var6, var7, var4, var5); + } + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lls;IIII)V", - garbageValue = "-1317915753" + signature = "(B)V", + garbageValue = "1" ) - static void method169(Sprite var0, int var1, int var2, int var3) { - DemotingHashTable var4 = WorldMapRegion.WorldMapRegion_cachedSprites; - long var6 = (long)(var3 << 16 | var1 << 8 | var2); - var4.put(var0, var6, var0.pixels.length * 4); + public static void method181() { + SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); + SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); } - @ObfuscatedName("p") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "-45" + signature = "(III)Z", + garbageValue = "-1614694262" ) - public static int method164(int var0, int var1) { - int var2 = var0 >>> 31; - return (var0 + var2) / var1 - var2; + static final boolean method187(int var0, int var1) { + ObjectDefinition var2 = Occluder.getObjectDefinition(var0); + if (var1 == 11) { + var1 = 10; + } + + if (var1 >= 5 && var1 <= 8) { + var1 = 4; + } + + return var2.method4675(var1); } - @ObfuscatedName("e") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(IIZB)Ljava/lang/String;", - garbageValue = "118" + signature = "(ILce;ZI)I", + garbageValue = "-1897390403" ) - static String method163(int var0, int var1, boolean var2) { - if (var1 >= 2 && var1 <= 36) { - if (var2 && var0 >= 0) { - int var3 = 2; - - for (int var4 = var0 / var1; var4 != 0; ++var3) { - var4 /= var1; + static int method175(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? class186.field2331 : MidiPcmStream.field2444; + if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = class83.method2108(WorldMapIcon_0.getWidgetClickMask(var3)); + return 1; + } else if (var0 != ScriptOpcodes.CC_GETOP) { + if (var0 == ScriptOpcodes.CC_GETOPBASE) { + if (var3.dataText == null) { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3.dataText; } - char[] var5 = new char[var3]; - var5[0] = '+'; - - for (int var6 = var3 - 1; var6 > 0; --var6) { - int var7 = var0; - var0 /= var1; - int var8 = var7 - var0 * var1; - if (var8 >= 10) { - var5[var6] = (char)(var8 + 87); - } else { - var5[var6] = (char)(var8 + 48); - } - } - - return new String(var5); + return 1; } else { - return Integer.toString(var0, var1); + return 2; } } else { - throw new IllegalArgumentException("" + var1); - } - } - - @ObfuscatedName("fg") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-991747570" - ) - @Export("forceDisconnect") - static final void forceDisconnect(int var0) { - InterfaceParent.logOut(); - switch(var0) { - case 1: - Login.loginIndex = 24; - AbstractWorldMapData.setLoginResponseString("", "You were disconnected from the server.", ""); - break; - case 2: - Login.loginIndex = 24; - AbstractWorldMapData.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); - } - - } - - @ObfuscatedName("iy") - @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "-1702503786" - ) - @Export("selectSpell") - static void selectSpell(int var0, int var1, int var2, int var3) { - Widget var4 = BZip2State.getWidgetChild(var0, var1); - if (var4 != null && var4.onTargetEnter != null) { - ScriptEvent var5 = new ScriptEvent(); - var5.widget = var4; - var5.args = var4.onTargetEnter; - Client.runScriptEvent(var5); - } - - Client.field785 = var3; - Client.isSpellSelected = true; - WorldMapDecoration.selectedSpellWidget = var0; - Client.selectedSpellChildIndex = var1; - ReflectionCheck.selectedSpellFlags = var2; - LoginPacket.invalidateWidget(var4); - } - - @ObfuscatedName("jk") - @ObfuscatedSignature( - signature = "(Lha;I)Z", - garbageValue = "-2123617287" - ) - @Export("runCs1") - static final boolean runCs1(Widget var0) { - if (var0.cs1Comparisons == null) { - return false; - } else { - for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { - int var2 = User.method5076(var0, var1); - int var3 = var0.cs1ComparisonValues[var1]; - if (var0.cs1Comparisons[var1] == 2) { - if (var2 >= var3) { - return false; - } - } else if (var0.cs1Comparisons[var1] == 3) { - if (var2 <= var3) { - return false; - } - } else if (var0.cs1Comparisons[var1] == 4) { - if (var3 == var2) { - return false; - } - } else if (var3 != var2) { - return false; - } + int var4 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + --var4; + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3.actions[var4]; + } else { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; } - return true; + return 1; } } } diff --git a/runescape-client/src/main/java/WorldMapData_1.java b/runescape-client/src/main/java/WorldMapData_1.java index c0e285f7b4..86da01a59c 100644 --- a/runescape-client/src/main/java/WorldMapData_1.java +++ b/runescape-client/src/main/java/WorldMapData_1.java @@ -4,42 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ag") +@ObfuscatedName("ar") @Implements("WorldMapData_1") public class WorldMapData_1 extends AbstractWorldMapData { - @ObfuscatedName("dp") - @ObfuscatedSignature( - signature = "Lif;" - ) - @Export("archive3") - static Archive archive3; - @ObfuscatedName("el") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -88926389 + intValue = -352069921 ) - @Export("port3") - static int port3; - @ObfuscatedName("l") + @Export("canvasHeight") + public static int canvasHeight; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 143866825 + intValue = 650382493 ) @Export("chunkXLow") int chunkXLow; - @ObfuscatedName("t") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1351915861 + intValue = 214088681 ) @Export("chunkYLow") int chunkYLow; - @ObfuscatedName("j") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1168236865 + intValue = -1958393799 ) @Export("chunkX") int chunkX; - @ObfuscatedName("n") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -450265365 + intValue = -1560494711 ) @Export("chunkY") int chunkY; @@ -47,47 +41,47 @@ public class WorldMapData_1 extends AbstractWorldMapData { WorldMapData_1() { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lkq;I)V", - garbageValue = "1553886419" + signature = "(Lkp;I)V", + garbageValue = "-431510829" ) @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); - if (var2 != WorldMapID.field253.value) { + if (var2 != WorldMapID.field278.value) { throw new IllegalStateException(""); } else { super.minPlane = var1.readUnsignedByte(); super.planes = var1.readUnsignedByte(); - super.regionXLow = var1.readUnsignedShort() * 64; - super.regionYLow = var1.readUnsignedShort() * 4096; + super.regionXLow = var1.readUnsignedShort() * 4096; + super.regionYLow = var1.readUnsignedShort() * 64; this.chunkXLow = var1.readUnsignedByte(); this.chunkYLow = var1.readUnsignedByte(); super.regionX = var1.readUnsignedShort(); super.regionY = var1.readUnsignedShort(); this.chunkX = var1.readUnsignedByte(); this.chunkY = var1.readUnsignedByte(); - super.groupId = var1.method5560(); - super.fileId = var1.method5560(); + super.groupId = var1.method5593(); + super.fileId = var1.method5593(); } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lkq;I)V", - garbageValue = "1425420215" + signature = "(Lkp;S)V", + garbageValue = "-30591" ) @Export("readGeography") void readGeography(Buffer var1) { super.planes = Math.min(super.planes, 4); super.floorUnderlayIds = new short[1][64][64]; super.floorOverlayIds = new short[super.planes][64][64]; - super.field150 = new byte[super.planes][64][64]; - super.field149 = new byte[super.planes][64][64]; + super.field188 = new byte[super.planes][64][64]; + super.field175 = new byte[super.planes][64][64]; super.decorations = new WorldMapDecoration[super.planes][64][64][]; int var2 = var1.readUnsignedByte(); - if (var2 != class30.field251.value) { + if (var2 != class30.field271.value) { throw new IllegalStateException(""); } else { int var3 = var1.readUnsignedByte(); @@ -107,131 +101,134 @@ public class WorldMapData_1 extends AbstractWorldMapData { } } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-1398372761" + signature = "(B)I", + garbageValue = "35" ) @Export("getChunkXLow") int getChunkXLow() { return this.chunkXLow; } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-2116975369" + signature = "(B)I", + garbageValue = "105" ) @Export("getChunkYLow") int getChunkYLow() { return this.chunkYLow; } - @ObfuscatedName("an") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-28" + signature = "(I)I", + garbageValue = "-1796035286" ) @Export("getChunkX") int getChunkX() { return this.chunkX; } - @ObfuscatedName("ar") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1663251439" + garbageValue = "1186864483" ) @Export("getChunkY") int getChunkY() { return this.chunkY; } - public int hashCode() { - return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; - } - public boolean equals(Object var1) { if (!(var1 instanceof WorldMapData_1)) { return false; } else { WorldMapData_1 var2 = (WorldMapData_1)var1; - if (super.regionX == var2.regionX && var2.regionY == super.regionY) { - return var2.chunkX == this.chunkX && this.chunkY == var2.chunkY; + if (var2.regionX == super.regionX && var2.regionY == super.regionY) { + return this.chunkX == var2.chunkX && this.chunkY == var2.chunkY; } else { return false; } } } - @ObfuscatedName("f") + public int hashCode() { + return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; + } + + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1451049643" + garbageValue = "-1587846163" ) - static void method722() { - if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { - KeyHandler.KeyHandler_keyCodes[186] = 57; - KeyHandler.KeyHandler_keyCodes[187] = 27; - KeyHandler.KeyHandler_keyCodes[188] = 71; - KeyHandler.KeyHandler_keyCodes[189] = 26; - KeyHandler.KeyHandler_keyCodes[190] = 72; - KeyHandler.KeyHandler_keyCodes[191] = 73; - KeyHandler.KeyHandler_keyCodes[192] = 58; - KeyHandler.KeyHandler_keyCodes[219] = 42; - KeyHandler.KeyHandler_keyCodes[220] = 74; - KeyHandler.KeyHandler_keyCodes[221] = 43; - KeyHandler.KeyHandler_keyCodes[222] = 59; - KeyHandler.KeyHandler_keyCodes[223] = 28; - } else { - KeyHandler.KeyHandler_keyCodes[44] = 71; - KeyHandler.KeyHandler_keyCodes[45] = 26; - KeyHandler.KeyHandler_keyCodes[46] = 72; - KeyHandler.KeyHandler_keyCodes[47] = 73; - KeyHandler.KeyHandler_keyCodes[59] = 57; - KeyHandler.KeyHandler_keyCodes[61] = 27; - KeyHandler.KeyHandler_keyCodes[91] = 42; - KeyHandler.KeyHandler_keyCodes[92] = 74; - KeyHandler.KeyHandler_keyCodes[93] = 43; - KeyHandler.KeyHandler_keyCodes[192] = 28; - KeyHandler.KeyHandler_keyCodes[222] = 58; - KeyHandler.KeyHandler_keyCodes[520] = 59; + @Export("savePreferences") + static void savePreferences() { + AccessFile var0 = null; + + try { + var0 = WorldMapRectangle.getPreferencesFile("", class14.field102.name, true); + Buffer var1 = WorldMapSection2.clientPreferences.toBuffer(); + var0.write(var1.array, 0, var1.offset); + } catch (Exception var3) { + } + + try { + if (var0 != null) { + var0.closeSync(true); + } + } catch (Exception var2) { } } - @ObfuscatedName("n") + @ObfuscatedName("j") + static boolean method732(long var0) { + return (int)(var0 >>> 16 & 1L) == 1; + } + + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IIIIIIII)Z", - garbageValue = "610798807" + signature = "(II)I", + garbageValue = "1876587331" ) - static final boolean method699(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var7 = ViewportMouse.ViewportMouse_y + var6; - if (var7 < var0 && var7 < var1 && var7 < var2) { - return false; + public static int method712(int var0) { + if (var0 > 0) { + return 1; } else { - var7 = ViewportMouse.ViewportMouse_y - var6; - if (var7 > var0 && var7 > var1 && var7 > var2) { - return false; - } else { - var7 = ViewportMouse.ViewportMouse_x + var6; - if (var7 < var3 && var7 < var4 && var7 < var5) { - return false; - } else { - var7 = ViewportMouse.ViewportMouse_x - var6; - return var7 <= var3 || var7 <= var4 || var7 <= var5; - } + return var0 < 0 ? -1 : 0; + } + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + signature = "(ILhj;ZB)V", + garbageValue = "89" + ) + static void method731(int var0, Coord var1, boolean var2) { + WorldMapArea var3 = GrandExchangeOfferUnitPriceComparator.getWorldMap().getMapArea(var0); + int var4 = class192.localPlayer.plane; + int var5 = Messages.baseX * 64 + (class192.localPlayer.x >> 7); + int var6 = Language.baseY * 64 + (class192.localPlayer.y >> 7); + Coord var7 = new Coord(var4, var5, var6); + GrandExchangeOfferUnitPriceComparator.getWorldMap().method6377(var3, var7, var1, var2); + } + + @ObfuscatedName("gj") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1054316430" + ) + static void method733() { + int var0 = Players.Players_count; + int[] var1 = Players.Players_indices; + + for (int var2 = 0; var2 < var0; ++var2) { + if (var1[var2] != Client.combatTargetPlayerIndex && var1[var2] != Client.localPlayerIndex) { + class51.addPlayerToScene(Client.players[var1[var2]], true); } } - } - @ObfuscatedName("hz") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1258797506" - ) - static void method708() { - Client.menuOptionsCount = 0; - Client.isMenuOpen = false; } } diff --git a/runescape-client/src/main/java/WorldMapDecoration.java b/runescape-client/src/main/java/WorldMapDecoration.java index b9f4df495f..a2a534686d 100644 --- a/runescape-client/src/main/java/WorldMapDecoration.java +++ b/runescape-client/src/main/java/WorldMapDecoration.java @@ -3,40 +3,25 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -@ObfuscatedName("q") +@ObfuscatedName("u") @Implements("WorldMapDecoration") public class WorldMapDecoration { @ObfuscatedName("c") - @Export("musicTrackBoolean") - static boolean musicTrackBoolean; - @ObfuscatedName("ei") @ObfuscatedGetter( - intValue = -2012639545 - ) - static int field195; - @ObfuscatedName("lt") - @ObfuscatedGetter( - intValue = 1281740027 - ) - @Export("selectedSpellWidget") - static int selectedSpellWidget; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -213451189 + intValue = 2038989741 ) @Export("objectDefinitionId") final int objectDefinitionId; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1408254649 + intValue = 1678601373 ) @Export("decoration") final int decoration; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1062701969 + intValue = -1725461175 ) @Export("rotation") final int rotation; @@ -47,68 +32,280 @@ public class WorldMapDecoration { this.rotation = var3; } - @ObfuscatedName("f") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "([BI)Lav;", - garbageValue = "-2072507802" + signature = "(IIILfk;Lfv;I)Z", + garbageValue = "-802024285" ) - static WorldMapSprite method325(byte[] var0) { - return var0 == null ? new WorldMapSprite() : new WorldMapSprite(GrandExchangeOfferTotalQuantityComparator.convertJpgToSprite(var0).pixels); - } + public static final boolean method346(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4) { + int var5 = var0; + int var6 = var1; + byte var7 = 64; + byte var8 = 64; + int var9 = var0 - var7; + int var10 = var1 - var8; + class173.directions[var7][var8] = 99; + class173.distances[var7][var8] = 0; + byte var11 = 0; + int var12 = 0; + class173.bufferX[var11] = var0; + int var20 = var11 + 1; + class173.bufferY[var11] = var1; + int[][] var13 = var4.flags; - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)Ljava/lang/Class;", - garbageValue = "-53" - ) - @Export("loadClassFromDescriptor") - static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { - if (var0.equals("B")) { - return Byte.TYPE; - } else if (var0.equals("I")) { - return Integer.TYPE; - } else if (var0.equals("S")) { - return Short.TYPE; - } else if (var0.equals("J")) { - return Long.TYPE; - } else if (var0.equals("Z")) { - return Boolean.TYPE; - } else if (var0.equals("F")) { - return Float.TYPE; - } else if (var0.equals("D")) { - return Double.TYPE; - } else if (var0.equals("C")) { - return Character.TYPE; - } else { - return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); + while (true) { + label310: + while (true) { + int var14; + int var15; + int var16; + int var17; + int var18; + int var19; + do { + do { + do { + label287: + do { + if (var12 == var20) { + ChatChannel.field1289 = var5; + class173.field2093 = var6; + return false; + } + + var5 = class173.bufferX[var12]; + var6 = class173.bufferY[var12]; + var12 = var12 + 1 & 4095; + var18 = var5 - var9; + var19 = var6 - var10; + var14 = var5 - var4.xInset; + var15 = var6 - var4.yInset; + if (var3.hasArrived(var2, var5, var6, var4)) { + ChatChannel.field1289 = var5; + class173.field2093 = var6; + return true; + } + + var16 = class173.distances[var18][var19] + 1; + if (var18 > 0 && class173.directions[var18 - 1][var19] == 0 && (var13[var14 - 1][var15] & 19136782) == 0 && (var13[var14 - 1][var15 + var2 - 1] & 19136824) == 0) { + var17 = 1; + + while (true) { + if (var17 >= var2 - 1) { + class173.bufferX[var20] = var5 - 1; + class173.bufferY[var20] = var6; + var20 = var20 + 1 & 4095; + class173.directions[var18 - 1][var19] = 2; + class173.distances[var18 - 1][var19] = var16; + break; + } + + if ((var13[var14 - 1][var17 + var15] & 19136830) != 0) { + break; + } + + ++var17; + } + } + + if (var18 < 128 - var2 && class173.directions[var18 + 1][var19] == 0 && (var13[var14 + var2][var15] & 19136899) == 0 && (var13[var14 + var2][var15 + var2 - 1] & 19136992) == 0) { + var17 = 1; + + while (true) { + if (var17 >= var2 - 1) { + class173.bufferX[var20] = var5 + 1; + class173.bufferY[var20] = var6; + var20 = var20 + 1 & 4095; + class173.directions[var18 + 1][var19] = 8; + class173.distances[var18 + 1][var19] = var16; + break; + } + + if ((var13[var14 + var2][var17 + var15] & 19136995) != 0) { + break; + } + + ++var17; + } + } + + if (var19 > 0 && class173.directions[var18][var19 - 1] == 0 && (var13[var14][var15 - 1] & 19136782) == 0 && (var13[var14 + var2 - 1][var15 - 1] & 19136899) == 0) { + var17 = 1; + + while (true) { + if (var17 >= var2 - 1) { + class173.bufferX[var20] = var5; + class173.bufferY[var20] = var6 - 1; + var20 = var20 + 1 & 4095; + class173.directions[var18][var19 - 1] = 1; + class173.distances[var18][var19 - 1] = var16; + break; + } + + if ((var13[var17 + var14][var15 - 1] & 19136911) != 0) { + break; + } + + ++var17; + } + } + + if (var19 < 128 - var2 && class173.directions[var18][var19 + 1] == 0 && (var13[var14][var15 + var2] & 19136824) == 0 && (var13[var14 + var2 - 1][var15 + var2] & 19136992) == 0) { + var17 = 1; + + while (true) { + if (var17 >= var2 - 1) { + class173.bufferX[var20] = var5; + class173.bufferY[var20] = var6 + 1; + var20 = var20 + 1 & 4095; + class173.directions[var18][var19 + 1] = 4; + class173.distances[var18][var19 + 1] = var16; + break; + } + + if ((var13[var17 + var14][var15 + var2] & 19137016) != 0) { + break; + } + + ++var17; + } + } + + if (var18 > 0 && var19 > 0 && class173.directions[var18 - 1][var19 - 1] == 0 && (var13[var14 - 1][var15 - 1] & 19136782) == 0) { + var17 = 1; + + while (true) { + if (var17 >= var2) { + class173.bufferX[var20] = var5 - 1; + class173.bufferY[var20] = var6 - 1; + var20 = var20 + 1 & 4095; + class173.directions[var18 - 1][var19 - 1] = 3; + class173.distances[var18 - 1][var19 - 1] = var16; + break; + } + + if ((var13[var14 - 1][var17 + (var15 - 1)] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 - 1] & 19136911) != 0) { + break; + } + + ++var17; + } + } + + if (var18 < 128 - var2 && var19 > 0 && class173.directions[var18 + 1][var19 - 1] == 0 && (var13[var14 + var2][var15 - 1] & 19136899) == 0) { + var17 = 1; + + while (true) { + if (var17 >= var2) { + class173.bufferX[var20] = var5 + 1; + class173.bufferY[var20] = var6 - 1; + var20 = var20 + 1 & 4095; + class173.directions[var18 + 1][var19 - 1] = 9; + class173.distances[var18 + 1][var19 - 1] = var16; + break; + } + + if ((var13[var14 + var2][var17 + (var15 - 1)] & 19136995) != 0 || (var13[var14 + var17][var15 - 1] & 19136911) != 0) { + break; + } + + ++var17; + } + } + + if (var18 > 0 && var19 < 128 - var2 && class173.directions[var18 - 1][var19 + 1] == 0 && (var13[var14 - 1][var15 + var2] & 19136824) == 0) { + for (var17 = 1; var17 < var2; ++var17) { + if ((var13[var14 - 1][var17 + var15] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 + var2] & 19137016) != 0) { + continue label287; + } + } + + class173.bufferX[var20] = var5 - 1; + class173.bufferY[var20] = var6 + 1; + var20 = var20 + 1 & 4095; + class173.directions[var18 - 1][var19 + 1] = 6; + class173.distances[var18 - 1][var19 + 1] = var16; + } + } while(var18 >= 128 - var2); + } while(var19 >= 128 - var2); + } while(class173.directions[var18 + 1][var19 + 1] != 0); + } while((var13[var14 + var2][var15 + var2] & 19136992) != 0); + + for (var17 = 1; var17 < var2; ++var17) { + if ((var13[var14 + var17][var15 + var2] & 19137016) != 0 || (var13[var14 + var2][var17 + var15] & 19136995) != 0) { + continue label310; + } + } + + class173.bufferX[var20] = var5 + 1; + class173.bufferY[var20] = var6 + 1; + var20 = var20 + 1 & 4095; + class173.directions[var18 + 1][var19 + 1] = 12; + class173.distances[var18 + 1][var19 + 1] = var16; + } } } - @ObfuscatedName("a") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(I)Lli;", - garbageValue = "1591816730" + signature = "(IZIZB)V", + garbageValue = "58" ) - static IndexedSprite method327() { - IndexedSprite var0 = new IndexedSprite(); - var0.width = class325.SpriteBuffer_spriteWidth; - var0.height = class325.SpriteBuffer_spriteHeight; - var0.xOffset = class325.SpriteBuffer_xOffsets[0]; - var0.yOffset = class325.SpriteBuffer_yOffsets[0]; - var0.subWidth = UserComparator1.SpriteBuffer_spriteWidths[0]; - var0.subHeight = class325.SpriteBuffer_spriteHeights[0]; - var0.palette = class268.SpriteBuffer_spritePalette; - var0.pixels = class290.SpriteBuffer_pixels[0]; - Message.method1223(); - return var0; + @Export("sortWorldList") + static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { + if (class96.World_worlds != null) { + InterfaceParent.doWorldSorting(0, class96.World_worlds.length - 1, var0, var1, var2, var3); + } + } - @ObfuscatedName("jb") + @ObfuscatedName("hd") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "1037810196" + signature = "(Lbs;I)V", + garbageValue = "447315853" ) - static boolean method326() { - return Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; + static final void method347(PendingSpawn var0) { + long var1 = 0L; + int var3 = -1; + int var4 = 0; + int var5 = 0; + if (var0.type == 0) { + var1 = ServerBuild.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 1) { + var1 = ServerBuild.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 2) { + var1 = ServerBuild.scene.getGameObjectTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 3) { + var1 = ServerBuild.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); + } + + if (var1 != 0L) { + int var6 = ServerBuild.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); + var3 = GrandExchangeEvents.Entity_unpackID(var1); + var4 = var6 & 31; + var5 = var6 >> 6 & 3; + } + + var0.objectId = var3; + var0.field924 = var4; + var0.field935 = var5; + } + + @ObfuscatedName("js") + @ObfuscatedSignature( + signature = "(IIIIIIIB)V", + garbageValue = "-22" + ) + @Export("updateRootInterface") + static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (ScriptFrame.loadInterface(var0)) { + GrandExchangeOfferAgeComparator.updateInterface(WorldMapLabel.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); + } } } diff --git a/runescape-client/src/main/java/WorldMapDecorationType.java b/runescape-client/src/main/java/WorldMapDecorationType.java index 59d7d89920..1fdddbe2fd 100644 --- a/runescape-client/src/main/java/WorldMapDecorationType.java +++ b/runescape-client/src/main/java/WorldMapDecorationType.java @@ -1,131 +1,137 @@ +import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hs") +@ObfuscatedName("ha") @Implements("WorldMapDecorationType") public enum WorldMapDecorationType implements Enumerated { - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Lhs;" - ) - field2719(0, 0), - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lhs;" - ) - field2706(1, 0), - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "Lhs;" - ) - field2710(2, 0), - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lhs;" - ) - field2708(3, 0), - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lhs;" - ) - field2707(9, 2), - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Lhs;" - ) - field2711(4, 1), - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lhs;" - ) - field2724(5, 1), - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lhs;" - ) - field2712(6, 1), - @ObfuscatedName("a") - @ObfuscatedSignature( - signature = "Lhs;" - ) - field2713(7, 1), - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "Lhs;" - ) - field2714(8, 1), @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lhs;" + signature = "Lha;" ) - field2715(12, 2), - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "Lhs;" - ) - field2716(13, 2), - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "Lhs;" - ) - field2723(14, 2), - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Lhs;" - ) - field2721(15, 2), - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "Lhs;" - ) - field2722(16, 2), - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "Lhs;" - ) - field2720(17, 2), + field2745(0, 0), @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lhs;" + signature = "Lha;" ) - field2718(18, 2), + field2728(1, 0), + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2729(2, 0), + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2743(3, 0), + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2731(9, 2), + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2732(4, 1), + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2733(5, 1), + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2734(6, 1), @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lhs;" + signature = "Lha;" ) - field2717(19, 2), - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "Lhs;" - ) - field2705(20, 2), - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lhs;" - ) - field2709(21, 2), - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "Lhs;" - ) - field2725(10, 2), - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "Lhs;" - ) - field2726(11, 2), + field2749(7, 1), @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lhs;" + signature = "Lha;" ) - field2727(22, 3); + field2736(8, 1), + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2737(12, 2), + @ObfuscatedName("h") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2738(13, 2), + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2742(14, 2), + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2727(15, 2), + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2741(16, 2), + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2750(17, 2), + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2730(18, 2), + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2744(19, 2), + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2740(20, 2), + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2746(21, 2), + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2747(10, 2), + @ObfuscatedName("b") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2748(11, 2), + @ObfuscatedName("r") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2751(22, 3); - @ObfuscatedName("g") + @ObfuscatedName("bt") + @ObfuscatedSignature( + signature = "Lli;" + ) + static IndexedSprite field2739; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1693964609 + intValue = 1956687069 ) @Export("id") public final int id; @@ -138,145 +144,230 @@ public enum WorldMapDecorationType implements Enumerated { this.id = var3; } - @ObfuscatedName("i") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "-57" + garbageValue = "1" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lhz;I)V", - garbageValue = "1637716955" + signature = "(I)Z", + garbageValue = "57455087" ) - public static void method4079(AbstractArchive var0) { - FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0; - } + public static boolean method4187() { + long var0 = WorldMapIcon_0.currentTimeMillis(); + int var2 = (int)(var0 - NetCache.field3170); + NetCache.field3170 = var0; + if (var2 > 200) { + var2 = 200; + } - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "500637540" - ) - public static int method4085(int var0, int var1) { - return (var0 << 8) + var1; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(Lkl;IB)Z", - garbageValue = "17" - ) - @Export("updateExternalPlayer") - static boolean updateExternalPlayer(PacketBuffer var0, int var1) { - int var2 = var0.readBits(2); - int var3; - int var4; - int var7; - int var8; - int var9; - int var10; - if (var2 == 0) { - if (var0.readBits(1) != 0) { - updateExternalPlayer(var0, var1); - } - - var3 = var0.readBits(13); - var4 = var0.readBits(13); - boolean var12 = var0.readBits(1) == 1; - if (var12) { - Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; - } - - if (Client.players[var1] != null) { - throw new RuntimeException(); - } else { - Player var6 = Client.players[var1] = new Player(); - var6.index = var1; - if (Players.field1228[var1] != null) { - var6.read(Players.field1228[var1]); - } - - var6.orientation = Players.Players_orientations[var1]; - var6.targetIndex = Players.Players_targetIndices[var1]; - var7 = Players.Players_regions[var1]; - var8 = var7 >> 28; - var9 = var7 >> 14 & 255; - var10 = var7 & 255; - var6.pathTraversed[0] = Players.field1231[var1]; - var6.plane = (byte)var8; - var6.resetPath((var9 << 13) + var3 - MusicPatchPcmStream.baseX * 64, (var10 << 13) + var4 - ScriptEvent.baseY * 64); - var6.field616 = false; - return true; - } - } else if (var2 == 1) { - var3 = var0.readBits(2); - var4 = Players.Players_regions[var1]; - Players.Players_regions[var1] = (var4 & 268435455) + (((var4 >> 28) + var3 & 3) << 28); + NetCache.NetCache_loadTime += var2; + if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { + return true; + } else if (NetCache.NetCache_socket == null) { return false; } else { - int var5; - int var11; - if (var2 == 2) { - var3 = var0.readBits(5); - var4 = var3 >> 3; - var5 = var3 & 7; - var11 = Players.Players_regions[var1]; - var7 = (var11 >> 28) + var4 & 3; - var8 = var11 >> 14 & 255; - var9 = var11 & 255; - if (var5 == 0) { - --var8; - --var9; + try { + if (NetCache.NetCache_loadTime > 30000) { + throw new IOException(); + } else { + NetFileRequest var3; + Buffer var4; + while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { + var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); + var4 = new Buffer(4); + var4.writeByte(1); + var4.writeMedium((int)var3.key); + NetCache.NetCache_socket.write(var4.array, 0, 4); + NetCache.NetCache_pendingPriorityResponses.put(var3, var3.key); + --NetCache.NetCache_pendingPriorityWritesCount; + ++NetCache.NetCache_pendingPriorityResponsesCount; + } + + while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { + var3 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); + var4 = new Buffer(4); + var4.writeByte(0); + var4.writeMedium((int)var3.key); + NetCache.NetCache_socket.write(var4.array, 0, 4); + var3.removeDual(); + NetCache.NetCache_pendingResponses.put(var3, var3.key); + --NetCache.NetCache_pendingWritesCount; + ++NetCache.NetCache_pendingResponsesCount; + } + + for (int var15 = 0; var15 < 100; ++var15) { + int var16 = NetCache.NetCache_socket.available(); + if (var16 < 0) { + throw new IOException(); + } + + if (var16 == 0) { + break; + } + + NetCache.NetCache_loadTime = 0; + byte var5 = 0; + if (GrandExchangeEvent.NetCache_currentResponse == null) { + var5 = 8; + } else if (NetCache.field3181 == 0) { + var5 = 1; + } + + int var6; + int var7; + int var8; + int var10; + byte[] var10000; + int var10001; + Buffer var22; + if (var5 > 0) { + var6 = var5 - NetCache.NetCache_responseHeaderBuffer.offset; + if (var6 > var16) { + var6 = var16; + } + + NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var6); + if (NetCache.field3184 != 0) { + for (var7 = 0; var7 < var6; ++var7) { + var10000 = NetCache.NetCache_responseHeaderBuffer.array; + var10001 = var7 + NetCache.NetCache_responseHeaderBuffer.offset; + var10000[var10001] ^= NetCache.field3184; + } + } + + var22 = NetCache.NetCache_responseHeaderBuffer; + var22.offset += var6; + if (NetCache.NetCache_responseHeaderBuffer.offset < var5) { + break; + } + + if (GrandExchangeEvent.NetCache_currentResponse == null) { + NetCache.NetCache_responseHeaderBuffer.offset = 0; + var7 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); + var8 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); + int var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); + var10 = NetCache.NetCache_responseHeaderBuffer.readInt(); + long var11 = (long)(var8 + (var7 << 16)); + NetFileRequest var13 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var11); + User.field3583 = true; + if (var13 == null) { + var13 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var11); + User.field3583 = false; + } + + if (var13 == null) { + throw new IOException(); + } + + int var14 = var9 == 0 ? 5 : 9; + GrandExchangeEvent.NetCache_currentResponse = var13; + VertexNormal.NetCache_responseArchiveBuffer = new Buffer(var14 + var10 + GrandExchangeEvent.NetCache_currentResponse.padding); + VertexNormal.NetCache_responseArchiveBuffer.writeByte(var9); + VertexNormal.NetCache_responseArchiveBuffer.writeInt(var10); + NetCache.field3181 = 8; + NetCache.NetCache_responseHeaderBuffer.offset = 0; + } else if (NetCache.field3181 == 0) { + if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { + NetCache.field3181 = 1; + NetCache.NetCache_responseHeaderBuffer.offset = 0; + } else { + GrandExchangeEvent.NetCache_currentResponse = null; + } + } + } else { + var6 = VertexNormal.NetCache_responseArchiveBuffer.array.length - GrandExchangeEvent.NetCache_currentResponse.padding; + var7 = 512 - NetCache.field3181; + if (var7 > var6 - VertexNormal.NetCache_responseArchiveBuffer.offset) { + var7 = var6 - VertexNormal.NetCache_responseArchiveBuffer.offset; + } + + if (var7 > var16) { + var7 = var16; + } + + NetCache.NetCache_socket.read(VertexNormal.NetCache_responseArchiveBuffer.array, VertexNormal.NetCache_responseArchiveBuffer.offset, var7); + if (NetCache.field3184 != 0) { + for (var8 = 0; var8 < var7; ++var8) { + var10000 = VertexNormal.NetCache_responseArchiveBuffer.array; + var10001 = VertexNormal.NetCache_responseArchiveBuffer.offset + var8; + var10000[var10001] ^= NetCache.field3184; + } + } + + var22 = VertexNormal.NetCache_responseArchiveBuffer; + var22.offset += var7; + NetCache.field3181 += var7; + if (var6 == VertexNormal.NetCache_responseArchiveBuffer.offset) { + if (GrandExchangeEvent.NetCache_currentResponse.key == 16711935L) { + class4.NetCache_reference = VertexNormal.NetCache_responseArchiveBuffer; + + for (var8 = 0; var8 < 256; ++var8) { + Archive var17 = NetCache.NetCache_archives[var8]; + if (var17 != null) { + class4.NetCache_reference.offset = var8 * 8 + 5; + var10 = class4.NetCache_reference.readInt(); + int var18 = class4.NetCache_reference.readInt(); + var17.loadIndex(var10, var18); + } + } + } else { + NetCache.NetCache_crc.reset(); + NetCache.NetCache_crc.update(VertexNormal.NetCache_responseArchiveBuffer.array, 0, var6); + var8 = (int)NetCache.NetCache_crc.getValue(); + if (var8 != GrandExchangeEvent.NetCache_currentResponse.crc) { + try { + NetCache.NetCache_socket.close(); + } catch (Exception var20) { + } + + ++NetCache.NetCache_crcMismatches; + NetCache.NetCache_socket = null; + NetCache.field3184 = (byte)((int)(Math.random() * 255.0D + 1.0D)); + return false; + } + + NetCache.NetCache_crcMismatches = 0; + NetCache.NetCache_ioExceptions = 0; + GrandExchangeEvent.NetCache_currentResponse.archive.write((int)(GrandExchangeEvent.NetCache_currentResponse.key & 65535L), VertexNormal.NetCache_responseArchiveBuffer.array, (GrandExchangeEvent.NetCache_currentResponse.key & 16711680L) == 16711680L, User.field3583); + } + + GrandExchangeEvent.NetCache_currentResponse.remove(); + if (User.field3583) { + --NetCache.NetCache_pendingPriorityResponsesCount; + } else { + --NetCache.NetCache_pendingResponsesCount; + } + + NetCache.field3181 = 0; + GrandExchangeEvent.NetCache_currentResponse = null; + VertexNormal.NetCache_responseArchiveBuffer = null; + } else { + if (NetCache.field3181 != 512) { + break; + } + + NetCache.field3181 = 0; + } + } + } + + return true; + } + } catch (IOException var21) { + try { + NetCache.NetCache_socket.close(); + } catch (Exception var19) { } - if (var5 == 1) { - --var9; - } - - if (var5 == 2) { - ++var8; - --var9; - } - - if (var5 == 3) { - --var8; - } - - if (var5 == 4) { - ++var8; - } - - if (var5 == 5) { - --var8; - ++var9; - } - - if (var5 == 6) { - ++var9; - } - - if (var5 == 7) { - ++var8; - ++var9; - } - - Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); - return false; - } else { - var3 = var0.readBits(18); - var4 = var3 >> 16; - var5 = var3 >> 8 & 255; - var11 = var3 & 255; - var7 = Players.Players_regions[var1]; - var8 = (var7 >> 28) + var4 & 3; - var9 = var5 + (var7 >> 14) & 255; - var10 = var7 + var11 & 255; - Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); + ++NetCache.NetCache_ioExceptions; + NetCache.NetCache_socket = null; return false; } } diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index 4a580720aa..edf21cf35d 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -4,106 +4,111 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("it") +@ObfuscatedName("im") @Implements("WorldMapElement") public class WorldMapElement extends DualNode { - @ObfuscatedName("f") + @ObfuscatedName("qr") + @ObfuscatedGetter( + intValue = -137008991 + ) + static int field3230; + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) @Export("WorldMapElement_archive") static AbstractArchive WorldMapElement_archive; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "[Lit;" + signature = "[Lim;" ) @Export("WorldMapElement_cached") static WorldMapElement[] WorldMapElement_cached; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Leb;" + signature = "Leh;" ) @Export("WorldMapElement_cachedSprites") - public static EvictingDualNodeHashTable WorldMapElement_cachedSprites; - @ObfuscatedName("p") + static EvictingDualNodeHashTable WorldMapElement_cachedSprites; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -38759309 + intValue = 1867958927 ) @Export("objectId") public final int objectId; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1854966479 + intValue = -1771257793 ) @Export("sprite1") public int sprite1; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 2114919513 + intValue = 2048947883 ) @Export("sprite2") int sprite2; - @ObfuscatedName("x") + @ObfuscatedName("l") @Export("name") public String name; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1045588681 + intValue = 1188038203 ) - public int field3195; - @ObfuscatedName("d") + public int field3215; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1328245247 + intValue = 1641997247 ) @Export("textSize") public int textSize; - @ObfuscatedName("o") + @ObfuscatedName("h") @Export("menuActions") public String[] menuActions; @ObfuscatedName("v") @Export("menuTargetName") public String menuTargetName; - @ObfuscatedName("k") - int[] field3193; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -1400114557 - ) - int field3194; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 1081967223 - ) - int field3196; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -1335511975 - ) - int field3185; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -512378151 - ) - int field3191; @ObfuscatedName("n") + int[] field3220; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 1973467605 + ) + int field3217; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 1618776483 + ) + int field3222; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 249158163 + ) + int field3223; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 1378552349 + ) + int field3224; + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Liz;" + signature = "Lih;" ) @Export("horizontalAlignment") public HorizontalAlignment horizontalAlignment; - @ObfuscatedName("u") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lia;" + signature = "Lic;" ) @Export("verticalAlignment") public VerticalAlignment verticalAlignment; - @ObfuscatedName("z") - int[] field3200; - @ObfuscatedName("h") - byte[] field3198; - @ObfuscatedName("m") + @ObfuscatedName("f") + int[] field3227; + @ObfuscatedName("b") + byte[] field3228; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1672409627 + intValue = 689795533 ) @Export("category") public int category; @@ -117,20 +122,20 @@ public class WorldMapElement extends DualNode { this.sprite2 = -1; this.textSize = 0; this.menuActions = new String[5]; - this.field3194 = Integer.MAX_VALUE; - this.field3196 = Integer.MAX_VALUE; - this.field3185 = Integer.MIN_VALUE; - this.field3191 = Integer.MIN_VALUE; + this.field3217 = Integer.MAX_VALUE; + this.field3222 = Integer.MAX_VALUE; + this.field3223 = Integer.MIN_VALUE; + this.field3224 = Integer.MIN_VALUE; this.horizontalAlignment = HorizontalAlignment.HorizontalAlignment_centered; this.verticalAlignment = VerticalAlignment.VerticalAlignment_centered; this.category = -1; this.objectId = var1; } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkq;I)V", - garbageValue = "-354454893" + signature = "(Lkp;I)V", + garbageValue = "1991794864" ) @Export("decode") void decode(Buffer var1) { @@ -144,21 +149,21 @@ public class WorldMapElement extends DualNode { } } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Lkq;IB)V", - garbageValue = "-19" + signature = "(Lkp;IS)V", + garbageValue = "32767" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - this.sprite1 = var1.method5560(); + this.sprite1 = var1.method5593(); } else if (var2 == 2) { - this.sprite2 = var1.method5560(); + this.sprite2 = var1.method5593(); } else if (var2 == 3) { this.name = var1.readStringCp1252NullTerminated(); } else if (var2 == 4) { - this.field3195 = var1.readMedium(); + this.field3215 = var1.readMedium(); } else if (var2 == 5) { var1.readMedium(); } else if (var2 == 6) { @@ -178,32 +183,32 @@ public class WorldMapElement extends DualNode { this.menuActions[var2 - 10] = var1.readStringCp1252NullTerminated(); } else if (var2 == 15) { var3 = var1.readUnsignedByte(); - this.field3193 = new int[var3 * 2]; + this.field3220 = new int[var3 * 2]; int var4; for (var4 = 0; var4 < var3 * 2; ++var4) { - this.field3193[var4] = var1.readShort(); + this.field3220[var4] = var1.readShort(); } var1.readInt(); var4 = var1.readUnsignedByte(); - this.field3200 = new int[var4]; + this.field3227 = new int[var4]; int var5; - for (var5 = 0; var5 < this.field3200.length; ++var5) { - this.field3200[var5] = var1.readInt(); + for (var5 = 0; var5 < this.field3227.length; ++var5) { + this.field3227[var5] = var1.readInt(); } - this.field3198 = new byte[var3]; + this.field3228 = new byte[var3]; for (var5 = 0; var5 < var3; ++var5) { - this.field3198[var5] = var1.readByte(); + this.field3228[var5] = var1.readByte(); } } else if (var2 != 16) { if (var2 == 17) { this.menuTargetName = var1.readStringCp1252NullTerminated(); } else if (var2 == 18) { - var1.method5560(); + var1.method5593(); } else if (var2 == 19) { this.category = var1.readUnsignedShort(); } else if (var2 == 21) { @@ -218,48 +223,47 @@ public class WorldMapElement extends DualNode { var1.readShort(); var1.readShort(); } else if (var2 == 25) { - var1.method5560(); + var1.method5593(); } else if (var2 == 28) { var1.readUnsignedByte(); } else if (var2 == 29) { - this.horizontalAlignment = (HorizontalAlignment)DynamicObject.findEnumerated(UserComparator8.method3329(), var1.readUnsignedByte()); + this.horizontalAlignment = (HorizontalAlignment)WorldMapSection0.findEnumerated(GraphicsObject.method2064(), var1.readUnsignedByte()); } else if (var2 == 30) { - VerticalAlignment[] var6 = new VerticalAlignment[]{VerticalAlignment.field3170, VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field3169}; - this.verticalAlignment = (VerticalAlignment)DynamicObject.findEnumerated(var6, var1.readUnsignedByte()); + this.verticalAlignment = (VerticalAlignment)WorldMapSection0.findEnumerated(Message.method1229(), var1.readUnsignedByte()); } } } } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-37" + signature = "(I)V", + garbageValue = "1639524352" ) - void method4360() { - if (this.field3193 != null) { - for (int var1 = 0; var1 < this.field3193.length; var1 += 2) { - if (this.field3193[var1] < this.field3194) { - this.field3194 = this.field3193[var1]; - } else if (this.field3193[var1] > this.field3185) { - this.field3185 = this.field3193[var1]; + void method4449() { + if (this.field3220 != null) { + for (int var1 = 0; var1 < this.field3220.length; var1 += 2) { + if (this.field3220[var1] < this.field3217) { + this.field3217 = this.field3220[var1]; + } else if (this.field3220[var1] > this.field3223) { + this.field3223 = this.field3220[var1]; } - if (this.field3193[var1 + 1] < this.field3196) { - this.field3196 = this.field3193[var1 + 1]; - } else if (this.field3193[var1 + 1] > this.field3191) { - this.field3191 = this.field3193[var1 + 1]; + if (this.field3220[var1 + 1] < this.field3222) { + this.field3222 = this.field3220[var1 + 1]; + } else if (this.field3220[var1 + 1] > this.field3224) { + this.field3224 = this.field3220[var1 + 1]; } } } } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(ZI)Lls;", - garbageValue = "-899007822" + signature = "(ZB)Llt;", + garbageValue = "33" ) @Export("getSpriteBool") public Sprite getSpriteBool(boolean var1) { @@ -267,10 +271,10 @@ public class WorldMapElement extends DualNode { return this.getSprite(var2); } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(IB)Lls;", - garbageValue = "-12" + signature = "(II)Llt;", + garbageValue = "-1731622138" ) @Export("getSprite") Sprite getSprite(int var1) { @@ -281,7 +285,7 @@ public class WorldMapElement extends DualNode { if (var2 != null) { return var2; } else { - var2 = FloorUnderlayDefinition.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); + var2 = WorldMapSection1.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); if (var2 != null) { WorldMapElement_cachedSprites.put(var2, (long)var1); } @@ -291,36 +295,24 @@ public class WorldMapElement extends DualNode { } } - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-837340912" + garbageValue = "-1106641241" ) @Export("getObjectId") public int getObjectId() { return this.objectId; } - @ObfuscatedName("kc") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "-61660598" + signature = "(B)V", + garbageValue = "1" ) - static void method4381(String var0) { - UserComparator10.field1943 = var0; - - try { - String var1 = class206.client.getParameter(Integer.toString(18)); - String var2 = class206.client.getParameter(Integer.toString(13)); - String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; - if (var0.length() == 0) { - var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; - } else { - var3 = var3 + "; Expires=" + class48.method864(WorldMapID.currentTimeMillis() + 94608000000L) + "; Max-Age=" + 94608000L; - } - - class46.method846(class206.client, "document.cookie=\"" + var3 + "\""); - } catch (Throwable var4) { + public static void method4470() { + if (NetCache.NetCache_socket != null) { + NetCache.NetCache_socket.close(); } } diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java index 5e2ca42c31..d53a4ab645 100644 --- a/runescape-client/src/main/java/WorldMapEvent.java +++ b/runescape-client/src/main/java/WorldMapEvent.java @@ -1,5 +1,3 @@ -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; @@ -9,33 +7,27 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("al") @Implements("WorldMapEvent") public class WorldMapEvent { - @ObfuscatedName("gu") - @ObfuscatedSignature( - signature = "[Lli;" - ) - @Export("modIconSprites") - static IndexedSprite[] modIconSprites; - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -458237055 + intValue = 937006651 ) @Export("mapElement") public int mapElement; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lht;" + signature = "Lhj;" ) @Export("coord1") public Coord coord1; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lht;" + signature = "Lhj;" ) @Export("coord2") public Coord coord2; @ObfuscatedSignature( - signature = "(ILht;Lht;)V" + signature = "(ILhj;Lhj;)V" ) public WorldMapEvent(int var1, Coord var2, Coord var3) { this.mapElement = var1; @@ -43,88 +35,123 @@ public class WorldMapEvent { this.coord2 = var3; } - @ObfuscatedName("t") + @ObfuscatedName("hm") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "111" + signature = "(III)V", + garbageValue = "560855047" ) - static final void method764() { - if (!ViewportMouse.ViewportMouse_false0) { - int var0 = Scene.Scene_cameraPitchSine; - int var1 = Scene.Scene_cameraPitchCosine; - int var2 = Scene.Scene_cameraYawSine; - int var3 = Scene.Scene_cameraYawCosine; - byte var4 = 50; - short var5 = 3500; - int var6 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var4 / Rasterizer3D.Rasterizer3D_zoom; - int var7 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var4 / Rasterizer3D.Rasterizer3D_zoom; - int var8 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var5 / Rasterizer3D.Rasterizer3D_zoom; - int var9 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var5 / Rasterizer3D.Rasterizer3D_zoom; - int var10 = Rasterizer3D.method3019(var7, var4, var1, var0); - int var11 = Rasterizer3D.method3020(var7, var4, var1, var0); - var7 = var10; - var10 = Rasterizer3D.method3019(var9, var5, var1, var0); - int var12 = Rasterizer3D.method3020(var9, var5, var1, var0); - var9 = var10; - var10 = Rasterizer3D.method3017(var6, var11, var3, var2); - var11 = Rasterizer3D.method3083(var6, var11, var3, var2); - var6 = var10; - var10 = Rasterizer3D.method3017(var8, var12, var3, var2); - var12 = Rasterizer3D.method3083(var8, var12, var3, var2); - ViewportMouse.field1717 = (var10 + var6) / 2; - class30.field245 = (var9 + var7) / 2; - ViewportMouse.field1718 = (var12 + var11) / 2; - ViewportMouse.field1719 = (var10 - var6) / 2; - WorldMapCacheName.field293 = (var9 - var7) / 2; - class40.field336 = (var12 - var11) / 2; - ViewportMouse.field1720 = Math.abs(ViewportMouse.field1719); - class247.field3261 = Math.abs(WorldMapCacheName.field293); - MusicPatch.field2472 = Math.abs(class40.field336); + @Export("updateItemPile") + static final void updateItemPile(int var0, int var1) { + NodeDeque var2 = Client.groundItems[Clock.Client_plane][var0][var1]; + if (var2 == null) { + ServerBuild.scene.removeGroundItemPile(Clock.Client_plane, var0, var1); + } else { + long var3 = -99999999L; + TileItem var5 = null; + + TileItem var6; + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { + ItemDefinition var7 = HealthBarDefinition.ItemDefinition_get(var6.id); + long var8 = (long)var7.price; + if (var7.isStackable == 1) { + var8 *= (long)(var6.quantity + 1); + } + + if (var8 > var3) { + var3 = var8; + var5 = var6; + } + } + + if (var5 == null) { + ServerBuild.scene.removeGroundItemPile(Clock.Client_plane, var0, var1); + } else { + var2.addLast(var5); + TileItem var12 = null; + TileItem var11 = null; + + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { + if (var5.id != var6.id) { + if (var12 == null) { + var12 = var6; + } + + if (var12.id != var6.id && var11 == null) { + var11 = var6; + } + } + } + + long var9 = GameShell.calculateTag(var0, var1, 3, false, 0); + ServerBuild.scene.newGroundItemPile(Clock.Client_plane, var0, var1, WorldMapSectionType.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, Clock.Client_plane), var5, var9, var12, var11); + } } } - @ObfuscatedName("ah") + @ObfuscatedName("jh") @ObfuscatedSignature( - signature = "(Lfl;IIS)Lcw;", - garbageValue = "14902" + signature = "([Lhn;IB)V", + garbageValue = "-29" ) - public static final PcmPlayer method763(TaskHandler var0, int var1, int var2) { - if (var1 >= 0 && var1 < 2) { - if (var2 < 256) { - var2 = 256; - } - - try { - PcmPlayer var3 = ChatChannel.pcmPlayerProvider.player(); - var3.samples = new int[(SoundCache.PcmPlayer_stereo ? 2 : 1) * 256]; - var3.field1373 = var2; - var3.init(); - var3.capacity = (var2 & -1024) + 1024; - if (var3.capacity > 16384) { - var3.capacity = 16384; - } - - var3.open(var3.capacity); - if (NPC.field1103 > 0 && HealthBar.soundSystem == null) { - HealthBar.soundSystem = new SoundSystem(); - FriendSystem.soundSystemExecutor = Executors.newScheduledThreadPool(1); - FriendSystem.soundSystemExecutor.scheduleAtFixedRate(HealthBar.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); - } - - if (HealthBar.soundSystem != null) { - if (HealthBar.soundSystem.players[var1] != null) { - throw new IllegalArgumentException(); + @Export("drawModelComponents") + static final void drawModelComponents(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { + Widget var3 = var0[var2]; + if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !VarcInt.isComponentHidden(var3))) { + if (var3.type == 0) { + if (!var3.isIf3 && VarcInt.isComponentHidden(var3) && var3 != GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1) { + continue; } - HealthBar.soundSystem.players[var1] = var3; + drawModelComponents(var0, var3.id); + if (var3.children != null) { + drawModelComponents(var3.children, var3.id); + } + + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); + if (var4 != null) { + GrandExchangeOfferNameComparator.method150(var4.group); + } } - return var3; - } catch (Throwable var4) { - return new PcmPlayer(); + if (var3.type == 6) { + int var5; + if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { + boolean var7 = ScriptFrame.runCs1(var3); + if (var7) { + var5 = var3.sequenceId2; + } else { + var5 = var3.sequenceId; + } + + if (var5 != -1) { + SequenceDefinition var6 = GraphicsDefaults.SequenceDefinition_get(var5); + + for (var3.modelFrameCycle += Client.field707; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; NPCDefinition.invalidateWidget(var3)) { + var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; + ++var3.modelFrame; + if (var3.modelFrame >= var6.frameIds.length) { + var3.modelFrame -= var6.frameCount; + if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { + var3.modelFrame = 0; + } + } + } + } + } + + if (var3.field2696 != 0 && !var3.isIf3) { + int var8 = var3.field2696 >> 16; + var5 = var3.field2696 << 16 >> 16; + var8 *= Client.field707; + var5 *= Client.field707; + var3.modelAngleX = var8 + var3.modelAngleX & 2047; + var3.modelAngleY = var5 + var3.modelAngleY & 2047; + NPCDefinition.invalidateWidget(var3); + } + } } - } else { - throw new IllegalArgumentException(); } + } } diff --git a/runescape-client/src/main/java/WorldMapID.java b/runescape-client/src/main/java/WorldMapID.java index b43cdcb883..8a302285b2 100644 --- a/runescape-client/src/main/java/WorldMapID.java +++ b/runescape-client/src/main/java/WorldMapID.java @@ -3,162 +3,403 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("au") @Implements("WorldMapID") public class WorldMapID { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "Lau;" ) - static final WorldMapID field252; - @ObfuscatedName("i") + static final WorldMapID field277; + @ObfuscatedName("t") @ObfuscatedSignature( signature = "Lau;" ) - static final WorldMapID field253; - @ObfuscatedName("y") + static final WorldMapID field278; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -814602649 + intValue = -632156307 ) @Export("value") final int value; static { - field252 = new WorldMapID(0); - field253 = new WorldMapID(1); + field277 = new WorldMapID(0); + field278 = new WorldMapID(1); } WorldMapID(int var1) { this.value = var1; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)J", - garbageValue = "1359720205" + signature = "(I)[Lhq;", + garbageValue = "1911999829" ) - @Export("currentTimeMillis") - public static final synchronized long currentTimeMillis() { - long var0 = System.currentTimeMillis(); - if (var0 < class296.field3687) { - class296.field3688 += class296.field3687 - var0; - } - - class296.field3687 = var0; - return var0 + class296.field3688; + static ServerBuild[] method572() { + return new ServerBuild[]{ServerBuild.RC, ServerBuild.BUILDLIVE, ServerBuild.WIP, ServerBuild.LIVE}; } - @ObfuscatedName("f") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lhz;I)V", - garbageValue = "817119758" + signature = "(Lbw;IB)V", + garbageValue = "0" ) - public static void method545(AbstractArchive var0) { - VarpDefinition.VarpDefinition_archive = var0; - VarpDefinition.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "(CI)Z", - garbageValue = "1021629294" - ) - @Export("isCharPrintable") - public static boolean isCharPrintable(char var0) { - if (var0 >= ' ' && var0 <= '~') { - return true; - } else if (var0 >= 160 && var0 <= 255) { - return true; + @Export("runScript") + static void runScript(ScriptEvent var0, int var1) { + Object[] var2 = var0.args; + Script var3; + int var17; + if (Username.isWorldMapEvent(var0.type)) { + WorldMapLabelSize.worldMapEvent = (WorldMapEvent)var2[0]; + WorldMapElement var4 = PacketBufferNode.WorldMapElement_get(WorldMapLabelSize.worldMapEvent.mapElement); + var3 = class197.getWorldMapScript(var0.type, var4.objectId, var4.category); } else { - return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; + var17 = (Integer)var2[0]; + var3 = UserComparator9.getScript(var17); + } + + if (var3 != null) { + class320.Interpreter_intStackSize = 0; + Message.Interpreter_stringStackSize = 0; + var17 = -1; + int[] var5 = var3.opcodes; + int[] var6 = var3.intOperands; + byte var7 = -1; + Interpreter.Interpreter_frameDepth = 0; + Interpreter.field1094 = false; + + try { + int var10; + try { + Interpreter.Interpreter_intLocals = new int[var3.localIntCount]; + int var8 = 0; + Interpreter.Interpreter_stringLocals = new String[var3.localStringCount]; + int var9 = 0; + + int var11; + String var18; + for (var10 = 1; var10 < var2.length; ++var10) { + if (var2[var10] instanceof Integer) { + var11 = (Integer)var2[var10]; + if (var11 == -2147483647) { + var11 = var0.mouseX; + } + + if (var11 == -2147483646) { + var11 = var0.mouseY; + } + + if (var11 == -2147483645) { + var11 = var0.widget != null ? var0.widget.id : -1; + } + + if (var11 == -2147483644) { + var11 = var0.opIndex; + } + + if (var11 == -2147483643) { + var11 = var0.widget != null ? var0.widget.childIndex : -1; + } + + if (var11 == -2147483642) { + var11 = var0.dragTarget != null ? var0.dragTarget.id : -1; + } + + if (var11 == -2147483641) { + var11 = var0.dragTarget != null ? var0.dragTarget.childIndex : -1; + } + + if (var11 == -2147483640) { + var11 = var0.keyTyped; + } + + if (var11 == -2147483639) { + var11 = var0.keyPressed; + } + + Interpreter.Interpreter_intLocals[var8++] = var11; + } else if (var2[var10] instanceof String) { + var18 = (String)var2[var10]; + if (var18.equals("event_opbase")) { + var18 = var0.targetName; + } + + Interpreter.Interpreter_stringLocals[var9++] = var18; + } + } + + var10 = 0; + Interpreter.field1088 = var0.field582; + + while (true) { + ++var10; + if (var10 > var1) { + throw new RuntimeException(); + } + + ++var17; + int var29 = var5[var17]; + int var20; + if (var29 >= 100) { + boolean var32; + if (var3.intOperands[var17] == 1) { + var32 = true; + } else { + var32 = false; + } + + var20 = LoginScreenAnimation.method1835(var29, var3, var32); + switch(var20) { + case 0: + return; + case 1: + default: + break; + case 2: + throw new IllegalStateException(); + } + } else if (var29 == ScriptOpcodes.ICONST) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var6[var17]; + } else if (var29 == ScriptOpcodes.GET_VARP) { + var11 = var6[var17]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Varps.Varps_main[var11]; + } else if (var29 == ScriptOpcodes.SET_VARP) { + var11 = var6[var17]; + Varps.Varps_main[var11] = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + ServerPacket.changeGameOptions(var11); + } else if (var29 == ScriptOpcodes.SCONST) { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3.stringOperands[var17]; + } else if (var29 == ScriptOpcodes.JUMP) { + var17 += var6[var17]; + } else if (var29 == ScriptOpcodes.IF_ICMPNE) { + class320.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]) { + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.IF_ICMPEQ) { + class320.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]) { + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.IF_ICMPLT) { + class320.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]) { + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.IF_ICMPGT) { + class320.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]) { + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.RETURN) { + if (Interpreter.Interpreter_frameDepth == 0) { + return; + } + + ScriptFrame var34 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; + var3 = var34.script; + var5 = var3.opcodes; + var6 = var3.intOperands; + var17 = var34.pc; + Interpreter.Interpreter_intLocals = var34.intLocals; + Interpreter.Interpreter_stringLocals = var34.stringLocals; + } else if (var29 == ScriptOpcodes.GET_VARBIT) { + var11 = var6[var17]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.getVarbit(var11); + } else if (var29 == ScriptOpcodes.SET_VARBIT) { + var11 = var6[var17]; + DirectByteArrayCopier.method4006(var11, Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); + } else if (var29 == ScriptOpcodes.IF_ICMPLE) { + class320.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]) { + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.IF_ICMPGE) { + class320.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]) { + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.ILOAD) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Interpreter.Interpreter_intLocals[var6[var17]]; + } else if (var29 == ScriptOpcodes.ISTORE) { + Interpreter.Interpreter_intLocals[var6[var17]] = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + } else if (var29 == ScriptOpcodes.SLOAD) { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var6[var17]]; + } else if (var29 == ScriptOpcodes.SSTORE) { + Interpreter.Interpreter_stringLocals[var6[var17]] = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + } else if (var29 == ScriptOpcodes.JOIN_STRING) { + var11 = var6[var17]; + Message.Interpreter_stringStackSize -= var11; + String var31 = class290.method5360(Interpreter.Interpreter_stringStack, Message.Interpreter_stringStackSize, var11); + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var31; + } else if (var29 == ScriptOpcodes.POP_INT) { + --class320.Interpreter_intStackSize; + } else if (var29 == ScriptOpcodes.POP_STRING) { + --Message.Interpreter_stringStackSize; + } else { + int var15; + if (var29 != ScriptOpcodes.INVOKE) { + if (var29 == ScriptOpcodes.GET_VARC_INT) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = class197.varcs.getInt(var6[var17]); + } else if (var29 == ScriptOpcodes.SET_VARC_INT) { + class197.varcs.setInt(var6[var17], Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); + } else if (var29 == ScriptOpcodes.DEFINE_ARRAY) { + var11 = var6[var17] >> 16; + var20 = var6[var17] & 65535; + int var21 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + if (var21 < 0 || var21 > 5000) { + throw new RuntimeException(); + } + + Interpreter.Interpreter_arrayLengths[var11] = var21; + byte var22 = -1; + if (var20 == 105) { + var22 = 0; + } + + for (var15 = 0; var15 < var21; ++var15) { + Interpreter.Interpreter_arrays[var11][var15] = var22; + } + } else if (var29 == ScriptOpcodes.GET_ARRAY_INT) { + var11 = var6[var17]; + var20 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { + throw new RuntimeException(); + } + + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var11][var20]; + } else if (var29 == ScriptOpcodes.SET_ARRAY_INT) { + var11 = var6[var17]; + class320.Interpreter_intStackSize -= 2; + var20 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { + throw new RuntimeException(); + } + + Interpreter.Interpreter_arrays[var11][var20] = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + } else if (var29 == ScriptOpcodes.GET_VARC_STRING_OLD) { + var18 = class197.varcs.getStringOld(var6[var17]); + if (var18 == null) { + var18 = "null"; + } + + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var18; + } else if (var29 == ScriptOpcodes.SET_VARC_STRING_OLD) { + class197.varcs.setStringOld(var6[var17], Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]); + } else if (var29 == ScriptOpcodes.GET_VARC_STRING) { + var18 = class197.varcs.getString(var6[var17]); + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var18; + } else if (var29 == ScriptOpcodes.SET_VARC_STRING) { + class197.varcs.setString(var6[var17], Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]); + } else { + if (var29 != ScriptOpcodes.SWITCH) { + throw new IllegalStateException(); + } + + IterableNodeHashTable var33 = var3.switches[var6[var17]]; + IntegerNode var30 = (IntegerNode)var33.get((long)Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); + if (var30 != null) { + var17 += var30.integer; + } + } + } else { + var11 = var6[var17]; + Script var12 = UserComparator9.getScript(var11); + int[] var13 = new int[var12.localIntCount]; + String[] var14 = new String[var12.localStringCount]; + + for (var15 = 0; var15 < var12.intArgumentCount; ++var15) { + var13[var15] = Interpreter.Interpreter_intStack[var15 + (class320.Interpreter_intStackSize - var12.intArgumentCount)]; + } + + for (var15 = 0; var15 < var12.stringArgumentCount; ++var15) { + var14[var15] = Interpreter.Interpreter_stringStack[var15 + (Message.Interpreter_stringStackSize - var12.stringArgumentCount)]; + } + + class320.Interpreter_intStackSize -= var12.intArgumentCount; + Message.Interpreter_stringStackSize -= var12.stringArgumentCount; + ScriptFrame var19 = new ScriptFrame(); + var19.script = var3; + var19.pc = var17; + var19.intLocals = Interpreter.Interpreter_intLocals; + var19.stringLocals = Interpreter.Interpreter_stringLocals; + Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var19; + var3 = var12; + var5 = var12.opcodes; + var6 = var12.intOperands; + var17 = -1; + Interpreter.Interpreter_intLocals = var13; + Interpreter.Interpreter_stringLocals = var14; + } + } + } + } catch (Exception var27) { + StringBuilder var24 = new StringBuilder(30); + var24.append("").append(var3.key).append(" "); + + for (var10 = Interpreter.Interpreter_frameDepth - 1; var10 >= 0; --var10) { + var24.append("").append(Interpreter.Interpreter_frames[var10].script.key).append(" "); + } + + var24.append("").append(var7); + class225.RunException_sendStackTrace(var24.toString(), var27); + } + } finally { + if (Interpreter.field1094) { + Interpreter.field1095 = true; + KeyHandler.method848(); + Interpreter.field1095 = false; + Interpreter.field1094 = false; + } + + } } } - @ObfuscatedName("fb") + @ObfuscatedName("jq") + @ObfuscatedSignature( + signature = "(II)Ljava/lang/String;", + garbageValue = "1853943165" + ) + static final String method570(int var0) { + return var0 < 999999999 ? Integer.toString(var0) : "*"; + } + + @ObfuscatedName("kj") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-2121389593" + garbageValue = "-1218090205" ) - static final void method546() { - for (int var0 = 0; var0 < Client.soundEffectCount; ++var0) { - int var10002 = Client.queuedSoundEffectDelays[var0]--; - if (Client.queuedSoundEffectDelays[var0] >= -10) { - SoundEffect var9 = Client.soundEffects[var0]; - if (var9 == null) { - Object var10000 = null; - var9 = SoundEffect.readSoundEffect(FloorDecoration.archive4, Client.soundEffectIds[var0], 0); - if (var9 == null) { - continue; - } - - int[] var12 = Client.queuedSoundEffectDelays; - var12[var0] += var9.calculateDelay(); - Client.soundEffects[var0] = var9; - } - - if (Client.queuedSoundEffectDelays[var0] < 0) { - int var2; - if (Client.soundLocations[var0] != 0) { - int var3 = (Client.soundLocations[var0] & 255) * 128; - int var4 = Client.soundLocations[var0] >> 16 & 255; - int var5 = var4 * 128 + 64 - Message.localPlayer.x; - if (var5 < 0) { - var5 = -var5; - } - - int var6 = Client.soundLocations[var0] >> 8 & 255; - int var7 = var6 * 128 + 64 - Message.localPlayer.y; - if (var7 < 0) { - var7 = -var7; - } - - int var8 = var7 + var5 - 128; - if (var8 > var3) { - Client.queuedSoundEffectDelays[var0] = -100; - continue; - } - - if (var8 < 0) { - var8 = 0; - } - - var2 = (var3 - var8) * Client.areaSoundEffectVolume / var3; - } else { - var2 = Client.soundEffectVolume; - } - - if (var2 > 0) { - RawSound var10 = var9.toRawSound().resample(ClientPreferences.decimator); - RawPcmStream var11 = RawPcmStream.createRawPcmStream(var10, 100, var2); - var11.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1); - Tiles.pcmStreamMixer.addSubStream(var11); - } - - Client.queuedSoundEffectDelays[var0] = -100; - } - } else { - --Client.soundEffectCount; - - for (int var1 = var0; var1 < Client.soundEffectCount; ++var1) { - Client.soundEffectIds[var1] = Client.soundEffectIds[var1 + 1]; - Client.soundEffects[var1] = Client.soundEffects[var1 + 1]; - Client.queuedSoundEffectLoops[var1] = Client.queuedSoundEffectLoops[var1 + 1]; - Client.queuedSoundEffectDelays[var1] = Client.queuedSoundEffectDelays[var1 + 1]; - Client.soundLocations[var1] = Client.soundLocations[var1 + 1]; - } - - --var0; - } + @Export("FriendSystem_invalidateFriends") + static final void FriendSystem_invalidateFriends() { + for (int var0 = 0; var0 < Players.Players_count; ++var0) { + Player var1 = Client.players[Players.Players_indices[var0]]; + var1.clearIsFriend(); } - if (Client.field767 && !class42.method792()) { - if (Client.musicVolume != 0 && Client.currentTrackGroupId != -1) { - class173.playMusicTrack(GrandExchangeOfferWorldComparator.archive6, Client.currentTrackGroupId, 0, Client.musicVolume, false); - } - - Client.field767 = false; + Message.method1228(); + if (InterfaceParent.clanChat != null) { + InterfaceParent.clanChat.clearFriends(); } } + + @ObfuscatedName("ko") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)V", + garbageValue = "1990682337" + ) + @Export("clanKickUser") + static final void clanKickUser(String var0) { + if (InterfaceParent.clanChat != null) { + PacketBufferNode var1 = TilePaint.getPacketBufferNode(ClientPacket.field2229, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var0)); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); + } + } } diff --git a/runescape-client/src/main/java/WorldMapIcon_0.java b/runescape-client/src/main/java/WorldMapIcon_0.java index 6c0176fcb0..bbbc862854 100644 --- a/runescape-client/src/main/java/WorldMapIcon_0.java +++ b/runescape-client/src/main/java/WorldMapIcon_0.java @@ -4,42 +4,64 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("n") +@ObfuscatedName("z") @Implements("WorldMapIcon_0") public class WorldMapIcon_0 extends AbstractWorldMapIcon { - @ObfuscatedName("f") + @ObfuscatedName("nl") @ObfuscatedGetter( - intValue = -348487323 + intValue = 801956047 + ) + static int field142; + @ObfuscatedName("sn") + @ObfuscatedSignature( + signature = "Lly;" + ) + @Export("worldMap") + static WorldMap worldMap; + @ObfuscatedName("dv") + @ObfuscatedSignature( + signature = "Lkr;" + ) + @Export("js5Socket") + static AbstractSocket js5Socket; + @ObfuscatedName("eg") + @ObfuscatedGetter( + intValue = -201961779 + ) + static int field148; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -204680949 ) @Export("element") final int element; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Law;" + signature = "Laz;" ) @Export("label") final WorldMapLabel label; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -453490289 + intValue = 844262399 ) @Export("subWidth") final int subWidth; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 350288691 + intValue = 1735837545 ) @Export("subHeight") final int subHeight; @ObfuscatedSignature( - signature = "(Lht;Lht;ILaw;)V" + signature = "(Lhj;Lhj;ILaz;)V" ) WorldMapIcon_0(Coord var1, Coord var2, int var3, WorldMapLabel var4) { super(var1, var2); this.element = var3; this.label = var4; - WorldMapElement var5 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(this.getElement()); + WorldMapElement var5 = PacketBufferNode.WorldMapElement_get(this.getElement()); Sprite var6 = var5.getSpriteBool(false); if (var6 != null) { this.subWidth = var6.subWidth; @@ -51,84 +73,207 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "63" + signature = "(I)I", + garbageValue = "1499764486" ) @Export("getElement") public int getElement() { return this.element; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)Law;", - garbageValue = "-1801186977" + signature = "(B)Laz;", + garbageValue = "124" ) @Export("getLabel") WorldMapLabel getLabel() { return this.label; } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-2033351231" + signature = "(S)I", + garbageValue = "-26101" ) @Export("getSubWidth") int getSubWidth() { return this.subWidth; } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1873129621" + signature = "(B)I", + garbageValue = "1" ) @Export("getSubHeight") int getSubHeight() { return this.subHeight; } - @ObfuscatedName("i") - public static String method201(long var0) { - if (var0 > 0L && var0 < 6582952005840035281L) { - if (0L == var0 % 37L) { - return null; - } else { - int var2 = 0; + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(B)J", + garbageValue = "74" + ) + @Export("currentTimeMillis") + public static final synchronized long currentTimeMillis() { + long var0 = System.currentTimeMillis(); + if (var0 < VertexNormal.field1752) { + SpotAnimationDefinition.field3250 += VertexNormal.field1752 - var0; + } - for (long var3 = var0; 0L != var3; var3 /= 37L) { - ++var2; + VertexNormal.field1752 = var0; + return SpotAnimationDefinition.field3250 + var0; + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(Lks;I)V", + garbageValue = "-2023034499" + ) + static final void method206(PacketBuffer var0) { + int var1 = 0; + var0.importIndex(); + + byte[] var10000; + int var2; + int var3; + int var4; + for (var2 = 0; var2 < Players.Players_count; ++var2) { + var3 = Players.Players_indices[var2]; + if ((Players.field1236[var3] & 1) == 0) { + if (var1 > 0) { + --var1; + var10000 = Players.field1236; + var10000[var3] = (byte)(var10000[var3] | 2); + } else { + var4 = var0.readBits(1); + if (var4 == 0) { + var1 = class80.method2094(var0); + var10000 = Players.field1236; + var10000[var3] = (byte)(var10000[var3] | 2); + } else { + class208.readPlayerUpdate(var0, var3); + } } - - StringBuilder var5 = new StringBuilder(var2); - - while (var0 != 0L) { - long var6 = var0; - var0 /= 37L; - var5.append(class288.base37Table[(int)(var6 - 37L * var0)]); - } - - return var5.reverse().toString(); } + } + + var0.exportIndex(); + if (var1 != 0) { + throw new RuntimeException(); } else { - return null; + var0.importIndex(); + + for (var2 = 0; var2 < Players.Players_count; ++var2) { + var3 = Players.Players_indices[var2]; + if ((Players.field1236[var3] & 1) != 0) { + if (var1 > 0) { + --var1; + var10000 = Players.field1236; + var10000[var3] = (byte)(var10000[var3] | 2); + } else { + var4 = var0.readBits(1); + if (var4 == 0) { + var1 = class80.method2094(var0); + var10000 = Players.field1236; + var10000[var3] = (byte)(var10000[var3] | 2); + } else { + class208.readPlayerUpdate(var0, var3); + } + } + } + } + + var0.exportIndex(); + if (var1 != 0) { + throw new RuntimeException(); + } else { + var0.importIndex(); + + for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { + var3 = Players.Players_emptyIndices[var2]; + if ((Players.field1236[var3] & 1) != 0) { + if (var1 > 0) { + --var1; + var10000 = Players.field1236; + var10000[var3] = (byte)(var10000[var3] | 2); + } else { + var4 = var0.readBits(1); + if (var4 == 0) { + var1 = class80.method2094(var0); + var10000 = Players.field1236; + var10000[var3] = (byte)(var10000[var3] | 2); + } else if (class40.updateExternalPlayer(var0, var3)) { + var10000 = Players.field1236; + var10000[var3] = (byte)(var10000[var3] | 2); + } + } + } + } + + var0.exportIndex(); + if (var1 != 0) { + throw new RuntimeException(); + } else { + var0.importIndex(); + + for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { + var3 = Players.Players_emptyIndices[var2]; + if ((Players.field1236[var3] & 1) == 0) { + if (var1 > 0) { + --var1; + var10000 = Players.field1236; + var10000[var3] = (byte)(var10000[var3] | 2); + } else { + var4 = var0.readBits(1); + if (var4 == 0) { + var1 = class80.method2094(var0); + var10000 = Players.field1236; + var10000[var3] = (byte)(var10000[var3] | 2); + } else if (class40.updateExternalPlayer(var0, var3)) { + var10000 = Players.field1236; + var10000[var3] = (byte)(var10000[var3] | 2); + } + } + } + } + + var0.exportIndex(); + if (var1 != 0) { + throw new RuntimeException(); + } else { + Players.Players_count = 0; + Players.Players_emptyIdxCount = 0; + + for (var2 = 1; var2 < 2048; ++var2) { + var10000 = Players.field1236; + var10000[var2] = (byte)(var10000[var2] >> 1); + Player var5 = Client.players[var2]; + if (var5 != null) { + Players.Players_indices[++Players.Players_count - 1] = var2; + } else { + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var2; + } + } + + } + } + } } } - @ObfuscatedName("gg") + @ObfuscatedName("ks") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-1371690211" + signature = "(Lhn;I)I", + garbageValue = "2118498909" ) - static final int method202() { - if (Interpreter.clientPreferences.roofsHidden) { - return UrlRequest.Client_plane; - } else { - int var0 = ScriptEvent.getTileHeight(MusicPatchNode2.cameraX, UserComparator9.cameraZ, UrlRequest.Client_plane); - return var0 - class60.cameraY < 800 && (Tiles.Tiles_renderFlags[UrlRequest.Client_plane][MusicPatchNode2.cameraX >> 7][UserComparator9.cameraZ >> 7] & 4) != 0 ? UrlRequest.Client_plane : 3; - } + @Export("getWidgetClickMask") + static int getWidgetClickMask(Widget var0) { + IntegerNode var1 = (IntegerNode)Client.widgetClickMasks.get((long)var0.childIndex + ((long)var0.id << 32)); + return var1 != null ? var1.integer : var0.clickMask; } } diff --git a/runescape-client/src/main/java/WorldMapIcon_1.java b/runescape-client/src/main/java/WorldMapIcon_1.java index 3e0acbbc9d..f69dfc1883 100644 --- a/runescape-client/src/main/java/WorldMapIcon_1.java +++ b/runescape-client/src/main/java/WorldMapIcon_1.java @@ -4,48 +4,48 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("g") +@ObfuscatedName("s") @Implements("WorldMapIcon_1") public class WorldMapIcon_1 extends AbstractWorldMapIcon { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 399748255 + intValue = 52552105 ) @Export("objectDefId") final int objectDefId; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Las;" + signature = "Lax;" ) @Export("region") final WorldMapRegion region; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1594551933 + intValue = 1871075417 ) @Export("element") int element; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Law;" + signature = "Laz;" ) @Export("label") WorldMapLabel label; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 2144976415 + intValue = -260537351 ) @Export("subWidth") int subWidth; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 649203899 + intValue = -753416785 ) @Export("subHeight") int subHeight; @ObfuscatedSignature( - signature = "(Lht;Lht;ILas;)V" + signature = "(Lhj;Lhj;ILax;)V" ) WorldMapIcon_1(Coord var1, Coord var2, int var3, WorldMapRegion var4) { super(var1, var2); @@ -54,40 +54,40 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { this.init(); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "63" + signature = "(I)I", + garbageValue = "1499764486" ) @Export("getElement") public int getElement() { return this.element; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)Law;", - garbageValue = "-1801186977" + signature = "(B)Laz;", + garbageValue = "124" ) @Export("getLabel") WorldMapLabel getLabel() { return this.label; } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-2033351231" + signature = "(S)I", + garbageValue = "-26101" ) @Export("getSubWidth") int getSubWidth() { return this.subWidth; } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1873129621" + signature = "(B)I", + garbageValue = "1" ) @Export("getSubHeight") int getSubHeight() { @@ -96,14 +96,14 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "0" + signature = "(I)V", + garbageValue = "-1452393190" ) @Export("init") void init() { - this.element = Coord.getObjectDefinition(this.objectDefId).transform().mapIconId; - this.label = this.region.createMapLabel(GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(this.element)); - WorldMapElement var1 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(this.getElement()); + this.element = Occluder.getObjectDefinition(this.objectDefId).transform().mapIconId; + this.label = this.region.createMapLabel(PacketBufferNode.WorldMapElement_get(this.element)); + WorldMapElement var1 = PacketBufferNode.WorldMapElement_get(this.getElement()); Sprite var2 = var1.getSpriteBool(false); if (var2 != null) { this.subWidth = var2.subWidth; @@ -115,79 +115,69 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(II)Lij;", - garbageValue = "-754699522" + signature = "([BILjava/lang/CharSequence;B)I", + garbageValue = "112" ) - @Export("getParamDefinition") - public static ParamDefinition getParamDefinition(int var0) { - ParamDefinition var1 = (ParamDefinition)ParamDefinition.ParamDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = ParamDefinition.ParamDefinition_archive.takeFile(11, var0); - var1 = new ParamDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); + public static int method310(byte[] var0, int var1, CharSequence var2) { + int var3 = var2.length(); + int var4 = var1; + + for (int var5 = 0; var5 < var3; ++var5) { + char var6 = var2.charAt(var5); + if (var6 <= 127) { + var0[var4++] = (byte)var6; + } else if (var6 <= 2047) { + var0[var4++] = (byte)(192 | var6 >> 6); + var0[var4++] = (byte)(128 | var6 & '?'); + } else { + var0[var4++] = (byte)(224 | var6 >> '\f'); + var0[var4++] = (byte)(128 | var6 >> 6 & 63); + var0[var4++] = (byte)(128 | var6 & '?'); } - - var1.postDecode(); - ParamDefinition.ParamDefinition_cached.put(var1, (long)var0); - return var1; } + + return var4 - var1; } - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1785574656" - ) - static void method277() { - Tiles.Tiles_minPlane = 99; - class14.field88 = new byte[4][104][104]; - Tiles.field498 = new byte[4][104][104]; - Tiles.field494 = new byte[4][104][104]; - Tiles.field493 = new byte[4][104][104]; - Tiles.field501 = new int[4][105][105]; - Tiles.field496 = new byte[4][105][105]; - ArchiveLoader.field512 = new int[105][105]; - UrlRequest.Tiles_hue = new int[104]; - MenuAction.Tiles_saturation = new int[104]; - PacketBufferNode.Tiles_lightness = new int[104]; - Tiles.Tiles_hueMultiplier = new int[104]; - Varcs.field1244 = new int[104]; - } - - @ObfuscatedName("gp") + @ObfuscatedName("fg") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "57" + garbageValue = "-8" ) - static void method296() { - int var0 = Players.Players_count; - int[] var1 = Players.Players_indices; - - for (int var2 = 0; var2 < var0; ++var2) { - if (var1[var2] != Client.combatTargetPlayerIndex && var1[var2] != Client.localPlayerIndex) { - class14.addPlayerToScene(Client.players[var1[var2]], true); - } + static final void method308() { + if (Client.logoutTimer > 0) { + class30.logOut(); + } else { + Client.timer.method5045(); + Projectile.updateGameState(40); + ClientPreferences.field1052 = Client.packetWriter.getSocket(); + Client.packetWriter.removeSocket(); } - } - @ObfuscatedName("kp") + @ObfuscatedName("il") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "75" + signature = "([Lhn;Lhn;ZB)V", + garbageValue = "42" ) - @Export("clanKickUser") - static final void clanKickUser(String var0) { - if (Calendar.clanChat != null) { - PacketBufferNode var1 = class2.getPacketBufferNode(ClientPacket.field2245, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(ViewportMouse.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); + @Export("revalidateWidgetScroll") + static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { + int var3 = var1.scrollWidth != 0 ? var1.scrollWidth : var1.width; + int var4 = var1.scrollHeight != 0 ? var1.scrollHeight : var1.height; + FloorUnderlayDefinition.resizeInterface(var0, var1.id, var3, var4, var2); + if (var1.children != null) { + FloorUnderlayDefinition.resizeInterface(var1.children, var1.id, var3, var4, var2); } + + InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); + if (var5 != null) { + GrandExchangeOfferUnitPriceComparator.method135(var5.group, var3, var4, var2); + } + + if (var1.contentType == 1337) { + } + } } diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java index 9872537157..8879165aef 100644 --- a/runescape-client/src/main/java/WorldMapLabel.java +++ b/runescape-client/src/main/java/WorldMapLabel.java @@ -4,45 +4,44 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aw") +@ObfuscatedName("az") @Implements("WorldMapLabel") public class WorldMapLabel { - @ObfuscatedName("t") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lal;" + signature = "[[Lhn;" ) - @Export("worldMapEvent") - static WorldMapEvent worldMapEvent; - @ObfuscatedName("go") - @ObfuscatedSignature( - signature = "[Lls;" + @Export("Widget_interfaceComponents") + public static Widget[][] Widget_interfaceComponents; + @ObfuscatedName("fs") + @ObfuscatedGetter( + longValue = 2387271044298976721L ) - @Export("mapDotSprites") - static Sprite[] mapDotSprites; - @ObfuscatedName("f") + static long field250; + @ObfuscatedName("c") @Export("text") String text; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1263751547 + intValue = -2063978581 ) @Export("width") int width; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1391610407 + intValue = 1586627561 ) @Export("height") int height; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lj;" + signature = "Lq;" ) @Export("size") WorldMapLabelSize size; @ObfuscatedSignature( - signature = "(Ljava/lang/String;IILj;)V" + signature = "(Ljava/lang/String;IILq;)V" ) WorldMapLabel(String var1, int var2, int var3, WorldMapLabelSize var4) { this.text = var1; @@ -51,19 +50,159 @@ public class WorldMapLabel { this.size = var4; } - @ObfuscatedName("fx") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1562650127" + signature = "(IIB)I", + garbageValue = "104" ) - @Export("playPcmPlayers") - static final void playPcmPlayers() { - if (NetSocket.pcmPlayer1 != null) { - NetSocket.pcmPlayer1.run(); - } + public static int method440(int var0, int var1) { + int var2 = var0 >>> 31; + return (var0 + var2) / var1 - var2; + } - if (UserComparator6.pcmPlayer0 != null) { - UserComparator6.pcmPlayer0.run(); + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "43" + ) + static final void method439() { + class60.method1188("You can't add yourself to your own friend list"); + } + + @ObfuscatedName("fp") + @ObfuscatedSignature( + signature = "(Lia;Ljava/lang/String;I)V", + garbageValue = "16711680" + ) + static void method438(Archive var0, String var1) { + ArchiveLoader var2 = new ArchiveLoader(var0, var1); + Client.archiveLoaders.add(var2); + Client.field813 += var2.groupCount; + } + + @ObfuscatedName("hb") + @ObfuscatedSignature( + signature = "(ZLks;I)V", + garbageValue = "-1660108888" + ) + @Export("loadRegions") + static final void loadRegions(boolean var0, PacketBuffer var1) { + Client.isInInstance = var0; + int var2; + int var4; + int var5; + int var6; + int var7; + int var8; + if (!Client.isInInstance) { + var2 = var1.method5740(); + int var3 = var1.readUnsignedShort(); + var4 = var1.readUnsignedShort(); + JagexCache.xteaKeys = new int[var4][4]; + + for (var5 = 0; var5 < var4; ++var5) { + for (var6 = 0; var6 < 4; ++var6) { + JagexCache.xteaKeys[var5][var6] = var1.readInt(); + } + } + + FriendsList.regions = new int[var4]; + class30.regionMapArchiveIds = new int[var4]; + class65.regionLandArchiveIds = new int[var4]; + Tiles.regionLandArchives = new byte[var4][]; + class226.regionMapArchives = new byte[var4][]; + boolean var16 = false; + if ((var3 / 8 == 48 || var3 / 8 == 49) && var2 / 8 == 48) { + var16 = true; + } + + if (var3 / 8 == 48 && var2 / 8 == 148) { + var16 = true; + } + + var4 = 0; + + for (var6 = (var3 - 6) / 8; var6 <= (var3 + 6) / 8; ++var6) { + for (var7 = (var2 - 6) / 8; var7 <= (var2 + 6) / 8; ++var7) { + var8 = var7 + (var6 << 8); + if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { + FriendsList.regions[var4] = var8; + class30.regionMapArchiveIds[var4] = NetSocket.archive5.getGroupId("m" + var6 + "_" + var7); + class65.regionLandArchiveIds[var4] = NetSocket.archive5.getGroupId("l" + var6 + "_" + var7); + ++var4; + } + } + } + + ChatChannel.method2302(var3, var2, true); + } else { + var2 = var1.method5614(); + boolean var15 = var1.method5605() == 1; + var4 = var1.method5762(); + var5 = var1.readUnsignedShort(); + var1.importIndex(); + + int var9; + for (var6 = 0; var6 < 4; ++var6) { + for (var7 = 0; var7 < 13; ++var7) { + for (var8 = 0; var8 < 13; ++var8) { + var9 = var1.readBits(1); + if (var9 == 1) { + Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); + } else { + Client.instanceChunkTemplates[var6][var7][var8] = -1; + } + } + } + } + + var1.exportIndex(); + JagexCache.xteaKeys = new int[var5][4]; + + for (var6 = 0; var6 < var5; ++var6) { + for (var7 = 0; var7 < 4; ++var7) { + JagexCache.xteaKeys[var6][var7] = var1.readInt(); + } + } + + FriendsList.regions = new int[var5]; + class30.regionMapArchiveIds = new int[var5]; + class65.regionLandArchiveIds = new int[var5]; + Tiles.regionLandArchives = new byte[var5][]; + class226.regionMapArchives = new byte[var5][]; + var5 = 0; + + for (var6 = 0; var6 < 4; ++var6) { + for (var7 = 0; var7 < 13; ++var7) { + for (var8 = 0; var8 < 13; ++var8) { + var9 = Client.instanceChunkTemplates[var6][var7][var8]; + if (var9 != -1) { + int var10 = var9 >> 14 & 1023; + int var11 = var9 >> 3 & 2047; + int var12 = (var10 / 8 << 8) + var11 / 8; + + int var13; + for (var13 = 0; var13 < var5; ++var13) { + if (FriendsList.regions[var13] == var12) { + var12 = -1; + break; + } + } + + if (var12 != -1) { + FriendsList.regions[var5] = var12; + var13 = var12 >> 8 & 255; + int var14 = var12 & 255; + class30.regionMapArchiveIds[var5] = NetSocket.archive5.getGroupId("m" + var13 + "_" + var14); + class65.regionLandArchiveIds[var5] = NetSocket.archive5.getGroupId("l" + var13 + "_" + var14); + ++var5; + } + } + } + } + } + + ChatChannel.method2302(var2, var4, !var15); } } diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java index ba9353fd69..43f0788b48 100644 --- a/runescape-client/src/main/java/WorldMapLabelSize.java +++ b/runescape-client/src/main/java/WorldMapLabelSize.java @@ -4,104 +4,141 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("j") +@ObfuscatedName("q") @Implements("WorldMapLabelSize") public class WorldMapLabelSize { - @ObfuscatedName("f") + @ObfuscatedName("qw") @ObfuscatedSignature( - signature = "Lj;" + signature = "Ldw;" + ) + @Export("pcmPlayer0") + static PcmPlayer pcmPlayer0; + @ObfuscatedName("rn") + @ObfuscatedGetter( + intValue = 1439744000 + ) + static int field139; + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "Lq;" ) @Export("WorldMapLabelSize_small") public static final WorldMapLabelSize WorldMapLabelSize_small; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lj;" + signature = "Lq;" ) @Export("WorldMapLabelSize_medium") public static final WorldMapLabelSize WorldMapLabelSize_medium; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lj;" + signature = "Lq;" ) @Export("WorldMapLabelSize_large") public static final WorldMapLabelSize WorldMapLabelSize_large; - @ObfuscatedName("hs") - @ObfuscatedGetter( - intValue = 1779595595 + @ObfuscatedName("d") + public static short[] field128; + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "Lbz;" ) - @Export("cameraYaw") - static int cameraYaw; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 753179293 + @Export("loginScreenRunesAnimation") + static LoginScreenAnimation loginScreenRunesAnimation; + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Lal;" ) - final int field113; - @ObfuscatedName("p") + @Export("worldMapEvent") + static WorldMapEvent worldMapEvent; + @ObfuscatedName("er") @ObfuscatedGetter( - intValue = -1705085615 + intValue = 1639032335 ) - final int field110; - @ObfuscatedName("b") + @Export("port1") + static int port1; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1894041549 + intValue = -147452209 ) - final int field109; + final int field127; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -10868609 + ) + final int field132; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 984617173 + ) + final int field131; static { - WorldMapLabelSize_small = new WorldMapLabelSize(2, 0, 4); - WorldMapLabelSize_medium = new WorldMapLabelSize(1, 1, 2); - WorldMapLabelSize_large = new WorldMapLabelSize(0, 2, 0); + WorldMapLabelSize_small = new WorldMapLabelSize(0, 0, 4); + WorldMapLabelSize_medium = new WorldMapLabelSize(2, 1, 2); + WorldMapLabelSize_large = new WorldMapLabelSize(1, 2, 0); } WorldMapLabelSize(int var1, int var2, int var3) { - this.field113 = var1; - this.field110 = var2; - this.field109 = var3; + this.field127 = var1; + this.field132 = var2; + this.field131 = var3; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(FI)Z", - garbageValue = "-886615284" + garbageValue = "-680427426" ) - boolean method183(float var1) { - return var1 >= (float)this.field109; + boolean method192(float var1) { + return var1 >= (float)this.field131; } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(II)Lj;", - garbageValue = "1782583414" + signature = "(I)V", + garbageValue = "-1845192428" ) - static WorldMapLabelSize method182(int var0) { - WorldMapLabelSize[] var1 = new WorldMapLabelSize[]{WorldMapLabelSize_small, WorldMapLabelSize_large, WorldMapLabelSize_medium}; - WorldMapLabelSize[] var2 = var1; + static void method198() { + ItemContainer.itemContainers = new NodeHashTable(32); + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "(ZI)V", + garbageValue = "-1220899418" + ) + public static void method197(boolean var0) { + if (var0 != class298.ItemDefinition_inMembersWorld) { + ItemDefinition.ItemDefinition_cached.clear(); + ItemDefinition.ItemDefinition_cachedModels.clear(); + ItemDefinition.ItemDefinition_cachedSprites.clear(); + class298.ItemDefinition_inMembersWorld = var0; + } + + } + + @ObfuscatedName("am") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "2070539914" + ) + @Export("runWidgetOnLoadListener") + static void runWidgetOnLoadListener(int var0) { + if (var0 != -1) { + if (ScriptFrame.loadInterface(var0)) { + Widget[] var1 = WorldMapLabel.Widget_interfaceComponents[var0]; + + for (int var2 = 0; var2 < var1.length; ++var2) { + Widget var3 = var1[var2]; + if (var3.onLoad != null) { + ScriptEvent var4 = new ScriptEvent(); + var4.widget = var3; + var4.args = var3.onLoad; + WorldMapID.runScript(var4, 5000000); + } + } - for (int var3 = 0; var3 < var2.length; ++var3) { - WorldMapLabelSize var4 = var2[var3]; - if (var0 == var4.field110) { - return var4; } } - - return null; - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(ILkg;Lif;I)V", - garbageValue = "408985273" - ) - static void method186(int var0, ArchiveDisk var1, Archive var2) { - ArchiveDiskAction var3 = new ArchiveDiskAction(); - var3.type = 1; - var3.key = (long)var0; - var3.archiveDisk = var1; - var3.archive = var2; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); - } - - class32.method549(); } } diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java index 1d4d411633..442fd7f3b8 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -8,121 +8,101 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ar") +@ObfuscatedName("ak") @Implements("WorldMapManager") public final class WorldMapManager { - @ObfuscatedName("dd") - @ObfuscatedSignature( - signature = "Lif;" - ) - @Export("archive9") - static Archive archive9; - @ObfuscatedName("hq") - @ObfuscatedGetter( - intValue = -652889909 - ) - static int field314; - @ObfuscatedName("jp") - @ObfuscatedSignature( - signature = "Lha;" - ) - static Widget field312; - @ObfuscatedName("ku") - @ObfuscatedGetter( - intValue = -1617122989 - ) - @Export("menuY") - static int menuY; - @ObfuscatedName("f") + @ObfuscatedName("a") + @Export("BZip2Decompressor_block") + static int[] BZip2Decompressor_block; + @ObfuscatedName("c") @Export("loaded") boolean loaded; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("loadStarted") boolean loadStarted; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lay;" + signature = "Law;" ) @Export("mapAreaData") WorldMapAreaData mapAreaData; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lls;" + signature = "Llt;" ) @Export("compositeTextureSprite") Sprite compositeTextureSprite; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("icons") HashMap icons; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "[[Las;" + signature = "[[Lax;" ) @Export("regions") WorldMapRegion[][] regions; - @ObfuscatedName("e") - HashMap field297; - @ObfuscatedName("x") + @ObfuscatedName("d") + HashMap field324; + @ObfuscatedName("l") @ObfuscatedSignature( signature = "[Lli;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) @Export("geographyArchive") final AbstractArchive geographyArchive; - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) @Export("groundArchive") final AbstractArchive groundArchive; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("fonts") final HashMap fonts; - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -880496543 + intValue = 792568209 ) @Export("tileX") int tileX; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -457247813 + intValue = -394276419 ) @Export("tileY") int tileY; - @ObfuscatedName("k") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -2082991249 + intValue = -744573755 ) @Export("tileWidth") int tileWidth; - @ObfuscatedName("s") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1520705984 + intValue = 439051201 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1382078931 + intValue = -139789011 ) @Export("pixelsPerTile") public int pixelsPerTile; @ObfuscatedSignature( - signature = "([Lli;Ljava/util/HashMap;Lhz;Lhz;)V" + signature = "([Lli;Ljava/util/HashMap;Lii;Lii;)V" ) public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) { this.loaded = false; this.loadStarted = false; - this.field297 = new HashMap(); + this.field324 = new HashMap(); this.pixelsPerTile = 0; this.mapSceneSprites = var1; this.fonts = var2; @@ -130,10 +110,10 @@ public final class WorldMapManager { this.groundArchive = var4; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lhz;Ljava/lang/String;ZI)V", - garbageValue = "1815825171" + signature = "(Lii;Ljava/lang/String;ZI)V", + garbageValue = "1034038969" ) @Export("load") public void load(AbstractArchive var1, String var2, boolean var3) { @@ -141,10 +121,10 @@ public final class WorldMapManager { this.loaded = false; this.loadStarted = true; System.nanoTime(); - int var4 = var1.getGroupId(WorldMapCacheName.field291.name); + int var4 = var1.getGroupId(WorldMapCacheName.field313.name); int var5 = var1.getFileId(var4, var2); - Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field291.name, var2)); - Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field286.name, var2)); + Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field313.name, var2)); + Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field309.name, var2)); System.nanoTime(); System.nanoTime(); this.mapAreaData = new WorldMapAreaData(); @@ -158,10 +138,10 @@ public final class WorldMapManager { this.mapAreaData.getOriginX(); this.mapAreaData.getOriginPlane(); this.mapAreaData.getOriginY(); - this.tileX = this.mapAreaData.getRegionLowX() * 4096; - this.tileY = this.mapAreaData.getRegionLowY() * 4096; + this.tileX = this.mapAreaData.getRegionLowX() * 64; + this.tileY = this.mapAreaData.getRegionLowY() * 64; this.tileWidth = (this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1) * 64; - this.tileHeight = (this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1) * 4096; + this.tileHeight = (this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1) * 64; int var16 = this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1; int var9 = this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1; System.nanoTime(); @@ -191,9 +171,9 @@ public final class WorldMapManager { System.nanoTime(); System.nanoTime(); - if (var1.isValidFileName(WorldMapCacheName.field287.name, var2)) { - byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field287.name, var2); - this.compositeTextureSprite = GrandExchangeOfferTotalQuantityComparator.convertJpgToSprite(var20); + if (var1.isValidFileName(WorldMapCacheName.field310.name, var2)) { + byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field310.name, var2); + this.compositeTextureSprite = class14.convertJpgToSprite(var20); } System.nanoTime(); @@ -203,20 +183,20 @@ public final class WorldMapManager { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "29" + signature = "(I)V", + garbageValue = "-2129677243" ) @Export("clearIcons") public final void clearIcons() { this.icons = null; } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(IIIIIIIIB)V", - garbageValue = "-92" + garbageValue = "-91" ) @Export("drawTiles") public final void drawTiles(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { @@ -229,49 +209,49 @@ public final class WorldMapManager { float var14 = this.getPixelsPerTile(var7 - var5, var3 - var1); int var15 = (int)Math.ceil((double)var14); this.pixelsPerTile = var15; - if (!this.field297.containsKey(var15)) { + if (!this.field324.containsKey(var15)) { class40 var16 = new class40(var15); var16.init(); - this.field297.put(var15, var16); + this.field324.put(var15, var16); } - int var23 = var13.x + var13.width - 1; - int var17 = var13.height + var13.y - 1; + int var23 = var13.width + var13.x - 1; + int var17 = var13.y + var13.height - 1; int var18; int var19; for (var18 = var13.x; var18 <= var23; ++var18) { for (var19 = var13.y; var19 <= var17; ++var19) { - this.regions[var18][var19].drawTile(var15, (class40)this.field297.get(var15), this.mapSceneSprites, this.geographyArchive, this.groundArchive); + this.regions[var18][var19].drawTile(var15, (class40)this.field324.get(var15), this.mapSceneSprites, this.geographyArchive, this.groundArchive); } } Rasterizer2D.Rasterizer2D_replace(var9, var10, var11); Rasterizer2D.Rasterizer2D_setClipArray(var12); - var18 = (int)(var14 * 64.0F); - var19 = this.tileX * 64 + var1; - int var20 = this.tileY * 64 + var2; + var18 = (int)(64.0F * var14); + var19 = this.tileX * 4096 + var1; + int var20 = this.tileY * 4096 + var2; for (int var21 = var13.x; var21 < var13.width + var13.x; ++var21) { - for (int var22 = var13.y; var22 < var13.y + var13.height; ++var22) { - this.regions[var21][var22].method417(var5 + var18 * (this.regions[var21][var22].regionX * 64 - var19) / 64, var8 - var18 * (this.regions[var21][var22].regionY * 64 - var20 + 64) / 64, var18); + for (int var22 = var13.y; var22 < var13.height + var13.y; ++var22) { + this.regions[var21][var22].method442(var5 + var18 * (this.regions[var21][var22].regionX * 64 - var19) / 64, var8 - var18 * (this.regions[var21][var22].regionY * 64 - var20 + 64) / 64, var18); } } } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZI)V", - garbageValue = "64885901" + garbageValue = "952569644" ) @Export("drawElements") public final void drawElements(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, HashSet var9, HashSet var10, int var11, int var12, boolean var13) { WorldMapRectangle var14 = this.createWorldMapRectangle(var1, var2, var3, var4); float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1); int var16 = (int)(var15 * 64.0F); - int var17 = this.tileX * 64 + var1; - int var18 = this.tileY * 64 + var2; + int var17 = this.tileX * 4096 + var1; + int var18 = this.tileY * 4096 + var2; int var19; int var20; @@ -281,13 +261,13 @@ public final class WorldMapManager { this.regions[var19][var20].initWorldMapIcon1s(); } - this.regions[var19][var20].method427(var5 + var16 * (this.regions[var19][var20].regionX * 64 - var17) / 64, var8 - var16 * (this.regions[var19][var20].regionY * 64 - var18 + 64) / 64, var16, var9); + this.regions[var19][var20].method452(var5 + var16 * (this.regions[var19][var20].regionX * 64 - var17) / 64, var8 - var16 * (this.regions[var19][var20].regionY * 64 - var18 + 64) / 64, var16, var9); } } if (var10 != null && var11 > 0) { for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { - for (var20 = var14.y; var20 < var14.y + var14.height; ++var20) { + for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { this.regions[var19][var20].flashElements(var10, var11, var12); } } @@ -295,10 +275,10 @@ public final class WorldMapManager { } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IIIILjava/util/HashSet;IIS)V", - garbageValue = "5037" + signature = "(IIIILjava/util/HashSet;IIB)V", + garbageValue = "-1" ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4, HashSet var5, int var6, int var7) { @@ -326,8 +306,8 @@ public final class WorldMapManager { while (var11.hasNext()) { AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var11.next(); - int var13 = var3 * (var12.coord2.x - this.tileX * 64) / (this.tileWidth * 4096); - int var14 = var4 - var4 * (var12.coord2.y - this.tileY * 64) / (this.tileHeight * 64); + int var13 = var3 * (var12.coord2.x - this.tileX * 4096) / (this.tileWidth * 4096); + int var14 = var4 - (var12.coord2.y - this.tileY * 4096) * var4 / (this.tileHeight * 4096); Rasterizer2D.Rasterizer2D_drawCircleAlpha(var13 + var1, var14 + var2, 2, 16776960, 256); } } @@ -335,25 +315,25 @@ public final class WorldMapManager { } } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(IIIIIIIIIIB)Ljava/util/List;", - garbageValue = "-26" + garbageValue = "-89" ) - public List method647(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { + public List method643(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { LinkedList var11 = new LinkedList(); if (!this.loaded) { return var11; } else { WorldMapRectangle var12 = this.createWorldMapRectangle(var1, var2, var3, var4); float var13 = this.getPixelsPerTile(var7, var3 - var1); - int var14 = (int)(var13 * 64.0F); - int var15 = this.tileX * 64 + var1; - int var16 = this.tileY * 64 + var2; + int var14 = (int)(64.0F * var13); + int var15 = this.tileX * 4096 + var1; + int var16 = this.tileY * 4096 + var2; for (int var17 = var12.x; var17 < var12.width + var12.x; ++var17) { - for (int var18 = var12.y; var18 < var12.height + var12.y; ++var18) { - List var19 = this.regions[var17][var18].method498(var5 + var14 * (this.regions[var17][var18].regionX * 64 - var15) / 64, var8 + var6 - var14 * (this.regions[var17][var18].regionY * 64 - var16 + 64) / 64, var14, var9, var10); + for (int var18 = var12.y; var18 < var12.y + var12.height; ++var18) { + List var19 = this.regions[var17][var18].method472(var5 + var14 * (this.regions[var17][var18].regionX * 64 - var15) / 64, var8 + var6 - var14 * (this.regions[var17][var18].regionY * 64 - var16 + 64) / 64, var14, var9, var10); if (!var19.isEmpty()) { var11.addAll(var19); } @@ -364,18 +344,18 @@ public final class WorldMapManager { } } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(IIIII)Lm;", - garbageValue = "1308551287" + signature = "(IIIII)Lr;", + garbageValue = "1051811475" ) @Export("createWorldMapRectangle") WorldMapRectangle createWorldMapRectangle(int var1, int var2, int var3, int var4) { WorldMapRectangle var5 = new WorldMapRectangle(this); - int var6 = this.tileX * 64 + var1; - int var7 = this.tileY * 64 + var2; - int var8 = var3 + this.tileX * 64; - int var9 = this.tileY * 64 + var4; + int var6 = this.tileX * 4096 + var1; + int var7 = this.tileY * 4096 + var2; + int var8 = var3 + this.tileX * 4096; + int var9 = this.tileY * 4096 + var4; int var10 = var6 / 64; int var11 = var7 / 64; int var12 = var8 / 64; @@ -407,20 +387,20 @@ public final class WorldMapManager { return var5; } - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(B)Z", - garbageValue = "1" + garbageValue = "0" ) @Export("isLoaded") public boolean isLoaded() { return this.loaded; } - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)Ljava/util/HashMap;", - garbageValue = "1748000895" + signature = "(B)Ljava/util/HashMap;", + garbageValue = "-24" ) @Export("buildIcons") public HashMap buildIcons() { @@ -428,10 +408,10 @@ public final class WorldMapManager { return this.icons; } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1796142123" + garbageValue = "241719352" ) @Export("buildIcons0") void buildIcons0() { @@ -465,10 +445,10 @@ public final class WorldMapManager { } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(III)F", - garbageValue = "2117368488" + signature = "(IIB)F", + garbageValue = "76" ) @Export("getPixelsPerTile") float getPixelsPerTile(int var1, int var2) { @@ -483,151 +463,33 @@ public final class WorldMapManager { } } - @ObfuscatedName("w") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(ILcu;ZB)I", - garbageValue = "0" + signature = "(II)Z", + garbageValue = "487477583" ) - static int method656(int var0, Script var1, boolean var2) { - int var3; - int var4; - if (var0 == ScriptOpcodes.CC_CREATE) { - class188.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - int var5 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2]; - if (var4 == 0) { - throw new RuntimeException(); - } else { - Widget var6 = Tile.getWidget(var3); - if (var6.children == null) { - var6.children = new Widget[var5 + 1]; - } - - if (var6.children.length <= var5) { - Widget[] var7 = new Widget[var5 + 1]; - - for (int var8 = 0; var8 < var6.children.length; ++var8) { - var7[var8] = var6.children[var8]; - } - - var6.children = var7; - } - - if (var5 > 0 && var6.children[var5 - 1] == null) { - throw new RuntimeException("" + (var5 - 1)); - } else { - Widget var12 = new Widget(); - var12.type = var4; - var12.parentId = var12.id = var6.id; - var12.childIndex = var5; - var12.isIf3 = true; - var6.children[var5] = var12; - if (var2) { - UserComparator7.field1946 = var12; - } else { - class197.field2398 = var12; - } - - LoginPacket.invalidateWidget(var6); - return 1; - } - } - } else { - Widget var9; - if (var0 == ScriptOpcodes.CC_DELETE) { - var9 = var2 ? UserComparator7.field1946 : class197.field2398; - Widget var10 = Tile.getWidget(var9.id); - var10.children[var9.childIndex] = null; - LoginPacket.invalidateWidget(var10); - return 1; - } else if (var0 == ScriptOpcodes.CC_DELETEALL) { - var9 = Tile.getWidget(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); - var9.children = null; - LoginPacket.invalidateWidget(var9); - return 1; - } else if (var0 != ScriptOpcodes.CC_FIND) { - if (var0 == ScriptOpcodes.IF_FIND) { - var9 = Tile.getWidget(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); - if (var9 != null) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 1; - if (var2) { - UserComparator7.field1946 = var9; - } else { - class197.field2398 = var9; - } - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else { - return 2; - } - } else { - class188.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - Widget var11 = BZip2State.getWidgetChild(var3, var4); - if (var11 != null && var4 != -1) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 1; - if (var2) { - UserComparator7.field1946 = var11; - } else { - class197.field2398 = var11; - } - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } - } + public static boolean method673(int var0) { + return (var0 >> 30 & 1) != 0; } - @ObfuscatedName("d") + @ObfuscatedName("ik") @ObfuscatedSignature( - signature = "(CI)Z", - garbageValue = "1068485725" + signature = "(B)V", + garbageValue = "9" ) - @Export("isCharAlphabetic") - public static boolean isCharAlphabetic(char var0) { - return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; - } - - @ObfuscatedName("ha") - @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "1926930622" - ) - static int method635(int var0, int var1) { - int var2 = var1 - 334; - if (var2 < 0) { - var2 = 0; - } else if (var2 > 100) { - var2 = 100; - } - - int var3 = (Client.zoomWidth - Client.zoomHeight) * var2 / 100 + Client.zoomHeight; - return var0 * var3 / 256; - } - - @ObfuscatedName("lh") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "933243539" - ) - static String method662(String var0) { - PlayerType[] var1 = MusicPatchPcmStream.PlayerType_values(); - - for (int var2 = 0; var2 < var1.length; ++var2) { - PlayerType var3 = var1[var2]; - if (var3.modIcon != -1 && var0.startsWith(ChatChannel.method2269(var3.modIcon))) { - var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); - break; + @Export("Widget_runOnTargetLeave") + static void Widget_runOnTargetLeave() { + if (Client.isSpellSelected) { + Widget var0 = SpriteMask.getWidgetChild(FontName.selectedSpellWidget, Client.selectedSpellChildIndex); + if (var0 != null && var0.onTargetLeave != null) { + ScriptEvent var1 = new ScriptEvent(); + var1.widget = var0; + var1.args = var0.onTargetLeave; + class4.runScriptEvent(var1); } - } - return var0; + Client.isSpellSelected = false; + NPCDefinition.invalidateWidget(var0); + } } } diff --git a/runescape-client/src/main/java/WorldMapRectangle.java b/runescape-client/src/main/java/WorldMapRectangle.java index f941ac9f2a..bc3115ee11 100644 --- a/runescape-client/src/main/java/WorldMapRectangle.java +++ b/runescape-client/src/main/java/WorldMapRectangle.java @@ -1,581 +1,150 @@ +import java.io.File; +import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("m") +@ObfuscatedName("r") @Implements("WorldMapRectangle") public final class WorldMapRectangle { - @ObfuscatedName("sh") + @ObfuscatedName("pb") @ObfuscatedSignature( - signature = "Lkg;" + signature = "Llt;" ) - @Export("masterDisk") - static ArchiveDisk masterDisk; - @ObfuscatedName("f") + @Export("sceneMinimapSprite") + static Sprite sceneMinimapSprite; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -2130750927 + intValue = 1400048681 ) @Export("width") int width; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -2077652257 + intValue = -1470820319 ) @Export("height") int height; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1828733085 + intValue = -86733365 ) @Export("x") int x; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1246600449 + intValue = 204657909 ) @Export("y") int y; // $FF: synthetic field @ObfuscatedSignature( - signature = "Lar;" + signature = "Lak;" ) final WorldMapManager this$0; @ObfuscatedSignature( - signature = "(Lar;)V" + signature = "(Lak;)V" ) WorldMapRectangle(WorldMapManager var1) { this.this$0 = var1; } - @ObfuscatedName("aj") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(ILcu;ZI)I", - garbageValue = "-1751394483" + signature = "(Ljava/lang/String;Ljava/lang/String;ZI)Lmx;", + garbageValue = "636335371" ) - static int method273(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 6600) { - var3 = UrlRequest.Client_plane; - int var9 = MusicPatchPcmStream.baseX * 64 + (Message.localPlayer.x >> 7); - int var5 = ScriptEvent.baseY * 64 + (Message.localPlayer.y >> 7); - Canvas.getWorldMap().method6367(var3, var9, var5, true); - return 1; - } else { - WorldMapArea var11; - if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - String var16 = ""; - var11 = Canvas.getWorldMap().getMapArea(var3); - if (var11 != null) { - var16 = var11.getExternalName(); - } - - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var16; - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Canvas.getWorldMap().setCurrentMapAreaId(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Canvas.getWorldMap().getZoomLevel(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Canvas.getWorldMap().setZoomPercentage(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Canvas.getWorldMap().isCacheLoaded() ? 1 : 0; - return 1; - } else { - Coord var15; - if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { - var15 = new Coord(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); - Canvas.getWorldMap().setWorldMapPositionTarget(var15.x, var15.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { - var15 = new Coord(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); - Canvas.getWorldMap().setWorldMapPositionTargetInstant(var15.x, var15.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { - var15 = new Coord(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); - Canvas.getWorldMap().jumpToSourceCoord(var15.plane, var15.x, var15.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { - var15 = new Coord(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); - Canvas.getWorldMap().jumpToSourceCoordInstant(var15.plane, var15.x, var15.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Canvas.getWorldMap().getDisplayX(); - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Canvas.getWorldMap().getDisplayY(); - return 1; - } else { - WorldMapArea var13; - if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - var13 = Canvas.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var13.getOrigin().packed(); - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - var13 = Canvas.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = (var13.getRegionHighX() - var13.getRegionLowX() + 1) * 64; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = (var13.getRegionHighY() - var13.getRegionLowY() + 1) * 64; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - var13 = Canvas.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var13.getRegionLowX() * 64; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var13.getRegionLowY() * 64; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var13.getRegionHighX() * 64 + 64 - 1; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var13.getRegionHighY() * 64 + 64 - 1; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - var13 = Canvas.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var13.getZoom(); - } - - return 1; - } else if (var0 == 6615) { - var15 = Canvas.getWorldMap().getDisplayCoord(); - if (var15 == null) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var15.x; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var15.y; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Canvas.getWorldMap().currentMapAreaId(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { - var15 = new Coord(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); - var13 = Canvas.getWorldMap().getCurrentMapArea(); - if (var13 == null) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; - return 1; - } else { - int[] var14 = var13.position(var15.plane, var15.x, var15.y); - if (var14 == null) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var14[0]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var14[1]; - } - - return 1; - } - } else { - Coord var7; - if (var0 == 6618) { - var15 = new Coord(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); - var13 = Canvas.getWorldMap().getCurrentMapArea(); - if (var13 == null) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; - return 1; - } else { - var7 = var13.coord(var15.x, var15.y); - if (var7 == null) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var7.packed(); - } - - return 1; - } - } else { - Coord var12; - if (var0 == 6619) { - class188.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]); - GrandExchangeEvent.method80(var3, var12, false); - return 1; - } else if (var0 == 6620) { - class188.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]); - GrandExchangeEvent.method80(var3, var12, true); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { - class188.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]); - var11 = Canvas.getWorldMap().getMapArea(var3); - if (var11 == null) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - return 1; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var11.containsCoord(var12.plane, var12.x, var12.y) ? 1 : 0; - return 1; - } - } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Canvas.getWorldMap().getDisplayWith(); - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Canvas.getWorldMap().getDisplayHeight(); - return 1; - } else if (var0 == 6623) { - var15 = new Coord(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); - var13 = Canvas.getWorldMap().mapAreaAtCoord(var15.plane, var15.x, var15.y); - if (var13 == null) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var13.getId(); - } - - return 1; - } else if (var0 == 6624) { - Canvas.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); - return 1; - } else if (var0 == 6625) { - Canvas.getWorldMap().resetMaxFlashCount(); - return 1; - } else if (var0 == 6626) { - Canvas.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); - return 1; - } else if (var0 == 6627) { - Canvas.getWorldMap().resetCyclesPerFlash(); - return 1; - } else { - boolean var10; - if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { - var10 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - Canvas.getWorldMap().setPerpetualFlash(var10); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Canvas.getWorldMap().flashElement(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Canvas.getWorldMap().flashCategory(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { - Canvas.getWorldMap().stopCurrentFlashes(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { - var10 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - Canvas.getWorldMap().setElementsDisabled(var10); - return 1; - } else { - boolean var4; - if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { - class188.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1] == 1; - Canvas.getWorldMap().disableElement(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { - class188.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1] == 1; - Canvas.getWorldMap().setCategoryDisabled(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Canvas.getWorldMap().getElementsDisabled() ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Canvas.getWorldMap().isElementDisabled(var3) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Canvas.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; - return 1; - } else if (var0 == 6638) { - class188.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]); - var7 = Canvas.getWorldMap().method6416(var3, var12); - if (var7 == null) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var7.packed(); - } - - return 1; - } else { - AbstractWorldMapIcon var8; - if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { - var8 = Canvas.getWorldMap().iconStart(); - if (var8 == null) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var8.getElement(); - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var8.coord2.packed(); - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { - var8 = Canvas.getWorldMap().iconNext(); - if (var8 == null) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var8.getElement(); - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var8.coord2.packed(); - } - - return 1; - } else { - WorldMapElement var6; - if (var0 == ScriptOpcodes.MEC_TEXT) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - var6 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var3); - if (var6.name == null) { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var6.name; - } - - return 1; - } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - var6 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var3); - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var6.textSize; - return 1; - } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - var6 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var3); - if (var6 == null) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var6.category; - } - - return 1; - } else if (var0 == ScriptOpcodes.MEC_SPRITE) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - var6 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var3); - if (var6 == null) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var6.sprite1; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = WorldMapLabel.worldMapEvent.mapElement; - return 1; - } else if (var0 == 6698) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = WorldMapLabel.worldMapEvent.coord1.packed(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = WorldMapLabel.worldMapEvent.coord2.packed(); - return 1; - } else { - return 2; - } - } - } - } - } - } - } - } + @Export("getPreferencesFile") + public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { + File var3 = new File(JagexCache.cacheDir, "preferences" + var0 + ".dat"); + if (var3.exists()) { + try { + AccessFile var10 = new AccessFile(var3, "rw", 10000L); + return var10; + } catch (IOException var9) { } } + + String var4 = ""; + if (GrandExchangeOfferOwnWorldComparator.cacheGamebuild == 33) { + var4 = "_rc"; + } else if (GrandExchangeOfferOwnWorldComparator.cacheGamebuild == 34) { + var4 = "_wip"; + } + + File var5 = new File(UserComparator4.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); + AccessFile var6; + if (!var2 && var5.exists()) { + try { + var6 = new AccessFile(var5, "rw", 10000L); + return var6; + } catch (IOException var8) { + } + } + + try { + var6 = new AccessFile(var3, "rw", 10000L); + return var6; + } catch (IOException var7) { + throw new RuntimeException(); + } } - @ObfuscatedName("go") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "66" + signature = "(IIS)Lbn;", + garbageValue = "-2264" ) - static final int method275() { - if (Interpreter.clientPreferences.roofsHidden) { - return UrlRequest.Client_plane; - } else { - int var0 = 3; - if (ViewportMouse.cameraPitch < 310) { - int var1; - int var2; - if (Client.oculusOrbState == 1) { - var1 = WorldMapSectionType.oculusOrbFocalPointX >> 7; - var2 = Language.oculusOrbFocalPointY >> 7; - } else { - var1 = Message.localPlayer.x >> 7; - var2 = Message.localPlayer.y >> 7; - } - - int var3 = MusicPatchNode2.cameraX >> 7; - int var4 = UserComparator9.cameraZ >> 7; - if (var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) { - return UrlRequest.Client_plane; - } - - if (var1 < 0 || var2 < 0 || var1 >= 104 || var2 >= 104) { - return UrlRequest.Client_plane; - } - - if ((Tiles.Tiles_renderFlags[UrlRequest.Client_plane][var3][var4] & 4) != 0) { - var0 = UrlRequest.Client_plane; - } - - int var5; - if (var1 > var3) { - var5 = var1 - var3; - } else { - var5 = var3 - var1; - } - - int var6; - if (var2 > var4) { - var6 = var2 - var4; - } else { - var6 = var4 - var2; - } - - int var7; - int var8; - if (var5 > var6) { - var7 = var6 * 65536 / var5; - var8 = 32768; - - while (var3 != var1) { - if (var3 < var1) { - ++var3; - } else if (var3 > var1) { - --var3; - } - - if ((Tiles.Tiles_renderFlags[UrlRequest.Client_plane][var3][var4] & 4) != 0) { - var0 = UrlRequest.Client_plane; - } - - var8 += var7; - if (var8 >= 65536) { - var8 -= 65536; - if (var4 < var2) { - ++var4; - } else if (var4 > var2) { - --var4; - } - - if ((Tiles.Tiles_renderFlags[UrlRequest.Client_plane][var3][var4] & 4) != 0) { - var0 = UrlRequest.Client_plane; - } - } - } - } else if (var6 > 0) { - var7 = var5 * 65536 / var6; - var8 = 32768; - - while (var4 != var2) { - if (var4 < var2) { - ++var4; - } else if (var4 > var2) { - --var4; - } - - if ((Tiles.Tiles_renderFlags[UrlRequest.Client_plane][var3][var4] & 4) != 0) { - var0 = UrlRequest.Client_plane; - } - - var8 += var7; - if (var8 >= 65536) { - var8 -= 65536; - if (var3 < var1) { - ++var3; - } else if (var3 > var1) { - --var3; - } - - if ((Tiles.Tiles_renderFlags[UrlRequest.Client_plane][var3][var4] & 4) != 0) { - var0 = UrlRequest.Client_plane; - } - } - } - } - } - - if (Message.localPlayer.x >= 0 && Message.localPlayer.y >= 0 && Message.localPlayer.x < 13312 && Message.localPlayer.y < 13312) { - if ((Tiles.Tiles_renderFlags[UrlRequest.Client_plane][Message.localPlayer.x >> 7][Message.localPlayer.y >> 7] & 4) != 0) { - var0 = UrlRequest.Client_plane; - } - - return var0; - } else { - return UrlRequest.Client_plane; - } - } + @Export("Messages_getByChannelAndID") + static Message Messages_getByChannelAndID(int var0, int var1) { + ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); + return var2.getMessage(var1); } - @ObfuscatedName("hi") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(ZLkl;I)V", - garbageValue = "-1139721015" + signature = "(II)V", + garbageValue = "1219570731" ) - @Export("updateNpcs") - static final void updateNpcs(boolean var0, PacketBuffer var1) { - Client.field815 = 0; - Client.field673 = 0; - HitSplatDefinition.method4612(); - GrandExchangeOfferWorldComparator.method71(var0, var1); - class65.method1228(var1); - - int var2; - for (var2 = 0; var2 < Client.field815; ++var2) { - int var3 = Client.field745[var2]; - if (Client.npcs[var3].npcCycle != Client.cycle) { - Client.npcs[var3].definition = null; - Client.npcs[var3] = null; - } - } - - if (var1.offset != Client.packetWriter.serverPacketLength) { - throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); - } else { - for (var2 = 0; var2 < Client.npcCount; ++var2) { - if (Client.npcs[Client.npcIndices[var2]] == null) { - throw new RuntimeException(var2 + "," + Client.npcCount); - } + @Export("clearItemContainer") + static void clearItemContainer(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var1 != null) { + for (int var2 = 0; var2 < var1.ids.length; ++var2) { + var1.ids[var2] = -1; + var1.quantities[var2] = 0; } } } - @ObfuscatedName("io") + @ObfuscatedName("ip") @ObfuscatedSignature( - signature = "(IIS)V", - garbageValue = "-26305" + signature = "(IIIIII)V", + garbageValue = "2037508438" ) - @Export("resumePauseWidget") - static void resumePauseWidget(int var0, int var1) { - PacketBufferNode var2 = class2.getPacketBufferNode(ClientPacket.field2246, Client.packetWriter.isaacCipher); - var2.packetBuffer.writeInt(var0); - var2.packetBuffer.method5746(var1); - Client.packetWriter.addNode(var2); + @Export("drawScrollBar") + static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { + class192.scrollBarSprites[0].drawAt(var0, var1); + class192.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field870); + int var5 = var3 * (var3 - 32) / var4; + if (var5 < 8) { + var5 = 8; + } + + int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field709); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field711); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field711); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field711); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field711); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field710); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field710); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field710); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var5 + var6 + var1 + 14, 15, Client.field710); } } diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index 47d52fbd5d..4857d7a862 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -1,6 +1,4 @@ -import java.io.File; -import java.io.IOException; -import java.io.RandomAccessFile; +import java.awt.Image; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -13,55 +11,63 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("as") +@ObfuscatedName("ax") @Implements("WorldMapRegion") public class WorldMapRegion { - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lfe;" + signature = "Lek;" ) @Export("WorldMapRegion_cachedSprites") public static DemotingHashTable WorldMapRegion_cachedSprites; - @ObfuscatedName("b") + @ObfuscatedName("aq") + static Image field254; + @ObfuscatedName("lw") + @ObfuscatedSignature( + signature = "Lck;" + ) + @Export("tempMenuAction") + static MenuAction tempMenuAction; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1375036887 + intValue = 1472843841 ) @Export("regionX") int regionX; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1046641901 + intValue = -973536499 ) @Export("regionY") int regionY; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Ll;" + signature = "Lw;" ) @Export("worldMapData_0") WorldMapData_0 worldMapData_0; - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("worldMapData1List") LinkedList worldMapData1List; - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1010803547 + intValue = 60788551 ) @Export("backgroundColor") int backgroundColor; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -401497597 + intValue = -1753597571 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("o") + @ObfuscatedName("h") @Export("icon0List") List icon0List; @ObfuscatedName("v") @Export("iconMap") HashMap iconMap; - @ObfuscatedName("k") + @ObfuscatedName("n") @Export("fonts") final HashMap fonts; @@ -79,13 +85,13 @@ public class WorldMapRegion { this.fonts = var4; } - @ObfuscatedName("y") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IIIB)V", - garbageValue = "-29" + signature = "(IIII)V", + garbageValue = "24692551" ) - void method417(int var1, int var2, int var3) { - Sprite var4 = WorldMapArea.method381(this.regionX, this.regionY, this.pixelsPerTile); + void method442(int var1, int var2, int var3) { + Sprite var4 = class60.method1187(this.regionX, this.regionY, this.pixelsPerTile); if (var4 != null) { if (var3 == this.pixelsPerTile * 64) { var4.drawAt(var1, var2); @@ -96,10 +102,10 @@ public class WorldMapRegion { } } - @ObfuscatedName("w") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ll;Ljava/util/List;B)V", - garbageValue = "14" + signature = "(Lw;Ljava/util/List;B)V", + garbageValue = "-57" ) @Export("initWorldMapData0") void initWorldMapData0(WorldMapData_0 var1, List var2) { @@ -108,10 +114,10 @@ public class WorldMapRegion { this.addAllToIconList(var2); } - @ObfuscatedName("p") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(Ljava/util/HashSet;Ljava/util/List;I)V", - garbageValue = "-203983545" + garbageValue = "369325117" ) @Export("initWorldMapData1") void initWorldMapData1(HashSet var1, List var2) { @@ -128,10 +134,10 @@ public class WorldMapRegion { this.addAllToIconList(var2); } - @ObfuscatedName("b") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IIIILh;I)V", - garbageValue = "-860745153" + signature = "(IIIILb;I)V", + garbageValue = "1972581880" ) @Export("getIconsForTiles") void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapData var5) { @@ -145,8 +151,8 @@ public class WorldMapRegion { for (int var11 = 0; var11 < var10.length; ++var11) { WorldMapDecoration var12 = var10[var11]; - ObjectDefinition var13 = Coord.getObjectDefinition(var12.objectDefinitionId); - if (FontName.method5377(var13)) { + ObjectDefinition var13 = Occluder.getObjectDefinition(var12.objectDefinitionId); + if (SoundSystem.method2565(var13)) { this.getIcon(var13, var8, var6, var7, var5); continue label51; } @@ -158,37 +164,37 @@ public class WorldMapRegion { } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lig;IIILh;I)V", - garbageValue = "-992347084" + signature = "(Lir;IIILb;S)V", + garbageValue = "24571" ) @Export("getIcon") void getIcon(ObjectDefinition var1, int var2, int var3, int var4, AbstractWorldMapData var5) { Coord var6 = new Coord(var2, var3 + this.regionX * 64, this.regionY * 64 + var4); Coord var7 = null; if (this.worldMapData_0 != null) { - var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 4096, var4 + this.worldMapData_0.regionYLow * 64); + var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, this.worldMapData_0.regionYLow * 4096 + var4); } else { WorldMapData_1 var8 = (WorldMapData_1)var5; - var7 = new Coord(var2 + var8.minPlane, var8.regionXLow * 4096 + var3 + var8.getChunkXLow() * 8, var4 + var8.regionYLow * 64 + var8.getChunkYLow() * 8); + var7 = new Coord(var2 + var8.minPlane, var8.regionXLow * 64 + var3 + var8.getChunkXLow() * 8, var8.regionYLow * 4096 + var4 + var8.getChunkYLow() * 8); } Object var10; if (var1.transforms != null) { var10 = new WorldMapIcon_1(var7, var6, var1.id, this); } else { - WorldMapElement var9 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var1.mapIconId); + WorldMapElement var9 = PacketBufferNode.WorldMapElement_get(var1.mapIconId); var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); } this.iconMap.put(new Coord(0, var3, var4), var10); } - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-128030675" + garbageValue = "93681400" ) @Export("initWorldMapIcon1s") void initWorldMapIcon1s() { @@ -203,10 +209,10 @@ public class WorldMapRegion { } - @ObfuscatedName("a") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(Ljava/util/List;I)V", - garbageValue = "1280170698" + garbageValue = "1607698315" ) @Export("addAllToIconList") void addAllToIconList(List var1) { @@ -215,19 +221,19 @@ public class WorldMapRegion { while (var2.hasNext()) { WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); if (var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { - WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method445(var3.element)); + WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method527(var3.element)); this.icon0List.add(var4); } } } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "29290" + signature = "(I)V", + garbageValue = "1410735729" ) - void method424() { + void method475() { if (this.worldMapData_0 != null) { this.worldMapData_0.reset(); } else { @@ -241,10 +247,10 @@ public class WorldMapRegion { } - @ObfuscatedName("c") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lhz;B)Z", - garbageValue = "8" + signature = "(Lii;B)Z", + garbageValue = "51" ) @Export("loadGeography") boolean loadGeography(AbstractArchive var1) { @@ -280,16 +286,16 @@ public class WorldMapRegion { } } - @ObfuscatedName("o") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(ILac;[Lli;Lhz;Lhz;I)V", - garbageValue = "907616954" + signature = "(ILav;[Lli;Lii;Lii;I)V", + garbageValue = "-1022935376" ) @Export("drawTile") void drawTile(int var1, class40 var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) { this.pixelsPerTile = var1; if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { - if (WorldMapArea.method381(this.regionX, this.regionY, var1) == null) { + if (class60.method1187(this.regionX, this.regionY, var1) == null) { boolean var6 = true; var6 &= this.loadGeography(var4); int var8; @@ -302,28 +308,33 @@ public class WorldMapRegion { var6 &= var5.tryLoadGroup(var8); if (var6) { byte[] var7 = var5.takeFileFlat(var8); - WorldMapSprite var9 = WorldMapDecoration.method325(var7); + WorldMapSprite var9 = PlayerType.method4204(var7); Sprite var10 = new Sprite(this.pixelsPerTile * 64, this.pixelsPerTile * 64); var10.setRaster(); if (this.worldMapData_0 != null) { - this.method475(var2, var3, var9); + this.method454(var2, var3, var9); } else { - this.method430(var2, var3, var9); + this.method455(var2, var3, var9); } - WorldMapData_0.method169(var10, this.regionX, this.regionY, this.pixelsPerTile); - this.method424(); + int var11 = this.regionX; + int var12 = this.regionY; + int var13 = this.pixelsPerTile; + DemotingHashTable var14 = WorldMapRegion_cachedSprites; + long var16 = (long)(var13 << 16 | var11 << 8 | var12); + var14.put(var10, var16, var10.pixels.length * 4); + this.method475(); } } } } - @ObfuscatedName("l") + @ObfuscatedName("h") @ObfuscatedSignature( signature = "(IIILjava/util/HashSet;B)V", - garbageValue = "91" + garbageValue = "68" ) - void method427(int var1, int var2, int var3, HashSet var4) { + void method452(int var1, int var2, int var3, HashSet var4) { if (var4 == null) { var4 = new HashSet(); } @@ -332,10 +343,10 @@ public class WorldMapRegion { this.drawMapLinks(var1, var2, var4, var3); } - @ObfuscatedName("t") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(Ljava/util/HashSet;III)V", - garbageValue = "-575920930" + signature = "(Ljava/util/HashSet;IIB)V", + garbageValue = "115" ) @Export("flashElements") void flashElements(HashSet var1, int var2, int var3) { @@ -346,44 +357,44 @@ public class WorldMapRegion { if (var5.hasValidElement()) { int var6 = var5.getElement(); if (var1.contains(var6)) { - WorldMapElement var7 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var6); + WorldMapElement var7 = PacketBufferNode.WorldMapElement_get(var6); this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); } } } - this.method436(var1, var2, var3); + this.method462(var1, var2, var3); } - @ObfuscatedName("j") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Lac;[Lli;Lav;B)V", - garbageValue = "121" + signature = "(Lav;[Lli;Laf;S)V", + garbageValue = "27653" ) - void method475(class40 var1, IndexedSprite[] var2, WorldMapSprite var3) { + void method454(class40 var1, IndexedSprite[] var2, WorldMapSprite var3) { int var4; int var5; for (var4 = 0; var4 < 64; ++var4) { for (var5 = 0; var5 < 64; ++var5) { this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); - this.method435(var4, var5, this.worldMapData_0, var1); + this.method458(var4, var5, this.worldMapData_0, var1); } } for (var4 = 0; var4 < 64; ++var4) { for (var5 = 0; var5 < 64; ++var5) { - this.method457(var4, var5, this.worldMapData_0, var1, var2); + this.method456(var4, var5, this.worldMapData_0, var1, var2); } } } - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lac;[Lli;Lav;I)V", - garbageValue = "11820226" + signature = "(Lav;[Lli;Laf;I)V", + garbageValue = "-532871376" ) - void method430(class40 var1, IndexedSprite[] var2, WorldMapSprite var3) { + void method455(class40 var1, IndexedSprite[] var2, WorldMapSprite var3) { Iterator var4 = this.worldMapData1List.iterator(); WorldMapData_1 var5; @@ -395,7 +406,7 @@ public class WorldMapRegion { for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { this.drawTileGround(var6, var7, var5, var1, var3); - this.method435(var6, var7, var5, var1); + this.method458(var6, var7, var5, var1); } } } @@ -407,27 +418,27 @@ public class WorldMapRegion { for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { - this.method457(var6, var7, var5, var1, var2); + this.method456(var6, var7, var5, var1, var2); } } } } - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(IILh;Lac;[Lli;I)V", - garbageValue = "-2005670242" + signature = "(IILb;Lav;[Lli;I)V", + garbageValue = "1825239742" ) - void method457(int var1, int var2, AbstractWorldMapData var3, class40 var4, IndexedSprite[] var5) { - this.method451(var1, var2, var3); - this.method434(var1, var2, var3, var5); + void method456(int var1, int var2, AbstractWorldMapData var3, class40 var4, IndexedSprite[] var5) { + this.method461(var1, var2, var3); + this.method542(var1, var2, var3, var5); } - @ObfuscatedName("z") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IILh;Lac;Lav;I)V", - garbageValue = "-1238267730" + signature = "(IILb;Lav;Laf;B)V", + garbageValue = "-20" ) @Export("drawTileGround") void drawTileGround(int var1, int var2, AbstractWorldMapData var3, class40 var4, WorldMapSprite var5) { @@ -439,56 +450,56 @@ public class WorldMapRegion { int var8 = 16711935; if (var7 != -1) { - var8 = Language.method3627(var7, this.backgroundColor); + var8 = AbstractUserComparator.method5119(var7, this.backgroundColor); } - if (var7 > -1 && var3.field150[0][var1][var2] == 0) { + if (var7 > -1 && var3.field188[0][var1][var2] == 0) { Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); } else { - int var9 = this.method433(var1, var2, var3, var5); + int var9 = this.method459(var1, var2, var3, var5); if (var7 == -1) { Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); } else { - var4.method736(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field150[0][var1][var2], var3.field149[0][var1][var2]); + var4.method736(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field188[0][var1][var2], var3.field175[0][var1][var2]); } } } - @ObfuscatedName("h") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(IILh;Lac;I)V", - garbageValue = "-1735440961" + signature = "(IILb;Lav;B)V", + garbageValue = "29" ) - void method435(int var1, int var2, AbstractWorldMapData var3, class40 var4) { + void method458(int var1, int var2, AbstractWorldMapData var3, class40 var4) { for (int var5 = 1; var5 < var3.planes; ++var5) { int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; if (var6 > -1) { - int var7 = Language.method3627(var6, this.backgroundColor); - if (var3.field150[var5][var1][var2] == 0) { + int var7 = AbstractUserComparator.method5119(var6, this.backgroundColor); + if (var3.field188[var5][var1][var2] == 0) { Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); } else { - var4.method736(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field150[var5][var1][var2], var3.field149[var5][var1][var2]); + var4.method736(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field188[var5][var1][var2], var3.field175[var5][var1][var2]); } } } } - @ObfuscatedName("m") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(IILh;Lav;I)I", - garbageValue = "-1005034743" + signature = "(IILb;Laf;I)I", + garbageValue = "1830841056" ) - int method433(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { + int method459(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); } - @ObfuscatedName("aa") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(IILh;[Lli;I)V", - garbageValue = "843307323" + signature = "(IILb;[Lli;I)V", + garbageValue = "-1911702637" ) - void method434(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { + void method542(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { for (int var5 = 0; var5 < var3.planes; ++var5) { WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; if (var6 != null && var6.length != 0) { @@ -497,21 +508,21 @@ public class WorldMapRegion { for (int var8 = 0; var8 < var7.length; ++var8) { WorldMapDecoration var9 = var7[var8]; int var11 = var9.decoration; - boolean var10 = var11 >= WorldMapDecorationType.field2725.id && var11 <= WorldMapDecorationType.field2726.id; + boolean var10 = var11 >= WorldMapDecorationType.field2747.id && var11 <= WorldMapDecorationType.field2748.id; if (!var10) { int var13 = var9.decoration; - boolean var12 = var13 == WorldMapDecorationType.field2727.id; + boolean var12 = var13 == WorldMapDecorationType.field2751.id; if (!var12) { continue; } } - ObjectDefinition var14 = Coord.getObjectDefinition(var9.objectDefinitionId); + ObjectDefinition var14 = Occluder.getObjectDefinition(var9.objectDefinitionId); if (var14.mapSceneId != -1) { if (var14.mapSceneId != 46 && var14.mapSceneId != 52) { - var4[var14.mapSceneId].method6124(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); + var4[var14.mapSceneId].method6162(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); } else { - var4[var14.mapSceneId].method6124(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); + var4[var14.mapSceneId].method6162(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); } } } @@ -520,12 +531,12 @@ public class WorldMapRegion { } - @ObfuscatedName("av") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(IILh;I)V", - garbageValue = "-2096863892" + signature = "(IILb;B)V", + garbageValue = "124" ) - void method451(int var1, int var2, AbstractWorldMapData var3) { + void method461(int var1, int var2, AbstractWorldMapData var3) { for (int var4 = 0; var4 < var3.planes; ++var4) { WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; if (var5 != null && var5.length != 0) { @@ -533,19 +544,19 @@ public class WorldMapRegion { for (int var7 = 0; var7 < var6.length; ++var7) { WorldMapDecoration var8 = var6[var7]; - if (Messages.method2240(var8.decoration)) { - ObjectDefinition var9 = Coord.getObjectDefinition(var8.objectDefinitionId); + if (class215.method4098(var8.decoration)) { + ObjectDefinition var9 = Occluder.getObjectDefinition(var8.objectDefinitionId); int var10 = var9.int1 != 0 ? -3407872 : -3355444; - if (var8.decoration == WorldMapDecorationType.field2719.id) { - this.method449(var1, var2, var8.rotation, var10); + if (var8.decoration == WorldMapDecorationType.field2745.id) { + this.method474(var1, var2, var8.rotation, var10); } - if (var8.decoration == WorldMapDecorationType.field2710.id) { - this.method449(var1, var2, var8.rotation, -3355444); - this.method449(var1, var2, var8.rotation + 1, var10); + if (var8.decoration == WorldMapDecorationType.field2729.id) { + this.method474(var1, var2, var8.rotation, -3355444); + this.method474(var1, var2, var8.rotation + 1, var10); } - if (var8.decoration == WorldMapDecorationType.field2708.id) { + if (var8.decoration == WorldMapDecorationType.field2743.id) { if (var8.rotation == 0) { Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var10); } @@ -555,7 +566,7 @@ public class WorldMapRegion { } if (var8.rotation == 2) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); } if (var8.rotation == 3) { @@ -563,7 +574,7 @@ public class WorldMapRegion { } } - if (var8.decoration == WorldMapDecorationType.field2707.id) { + if (var8.decoration == WorldMapDecorationType.field2731.id) { int var11 = var8.rotation % 2; int var12; if (var11 == 0) { @@ -583,10 +594,10 @@ public class WorldMapRegion { } - @ObfuscatedName("aw") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(IILjava/util/HashSet;II)V", - garbageValue = "-1722827665" + signature = "(IILjava/util/HashSet;IB)V", + garbageValue = "0" ) @Export("drawNonLinkMapIcons") void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { @@ -597,33 +608,33 @@ public class WorldMapRegion { while (var7.hasNext()) { Entry var8 = (Entry)var7.next(); Coord var9 = (Coord)var8.getKey(); - int var10 = (int)((float)var1 + (float)var9.x * var5 - var6); + int var10 = (int)(var5 * (float)var9.x + (float)var1 - var6); int var11 = (int)((float)(var2 + var4) - var5 * (float)var9.y - var6); AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); if (var12 != null && var12.hasValidElement()) { var12.screenX = var10; var12.screenY = var11; - WorldMapElement var13 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var12.getElement()); + WorldMapElement var13 = PacketBufferNode.WorldMapElement_get(var12.getElement()); if (!var3.contains(var13.getObjectId())) { - this.method439(var12, var10, var11, var5); + this.method464(var12, var10, var11, var5); } } } } - @ObfuscatedName("as") + @ObfuscatedName("ae") @ObfuscatedSignature( signature = "(Ljava/util/HashSet;III)V", - garbageValue = "-750214661" + garbageValue = "-1071751507" ) - void method436(HashSet var1, int var2, int var3) { + void method462(HashSet var1, int var2, int var3) { Iterator var4 = this.icon0List.iterator(); while (var4.hasNext()) { AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); if (var5.hasValidElement()) { - WorldMapElement var6 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var5.getElement()); + WorldMapElement var6 = PacketBufferNode.WorldMapElement_get(var5.getElement()); if (var6 != null && var1.contains(var6.getObjectId())) { this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); } @@ -632,10 +643,10 @@ public class WorldMapRegion { } - @ObfuscatedName("ak") + @ObfuscatedName("af") @ObfuscatedSignature( - signature = "(Lit;IIIII)V", - garbageValue = "1151123929" + signature = "(Lim;IIIII)V", + garbageValue = "-1197729019" ) @Export("drawBackgroundCircle") void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) { @@ -650,51 +661,51 @@ public class WorldMapRegion { } } - @ObfuscatedName("au") + @ObfuscatedName("az") @ObfuscatedSignature( - signature = "(Lao;IIFB)V", - garbageValue = "22" + signature = "(Laq;IIFI)V", + garbageValue = "1534563948" ) - void method439(AbstractWorldMapIcon var1, int var2, int var3, float var4) { - WorldMapElement var5 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var1.getElement()); - this.method440(var5, var2, var3); - this.method507(var1, var5, var2, var3, var4); + void method464(AbstractWorldMapIcon var1, int var2, int var3, float var4) { + WorldMapElement var5 = PacketBufferNode.WorldMapElement_get(var1.getElement()); + this.method465(var5, var2, var3); + this.method460(var1, var5, var2, var3, var4); } - @ObfuscatedName("ah") + @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "(Lit;III)V", - garbageValue = "-1270354763" + signature = "(Lim;IIB)V", + garbageValue = "59" ) - void method440(WorldMapElement var1, int var2, int var3) { + void method465(WorldMapElement var1, int var2, int var3) { Sprite var4 = var1.getSpriteBool(false); if (var4 != null) { - int var5 = this.method443(var4, var1.horizontalAlignment); - int var6 = this.method444(var4, var1.verticalAlignment); + int var5 = this.method524(var4, var1.horizontalAlignment); + int var6 = this.method469(var4, var1.verticalAlignment); var4.drawTransBgAt(var5 + var2, var3 + var6); } } - @ObfuscatedName("aq") + @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "(Lao;Lit;IIFB)V", - garbageValue = "55" + signature = "(Laq;Lim;IIFI)V", + garbageValue = "2135973075" ) - void method507(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { + void method460(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { WorldMapLabel var6 = var1.getLabel(); if (var6 != null) { - if (var6.size.method183(var5)) { + if (var6.size.method192(var5)) { Font var7 = (Font)this.fonts.get(var6.size); - var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field3195, 0, 1, 0, var7.ascent / 2); + var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field3215, 0, 1, 0, var7.ascent / 2); } } } - @ObfuscatedName("ao") + @ObfuscatedName("au") @ObfuscatedSignature( - signature = "(IILjava/util/HashSet;II)V", - garbageValue = "-1968496200" + signature = "(IILjava/util/HashSet;IB)V", + garbageValue = "-57" ) @Export("drawMapLinks") void drawMapLinks(int var1, int var2, HashSet var3, int var4) { @@ -706,90 +717,110 @@ public class WorldMapRegion { if (var7.hasValidElement()) { int var8 = var7.coord2.x % 64; int var9 = var7.coord2.y % 64; - var7.screenX = (int)((float)var8 * var5 + (float)var1); - var7.screenY = (int)(var5 * (float)(63 - var9) + (float)var2); + var7.screenX = (int)((float)var1 + var5 * (float)var8); + var7.screenY = (int)((float)var2 + var5 * (float)(63 - var9)); if (!var3.contains(var7.getElement())) { - this.method439(var7, var7.screenX, var7.screenY, var5); + this.method464(var7, var7.screenX, var7.screenY, var5); } } } } - @ObfuscatedName("an") + @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "(Lls;Liz;B)I", - garbageValue = "43" + signature = "(Llt;Lih;B)I", + garbageValue = "-44" ) - int method443(Sprite var1, HorizontalAlignment var2) { + int method524(Sprite var1, HorizontalAlignment var2) { switch(var2.value) { case 0: return 0; - case 2: + case 1: return -var1.subWidth / 2; default: return -var1.subWidth; } } - @ObfuscatedName("ar") + @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "(Lls;Lia;I)I", - garbageValue = "1222469421" + signature = "(Llt;Lic;I)I", + garbageValue = "1263279649" ) - int method444(Sprite var1, VerticalAlignment var2) { + int method469(Sprite var1, VerticalAlignment var2) { switch(var2.value) { case 0: - return 0; - case 1: return -var1.subHeight / 2; + case 2: + return 0; default: return -var1.subHeight; } } - @ObfuscatedName("ay") + @ObfuscatedName("as") @ObfuscatedSignature( - signature = "(II)Law;", - garbageValue = "-1275303691" + signature = "(II)Laz;", + garbageValue = "-2048632100" ) - WorldMapLabel method445(int var1) { - WorldMapElement var2 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(var1); + WorldMapLabel method527(int var1) { + WorldMapElement var2 = PacketBufferNode.WorldMapElement_get(var1); return this.createMapLabel(var2); } - @ObfuscatedName("ag") + @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "(Lit;B)Law;", - garbageValue = "87" + signature = "(Lim;I)Laz;", + garbageValue = "-340039451" ) @Export("createMapLabel") WorldMapLabel createMapLabel(WorldMapElement var1) { if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { - WorldMapLabelSize var2 = WorldMapLabelSize.method182(var1.textSize); + int var3 = var1.textSize; + WorldMapLabelSize[] var4 = new WorldMapLabelSize[]{WorldMapLabelSize.WorldMapLabelSize_medium, WorldMapLabelSize.WorldMapLabelSize_small, WorldMapLabelSize.WorldMapLabelSize_large}; + WorldMapLabelSize[] var5 = var4; + int var6 = 0; + + WorldMapLabelSize var2; + while (true) { + if (var6 >= var5.length) { + var2 = null; + break; + } + + WorldMapLabelSize var7 = var5[var6]; + if (var3 == var7.field132) { + var2 = var7; + break; + } + + ++var6; + } + if (var2 == null) { return null; } else { - Font var3 = (Font)this.fonts.get(var2); - if (var3 == null) { + Font var14 = (Font)this.fonts.get(var2); + if (var14 == null) { return null; } else { - int var4 = var3.lineCount(var1.name, 1000000); - String[] var5 = new String[var4]; - var3.breakLines(var1.name, (int[])null, var5); - int var6 = var5.length * var3.ascent / 2; - int var7 = 0; - String[] var8 = var5; + var6 = var14.lineCount(var1.name, 1000000); + String[] var15 = new String[var6]; + var14.breakLines(var1.name, (int[])null, var15); + int var8 = var15.length * var14.ascent / 2; + int var9 = 0; + String[] var10 = var15; - for (int var9 = 0; var9 < var8.length; ++var9) { - String var10 = var8[var9]; - int var11 = var3.stringWidth(var10); - if (var11 > var7) { - var7 = var11; + for (int var11 = 0; var11 < var10.length; ++var11) { + String var12 = var10[var11]; + int var13 = var14.stringWidth(var12); + if (var13 > var9) { + var9 = var13; } } - return new WorldMapLabel(var1.name, var7, var6, var2); + return new WorldMapLabel(var1.name, var9, var8, var2); } } } else { @@ -799,10 +830,10 @@ public class WorldMapRegion { @ObfuscatedName("ac") @ObfuscatedSignature( - signature = "(IIIIII)Ljava/util/List;", - garbageValue = "-1417348490" + signature = "(IIIIIB)Ljava/util/List;", + garbageValue = "1" ) - List method498(int var1, int var2, int var3, int var4, int var5) { + List method472(int var1, int var2, int var3, int var4, int var5) { LinkedList var6 = new LinkedList(); if (var4 >= var1 && var5 >= var2) { if (var4 < var3 + var1 && var5 < var3 + var2) { @@ -834,10 +865,10 @@ public class WorldMapRegion { } } - @ObfuscatedName("al") + @ObfuscatedName("aw") @ObfuscatedSignature( - signature = "(I)Ljava/util/List;", - garbageValue = "-989883641" + signature = "(B)Ljava/util/List;", + garbageValue = "-63" ) @Export("icons") List icons() { @@ -847,12 +878,12 @@ public class WorldMapRegion { return var1; } - @ObfuscatedName("ae") + @ObfuscatedName("ar") @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "899248185" + signature = "(IIIIS)V", + garbageValue = "-4117" ) - void method449(int var1, int var2, int var3, int var4) { + void method474(int var1, int var2, int var3, int var4) { var3 %= 4; if (var3 == 0) { Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); @@ -872,646 +903,329 @@ public class WorldMapRegion { } - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;IIS)V", - garbageValue = "-3328" - ) - public static void method504(String var0, String var1, int var2, int var3) throws IOException { - JagexCache.idxCount = var3; - VertexNormal.cacheGamebuild = var2; - - try { - StudioGame.field3092 = System.getProperty("os.name"); - } catch (Exception var14) { - StudioGame.field3092 = "Unknown"; - } - - class81.field1129 = StudioGame.field3092.toLowerCase(); - - try { - ReflectionCheck.userHomeDirectory = System.getProperty("user.home"); - if (ReflectionCheck.userHomeDirectory != null) { - ReflectionCheck.userHomeDirectory = ReflectionCheck.userHomeDirectory + "/"; - } - } catch (Exception var13) { - } - - try { - if (class81.field1129.startsWith("win")) { - if (ReflectionCheck.userHomeDirectory == null) { - ReflectionCheck.userHomeDirectory = System.getenv("USERPROFILE"); - } - } else if (ReflectionCheck.userHomeDirectory == null) { - ReflectionCheck.userHomeDirectory = System.getenv("HOME"); - } - - if (ReflectionCheck.userHomeDirectory != null) { - ReflectionCheck.userHomeDirectory = ReflectionCheck.userHomeDirectory + "/"; - } - } catch (Exception var12) { - } - - if (ReflectionCheck.userHomeDirectory == null) { - ReflectionCheck.userHomeDirectory = "~/"; - } - - JagexCache.field2024 = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", ReflectionCheck.userHomeDirectory, "/tmp/", ""}; - WorldMapSprite.field219 = new String[]{".jagex_cache_" + VertexNormal.cacheGamebuild, ".file_store_" + VertexNormal.cacheGamebuild}; - int var9 = 0; - - int var7; - File var8; - label132: - while (var9 < 4) { - JagexCache.cacheDir = class81.method2064(var0, var1, var9); - if (!JagexCache.cacheDir.exists()) { - JagexCache.cacheDir.mkdirs(); - } - - File[] var5 = JagexCache.cacheDir.listFiles(); - if (var5 == null) { - break; - } - - File[] var6 = var5; - var7 = 0; - - while (true) { - if (var7 >= var6.length) { - break label132; - } - - var8 = var6[var7]; - if (!class173.method3561(var8, false)) { - ++var9; - break; - } - - ++var7; - } - } - - File var4 = JagexCache.cacheDir; - GrandExchangeOfferNameComparator.FileSystem_cacheDir = var4; - if (!GrandExchangeOfferNameComparator.FileSystem_cacheDir.exists()) { - throw new RuntimeException(""); - } else { - FileSystem.FileSystem_hasPermissions = true; - - try { - File var16 = new File(ReflectionCheck.userHomeDirectory, "random.dat"); - if (var16.exists()) { - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var16, "rw", 25L), 24, 0); - } else { - label112: - for (int var10 = 0; var10 < WorldMapSprite.field219.length; ++var10) { - for (var7 = 0; var7 < JagexCache.field2024.length; ++var7) { - var8 = new File(JagexCache.field2024[var7] + WorldMapSprite.field219[var10] + File.separatorChar + "random.dat"); - if (var8.exists()) { - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var8, "rw", 25L), 24, 0); - break label112; - } - } - } - } - - if (JagexCache.JagexCache_randomDat == null) { - RandomAccessFile var17 = new RandomAccessFile(var16, "rw"); - var7 = var17.read(); - var17.seek(0L); - var17.write(var7); - var17.seek(0L); - var17.close(); - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var16, "rw", 25L), 24, 0); - } - } catch (IOException var15) { - } - - JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(Message.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); - JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(Message.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); - AttackOption.JagexCache_idxFiles = new BufferedFile[JagexCache.idxCount]; - - for (int var11 = 0; var11 < JagexCache.idxCount; ++var11) { - AttackOption.JagexCache_idxFiles[var11] = new BufferedFile(new AccessFile(Message.getFile("main_file_cache.idx" + var11), "rw", 1048576L), 6000, 0); - } - - } - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "5" - ) - static final void method446() { - Tiles.method1143("Your friend list is full. Max of 200 for free users, and 400 for members"); - } - - @ObfuscatedName("o") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "65535" + garbageValue = "403246047" ) - static final int method536(int var0, int var1) { - int var2 = var1 * 57 + var0; - var2 ^= var2 << 13; - int var3 = var2 * (var2 * var2 * 15731 + 789221) + 1376312589 & Integer.MAX_VALUE; - return var3 >> 19 & 255; + static final int method564(int var0, int var1) { + if (var0 == -2) { + return 12345678; + } else if (var0 == -1) { + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; + } + + return var1; + } else { + var1 = (var0 & 127) * var1 / 128; + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; + } + + return (var0 & 65408) + var1; + } } - @ObfuscatedName("fn") + @ObfuscatedName("ga") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-106" + signature = "(Lbx;I)V", + garbageValue = "-1195764731" ) - @Export("load") - static void load() { - int var0; - if (Client.titleLoadingStage == 0) { - class14.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); - - for (var0 = 0; var0 < 4; ++var0) { - Client.collisionMaps[var0] = new CollisionMap(104, 104); - } - - Language.sceneMinimapSprite = new Sprite(512, 512); - Login.Login_loadingText = "Starting game engine..."; - Login.Login_loadingPercent = 5; - Client.titleLoadingStage = 20; - } else if (Client.titleLoadingStage == 20) { - Login.Login_loadingText = "Prepared visibility map"; - Login.Login_loadingPercent = 10; - Client.titleLoadingStage = 30; - } else if (Client.titleLoadingStage == 30) { - ClientPacket.archive0 = class48.newArchive(0, false, true, true); - ItemDefinition.archive1 = class48.newArchive(1, false, true, true); - class2.archive2 = class48.newArchive(2, true, false, true); - WorldMapData_1.archive3 = class48.newArchive(3, false, true, true); - FloorDecoration.archive4 = class48.newArchive(4, false, true, true); - AbstractWorldMapData.archive5 = class48.newArchive(5, true, true, true); - GrandExchangeOfferWorldComparator.archive6 = class48.newArchive(6, true, true, true); - MouseRecorder.archive7 = class48.newArchive(7, false, true, true); - class3.archive8 = class48.newArchive(8, false, true, true); - WorldMapManager.archive9 = class48.newArchive(9, false, true, true); - ServerBuild.archive10 = class48.newArchive(10, false, true, true); - class48.archive11 = class48.newArchive(11, false, true, true); - SoundSystem.archive12 = class48.newArchive(12, false, true, true); - WorldMapSection1.archive13 = class48.newArchive(13, true, false, true); - class117.archive14 = class48.newArchive(14, false, true, true); - GrandExchangeOfferTotalQuantityComparator.archive15 = class48.newArchive(15, false, true, true); - GrandExchangeOfferNameComparator.archive17 = class48.newArchive(17, true, true, true); - AbstractWorldMapData.archive18 = class48.newArchive(18, false, true, true); - MusicPatchNode2.archive19 = class48.newArchive(19, false, true, true); - UserComparator9.archive20 = class48.newArchive(20, false, true, true); - Login.Login_loadingText = "Connecting to update server"; - Login.Login_loadingPercent = 20; - Client.titleLoadingStage = 40; - } else if (Client.titleLoadingStage == 40) { - byte var29 = 0; - var0 = var29 + ClientPacket.archive0.percentage() * 4 / 100; - var0 += ItemDefinition.archive1.percentage() * 4 / 100; - var0 += class2.archive2.percentage() * 2 / 100; - var0 += WorldMapData_1.archive3.percentage() * 2 / 100; - var0 += FloorDecoration.archive4.percentage() * 6 / 100; - var0 += AbstractWorldMapData.archive5.percentage() * 4 / 100; - var0 += GrandExchangeOfferWorldComparator.archive6.percentage() * 2 / 100; - var0 += MouseRecorder.archive7.percentage() * 56 / 100; - var0 += class3.archive8.percentage() * 2 / 100; - var0 += WorldMapManager.archive9.percentage() * 2 / 100; - var0 += ServerBuild.archive10.percentage() * 2 / 100; - var0 += class48.archive11.percentage() * 2 / 100; - var0 += SoundSystem.archive12.percentage() * 2 / 100; - var0 += WorldMapSection1.archive13.percentage() * 2 / 100; - var0 += class117.archive14.percentage() * 2 / 100; - var0 += GrandExchangeOfferTotalQuantityComparator.archive15.percentage() * 2 / 100; - var0 += MusicPatchNode2.archive19.percentage() / 100; - var0 += AbstractWorldMapData.archive18.percentage() / 100; - var0 += UserComparator9.archive20.percentage() / 100; - var0 += GrandExchangeOfferNameComparator.archive17.method4246() && GrandExchangeOfferNameComparator.archive17.isFullyLoaded() ? 1 : 0; - if (var0 != 100) { - if (var0 != 0) { - Login.Login_loadingText = "Checking for updates - " + var0 + "%"; + static final void method565(Actor var0) { + var0.movementSequence = var0.readySequence; + if (var0.pathLength == 0) { + var0.field997 = 0; + } else { + if (var0.sequence != -1 && var0.sequenceDelay == 0) { + SequenceDefinition var1 = GraphicsDefaults.SequenceDefinition_get(var0.sequence); + if (var0.field998 > 0 && var1.field3523 == 0) { + ++var0.field997; + return; } - Login.Login_loadingPercent = 30; - } else { - BufferedSource.method5925(ClientPacket.archive0, "Animations"); - BufferedSource.method5925(ItemDefinition.archive1, "Skeletons"); - BufferedSource.method5925(FloorDecoration.archive4, "Sound FX"); - BufferedSource.method5925(AbstractWorldMapData.archive5, "Maps"); - BufferedSource.method5925(GrandExchangeOfferWorldComparator.archive6, "Music Tracks"); - BufferedSource.method5925(MouseRecorder.archive7, "Models"); - BufferedSource.method5925(class3.archive8, "Sprites"); - BufferedSource.method5925(class48.archive11, "Music Jingles"); - BufferedSource.method5925(class117.archive14, "Music Samples"); - BufferedSource.method5925(GrandExchangeOfferTotalQuantityComparator.archive15, "Music Patches"); - BufferedSource.method5925(MusicPatchNode2.archive19, "World Map"); - BufferedSource.method5925(AbstractWorldMapData.archive18, "World Map Geography"); - BufferedSource.method5925(UserComparator9.archive20, "World Map Ground"); - SecureRandomCallable.spriteIds = new GraphicsDefaults(); - SecureRandomCallable.spriteIds.decode(GrandExchangeOfferNameComparator.archive17); - Login.Login_loadingText = "Loaded update list"; - Login.Login_loadingPercent = 30; - Client.titleLoadingStage = 45; + if (var0.field998 <= 0 && var1.field3524 == 0) { + ++var0.field997; + return; + } } - } else { - Archive var2; - Archive var3; - if (Client.titleLoadingStage == 45) { - boolean var27 = !Client.isLowDetail; - DirectByteArrayCopier.field2490 = 22050; - SoundCache.PcmPlayer_stereo = var27; - NPC.field1103 = 2; - MidiPcmStream var26 = new MidiPcmStream(); - var26.method3765(9, 128); - UserComparator6.pcmPlayer0 = WorldMapEvent.method763(GameShell.taskHandler, 0, 22050); - UserComparator6.pcmPlayer0.setStream(var26); - var2 = GrandExchangeOfferTotalQuantityComparator.archive15; - var3 = class117.archive14; - Archive var4 = FloorDecoration.archive4; - class197.musicPatchesArchive = var2; - class197.musicSamplesArchive = var3; - class197.soundEffectsArchive = var4; - GZipDecompressor.midiPcmStream = var26; - NetSocket.pcmPlayer1 = WorldMapEvent.method763(GameShell.taskHandler, 1, 2048); - Tiles.pcmStreamMixer = new PcmStreamMixer(); - NetSocket.pcmPlayer1.setStream(Tiles.pcmStreamMixer); - ClientPreferences.decimator = new Decimator(22050, DirectByteArrayCopier.field2490 * -168449264); - Login.Login_loadingText = "Prepared sound engine"; - Login.Login_loadingPercent = 35; - Client.titleLoadingStage = 50; - class65.WorldMapElement_fonts = new Fonts(class3.archive8, WorldMapSection1.archive13); - } else { - int var17; - if (Client.titleLoadingStage == 50) { - FontName[] var31 = new FontName[]{FontName.FontName_plain11, FontName.FontName_verdana13, FontName.FontName_verdana15, FontName.FontName_verdana11, FontName.FontName_plain12, FontName.FontName_bold12}; - var17 = var31.length; - Fonts var24 = class65.WorldMapElement_fonts; - FontName[] var23 = new FontName[]{FontName.FontName_plain11, FontName.FontName_verdana13, FontName.FontName_verdana15, FontName.FontName_verdana11, FontName.FontName_plain12, FontName.FontName_bold12}; - Client.fontsMap = var24.createMap(var23); - if (Client.fontsMap.size() < var17) { - Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var17 + "%"; - Login.Login_loadingPercent = 40; - } else { - class3.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); - ScriptFrame.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); - GrandExchangeOffer.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); - class42.platformInfo = Client.platformInfoProvider.get(); - Login.Login_loadingText = "Loaded fonts"; - Login.Login_loadingPercent = 40; - Client.titleLoadingStage = 60; + + int var10 = var0.x; + int var2 = var0.y; + int var3 = var0.pathX[var0.pathLength - 1] * 128 + var0.field942 * 2013925376; + int var4 = var0.pathY[var0.pathLength - 1] * 128 + var0.field942 * 2013925376; + if (var10 < var3) { + if (var2 < var4) { + var0.orientation = 1280; + } else if (var2 > var4) { + var0.orientation = 1792; + } else { + var0.orientation = 1536; + } + } else if (var10 > var3) { + if (var2 < var4) { + var0.orientation = 768; + } else if (var2 > var4) { + var0.orientation = 256; + } else { + var0.orientation = 512; + } + } else if (var2 < var4) { + var0.orientation = 1024; + } else if (var2 > var4) { + var0.orientation = 0; + } + + byte var5 = var0.pathTraversed[var0.pathLength - 1]; + if (var3 - var10 <= 256 && var3 - var10 >= -256 && var4 - var2 <= 256 && var4 - var2 >= -256) { + int var6 = var0.orientation - var0.rotation & 2047; + if (var6 > 1024) { + var6 -= 2048; + } + + int var7 = var0.walkBackSequence; + if (var6 >= -256 && var6 <= 256) { + var7 = var0.walkSequence; + } else if (var6 >= 256 && var6 < 768) { + var7 = var0.walkRightSequence; + } else if (var6 >= -768 && var6 <= -256) { + var7 = var0.walkLeftSequence; + } + + if (var7 == -1) { + var7 = var0.walkSequence; + } + + var0.movementSequence = var7; + int var8 = 4; + boolean var9 = true; + if (var0 instanceof NPC) { + var9 = ((NPC)var0).definition.isClickable; + } + + if (var9) { + if (var0.orientation != var0.rotation && var0.targetIndex == -1 && var0.field975 != 0) { + var8 = 2; + } + + if (var0.pathLength > 2) { + var8 = 6; + } + + if (var0.pathLength > 3) { + var8 = 8; + } + + if (var0.field997 > 0 && var0.pathLength > 1) { + var8 = 8; + --var0.field997; } } else { - int var18; - Archive var25; - if (Client.titleLoadingStage == 60) { - var25 = ServerBuild.archive10; - var2 = class3.archive8; - var18 = 0; - if (var25.tryLoadFileByNames("title.jpg", "")) { - ++var18; - } + if (var0.pathLength > 1) { + var8 = 6; + } - if (var2.tryLoadFileByNames("logo", "")) { - ++var18; - } + if (var0.pathLength > 2) { + var8 = 8; + } - if (var2.tryLoadFileByNames("logo_deadman_mode", "")) { - ++var18; - } - - if (var2.tryLoadFileByNames("logo_seasonal_mode", "")) { - ++var18; - } - - if (var2.tryLoadFileByNames("titlebox", "")) { - ++var18; - } - - if (var2.tryLoadFileByNames("titlebutton", "")) { - ++var18; - } - - if (var2.tryLoadFileByNames("runes", "")) { - ++var18; - } - - if (var2.tryLoadFileByNames("title_mute", "")) { - ++var18; - } - - if (var2.tryLoadFileByNames("options_radio_buttons,0", "")) { - ++var18; - } - - if (var2.tryLoadFileByNames("options_radio_buttons,2", "")) { - ++var18; - } - - if (var2.tryLoadFileByNames("options_radio_buttons,4", "")) { - ++var18; - } - - if (var2.tryLoadFileByNames("options_radio_buttons,6", "")) { - ++var18; - } - - var2.tryLoadFileByNames("sl_back", ""); - var2.tryLoadFileByNames("sl_flags", ""); - var2.tryLoadFileByNames("sl_arrows", ""); - var2.tryLoadFileByNames("sl_stars", ""); - var2.tryLoadFileByNames("sl_button", ""); - byte var33 = 12; - if (var18 < var33) { - Login.Login_loadingText = "Loading title screen - " + var18 * 100 / var33 + "%"; - Login.Login_loadingPercent = 50; - } else { - Login.Login_loadingText = "Loaded title screen"; - Login.Login_loadingPercent = 50; - class195.updateGameState(5); - Client.titleLoadingStage = 70; - } - } else if (Client.titleLoadingStage == 70) { - if (!class2.archive2.isFullyLoaded()) { - Login.Login_loadingText = "Loading config - " + class2.archive2.loadPercent() + "%"; - Login.Login_loadingPercent = 60; - } else { - FillMode.method6117(class2.archive2); - WorldMapDecorationType.method4079(class2.archive2); - Archive var30 = class2.archive2; - var25 = MouseRecorder.archive7; - KitDefinition.KitDefinition_archive = var30; - KitDefinition.KitDefinition_modelsArchive = var25; - GrandExchangeOfferUnitPriceComparator.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); - var2 = class2.archive2; - var3 = MouseRecorder.archive7; - boolean var32 = Client.isLowDetail; - ObjectDefinition.ObjectDefinition_archive = var2; - ObjectDefinition.ObjectDefinition_modelsArchive = var3; - ObjectDefinition.ObjectDefinition_isLowDetail = var32; - Archive var34 = class2.archive2; - Archive var22 = MouseRecorder.archive7; - NPCDefinition.NpcDefinition_archive = var34; - NPCDefinition.NpcDefinition_modelArchive = var22; - Messages.method2227(class2.archive2); - class65.method1232(class2.archive2, MouseRecorder.archive7, Client.isMembersWorld, class3.fontPlain11); - Archive var28 = class2.archive2; - Archive var8 = ClientPacket.archive0; - Archive var9 = ItemDefinition.archive1; - SequenceDefinition.SequenceDefinition_archive = var28; - SequenceDefinition.SequenceDefinition_animationsArchive = var8; - SequenceDefinition.SequenceDefinition_skeletonsArchive = var9; - ClientPacket.method3570(class2.archive2, MouseRecorder.archive7); - Archive var10 = class2.archive2; - VarbitDefinition.VarbitDefinition_archive = var10; - WorldMapID.method545(class2.archive2); - DevicePcmPlayerProvider.method842(WorldMapData_1.archive3, MouseRecorder.archive7, class3.archive8, WorldMapSection1.archive13); - UserComparator10.method3335(class2.archive2); - DirectByteArrayCopier.method3940(class2.archive2); - Archive var11 = class2.archive2; - VarcInt.VarcInt_archive = var11; - Archive var12 = class2.archive2; - ParamDefinition.ParamDefinition_archive = var12; - MilliClock.varcs = new Varcs(); - Archive var13 = class2.archive2; - Archive var14 = class3.archive8; - Archive var15 = WorldMapSection1.archive13; - HitSplatDefinition.HitSplatDefinition_archive = var13; - HitSplatDefinition.field3290 = var14; - class206.HitSplatDefinition_fontsArchive = var15; - UserComparator10.method3336(class2.archive2, class3.archive8); - BuddyRankComparator.method3363(class2.archive2, class3.archive8); - Login.Login_loadingText = "Loaded config"; - Login.Login_loadingPercent = 60; - Client.titleLoadingStage = 80; - } - } else if (Client.titleLoadingStage == 80) { - var0 = 0; - if (GrandExchangeOfferTotalQuantityComparator.compass == null) { - GrandExchangeOfferTotalQuantityComparator.compass = FloorUnderlayDefinition.SpriteBuffer_getSprite(class3.archive8, SecureRandomCallable.spriteIds.compass, 0); - } else { - ++var0; - } - - if (class40.redHintArrowSprite == null) { - class40.redHintArrowSprite = FloorUnderlayDefinition.SpriteBuffer_getSprite(class3.archive8, SecureRandomCallable.spriteIds.field3803, 0); - } else { - ++var0; - } - - IndexedSprite[] var1; - int var6; - IndexedSprite var7; - IndexedSprite[] var21; - if (class162.mapSceneSprites == null) { - var2 = class3.archive8; - var18 = SecureRandomCallable.spriteIds.mapScenes; - if (!HitSplatDefinition.method4586(var2, var18, 0)) { - var1 = null; - } else { - var21 = new IndexedSprite[class325.SpriteBuffer_spriteCount]; - - for (var6 = 0; var6 < class325.SpriteBuffer_spriteCount; ++var6) { - var7 = var21[var6] = new IndexedSprite(); - var7.width = class325.SpriteBuffer_spriteWidth; - var7.height = class325.SpriteBuffer_spriteHeight; - var7.xOffset = class325.SpriteBuffer_xOffsets[var6]; - var7.yOffset = class325.SpriteBuffer_yOffsets[var6]; - var7.subWidth = UserComparator1.SpriteBuffer_spriteWidths[var6]; - var7.subHeight = class325.SpriteBuffer_spriteHeights[var6]; - var7.palette = class268.SpriteBuffer_spritePalette; - var7.pixels = class290.SpriteBuffer_pixels[var6]; - } - - Message.method1223(); - var1 = var21; - } - - class162.mapSceneSprites = var1; - } else { - ++var0; - } - - if (class222.headIconPkSprites == null) { - class222.headIconPkSprites = GrandExchangeOfferNameComparator.SpriteBuffer_getSpriteArray(class3.archive8, SecureRandomCallable.spriteIds.headIconsPk, 0); - } else { - ++var0; - } - - if (GraphicsObject.headIconPrayerSprites == null) { - GraphicsObject.headIconPrayerSprites = GrandExchangeOfferNameComparator.SpriteBuffer_getSpriteArray(class3.archive8, SecureRandomCallable.spriteIds.field3798, 0); - } else { - ++var0; - } - - if (WorldMapData_0.headIconHintSprites == null) { - WorldMapData_0.headIconHintSprites = GrandExchangeOfferNameComparator.SpriteBuffer_getSpriteArray(class3.archive8, SecureRandomCallable.spriteIds.field3807, 0); - } else { - ++var0; - } - - if (Varps.mapMarkerSprites == null) { - Varps.mapMarkerSprites = GrandExchangeOfferNameComparator.SpriteBuffer_getSpriteArray(class3.archive8, SecureRandomCallable.spriteIds.field3804, 0); - } else { - ++var0; - } - - if (ObjectDefinition.crossSprites == null) { - ObjectDefinition.crossSprites = GrandExchangeOfferNameComparator.SpriteBuffer_getSpriteArray(class3.archive8, SecureRandomCallable.spriteIds.field3805, 0); - } else { - ++var0; - } - - if (WorldMapLabel.mapDotSprites == null) { - WorldMapLabel.mapDotSprites = GrandExchangeOfferNameComparator.SpriteBuffer_getSpriteArray(class3.archive8, SecureRandomCallable.spriteIds.field3806, 0); - } else { - ++var0; - } - - if (class60.scrollBarSprites == null) { - var2 = class3.archive8; - var18 = SecureRandomCallable.spriteIds.field3799; - if (!HitSplatDefinition.method4586(var2, var18, 0)) { - var1 = null; - } else { - var21 = new IndexedSprite[class325.SpriteBuffer_spriteCount]; - - for (var6 = 0; var6 < class325.SpriteBuffer_spriteCount; ++var6) { - var7 = var21[var6] = new IndexedSprite(); - var7.width = class325.SpriteBuffer_spriteWidth; - var7.height = class325.SpriteBuffer_spriteHeight; - var7.xOffset = class325.SpriteBuffer_xOffsets[var6]; - var7.yOffset = class325.SpriteBuffer_yOffsets[var6]; - var7.subWidth = UserComparator1.SpriteBuffer_spriteWidths[var6]; - var7.subHeight = class325.SpriteBuffer_spriteHeights[var6]; - var7.palette = class268.SpriteBuffer_spritePalette; - var7.pixels = class290.SpriteBuffer_pixels[var6]; - } - - Message.method1223(); - var1 = var21; - } - - class60.scrollBarSprites = var1; - } else { - ++var0; - } - - if (WorldMapEvent.modIconSprites == null) { - var2 = class3.archive8; - var18 = SecureRandomCallable.spriteIds.field3808; - if (!HitSplatDefinition.method4586(var2, var18, 0)) { - var1 = null; - } else { - var21 = new IndexedSprite[class325.SpriteBuffer_spriteCount]; - - for (var6 = 0; var6 < class325.SpriteBuffer_spriteCount; ++var6) { - var7 = var21[var6] = new IndexedSprite(); - var7.width = class325.SpriteBuffer_spriteWidth; - var7.height = class325.SpriteBuffer_spriteHeight; - var7.xOffset = class325.SpriteBuffer_xOffsets[var6]; - var7.yOffset = class325.SpriteBuffer_yOffsets[var6]; - var7.subWidth = UserComparator1.SpriteBuffer_spriteWidths[var6]; - var7.subHeight = class325.SpriteBuffer_spriteHeights[var6]; - var7.palette = class268.SpriteBuffer_spritePalette; - var7.pixels = class290.SpriteBuffer_pixels[var6]; - } - - Message.method1223(); - var1 = var21; - } - - WorldMapEvent.modIconSprites = var1; - } else { - ++var0; - } - - if (var0 < 11) { - Login.Login_loadingText = "Loading sprites - " + var0 * 100 / 12 + "%"; - Login.Login_loadingPercent = 70; - } else { - AbstractFont.AbstractFont_modIconSprites = WorldMapEvent.modIconSprites; - class40.redHintArrowSprite.normalize(); - var17 = (int)(Math.random() * 21.0D) - 10; - int var20 = (int)(Math.random() * 21.0D) - 10; - var18 = (int)(Math.random() * 21.0D) - 10; - int var19 = (int)(Math.random() * 41.0D) - 20; - class162.mapSceneSprites[0].shiftColors(var19 + var17, var19 + var20, var18 + var19); - Login.Login_loadingText = "Loaded sprites"; - Login.Login_loadingPercent = 70; - Client.titleLoadingStage = 90; - } - } else if (Client.titleLoadingStage == 90) { - if (!WorldMapManager.archive9.isFullyLoaded()) { - Login.Login_loadingText = "Loading textures - " + "0%"; - Login.Login_loadingPercent = 90; - } else { - class14.textureProvider = new TextureProvider(WorldMapManager.archive9, class3.archive8, 20, 0.8D, Client.isLowDetail ? 64 : 128); - Rasterizer3D.Rasterizer3D_setTextureLoader(class14.textureProvider); - Rasterizer3D.Rasterizer3D_setBrightness(0.8D); - Client.titleLoadingStage = 100; - } - } else if (Client.titleLoadingStage == 100) { - var0 = class14.textureProvider.getLoadedPercentage(); - if (var0 < 100) { - Login.Login_loadingText = "Loading textures - " + var0 + "%"; - Login.Login_loadingPercent = 90; - } else { - Login.Login_loadingText = "Loaded textures"; - Login.Login_loadingPercent = 90; - Client.titleLoadingStage = 110; - } - } else if (Client.titleLoadingStage == 110) { - class173.mouseRecorder = new MouseRecorder(); - GameShell.taskHandler.newThreadTask(class173.mouseRecorder, 10); - Login.Login_loadingText = "Loaded input handler"; - Login.Login_loadingPercent = 92; - Client.titleLoadingStage = 120; - } else if (Client.titleLoadingStage == 120) { - if (!ServerBuild.archive10.tryLoadFileByNames("huffman", "")) { - Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; - Login.Login_loadingPercent = 94; - } else { - Huffman var16 = new Huffman(ServerBuild.archive10.takeFileByNames("huffman", "")); - GameObject.method3296(var16); - Login.Login_loadingText = "Loaded wordpack"; - Login.Login_loadingPercent = 94; - Client.titleLoadingStage = 130; - } - } else if (Client.titleLoadingStage == 130) { - if (!WorldMapData_1.archive3.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + WorldMapData_1.archive3.loadPercent() * 4 / 5 + "%"; - Login.Login_loadingPercent = 96; - } else if (!SoundSystem.archive12.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + (80 + SoundSystem.archive12.loadPercent() / 6) + "%"; - Login.Login_loadingPercent = 96; - } else if (!WorldMapSection1.archive13.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + (96 + WorldMapSection1.archive13.loadPercent() / 50) + "%"; - Login.Login_loadingPercent = 96; - } else { - Login.Login_loadingText = "Loaded interfaces"; - Login.Login_loadingPercent = 98; - Client.titleLoadingStage = 140; - } - } else if (Client.titleLoadingStage == 140) { - Login.Login_loadingPercent = 100; - if (!MusicPatchNode2.archive19.tryLoadGroupByName(WorldMapCacheName.field291.name)) { - Login.Login_loadingText = "Loading world map - " + MusicPatchNode2.archive19.groupLoadPercentByName(WorldMapCacheName.field291.name) / 10 + "%"; - } else { - if (GrandExchangeEvent.worldMap == null) { - GrandExchangeEvent.worldMap = new WorldMap(); - GrandExchangeEvent.worldMap.init(MusicPatchNode2.archive19, AbstractWorldMapData.archive18, UserComparator9.archive20, GrandExchangeOffer.fontBold12, Client.fontsMap, class162.mapSceneSprites); - } - - Login.Login_loadingText = "Loaded world map"; - Client.titleLoadingStage = 150; - } - } else if (Client.titleLoadingStage == 150) { - class195.updateGameState(10); + if (var0.field997 > 0 && var0.pathLength > 1) { + var8 = 8; + --var0.field997; } } + + if (var5 == 2) { + var8 <<= 1; + } + + if (var8 >= 8 && var0.movementSequence == var0.walkSequence && var0.runSequence != -1) { + var0.movementSequence = var0.runSequence; + } + + if (var10 != var3 || var4 != var2) { + if (var10 < var3) { + var0.x += var8; + if (var0.x > var3) { + var0.x = var3; + } + } else if (var10 > var3) { + var0.x -= var8; + if (var0.x < var3) { + var0.x = var3; + } + } + + if (var2 < var4) { + var0.y += var8; + if (var0.y > var4) { + var0.y = var4; + } + } else if (var2 > var4) { + var0.y -= var8; + if (var0.y < var4) { + var0.y = var4; + } + } + } + + if (var3 == var0.x && var4 == var0.y) { + --var0.pathLength; + if (var0.field998 > 0) { + --var0.field998; + } + } + + } else { + var0.x = var3; + var0.y = var4; + --var0.pathLength; + if (var0.field998 > 0) { + --var0.field998; + } + } } } + + @ObfuscatedName("ku") + @ObfuscatedSignature( + signature = "(Lhn;IIII)V", + garbageValue = "-1636455277" + ) + @Export("drawMinimap") + static final void drawMinimap(Widget var0, int var1, int var2, int var3) { + UserComparator3.playPcmPlayers(); + SpriteMask var4 = var0.getSpriteMask(false); + if (var4 != null) { + Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); + if (Client.minimapState != 2 && Client.minimapState != 5) { + int var5 = Client.camAngleY & 2047; + int var6 = class192.localPlayer.x / 32 + 48; + int var7 = 464 - class192.localPlayer.y / 32; + WorldMapRectangle.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); + + int var8; + int var9; + int var10; + for (var8 = 0; var8 < Client.mapIconCount; ++var8) { + var9 = Client.mapIconXs[var8] * 4 + 2 - class192.localPlayer.x / 32; + var10 = Client.mapIconYs[var8] * 4 + 2 - class192.localPlayer.y / 32; + Script.drawSpriteOnMinimap(var1, var2, var9, var10, Client.mapIcons[var8], var4); + } + + int var11; + int var12; + for (var8 = 0; var8 < 104; ++var8) { + for (var9 = 0; var9 < 104; ++var9) { + NodeDeque var15 = Client.groundItems[Clock.Client_plane][var8][var9]; + if (var15 != null) { + var11 = var8 * 4 + 2 - class192.localPlayer.x / 32; + var12 = var9 * 4 + 2 - class192.localPlayer.y / 32; + Script.drawSpriteOnMinimap(var1, var2, var11, var12, AbstractWorldMapData.mapDotSprites[0], var4); + } + } + } + + for (var8 = 0; var8 < Client.npcCount; ++var8) { + NPC var16 = Client.npcs[Client.npcIndices[var8]]; + if (var16 != null && var16.isVisible()) { + NPCDefinition var18 = var16.definition; + if (var18 != null && var18.transforms != null) { + var18 = var18.transform(); + } + + if (var18 != null && var18.drawMapDot && var18.isInteractable) { + var11 = var16.x / 32 - class192.localPlayer.x / 32; + var12 = var16.y / 32 - class192.localPlayer.y / 32; + Script.drawSpriteOnMinimap(var1, var2, var11, var12, AbstractWorldMapData.mapDotSprites[1], var4); + } + } + } + + var8 = Players.Players_count; + int[] var19 = Players.Players_indices; + + for (var10 = 0; var10 < var8; ++var10) { + Player var17 = Client.players[var19[var10]]; + if (var17 != null && var17.isVisible() && !var17.isHidden && var17 != class192.localPlayer) { + var12 = var17.x / 32 - class192.localPlayer.x / 32; + int var13 = var17.y / 32 - class192.localPlayer.y / 32; + boolean var14 = false; + if (class192.localPlayer.team != 0 && var17.team != 0 && var17.team == class192.localPlayer.team) { + var14 = true; + } + + if (var17.isFriend()) { + Script.drawSpriteOnMinimap(var1, var2, var12, var13, AbstractWorldMapData.mapDotSprites[3], var4); + } else if (var14) { + Script.drawSpriteOnMinimap(var1, var2, var12, var13, AbstractWorldMapData.mapDotSprites[4], var4); + } else if (var17.isClanMember()) { + Script.drawSpriteOnMinimap(var1, var2, var12, var13, AbstractWorldMapData.mapDotSprites[5], var4); + } else { + Script.drawSpriteOnMinimap(var1, var2, var12, var13, AbstractWorldMapData.mapDotSprites[2], var4); + } + } + } + + if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { + if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { + NPC var20 = Client.npcs[Client.hintArrowNpcIndex]; + if (var20 != null) { + var11 = var20.x / 32 - class192.localPlayer.x / 32; + var12 = var20.y / 32 - class192.localPlayer.y / 32; + KeyHandler.worldToMinimap(var1, var2, var11, var12, StructDefinition.mapMarkerSprites[1], var4); + } + } + + if (Client.hintArrowType == 2) { + var10 = Client.hintArrowX * 4 - Messages.baseX * 256 + 2 - class192.localPlayer.x / 32; + var11 = Client.hintArrowY * 4 - Language.baseY * 256 + 2 - class192.localPlayer.y / 32; + KeyHandler.worldToMinimap(var1, var2, var10, var11, StructDefinition.mapMarkerSprites[1], var4); + } + + if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { + Player var21 = Client.players[Client.hintArrowPlayerIndex]; + if (var21 != null) { + var11 = var21.x / 32 - class192.localPlayer.x / 32; + var12 = var21.y / 32 - class192.localPlayer.y / 32; + KeyHandler.worldToMinimap(var1, var2, var11, var12, StructDefinition.mapMarkerSprites[1], var4); + } + } + } + + if (Client.destinationX != 0) { + var10 = Client.destinationX * 4 + 2 - class192.localPlayer.x / 32; + var11 = Client.destinationY * 4 + 2 - class192.localPlayer.y / 32; + Script.drawSpriteOnMinimap(var1, var2, var10, var11, StructDefinition.mapMarkerSprites[0], var4); + } + + if (!class192.localPlayer.isHidden) { + Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215); + } + } else { + Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); + } + + Client.field852[var3] = true; + } + } + + @ObfuscatedName("kk") + @ObfuscatedSignature( + signature = "(IIIZI)V", + garbageValue = "-57958183" + ) + public static void method563(int var0, int var1, int var2, boolean var3) { + PacketBufferNode var4 = TilePaint.getPacketBufferNode(ClientPacket.field2255, Client.packetWriter.isaacCipher); + var4.packetBuffer.writeInt(var3 ? Client.field727 : 0); + var4.packetBuffer.writeShortLE(var0); + var4.packetBuffer.writeShort(var1); + var4.packetBuffer.writeByte(var2); + Client.packetWriter.addNode(var4); + } } diff --git a/runescape-client/src/main/java/WorldMapSection.java b/runescape-client/src/main/java/WorldMapSection.java index 61ce60e65e..71161c1261 100644 --- a/runescape-client/src/main/java/WorldMapSection.java +++ b/runescape-client/src/main/java/WorldMapSection.java @@ -3,53 +3,53 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("az") +@ObfuscatedName("ac") @Implements("WorldMapSection") public interface WorldMapSection { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Laa;I)V", - garbageValue = "515570621" + signature = "(Lae;I)V", + garbageValue = "-1034100543" ) @Export("expandBounds") void expandBounds(WorldMapArea var1); - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IIII)Z", - garbageValue = "2033433479" + signature = "(IIIB)Z", + garbageValue = "-110" ) @Export("containsCoord") boolean containsCoord(int var1, int var2, int var3); - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(IIB)Z", - garbageValue = "-66" + garbageValue = "37" ) @Export("containsPosition") boolean containsPosition(int var1, int var2); - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(IIII)[I", - garbageValue = "1684413985" + garbageValue = "-96920779" ) @Export("getBorderTileLengths") int[] getBorderTileLengths(int var1, int var2, int var3); - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IIB)Lht;", - garbageValue = "21" + signature = "(III)Lhj;", + garbageValue = "911083222" ) @Export("coord") Coord coord(int var1, int var2); - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lkq;B)V", - garbageValue = "74" + signature = "(Lkp;B)V", + garbageValue = "76" ) @Export("read") void read(Buffer var1); diff --git a/runescape-client/src/main/java/WorldMapSection0.java b/runescape-client/src/main/java/WorldMapSection0.java index 1938419255..c02c5a4c28 100644 --- a/runescape-client/src/main/java/WorldMapSection0.java +++ b/runescape-client/src/main/java/WorldMapSection0.java @@ -4,90 +4,90 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("u") +@ObfuscatedName("y") @Implements("WorldMapSection0") public class WorldMapSection0 implements WorldMapSection { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1160137245 + intValue = -2146402029 ) @Export("oldZ") int oldZ; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1904283883 + intValue = -2085039341 ) @Export("newZ") int newZ; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -314575009 + intValue = 555505141 ) @Export("oldX") int oldX; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 2112889933 + intValue = -1856751623 ) @Export("oldY") int oldY; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -792611751 + intValue = -2086851217 ) @Export("newX") int newX; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -575856113 + intValue = 1346820565 ) @Export("newY") int newY; - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1539446875 + intValue = -1459523587 ) @Export("oldChunkXLow") int oldChunkXLow; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1657391795 + intValue = -954702965 ) @Export("oldChunkYLow") int oldChunkYLow; - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 442819299 + intValue = -1622063887 ) @Export("oldChunkXHigh") int oldChunkXHigh; - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1953687417 + intValue = -2070491231 ) @Export("oldChunkYHigh") int oldChunkYHigh; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1951120751 + intValue = 1112408651 ) @Export("newChunkXLow") int newChunkXLow; - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -940095865 + intValue = -749966597 ) @Export("newChunkYLow") int newChunkYLow; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -777745283 + intValue = -1079927535 ) @Export("newChunkXHigh") int newChunkXHigh; - @ObfuscatedName("k") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -733068917 + intValue = 524547303 ) @Export("newChunkYHigh") int newChunkYHigh; @@ -95,10 +95,10 @@ public class WorldMapSection0 implements WorldMapSection { WorldMapSection0() { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Laa;I)V", - garbageValue = "515570621" + signature = "(Lae;I)V", + garbageValue = "-1034100543" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { @@ -120,10 +120,10 @@ public class WorldMapSection0 implements WorldMapSection { } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IIII)Z", - garbageValue = "2033433479" + signature = "(IIIB)Z", + garbageValue = "-110" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -134,20 +134,20 @@ public class WorldMapSection0 implements WorldMapSection { } } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(IIB)Z", - garbageValue = "-66" + garbageValue = "37" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { return var1 >= (this.newX << 6) + (this.newChunkXLow << 3) && var1 <= (this.newX << 6) + (this.newChunkXHigh << 3) + 7 && var2 >= (this.newY << 6) + (this.newChunkYLow << 3) && var2 <= (this.newY << 6) + (this.newChunkYHigh << 3) + 7; } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(IIII)[I", - garbageValue = "1684413985" + garbageValue = "-96920779" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { @@ -159,10 +159,10 @@ public class WorldMapSection0 implements WorldMapSection { } } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IIB)Lht;", - garbageValue = "21" + signature = "(III)Lhj;", + garbageValue = "911083222" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -175,10 +175,10 @@ public class WorldMapSection0 implements WorldMapSection { } } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lkq;B)V", - garbageValue = "74" + signature = "(Lkp;B)V", + garbageValue = "76" ) @Export("read") public void read(Buffer var1) { @@ -199,61 +199,370 @@ public class WorldMapSection0 implements WorldMapSection { this.postRead(); } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1568210913" + signature = "(B)V", + garbageValue = "-127" ) @Export("postRead") void postRead() { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IB)Liv;", - garbageValue = "-25" + signature = "([Lgq;IB)Lgq;", + garbageValue = "-32" ) - @Export("SequenceDefinition_get") - public static SequenceDefinition SequenceDefinition_get(int var0) { - SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0); - var1 = new SequenceDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); + @Export("findEnumerated") + public static Enumerated findEnumerated(Enumerated[] var0, int var1) { + Enumerated[] var2 = var0; + + for (int var3 = 0; var3 < var2.length; ++var3) { + Enumerated var4 = var2[var3]; + if (var1 == var4.rsOrdinal()) { + return var4; + } + } + + return null; + } + + @ObfuscatedName("ha") + @ObfuscatedSignature( + signature = "(IIIIIIIS)V", + garbageValue = "6328" + ) + @Export("addPendingSpawnToScene") + static final void addPendingSpawnToScene(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) { + if (Client.isLowDetail && var0 != Clock.Client_plane) { + return; } - var1.postDecode(); - SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); - return var1; + long var7 = 0L; + boolean var9 = true; + boolean var10 = false; + boolean var11 = false; + if (var1 == 0) { + var7 = ServerBuild.scene.getBoundaryObjectTag(var0, var2, var3); + } + + if (var1 == 1) { + var7 = ServerBuild.scene.getWallDecorationTag(var0, var2, var3); + } + + if (var1 == 2) { + var7 = ServerBuild.scene.getGameObjectTag(var0, var2, var3); + } + + if (var1 == 3) { + var7 = ServerBuild.scene.getFloorDecorationTag(var0, var2, var3); + } + + int var12; + if (var7 != 0L) { + var12 = ServerBuild.scene.getObjectFlags(var0, var2, var3, var7); + int var14 = GrandExchangeEvents.Entity_unpackID(var7); + int var15 = var12 & 31; + int var16 = var12 >> 6 & 3; + ObjectDefinition var13; + if (var1 == 0) { + ServerBuild.scene.removeBoundaryObject(var0, var2, var3); + var13 = Occluder.getObjectDefinition(var14); + if (var13.interactType != 0) { + Client.collisionMaps[var0].method3621(var2, var3, var15, var16, var13.boolean1); + } + } + + if (var1 == 1) { + ServerBuild.scene.removeWallDecoration(var0, var2, var3); + } + + if (var1 == 2) { + ServerBuild.scene.removeGameObject(var0, var2, var3); + var13 = Occluder.getObjectDefinition(var14); + if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { + return; + } + + if (var13.interactType != 0) { + Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var16, var13.boolean1); + } + } + + if (var1 == 3) { + ServerBuild.scene.removeFloorDecoration(var0, var2, var3); + var13 = Occluder.getObjectDefinition(var14); + if (var13.interactType == 1) { + Client.collisionMaps[var0].method3624(var2, var3); + } + } + } + + if (var4 >= 0) { + var12 = var0; + if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { + var12 = var0 + 1; + } + + ArchiveLoader.method1168(var0, var12, var2, var3, var4, var5, var6, ServerBuild.scene, Client.collisionMaps[var0]); + } + } + + } + + @ObfuscatedName("ie") + @ObfuscatedSignature( + signature = "(IIIII)V", + garbageValue = "683461450" + ) + @Export("addSceneMenuOptions") + static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { + if (Client.isItemSelected == 0 && !Client.isSpellSelected) { + GraphicsObject.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); + } + + long var4 = -1L; + long var6 = -1L; + int var8 = 0; + + while (true) { + int var10 = ViewportMouse.ViewportMouse_entityCount; + if (var8 >= var10) { + if (var4 != -1L) { + var8 = GrandExchangeEvent.method96(var4); + int var9 = class14.method169(var4); + Player var25 = Client.players[Client.combatTargetPlayerIndex]; + class191.addPlayerToMenu(var25, Client.combatTargetPlayerIndex, var8, var9); + } + + return; + } + + long var11 = VertexNormal.method3063(var8); + if (var11 != var6) { + label324: { + var6 = var11; + int var13 = GrandExchangeOffer.method128(var8); + int var14 = class43.method816(var8); + int var15 = Tile.method2926(ViewportMouse.ViewportMouse_entityTags[var8]); + int var17 = GrandExchangeEvents.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var8]); + int var18 = var17; + if (var15 == 2 && ServerBuild.scene.getObjectFlags(Clock.Client_plane, var13, var14, var11) >= 0) { + ObjectDefinition var19 = Occluder.getObjectDefinition(var17); + if (var19.transforms != null) { + var19 = var19.transform(); + } + + if (var19 == null) { + break label324; + } + + if (Client.isItemSelected == 1) { + GraphicsObject.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + PacketWriter.colorStartTag(65535) + var19.name, 1, var17, var13, var14); + } else if (Client.isSpellSelected) { + if ((NetSocket.selectedSpellFlags & 4) == 4) { + GraphicsObject.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + PacketWriter.colorStartTag(65535) + var19.name, 2, var17, var13, var14); + } + } else { + String[] var20 = var19.actions; + if (var20 != null) { + for (int var21 = 4; var21 >= 0; --var21) { + if (var20[var21] != null) { + short var22 = 0; + if (var21 == 0) { + var22 = 3; + } + + if (var21 == 1) { + var22 = 4; + } + + if (var21 == 2) { + var22 = 5; + } + + if (var21 == 3) { + var22 = 6; + } + + if (var21 == 4) { + var22 = 1001; + } + + GraphicsObject.insertMenuItemNoShift(var20[var21], PacketWriter.colorStartTag(65535) + var19.name, var22, var18, var13, var14); + } + } + } + + GraphicsObject.insertMenuItemNoShift("Examine", PacketWriter.colorStartTag(65535) + var19.name, 1002, var19.id, var13, var14); + } + } + + Player var23; + NPC var26; + int var27; + int var34; + int[] var35; + if (var15 == 1) { + NPC var30 = Client.npcs[var18]; + if (var30 == null) { + break label324; + } + + if (var30.definition.size == 1 && (var30.x & 127) == 64 && (var30.y & 127) == 64) { + for (var27 = 0; var27 < Client.npcCount; ++var27) { + var26 = Client.npcs[Client.npcIndices[var27]]; + if (var26 != null && var26 != var30 && var26.definition.size == 1 && var26.x == var30.x && var30.y == var26.y) { + HorizontalAlignment.addNpcToMenu(var26.definition, Client.npcIndices[var27], var13, var14); + } + } + + var27 = Players.Players_count; + var35 = Players.Players_indices; + + for (var34 = 0; var34 < var27; ++var34) { + var23 = Client.players[var35[var34]]; + if (var23 != null && var23.x == var30.x && var23.y == var30.y) { + class191.addPlayerToMenu(var23, var35[var34], var13, var14); + } + } + } + + HorizontalAlignment.addNpcToMenu(var30.definition, var18, var13, var14); + } + + if (var15 == 0) { + Player var31 = Client.players[var18]; + if (var31 == null) { + break label324; + } + + if ((var31.x & 127) == 64 && (var31.y & 127) == 64) { + for (var27 = 0; var27 < Client.npcCount; ++var27) { + var26 = Client.npcs[Client.npcIndices[var27]]; + if (var26 != null && var26.definition.size == 1 && var26.x == var31.x && var26.y == var31.y) { + HorizontalAlignment.addNpcToMenu(var26.definition, Client.npcIndices[var27], var13, var14); + } + } + + var27 = Players.Players_count; + var35 = Players.Players_indices; + + for (var34 = 0; var34 < var27; ++var34) { + var23 = Client.players[var35[var34]]; + if (var23 != null && var31 != var23 && var23.x == var31.x && var31.y == var23.y) { + class191.addPlayerToMenu(var23, var35[var34], var13, var14); + } + } + } + + if (var18 != Client.combatTargetPlayerIndex) { + class191.addPlayerToMenu(var31, var18, var13, var14); + } else { + var4 = var11; + } + } + + if (var15 == 3) { + NodeDeque var33 = Client.groundItems[Clock.Client_plane][var13][var14]; + if (var33 != null) { + for (TileItem var32 = (TileItem)var33.first(); var32 != null; var32 = (TileItem)var33.next()) { + ItemDefinition var36 = HealthBarDefinition.ItemDefinition_get(var32.id); + if (Client.isItemSelected == 1) { + GraphicsObject.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + PacketWriter.colorStartTag(16748608) + var36.name, 16, var32.id, var13, var14); + } else if (Client.isSpellSelected) { + if ((NetSocket.selectedSpellFlags & 1) == 1) { + GraphicsObject.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + PacketWriter.colorStartTag(16748608) + var36.name, 17, var32.id, var13, var14); + } + } else { + String[] var28 = var36.groundActions; + + for (int var29 = 4; var29 >= 0; --var29) { + if (var28 != null && var28[var29] != null) { + byte var24 = 0; + if (var29 == 0) { + var24 = 18; + } + + if (var29 == 1) { + var24 = 19; + } + + if (var29 == 2) { + var24 = 20; + } + + if (var29 == 3) { + var24 = 21; + } + + if (var29 == 4) { + var24 = 22; + } + + GraphicsObject.insertMenuItemNoShift(var28[var29], PacketWriter.colorStartTag(16748608) + var36.name, var24, var32.id, var13, var14); + } else if (var29 == 2) { + GraphicsObject.insertMenuItemNoShift("Take", PacketWriter.colorStartTag(16748608) + var36.name, 20, var32.id, var13, var14); + } + } + + GraphicsObject.insertMenuItemNoShift("Examine", PacketWriter.colorStartTag(16748608) + var36.name, 1004, var32.id, var13, var14); + } + } + } + } + } + } + + ++var8; } } - @ObfuscatedName("a") + @ObfuscatedName("jn") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "806992568" + signature = "([Lhn;IB)V", + garbageValue = "2" ) - @Export("Messages_getNextChatID") - static int Messages_getNextChatID(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); - if (var1 == null) { - return -1; - } else { - return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; - } - } + @Export("runComponentCloseListeners") + static final void runComponentCloseListeners(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { + Widget var3 = var0[var2]; + if (var3 != null) { + if (var3.type == 0) { + if (var3.children != null) { + runComponentCloseListeners(var3.children, var1); + } + + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); + if (var4 != null) { + class226.runIntfCloseListeners(var4.group, var1); + } + } + + ScriptEvent var5; + if (var1 == 0 && var3.onDialogAbort != null) { + var5 = new ScriptEvent(); + var5.widget = var3; + var5.args = var3.onDialogAbort; + class4.runScriptEvent(var5); + } + + if (var1 == 1 && var3.onSubChange != null) { + if (var3.childIndex >= 0) { + Widget var6 = Varps.getWidget(var3.id); + if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { + continue; + } + } + + var5 = new ScriptEvent(); + var5.widget = var3; + var5.args = var3.onSubChange; + class4.runScriptEvent(var5); + } + } + } - @ObfuscatedName("kb") - @ObfuscatedSignature( - signature = "(Lha;I)I", - garbageValue = "452244252" - ) - @Export("getWidgetClickMask") - static int getWidgetClickMask(Widget var0) { - IntegerNode var1 = (IntegerNode)Client.widgetClickMasks.get((long)var0.childIndex + ((long)var0.id << 32)); - return var1 != null ? var1.integer : var0.clickMask; } } diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index 30edb6f050..65fc1d8c1f 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -4,50 +4,56 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aq") +@ObfuscatedName("aa") @Implements("WorldMapSection1") public class WorldMapSection1 implements WorldMapSection { - @ObfuscatedName("x") - public static short[][] field269; - @ObfuscatedName("dj") + @ObfuscatedName("qx") @ObfuscatedSignature( - signature = "Lif;" + signature = "Ldj;" ) - @Export("archive13") - static Archive archive13; - @ObfuscatedName("f") + @Export("decimator") + static Decimator decimator; + @ObfuscatedName("dx") + @ObfuscatedSignature( + signature = "Lia;" + ) + @Export("archive15") + static Archive archive15; + @ObfuscatedName("ek") + static int[] field295; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -129099459 + intValue = -1032814753 ) @Export("minPlane") int minPlane; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 2029777559 + intValue = 161851669 ) @Export("planes") int planes; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1452885269 + intValue = -1056408349 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1570402195 + intValue = 1194427309 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 387598709 + intValue = -27645919 ) @Export("regionEndX") int regionEndX; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1600612691 + intValue = -290110331 ) @Export("regionEndY") int regionEndY; @@ -55,10 +61,10 @@ public class WorldMapSection1 implements WorldMapSection { WorldMapSection1() { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Laa;I)V", - garbageValue = "515570621" + signature = "(Lae;I)V", + garbageValue = "-1034100543" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { @@ -80,10 +86,10 @@ public class WorldMapSection1 implements WorldMapSection { } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IIII)Z", - garbageValue = "2033433479" + signature = "(IIIB)Z", + garbageValue = "-110" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -94,20 +100,20 @@ public class WorldMapSection1 implements WorldMapSection { } } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(IIB)Z", - garbageValue = "-66" + garbageValue = "37" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(IIII)[I", - garbageValue = "1684413985" + garbageValue = "-96920779" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { @@ -119,10 +125,10 @@ public class WorldMapSection1 implements WorldMapSection { } } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IIB)Lht;", - garbageValue = "21" + signature = "(III)Lhj;", + garbageValue = "911083222" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -135,10 +141,10 @@ public class WorldMapSection1 implements WorldMapSection { } } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lkq;B)V", - garbageValue = "74" + signature = "(Lkp;B)V", + garbageValue = "76" ) @Export("read") public void read(Buffer var1) { @@ -151,24 +157,253 @@ public class WorldMapSection1 implements WorldMapSection { this.postRead(); } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-15" + signature = "(I)V", + garbageValue = "-1927273541" ) @Export("postRead") void postRead() { } - @ObfuscatedName("gs") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1906652083" + signature = "(Lii;IIB)Llt;", + garbageValue = "-81" ) - static void method584() { - if (GrandExchangeEvent.worldMap != null) { - GrandExchangeEvent.worldMap.method6367(UrlRequest.Client_plane, MusicPatchPcmStream.baseX * 64 + (Message.localPlayer.x >> 7), ScriptEvent.baseY * 64 + (Message.localPlayer.y >> 7), false); - GrandExchangeEvent.worldMap.loadCache(); + @Export("SpriteBuffer_getSprite") + public static Sprite SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { + return !class228.method4199(var0, var1, var2) ? null : PendingSpawn.method1738(); + } + + @ObfuscatedName("gq") + @ObfuscatedSignature( + signature = "(IIIII)V", + garbageValue = "-301044323" + ) + @Export("drawEntities") + static final void drawEntities(int var0, int var1, int var2, int var3) { + ++Client.viewportDrawCount; + GrandExchangeOfferUnitPriceComparator.method141(); + if (Client.renderSelf) { + class51.addPlayerToScene(class192.localPlayer, false); + } + + if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { + class51.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); + } + + ItemContainer.addNpcsToScene(true); + WorldMapData_1.method733(); + ItemContainer.addNpcsToScene(false); + + int var6; + for (Projectile var4 = (Projectile)Client.projectiles.last(); var4 != null; var4 = (Projectile)Client.projectiles.previous()) { + if (var4.plane == Clock.Client_plane && Client.cycle <= var4.cycleEnd) { + if (Client.cycle >= var4.cycleStart) { + if (var4.targetIndex > 0) { + NPC var20 = Client.npcs[var4.targetIndex - 1]; + if (var20 != null && var20.x >= 0 && var20.x < 13312 && var20.y >= 0 && var20.y < 13312) { + var4.setDestination(var20.x, var20.y, WorldMapSectionType.getTileHeight(var20.x, var20.y, var4.plane) - var4.endHeight, Client.cycle); + } + } + + if (var4.targetIndex < 0) { + var6 = -var4.targetIndex - 1; + Player var22; + if (var6 == Client.localPlayerIndex) { + var22 = class192.localPlayer; + } else { + var22 = Client.players[var6]; + } + + if (var22 != null && var22.x >= 0 && var22.x < 13312 && var22.y >= 0 && var22.y < 13312) { + var4.setDestination(var22.x, var22.y, WorldMapSectionType.getTileHeight(var22.x, var22.y, var4.plane) - var4.endHeight, Client.cycle); + } + } + + var4.advance(Client.field707); + ServerBuild.scene.drawEntity(Clock.Client_plane, (int)var4.x, (int)var4.y, (int)var4.z, 60, var4, var4.yaw, -1L, false); + } + } else { + var4.remove(); + } + } + + Tiles.method1156(); + GrandExchangeOfferUnitPriceComparator.setViewportShape(var0, var1, var2, var3, true); + var0 = Client.viewportOffsetX; + var1 = Client.viewportOffsetY; + var2 = Client.viewportWidth; + var3 = Client.viewportHeight; + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); + int var5; + int var7; + int var8; + int var9; + int var10; + int var11; + int var12; + int var14; + int var19; + if (!Client.isCameraLocked) { + var19 = Client.camAngleX; + if (Client.field818 / 256 > var19) { + var19 = Client.field818 / 256; + } + + if (Client.field775[4] && Client.field699[4] + 128 > var19) { + var19 = Client.field699[4] + 128; + } + + var5 = Client.camAngleY & 2047; + var6 = PendingSpawn.oculusOrbFocalPointX; + var7 = WorldMapSectionType.field166; + var8 = Skeleton.oculusOrbFocalPointY; + var9 = var19 * 3 + 600; + var10 = Canvas.method864(var9, var3); + var11 = 2048 - var19 & 2047; + var12 = 2048 - var5 & 2047; + int var13 = 0; + var14 = 0; + int var15 = var10; + int var16; + int var17; + int var18; + if (var11 != 0) { + var16 = Rasterizer3D.Rasterizer3D_sine[var11]; + var17 = Rasterizer3D.Rasterizer3D_cosine[var11]; + var18 = var17 * var14 - var10 * var16 >> 16; + var15 = var16 * var14 + var17 * var10 >> 16; + var14 = var18; + } + + if (var12 != 0) { + var16 = Rasterizer3D.Rasterizer3D_sine[var12]; + var17 = Rasterizer3D.Rasterizer3D_cosine[var12]; + var18 = var17 * var13 + var15 * var16 >> 16; + var15 = var15 * var17 - var13 * var16 >> 16; + var13 = var18; + } + + HitSplatDefinition.cameraX = var6 - var13; + class51.cameraY = var7 - var14; + Actor.cameraZ = var8 - var15; + GrandExchangeOffer.cameraPitch = var19; + FriendSystem.cameraYaw = var5; + if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (PendingSpawn.oculusOrbFocalPointX >> 7 != class192.localPlayer.x >> 7 || Skeleton.oculusOrbFocalPointY >> 7 != class192.localPlayer.y >> 7)) { + var16 = class192.localPlayer.plane; + var17 = Messages.baseX * 64 + (PendingSpawn.oculusOrbFocalPointX >> 7); + var18 = Language.baseY * 64 + (Skeleton.oculusOrbFocalPointY >> 7); + WorldMapRegion.method563(var17, var18, var16, true); + } + } + + if (!Client.isCameraLocked) { + var19 = class96.method2346(); + } else { + if (WorldMapSection2.clientPreferences.roofsHidden) { + var5 = Clock.Client_plane; + } else { + var6 = WorldMapSectionType.getTileHeight(HitSplatDefinition.cameraX, Actor.cameraZ, Clock.Client_plane); + if (var6 - class51.cameraY < 800 && (Tiles.Tiles_renderFlags[Clock.Client_plane][HitSplatDefinition.cameraX >> 7][Actor.cameraZ >> 7] & 4) != 0) { + var5 = Clock.Client_plane; + } else { + var5 = 3; + } + } + + var19 = var5; + } + + var5 = HitSplatDefinition.cameraX; + var6 = class51.cameraY; + var7 = Actor.cameraZ; + var8 = GrandExchangeOffer.cameraPitch; + var9 = FriendSystem.cameraYaw; + + for (var10 = 0; var10 < 5; ++var10) { + if (Client.field775[var10]) { + var11 = (int)(Math.random() * (double)(Client.field892[var10] * 2 + 1) - (double)Client.field892[var10] + Math.sin((double)Client.field895[var10] * ((double)Client.field894[var10] / 100.0D)) * (double)Client.field699[var10]); + if (var10 == 0) { + HitSplatDefinition.cameraX += var11; + } + + if (var10 == 1) { + class51.cameraY += var11; + } + + if (var10 == 2) { + Actor.cameraZ += var11; + } + + if (var10 == 3) { + FriendSystem.cameraYaw = var11 + FriendSystem.cameraYaw & 2047; + } + + if (var10 == 4) { + GrandExchangeOffer.cameraPitch += var11; + if (GrandExchangeOffer.cameraPitch < 128) { + GrandExchangeOffer.cameraPitch = 128; + } + + if (GrandExchangeOffer.cameraPitch > 383) { + GrandExchangeOffer.cameraPitch = 383; + } + } + } + } + + var10 = MouseHandler.MouseHandler_x; + var11 = MouseHandler.MouseHandler_y; + if (MouseHandler.MouseHandler_lastButton != 0) { + var10 = MouseHandler.MouseHandler_lastPressedX; + var11 = MouseHandler.MouseHandler_lastPressedY; + } + + if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) { + Message.method1246(var10 - var0, var11 - var1); + } else { + ViewportMouse.ViewportMouse_isInViewport = false; + ViewportMouse.ViewportMouse_entityCount = 0; + } + + UserComparator3.playPcmPlayers(); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); + UserComparator3.playPcmPlayers(); + var12 = Rasterizer3D.Rasterizer3D_zoom; + Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; + ServerBuild.scene.draw(HitSplatDefinition.cameraX, class51.cameraY, Actor.cameraZ, GrandExchangeOffer.cameraPitch, FriendSystem.cameraYaw, var19); + Rasterizer3D.Rasterizer3D_zoom = var12; + UserComparator3.playPcmPlayers(); + ServerBuild.scene.clearTempGameObjects(); + class208.method4017(var0, var1, var2, var3); + if (Client.hintArrowType == 2) { + MouseRecorder.worldToScreen(Client.hintArrowSubX * 64 + (Client.hintArrowX - Messages.baseX * 64 << 7), (Client.hintArrowY - Language.baseY * 64 << 7) + Client.hintArrowSubY * 4096, Client.hintArrowHeight * 2); + if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { + SecureRandomCallable.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); + } + } + + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field707); + RouteStrategy.method3662(var0, var1, var2, var3); + HitSplatDefinition.cameraX = var5; + class51.cameraY = var6; + Actor.cameraZ = var7; + GrandExchangeOffer.cameraPitch = var8; + FriendSystem.cameraYaw = var9; + if (Client.isLoading) { + byte var21 = 0; + var14 = var21 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount; + if (var14 == 0) { + Client.isLoading = false; + } + } + + if (Client.isLoading) { + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); + class197.drawLoadingMessage("Loading - please wait.", false); } } diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index 4072d37a0c..74b0cd237e 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -4,162 +4,165 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("r") +@ObfuscatedName("a") @Implements("WorldMapSection2") public class WorldMapSection2 implements WorldMapSection { - @ObfuscatedName("nb") - @ObfuscatedGetter( - intValue = 1762244161 + @ObfuscatedName("sp") + @ObfuscatedSignature( + signature = "Lbj;" ) - @Export("widgetDragDuration") - static int widgetDragDuration; - @ObfuscatedName("gn") - @Export("regions") - static int[] regions; - @ObfuscatedName("f") + @Export("clientPreferences") + static ClientPreferences clientPreferences; + @ObfuscatedName("ea") @ObfuscatedGetter( - intValue = 2107748955 + intValue = 1716794499 + ) + @Export("port3") + static int port3; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 62157229 ) @Export("minPlane") int minPlane; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -841656425 + intValue = 808318479 ) @Export("planes") int planes; - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1431840249 + intValue = 521626037 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 537268121 + intValue = 694874349 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1669995065 + intValue = 316477089 ) @Export("regionEndX") int regionEndX; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 188092539 + intValue = 911714159 ) @Export("regionEndY") int regionEndY; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = 954202009 - ) - int field177; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -51242925 - ) - int field181; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 169848389 - ) - int field182; @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1576272075 + intValue = 1254748989 ) - int field183; + int field214; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 389719751 + ) + int field216; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -363427247 + ) + int field215; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 467774707 + ) + int field217; WorldMapSection2() { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Laa;I)V", - garbageValue = "515570621" + signature = "(Lae;I)V", + garbageValue = "-1034100543" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field177) { - var1.regionLowX = this.field177; + if (var1.regionLowX > this.field214) { + var1.regionLowX = this.field214; } - if (var1.regionHighX < this.field182) { - var1.regionHighX = this.field182; + if (var1.regionHighX < this.field215) { + var1.regionHighX = this.field215; } - if (var1.regionLowY > this.field181) { - var1.regionLowY = this.field181; + if (var1.regionLowY > this.field216) { + var1.regionLowY = this.field216; } - if (var1.regionHighY < this.field183) { - var1.regionHighY = this.field183; + if (var1.regionHighY < this.field217) { + var1.regionHighY = this.field217; } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IIII)Z", - garbageValue = "2033433479" + signature = "(IIIB)Z", + garbageValue = "-110" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.minPlane && var1 < this.planes + this.minPlane) { + if (var1 >= this.minPlane && var1 < this.minPlane + this.planes) { return var2 >> 6 >= this.regionStartX && var2 >> 6 <= this.regionEndX && var3 >> 6 >= this.regionStartY && var3 >> 6 <= this.regionEndY; } else { return false; } } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(IIB)Z", - garbageValue = "-66" + garbageValue = "37" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >> 6 >= this.field177 && var1 >> 6 <= this.field182 && var2 >> 6 >= this.field181 && var2 >> 6 <= this.field183; + return var1 >> 6 >= this.field214 && var1 >> 6 <= this.field215 && var2 >> 6 >= this.field216 && var2 >> 6 <= this.field217; } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(IIII)[I", - garbageValue = "1684413985" + garbageValue = "-96920779" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { if (!this.containsCoord(var1, var2, var3)) { return null; } else { - int[] var4 = new int[]{this.field177 * 64 - this.regionStartX * 64 + var2, var3 + (this.field181 * 64 - this.regionStartY * 64)}; + int[] var4 = new int[]{this.field214 * 64 - this.regionStartX * 64 + var2, var3 + (this.field216 * 64 - this.regionStartY * 64)}; return var4; } } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IIB)Lht;", - garbageValue = "21" + signature = "(III)Lhj;", + garbageValue = "911083222" ) @Export("coord") public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { return null; } else { - int var3 = this.regionStartX * 64 - this.field177 * 64 + var1; - int var4 = this.regionStartY * 64 - this.field181 * 64 + var2; + int var3 = this.regionStartX * 64 - this.field214 * 64 + var1; + int var4 = this.regionStartY * 64 - this.field216 * 64 + var2; return new Coord(this.minPlane, var3, var4); } } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lkq;B)V", - garbageValue = "74" + signature = "(Lkp;B)V", + garbageValue = "76" ) @Export("read") public void read(Buffer var1) { @@ -169,88 +172,133 @@ public class WorldMapSection2 implements WorldMapSection { this.regionStartY = var1.readUnsignedShort(); this.regionEndX = var1.readUnsignedShort(); this.regionEndY = var1.readUnsignedShort(); - this.field177 = var1.readUnsignedShort(); - this.field181 = var1.readUnsignedShort(); - this.field182 = var1.readUnsignedShort(); - this.field183 = var1.readUnsignedShort(); + this.field214 = var1.readUnsignedShort(); + this.field216 = var1.readUnsignedShort(); + this.field215 = var1.readUnsignedShort(); + this.field217 = var1.readUnsignedShort(); this.postRead(); } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1724317369" + garbageValue = "-1425625159" ) @Export("postRead") void postRead() { } + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(II)Lio;", + garbageValue = "-1814151694" + ) + @Export("KitDefinition_get") + public static KitDefinition KitDefinition_get(int var0) { + KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); + var1 = new KitDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + KitDefinition.KitDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1693295942" + ) + public static void method342() { + VarbitDefinition.VarbitDefinition_cached.clear(); + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(III)I", + garbageValue = "-1579745096" + ) + static int method340(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var2 == null) { + return 0; + } else if (var1 == -1) { + return 0; + } else { + int var3 = 0; + + for (int var4 = 0; var4 < var2.quantities.length; ++var4) { + if (var2.ids[var4] == var1) { + var3 += var2.quantities[var4]; + } + } + + return var3; + } + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1868356098" + ) + static void method344() { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + Tiles.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); + } else { + long var1 = class30.method567(); + int var0; + if (0L == var1) { + var0 = 5; + } else { + var0 = GraphicsObject.method2060(var1, Login.Login_username); + } + + switch(var0) { + case 2: + Tiles.setLoginResponseString(Strings.field3036, Strings.field3037, Strings.field2933); + Login.loginIndex = 6; + break; + case 3: + Tiles.setLoginResponseString("", "Error connecting to server.", ""); + break; + case 4: + Tiles.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); + break; + case 5: + Tiles.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); + break; + case 6: + Tiles.setLoginResponseString("", "Error connecting to server.", ""); + break; + case 7: + Tiles.setLoginResponseString("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username."); + } + + } + } + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-261996704" + signature = "(Ljava/lang/CharSequence;B)Ljava/lang/String;", + garbageValue = "11" ) - public static int method322(int var0) { - return class2.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var0]); - } + public static String method321(CharSequence var0) { + int var2 = var0.length(); + char[] var3 = new char[var2]; - @ObfuscatedName("jz") - @ObfuscatedSignature( - signature = "(Lha;IIIIIIB)V", - garbageValue = "16" - ) - static final void method321(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (Client.field695) { - Client.alternativeScrollbarWidth = 32; - } else { - Client.alternativeScrollbarWidth = 0; + for (int var4 = 0; var4 < var2; ++var4) { + var3[var4] = '*'; } - Client.field695 = false; - int var7; - if (MouseHandler.MouseHandler_currentButton == 1 || !NetFileRequest.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { - if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { - var0.scrollY -= 4; - LoginPacket.invalidateWidget(var0); - } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { - var0.scrollY += 4; - LoginPacket.invalidateWidget(var0); - } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { - var7 = var3 * (var3 - 32) / var4; - if (var7 < 8) { - var7 = 8; - } - - int var8 = var6 - var2 - 16 - var7 / 2; - int var9 = var3 - 32 - var7; - var0.scrollY = var8 * (var4 - var3) / var9; - LoginPacket.invalidateWidget(var0); - Client.field695 = true; - } - } - - if (Client.mouseWheelRotation != 0) { - var7 = var0.width; - if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { - var0.scrollY += Client.mouseWheelRotation * 45; - LoginPacket.invalidateWidget(var0); - } - } - - } - - @ObfuscatedName("ky") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "-1461101470" - ) - @Export("Clan_joinChat") - static final void Clan_joinChat(String var0) { - if (!var0.equals("")) { - PacketBufferNode var1 = class2.getPacketBufferNode(ClientPacket.field2259, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(ViewportMouse.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); - } + String var1 = new String(var3); + return var1; } } diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java index ee2eeec85c..b8af43c4ff 100644 --- a/runescape-client/src/main/java/WorldMapSectionType.java +++ b/runescape-client/src/main/java/WorldMapSectionType.java @@ -1,53 +1,56 @@ -import java.lang.management.GarbageCollectorMXBean; -import java.lang.management.ManagementFactory; -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("z") +@ObfuscatedName("f") @Implements("WorldMapSectionType") public enum WorldMapSectionType implements Enumerated { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lz;" + signature = "Lf;" ) @Export("WORLDMAPSECTIONTYPE0") - WORLDMAPSECTIONTYPE0(3, (byte)0), - @ObfuscatedName("i") + WORLDMAPSECTIONTYPE0(0, (byte)0), + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lz;" + signature = "Lf;" ) @Export("WORLDMAPSECTIONTYPE1") - WORLDMAPSECTIONTYPE1(0, (byte)1), - @ObfuscatedName("y") + WORLDMAPSECTIONTYPE1(2, (byte)1), + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lz;" + signature = "Lf;" ) @Export("WORLDMAPSECTIONTYPE2") - WORLDMAPSECTIONTYPE2(1, (byte)2), - @ObfuscatedName("w") + WORLDMAPSECTIONTYPE2(3, (byte)2), + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lz;" + signature = "Lf;" ) @Export("WORLDMAPSECTIONTYPE3") - WORLDMAPSECTIONTYPE3(2, (byte)3); + WORLDMAPSECTIONTYPE3(1, (byte)3); - @ObfuscatedName("hi") - @ObfuscatedGetter( - intValue = 75470723 + @ObfuscatedName("pv") + @ObfuscatedSignature( + signature = "Lkx;" ) - @Export("oculusOrbFocalPointX") - static int oculusOrbFocalPointX; - @ObfuscatedName("p") + @Export("privateChatMode") + static PrivateChatMode privateChatMode; + @ObfuscatedName("hq") @ObfuscatedGetter( - intValue = -814445795 + intValue = 1689470585 + ) + static int field166; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 262125779 ) @Export("type") final int type; - @ObfuscatedName("b") + @ObfuscatedName("g") @Export("id") final byte id; @@ -56,174 +59,73 @@ public enum WorldMapSectionType implements Enumerated { this.id = var4; } - @ObfuscatedName("i") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "-57" + garbageValue = "1" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)[Lz;", - garbageValue = "198707251" + signature = "(S)[Lf;", + garbageValue = "-3096" ) - static WorldMapSectionType[] method235() { - return new WorldMapSectionType[]{WORLDMAPSECTIONTYPE3, WORLDMAPSECTIONTYPE1, WORLDMAPSECTIONTYPE2, WORLDMAPSECTIONTYPE0}; + static WorldMapSectionType[] method249() { + return new WorldMapSectionType[]{WORLDMAPSECTIONTYPE3, WORLDMAPSECTIONTYPE0, WORLDMAPSECTIONTYPE2, WORLDMAPSECTIONTYPE1}; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "125" + signature = "([BI)[B", + garbageValue = "84077862" ) - static void method236() { - for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var0.stream1 != null) { - Tiles.pcmStreamMixer.removeSubStream(var0.stream1); - var0.stream1 = null; - } - - if (var0.stream2 != null) { - Tiles.pcmStreamMixer.removeSubStream(var0.stream2); - var0.stream2 = null; - } - } - - ObjectSound.objectSounds.clear(); + public static byte[] method250(byte[] var0) { + int var1 = var0.length; + byte[] var2 = new byte[var1]; + System.arraycopy(var0, 0, var2, 0, var1); + return var2; } - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "20" + signature = "(ILce;ZI)I", + garbageValue = "637615278" ) - @Export("getGcDuration") - protected static int getGcDuration() { - int var0 = 0; - if (Interpreter.garbageCollector == null || !Interpreter.garbageCollector.isValid()) { - try { - Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); - - while (var1.hasNext()) { - GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); - if (var2.isValid()) { - Interpreter.garbageCollector = var2; - GameShell.garbageCollectorLastCheckTimeMs = -1L; - GameShell.garbageCollectorLastCollectionTime = -1L; - } - } - } catch (Throwable var11) { - } - } - - if (Interpreter.garbageCollector != null) { - long var9 = WorldMapID.currentTimeMillis(); - long var3 = Interpreter.garbageCollector.getCollectionTime(); - if (GameShell.garbageCollectorLastCollectionTime != -1L) { - long var5 = var3 - GameShell.garbageCollectorLastCollectionTime; - long var7 = var9 - GameShell.garbageCollectorLastCheckTimeMs; - if (0L != var7) { - var0 = (int)(var5 * 100L / var7); - } - } - - GameShell.garbageCollectorLastCollectionTime = var3; - GameShell.garbageCollectorLastCheckTimeMs = var9; - } - - return var0; - } - - @ObfuscatedName("gq") - @ObfuscatedSignature( - signature = "(Lbv;I)V", - garbageValue = "-821947807" - ) - static final void method239(Actor var0) { - if (var0.field969 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > WorldMapSection0.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { - int var1 = var0.field969 - var0.field950; - int var2 = Client.cycle - var0.field950; - int var3 = var0.field921 * 128 + var0.field925 * 64; - int var4 = var0.field966 * 128 + var0.field925 * 64; - int var5 = var0.field965 * 128 + var0.field925 * 64; - int var6 = var0.field929 * 128 + var0.field925 * 64; - var0.x = (var2 * var5 + var3 * (var1 - var2)) / var1; - var0.y = (var2 * var6 + var4 * (var1 - var2)) / var1; - } - - var0.field980 = 0; - var0.orientation = var0.field970; - var0.rotation = var0.orientation; - } - - @ObfuscatedName("jl") - @ObfuscatedSignature( - signature = "(IB)Ljava/lang/String;", - garbageValue = "24" - ) - @Export("formatItemStacks") - static final String formatItemStacks(int var0) { - String var1 = Integer.toString(var0); - - for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { - var1 = var1.substring(0, var2) + "," + var1.substring(var2); - } - - if (var1.length() > 9) { - return " " + NPC.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; + static int method245(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.LOGOUT) { + Client.logoutTimer = 250; + return 1; } else { - return var1.length() > 6 ? " " + NPC.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + NPC.colorStartTag(16776960) + var1 + ""; + return 2; } } - @ObfuscatedName("lp") + @ObfuscatedName("hi") @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZB)V", - garbageValue = "-1" + signature = "(IIIB)I", + garbageValue = "1" ) - @Export("findItemDefinitions") - static void findItemDefinitions(String var0, boolean var1) { - var0 = var0.toLowerCase(); - short[] var2 = new short[16]; - int var3 = 0; - - for (int var4 = 0; var4 < ItemDefinition.ItemDefinition_fileCount; ++var4) { - ItemDefinition var5 = PacketBufferNode.ItemDefinition_get(var4); - if ((!var1 || var5.isTradable) && var5.noteTemplate == -1 && var5.name.toLowerCase().indexOf(var0) != -1) { - if (var3 >= 250) { - KeyHandler.foundItemIdCount = -1; - class269.foundItemIds = null; - return; - } - - if (var3 >= var2.length) { - short[] var6 = new short[var2.length * 2]; - - for (int var7 = 0; var7 < var3; ++var7) { - var6[var7] = var2[var7]; - } - - var2 = var6; - } - - var2[var3++] = (short)var4; + @Export("getTileHeight") + static final int getTileHeight(int var0, int var1, int var2) { + int var3 = var0 >> 7; + int var4 = var1 >> 7; + if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { + int var5 = var2; + if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { + var5 = var2 + 1; } + + int var6 = var0 & 127; + int var7 = var1 & 127; + int var8 = Tiles.Tiles_heights[var5][var3 + 1][var4] * var6 + (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] >> 7; + int var9 = Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] * var6 + Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) >> 7; + return var9 * var7 + var8 * (128 - var7) >> 7; + } else { + return 0; } - - class269.foundItemIds = var2; - class189.foundItemIndex = 0; - KeyHandler.foundItemIdCount = var3; - String[] var8 = new String[KeyHandler.foundItemIdCount]; - - for (int var9 = 0; var9 < KeyHandler.foundItemIdCount; ++var9) { - var8[var9] = PacketBufferNode.ItemDefinition_get(var2[var9]).name; - } - - short[] var10 = class269.foundItemIds; - ParamDefinition.sortItemsByName(var8, var10, 0, var8.length - 1); } } diff --git a/runescape-client/src/main/java/WorldMapSprite.java b/runescape-client/src/main/java/WorldMapSprite.java index 4e36b729f6..a9d64bc7a9 100644 --- a/runescape-client/src/main/java/WorldMapSprite.java +++ b/runescape-client/src/main/java/WorldMapSprite.java @@ -1,18 +1,24 @@ -import java.awt.FontMetrics; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("av") +@ObfuscatedName("af") @Implements("WorldMapSprite") public final class WorldMapSprite { - @ObfuscatedName("j") - static String[] field219; - @ObfuscatedName("ak") - @Export("loginScreenFontMetrics") - static FontMetrics loginScreenFontMetrics; - @ObfuscatedName("i") + @ObfuscatedName("rc") + @ObfuscatedGetter( + intValue = -936631043 + ) + static int field240; + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "Lli;" + ) + @Export("options_buttons_0Sprite") + static IndexedSprite options_buttons_0Sprite; + @ObfuscatedName("t") @Export("tileColors") final int[] tileColors; @@ -24,44 +30,45 @@ public final class WorldMapSprite { this.tileColors = var1; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-1062686446" + signature = "(IIB)I", + garbageValue = "35" ) @Export("getTileColor") final int getTileColor(int var1, int var2) { return this.tileColors[var1 + var2 * 64]; } - @ObfuscatedName("fm") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1175490871" + signature = "(Lkp;IS)V", + garbageValue = "-20256" ) - @Export("playSong") - static void playSong(int var0) { - if (var0 == -1 && !Client.field767) { - Actor.method1755(); - } else if (var0 != -1 && var0 != Client.currentTrackGroupId && Client.musicVolume != 0 && !Client.field767) { - class4.method59(2, GrandExchangeOfferWorldComparator.archive6, var0, 0, Client.musicVolume, false); + public static void method427(Buffer var0, int var1) { + if (JagexCache.JagexCache_randomDat != null) { + try { + JagexCache.JagexCache_randomDat.seek(0L); + JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); + } catch (Exception var3) { + } } - Client.currentTrackGroupId = var0; } - @ObfuscatedName("gu") + @ObfuscatedName("gb") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "-50" + signature = "(B)V", + garbageValue = "96" ) - static final void method408(int var0, int var1) { - if (Client.hintArrowType == 2) { - KeyHandler.worldToScreen((Client.hintArrowX - MusicPatchPcmStream.baseX * 64 << 7) + Client.hintArrowSubX * 4096, (Client.hintArrowY - ScriptEvent.baseY * 64 << 7) + Client.hintArrowSubY * 4096, Client.hintArrowHeight * 2); - if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { - WorldMapData_0.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); + static final void method434() { + for (int var0 = 0; var0 < Client.npcCount; ++var0) { + int var1 = Client.npcIndices[var0]; + NPC var2 = Client.npcs[var1]; + if (var2 != null) { + ScriptFrame.updateActorSequence(var2, var2.definition.size); } - } + } } diff --git a/runescape-client/src/main/java/Wrapper.java b/runescape-client/src/main/java/Wrapper.java index 86be9d4e3f..4dae57b1ab 100644 --- a/runescape-client/src/main/java/Wrapper.java +++ b/runescape-client/src/main/java/Wrapper.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ff") +@ObfuscatedName("ef") @Implements("Wrapper") public abstract class Wrapper extends DualNode { - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("size") final int size; @@ -13,11 +13,11 @@ public abstract class Wrapper extends DualNode { this.size = var1; } - @ObfuscatedName("f") + @ObfuscatedName("c") @Export("get") abstract Object get(); - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("isSoft") abstract boolean isSoft(); } diff --git a/runescape-client/src/main/java/class0.java b/runescape-client/src/main/java/class0.java index 9d1fcd70e2..3fadc3f6a0 100644 --- a/runescape-client/src/main/java/class0.java +++ b/runescape-client/src/main/java/class0.java @@ -1,19 +1,19 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("f") +@ObfuscatedName("c") public interface class0 { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/lang/Object;Lkq;I)V", - garbageValue = "-685052934" + signature = "(Ljava/lang/Object;Lkp;B)V", + garbageValue = "95" ) - void vmethod53(Object var1, Buffer var2); + void vmethod55(Object var1, Buffer var2); - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lkq;I)Ljava/lang/Object;", - garbageValue = "390816352" + signature = "(Lkp;I)Ljava/lang/Object;", + garbageValue = "1665636232" ) - Object vmethod60(Buffer var1); + Object vmethod53(Buffer var1); } diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index 30f413a6f2..2dd4ac2a29 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -2,77 +2,56 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("i") +@ObfuscatedName("t") final class class1 implements class0 { - @ObfuscatedName("f") + @ObfuscatedName("fe") @ObfuscatedSignature( - signature = "(Ljava/lang/Object;Lkq;I)V", - garbageValue = "-685052934" + signature = "Lko;" ) - public void vmethod53(Object var1, Buffer var2) { - this.method8((Integer)var1, var2); + @Export("fontBold12") + static Font fontBold12; + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(Ljava/lang/Object;Lkp;B)V", + garbageValue = "95" + ) + public void vmethod55(Object var1, Buffer var2) { + this.method7((Integer)var1, var2); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lkq;I)Ljava/lang/Object;", - garbageValue = "390816352" + signature = "(Lkp;I)Ljava/lang/Object;", + garbageValue = "1665636232" ) - public Object vmethod60(Buffer var1) { + public Object vmethod53(Buffer var1) { return var1.readInt(); } - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(Ljava/lang/Integer;Lkq;I)V", - garbageValue = "-1005316457" + signature = "(Ljava/lang/Integer;Lkp;I)V", + garbageValue = "-890899410" ) - void method8(Integer var1, Buffer var2) { + void method7(Integer var1, Buffer var2) { var2.writeInt(var1); } - @ObfuscatedName("gv") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZB)V", - garbageValue = "-52" + signature = "(Lbg;Lbg;IZIZI)I", + garbageValue = "-926800273" ) - @Export("drawLoadingMessage") - static final void drawLoadingMessage(String var0, boolean var1) { - if (Client.showLoadingMessages) { - byte var2 = 4; - int var3 = var2 + 6; - int var4 = var2 + 6; - int var5 = ScriptFrame.fontPlain12.lineWidth(var0, 250); - int var6 = ScriptFrame.fontPlain12.lineCount(var0, 250) * 13; - Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var6 + var2, 0); - Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var2 + var6, 16777215); - ScriptFrame.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); - GameObject.method3297(var3 - var2, var4 - var2, var2 + var5 + var2, var6 + var2 + var2); - if (var1) { - IgnoreList.rasterProvider.drawFull(0, 0); - } else { - int var7 = var3; - int var8 = var4; - int var9 = var5; - int var10 = var6; - - for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { - if (Client.rootWidgetXs[var11] + Client.rootWidgetWidths[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var10 + var8) { - Client.field834[var11] = true; - } - } - } - + static int method19(World var0, World var1, int var2, boolean var3, int var4, boolean var5) { + int var6 = MouseHandler.compareWorlds(var0, var1, var2, var3); + if (var6 != 0) { + return var3 ? -var6 : var6; + } else if (var4 == -1) { + return 0; + } else { + int var7 = MouseHandler.compareWorlds(var0, var1, var4, var5); + return var5 ? -var7 : var7; } } - - @ObfuscatedName("ij") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;IIIIB)V", - garbageValue = "3" - ) - @Export("insertMenuItemNoShift") - public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { - AbstractWorldMapIcon.insertMenuItem(var0, var1, var2, var3, var4, var5, false); - } } diff --git a/runescape-client/src/main/java/class117.java b/runescape-client/src/main/java/class117.java deleted file mode 100644 index 070cba189e..0000000000 --- a/runescape-client/src/main/java/class117.java +++ /dev/null @@ -1,152 +0,0 @@ -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; - -@ObfuscatedName("db") -public class class117 { - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Ljl;" - ) - @Export("reflectionChecks") - static IterableNodeDeque reflectionChecks; - @ObfuscatedName("dy") - @ObfuscatedSignature( - signature = "Lif;" - ) - @Export("archive14") - static Archive archive14; - - static { - reflectionChecks = new IterableNodeDeque(); - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(Lkq;IB)V", - garbageValue = "-86" - ) - @Export("readReflectionCheck") - public static void readReflectionCheck(Buffer var0, int var1) { - ReflectionCheck var2 = new ReflectionCheck(); - var2.size = var0.readUnsignedByte(); - var2.id = var0.readInt(); - var2.operations = new int[var2.size]; - var2.creationErrors = new int[var2.size]; - var2.fields = new Field[var2.size]; - var2.intReplaceValues = new int[var2.size]; - var2.methods = new Method[var2.size]; - var2.arguments = new byte[var2.size][][]; - - for (int var3 = 0; var3 < var2.size; ++var3) { - try { - int var4 = var0.readUnsignedByte(); - String var5; - String var6; - int var7; - if (var4 != 0 && var4 != 1 && var4 != 2) { - if (var4 == 3 || var4 == 4) { - var5 = var0.readStringCp1252NullTerminated(); - var6 = var0.readStringCp1252NullTerminated(); - var7 = var0.readUnsignedByte(); - String[] var8 = new String[var7]; - - for (int var9 = 0; var9 < var7; ++var9) { - var8[var9] = var0.readStringCp1252NullTerminated(); - } - - String var20 = var0.readStringCp1252NullTerminated(); - byte[][] var10 = new byte[var7][]; - int var12; - if (var4 == 3) { - for (int var11 = 0; var11 < var7; ++var11) { - var12 = var0.readInt(); - var10[var11] = new byte[var12]; - var0.readBytes(var10[var11], 0, var12); - } - } - - var2.operations[var3] = var4; - Class[] var21 = new Class[var7]; - - for (var12 = 0; var12 < var7; ++var12) { - var21[var12] = WorldMapDecoration.loadClassFromDescriptor(var8[var12]); - } - - Class var22 = WorldMapDecoration.loadClassFromDescriptor(var20); - if (WorldMapDecoration.loadClassFromDescriptor(var5).getClassLoader() == null) { - throw new SecurityException(); - } - - Method[] var13 = WorldMapDecoration.loadClassFromDescriptor(var5).getDeclaredMethods(); - Method[] var14 = var13; - - for (int var15 = 0; var15 < var14.length; ++var15) { - Method var16 = var14[var15]; - if (Reflection.getMethodName(var16).equals(var6)) { - Class[] var17 = Reflection.getParameterTypes(var16); - if (var21.length == var17.length) { - boolean var18 = true; - - for (int var19 = 0; var19 < var21.length; ++var19) { - if (var21[var19] != var17[var19]) { - var18 = false; - break; - } - } - - if (var18 && var22 == var16.getReturnType()) { - var2.methods[var3] = var16; - } - } - } - } - - var2.arguments[var3] = var10; - } - } else { - var5 = var0.readStringCp1252NullTerminated(); - var6 = var0.readStringCp1252NullTerminated(); - var7 = 0; - if (var4 == 1) { - var7 = var0.readInt(); - } - - var2.operations[var3] = var4; - var2.intReplaceValues[var3] = var7; - if (WorldMapDecoration.loadClassFromDescriptor(var5).getClassLoader() == null) { - throw new SecurityException(); - } - - var2.fields[var3] = Reflection.findField(WorldMapDecoration.loadClassFromDescriptor(var5), var6); - } - } catch (ClassNotFoundException var24) { - var2.creationErrors[var3] = -1; - } catch (SecurityException var25) { - var2.creationErrors[var3] = -2; - } catch (NullPointerException var26) { - var2.creationErrors[var3] = -3; - } catch (Exception var27) { - var2.creationErrors[var3] = -4; - } catch (Throwable var28) { - var2.creationErrors[var3] = -5; - } - } - - reflectionChecks.addFirst(var2); - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "120" - ) - public static int method2760(int var0) { - long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; - int var1 = (int)(var2 >>> 7 & 127L); - return var1; - } -} diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java index ff7fc035e1..7c810d4259 100644 --- a/runescape-client/src/main/java/class13.java +++ b/runescape-client/src/main/java/class13.java @@ -1,75 +1,164 @@ -import java.awt.Desktop; -import java.awt.Desktop.Action; -import java.net.URI; +import java.lang.reflect.Field; +import java.lang.reflect.Method; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; -@ObfuscatedName("k") +@ObfuscatedName("n") public class class13 { - @ObfuscatedName("i") + @ObfuscatedName("fu") @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZZI)V", - garbageValue = "637886489" + signature = "Lko;" ) - @Export("openURL") - public static void openURL(String var0, boolean var1, boolean var2) { - if (var1) { - if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { - try { - Desktop.getDesktop().browse(new URI(var0)); - return; - } catch (Exception var4) { - } - } + @Export("fontPlain12") + static Font fontPlain12; - if (class50.field410.startsWith("win")) { - class216.method4017(var0, 0); - } else if (class50.field410.startsWith("mac")) { - GrandExchangeEvent.method79(var0, 1, "openjs"); - } else { - class216.method4017(var0, 2); + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "(Lkp;IB)V", + garbageValue = "86" + ) + @Export("readReflectionCheck") + public static void readReflectionCheck(Buffer var0, int var1) { + ReflectionCheck var2 = new ReflectionCheck(); + var2.size = var0.readUnsignedByte(); + var2.id = var0.readInt(); + var2.operations = new int[var2.size]; + var2.creationErrors = new int[var2.size]; + var2.fields = new Field[var2.size]; + var2.intReplaceValues = new int[var2.size]; + var2.methods = new Method[var2.size]; + var2.arguments = new byte[var2.size][][]; + + for (int var3 = 0; var3 < var2.size; ++var3) { + try { + int var4 = var0.readUnsignedByte(); + String var5; + String var6; + int var7; + if (var4 != 0 && var4 != 1 && var4 != 2) { + if (var4 == 3 || var4 == 4) { + var5 = var0.readStringCp1252NullTerminated(); + var6 = var0.readStringCp1252NullTerminated(); + var7 = var0.readUnsignedByte(); + String[] var8 = new String[var7]; + + for (int var9 = 0; var9 < var7; ++var9) { + var8[var9] = var0.readStringCp1252NullTerminated(); + } + + String var20 = var0.readStringCp1252NullTerminated(); + byte[][] var10 = new byte[var7][]; + int var12; + if (var4 == 3) { + for (int var11 = 0; var11 < var7; ++var11) { + var12 = var0.readInt(); + var10[var11] = new byte[var12]; + var0.readBytes(var10[var11], 0, var12); + } + } + + var2.operations[var3] = var4; + Class[] var21 = new Class[var7]; + + for (var12 = 0; var12 < var7; ++var12) { + var21[var12] = class223.loadClassFromDescriptor(var8[var12]); + } + + Class var22 = class223.loadClassFromDescriptor(var20); + if (class223.loadClassFromDescriptor(var5).getClassLoader() == null) { + throw new SecurityException(); + } + + Method[] var13 = class223.loadClassFromDescriptor(var5).getDeclaredMethods(); + Method[] var14 = var13; + + for (int var15 = 0; var15 < var14.length; ++var15) { + Method var16 = var14[var15]; + if (Reflection.getMethodName(var16).equals(var6)) { + Class[] var17 = Reflection.getParameterTypes(var16); + if (var17.length == var21.length) { + boolean var18 = true; + + for (int var19 = 0; var19 < var21.length; ++var19) { + if (var17[var19] != var21[var19]) { + var18 = false; + break; + } + } + + if (var18 && var22 == var16.getReturnType()) { + var2.methods[var3] = var16; + } + } + } + } + + var2.arguments[var3] = var10; + } + } else { + var5 = var0.readStringCp1252NullTerminated(); + var6 = var0.readStringCp1252NullTerminated(); + var7 = 0; + if (var4 == 1) { + var7 = var0.readInt(); + } + + var2.operations[var3] = var4; + var2.intReplaceValues[var3] = var7; + if (class223.loadClassFromDescriptor(var5).getClassLoader() == null) { + throw new SecurityException(); + } + + var2.fields[var3] = Reflection.findField(class223.loadClassFromDescriptor(var5), var6); + } + } catch (ClassNotFoundException var24) { + var2.creationErrors[var3] = -1; + } catch (SecurityException var25) { + var2.creationErrors[var3] = -2; + } catch (NullPointerException var26) { + var2.creationErrors[var3] = -3; + } catch (Exception var27) { + var2.creationErrors[var3] = -4; + } catch (Throwable var28) { + var2.creationErrors[var3] = -5; } - } else { - class216.method4017(var0, 3); } + class96.reflectionChecks.addFirst(var2); } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IIIIB)I", - garbageValue = "119" + signature = "(IB)I", + garbageValue = "0" ) - static final int method150(int var0, int var1, int var2, int var3) { - int var4 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var2 * 1024 / var3] >> 1; - return ((65536 - var4) * var0 >> 16) + (var4 * var1 >> 16); - } - - @ObfuscatedName("iw") - @ObfuscatedSignature( - signature = "(IIIIIIIII)V", - garbageValue = "1952174760" - ) - @Export("drawWidgets") - static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (MusicPatch.loadInterface(var0)) { - ClientPacket.field2223 = null; - UserComparator7.drawInterface(UserComparator7.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); - if (ClientPacket.field2223 != null) { - UserComparator7.drawInterface(ClientPacket.field2223, -1412584499, var1, var2, var3, var4, GrandExchangeEvents.field31, class81.field1126, var7); - ClientPacket.field2223 = null; - } - + @Export("Messages_getNextChatID") + static int Messages_getNextChatID(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); + if (var1 == null) { + return -1; } else { - if (var7 != -1) { - Client.field833[var7] = true; - } else { - for (int var8 = 0; var8 < 100; ++var8) { - Client.field833[var8] = true; - } - } - + return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; } } + + @ObfuscatedName("fi") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "859526666" + ) + @Export("forceDisconnect") + static final void forceDisconnect(int var0) { + class30.logOut(); + switch(var0) { + case 1: + WorldMapCacheName.method634(); + break; + case 2: + NPC.method2079(); + } + + } } diff --git a/runescape-client/src/main/java/class14.java b/runescape-client/src/main/java/class14.java index 56323e1d8e..8be41a7aad 100644 --- a/runescape-client/src/main/java/class14.java +++ b/runescape-client/src/main/java/class14.java @@ -1,225 +1,162 @@ +import java.applet.Applet; +import java.awt.image.BufferedImage; +import java.awt.image.PixelGrabber; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.net.URL; +import javax.imageio.ImageIO; import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import netscape.javascript.JSObject; -@ObfuscatedName("s") +@ObfuscatedName("x") public class class14 { - @ObfuscatedName("w") - static byte[][][] field88; - @ObfuscatedName("v") - public static boolean field89; - @ObfuscatedName("gs") - @ObfuscatedSignature( - signature = "Lej;" + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 1417647521 ) - @Export("scene") - static Scene scene; - @ObfuscatedName("je") + @Export("clientTickTimeIdx") + static int clientTickTimeIdx; + @ObfuscatedName("aa") + static String field101; + @ObfuscatedName("bb") @ObfuscatedSignature( - signature = "Ldt;" + signature = "Lhx;" ) - @Export("textureProvider") - static TextureProvider textureProvider; - @ObfuscatedName("lx") - @ObfuscatedSignature( - signature = "Lha;" - ) - static Widget field90; + static StudioGame field102; - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IILfx;Lfp;B)Z", - garbageValue = "-12" + signature = "([BB)Llt;", + garbageValue = "-30" ) - public static final boolean method158(int var0, int var1, RouteStrategy var2, CollisionMap var3) { - int var4 = var0; - int var5 = var1; - byte var6 = 64; - byte var7 = 64; - int var8 = var0 - var6; - int var9 = var1 - var7; - class173.directions[var6][var7] = 99; - class173.distances[var6][var7] = 0; - byte var10 = 0; - int var11 = 0; - class173.bufferX[var10] = var0; - byte var10001 = var10; - int var18 = var10 + 1; - class173.bufferY[var10001] = var1; - int[][] var12 = var3.flags; + @Export("convertJpgToSprite") + public static final Sprite convertJpgToSprite(byte[] var0) { + BufferedImage var1 = null; - while (var11 != var18) { - var4 = class173.bufferX[var11]; - var5 = class173.bufferY[var11]; - var11 = var11 + 1 & 4095; - int var16 = var4 - var8; - int var17 = var5 - var9; - int var13 = var4 - var3.xInset; - int var14 = var5 - var3.yInset; - if (var2.hasArrived(1, var4, var5, var3)) { - class268.field3524 = var4; - class173.field2072 = var5; + try { + var1 = ImageIO.read(new ByteArrayInputStream(var0)); + int var2 = var1.getWidth(); + int var3 = var1.getHeight(); + int[] var4 = new int[var2 * var3]; + PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2); + var5.grabPixels(); + return new Sprite(var4, var2, var3); + } catch (IOException var7) { + } catch (InterruptedException var8) { + } + + return new Sprite(0, 0); + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;ILjava/lang/String;I)Z", + garbageValue = "-1466465553" + ) + static boolean method174(String var0, int var1, String var2) { + if (var1 == 0) { + try { + if (!class51.field431.startsWith("win")) { + throw new Exception(); + } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { + throw new Exception(); + } else { + String var13 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; + + for (int var4 = 0; var4 < var0.length(); ++var4) { + if (var13.indexOf(var0.charAt(var4)) == -1) { + throw new Exception(); + } + } + + Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); + return true; + } + } catch (Throwable var8) { + return false; + } + } else if (var1 == 1) { + try { + Applet var7 = class51.applet; + Object[] var5 = new Object[]{(new URL(class51.applet.getCodeBase(), var0)).toString()}; + Object var3 = JSObject.getWindow(var7).call(var2, var5); + return var3 != null; + } catch (Throwable var9) { + return false; + } + } else if (var1 == 2) { + try { + class51.applet.getAppletContext().showDocument(new URL(class51.applet.getCodeBase(), var0), "_blank"); return true; + } catch (Exception var10) { + return false; + } + } else if (var1 == 3) { + try { + class47.method857(class51.applet, "loggedout"); + } catch (Throwable var12) { } - int var15 = class173.distances[var16][var17] + 1; - if (var16 > 0 && class173.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136776) == 0) { - class173.bufferX[var18] = var4 - 1; - class173.bufferY[var18] = var5; - var18 = var18 + 1 & 4095; - class173.directions[var16 - 1][var17] = 2; - class173.distances[var16 - 1][var17] = var15; + try { + class51.applet.getAppletContext().showDocument(new URL(class51.applet.getCodeBase(), var0), "_top"); + return true; + } catch (Exception var11) { + return false; } - - if (var16 < 127 && class173.directions[var16 + 1][var17] == 0 && (var12[var13 + 1][var14] & 19136896) == 0) { - class173.bufferX[var18] = var4 + 1; - class173.bufferY[var18] = var5; - var18 = var18 + 1 & 4095; - class173.directions[var16 + 1][var17] = 8; - class173.distances[var16 + 1][var17] = var15; - } - - if (var17 > 0 && class173.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { - class173.bufferX[var18] = var4; - class173.bufferY[var18] = var5 - 1; - var18 = var18 + 1 & 4095; - class173.directions[var16][var17 - 1] = 1; - class173.distances[var16][var17 - 1] = var15; - } - - if (var17 < 127 && class173.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { - class173.bufferX[var18] = var4; - class173.bufferY[var18] = var5 + 1; - var18 = var18 + 1 & 4095; - class173.directions[var16][var17 + 1] = 4; - class173.distances[var16][var17 + 1] = var15; - } - - if (var16 > 0 && var17 > 0 && class173.directions[var16 - 1][var17 - 1] == 0 && (var12[var13 - 1][var14 - 1] & 19136782) == 0 && (var12[var13 - 1][var14] & 19136776) == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { - class173.bufferX[var18] = var4 - 1; - class173.bufferY[var18] = var5 - 1; - var18 = var18 + 1 & 4095; - class173.directions[var16 - 1][var17 - 1] = 3; - class173.distances[var16 - 1][var17 - 1] = var15; - } - - if (var16 < 127 && var17 > 0 && class173.directions[var16 + 1][var17 - 1] == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0 && (var12[var13 + 1][var14] & 19136896) == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { - class173.bufferX[var18] = var4 + 1; - class173.bufferY[var18] = var5 - 1; - var18 = var18 + 1 & 4095; - class173.directions[var16 + 1][var17 - 1] = 9; - class173.distances[var16 + 1][var17 - 1] = var15; - } - - if (var16 > 0 && var17 < 127 && class173.directions[var16 - 1][var17 + 1] == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0 && (var12[var13 - 1][var14] & 19136776) == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { - class173.bufferX[var18] = var4 - 1; - class173.bufferY[var18] = var5 + 1; - var18 = var18 + 1 & 4095; - class173.directions[var16 - 1][var17 + 1] = 6; - class173.distances[var16 - 1][var17 + 1] = var15; - } - - if (var16 < 127 && var17 < 127 && class173.directions[var16 + 1][var17 + 1] == 0 && (var12[var13 + 1][var14 + 1] & 19136992) == 0 && (var12[var13 + 1][var14] & 19136896) == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { - class173.bufferX[var18] = var4 + 1; - class173.bufferY[var18] = var5 + 1; - var18 = var18 + 1 & 4095; - class173.directions[var16 + 1][var17 + 1] = 12; - class173.distances[var16 + 1][var17 + 1] = var15; - } - } - - class268.field3524 = var4; - class173.field2072 = var5; - return false; - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(IS)I", - garbageValue = "255" - ) - public static int method157(int var0) { - return var0 >> 11 & 63; - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "(Llc;ILjava/lang/String;B)Ljava/lang/String;", - garbageValue = "47" - ) - static String method151(IterableNodeHashTable var0, int var1, String var2) { - if (var0 == null) { - return var2; } else { - ObjectNode var3 = (ObjectNode)var0.get((long)var1); - return var3 == null ? var2 : (String)var3.obj; + throw new IllegalArgumentException(); } } - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "(Lhz;Lhz;III)Lko;", - garbageValue = "276339523" - ) - public static Font method160(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { - return !HitSplatDefinition.method4586(var0, var2, var3) ? null : ChatChannel.method2270(var1.takeFile(var2, var3)); - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "(IS)J", - garbageValue = "-206" - ) - public static long method152(int var0) { - return ViewportMouse.ViewportMouse_entityTags[var0]; - } - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "349411757" - ) - public static void method155() { - PlayerAppearance.PlayerAppearance_cachedModels.clear(); + public static int method169(long var0) { + return (int)(var0 >>> 7 & 127L); } - @ObfuscatedName("gy") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(Lbn;ZI)V", - garbageValue = "558782767" + signature = "(CB)Z", + garbageValue = "1" ) - @Export("addPlayerToScene") - static void addPlayerToScene(Player var0, boolean var1) { - if (var0 != null && var0.isVisible() && !var0.isHidden) { - var0.isUnanimated = false; - if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.readySequence == var0.movementSequence) { - var0.isUnanimated = true; - } + @Export("isDigit") + public static boolean isDigit(char var0) { + return var0 >= '0' && var0 <= '9'; + } - int var2 = var0.x >> 7; - int var3 = var0.y >> 7; - if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { - long var4 = KeyHandler.calculateTag(0, 0, 0, false, var0.index); - if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { - var0.isUnanimated = false; - var0.tileHeight = ScriptEvent.getTileHeight(var0.x, var0.y, UrlRequest.Client_plane); - var0.playerCycle = Client.cycle; - scene.addNullableObject(UrlRequest.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.field605, var0.field606, var0.field607, var0.field608); - } else { - if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { - if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { - return; - } - - Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; - } - - var0.tileHeight = ScriptEvent.getTileHeight(var0.x, var0.y, UrlRequest.Client_plane); - var0.playerCycle = Client.cycle; - scene.drawEntity(UrlRequest.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); - } - } + @ObfuscatedName("af") + @ObfuscatedSignature( + signature = "(IZIB)V", + garbageValue = "14" + ) + public static final void method173(int var0, boolean var1, int var2) { + if (var0 >= 8000 && var0 <= 48000) { + PcmPlayer.field1398 = var0; + PcmPlayer.PcmPlayer_stereo = var1; + GrandExchangeEvent.field45 = var2; + } else { + throw new IllegalArgumentException(); } + } + @ObfuscatedName("fs") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "970365805" + ) + static int method170() { + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { + int var0 = 0; + + for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { + var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; + } + + return var0 * 10000 / Client.field813; + } else { + return 10000; + } } } diff --git a/runescape-client/src/main/java/class146.java b/runescape-client/src/main/java/class146.java new file mode 100644 index 0000000000..2152bae502 --- /dev/null +++ b/runescape-client/src/main/java/class146.java @@ -0,0 +1,7 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("ev") +public interface class146 { + @ObfuscatedName("c") + void method3397(Object var1); +} diff --git a/runescape-client/src/main/java/class155.java b/runescape-client/src/main/java/class155.java deleted file mode 100644 index 83ffd375a8..0000000000 --- a/runescape-client/src/main/java/class155.java +++ /dev/null @@ -1,7 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("em") -public interface class155 { - @ObfuscatedName("f") - void method3386(Object var1); -} diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java index 350b4b1f96..c4fd68f48e 100644 --- a/runescape-client/src/main/java/class16.java +++ b/runescape-client/src/main/java/class16.java @@ -1,105 +1,38 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("t") +@ObfuscatedName("k") public class class16 { @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -367363475 - ) - @Export("musicTrackGroupId") - static int musicTrackGroupId; - @ObfuscatedName("ly") @ObfuscatedSignature( - signature = "Lha;" + signature = "[Lli;" ) - @Export("mousedOverWidgetIf1") - static Widget mousedOverWidgetIf1; + @Export("runesSprite") + static IndexedSprite[] runesSprite; + @ObfuscatedName("cf") + @ObfuscatedSignature( + signature = "Lbt;" + ) + @Export("mouseRecorder") + static MouseRecorder mouseRecorder; - @ObfuscatedName("i") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(IIII)Lcu;", - garbageValue = "1224179540" + signature = "(Lii;Ljava/lang/String;Ljava/lang/String;I)Lli;", + garbageValue = "1833648793" ) - @Export("getWorldMapScript") - static Script getWorldMapScript(int var0, int var1, int var2) { - int var3 = WorldMapDecorationType.method4085(var1, var0); - Script var5 = (Script)Script.Script_cached.get((long)(var3 << 16)); - Script var4; - if (var5 != null) { - var4 = var5; + @Export("SpriteBuffer_getIndexedSpriteByName") + public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); + int var4 = var0.getFileId(var3, var2); + IndexedSprite var5; + if (!class228.method4199(var0, var3, var4)) { + var5 = null; } else { - String var6 = String.valueOf(var3); - int var7 = SoundSystem.archive12.getGroupId(var6); - if (var7 == -1) { - var4 = null; - } else { - label56: { - byte[] var8 = SoundSystem.archive12.takeFileFlat(var7); - if (var8 != null) { - if (var8.length <= 1) { - var4 = null; - break label56; - } - - var5 = Tiles.newScript(var8); - if (var5 != null) { - Script.Script_cached.put(var5, (long)(var3 << 16)); - var4 = var5; - break label56; - } - } - - var4 = null; - } - } + var5 = class313.method5962(); } - if (var4 != null) { - return var4; - } else { - int var12 = (var2 + 40000 << 8) + var0; - Script var14 = (Script)Script.Script_cached.get((long)(var12 << 16)); - Script var13; - if (var14 != null) { - var13 = var14; - } else { - String var9 = String.valueOf(var12); - int var10 = SoundSystem.archive12.getGroupId(var9); - if (var10 == -1) { - var13 = null; - } else { - byte[] var11 = SoundSystem.archive12.takeFileFlat(var10); - if (var11 != null) { - if (var11.length <= 1) { - var13 = null; - return var13 != null ? var13 : null; - } - - var14 = Tiles.newScript(var11); - if (var14 != null) { - Script.Script_cached.put(var14, (long)(var12 << 16)); - var13 = var14; - return var13 != null ? var13 : null; - } - } - - var13 = null; - } - } - - return var13 != null ? var13 : null; - } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1669945639" - ) - public static void method179() { - ParamDefinition.ParamDefinition_cached.clear(); + return var5; } } diff --git a/runescape-client/src/main/java/class160.java b/runescape-client/src/main/java/class160.java index a8a285ad3f..e153eac76d 100644 --- a/runescape-client/src/main/java/class160.java +++ b/runescape-client/src/main/java/class160.java @@ -3,69 +3,127 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fv") +@ObfuscatedName("fn") public enum class160 implements Enumerated { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lfv;" + signature = "Lfn;" ) - field1988(2, 0), - @ObfuscatedName("i") + field1994(1, 0), + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lfv;" + signature = "Lfn;" ) - field1984(1, 1), - @ObfuscatedName("y") + field1996(0, 1), + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lfv;" + signature = "Lfn;" ) - field1985(3, 2), - @ObfuscatedName("w") + field1993(2, 2), + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lfv;" + signature = "Lfn;" ) - field1986(0, 3); + field1995(3, 3); - @ObfuscatedName("p") + @ObfuscatedName("f") + public static String field1998; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -410013457 + intValue = 1846550889 ) - public final int field1987; - @ObfuscatedName("b") + public final int field1992; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1136729991 + intValue = -699786639 ) @Export("id") final int id; class160(int var3, int var4) { - this.field1987 = var3; + this.field1992 = var3; this.id = var4; } - @ObfuscatedName("i") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "-57" + garbageValue = "1" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lkq;II)V", - garbageValue = "1384182754" + signature = "([BIILem;[Lfv;I)V", + garbageValue = "1777636596" ) - public static void method3432(Buffer var0, int var1) { - if (JagexCache.JagexCache_randomDat != null) { - try { - JagexCache.JagexCache_randomDat.seek(0L); - JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); - } catch (Exception var3) { + static final void method3518(byte[] var0, int var1, int var2, Scene var3, CollisionMap[] var4) { + Buffer var5 = new Buffer(var0); + int var6 = -1; + + while (true) { + int var7 = var5.method5589(); + if (var7 == 0) { + return; + } + + var6 += var7; + int var8 = 0; + + while (true) { + int var9 = var5.readUShortSmart(); + if (var9 == 0) { + break; + } + + var8 += var9 - 1; + int var10 = var8 & 63; + int var11 = var8 >> 6 & 63; + int var12 = var8 >> 12; + int var13 = var5.readUnsignedByte(); + int var14 = var13 >> 2; + int var15 = var13 & 3; + int var16 = var11 + var1; + int var17 = var10 + var2; + if (var16 > 0 && var17 > 0 && var16 < 103 && var17 < 103) { + int var18 = var12; + if ((Tiles.Tiles_renderFlags[1][var16][var17] & 2) == 2) { + var18 = var12 - 1; + } + + CollisionMap var19 = null; + if (var18 >= 0) { + var19 = var4[var18]; + } + + ArchiveDiskActionHandler.method4336(var12, var16, var17, var6, var15, var14, var3, var19); + } } } + } + @ObfuscatedName("id") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V", + garbageValue = "-115001383" + ) + @Export("insertMenuItem") + static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) { + if (!Client.isMenuOpen) { + if (Client.menuOptionsCount < 500) { + Client.menuActions[Client.menuOptionsCount] = var0; + Client.menuTargets[Client.menuOptionsCount] = var1; + Client.menuOpcodes[Client.menuOptionsCount] = var2; + Client.menuIdentifiers[Client.menuOptionsCount] = var3; + Client.menuArguments1[Client.menuOptionsCount] = var4; + Client.menuArguments2[Client.menuOptionsCount] = var5; + Client.menuShiftClick[Client.menuOptionsCount] = var6; + ++Client.menuOptionsCount; + } + + } } } diff --git a/runescape-client/src/main/java/class161.java b/runescape-client/src/main/java/class161.java index 35459ea2a9..6256665098 100644 --- a/runescape-client/src/main/java/class161.java +++ b/runescape-client/src/main/java/class161.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("fo") +@ObfuscatedName("fh") public interface class161 { } diff --git a/runescape-client/src/main/java/class162.java b/runescape-client/src/main/java/class162.java index 1166b00d83..01eec8f080 100644 --- a/runescape-client/src/main/java/class162.java +++ b/runescape-client/src/main/java/class162.java @@ -1,29 +1,37 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fq") +@ObfuscatedName("fb") public class class162 implements class161 { - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "[Lbe;" + @ObfuscatedName("sy") + @ObfuscatedGetter( + intValue = -1885571545 ) - @Export("World_worlds") - static World[] World_worlds; - @ObfuscatedName("gl") + @Export("foundItemIdCount") + static int foundItemIdCount; + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "[Lli;" + signature = "Lii;" ) - @Export("mapSceneSprites") - static IndexedSprite[] mapSceneSprites; + @Export("Widget_fontsArchive") + static AbstractArchive Widget_fontsArchive; - @ObfuscatedName("f") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(B)[Lfw;", - garbageValue = "-63" + signature = "(Lii;Ljava/lang/String;Ljava/lang/String;IZI)V", + garbageValue = "-1967656766" ) - @Export("ServerPacket_values") - public static ServerPacket[] ServerPacket_values() { - return new ServerPacket[]{ServerPacket.field2120, ServerPacket.field2087, ServerPacket.field2088, ServerPacket.field2144, ServerPacket.field2090, ServerPacket.field2091, ServerPacket.field2142, ServerPacket.field2140, ServerPacket.field2094, ServerPacket.field2095, ServerPacket.field2096, ServerPacket.field2097, ServerPacket.field2098, ServerPacket.field2163, ServerPacket.field2159, ServerPacket.field2101, ServerPacket.field2149, ServerPacket.field2173, ServerPacket.field2104, ServerPacket.field2105, ServerPacket.field2106, ServerPacket.field2138, ServerPacket.field2108, ServerPacket.field2109, ServerPacket.field2110, ServerPacket.field2162, ServerPacket.field2112, ServerPacket.field2113, ServerPacket.field2114, ServerPacket.field2089, ServerPacket.field2116, ServerPacket.field2100, ServerPacket.field2118, ServerPacket.field2119, ServerPacket.field2093, ServerPacket.field2121, ServerPacket.field2122, ServerPacket.field2129, ServerPacket.field2124, ServerPacket.field2125, ServerPacket.field2126, ServerPacket.field2127, ServerPacket.field2128, ServerPacket.field2164, ServerPacket.field2130, ServerPacket.field2153, ServerPacket.field2132, ServerPacket.field2111, ServerPacket.field2134, ServerPacket.field2135, ServerPacket.field2136, ServerPacket.field2161, ServerPacket.field2131, ServerPacket.field2139, ServerPacket.field2123, ServerPacket.field2141, ServerPacket.field2137, ServerPacket.field2143, ServerPacket.field2102, ServerPacket.field2145, ServerPacket.field2146, ServerPacket.field2147, ServerPacket.field2148, ServerPacket.field2169, ServerPacket.field2170, ServerPacket.field2151, ServerPacket.field2152, ServerPacket.field2133, ServerPacket.field2154, ServerPacket.field2155, ServerPacket.field2156, ServerPacket.field2157, ServerPacket.field2158, ServerPacket.field2150, ServerPacket.field2160, ServerPacket.field2099, ServerPacket.field2086, ServerPacket.field2117, ServerPacket.field2115, ServerPacket.field2165, ServerPacket.field2166, ServerPacket.field2167, ServerPacket.field2168, ServerPacket.field2092, ServerPacket.field2107, ServerPacket.field2171}; + public static void method3523(AbstractArchive var0, String var1, String var2, int var3, boolean var4) { + int var5 = var0.getGroupId(var1); + int var6 = var0.getFileId(var5, var2); + class197.field2414 = 1; + UserComparator5.musicTrackArchive = var0; + class197.musicTrackGroupId = var5; + class83.musicTrackFileId = var6; + AttackOption.musicTrackVolume = var3; + KeyHandler.musicTrackBoolean = var4; + class197.field2412 = 10000; } } diff --git a/runescape-client/src/main/java/class173.java b/runescape-client/src/main/java/class173.java index 0e05d6c9bd..7dcfe2e81b 100644 --- a/runescape-client/src/main/java/class173.java +++ b/runescape-client/src/main/java/class173.java @@ -1,35 +1,27 @@ -import java.io.File; -import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ft") +@ObfuscatedName("fo") public class class173 { - @ObfuscatedName("y") + @ObfuscatedName("o") @Export("directions") public static int[][] directions; - @ObfuscatedName("w") + @ObfuscatedName("e") @Export("distances") public static int[][] distances; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1981163643 + intValue = -1572714133 ) - public static int field2072; - @ObfuscatedName("x") + public static int field2093; + @ObfuscatedName("l") @Export("bufferX") public static int[] bufferX; - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("bufferY") public static int[] bufferY; - @ObfuscatedName("ca") - @ObfuscatedSignature( - signature = "Lbo;" - ) - @Export("mouseRecorder") - static MouseRecorder mouseRecorder; static { directions = new int[128][128]; @@ -38,62 +30,22 @@ public class class173 { bufferY = new int[4096]; } - @ObfuscatedName("f") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lhz;IIIZI)V", - garbageValue = "1828345963" + signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-1943215083" ) - @Export("playMusicTrack") - public static void playMusicTrack(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { - class197.field2392 = 1; - Coord.musicTrackArchive = var0; - class16.musicTrackGroupId = var1; - GrandExchangeOffer.musicTrackFileId = var2; - class197.musicTrackVolume = var3; - WorldMapDecoration.musicTrackBoolean = var4; - ParamDefinition.field3275 = 10000; - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "(Ljava/io/File;ZI)Z", - garbageValue = "969136252" - ) - static boolean method3561(File var0, boolean var1) { - try { - RandomAccessFile var2 = new RandomAccessFile(var0, "rw"); - int var3 = var2.read(); - var2.seek(0L); - var2.write(var3); - var2.seek(0L); - var2.close(); - if (var1) { - var0.delete(); - } - - return true; - } catch (Exception var4) { - return false; + @Export("addChatMessage") + static void addChatMessage(int var0, String var1, String var2, String var3) { + ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); + if (var4 == null) { + var4 = new ChatChannel(); + Messages.Messages_channels.put(var0, var4); } - } - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-974427465" - ) - public static void method3560() { - while (true) { - ArchiveDiskAction var0; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - var0 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); - } - - if (var0 == null) { - return; - } - - var0.archive.load(var0.archiveDisk, (int)var0.key, var0.data, false); - } + Message var5 = var4.addMessage(var0, var1, var2, var3); + Messages.Messages_hashTable.put(var5, (long)var5.count); + Messages.Messages_queue.add(var5); + Client.chatCycle = Client.cycleCntr; } } diff --git a/runescape-client/src/main/java/class175.java b/runescape-client/src/main/java/class175.java deleted file mode 100644 index 5ea58b2f74..0000000000 --- a/runescape-client/src/main/java/class175.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("fb") -public interface class175 { -} diff --git a/runescape-client/src/main/java/class179.java b/runescape-client/src/main/java/class179.java deleted file mode 100644 index de62efd780..0000000000 --- a/runescape-client/src/main/java/class179.java +++ /dev/null @@ -1,136 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("fi") -public class class179 { - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Lfi;" - ) - public static final class179 field2291; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lfi;" - ) - public static final class179 field2290; - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "Lfi;" - ) - public static final class179 field2292; - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lfi;" - ) - public static final class179 field2289; - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lfi;" - ) - public static final class179 field2293; - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Lfi;" - ) - public static final class179 field2294; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lfi;" - ) - public static final class179 field2295; - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lfi;" - ) - public static final class179 field2296; - @ObfuscatedName("a") - @ObfuscatedSignature( - signature = "Lfi;" - ) - public static final class179 field2297; - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "Lfi;" - ) - public static final class179 field2298; - - static { - field2291 = new class179(3); - field2290 = new class179(6); - field2292 = new class179(4); - field2289 = new class179(15); - field2293 = new class179(4); - field2294 = new class179(7); - field2295 = new class179(5); - field2296 = new class179(2); - field2297 = new class179(5); - field2298 = new class179(14); - } - - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "3" - ) - class179(int var1) { - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "-60" - ) - public static int method3580(int var0, int var1) { - int var2; - if (var1 > var0) { - var2 = var0; - var0 = var1; - var1 = var2; - } - - while (var1 != 0) { - var2 = var0 % var1; - var0 = var1; - var1 = var2; - } - - return var0; - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(CI)Z", - garbageValue = "-1453878926" - ) - public static boolean method3581(char var0) { - if (var0 >= ' ' && var0 < 127 || var0 > 127 && var0 < 160 || var0 > 160 && var0 <= 255) { - return true; - } else { - if (var0 != 0) { - char[] var1 = class287.cp1252AsciiExtension; - - for (int var2 = 0; var2 < var1.length; ++var2) { - char var3 = var1[var2]; - if (var0 == var3) { - return true; - } - } - } - - return false; - } - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-340612518" - ) - public static void method3579() { - if (KeyHandler.KeyHandler_instance != null) { - synchronized(KeyHandler.KeyHandler_instance) { - KeyHandler.KeyHandler_instance = null; - } - } - - } -} diff --git a/runescape-client/src/main/java/class180.java b/runescape-client/src/main/java/class180.java deleted file mode 100644 index 332e2c726c..0000000000 --- a/runescape-client/src/main/java/class180.java +++ /dev/null @@ -1,13 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("fj") -public class class180 { - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = 376801611 - ) - @Export("WorldMapElement_count") - public static int WorldMapElement_count; -} diff --git a/runescape-client/src/main/java/class181.java b/runescape-client/src/main/java/class181.java new file mode 100644 index 0000000000..35def35f81 --- /dev/null +++ b/runescape-client/src/main/java/class181.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("fr") +public interface class181 { +} diff --git a/runescape-client/src/main/java/class185.java b/runescape-client/src/main/java/class185.java new file mode 100644 index 0000000000..0a407a04b2 --- /dev/null +++ b/runescape-client/src/main/java/class185.java @@ -0,0 +1,139 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("gy") +public class class185 { + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "Lgy;" + ) + public static final class185 field2327; + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "Lgy;" + ) + public static final class185 field2315; + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "Lgy;" + ) + public static final class185 field2322; + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "Lgy;" + ) + public static final class185 field2317; + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "Lgy;" + ) + public static final class185 field2318; + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "Lgy;" + ) + public static final class185 field2320; + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "Lgy;" + ) + public static final class185 field2319; + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "Lgy;" + ) + public static final class185 field2314; + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "Lgy;" + ) + public static final class185 field2316; + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Lgy;" + ) + public static final class185 field2323; + @ObfuscatedName("js") + @ObfuscatedSignature( + signature = "Lhn;" + ) + @Export("dragInventoryWidget") + static Widget dragInventoryWidget; + + static { + field2327 = new class185(5); + field2315 = new class185(7); + field2322 = new class185(3); + field2317 = new class185(5); + field2318 = new class185(15); + field2320 = new class185(14); + field2319 = new class185(6); + field2314 = new class185(2); + field2316 = new class185(4); + field2323 = new class185(4); + } + + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "5" + ) + class185(int var1) { + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(Llp;IIB)I", + garbageValue = "-67" + ) + static int method3686(IterableNodeHashTable var0, int var1, int var2) { + if (var0 == null) { + return var2; + } else { + IntegerNode var3 = (IntegerNode)var0.get((long)var1); + return var3 == null ? var2 : var3.integer; + } + } + + @ObfuscatedName("ge") + @ObfuscatedSignature( + signature = "(Lbx;I)V", + garbageValue = "-46568974" + ) + static final void method3685(Actor var0) { + int var1 = Math.max(1, var0.field985 - Client.cycle); + int var2 = var0.field981 * 128 + var0.field942 * 2013925376; + int var3 = var0.field957 * 128 + var0.field942 * 2013925376; + var0.x += (var2 - var0.x) / var1; + var0.y += (var3 - var0.y) / var1; + var0.field997 = 0; + var0.orientation = var0.field987; + } + + @ObfuscatedName("jl") + @ObfuscatedSignature( + signature = "(Lbe;ZI)V", + garbageValue = "1102320238" + ) + @Export("closeInterface") + static final void closeInterface(InterfaceParent var0, boolean var1) { + int var2 = var0.group; + int var3 = (int)var0.key; + var0.remove(); + if (var1) { + ObjectSound.method1933(var2); + } + + AbstractWorldMapIcon.method628(var2); + Widget var4 = Varps.getWidget(var3); + if (var4 != null) { + NPCDefinition.invalidateWidget(var4); + } + + GameObject.method3360(); + if (Client.rootInterface != -1) { + class226.runIntfCloseListeners(Client.rootInterface, 1); + } + + } +} diff --git a/runescape-client/src/main/java/class186.java b/runescape-client/src/main/java/class186.java new file mode 100644 index 0000000000..49de8ad3fe --- /dev/null +++ b/runescape-client/src/main/java/class186.java @@ -0,0 +1,11 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ga") +public class class186 { + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "Lhn;" + ) + static Widget field2331; +} diff --git a/runescape-client/src/main/java/class188.java b/runescape-client/src/main/java/class188.java index 560ca6a2bc..6f192e315a 100644 --- a/runescape-client/src/main/java/class188.java +++ b/runescape-client/src/main/java/class188.java @@ -1,40 +1,41 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gq") +@ObfuscatedName("gm") public class class188 { - @ObfuscatedName("x") + @ObfuscatedName("rg") @ObfuscatedGetter( - intValue = 1663251439 + intValue = -1778980480 ) - @Export("Interpreter_intStackSize") - static int Interpreter_intStackSize; - @ObfuscatedName("bq") - @ObfuscatedSignature( - signature = "Lll;" - ) - @Export("loginType") - static LoginType loginType; + static int field2346; + @ObfuscatedName("c") + static int[] field2344; - @ObfuscatedName("i") - static final void method3604(long var0) { - try { - Thread.sleep(var0); - } catch (InterruptedException var3) { + static { + new Object(); + field2344 = new int[33]; + field2344[0] = 0; + int var0 = 2; + + for (int var1 = 1; var1 < 33; ++var1) { + field2344[var1] = var0 - 1; + var0 += var0; } } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(ZZB)I", - garbageValue = "1" + signature = "(I)V", + garbageValue = "568041026" ) - public static int method3601(boolean var0, boolean var1) { - byte var2 = 0; - int var3 = var2 + NetCache.NetCache_pendingPriorityResponsesCount + NetCache.NetCache_pendingPriorityWritesCount; - return var3; + static void method3708() { + for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var0.obj != null) { + var0.set(); + } + } + } } diff --git a/runescape-client/src/main/java/class189.java b/runescape-client/src/main/java/class189.java index 0058c061ec..29416800a8 100644 --- a/runescape-client/src/main/java/class189.java +++ b/runescape-client/src/main/java/class189.java @@ -1,54 +1,19 @@ -import java.awt.Image; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gf") +@ObfuscatedName("gn") public class class189 { - @ObfuscatedName("sb") + @ObfuscatedName("dz") + @ObfuscatedSignature( + signature = "Lia;" + ) + @Export("archive14") + static Archive archive14; + @ObfuscatedName("ei") @ObfuscatedGetter( - intValue = -1002742885 + intValue = -1965568453 ) - @Export("foundItemIndex") - static int foundItemIndex; - @ObfuscatedName("f") - static int[] field2331; - @ObfuscatedName("ao") - static Image field2333; - - static { - new Object(); - field2331 = new int[33]; - field2331[0] = 0; - int var0 = 2; - - for (int var1 = 1; var1 < 33; ++var1) { - field2331[var1] = var0 - 1; - var0 += var0; - } - - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-567890341" - ) - public static void method3623() { - ObjectDefinition.ObjectDefinition_cached.clear(); - ObjectDefinition.ObjectDefinition_cachedModelData.clear(); - ObjectDefinition.ObjectDefinition_cachedEntities.clear(); - ObjectDefinition.ObjectDefinition_cachedModels.clear(); - } - - @ObfuscatedName("la") - @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "-32149" - ) - static void method3620() { - Client.packetWriter.addNode(class2.getPacketBufferNode(ClientPacket.field2226, Client.packetWriter.isaacCipher)); - Client.oculusOrbState = 0; - } + static int field2353; } diff --git a/runescape-client/src/main/java/class191.java b/runescape-client/src/main/java/class191.java index 67959307be..1e090882ac 100644 --- a/runescape-client/src/main/java/class191.java +++ b/runescape-client/src/main/java/class191.java @@ -2,169 +2,121 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gd") +@ObfuscatedName("gx") public class class191 { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lgd;" + signature = "Lgx;" ) - static final class191 field2354; - @ObfuscatedName("i") + static final class191 field2370; + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lgd;" + signature = "Lgx;" ) - static final class191 field2350; - @ObfuscatedName("y") + static final class191 field2368; + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgd;" + signature = "Lgx;" ) - static final class191 field2352; + static final class191 field2373; static { - field2354 = new class191(); - field2350 = new class191(); - field2352 = new class191(); + field2370 = new class191(); + field2368 = new class191(); + field2373 = new class191(); } class191() { } - @ObfuscatedName("f") + @ObfuscatedName("ix") @ObfuscatedSignature( - signature = "(II)Lix;", - garbageValue = "-2115403746" + signature = "(Lba;IIII)V", + garbageValue = "-390194357" ) - @Export("KitDefinition_get") - public static KitDefinition KitDefinition_get(int var0) { - KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); - var1 = new KitDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } + @Export("addPlayerToMenu") + static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { + if (class192.localPlayer != var0) { + if (Client.menuOptionsCount < 400) { + String var4; + int var7; + if (var0.skillLevel == 0) { + String var5 = var0.actions[0] + var0.username + var0.actions[1]; + var7 = var0.combatLevel; + int var8 = class192.localPlayer.combatLevel; + int var9 = var8 - var7; + String var6; + if (var9 < -9) { + var6 = PacketWriter.colorStartTag(16711680); + } else if (var9 < -6) { + var6 = PacketWriter.colorStartTag(16723968); + } else if (var9 < -3) { + var6 = PacketWriter.colorStartTag(16740352); + } else if (var9 < 0) { + var6 = PacketWriter.colorStartTag(16756736); + } else if (var9 > 9) { + var6 = PacketWriter.colorStartTag(65280); + } else if (var9 > 6) { + var6 = PacketWriter.colorStartTag(4259584); + } else if (var9 > 3) { + var6 = PacketWriter.colorStartTag(8453888); + } else if (var9 > 0) { + var6 = PacketWriter.colorStartTag(12648192); + } else { + var6 = PacketWriter.colorStartTag(16776960); + } - KitDefinition.KitDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(Lbj;I)V", - garbageValue = "-1644977095" - ) - static void method3638(GameShell var0) { - while (KeyHandler.isKeyDown()) { - if (VertexNormal.field1732 == 13) { - Login.worldSelectOpen = false; - UrlRequest.leftTitleSprite.drawAt(Login.xPadding, 0); - ScriptFrame.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); - return; - } - - if (VertexNormal.field1732 == 96) { - if (Login.worldSelectPage > 0 && GrandExchangeEvent.worldSelectLeftSprite != null) { - --Login.worldSelectPage; + var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; + } else { + var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; } - } else if (VertexNormal.field1732 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && UserList.worldSelectRightSprite != null) { - ++Login.worldSelectPage; + + int var10; + if (Client.isItemSelected == 1) { + GraphicsObject.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + PacketWriter.colorStartTag(16777215) + var4, 14, var1, var2, var3); + } else if (Client.isSpellSelected) { + if ((NetSocket.selectedSpellFlags & 8) == 8) { + GraphicsObject.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + PacketWriter.colorStartTag(16777215) + var4, 15, var1, var2, var3); + } + } else { + for (var10 = 7; var10 >= 0; --var10) { + if (Client.playerMenuActions[var10] != null) { + short var11 = 0; + if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { + if (Client.playerAttackOption == AttackOption.AttackOption_hidden) { + continue; + } + + if (Client.playerAttackOption == AttackOption.AttackOption_alwaysRightClick || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class192.localPlayer.combatLevel) { + var11 = 2000; + } + + if (class192.localPlayer.team != 0 && var0.team != 0) { + if (var0.team == class192.localPlayer.team) { + var11 = 2000; + } else { + var11 = 0; + } + } + } else if (Client.playerOptionsPriorities[var10]) { + var11 = 2000; + } + + boolean var12 = false; + var7 = Client.playerMenuOpcodes[var10] + var11; + GraphicsObject.insertMenuItemNoShift(Client.playerMenuActions[var10], PacketWriter.colorStartTag(16777215) + var4, var7, var1, var2, var3); + } + } + } + + for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { + if (Client.menuOpcodes[var10] == 23) { + Client.menuTargets[var10] = PacketWriter.colorStartTag(16777215) + var4; + break; + } + } + } } - - if (MouseHandler.MouseHandler_lastButton == 1 || !NetFileRequest.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { - int var1 = Login.xPadding + 280; - if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - PcmPlayer.changeWorldSelectSorting(0, 0); - return; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - PcmPlayer.changeWorldSelectSorting(0, 1); - return; - } - - int var2 = Login.xPadding + 390; - if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - PcmPlayer.changeWorldSelectSorting(1, 0); - return; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - PcmPlayer.changeWorldSelectSorting(1, 1); - return; - } - - int var3 = Login.xPadding + 500; - if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - PcmPlayer.changeWorldSelectSorting(2, 0); - return; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - PcmPlayer.changeWorldSelectSorting(2, 1); - return; - } - - int var4 = Login.xPadding + 610; - if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - PcmPlayer.changeWorldSelectSorting(3, 0); - return; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - PcmPlayer.changeWorldSelectSorting(3, 1); - return; - } - - if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { - Login.worldSelectOpen = false; - UrlRequest.leftTitleSprite.drawAt(Login.xPadding, 0); - ScriptFrame.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); - return; - } - - if (Login.hoveredWorldIndex != -1) { - World var5 = class162.World_worlds[Login.hoveredWorldIndex]; - KeyHandler.changeWorld(var5); - Login.worldSelectOpen = false; - UrlRequest.leftTitleSprite.drawAt(Login.xPadding, 0); - ScriptFrame.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); - return; - } - - if (Login.worldSelectPage > 0 && GrandExchangeEvent.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= GrandExchangeEvent.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= AttackOption.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= AttackOption.canvasHeight / 2 + 50) { - --Login.worldSelectPage; - } - - if (Login.worldSelectPage < Login.worldSelectPagesCount && UserList.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= GrandExchangeOfferTotalQuantityComparator.canvasWidth - UserList.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= GrandExchangeOfferTotalQuantityComparator.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= AttackOption.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= AttackOption.canvasHeight / 2 + 50) { - ++Login.worldSelectPage; - } - } - - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "(CI)Z", - garbageValue = "-1025442048" - ) - @Export("isAlphaNumeric") - public static boolean isAlphaNumeric(char var0) { - return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "-13" - ) - static final void method3640(String var0) { - Tiles.method1143("Please remove " + var0 + " from your friend list first"); } } diff --git a/runescape-client/src/main/java/class192.java b/runescape-client/src/main/java/class192.java index cac5b6a9dd..8e098970e0 100644 --- a/runescape-client/src/main/java/class192.java +++ b/runescape-client/src/main/java/class192.java @@ -5,640 +5,186 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gb") +@ObfuscatedName("gp") public enum class192 implements Enumerated { - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Lgb;" - ) - field2369("", 0, new class191[]{class191.field2352}), - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lgb;" - ) - field2358("", 1, new class191[]{class191.field2350, class191.field2352}), - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "Lgb;" - ) - field2359("", 2, new class191[]{class191.field2350, class191.field2354, class191.field2352}), - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lgb;" - ) - field2360("", 3, new class191[]{class191.field2350}), - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lgb;" - ) - field2368("", 4), - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Lgb;" - ) - field2362("", 5, new class191[]{class191.field2350, class191.field2352}), - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lgb;" - ) - field2363("", 6, new class191[]{class191.field2352}), - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lgb;" - ) - field2373("", 8, new class191[]{class191.field2350, class191.field2352}), - @ObfuscatedName("a") - @ObfuscatedSignature( - signature = "Lgb;" - ) - field2365("", 9, new class191[]{class191.field2350, class191.field2354}), - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "Lgb;" - ) - field2370("", 10, new class191[]{class191.field2350}), @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgp;" ) - field2367("", 11, new class191[]{class191.field2350}), + field2380("", 0, new class191[]{class191.field2373}), + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "Lgp;" + ) + field2375("", 1, new class191[]{class191.field2368, class191.field2373}), @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgp;" ) - field2361("", 12, new class191[]{class191.field2350, class191.field2352}), + field2376("", 2, new class191[]{class191.field2368, class191.field2370, class191.field2373}), + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "Lgp;" + ) + field2382("", 3, new class191[]{class191.field2368}), + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "Lgp;" + ) + field2378("", 4), + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "Lgp;" + ) + field2379("", 5, new class191[]{class191.field2368, class191.field2373}), + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "Lgp;" + ) + field2377("", 6, new class191[]{class191.field2373}), + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "Lgp;" + ) + field2390("", 8, new class191[]{class191.field2368, class191.field2373}), + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "Lgp;" + ) + field2384("", 9, new class191[]{class191.field2368, class191.field2370}), + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Lgp;" + ) + field2383("", 10, new class191[]{class191.field2368}), + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "Lgp;" + ) + field2395("", 11, new class191[]{class191.field2368}), + @ObfuscatedName("h") + @ObfuscatedSignature( + signature = "Lgp;" + ) + field2385("", 12, new class191[]{class191.field2368, class191.field2373}), @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgp;" ) - field2364("", 13, new class191[]{class191.field2350}); + field2374("", 13, new class191[]{class191.field2368}); - @ObfuscatedName("ji") + @ObfuscatedName("bi") @ObfuscatedSignature( - signature = "Lha;" + signature = "Lmv;" ) - static Widget field2372; - @ObfuscatedName("k") + @Export("loginType") + static LoginType loginType; + @ObfuscatedName("gc") + @ObfuscatedSignature( + signature = "[Lli;" + ) + @Export("scrollBarSprites") + static IndexedSprite[] scrollBarSprites; + @ObfuscatedName("jy") + @ObfuscatedSignature( + signature = "Lba;" + ) + @Export("localPlayer") + static Player localPlayer; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1652165793 + intValue = 1568676187 ) @Export("id") final int id; - @ObfuscatedName("s") - final Set field2371; + @ObfuscatedName("x") + final Set field2388; static { - method3643(); + method3732(); } @ObfuscatedSignature( - signature = "(Ljava/lang/String;I[Lgd;)V" + signature = "(Ljava/lang/String;I[Lgx;)V" ) class192(String var3, int var4, class191[] var5) { - this.field2371 = new HashSet(); + this.field2388 = new HashSet(); this.id = var4; class191[] var6 = var5; for (int var7 = 0; var7 < var6.length; ++var7) { class191 var8 = var6[var7]; - this.field2371.add(var8); + this.field2388.add(var8); } } class192(String var3, int var4) { - this.field2371 = new HashSet(); + this.field2388 = new HashSet(); this.id = var4; } - @ObfuscatedName("i") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "-57" + garbageValue = "1" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)[Lgb;", - garbageValue = "474493993" + signature = "(B)[Lgp;", + garbageValue = "39" ) - static class192[] method3643() { - return new class192[]{field2369, field2365, field2360, field2359, field2364, field2363, field2370, field2358, field2361, field2373, field2368, field2367, field2362}; + static class192[] method3732() { + return new class192[]{field2376, field2390, field2378, field2395, field2382, field2383, field2377, field2375, field2385, field2380, field2379, field2384, field2374}; } - @ObfuscatedName("f") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1164904579" + signature = "(Lhn;II)V", + garbageValue = "558596528" ) - public static int method3654() { - return ViewportMouse.ViewportMouse_entityCount; - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "([Lbe;II[I[II)V", - garbageValue = "2064654352" - ) - @Export("sortWorlds") - static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) { - if (var1 < var2) { - int var5 = var1 - 1; - int var6 = var2 + 1; - int var7 = (var2 + var1) / 2; - World var8 = var0[var7]; - var0[var7] = var0[var1]; - var0[var1] = var8; - - while (var5 < var6) { - boolean var9 = true; - - int var10; - int var11; - int var12; - do { - --var6; - - for (var10 = 0; var10 < 4; ++var10) { - if (var3[var10] == 2) { - var11 = var0[var6].index; - var12 = var8.index; - } else if (var3[var10] == 1) { - var11 = var0[var6].population; - var12 = var8.population; - if (var11 == -1 && var4[var10] == 1) { - var11 = 2001; - } - - if (var12 == -1 && var4[var10] == 1) { - var12 = 2001; - } - } else if (var3[var10] == 3) { - var11 = var0[var6].isMembersOnly() ? 1 : 0; - var12 = var8.isMembersOnly() ? 1 : 0; - } else { - var11 = var0[var6].id; - var12 = var8.id; - } - - if (var12 != var11) { - if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { - var9 = false; - } - break; - } - - if (var10 == 3) { - var9 = false; - } - } - } while(var9); - - var9 = true; - - do { - ++var5; - - for (var10 = 0; var10 < 4; ++var10) { - if (var3[var10] == 2) { - var11 = var0[var5].index; - var12 = var8.index; - } else if (var3[var10] == 1) { - var11 = var0[var5].population; - var12 = var8.population; - if (var11 == -1 && var4[var10] == 1) { - var11 = 2001; - } - - if (var12 == -1 && var4[var10] == 1) { - var12 = 2001; - } - } else if (var3[var10] == 3) { - var11 = var0[var5].isMembersOnly() ? 1 : 0; - var12 = var8.isMembersOnly() ? 1 : 0; - } else { - var11 = var0[var5].id; - var12 = var8.id; - } - - if (var12 != var11) { - if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { - var9 = false; - } - break; - } - - if (var10 == 3) { - var9 = false; - } - } - } while(var9); - - if (var5 < var6) { - World var13 = var0[var5]; - var0[var5] = var0[var6]; - var0[var6] = var13; - } - } - - sortWorlds(var0, var1, var6, var3, var4); - sortWorlds(var0, var6 + 1, var2, var3, var4); - } - - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-2145211344" - ) - public static void method3655() { - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { - if (ArchiveDiskActionHandler.field3120 != 0) { - ArchiveDiskActionHandler.field3120 = 1; - - try { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); - } catch (InterruptedException var3) { - } - } - - } - } - - @ObfuscatedName("gm") - @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "551859372" - ) - @Export("drawEntities") - static final void drawEntities(int var0, int var1, int var2, int var3) { - ++Client.viewportDrawCount; - if (Message.localPlayer.x >> 7 == Client.destinationX && Message.localPlayer.y >> 7 == Client.destinationY) { - Client.destinationX = 0; - } - - WorldMapAreaData.method686(); - if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { - class14.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); - } - - Archive.addNpcsToScene(true); - WorldMapIcon_1.method296(); - Archive.addNpcsToScene(false); - - int var6; - for (Projectile var4 = (Projectile)Client.projectiles.last(); var4 != null; var4 = (Projectile)Client.projectiles.previous()) { - if (var4.plane == UrlRequest.Client_plane && Client.cycle <= var4.cycleEnd) { - if (Client.cycle >= var4.cycleStart) { - if (var4.targetIndex > 0) { - NPC var31 = Client.npcs[var4.targetIndex - 1]; - if (var31 != null && var31.x >= 0 && var31.x < 13312 && var31.y >= 0 && var31.y < 13312) { - var4.setDestination(var31.x, var31.y, ScriptEvent.getTileHeight(var31.x, var31.y, var4.plane) - var4.endHeight, Client.cycle); - } - } - - if (var4.targetIndex < 0) { - var6 = -var4.targetIndex - 1; - Player var35; - if (var6 == Client.localPlayerIndex) { - var35 = Message.localPlayer; - } else { - var35 = Client.players[var6]; - } - - if (var35 != null && var35.x >= 0 && var35.x < 13312 && var35.y >= 0 && var35.y < 13312) { - var4.setDestination(var35.x, var35.y, ScriptEvent.getTileHeight(var35.x, var35.y, var4.plane) - var4.endHeight, Client.cycle); - } - } - - var4.advance(Client.field690); - class14.scene.drawEntity(UrlRequest.Client_plane, (int)var4.x, (int)var4.y, (int)var4.z, 60, var4, var4.yaw, -1L, false); - } - } else { - var4.remove(); - } - } - - UserComparator10.method3337(); - Frames.setViewportShape(var0, var1, var2, var3, true); - var0 = Client.viewportOffsetX; - var1 = Client.viewportOffsetY; - var2 = Client.viewportWidth; - var3 = Client.viewportHeight; - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - int var5; - int var7; - int var8; - int var9; - int var10; - int var11; - int var12; - int var13; - int var14; - int var15; - int var16; - int var18; - int var28; - if (!Client.isCameraLocked) { - var28 = Client.camAngleX; - if (Client.field714 / 256 > var28) { - var28 = Client.field714 / 256; - } - - if (Client.field779[4] && Client.field876[4] + 128 > var28) { - var28 = Client.field876[4] + 128; - } - - var5 = Client.camAngleY & 2047; - var6 = WorldMapSectionType.oculusOrbFocalPointX; - var7 = WorldMapManager.field314; - var8 = Language.oculusOrbFocalPointY; - var9 = var28 * 3 + 600; - var10 = WorldMapManager.method635(var9, var3); - var11 = 2048 - var28 & 2047; - var12 = 2048 - var5 & 2047; - var13 = 0; - var14 = 0; - var15 = var10; - int var17; - if (var11 != 0) { - var16 = Rasterizer3D.Rasterizer3D_sine[var11]; - var17 = Rasterizer3D.Rasterizer3D_cosine[var11]; - var18 = var17 * var14 - var16 * var10 >> 16; - var15 = var10 * var17 + var16 * var14 >> 16; - var14 = var18; - } - - if (var12 != 0) { - var16 = Rasterizer3D.Rasterizer3D_sine[var12]; - var17 = Rasterizer3D.Rasterizer3D_cosine[var12]; - var18 = var13 * var17 + var15 * var16 >> 16; - var15 = var15 * var17 - var16 * var13 >> 16; - var13 = var18; - } - - MusicPatchNode2.cameraX = var6 - var13; - class60.cameraY = var7 - var14; - UserComparator9.cameraZ = var8 - var15; - ViewportMouse.cameraPitch = var28; - WorldMapLabelSize.cameraYaw = var5; - if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (WorldMapSectionType.oculusOrbFocalPointX >> 7 != Message.localPlayer.x >> 7 || Language.oculusOrbFocalPointY >> 7 != Message.localPlayer.y >> 7)) { - var16 = Message.localPlayer.plane; - var17 = MusicPatchPcmStream.baseX * 64 + (WorldMapSectionType.oculusOrbFocalPointX >> 7); - var18 = ScriptEvent.baseY * 64 + (Language.oculusOrbFocalPointY >> 7); - PacketBufferNode var19 = class2.getPacketBufferNode(ClientPacket.field2251, Client.packetWriter.isaacCipher); - var19.packetBuffer.writeIntME(var17); - var19.packetBuffer.writeShortLE(Client.field710); - var19.packetBuffer.writeIntME(var18); - var19.packetBuffer.method5569(var16); - Client.packetWriter.addNode(var19); - } - } - - if (!Client.isCameraLocked) { - var28 = WorldMapRectangle.method275(); + @Export("Widget_setKeyIgnoreHeld") + static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { + if (var0.field2702 == null) { + throw new RuntimeException(); } else { - var28 = WorldMapIcon_0.method202(); - } - - var5 = MusicPatchNode2.cameraX; - var6 = class60.cameraY; - var7 = UserComparator9.cameraZ; - var8 = ViewportMouse.cameraPitch; - var9 = WorldMapLabelSize.cameraYaw; - - for (var10 = 0; var10 < 5; ++var10) { - if (Client.field779[var10]) { - var11 = (int)(Math.random() * (double)(Client.field875[var10] * 2 + 1) - (double)Client.field875[var10] + Math.sin((double)Client.field877[var10] / 100.0D * (double)Client.field878[var10]) * (double)Client.field876[var10]); - if (var10 == 0) { - MusicPatchNode2.cameraX += var11; - } - - if (var10 == 1) { - class60.cameraY += var11; - } - - if (var10 == 2) { - UserComparator9.cameraZ += var11; - } - - if (var10 == 3) { - WorldMapLabelSize.cameraYaw = var11 + WorldMapLabelSize.cameraYaw & 2047; - } - - if (var10 == 4) { - ViewportMouse.cameraPitch += var11; - if (ViewportMouse.cameraPitch < 128) { - ViewportMouse.cameraPitch = 128; - } - - if (ViewportMouse.cameraPitch > 383) { - ViewportMouse.cameraPitch = 383; - } - } - } - } - - var10 = MouseHandler.MouseHandler_x; - var11 = MouseHandler.MouseHandler_y; - if (MouseHandler.MouseHandler_lastButton != 0) { - var10 = MouseHandler.MouseHandler_lastPressedX; - var11 = MouseHandler.MouseHandler_lastPressedY; - } - - if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) { - var12 = var10 - var0; - var13 = var11 - var1; - ViewportMouse.ViewportMouse_x = var12; - ViewportMouse.ViewportMouse_y = var13; - ViewportMouse.ViewportMouse_isInViewport = true; - ViewportMouse.ViewportMouse_entityCount = 0; - ViewportMouse.ViewportMouse_false0 = false; - } else { - class226.method4099(); - } - - WorldMapLabel.playPcmPlayers(); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); - WorldMapLabel.playPcmPlayers(); - var12 = Rasterizer3D.Rasterizer3D_zoom; - Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; - class14.scene.draw(MusicPatchNode2.cameraX, class60.cameraY, UserComparator9.cameraZ, ViewportMouse.cameraPitch, WorldMapLabelSize.cameraYaw, var28); - Rasterizer3D.Rasterizer3D_zoom = var12; - WorldMapLabel.playPcmPlayers(); - class14.scene.clearTempGameObjects(); - Client.overheadTextCount = 0; - boolean var33 = false; - var14 = -1; - var15 = -1; - var16 = Players.Players_count; - int[] var29 = Players.Players_indices; - - for (var18 = 0; var18 < var16 + Client.npcCount; ++var18) { - Object var34; - if (var18 < var16) { - var34 = Client.players[var29[var18]]; - if (var29[var18] == Client.combatTargetPlayerIndex) { - var33 = true; - var14 = var18; - continue; - } - - if (var34 == Message.localPlayer) { - var15 = var18; - continue; - } - } else { - var34 = Client.npcs[Client.npcIndices[var18 - var16]]; + if (var0.field2711 == null) { + var0.field2711 = new int[var0.field2702.length]; } - UserComparator5.drawActor2d((Actor)var34, var18, var0, var1, var2, var3); + var0.field2711[var1] = Integer.MAX_VALUE; + } + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "(IIII)I", + garbageValue = "-1858643445" + ) + @Export("hslToRgb") + static final int hslToRgb(int var0, int var1, int var2) { + if (var2 > 179) { + var1 /= 2; } - if (Client.renderSelf && var15 != -1) { - UserComparator5.drawActor2d(Message.localPlayer, var15, var0, var1, var2, var3); + if (var2 > 192) { + var1 /= 2; } - if (var33) { - UserComparator5.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var14, var0, var1, var2, var3); + if (var2 > 217) { + var1 /= 2; } - for (var18 = 0; var18 < Client.overheadTextCount; ++var18) { - int var30 = Client.overheadTextXs[var18]; - int var20 = Client.overheadTextYs[var18]; - int var21 = Client.overheadTextXOffsets[var18]; - int var22 = Client.overheadTextAscents[var18]; - boolean var23 = true; - - while (var23) { - var23 = false; - - for (int var24 = 0; var24 < var18; ++var24) { - if (var20 + 2 > Client.overheadTextYs[var24] - Client.overheadTextAscents[var24] && var20 - var22 < Client.overheadTextYs[var24] + 2 && var30 - var21 < Client.overheadTextXOffsets[var24] + Client.overheadTextXs[var24] && var30 + var21 > Client.overheadTextXs[var24] - Client.overheadTextXOffsets[var24] && Client.overheadTextYs[var24] - Client.overheadTextAscents[var24] < var20) { - var20 = Client.overheadTextYs[var24] - Client.overheadTextAscents[var24]; - var23 = true; - } - } - } - - Client.viewportTempX = Client.overheadTextXs[var18]; - Client.viewportTempY = Client.overheadTextYs[var18] = var20; - String var32 = Client.overheadText[var18]; - if (Client.chatEffects == 0) { - int var25 = 16776960; - if (Client.overheadTextColors[var18] < 6) { - var25 = Client.field864[Client.overheadTextColors[var18]]; - } - - if (Client.overheadTextColors[var18] == 6) { - var25 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; - } - - if (Client.overheadTextColors[var18] == 7) { - var25 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; - } - - if (Client.overheadTextColors[var18] == 8) { - var25 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016; - } - - int var26; - if (Client.overheadTextColors[var18] == 9) { - var26 = 150 - Client.overheadTextCyclesRemaining[var18]; - if (var26 < 50) { - var25 = var26 * 1280 + 16711680; - } else if (var26 < 100) { - var25 = 16776960 - (var26 - 50) * 327680; - } else if (var26 < 150) { - var25 = (var26 - 100) * 5 + 65280; - } - } - - if (Client.overheadTextColors[var18] == 10) { - var26 = 150 - Client.overheadTextCyclesRemaining[var18]; - if (var26 < 50) { - var25 = var26 * 5 + 16711680; - } else if (var26 < 100) { - var25 = 16711935 - (var26 - 50) * 327680; - } else if (var26 < 150) { - var25 = (var26 - 100) * 327680 + 255 - (var26 - 100) * 5; - } - } - - if (Client.overheadTextColors[var18] == 11) { - var26 = 150 - Client.overheadTextCyclesRemaining[var18]; - if (var26 < 50) { - var25 = 16777215 - var26 * 327685; - } else if (var26 < 100) { - var25 = (var26 - 50) * 327685 + 65280; - } else if (var26 < 150) { - var25 = 16777215 - (var26 - 100) * 327680; - } - } - - if (Client.overheadTextEffects[var18] == 0) { - GrandExchangeOffer.fontBold12.drawCentered(var32, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0); - } - - if (Client.overheadTextEffects[var18] == 1) { - GrandExchangeOffer.fontBold12.drawCenteredWave(var32, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var18] == 2) { - GrandExchangeOffer.fontBold12.drawCenteredWave2(var32, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var18] == 3) { - GrandExchangeOffer.fontBold12.drawCenteredShake(var32, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var18]); - } - - if (Client.overheadTextEffects[var18] == 4) { - var26 = (150 - Client.overheadTextCyclesRemaining[var18]) * (GrandExchangeOffer.fontBold12.stringWidth(var32) + 100) / 150; - Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); - GrandExchangeOffer.fontBold12.draw(var32, var0 + Client.viewportTempX + 50 - var26, Client.viewportTempY + var1, var25, 0); - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); - } - - if (Client.overheadTextEffects[var18] == 5) { - var26 = 150 - Client.overheadTextCyclesRemaining[var18]; - int var27 = 0; - if (var26 < 25) { - var27 = var26 - 25; - } else if (var26 > 125) { - var27 = var26 - 125; - } - - Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - GrandExchangeOffer.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); - GrandExchangeOffer.fontBold12.drawCentered(var32, var0 + Client.viewportTempX, var27 + Client.viewportTempY + var1, var25, 0); - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); - } - } else { - GrandExchangeOffer.fontBold12.drawCentered(var32, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); - } - } - - WorldMapSprite.method408(var0, var1); - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field690); - LoginPacket.method3574(); - MusicPatchNode2.cameraX = var5; - class60.cameraY = var6; - UserComparator9.cameraZ = var7; - ViewportMouse.cameraPitch = var8; - WorldMapLabelSize.cameraYaw = var9; - if (Client.isLoading && class188.method3601(true, false) == 0) { - Client.isLoading = false; - } - - if (Client.isLoading) { - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); - class1.drawLoadingMessage("Loading - please wait.", false); + if (var2 > 243) { + var1 /= 2; } + int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; + return var3; } } diff --git a/runescape-client/src/main/java/class195.java b/runescape-client/src/main/java/class195.java index 159998e2f6..f2dd873587 100644 --- a/runescape-client/src/main/java/class195.java +++ b/runescape-client/src/main/java/class195.java @@ -1,238 +1,9 @@ import java.util.HashMap; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ge") +@ObfuscatedName("gt") public class class195 { static { new HashMap(); } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lgs;I)I", - garbageValue = "265459979" - ) - @Export("compareStrings") - public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) { - int var3 = var0.length(); - int var4 = var1.length(); - int var5 = 0; - int var6 = 0; - byte var7 = 0; - byte var8 = 0; - - while (var5 - var7 < var3 || var6 - var8 < var4) { - if (var5 - var7 >= var3) { - return -1; - } - - if (var6 - var8 >= var4) { - return 1; - } - - char var9; - if (var7 != 0) { - var9 = (char)var7; - boolean var14 = false; - } else { - var9 = var0.charAt(var5++); - } - - char var10; - if (var8 != 0) { - var10 = (char)var8; - boolean var15 = false; - } else { - var10 = var1.charAt(var6++); - } - - byte var11; - if (var9 == 198) { - var11 = 69; - } else if (var9 == 230) { - var11 = 101; - } else if (var9 == 223) { - var11 = 115; - } else if (var9 == 338) { - var11 = 69; - } else if (var9 == 339) { - var11 = 101; - } else { - var11 = 0; - } - - var7 = var11; - byte var12; - if (var10 == 198) { - var12 = 69; - } else if (var10 == 230) { - var12 = 101; - } else if (var10 == 223) { - var12 = 115; - } else if (var10 == 338) { - var12 = 69; - } else if (var10 == 339) { - var12 = 101; - } else { - var12 = 0; - } - - var8 = var12; - var9 = Interpreter.standardizeChar(var9, var2); - var10 = Interpreter.standardizeChar(var10, var2); - if (var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { - var9 = Character.toLowerCase(var9); - var10 = Character.toLowerCase(var10); - if (var10 != var9) { - return FloorOverlayDefinition.lowercaseChar(var9, var2) - FloorOverlayDefinition.lowercaseChar(var10, var2); - } - } - } - - int var16 = Math.min(var3, var4); - - int var17; - char var20; - for (var17 = 0; var17 < var16; ++var17) { - if (var2 == Language.Language_FR) { - var5 = var3 - 1 - var17; - var6 = var4 - 1 - var17; - } else { - var6 = var17; - var5 = var17; - } - - char var18 = var0.charAt(var5); - var20 = var1.charAt(var6); - if (var20 != var18 && Character.toUpperCase(var18) != Character.toUpperCase(var20)) { - var18 = Character.toLowerCase(var18); - var20 = Character.toLowerCase(var20); - if (var20 != var18) { - return FloorOverlayDefinition.lowercaseChar(var18, var2) - FloorOverlayDefinition.lowercaseChar(var20, var2); - } - } - } - - var17 = var3 - var4; - if (var17 != 0) { - return var17; - } else { - for (int var19 = 0; var19 < var16; ++var19) { - var20 = var0.charAt(var19); - char var13 = var1.charAt(var19); - if (var13 != var20) { - return FloorOverlayDefinition.lowercaseChar(var20, var2) - FloorOverlayDefinition.lowercaseChar(var13, var2); - } - } - - return 0; - } - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(Lhz;Ljava/lang/String;Ljava/lang/String;I)[Lli;", - garbageValue = "900834692" - ) - public static IndexedSprite[] method3667(AbstractArchive var0, String var1, String var2) { - int var3 = var0.getGroupId(var1); - int var4 = var0.getFileId(var3, var2); - IndexedSprite[] var5; - if (!HitSplatDefinition.method4586(var0, var3, var4)) { - var5 = null; - } else { - IndexedSprite[] var7 = new IndexedSprite[class325.SpriteBuffer_spriteCount]; - - for (int var8 = 0; var8 < class325.SpriteBuffer_spriteCount; ++var8) { - IndexedSprite var9 = var7[var8] = new IndexedSprite(); - var9.width = class325.SpriteBuffer_spriteWidth; - var9.height = class325.SpriteBuffer_spriteHeight; - var9.xOffset = class325.SpriteBuffer_xOffsets[var8]; - var9.yOffset = class325.SpriteBuffer_yOffsets[var8]; - var9.subWidth = UserComparator1.SpriteBuffer_spriteWidths[var8]; - var9.subHeight = class325.SpriteBuffer_spriteHeights[var8]; - var9.palette = class268.SpriteBuffer_spritePalette; - var9.pixels = class290.SpriteBuffer_pixels[var8]; - } - - Message.method1223(); - var5 = var7; - } - - return var5; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(Lkq;IB)Ljava/lang/String;", - garbageValue = "125" - ) - static String method3664(Buffer var0, int var1) { - try { - int var2 = var0.readUShortSmart(); - if (var2 > var1) { - var2 = var1; - } - - byte[] var3 = new byte[var2]; - var0.offset += class206.huffman.decompress(var0.array, var0.offset, var3, 0, var2); - String var4 = class225.decodeStringCp1252(var3, 0, var2); - return var4; - } catch (Exception var6) { - return "Cabbage"; - } - } - - @ObfuscatedName("fd") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1463713032" - ) - @Export("updateGameState") - static void updateGameState(int var0) { - if (var0 != Client.gameState) { - if (Client.gameState == 0) { - class206.client.method947(); - } - - if (var0 == 20 || var0 == 40 || var0 == 45) { - Client.loginState = 0; - Client.field663 = 0; - Client.field740 = 0; - Client.timer.method5017(var0); - if (var0 != 20) { - AbstractWorldMapIcon.method612(false); - } - } - - if (var0 != 20 && var0 != 40 && VertexNormal.field1730 != null) { - VertexNormal.field1730.close(); - VertexNormal.field1730 = null; - } - - if (Client.gameState == 25) { - Client.field734 = 0; - Client.field824 = 0; - Client.field859 = 1; - Client.field683 = 0; - Client.field684 = 1; - } - - if (var0 != 5 && var0 != 10) { - if (var0 == 20) { - DevicePcmPlayerProvider.method841(ServerBuild.archive10, class3.archive8, true, Client.gameState == 11 ? 4 : 0); - } else if (var0 == 11) { - DevicePcmPlayerProvider.method841(ServerBuild.archive10, class3.archive8, false, 4); - } else { - Frames.method3280(); - } - } else { - DevicePcmPlayerProvider.method841(ServerBuild.archive10, class3.archive8, true, 0); - } - - Client.gameState = var0; - } - } } diff --git a/runescape-client/src/main/java/class197.java b/runescape-client/src/main/java/class197.java index 8eb8a58b18..7528328297 100644 --- a/runescape-client/src/main/java/class197.java +++ b/runescape-client/src/main/java/class197.java @@ -3,83 +3,129 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gv") +@ObfuscatedName("gj") public class class197 { - @ObfuscatedName("f") + @ObfuscatedName("og") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lcu;" + ) + @Export("varcs") + static Varcs varcs; + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "Lii;" ) @Export("musicPatchesArchive") - public static AbstractArchive musicPatchesArchive; - @ObfuscatedName("i") + static AbstractArchive musicPatchesArchive; + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lii;" ) @Export("musicSamplesArchive") - public static AbstractArchive musicSamplesArchive; - @ObfuscatedName("y") + static AbstractArchive musicSamplesArchive; + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lgw;" ) - @Export("soundEffectsArchive") - public static AbstractArchive soundEffectsArchive; - @ObfuscatedName("p") + @Export("midiPcmStream") + public static MidiPcmStream midiPcmStream; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -680038187 + intValue = 1658116117 ) - public static int field2392; - @ObfuscatedName("a") + public static int field2414; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1263500685 + intValue = -1762609869 ) - @Export("musicTrackVolume") - static int musicTrackVolume; - @ObfuscatedName("o") + @Export("musicTrackGroupId") + public static int musicTrackGroupId; + @ObfuscatedName("l") + @Export("Widget_loadedInterfaces") + static boolean[] Widget_loadedInterfaces; + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lgh;" + signature = "Lii;" ) - @Export("musicTrack") - public static MusicTrack musicTrack; + @Export("Widget_archive") + static AbstractArchive Widget_archive; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -623019541 + ) + public static int field2412; @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lha;" + signature = "Ldv;" ) - static Widget field2398; - @ObfuscatedName("an") - @ObfuscatedSignature( - signature = "Llh;" - ) - static Bounds field2397; - @ObfuscatedName("en") - @ObfuscatedGetter( - intValue = -54870407 - ) - @Export("port1") - static int port1; + @Export("soundCache") + public static SoundCache soundCache; static { - field2392 = 0; + field2414 = 0; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(II)Lip;", - garbageValue = "760670759" + signature = "(IIII)Lce;", + garbageValue = "473257926" ) - @Export("getInvDefinition") - public static InvDefinition getInvDefinition(int var0) { - InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + @Export("getWorldMapScript") + static Script getWorldMapScript(int var0, int var1, int var2) { + int var3 = (var1 << 8) + var0; + Script var5 = MilliClock.method3529(var3, var0); + if (var5 != null) { + return var5; } else { - byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); - var1 = new InvDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); + int var4 = class210.method4029(var2, var0); + var5 = MilliClock.method3529(var4, var0); + return var5 != null ? var5 : null; + } + } + + @ObfuscatedName("go") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;ZI)V", + garbageValue = "-802729568" + ) + @Export("drawLoadingMessage") + static final void drawLoadingMessage(String var0, boolean var1) { + if (Client.showLoadingMessages) { + byte var2 = 4; + int var3 = var2 + 6; + int var4 = var2 + 6; + int var5 = class13.fontPlain12.lineWidth(var0, 250); + int var6 = class13.fontPlain12.lineCount(var0, 250) * 13; + Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var6 + var2, 0); + Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var2 + var5, var6 + var2 + var2, 16777215); + class13.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); + int var7 = var3 - var2; + int var8 = var4 - var2; + int var9 = var2 + var5 + var2; + int var10 = var6 + var2 + var2; + + int var11; + for (var11 = 0; var11 < Client.rootWidgetCount; ++var11) { + if (Client.rootWidgetXs[var11] + Client.rootWidgetWidths[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var8 + var10) { + Client.field851[var11] = true; + } + } + + if (var1) { + DevicePcmPlayerProvider.rasterProvider.drawFull(0, 0); + } else { + var11 = var3; + int var12 = var4; + int var13 = var5; + int var14 = var6; + + for (int var15 = 0; var15 < Client.rootWidgetCount; ++var15) { + if (Client.rootWidgetXs[var15] + Client.rootWidgetWidths[var15] > var11 && Client.rootWidgetXs[var15] < var11 + var13 && Client.rootWidgetHeights[var15] + Client.rootWidgetYs[var15] > var12 && Client.rootWidgetYs[var15] < var14 + var12) { + Client.field852[var15] = true; + } + } } - InvDefinition.InvDefinition_cached.put(var1, (long)var0); - return var1; } } } diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java index 657a165fc1..2f25c9393b 100644 --- a/runescape-client/src/main/java/class2.java +++ b/runescape-client/src/main/java/class2.java @@ -1,163 +1,414 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("y") +@ObfuscatedName("o") final class class2 implements class0 { - @ObfuscatedName("da") + @ObfuscatedName("ql") @ObfuscatedSignature( - signature = "Lif;" + signature = "Lch;" ) - @Export("archive2") - static Archive archive2; - @ObfuscatedName("fk") - @ObfuscatedGetter( - longValue = -4799784442313615623L - ) - static long field4; + @Export("pcmStreamMixer") + static PcmStreamMixer pcmStreamMixer; - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/lang/Object;Lkq;I)V", - garbageValue = "-685052934" + signature = "(Ljava/lang/Object;Lkp;B)V", + garbageValue = "95" ) - public void vmethod53(Object var1, Buffer var2) { - this.method22((Long)var1, var2); + public void vmethod55(Object var1, Buffer var2) { + this.method21((Long)var1, var2); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lkq;I)Ljava/lang/Object;", - garbageValue = "390816352" + signature = "(Lkp;I)Ljava/lang/Object;", + garbageValue = "1665636232" ) - public Object vmethod60(Buffer var1) { + public Object vmethod53(Buffer var1) { return var1.readLong(); } - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(Ljava/lang/Long;Lkq;I)V", - garbageValue = "-1352577432" - ) - void method22(Long var1, Buffer var2) { - var2.writeLong(var1); - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(Lfh;Llr;I)Lfz;", - garbageValue = "890540527" - ) - @Export("getPacketBufferNode") - public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { - PacketBufferNode var2; - if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { - var2 = new PacketBufferNode(); - } else { - var2 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; - } - - var2.clientPacket = var0; - var2.clientPacketLength = var0.length; - if (var2.clientPacketLength == -1) { - var2.packetBuffer = new PacketBuffer(260); - } else if (var2.clientPacketLength == -2) { - var2.packetBuffer = new PacketBuffer(10000); - } else if (var2.clientPacketLength <= 18) { - var2.packetBuffer = new PacketBuffer(20); - } else if (var2.clientPacketLength <= 98) { - var2.packetBuffer = new PacketBuffer(100); - } else { - var2.packetBuffer = new PacketBuffer(260); - } - - var2.packetBuffer.setIsaacCipher(var1); - var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); - var2.index = 0; - return var2; - } - - @ObfuscatedName("a") - @Export("Entity_unpackID") - public static int Entity_unpackID(long var0) { - return (int)(var0 >>> 17 & 4294967295L); - } - @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(ILcu;ZB)I", - garbageValue = "43" + signature = "(Ljava/lang/Long;Lkp;I)V", + garbageValue = "-301024958" + ) + void method21(Long var1, Buffer var2) { + var2.writeLong(var1); + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(II)Lhq;", + garbageValue = "-1693813120" + ) + public static ServerBuild method31(int var0) { + ServerBuild[] var1 = WorldMapID.method572(); + + for (int var2 = 0; var2 < var1.length; ++var2) { + ServerBuild var3 = var1[var2]; + if (var0 == var3.field3108) { + return var3; + } + } + + return null; + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "(ILce;ZB)I", + garbageValue = "-115" ) static int method34(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? UserComparator7.field1946 : class197.field2398; - if (var0 == ScriptOpcodes.CC_GETX) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.x; + int var4 = -1; + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var4 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + var3 = Varps.getWidget(var4); + } else { + var3 = var2 ? class186.field2331 : MidiPcmStream.field2444; + } + + if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { + class320.Interpreter_intStackSize -= 2; + var3.scrollX = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + if (var3.scrollX > var3.scrollWidth - var3.width) { + var3.scrollX = var3.scrollWidth - var3.width; + } + + if (var3.scrollX < 0) { + var3.scrollX = 0; + } + + var3.scrollY = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + if (var3.scrollY > var3.scrollHeight - var3.height) { + var3.scrollY = var3.scrollHeight - var3.height; + } + + if (var3.scrollY < 0) { + var3.scrollY = 0; + } + + NPCDefinition.invalidateWidget(var3); return 1; - } else if (var0 == ScriptOpcodes.CC_GETY) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.y; + } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { + var3.color = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + NPCDefinition.invalidateWidget(var3); return 1; - } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.width; + } else if (var0 == ScriptOpcodes.CC_SETFILL) { + var3.fill = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + NPCDefinition.invalidateWidget(var3); return 1; - } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.height; + } else if (var0 == ScriptOpcodes.CC_SETTRANS) { + var3.transparencyTop = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + NPCDefinition.invalidateWidget(var3); return 1; - } else if (var0 == ScriptOpcodes.CC_GETHIDE) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; + } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { + var3.lineWid = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + NPCDefinition.invalidateWidget(var3); return 1; - } else if (var0 == ScriptOpcodes.CC_GETLAYER) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.parentId; + } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { + var3.spriteId2 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + NPCDefinition.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { + var3.spriteAngle = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + NPCDefinition.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTILING) { + var3.spriteTiling = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + NPCDefinition.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETMODEL) { + var3.modelType = 1; + var3.modelId = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + NPCDefinition.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { + class320.Interpreter_intStackSize -= 6; + var3.modelOffsetX = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var3.modelOffsetY = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + var3.modelAngleX = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 2]; + var3.modelAngleY = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 3]; + var3.modelAngleZ = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 4]; + var3.modelZoom = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 5]; + NPCDefinition.invalidateWidget(var3); return 1; } else { - return 2; + int var8; + if (var0 == ScriptOpcodes.CC_SETMODELANIM) { + var8 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + if (var8 != var3.sequenceId) { + var3.sequenceId = var8; + var3.modelFrame = 0; + var3.modelFrameCycle = 0; + NPCDefinition.invalidateWidget(var3); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { + var3.modelOrthog = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + NPCDefinition.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTEXT) { + String var7 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + if (!var7.equals(var3.text)) { + var3.text = var7; + NPCDefinition.invalidateWidget(var3); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { + var3.fontId = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + NPCDefinition.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { + class320.Interpreter_intStackSize -= 3; + var3.textXAlignment = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var3.textYAlignment = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + var3.textLineHeight = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 2]; + NPCDefinition.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { + var3.textShadowed = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + NPCDefinition.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { + var3.outline = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + NPCDefinition.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { + var3.spriteShadow = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + NPCDefinition.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { + var3.spriteFlipV = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + NPCDefinition.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { + var3.spriteFlipH = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + NPCDefinition.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { + class320.Interpreter_intStackSize -= 2; + var3.scrollWidth = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var3.scrollHeight = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + NPCDefinition.invalidateWidget(var3); + if (var4 != -1 && var3.type == 0) { + WorldMapIcon_1.revalidateWidgetScroll(WorldMapLabel.Widget_interfaceComponents[var4 >> 16], var3, false); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { + WorldMapAreaData.resumePauseWidget(var3.id, var3.childIndex); + Client.meslayerContinueWidget = var3; + NPCDefinition.invalidateWidget(var3); + return 1; + } else if (var0 == 1122) { + var3.spriteId = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + NPCDefinition.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { + var3.color2 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + NPCDefinition.invalidateWidget(var3); + return 1; + } else if (var0 == 1124) { + var3.transparencyBot = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + NPCDefinition.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETFILLMODE) { + var8 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + FillMode var6 = (FillMode)WorldMapSection0.findEnumerated(ClientPreferences.FillMode_values(), var8); + if (var6 != null) { + var3.fillMode = var6; + NPCDefinition.invalidateWidget(var3); + } + + return 1; + } else { + boolean var5; + if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { + var5 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + var3.field2606 = var5; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { + var5 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1; + var3.modelTransparency = var5; + return 1; + } else { + return 2; + } + } } } - @ObfuscatedName("hj") + @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "32937024" + signature = "([BB)[B", + garbageValue = "-84" ) - static boolean method27() { - return (Client.drawPlayerNames & 2) != 0; + @Export("decompressBytes") + static final byte[] decompressBytes(byte[] var0) { + Buffer var1 = new Buffer(var0); + int var2 = var1.readUnsignedByte(); + int var3 = var1.readInt(); + if (var3 < 0 || AbstractArchive.field3148 != 0 && var3 > AbstractArchive.field3148) { + throw new RuntimeException(); + } else if (var2 == 0) { + byte[] var4 = new byte[var3]; + var1.readBytes(var4, 0, var3); + return var4; + } else { + int var6 = var1.readInt(); + if (var6 >= 0 && (AbstractArchive.field3148 == 0 || var6 <= AbstractArchive.field3148)) { + byte[] var5 = new byte[var6]; + if (var2 == 1) { + BZip2Decompressor.BZip2Decompressor_decompress(var5, var6, var0, var3, 9); + } else { + AbstractArchive.gzipDecompressor.decompress(var1, var5); + } + + return var5; + } else { + throw new RuntimeException(); + } + } } - @ObfuscatedName("jh") + @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "(Lha;III)V", - garbageValue = "65280" + signature = "(B)V", + garbageValue = "26" ) - @Export("alignWidgetPosition") - static void alignWidgetPosition(Widget var0, int var1, int var2) { - if (var0.xAlignment == 0) { - var0.x = var0.rawX; - } else if (var0.xAlignment == 1) { - var0.x = var0.rawX + (var1 - var0.width) / 2; - } else if (var0.xAlignment == 2) { - var0.x = var1 - var0.width - var0.rawX; - } else if (var0.xAlignment == 3) { - var0.x = var0.rawX * var1 >> 14; - } else if (var0.xAlignment == 4) { - var0.x = (var0.rawX * var1 >> 14) + (var1 - var0.width) / 2; - } else { - var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); + protected static final void method24() { + GameShell.clock.mark(); + + int var0; + for (var0 = 0; var0 < 32; ++var0) { + GameShell.graphicsTickTimes[var0] = 0L; } - if (var0.yAlignment == 0) { - var0.y = var0.rawY; - } else if (var0.yAlignment == 1) { - var0.y = (var2 - var0.height) / 2 + var0.rawY; - } else if (var0.yAlignment == 2) { - var0.y = var2 - var0.height - var0.rawY; - } else if (var0.yAlignment == 3) { - var0.y = var2 * var0.rawY >> 14; - } else if (var0.yAlignment == 4) { - var0.y = (var2 - var0.height) / 2 + (var2 * var0.rawY >> 14); - } else { - var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); + for (var0 = 0; var0 < 32; ++var0) { + GameShell.clientTickTimes[var0] = 0L; } + Fonts.gameCyclesToDo = 0; + } + + @ObfuscatedName("fj") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-917024322" + ) + static void method32() { + Client.mouseLastLastPressedTimeMillis = -1L; + class16.mouseRecorder.index = 0; + GrandExchangeOfferTotalQuantityComparator.hasFocus = true; + Client.hadFocus = true; + Client.field702 = -1L; + GrandExchangeOfferAgeComparator.method162(); + Client.packetWriter.clearBuffer(); + Client.packetWriter.packetBuffer.offset = 0; + Client.packetWriter.serverPacket = null; + Client.packetWriter.field1309 = null; + Client.packetWriter.field1305 = null; + Client.packetWriter.field1307 = null; + Client.packetWriter.serverPacketLength = 0; + Client.packetWriter.field1299 = 0; + Client.rebootTimer = 0; + Client.logoutTimer = 0; + Client.hintArrowType = 0; + Client.menuOptionsCount = 0; + Client.isMenuOpen = false; + MouseHandler.MouseHandler_idleCycles = 0; + SoundSystem.method2563(); + Client.isItemSelected = 0; + Client.isSpellSelected = false; + Client.soundEffectCount = 0; + Client.camAngleY = 0; + Client.oculusOrbState = 0; + class218.field2716 = null; + Client.minimapState = 0; + Client.field704 = -1; + Client.destinationX = 0; + Client.destinationY = 0; + Client.playerAttackOption = AttackOption.AttackOption_hidden; + Client.npcAttackOption = AttackOption.AttackOption_hidden; + Client.npcCount = 0; + GrandExchangeOfferOwnWorldComparator.method1308(); + + int var0; + for (var0 = 0; var0 < 2048; ++var0) { + Client.players[var0] = null; + } + + for (var0 = 0; var0 < 32768; ++var0) { + Client.npcs[var0] = null; + } + + Client.combatTargetPlayerIndex = -1; + Client.projectiles.clear(); + Client.graphicsObjects.clear(); + + for (var0 = 0; var0 < 4; ++var0) { + for (int var1 = 0; var1 < 104; ++var1) { + for (int var2 = 0; var2 < 104; ++var2) { + Client.groundItems[var0][var1][var2] = null; + } + } + } + + Client.pendingSpawns = new NodeDeque(); + KeyHandler.friendSystem.clear(); + + for (var0 = 0; var0 < VarpDefinition.VarpDefinition_fileCount; ++var0) { + VarpDefinition var3 = Messages.VarpDefinition_get(var0); + if (var3 != null) { + Varps.Varps_temp[var0] = 0; + Varps.Varps_main[var0] = 0; + } + } + + class197.varcs.clearTransient(); + Client.followerIndex = -1; + if (Client.rootInterface != -1) { + ObjectSound.method1933(Client.rootInterface); + } + + for (InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.first(); var4 != null; var4 = (InterfaceParent)Client.interfaceParents.next()) { + class185.closeInterface(var4, true); + } + + Client.rootInterface = -1; + Client.interfaceParents = new NodeHashTable(8); + Client.meslayerContinueWidget = null; + Client.menuOptionsCount = 0; + Client.isMenuOpen = false; + Client.playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); + + for (var0 = 0; var0 < 8; ++var0) { + Client.playerMenuActions[var0] = null; + Client.playerOptionsPriorities[var0] = false; + } + + WorldMapLabelSize.method198(); + Client.isLoading = true; + + for (var0 = 0; var0 < 100; ++var0) { + Client.field851[var0] = true; + } + + class238.method4415(); + InterfaceParent.clanChat = null; + + for (var0 = 0; var0 < 8; ++var0) { + Client.grandExchangeOffers[var0] = new GrandExchangeOffer(); + } + + PendingSpawn.grandExchangeEvents = null; } } diff --git a/runescape-client/src/main/java/class206.java b/runescape-client/src/main/java/class206.java deleted file mode 100644 index 45248ed77f..0000000000 --- a/runescape-client/src/main/java/class206.java +++ /dev/null @@ -1,188 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; - -@ObfuscatedName("gg") -public class class206 { - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Lgo;" - ) - @Export("huffman") - static Huffman huffman; - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "Lhz;" - ) - @Export("HitSplatDefinition_fontsArchive") - public static AbstractArchive HitSplatDefinition_fontsArchive; - @ObfuscatedName("am") - @Export("client") - @ObfuscatedSignature( - signature = "Lclient;" - ) - static Client client; - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(IIII)I", - garbageValue = "-2034421458" - ) - public static int method3926(int var0, int var1, int var2) { - var2 &= 3; - if (var2 == 0) { - return var1; - } else if (var2 == 1) { - return 7 - var0; - } else { - return var2 == 2 ? 7 - var1 : var0; - } - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - signature = "(ILcu;ZI)I", - garbageValue = "-2142702532" - ) - static int method3919(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.CLIENTCLOCK) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.cycle; - return 1; - } else { - int var3; - int var4; - if (var0 == ScriptOpcodes.INV_GETOBJ) { - class188.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = MilliClock.method3447(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INV_GETNUM) { - class188.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = GrandExchangeEvents.ItemContainer_getCount(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INV_TOTAL) { - class188.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.method118(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INV_SIZE) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = class197.getInvDefinition(var3).size; - return 1; - } else if (var0 == ScriptOpcodes.STAT) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; - return 1; - } else if (var0 == ScriptOpcodes.STAT_BASE) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.levels[var3]; - return 1; - } else if (var0 == ScriptOpcodes.STAT_XP) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.experience[var3]; - return 1; - } else { - int var5; - if (var0 == ScriptOpcodes.COORD) { - var3 = UrlRequest.Client_plane; - var4 = MusicPatchPcmStream.baseX * 64 + (Message.localPlayer.x >> 7); - var5 = ScriptEvent.baseY * 64 + (Message.localPlayer.y >> 7); - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); - return 1; - } else if (var0 == ScriptOpcodes.COORDX) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; - return 1; - } else if (var0 == ScriptOpcodes.COORDZ) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 >> 28; - return 1; - } else if (var0 == ScriptOpcodes.COORDY) { - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 & 16383; - return 1; - } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { - class188.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = MilliClock.method3447(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { - class188.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = GrandExchangeEvents.ItemContainer_getCount(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { - class188.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.method118(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { - if (Client.staffModLevel >= 2) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.staffModLevel; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.REBOOTTIMER) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.rebootTimer; - return 1; - } else if (var0 == ScriptOpcodes.MAP_WORLD) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.worldId; - return 1; - } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.runEnergy; - return 1; - } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.weight; - return 1; - } else if (var0 == ScriptOpcodes.PLAYERMOD) { - if (Client.playerMod) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDFLAGS) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Client.worldProperties; - return 1; - } else if (var0 == ScriptOpcodes.MOVECOORD) { - class188.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2]; - int var6 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 3]; - var3 += var4 << 14; - var3 += var5 << 28; - var3 += var6; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3; - return 1; - } else { - return 2; - } - } - } - } - - @ObfuscatedName("hh") - @ObfuscatedSignature( - signature = "(Lbv;II)V", - garbageValue = "-1115818539" - ) - @Export("getActorScreenLocation") - static final void getActorScreenLocation(Actor var0, int var1) { - KeyHandler.worldToScreen(var0.x, var0.y, var1); - } -} diff --git a/runescape-client/src/main/java/class208.java b/runescape-client/src/main/java/class208.java new file mode 100644 index 0000000000..fd4ef171b3 --- /dev/null +++ b/runescape-client/src/main/java/class208.java @@ -0,0 +1,486 @@ +import java.io.File; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ht") +public class class208 { + @ObfuscatedName("m") + public static short[][] field2514; + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(Ljava/io/File;B)V", + garbageValue = "16" + ) + public static void method4016(File var0) { + FileSystem.FileSystem_cacheDir = var0; + if (!FileSystem.FileSystem_cacheDir.exists()) { + throw new RuntimeException(""); + } else { + FileSystem.FileSystem_hasPermissions = true; + } + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(Lks;II)V", + garbageValue = "-1608605247" + ) + @Export("readPlayerUpdate") + static void readPlayerUpdate(PacketBuffer var0, int var1) { + boolean var2 = var0.readBits(1) == 1; + if (var2) { + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; + } + + int var3 = var0.readBits(2); + Player var4 = Client.players[var1]; + if (var3 == 0) { + if (var2) { + var4.field621 = false; + } else if (Client.localPlayerIndex == var1) { + throw new RuntimeException(); + } else { + Players.Players_regions[var1] = (var4.plane << 28) + (Language.baseY * 64 + var4.pathY[0] >> 13) + (Messages.baseX * 64 + var4.pathX[0] >> 13 << 14); + if (var4.field967 != -1) { + Players.Players_orientations[var1] = var4.field967; + } else { + Players.Players_orientations[var1] = var4.orientation; + } + + Players.Players_targetIndices[var1] = var4.targetIndex; + Client.players[var1] = null; + if (var0.readBits(1) != 0) { + class40.updateExternalPlayer(var0, var1); + } + + } + } else { + int var5; + int var6; + int var7; + if (var3 == 1) { + var5 = var0.readBits(3); + var6 = var4.pathX[0]; + var7 = var4.pathY[0]; + if (var5 == 0) { + --var6; + --var7; + } else if (var5 == 1) { + --var7; + } else if (var5 == 2) { + ++var6; + --var7; + } else if (var5 == 3) { + --var6; + } else if (var5 == 4) { + ++var6; + } else if (var5 == 5) { + --var6; + ++var7; + } else if (var5 == 6) { + ++var7; + } else if (var5 == 7) { + ++var6; + ++var7; + } + + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { + var4.resetPath(var6, var7); + var4.field621 = false; + } else if (var2) { + var4.field621 = true; + var4.tileX = var6; + var4.tileY = var7; + } else { + var4.field621 = false; + var4.method1266(var6, var7, Players.field1237[var1]); + } + + } else if (var3 == 2) { + var5 = var0.readBits(4); + var6 = var4.pathX[0]; + var7 = var4.pathY[0]; + if (var5 == 0) { + var6 -= 2; + var7 -= 2; + } else if (var5 == 1) { + --var6; + var7 -= 2; + } else if (var5 == 2) { + var7 -= 2; + } else if (var5 == 3) { + ++var6; + var7 -= 2; + } else if (var5 == 4) { + var6 += 2; + var7 -= 2; + } else if (var5 == 5) { + var6 -= 2; + --var7; + } else if (var5 == 6) { + var6 += 2; + --var7; + } else if (var5 == 7) { + var6 -= 2; + } else if (var5 == 8) { + var6 += 2; + } else if (var5 == 9) { + var6 -= 2; + ++var7; + } else if (var5 == 10) { + var6 += 2; + ++var7; + } else if (var5 == 11) { + var6 -= 2; + var7 += 2; + } else if (var5 == 12) { + --var6; + var7 += 2; + } else if (var5 == 13) { + var7 += 2; + } else if (var5 == 14) { + ++var6; + var7 += 2; + } else if (var5 == 15) { + var6 += 2; + var7 += 2; + } + + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { + var4.resetPath(var6, var7); + var4.field621 = false; + } else if (var2) { + var4.field621 = true; + var4.tileX = var6; + var4.tileY = var7; + } else { + var4.field621 = false; + var4.method1266(var6, var7, Players.field1237[var1]); + } + + } else { + var5 = var0.readBits(1); + int var8; + int var9; + int var10; + int var11; + if (var5 == 0) { + var6 = var0.readBits(12); + var7 = var6 >> 10; + var8 = var6 >> 5 & 31; + if (var8 > 15) { + var8 -= 32; + } + + var9 = var6 & 31; + if (var9 > 15) { + var9 -= 32; + } + + var10 = var8 + var4.pathX[0]; + var11 = var9 + var4.pathY[0]; + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { + var4.resetPath(var10, var11); + var4.field621 = false; + } else if (var2) { + var4.field621 = true; + var4.tileX = var10; + var4.tileY = var11; + } else { + var4.field621 = false; + var4.method1266(var10, var11, Players.field1237[var1]); + } + + var4.plane = (byte)(var7 + var4.plane & 3); + if (Client.localPlayerIndex == var1) { + Clock.Client_plane = var4.plane; + } + + } else { + var6 = var0.readBits(30); + var7 = var6 >> 28; + var8 = var6 >> 14 & 16383; + var9 = var6 & 16383; + var10 = (Messages.baseX * 64 + var8 + var4.pathX[0] & 16383) - Messages.baseX * 64; + var11 = (Language.baseY * 64 + var9 + var4.pathY[0] & 16383) - Language.baseY * 64; + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { + var4.resetPath(var10, var11); + var4.field621 = false; + } else if (var2) { + var4.field621 = true; + var4.tileX = var10; + var4.tileY = var11; + } else { + var4.field621 = false; + var4.method1266(var10, var11, Players.field1237[var1]); + } + + var4.plane = (byte)(var7 + var4.plane & 3); + if (Client.localPlayerIndex == var1) { + Clock.Client_plane = var4.plane; + } + + } + } + } + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + signature = "(Lbf;B)V", + garbageValue = "1" + ) + static void method4019(GameShell var0) { + while (SoundSystem.isKeyDown()) { + if (RouteStrategy.field2102 == 13) { + Login.worldSelectOpen = false; + Login.leftTitleSprite.drawAt(Login.xPadding, 0); + class32.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + FloorDecoration.logoSprite.drawAt(Login.xPadding + 382 - FloorDecoration.logoSprite.subWidth / 2, 18); + return; + } + + if (RouteStrategy.field2102 == 96) { + if (Login.worldSelectPage > 0 && GrandExchangeEvent.worldSelectLeftSprite != null) { + --Login.worldSelectPage; + } + } else if (RouteStrategy.field2102 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && class32.worldSelectRightSprite != null) { + ++Login.worldSelectPage; + } + } + + if (MouseHandler.MouseHandler_lastButton == 1 || !ArchiveLoader.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { + int var1 = Login.xPadding + 280; + if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + PcmPlayer.changeWorldSelectSorting(0, 0); + return; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + PcmPlayer.changeWorldSelectSorting(0, 1); + return; + } + + int var2 = Login.xPadding + 390; + if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + PcmPlayer.changeWorldSelectSorting(1, 0); + return; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + PcmPlayer.changeWorldSelectSorting(1, 1); + return; + } + + int var3 = Login.xPadding + 500; + if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + PcmPlayer.changeWorldSelectSorting(2, 0); + return; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + PcmPlayer.changeWorldSelectSorting(2, 1); + return; + } + + int var4 = Login.xPadding + 610; + if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + PcmPlayer.changeWorldSelectSorting(3, 0); + return; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + PcmPlayer.changeWorldSelectSorting(3, 1); + return; + } + + if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { + Login.worldSelectOpen = false; + Login.leftTitleSprite.drawAt(Login.xPadding, 0); + class32.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + FloorDecoration.logoSprite.drawAt(Login.xPadding + 382 - FloorDecoration.logoSprite.subWidth / 2, 18); + return; + } + + if (Login.hoveredWorldIndex != -1) { + World var5 = class96.World_worlds[Login.hoveredWorldIndex]; + GrandExchangeEvents.changeWorld(var5); + Login.worldSelectOpen = false; + Login.leftTitleSprite.drawAt(Login.xPadding, 0); + class32.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + FloorDecoration.logoSprite.drawAt(Login.xPadding + 382 - FloorDecoration.logoSprite.subWidth / 2, 18); + return; + } + + if (Login.worldSelectPage > 0 && GrandExchangeEvent.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= GrandExchangeEvent.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= WorldMapData_1.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= WorldMapData_1.canvasHeight / 2 + 50) { + --Login.worldSelectPage; + } + + if (Login.worldSelectPage < Login.worldSelectPagesCount && class32.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= Username.canvasWidth - class32.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= Username.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= WorldMapData_1.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= WorldMapData_1.canvasHeight / 2 + 50) { + ++Login.worldSelectPage; + } + } + + } + + @ObfuscatedName("gc") + @ObfuscatedSignature( + signature = "(IIIII)V", + garbageValue = "168083732" + ) + static final void method4017(int var0, int var1, int var2, int var3) { + Client.overheadTextCount = 0; + boolean var4 = false; + int var5 = -1; + int var6 = -1; + int var7 = Players.Players_count; + int[] var8 = Players.Players_indices; + + int var9; + for (var9 = 0; var9 < var7 + Client.npcCount; ++var9) { + Object var10; + if (var9 < var7) { + var10 = Client.players[var8[var9]]; + if (var8[var9] == Client.combatTargetPlayerIndex) { + var4 = true; + var5 = var9; + continue; + } + + if (var10 == class192.localPlayer) { + var6 = var9; + continue; + } + } else { + var10 = Client.npcs[Client.npcIndices[var9 - var7]]; + } + + class288.drawActor2d((Actor)var10, var9, var0, var1, var2, var3); + } + + if (Client.renderSelf && var6 != -1) { + class288.drawActor2d(class192.localPlayer, var6, var0, var1, var2, var3); + } + + if (var4) { + class288.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var5, var0, var1, var2, var3); + } + + for (var9 = 0; var9 < Client.overheadTextCount; ++var9) { + int var19 = Client.overheadTextXs[var9]; + int var11 = Client.overheadTextYs[var9]; + int var12 = Client.overheadTextXOffsets[var9]; + int var13 = Client.overheadTextAscents[var9]; + boolean var14 = true; + + while (var14) { + var14 = false; + + for (int var15 = 0; var15 < var9; ++var15) { + if (var11 + 2 > Client.overheadTextYs[var15] - Client.overheadTextAscents[var15] && var11 - var13 < Client.overheadTextYs[var15] + 2 && var19 - var12 < Client.overheadTextXOffsets[var15] + Client.overheadTextXs[var15] && var19 + var12 > Client.overheadTextXs[var15] - Client.overheadTextXOffsets[var15] && Client.overheadTextYs[var15] - Client.overheadTextAscents[var15] < var11) { + var11 = Client.overheadTextYs[var15] - Client.overheadTextAscents[var15]; + var14 = true; + } + } + } + + Client.viewportTempX = Client.overheadTextXs[var9]; + Client.viewportTempY = Client.overheadTextYs[var9] = var11; + String var20 = Client.overheadText[var9]; + if (Client.chatEffects == 0) { + int var16 = 16776960; + if (Client.overheadTextColors[var9] < 6) { + var16 = Client.field861[Client.overheadTextColors[var9]]; + } + + if (Client.overheadTextColors[var9] == 6) { + var16 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; + } + + if (Client.overheadTextColors[var9] == 7) { + var16 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; + } + + if (Client.overheadTextColors[var9] == 8) { + var16 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016; + } + + int var17; + if (Client.overheadTextColors[var9] == 9) { + var17 = 150 - Client.overheadTextCyclesRemaining[var9]; + if (var17 < 50) { + var16 = var17 * 1280 + 16711680; + } else if (var17 < 100) { + var16 = 16776960 - (var17 - 50) * 327680; + } else if (var17 < 150) { + var16 = (var17 - 100) * 5 + 65280; + } + } + + if (Client.overheadTextColors[var9] == 10) { + var17 = 150 - Client.overheadTextCyclesRemaining[var9]; + if (var17 < 50) { + var16 = var17 * 5 + 16711680; + } else if (var17 < 100) { + var16 = 16711935 - (var17 - 50) * 327680; + } else if (var17 < 150) { + var16 = (var17 - 100) * 327680 + 255 - (var17 - 100) * 5; + } + } + + if (Client.overheadTextColors[var9] == 11) { + var17 = 150 - Client.overheadTextCyclesRemaining[var9]; + if (var17 < 50) { + var16 = 16777215 - var17 * 327685; + } else if (var17 < 100) { + var16 = (var17 - 50) * 327685 + 65280; + } else if (var17 < 150) { + var16 = 16777215 - (var17 - 100) * 327680; + } + } + + if (Client.overheadTextEffects[var9] == 0) { + class1.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0); + } + + if (Client.overheadTextEffects[var9] == 1) { + class1.fontBold12.drawCenteredWave(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var9] == 2) { + class1.fontBold12.drawCenteredWave2(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var9] == 3) { + class1.fontBold12.drawCenteredShake(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var9]); + } + + if (Client.overheadTextEffects[var9] == 4) { + var17 = (150 - Client.overheadTextCyclesRemaining[var9]) * (class1.fontBold12.stringWidth(var20) + 100) / 150; + Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); + class1.fontBold12.draw(var20, var0 + Client.viewportTempX + 50 - var17, Client.viewportTempY + var1, var16, 0); + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); + } + + if (Client.overheadTextEffects[var9] == 5) { + var17 = 150 - Client.overheadTextCyclesRemaining[var9]; + int var18 = 0; + if (var17 < 25) { + var18 = var17 - 25; + } else if (var17 > 125) { + var18 = var17 - 125; + } + + Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - class1.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); + class1.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, var18 + Client.viewportTempY + var1, var16, 0); + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); + } + } else { + class1.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); + } + } + + } +} diff --git a/runescape-client/src/main/java/class210.java b/runescape-client/src/main/java/class210.java index 004c05d8a0..6575cc10e7 100644 --- a/runescape-client/src/main/java/class210.java +++ b/runescape-client/src/main/java/class210.java @@ -2,26 +2,34 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hj") +@ObfuscatedName("hi") public class class210 { - @ObfuscatedName("i") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-1841265610" + signature = "Lhc;" ) - public static boolean method3947() { - ReflectionCheck var0 = (ReflectionCheck)class117.reflectionChecks.last(); - return var0 != null; + @Export("huffman") + static Huffman huffman; + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(III)I", + garbageValue = "1848259847" + ) + public static int method4029(int var0, int var1) { + return (var0 + 40000 << 8) + var1; } - @ObfuscatedName("y") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(III)Lbs;", - garbageValue = "-453941581" + signature = "(IIS)V", + garbageValue = "11236" ) - @Export("Messages_getByChannelAndID") - static Message Messages_getByChannelAndID(int var0, int var1) { - ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); - return var2.getMessage(var1); + static void method4032(int var0, int var1) { + long var2 = (long)((var0 << 16) + var1); + NetFileRequest var4 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var2); + if (var4 != null) { + NetCache.NetCache_pendingWritesQueue.addLast(var4); + } } } diff --git a/runescape-client/src/main/java/class215.java b/runescape-client/src/main/java/class215.java index 131415344e..efef8ce3b6 100644 --- a/runescape-client/src/main/java/class215.java +++ b/runescape-client/src/main/java/class215.java @@ -1,47 +1,181 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("hn") +@ObfuscatedName("hl") public class class215 { - @ObfuscatedName("sg") - @ObfuscatedSignature( - signature = "Lic;" - ) - public static class237 field2534; - @ObfuscatedName("f") - public static final short[] field2529; - @ObfuscatedName("i") - public static final short[][] field2533; - @ObfuscatedName("y") - public static final short[] field2531; - @ObfuscatedName("w") - public static final short[][] field2532; + @ObfuscatedName("c") + public static final short[] field2552; + @ObfuscatedName("t") + public static final short[][] field2553; + @ObfuscatedName("o") + public static final short[] field2551; + @ObfuscatedName("e") + public static final short[][] field2550; static { - field2529 = new short[]{6798, 8741, 25238, 4626, 4550}; - field2533 = new short[][]{{6798, 107, 10283, 16, 4797, 7744, 5799, 4634, -31839, 22433, 2983, -11343, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {8741, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 25239, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {25238, 8742, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {4626, 11146, 6439, 12, 4758, 10270}, {4550, 4537, 5681, 5673, 5790, 6806, 8076, 4574, 17050, 0, 127, -31821, -17991}}; - field2531 = new short[]{-10304, 9104, -1, -1, -1}; - field2532 = new short[][]{{6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002}, {9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019}, new short[0], new short[0], new short[0]}; + field2552 = new short[]{6798, 8741, 25238, 4626, 4550}; + field2553 = new short[][]{{6798, 107, 10283, 16, 4797, 7744, 5799, 4634, -31839, 22433, 2983, -11343, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {8741, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 25239, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {25238, 8742, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {4626, 11146, 6439, 12, 4758, 10270}, {4550, 4537, 5681, 5673, 5790, 6806, 8076, 4574, 17050, 0, 127, -31821, -17991}}; + field2551 = new short[]{-10304, 9104, -1, -1, -1}; + field2550 = new short[][]{{6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002}, {9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019}, new short[0], new short[0], new short[0]}; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IB)Lir;", - garbageValue = "41" + signature = "(II)Z", + garbageValue = "-1561173160" ) - public static VarcInt method4012(int var0) { - VarcInt var1 = (VarcInt)VarcInt.VarcInt_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = VarcInt.VarcInt_archive.takeFile(19, var0); - var1 = new VarcInt(); - if (var2 != null) { - var1.method4388(new Buffer(var2)); - } + public static boolean method4098(int var0) { + return var0 >= WorldMapDecorationType.field2745.id && var0 <= WorldMapDecorationType.field2743.id || var0 == WorldMapDecorationType.field2731.id; + } - VarcInt.VarcInt_cached.put(var1, (long)var0); - return var1; + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;ZZI)V", + garbageValue = "694265638" + ) + @Export("openURL") + public static void openURL(String var0, boolean var1, boolean var2) { + Tile.method2927(var0, var1, "openjs", var2); + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-329192495" + ) + public static void method4095() { + ParamDefinition.ParamDefinition_cached.clear(); + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "-2141747621" + ) + static void method4101(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var1 != null) { + var1.remove(); + } + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + signature = "(ILce;ZI)I", + garbageValue = "1319059426" + ) + static int method4100(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.OC_NAME) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = HealthBarDefinition.ItemDefinition_get(var3).name; + return 1; + } else { + int var4; + ItemDefinition var5; + if (var0 == ScriptOpcodes.OC_OP) { + class320.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + var5 = HealthBarDefinition.ItemDefinition_get(var3); + if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_IOP) { + class320.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + var5 = HealthBarDefinition.ItemDefinition_get(var3); + if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_COST) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = HealthBarDefinition.ItemDefinition_get(var3).price; + return 1; + } else if (var0 == ScriptOpcodes.OC_STACKABLE) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = HealthBarDefinition.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; + return 1; + } else { + ItemDefinition var6; + if (var0 == ScriptOpcodes.OC_CERT) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + var6 = HealthBarDefinition.ItemDefinition_get(var3); + if (var6.noteTemplate == -1 && var6.note >= 0) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var6.note; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_UNCERT) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + var6 = HealthBarDefinition.ItemDefinition_get(var3); + if (var6.noteTemplate >= 0 && var6.note >= 0) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var6.note; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_MEMBERS) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = HealthBarDefinition.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + var6 = HealthBarDefinition.ItemDefinition_get(var3); + if (var6.placeholderTemplate == -1 && var6.placeholder >= 0) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var6.placeholder; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + var6 = HealthBarDefinition.ItemDefinition_get(var3); + if (var6.placeholderTemplate >= 0 && var6.placeholder >= 0) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var6.placeholder; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_FIND) { + String var7 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + class42.findItemDefinitions(var7, var4 == 1); + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = class162.foundItemIdCount; + return 1; + } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { + if (var0 == ScriptOpcodes.OC_FINDRESET) { + AbstractByteArrayCopier.foundItemIndex = 0; + return 1; + } else { + return 2; + } + } else { + if (WorldMapData_0.foundItemIds != null && AbstractByteArrayCopier.foundItemIndex < class162.foundItemIdCount) { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = WorldMapData_0.foundItemIds[++AbstractByteArrayCopier.foundItemIndex - 1] & '\uffff'; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = -1; + } + + return 1; + } + } } } } diff --git a/runescape-client/src/main/java/class216.java b/runescape-client/src/main/java/class216.java index f018c8de5c..1653aafbcc 100644 --- a/runescape-client/src/main/java/class216.java +++ b/runescape-client/src/main/java/class216.java @@ -1,30 +1,15 @@ -import java.util.Iterator; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hx") +@ObfuscatedName("hs") public class class216 { - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;II)Z", - garbageValue = "-1882269787" + @ObfuscatedName("t") + @Export("javaVersion") + public static String javaVersion; + @ObfuscatedName("ag") + @ObfuscatedGetter( + intValue = 276241037 ) - static boolean method4017(String var0, int var1) { - return GrandExchangeEvent.method79(var0, var1, "openjs"); - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "178095242" - ) - static void method4013() { - Iterator var0 = Messages.Messages_hashTable.iterator(); - - while (var0.hasNext()) { - Message var1 = (Message)var0.next(); - var1.clearIsFromFriend(); - } - - } + static int field2559; } diff --git a/runescape-client/src/main/java/class218.java b/runescape-client/src/main/java/class218.java index 5dabbb3a7d..9c8c07f26a 100644 --- a/runescape-client/src/main/java/class218.java +++ b/runescape-client/src/main/java/class218.java @@ -1,32 +1,70 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hg") +@ObfuscatedName("hw") public class class218 { - @ObfuscatedName("c") + @ObfuscatedName("su") @ObfuscatedSignature( - signature = "Lli;" + signature = "Lin;" ) - @Export("options_buttons_0Sprite") - static IndexedSprite options_buttons_0Sprite; + public static class238 field2716; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -851382349 + ) + @Export("WorldMapElement_count") + public static int WorldMapElement_count; + @ObfuscatedName("g") + @Export("ArchiveDiskActionHandler_thread") + static Thread ArchiveDiskActionHandler_thread; + @ObfuscatedName("j") + static int[] field2718; - @ObfuscatedName("y") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IB)[B", - garbageValue = "1" + signature = "(Ljava/lang/Throwable;Ljava/lang/String;)Lmo;" ) - @Export("ByteArrayPool_getArray") - public static synchronized byte[] ByteArrayPool_getArray(int var0) { - return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); + @Export("newRunException") + public static RunException newRunException(Throwable var0, String var1) { + RunException var2; + if (var0 instanceof RunException) { + var2 = (RunException)var0; + var2.message = var2.message + ' ' + var1; + } else { + var2 = new RunException(var0, var1); + } + + return var2; } - @ObfuscatedName("o") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "450645435" + signature = "(IIB)I", + garbageValue = "-77" ) - static final int method4074() { - return ViewportMouse.ViewportMouse_x; + static int method4178(int var0, int var1) { + if (var0 == -2) { + return 12345678; + } else if (var0 == -1) { + if (var1 < 0) { + var1 = 0; + } else if (var1 > 127) { + var1 = 127; + } + + var1 = 127 - var1; + return var1; + } else { + var1 = (var0 & 127) * var1 / 128; + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; + } + + return (var0 & 65408) + var1; + } } } diff --git a/runescape-client/src/main/java/class219.java b/runescape-client/src/main/java/class219.java deleted file mode 100644 index d4d8e0092c..0000000000 --- a/runescape-client/src/main/java/class219.java +++ /dev/null @@ -1,49 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; - -@ObfuscatedName("hb") -public class class219 { - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "(ILcu;ZS)I", - garbageValue = "6812" - ) - static int method4077(int var0, Script var1, boolean var2) { - Widget var3 = Tile.getWidget(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); - if (var0 == ScriptOpcodes.IF_GETX) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.x; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETY) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.y; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.width; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.height; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETHIDE) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETLAYER) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.parentId; - return 1; - } else { - return 2; - } - } - - @ObfuscatedName("gz") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-857951152" - ) - static void method4076() { - PacketBufferNode var0 = class2.getPacketBufferNode(ClientPacket.field2179, Client.packetWriter.isaacCipher); - var0.packetBuffer.writeByte(ItemDefinition.getWindowedMode()); - var0.packetBuffer.writeShort(GrandExchangeOfferTotalQuantityComparator.canvasWidth); - var0.packetBuffer.writeShort(AttackOption.canvasHeight); - Client.packetWriter.addNode(var0); - } -} diff --git a/runescape-client/src/main/java/class222.java b/runescape-client/src/main/java/class222.java index ca77c82acf..828106fa20 100644 --- a/runescape-client/src/main/java/class222.java +++ b/runescape-client/src/main/java/class222.java @@ -2,28 +2,117 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hc") +@ObfuscatedName("hg") public class class222 { - @ObfuscatedName("gx") - @Export("regionLandArchiveIds") - static int[] regionLandArchiveIds; - @ObfuscatedName("gr") + @ObfuscatedName("em") @ObfuscatedSignature( - signature = "[Lls;" + signature = "Llj;" ) - @Export("headIconPkSprites") - static Sprite[] headIconPkSprites; + @Export("spriteIds") + static GraphicsDefaults spriteIds; - @ObfuscatedName("l") + @ObfuscatedName("fo") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-785436226" + garbageValue = "-1128427150" ) - static void method4090() { - if (MouseRecorder.loadWorlds()) { - Login.worldSelectOpen = true; - Login.worldSelectPage = 0; - Login.worldSelectPagesCount = 0; + static final void method4192() { + int var2; + int var3; + for (int var0 = 0; var0 < Client.soundEffectCount; ++var0) { + int var10002 = Client.queuedSoundEffectDelays[var0]--; + if (Client.queuedSoundEffectDelays[var0] >= -10) { + SoundEffect var9 = Client.soundEffects[var0]; + if (var9 == null) { + Object var10000 = null; + var9 = SoundEffect.readSoundEffect(Client.archive4, Client.soundEffectIds[var0], 0); + if (var9 == null) { + continue; + } + + int[] var14 = Client.queuedSoundEffectDelays; + var14[var0] += var9.calculateDelay(); + Client.soundEffects[var0] = var9; + } + + if (Client.queuedSoundEffectDelays[var0] < 0) { + if (Client.soundLocations[var0] != 0) { + var3 = (Client.soundLocations[var0] & 255) * 128; + int var4 = Client.soundLocations[var0] >> 16 & 255; + int var5 = var4 * 128 + 64 - class192.localPlayer.x; + if (var5 < 0) { + var5 = -var5; + } + + int var6 = Client.soundLocations[var0] >> 8 & 255; + int var7 = var6 * 128 + 64 - class192.localPlayer.y; + if (var7 < 0) { + var7 = -var7; + } + + int var8 = var5 + var7 - 128; + if (var8 > var3) { + Client.queuedSoundEffectDelays[var0] = -100; + continue; + } + + if (var8 < 0) { + var8 = 0; + } + + var2 = (var3 - var8) * Client.areaSoundEffectVolume / var3; + } else { + var2 = Client.soundEffectVolume; + } + + if (var2 > 0) { + RawSound var10 = var9.toRawSound().resample(WorldMapSection1.decimator); + RawPcmStream var11 = RawPcmStream.createRawPcmStream(var10, 100, var2); + var11.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1); + class2.pcmStreamMixer.addSubStream(var11); + } + + Client.queuedSoundEffectDelays[var0] = -100; + } + } else { + --Client.soundEffectCount; + + for (int var1 = var0; var1 < Client.soundEffectCount; ++var1) { + Client.soundEffectIds[var1] = Client.soundEffectIds[var1 + 1]; + Client.soundEffects[var1] = Client.soundEffects[var1 + 1]; + Client.queuedSoundEffectLoops[var1] = Client.queuedSoundEffectLoops[var1 + 1]; + Client.queuedSoundEffectDelays[var1] = Client.queuedSoundEffectDelays[var1 + 1]; + Client.soundLocations[var1] = Client.soundLocations[var1 + 1]; + } + + --var0; + } + } + + if (Client.field881) { + boolean var12; + if (class197.field2414 != 0) { + var12 = true; + } else { + var12 = class197.midiPcmStream.isReady(); + } + + if (!var12) { + if (Client.musicVolume != 0 && Client.currentTrackGroupId != -1) { + Archive var13 = MouseHandler.archive6; + var2 = Client.currentTrackGroupId; + var3 = Client.musicVolume; + class197.field2414 = 1; + UserComparator5.musicTrackArchive = var13; + class197.musicTrackGroupId = var2; + class83.musicTrackFileId = 0; + AttackOption.musicTrackVolume = var3; + KeyHandler.musicTrackBoolean = false; + class197.field2412 = 10000; + } + + Client.field881 = false; + } } } diff --git a/runescape-client/src/main/java/class223.java b/runescape-client/src/main/java/class223.java new file mode 100644 index 0000000000..382a9073f1 --- /dev/null +++ b/runescape-client/src/main/java/class223.java @@ -0,0 +1,117 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; +import net.runelite.rs.ScriptOpcodes; + +@ObfuscatedName("hy") +public class class223 { + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)Ljava/lang/Class;", + garbageValue = "118076110" + ) + @Export("loadClassFromDescriptor") + static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { + if (var0.equals("B")) { + return Byte.TYPE; + } else if (var0.equals("I")) { + return Integer.TYPE; + } else if (var0.equals("S")) { + return Short.TYPE; + } else if (var0.equals("J")) { + return Long.TYPE; + } else if (var0.equals("Z")) { + return Boolean.TYPE; + } else if (var0.equals("F")) { + return Float.TYPE; + } else if (var0.equals("D")) { + return Double.TYPE; + } else if (var0.equals("C")) { + return Character.TYPE; + } else { + return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); + } + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + signature = "(ILce;ZI)I", + garbageValue = "-1273474206" + ) + static int method4193(int var0, Script var1, boolean var2) { + int var3; + int var4; + int var6; + if (var0 == ScriptOpcodes.ENUM_STRING) { + class320.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + EnumDefinition var5 = GameObject.getEnum(var3); + if (var5.outputType != 's') { + } + + for (var6 = 0; var6 < var5.outputCount; ++var6) { + if (var4 == var5.keys[var6]) { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var5.strVals[var6]; + var5 = null; + break; + } + } + + if (var5 != null) { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var5.defaultStr; + } + + return 1; + } else if (var0 != ScriptOpcodes.ENUM) { + if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { + var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]; + EnumDefinition var10 = GameObject.getEnum(var3); + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var10.size(); + return 1; + } else { + return 2; + } + } else { + class320.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1]; + int var9 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 3]; + EnumDefinition var7 = GameObject.getEnum(var9); + if (var3 == var7.inputType && var4 == var7.outputType) { + for (int var8 = 0; var8 < var7.outputCount; ++var8) { + if (var6 == var7.keys[var8]) { + if (var4 == 115) { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var7.strVals[var8]; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var7.intVals[var8]; + } + + var7 = null; + break; + } + } + + if (var7 != null) { + if (var4 == 115) { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var7.defaultStr; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var7.defaultInt; + } + } + + return 1; + } else { + if (var4 == 115) { + Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = "null"; + } else { + Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + } + } +} diff --git a/runescape-client/src/main/java/class225.java b/runescape-client/src/main/java/class225.java index a8ed76c713..ea5372d85e 100644 --- a/runescape-client/src/main/java/class225.java +++ b/runescape-client/src/main/java/class225.java @@ -1,35 +1,597 @@ +import java.io.DataInputStream; +import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hf") +@ObfuscatedName("hv") public class class225 { - @ObfuscatedName("e") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "([BIII)Ljava/lang/String;", - garbageValue = "1102427544" + signature = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", + garbageValue = "1575191798" ) - @Export("decodeStringCp1252") - public static String decodeStringCp1252(byte[] var0, int var1, int var2) { - char[] var3 = new char[var2]; - int var4 = 0; - - for (int var5 = 0; var5 < var2; ++var5) { - int var6 = var0[var5 + var1] & 255; - if (var6 != 0) { - if (var6 >= 128 && var6 < 160) { - char var7 = class287.cp1252AsciiExtension[var6 - 128]; - if (var7 == 0) { - var7 = '?'; - } - - var6 = var7; + @Export("RunException_sendStackTrace") + public static void RunException_sendStackTrace(String var0, Throwable var1) { + if (var1 != null) { + var1.printStackTrace(); + } else { + try { + String var2 = ""; + if (var1 != null) { + var2 = Bounds.method6058(var1); } - var3[var4++] = (char)var6; + if (var0 != null) { + if (var1 != null) { + var2 = var2 + " | "; + } + + var2 = var2 + var0; + } + + System.out.println("Error: " + var2); + var2 = var2.replace(':', '.'); + var2 = var2.replace('@', '_'); + var2 = var2.replace('&', '_'); + var2 = var2.replace('#', '_'); + if (RunException.RunException_applet == null) { + return; + } + + URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + GZipDecompressor.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + class216.javaVersion + "&ct=" + RunException.clientType + "&e=" + var2); + DataInputStream var4 = new DataInputStream(var3.openStream()); + var4.read(); + var4.close(); + } catch (Exception var5) { + } + + } + } + + @ObfuscatedName("fh") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "48" + ) + @Export("load") + static void load() { + int var0; + if (Client.titleLoadingStage == 0) { + ServerBuild.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); + + for (var0 = 0; var0 < 4; ++var0) { + Client.collisionMaps[var0] = new CollisionMap(104, 104); + } + + WorldMapRectangle.sceneMinimapSprite = new Sprite(512, 512); + Login.Login_loadingText = "Starting game engine..."; + Login.Login_loadingPercent = 5; + Client.titleLoadingStage = 20; + } else if (Client.titleLoadingStage == 20) { + Login.Login_loadingText = "Prepared visibility map"; + Login.Login_loadingPercent = 10; + Client.titleLoadingStage = 30; + } else if (Client.titleLoadingStage == 30) { + GrandExchangeEvent.archive0 = class51.newArchive(0, false, true, true); + class65.archive1 = class51.newArchive(1, false, true, true); + GrandExchangeOfferWorldComparator.archive2 = class51.newArchive(2, true, false, true); + class267.archive3 = class51.newArchive(3, false, true, true); + Client.archive4 = class51.newArchive(4, false, true, true); + NetSocket.archive5 = class51.newArchive(5, true, true, true); + MouseHandler.archive6 = class51.newArchive(6, true, true, true); + BuddyRankComparator.archive7 = class51.newArchive(7, false, true, true); + UserComparator8.archive8 = class51.newArchive(8, false, true, true); + GrandExchangeOfferNameComparator.archive9 = class51.newArchive(9, false, true, true); + HealthBar.archive10 = class51.newArchive(10, false, true, true); + GrandExchangeOffer.archive11 = class51.newArchive(11, false, true, true); + MilliClock.archive12 = class51.newArchive(12, false, true, true); + MouseHandler.archive13 = class51.newArchive(13, true, false, true); + class189.archive14 = class51.newArchive(14, false, true, true); + WorldMapSection1.archive15 = class51.newArchive(15, false, true, true); + Client.archive17 = class51.newArchive(17, true, true, true); + UserComparator2.archive18 = class51.newArchive(18, false, true, true); + Clock.archive19 = class51.newArchive(19, false, true, true); + SecureRandomCallable.archive20 = class51.newArchive(20, false, true, true); + Login.Login_loadingText = "Connecting to update server"; + Login.Login_loadingPercent = 20; + Client.titleLoadingStage = 40; + } else if (Client.titleLoadingStage == 40) { + byte var35 = 0; + var0 = var35 + GrandExchangeEvent.archive0.percentage() * 4 / 100; + var0 += class65.archive1.percentage() * 4 / 100; + var0 += GrandExchangeOfferWorldComparator.archive2.percentage() * 2 / 100; + var0 += class267.archive3.percentage() * 2 / 100; + var0 += Client.archive4.percentage() * 6 / 100; + var0 += NetSocket.archive5.percentage() * 4 / 100; + var0 += MouseHandler.archive6.percentage() * 2 / 100; + var0 += BuddyRankComparator.archive7.percentage() * 56 / 100; + var0 += UserComparator8.archive8.percentage() * 2 / 100; + var0 += GrandExchangeOfferNameComparator.archive9.percentage() * 2 / 100; + var0 += HealthBar.archive10.percentage() * 2 / 100; + var0 += GrandExchangeOffer.archive11.percentage() * 2 / 100; + var0 += MilliClock.archive12.percentage() * 2 / 100; + var0 += MouseHandler.archive13.percentage() * 2 / 100; + var0 += class189.archive14.percentage() * 2 / 100; + var0 += WorldMapSection1.archive15.percentage() * 2 / 100; + var0 += Clock.archive19.percentage() / 100; + var0 += UserComparator2.archive18.percentage() / 100; + var0 += SecureRandomCallable.archive20.percentage() / 100; + var0 += Client.archive17.method4372() && Client.archive17.isFullyLoaded() ? 1 : 0; + if (var0 != 100) { + if (var0 != 0) { + Login.Login_loadingText = "Checking for updates - " + var0 + "%"; + } + + Login.Login_loadingPercent = 30; + } else { + WorldMapLabel.method438(GrandExchangeEvent.archive0, "Animations"); + WorldMapLabel.method438(class65.archive1, "Skeletons"); + WorldMapLabel.method438(Client.archive4, "Sound FX"); + WorldMapLabel.method438(NetSocket.archive5, "Maps"); + WorldMapLabel.method438(MouseHandler.archive6, "Music Tracks"); + WorldMapLabel.method438(BuddyRankComparator.archive7, "Models"); + WorldMapLabel.method438(UserComparator8.archive8, "Sprites"); + WorldMapLabel.method438(GrandExchangeOffer.archive11, "Music Jingles"); + WorldMapLabel.method438(class189.archive14, "Music Samples"); + WorldMapLabel.method438(WorldMapSection1.archive15, "Music Patches"); + WorldMapLabel.method438(Clock.archive19, "World Map"); + WorldMapLabel.method438(UserComparator2.archive18, "World Map Geography"); + WorldMapLabel.method438(SecureRandomCallable.archive20, "World Map Ground"); + class222.spriteIds = new GraphicsDefaults(); + class222.spriteIds.decode(Client.archive17); + Login.Login_loadingText = "Loaded update list"; + Login.Login_loadingPercent = 30; + Client.titleLoadingStage = 45; + } + } else if (Client.titleLoadingStage == 45) { + class14.method173(22050, !Client.isLowDetail, 2); + MidiPcmStream var39 = new MidiPcmStream(); + var39.method3819(9, 128); + WorldMapLabelSize.pcmPlayer0 = AbstractWorldMapIcon.method627(GameShell.taskHandler, 0, 22050); + WorldMapLabelSize.pcmPlayer0.setStream(var39); + MouseRecorder.method1208(WorldMapSection1.archive15, class189.archive14, Client.archive4, var39); + class43.pcmPlayer1 = AbstractWorldMapIcon.method627(GameShell.taskHandler, 1, 2048); + class2.pcmStreamMixer = new PcmStreamMixer(); + class43.pcmPlayer1.setStream(class2.pcmStreamMixer); + WorldMapSection1.decimator = new Decimator(22050, PcmPlayer.field1398); + Login.Login_loadingText = "Prepared sound engine"; + Login.Login_loadingPercent = 35; + Client.titleLoadingStage = 50; + NetSocket.WorldMapElement_fonts = new Fonts(UserComparator8.archive8, MouseHandler.archive13); + } else { + int var1; + if (Client.titleLoadingStage == 50) { + FontName[] var38 = new FontName[]{FontName.FontName_plain12, FontName.FontName_verdana13, FontName.FontName_bold12, FontName.FontName_verdana11, FontName.FontName_verdana15, FontName.FontName_plain11}; + var1 = var38.length; + Fonts var34 = NetSocket.WorldMapElement_fonts; + FontName[] var32 = new FontName[]{FontName.FontName_plain12, FontName.FontName_verdana13, FontName.FontName_bold12, FontName.FontName_verdana11, FontName.FontName_verdana15, FontName.FontName_plain11}; + Client.fontsMap = var34.createMap(var32); + if (Client.fontsMap.size() < var1) { + Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var1 + "%"; + Login.Login_loadingPercent = 40; + } else { + WorldMapData_0.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); + class13.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); + class1.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); + NetSocket.platformInfo = Client.platformInfoProvider.get(); + Login.Login_loadingText = "Loaded fonts"; + Login.Login_loadingPercent = 40; + Client.titleLoadingStage = 60; + } + } else { + Archive var2; + int var27; + Archive var41; + if (Client.titleLoadingStage == 60) { + var41 = HealthBar.archive10; + var2 = UserComparator8.archive8; + var27 = 0; + if (var41.tryLoadFileByNames("title.jpg", "")) { + ++var27; + } + + if (var2.tryLoadFileByNames("logo", "")) { + ++var27; + } + + if (var2.tryLoadFileByNames("logo_deadman_mode", "")) { + ++var27; + } + + if (var2.tryLoadFileByNames("logo_seasonal_mode", "")) { + ++var27; + } + + if (var2.tryLoadFileByNames("titlebox", "")) { + ++var27; + } + + if (var2.tryLoadFileByNames("titlebutton", "")) { + ++var27; + } + + if (var2.tryLoadFileByNames("runes", "")) { + ++var27; + } + + if (var2.tryLoadFileByNames("title_mute", "")) { + ++var27; + } + + if (var2.tryLoadFileByNames("options_radio_buttons,0", "")) { + ++var27; + } + + if (var2.tryLoadFileByNames("options_radio_buttons,2", "")) { + ++var27; + } + + if (var2.tryLoadFileByNames("options_radio_buttons,4", "")) { + ++var27; + } + + if (var2.tryLoadFileByNames("options_radio_buttons,6", "")) { + ++var27; + } + + var2.tryLoadFileByNames("sl_back", ""); + var2.tryLoadFileByNames("sl_flags", ""); + var2.tryLoadFileByNames("sl_arrows", ""); + var2.tryLoadFileByNames("sl_stars", ""); + var2.tryLoadFileByNames("sl_button", ""); + byte var33 = 12; + if (var27 < var33) { + Login.Login_loadingText = "Loading title screen - " + var27 * 100 / var33 + "%"; + Login.Login_loadingPercent = 50; + } else { + Login.Login_loadingText = "Loaded title screen"; + Login.Login_loadingPercent = 50; + Projectile.updateGameState(5); + Client.titleLoadingStage = 70; + } + } else if (Client.titleLoadingStage == 70) { + if (!GrandExchangeOfferWorldComparator.archive2.isFullyLoaded()) { + Login.Login_loadingText = "Loading config - " + GrandExchangeOfferWorldComparator.archive2.loadPercent() + "%"; + Login.Login_loadingPercent = 60; + } else { + Archive var37 = GrandExchangeOfferWorldComparator.archive2; + FloorOverlayDefinition.FloorOverlayDefinition_archive = var37; + class83.method2109(GrandExchangeOfferWorldComparator.archive2); + var41 = GrandExchangeOfferWorldComparator.archive2; + var2 = BuddyRankComparator.archive7; + KitDefinition.KitDefinition_archive = var41; + KitDefinition.KitDefinition_modelsArchive = var2; + CollisionMap.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); + Archive var3 = GrandExchangeOfferWorldComparator.archive2; + Archive var28 = BuddyRankComparator.archive7; + boolean var5 = Client.isLowDetail; + ObjectDefinition.ObjectDefinition_archive = var3; + ObjectDefinition.ObjectDefinition_modelsArchive = var28; + ObjectDefinition.ObjectDefinition_isLowDetail = var5; + Archive var6 = GrandExchangeOfferWorldComparator.archive2; + Archive var36 = BuddyRankComparator.archive7; + NPCDefinition.NpcDefinition_archive = var6; + NPCDefinition.NpcDefinition_modelArchive = var36; + GraphicsObject.method2063(GrandExchangeOfferWorldComparator.archive2); + Archive var8 = GrandExchangeOfferWorldComparator.archive2; + Archive var9 = BuddyRankComparator.archive7; + boolean var10 = Client.isMembersWorld; + Font var11 = WorldMapData_0.fontPlain11; + ItemDefinition.ItemDefinition_archive = var8; + ItemDefinition.ItemDefinition_modelArchive = var9; + class298.ItemDefinition_inMembersWorld = var10; + ItemDefinition.ItemDefinition_fileCount = ItemDefinition.ItemDefinition_archive.getGroupFileCount(10); + ItemDefinition.ItemDefinition_fontPlain11 = var11; + TilePaint.method3149(GrandExchangeOfferWorldComparator.archive2, GrandExchangeEvent.archive0, class65.archive1); + Archive var12 = GrandExchangeOfferWorldComparator.archive2; + Archive var13 = BuddyRankComparator.archive7; + SpotAnimationDefinition.SpotAnimationDefinition_archive = var12; + ArchiveDiskActionHandler.SpotAnimationDefinition_modelArchive = var13; + Archive var14 = GrandExchangeOfferWorldComparator.archive2; + class287.VarbitDefinition_archive = var14; + Archive var15 = GrandExchangeOfferWorldComparator.archive2; + VarpDefinition.VarpDefinition_archive = var15; + VarpDefinition.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); + SoundSystem.method2562(class267.archive3, BuddyRankComparator.archive7, UserComparator8.archive8, MouseHandler.archive13); + Archive var16 = GrandExchangeOfferWorldComparator.archive2; + InvDefinition.InvDefinition_archive = var16; + Archive var17 = GrandExchangeOfferWorldComparator.archive2; + GrandExchangeOfferAgeComparator.EnumDefinition_archive = var17; + Archive var18 = GrandExchangeOfferWorldComparator.archive2; + VarcInt.VarcInt_archive = var18; + Archive var19 = GrandExchangeOfferWorldComparator.archive2; + ParamDefinition.ParamDefinition_archive = var19; + class197.varcs = new Varcs(); + Archive var20 = GrandExchangeOfferWorldComparator.archive2; + Archive var21 = UserComparator8.archive8; + Archive var22 = MouseHandler.archive13; + class49.HitSplatDefinition_archive = var20; + HitSplatDefinition.field3329 = var21; + HitSplatDefinition.HitSplatDefinition_fontsArchive = var22; + Archive var23 = GrandExchangeOfferWorldComparator.archive2; + Archive var24 = UserComparator8.archive8; + HealthBarDefinition.HealthBarDefinition_archive = var23; + HealthBarDefinition.HitSplatDefinition_spritesArchive = var24; + Varcs.method2212(GrandExchangeOfferWorldComparator.archive2, UserComparator8.archive8); + Login.Login_loadingText = "Loaded config"; + Login.Login_loadingPercent = 60; + Client.titleLoadingStage = 80; + } + } else if (Client.titleLoadingStage == 80) { + var0 = 0; + if (Entity.compass == null) { + Entity.compass = WorldMapSection1.SpriteBuffer_getSprite(UserComparator8.archive8, class222.spriteIds.compass, 0); + } else { + ++var0; + } + + if (ArchiveLoader.redHintArrowSprite == null) { + ArchiveLoader.redHintArrowSprite = WorldMapSection1.SpriteBuffer_getSprite(UserComparator8.archive8, class222.spriteIds.field3796, 0); + } else { + ++var0; + } + + IndexedSprite var7; + IndexedSprite[] var26; + IndexedSprite[] var29; + int var30; + if (VertexNormal.mapSceneSprites == null) { + var2 = UserComparator8.archive8; + var27 = class222.spriteIds.mapScenes; + if (!class228.method4199(var2, var27, 0)) { + var26 = null; + } else { + var29 = new IndexedSprite[class326.SpriteBuffer_spriteCount]; + + for (var30 = 0; var30 < class326.SpriteBuffer_spriteCount; ++var30) { + var7 = var29[var30] = new IndexedSprite(); + var7.width = GZipDecompressor.SpriteBuffer_spriteWidth; + var7.height = class326.SpriteBuffer_spriteHeight; + var7.xOffset = Huffman.SpriteBuffer_xOffsets[var30]; + var7.yOffset = NPC.SpriteBuffer_yOffsets[var30]; + var7.subWidth = class326.SpriteBuffer_spriteWidths[var30]; + var7.subHeight = class326.SpriteBuffer_spriteHeights[var30]; + var7.palette = class326.SpriteBuffer_spritePalette; + var7.pixels = class326.SpriteBuffer_pixels[var30]; + } + + DynamicObject.method2292(); + var26 = var29; + } + + VertexNormal.mapSceneSprites = var26; + } else { + ++var0; + } + + Sprite[] var40; + if (Ignored.headIconPkSprites == null) { + var2 = UserComparator8.archive8; + var27 = class222.spriteIds.headIconsPk; + if (!class228.method4199(var2, var27, 0)) { + var40 = null; + } else { + var40 = HorizontalAlignment.method4783(); + } + + Ignored.headIconPkSprites = var40; + } else { + ++var0; + } + + if (class40.headIconPrayerSprites == null) { + var2 = UserComparator8.archive8; + var27 = class222.spriteIds.field3799; + if (!class228.method4199(var2, var27, 0)) { + var40 = null; + } else { + var40 = HorizontalAlignment.method4783(); + } + + class40.headIconPrayerSprites = var40; + } else { + ++var0; + } + + if (SecureRandomCallable.headIconHintSprites == null) { + var2 = UserComparator8.archive8; + var27 = class222.spriteIds.field3800; + if (!class228.method4199(var2, var27, 0)) { + var40 = null; + } else { + var40 = HorizontalAlignment.method4783(); + } + + SecureRandomCallable.headIconHintSprites = var40; + } else { + ++var0; + } + + if (StructDefinition.mapMarkerSprites == null) { + var2 = UserComparator8.archive8; + var27 = class222.spriteIds.field3803; + if (!class228.method4199(var2, var27, 0)) { + var40 = null; + } else { + var40 = HorizontalAlignment.method4783(); + } + + StructDefinition.mapMarkerSprites = var40; + } else { + ++var0; + } + + if (WorldMapData_0.crossSprites == null) { + var2 = UserComparator8.archive8; + var27 = class222.spriteIds.field3802; + if (!class228.method4199(var2, var27, 0)) { + var40 = null; + } else { + var40 = HorizontalAlignment.method4783(); + } + + WorldMapData_0.crossSprites = var40; + } else { + ++var0; + } + + if (AbstractWorldMapData.mapDotSprites == null) { + var2 = UserComparator8.archive8; + var27 = class222.spriteIds.field3805; + if (!class228.method4199(var2, var27, 0)) { + var40 = null; + } else { + var40 = HorizontalAlignment.method4783(); + } + + AbstractWorldMapData.mapDotSprites = var40; + } else { + ++var0; + } + + if (class192.scrollBarSprites == null) { + var2 = UserComparator8.archive8; + var27 = class222.spriteIds.field3804; + if (!class228.method4199(var2, var27, 0)) { + var26 = null; + } else { + var29 = new IndexedSprite[class326.SpriteBuffer_spriteCount]; + + for (var30 = 0; var30 < class326.SpriteBuffer_spriteCount; ++var30) { + var7 = var29[var30] = new IndexedSprite(); + var7.width = GZipDecompressor.SpriteBuffer_spriteWidth; + var7.height = class326.SpriteBuffer_spriteHeight; + var7.xOffset = Huffman.SpriteBuffer_xOffsets[var30]; + var7.yOffset = NPC.SpriteBuffer_yOffsets[var30]; + var7.subWidth = class326.SpriteBuffer_spriteWidths[var30]; + var7.subHeight = class326.SpriteBuffer_spriteHeights[var30]; + var7.palette = class326.SpriteBuffer_spritePalette; + var7.pixels = class326.SpriteBuffer_pixels[var30]; + } + + DynamicObject.method2292(); + var26 = var29; + } + + class192.scrollBarSprites = var26; + } else { + ++var0; + } + + if (InterfaceParent.modIconSprites == null) { + var2 = UserComparator8.archive8; + var27 = class222.spriteIds.field3795; + if (!class228.method4199(var2, var27, 0)) { + var26 = null; + } else { + var29 = new IndexedSprite[class326.SpriteBuffer_spriteCount]; + + for (var30 = 0; var30 < class326.SpriteBuffer_spriteCount; ++var30) { + var7 = var29[var30] = new IndexedSprite(); + var7.width = GZipDecompressor.SpriteBuffer_spriteWidth; + var7.height = class326.SpriteBuffer_spriteHeight; + var7.xOffset = Huffman.SpriteBuffer_xOffsets[var30]; + var7.yOffset = NPC.SpriteBuffer_yOffsets[var30]; + var7.subWidth = class326.SpriteBuffer_spriteWidths[var30]; + var7.subHeight = class326.SpriteBuffer_spriteHeights[var30]; + var7.palette = class326.SpriteBuffer_spritePalette; + var7.pixels = class326.SpriteBuffer_pixels[var30]; + } + + DynamicObject.method2292(); + var26 = var29; + } + + InterfaceParent.modIconSprites = var26; + } else { + ++var0; + } + + if (var0 < 11) { + Login.Login_loadingText = "Loading sprites - " + var0 * 100 / 12 + "%"; + Login.Login_loadingPercent = 70; + } else { + AbstractFont.AbstractFont_modIconSprites = InterfaceParent.modIconSprites; + ArchiveLoader.redHintArrowSprite.normalize(); + var1 = (int)(Math.random() * 21.0D) - 10; + int var31 = (int)(Math.random() * 21.0D) - 10; + var27 = (int)(Math.random() * 21.0D) - 10; + int var4 = (int)(Math.random() * 41.0D) - 20; + VertexNormal.mapSceneSprites[0].shiftColors(var1 + var4, var4 + var31, var27 + var4); + Login.Login_loadingText = "Loaded sprites"; + Login.Login_loadingPercent = 70; + Client.titleLoadingStage = 90; + } + } else if (Client.titleLoadingStage == 90) { + if (!GrandExchangeOfferNameComparator.archive9.isFullyLoaded()) { + Login.Login_loadingText = "Loading textures - " + "0%"; + Login.Login_loadingPercent = 90; + } else { + Language.textureProvider = new TextureProvider(GrandExchangeOfferNameComparator.archive9, UserComparator8.archive8, 20, 0.8D, Client.isLowDetail ? 64 : 128); + Rasterizer3D.Rasterizer3D_setTextureLoader(Language.textureProvider); + Rasterizer3D.Rasterizer3D_setBrightness(0.8D); + Client.titleLoadingStage = 100; + } + } else if (Client.titleLoadingStage == 100) { + var0 = Language.textureProvider.getLoadedPercentage(); + if (var0 < 100) { + Login.Login_loadingText = "Loading textures - " + var0 + "%"; + Login.Login_loadingPercent = 90; + } else { + Login.Login_loadingText = "Loaded textures"; + Login.Login_loadingPercent = 90; + Client.titleLoadingStage = 110; + } + } else if (Client.titleLoadingStage == 110) { + class16.mouseRecorder = new MouseRecorder(); + GameShell.taskHandler.newThreadTask(class16.mouseRecorder, 10); + Login.Login_loadingText = "Loaded input handler"; + Login.Login_loadingPercent = 92; + Client.titleLoadingStage = 120; + } else if (Client.titleLoadingStage == 120) { + if (!HealthBar.archive10.tryLoadFileByNames("huffman", "")) { + Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; + Login.Login_loadingPercent = 94; + } else { + Huffman var25 = new Huffman(HealthBar.archive10.takeFileByNames("huffman", "")); + TilePaint.method3150(var25); + Login.Login_loadingText = "Loaded wordpack"; + Login.Login_loadingPercent = 94; + Client.titleLoadingStage = 130; + } + } else if (Client.titleLoadingStage == 130) { + if (!class267.archive3.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + class267.archive3.loadPercent() * 4 / 5 + "%"; + Login.Login_loadingPercent = 96; + } else if (!MilliClock.archive12.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + (80 + MilliClock.archive12.loadPercent() / 6) + "%"; + Login.Login_loadingPercent = 96; + } else if (!MouseHandler.archive13.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + (96 + MouseHandler.archive13.loadPercent() / 50) + "%"; + Login.Login_loadingPercent = 96; + } else { + Login.Login_loadingText = "Loaded interfaces"; + Login.Login_loadingPercent = 98; + Client.titleLoadingStage = 140; + } + } else if (Client.titleLoadingStage == 140) { + Login.Login_loadingPercent = 100; + if (!Clock.archive19.tryLoadGroupByName(WorldMapCacheName.field313.name)) { + Login.Login_loadingText = "Loading world map - " + Clock.archive19.groupLoadPercentByName(WorldMapCacheName.field313.name) / 10 + "%"; + } else { + if (WorldMapIcon_0.worldMap == null) { + WorldMapIcon_0.worldMap = new WorldMap(); + WorldMapIcon_0.worldMap.init(Clock.archive19, UserComparator2.archive18, SecureRandomCallable.archive20, class1.fontBold12, Client.fontsMap, VertexNormal.mapSceneSprites); + } + + Login.Login_loadingText = "Loaded world map"; + Client.titleLoadingStage = 150; + } + } else if (Client.titleLoadingStage == 150) { + Projectile.updateGameState(10); + } } } - - return new String(var3, 0, var4); } } diff --git a/runescape-client/src/main/java/class226.java b/runescape-client/src/main/java/class226.java index 854fb85cf8..cc461ce13e 100644 --- a/runescape-client/src/main/java/class226.java +++ b/runescape-client/src/main/java/class226.java @@ -2,104 +2,21 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hl") +@ObfuscatedName("ho") public class class226 { - @ObfuscatedName("f") + @ObfuscatedName("gn") + @Export("regionMapArchives") + static byte[][] regionMapArchives; + + @ObfuscatedName("jc") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)J", - garbageValue = "-1275125975" + signature = "(III)V", + garbageValue = "-1597824761" ) - public static long method4101(CharSequence var0) { - long var1 = 0L; - int var3 = var0.length(); - - for (int var4 = 0; var4 < var3; ++var4) { - var1 *= 37L; - char var5 = var0.charAt(var4); - if (var5 >= 'A' && var5 <= 'Z') { - var1 += (long)(var5 + 1 - 65); - } else if (var5 >= 'a' && var5 <= 'z') { - var1 += (long)(var5 + 1 - 97); - } else if (var5 >= '0' && var5 <= '9') { - var1 += (long)(var5 + 27 - 48); - } - - if (var1 >= 177917621779460413L) { - break; - } + @Export("runIntfCloseListeners") + static final void runIntfCloseListeners(int var0, int var1) { + if (ScriptFrame.loadInterface(var0)) { + WorldMapSection0.runComponentCloseListeners(WorldMapLabel.Widget_interfaceComponents[var0], var1); } - - while (var1 % 37L == 0L && var1 != 0L) { - var1 /= 37L; - } - - return var1; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(Lif;IIIBZI)V", - garbageValue = "-2034878467" - ) - @Export("requestNetFile") - static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { - long var6 = (long)((var1 << 16) + var2); - NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); - if (var8 == null) { - var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); - if (var8 == null) { - var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); - if (var8 != null) { - if (var5) { - var8.removeDual(); - NetCache.NetCache_pendingPriorityWrites.put(var8, var6); - --NetCache.NetCache_pendingWritesCount; - ++NetCache.NetCache_pendingPriorityWritesCount; - } - - } else { - if (!var5) { - var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); - if (var8 != null) { - return; - } - } - - var8 = new NetFileRequest(); - var8.archive = var0; - var8.crc = var3; - var8.padding = var4; - if (var5) { - NetCache.NetCache_pendingPriorityWrites.put(var8, var6); - ++NetCache.NetCache_pendingPriorityWritesCount; - } else { - NetCache.NetCache_pendingWritesQueue.addFirst(var8); - NetCache.NetCache_pendingWrites.put(var8, var6); - ++NetCache.NetCache_pendingWritesCount; - } - - } - } - } - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "118" - ) - public static void method4100() { - HealthBarDefinition.HealthBarDefinition_cached.clear(); - HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-39" - ) - public static final void method4099() { - ViewportMouse.ViewportMouse_isInViewport = false; - ViewportMouse.ViewportMouse_entityCount = 0; } } diff --git a/runescape-client/src/main/java/class227.java b/runescape-client/src/main/java/class227.java deleted file mode 100644 index 28cc29a023..0000000000 --- a/runescape-client/src/main/java/class227.java +++ /dev/null @@ -1,14 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("hk") -public final class class227 { - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(CI)Z", - garbageValue = "-2145751121" - ) - static boolean method4102(char var0) { - return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var0) != -1; - } -} diff --git a/runescape-client/src/main/java/class228.java b/runescape-client/src/main/java/class228.java new file mode 100644 index 0000000000..820125fe83 --- /dev/null +++ b/runescape-client/src/main/java/class228.java @@ -0,0 +1,24 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("hh") +public class class228 { + static { + Math.sqrt(8192.0D); + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "(Lii;III)Z", + garbageValue = "-1380695861" + ) + public static boolean method4199(AbstractArchive var0, int var1, int var2) { + byte[] var3 = var0.takeFile(var1, var2); + if (var3 == null) { + return false; + } else { + SpriteMask.SpriteBuffer_decode(var3); + return true; + } + } +} diff --git a/runescape-client/src/main/java/class237.java b/runescape-client/src/main/java/class238.java similarity index 51% rename from runescape-client/src/main/java/class237.java rename to runescape-client/src/main/java/class238.java index ae7ac063cb..d204d5c7c0 100644 --- a/runescape-client/src/main/java/class237.java +++ b/runescape-client/src/main/java/class238.java @@ -4,66 +4,64 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ic") -public class class237 { - @ObfuscatedName("a") - static int[] field3164; - @ObfuscatedName("f") +@ObfuscatedName("in") +public class class238 { + @ObfuscatedName("c") @Export("spriteMap") final HashMap spriteMap; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Llh;" + signature = "Lll;" ) @Export("bounds") Bounds bounds; - @ObfuscatedName("y") - int[] field3160; - @ObfuscatedName("w") - int[] field3161; - @ObfuscatedName("p") + @ObfuscatedName("o") + int[] field3189; + @ObfuscatedName("e") + int[] field3187; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1798727119 + intValue = -63300003 ) - int field3162; + int field3190; - public class237() { + public class238() { this.spriteMap = new HashMap(); this.bounds = new Bounds(0, 0); - this.field3160 = new int[2048]; - this.field3161 = new int[2048]; - this.field3162 = 0; - field3164 = new int[2000]; + this.field3189 = new int[2048]; + this.field3187 = new int[2048]; + this.field3190 = 0; + class218.field2718 = new int[2000]; int var1 = 0; int var2 = 240; int var4; for (byte var3 = 12; var1 < 16; var2 -= var3) { - var4 = Tiles.method1121((double)((float)var2 / 360.0F), 0.9998999834060669D, (double)((float)var1 * 0.425F / 16.0F + 0.075F)); - field3164[var1] = var4; + var4 = Decimator.method2600((double)((float)var2 / 360.0F), 0.9998999834060669D, (double)(0.075F + (float)var1 * 0.425F / 16.0F)); + class218.field2718[var1] = var4; ++var1; } var2 = 48; - for (int var6 = var2 / 6; var1 < field3164.length; var2 -= var6) { + for (int var6 = var2 / 6; var1 < class218.field2718.length; var2 -= var6) { var4 = var1 * 2; - for (int var5 = Tiles.method1121((double)((float)var2 / 360.0F), 0.9998999834060669D, 0.5D); var1 < var4 && var1 < field3164.length; ++var1) { - field3164[var1] = var5; + for (int var5 = Decimator.method2600((double)((float)var2 / 360.0F), 0.9998999834060669D, 0.5D); var1 < var4 && var1 < class218.field2718.length; ++var1) { + class218.field2718[var1] = var5; } } } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "2086190547" + garbageValue = "-1042631612" ) - void method4301(int var1) { + void method4393(int var1) { int var2 = var1 * 2 + 1; - double[] var3 = class289.method5336(0.0D, (double)((float)var1 / 3.0F), var1); + double[] var3 = BufferedSink.method5902(0.0D, (double)((float)var1 / 3.0F), var1); double var4 = var3[var1] * var3[var1]; int[] var6 = new int[var2 * var2]; boolean var7 = false; @@ -81,49 +79,49 @@ public class class237 { this.spriteMap.put(var1, var11); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IB)Lls;", - garbageValue = "-60" + signature = "(IB)Llt;", + garbageValue = "-100" ) - Sprite method4302(int var1) { + Sprite method4396(int var1) { if (!this.spriteMap.containsKey(var1)) { - this.method4301(var1); + this.method4393(var1); } return (Sprite)this.spriteMap.get(var1); } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "1391492570" + signature = "(IIB)V", + garbageValue = "45" ) - public final void method4303(int var1, int var2) { - if (this.field3162 < this.field3160.length) { - this.field3160[this.field3162] = var1; - this.field3161[this.field3162] = var2; - ++this.field3162; + public final void method4408(int var1, int var2) { + if (this.field3190 < this.field3189.length) { + this.field3189[this.field3190] = var1; + this.field3187[this.field3190] = var2; + ++this.field3190; } } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-938639376" + signature = "(B)V", + garbageValue = "0" ) - public final void method4304() { - this.field3162 = 0; + public final void method4395() { + this.field3190 = 0; } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IILls;FI)V", - garbageValue = "-501073565" + signature = "(IILlt;FB)V", + garbageValue = "111" ) - public final void method4318(int var1, int var2, Sprite var3, float var4) { - int var5 = (int)(var4 * 18.0F); - Sprite var6 = this.method4302(var5); + public final void method4404(int var1, int var2, Sprite var3, float var4) { + int var5 = (int)(18.0F * var4); + Sprite var6 = this.method4396(var5); int var7 = var5 * 2 + 1; Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); Bounds var9 = new Bounds(0, 0); @@ -133,14 +131,14 @@ public class class237 { int var10; int var11; int var12; - for (var10 = 0; var10 < this.field3162; ++var10) { - var11 = this.field3160[var10]; - var12 = this.field3161[var10]; + for (var10 = 0; var10 < this.field3190; ++var10) { + var11 = this.field3189[var10]; + var12 = this.field3187[var10]; int var13 = (int)(var4 * (float)(var11 - var1)) - var5; int var14 = (int)((float)var3.subHeight - var4 * (float)(var12 - var2)) - var5; this.bounds.setLow(var13, var14); - this.bounds.method5997(var8, var9); - this.method4306(var6, var3, var9); + this.bounds.method6031(var8, var9); + this.method4397(var6, var3, var9); } System.nanoTime(); @@ -154,11 +152,11 @@ public class class237 { if (var11 <= 0) { var3.pixels[var10] = -16777216; } else { - if (var11 > field3164.length) { - var11 = field3164.length; + if (var11 > class218.field2718.length) { + var11 = class218.field2718.length; } - var12 = field3164[var11 - 1]; + var12 = class218.field2718[var11 - 1]; var3.pixels[var10] = -16777216 | var12; } } @@ -167,12 +165,12 @@ public class class237 { System.nanoTime(); } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lls;Lls;Llh;I)V", - garbageValue = "-17705083" + signature = "(Llt;Llt;Lll;I)V", + garbageValue = "-1243462627" ) - void method4306(Sprite var1, Sprite var2, Bounds var3) { + void method4397(Sprite var1, Sprite var2, Bounds var3) { if (var3.highX != 0 && var3.highY != 0) { int var4 = 0; int var5 = 0; @@ -201,23 +199,25 @@ public class class237 { } } - @ObfuscatedName("c") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(CI)Z", - garbageValue = "1561661467" + garbageValue = "-1969161403" ) - @Export("isDigit") - public static boolean isDigit(char var0) { - return var0 >= '0' && var0 <= '9'; + static boolean method4414(char var0) { + return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var0) != -1; } - @ObfuscatedName("c") + @ObfuscatedName("gl") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1306967480" + signature = "(S)V", + garbageValue = "-28085" ) - public static void method4300() { - NPCDefinition.NpcDefinition_cached.clear(); - NPCDefinition.NpcDefinition_cachedModels.clear(); + static void method4415() { + PacketBufferNode var0 = TilePaint.getPacketBufferNode(ClientPacket.field2289, Client.packetWriter.isaacCipher); + var0.packetBuffer.writeByte(Friend.getWindowedMode()); + var0.packetBuffer.writeShort(Username.canvasWidth); + var0.packetBuffer.writeShort(WorldMapData_1.canvasHeight); + Client.packetWriter.addNode(var0); } } diff --git a/runescape-client/src/main/java/class247.java b/runescape-client/src/main/java/class247.java deleted file mode 100644 index 832b919a77..0000000000 --- a/runescape-client/src/main/java/class247.java +++ /dev/null @@ -1,15 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("iu") -public class class247 { - @ObfuscatedName("w") - @Export("Interpreter_stringLocals") - static String[] Interpreter_stringLocals; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1864596047 - ) - static int field3261; -} diff --git a/runescape-client/src/main/java/class248.java b/runescape-client/src/main/java/class248.java new file mode 100644 index 0000000000..541af2eafd --- /dev/null +++ b/runescape-client/src/main/java/class248.java @@ -0,0 +1,16 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("iv") +public class class248 { + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(Ljava/lang/CharSequence;I)Z", + garbageValue = "-1891456461" + ) + @Export("isNumber") + public static boolean isNumber(CharSequence var0) { + return ClanMate.method5073(var0, 10, true); + } +} diff --git a/runescape-client/src/main/java/class266.java b/runescape-client/src/main/java/class266.java deleted file mode 100644 index 97ff564cff..0000000000 --- a/runescape-client/src/main/java/class266.java +++ /dev/null @@ -1,11 +0,0 @@ -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("jn") -public class class266 { - @ObfuscatedName("ab") - @ObfuscatedGetter( - intValue = -1184737469 - ) - static int field3517; -} diff --git a/runescape-client/src/main/java/class267.java b/runescape-client/src/main/java/class267.java index dfbdd8d0a2..57df6a3a86 100644 --- a/runescape-client/src/main/java/class267.java +++ b/runescape-client/src/main/java/class267.java @@ -1,11 +1,89 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jh") +@ObfuscatedName("jo") public class class267 { - @ObfuscatedName("ao") + @ObfuscatedName("dn") @ObfuscatedSignature( - signature = "Llh;" + signature = "Lia;" ) - static Bounds field3521; + @Export("archive3") + static Archive archive3; + + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "([BI)V", + garbageValue = "-1781109205" + ) + @Export("ByteArrayPool_release") + public static synchronized void ByteArrayPool_release(byte[] var0) { + if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < 1000) { + ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; + } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < 250) { + ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; + } else if (var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) { + ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; + } else { + if (ByteArrayPool.ByteArrayPool_arrays != null) { + for (int var1 = 0; var1 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var1) { + if (var0.length == ByteArrayPool.ByteArrayPool_alternativeSizes[var1] && VerticalAlignment.ByteArrayPool_altSizeArrayCounts[var1] < ByteArrayPool.ByteArrayPool_arrays[var1].length) { + ByteArrayPool.ByteArrayPool_arrays[var1][VerticalAlignment.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; + return; + } + } + } + + } + } + + @ObfuscatedName("fc") + @ObfuscatedSignature( + signature = "(Lhn;III)V", + garbageValue = "1321817933" + ) + @Export("checkIfMinimapClicked") + static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { + if (Client.minimapState == 0 || Client.minimapState == 3) { + if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !ArchiveLoader.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { + SpriteMask var3 = var0.getSpriteMask(true); + if (var3 == null) { + return; + } + + int var4 = MouseHandler.MouseHandler_lastPressedX - var1; + int var5 = MouseHandler.MouseHandler_lastPressedY - var2; + if (var3.contains(var4, var5)) { + var4 -= var3.width / 2; + var5 -= var3.height / 2; + int var6 = Client.camAngleY & 2047; + int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; + int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; + int var9 = var7 * var5 + var4 * var8 >> 11; + int var10 = var8 * var5 - var7 * var4 >> 11; + int var11 = var9 + class192.localPlayer.x >> 7; + int var12 = class192.localPlayer.y - var10 >> 7; + PacketBufferNode var13 = TilePaint.getPacketBufferNode(ClientPacket.field2276, Client.packetWriter.isaacCipher); + var13.packetBuffer.writeByte(18); + var13.packetBuffer.writeShort(Language.baseY * 64 + var12); + var13.packetBuffer.method5787(Messages.baseX * 64 + var11); + var13.packetBuffer.method5604(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); + var13.packetBuffer.writeByte(var4); + var13.packetBuffer.writeByte(var5); + var13.packetBuffer.writeShort(Client.camAngleY); + var13.packetBuffer.writeByte(57); + var13.packetBuffer.writeByte(0); + var13.packetBuffer.writeByte(0); + var13.packetBuffer.writeByte(89); + var13.packetBuffer.writeShort(class192.localPlayer.x); + var13.packetBuffer.writeShort(class192.localPlayer.y); + var13.packetBuffer.writeByte(63); + Client.packetWriter.addNode(var13); + Client.destinationX = var11; + Client.destinationY = var12; + } + } + + } + } } diff --git a/runescape-client/src/main/java/class268.java b/runescape-client/src/main/java/class268.java index bdb186fe78..4dbb3d1adc 100644 --- a/runescape-client/src/main/java/class268.java +++ b/runescape-client/src/main/java/class268.java @@ -1,68 +1,19 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jz") +@ObfuscatedName("js") public class class268 { - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -1635748915 - ) - public static int field3524; - @ObfuscatedName("x") - @Export("SpriteBuffer_spritePalette") - public static int[] SpriteBuffer_spritePalette; - @ObfuscatedName("v") + @ObfuscatedName("m") + @Export("Tiles_hue") + static int[] Tiles_hue; + + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Ldx;" + signature = "(II)Z", + garbageValue = "1645671847" ) - @Export("soundCache") - public static SoundCache soundCache; - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(Ljava/lang/Object;ZI)[B", - garbageValue = "-1997721504" - ) - @Export("serialize") - public static byte[] serialize(Object var0, boolean var1) { - if (var0 == null) { - return null; - } else if (var0 instanceof byte[]) { - byte[] var6 = (byte[])((byte[])var0); - int var4 = var6.length; - byte[] var5 = new byte[var4]; - System.arraycopy(var6, 0, var5, 0, var4); - return var5; - } else if (var0 instanceof AbstractByteArrayCopier) { - AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; - return var2.get(); - } else { - throw new IllegalArgumentException(); - } - } - - @ObfuscatedName("e") - static int method5012(long var0) { - return (int)(var0 >>> 14 & 3L); - } - - @ObfuscatedName("fh") - @ObfuscatedSignature( - signature = "(IIII)V", - garbageValue = "-1968592284" - ) - @Export("queueSoundEffect") - static void queueSoundEffect(int var0, int var1, int var2) { - if (Client.soundEffectVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) { - Client.soundEffectIds[Client.soundEffectCount] = var0; - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; - Client.soundEffects[Client.soundEffectCount] = null; - Client.soundLocations[Client.soundEffectCount] = 0; - ++Client.soundEffectCount; - } - + public static boolean method5042(int var0) { + return (var0 >> 31 & 1) != 0; } } diff --git a/runescape-client/src/main/java/class269.java b/runescape-client/src/main/java/class269.java deleted file mode 100644 index 581f9fa574..0000000000 --- a/runescape-client/src/main/java/class269.java +++ /dev/null @@ -1,92 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("jp") -public class class269 { - @ObfuscatedName("sf") - @Export("foundItemIds") - static short[] foundItemIds; - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(IIIZIZI)V", - garbageValue = "1979795813" - ) - @Export("doWorldSorting") - static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) { - if (var0 < var1) { - int var6 = (var0 + var1) / 2; - int var7 = var0; - World var8 = class162.World_worlds[var6]; - class162.World_worlds[var6] = class162.World_worlds[var1]; - class162.World_worlds[var1] = var8; - - for (int var9 = var0; var9 < var1; ++var9) { - World var11 = class162.World_worlds[var9]; - int var12 = Player.compareWorlds(var11, var8, var2, var3); - int var10; - if (var12 != 0) { - if (var3) { - var10 = -var12; - } else { - var10 = var12; - } - } else if (var4 == -1) { - var10 = 0; - } else { - int var13 = Player.compareWorlds(var11, var8, var4, var5); - if (var5) { - var10 = -var13; - } else { - var10 = var13; - } - } - - if (var10 <= 0) { - World var14 = class162.World_worlds[var9]; - class162.World_worlds[var9] = class162.World_worlds[var7]; - class162.World_worlds[var7++] = var14; - } - } - - class162.World_worlds[var1] = class162.World_worlds[var7]; - class162.World_worlds[var7] = var8; - doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); - doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); - } - - } - - @ObfuscatedName("ga") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1859610871" - ) - static final void method5014() { - int[] var0 = Players.Players_indices; - - int var1; - for (var1 = 0; var1 < Players.Players_count; ++var1) { - Player var2 = Client.players[var0[var1]]; - if (var2 != null && var2.overheadTextCyclesRemaining > 0) { - --var2.overheadTextCyclesRemaining; - if (var2.overheadTextCyclesRemaining == 0) { - var2.overheadText = null; - } - } - } - - for (var1 = 0; var1 < Client.npcCount; ++var1) { - int var4 = Client.npcIndices[var1]; - NPC var3 = Client.npcs[var4]; - if (var3 != null && var3.overheadTextCyclesRemaining > 0) { - --var3.overheadTextCyclesRemaining; - if (var3.overheadTextCyclesRemaining == 0) { - var3.overheadText = null; - } - } - } - - } -} diff --git a/runescape-client/src/main/java/class286.java b/runescape-client/src/main/java/class286.java deleted file mode 100644 index ca46289541..0000000000 --- a/runescape-client/src/main/java/class286.java +++ /dev/null @@ -1,23 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("kt") -public class class286 { - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Lhz;" - ) - @Export("EnumDefinition_archive") - static AbstractArchive EnumDefinition_archive; - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1832387594" - ) - public static void method5310() { - SequenceDefinition.SequenceDefinition_cached.clear(); - SequenceDefinition.SequenceDefinition_cachedFrames.clear(); - } -} diff --git a/runescape-client/src/main/java/class287.java b/runescape-client/src/main/java/class287.java index dc04ef59b9..40ac2e9aa9 100644 --- a/runescape-client/src/main/java/class287.java +++ b/runescape-client/src/main/java/class287.java @@ -1,13 +1,41 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kd") +@ObfuscatedName("ku") public class class287 { - @ObfuscatedName("f") - @Export("cp1252AsciiExtension") - public static final char[] cp1252AsciiExtension; + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "Lii;" + ) + @Export("VarbitDefinition_archive") + public static AbstractArchive VarbitDefinition_archive; - static { - cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; + @ObfuscatedName("jy") + @ObfuscatedSignature( + signature = "(IIIB)Lbe;", + garbageValue = "27" + ) + static final InterfaceParent method5327(int var0, int var1, int var2) { + InterfaceParent var3 = new InterfaceParent(); + var3.group = var1; + var3.type = var2; + Client.interfaceParents.put(var3, (long)var0); + class51.Widget_resetModelFrames(var1); + Widget var4 = Varps.getWidget(var0); + NPCDefinition.invalidateWidget(var4); + if (Client.meslayerContinueWidget != null) { + NPCDefinition.invalidateWidget(Client.meslayerContinueWidget); + Client.meslayerContinueWidget = null; + } + + GameObject.method3360(); + WorldMapIcon_1.revalidateWidgetScroll(WorldMapLabel.Widget_interfaceComponents[var0 >> 16], var4, false); + WorldMapLabelSize.runWidgetOnLoadListener(var1); + if (Client.rootInterface != -1) { + class226.runIntfCloseListeners(Client.rootInterface, 1); + } + + return var3; } } diff --git a/runescape-client/src/main/java/class288.java b/runescape-client/src/main/java/class288.java index 32e19d413d..8a655ef34e 100644 --- a/runescape-client/src/main/java/class288.java +++ b/runescape-client/src/main/java/class288.java @@ -3,34 +3,650 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ke") -public final class class288 { - @ObfuscatedName("f") - @Export("base37Table") - static final char[] base37Table; - @ObfuscatedName("i") - static long[] field3631; +public class class288 { + @ObfuscatedName("c") + @Export("cp1252AsciiExtension") + public static final char[] cp1252AsciiExtension; static { - base37Table = new char[]{'_', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; - field3631 = new long[12]; - - for (int var0 = 0; var0 < field3631.length; ++var0) { - field3631[var0] = (long)Math.pow(37.0D, (double)var0); - } - + cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; } - @ObfuscatedName("w") - public static int method5334(long var0) { - return (int)(var0 >>> 0 & 127L); - } - - @ObfuscatedName("c") + @ObfuscatedName("gv") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "56" + signature = "(Lbx;IIIIIB)V", + garbageValue = "1" ) - static final void method5335(String var0) { - Tiles.method1143(var0 + " is already on your friend list"); + @Export("drawActor2d") + static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { + if (var0 != null && var0.isVisible()) { + if (var0 instanceof NPC) { + NPCDefinition var6 = ((NPC)var0).definition; + if (var6.transforms != null) { + var6 = var6.transform(); + } + + if (var6 == null) { + return; + } + } + + int var76 = Players.Players_count; + int[] var7 = Players.Players_indices; + byte var8 = 0; + int var10; + if (var1 < var76 && var0.playerCycle == Client.cycle && ClientPreferences.method1840((Player)var0)) { + Player var9 = (Player)var0; + if (var1 < var76) { + var10 = var0.defaultHeight + 15; + MouseRecorder.worldToScreen(var0.x, var0.y, var10); + AbstractFont var11 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); + byte var12 = 9; + var11.drawCentered(var9.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var12, 16777215, 0); + var8 = 18; + } + } + + int var77 = -2; + int var16; + int var17; + int var23; + int var24; + if (!var0.healthBars.method4886()) { + var10 = var0.defaultHeight + 15; + MouseRecorder.worldToScreen(var0.x, var0.y, var10); + + for (HealthBar var91 = (HealthBar)var0.healthBars.last(); var91 != null; var91 = (HealthBar)var0.healthBars.previous()) { + HealthBarUpdate var78 = var91.get(Client.cycle); + if (var78 == null) { + if (var91.isEmpty()) { + var91.remove(); + } + } else { + HealthBarDefinition var13 = var91.definition; + Sprite var14 = var13.getBackSprite(); + Sprite var15 = var13.getFrontSprite(); + var17 = 0; + if (var14 != null && var15 != null) { + if (var13.widthPadding * 2 < var15.subWidth) { + var17 = var13.widthPadding; + } + + var16 = var15.subWidth - var17 * 2; + } else { + var16 = var13.width; + } + + int var18 = 255; + boolean var19 = true; + int var20 = Client.cycle - var78.cycle; + int var21 = var16 * var78.health2 / var13.width; + int var22; + int var95; + if (var78.cycleOffset > var20) { + var22 = var13.field3283 == 0 ? 0 : var13.field3283 * (var20 / var13.field3283); + var23 = var16 * var78.health / var13.width; + var95 = var22 * (var21 - var23) / var78.cycleOffset + var23; + } else { + var95 = var21; + var22 = var78.cycleOffset + var13.int5 - var20; + if (var13.int3 >= 0) { + var18 = (var22 << 8) / (var13.int5 - var13.int3); + } + } + + if (var78.health2 > 0 && var95 < 1) { + var95 = 1; + } + + if (var14 != null && var15 != null) { + if (var16 == var95) { + var95 += var17 * 2; + } else { + var95 += var17; + } + + var22 = var14.subHeight; + var77 += var22; + var23 = var2 + Client.viewportTempX - (var16 >> 1); + var24 = var3 + Client.viewportTempY - var77; + var23 -= var17; + if (var18 >= 0 && var18 < 255) { + var14.drawTransAt(var23, var24, var18); + Rasterizer2D.Rasterizer2D_expandClip(var23, var24, var23 + var95, var22 + var24); + var15.drawTransAt(var23, var24, var18); + } else { + var14.drawTransBgAt(var23, var24); + Rasterizer2D.Rasterizer2D_expandClip(var23, var24, var23 + var95, var22 + var24); + var15.drawTransBgAt(var23, var24); + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); + var77 += 2; + } else { + var77 += 5; + if (Client.viewportTempX > -1) { + var22 = var2 + Client.viewportTempX - (var16 >> 1); + var23 = var3 + Client.viewportTempY - var77; + Rasterizer2D.Rasterizer2D_fillRectangle(var22, var23, var95, 5, 65280); + Rasterizer2D.Rasterizer2D_fillRectangle(var95 + var22, var23, var16 - var95, 5, 16711680); + } + + var77 += 2; + } + } + } + } + + if (var77 == -2) { + var77 += 7; + } + + var77 += var8; + int var80; + if (var1 < var76) { + Player var79 = (Player)var0; + if (var79.isHidden) { + return; + } + + if (var79.headIconPk != -1 || var79.headIconPrayer != -1) { + var80 = var0.defaultHeight + 15; + MouseRecorder.worldToScreen(var0.x, var0.y, var80); + if (Client.viewportTempX > -1) { + if (var79.headIconPk != -1) { + var77 += 25; + Ignored.headIconPkSprites[var79.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var77); + } + + if (var79.headIconPrayer != -1) { + var77 += 25; + class40.headIconPrayerSprites[var79.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var77); + } + } + } + + if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { + var80 = var0.defaultHeight + 15; + MouseRecorder.worldToScreen(var0.x, var0.y, var80); + if (Client.viewportTempX > -1) { + var77 += SecureRandomCallable.headIconHintSprites[1].subHeight; + SecureRandomCallable.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var77); + } + } + } else { + NPCDefinition var97 = ((NPC)var0).definition; + if (var97.transforms != null) { + var97 = var97.transform(); + } + + if (var97.headIconPrayer >= 0 && var97.headIconPrayer < class40.headIconPrayerSprites.length) { + var80 = var0.defaultHeight + 15; + MouseRecorder.worldToScreen(var0.x, var0.y, var80); + if (Client.viewportTempX > -1) { + class40.headIconPrayerSprites[var97.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); + } + } + + if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var76] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { + var80 = var0.defaultHeight + 15; + MouseRecorder.worldToScreen(var0.x, var0.y, var80); + if (Client.viewportTempX > -1) { + SecureRandomCallable.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); + } + } + } + + if (var0.overheadText != null && (var1 >= var76 || !var0.field954 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { + var10 = var0.defaultHeight; + MouseRecorder.worldToScreen(var0.x, var0.y, var10); + if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { + Client.overheadTextXOffsets[Client.overheadTextCount] = class1.fontBold12.stringWidth(var0.overheadText) / 2; + Client.overheadTextAscents[Client.overheadTextCount] = class1.fontBold12.ascent; + Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; + Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; + Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; + Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; + Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; + Client.overheadText[Client.overheadTextCount] = var0.overheadText; + ++Client.overheadTextCount; + } + } + + for (var10 = 0; var10 < 4; ++var10) { + var80 = var0.hitSplatCycles[var10]; + int var92 = var0.hitSplatTypes[var10]; + HitSplatDefinition var93 = null; + int var81 = 0; + HitSplatDefinition var84; + if (var92 >= 0) { + if (var80 <= Client.cycle) { + continue; + } + + var16 = var0.hitSplatTypes[var10]; + var84 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var16); + HitSplatDefinition var94; + if (var84 != null) { + var94 = var84; + } else { + byte[] var85 = class49.HitSplatDefinition_archive.takeFile(32, var16); + var84 = new HitSplatDefinition(); + if (var85 != null) { + var84.decode(new Buffer(var85)); + } + + HitSplatDefinition.HitSplatDefinition_cached.put(var84, (long)var16); + var94 = var84; + } + + var93 = var94; + var81 = var94.field3328; + if (var94 != null && var94.transforms != null) { + var93 = var94.transform(); + if (var93 == null) { + var0.hitSplatCycles[var10] = -1; + continue; + } + } + } else if (var80 < 0) { + continue; + } + + int var82 = var0.hitSplatTypes2[var10]; + HitSplatDefinition var83 = null; + if (var82 >= 0) { + HitSplatDefinition var98 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var82); + if (var98 != null) { + var84 = var98; + } else { + byte[] var86 = class49.HitSplatDefinition_archive.takeFile(32, var82); + var98 = new HitSplatDefinition(); + if (var86 != null) { + var98.decode(new Buffer(var86)); + } + + HitSplatDefinition.HitSplatDefinition_cached.put(var98, (long)var82); + var84 = var98; + } + + var83 = var84; + if (var84 != null && var84.transforms != null) { + var83 = var84.transform(); + } + } + + if (var80 - var81 <= Client.cycle) { + if (var93 == null) { + var0.hitSplatCycles[var10] = -1; + } else { + var17 = var0.defaultHeight / 2; + MouseRecorder.worldToScreen(var0.x, var0.y, var17); + if (Client.viewportTempX > -1) { + if (var10 == 1) { + Client.viewportTempY -= 20; + } + + if (var10 == 2) { + Client.viewportTempX -= 15; + Client.viewportTempY -= 10; + } + + if (var10 == 3) { + Client.viewportTempX += 15; + Client.viewportTempY -= 10; + } + + Sprite var99 = null; + Sprite var87 = null; + Sprite var88 = null; + Sprite var89 = null; + var23 = 0; + var24 = 0; + int var25 = 0; + int var26 = 0; + int var27 = 0; + int var28 = 0; + int var29 = 0; + int var30 = 0; + Sprite var31 = null; + Sprite var32 = null; + Sprite var33 = null; + Sprite var34 = null; + int var35 = 0; + int var36 = 0; + int var37 = 0; + int var38 = 0; + int var39 = 0; + int var40 = 0; + int var41 = 0; + int var42 = 0; + int var43 = 0; + var99 = var93.method4649(); + int var44; + if (var99 != null) { + var23 = var99.subWidth; + var44 = var99.subHeight; + if (var44 > var43) { + var43 = var44; + } + + var27 = var99.xOffset; + } + + var87 = var93.method4650(); + if (var87 != null) { + var24 = var87.subWidth; + var44 = var87.subHeight; + if (var44 > var43) { + var43 = var44; + } + + var28 = var87.xOffset; + } + + var88 = var93.method4651(); + if (var88 != null) { + var25 = var88.subWidth; + var44 = var88.subHeight; + if (var44 > var43) { + var43 = var44; + } + + var29 = var88.xOffset; + } + + var89 = var93.method4652(); + if (var89 != null) { + var26 = var89.subWidth; + var44 = var89.subHeight; + if (var44 > var43) { + var43 = var44; + } + + var30 = var89.xOffset; + } + + if (var83 != null) { + var31 = var83.method4649(); + if (var31 != null) { + var35 = var31.subWidth; + var44 = var31.subHeight; + if (var44 > var43) { + var43 = var44; + } + + var39 = var31.xOffset; + } + + var32 = var83.method4650(); + if (var32 != null) { + var36 = var32.subWidth; + var44 = var32.subHeight; + if (var44 > var43) { + var43 = var44; + } + + var40 = var32.xOffset; + } + + var33 = var83.method4651(); + if (var33 != null) { + var37 = var33.subWidth; + var44 = var33.subHeight; + if (var44 > var43) { + var43 = var44; + } + + var41 = var33.xOffset; + } + + var34 = var83.method4652(); + if (var34 != null) { + var38 = var34.subWidth; + var44 = var34.subHeight; + if (var44 > var43) { + var43 = var44; + } + + var42 = var34.xOffset; + } + } + + Font var90 = var93.getFont(); + if (var90 == null) { + var90 = WorldMapData_0.fontPlain11; + } + + Font var45; + if (var83 != null) { + var45 = var83.getFont(); + if (var45 == null) { + var45 = WorldMapData_0.fontPlain11; + } + } else { + var45 = WorldMapData_0.fontPlain11; + } + + String var46 = null; + String var47 = null; + boolean var48 = false; + int var49 = 0; + var46 = var93.getString(var0.hitSplatValues[var10]); + int var96 = var90.stringWidth(var46); + if (var83 != null) { + var47 = var83.getString(var0.hitSplatValues2[var10]); + var49 = var45.stringWidth(var47); + } + + int var50 = 0; + int var51 = 0; + if (var24 > 0) { + if (var88 == null && var89 == null) { + var50 = 1; + } else { + var50 = var96 / var24 + 1; + } + } + + if (var83 != null && var36 > 0) { + if (var33 == null && var34 == null) { + var51 = 1; + } else { + var51 = var49 / var36 + 1; + } + } + + int var52 = 0; + int var53 = var52; + if (var23 > 0) { + var52 += var23; + } + + var52 += 2; + int var54 = var52; + if (var25 > 0) { + var52 += var25; + } + + int var55 = var52; + int var56 = var52; + int var57; + if (var24 > 0) { + var57 = var24 * var50; + var52 += var57; + var56 += (var57 - var96) / 2; + } else { + var52 += var96; + } + + var57 = var52; + if (var26 > 0) { + var52 += var26; + } + + int var58 = 0; + int var59 = 0; + int var60 = 0; + int var61 = 0; + int var62 = 0; + int var63; + if (var83 != null) { + var52 += 2; + var58 = var52; + if (var35 > 0) { + var52 += var35; + } + + var52 += 2; + var59 = var52; + if (var37 > 0) { + var52 += var37; + } + + var60 = var52; + var62 = var52; + if (var36 > 0) { + var63 = var36 * var51; + var52 += var63; + var62 += (var63 - var49) / 2; + } else { + var52 += var49; + } + + var61 = var52; + if (var38 > 0) { + var52 += var38; + } + } + + var63 = var0.hitSplatCycles[var10] - Client.cycle; + int var64 = var93.field3323 - var63 * var93.field3323 / var93.field3328; + int var65 = var63 * var93.field3334 / var93.field3328 + -var93.field3334; + int var66 = var64 + (var2 + Client.viewportTempX - (var52 >> 1)); + int var67 = var3 + Client.viewportTempY - 12 + var65; + int var68 = var67; + int var69 = var67 + var43; + int var70 = var67 + var93.field3338 + 15; + int var71 = var70 - var90.maxAscent; + int var72 = var70 + var90.maxDescent; + if (var71 < var67) { + var68 = var71; + } + + if (var72 > var69) { + var69 = var72; + } + + int var73 = 0; + int var74; + int var75; + if (var83 != null) { + var73 = var67 + var83.field3338 + 15; + var74 = var73 - var45.maxAscent; + var75 = var73 + var45.maxDescent; + if (var74 < var68) { + ; + } + + if (var75 > var69) { + ; + } + } + + var74 = 255; + if (var93.field3335 >= 0) { + var74 = (var63 << 8) / (var93.field3328 - var93.field3335); + } + + if (var74 >= 0 && var74 < 255) { + if (var99 != null) { + var99.drawTransAt(var53 + var66 - var27, var67, var74); + } + + if (var88 != null) { + var88.drawTransAt(var54 + var66 - var29, var67, var74); + } + + if (var87 != null) { + for (var75 = 0; var75 < var50; ++var75) { + var87.drawTransAt(var24 * var75 + (var55 + var66 - var28), var67, var74); + } + } + + if (var89 != null) { + var89.drawTransAt(var66 + var57 - var30, var67, var74); + } + + var90.drawAlpha(var46, var66 + var56, var70, var93.textColor, 0, var74); + if (var83 != null) { + if (var31 != null) { + var31.drawTransAt(var58 + var66 - var39, var67, var74); + } + + if (var33 != null) { + var33.drawTransAt(var66 + var59 - var41, var67, var74); + } + + if (var32 != null) { + for (var75 = 0; var75 < var51; ++var75) { + var32.drawTransAt(var36 * var75 + (var60 + var66 - var40), var67, var74); + } + } + + if (var34 != null) { + var34.drawTransAt(var66 + var61 - var42, var67, var74); + } + + var45.drawAlpha(var47, var62 + var66, var73, var83.textColor, 0, var74); + } + } else { + if (var99 != null) { + var99.drawTransBgAt(var66 + var53 - var27, var67); + } + + if (var88 != null) { + var88.drawTransBgAt(var54 + var66 - var29, var67); + } + + if (var87 != null) { + for (var75 = 0; var75 < var50; ++var75) { + var87.drawTransBgAt(var75 * var24 + (var66 + var55 - var28), var67); + } + } + + if (var89 != null) { + var89.drawTransBgAt(var57 + var66 - var30, var67); + } + + var90.draw(var46, var56 + var66, var70, var93.textColor | -16777216, 0); + if (var83 != null) { + if (var31 != null) { + var31.drawTransBgAt(var58 + var66 - var39, var67); + } + + if (var33 != null) { + var33.drawTransBgAt(var59 + var66 - var41, var67); + } + + if (var32 != null) { + for (var75 = 0; var75 < var51; ++var75) { + var32.drawTransBgAt(var36 * var75 + (var60 + var66 - var40), var67); + } + } + + if (var34 != null) { + var34.drawTransBgAt(var61 + var66 - var42, var67); + } + + var45.draw(var47, var62 + var66, var73, var83.textColor | -16777216, 0); + } + } + } + } + } + } + + } } } diff --git a/runescape-client/src/main/java/class289.java b/runescape-client/src/main/java/class289.java index a5a146e848..83c4ae11f2 100644 --- a/runescape-client/src/main/java/class289.java +++ b/runescape-client/src/main/java/class289.java @@ -1,109 +1,43 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kr") -public class class289 { - @ObfuscatedName("f") - static char[] field3634; - @ObfuscatedName("i") - static char[] field3636; - @ObfuscatedName("y") - static char[] field3633; - @ObfuscatedName("w") - static int[] field3635; +@ObfuscatedName("kl") +public final class class289 { + @ObfuscatedName("c") + @Export("base37Table") + public static final char[] base37Table; + @ObfuscatedName("t") + static long[] field3642; static { - field3634 = new char[64]; + base37Table = new char[]{'_', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; + field3642 = new long[12]; - int var0; - for (var0 = 0; var0 < 26; ++var0) { - field3634[var0] = (char)(var0 + 65); + for (int var0 = 0; var0 < field3642.length; ++var0) { + field3642[var0] = (long)Math.pow(37.0D, (double)var0); } - for (var0 = 26; var0 < 52; ++var0) { - field3634[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { - field3634[var0] = (char)(var0 + 48 - 52); - } - - field3634[62] = '+'; - field3634[63] = '/'; - field3636 = new char[64]; - - for (var0 = 0; var0 < 26; ++var0) { - field3636[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { - field3636[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { - field3636[var0] = (char)(var0 + 48 - 52); - } - - field3636[62] = '*'; - field3636[63] = '-'; - field3633 = new char[64]; - - for (var0 = 0; var0 < 26; ++var0) { - field3633[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { - field3633[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { - field3633[var0] = (char)(var0 + 48 - 52); - } - - field3633[62] = '-'; - field3633[63] = '_'; - field3635 = new int[128]; - - for (var0 = 0; var0 < field3635.length; ++var0) { - field3635[var0] = -1; - } - - for (var0 = 65; var0 <= 90; ++var0) { - field3635[var0] = var0 - 65; - } - - for (var0 = 97; var0 <= 122; ++var0) { - field3635[var0] = var0 - 97 + 26; - } - - for (var0 = 48; var0 <= 57; ++var0) { - field3635[var0] = var0 - 48 + 52; - } - - int[] var2 = field3635; - field3635[43] = 62; - var2[42] = 62; - int[] var1 = field3635; - field3635[47] = 63; - var1[45] = 63; } - @ObfuscatedName("i") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(DDIB)[D", - garbageValue = "-83" + signature = "(I)[Lkx;", + garbageValue = "822610735" ) - public static double[] method5336(double var0, double var2, int var4) { - int var5 = var4 * 2 + 1; - double[] var6 = new double[var5]; - int var7 = -var4; + static PrivateChatMode[] method5359() { + return new PrivateChatMode[]{PrivateChatMode.field3789, PrivateChatMode.field3790, PrivateChatMode.field3788}; + } - for (int var8 = 0; var7 <= var4; ++var8) { - double var11 = FriendLoginUpdate.method5301(((double)var7 - var0) / var2) / var2; - var6[var8] = var11; - ++var7; - } - - return var6; + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "(III)I", + garbageValue = "-1942089973" + ) + static final int method5358(int var0, int var1) { + int var2 = var0 + var1 * 57; + var2 ^= var2 << 13; + int var3 = (var2 * var2 * 15731 + 789221) * var2 + 1376312589 & Integer.MAX_VALUE; + return var3 >> 19 & 255; } } diff --git a/runescape-client/src/main/java/class290.java b/runescape-client/src/main/java/class290.java index 3f52c22823..3e0335978d 100644 --- a/runescape-client/src/main/java/class290.java +++ b/runescape-client/src/main/java/class290.java @@ -1,19 +1,129 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kf") -public final class class290 { - @ObfuscatedName("a") - @Export("SpriteBuffer_pixels") - public static byte[][] SpriteBuffer_pixels; +@ObfuscatedName("kh") +public class class290 { + @ObfuscatedName("c") + static char[] field3646; + @ObfuscatedName("t") + static char[] field3648; + @ObfuscatedName("o") + static char[] field3647; + @ObfuscatedName("e") + static int[] field3645; - @ObfuscatedName("bk") + static { + field3646 = new char[64]; + + int var0; + for (var0 = 0; var0 < 26; ++var0) { + field3646[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { + field3646[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { + field3646[var0] = (char)(var0 + 48 - 52); + } + + field3646[62] = '+'; + field3646[63] = '/'; + field3648 = new char[64]; + + for (var0 = 0; var0 < 26; ++var0) { + field3648[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { + field3648[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { + field3648[var0] = (char)(var0 + 48 - 52); + } + + field3648[62] = '*'; + field3648[63] = '-'; + field3647 = new char[64]; + + for (var0 = 0; var0 < 26; ++var0) { + field3647[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { + field3647[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { + field3647[var0] = (char)(var0 + 48 - 52); + } + + field3647[62] = '-'; + field3647[63] = '_'; + field3645 = new int[128]; + + for (var0 = 0; var0 < field3645.length; ++var0) { + field3645[var0] = -1; + } + + for (var0 = 65; var0 <= 90; ++var0) { + field3645[var0] = var0 - 65; + } + + for (var0 = 97; var0 <= 122; ++var0) { + field3645[var0] = var0 - 97 + 26; + } + + for (var0 = 48; var0 <= 57; ++var0) { + field3645[var0] = var0 - 48 + 52; + } + + int[] var2 = field3645; + field3645[43] = 62; + var2[42] = 62; + int[] var1 = field3645; + field3645[47] = 63; + var1[45] = 63; + } + + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)I", - garbageValue = "-1637680700" + signature = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", + garbageValue = "-514037609" ) - public static int method5375(String var0) { - return var0.length() + 2; + public static String method5360(CharSequence[] var0, int var1, int var2) { + if (var2 == 0) { + return ""; + } else if (var2 == 1) { + CharSequence var3 = var0[var1]; + return var3 == null ? "null" : var3.toString(); + } else { + int var8 = var2 + var1; + int var4 = 0; + + for (int var5 = var1; var5 < var8; ++var5) { + CharSequence var6 = var0[var5]; + if (var6 == null) { + var4 += 4; + } else { + var4 += var6.length(); + } + } + + StringBuilder var9 = new StringBuilder(var4); + + for (int var10 = var1; var10 < var8; ++var10) { + CharSequence var7 = var0[var10]; + if (var7 == null) { + var9.append("null"); + } else { + var9.append(var7); + } + } + + return var9.toString(); + } } } diff --git a/runescape-client/src/main/java/class295.java b/runescape-client/src/main/java/class295.java deleted file mode 100644 index 1685ca1257..0000000000 --- a/runescape-client/src/main/java/class295.java +++ /dev/null @@ -1,16 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ka") -public class class295 { - @ObfuscatedName("jm") - @ObfuscatedSignature( - signature = "(ZB)V", - garbageValue = "-34" - ) - @Export("setTapToDrop") - static void setTapToDrop(boolean var0) { - Client.tapToDrop = var0; - } -} diff --git a/runescape-client/src/main/java/class296.java b/runescape-client/src/main/java/class296.java deleted file mode 100644 index e3d09c811b..0000000000 --- a/runescape-client/src/main/java/class296.java +++ /dev/null @@ -1,16 +0,0 @@ -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("km") -public final class class296 { - @ObfuscatedName("f") - @ObfuscatedGetter( - longValue = 6863597173679897189L - ) - static long field3687; - @ObfuscatedName("i") - @ObfuscatedGetter( - longValue = -2996809742532727575L - ) - static long field3688; -} diff --git a/runescape-client/src/main/java/class297.java b/runescape-client/src/main/java/class297.java deleted file mode 100644 index 715eea0fce..0000000000 --- a/runescape-client/src/main/java/class297.java +++ /dev/null @@ -1,13 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ks") -public class class297 { - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Lky;" - ) - @Export("NetCache_socket") - public static AbstractSocket NetCache_socket; -} diff --git a/runescape-client/src/main/java/class298.java b/runescape-client/src/main/java/class298.java new file mode 100644 index 0000000000..46ab3c1a40 --- /dev/null +++ b/runescape-client/src/main/java/class298.java @@ -0,0 +1,9 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("kt") +public class class298 { + @ObfuscatedName("l") + @Export("ItemDefinition_inMembersWorld") + public static boolean ItemDefinition_inMembersWorld; +} diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java index a29ecbd40d..6320d62155 100644 --- a/runescape-client/src/main/java/class3.java +++ b/runescape-client/src/main/java/class3.java @@ -1,257 +1,182 @@ -import java.applet.Applet; +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("w") +@ObfuscatedName("e") public class class3 implements Enumerated { - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lw;" + signature = "Le;" ) - public static final class3 field19; - @ObfuscatedName("i") + public static final class3 field22; + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lw;" + signature = "Le;" ) - public static final class3 field10; - @ObfuscatedName("y") + public static final class3 field15; + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lw;" + signature = "Le;" ) - public static final class3 field9; - @ObfuscatedName("dc") - @ObfuscatedSignature( - signature = "Lif;" - ) - @Export("archive8") - static Archive archive8; - @ObfuscatedName("fg") - @ObfuscatedSignature( - signature = "Lko;" - ) - @Export("fontPlain11") - static Font fontPlain11; - @ObfuscatedName("gz") - @ObfuscatedGetter( - intValue = 1624533233 - ) - static int field7; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 55070651 - ) - final int field15; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -1265968075 - ) - public final int field11; - @ObfuscatedName("b") - public final Class field12; + public static final class3 field16; @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lf;" + @ObfuscatedGetter( + intValue = -794176661 ) - final class0 field13; + final int field17; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 500011769 + ) + public final int field18; + @ObfuscatedName("g") + final Class field19; + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "Lc;" + ) + final class0 field20; static { - field19 = new class3(1, 0, Integer.class, new class1()); - field10 = new class3(2, 1, Long.class, new class2()); - field9 = new class3(0, 2, String.class, new class4()); + field22 = new class3(0, 0, Integer.class, new class1()); + field15 = new class3(1, 1, Long.class, new class2()); + field16 = new class3(2, 2, String.class, new class4()); } @ObfuscatedSignature( - signature = "(IILjava/lang/Class;Lf;)V" + signature = "(IILjava/lang/Class;Lc;)V" ) class3(int var1, int var2, Class var3, class0 var4) { - this.field15 = var1; - this.field11 = var2; - this.field12 = var3; - this.field13 = var4; + this.field17 = var1; + this.field18 = var2; + this.field19 = var3; + this.field20 = var4; } - @ObfuscatedName("i") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "-57" + garbageValue = "1" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field11; + return this.field18; } - @ObfuscatedName("y") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkq;I)Ljava/lang/Object;", - garbageValue = "868872918" + signature = "(Lkp;I)Ljava/lang/Object;", + garbageValue = "1079792403" ) public Object method38(Buffer var1) { - return this.field13.vmethod60(var1); + return this.field20.vmethod53(var1); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;B)I", - garbageValue = "-26" + signature = "(Ljava/lang/Class;I)Le;", + garbageValue = "1607211171" ) - public static int method35(CharSequence var0) { - int var1 = var0.length(); - int var2 = 0; + public static class3 method51(Class var0) { + class3[] var1 = new class3[]{field15, field22, field16}; + class3[] var2 = var1; - for (int var3 = 0; var3 < var1; ++var3) { - char var4 = var0.charAt(var3); - if (var4 <= 127) { - ++var2; - } else if (var4 <= 2047) { - var2 += 2; - } else { - var2 += 3; + for (int var3 = 0; var3 < var2.length; ++var3) { + class3 var4 = var2[var3]; + if (var4.field19 == var0) { + return var4; } } - return var2; + return null; } - @ObfuscatedName("f") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Ljava/lang/Object;Lkq;I)V", - garbageValue = "911012912" + signature = "(Ljava/lang/Object;Lkp;B)V", + garbageValue = "-3" ) - public static void method36(Object var0, Buffer var1) { - Class var3 = var0.getClass(); - class3[] var5 = new class3[]{field19, field9, field10}; - class3[] var6 = var5; - int var7 = 0; + public static void method35(Object var0, Buffer var1) { + class0 var2 = method36(var0.getClass()); + var2.vmethod55(var0, var1); + } - class3 var4; - while (true) { - if (var7 >= var6.length) { - var4 = null; - break; - } - - class3 var8 = var6[var7]; - if (var3 == var8.field12) { - var4 = var8; - break; - } - - ++var7; - } - - if (var4 == null) { + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(Ljava/lang/Class;I)Lc;", + garbageValue = "-201332195" + ) + static class0 method36(Class var0) { + class3 var1 = method51(var0); + if (var1 == null) { throw new IllegalArgumentException(); } else { - class0 var2 = var4.field13; - var2.vmethod53(var0, var1); + return var1.field20; } } - @ObfuscatedName("f") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ljava/applet/Applet;Ljava/lang/String;I)V", - garbageValue = "1416761199" + signature = "(B)V", + garbageValue = "-95" ) - public static void method39(Applet var0, String var1) { - class50.applet = var0; - if (var1 != null) { - class50.field410 = var1; - } - - } - - @ObfuscatedName("gf") - @ObfuscatedSignature( - signature = "(Lbv;I)V", - garbageValue = "-6957395" - ) - static final void method48(Actor var0) { - if (var0.field968 != 0) { - if (var0.targetIndex != -1) { - Object var1 = null; - if (var0.targetIndex < 32768) { - var1 = Client.npcs[var0.targetIndex]; - } else if (var0.targetIndex >= 32768) { - var1 = Client.players[var0.targetIndex - 32768]; - } - - if (var1 != null) { - int var2 = var0.x - ((Actor)var1).x; - int var3 = var0.y - ((Actor)var1).y; - if (var2 != 0 || var3 != 0) { - var0.orientation = (int)(Math.atan2((double)var2, (double)var3) * 325.949D) & 2047; - } - } else if (var0.false0) { - var0.targetIndex = -1; - var0.false0 = false; - } - } - - if (var0.field960 != -1 && (var0.pathLength == 0 || var0.field980 > 0)) { - var0.orientation = var0.field960; - var0.field960 = -1; - } - - int var4 = var0.orientation - var0.rotation & 2047; - if (var4 == 0 && var0.false0) { - var0.targetIndex = -1; - var0.false0 = false; - } - - if (var4 != 0) { - ++var0.field974; - boolean var6; - if (var4 > 1024) { - var0.rotation -= var0.field968; - var6 = true; - if (var4 < var0.field968 || var4 > 2048 - var0.field968) { - var0.rotation = var0.orientation; - var6 = false; - } - - if (var0.readySequence == var0.movementSequence && (var0.field974 > 25 || var6)) { - if (var0.turnLeftSequence != -1) { - var0.movementSequence = var0.turnLeftSequence; - } else { - var0.movementSequence = var0.walkSequence; - } - } - } else { - var0.rotation += var0.field968; - var6 = true; - if (var4 < var0.field968 || var4 > 2048 - var0.field968) { - var0.rotation = var0.orientation; - var6 = false; - } - - if (var0.readySequence == var0.movementSequence && (var0.field974 > 25 || var6)) { - if (var0.turnRightSequence != -1) { - var0.movementSequence = var0.turnRightSequence; - } else { - var0.movementSequence = var0.walkSequence; - } - } - } - - var0.rotation &= 2047; + public static void method52() { + try { + File var0 = new File(UserComparator4.userHomeDirectory, "random.dat"); + int var2; + if (var0.exists()) { + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); } else { - var0.field974 = 0; + label37: + for (int var1 = 0; var1 < class42.field373.length; ++var1) { + for (var2 = 0; var2 < ChatChannel.field1291.length; ++var2) { + File var3 = new File(ChatChannel.field1291[var2] + class42.field373[var1] + File.separatorChar + "random.dat"); + if (var3.exists()) { + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0); + break label37; + } + } + } } + if (JagexCache.JagexCache_randomDat == null) { + RandomAccessFile var4 = new RandomAccessFile(var0, "rw"); + var2 = var4.read(); + var4.seek(0L); + var4.write(var2); + var4.seek(0L); + var4.close(); + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); + } + } catch (IOException var5) { } + } - @ObfuscatedName("kw") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1387375929" + signature = "(IIII)I", + garbageValue = "310348252" ) - @Export("Clan_leaveChat") - static final void Clan_leaveChat() { - PacketBufferNode var0 = class2.getPacketBufferNode(ClientPacket.field2259, Client.packetWriter.isaacCipher); - var0.packetBuffer.writeByte(0); - Client.packetWriter.addNode(var0); + static final int method49(int var0, int var1, int var2) { + int var3 = var0 / var2; + int var4 = var0 & var2 - 1; + int var5 = var1 / var2; + int var6 = var1 & var2 - 1; + int var7 = UserComparator4.method3450(var3, var5); + int var8 = UserComparator4.method3450(var3 + 1, var5); + int var9 = UserComparator4.method3450(var3, var5 + 1); + int var10 = UserComparator4.method3450(var3 + 1, var5 + 1); + int var12 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; + int var11 = ((65536 - var12) * var7 >> 16) + (var8 * var12 >> 16); + int var14 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; + int var13 = ((65536 - var14) * var9 >> 16) + (var10 * var14 >> 16); + int var16 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var6 * 1024 / var2] >> 1; + int var15 = ((65536 - var16) * var11 >> 16) + (var16 * var13 >> 16); + return var15; } } diff --git a/runescape-client/src/main/java/class30.java b/runescape-client/src/main/java/class30.java index b8fd1ffae3..6f3bdd7a7c 100644 --- a/runescape-client/src/main/java/class30.java +++ b/runescape-client/src/main/java/class30.java @@ -1,187 +1,153 @@ +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.net.URL; +import java.net.URLConnection; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ak") +@ObfuscatedName("aj") public class class30 { - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Lak;" - ) - static final class30 field246; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lak;" - ) - static final class30 field251; - @ObfuscatedName("b") + @ObfuscatedName("sj") @ObfuscatedGetter( - intValue = 864715249 + longValue = -3315031402315742045L ) - static int field245; - @ObfuscatedName("d") + static long field274; + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "[Lli;" + signature = "Laj;" ) - @Export("title_muteSprite") - static IndexedSprite[] title_muteSprite; + static final class30 field270; @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -1588163073 + @ObfuscatedSignature( + signature = "Laj;" ) - @Export("graphicsTickTimeIdx") - static int graphicsTickTimeIdx; - @ObfuscatedName("y") + static final class30 field271; + @ObfuscatedName("h") + @Export("Tiles_lightness") + static int[] Tiles_lightness; + @ObfuscatedName("gy") + @Export("regionMapArchiveIds") + static int[] regionMapArchiveIds; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1815334447 + intValue = 404466751 ) @Export("value") final int value; static { - field246 = new class30(0); - field251 = new class30(1); + field270 = new class30(0); + field271 = new class30(1); } class30(int var1) { this.value = var1; } - @ObfuscatedName("y") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(ILkg;Lif;B)V", - garbageValue = "-8" + signature = "(B)J", + garbageValue = "25" ) - static void method543(int var0, ArchiveDisk var1, Archive var2) { - byte[] var3 = null; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - for (ArchiveDiskAction var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var5 != null; var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { - if ((long)var0 == var5.key && var1 == var5.archiveDisk && var5.type == 0) { - var3 = var5.data; - break; - } - } - } - - if (var3 != null) { - var2.load(var1, var0, var3, true); - } else { - byte[] var4 = var1.read(var0); - var2.load(var1, var0, var4, true); - } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "972731925" - ) - public static boolean method542(int var0) { - return (var0 >> 30 & 1) != 0; - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(B)Lfc;", - garbageValue = "14" - ) - public static Clock method540() { + static long method567() { try { - return new NanoClock(); - } catch (Throwable var1) { - return new MilliClock(); + URL var0 = new URL(class42.method809("services", false) + "m=accountappeal/login.ws"); + URLConnection var1 = var0.openConnection(); + var1.setRequestProperty("connection", "close"); + var1.setDoInput(true); + var1.setDoOutput(true); + var1.setConnectTimeout(5000); + OutputStreamWriter var2 = new OutputStreamWriter(var1.getOutputStream()); + var2.write("data1=req"); + var2.flush(); + InputStream var3 = var1.getInputStream(); + Buffer var4 = new Buffer(new byte[1000]); + + do { + int var5 = var3.read(var4.array, var4.offset, 1000 - var4.offset); + if (var5 == -1) { + var4.offset = 0; + long var7 = var4.readLong(); + return var7; + } + + var4.offset += var5; + } while(var4.offset < 1000); + + return 0L; + } catch (Exception var9) { + return 0L; } } - @ObfuscatedName("iz") + @ObfuscatedName("fm") @ObfuscatedSignature( - signature = "(Lbn;IIII)V", - garbageValue = "-1992004658" + signature = "(I)V", + garbageValue = "-1945263247" ) - @Export("addPlayerToMenu") - static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { - if (Message.localPlayer != var0) { - if (Client.menuOptionsCount < 400) { - String var4; - int var7; - if (var0.skillLevel == 0) { - String var5 = var0.actions[0] + var0.username + var0.actions[1]; - var7 = var0.combatLevel; - int var8 = Message.localPlayer.combatLevel; - int var9 = var8 - var7; - String var6; - if (var9 < -9) { - var6 = NPC.colorStartTag(16711680); - } else if (var9 < -6) { - var6 = NPC.colorStartTag(16723968); - } else if (var9 < -3) { - var6 = NPC.colorStartTag(16740352); - } else if (var9 < 0) { - var6 = NPC.colorStartTag(16756736); - } else if (var9 > 9) { - var6 = NPC.colorStartTag(65280); - } else if (var9 > 6) { - var6 = NPC.colorStartTag(4259584); - } else if (var9 > 3) { - var6 = NPC.colorStartTag(8453888); - } else if (var9 > 0) { - var6 = NPC.colorStartTag(12648192); - } else { - var6 = NPC.colorStartTag(16776960); - } + @Export("logOut") + static final void logOut() { + Client.packetWriter.close(); + Skeleton.method3152(); + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); + FontName.method5402(); + ObjectDefinition.ObjectDefinition_cached.clear(); + ObjectDefinition.ObjectDefinition_cachedModelData.clear(); + ObjectDefinition.ObjectDefinition_cachedEntities.clear(); + ObjectDefinition.ObjectDefinition_cachedModels.clear(); + NPCDefinition.NpcDefinition_cached.clear(); + NPCDefinition.NpcDefinition_cachedModels.clear(); + ItemDefinition.ItemDefinition_cached.clear(); + ItemDefinition.ItemDefinition_cachedModels.clear(); + ItemDefinition.ItemDefinition_cachedSprites.clear(); + SequenceDefinition.SequenceDefinition_cached.clear(); + SequenceDefinition.SequenceDefinition_cachedFrames.clear(); + WorldMapData_0.method181(); + WorldMapSection2.method342(); + WorldMapCacheName.method635(); + HitSplatDefinition.HitSplatDefinition_cached.clear(); + HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); + HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); + HealthBarDefinition.HealthBarDefinition_cached.clear(); + HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); + UserComparator7.method3481(); + class215.method4095(); + WallDecoration.method3359(); + PlayerAppearance.PlayerAppearance_cachedModels.clear(); + MilliClock.method3535(); + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); + Script.Script_cached.clear(); + GrandExchangeEvent.archive0.clearFiles(); + class65.archive1.clearFiles(); + class267.archive3.clearFiles(); + Client.archive4.clearFiles(); + NetSocket.archive5.clearFiles(); + MouseHandler.archive6.clearFiles(); + BuddyRankComparator.archive7.clearFiles(); + UserComparator8.archive8.clearFiles(); + GrandExchangeOfferNameComparator.archive9.clearFiles(); + HealthBar.archive10.clearFiles(); + GrandExchangeOffer.archive11.clearFiles(); + MilliClock.archive12.clearFiles(); + ServerBuild.scene.clear(); - var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; - } else { - var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; - } - - int var10; - if (Client.isItemSelected == 1) { - class1.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + NPC.colorStartTag(16777215) + var4, 14, var1, var2, var3); - } else if (Client.isSpellSelected) { - if ((ReflectionCheck.selectedSpellFlags & 8) == 8) { - class1.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + NPC.colorStartTag(16777215) + var4, 15, var1, var2, var3); - } - } else { - for (var10 = 7; var10 >= 0; --var10) { - if (Client.playerMenuActions[var10] != null) { - short var11 = 0; - if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { - if (Client.playerAttackOption == AttackOption.AttackOption_hidden) { - continue; - } - - if (Client.playerAttackOption == AttackOption.AttackOption_alwaysRightClick || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > Message.localPlayer.combatLevel) { - var11 = 2000; - } - - if (Message.localPlayer.team != 0 && var0.team != 0) { - if (var0.team == Message.localPlayer.team) { - var11 = 2000; - } else { - var11 = 0; - } - } - } else if (Client.playerOptionsPriorities[var10]) { - var11 = 2000; - } - - boolean var12 = false; - var7 = Client.playerMenuOpcodes[var10] + var11; - class1.insertMenuItemNoShift(Client.playerMenuActions[var10], NPC.colorStartTag(16777215) + var4, var7, var1, var2, var3); - } - } - } - - for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { - if (Client.menuOpcodes[var10] == 23) { - Client.menuTargets[var10] = NPC.colorStartTag(16777215) + var4; - break; - } - } - - } + for (int var0 = 0; var0 < 4; ++var0) { + Client.collisionMaps[var0].clear(); } + + System.gc(); + class197.field2414 = 1; + UserComparator5.musicTrackArchive = null; + class197.musicTrackGroupId = -1; + class83.musicTrackFileId = -1; + AttackOption.musicTrackVolume = 0; + KeyHandler.musicTrackBoolean = false; + class197.field2412 = 2; + Client.currentTrackGroupId = -1; + Client.field881 = false; + UrlRequest.method3375(); + Projectile.updateGameState(10); } } diff --git a/runescape-client/src/main/java/class300.java b/runescape-client/src/main/java/class301.java similarity index 94% rename from runescape-client/src/main/java/class300.java rename to runescape-client/src/main/java/class301.java index e551de539f..1fa5e47a95 100644 --- a/runescape-client/src/main/java/class300.java +++ b/runescape-client/src/main/java/class301.java @@ -1,9 +1,9 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("kh") -public class class300 { - @ObfuscatedName("f") +@ObfuscatedName("kd") +public class class301 { + @ObfuscatedName("c") @Export("writeRandomDat") public static void writeRandomDat(byte[] var0, int var1, byte[] var2, int var3, int var4) { if (var2 == var0) { @@ -51,7 +51,7 @@ public class class300 { } - @ObfuscatedName("d") + @ObfuscatedName("m") @Export("clearIntArray") public static void clearIntArray(int[] var0, int var1, int var2) { for (var2 = var2 + var1 - 7; var1 < var2; var0[var1++] = 0) { diff --git a/runescape-client/src/main/java/class312.java b/runescape-client/src/main/java/class312.java deleted file mode 100644 index 3f8d76e0a6..0000000000 --- a/runescape-client/src/main/java/class312.java +++ /dev/null @@ -1,100 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("lp") -public enum class312 implements Enumerated { - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Llp;" - ) - field3813(0, 0), - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Llp;" - ) - field3809(2, 2), - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "Llp;" - ) - field3815(3, 5), - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Llp;" - ) - field3812(1, 6), - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Llp;" - ) - field3810(4, 7), - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Llp;" - ) - field3814(5, 8); - - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = 427096005 - ) - final int field3811; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -1839498097 - ) - @Export("id") - final int id; - - class312(int var3, int var4) { - this.field3811 = var3; - this.id = var4; - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-57" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.id; - } - - @ObfuscatedName("jd") - @ObfuscatedSignature( - signature = "(Lha;Lii;IIZI)V", - garbageValue = "40878852" - ) - @Export("addWidgetItemMenuItem") - static final void addWidgetItemMenuItem(Widget var0, ItemDefinition var1, int var2, int var3, boolean var4) { - String[] var5 = var1.inventoryActions; - byte var6 = -1; - String var7 = null; - if (var5 != null && var5[var3] != null) { - if (var3 == 0) { - var6 = 33; - } else if (var3 == 1) { - var6 = 34; - } else if (var3 == 2) { - var6 = 35; - } else if (var3 == 3) { - var6 = 36; - } else { - var6 = 37; - } - - var7 = var5[var3]; - } else if (var3 == 4) { - var6 = 37; - var7 = "Drop"; - } - - if (var6 != -1 && var7 != null) { - AbstractWorldMapIcon.insertMenuItem(var7, NPC.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); - } - - } -} diff --git a/runescape-client/src/main/java/class313.java b/runescape-client/src/main/java/class313.java new file mode 100644 index 0000000000..c92bc7f997 --- /dev/null +++ b/runescape-client/src/main/java/class313.java @@ -0,0 +1,84 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ld") +public enum class313 implements Enumerated { + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "Lld;" + ) + field3815(5, 0), + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "Lld;" + ) + field3812(4, 2), + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "Lld;" + ) + field3809(1, 5), + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "Lld;" + ) + field3808(3, 6), + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "Lld;" + ) + field3811(2, 7), + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "Lld;" + ) + field3810(0, 8); + + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -2058457901 + ) + final int field3813; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -695700033 + ) + @Export("id") + final int id; + + class313(int var3, int var4) { + this.field3813 = var3; + this.id = var4; + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "(B)I", + garbageValue = "1" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.id; + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(I)Lli;", + garbageValue = "-432973503" + ) + public static IndexedSprite method5962() { + IndexedSprite var0 = new IndexedSprite(); + var0.width = GZipDecompressor.SpriteBuffer_spriteWidth; + var0.height = class326.SpriteBuffer_spriteHeight; + var0.xOffset = Huffman.SpriteBuffer_xOffsets[0]; + var0.yOffset = NPC.SpriteBuffer_yOffsets[0]; + var0.subWidth = class326.SpriteBuffer_spriteWidths[0]; + var0.subHeight = class326.SpriteBuffer_spriteHeights[0]; + var0.palette = class326.SpriteBuffer_spritePalette; + var0.pixels = class326.SpriteBuffer_pixels[0]; + DynamicObject.method2292(); + return var0; + } +} diff --git a/runescape-client/src/main/java/class32.java b/runescape-client/src/main/java/class32.java index 57ae28ca89..1350e3a3be 100644 --- a/runescape-client/src/main/java/class32.java +++ b/runescape-client/src/main/java/class32.java @@ -1,295 +1,19 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ah") +@ObfuscatedName("ay") public class class32 { - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(II)Lio;", - garbageValue = "-1785885039" - ) - public static HealthBarDefinition method548(int var0) { - HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var0); - var1 = new HealthBarDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-247808033" - ) - static void method549() { - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { - if (ArchiveDiskActionHandler.field3120 == 0) { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); - } - - ArchiveDiskActionHandler.field3120 = 600; - } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;II[BII)I", - garbageValue = "505270467" - ) - @Export("encodeStringCp1252") - public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { - int var5 = var2 - var1; - - for (int var6 = 0; var6 < var5; ++var6) { - char var7 = var0.charAt(var6 + var1); - if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { - var3[var6 + var4] = (byte)var7; - } else if (var7 == 8364) { - var3[var6 + var4] = -128; - } else if (var7 == 8218) { - var3[var6 + var4] = -126; - } else if (var7 == 402) { - var3[var6 + var4] = -125; - } else if (var7 == 8222) { - var3[var6 + var4] = -124; - } else if (var7 == 8230) { - var3[var6 + var4] = -123; - } else if (var7 == 8224) { - var3[var6 + var4] = -122; - } else if (var7 == 8225) { - var3[var6 + var4] = -121; - } else if (var7 == 710) { - var3[var6 + var4] = -120; - } else if (var7 == 8240) { - var3[var6 + var4] = -119; - } else if (var7 == 352) { - var3[var6 + var4] = -118; - } else if (var7 == 8249) { - var3[var6 + var4] = -117; - } else if (var7 == 338) { - var3[var6 + var4] = -116; - } else if (var7 == 381) { - var3[var6 + var4] = -114; - } else if (var7 == 8216) { - var3[var6 + var4] = -111; - } else if (var7 == 8217) { - var3[var6 + var4] = -110; - } else if (var7 == 8220) { - var3[var6 + var4] = -109; - } else if (var7 == 8221) { - var3[var6 + var4] = -108; - } else if (var7 == 8226) { - var3[var6 + var4] = -107; - } else if (var7 == 8211) { - var3[var6 + var4] = -106; - } else if (var7 == 8212) { - var3[var6 + var4] = -105; - } else if (var7 == 732) { - var3[var6 + var4] = -104; - } else if (var7 == 8482) { - var3[var6 + var4] = -103; - } else if (var7 == 353) { - var3[var6 + var4] = -102; - } else if (var7 == 8250) { - var3[var6 + var4] = -101; - } else if (var7 == 339) { - var3[var6 + var4] = -100; - } else if (var7 == 382) { - var3[var6 + var4] = -98; - } else if (var7 == 376) { - var3[var6 + var4] = -97; - } else { - var3[var6 + var4] = 63; - } - } - - return var5; - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "117" - ) - static final int method551(int var0, int var1) { - int var2 = WorldMapRegion.method536(var0 - 1, var1 - 1) + WorldMapRegion.method536(1 + var0, var1 - 1) + WorldMapRegion.method536(var0 - 1, var1 + 1) + WorldMapRegion.method536(var0 + 1, var1 + 1); - int var3 = WorldMapRegion.method536(var0 - 1, var1) + WorldMapRegion.method536(var0 + 1, var1) + WorldMapRegion.method536(var0, var1 - 1) + WorldMapRegion.method536(var0, 1 + var1); - int var4 = WorldMapRegion.method536(var0, var1); - return var2 / 16 + var3 / 8 + var4 / 4; - } - @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-577138619" + signature = "Llt;" ) - static final int method555(int var0, int var1) { - if (var0 == -1) { - return 12345678; - } else { - var1 = (var0 & 127) * var1 / 128; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } - - return (var0 & 65408) + var1; - } - } - - @ObfuscatedName("aa") + @Export("rightTitleSprite") + static Sprite rightTitleSprite; + @ObfuscatedName("bm") @ObfuscatedSignature( - signature = "(ILcu;ZB)I", - garbageValue = "-35" + signature = "Lli;" ) - static int method559(int var0, Script var1, boolean var2) { - Widget var3 = Tile.getWidget(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]); - if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = class14.method157(WorldMapSection0.getWidgetClickMask(var3)); - return 1; - } else if (var0 != ScriptOpcodes.IF_GETOP) { - if (var0 == ScriptOpcodes.IF_GETOPBASE) { - if (var3.dataText == null) { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3.dataText; - } - - return 1; - } else { - return 2; - } - } else { - int var4 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - --var4; - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3.actions[var4]; - } else { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "118209259" - ) - public static void method557(boolean var0) { - if (var0 != ItemDefinition.ItemDefinition_inMembersWorld) { - class54.method1104(); - ItemDefinition.ItemDefinition_inMembersWorld = var0; - } - - } - - @ObfuscatedName("hf") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1594017150" - ) - static final void method556() { - for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (var0.hitpoints == -1) { - var0.delay = 0; - SequenceDefinition.method4821(var0); - } else { - var0.remove(); - } - } - - } - - @ObfuscatedName("in") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;Lha;B)Ljava/lang/String;", - garbageValue = "-110" - ) - static String method553(String var0, Widget var1) { - if (var0.indexOf("%") != -1) { - for (int var2 = 1; var2 <= 5; ++var2) { - while (true) { - int var3 = var0.indexOf("%" + var2); - if (var3 == -1) { - break; - } - - String var4 = var0.substring(0, var3); - int var6 = User.method5076(var1, var2 - 1); - String var5; - if (var6 < 999999999) { - var5 = Integer.toString(var6); - } else { - var5 = "*"; - } - - var0 = var4 + var5 + var0.substring(var3 + 2); - } - } - } - - return var0; - } - - @ObfuscatedName("jn") - @ObfuscatedSignature( - signature = "(Lha;IIZB)V", - garbageValue = "-35" - ) - @Export("alignWidgetSize") - static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { - int var4 = var0.width; - int var5 = var0.height; - if (var0.widthAlignment == 0) { - var0.width = var0.rawWidth; - } else if (var0.widthAlignment == 1) { - var0.width = var1 - var0.rawWidth; - } else if (var0.widthAlignment == 2) { - var0.width = var0.rawWidth * var1 >> 14; - } - - if (var0.heightAlignment == 0) { - var0.height = var0.rawHeight; - } else if (var0.heightAlignment == 1) { - var0.height = var2 - var0.rawHeight; - } else if (var0.heightAlignment == 2) { - var0.height = var2 * var0.rawHeight >> 14; - } - - if (var0.widthAlignment == 4) { - var0.width = var0.field2617 * var0.height / var0.field2569; - } - - if (var0.heightAlignment == 4) { - var0.height = var0.field2569 * var0.width / var0.field2617; - } - - if (var0.contentType == 1337) { - Client.viewportWidget = var0; - } - - if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { - ScriptEvent var6 = new ScriptEvent(); - var6.widget = var0; - var6.args = var0.onResize; - Client.scriptEvents.addFirst(var6); - } - - } + @Export("worldSelectRightSprite") + static IndexedSprite worldSelectRightSprite; } diff --git a/runescape-client/src/main/java/class320.java b/runescape-client/src/main/java/class320.java new file mode 100644 index 0000000000..9f4b3366f2 --- /dev/null +++ b/runescape-client/src/main/java/class320.java @@ -0,0 +1,13 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("lq") +public class class320 { + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1209977249 + ) + @Export("Interpreter_intStackSize") + static int Interpreter_intStackSize; +} diff --git a/runescape-client/src/main/java/class325.java b/runescape-client/src/main/java/class325.java deleted file mode 100644 index e770e8a112..0000000000 --- a/runescape-client/src/main/java/class325.java +++ /dev/null @@ -1,34 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("lz") -public class class325 { - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -1370932437 - ) - @Export("SpriteBuffer_spriteCount") - public static int SpriteBuffer_spriteCount; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 14463585 - ) - @Export("SpriteBuffer_spriteWidth") - public static int SpriteBuffer_spriteWidth; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = 1456048807 - ) - @Export("SpriteBuffer_spriteHeight") - public static int SpriteBuffer_spriteHeight; - @ObfuscatedName("w") - @Export("SpriteBuffer_xOffsets") - public static int[] SpriteBuffer_xOffsets; - @ObfuscatedName("p") - @Export("SpriteBuffer_yOffsets") - public static int[] SpriteBuffer_yOffsets; - @ObfuscatedName("e") - @Export("SpriteBuffer_spriteHeights") - public static int[] SpriteBuffer_spriteHeights; -} diff --git a/runescape-client/src/main/java/class326.java b/runescape-client/src/main/java/class326.java new file mode 100644 index 0000000000..d17ecf1f72 --- /dev/null +++ b/runescape-client/src/main/java/class326.java @@ -0,0 +1,31 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("lx") +public class class326 { + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 1194876757 + ) + @Export("SpriteBuffer_spriteCount") + public static int SpriteBuffer_spriteCount; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -7287781 + ) + @Export("SpriteBuffer_spriteHeight") + public static int SpriteBuffer_spriteHeight; + @ObfuscatedName("g") + @Export("SpriteBuffer_spriteWidths") + public static int[] SpriteBuffer_spriteWidths; + @ObfuscatedName("d") + @Export("SpriteBuffer_spriteHeights") + public static int[] SpriteBuffer_spriteHeights; + @ObfuscatedName("l") + @Export("SpriteBuffer_spritePalette") + public static int[] SpriteBuffer_spritePalette; + @ObfuscatedName("j") + @Export("SpriteBuffer_pixels") + public static byte[][] SpriteBuffer_pixels; +} diff --git a/runescape-client/src/main/java/class336.java b/runescape-client/src/main/java/class336.java deleted file mode 100644 index 249c4e97ab..0000000000 --- a/runescape-client/src/main/java/class336.java +++ /dev/null @@ -1,21 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("lt") -public class class336 { - @ObfuscatedName("d") - static final int[] field4020; - @ObfuscatedName("c") - static final int[] field4021; - - static { - field4020 = new int[2048]; - field4021 = new int[2048]; - double var0 = 0.0030679615757712823D; - - for (int var2 = 0; var2 < 2048; ++var2) { - field4020[var2] = (int)(65536.0D * Math.sin((double)var2 * var0)); - field4021[var2] = (int)(65536.0D * Math.cos((double)var2 * var0)); - } - - } -} diff --git a/runescape-client/src/main/java/class337.java b/runescape-client/src/main/java/class337.java new file mode 100644 index 0000000000..71c46bd1d3 --- /dev/null +++ b/runescape-client/src/main/java/class337.java @@ -0,0 +1,21 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("ls") +public class class337 { + @ObfuscatedName("m") + static final int[] field4016; + @ObfuscatedName("p") + static final int[] field4025; + + static { + field4016 = new int[2048]; + field4025 = new int[2048]; + double var0 = 0.0030679615757712823D; + + for (int var2 = 0; var2 < 2048; ++var2) { + field4016[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2)); + field4025[var2] = (int)(65536.0D * Math.cos((double)var2 * var0)); + } + + } +} diff --git a/runescape-client/src/main/java/class338.java b/runescape-client/src/main/java/class338.java deleted file mode 100644 index 4de6cd6f06..0000000000 --- a/runescape-client/src/main/java/class338.java +++ /dev/null @@ -1,14 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("mj") -public class class338 { - @ObfuscatedName("y") - public static final char[] field4037; - @ObfuscatedName("w") - public static final char[] field4035; - - static { - field4037 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; - field4035 = new char[]{'[', ']', '#'}; - } -} diff --git a/runescape-client/src/main/java/class339.java b/runescape-client/src/main/java/class339.java index 54c58cc3e4..9216ac5d2b 100644 --- a/runescape-client/src/main/java/class339.java +++ b/runescape-client/src/main/java/class339.java @@ -1,14 +1,14 @@ import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mp") +@ObfuscatedName("mj") public class class339 { - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "321161362" - ) - public static int method6563(int var0) { - return var0 >> 17 & 7; + @ObfuscatedName("o") + static final char[] field4042; + @ObfuscatedName("e") + static final char[] field4041; + + static { + field4042 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; + field4041 = new char[]{'[', ']', '#'}; } } diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index 7ee0b5a0dd..65e1a40144 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -1,111 +1,109 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("p") +@ObfuscatedName("i") final class class4 implements class0 { - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(Ljava/lang/Object;Lkq;I)V", - garbageValue = "-685052934" + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -905472929 ) - public void vmethod53(Object var1, Buffer var2) { - this.method51((String)var1, var2); + static int field26; + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "Lkp;" + ) + @Export("NetCache_reference") + static Buffer NetCache_reference; + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(Ljava/lang/Object;Lkp;B)V", + garbageValue = "95" + ) + public void vmethod55(Object var1, Buffer var2) { + this.method54((String)var1, var2); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lkq;I)Ljava/lang/Object;", - garbageValue = "390816352" + signature = "(Lkp;I)Ljava/lang/Object;", + garbageValue = "1665636232" ) - public Object vmethod60(Buffer var1) { + public Object vmethod53(Buffer var1) { return var1.readStringCp1252NullTerminated(); } - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;Lkq;I)V", - garbageValue = "1310089464" - ) - void method51(String var1, Buffer var2) { - var2.writeStringCp1252NullTerminated(var1); - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(ILhz;IIIZI)V", - garbageValue = "-1294056256" - ) - public static void method59(int var0, AbstractArchive var1, int var2, int var3, int var4, boolean var5) { - class197.field2392 = 1; - Coord.musicTrackArchive = var1; - class16.musicTrackGroupId = var2; - GrandExchangeOffer.musicTrackFileId = var3; - class197.musicTrackVolume = var4; - WorldMapDecoration.musicTrackBoolean = var5; - ParamDefinition.field3275 = var0; - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "(IB)Leq;", - garbageValue = "103" - ) - @Export("getFrames") - static Frames getFrames(int var0) { - Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); - if (var1 != null) { - return var1; - } else { - AbstractArchive var3 = SequenceDefinition.SequenceDefinition_animationsArchive; - AbstractArchive var4 = SequenceDefinition.SequenceDefinition_skeletonsArchive; - boolean var5 = true; - int[] var6 = var3.getGroupFileIds(var0); - - for (int var7 = 0; var7 < var6.length; ++var7) { - byte[] var8 = var3.getFile(var0, var6[var7]); - if (var8 == null) { - var5 = false; - } else { - int var9 = (var8[0] & 255) << 8 | var8[1] & 255; - byte[] var10 = var4.getFile(var9, 0); - if (var10 == null) { - var5 = false; - } - } - } - - Frames var2; - if (!var5) { - var2 = null; - } else { - try { - var2 = new Frames(var3, var4, var0, false); - } catch (Exception var12) { - var2 = null; - } - } - - if (var2 != null) { - SequenceDefinition.SequenceDefinition_cachedFrames.put(var2, (long)var0); - } - - return var2; - } - } - @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(Lhz;IB)Z", - garbageValue = "-83" + signature = "(Ljava/lang/String;Lkp;I)V", + garbageValue = "1837357255" ) - static boolean method61(AbstractArchive var0, int var1) { - byte[] var2 = var0.takeFileFlat(var1); - if (var2 == null) { - return false; - } else { - AbstractWorldMapIcon.SpriteBuffer_decode(var2); - return true; + void method54(String var1, Buffer var2) { + var2.writeStringCp1252NullTerminated(var1); + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "1447651687" + ) + static int method57() { + return ++Messages.Messages_count - 1; + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(Lbw;I)V", + garbageValue = "1307142310" + ) + @Export("runScriptEvent") + public static void runScriptEvent(ScriptEvent var0) { + WorldMapID.runScript(var0, 500000); + } + + @ObfuscatedName("hz") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-2068371159" + ) + static final void method64() { + int var0 = ArchiveDiskAction.menuX; + int var1 = SecureRandomCallable.menuY; + int var2 = InterfaceParent.menuWidth; + int var3 = Message.menuHeight; + int var4 = 6116423; + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, var4); + Rasterizer2D.Rasterizer2D_fillRectangle(var0 + 1, var1 + 1, var2 - 2, 16, 0); + Rasterizer2D.Rasterizer2D_drawRectangle(var0 + 1, var1 + 18, var2 - 2, var3 - 19, 0); + class1.fontBold12.draw("Choose Option", var0 + 3, var1 + 14, var4, -1); + int var5 = MouseHandler.MouseHandler_x; + int var6 = MouseHandler.MouseHandler_y; + + int var7; + int var8; + int var9; + for (var7 = 0; var7 < Client.menuOptionsCount; ++var7) { + var8 = var1 + (Client.menuOptionsCount - 1 - var7) * 15 + 31; + var9 = 16777215; + if (var5 > var0 && var5 < var0 + var2 && var6 > var8 - 13 && var6 < var8 + 3) { + var9 = 16776960; + } + + class1.fontBold12.draw(VerticalAlignment.method4426(var7), var0 + 3, var8, var9, 0); } + + var7 = ArchiveDiskAction.menuX; + var8 = SecureRandomCallable.menuY; + var9 = InterfaceParent.menuWidth; + int var10 = Message.menuHeight; + + for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { + if (Client.rootWidgetWidths[var11] + Client.rootWidgetXs[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var8 + var10) { + Client.field852[var11] = true; + } + } + } } diff --git a/runescape-client/src/main/java/class40.java b/runescape-client/src/main/java/class40.java index 8de6d8e86f..558d216ed5 100644 --- a/runescape-client/src/main/java/class40.java +++ b/runescape-client/src/main/java/class40.java @@ -3,26 +3,24 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ac") +@ObfuscatedName("av") public class class40 { - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 890126163 - ) - static int field336; - @ObfuscatedName("gm") + @ObfuscatedName("v") + @Export("Tiles_hueMultiplier") + static int[] Tiles_hueMultiplier; + @ObfuscatedName("gr") @ObfuscatedSignature( - signature = "Lls;" + signature = "[Llt;" ) - @Export("redHintArrowSprite") - static Sprite redHintArrowSprite; - @ObfuscatedName("f") + @Export("headIconPrayerSprites") + static Sprite[] headIconPrayerSprites; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1677674321 + intValue = -207951793 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("tileTemplates") byte[][][] tileTemplates; @@ -30,25 +28,25 @@ public class class40 { this.pixelsPerTile = var1; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(IIIIIIIII)V", - garbageValue = "-876031007" + garbageValue = "-1008655546" ) void method736(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { if (var7 != 0 && this.pixelsPerTile != 0 && this.tileTemplates != null) { - var8 = this.method727(var8, var7); - var7 = this.method728(var7); + var8 = this.method737(var8, var7); + var7 = this.method740(var7); Rasterizer2D.Rasterizer2D_drawGradientPixels(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "-2145199421" + garbageValue = "-88869818" ) - int method727(int var1, int var2) { + int method737(int var1, int var2) { if (var2 == 9) { var1 = var1 + 1 & 3; } @@ -64,12 +62,12 @@ public class class40 { return var1; } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "327680" + signature = "(IB)I", + garbageValue = "-50" ) - int method728(int var1) { + int method740(int var1) { if (var1 != 9 && var1 != 10) { return var1 == 11 ? 8 : var1; } else { @@ -77,10 +75,10 @@ public class class40 { } } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1496491774" + garbageValue = "1894948040" ) @Export("init") void init() { @@ -97,10 +95,10 @@ public class class40 { } } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "2131351823" + garbageValue = "-382009936" ) @Export("init0") void init0() { @@ -164,10 +162,10 @@ public class class40 { this.tileTemplates[0][3] = var1; } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-706960701" + garbageValue = "1984222504" ) @Export("init1") void init1() { @@ -235,10 +233,10 @@ public class class40 { this.tileTemplates[1][3] = var1; } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-98" + signature = "(I)V", + garbageValue = "728163043" ) @Export("init2") void init2() { @@ -302,10 +300,10 @@ public class class40 { this.tileTemplates[2][3] = var1; } - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1429091802" + garbageValue = "-1802429738" ) @Export("init3") void init3() { @@ -369,10 +367,10 @@ public class class40 { this.tileTemplates[3][3] = var1; } - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1595701030" + garbageValue = "-647414873" ) @Export("init4") void init4() { @@ -436,10 +434,10 @@ public class class40 { this.tileTemplates[4][3] = var1; } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "-12923" + signature = "(I)V", + garbageValue = "-1171855086" ) @Export("init5") void init5() { @@ -505,10 +503,10 @@ public class class40 { this.tileTemplates[5][3] = var1; } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1129170979" + signature = "(B)V", + garbageValue = "0" ) @Export("init6") void init6() { @@ -574,10 +572,10 @@ public class class40 { this.tileTemplates[6][3] = var1; } - @ObfuscatedName("o") + @ObfuscatedName("h") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1818794515" + garbageValue = "-106861274" ) @Export("init7") void init7() { @@ -643,12 +641,164 @@ public class class40 { this.tileTemplates[7][3] = var1; } - @ObfuscatedName("ac") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "98" + signature = "(Lks;II)Z", + garbageValue = "-1391671587" ) - static int method762(int var0) { - return (int)Math.pow(2.0D, (double)((float)var0 / 256.0F + 7.0F)); + @Export("updateExternalPlayer") + static boolean updateExternalPlayer(PacketBuffer var0, int var1) { + int var2 = var0.readBits(2); + int var3; + int var4; + int var7; + int var8; + int var9; + int var10; + if (var2 == 0) { + if (var0.readBits(1) != 0) { + updateExternalPlayer(var0, var1); + } + + var3 = var0.readBits(13); + var4 = var0.readBits(13); + boolean var12 = var0.readBits(1) == 1; + if (var12) { + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; + } + + if (Client.players[var1] != null) { + throw new RuntimeException(); + } else { + Player var6 = Client.players[var1] = new Player(); + var6.index = var1; + if (Players.field1235[var1] != null) { + var6.read(Players.field1235[var1]); + } + + var6.orientation = Players.Players_orientations[var1]; + var6.targetIndex = Players.Players_targetIndices[var1]; + var7 = Players.Players_regions[var1]; + var8 = var7 >> 28; + var9 = var7 >> 14 & 255; + var10 = var7 & 255; + var6.pathTraversed[0] = Players.field1237[var1]; + var6.plane = (byte)var8; + var6.resetPath((var9 << 13) + var3 - Messages.baseX * 64, (var10 << 13) + var4 - Language.baseY * 64); + var6.field621 = false; + return true; + } + } else if (var2 == 1) { + var3 = var0.readBits(2); + var4 = Players.Players_regions[var1]; + Players.Players_regions[var1] = (var4 & 268435455) + (((var4 >> 28) + var3 & 3) << 28); + return false; + } else { + int var5; + int var11; + if (var2 == 2) { + var3 = var0.readBits(5); + var4 = var3 >> 3; + var5 = var3 & 7; + var11 = Players.Players_regions[var1]; + var7 = (var11 >> 28) + var4 & 3; + var8 = var11 >> 14 & 255; + var9 = var11 & 255; + if (var5 == 0) { + --var8; + --var9; + } + + if (var5 == 1) { + --var9; + } + + if (var5 == 2) { + ++var8; + --var9; + } + + if (var5 == 3) { + --var8; + } + + if (var5 == 4) { + ++var8; + } + + if (var5 == 5) { + --var8; + ++var9; + } + + if (var5 == 6) { + ++var9; + } + + if (var5 == 7) { + ++var8; + ++var9; + } + + Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); + return false; + } else { + var3 = var0.readBits(18); + var4 = var3 >> 16; + var5 = var3 >> 8 & 255; + var11 = var3 & 255; + var7 = Players.Players_regions[var1]; + var8 = (var7 >> 28) + var4 & 3; + var9 = var5 + (var7 >> 14) & 255; + var10 = var11 + var7 & 255; + Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); + return false; + } + } + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;B)Ljava/lang/String;", + garbageValue = "-56" + ) + public static String method735(String var0) { + int var1 = var0.length(); + char[] var2 = new char[var1]; + byte var3 = 2; + + for (int var4 = 0; var4 < var1; ++var4) { + char var5 = var0.charAt(var4); + if (var3 == 0) { + var5 = Character.toLowerCase(var5); + } else if (var3 == 2 || Character.isUpperCase(var5)) { + char var6; + if (var5 != 181 && var5 != 402) { + var6 = Character.toTitleCase(var5); + } else { + var6 = var5; + } + + var5 = var6; + } + + if (Character.isLetter(var5)) { + var3 = 0; + } else if (var5 != '.' && var5 != '?' && var5 != '!') { + if (Character.isSpaceChar(var5)) { + if (var3 != 2) { + var3 = 1; + } + } else { + var3 = 1; + } + } else { + var3 = 2; + } + + var2[var4] = var5; + } + + return new String(var2); } } diff --git a/runescape-client/src/main/java/class42.java b/runescape-client/src/main/java/class42.java index 2eac94a5dd..41eb1a443c 100644 --- a/runescape-client/src/main/java/class42.java +++ b/runescape-client/src/main/java/class42.java @@ -1,449 +1,303 @@ +import java.awt.FontMetrics; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ae") +@ObfuscatedName("ad") public class class42 implements WorldMapSection { - @ObfuscatedName("sy") - @ObfuscatedSignature( - signature = "Llx;" - ) - @Export("platformInfo") - static PlatformInfo platformInfo; - @ObfuscatedName("f") + @ObfuscatedName("q") + public static String[] field373; + @ObfuscatedName("aj") + @Export("loginScreenFontMetrics") + static FontMetrics loginScreenFontMetrics; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 876812837 + intValue = -794430173 ) - int field355; - @ObfuscatedName("i") + int field371; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -533343471 + intValue = 1085068769 ) - int field350; - @ObfuscatedName("y") + int field367; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1956244031 + intValue = -1005090491 ) - int field349; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -1105762903 - ) - int field358; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -199863857 - ) - int field351; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -1075817101 - ) - int field352; + int field366; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1187703403 + intValue = 283016431 ) - int field348; - @ObfuscatedName("x") + int field369; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1352980527 + intValue = -15254045 ) - int field354; - @ObfuscatedName("a") + int field372; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -197811131 + intValue = -865271583 ) - int field347; + int field370; @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 305542163 + intValue = 1602446289 ) - int field356; + int field376; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -2003918993 + ) + int field368; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -500974497 + ) + int field374; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 1662707559 + ) + int field375; class42() { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Laa;I)V", - garbageValue = "515570621" + signature = "(Lae;I)V", + garbageValue = "-1034100543" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field351) { - var1.regionLowX = this.field351; + if (var1.regionLowX > this.field372) { + var1.regionLowX = this.field372; } - if (var1.regionHighX < this.field351) { - var1.regionHighX = this.field351; + if (var1.regionHighX < this.field372) { + var1.regionHighX = this.field372; } - if (var1.regionLowY > this.field352) { - var1.regionLowY = this.field352; + if (var1.regionLowY > this.field370) { + var1.regionLowY = this.field370; } - if (var1.regionHighY < this.field352) { - var1.regionHighY = this.field352; + if (var1.regionHighY < this.field370) { + var1.regionHighY = this.field370; } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IIII)Z", - garbageValue = "2033433479" + signature = "(IIIB)Z", + garbageValue = "-110" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.field355 && var1 < this.field355 + this.field350) { - return var2 >= (this.field349 << 6) + (this.field348 << 3) && var2 <= (this.field349 << 6) + (this.field348 << 3) + 7 && var3 >= (this.field358 << 6) + (this.field354 << 3) && var3 <= (this.field358 << 6) + (this.field354 << 3) + 7; + if (var1 >= this.field371 && var1 < this.field371 + this.field367) { + return var2 >= (this.field366 << 6) + (this.field376 << 3) && var2 <= (this.field366 << 6) + (this.field376 << 3) + 7 && var3 >= (this.field369 << 6) + (this.field368 << 3) && var3 <= (this.field369 << 6) + (this.field368 << 3) + 7; } else { return false; } } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(IIB)Z", - garbageValue = "-66" + garbageValue = "37" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >= (this.field351 << 6) + (this.field347 << 3) && var1 <= (this.field351 << 6) + (this.field347 << 3) + 7 && var2 >= (this.field352 << 6) + (this.field356 << 3) && var2 <= (this.field352 << 6) + (this.field356 << 3) + 7; + return var1 >= (this.field372 << 6) + (this.field374 << 3) && var1 <= (this.field372 << 6) + (this.field374 << 3) + 7 && var2 >= (this.field370 << 6) + (this.field375 << 3) && var2 <= (this.field370 << 6) + (this.field375 << 3) + 7; } - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(IIII)[I", - garbageValue = "1684413985" + garbageValue = "-96920779" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { if (!this.containsCoord(var1, var2, var3)) { return null; } else { - int[] var4 = new int[]{this.field351 * 64 - this.field349 * 64 + var2 + (this.field347 * 8 - this.field348 * 8), var3 + (this.field352 * 64 - this.field358 * 64) + (this.field356 * 8 - this.field354 * 8)}; + int[] var4 = new int[]{this.field372 * 64 - this.field366 * 64 + var2 + (this.field374 * 8 - this.field376 * 8), var3 + (this.field370 * 64 - this.field369 * 64) + (this.field375 * 8 - this.field368 * 8)}; return var4; } } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IIB)Lht;", - garbageValue = "21" + signature = "(III)Lhj;", + garbageValue = "911083222" ) @Export("coord") public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { return null; } else { - int var3 = this.field349 * 64 - this.field351 * 64 + (this.field348 * 8 - this.field347 * 8) + var1; - int var4 = this.field358 * 64 - this.field352 * 64 + var2 + (this.field354 * 8 - this.field356 * 8); - return new Coord(this.field355, var3, var4); + int var3 = this.field366 * 64 - this.field372 * 64 + (this.field376 * 8 - this.field374 * 8) + var1; + int var4 = this.field369 * 64 - this.field370 * 64 + var2 + (this.field368 * 8 - this.field375 * 8); + return new Coord(this.field371, var3, var4); } } - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lkq;B)V", - garbageValue = "74" + signature = "(Lkp;B)V", + garbageValue = "76" ) @Export("read") public void read(Buffer var1) { - this.field355 = var1.readUnsignedByte(); - this.field350 = var1.readUnsignedByte(); - this.field349 = var1.readUnsignedShort(); - this.field348 = var1.readUnsignedByte(); - this.field358 = var1.readUnsignedShort(); - this.field354 = var1.readUnsignedByte(); - this.field351 = var1.readUnsignedShort(); - this.field347 = var1.readUnsignedByte(); - this.field352 = var1.readUnsignedShort(); - this.field356 = var1.readUnsignedByte(); - this.method771(); + this.field371 = var1.readUnsignedByte(); + this.field367 = var1.readUnsignedByte(); + this.field366 = var1.readUnsignedShort(); + this.field376 = var1.readUnsignedByte(); + this.field369 = var1.readUnsignedShort(); + this.field368 = var1.readUnsignedByte(); + this.field372 = var1.readUnsignedShort(); + this.field374 = var1.readUnsignedByte(); + this.field370 = var1.readUnsignedShort(); + this.field375 = var1.readUnsignedByte(); + this.method788(); } - @ObfuscatedName("e") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "794869852" + signature = "(B)V", + garbageValue = "-111" ) - void method771() { + void method788() { } - @ObfuscatedName("i") - public static boolean method790(long var0) { - boolean var2 = var0 != 0L; - if (var2) { - boolean var3 = (int)(var0 >>> 16 & 1L) == 1; - var2 = !var3; + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(CLgl;B)I", + garbageValue = "15" + ) + @Export("lowercaseChar") + static int lowercaseChar(char var0, Language var1) { + int var2 = var0 << 4; + if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { + var0 = Character.toLowerCase(var0); + var2 = (var0 << 4) + 1; + } + + if (var0 == 241 && var1 == Language.Language_ES) { + var2 = 1762; } return var2; } - @ObfuscatedName("e") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "1817896162" + signature = "(ILce;ZB)I", + garbageValue = "1" ) - public static boolean method792() { - return class197.field2392 != 0 ? true : GZipDecompressor.midiPcmStream.isReady(); + static int method810(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var3 = Varps.getWidget(Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize]); + } else { + var3 = var2 ? class186.field2331 : MidiPcmStream.field2444; + } + + if (var0 == ScriptOpcodes.CC_CALLONRESIZE) { + if (Interpreter.field1088 >= 10) { + throw new RuntimeException(); + } else if (var3.onResize == null) { + return 0; + } else { + ScriptEvent var4 = new ScriptEvent(); + var4.widget = var3; + var4.args = var3.onResize; + var4.field582 = Interpreter.field1088 + 1; + Client.scriptEvents.addFirst(var4); + return 1; + } + } else { + return 2; + } } - @ObfuscatedName("d") + @ObfuscatedName("kf") @ObfuscatedSignature( - signature = "(Lko;Lko;S)V", - garbageValue = "-12122" + signature = "(Ljava/lang/String;ZS)Ljava/lang/String;", + garbageValue = "-9068" ) - static void method781(Font var0, Font var1) { - if (Calendar.worldSelectBackSprites == null) { - Calendar.worldSelectBackSprites = class80.method2058(class3.archive8, "sl_back", ""); + static String method809(String var0, boolean var1) { + String var2 = var1 ? "https://" : "http://"; + if (Client.gameBuild == 1) { + var0 = var0 + "-wtrc"; + } else if (Client.gameBuild == 2) { + var0 = var0 + "-wtqa"; + } else if (Client.gameBuild == 3) { + var0 = var0 + "-wtwip"; + } else if (Client.gameBuild == 5) { + var0 = var0 + "-wti"; + } else if (Client.gameBuild == 4) { + var0 = "local"; } - if (AbstractWorldMapIcon.worldSelectFlagSprites == null) { - AbstractWorldMapIcon.worldSelectFlagSprites = class195.method3667(class3.archive8, "sl_flags", ""); + String var3 = ""; + if (GameShell.field477 != null) { + var3 = "/p=" + GameShell.field477; } - if (Message.worldSelectArrows == null) { - Message.worldSelectArrows = class195.method3667(class3.archive8, "sl_arrows", ""); - } - - if (SpotAnimationDefinition.worldSelectStars == null) { - SpotAnimationDefinition.worldSelectStars = class195.method3667(class3.archive8, "sl_stars", ""); - } - - if (GrandExchangeEvent.worldSelectLeftSprite == null) { - GrandExchangeEvent.worldSelectLeftSprite = Canvas.SpriteBuffer_getIndexedSpriteByName(class3.archive8, "leftarrow", ""); - } - - if (UserList.worldSelectRightSprite == null) { - UserList.worldSelectRightSprite = Canvas.SpriteBuffer_getIndexedSpriteByName(class3.archive8, "rightarrow", ""); - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); - Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); - Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); - var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); - if (SpotAnimationDefinition.worldSelectStars != null) { - SpotAnimationDefinition.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); - var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); - SpotAnimationDefinition.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); - var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); - } - - int var4; - int var5; - if (Message.worldSelectArrows != null) { - int var2 = Login.xPadding + 280; - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { - Message.worldSelectArrows[2].drawAt(var2, 4); - } else { - Message.worldSelectArrows[0].drawAt(var2, 4); - } - - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { - Message.worldSelectArrows[3].drawAt(var2 + 15, 4); - } else { - Message.worldSelectArrows[1].drawAt(var2 + 15, 4); - } - - var0.draw("World", var2 + 32, 17, 16777215, -1); - int var3 = Login.xPadding + 390; - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { - Message.worldSelectArrows[2].drawAt(var3, 4); - } else { - Message.worldSelectArrows[0].drawAt(var3, 4); - } - - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { - Message.worldSelectArrows[3].drawAt(var3 + 15, 4); - } else { - Message.worldSelectArrows[1].drawAt(var3 + 15, 4); - } - - var0.draw("Players", var3 + 32, 17, 16777215, -1); - var4 = Login.xPadding + 500; - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { - Message.worldSelectArrows[2].drawAt(var4, 4); - } else { - Message.worldSelectArrows[0].drawAt(var4, 4); - } - - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { - Message.worldSelectArrows[3].drawAt(var4 + 15, 4); - } else { - Message.worldSelectArrows[1].drawAt(var4 + 15, 4); - } - - var0.draw("Location", var4 + 32, 17, 16777215, -1); - var5 = Login.xPadding + 610; - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { - Message.worldSelectArrows[2].drawAt(var5, 4); - } else { - Message.worldSelectArrows[0].drawAt(var5, 4); - } - - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { - Message.worldSelectArrows[3].drawAt(var5 + 15, 4); - } else { - Message.worldSelectArrows[1].drawAt(var5 + 15, 4); - } - - var0.draw("Type", var5 + 32, 17, 16777215, -1); - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); - var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); - Login.hoveredWorldIndex = -1; - if (Calendar.worldSelectBackSprites != null) { - byte var23 = 88; - byte var24 = 19; - var4 = 765 / (var23 + 1) - 1; - var5 = 480 / (var24 + 1); - - int var6; - int var7; - do { - var6 = var5; - var7 = var4; - if (var5 * (var4 - 1) >= World.World_count) { - --var4; - } - - if (var4 * (var5 - 1) >= World.World_count) { - --var5; - } - - if (var4 * (var5 - 1) >= World.World_count) { - --var5; - } - } while(var6 != var5 || var7 != var4); - - var6 = (765 - var23 * var4) / (var4 + 1); - if (var6 > 5) { - var6 = 5; - } - - var7 = (480 - var24 * var5) / (var5 + 1); - if (var7 > 5) { - var7 = 5; - } - - int var8 = (765 - var4 * var23 - var6 * (var4 - 1)) / 2; - int var9 = (480 - var24 * var5 - var7 * (var5 - 1)) / 2; - int var10 = (var5 + World.World_count - 1) / var5; - Login.worldSelectPagesCount = var10 - var4; - if (GrandExchangeEvent.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { - GrandExchangeEvent.worldSelectLeftSprite.drawAt(8, AttackOption.canvasHeight / 2 - GrandExchangeEvent.worldSelectLeftSprite.subHeight / 2); - } - - if (UserList.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { - UserList.worldSelectRightSprite.drawAt(GrandExchangeOfferTotalQuantityComparator.canvasWidth - UserList.worldSelectRightSprite.subWidth - 8, AttackOption.canvasHeight / 2 - UserList.worldSelectRightSprite.subHeight / 2); - } - - int var11 = var9 + 23; - int var12 = var8 + Login.xPadding; - int var13 = 0; - boolean var14 = false; - int var15 = Login.worldSelectPage; - - int var16; - for (var16 = var5 * var15; var16 < World.World_count && var15 - Login.worldSelectPage < var4; ++var16) { - World var22 = class162.World_worlds[var16]; - boolean var18 = true; - String var19 = Integer.toString(var22.population); - if (var22.population == -1) { - var19 = "OFF"; - var18 = false; - } else if (var22.population > 1980) { - var19 = "FULL"; - var18 = false; - } - - int var21 = 0; - byte var20; - if (var22.isBeta()) { - if (var22.isMembersOnly()) { - var20 = 7; - } else { - var20 = 6; - } - } else if (var22.isDeadman()) { - var21 = 16711680; - if (var22.isMembersOnly()) { - var20 = 5; - } else { - var20 = 4; - } - } else if (var22.method1775()) { - if (var22.isMembersOnly()) { - var20 = 9; - } else { - var20 = 8; - } - } else if (var22.isPvp()) { - if (var22.isMembersOnly()) { - var20 = 3; - } else { - var20 = 2; - } - } else if (var22.isMembersOnly()) { - var20 = 1; - } else { - var20 = 0; - } - - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var11 && MouseHandler.MouseHandler_x < var12 + var23 && MouseHandler.MouseHandler_y < var24 + var11 && var18) { - Login.hoveredWorldIndex = var16; - Calendar.worldSelectBackSprites[var20].drawTransOverlayAt(var12, var11, 128, 16777215); - var14 = true; - } else { - Calendar.worldSelectBackSprites[var20].drawAt(var12, var11); - } - - if (AbstractWorldMapIcon.worldSelectFlagSprites != null) { - AbstractWorldMapIcon.worldSelectFlagSprites[(var22.isMembersOnly() ? 8 : 0) + var22.location].drawAt(var12 + 29, var11); - } - - var0.drawCentered(Integer.toString(var22.id), var12 + 15, var24 / 2 + var11 + 5, var21, -1); - var1.drawCentered(var19, var12 + 60, var24 / 2 + var11 + 5, 268435455, -1); - var11 = var11 + var24 + var7; - ++var13; - if (var13 >= var5) { - var11 = var9 + 23; - var12 = var12 + var6 + var23; - var13 = 0; - ++var15; - } - } - - if (var14) { - var16 = var1.stringWidth(class162.World_worlds[Login.hoveredWorldIndex].activity) + 6; - int var17 = var1.ascent + 8; - int var25 = MouseHandler.MouseHandler_y + 25; - if (var25 + var17 > 480) { - var25 = MouseHandler.MouseHandler_y - 25 - var17; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var16 / 2, var25, var16, var17, 16777120); - Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var16 / 2, var25, var16, var17, 0); - var1.drawCentered(class162.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var25 + var1.ascent + 4, 0, -1); - } - } - - IgnoreList.rasterProvider.drawFull(0, 0); + String var4 = "runescape.com"; + return var2 + var0 + "." + var4 + "/l=" + FriendLoginUpdate.clientLanguage + "/a=" + Client.field672 + var3 + "/"; } - @ObfuscatedName("ju") + @ObfuscatedName("kw") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "283959833" + signature = "(Ljava/lang/String;ZI)V", + garbageValue = "572595678" ) - @Export("getTapToDrop") - static boolean getTapToDrop() { - return Client.tapToDrop; + @Export("findItemDefinitions") + static void findItemDefinitions(String var0, boolean var1) { + var0 = var0.toLowerCase(); + short[] var2 = new short[16]; + int var3 = 0; + + for (int var4 = 0; var4 < ItemDefinition.ItemDefinition_fileCount; ++var4) { + ItemDefinition var5 = HealthBarDefinition.ItemDefinition_get(var4); + if ((!var1 || var5.isTradable) && var5.noteTemplate == -1 && var5.name.toLowerCase().indexOf(var0) != -1) { + if (var3 >= 250) { + class162.foundItemIdCount = -1; + WorldMapData_0.foundItemIds = null; + return; + } + + if (var3 >= var2.length) { + short[] var6 = new short[var2.length * 2]; + + for (int var7 = 0; var7 < var3; ++var7) { + var6[var7] = var2[var7]; + } + + var2 = var6; + } + + var2[var3++] = (short)var4; + } + } + + WorldMapData_0.foundItemIds = var2; + AbstractByteArrayCopier.foundItemIndex = 0; + class162.foundItemIdCount = var3; + String[] var8 = new String[class162.foundItemIdCount]; + + for (int var9 = 0; var9 < class162.foundItemIdCount; ++var9) { + var8[var9] = HealthBarDefinition.ItemDefinition_get(var2[var9]).name; + } + + short[] var10 = WorldMapData_0.foundItemIds; + FriendLoginUpdate.sortItemsByName(var8, var10, 0, var8.length - 1); } } diff --git a/runescape-client/src/main/java/class43.java b/runescape-client/src/main/java/class43.java new file mode 100644 index 0000000000..54a558d632 --- /dev/null +++ b/runescape-client/src/main/java/class43.java @@ -0,0 +1,69 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("am") +public final class class43 { + @ObfuscatedName("qp") + @ObfuscatedSignature( + signature = "Ldw;" + ) + @Export("pcmPlayer1") + static PcmPlayer pcmPlayer1; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -2015849949 + ) + static int field381; + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(II)Lbn;", + garbageValue = "-983073165" + ) + @Export("Messages_getMessage") + static Message Messages_getMessage(int var0) { + return (Message)Messages.Messages_hashTable.get((long)var0); + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "(II)I", + garbageValue = "-1093470855" + ) + public static int method816(int var0) { + return class14.method169(ViewportMouse.ViewportMouse_entityTags[var0]); + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "(Lks;B)V", + garbageValue = "-25" + ) + static final void method813(PacketBuffer var0) { + for (int var1 = 0; var1 < Players.Players_pendingUpdateCount; ++var1) { + int var2 = Players.Players_pendingUpdateIndices[var1]; + Player var3 = Client.players[var2]; + int var4 = var0.readUnsignedByte(); + if ((var4 & 4) != 0) { + var4 += var0.readUnsignedByte() << 8; + } + + AbstractWorldMapIcon.method613(var0, var2, var3, var4); + } + + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)V", + garbageValue = "-67193374" + ) + static final void method817(String var0) { + PacketBufferNode var1 = TilePaint.getPacketBufferNode(ClientPacket.field2240, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var0)); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); + } +} diff --git a/runescape-client/src/main/java/class46.java b/runescape-client/src/main/java/class46.java deleted file mode 100644 index 6b1e284d17..0000000000 --- a/runescape-client/src/main/java/class46.java +++ /dev/null @@ -1,16 +0,0 @@ -import java.applet.Applet; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import netscape.javascript.JSObject; - -@ObfuscatedName("at") -public class class46 { - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(Ljava/applet/Applet;Ljava/lang/String;I)V", - garbageValue = "273320241" - ) - public static void method846(Applet var0, String var1) throws Throwable { - JSObject.getWindow(var0).eval(var1); - } -} diff --git a/runescape-client/src/main/java/class47.java b/runescape-client/src/main/java/class47.java new file mode 100644 index 0000000000..9e32698640 --- /dev/null +++ b/runescape-client/src/main/java/class47.java @@ -0,0 +1,16 @@ +import java.applet.Applet; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import netscape.javascript.JSObject; + +@ObfuscatedName("ag") +public class class47 { + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(Ljava/applet/Applet;Ljava/lang/String;I)Ljava/lang/Object;", + garbageValue = "1719913469" + ) + public static Object method857(Applet var0, String var1) throws Throwable { + return JSObject.getWindow(var0).call(var1, (Object[])null); + } +} diff --git a/runescape-client/src/main/java/class48.java b/runescape-client/src/main/java/class48.java deleted file mode 100644 index ea3ab0bae1..0000000000 --- a/runescape-client/src/main/java/class48.java +++ /dev/null @@ -1,149 +0,0 @@ -import java.util.Date; -import javax.imageio.ImageIO; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ap") -public class class48 { - @ObfuscatedName("bw") - @ObfuscatedSignature( - signature = "Lhi;" - ) - static ServerBuild field402; - @ObfuscatedName("du") - @ObfuscatedSignature( - signature = "Lif;" - ) - @Export("archive11") - static Archive archive11; - - static { - ImageIO.setUseCache(false); - } - - @ObfuscatedName("f") - public static String method864(long var0) { - Calendar.Calendar_calendar.setTime(new Date(var0)); - int var2 = Calendar.Calendar_calendar.get(7); - int var3 = Calendar.Calendar_calendar.get(5); - int var4 = Calendar.Calendar_calendar.get(2); - int var5 = Calendar.Calendar_calendar.get(1); - int var6 = Calendar.Calendar_calendar.get(11); - int var7 = Calendar.Calendar_calendar.get(12); - int var8 = Calendar.Calendar_calendar.get(13); - return Calendar.DAYS_OF_THE_WEEK[var2 - 1] + ", " + var3 / 10 + var3 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var4] + "-" + var5 + " " + var6 / 10 + var6 % 10 + ":" + var7 / 10 + var7 % 10 + ":" + var8 / 10 + var8 % 10 + " GMT"; - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "(Lif;IB)V", - garbageValue = "114" - ) - static void method862(Archive var0, int var1) { - if (NetCache.NetCache_reference != null) { - NetCache.NetCache_reference.offset = var1 * 8 + 5; - int var2 = NetCache.NetCache_reference.readInt(); - int var3 = NetCache.NetCache_reference.readInt(); - var0.loadIndex(var2, var3); - } else { - class226.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); - NetCache.NetCache_archives[var1] = var0; - } - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "([BIIIIIII[Lfp;I)V", - garbageValue = "264841801" - ) - static final void method858(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, CollisionMap[] var8) { - int var10; - for (int var9 = 0; var9 < 8; ++var9) { - for (var10 = 0; var10 < 8; ++var10) { - if (var9 + var2 > 0 && var9 + var2 < 103 && var3 + var10 > 0 && var3 + var10 < 103) { - int[] var10000 = var8[var1].flags[var9 + var2]; - var10000[var10 + var3] &= -16777217; - } - } - } - - Buffer var20 = new Buffer(var0); - - for (var10 = 0; var10 < 4; ++var10) { - for (int var11 = 0; var11 < 64; ++var11) { - for (int var12 = 0; var12 < 64; ++var12) { - if (var10 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) { - int var17 = var11 & 7; - int var18 = var12 & 7; - int var19 = var7 & 3; - int var16; - if (var19 == 0) { - var16 = var17; - } else if (var19 == 1) { - var16 = var18; - } else if (var19 == 2) { - var16 = 7 - var17; - } else { - var16 = 7 - var18; - } - - PrivateChatMode.loadTerrain(var20, var1, var16 + var2, var3 + class206.method3926(var11 & 7, var12 & 7, var7), 0, 0, var7); - } else { - PrivateChatMode.loadTerrain(var20, 0, -1, -1, 0, 0, 0); - } - } - } - } - - } - - @ObfuscatedName("fo") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-767929178" - ) - static int method861() { - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { - int var0 = 0; - - for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { - var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; - } - - return var0 * 10000 / Client.field629; - } else { - return 10000; - } - } - - @ObfuscatedName("fy") - @ObfuscatedSignature( - signature = "(IZZZI)Lif;", - garbageValue = "959698373" - ) - @Export("newArchive") - static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) { - ArchiveDisk var4 = null; - if (JagexCache.JagexCache_dat2File != null) { - var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, AttackOption.JagexCache_idxFiles[var0], 1000000); - } - - return new Archive(var4, WorldMapRectangle.masterDisk, var0, var1, var2, var3); - } - - @ObfuscatedName("lf") - @ObfuscatedSignature( - signature = "(Lkq;II)V", - garbageValue = "197920071" - ) - static void method859(Buffer var0, int var1) { - byte[] var2 = var0.array; - if (Client.randomDatData == null) { - Client.randomDatData = new byte[24]; - } - - class300.writeRandomDat(var2, var1, Client.randomDatData, 0, 24); - class160.method3432(var0, var1); - } -} diff --git a/runescape-client/src/main/java/class49.java b/runescape-client/src/main/java/class49.java new file mode 100644 index 0000000000..5b663142c6 --- /dev/null +++ b/runescape-client/src/main/java/class49.java @@ -0,0 +1,197 @@ +import javax.imageio.ImageIO; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ab") +public class class49 { + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "Lii;" + ) + @Export("HitSplatDefinition_archive") + public static AbstractArchive HitSplatDefinition_archive; + + static { + ImageIO.setUseCache(false); + } + + @ObfuscatedName("fd") + @ObfuscatedSignature( + signature = "(III)V", + garbageValue = "-624446357" + ) + @Export("playSoundJingle") + static void playSoundJingle(int var0, int var1) { + if (Client.musicVolume != 0 && var0 != -1) { + Archive var2 = GrandExchangeOffer.archive11; + int var3 = Client.musicVolume; + class197.field2414 = 1; + UserComparator5.musicTrackArchive = var2; + class197.musicTrackGroupId = var0; + class83.musicTrackFileId = 0; + AttackOption.musicTrackVolume = var3; + KeyHandler.musicTrackBoolean = false; + class197.field2412 = 10000; + Client.field881 = true; + } + + } + + @ObfuscatedName("hk") + @ObfuscatedSignature( + signature = "(Lks;I)V", + garbageValue = "-815942128" + ) + static final void method866(PacketBuffer var0) { + for (int var1 = 0; var1 < Client.field690; ++var1) { + int var2 = Client.field867[var1]; + NPC var3 = Client.npcs[var2]; + int var4 = var0.readUnsignedByte(); + if ((var4 & 4) != 0) { + var3.targetIndex = var0.readUnsignedShort(); + if (var3.targetIndex == 65535) { + var3.targetIndex = -1; + } + } + + int var5; + if ((var4 & 2) != 0) { + var3.spotAnimation = var0.method5762(); + var5 = var0.method5626(); + var3.field980 = var5 >> 16; + var3.field979 = (var5 & 65535) + Client.cycle; + var3.spotAnimationFrame = 0; + var3.spotAnimationFrameCycle = 0; + if (var3.field979 > Client.cycle) { + var3.spotAnimationFrame = -1; + } + + if (var3.spotAnimation == 65535) { + var3.spotAnimation = -1; + } + } + + if ((var4 & 32) != 0) { + var3.overheadText = var0.readStringCp1252NullTerminated(); + var3.overheadTextCyclesRemaining = 100; + } + + int var6; + int var7; + int var8; + if ((var4 & 1) != 0) { + var5 = var0.method5606(); + int var9; + int var10; + int var11; + if (var5 > 0) { + for (var6 = 0; var6 < var5; ++var6) { + var8 = -1; + var9 = -1; + var10 = -1; + var7 = var0.readUShortSmart(); + if (var7 == 32767) { + var7 = var0.readUShortSmart(); + var9 = var0.readUShortSmart(); + var8 = var0.readUShortSmart(); + var10 = var0.readUShortSmart(); + } else if (var7 != 32766) { + var9 = var0.readUShortSmart(); + } else { + var7 = -1; + } + + var11 = var0.readUShortSmart(); + var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11); + } + } + + var6 = var0.readUnsignedByte(); + if (var6 > 0) { + for (var7 = 0; var7 < var6; ++var7) { + var8 = var0.readUShortSmart(); + var9 = var0.readUShortSmart(); + if (var9 != 32767) { + var10 = var0.readUShortSmart(); + var11 = var0.readUnsignedByte(); + int var12 = var9 > 0 ? var0.method5606() : var11; + var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); + } else { + var3.removeHealthBar(var8); + } + } + } + } + + if ((var4 & 64) != 0) { + var3.field981 = var0.method5618(); + var3.field957 = var0.method5618(); + var3.field961 = var0.method5618(); + var3.field991 = var0.readByte(); + var3.field985 = var0.method5614() + Client.cycle; + var3.field986 = var0.method5614() + Client.cycle; + var3.field987 = var0.method5762(); + var3.pathLength = 1; + var3.field998 = 0; + var3.field981 += var3.pathX[0]; + var3.field957 += var3.pathY[0]; + var3.field961 += var3.pathX[0]; + var3.field991 += var3.pathY[0]; + } + + if ((var4 & 8) != 0) { + var5 = var0.method5614(); + if (var5 == 65535) { + var5 = -1; + } + + var6 = var0.readUnsignedByte(); + if (var5 == var3.sequence && var5 != -1) { + var7 = GraphicsDefaults.SequenceDefinition_get(var5).field3516; + if (var7 == 1) { + var3.sequenceFrame = 0; + var3.sequenceFrameCycle = 0; + var3.sequenceDelay = var6; + var3.field983 = 0; + } + + if (var7 == 2) { + var3.field983 = 0; + } + } else if (var5 == -1 || var3.sequence == -1 || GraphicsDefaults.SequenceDefinition_get(var5).field3508 >= GraphicsDefaults.SequenceDefinition_get(var3.sequence).field3508) { + var3.sequence = var5; + var3.sequenceFrame = 0; + var3.sequenceFrameCycle = 0; + var3.sequenceDelay = var6; + var3.field983 = 0; + var3.field998 = var3.pathLength; + } + } + + if ((var4 & 16) != 0) { + var3.definition = NetCache.getNpcDefinition(var0.method5762()); + var3.field942 = var3.definition.size * 64; + var3.field975 = var3.definition.rotation; + var3.walkSequence = var3.definition.walkSequence; + var3.walkBackSequence = var3.definition.walkBackSequence; + var3.walkLeftSequence = var3.definition.walkLeftSequence; + var3.walkRightSequence = var3.definition.walkRightSequence; + var3.readySequence = var3.definition.readySequence; + var3.turnLeftSequence = var3.definition.turnLeftSequence; + var3.turnRightSequence = var3.definition.turnRightSequence; + } + + if ((var4 & 128) != 0) { + var5 = var0.method5762(); + var6 = var0.method5614(); + var7 = var3.x - (var5 - Messages.baseX * 64 - Messages.baseX * 64) * 64; + var8 = var3.y - (var6 - Language.baseY * 64 - Language.baseY * 64) * 64; + if (var7 != 0 || var8 != 0) { + var3.field967 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047; + } + } + } + + } +} diff --git a/runescape-client/src/main/java/class50.java b/runescape-client/src/main/java/class50.java deleted file mode 100644 index b57a6330be..0000000000 --- a/runescape-client/src/main/java/class50.java +++ /dev/null @@ -1,37 +0,0 @@ -import java.applet.Applet; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("am") -public class class50 { - @ObfuscatedName("f") - @Export("applet") - static Applet applet; - @ObfuscatedName("i") - static String field410; - - static { - applet = null; - field410 = ""; - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(II)Lku;", - garbageValue = "-1375036887" - ) - public static PrivateChatMode method893(int var0) { - PrivateChatMode[] var1 = new PrivateChatMode[]{PrivateChatMode.field3791, PrivateChatMode.field3790, PrivateChatMode.field3792}; - PrivateChatMode[] var2 = var1; - - for (int var3 = 0; var3 < var2.length; ++var3) { - PrivateChatMode var4 = var2[var3]; - if (var0 == var4.field3793) { - return var4; - } - } - - return null; - } -} diff --git a/runescape-client/src/main/java/class51.java b/runescape-client/src/main/java/class51.java new file mode 100644 index 0000000000..909cc3fc3a --- /dev/null +++ b/runescape-client/src/main/java/class51.java @@ -0,0 +1,131 @@ +import java.applet.Applet; +import java.security.SecureRandom; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ah") +public class class51 { + @ObfuscatedName("rp") + @ObfuscatedGetter( + intValue = -101053789 + ) + static int field435; + @ObfuscatedName("c") + @Export("applet") + public static Applet applet; + @ObfuscatedName("t") + public static String field431; + @ObfuscatedName("cm") + public static char field432; + @ObfuscatedName("hn") + @ObfuscatedGetter( + intValue = 1911186179 + ) + @Export("cameraY") + static int cameraY; + + static { + applet = null; + field431 = ""; + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(I)Ljava/security/SecureRandom;", + garbageValue = "848753494" + ) + static SecureRandom method896() { + SecureRandom var0 = new SecureRandom(); + var0.nextInt(); + return var0; + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "(II)I", + garbageValue = "827233636" + ) + @Export("Messages_getHistorySize") + static int Messages_getHistorySize(int var0) { + ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); + return var1 == null ? 0 : var1.size(); + } + + @ObfuscatedName("fb") + @ObfuscatedSignature( + signature = "(IZZZI)Lia;", + garbageValue = "-987500203" + ) + @Export("newArchive") + static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) { + ArchiveDisk var4 = null; + if (JagexCache.JagexCache_dat2File != null) { + var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, MilliClock.JagexCache_idxFiles[var0], 1000000); + } + + return new Archive(var4, TileItem.masterDisk, var0, var1, var2, var3); + } + + @ObfuscatedName("gw") + @ObfuscatedSignature( + signature = "(Lba;ZI)V", + garbageValue = "-504714497" + ) + @Export("addPlayerToScene") + static void addPlayerToScene(Player var0, boolean var1) { + if (var0 != null && var0.isVisible() && !var0.isHidden) { + var0.isUnanimated = false; + if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.movementSequence == var0.readySequence) { + var0.isUnanimated = true; + } + + int var2 = var0.x >> 7; + int var3 = var0.y >> 7; + if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { + long var4 = GameShell.calculateTag(0, 0, 0, false, var0.index); + if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { + var0.isUnanimated = false; + var0.tileHeight = WorldMapSectionType.getTileHeight(var0.x, var0.y, Clock.Client_plane); + var0.playerCycle = Client.cycle; + ServerBuild.scene.addNullableObject(Clock.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.field626, var0.field627, var0.field628, var0.field629); + } else { + if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { + if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { + return; + } + + Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; + } + + var0.tileHeight = WorldMapSectionType.getTileHeight(var0.x, var0.y, Clock.Client_plane); + var0.playerCycle = Client.cycle; + ServerBuild.scene.drawEntity(Clock.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); + } + } + } + + } + + @ObfuscatedName("jp") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "2078000833" + ) + @Export("Widget_resetModelFrames") + static final void Widget_resetModelFrames(int var0) { + if (ScriptFrame.loadInterface(var0)) { + Widget[] var1 = WorldMapLabel.Widget_interfaceComponents[var0]; + + for (int var2 = 0; var2 < var1.length; ++var2) { + Widget var3 = var1[var2]; + if (var3 != null) { + var3.modelFrame = 0; + var3.modelFrameCycle = 0; + } + } + + } + } +} diff --git a/runescape-client/src/main/java/class54.java b/runescape-client/src/main/java/class54.java deleted file mode 100644 index 30b0585393..0000000000 --- a/runescape-client/src/main/java/class54.java +++ /dev/null @@ -1,47 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("bw") -public final class class54 { - @ObfuscatedName("bo") - @ObfuscatedSignature( - signature = "Lli;" - ) - static IndexedSprite field483; - @ObfuscatedName("eo") - @ObfuscatedGetter( - intValue = -460965205 - ) - static int field482; - @ObfuscatedName("kc") - @ObfuscatedGetter( - intValue = -612545979 - ) - @Export("menuHeight") - static int menuHeight; - - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-2012474432" - ) - static void method1105() { - Messages.Messages_channels.clear(); - Messages.Messages_hashTable.clear(); - Messages.Messages_queue.clear(); - Messages.Messages_count = 0; - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-396551795" - ) - public static void method1104() { - ItemDefinition.ItemDefinition_cached.clear(); - ItemDefinition.ItemDefinition_cachedModels.clear(); - ItemDefinition.ItemDefinition_cachedSprites.clear(); - } -} diff --git a/runescape-client/src/main/java/class60.java b/runescape-client/src/main/java/class60.java index 58a55fc6e2..7b53d3f6bf 100644 --- a/runescape-client/src/main/java/class60.java +++ b/runescape-client/src/main/java/class60.java @@ -1,411 +1,66 @@ -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InvalidClassException; -import java.io.ObjectInputStream; -import java.io.OptionalDataException; -import java.io.StreamCorruptedException; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.Date; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("by") public class class60 { - @ObfuscatedName("gg") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "[Lli;" + signature = "(IIIB)Llt;", + garbageValue = "-75" ) - @Export("scrollBarSprites") - static IndexedSprite[] scrollBarSprites; - @ObfuscatedName("ha") - @ObfuscatedGetter( - intValue = -1555429919 - ) - @Export("cameraY") - static int cameraY; - - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "(Lkl;B)V", - garbageValue = "64" - ) - @Export("performReflectionCheck") - public static void performReflectionCheck(PacketBuffer var0) { - ReflectionCheck var1 = (ReflectionCheck)class117.reflectionChecks.last(); - if (var1 != null) { - int var2 = var0.offset; - var0.writeInt(var1.id); - - for (int var3 = 0; var3 < var1.size; ++var3) { - if (var1.creationErrors[var3] != 0) { - var0.writeByte(var1.creationErrors[var3]); - } else { - try { - int var4 = var1.operations[var3]; - Field var5; - int var6; - if (var4 == 0) { - var5 = var1.fields[var3]; - var6 = Reflection.getInt(var5, (Object)null); - var0.writeByte(0); - var0.writeInt(var6); - } else if (var4 == 1) { - var5 = var1.fields[var3]; - Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); - var0.writeByte(0); - } else if (var4 == 2) { - var5 = var1.fields[var3]; - var6 = var5.getModifiers(); - var0.writeByte(0); - var0.writeInt(var6); - } - - Method var25; - if (var4 != 3) { - if (var4 == 4) { - var25 = var1.methods[var3]; - var6 = var25.getModifiers(); - var0.writeByte(0); - var0.writeInt(var6); - } - } else { - var25 = var1.methods[var3]; - byte[][] var10 = var1.arguments[var3]; - Object[] var7 = new Object[var10.length]; - - for (int var8 = 0; var8 < var10.length; ++var8) { - ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); - var7[var8] = var9.readObject(); - } - - Object var11 = Reflection.invoke(var25, (Object)null, var7); - if (var11 == null) { - var0.writeByte(0); - } else if (var11 instanceof Number) { - var0.writeByte(1); - var0.writeLong(((Number)var11).longValue()); - } else if (var11 instanceof String) { - var0.writeByte(2); - var0.writeStringCp1252NullTerminated((String)var11); - } else { - var0.writeByte(4); - } - } - } catch (ClassNotFoundException var13) { - var0.writeByte(-10); - } catch (InvalidClassException var14) { - var0.writeByte(-11); - } catch (StreamCorruptedException var15) { - var0.writeByte(-12); - } catch (OptionalDataException var16) { - var0.writeByte(-13); - } catch (IllegalAccessException var17) { - var0.writeByte(-14); - } catch (IllegalArgumentException var18) { - var0.writeByte(-15); - } catch (InvocationTargetException var19) { - var0.writeByte(-16); - } catch (SecurityException var20) { - var0.writeByte(-17); - } catch (IOException var21) { - var0.writeByte(-18); - } catch (NullPointerException var22) { - var0.writeByte(-19); - } catch (Exception var23) { - var0.writeByte(-20); - } catch (Throwable var24) { - var0.writeByte(-21); - } - } - } - - var0.writeCrc(var2); - var1.remove(); - } + static Sprite method1187(int var0, int var1, int var2) { + DemotingHashTable var3 = WorldMapRegion.WorldMapRegion_cachedSprites; + long var4 = (long)(var2 << 16 | var0 << 8 | var1); + return (Sprite)var3.get(var4); } - @ObfuscatedName("p") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(ILcu;ZI)I", - garbageValue = "102357643" + signature = "(Ljava/lang/String;I)V", + garbageValue = "399191905" ) - static int method1170(int var0, Script var1, boolean var2) { - int var3 = -1; - Widget var4; - if (var0 >= 2000) { - var0 -= 1000; - var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - var4 = Tile.getWidget(var3); - } else { - var4 = var2 ? UserComparator7.field1946 : class197.field2398; - } - - if (var0 == ScriptOpcodes.CC_SETPOSITION) { - class188.Interpreter_intStackSize -= 4; - var4.rawX = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var4.rawY = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - var4.xAlignment = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2]; - var4.yAlignment = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 3]; - LoginPacket.invalidateWidget(var4); - class206.client.alignWidget(var4); - if (var3 != -1 && var4.type == 0) { - Messages.revalidateWidgetScroll(UserComparator7.Widget_interfaceComponents[var3 >> 16], var4, false); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETSIZE) { - class188.Interpreter_intStackSize -= 4; - var4.rawWidth = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var4.rawHeight = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - var4.widthAlignment = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2]; - var4.heightAlignment = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 3]; - LoginPacket.invalidateWidget(var4); - class206.client.alignWidget(var4); - if (var3 != -1 && var4.type == 0) { - Messages.revalidateWidgetScroll(UserComparator7.Widget_interfaceComponents[var3 >> 16], var4, false); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETHIDE) { - boolean var5 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - if (var5 != var4.isHidden) { - var4.isHidden = var5; - LoginPacket.invalidateWidget(var4); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { - var4.noClickThrough = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { - var4.noScrollThrough = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1; - return 1; - } else { - return 2; - } + static final void method1188(String var0) { + ClientPreferences.addGameMessage(30, "", var0); } - @ObfuscatedName("ao") + @ObfuscatedName("in") @ObfuscatedSignature( - signature = "(ILcu;ZB)I", - garbageValue = "81" + signature = "(B)V", + garbageValue = "-42" ) - static int method1171(int var0, Script var1, boolean var2) { - String var3; - int var4; - if (var0 == ScriptOpcodes.APPEND_NUM) { - var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3 + var4; - return 1; - } else { - String var9; - if (var0 == ScriptOpcodes.APPEND) { - class65.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[class65.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[class65.Interpreter_stringStackSize + 1]; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3 + var9; - return 1; - } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { - var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3 + class65.intToString(var4, true); - return 1; - } else if (var0 == ScriptOpcodes.LOWERCASE) { - var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3.toLowerCase(); - return 1; - } else { - int var6; - int var10; - if (var0 == ScriptOpcodes.FROMDATE) { - var10 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - long var11 = 86400000L * ((long)var10 + 11745L); - Interpreter.Interpreter_calendar.setTime(new Date(var11)); - var6 = Interpreter.Interpreter_calendar.get(5); - int var16 = Interpreter.Interpreter_calendar.get(2); - int var8 = Interpreter.Interpreter_calendar.get(1); - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var16] + "-" + var8; - return 1; - } else if (var0 != ScriptOpcodes.TEXT_GENDER) { - if (var0 == ScriptOpcodes.TOSTRING) { - var10 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = Integer.toString(var10); - return 1; - } else if (var0 == ScriptOpcodes.COMPARE) { - class65.Interpreter_stringStackSize -= 2; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = ViewportMouse.method2993(class195.compareStrings(Interpreter.Interpreter_stringStack[class65.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[class65.Interpreter_stringStackSize + 1], Varps.clientLanguage)); - return 1; - } else { - int var5; - byte[] var13; - Font var14; - if (var0 == ScriptOpcodes.PARAHEIGHT) { - var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - class188.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - var13 = WorldMapSection1.archive13.takeFile(var5, 0); - var14 = new Font(var13); - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var14.lineCount(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.PARAWIDTH) { - var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - class188.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - var13 = WorldMapSection1.archive13.takeFile(var5, 0); - var14 = new Font(var13); - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var14.lineWidth(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { - class65.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[class65.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[class65.Interpreter_stringStackSize + 1]; - if (Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize] == 1) { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3; - } else { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var9; - } + static final void method1186() { + boolean var0 = false; - return 1; - } else if (var0 == ScriptOpcodes.ESCAPE) { - var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); - return 1; - } else if (var0 == ScriptOpcodes.APPEND_CHAR) { - var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3 + (char)var4; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { - var10 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = WorldMapID.isCharPrintable((char)var10) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { - var10 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = class191.isAlphaNumeric((char)var10) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { - var10 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = WorldMapManager.isCharAlphabetic((char)var10) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { - var10 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = class237.isDigit((char)var10) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STRING_LENGTH) { - var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - if (var3 != null) { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.length(); - } else { - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0; - } + while (!var0) { + var0 = true; - return 1; - } else if (var0 == ScriptOpcodes.SUBSTRING) { - var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - class188.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3.substring(var4, var5); - return 1; - } else if (var0 == ScriptOpcodes.REMOVETAGS) { - var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - StringBuilder var17 = new StringBuilder(var3.length()); - boolean var15 = false; - - for (var6 = 0; var6 < var3.length(); ++var6) { - char var7 = var3.charAt(var6); - if (var7 == '<') { - var15 = true; - } else if (var7 == '>') { - var15 = false; - } else if (!var15) { - var17.append(var7); - } - } - - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var17.toString(); - return 1; - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { - var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.indexOf(var4); - return 1; - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { - class65.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[class65.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[class65.Interpreter_stringStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3.indexOf(var9, var5); - return 1; - } else if (var0 == ScriptOpcodes.UPPERCASE) { - var3 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3.toUpperCase(); - return 1; - } else { - return 2; - } - } - } else { - class65.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[class65.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[class65.Interpreter_stringStackSize + 1]; - if (Message.localPlayer.appearance != null && Message.localPlayer.appearance.isFemale) { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var9; - } else { - Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3; - } - - return 1; + for (int var1 = 0; var1 < Client.menuOptionsCount - 1; ++var1) { + if (Client.menuOpcodes[var1] < 1000 && Client.menuOpcodes[var1 + 1] > 1000) { + String var2 = Client.menuTargets[var1]; + Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; + Client.menuTargets[var1 + 1] = var2; + String var3 = Client.menuActions[var1]; + Client.menuActions[var1] = Client.menuActions[var1 + 1]; + Client.menuActions[var1 + 1] = var3; + int var4 = Client.menuOpcodes[var1]; + Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; + Client.menuOpcodes[var1 + 1] = var4; + var4 = Client.menuArguments1[var1]; + Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; + Client.menuArguments1[var1 + 1] = var4; + var4 = Client.menuArguments2[var1]; + Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; + Client.menuArguments2[var1 + 1] = var4; + var4 = Client.menuIdentifiers[var1]; + Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; + Client.menuIdentifiers[var1 + 1] = var4; + boolean var5 = Client.menuShiftClick[var1]; + Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; + Client.menuShiftClick[var1 + 1] = var5; + var0 = false; } } } - } - @ObfuscatedName("gi") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "18" - ) - @Export("setWindowedMode") - static void setWindowedMode(int var0) { - Client.field841 = 0L; - if (var0 >= 2) { - Client.isResizable = true; - } else { - Client.isResizable = false; - } - - if (ItemDefinition.getWindowedMode() == 1) { - class206.client.setMaxCanvasSize(765, 503); - } else { - class206.client.setMaxCanvasSize(7680, 2160); - } - - if (Client.gameState >= 25) { - class219.method4076(); - } - - } - - @ObfuscatedName("ku") - @ObfuscatedSignature( - signature = "(Lha;I)Ljava/lang/String;", - garbageValue = "762808761" - ) - static String method1167(Widget var0) { - if (class14.method157(WorldMapSection0.getWidgetClickMask(var0)) == 0) { - return null; - } else { - return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; - } } } diff --git a/runescape-client/src/main/java/class65.java b/runescape-client/src/main/java/class65.java index c99052bae7..a8ea8b6c5a 100644 --- a/runescape-client/src/main/java/class65.java +++ b/runescape-client/src/main/java/class65.java @@ -3,633 +3,74 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ba") +@ObfuscatedName("bm") public class class65 extends RouteStrategy { - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = -248026877 - ) - @Export("Interpreter_stringStackSize") - static int Interpreter_stringStackSize; - @ObfuscatedName("fs") + @ObfuscatedName("de") @ObfuscatedSignature( - signature = "Lki;" + signature = "Lia;" ) - @Export("WorldMapElement_fonts") - static Fonts WorldMapElement_fonts; + @Export("archive1") + static Archive archive1; + @ObfuscatedName("ga") + @Export("regionLandArchiveIds") + static int[] regionLandArchiveIds; + @ObfuscatedName("lg") + @ObfuscatedGetter( + intValue = 1699328089 + ) + @Export("selectedItemSlot") + static int selectedItemSlot; class65() { } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IIILfp;I)Z", - garbageValue = "1339159810" + signature = "(IIILfv;B)Z", + garbageValue = "50" ) @Export("hasArrived") - public boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) { + protected boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) { return var2 == super.approxDestinationX && var3 == super.approxDestinationY; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lhz;Lhz;ZLko;I)V", - garbageValue = "1687966211" + signature = "(II)Liu;", + garbageValue = "890351754" ) - public static void method1232(AbstractArchive var0, AbstractArchive var1, boolean var2, Font var3) { - UserComparator10.ItemDefinition_archive = var0; - ItemDefinition.ItemDefinition_modelArchive = var1; - ItemDefinition.ItemDefinition_inMembersWorld = var2; - ItemDefinition.ItemDefinition_fileCount = UserComparator10.ItemDefinition_archive.getGroupFileCount(10); - ReflectionCheck.ItemDefinition_fontPlain11 = var3; - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(Lkl;IB)V", - garbageValue = "-16" - ) - @Export("updatePlayers") - static final void updatePlayers(PacketBuffer var0, int var1) { - int var2 = var0.offset; - Players.Players_pendingUpdateCount = 0; - int var3 = 0; - var0.importIndex(); - - int var4; - int var5; - int var6; - int var8; - int var9; - byte[] var10000; - for (var4 = 0; var4 < Players.Players_count; ++var4) { - var5 = Players.Players_indices[var4]; - if ((Players.field1230[var5] & 1) == 0) { - if (var3 > 0) { - --var3; - var10000 = Players.field1230; - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - var6 = var0.readBits(1); - if (var6 == 0) { - var8 = var0.readBits(2); - if (var8 == 0) { - var9 = 0; - } else if (var8 == 1) { - var9 = var0.readBits(5); - } else if (var8 == 2) { - var9 = var0.readBits(8); - } else { - var9 = var0.readBits(11); - } - - var3 = var9; - var10000 = Players.field1230; - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - WorldMapAreaData.readPlayerUpdate(var0, var5); - } - } - } - } - - var0.exportIndex(); - if (var3 != 0) { - throw new RuntimeException(); + @Export("SpotAnimationDefinition_get") + public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) { + SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; } else { - var0.importIndex(); - - for (var4 = 0; var4 < Players.Players_count; ++var4) { - var5 = Players.Players_indices[var4]; - if ((Players.field1230[var5] & 1) != 0) { - if (var3 > 0) { - --var3; - var10000 = Players.field1230; - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - var6 = var0.readBits(1); - if (var6 == 0) { - var8 = var0.readBits(2); - if (var8 == 0) { - var9 = 0; - } else if (var8 == 1) { - var9 = var0.readBits(5); - } else if (var8 == 2) { - var9 = var0.readBits(8); - } else { - var9 = var0.readBits(11); - } - - var3 = var9; - var10000 = Players.field1230; - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - WorldMapAreaData.readPlayerUpdate(var0, var5); - } - } - } + byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); + var1 = new SpotAnimationDefinition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); } - var0.exportIndex(); - if (var3 != 0) { - throw new RuntimeException(); - } else { - var0.importIndex(); - - for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { - var5 = Players.Players_emptyIndices[var4]; - if ((Players.field1230[var5] & 1) != 0) { - if (var3 > 0) { - --var3; - var10000 = Players.field1230; - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - var6 = var0.readBits(1); - if (var6 == 0) { - var8 = var0.readBits(2); - if (var8 == 0) { - var9 = 0; - } else if (var8 == 1) { - var9 = var0.readBits(5); - } else if (var8 == 2) { - var9 = var0.readBits(8); - } else { - var9 = var0.readBits(11); - } - - var3 = var9; - var10000 = Players.field1230; - var10000[var5] = (byte)(var10000[var5] | 2); - } else if (WorldMapDecorationType.updateExternalPlayer(var0, var5)) { - var10000 = Players.field1230; - var10000[var5] = (byte)(var10000[var5] | 2); - } - } - } - } - - var0.exportIndex(); - if (var3 != 0) { - throw new RuntimeException(); - } else { - var0.importIndex(); - - for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { - var5 = Players.Players_emptyIndices[var4]; - if ((Players.field1230[var5] & 1) == 0) { - if (var3 > 0) { - --var3; - var10000 = Players.field1230; - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - var6 = var0.readBits(1); - if (var6 == 0) { - var8 = var0.readBits(2); - if (var8 == 0) { - var9 = 0; - } else if (var8 == 1) { - var9 = var0.readBits(5); - } else if (var8 == 2) { - var9 = var0.readBits(8); - } else { - var9 = var0.readBits(11); - } - - var3 = var9; - var10000 = Players.field1230; - var10000[var5] = (byte)(var10000[var5] | 2); - } else if (WorldMapDecorationType.updateExternalPlayer(var0, var5)) { - var10000 = Players.field1230; - var10000[var5] = (byte)(var10000[var5] | 2); - } - } - } - } - - var0.exportIndex(); - if (var3 != 0) { - throw new RuntimeException(); - } else { - Players.Players_count = 0; - Players.Players_emptyIdxCount = 0; - - Player var16; - for (var4 = 1; var4 < 2048; ++var4) { - var10000 = Players.field1230; - var10000[var4] = (byte)(var10000[var4] >> 1); - var16 = Client.players[var4]; - if (var16 != null) { - Players.Players_indices[++Players.Players_count - 1] = var4; - } else { - Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var4; - } - } - - for (var3 = 0; var3 < Players.Players_pendingUpdateCount; ++var3) { - var4 = Players.Players_pendingUpdateIndices[var3]; - var16 = Client.players[var4]; - var6 = var0.readUnsignedByte(); - if ((var6 & 128) != 0) { - var6 += var0.readUnsignedByte() << 8; - } - - byte var7 = -1; - int var11; - int var12; - int var15; - if ((var6 & 4) != 0) { - var8 = var0.readUnsignedByte(); - int var10; - int var13; - int var14; - if (var8 > 0) { - for (var9 = 0; var9 < var8; ++var9) { - var11 = -1; - var12 = -1; - var13 = -1; - var10 = var0.readUShortSmart(); - if (var10 == 32767) { - var10 = var0.readUShortSmart(); - var12 = var0.readUShortSmart(); - var11 = var0.readUShortSmart(); - var13 = var0.readUShortSmart(); - } else if (var10 != 32766) { - var12 = var0.readUShortSmart(); - } else { - var10 = -1; - } - - var14 = var0.readUShortSmart(); - var16.addHitSplat(var10, var12, var11, var13, Client.cycle, var14); - } - } - - var9 = var0.method5572(); - if (var9 > 0) { - for (var10 = 0; var10 < var9; ++var10) { - var11 = var0.readUShortSmart(); - var12 = var0.readUShortSmart(); - if (var12 != 32767) { - var13 = var0.readUShortSmart(); - var14 = var0.method5572(); - var15 = var12 > 0 ? var0.method5628() : var14; - var16.addHealthBar(var11, Client.cycle, var12, var13, var14, var15); - } else { - var16.removeHealthBar(var11); - } - } - } - } - - if ((var6 & 512) != 0) { - Players.field1231[var4] = var0.method5577(); - } - - if ((var6 & 4096) != 0) { - var16.spotAnimation = var0.readUnsignedShort(); - var8 = var0.method5591(); - var16.field963 = var8 >> 16; - var16.field943 = (var8 & 65535) + Client.cycle; - var16.spotAnimationFrame = 0; - var16.spotAnimationFrameCycle = 0; - if (var16.field943 > Client.cycle) { - var16.spotAnimationFrame = -1; - } - - if (var16.spotAnimation == 65535) { - var16.spotAnimation = -1; - } - } - - if ((var6 & 32) != 0) { - var16.targetIndex = var0.method5583(); - if (var16.targetIndex == 65535) { - var16.targetIndex = -1; - } - } - - if ((var6 & 64) != 0) { - var8 = var0.method5583(); - PlayerType var17 = (PlayerType)DynamicObject.findEnumerated(MusicPatchPcmStream.PlayerType_values(), var0.method5572()); - boolean var20 = var0.method5572() == 1; - var11 = var0.method5628(); - var12 = var0.offset; - if (var16.username != null && var16.appearance != null) { - boolean var22 = false; - if (var17.isUser && Message.friendSystem.isIgnored(var16.username)) { - var22 = true; - } - - if (!var22 && Client.field678 == 0 && !var16.isHidden) { - Players.field1242.offset = 0; - var0.method5740(Players.field1242.array, 0, var11); - Players.field1242.offset = 0; - String var18 = AbstractFont.escapeBrackets(Buddy.method5214(GraphicsObject.method2028(Players.field1242))); - var16.overheadText = var18.trim(); - var16.overheadTextColor = var8 >> 8; - var16.overheadTextEffect = var8 & 255; - var16.overheadTextCyclesRemaining = 150; - var16.isAutoChatting = var20; - var16.field937 = var16 != Message.localPlayer && var17.isUser && "" != Client.field846 && var18.toLowerCase().indexOf(Client.field846) == -1; - if (var17.isPrivileged) { - var15 = var20 ? 91 : 1; - } else { - var15 = var20 ? 90 : 2; - } - - if (var17.modIcon != -1) { - class83.addGameMessage(var15, ChatChannel.method2269(var17.modIcon) + var16.username.getName(), var18); - } else { - class83.addGameMessage(var15, var16.username.getName(), var18); - } - } - } - - var0.offset = var12 + var11; - } - - if ((var6 & 1) != 0) { - var16.field960 = var0.readUnsignedShort(); - if (var16.pathLength == 0) { - var16.orientation = var16.field960; - var16.field960 = -1; - } - } - - if ((var6 & 2048) != 0) { - var7 = var0.readByte(); - } - - if ((var6 & 8) != 0) { - var8 = var0.method5572(); - byte[] var23 = new byte[var8]; - Buffer var19 = new Buffer(var23); - var0.method5593(var23, 0, var8); - Players.field1228[var4] = var19; - var16.read(var19); - } - - if ((var6 & 2) != 0) { - var8 = var0.method5582(); - if (var8 == 65535) { - var8 = -1; - } - - var9 = var0.method5675(); - BuddyRankComparator.performPlayerAnimation(var16, var8, var9); - } - - if ((var6 & 256) != 0) { - var16.field921 = var0.method5577(); - var16.field966 = var0.method5577(); - var16.field965 = var0.method5577(); - var16.field929 = var0.readByte(); - var16.field950 = var0.readUnsignedShort() + Client.cycle; - var16.field969 = var0.method5723() + Client.cycle; - var16.field970 = var0.method5583(); - if (var16.field616) { - var16.field921 += var16.tileX; - var16.field966 += var16.tileY; - var16.field965 += var16.tileX; - var16.field929 += var16.tileY; - var16.pathLength = 0; - } else { - var16.field921 += var16.pathX[0]; - var16.field966 += var16.pathY[0]; - var16.field965 += var16.pathX[0]; - var16.field929 += var16.pathY[0]; - var16.pathLength = 1; - } - - var16.field926 = 0; - } - - if ((var6 & 16) != 0) { - var16.overheadText = var0.readStringCp1252NullTerminated(); - if (var16.overheadText.charAt(0) == '~') { - var16.overheadText = var16.overheadText.substring(1); - class83.addGameMessage(2, var16.username.getName(), var16.overheadText); - } else if (var16 == Message.localPlayer) { - class83.addGameMessage(2, var16.username.getName(), var16.overheadText); - } - - var16.isAutoChatting = false; - var16.overheadTextColor = 0; - var16.overheadTextEffect = 0; - var16.overheadTextCyclesRemaining = 150; - } - - if ((var6 & 1024) != 0) { - for (var8 = 0; var8 < 3; ++var8) { - var16.actions[var8] = var0.readStringCp1252NullTerminated(); - } - } - - if (var16.field616) { - if (var7 == 127) { - var16.resetPath(var16.tileX, var16.tileY); - } else { - byte var21; - if (var7 != -1) { - var21 = var7; - } else { - var21 = Players.field1231[var4]; - } - - var16.method1261(var16.tileX, var16.tileY, var21); - } - } - } - - if (var0.offset - var2 != var1) { - throw new RuntimeException(var0.offset - var2 + " " + var1); - } - } - } - } + SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); + return var1; } } - @ObfuscatedName("b") + @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "(IZI)Ljava/lang/String;", - garbageValue = "2010255581" + signature = "(Ldn;B)V", + garbageValue = "71" ) - @Export("intToString") - public static String intToString(int var0, boolean var1) { - return var1 && var0 >= 0 ? WorldMapData_0.method163(var0, 10, var1) : Integer.toString(var0); - } - - @ObfuscatedName("hm") - @ObfuscatedSignature( - signature = "(IIIIIIIIIB)V", - garbageValue = "104" - ) - @Export("updatePendingSpawn") - static final void updatePendingSpawn(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - PendingSpawn var9 = null; - - for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { - var9 = var10; - break; - } + @Export("PcmStream_disable") + static final void PcmStream_disable(PcmStream var0) { + var0.active = false; + if (var0.sound != null) { + var0.sound.position = 0; } - if (var9 == null) { - var9 = new PendingSpawn(); - var9.plane = var0; - var9.type = var3; - var9.x = var1; - var9.y = var2; - SequenceDefinition.method4821(var9); - Client.pendingSpawns.addFirst(var9); - } - - var9.id = var4; - var9.field918 = var5; - var9.orientation = var6; - var9.delay = var7; - var9.hitpoints = var8; - } - - @ObfuscatedName("ho") - @ObfuscatedSignature( - signature = "(Lkl;I)V", - garbageValue = "-1944443649" - ) - static final void method1228(PacketBuffer var0) { - for (int var1 = 0; var1 < Client.field673; ++var1) { - int var2 = Client.field720[var1]; - NPC var3 = Client.npcs[var2]; - int var4 = var0.readUnsignedByte(); - int var5; - int var6; - int var7; - if ((var4 & 64) != 0) { - var5 = var0.method5582(); - if (var5 == 65535) { - var5 = -1; - } - - var6 = var0.method5675(); - if (var5 == var3.sequence && var5 != -1) { - var7 = WorldMapSection0.SequenceDefinition_get(var5).field3495; - if (var7 == 1) { - var3.sequenceFrame = 0; - var3.sequenceFrameCycle = 0; - var3.sequenceDelay = var6; - var3.field958 = 0; - } - - if (var7 == 2) { - var3.field958 = 0; - } - } else if (var5 == -1 || var3.sequence == -1 || WorldMapSection0.SequenceDefinition_get(var5).field3492 >= WorldMapSection0.SequenceDefinition_get(var3.sequence).field3492) { - var3.sequence = var5; - var3.sequenceFrame = 0; - var3.sequenceFrameCycle = 0; - var3.sequenceDelay = var6; - var3.field958 = 0; - var3.field926 = var3.pathLength; - } - } - - if ((var4 & 8) != 0) { - var3.targetIndex = var0.method5723(); - if (var3.targetIndex == 65535) { - var3.targetIndex = -1; - } - } - - if ((var4 & 1) != 0) { - var3.overheadText = var0.readStringCp1252NullTerminated(); - var3.overheadTextCyclesRemaining = 100; - } - - if ((var4 & 4) != 0) { - var3.definition = AbstractUserComparator.getNpcDefinition(var0.method5582()); - var3.field925 = var3.definition.size; - var3.field968 = var3.definition.rotation; - var3.walkSequence = var3.definition.walkSequence; - var3.walkBackSequence = var3.definition.walkBackSequence; - var3.walkLeftSequence = var3.definition.walkLeftSequence; - var3.walkRightSequence = var3.definition.walkRightSequence; - var3.readySequence = var3.definition.readySequence; - var3.turnLeftSequence = var3.definition.turnLeftSequence; - var3.turnRightSequence = var3.definition.turnRightSequence; - } - - int var8; - if ((var4 & 2) != 0) { - var5 = var0.method5628(); - int var9; - int var10; - int var11; - if (var5 > 0) { - for (var6 = 0; var6 < var5; ++var6) { - var8 = -1; - var9 = -1; - var10 = -1; - var7 = var0.readUShortSmart(); - if (var7 == 32767) { - var7 = var0.readUShortSmart(); - var9 = var0.readUShortSmart(); - var8 = var0.readUShortSmart(); - var10 = var0.readUShortSmart(); - } else if (var7 != 32766) { - var9 = var0.readUShortSmart(); - } else { - var7 = -1; - } - - var11 = var0.readUShortSmart(); - var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11); - } - } - - var6 = var0.readUnsignedByte(); - if (var6 > 0) { - for (var7 = 0; var7 < var6; ++var7) { - var8 = var0.readUShortSmart(); - var9 = var0.readUShortSmart(); - if (var9 != 32767) { - var10 = var0.readUShortSmart(); - var11 = var0.method5675(); - int var12 = var9 > 0 ? var0.method5675() : var11; - var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); - } else { - var3.removeHealthBar(var8); - } - } - } - } - - if ((var4 & 16) != 0) { - var5 = var0.readUnsignedShort(); - var6 = var0.method5723(); - var7 = var3.x - (var5 - MusicPatchPcmStream.baseX * 64 - MusicPatchPcmStream.baseX * 64) * 64; - var8 = var3.y - (var6 - ScriptEvent.baseY * 64 - ScriptEvent.baseY * 64) * 64; - if (var7 != 0 || var8 != 0) { - var3.field960 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047; - } - } - - if ((var4 & 32) != 0) { - var3.spotAnimation = var0.method5582(); - var5 = var0.method5592(); - var3.field963 = var5 >> 16; - var3.field943 = (var5 & 65535) + Client.cycle; - var3.spotAnimationFrame = 0; - var3.spotAnimationFrameCycle = 0; - if (var3.field943 > Client.cycle) { - var3.spotAnimationFrame = -1; - } - - if (var3.spotAnimation == 65535) { - var3.spotAnimation = -1; - } - } + for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { + PcmStream_disable(var1); } } diff --git a/runescape-client/src/main/java/class80.java b/runescape-client/src/main/java/class80.java index f7af343d3c..274aa85da6 100644 --- a/runescape-client/src/main/java/class80.java +++ b/runescape-client/src/main/java/class80.java @@ -1,66 +1,61 @@ import java.math.BigInteger; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cd") +@ObfuscatedName("cr") public class class80 { - @ObfuscatedName("rm") - @ObfuscatedGetter( - intValue = 638664704 - ) - static int field1111; - @ObfuscatedName("p") - static final BigInteger field1109; - @ObfuscatedName("b") - static final BigInteger field1112; - @ObfuscatedName("bj") - @Export("otp") - static String otp; + @ObfuscatedName("i") + static final BigInteger field1123; + @ObfuscatedName("g") + static final BigInteger field1120; static { - field1109 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); - field1112 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); + field1123 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); + field1120 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); } - @ObfuscatedName("i") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "-52" + signature = "(Lks;I)I", + garbageValue = "-1637825226" ) - static int method2053(int var0, int var1) { - if (var0 == -2) { - return 12345678; - } else if (var0 == -1) { - if (var1 < 0) { - var1 = 0; - } else if (var1 > 127) { - var1 = 127; - } - - var1 = 127 - var1; - return var1; + static int method2094(PacketBuffer var0) { + int var1 = var0.readBits(2); + int var2; + if (var1 == 0) { + var2 = 0; + } else if (var1 == 1) { + var2 = var0.readBits(5); + } else if (var1 == 2) { + var2 = var0.readBits(8); } else { - var1 = (var0 & 127) * var1 / 128; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } + var2 = var0.readBits(11); + } - return (var0 & 65408) + var1; + return var2; + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1745616388" + ) + static final void method2097() { + class60.method1188("You can't add yourself to your own ignore list"); + } + + @ObfuscatedName("ka") + @ObfuscatedSignature( + signature = "(Lhn;II)Ljava/lang/String;", + garbageValue = "237205846" + ) + static String method2098(Widget var0, int var1) { + int var3 = WorldMapIcon_0.getWidgetClickMask(var0); + boolean var2 = (var3 >> var1 + 1 & 1) != 0; + if (!var2 && var0.onOp == null) { + return null; + } else { + return var0.actions != null && var0.actions.length > var1 && var0.actions[var1] != null && var0.actions[var1].trim().length() != 0 ? var0.actions[var1] : null; } } - - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(Lhz;Ljava/lang/String;Ljava/lang/String;B)[Lls;", - garbageValue = "-8" - ) - public static Sprite[] method2058(AbstractArchive var0, String var1, String var2) { - int var3 = var0.getGroupId(var1); - int var4 = var0.getFileId(var3, var2); - return GrandExchangeOfferNameComparator.SpriteBuffer_getSpriteArray(var0, var3, var4); - } } diff --git a/runescape-client/src/main/java/class81.java b/runescape-client/src/main/java/class81.java index 7cfc6e3798..8884cf2694 100644 --- a/runescape-client/src/main/java/class81.java +++ b/runescape-client/src/main/java/class81.java @@ -1,213 +1,19 @@ -import java.io.File; -import java.io.IOException; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cj") +@ObfuscatedName("co") public class class81 { - @ObfuscatedName("nd") - @ObfuscatedGetter( - intValue = -122722745 - ) - static int field1126; - @ObfuscatedName("z") - public static String field1129; - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;II)Ljava/io/File;", - garbageValue = "855544439" - ) - static File method2064(String var0, String var1, int var2) { - String var3 = var2 == 0 ? "" : "" + var2; - DefaultsGroup.JagexCache_locationFile = new File(ReflectionCheck.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var3 + ".dat"); - String var4 = null; - String var5 = null; - boolean var6 = false; - Buffer var8; - File var23; - if (DefaultsGroup.JagexCache_locationFile.exists()) { - try { - AccessFile var7 = new AccessFile(DefaultsGroup.JagexCache_locationFile, "rw", 10000L); - - int var9; - for (var8 = new Buffer((int)var7.length()); var8.offset < var8.array.length; var8.offset += var9) { - var9 = var7.read(var8.array, var8.offset, var8.array.length - var8.offset); - if (var9 == -1) { - throw new IOException(); - } - } - - var8.offset = 0; - var9 = var8.readUnsignedByte(); - if (var9 < 1 || var9 > 3) { - throw new IOException("" + var9); - } - - int var10 = 0; - if (var9 > 1) { - var10 = var8.readUnsignedByte(); - } - - if (var9 <= 2) { - var4 = var8.readStringCp1252NullCircumfixed(); - if (var10 == 1) { - var5 = var8.readStringCp1252NullCircumfixed(); - } - } else { - var4 = var8.readCESU8(); - if (var10 == 1) { - var5 = var8.readCESU8(); - } - } - - var7.close(); - } catch (IOException var21) { - var21.printStackTrace(); - } - - if (var4 != null) { - var23 = new File(var4); - if (!var23.exists()) { - var4 = null; - } - } - - if (var4 != null) { - var23 = new File(var4, "test.dat"); - if (!class173.method3561(var23, true)) { - var4 = null; - } - } - } - - if (var4 == null && var2 == 0) { - label142: - for (int var15 = 0; var15 < WorldMapSprite.field219.length; ++var15) { - for (int var16 = 0; var16 < JagexCache.field2024.length; ++var16) { - File var17 = new File(JagexCache.field2024[var16] + WorldMapSprite.field219[var15] + File.separatorChar + var0 + File.separatorChar); - if (var17.exists() && class173.method3561(new File(var17, "test.dat"), true)) { - var4 = var17.toString(); - var6 = true; - break label142; - } - } - } - } - - if (var4 == null) { - var4 = ReflectionCheck.userHomeDirectory + File.separatorChar + "jagexcache" + var3 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; - var6 = true; - } - - File var22; - if (var5 != null) { - var22 = new File(var5); - var23 = new File(var4); - - try { - File[] var24 = var22.listFiles(); - File[] var18 = var24; - - for (int var11 = 0; var11 < var18.length; ++var11) { - File var12 = var18[var11]; - File var13 = new File(var23, var12.getName()); - boolean var14 = var12.renameTo(var13); - if (!var14) { - throw new IOException(); - } - } - } catch (Exception var20) { - var20.printStackTrace(); - } - - var6 = true; - } - - if (var6) { - var22 = new File(var4); - var8 = null; - - try { - AccessFile var25 = new AccessFile(DefaultsGroup.JagexCache_locationFile, "rw", 10000L); - Buffer var26 = new Buffer(500); - var26.writeByte(3); - var26.writeByte(var8 != null ? 1 : 0); - var26.writeCESU8(var22.getPath()); - if (var8 != null) { - var26.writeCESU8(""); - } - - var25.write(var26.array, 0, var26.offset); - var25.close(); - } catch (IOException var19) { - var19.printStackTrace(); - } - } - - return new File(var4); - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)I", - garbageValue = "998758859" - ) - @Export("hashString") - public static int hashString(CharSequence var0) { - int var1 = var0.length(); - int var2 = 0; - - for (int var3 = 0; var3 < var1; ++var3) { - var2 = (var2 << 5) - var2 + NetSocket.charToByteCp1252(var0.charAt(var3)); - } - - return var2; - } - - @ObfuscatedName("fc") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1389817543" + garbageValue = "-2019499752" ) - static final void method2063() { - PacketBufferNode.method3587(); - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); - KitDefinition.KitDefinition_cached.clear(); - class189.method3623(); - class237.method4300(); - class54.method1104(); - class286.method5310(); - MusicPatchNode2.method3668(); - Huffman.method3917(); - Actor.method1756(); - HitSplatDefinition.HitSplatDefinition_cached.clear(); - HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); - HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); - class226.method4100(); - GrandExchangeOfferAgeComparator.method146(); - class16.method179(); - WorldMapElement.WorldMapElement_cachedSprites.clear(); - class14.method155(); - Widget.Widget_cachedSprites.clear(); - Widget.Widget_cachedModels.clear(); - Widget.Widget_cachedFonts.clear(); - Widget.Widget_cachedSpriteMasks.clear(); - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); - Script.Script_cached.clear(); - ClientPacket.archive0.clearFiles(); - ItemDefinition.archive1.clearFiles(); - WorldMapData_1.archive3.clearFiles(); - FloorDecoration.archive4.clearFiles(); - AbstractWorldMapData.archive5.clearFiles(); - GrandExchangeOfferWorldComparator.archive6.clearFiles(); - MouseRecorder.archive7.clearFiles(); - class3.archive8.clearFiles(); - WorldMapManager.archive9.clearFiles(); - ServerBuild.archive10.clearFiles(); - class48.archive11.clearFiles(); - SoundSystem.archive12.clearFiles(); + static void method2099() { + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { + Login.currentLoginField = 1; + } else { + Login.currentLoginField = 0; + } + } } diff --git a/runescape-client/src/main/java/class83.java b/runescape-client/src/main/java/class83.java index 56c8d0e83f..9749f473dd 100644 --- a/runescape-client/src/main/java/class83.java +++ b/runescape-client/src/main/java/class83.java @@ -1,50 +1,68 @@ import java.math.BigInteger; import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cb") +@ObfuscatedName("cn") public class class83 { - @ObfuscatedName("f") - static final BigInteger field1144; - @ObfuscatedName("i") - static final BigInteger field1142; + @ObfuscatedName("c") + static final BigInteger field1151; + @ObfuscatedName("t") + static final BigInteger field1150; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1334117913 + ) + @Export("musicTrackFileId") + public static int musicTrackFileId; static { - field1144 = new BigInteger("10001", 16); - field1142 = new BigInteger("a829ab7e2d47507cfcd882652a97602a8c7e3cd5afbd5cfcc669d81bd92ae7972a5c5d9755da447ca19827e60e79d3f609c67492a4082b20cfd50a33b5fe88a33e336e600c1ff6c84652ccfbf0d5e72de43e0bf9feed0a9829c4c475ae559b5ba4cec4bb0ecf84b403d82521b2678c77dc90101b737cb47ce3caa6d55073078d", 16); + field1151 = new BigInteger("10001", 16); + field1150 = new BigInteger("c20a7ab5337092e3e04d646de102abda0a14c2669233a3df9db8a57acccc6e54d9e9a5eaa408b39b17d7cc429c38a98aa62a7fb616e714a301546ff47456dcc74c2003b3fc6683bb22ac4170ee6bc1ecad99bb26b684c3264c94a8b411e363a7b55bb16c0fef207993b812f36888b07a465243bd4640d3bd4828356795dcb74d", 16); } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(ILjava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-1594783398" + signature = "(Lii;I)V", + garbageValue = "590815960" ) - @Export("addGameMessage") - static void addGameMessage(int var0, String var1, String var2) { - GameShell.addChatMessage(var0, var1, var2, (String)null); + public static void method2109(AbstractArchive var0) { + FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0; } - @ObfuscatedName("i") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Llc;IIS)I", - garbageValue = "-31800" + signature = "(B)[Lgy;", + garbageValue = "1" ) - static int method2071(IterableNodeHashTable var0, int var1, int var2) { - if (var0 == null) { - return var2; + public static class185[] method2107() { + return new class185[]{class185.field2327, class185.field2315, class185.field2322, class185.field2317, class185.field2318, class185.field2320, class185.field2319, class185.field2314, class185.field2316, class185.field2323}; + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(II)I", + garbageValue = "17386837" + ) + public static int method2108(int var0) { + return var0 >> 11 & 63; + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(Lia;II)V", + garbageValue = "319200175" + ) + static void method2110(Archive var0, int var1) { + if (class4.NetCache_reference != null) { + class4.NetCache_reference.offset = var1 * 8 + 5; + int var2 = class4.NetCache_reference.readInt(); + int var3 = class4.NetCache_reference.readInt(); + var0.loadIndex(var2, var3); } else { - IntegerNode var3 = (IntegerNode)var0.get((long)var1); - return var3 == null ? var2 : var3.integer; + BuddyRankComparator.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); + NetCache.NetCache_archives[var1] = var0; } } - - @ObfuscatedName("he") - @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "114" - ) - static boolean method2072() { - return (Client.drawPlayerNames & 4) != 0; - } } diff --git a/runescape-client/src/main/java/class96.java b/runescape-client/src/main/java/class96.java new file mode 100644 index 0000000000..3afb0b65bd --- /dev/null +++ b/runescape-client/src/main/java/class96.java @@ -0,0 +1,191 @@ +import java.util.Iterator; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ca") +public class class96 { + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "Ljj;" + ) + @Export("reflectionChecks") + static IterableNodeDeque reflectionChecks; + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "[Lbg;" + ) + @Export("World_worlds") + static World[] World_worlds; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -44296149 + ) + @Export("loginBoxCenter") + static int loginBoxCenter; + + static { + reflectionChecks = new IterableNodeDeque(); + } + + @ObfuscatedName("gr") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "512388995" + ) + static final int method2346() { + if (WorldMapSection2.clientPreferences.roofsHidden) { + return Clock.Client_plane; + } else { + int var0 = 3; + if (GrandExchangeOffer.cameraPitch < 310) { + int var1; + int var2; + if (Client.oculusOrbState == 1) { + var1 = PendingSpawn.oculusOrbFocalPointX >> 7; + var2 = Skeleton.oculusOrbFocalPointY >> 7; + } else { + var1 = class192.localPlayer.x >> 7; + var2 = class192.localPlayer.y >> 7; + } + + int var3 = HitSplatDefinition.cameraX >> 7; + int var4 = Actor.cameraZ >> 7; + if (var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) { + return Clock.Client_plane; + } + + if (var1 < 0 || var2 < 0 || var1 >= 104 || var2 >= 104) { + return Clock.Client_plane; + } + + if ((Tiles.Tiles_renderFlags[Clock.Client_plane][var3][var4] & 4) != 0) { + var0 = Clock.Client_plane; + } + + int var5; + if (var1 > var3) { + var5 = var1 - var3; + } else { + var5 = var3 - var1; + } + + int var6; + if (var2 > var4) { + var6 = var2 - var4; + } else { + var6 = var4 - var2; + } + + int var7; + int var8; + if (var5 > var6) { + var7 = var6 * 65536 / var5; + var8 = 32768; + + while (var1 != var3) { + if (var3 < var1) { + ++var3; + } else if (var3 > var1) { + --var3; + } + + if ((Tiles.Tiles_renderFlags[Clock.Client_plane][var3][var4] & 4) != 0) { + var0 = Clock.Client_plane; + } + + var8 += var7; + if (var8 >= 65536) { + var8 -= 65536; + if (var4 < var2) { + ++var4; + } else if (var4 > var2) { + --var4; + } + + if ((Tiles.Tiles_renderFlags[Clock.Client_plane][var3][var4] & 4) != 0) { + var0 = Clock.Client_plane; + } + } + } + } else if (var6 > 0) { + var7 = var5 * 65536 / var6; + var8 = 32768; + + while (var4 != var2) { + if (var4 < var2) { + ++var4; + } else if (var4 > var2) { + --var4; + } + + if ((Tiles.Tiles_renderFlags[Clock.Client_plane][var3][var4] & 4) != 0) { + var0 = Clock.Client_plane; + } + + var8 += var7; + if (var8 >= 65536) { + var8 -= 65536; + if (var3 < var1) { + ++var3; + } else if (var3 > var1) { + --var3; + } + + if ((Tiles.Tiles_renderFlags[Clock.Client_plane][var3][var4] & 4) != 0) { + var0 = Clock.Client_plane; + } + } + } + } + } + + if (class192.localPlayer.x >= 0 && class192.localPlayer.y >= 0 && class192.localPlayer.x < 13312 && class192.localPlayer.y < 13312) { + if ((Tiles.Tiles_renderFlags[Clock.Client_plane][class192.localPlayer.x >> 7][class192.localPlayer.y >> 7] & 4) != 0) { + var0 = Clock.Client_plane; + } + + return var0; + } else { + return Clock.Client_plane; + } + } + } + + @ObfuscatedName("hv") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-2092655823" + ) + @Export("addCancelMenuEntry") + static void addCancelMenuEntry() { + Client.menuOptionsCount = 0; + Client.isMenuOpen = false; + Client.menuActions[0] = "Cancel"; + Client.menuTargets[0] = ""; + Client.menuOpcodes[0] = 1006; + Client.menuShiftClick[0] = false; + Client.menuOptionsCount = 1; + } + + @ObfuscatedName("kq") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1882557485" + ) + @Export("FriendSystem_invalidateIgnoreds") + static final void FriendSystem_invalidateIgnoreds() { + Iterator var0 = Messages.Messages_hashTable.iterator(); + + while (var0.hasNext()) { + Message var1 = (Message)var0.next(); + var1.clearIsFromIgnored(); + } + + if (InterfaceParent.clanChat != null) { + InterfaceParent.clanChat.invalidateIgnoreds(); + } + + } +} diff --git a/runescape-client/src/main/java/class97.java b/runescape-client/src/main/java/class99.java similarity index 60% rename from runescape-client/src/main/java/class97.java rename to runescape-client/src/main/java/class99.java index 20341edd09..57cc6f70f5 100644 --- a/runescape-client/src/main/java/class97.java +++ b/runescape-client/src/main/java/class99.java @@ -2,12 +2,12 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cz") -public interface class97 { - @ObfuscatedName("f") +@ObfuscatedName("cx") +public interface class99 { + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)Lcw;", - garbageValue = "479224621" + signature = "(I)Ldw;", + garbageValue = "-1842325799" ) @Export("player") PcmPlayer player();