diff --git a/build.gradle b/build.gradle index 175278cab0..3773a80030 100644 --- a/build.gradle +++ b/build.gradle @@ -88,7 +88,7 @@ allprojects { version = '1.5.32-SNAPSHOT' ext { - rsversion = 181 + rsversion = 182 cacheversion = 165 plusVersion = '2.1.4.0' diff --git a/runescape-client/src/main/java/AbstractArchive.java b/runescape-client/src/main/java/AbstractArchive.java index bb761edc93..071f642bff 100644 --- a/runescape-client/src/main/java/AbstractArchive.java +++ b/runescape-client/src/main/java/AbstractArchive.java @@ -3,74 +3,73 @@ 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("hp") +@ObfuscatedName("hz") @Implements("AbstractArchive") public abstract class AbstractArchive { - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lld;" + signature = "Llc;" ) @Export("gzipDecompressor") static GZipDecompressor gzipDecompressor; - @ObfuscatedName("a") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 420916507 + intValue = -894464741 ) - static int field3143; - @ObfuscatedName("w") + static int field3120; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1329598587 + intValue = 1986402315 ) @Export("groupCount") int groupCount; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("groupIds") int[] groupIds; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("groupNameHashes") int[] groupNameHashes; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Llj;" + signature = "Lly;" ) @Export("groupNameHashTable") IntHashTable groupNameHashTable; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("groupCrcs") int[] groupCrcs; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("groupVersions") int[] groupVersions; - @ObfuscatedName("i") + @ObfuscatedName("q") @Export("fileCounts") int[] fileCounts; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("fileIds") int[][] fileIds; - @ObfuscatedName("f") + @ObfuscatedName("d") @Export("fileNameHashes") int[][] fileNameHashes; - @ObfuscatedName("m") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "[Llj;" + signature = "[Lly;" ) @Export("fileNameHashTables") IntHashTable[] fileNameHashTables; - @ObfuscatedName("u") + @ObfuscatedName("c") @Export("groups") Object[] groups; - @ObfuscatedName("x") + @ObfuscatedName("r") @Export("files") Object[][] files; - @ObfuscatedName("v") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -2113214337 + intValue = 2098544055 ) @Export("hash") public int hash; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("releaseGroups") boolean releaseGroups; @ObfuscatedName("g") @@ -79,7 +78,7 @@ public abstract class AbstractArchive { static { gzipDecompressor = new GZipDecompressor(); - field3143 = 0; + field3120 = 0; } AbstractArchive(boolean var1, boolean var2) { @@ -87,241 +86,252 @@ public abstract class AbstractArchive { this.shallowFiles = var2; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "([BI)V", - garbageValue = "1973415514" + signature = "([BB)V", + garbageValue = "64" ) @Export("decodeIndex") void decodeIndex(byte[] var1) { int var3 = var1.length; - int var2 = class2.method18(var1, 0, var3); - this.hash = var2; - Buffer var4 = new Buffer(HealthBarUpdate.decompressBytes(var1)); - int var5 = var4.readUnsignedByte(); - if (var5 < 5 || var5 > 7) { + int var5 = -1; + + int var6; + for (var6 = 0; var6 < var3; ++var6) { + var5 = var5 >>> 8 ^ Buffer.crc32Table[(var5 ^ var1[var6]) & 255]; + } + + var5 = ~var5; + this.hash = var5; + Buffer var15 = new Buffer(Player.decompressBytes(var1)); + var5 = var15.readUnsignedByte(); + if (var5 >= 5 && var5 <= 7) { + if (var5 >= 6) { + var15.readInt(); + } + + var6 = var15.readUnsignedByte(); + if (var5 >= 7) { + this.groupCount = var15.method5423(); + } else { + this.groupCount = var15.readUnsignedShort(); + } + + int var7 = 0; + int var8 = -1; + this.groupIds = new int[this.groupCount]; + int var9; + if (var5 >= 7) { + for (var9 = 0; var9 < this.groupCount; ++var9) { + this.groupIds[var9] = var7 += var15.method5423(); + if (this.groupIds[var9] > var8) { + var8 = this.groupIds[var9]; + } + } + } else { + for (var9 = 0; var9 < this.groupCount; ++var9) { + this.groupIds[var9] = var7 += var15.readUnsignedShort(); + if (this.groupIds[var9] > var8) { + var8 = this.groupIds[var9]; + } + } + } + + 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]; + + for (var9 = 0; var9 < this.groupCount; ++var9) { + this.groupNameHashes[this.groupIds[var9]] = var15.readInt(); + } + + this.groupNameHashTable = new IntHashTable(this.groupNameHashes); + } + + for (var9 = 0; var9 < this.groupCount; ++var9) { + this.groupCrcs[this.groupIds[var9]] = var15.readInt(); + } + + for (var9 = 0; var9 < this.groupCount; ++var9) { + this.groupVersions[this.groupIds[var9]] = var15.readInt(); + } + + for (var9 = 0; var9 < this.groupCount; ++var9) { + this.fileCounts[this.groupIds[var9]] = var15.readUnsignedShort(); + } + + 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]; + + for (var13 = 0; var13 < var11; ++var13) { + var14 = this.fileIds[var10][var13] = var7 += var15.method5423(); + if (var14 > var12) { + var12 = var14; + } + } + + this.files[var10] = new Object[var12 + 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 (var13 = 0; var13 < var11; ++var13) { + var14 = this.fileIds[var10][var13] = var7 += var15.readUnsignedShort(); + if (var14 > var12) { + var12 = var14; + } + } + + this.files[var10] = new Object[var12 + 1]; + } + } + + if (var6 != 0) { + this.fileNameHashes = new int[var8 + 1][]; + this.fileNameHashTables = new IntHashTable[var8 + 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 (var12 = 0; var12 < var11; ++var12) { + this.fileNameHashes[var10][this.fileIds[var10][var12]] = var15.readInt(); + } + + this.fileNameHashTables[var10] = new IntHashTable(this.fileNameHashes[var10]); + } + } + + } else { throw new RuntimeException(""); } - if (var5 >= 6) { - var4.readInt(); - } - - int var6 = var4.readUnsignedByte(); - if (var5 >= 7) { - this.groupCount = var4.method5685(); - } else { - this.groupCount = var4.readUnsignedShort(); - } - - int var7 = 0; - int var8 = -1; - this.groupIds = new int[this.groupCount]; - int var9; - if (var5 >= 7) { - for (var9 = 0; var9 < this.groupCount; ++var9) { - this.groupIds[var9] = var7 += var4.method5685(); - if (this.groupIds[var9] > var8) { - var8 = this.groupIds[var9]; - } - } - } else { - for (var9 = 0; var9 < this.groupCount; ++var9) { - this.groupIds[var9] = var7 += var4.readUnsignedShort(); - if (this.groupIds[var9] > var8) { - var8 = this.groupIds[var9]; - } - } - } - - 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]; - - for (var9 = 0; var9 < this.groupCount; ++var9) { - this.groupNameHashes[this.groupIds[var9]] = var4.readInt(); - } - - this.groupNameHashTable = new IntHashTable(this.groupNameHashes); - } - - for (var9 = 0; var9 < this.groupCount; ++var9) { - this.groupCrcs[this.groupIds[var9]] = var4.readInt(); - } - - for (var9 = 0; var9 < this.groupCount; ++var9) { - this.groupVersions[this.groupIds[var9]] = var4.readInt(); - } - - for (var9 = 0; var9 < this.groupCount; ++var9) { - this.fileCounts[this.groupIds[var9]] = var4.readUnsignedShort(); - } - - 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]; - - for (var13 = 0; var13 < var11; ++var13) { - var14 = this.fileIds[var10][var13] = var7 += var4.method5685(); - if (var14 > var12) { - var12 = var14; - } - } - - this.files[var10] = new Object[var12 + 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 (var13 = 0; var13 < var11; ++var13) { - var14 = this.fileIds[var10][var13] = var7 += var4.readUnsignedShort(); - if (var14 > var12) { - var12 = var14; - } - } - - this.files[var10] = new Object[var12 + 1]; - } - } - - if (var6 != 0) { - this.fileNameHashes = new int[var8 + 1][]; - this.fileNameHashTables = new IntHashTable[var8 + 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 (var12 = 0; var12 < var11; ++var12) { - this.fileNameHashes[var10][this.fileIds[var10][var12]] = var4.readInt(); - } - - this.fileNameHashTables[var10] = new IntHashTable(this.fileNameHashes[var10]); - } - } - } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "2144523901" + garbageValue = "502266240" ) @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(III)[B", - garbageValue = "-1152099404" + signature = "(IIB)[B", + garbageValue = "127" ) @Export("takeFile") public byte[] takeFile(int var1, int var2) { return this.takeFileEncrypted(var1, var2, (int[])null); } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(II[II)[B", - garbageValue = "-2126995235" + garbageValue = "-1621987750" ) @Export("takeFileEncrypted") public byte[] takeFileEncrypted(int var1, int var2, int[] var3) { - if (var1 < 0 || var1 >= this.files.length || this.files[var1] == null || var2 < 0 || var2 >= this.files[var1].length) { - return null; - } - if (this.files[var1][var2] == null) { - boolean var4 = this.buildFiles(var1, var3); - if (!var4) { - this.loadGroup(var1); - var4 = this.buildFiles(var1, var3); + if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { + if (this.files[var1][var2] == null) { + boolean var4 = this.buildFiles(var1, var3); if (!var4) { - return null; + this.loadGroup(var1); + var4 = this.buildFiles(var1, var3); + if (!var4) { + return null; + } } } - } - byte[] var5 = ArchiveDisk.serialize(this.files[var1][var2], false); - if (this.shallowFiles) { - this.files[var1][var2] = null; - } + byte[] var5 = class43.serialize(this.files[var1][var2], false); + if (this.shallowFiles) { + this.files[var1][var2] = null; + } - return var5; + return var5; + } else { + return null; + } } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(III)Z", - garbageValue = "-416813220" + garbageValue = "187861364" ) @Export("tryLoadFile") public boolean tryLoadFile(int var1, int var2) { - if (var1 < 0 || var1 >= this.files.length || this.files[var1] == null || var2 < 0 || var2 >= this.files[var1].length) { + if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { + if (this.files[var1][var2] != null) { + return true; + } else if (this.groups[var1] != null) { + return true; + } else { + this.loadGroup(var1); + return this.groups[var1] != null; + } + } else { return false; } - if (this.files[var1][var2] != null) { - return true; - } - if (this.groups[var1] != null) { - return true; - } - this.loadGroup(var1); - return this.groups[var1] != null; } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "1060538444" + garbageValue = "1284781911" ) - public boolean method4147(int var1) { + public boolean method4066(int var1) { if (this.files.length == 1) { return this.tryLoadFile(0, var1); - } - if (this.files[var1].length == 1) { + } else if (this.files[var1].length == 1) { return this.tryLoadFile(var1, 0); + } else { + throw new RuntimeException(); } - throw new RuntimeException(); } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "-43766791" + signature = "(IS)Z", + garbageValue = "-29246" ) @Export("tryLoadGroup") public boolean tryLoadGroup(int var1) { if (this.groups[var1] != null) { return true; + } else { + this.loadGroup(var1); + return this.groups[var1] != null; } - this.loadGroup(var1); - return this.groups[var1] != null; } - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "741322871" + garbageValue = "-855102923" ) @Export("isFullyLoaded") public boolean isFullyLoaded() { @@ -340,77 +350,78 @@ public abstract class AbstractArchive { return var1; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "0" + signature = "(II)I", + garbageValue = "-1902634670" ) @Export("groupLoadPercent") int groupLoadPercent(int var1) { return this.groups[var1] != null ? 100 : 0; } - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(II)[B", - garbageValue = "1034279223" + garbageValue = "-108401953" ) @Export("takeFileFlat") public byte[] takeFileFlat(int var1) { if (this.files.length == 1) { return this.takeFile(0, var1); - } - if (this.files[var1].length == 1) { + } else if (this.files[var1].length == 1) { return this.takeFile(var1, 0); + } else { + throw new RuntimeException(); } - throw new RuntimeException(); } - @ObfuscatedName("x") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(III)[B", - garbageValue = "-377229485" + signature = "(IIB)[B", + garbageValue = "99" ) @Export("getFile") public byte[] getFile(int var1, int var2) { - if (var1 < 0 || var1 >= this.files.length || this.files[var1] == null || var2 < 0 || var2 >= this.files[var1].length) { - return null; - } - if (this.files[var1][var2] == null) { - boolean var3 = this.buildFiles(var1, (int[])null); - if (!var3) { - this.loadGroup(var1); - var3 = this.buildFiles(var1, (int[])null); + if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { + if (this.files[var1][var2] == null) { + boolean var3 = this.buildFiles(var1, (int[])null); if (!var3) { - return null; + this.loadGroup(var1); + var3 = this.buildFiles(var1, (int[])null); + if (!var3) { + return null; + } } } - } - byte[] var4 = ArchiveDisk.serialize(this.files[var1][var2], false); - return var4; + byte[] var4 = class43.serialize(this.files[var1][var2], false); + return var4; + } else { + return null; + } } - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(II)[B", - garbageValue = "-1915975799" + garbageValue = "-1767422605" ) @Export("getFileFlat") public byte[] getFileFlat(int var1) { if (this.files.length == 1) { return this.getFile(0, var1); - } - if (this.files[var1].length == 1) { + } else if (this.files[var1].length == 1) { return this.getFile(var1, 0); + } else { + throw new RuntimeException(); } - throw new RuntimeException(); } - @ObfuscatedName("v") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(IS)V", - garbageValue = "3211" + signature = "(II)V", + garbageValue = "1800831619" ) @Export("loadGroup") void loadGroup(int var1) { @@ -419,37 +430,37 @@ public abstract class AbstractArchive { @ObfuscatedName("y") @ObfuscatedSignature( signature = "(II)[I", - garbageValue = "1269467416" + garbageValue = "1605042893" ) @Export("getGroupFileIds") public int[] getGroupFileIds(int var1) { return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; } - @ObfuscatedName("g") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(II)I", - garbageValue = "-1116420622" + garbageValue = "-1967727419" ) @Export("getGroupFileCount") public int getGroupFileCount(int var1) { return this.files[var1].length; } - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-953283657" + signature = "(B)I", + garbageValue = "-2" ) @Export("getGroupCount") public int getGroupCount() { return this.files.length; } - @ObfuscatedName("j") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1731367566" + signature = "(S)V", + garbageValue = "663" ) @Export("clearGroups") public void clearGroups() { @@ -459,10 +470,10 @@ public abstract class AbstractArchive { } - @ObfuscatedName("o") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "513084306" + signature = "(IB)V", + garbageValue = "41" ) @Export("clearFilesGroup") public void clearFilesGroup(int var1) { @@ -472,10 +483,10 @@ public abstract class AbstractArchive { } - @ObfuscatedName("d") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1559971076" + garbageValue = "-454602481" ) @Export("clearFiles") public void clearFiles() { @@ -489,266 +500,207 @@ public abstract class AbstractArchive { } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(I[II)Z", - garbageValue = "-1546414650" + garbageValue = "-1201461238" ) @Export("buildFiles") boolean buildFiles(int var1, int[] var2) { if (this.groups[var1] == null) { return false; - } - int var3 = this.fileCounts[var1]; - int[] var4 = this.fileIds[var1]; - Object[] var5 = this.files[var1]; - boolean var6 = true; - - for (int var7 = 0; var7 < var3; ++var7) { - if (var5[var4[var7]] == null) { - var6 = false; - break; - } - } - - if (var6) { - return true; - } - byte[] var21; - if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { - var21 = ArchiveDisk.serialize(this.groups[var1], false); } else { - var21 = ArchiveDisk.serialize(this.groups[var1], true); - Buffer var8 = new Buffer(var21); - var8.xteaDecrypt(var2, 5, var8.array.length); - } + int var3 = this.fileCounts[var1]; + int[] var4 = this.fileIds[var1]; + Object[] var5 = this.files[var1]; + boolean var6 = true; - byte[] var25 = HealthBarUpdate.decompressBytes(var21); - if (this.releaseGroups) { - this.groups[var1] = null; - } + for (int var7 = 0; var7 < var3; ++var7) { + if (var5[var4[var7]] == null) { + var6 = false; + break; + } + } + + if (var6) { + return true; + } else { + byte[] var18; + if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { + var18 = class43.serialize(this.groups[var1], false); + } else { + var18 = class43.serialize(this.groups[var1], true); + Buffer var8 = new Buffer(var18); + var8.xteaDecrypt(var2, 5, var8.array.length); + } + + byte[] var20 = Player.decompressBytes(var18); + if (this.releaseGroups) { + this.groups[var1] = null; + } + + if (var3 > 1) { + int var9 = var20.length; + --var9; + int var10 = var20[var9] & 255; + var9 -= var3 * var10 * 4; + Buffer var11 = new Buffer(var20); + int[] var12 = new int[var3]; + var11.offset = var9; + + int var14; + int var15; + for (int var13 = 0; var13 < var10; ++var13) { + var14 = 0; + + for (var15 = 0; var15 < var3; ++var15) { + var14 += var11.readInt(); + var12[var15] += var14; + } + } + + byte[][] var19 = new byte[var3][]; + + for (var14 = 0; var14 < var3; ++var14) { + var19[var14] = new byte[var12[var14]]; + var12[var14] = 0; + } + + var11.offset = var9; + var14 = 0; + + for (var15 = 0; var15 < var10; ++var15) { + int var16 = 0; + + for (int var17 = 0; var17 < var3; ++var17) { + var16 += var11.readInt(); + System.arraycopy(var20, var14, var19[var17], var12[var17], var16); + var12[var17] += var16; + var14 += var16; + } + } + + for (var15 = 0; var15 < var3; ++var15) { + if (!this.shallowFiles) { + var5[var4[var15]] = Entity.method3209(var19[var15], false); + } else { + var5[var4[var15]] = var19[var15]; + } + } + } else if (!this.shallowFiles) { + var5[var4[0]] = Entity.method3209(var20, false); + } else { + var5[var4[0]] = var20; + } - int var10; - if (var3 <= 1) { - if (this.shallowFiles) { - var5[var4[0]] = var25; return true; } - var10 = var4[0]; - Object var26; - if (var25 == null) { - var26 = null; - } else if (var25.length > 136) { - DirectByteArrayCopier var27 = new DirectByteArrayCopier(); - var27.set(var25); - var26 = var27; - } else { - var26 = var25; - } - - var5[var10] = var26; - return true; } - int var9 = var25.length; - --var9; - var10 = var25[var9] & 255; - var9 -= var10 * var3 * 4; - Buffer var11 = new Buffer(var25); - int[] var12 = new int[var3]; - var11.offset = var9; - - int var14; - int var15; - for (int var13 = 0; var13 < var10; ++var13) { - var14 = 0; - - for (var15 = 0; var15 < var3; ++var15) { - var14 += var11.readInt(); - var12[var15] += var14; - } - } - - byte[][] var23 = new byte[var3][]; - - for (var14 = 0; var14 < var3; ++var14) { - var23[var14] = new byte[var12[var14]]; - var12[var14] = 0; - } - - var11.offset = var9; - var14 = 0; - - int var17; - for (var15 = 0; var15 < var10; ++var15) { - int var16 = 0; - - for (var17 = 0; var17 < var3; ++var17) { - var16 += var11.readInt(); - System.arraycopy(var25, var14, var23[var17], var12[var17], var16); - var12[var17] += var16; - var14 += var16; - } - } - - for (var15 = 0; var15 < var3; ++var15) { - if (this.shallowFiles) { - var5[var4[var15]] = var23[var15]; - continue; - } - var17 = var4[var15]; - byte[] var19 = var23[var15]; - Object var18; - if (var19 == null) { - var18 = null; - } else if (var19.length > 136) { - DirectByteArrayCopier var20 = new DirectByteArrayCopier(); - var20.set(var19); - var18 = var20; - } else { - var18 = var19; - } - - var5[var17] = var18; - } - - return true; } - @ObfuscatedName("z") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)I", - garbageValue = "1993215311" + signature = "(Ljava/lang/String;B)I", + garbageValue = "1" ) @Export("getGroupId") public int getGroupId(String var1) { var1 = var1.toLowerCase(); - return this.groupNameHashTable.get(GrandExchangeOfferAgeComparator.hashString(var1)); + return this.groupNameHashTable.get(ReflectionCheck.hashString(var1)); } - @ObfuscatedName("al") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(ILjava/lang/String;B)I", - garbageValue = "35" + signature = "(ILjava/lang/String;I)I", + garbageValue = "-1503814186" ) @Export("getFileId") public int getFileId(int var1, String var2) { var2 = var2.toLowerCase(); - return this.fileNameHashTables[var1].get(GrandExchangeOfferAgeComparator.hashString(var2)); + return this.fileNameHashTables[var1].get(ReflectionCheck.hashString(var2)); } - @ObfuscatedName("av") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;B)Z", - garbageValue = "14" + signature = "(Ljava/lang/String;Ljava/lang/String;I)Z", + garbageValue = "1589930218" ) @Export("isValidFileName") public boolean isValidFileName(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(GrandExchangeOfferAgeComparator.hashString(var1)); + int var3 = this.groupNameHashTable.get(ReflectionCheck.hashString(var1)); if (var3 < 0) { return false; + } else { + int var4 = this.fileNameHashTables[var3].get(ReflectionCheck.hashString(var2)); + return var4 >= 0; } - int var4 = this.fileNameHashTables[var3].get(GrandExchangeOfferAgeComparator.hashString(var2)); - return var4 >= 0; } - @ObfuscatedName("as") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;I)[B", - garbageValue = "-722893265" + signature = "(Ljava/lang/String;Ljava/lang/String;B)[B", + garbageValue = "34" ) @Export("takeFileByNames") public byte[] takeFileByNames(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(GrandExchangeOfferAgeComparator.hashString(var1)); - int var4 = this.fileNameHashTables[var3].get(GrandExchangeOfferAgeComparator.hashString(var2)); + int var3 = this.groupNameHashTable.get(ReflectionCheck.hashString(var1)); + int var4 = this.fileNameHashTables[var3].get(ReflectionCheck.hashString(var2)); return this.takeFile(var3, var4); } - @ObfuscatedName("aw") + @ObfuscatedName("av") @ObfuscatedSignature( signature = "(Ljava/lang/String;Ljava/lang/String;I)Z", - garbageValue = "-1918711245" + garbageValue = "-823557765" ) @Export("tryLoadFileByNames") public boolean tryLoadFileByNames(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(GrandExchangeOfferAgeComparator.hashString(var1)); - int var4 = this.fileNameHashTables[var3].get(GrandExchangeOfferAgeComparator.hashString(var2)); + int var3 = this.groupNameHashTable.get(ReflectionCheck.hashString(var1)); + int var4 = this.fileNameHashTables[var3].get(ReflectionCheck.hashString(var2)); return this.tryLoadFile(var3, var4); } - @ObfuscatedName("ad") + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)Z", - garbageValue = "-928538356" + signature = "(Ljava/lang/String;B)Z", + garbageValue = "11" ) @Export("tryLoadGroupByName") public boolean tryLoadGroupByName(String var1) { var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(GrandExchangeOfferAgeComparator.hashString(var1)); + int var2 = this.groupNameHashTable.get(ReflectionCheck.hashString(var1)); return this.tryLoadGroup(var2); } - @ObfuscatedName("ag") + @ObfuscatedName("ai") @ObfuscatedSignature( signature = "(Ljava/lang/String;B)V", - garbageValue = "62" + garbageValue = "1" ) @Export("loadRegionFromName") public void loadRegionFromName(String var1) { var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(GrandExchangeOfferAgeComparator.hashString(var1)); + int var2 = this.groupNameHashTable.get(ReflectionCheck.hashString(var1)); if (var2 >= 0) { this.loadRegionFromGroup(var2); } } - @ObfuscatedName("ar") + @ObfuscatedName("af") @ObfuscatedSignature( signature = "(Ljava/lang/String;B)I", - garbageValue = "-19" + garbageValue = "-43" ) @Export("groupLoadPercentByName") public int groupLoadPercentByName(String var1) { var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(GrandExchangeOfferAgeComparator.hashString(var1)); + int var2 = this.groupNameHashTable.get(ReflectionCheck.hashString(var1)); return this.groupLoadPercent(var2); } - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(B)[Lct;", - garbageValue = "-27" - ) - @Export("AttackOption_values") - static AttackOption[] AttackOption_values() { - return new AttackOption[]{AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_hidden, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_leftClickWhereAvailable}; - } - - @ObfuscatedName("av") - @ObfuscatedSignature( - signature = "(ILcx;ZI)I", - garbageValue = "-74440934" - ) - static int method4172(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.SOUND_SYNTH) { - HealthBarUpdate.Interpreter_intStackSize -= 3; - class81.queueSoundEffect(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize], Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2]); - return 1; - } - if (var0 == ScriptOpcodes.SOUND_SONG) { - GrandExchangeOfferTotalQuantityComparator.playSong(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - return 1; - } - if (var0 == ScriptOpcodes.SOUND_JINGLE) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - WorldMapLabelSize.playSoundJingle(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize], Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]); - return 1; - } - return 2; - } } diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index 2fed23489b..a8efb57e49 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -3,75 +3,223 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gz") +@ObfuscatedName("gl") @Implements("AbstractByteArrayCopier") public abstract class AbstractByteArrayCopier { AbstractByteArrayCopier() { } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(I)[B", - garbageValue = "1071129091" + garbageValue = "-1040345200" ) @Export("get") abstract byte[] get(); - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "([BI)V", - garbageValue = "594076777" + garbageValue = "38240743" ) @Export("set") - public abstract void set(byte[] var1); + abstract void set(byte[] var1); - @ObfuscatedName("l") + @ObfuscatedName("gq") @ObfuscatedSignature( - signature = "([BIILer;[Lfv;I)V", - garbageValue = "95070993" + signature = "(B)V", + garbageValue = "53" ) - static final void method3933(byte[] var0, int var1, int var2, Scene var3, CollisionMap[] var4) { - Buffer var5 = new Buffer(var0); - int var6 = -1; + static void method3878() { + if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { + class80.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); + } - while (true) { - int var7 = var5.method5509(); - if (var7 == 0) { - return; - } + } - var6 += var7; - int var8 = 0; + @ObfuscatedName("jf") + @ObfuscatedSignature( + signature = "(Lhp;II)I", + garbageValue = "-706781687" + ) + static final int method3868(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 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; + while (true) { + int var6 = var2[var4++]; + int var7 = 0; + byte var8 = 0; + if (var6 == 0) { + return var3; } - CollisionMap var19 = null; - if (var18 >= 0) { - var19 = var4[var18]; + if (var6 == 1) { + var7 = Client.currentLevels[var2[var4++]]; } - GrandExchangeOfferOwnWorldComparator.method1236(var12, var16, var17, var6, var15, var14, var3, var19); + 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 = WorldMapElement.getWidget(var9); + var11 = var2[var4++]; + if (var11 != -1 && (!WorldMapData_0.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 = WorldMapIcon_1.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 = WorldMapElement.getWidget(var9); + var11 = var2[var4++]; + if (var11 != -1 && (!WorldMapData_0.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 = class208.getVarbit(var9); + } + + if (var6 == 15) { + var8 = 1; + } + + if (var6 == 16) { + var8 = 2; + } + + if (var6 == 17) { + var8 = 3; + } + + if (var6 == 18) { + var7 = PacketWriter.baseX * 64 + (WorldMapIcon_1.localPlayer.x >> 7); + } + + if (var6 == 19) { + var7 = RouteStrategy.baseY * 64 + (WorldMapIcon_1.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("ky") + @ObfuscatedSignature( + signature = "(Lhp;I)Lhp;", + garbageValue = "-1890509802" + ) + static Widget method3871(Widget var0) { + int var2 = ParamDefinition.getWidgetClickMask(var0); + int var1 = var2 >> 17 & 7; + int var3 = var1; + if (var1 == 0) { + return null; + } else { + for (int var4 = 0; var4 < var3; ++var4) { + var0 = WorldMapElement.getWidget(var0.parentId); + if (var0 == null) { + return null; } } + + return var0; } } } diff --git a/runescape-client/src/main/java/AbstractFont.java b/runescape-client/src/main/java/AbstractFont.java index b2798cc7ff..df6bbca23e 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("kl") @Implements("AbstractFont") public abstract class AbstractFont extends Rasterizer2D { - @ObfuscatedName("f") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "[Llx;" + signature = "[Llq;" ) @Export("AbstractFont_modIconSprites") public static IndexedSprite[] AbstractFont_modIconSprites; - @ObfuscatedName("u") + @ObfuscatedName("c") @Export("AbstractFont_strike") static int AbstractFont_strike; - @ObfuscatedName("x") + @ObfuscatedName("r") @Export("AbstractFont_underline") static int AbstractFont_underline; - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("AbstractFont_previousShadow") static int AbstractFont_previousShadow; - @ObfuscatedName("v") + @ObfuscatedName("p") @Export("AbstractFont_shadow") static int AbstractFont_shadow; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("AbstractFont_previousColor") static int AbstractFont_previousColor; @ObfuscatedName("g") @Export("AbstractFont_color") static int AbstractFont_color; - @ObfuscatedName("a") + @ObfuscatedName("e") @Export("AbstractFont_alpha") static int AbstractFont_alpha; - @ObfuscatedName("j") + @ObfuscatedName("z") @Export("AbstractFont_justificationTotal") static int AbstractFont_justificationTotal; - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("AbstractFont_justificationCurrent") static int AbstractFont_justificationCurrent; - @ObfuscatedName("h") + @ObfuscatedName("w") @Export("AbstractFont_random") static Random AbstractFont_random; - @ObfuscatedName("o") + @ObfuscatedName("l") @Export("AbstractFont_lines") static String[] AbstractFont_lines; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("pixels") byte[][] pixels; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("advances") int[] advances; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("widths") int[] widths; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("heights") int[] heights; - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("leftBearings") int[] leftBearings; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("topBearings") int[] topBearings; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("ascent") public int ascent; - @ObfuscatedName("i") + @ObfuscatedName("q") @Export("maxAscent") public int maxAscent; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("maxDescent") public int maxDescent; - @ObfuscatedName("m") + @ObfuscatedName("f") @Export("kerning") byte[] kerning; @@ -123,15 +123,15 @@ public abstract class AbstractFont extends Rasterizer2D { this.readMetrics(var1); } - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("drawGlyph") abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6); - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("drawGlyphAlpha") abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7); - @ObfuscatedName("c") + @ObfuscatedName("x") @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)method5339(var11, var12, var4, this.advances, var10, var13, var8); + this.kerning[var8 + (var13 << 8)] = (byte)method5255(var11, var12, var4, this.advances, var10, var13, var8); } } } @@ -204,171 +204,175 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("x") + @ObfuscatedName("f") @Export("charWidth") int charWidth(char var1) { if (var1 == 160) { var1 = ' '; } - return this.advances[ItemDefinition.charToByteCp1252(var1) & 255]; + return this.advances[class14.charToByteCp1252(var1) & 255]; } - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("stringWidth") public int stringWidth(String var1) { if (var1 == null) { return 0; - } - int var2 = -1; - int var3 = -1; - int var4 = 0; + } else { + int var2 = -1; + int var3 = -1; + int var4 = 0; - for (int var5 = 0; var5 < var1.length(); ++var5) { - char var6 = var1.charAt(var5); - if (var6 == '<') { - var2 = var5; - continue; - } - if (var6 == '>' && var2 != -1) { - String var7 = var1.substring(var2 + 1, var5); - var2 = -1; - if (var7.equals("lt")) { - var6 = '<'; - } - else if (var7.equals("gt")) { - var6 = '>'; - } else if (var7.startsWith("img=")) { - try { - int var8 = class3.parseInt(var7.substring(4)); - var4 += AbstractFont_modIconSprites[var8].width; - var3 = -1; - } catch (Exception var10) { + for (int var5 = 0; var5 < var1.length(); ++var5) { + char var6 = var1.charAt(var5); + if (var6 == '<') { + var2 = var5; + } else { + if (var6 == '>' && var2 != -1) { + String var7 = var1.substring(var2 + 1, var5); + var2 = -1; + if (var7.equals("lt")) { + var6 = '<'; + } else { + if (!var7.equals("gt")) { + if (var7.startsWith("img=")) { + try { + int var8 = WallDecoration.parseInt(var7.substring(4)); + var4 += AbstractFont_modIconSprites[var8].width; + var3 = -1; + } catch (Exception var10) { + } + } + continue; + } + + var6 = '>'; + } + } + + if (var6 == 160) { + var6 = ' '; + } + + if (var2 == -1) { + var4 += this.advances[(char)(class14.charToByteCp1252(var6) & 255)]; + if (this.kerning != null && var3 != -1) { + var4 += this.kerning[var6 + (var3 << 8)]; + } + + var3 = var6; } } } - if (var6 == 160) { - var6 = ' '; - } - - if (var2 != -1) { - continue; - } - var4 += this.advances[(char) (ItemDefinition.charToByteCp1252(var6) & 255)]; - if (this.kerning != null && var3 != -1) { - var4 += this.kerning[var6 + (var3 << 8)]; - } - - var3 = var6; + return var4; } - - return var4; } - @ObfuscatedName("v") + @ObfuscatedName("r") @Export("breakLines") public int breakLines(String var1, int[] var2, String[] var3) { if (var1 == null) { return 0; - } - int var4 = 0; - int var5 = 0; - StringBuilder var6 = new StringBuilder(100); - int var7 = -1; - int var8 = 0; - byte var9 = 0; - int var10 = -1; - char var11 = 0; - int var12 = 0; - int var13 = var1.length(); + } else { + int var4 = 0; + int var5 = 0; + StringBuilder var6 = new StringBuilder(100); + int var7 = -1; + int var8 = 0; + byte var9 = 0; + int var10 = -1; + char var11 = 0; + int var12 = 0; + int var13 = var1.length(); - for (int var14 = 0; var14 < var13; ++var14) { - char var15 = var1.charAt(var14); - if (var15 == '<') { - var10 = var14; - continue; - } - if (var15 == '>' && var10 != -1) { - String var16 = var1.substring(var10 + 1, var14); - var10 = -1; - var6.append('<'); - var6.append(var16); - var6.append('>'); - if (var16.equals("br")) { - var3[var12] = var6.toString().substring(var5, var6.length()); - ++var12; - var5 = var6.length(); - var4 = 0; - var7 = -1; - var11 = 0; - } else if (var16.equals("lt")) { - var4 += this.charWidth('<'); - if (this.kerning != null && var11 != -1) { - var4 += this.kerning[(var11 << '\b') + 60]; + for (int var14 = 0; var14 < var13; ++var14) { + char var15 = var1.charAt(var14); + if (var15 == '<') { + var10 = var14; + } else { + if (var15 == '>' && var10 != -1) { + String var16 = var1.substring(var10 + 1, var14); + var10 = -1; + var6.append('<'); + var6.append(var16); + var6.append('>'); + if (var16.equals("br")) { + var3[var12] = var6.toString().substring(var5, var6.length()); + ++var12; + var5 = var6.length(); + var4 = 0; + var7 = -1; + var11 = 0; + } else if (var16.equals("lt")) { + var4 += this.charWidth('<'); + if (this.kerning != null && var11 != -1) { + var4 += this.kerning[(var11 << '\b') + 60]; + } + + var11 = '<'; + } else if (var16.equals("gt")) { + var4 += this.charWidth('>'); + if (this.kerning != null && var11 != -1) { + var4 += this.kerning[(var11 << '\b') + 62]; + } + + var11 = '>'; + } else if (var16.startsWith("img=")) { + try { + int var17 = WallDecoration.parseInt(var16.substring(4)); + var4 += AbstractFont_modIconSprites[var17].width; + var11 = 0; + } catch (Exception var20) { + } + } + + var15 = 0; } - var11 = '<'; - } else if (var16.equals("gt")) { - var4 += this.charWidth('>'); - if (this.kerning != null && var11 != -1) { - var4 += this.kerning[(var11 << '\b') + 62]; - } + if (var10 == -1) { + if (var15 != 0) { + var6.append(var15); + var4 += this.charWidth(var15); + if (this.kerning != null && var11 != -1) { + var4 += this.kerning[var15 + (var11 << '\b')]; + } - var11 = '>'; - } else if (var16.startsWith("img=")) { - try { - int var17 = class3.parseInt(var16.substring(4)); - var4 += AbstractFont_modIconSprites[var17].width; - var11 = 0; - } catch (Exception var20) { + var11 = var15; + } + + if (var15 == ' ') { + var7 = var6.length(); + var8 = var4; + var9 = 1; + } + + if (var2 != null && var4 > var2[var12 < var2.length ? var12 : var2.length - 1] && var7 >= 0) { + var3[var12] = var6.toString().substring(var5, var7 - var9); + ++var12; + var5 = var7; + var7 = -1; + var4 -= var8; + var11 = 0; + } + + if (var15 == '-') { + var7 = var6.length(); + var8 = var4; + var9 = 0; + } } } - - var15 = 0; } - if (var10 != -1) { - continue; - } - if (var15 != 0) { - var6.append(var15); - var4 += this.charWidth(var15); - if (this.kerning != null && var11 != -1) { - var4 += this.kerning[var15 + (var11 << '\b')]; - } - - var11 = var15; + String var19 = var6.toString(); + if (var19.length() > var5) { + var3[var12++] = var19.substring(var5, var19.length()); } - if (var15 == ' ') { - var7 = var6.length(); - var8 = var4; - var9 = 1; - } - - if (var2 != null && var4 > var2[var12 < var2.length ? var12 : var2.length - 1] && var7 >= 0) { - var3[var12] = var6.toString().substring(var5, var7 - var9); - ++var12; - var5 = var7; - var7 = -1; - var4 -= var8; - var11 = 0; - } - - if (var15 == '-') { - var7 = var6.length(); - var8 = var4; - var9 = 0; - } + return var12; } - - String var19 = var6.toString(); - if (var19.length() > var5) { - var3[var12++] = var19.substring(var5, var19.length()); - } - - return var12; } @ObfuscatedName("y") @@ -387,13 +391,13 @@ public abstract class AbstractFont extends Rasterizer2D { return var4; } - @ObfuscatedName("g") + @ObfuscatedName("p") @Export("lineCount") public int lineCount(String var1, int var2) { return this.breakLines(var1, new int[]{var2}, AbstractFont_lines); } - @ObfuscatedName("j") + @ObfuscatedName("e") @Export("draw") public void draw(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { @@ -402,7 +406,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("o") + @ObfuscatedName("z") @Export("drawAlpha") public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { @@ -412,7 +416,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("d") + @ObfuscatedName("w") @Export("drawRightAligned") public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { @@ -421,7 +425,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("drawCentered") public void drawCentered(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { @@ -430,67 +434,68 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("z") + @ObfuscatedName("h") @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) { return 0; - } - this.reset(var6, var7); - if (var10 == 0) { - var10 = this.ascent; - } - - int[] var11 = new int[]{var4}; - if (var5 < var10 + this.maxAscent + this.maxDescent && var5 < var10 + var10) { - var11 = null; - } - - int var12 = this.breakLines(var1, var11, AbstractFont_lines); - if (var9 == 3 && var12 == 1) { - var9 = 1; - } - - int var13; - int var14; - if (var9 == 0) { - var13 = var3 + this.maxAscent; - } else if (var9 == 1) { - var13 = var3 + (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / 2 + this.maxAscent; - } else if (var9 == 2) { - var13 = var3 + var5 - this.maxDescent - var10 * (var12 - 1); } else { - var14 = (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / (var12 + 1); - if (var14 < 0) { - var14 = 0; + this.reset(var6, var7); + if (var10 == 0) { + var10 = this.ascent; } - var13 = var3 + var14 + this.maxAscent; - var10 += var14; - } + int[] var11 = new int[]{var4}; + if (var5 < var10 + this.maxAscent + this.maxDescent && var5 < var10 + var10) { + var11 = null; + } - for (var14 = 0; var14 < var12; ++var14) { - if (var8 == 0) { - this.draw0(AbstractFont_lines[var14], var2, var13); - } else if (var8 == 1) { - this.draw0(AbstractFont_lines[var14], var2 + (var4 - this.stringWidth(AbstractFont_lines[var14])) / 2, var13); - } else if (var8 == 2) { - this.draw0(AbstractFont_lines[var14], var2 + var4 - this.stringWidth(AbstractFont_lines[var14]), var13); - } else if (var14 == var12 - 1) { - this.draw0(AbstractFont_lines[var14], var2, var13); + int var12 = this.breakLines(var1, var11, AbstractFont_lines); + if (var9 == 3 && var12 == 1) { + var9 = 1; + } + + int var13; + int var14; + if (var9 == 0) { + var13 = var3 + this.maxAscent; + } else if (var9 == 1) { + var13 = var3 + (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / 2 + this.maxAscent; + } else if (var9 == 2) { + var13 = var3 + var5 - this.maxDescent - var10 * (var12 - 1); } else { - this.calculateLineJustification(AbstractFont_lines[var14], var4); - this.draw0(AbstractFont_lines[var14], var2, var13); - AbstractFont_justificationTotal = 0; + var14 = (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / (var12 + 1); + if (var14 < 0) { + var14 = 0; + } + + var13 = var3 + var14 + this.maxAscent; + var10 += var14; } - var13 += var10; - } + for (var14 = 0; var14 < var12; ++var14) { + if (var8 == 0) { + this.draw0(AbstractFont_lines[var14], var2, var13); + } else if (var8 == 1) { + this.draw0(AbstractFont_lines[var14], var2 + (var4 - this.stringWidth(AbstractFont_lines[var14])) / 2, var13); + } else if (var8 == 2) { + this.draw0(AbstractFont_lines[var14], var2 + var4 - this.stringWidth(AbstractFont_lines[var14]), var13); + } else if (var14 == var12 - 1) { + this.draw0(AbstractFont_lines[var14], var2, var13); + } else { + this.calculateLineJustification(AbstractFont_lines[var14], var4); + this.draw0(AbstractFont_lines[var14], var2, var13); + AbstractFont_justificationTotal = 0; + } - return var12; + var13 += var10; + } + + return var12; + } } - @ObfuscatedName("al") + @ObfuscatedName("v") @Export("drawCenteredWave") public void drawCenteredWave(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { @@ -505,7 +510,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("av") + @ObfuscatedName("m") @Export("drawCenteredWave2") public void drawCenteredWave2(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { @@ -522,7 +527,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("as") + @ObfuscatedName("o") @Export("drawCenteredShake") public void drawCenteredShake(String var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (var1 != null) { @@ -542,7 +547,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("aw") + @ObfuscatedName("av") @Export("drawRandomAlphaAndSpacing") public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { @@ -563,7 +568,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("ad") + @ObfuscatedName("am") @Export("reset") void reset(int var1, int var2) { AbstractFont_strike = -1; @@ -577,28 +582,38 @@ public abstract class AbstractFont extends Rasterizer2D { AbstractFont_justificationCurrent = 0; } - @ObfuscatedName("ag") + @ObfuscatedName("ai") @Export("decodeTag") void decodeTag(String var1) { try { + int var2; + String var3; if (var1.startsWith("col=")) { - AbstractFont_color = VarbitDefinition.parseIntCustomRadix(var1.substring(4), 16); + var3 = var1.substring(4); + var2 = Ignored.parseIntCustomRadix(var3, 16, true); + AbstractFont_color = var2; } else if (var1.equals("/col")) { AbstractFont_color = AbstractFont_previousColor; } else if (var1.startsWith("str=")) { - AbstractFont_strike = VarbitDefinition.parseIntCustomRadix(var1.substring(4), 16); + var3 = var1.substring(4); + var2 = Ignored.parseIntCustomRadix(var3, 16, true); + AbstractFont_strike = var2; } else if (var1.equals("str")) { - AbstractFont_strike = 0x800000; + AbstractFont_strike = 8388608; } else if (var1.equals("/str")) { AbstractFont_strike = -1; } else if (var1.startsWith("u=")) { - AbstractFont_underline = VarbitDefinition.parseIntCustomRadix(var1.substring(2), 16); + var3 = var1.substring(2); + var2 = Ignored.parseIntCustomRadix(var3, 16, true); + AbstractFont_underline = var2; } else if (var1.equals("u")) { AbstractFont_underline = 0; } else if (var1.equals("/u")) { AbstractFont_underline = -1; } else if (var1.startsWith("shad=")) { - AbstractFont_shadow = VarbitDefinition.parseIntCustomRadix(var1.substring(5), 16); + var3 = var1.substring(5); + var2 = Ignored.parseIntCustomRadix(var3, 16, true); + AbstractFont_shadow = var2; } else if (var1.equals("shad")) { AbstractFont_shadow = 0; } else if (var1.equals("/shad")) { @@ -606,12 +621,12 @@ public abstract class AbstractFont extends Rasterizer2D { } else if (var1.equals("br")) { this.reset(AbstractFont_previousColor, AbstractFont_previousShadow); } - } catch (Exception var3) { + } catch (Exception var5) { } } - @ObfuscatedName("ar") + @ObfuscatedName("af") @Export("calculateLineJustification") void calculateLineJustification(String var1, int var2) { int var3 = 0; @@ -634,7 +649,7 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("ax") + @ObfuscatedName("az") @Export("draw0") void draw0(String var1, int var2, int var3) { var3 -= this.ascent; @@ -642,87 +657,88 @@ public abstract class AbstractFont extends Rasterizer2D { int var5 = -1; for (int var6 = 0; var6 < var1.length(); ++var6) { - if (var1.charAt(var6) == 0) { - continue; - } - char var7 = (char)(ItemDefinition.charToByteCp1252(var1.charAt(var6)) & 255); - if (var7 == '<') { - var4 = var6; - continue; - } - int var9; - if (var7 == '>' && var4 != -1) { - String var8 = var1.substring(var4 + 1, var6); - var4 = -1; - if (var8.equals("lt")) { - var7 = '<'; - } else if (var8.equals("gt")) { - var7 = '>'; - } else if (var8.startsWith("img=")) { - try { - var9 = class3.parseInt(var8.substring(4)); - IndexedSprite var10 = AbstractFont_modIconSprites[var9]; - var10.drawAt(var2, var3 + this.ascent - var10.height); - var2 += var10.width; - var5 = -1; - } catch (Exception var14) { - } - continue; + if (var1.charAt(var6) != 0) { + char var7 = (char)(class14.charToByteCp1252(var1.charAt(var6)) & 255); + if (var7 == '<') { + var4 = var6; } else { - this.decodeTag(var8); - continue; + int var9; + if (var7 == '>' && var4 != -1) { + String var8 = var1.substring(var4 + 1, var6); + var4 = -1; + if (var8.equals("lt")) { + var7 = '<'; + } else { + if (!var8.equals("gt")) { + if (var8.startsWith("img=")) { + try { + var9 = WallDecoration.parseInt(var8.substring(4)); + IndexedSprite var10 = AbstractFont_modIconSprites[var9]; + var10.drawAt(var2, var3 + this.ascent - var10.height); + var2 += var10.width; + var5 = -1; + } catch (Exception var14) { + } + } else { + this.decodeTag(var8); + } + continue; + } + + var7 = '>'; + } + } + + if (var7 == 160) { + var7 = ' '; + } + + if (var4 == -1) { + if (this.kerning != null && var5 != -1) { + var2 += this.kerning[var7 + (var5 << 8)]; + } + + int var12 = this.widths[var7]; + var9 = this.heights[var7]; + if (var7 != ' ') { + if (AbstractFont_alpha == 256) { + if (AbstractFont_shadow != -1) { + AbstractFont_drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var9, AbstractFont_shadow); + } + + this.drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color); + } else { + if (AbstractFont_shadow != -1) { + AbstractFont_drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var9, AbstractFont_shadow, AbstractFont_alpha); + } + + this.drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color, AbstractFont_alpha); + } + } else if (AbstractFont_justificationTotal > 0) { + AbstractFont_justificationCurrent += AbstractFont_justificationTotal; + var2 += AbstractFont_justificationCurrent >> 8; + AbstractFont_justificationCurrent &= 255; + } + + int var13 = this.advances[var7]; + if (AbstractFont_strike != -1) { + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var13, AbstractFont_strike); + } + + if (AbstractFont_underline != -1) { + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent + 1, var13, AbstractFont_underline); + } + + var2 += var13; + var5 = var7; + } } } - - if (var7 == 160) { - var7 = ' '; - } - - if (var4 != -1) { - continue; - } - if (this.kerning != null && var5 != -1) { - var2 += this.kerning[var7 + (var5 << 8)]; - } - - int var12 = this.widths[var7]; - var9 = this.heights[var7]; - if (var7 == ' ') { - if (AbstractFont_justificationTotal > 0) { - AbstractFont_justificationCurrent += AbstractFont_justificationTotal; - var2 += AbstractFont_justificationCurrent >> 8; - AbstractFont_justificationCurrent &= 255; - } - } else if (AbstractFont_alpha == 256) { - if (AbstractFont_shadow != -1) { - AbstractFont_drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var9, AbstractFont_shadow); - } - - this.drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color); - } else { - if (AbstractFont_shadow != -1) { - AbstractFont_drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var9, AbstractFont_shadow, AbstractFont_alpha); - } - - this.drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color, AbstractFont_alpha); - } - - int var13 = this.advances[var7]; - if (AbstractFont_strike != -1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var13, AbstractFont_strike); - } - - if (AbstractFont_underline != -1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent + 1, var13, AbstractFont_underline); - } - - var2 += var13; - var5 = var7; } } - @ObfuscatedName("az") + @ObfuscatedName("aj") @Export("drawWithOffsets0") void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) { var3 -= this.ascent; @@ -731,110 +747,117 @@ public abstract class AbstractFont extends Rasterizer2D { int var8 = 0; for (int var9 = 0; var9 < var1.length(); ++var9) { - if (var1.charAt(var9) == 0) { - continue; - } - char var10 = (char)(ItemDefinition.charToByteCp1252(var1.charAt(var9)) & 255); - if (var10 == '<') { - var6 = var9; - } else if (var10 == '>' && var6 != -1) { - String var11 = var1.substring(var6 + 1, var9); - var6 = -1; - if (var11.equals("lt")) { - var10 = '<'; - } else if (var11.equals("gt")) { - var10 = '>'; - } else if (!var11.startsWith("img=")) { - this.decodeTag(var11); + if (var1.charAt(var9) != 0) { + char var10 = (char)(class14.charToByteCp1252(var1.charAt(var9)) & 255); + if (var10 == '<') { + var6 = var9; } else { - try { - int var12, var13; - if (var4 != null) { - var12 = var4[var8]; + int var12; + int var13; + int var14; + if (var10 == '>' && var6 != -1) { + String var11 = var1.substring(var6 + 1, var9); + var6 = -1; + if (var11.equals("lt")) { + var10 = '<'; } else { - var12 = 0; + if (!var11.equals("gt")) { + if (var11.startsWith("img=")) { + try { + if (var4 != null) { + var12 = var4[var8]; + } else { + var12 = 0; + } + + if (var5 != null) { + var13 = var5[var8]; + } else { + var13 = 0; + } + + ++var8; + var14 = WallDecoration.parseInt(var11.substring(4)); + IndexedSprite var15 = AbstractFont_modIconSprites[var14]; + var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height)); + var2 += var15.width; + var7 = -1; + } catch (Exception var19) { + } + } else { + this.decodeTag(var11); + } + continue; + } + + var10 = '>'; + } + } + + if (var10 == 160) { + var10 = ' '; + } + + if (var6 == -1) { + if (this.kerning != null && var7 != -1) { + var2 += this.kerning[var10 + (var7 << 8)]; } - if (var5 != null) { - var13 = var5[var8]; + int var17 = this.widths[var10]; + var12 = this.heights[var10]; + if (var4 != null) { + var13 = var4[var8]; } else { var13 = 0; } + if (var5 != null) { + var14 = var5[var8]; + } else { + var14 = 0; + } + ++var8; - int var14 = class3.parseInt(var11.substring(4)); - IndexedSprite var15 = AbstractFont_modIconSprites[var14]; - var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height)); - var2 += var15.width; - var7 = -1; - } catch (Exception var19) { + if (var10 != ' ') { + if (AbstractFont_alpha == 256) { + if (AbstractFont_shadow != -1) { + AbstractFont_drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10] + 1, var3 + var14 + this.topBearings[var10] + 1, var17, var12, AbstractFont_shadow); + } + + this.drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color); + } else { + if (AbstractFont_shadow != -1) { + AbstractFont_drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10] + 1, var3 + var14 + this.topBearings[var10] + 1, var17, var12, AbstractFont_shadow, AbstractFont_alpha); + } + + this.drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color, AbstractFont_alpha); + } + } else if (AbstractFont_justificationTotal > 0) { + AbstractFont_justificationCurrent += AbstractFont_justificationTotal; + var2 += AbstractFont_justificationCurrent >> 8; + AbstractFont_justificationCurrent &= 255; + } + + int var18 = this.advances[var10]; + if (AbstractFont_strike != -1) { + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var18, AbstractFont_strike); + } + + if (AbstractFont_underline != -1) { + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent, var18, AbstractFont_underline); + } + + var2 += var18; + var7 = var10; } } } - - if (var10 == 160) { - var10 = ' '; - } - - if (var6 != -1) { - continue; - } - if (this.kerning != null && var7 != -1) { - var2 += this.kerning[var10 + (var7 << 8)]; - } - - int var17 = this.widths[var10]; - int var12 = this.heights[var10]; - int var13, var14; - if (var4 != null) { - var13 = var4[var8]; - } else { - var13 = 0; - } - - if (var5 != null) { - var14 = var5[var8]; - } else { - var14 = 0; - } - - ++var8; - if (var10 == ' ') { - if (AbstractFont_justificationTotal > 0) { - AbstractFont_justificationCurrent += AbstractFont_justificationTotal; - var2 += AbstractFont_justificationCurrent >> 8; - AbstractFont_justificationCurrent &= 255; - } - } else if (AbstractFont_alpha == 256) { - if (AbstractFont_shadow != -1) { - AbstractFont_drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10] + 1, var3 + var14 + this.topBearings[var10] + 1, var17, var12, AbstractFont_shadow); - } - - this.drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color); - } else { - if (AbstractFont_shadow != -1) { - AbstractFont_drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10] + 1, var3 + var14 + this.topBearings[var10] + 1, var17, var12, AbstractFont_shadow, AbstractFont_alpha); - } - - this.drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color, AbstractFont_alpha); - } - - int var18 = this.advances[var10]; - if (AbstractFont_strike != -1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var18, AbstractFont_strike); - } - - if (AbstractFont_underline != -1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent, var18, AbstractFont_underline); - } - - var2 += var18; - var7 = var10; } + } - @ObfuscatedName("u") - static int method5339(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { + @ObfuscatedName("d") + static int method5255(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]; @@ -869,7 +892,7 @@ public abstract class AbstractFont extends Rasterizer2D { return -var13; } - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("escapeBrackets") public static String escapeBrackets(String var0) { int var1 = var0.length(); @@ -898,7 +921,7 @@ public abstract class AbstractFont extends Rasterizer2D { return var6.toString(); } - @ObfuscatedName("ae") + @ObfuscatedName("an") @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; @@ -940,7 +963,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("ao") + @ObfuscatedName("at") @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); @@ -988,7 +1011,7 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("aj") + @ObfuscatedName("as") @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; @@ -1030,17 +1053,17 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("at") + @ObfuscatedName("ak") @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 & 0xff00) * var9 & 0xff0000) + (var9 * (var2 & 0xff00ff) & 0xff00ff00) >> 8; + var2 = ((var2 & 65280) * var9 & 16711680) + (var9 * (var2 & 16711935) & -16711936) >> 8; var9 = 256 - var9; for (int var10 = -var6; var10 < 0; ++var10) { for (int var11 = -var5; var11 < 0; ++var11) { if (var1[var3++] != 0) { int var12 = var0[var4]; - var0[var4++] = (((var12 & 0xff00) * var9 & 0xff0000) + ((var12 & 0xff00ff) * var9 & 0xff00ff00) >> 8) + var2; + var0[var4++] = (((var12 & 65280) * var9 & 16711680) + ((var12 & 16711935) * var9 & -16711936) >> 8) + var2; } else { ++var4; } diff --git a/runescape-client/src/main/java/AbstractRasterProvider.java b/runescape-client/src/main/java/AbstractRasterProvider.java index eae5569f90..220d334dfa 100644 --- a/runescape-client/src/main/java/AbstractRasterProvider.java +++ b/runescape-client/src/main/java/AbstractRasterProvider.java @@ -4,27 +4,21 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lt") +@ObfuscatedName("lg") @Implements("AbstractRasterProvider") public abstract class AbstractRasterProvider { - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Lkf;" - ) - @Export("NetCache_reference") - static Buffer NetCache_reference; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("pixels") public int[] pixels; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1276568955 + intValue = -436554829 ) @Export("width") public int width; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1637041543 + intValue = -1168028289 ) @Export("height") public int height; @@ -32,26 +26,26 @@ public abstract class AbstractRasterProvider { protected AbstractRasterProvider() { } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-1942972544" + garbageValue = "314023161" ) @Export("drawFull") public abstract void drawFull(int var1, int var2); - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(IIIII)V", - garbageValue = "1902391505" + garbageValue = "333545527" ) @Export("draw") public abstract void draw(int var1, int var2, int var3, int var4); - @ObfuscatedName("s") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "106" + signature = "(I)V", + garbageValue = "1451326676" ) @Export("apply") public final void apply() { diff --git a/runescape-client/src/main/java/AbstractSocket.java b/runescape-client/src/main/java/AbstractSocket.java index f43d5fe6a5..838af9feb1 100644 --- a/runescape-client/src/main/java/AbstractSocket.java +++ b/runescape-client/src/main/java/AbstractSocket.java @@ -4,57 +4,67 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ky") +@ObfuscatedName("kg") @Implements("AbstractSocket") public abstract class AbstractSocket { protected AbstractSocket() { } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1144636612" + garbageValue = "-1798752769" ) @Export("close") public abstract void close(); - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "2" + signature = "(I)I", + garbageValue = "547465689" ) @Export("readUnsignedByte") public abstract int readUnsignedByte() throws IOException; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "55" + garbageValue = "83" ) @Export("available") public abstract int available() throws IOException; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "1948150862" + garbageValue = "156087109" ) @Export("isAvailable") public abstract boolean isAvailable(int var1) throws IOException; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "([BIIB)I", - garbageValue = "26" + garbageValue = "100" ) @Export("read") public abstract int read(byte[] var1, int var2, int var3) throws IOException; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "-1696227994" + garbageValue = "638463675" ) @Export("write") public abstract void write(byte[] var1, int var2, int var3) throws IOException; + + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(I)[Lkk;", + garbageValue = "2143260840" + ) + @Export("ChatMode_values") + static PrivateChatMode[] ChatMode_values() { + return new PrivateChatMode[]{PrivateChatMode.field3790, PrivateChatMode.field3788, PrivateChatMode.field3793}; + } } diff --git a/runescape-client/src/main/java/AbstractSound.java b/runescape-client/src/main/java/AbstractSound.java index 89e92dca3a..0a176d81f0 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("du") +@ObfuscatedName("ds") @Implements("AbstractSound") public abstract class AbstractSound extends Node { - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("position") int position; diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java index 6e7e059e4d..72bdbbf7d4 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("ja") +@ObfuscatedName("je") @Implements("AbstractUserComparator") public abstract class AbstractUserComparator implements Comparator { - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("nextComparator") Comparator nextComparator; protected AbstractUserComparator() { } - @ObfuscatedName("c") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Ljava/util/Comparator;I)V", - garbageValue = "-6206068" + signature = "(Ljava/util/Comparator;B)V", + garbageValue = "102" ) @Export("addComparator") final void addComparator(Comparator var1) { @@ -29,10 +29,10 @@ public abstract class AbstractUserComparator implements Comparator { } - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Ljd;Ljd;I)I", - garbageValue = "191415789" + signature = "(Lju;Lju;I)I", + garbageValue = "760812985" ) @Export("compareUser") protected final int compareUser(User var1, User var2) { diff --git a/runescape-client/src/main/java/AbstractWorldMapData.java b/runescape-client/src/main/java/AbstractWorldMapData.java index d4d5c9789f..f7416629a7 100644 --- a/runescape-client/src/main/java/AbstractWorldMapData.java +++ b/runescape-client/src/main/java/AbstractWorldMapData.java @@ -5,113 +5,108 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("o") +@ObfuscatedName("l") @Implements("AbstractWorldMapData") public abstract class AbstractWorldMapData { - @ObfuscatedName("el") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1739932713 - ) - static int field155; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -680308736 + intValue = -136523776 ) @Export("regionXLow") int regionXLow; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1014181888 + intValue = 1537560576 ) @Export("regionYLow") int regionYLow; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 421939525 + intValue = -756440995 ) @Export("regionX") int regionX; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1418471835 + intValue = 2087702297 ) @Export("regionY") int regionY; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1513175747 + intValue = -489051341 ) @Export("minPlane") int minPlane; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -402229247 + intValue = -1972038717 ) @Export("planes") int planes; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -376642433 + intValue = 156978213 ) @Export("groupId") int groupId; - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1618366577 + intValue = 1797648451 ) @Export("fileId") int fileId; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("floorUnderlayIds") short[][][] floorUnderlayIds; - @ObfuscatedName("f") + @ObfuscatedName("d") @Export("floorOverlayIds") short[][][] floorOverlayIds; - @ObfuscatedName("m") - byte[][][] field165; - @ObfuscatedName("u") - byte[][][] field166; - @ObfuscatedName("x") + @ObfuscatedName("f") + byte[][][] field145; + @ObfuscatedName("c") + byte[][][] field156; + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "[[[[Lz;" + signature = "[[[[Lo;" ) @Export("decorations") WorldMapDecoration[][][][] decorations; - @ObfuscatedName("r") - boolean field168; - @ObfuscatedName("v") - boolean field169; + @ObfuscatedName("y") + boolean field158; + @ObfuscatedName("p") + boolean field159; AbstractWorldMapData() { this.groupId = -1; this.fileId = -1; new LinkedList(); - this.field168 = false; - this.field169 = false; + this.field158 = false; + this.field159 = false; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkf;I)V", - garbageValue = "-1951934103" + signature = "(Lky;B)V", + garbageValue = "120" ) @Export("readGeography") abstract void readGeography(Buffer var1); - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-613524686" + signature = "(B)Z", + garbageValue = "-103" ) @Export("isFullyLoaded") boolean isFullyLoaded() { - return this.field168 && this.field169; + return this.field158 && this.field159; } - @ObfuscatedName("u") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lhp;I)V", - garbageValue = "1963301304" + signature = "(Lhz;I)V", + garbageValue = "-1580621275" ) @Export("loadGeography") void loadGeography(AbstractArchive var1) { @@ -119,53 +114,53 @@ public abstract class AbstractWorldMapData { byte[] var2 = var1.takeFile(this.groupId, this.fileId); if (var2 != null) { this.readGeography(new Buffer(var2)); - this.field168 = true; - this.field169 = true; + this.field158 = true; + this.field159 = true; } } } - @ObfuscatedName("x") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1146093408" + garbageValue = "2145144649" ) @Export("reset") void reset() { this.floorUnderlayIds = null; this.floorOverlayIds = null; - this.field165 = null; - this.field166 = null; + this.field145 = null; + this.field156 = null; this.decorations = null; - this.field168 = false; - this.field169 = false; + this.field158 = false; + this.field159 = false; } - @ObfuscatedName("r") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IILkf;I)V", - garbageValue = "-1521348339" + signature = "(IILky;I)V", + garbageValue = "1320309065" ) @Export("readTile") void readTile(int var1, int var2, Buffer var3) { int var4 = var3.readUnsignedByte(); if (var4 != 0) { if ((var4 & 1) != 0) { - this.method258(var1, var2, var3, var4); + this.method247(var1, var2, var3, var4); } else { - this.method253(var1, var2, var3, var4); + this.method259(var1, var2, var3, var4); } } } - @ObfuscatedName("v") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(IILkf;IB)V", - garbageValue = "0" + signature = "(IILky;IB)V", + garbageValue = "85" ) - void method258(int var1, int var2, Buffer var3, int var4) { + void method247(int var1, int var2, Buffer var3, int var4) { boolean var5 = (var4 & 2) != 0; if (var5) { this.floorOverlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); @@ -174,12 +169,12 @@ public abstract class AbstractWorldMapData { this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); } - @ObfuscatedName("y") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(IILkf;IB)V", - garbageValue = "44" + signature = "(IILky;IS)V", + garbageValue = "320" ) - void method253(int var1, int var2, Buffer var3, int var4) { + void method259(int var1, int var2, Buffer var3, int var4) { int var5 = ((var4 & 24) >> 3) + 1; boolean var6 = (var4 & 2) != 0; boolean var7 = (var4 & 4) != 0; @@ -195,8 +190,8 @@ public abstract class AbstractWorldMapData { if (var10 != 0) { this.floorOverlayIds[var9][var1][var2] = (short)var10; var11 = var3.readUnsignedByte(); - this.field165[var9][var1][var2] = (byte)(var11 >> 2); - this.field166[var9][var1][var2] = (byte)(var11 & 3); + this.field145[var9][var1][var2] = (byte)(var11 >> 2); + this.field156[var9][var1][var2] = (byte)(var11 & 3); } } } @@ -208,7 +203,7 @@ public abstract class AbstractWorldMapData { WorldMapDecoration[] var14 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9]; for (var11 = 0; var11 < var9; ++var11) { - int var12 = var3.method5511(); + int var12 = var3.method5602(); int var13 = var3.readUnsignedByte(); var14[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); } @@ -218,178 +213,111 @@ public abstract class AbstractWorldMapData { } - @ObfuscatedName("g") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-121424149" + signature = "(B)I", + garbageValue = "-88" ) @Export("getRegionX") int getRegionX() { return this.regionX; } - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-1967751745" + signature = "(B)I", + garbageValue = "-79" ) @Export("getRegionY") int getRegionY() { return this.regionY; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "-108" + signature = "(IS)Ljava/lang/String;", + garbageValue = "30202" ) - static int method274(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var2 == null) { - return -1; - } - return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; + static String method278(int var0) { + return ""; } - @ObfuscatedName("gj") + @ObfuscatedName("gb") @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "-2108015148" + signature = "(II)V", + garbageValue = "1514757872" ) - static final void method273(int var0, int var1, int var2, int var3) { - ObjectSound.method1826(); + static final void method264(int var0) { + int[] var1 = ParamDefinition.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) { + Player.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3); + } + + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { + Player.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; + ParamDefinition.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) { + UserComparator10.drawObject(var0, var6, var5, var3, var4); + } + + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { + UserComparator10.drawObject(var0 + 1, var6, var5, var3, var4); + } + } + } + + Client.mapIconCount = 0; + + for (var5 = 0; var5 < 104; ++var5) { + for (var6 = 0; var6 < 104; ++var6) { + long var7 = Player.scene.getFloorDecorationTag(ItemContainer.plane, var5, var6); + if (var7 != 0L) { + int var9 = BoundaryObject.Entity_unpackID(var7); + int var10 = class215.getObjectDefinition(var9).mapIconId; + if (var10 >= 0) { + Client.mapIcons[Client.mapIconCount] = WorldMapData_0.WorldMapElement_get(var10).getSpriteBool(false); + Client.mapIconXs[Client.mapIconCount] = var5; + Client.mapIconYs[Client.mapIconCount] = var6; + ++Client.mapIconCount; + } + } + } + } + + SpotAnimationDefinition.rasterProvider.apply(); } - @ObfuscatedName("hp") + @ObfuscatedName("kp") @ObfuscatedSignature( - signature = "(Lij;IIII)V", - garbageValue = "566580282" + signature = "(IB)V", + garbageValue = "-61" ) - @Export("addNpcToMenu") - static final void addNpcToMenu(NPCDefinition var0, int var1, int var2, int var3) { - if (Client.menuOptionsCount >= 400) { - return; - } - if (var0.transforms != null) { - var0 = var0.transform(); - } - - if (var0 == null || !var0.isInteractable || (var0.isFollower && Client.followerIndex != var1)) { - return; - } - String var4 = var0.name; - if (var0.combatLevel != 0) { - int var7 = var0.combatLevel; - int var8 = Client.localPlayer.combatLevel; - int var9 = var8 - var7; - String var6; - if (var9 < -9) { - var6 = ClientPreferences.colorStartTag(0xff0000); - } else if (var9 < -6) { - var6 = ClientPreferences.colorStartTag(0xff3000); - } else if (var9 < -3) { - var6 = ClientPreferences.colorStartTag(0xff7000); - } else if (var9 < 0) { - var6 = ClientPreferences.colorStartTag(0xffb000); - } else if (var9 > 9) { - var6 = ClientPreferences.colorStartTag(0xff00); - } else if (var9 > 6) { - var6 = ClientPreferences.colorStartTag(0x40ff00); - } else if (var9 > 3) { - var6 = ClientPreferences.colorStartTag(0x80ff00); - } else if (var9 > 0) { - var6 = ClientPreferences.colorStartTag(0xc0ff00); - } else { - var6 = ClientPreferences.colorStartTag(0xffff00); - } - - var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")"; - } - - if (var0.isFollower && Client.followerOpsLowPriority) { - class188.insertMenuItemNoShift("Examine", ClientPreferences.colorStartTag(0xffff00) + var4, 1003, var1, var2, var3); - } - - if (Client.isItemSelected == 1) { - class188.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ClientPreferences.colorStartTag(0xffff00) + var4, 7, var1, var2, var3); - return; - } else if (Client.isSpellSelected) { - if ((WorldMapCacheName.selectedSpellFlags & 2) == 2) { - class188.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ClientPreferences.colorStartTag(0xffff00) + var4, 8, var1, var2, var3); - } - return; - } - String[] var11 = var0.actions; - if (var11 != null) { - for (int var7 = 4; var7 >= 0; --var7) { - if (var11[var7] == null || var11[var7].equalsIgnoreCase("Attack")) { - continue; - } - int var8 = 0; - int var10 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 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; - } - - class188.insertMenuItemNoShift(var11[var7], ClientPreferences.colorStartTag(0xffff00) + var4, var8, var1, var2, var3); - } - - for (int var7 = 4; var7 >= 0; --var7) { - if (var11[var7] == null || !var11[var7].equalsIgnoreCase("Attack")) { - continue; - } - short var12 = 0; - if (AttackOption.AttackOption_hidden == Client.npcAttackOption) { - continue; - } - if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || AttackOption.AttackOption_dependsOnCombatLevels == Client.npcAttackOption && var0.combatLevel > Client.localPlayer.combatLevel) { - var12 = 2000; - } - - int 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; - } - - class188.insertMenuItemNoShift(var11[var7], ClientPreferences.colorStartTag(0xffff00) + var4, var8, var1, var2, var3); - } - } - - if (!var0.isFollower || !Client.followerOpsLowPriority) { - class188.insertMenuItemNoShift("Examine", ClientPreferences.colorStartTag(0xffff00) + var4, 1003, var1, var2, var3); - } - + static void method272(int var0) { + Client.oculusOrbState = var0; } } diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index a13b4606f8..c239979887 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -4,183 +4,184 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("az") +@ObfuscatedName("as") @Implements("AbstractWorldMapIcon") public abstract class AbstractWorldMapIcon { - @ObfuscatedName("b") + @ObfuscatedName("bi") @ObfuscatedSignature( - signature = "Lhv;" + signature = "Llq;" + ) + @Export("worldSelectLeftSprite") + static IndexedSprite worldSelectLeftSprite; + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "Lhd;" ) @Export("coord2") public final Coord coord2; - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lhv;" + signature = "Lhd;" ) @Export("coord1") public final Coord coord1; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1277861537 + intValue = 318036895 ) @Export("screenX") int screenX; - @ObfuscatedName("f") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -946812135 + intValue = 1985838427 ) @Export("screenY") int screenY; @ObfuscatedSignature( - signature = "(Lhv;Lhv;)V" + signature = "(Lhd;Lhd;)V" ) AbstractWorldMapIcon(Coord var1, Coord var2) { this.coord1 = var1; this.coord2 = var2; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-229566020" + signature = "(B)I", + garbageValue = "78" ) @Export("getElement") public abstract int getElement(); - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)Las;", - garbageValue = "1426074195" + signature = "(B)Lai;", + garbageValue = "1" ) @Export("getLabel") abstract WorldMapLabel getLabel(); - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "14" + signature = "(I)I", + garbageValue = "1930584854" ) @Export("getSubWidth") abstract int getSubWidth(); - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "1" + garbageValue = "-56" ) @Export("getSubHeight") abstract int getSubHeight(); - @ObfuscatedName("o") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(IIB)Z", - garbageValue = "-101" + signature = "(III)Z", + garbageValue = "505598061" ) @Export("fitsScreen") boolean fitsScreen(int var1, int var2) { if (this.elementFitsScreen(var1, var2)) { return true; + } else { + return this.labelFitsScreen(var1, var2); } - return this.labelFitsScreen(var1, var2); } - @ObfuscatedName("d") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-1274004046" + signature = "(S)Z", + garbageValue = "256" ) @Export("hasValidElement") boolean hasValidElement() { return this.getElement() >= 0; } - @ObfuscatedName("s") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(III)Z", - garbageValue = "406020312" + signature = "(IIS)Z", + garbageValue = "-26498" ) @Export("elementFitsScreen") boolean elementFitsScreen(int var1, int var2) { if (!this.hasValidElement()) { return false; - } - WorldMapElement var3 = class222.WorldMapElement_get(this.getElement()); - int var4 = this.getSubWidth(); - int var5 = this.getSubHeight(); - switch(var3.horizontalAlignment.value) { - case 0: - if (var1 <= this.screenX - var4 || var1 > this.screenX) { + } else { + WorldMapElement var3 = WorldMapData_0.WorldMapElement_get(this.getElement()); + int var4 = this.getSubWidth(); + int var5 = this.getSubHeight(); + switch(var3.horizontalAlignment.value) { + case 0: + if (var1 >= this.screenX && var1 < var4 + this.screenX) { + break; + } + return false; + case 1: + if (var1 >= this.screenX - var4 / 2 && var1 <= var4 / 2 + this.screenX) { + break; + } + + return false; + case 2: + if (var1 <= this.screenX - var4 || var1 > this.screenX) { + return false; + } } - break; - case 1: - if (var1 >= this.screenX && var1 < var4 + this.screenX) { + + switch(var3.verticalAlignment.value) { + case 0: + if (var2 >= this.screenY - var5 / 2 && var2 <= var5 / 2 + this.screenY) { + break; + } + + return false; + case 1: + if (var2 <= this.screenY - var5 || var2 > this.screenY) { + return false; + } break; + case 2: + if (var2 < this.screenY || var2 >= var5 + this.screenY) { + return false; + } } - return false; - case 2: - if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) { - return false; - } + return true; } - - switch(var3.verticalAlignment.value) { - case 0: - if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) { - return false; - } - break; - case 1: - if (var2 <= this.screenY - var5 || var2 > this.screenY) { - return false; - } - break; - case 2: - if (var2 < this.screenY || var2 >= var5 + this.screenY) { - return false; - } - } - - return true; } - @ObfuscatedName("z") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(III)Z", - garbageValue = "-1252480817" + signature = "(IIB)Z", + garbageValue = "66" ) @Export("labelFitsScreen") boolean labelFitsScreen(int var1, int var2) { WorldMapLabel var3 = this.getLabel(); if (var3 == null) { return false; - } - if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) { + } else if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) { return var2 >= this.screenY && var2 <= this.screenY + var3.height; + } else { + return false; } - return false; } @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1908697951" + signature = "(Ljava/lang/String;I)V", + garbageValue = "261353448" ) - @Export("NpcDefinition_clearCached") - public static void NpcDefinition_clearCached() { - NPCDefinition.NpcDefinition_cached.clear(); - NPCDefinition.NpcDefinition_cachedModels.clear(); - } - - @ObfuscatedName("fb") - @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-108" - ) - @Export("getWindowedMode") - static int getWindowedMode() { - return Client.isResizable ? 2 : 1; + static final void method591(String var0) { + StringBuilder var10000 = (new StringBuilder()).append(var0); + Object var10001 = null; + String var1 = var10000.append(" is already on your ignore list").toString(); + DirectByteArrayCopier.addGameMessage(30, "", var1); } } diff --git a/runescape-client/src/main/java/AccessFile.java b/runescape-client/src/main/java/AccessFile.java index 908d3174a3..e397cd4d9b 100644 --- a/runescape-client/src/main/java/AccessFile.java +++ b/runescape-client/src/main/java/AccessFile.java @@ -9,27 +9,29 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ma") +@ObfuscatedName("mm") @Implements("AccessFile") public final class AccessFile { - @ObfuscatedName("q") + @ObfuscatedName("u") + static byte[][][] field4061; + @ObfuscatedName("s") @Export("file") RandomAccessFile file; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - longValue = -4859377869140643535L + longValue = 6204556434071022947L ) @Export("maxSize") final long maxSize; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - longValue = -5982883315607554345L + longValue = 5275749299961116233L ) @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,43 +51,44 @@ public final class AccessFile { this.file.seek(0L); } - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("seek") final void seek(long var1) throws IOException { this.file.seek(var1); this.offset = var1; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "793801547" + garbageValue = "160189816" ) @Export("write") public final void write(byte[] var1, int var2, int var3) throws IOException { - if ((long)var3 + this.offset > this.maxSize) { + if (this.offset + (long)var3 > this.maxSize) { this.file.seek(this.maxSize); this.file.write(1); throw new EOFException(); + } else { + this.file.write(var1, var2, var3); + this.offset += (long)var3; } - this.file.write(var1, var2, var3); - this.offset += (long)var3; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1602757440" + signature = "(B)V", + garbageValue = "18" ) @Export("close") public final void close() throws IOException { this.closeSync(false); } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(ZI)V", - garbageValue = "978888846" + garbageValue = "1818151820" ) @Export("closeSync") public final void closeSync(boolean var1) throws IOException { @@ -103,20 +106,20 @@ public final class AccessFile { } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(I)J", - garbageValue = "1189798798" + garbageValue = "2071750719" ) @Export("length") public final long length() throws IOException { return this.file.length(); } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "([BIII)I", - garbageValue = "701557643" + garbageValue = "1749187322" ) @Export("read") public final int read(byte[] var1, int var2, int var3) throws IOException { @@ -128,6 +131,22 @@ public final class AccessFile { return var4; } + protected void abi() throws Throwable { + if (this.file != null) { + System.out.println(""); + this.close(); + } + + } + + protected void abt() throws Throwable { + if (this.file != null) { + System.out.println(""); + this.close(); + } + + } + protected void finalize() throws Throwable { if (this.file != null) { System.out.println(""); diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index 621a4e8654..a44342df20 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -4,319 +4,327 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bq") +@ObfuscatedName("bu") @Implements("Actor") public abstract class Actor extends Entity { - @ObfuscatedName("aw") + @ObfuscatedName("jm") + @ObfuscatedSignature( + signature = "Lhp;" + ) + static Widget field978; + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 1528091447 + intValue = 1884598383 ) @Export("x") int x; - @ObfuscatedName("ad") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -390280385 + intValue = -1632465489 ) @Export("y") int y; - @ObfuscatedName("ag") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 1236559867 + intValue = -1372261855 ) @Export("rotation") int rotation; - @ObfuscatedName("ar") + @ObfuscatedName("an") @Export("isWalking") boolean isWalking; - @ObfuscatedName("ax") + @ObfuscatedName("at") + @ObfuscatedGetter( + intValue = -1570594880 + ) @Export("size") int size; - @ObfuscatedName("az") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 990710297 + intValue = 608219797 ) @Export("playerCycle") int playerCycle; - @ObfuscatedName("ae") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 2081393933 + intValue = -1134168353 ) @Export("readySequence") int readySequence; @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 1431486431 + intValue = -1794207509 ) @Export("turnLeftSequence") int turnLeftSequence; - @ObfuscatedName("aj") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 2143634015 + intValue = 1807906031 ) @Export("turnRightSequence") int turnRightSequence; - @ObfuscatedName("at") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -1300778473 + intValue = 821150937 ) @Export("walkSequence") int walkSequence; - @ObfuscatedName("ac") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 415761655 + intValue = -346334565 ) @Export("walkBackSequence") int walkBackSequence; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -1586227603 + intValue = 2122224863 ) @Export("walkLeftSequence") int walkLeftSequence; - @ObfuscatedName("aq") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -510900587 + intValue = -1158599439 ) @Export("walkRightSequence") int walkRightSequence; @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = 1475013463 + intValue = 1650224251 ) @Export("runSequence") int runSequence; - @ObfuscatedName("an") + @ObfuscatedName("ap") @Export("overheadText") String overheadText; - @ObfuscatedName("au") + @ObfuscatedName("aq") @Export("isAutoChatting") boolean isAutoChatting; - @ObfuscatedName("ai") - boolean field998; - @ObfuscatedName("ak") + @ObfuscatedName("ay") + boolean field926; + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 1272238473 + intValue = 319208211 ) @Export("overheadTextCyclesRemaining") int overheadTextCyclesRemaining; - @ObfuscatedName("ah") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 22112303 + intValue = -1527605305 ) @Export("overheadTextColor") int overheadTextColor; - @ObfuscatedName("am") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = 1107006481 + intValue = 611459225 ) @Export("overheadTextEffect") int overheadTextEffect; - @ObfuscatedName("af") + @ObfuscatedName("aw") @Export("hitSplatCount") byte hitSplatCount; - @ObfuscatedName("ab") + @ObfuscatedName("ae") @Export("hitSplatTypes") int[] hitSplatTypes; - @ObfuscatedName("bp") + @ObfuscatedName("bk") @Export("hitSplatValues") int[] hitSplatValues; - @ObfuscatedName("bz") + @ObfuscatedName("bw") @Export("hitSplatCycles") int[] hitSplatCycles; - @ObfuscatedName("bi") + @ObfuscatedName("bo") @Export("hitSplatTypes2") int[] hitSplatTypes2; - @ObfuscatedName("bg") + @ObfuscatedName("bn") @Export("hitSplatValues2") int[] hitSplatValues2; - @ObfuscatedName("bh") + @ObfuscatedName("bp") @ObfuscatedSignature( - signature = "Lju;" + signature = "Ljp;" ) @Export("healthBars") IterableNodeDeque healthBars; - @ObfuscatedName("bm") + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = 1587933085 + intValue = -666406559 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("bn") + @ObfuscatedName("bh") @Export("false0") boolean false0; - @ObfuscatedName("bc") + @ObfuscatedName("bv") @ObfuscatedGetter( - intValue = -2012515929 + intValue = 1338126615 ) - int field976; - @ObfuscatedName("bx") + int field946; + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = 1552753251 + intValue = 221299857 ) @Export("movementSequence") int movementSequence; - @ObfuscatedName("bo") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = 1656230573 + intValue = 669631645 ) @Export("movementFrame") int movementFrame; - @ObfuscatedName("bb") + @ObfuscatedName("by") @ObfuscatedGetter( - intValue = 789237355 + intValue = 1550152873 ) @Export("movementFrameCycle") int movementFrameCycle; @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = -1029202699 + intValue = 236934275 ) @Export("sequence") int sequence; - @ObfuscatedName("bj") + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = 1698363493 + intValue = 1446546153 ) @Export("sequenceFrame") int sequenceFrame; - @ObfuscatedName("bl") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = -1057767495 + intValue = 1633380255 ) @Export("sequenceFrameCycle") int sequenceFrameCycle; @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = -1679741685 + intValue = -159449897 ) @Export("sequenceDelay") int sequenceDelay; - @ObfuscatedName("by") + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = 1192767673 + intValue = 1360808075 ) - int field985; - @ObfuscatedName("bt") + int field964; + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = 606261849 + intValue = -1209932375 ) @Export("spotAnimation") int spotAnimation; - @ObfuscatedName("bq") + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = 47256047 + intValue = 1531272561 ) @Export("spotAnimationFrame") int spotAnimationFrame; - @ObfuscatedName("bu") + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = -50887377 + intValue = 1785825301 ) @Export("spotAnimationFrameCycle") int spotAnimationFrameCycle; - @ObfuscatedName("bw") + @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = -2008312019 + intValue = -63871325 ) - int field989; - @ObfuscatedName("br") + int field958; + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = -21231063 + intValue = 130403319 ) @Export("heightOffset") int heightOffset; - @ObfuscatedName("bk") + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = 67427601 + intValue = -446723661 ) - int field991; - @ObfuscatedName("bf") - @ObfuscatedGetter( - intValue = 1057554273 - ) - int field992; - @ObfuscatedName("bv") - @ObfuscatedGetter( - intValue = 1321176455 - ) - int field993; - @ObfuscatedName("be") - @ObfuscatedGetter( - intValue = -1276485965 - ) - int field983; + int field960; @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = -851079763 + intValue = 1274756773 ) - int field995; - @ObfuscatedName("cr") + int field961; + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = -352767789 + intValue = 1683717067 ) - int field996; - @ObfuscatedName("cf") + int field954; + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = -342620369 + intValue = -1907051737 ) - int field997; - @ObfuscatedName("cj") + int field963; + @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = 1247160827 + intValue = -356117007 + ) + int field941; + @ObfuscatedName("ce") + @ObfuscatedGetter( + intValue = -1458171567 + ) + int field965; + @ObfuscatedName("ci") + @ObfuscatedGetter( + intValue = 716061265 + ) + int field966; + @ObfuscatedName("ck") + @ObfuscatedGetter( + intValue = -1132398517 ) @Export("npcCycle") int npcCycle; - @ObfuscatedName("cl") + @ObfuscatedName("cc") @ObfuscatedGetter( - intValue = 1753110543 + intValue = -2023452361 ) @Export("defaultHeight") int defaultHeight; - @ObfuscatedName("cn") + @ObfuscatedName("cd") @ObfuscatedGetter( - intValue = 1217852897 + intValue = 1438228269 ) @Export("orientation") int orientation; - @ObfuscatedName("cy") + @ObfuscatedName("cf") @ObfuscatedGetter( - intValue = -146454839 + intValue = 1512808789 ) - int field1009; - @ObfuscatedName("ct") + int field970; + @ObfuscatedName("cw") @ObfuscatedGetter( - intValue = 1670871863 + intValue = -1629005053 ) - int field948; - @ObfuscatedName("cq") + int field971; + @ObfuscatedName("cj") @ObfuscatedGetter( - intValue = 1967067825 + intValue = -1777881517 ) @Export("pathLength") int pathLength; @ObfuscatedName("cp") @Export("pathX") int[] pathX; - @ObfuscatedName("ch") + @ObfuscatedName("cu") @Export("pathY") int[] pathY; - @ObfuscatedName("co") + @ObfuscatedName("cm") @Export("pathTraversed") byte[] pathTraversed; - @ObfuscatedName("cw") + @ObfuscatedName("cb") @ObfuscatedGetter( - intValue = -615012941 + intValue = -1405217673 ) - int field1007; - @ObfuscatedName("ca") + int field976; + @ObfuscatedName("ch") @ObfuscatedGetter( - intValue = 829354671 + intValue = -1913917699 ) - int field1008; + int field947; Actor() { this.isWalking = false; - this.size = 78073455; + this.size = 64; this.readySequence = -1; this.turnLeftSequence = -1; this.turnRightSequence = -1; @@ -326,7 +334,7 @@ public abstract class Actor extends Entity { this.walkRightSequence = -1; this.runSequence = -1; this.overheadText = null; - this.field998 = false; + this.field926 = false; this.overheadTextCyclesRemaining = 100; this.overheadTextColor = 0; this.overheadTextEffect = 0; @@ -339,7 +347,7 @@ public abstract class Actor extends Entity { this.healthBars = new IterableNodeDeque(); this.targetIndex = -1; this.false0 = false; - this.field976 = -1; + this.field946 = -1; this.movementSequence = -1; this.movementFrame = 0; this.movementFrameCycle = 0; @@ -347,46 +355,46 @@ public abstract class Actor extends Entity { this.sequenceFrame = 0; this.sequenceFrameCycle = 0; this.sequenceDelay = 0; - this.field985 = 0; + this.field964 = 0; this.spotAnimation = -1; this.spotAnimationFrame = 0; this.spotAnimationFrameCycle = 0; this.npcCycle = 0; this.defaultHeight = 200; - this.field1009 = 0; - this.field948 = 32; + this.field970 = 0; + this.field971 = 32; this.pathLength = 0; this.pathX = new int[10]; this.pathY = new int[10]; this.pathTraversed = new byte[10]; - this.field1007 = 0; - this.field1008 = 0; + this.field976 = 0; + this.field947 = 0; } - @ObfuscatedName("v") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-1461786701" + signature = "(B)Z", + garbageValue = "-110" ) @Export("isVisible") boolean isVisible() { return false; } - @ObfuscatedName("bp") + @ObfuscatedName("aa") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1575805976" + garbageValue = "-1059295249" ) - final void method1658() { + final void method1671() { this.pathLength = 0; - this.field1008 = 0; + this.field947 = 0; } - @ObfuscatedName("bz") + @ObfuscatedName("ap") @ObfuscatedSignature( signature = "(IIIIIII)V", - garbageValue = "295125263" + garbageValue = "888431256" ) @Export("addHitSplat") final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) { @@ -406,9 +414,9 @@ public abstract class Actor extends Entity { int var10 = -1; int var11 = 0; if (var1 >= 0) { - HitSplatDefinition var12 = Projectile.HitSplatDefinition_get(var1); - var10 = var12.field3348; - var11 = var12.field3344; + HitSplatDefinition var12 = StructDefinition.HitSplatDefinition_get(var1); + var10 = var12.field3323; + var11 = var12.field3314; } int var14; @@ -464,14 +472,14 @@ public abstract class Actor extends Entity { } } - @ObfuscatedName("bi") + @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "(IIIIIIB)V", - garbageValue = "15" + signature = "(IIIIIIS)V", + garbageValue = "-25412" ) @Export("addHealthBar") final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) { - HealthBarDefinition var7 = class51.HealthBarDefinition_get(var1); + HealthBarDefinition var7 = GrandExchangeOfferUnitPriceComparator.HealthBarDefinition_get(var1); HealthBar var8 = null; HealthBar var9 = null; int var10 = var7.int2; @@ -480,7 +488,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.field3279 == var7.field3279) { + if (var12.definition.field3264 == var7.field3264) { var12.put(var2 + var4, var5, var6, var3); return; } @@ -511,14 +519,14 @@ public abstract class Actor extends Entity { } } - @ObfuscatedName("bg") + @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1541896355" + signature = "(IB)V", + garbageValue = "1" ) @Export("removeHealthBar") final void removeHealthBar(int var1) { - HealthBarDefinition var2 = class51.HealthBarDefinition_get(var1); + HealthBarDefinition var2 = GrandExchangeOfferUnitPriceComparator.HealthBarDefinition_get(var1); for (HealthBar var3 = (HealthBar)this.healthBars.last(); var3 != null; var3 = (HealthBar)this.healthBars.previous()) { if (var2 == var3.definition) { @@ -529,15 +537,25 @@ public abstract class Actor extends Entity { } - @ObfuscatedName("kh") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-105" + signature = "(II)Liz;", + garbageValue = "505249630" ) - static void method1670() { - if (Client.oculusOrbState == 1) { - Client.field736 = true; - } + @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/Animation.java b/runescape-client/src/main/java/Animation.java index 2e2adab037..2f5a6106ea 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("da") +@ObfuscatedName("di") @Implements("Animation") public class Animation { - @ObfuscatedName("q") - static int[] field1638; - @ObfuscatedName("w") - static int[] field1639; - @ObfuscatedName("e") - static int[] field1636; - @ObfuscatedName("p") - static int[] field1635; + @ObfuscatedName("s") + static int[] field1619; + @ObfuscatedName("j") + static int[] field1615; + @ObfuscatedName("i") + static int[] field1624; @ObfuscatedName("k") + static int[] field1617; + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lej;" + signature = "Lex;" ) @Export("skeleton") Skeleton skeleton; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("transformCount") int transformCount; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("transformSkeletonLabels") int[] transformSkeletonLabels; - @ObfuscatedName("i") + @ObfuscatedName("q") @Export("transformXs") int[] transformXs; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("transformYs") int[] transformYs; - @ObfuscatedName("f") + @ObfuscatedName("d") @Export("transformZs") int[] transformZs; - @ObfuscatedName("m") + @ObfuscatedName("f") @Export("hasAlphaTransform") boolean hasAlphaTransform; static { - field1638 = new int[500]; - field1639 = new int[500]; - field1636 = new int[500]; - field1635 = new int[500]; + field1619 = new int[500]; + field1615 = new int[500]; + field1624 = new int[500]; + field1617 = new int[500]; } @ObfuscatedSignature( - signature = "([BLej;)V" + signature = "([BLex;)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) { - field1638[var7] = var10; - field1639[var7] = 0; - field1636[var7] = 0; - field1635[var7] = 0; + field1619[var7] = var10; + field1615[var7] = 0; + field1624[var7] = 0; + field1617[var7] = 0; ++var7; break; } } } - field1638[var7] = var8; + field1619[var7] = var8; short var11 = 0; if (this.skeleton.transformTypes[var8] == 3) { var11 = 128; } if ((var9 & 1) != 0) { - field1639[var7] = var4.readShortSmart(); + field1615[var7] = var4.readShortSmart(); } else { - field1639[var7] = var11; + field1615[var7] = var11; } if ((var9 & 2) != 0) { - field1636[var7] = var4.readShortSmart(); + field1624[var7] = var4.readShortSmart(); } else { - field1636[var7] = var11; + field1624[var7] = var11; } if ((var9 & 4) != 0) { - field1635[var7] = var4.readShortSmart(); + field1617[var7] = var4.readShortSmart(); } else { - field1635[var7] = var11; + field1617[var7] = var11; } var6 = var8; @@ -113,19 +113,20 @@ public class Animation { if (var1.length != var4.offset) { throw new RuntimeException(); - } - this.transformCount = var7; - this.transformSkeletonLabels = new int[var7]; - this.transformXs = new int[var7]; - this.transformYs = new int[var7]; - this.transformZs = new int[var7]; + } else { + this.transformCount = var7; + this.transformSkeletonLabels = new int[var7]; + this.transformXs = new int[var7]; + this.transformYs = new int[var7]; + this.transformZs = new int[var7]; - for (var8 = 0; var8 < var7; ++var8) { - this.transformSkeletonLabels[var8] = field1638[var8]; - this.transformXs[var8] = field1639[var8]; - this.transformYs[var8] = field1636[var8]; - this.transformZs[var8] = field1635[var8]; - } + for (var8 = 0; var8 < var7; ++var8) { + this.transformSkeletonLabels[var8] = field1619[var8]; + this.transformXs[var8] = field1615[var8]; + this.transformYs[var8] = field1624[var8]; + this.transformZs[var8] = field1617[var8]; + } + } } } diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java index 113f6211f6..7eac00d61a 100644 --- a/runescape-client/src/main/java/Archive.java +++ b/runescape-client/src/main/java/Archive.java @@ -5,183 +5,201 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iu") +@ObfuscatedName("id") @Implements("Archive") public class Archive extends AbstractArchive { - @ObfuscatedName("as") + @ObfuscatedName("ai") @Export("Archive_crc") static CRC32 Archive_crc; - @ObfuscatedName("n") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Lkm;" + signature = "Lkv;" ) @Export("archiveDisk") ArchiveDisk archiveDisk; - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lkm;" + signature = "Lkv;" ) @Export("masterDisk") ArchiveDisk masterDisk; - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1121640995 + intValue = -1228227843 ) @Export("index") int index; - @ObfuscatedName("z") - volatile boolean field3155; - @ObfuscatedName("al") - boolean field3157; + @ObfuscatedName("o") + volatile boolean field3132; @ObfuscatedName("av") + boolean field3133; + @ObfuscatedName("am") @Export("validGroups") volatile boolean[] validGroups; - @ObfuscatedName("aw") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -150911311 + intValue = 1456312337 ) @Export("indexCrc") int indexCrc; - @ObfuscatedName("ad") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 196530351 + intValue = -1798815125 ) @Export("indexVersion") int indexVersion; - @ObfuscatedName("ag") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -1519910241 + intValue = -1710593501 ) - int field3152; + int field3131; static { Archive_crc = new CRC32(); } @ObfuscatedSignature( - signature = "(Lkm;Lkm;IZZZ)V" + signature = "(Lkv;Lkv;IZZZ)V" ) public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) { super(var4, var5); - this.field3155 = false; - this.field3157 = false; - this.field3152 = -1; + this.field3132 = false; + this.field3133 = false; + this.field3131 = -1; this.archiveDisk = var1; this.masterDisk = var2; this.index = var3; - this.field3157 = var6; + this.field3133 = var6; int var8 = this.index; - if (AbstractRasterProvider.NetCache_reference != null) { - AbstractRasterProvider.NetCache_reference.offset = var8 * 8 + 5; - int var9 = AbstractRasterProvider.NetCache_reference.readInt(); - int var10 = AbstractRasterProvider.NetCache_reference.readInt(); + if (Decimator.NetCache_reference != null) { + Decimator.NetCache_reference.offset = var8 * 8 + 5; + int var9 = Decimator.NetCache_reference.readInt(); + int var10 = Decimator.NetCache_reference.readInt(); this.loadIndex(var9, var10); } else { - ViewportMouse.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); + BuddyRankComparator.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); NetCache.NetCache_archives[var8] = this; } } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "2144523901" + garbageValue = "502266240" ) @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { - PendingSpawn.method1653(this.index, 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); + } + } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "0" + signature = "(II)I", + garbageValue = "-1902634670" ) @Export("groupLoadPercent") int groupLoadPercent(int var1) { if (super.groups[var1] != null) { return 100; + } else if (this.validGroups[var1]) { + return 100; + } else { + int var3 = this.index; + long var4 = (long)((var3 << 16) + var1); + int var2; + if (NetCache.NetCache_currentResponse != null && var4 == NetCache.NetCache_currentResponse.key) { + var2 = NetCache.NetCache_responseArchiveBuffer.offset * 99 / (NetCache.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding) + 1; + } else { + var2 = 0; + } + + return var2; } - return this.validGroups[var1] ? 100 : Huffman.method3948(this.index, var1); } - @ObfuscatedName("v") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(IS)V", - garbageValue = "3211" + signature = "(II)V", + garbageValue = "1800831619" ) @Export("loadGroup") void loadGroup(int var1) { if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { - SecureRandomFuture.method2056(var1, this.archiveDisk, this); + WorldMapIcon_0.method191(var1, this.archiveDisk, this); } else { - ViewportMouse.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); + BuddyRankComparator.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); } } - @ObfuscatedName("dg") + @ObfuscatedName("cs") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "44" + signature = "(I)Z", + garbageValue = "581718104" ) - public boolean method4258() { - return this.field3155; + public boolean method4177() { + return this.field3132; } - @ObfuscatedName("df") + @ObfuscatedName("co") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-249697380" + signature = "(B)I", + garbageValue = "-35" ) @Export("percentage") public int percentage() { - if (this.field3155) { + if (this.field3132) { return 100; - } - if (super.groups != null) { + } else if (super.groups != null) { return 99; - } - int var1 = Huffman.method3948(255, this.index); - if (var1 >= 100) { - var1 = 99; - } + } else { + int var1 = class160.method3383(255, this.index); + if (var1 >= 100) { + var1 = 99; + } - return var1; + return var1; + } } - @ObfuscatedName("dt") + @ObfuscatedName("dr") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "1381214916" + signature = "(IIB)V", + garbageValue = "-1" ) @Export("loadIndex") void loadIndex(int var1, int var2) { this.indexCrc = var1; this.indexVersion = var2; if (this.masterDisk != null) { - SecureRandomFuture.method2056(this.index, this.masterDisk, this); + WorldMapIcon_0.method191(this.index, this.masterDisk, this); } else { - ViewportMouse.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); + BuddyRankComparator.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); } } - @ObfuscatedName("dj") + @ObfuscatedName("dd") @ObfuscatedSignature( signature = "(I[BZZB)V", - garbageValue = "-36" + garbageValue = "-44" ) @Export("write") void write(int var1, byte[] var2, boolean var3, boolean var4) { if (var3) { - if (this.field3155) { + if (this.field3132) { throw new RuntimeException(); } if (this.masterDisk != null) { - class294.method5328(this.index, var2, this.masterDisk); + GameShell.method1005(this.index, var2, this.masterDisk); } this.decodeIndex(var2); @@ -190,124 +208,93 @@ 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) { - class294.method5328(var1, var2, this.archiveDisk); + GameShell.method1005(var1, var2, this.archiveDisk); this.validGroups[var1] = true; } if (var4) { - Object[] var5 = super.groups; - Object var7; - if (var2 == null) { - var7 = null; - } else if (var2.length > 136) { - DirectByteArrayCopier var8 = new DirectByteArrayCopier(); - var8.set(var2); - var7 = var8; - } else { - var7 = var2; - } - - var5[var1] = var7; + super.groups[var1] = Entity.method3209(var2, false); } } } - @ObfuscatedName("dl") + @ObfuscatedName("dv") @ObfuscatedSignature( - signature = "(Lkm;I[BZI)V", - garbageValue = "-1554685282" + signature = "(Lkv;I[BZI)V", + garbageValue = "54929376" ) @Export("load") - public void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { + void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { int var5; if (var1 == this.masterDisk) { - if (this.field3155) { + if (this.field3132) { throw new RuntimeException(); - } - - if (var3 == null) { - ViewportMouse.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); - return; - } - - Archive_crc.reset(); - Archive_crc.update(var3, 0, var3.length); - var5 = (int)Archive_crc.getValue(); - if (var5 != this.indexCrc) { - ViewportMouse.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); - return; - } - - Buffer var11 = new Buffer(HealthBarUpdate.decompressBytes(var3)); - int var12 = var11.readUnsignedByte(); - if (var12 != 5 && var12 != 6) { - throw new RuntimeException(var12 + "," + this.index + "," + var2); - } - - int var8 = 0; - if (var12 >= 6) { - var8 = var11.readInt(); - } - - if (var8 != this.indexVersion) { - ViewportMouse.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); - return; - } - - this.decodeIndex(var3); - this.loadAllLocal(); - } else { - if (!var4 && var2 == this.field3152) { - this.field3155 = true; - } - - if (var3 == null || var3.length <= 2) { - this.validGroups[var2] = false; - if (this.field3157 || var4) { - ViewportMouse.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); - } - - return; - } - - Archive_crc.reset(); - Archive_crc.update(var3, 0, var3.length - 2); - var5 = (int)Archive_crc.getValue(); - 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.field3157 || var4) { - ViewportMouse.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); - } - - return; - } - - this.validGroups[var2] = true; - if (var4) { - Object[] var7 = super.groups; - Object var9; - if (var3 == null) { - var9 = null; - } else if (var3.length > 136) { - DirectByteArrayCopier var10 = new DirectByteArrayCopier(); - var10.set(var3); - var9 = var10; + } else if (var3 == null) { + BuddyRankComparator.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); + } else { + Archive_crc.reset(); + Archive_crc.update(var3, 0, var3.length); + var5 = (int)Archive_crc.getValue(); + if (var5 != this.indexCrc) { + BuddyRankComparator.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); } else { - var9 = var3; + Buffer var9 = new Buffer(Player.decompressBytes(var3)); + int var7 = var9.readUnsignedByte(); + if (var7 != 5 && var7 != 6) { + throw new RuntimeException(var7 + "," + this.index + "," + var2); + } else { + int var8 = 0; + if (var7 >= 6) { + var8 = var9.readInt(); + } + + if (var8 != this.indexVersion) { + BuddyRankComparator.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); + } else { + this.decodeIndex(var3); + this.loadAllLocal(); + } + } + } + } + } else { + if (!var4 && var2 == this.field3131) { + this.field3132 = true; + } + + if (var3 != null && var3.length > 2) { + Archive_crc.reset(); + Archive_crc.update(var3, 0, var3.length - 2); + var5 = (int)Archive_crc.getValue(); + 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] = true; + if (var4) { + super.groups[var2] = Entity.method3209(var3, false); + } + + } else { + this.validGroups[var2] = false; + if (this.field3133 || var4) { + BuddyRankComparator.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + } + + } + } else { + this.validGroups[var2] = false; + if (this.field3133 || var4) { + BuddyRankComparator.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } - var7[var2] = var9; } } - } - @ObfuscatedName("dz") + @ObfuscatedName("da") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-72081442" + garbageValue = "-1518016463" ) @Export("loadAllLocal") void loadAllLocal() { @@ -319,39 +306,19 @@ public class Archive extends AbstractArchive { } if (this.archiveDisk == null) { - this.field3155 = true; + this.field3132 = true; } else { - this.field3152 = -1; + this.field3131 = -1; for (var1 = 0; var1 < this.validGroups.length; ++var1) { if (super.fileCounts[var1] > 0) { - 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); - } - - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { - if (ArchiveDiskActionHandler.field3144 == 0) { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); - } - - ArchiveDiskActionHandler.field3144 = 600; - } - - this.field3152 = var1; + BuddyRankComparator.method3376(var1, this.archiveDisk, this); + this.field3131 = var1; } } - if (this.field3152 == -1) { - this.field3155 = true; + if (this.field3131 == -1) { + this.field3132 = true; } } @@ -360,25 +327,25 @@ public class Archive extends AbstractArchive { @ObfuscatedName("dh") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "2032179519" + garbageValue = "512289174" ) - public boolean method4267(int var1) { + public boolean method4185(int var1) { return this.validGroups[var1]; } - @ObfuscatedName("dy") + @ObfuscatedName("dm") @ObfuscatedSignature( signature = "(IB)Z", - garbageValue = "0" + garbageValue = "-5" ) - public boolean method4268(int var1) { + public boolean method4199(int var1) { return this.getGroupFileIds(var1) != null; } - @ObfuscatedName("dx") + @ObfuscatedName("dj") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "889991726" + signature = "(B)I", + garbageValue = "119" ) @Export("loadPercent") public int loadPercent() { @@ -395,54 +362,9 @@ public class Archive extends AbstractArchive { if (var1 == 0) { return 100; - } - var3 = var2 * 100 / var1; - return var3; - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(Lgx;Llv;I)Lgb;", - garbageValue = "1775123545" - ) - @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("jn") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "35" - ) - @Export("drawInterfaceModelComponents") - static final void drawInterfaceModelComponents(int var0) { - if (class162.loadInterface(var0)) { - class225.drawModelComponents(Widget.Widget_interfaceComponents[var0], -1); + var3 = var2 * 100 / var1; + return var3; } } } diff --git a/runescape-client/src/main/java/ArchiveDisk.java b/runescape-client/src/main/java/ArchiveDisk.java index d2e9350786..32655613cb 100644 --- a/runescape-client/src/main/java/ArchiveDisk.java +++ b/runescape-client/src/main/java/ArchiveDisk.java @@ -1,38 +1,40 @@ import java.io.EOFException; import java.io.IOException; +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("km") +@ObfuscatedName("kv") @Implements("ArchiveDisk") public final class ArchiveDisk { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("ArchiveDisk_buffer") static byte[] ArchiveDisk_buffer; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lmn;" + signature = "Lmw;" ) @Export("datFile") BufferedFile datFile; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lmn;" - ) - @Export("idxFile") - BufferedFile idxFile; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -2081269841 + intValue = -1905715445 ) @Export("archive") int archive; @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Lmw;" + ) + @Export("idxFile") + BufferedFile idxFile; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -609307423 + intValue = 1039930471 ) @Export("maxEntrySize") int maxEntrySize; @@ -42,7 +44,7 @@ public final class ArchiveDisk { } @ObfuscatedSignature( - signature = "(ILmn;Lmn;I)V" + signature = "(ILmw;Lmw;I)V" ) public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) { this.datFile = null; @@ -54,132 +56,144 @@ public final class ArchiveDisk { this.maxEntrySize = var4; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(II)[B", - garbageValue = "-8739933" + signature = "(IB)[B", + garbageValue = "93" ) @Export("read") public byte[] read(int var1) { synchronized(this.datFile) { try { + Object var10000; if (this.idxFile.length() < (long)(var1 * 6 + 6)) { - return null; - } - this.idxFile.seek((long)(var1 * 6)); - this.idxFile.read(ArchiveDisk_buffer, 0, 6); - int var3 = ((ArchiveDisk_buffer[0] & 255) << 16) + (ArchiveDisk_buffer[2] & 255) + ((ArchiveDisk_buffer[1] & 255) << 8); - int var4 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8); - if (var3 < 0 || var3 > this.maxEntrySize) { - return null; - } - if (var4 <= 0 || (long)var4 > this.datFile.length() / 520L) { - return null; - } - byte[] var5 = new byte[var3]; - int var6 = 0; - - for (int var7 = 0; var6 < var3; ++var7) { - if (var4 == 0) { - return null; - } - - this.datFile.seek(520L * (long)var4); - int var8 = var3 - var6; - int var9; - int var10; - int var11; - int var12; - byte var13; - if (var1 > 0xffff) { - if (var8 > 510) { - var8 = 510; - } - - var13 = 10; - this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13); - 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); - var12 = ArchiveDisk_buffer[9] & 255; + var10000 = null; + return (byte[])var10000; + } else { + this.idxFile.seek((long)(var1 * 6)); + this.idxFile.read(ArchiveDisk_buffer, 0, 6); + int var3 = ((ArchiveDisk_buffer[0] & 255) << 16) + (ArchiveDisk_buffer[2] & 255) + ((ArchiveDisk_buffer[1] & 255) << 8); + int var4 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8); + if (var3 < 0 || var3 > this.maxEntrySize) { + var10000 = null; + return (byte[])var10000; + } else if (var4 <= 0 || (long)var4 > this.datFile.length() / 520L) { + var10000 = null; + return (byte[])var10000; } else { - if (var8 > 512) { - var8 = 512; + byte[] var5 = new byte[var3]; + int var6 = 0; + + for (int var7 = 0; var6 < var3; ++var7) { + if (var4 == 0) { + var10000 = null; + return (byte[])var10000; + } + + this.datFile.seek(520L * (long)var4); + int var8 = var3 - var6; + int var9; + int var10; + int var11; + int var12; + byte var13; + if (var1 > 65535) { + if (var8 > 510) { + var8 = 510; + } + + var13 = 10; + this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13); + 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); + var12 = ArchiveDisk_buffer[9] & 255; + } else { + if (var8 > 512) { + var8 = 512; + } + + var13 = 8; + 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) { + var10000 = null; + return (byte[])var10000; + } + + if (var11 < 0 || (long)var11 > this.datFile.length() / 520L) { + var10000 = null; + return (byte[])var10000; + } + + int var14 = var13 + var8; + + for (int var15 = var13; var15 < var14; ++var15) { + var5[var6++] = ArchiveDisk_buffer[var15]; + } + + var4 = var11; } - var13 = 8; - this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8); - 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; + byte[] var20 = var5; + return var20; } - - if (var9 != var1 || var7 != var10 || var12 != this.archive) { - return null; - } - - if (var11 < 0 || (long)var11 > this.datFile.length() / 520L) { - return null; - } - - int var14 = var8 + var13; - - for (int var15 = var13; var15 < var14; ++var15) { - var5[var6++] = ArchiveDisk_buffer[var15]; - } - - var4 = var11; } - - byte[] var20 = var5; - return var20; } catch (IOException var18) { return null; } } } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I[BII)Z", - garbageValue = "-1155409189" + garbageValue = "1937661421" ) @Export("write") public boolean write(int var1, byte[] var2, int var3) { synchronized(this.datFile) { - if (var3 < 0 || var3 > this.maxEntrySize) { + if (var3 >= 0 && var3 <= this.maxEntrySize) { + boolean var5 = this.write0(var1, var2, var3, true); + if (!var5) { + var5 = this.write0(var1, var2, var3, false); + } + + return var5; + } else { throw new IllegalArgumentException("" + this.archive + ',' + var1 + ',' + var3); } - boolean var5 = this.write0(var1, var2, var3, true); - if (!var5) { - var5 = this.write0(var1, var2, var3, false); - } - - return var5; } } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(I[BIZB)Z", - garbageValue = "64" + garbageValue = "16" ) @Export("write0") boolean write0(int var1, byte[] var2, int var3, boolean var4) { synchronized(this.datFile) { try { int var6; + boolean var10000; if (var4) { if (this.idxFile.length() < (long)(var1 * 6 + 6)) { - return false; + var10000 = false; + return var10000; } this.idxFile.seek((long)(var1 * 6)); this.idxFile.read(ArchiveDisk_buffer, 0, 6); var6 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8); if (var6 <= 0 || (long)var6 > this.datFile.length() / 520L) { - return false; + var10000 = false; + return var10000; } } else { var6 = (int)((this.datFile.length() + 519L) / 520L); @@ -199,19 +213,20 @@ public final class ArchiveDisk { int var7 = 0; int var8 = 0; - while (var7 < var3) { + while (true) { + if (var7 < var3) { label171: { int var9 = 0; int var10; if (var4) { - this.datFile.seek((long)var6 * 520L); + this.datFile.seek(520L * (long)var6); int var11; int var12; - if (var1 > 0xffff) { + if (var1 > 65535) { try { this.datFile.read(ArchiveDisk_buffer, 0, 10); } catch (EOFException var17) { - continue; + break label171; } var10 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); @@ -231,12 +246,14 @@ public final class ArchiveDisk { var12 = ArchiveDisk_buffer[7] & 255; } - if (var10 != var1 || var8 != var11 || var12 != this.archive) { - return false; + if (var10 != var1 || var11 != var8 || var12 != this.archive) { + var10000 = false; + return var10000; } if (var9 < 0 || (long)var9 > this.datFile.length() / 520L) { - return false; + var10000 = false; + return var10000; } } @@ -252,7 +269,7 @@ public final class ArchiveDisk { } } - if (var1 > 0xffff) { + if (var1 > 65535) { if (var3 - var7 <= 510) { var9 = 0; } @@ -267,7 +284,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) { @@ -306,41 +323,71 @@ public final class ArchiveDisk { } } - return true; + var10000 = true; + return var10000; + } } catch (IOException var18) { return false; } } } + public String abd() { + return "" + this.archive; + } + + public String abb() { + return "" + this.archive * 1098163870; + } + public String toString() { return "" + this.archive; } - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(Ljava/lang/Object;ZI)[B", - garbageValue = "991854443" + signature = "(Lfu;III)Ldd;", + garbageValue = "670296930" ) - @Export("serialize") - public static byte[] serialize(Object var0, boolean var1) { - if (var0 == null) { - return null; - } - if (var0 instanceof byte[]) { - byte[] var6 = ((byte[]) var0); - if (var1) { - int var4 = var6.length; - byte[] var5 = new byte[var4]; - System.arraycopy(var6, 0, var5, 0, var4); - return var5; + public static final PcmPlayer method5757(TaskHandler var0, int var1, int var2) { + if (PcmPlayer.PcmPlayer_sampleRate == 0) { + throw new IllegalStateException(); + } else if (var1 >= 0 && var1 < 2) { + if (var2 < 256) { + var2 = 256; } - return var6; - } - if (!(var0 instanceof AbstractByteArrayCopier)) { + + try { + PcmPlayer var3 = SecureRandomCallable.pcmPlayerProvider.player(); + var3.samples = new int[(PcmPlayer.PcmPlayer_stereo ? 2 : 1) * 256]; + var3.field1399 = var2; + var3.init(); + var3.capacity = (var2 & -1024) + 1024; + if (var3.capacity > 16384) { + var3.capacity = 16384; + } + + var3.open(var3.capacity); + if (FloorDecoration.PcmPlayer_count > 0 && PacketBufferNode.soundSystem == null) { + PacketBufferNode.soundSystem = new SoundSystem(); + GrandExchangeOfferWorldComparator.soundSystemExecutor = Executors.newScheduledThreadPool(1); + GrandExchangeOfferWorldComparator.soundSystemExecutor.scheduleAtFixedRate(PacketBufferNode.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); + } + + if (PacketBufferNode.soundSystem != null) { + if (PacketBufferNode.soundSystem.players[var1] != null) { + throw new IllegalArgumentException(); + } + + PacketBufferNode.soundSystem.players[var1] = var3; + } + + return var3; + } catch (Throwable var4) { + return new PcmPlayer(); + } + } else { throw new IllegalArgumentException(); } - AbstractByteArrayCopier var2 = (AbstractByteArrayCopier) var0; - return var2.get(); } } diff --git a/runescape-client/src/main/java/ArchiveDiskAction.java b/runescape-client/src/main/java/ArchiveDiskAction.java index 3294944680..a276737a6c 100644 --- a/runescape-client/src/main/java/ArchiveDiskAction.java +++ b/runescape-client/src/main/java/ArchiveDiskAction.java @@ -4,52 +4,31 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hc") +@ObfuscatedName("hn") @Implements("ArchiveDiskAction") public class ArchiveDiskAction extends Node { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -907427363 + intValue = 1794438743 ) @Export("type") int type; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("data") - public byte[] data; - @ObfuscatedName("e") + byte[] data; + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lkm;" + signature = "Lkv;" ) @Export("archiveDisk") - public ArchiveDisk archiveDisk; - @ObfuscatedName("p") + ArchiveDisk archiveDisk; + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Liu;" + signature = "Lid;" ) @Export("archive") - public Archive archive; + Archive archive; ArchiveDiskAction() { } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(II)Lim;", - garbageValue = "-738252140" - ) - @Export("KitDefinition_get") - public static KitDefinition KitDefinition_get(int var0) { - KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } - 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; - } } diff --git a/runescape-client/src/main/java/ArchiveDiskActionHandler.java b/runescape-client/src/main/java/ArchiveDiskActionHandler.java index 9069fd4c7b..9728746cf1 100644 --- a/runescape-client/src/main/java/ArchiveDiskActionHandler.java +++ b/runescape-client/src/main/java/ArchiveDiskActionHandler.java @@ -1,42 +1,37 @@ -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("ir") +@ObfuscatedName("iw") @Implements("ArchiveDiskActionHandler") public class ArchiveDiskActionHandler implements Runnable { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Ljh;" + signature = "Ljc;" ) @Export("ArchiveDiskActionHandler_requestQueue") - public static NodeDeque ArchiveDiskActionHandler_requestQueue; - @ObfuscatedName("w") + static NodeDeque ArchiveDiskActionHandler_requestQueue; + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Ljh;" + signature = "Ljc;" ) @Export("ArchiveDiskActionHandler_responseQueue") - public static NodeDeque ArchiveDiskActionHandler_responseQueue; - @ObfuscatedName("e") + static NodeDeque ArchiveDiskActionHandler_responseQueue; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1331634311 + intValue = 587142169 ) - static int field3144; - @ObfuscatedName("p") + static int field3124; + @ObfuscatedName("k") @Export("ArchiveDiskActionHandler_lock") static Object ArchiveDiskActionHandler_lock; - @ObfuscatedName("k") - @Export("ArchiveDiskActionHandler_thread") - static Thread ArchiveDiskActionHandler_thread; static { ArchiveDiskActionHandler_requestQueue = new NodeDeque(); ArchiveDiskActionHandler_responseQueue = new NodeDeque(); - field3144 = 0; + field3124 = 0; ArchiveDiskActionHandler_lock = new Object(); } @@ -65,76 +60,45 @@ public class ArchiveDiskActionHandler implements Runnable { } synchronized(ArchiveDiskActionHandler_lock) { - if (field3144 <= 1) { - field3144 = 0; + if (field3124 <= 1) { + field3124 = 0; ArchiveDiskActionHandler_lock.notifyAll(); return; } - field3144 = 600; + field3124 = 600; } } else { - EnumDefinition.sleepMillis(100L); + UserList.sleepMillis(100L); synchronized(ArchiveDiskActionHandler_lock) { - if (field3144 <= 1) { - field3144 = 0; + if (field3124 <= 1) { + field3124 = 0; ArchiveDiskActionHandler_lock.notifyAll(); return; } - --field3144; + --field3124; } } } } catch (Exception var13) { - HitSplatDefinition.RunException_sendStackTrace((String)null, var13); + class3.RunException_sendStackTrace((String)null, var13); } } - @ObfuscatedName("al") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lfs;III)Ldn;", - garbageValue = "2015059645" + signature = "(CB)Z", + garbageValue = "-108" ) - public static final PcmPlayer method4256(TaskHandler var0, int var1, int var2) { - if (CollisionMap.PcmPlayer_sampleRate == 0) { - throw new IllegalStateException(); + @Export("isCharPrintable") + public static boolean isCharPrintable(char var0) { + if (var0 >= ' ' && var0 <= '~') { + return true; + } else if (var0 >= 160 && var0 <= 255) { + return true; + } else { + return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; } - if (var1 >= 0 && var1 < 2) { - if (var2 < 256) { - var2 = 256; - } - - try { - PcmPlayer var3 = class32.pcmPlayerProvider.player(); - var3.samples = new int[256 * (FileSystem.PcmPlayer_stereo ? 2 : 1)]; - var3.field1414 = var2; - var3.init(); - var3.capacity = (var2 & -1024) + 1024; - if (var3.capacity > 16384) { - var3.capacity = 16384; - } - - var3.open(var3.capacity); - if (PcmPlayer.PcmPlayer_count > 0 && SecureRandomFuture.soundSystem == null) { - SecureRandomFuture.soundSystem = new SoundSystem(); - class14.soundSystemExecutor = Executors.newScheduledThreadPool(1); - class14.soundSystemExecutor.scheduleAtFixedRate(SecureRandomFuture.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); - } - - if (SecureRandomFuture.soundSystem != null) { - if (SecureRandomFuture.soundSystem.players[var1] != null) { - throw new IllegalArgumentException(); - } - - SecureRandomFuture.soundSystem.players[var1] = var3; - } - - return var3; - } catch (Throwable var4) { - return new PcmPlayer(); - } - } - throw new IllegalArgumentException(); } } diff --git a/runescape-client/src/main/java/ArchiveLoader.java b/runescape-client/src/main/java/ArchiveLoader.java index 644855bd1b..87afa5d2ff 100644 --- a/runescape-client/src/main/java/ArchiveLoader.java +++ b/runescape-client/src/main/java/ArchiveLoader.java @@ -3,38 +3,37 @@ 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("bn") +@ObfuscatedName("bh") @Implements("ArchiveLoader") public class ArchiveLoader { - @ObfuscatedName("rz") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "Lbf;" + signature = "Lkb;" ) - @Export("friendSystem") - public static FriendSystem friendSystem; - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Liu;" - ) - @Export("archive") - final Archive archive; - @ObfuscatedName("e") + @Export("ItemDefinition_fontPlain11") + static Font ItemDefinition_fontPlain11; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -637612403 + intValue = -1407926591 ) @Export("groupCount") final int groupCount; - @ObfuscatedName("p") + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "Lid;" + ) + @Export("archive") + final Archive archive; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1413706037 + intValue = 2082038361 ) @Export("loadedCount") int loadedCount; @ObfuscatedSignature( - signature = "(Liu;Ljava/lang/String;)V" + signature = "(Lid;Ljava/lang/String;)V" ) ArchiveLoader(Archive var1, String var2) { this.loadedCount = 0; @@ -42,17 +41,17 @@ public class ArchiveLoader { this.groupCount = var1.getGroupCount(); } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "-30" + signature = "(I)Z", + garbageValue = "273857318" ) @Export("isLoaded") boolean isLoaded() { this.loadedCount = 0; for (int var1 = 0; var1 < this.groupCount; ++var1) { - if (!this.archive.method4268(var1) || this.archive.method4267(var1)) { + if (!this.archive.method4199(var1) || this.archive.method4185(var1)) { ++this.loadedCount; } } @@ -60,205 +59,53 @@ public class ArchiveLoader { return this.loadedCount >= this.groupCount; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lhp;Lhp;Lhp;Lga;B)Z", - garbageValue = "14" + signature = "(II)Lcr;", + garbageValue = "-332369983" ) - @Export("setAudioArchives") - public static boolean setAudioArchives(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, MidiPcmStream var3) { - class197.musicPatchesArchive = var0; - class197.musicSamplesArchive = var1; - class197.soundEffectsArchive = var2; - Interpreter.midiPcmStream = var3; - return true; + @Export("getScript") + static Script getScript(int var0) { + Script var1 = (Script)Script.Script_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = GameShell.archive12.takeFile(var0, 0); + if (var2 == null) { + return null; + } else { + var1 = DesktopPlatformInfoProvider.newScript(var2); + Script.Script_cached.put(var1, (long)var0); + return var1; + } + } } - @ObfuscatedName("j") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(ILcx;ZB)I", - garbageValue = "65" + signature = "(B)V", + garbageValue = "114" ) - static int method1100(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var3 = class80.getWidget(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - } else { - var3 = var2 ? Interpreter.field1111 : Calendar.field2507; - } - - if (var0 == ScriptOpcodes.CC_CALLONRESIZE) { - if (Interpreter.field1106 >= 10) { - throw new RuntimeException(); - } - if (var3.onResize == null) { - return 0; - } - ScriptEvent var4 = new ScriptEvent(); - var4.widget = var3; - var4.args = var3.onResize; - var4.field583 = Interpreter.field1106 + 1; - Client.scriptEvents.addFirst(var4); - return 1; - } - return 2; + @Export("NpcDefinition_clearCached") + public static void NpcDefinition_clearCached() { + NPCDefinition.NpcDefinition_cached.clear(); + NPCDefinition.NpcDefinition_cachedModels.clear(); } - @ObfuscatedName("jk") + @ObfuscatedName("gh") @ObfuscatedSignature( - signature = "(Lhj;I)Lhj;", - garbageValue = "1227786783" + signature = "(III)I", + garbageValue = "1464962568" ) - static Widget method1099(Widget var0) { - Widget var2 = var0; - int var3 = class32.method545(class268.getWidgetClickMask(var0)); - Widget var1; - if (var3 == 0) { - var1 = null; - } else { - for (int var4 = 0; var4 < var3; var4++) { - var2 = class80.getWidget(var2.parentId); - if (var2 == null) { - break; - } - } - - var1 = var2; + static int method1100(int var0, int var1) { + int var2 = var1 - 334; + if (var2 < 0) { + var2 = 0; + } else if (var2 > 100) { + var2 = 100; } - Widget var5 = var1; - if (var1 == null) { - var5 = var0.parent; - } - - return var5; - } - - @ObfuscatedName("ja") - @ObfuscatedSignature( - signature = "(Lhj;IIIB)V", - garbageValue = "94" - ) - @Export("drawMinimap") - static final void drawMinimap(Widget var0, int var1, int var2, int var3) { - class186.playPcmPlayers(); - SpriteMask var4 = var0.getSpriteMask(false); - if (var4 == null) { - return; - } - Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); - if (Client.minimapState == 2 || Client.minimapState == 5) { - Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); - } else { - int var5 = Client.camAngleY & 2047; - int var6 = Client.localPlayer.x / 32 + 48; - int var7 = 464 - Client.localPlayer.y / 32; - RouteStrategy.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 - Client.localPlayer.x / 32; - var10 = Client.mapIconYs[var8] * 4 + 2 - Client.localPlayer.y / 32; - Interpreter.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[class42.plane][var8][var9]; - if (var15 == null) { - continue; - } - var11 = var8 * 4 + 2 - Client.localPlayer.x / 32; - var12 = var9 * 4 + 2 - Client.localPlayer.y / 32; - Interpreter.drawSpriteOnMinimap(var1, var2, var11, var12, Skills.mapDotSprites[0], var4); - } - } - - for (var8 = 0; var8 < Client.npcCount; ++var8) { - NPC var16 = Client.npcs[Client.npcIndices[var8]]; - if (var16 == null || !var16.isVisible()) { - continue; - } - NPCDefinition var18 = var16.definition; - if (var18 != null && var18.transforms != null) { - var18 = var18.transform(); - } - - if (var18 != null && var18.drawMapDot && var18.isInteractable) { - var11 = var16.x / 32 - Client.localPlayer.x / 32; - var12 = var16.y / 32 - Client.localPlayer.y / 32; - Interpreter.drawSpriteOnMinimap(var1, var2, var11, var12, Skills.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 == Client.localPlayer) { - continue; - } - var12 = var17.x / 32 - Client.localPlayer.x / 32; - int var13 = var17.y / 32 - Client.localPlayer.y / 32; - boolean var14 = false; - if (Client.localPlayer.team != 0 && var17.team != 0 && var17.team == Client.localPlayer.team) { - var14 = true; - } - - if (var17.isFriend()) { - Interpreter.drawSpriteOnMinimap(var1, var2, var12, var13, Skills.mapDotSprites[3], var4); - } else if (var14) { - Interpreter.drawSpriteOnMinimap(var1, var2, var12, var13, Skills.mapDotSprites[4], var4); - } else if (var17.isClanMember()) { - Interpreter.drawSpriteOnMinimap(var1, var2, var12, var13, Skills.mapDotSprites[5], var4); - } else { - Interpreter.drawSpriteOnMinimap(var1, var2, var12, var13, Skills.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 - Client.localPlayer.x / 32; - var12 = var20.y / 32 - Client.localPlayer.y / 32; - Canvas.worldToMinimap(var1, var2, var11, var12, WorldMapData_1.mapMarkerSprites[1], var4); - } - } - - if (Client.hintArrowType == 2) { - var10 = Client.hintArrowX * 4 - MusicPatchNode2.baseX * 256 + 2 - Client.localPlayer.x / 32; - var11 = Client.hintArrowY * 4 - class1.baseY * 256 + 2 - Client.localPlayer.y / 32; - Canvas.worldToMinimap(var1, var2, var10, var11, WorldMapData_1.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 - Client.localPlayer.x / 32; - var12 = var21.y / 32 - Client.localPlayer.y / 32; - Canvas.worldToMinimap(var1, var2, var11, var12, WorldMapData_1.mapMarkerSprites[1], var4); - } - } - } - - if (Client.destinationX != 0) { - var10 = Client.destinationX * 4 + 2 - Client.localPlayer.x / 32; - var11 = Client.destinationY * 4 + 2 - Client.localPlayer.y / 32; - Interpreter.drawSpriteOnMinimap(var1, var2, var10, var11, WorldMapData_1.mapMarkerSprites[0], var4); - } - - if (!Client.localPlayer.isHidden) { - Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 0xffffff); - } - } - - Client.field861[var3] = true; + int var3 = (Client.zoomWidth - Client.zoomHeight) * var2 / 100 + Client.zoomHeight; + return var0 * var3 / 256; } } diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java index 3a3f6d95b2..03926b0cc9 100644 --- a/runescape-client/src/main/java/AttackOption.java +++ b/runescape-client/src/main/java/AttackOption.java @@ -4,43 +4,37 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ct") +@ObfuscatedName("cw") @Implements("AttackOption") public enum AttackOption implements Enumerated { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lct;" + signature = "Lcw;" ) @Export("AttackOption_dependsOnCombatLevels") AttackOption_dependsOnCombatLevels(0), - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lct;" + signature = "Lcw;" ) @Export("AttackOption_alwaysRightClick") AttackOption_alwaysRightClick(1), - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lct;" + signature = "Lcw;" ) @Export("AttackOption_leftClickWhereAvailable") AttackOption_leftClickWhereAvailable(2), - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lct;" + signature = "Lcw;" ) @Export("AttackOption_hidden") AttackOption_hidden(3); - @ObfuscatedName("qz") - @ObfuscatedSignature( - signature = "Ldz;" - ) - @Export("decimator") - static Decimator decimator; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 52026669 + intValue = -2103853983 ) @Export("id") final int id; @@ -49,10 +43,10 @@ public enum AttackOption implements Enumerated { this.id = var3; } - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "320353268" + signature = "(B)I", + garbageValue = "-32" ) @Export("rsOrdinal") public int rsOrdinal() { diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java index 44c497991b..de3c1489b3 100644 --- a/runescape-client/src/main/java/AudioFilter.java +++ b/runescape-client/src/main/java/AudioFilter.java @@ -3,147 +3,154 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dy") +@ObfuscatedName("dp") @Implements("AudioFilter") public class AudioFilter { - @ObfuscatedName("l") - static float[][] field1488; - @ObfuscatedName("b") + @ObfuscatedName("n") + static float[][] field1475; + @ObfuscatedName("t") @Export("coefficients") static int[][] coefficients; - @ObfuscatedName("i") - static float field1491; - @ObfuscatedName("c") + @ObfuscatedName("q") + static float field1468; + @ObfuscatedName("x") @Export("forwardMultiplier") static int forwardMultiplier; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("pairs") int[] pairs; - @ObfuscatedName("e") - int[][][] field1494; - @ObfuscatedName("p") - int[][][] field1486; + @ObfuscatedName("i") + int[][][] field1467; @ObfuscatedName("k") - int[] field1487; + int[][][] field1470; + @ObfuscatedName("u") + int[] field1469; static { - field1488 = new float[2][8]; + field1475 = new float[2][8]; coefficients = new int[2][8]; } AudioFilter() { this.pairs = new int[2]; - this.field1494 = new int[2][2][4]; - this.field1486 = new int[2][2][4]; - this.field1487 = new int[2]; + this.field1467 = new int[2][2][4]; + this.field1470 = new int[2][2][4]; + this.field1469 = new int[2]; } - @ObfuscatedName("q") - float method2668(int var1, int var2, float var3) { - float var4 = (float)this.field1486[var1][0][var2] + var3 * (float)(this.field1486[var1][1][var2] - this.field1486[var1][0][var2]); + @ObfuscatedName("s") + float method2622(int var1, int var2, float var3) { + float var4 = (float)this.field1470[var1][0][var2] + var3 * (float)(this.field1470[var1][1][var2] - this.field1470[var1][0][var2]); var4 *= 0.0015258789F; return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F)); } - @ObfuscatedName("e") - float method2683(int var1, int var2, float var3) { - float var4 = (float)this.field1494[var1][0][var2] + var3 * (float)(this.field1494[var1][1][var2] - this.field1494[var1][0][var2]); + @ObfuscatedName("i") + float method2629(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("p") + @ObfuscatedName("k") @Export("compute") int compute(int var1, float var2) { float var3; if (var1 == 0) { - var3 = (float)this.field1487[0] + (float)(this.field1487[1] - this.field1487[0]) * var2; + var3 = (float)this.field1469[0] + (float)(this.field1469[1] - this.field1469[0]) * var2; var3 *= 0.0030517578F; - field1491 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); - forwardMultiplier = (int)(field1491 * 65536.0F); + field1468 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); + forwardMultiplier = (int)(field1468 * 65536.0F); } if (this.pairs[var1] == 0) { return 0; - } - var3 = this.method2668(var1, 0, var2); - field1488[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2683(var1, 0, var2)); - field1488[var1][1] = var3 * var3; + } else { + var3 = this.method2622(var1, 0, var2); + field1475[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2629(var1, 0, var2)); + field1475[var1][1] = var3 * var3; - int var4; - for (var4 = 1; var4 < this.pairs[var1]; ++var4) { - var3 = this.method2668(var1, var4, var2); - float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2683(var1, var4, var2)); - float var6 = var3 * var3; - field1488[var1][var4 * 2 + 1] = field1488[var1][var4 * 2 - 1] * var6; - field1488[var1][var4 * 2] = field1488[var1][var4 * 2 - 1] * var5 + field1488[var1][var4 * 2 - 2] * var6; + float[] var10000; + int var4; + for (var4 = 1; var4 < this.pairs[var1]; ++var4) { + var3 = this.method2622(var1, var4, var2); + float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2629(var1, var4, var2)); + float var6 = var3 * var3; + field1475[var1][var4 * 2 + 1] = field1475[var1][var4 * 2 - 1] * var6; + field1475[var1][var4 * 2] = field1475[var1][var4 * 2 - 1] * var5 + field1475[var1][var4 * 2 - 2] * var6; - for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { - field1488[var1][var7] += field1488[var1][var7 - 1] * var5 + field1488[var1][var7 - 2] * var6; + for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { + var10000 = field1475[var1]; + var10000[var7] += field1475[var1][var7 - 1] * var5 + field1475[var1][var7 - 2] * var6; + } + + var10000 = field1475[var1]; + var10000[1] += field1475[var1][0] * var5 + var6; + var10000 = field1475[var1]; + var10000[0] += var5; } - field1488[var1][1] += field1488[var1][0] * var5 + var6; - field1488[var1][0] += var5; - } - - if (var1 == 0) { - for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) { - field1488[0][var4] *= field1491; + if (var1 == 0) { + for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) { + var10000 = field1475[0]; + var10000[var4] *= field1468; + } } - } - for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { - coefficients[var1][var4] = (int)(field1488[var1][var4] * 65536.0F); - } + for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { + coefficients[var1][var4] = (int)(field1475[var1][var4] * 65536.0F); + } - return this.pairs[var1] * 2; + return this.pairs[var1] * 2; + } } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Lkf;Ldw;)V" + signature = "(Lky;Ldv;)V" ) - final void method2680(Buffer var1, SoundEnvelope var2) { + final void method2637(Buffer var1, SoundEnvelope var2) { int var3 = var1.readUnsignedByte(); this.pairs[0] = var3 >> 4; this.pairs[1] = var3 & 15; - if (var3 == 0) { - this.field1487[0] = 0; - this.field1487[1] = 0; - return; - } - this.field1487[0] = var1.readUnsignedShort(); - this.field1487[1] = var1.readUnsignedShort(); - int var4 = var1.readUnsignedByte(); + if (var3 != 0) { + 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.field1494[var5][0][var6] = var1.readUnsignedShort(); - this.field1486[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.field1494[var5][1][var6] = var1.readUnsignedShort(); - this.field1486[var5][1][var6] = var1.readUnsignedShort(); - } else { - this.field1494[var5][1][var6] = this.field1494[var5][0][var6]; - this.field1486[var5][1][var6] = this.field1486[var5][0][var6]; + int var5; + int var6; + for (var5 = 0; var5 < 2; ++var5) { + for (var6 = 0; var6 < this.pairs[var5]; ++var6) { + this.field1467[var5][0][var6] = var1.readUnsignedShort(); + this.field1470[var5][0][var6] = var1.readUnsignedShort(); } } - } - if (var4 != 0 || this.field1487[1] != this.field1487[0]) { - var2.decodeSegments(var1); + for (var5 = 0; var5 < 2; ++var5) { + for (var6 = 0; var6 < this.pairs[var5]; ++var6) { + if ((var4 & 1 << var5 * 4 << var6) != 0) { + this.field1467[var5][1][var6] = var1.readUnsignedShort(); + this.field1470[var5][1][var6] = var1.readUnsignedShort(); + } else { + this.field1467[var5][1][var6] = this.field1467[var5][0][var6]; + this.field1470[var5][1][var6] = this.field1470[var5][0][var6]; + } + } + } + + if (var4 != 0 || this.field1469[1] != this.field1469[0]) { + var2.decodeSegments(var1); + } + } else { + int[] var7 = this.field1469; + this.field1469[1] = 0; + var7[0] = 0; } } - @ObfuscatedName("w") + @ObfuscatedName("j") @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 20cb637efb..01334d7bea 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("kg") +@ObfuscatedName("ku") @Implements("BZip2Decompressor") public final class BZip2Decompressor { - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lki;" + signature = "Lkw;" ) @Export("BZip2Decompressor_state") static BZip2State BZip2Decompressor_state; @@ -17,7 +17,7 @@ public final class BZip2Decompressor { BZip2Decompressor_state = new BZip2State(); } - @ObfuscatedName("q") + @ObfuscatedName("s") @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.field3753 = 0; + BZip2Decompressor_state.field3721 = 0; BZip2Decompressor_decompress(BZip2Decompressor_state); var1 -= BZip2Decompressor_state.outputLength; BZip2Decompressor_state.inputArray = null; @@ -38,21 +38,21 @@ public final class BZip2Decompressor { } } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lki;)V" + signature = "(Lkw;)V" ) - static void method5773(BZip2State var0) { + static void method5667(BZip2State var0) { byte var2 = var0.out_char; int var3 = var0.su_rNToGo; int var4 = var0.nblocks_used; int var5 = var0.su_ch2; - int[] var6 = VarbitDefinition.BZip2Decompressor_block; - int var7 = var0.field3760; + int[] var6 = Coord.BZip2Decompressor_block; + int var7 = var0.field3736; byte[] var8 = var0.outputArray; int var9 = var0.next_out; int var10 = var0.outputLength; - int var12 = var0.field3776 + 1; + int var12 = var0.field3754 + 1; label61: while (true) { @@ -148,25 +148,25 @@ public final class BZip2Decompressor { break; } - int var13 = var0.field3753; - var0.field3753 += var10 - var10; - if (var0.field3753 < var13) { + int var13 = var0.field3721; + var0.field3721 += var10 - var10; + if (var0.field3721 < var13) { } var0.out_char = var2; var0.su_rNToGo = var3; var0.nblocks_used = var4; var0.su_ch2 = var5; - VarbitDefinition.BZip2Decompressor_block = var6; - var0.field3760 = var7; + Coord.BZip2Decompressor_block = var6; + var0.field3736 = var7; var0.outputArray = var8; var0.next_out = var9; var0.outputLength = var10; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lki;)V" + signature = "(Lkw;)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 (VarbitDefinition.BZip2Decompressor_block == null) { - VarbitDefinition.BZip2Decompressor_block = new int[var0.blockSize100k * 100000]; + var0.blockSize100k = 1410065408; + if (Coord.BZip2Decompressor_block == null) { + Coord.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]++; - VarbitDefinition.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; + Coord.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) { - VarbitDefinition.BZip2Decompressor_block[var47] = var1 & 255; + Coord.BZip2Decompressor_block[var47] = var1 & 255; ++var47; } } @@ -509,22 +509,22 @@ public final class BZip2Decompressor { } for (var36 = 0; var36 < var47; ++var36) { - var1 = (byte)(VarbitDefinition.BZip2Decompressor_block[var36] & 255); - var10000 = VarbitDefinition.BZip2Decompressor_block; + var1 = (byte)(Coord.BZip2Decompressor_block[var36] & 255); + var10000 = Coord.BZip2Decompressor_block; int var10001 = var0.cftab[var1 & 255]; var10000[var10001] |= var36 << 8; var10002 = var0.cftab[var1 & 255]++; } - var0.field3760 = VarbitDefinition.BZip2Decompressor_block[var0.originalPointer] >> 8; + var0.field3736 = Coord.BZip2Decompressor_block[var0.originalPointer] >> 8; var0.nblocks_used = 0; - var0.field3760 = VarbitDefinition.BZip2Decompressor_block[var0.field3760]; - var0.su_ch2 = (byte)(var0.field3760 & 255); - var0.field3760 >>= 8; + var0.field3736 = Coord.BZip2Decompressor_block[var0.field3736]; + var0.su_ch2 = (byte)(var0.field3736 & 255); + var0.field3736 >>= 8; ++var0.nblocks_used; - var0.field3776 = var47; - method5773(var0); - if (var0.field3776 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { + var0.field3754 = var47; + method5667(var0); + if (var0.field3754 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { var26 = true; break; } @@ -538,27 +538,27 @@ public final class BZip2Decompressor { } } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lki;)B" + signature = "(Lkw;)B" ) @Export("BZip2Decompressor_readNextByte") static byte BZip2Decompressor_readNextByte(BZip2State var0) { return (byte)BZip2Decompressor_readBits(8, var0); } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Lki;)B" + signature = "(Lkw;)B" ) @Export("BZip2Decompressor_readNextBit") static byte BZip2Decompressor_readNextBit(BZip2State var0) { return (byte)BZip2Decompressor_readBits(1, var0); } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(ILki;)I" + signature = "(ILkw;)I" ) @Export("BZip2Decompressor_readBits") static int BZip2Decompressor_readBits(int var0, BZip2State var1) { @@ -576,9 +576,9 @@ public final class BZip2Decompressor { return var2; } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lki;)V" + signature = "(Lkw;)V" ) @Export("makeMaps") static void makeMaps(BZip2State var0) { @@ -593,7 +593,7 @@ public final class BZip2Decompressor { } - @ObfuscatedName("i") + @ObfuscatedName("q") @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 d564845c60..48c71ab71f 100644 --- a/runescape-client/src/main/java/BZip2State.java +++ b/runescape-client/src/main/java/BZip2State.java @@ -1,172 +1,170 @@ -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("ki") +@ObfuscatedName("kw") @Implements("BZip2State") public final class BZip2State { - @ObfuscatedName("q") - final int field3748; - @ObfuscatedName("w") - final int field3743; - @ObfuscatedName("e") - final int field3779; - @ObfuscatedName("p") - final int field3778; - @ObfuscatedName("k") + @ObfuscatedName("s") + final int field3737; + @ObfuscatedName("j") final int field3745; - @ObfuscatedName("l") + @ObfuscatedName("i") final int field3746; - @ObfuscatedName("b") + @ObfuscatedName("k") + final int field3722; + @ObfuscatedName("u") + final int field3735; + @ObfuscatedName("n") + final int field3717; + @ObfuscatedName("t") @Export("inputArray") byte[] inputArray; - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1049906743 + intValue = 1249128023 ) @Export("nextByte") int nextByte; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1743451477 + intValue = -423174679 ) @Export("nextBit_unused") int nextBit_unused; - @ObfuscatedName("f") + @ObfuscatedName("d") @Export("outputArray") byte[] outputArray; - @ObfuscatedName("m") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1528977191 + intValue = 1450954735 ) @Export("next_out") int next_out; - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1616991267 + intValue = 875649401 ) @Export("outputLength") int outputLength; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 1607838751 - ) - int field3753; @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 1562015159 + ) + int field3721; + @ObfuscatedName("y") @Export("out_char") byte out_char; - @ObfuscatedName("v") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 236002095 + intValue = 1013295897 ) @Export("su_rNToGo") int su_rNToGo; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 145021143 + intValue = 2065373853 ) @Export("bsBuff") int bsBuff; @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 964245035 + intValue = -322433333 ) @Export("bsLive") int bsLive; - @ObfuscatedName("a") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 738319360 + intValue = 1084513280 ) @Export("blockSize100k") int blockSize100k; - @ObfuscatedName("j") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 826030823 + intValue = -1304598549 ) @Export("originalPointer") int originalPointer; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -300117779 + intValue = 293823581 ) - int field3760; - @ObfuscatedName("h") + int field3736; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -284126821 + intValue = -545729875 ) @Export("su_ch2") int su_ch2; - @ObfuscatedName("o") + @ObfuscatedName("l") @Export("unzftab") int[] unzftab; - @ObfuscatedName("n") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -485705465 + intValue = 1751111105 ) @Export("nblocks_used") int nblocks_used; - @ObfuscatedName("d") + @ObfuscatedName("v") @Export("cftab") int[] cftab; - @ObfuscatedName("z") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 386581291 + intValue = 463275141 ) @Export("nInUse") int nInUse; - @ObfuscatedName("al") + @ObfuscatedName("av") @Export("inUse") boolean[] inUse; - @ObfuscatedName("av") + @ObfuscatedName("am") @Export("inUse16") boolean[] inUse16; - @ObfuscatedName("as") + @ObfuscatedName("ai") @Export("seqToUnseq") byte[] seqToUnseq; - @ObfuscatedName("aw") + @ObfuscatedName("af") @Export("ll8") byte[] ll8; - @ObfuscatedName("ad") + @ObfuscatedName("az") @Export("getAndMoveToFrontDecode_yy") int[] getAndMoveToFrontDecode_yy; - @ObfuscatedName("ag") + @ObfuscatedName("aj") @Export("selector") byte[] selector; - @ObfuscatedName("ar") + @ObfuscatedName("an") @Export("selectorMtf") byte[] selectorMtf; - @ObfuscatedName("ax") + @ObfuscatedName("at") @Export("temp_charArray2d") byte[][] temp_charArray2d; - @ObfuscatedName("az") + @ObfuscatedName("as") @Export("limit") int[][] limit; - @ObfuscatedName("ae") + @ObfuscatedName("ak") @Export("base") int[][] base; @ObfuscatedName("ao") @Export("perm") int[][] perm; - @ObfuscatedName("aj") + @ObfuscatedName("ac") @Export("minLens") int[] minLens; - @ObfuscatedName("at") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -590888097 + intValue = -716853171 ) - int field3776; + int field3754; BZip2State() { - this.field3748 = 4096; - this.field3743 = 16; - this.field3779 = 258; - this.field3778 = 6; - this.field3745 = 50; - this.field3746 = 18002; + this.field3737 = 4096; + this.field3745 = 16; + this.field3746 = 258; + this.field3722 = 6; + this.field3735 = 50; + this.field3717 = 18002; this.nextByte = 0; this.next_out = 0; this.unzftab = new int[256]; @@ -185,13 +183,12 @@ public final class BZip2State { this.minLens = new int[6]; } - @ObfuscatedName("ag") + @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "(Ljava/net/Socket;IIB)Lky;", - garbageValue = "10" + signature = "(II)I", + garbageValue = "-3321312" ) - @Export("newBufferedNetSocket") - public static AbstractSocket newBufferedNetSocket(Socket var0, int var1, int var2) throws IOException { - return new BufferedNetSocket(var0, var1, var2); + static int method5664(int var0) { + return (int)Math.pow(2.0D, (double)(7.0F + (float)var0 / 256.0F)); } } diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java index 28c6a3329f..ea51a2d0e6 100644 --- a/runescape-client/src/main/java/BoundaryObject.java +++ b/runescape-client/src/main/java/BoundaryObject.java @@ -4,66 +4,66 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("em") +@ObfuscatedName("ey") @Implements("BoundaryObject") public final class BoundaryObject { - @ObfuscatedName("sx") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Llw;" + signature = "[Llq;" ) - @Export("worldMap") - static WorldMap worldMap; - @ObfuscatedName("q") + @Export("title_muteSprite") + static IndexedSprite[] title_muteSprite; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 2097561189 + intValue = -557020941 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1949359765 + intValue = -308845337 ) @Export("x") int x; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1661311189 + intValue = -808193817 ) @Export("y") int y; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 258723163 + intValue = -1993098605 ) @Export("orientationA") int orientationA; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -321030007 + intValue = -1270638241 ) @Export("orientationB") int orientationB; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Leo;" + signature = "Len;" ) @Export("entity1") public Entity entity1; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Leo;" + signature = "Len;" ) @Export("entity2") public Entity entity2; - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedGetter( - longValue = 7136672908246986663L + longValue = 1081854748204039869L ) @Export("tag") public long tag; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -77784117 + intValue = 1627431525 ) @Export("flags") int flags; @@ -73,62 +73,252 @@ public final class BoundaryObject { this.flags = 0; } - @ObfuscatedName("q") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lhp;Lhp;IZB)Lek;", - garbageValue = "103" + signature = "(Lhz;Lhz;ZII)V", + garbageValue = "1558921351" ) - public static Frames method3262(AbstractArchive var0, AbstractArchive var1, int var2, boolean var3) { - boolean var4 = true; - int[] var5 = var0.getGroupFileIds(var2); + static void method3213(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { + if (Login.field1146) { + if (var3 == 4) { + Login.loginIndex = 4; + } - for (int var6 = 0; var6 < var5.length; ++var6) { - byte[] var7 = var0.getFile(var2, var5[var6]); - if (var7 == null) { - var4 = false; + } else { + Login.loginIndex = var3; + Rasterizer2D.Rasterizer2D_clear(); + byte[] var4 = var0.takeFileByNames("title.jpg", ""); + Login.leftTitleSprite = WorldMapIcon_0.convertJpgToSprite(var4); + Login.rightTitleSprite = Login.leftTitleSprite.mirrorHorizontally(); + if ((Client.worldProperties & 536870912) != 0) { + class51.logoSprite = VertexNormal.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); } else { - int var8 = (var7[0] & 255) << 8 | var7[1] & 255; - byte[] var9; - if (var3) { - var9 = var1.getFile(0, var8); - } else { - var9 = var1.getFile(var8, 0); + class51.logoSprite = VertexNormal.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); + } + + Login.titleboxSprite = VertexNormal.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); + Login.titlebuttonSprite = VertexNormal.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); + int var6 = var1.getGroupId("runes"); + int var7 = var1.getFileId(var6, ""); + IndexedSprite[] var8; + if (!World.SpriteBuffer_bufferFile(var1, var6, var7)) { + var8 = null; + } else { + IndexedSprite[] var10 = new IndexedSprite[class325.SpriteBuffer_spriteCount]; + + for (int var11 = 0; var11 < class325.SpriteBuffer_spriteCount; ++var11) { + IndexedSprite var12 = var10[var11] = new IndexedSprite(); + var12.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth; + var12.height = class325.SpriteBuffer_spriteHeight; + var12.xOffset = class325.SpriteBuffer_xOffsets[var11]; + var12.yOffset = class325.SpriteBuffer_yOffsets[var11]; + var12.subWidth = class325.SpriteBuffer_spriteWidths[var11]; + var12.subHeight = class225.SpriteBuffer_spriteHeights[var11]; + var12.palette = class325.SpriteBuffer_spritePalette; + var12.pixels = WorldMapSection1.SpriteBuffer_pixels[var11]; } - if (var9 == null) { - var4 = false; + UserComparator7.SpriteBuffer_clear(); + var8 = var10; + } + + ItemDefinition.runesSprite = var8; + var7 = var1.getGroupId("title_mute"); + int var14 = var1.getFileId(var7, ""); + IndexedSprite[] var9; + if (!World.SpriteBuffer_bufferFile(var1, var7, var14)) { + var9 = null; + } else { + IndexedSprite[] var18 = new IndexedSprite[class325.SpriteBuffer_spriteCount]; + + for (int var19 = 0; var19 < class325.SpriteBuffer_spriteCount; ++var19) { + IndexedSprite var13 = var18[var19] = new IndexedSprite(); + var13.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth; + var13.height = class325.SpriteBuffer_spriteHeight; + var13.xOffset = class325.SpriteBuffer_xOffsets[var19]; + var13.yOffset = class325.SpriteBuffer_yOffsets[var19]; + var13.subWidth = class325.SpriteBuffer_spriteWidths[var19]; + var13.subHeight = class225.SpriteBuffer_spriteHeights[var19]; + var13.palette = class325.SpriteBuffer_spritePalette; + var13.pixels = WorldMapSection1.SpriteBuffer_pixels[var19]; + } + + UserComparator7.SpriteBuffer_clear(); + var9 = var18; + } + + title_muteSprite = var9; + Login.options_buttons_0Sprite = VertexNormal.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); + class83.field1136 = VertexNormal.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); + Login.options_buttons_2Sprite = VertexNormal.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); + class96.field1303 = VertexNormal.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); + UserComparator8.field1957 = Login.options_buttons_0Sprite.subWidth; + class173.field2079 = Login.options_buttons_0Sprite.subHeight; + Bounds.loginScreenRunesAnimation = new LoginScreenAnimation(ItemDefinition.runesSprite); + if (var2) { + Login.Login_username = ""; + Login.Login_password = ""; + } + + SecureRandomCallable.field500 = 0; + WorldMapSection1.otp = ""; + Login.field1171 = true; + Login.worldSelectOpen = false; + if (!GrandExchangeOffer.clientPreferences.titleMusicDisabled) { + Archive var16 = GrandExchangeEvent.archive6; + var14 = var16.getGroupId("scape main"); + int var17 = var16.getFileId(var14, ""); + Projectile.method2040(2, var16, var14, var17, 255, false); + } else { + DevicePcmPlayerProvider.method793(2); + } + + NPC.method1977(false); + Login.field1146 = true; + Login.xPadding = (KitDefinition.canvasWidth - 765) / 2; + Login.loginBoxX = Login.xPadding + 202; + Login.loginBoxCenter = Login.loginBoxX + 180; + Login.leftTitleSprite.drawAt(Login.xPadding, 0); + Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + class51.logoSprite.drawAt(Login.xPadding + 382 - class51.logoSprite.subWidth / 2, 18); + } + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "(II)I", + garbageValue = "1412728541" + ) + @Export("Messages_getHistorySize") + static int Messages_getHistorySize(int var0) { + ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); + return var1 == null ? 0 : var1.size(); + } + + @ObfuscatedName("t") + @Export("Entity_unpackID") + public static int Entity_unpackID(long var0) { + return (int)(var0 >>> 17 & 4294967295L); + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "(IIIB)I", + garbageValue = "64" + ) + @Export("hslToRgb") + static final int hslToRgb(int var0, int var1, int var2) { + if (var2 > 179) { + var1 /= 2; + } + + 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("hk") + @ObfuscatedSignature( + signature = "(ZLkx;B)V", + garbageValue = "-77" + ) + static final void method3216(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; + } + + 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; + } + } + + int var6 = var1.readBits(1); + int var7 = Client.defaultRotations[var1.readBits(3)]; + if (var3) { + var4.orientation = var4.rotation = var7; + } + + int var8 = var1.readBits(1); + if (var8 == 1) { + Client.field669[++Client.field861 - 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.definition = ViewportMouse.getNpcDefinition(var1.readBits(14)); + var4.size = var4.definition.size * 64; + var4.field971 = var4.definition.rotation; + if (var4.field971 == 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.method1970(WorldMapIcon_1.localPlayer.pathX[0] + var5, WorldMapIcon_1.localPlayer.pathY[0] + var9, var6 == 1); + continue; } } - } - if (!var4) { - return null; - } - try { - return new Frames(var0, var1, var2, var3); - } catch (Exception var11) { - return null; + var1.exportIndex(); + return; } } - @ObfuscatedName("q") + @ObfuscatedName("ka") @ObfuscatedSignature( - signature = "(II)Liv;", - garbageValue = "-497669049" + signature = "(IIIZI)V", + garbageValue = "-1395440174" ) - @Export("getEnum") - public static EnumDefinition getEnum(int var0) { - EnumDefinition var1 = (EnumDefinition)EnumDefinition.EnumDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } - byte[] var2 = EnumDefinition.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; + public static void method3215(int var0, int var1, int var2, boolean var3) { + PacketBufferNode var4 = MenuAction.getPacketBufferNode(ClientPacket.field2255, Client.packetWriter.isaacCipher); + var4.packetBuffer.writeIntME(var3 ? Client.field705 : 0); + var4.packetBuffer.writeShortLE(var1); + var4.packetBuffer.method5545(var2); + var4.packetBuffer.writeShort(var0); + Client.packetWriter.addNode(var4); } } diff --git a/runescape-client/src/main/java/Bounds.java b/runescape-client/src/main/java/Bounds.java index a3418c16a2..046cf370b5 100644 --- a/runescape-client/src/main/java/Bounds.java +++ b/runescape-client/src/main/java/Bounds.java @@ -4,30 +4,41 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ls") +@ObfuscatedName("lh") @Implements("Bounds") public class Bounds { - @ObfuscatedName("q") + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "Lbt;" + ) + @Export("loginScreenRunesAnimation") + static LoginScreenAnimation loginScreenRunesAnimation; + @ObfuscatedName("fv") + @ObfuscatedSignature( + signature = "Lkg;" + ) + static AbstractSocket field3845; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1186074789 + intValue = 927119221 ) @Export("lowX") public int lowX; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -198324779 + intValue = 1883471895 ) @Export("lowY") public int lowY; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -574576823 + intValue = 482662949 ) @Export("highX") public int highX; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 833436879 + intValue = 1342895921 ) @Export("highY") public int highY; @@ -41,10 +52,10 @@ public class Bounds { this(0, 0, var1, var2); } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(IIB)V", - garbageValue = "-102" + garbageValue = "-92" ) @Export("setLow") public void setLow(int var1, int var2) { @@ -52,10 +63,10 @@ public class Bounds { this.lowY = var2; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "12" + signature = "(III)V", + garbageValue = "638104028" ) @Export("setHigh") public void setHigh(int var1, int var2) { @@ -63,22 +74,22 @@ public class Bounds { this.highY = var2; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lls;Lls;I)V", - garbageValue = "799718452" + signature = "(Llh;Llh;B)V", + garbageValue = "15" ) - public void method5980(Bounds var1, Bounds var2) { - this.method5968(var1, var2); - this.method5964(var1, var2); + public void method5846(Bounds var1, Bounds var2) { + this.method5867(var1, var2); + this.method5848(var1, var2); } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lls;Lls;B)V", - garbageValue = "-20" + signature = "(Llh;Llh;I)V", + garbageValue = "-157171607" ) - void method5968(Bounds var1, Bounds var2) { + void method5867(Bounds var1, Bounds var2) { var2.lowX = this.lowX; var2.highX = this.highX; if (this.lowX < var1.lowX) { @@ -86,8 +97,8 @@ public class Bounds { var2.lowX = var1.lowX; } - if (var2.method5976() > var1.method5976()) { - var2.highX -= var2.method5976() - var1.method5976(); + if (var2.method5847() > var1.method5847()) { + var2.highX -= var2.method5847() - var1.method5847(); } if (var2.highX < 0) { @@ -96,12 +107,12 @@ public class Bounds { } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Lls;Lls;I)V", - garbageValue = "182983589" + signature = "(Llh;Llh;I)V", + garbageValue = "-2140694621" ) - void method5964(Bounds var1, Bounds var2) { + void method5848(Bounds var1, Bounds var2) { var2.lowY = this.lowY; var2.highY = this.highY; if (this.lowY < var1.lowY) { @@ -109,8 +120,8 @@ public class Bounds { var2.lowY = var1.lowY; } - if (var2.method5965() > var1.method5965()) { - var2.highY -= var2.method5965() - var1.method5965(); + if (var2.method5842() > var1.method5842()) { + var2.highY -= var2.method5842() - var1.method5842(); } if (var2.highY < 0) { @@ -119,25 +130,47 @@ public class Bounds { } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1428102724" + garbageValue = "134601683" ) - int method5976() { + int method5847() { return this.highX + this.lowX; } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "185439342" + garbageValue = "-901412341" ) - int method5965() { + int method5842() { return this.highY + this.lowY; } + public String abb() { + return null; + } + + public String abd() { + return null; + } + public String toString() { return null; } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(I)Lfs;", + garbageValue = "-2037238373" + ) + @Export("newClock") + public static Clock newClock() { + try { + return new NanoClock(); + } catch (Throwable var1) { + return new MilliClock(); + } + } } diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java index fb09789e6b..9b2b5730f5 100644 --- a/runescape-client/src/main/java/Buddy.java +++ b/runescape-client/src/main/java/Buddy.java @@ -4,29 +4,27 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jz") +@ObfuscatedName("jt") @Implements("Buddy") public class Buddy extends User { - @ObfuscatedName("ss") + @ObfuscatedName("c") + @Export("Tiles_lightness") + static int[] Tiles_lightness; + @ObfuscatedName("u") @ObfuscatedGetter( - longValue = 7424240758646581017L - ) - static long field3632; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 90340793 + intValue = 453016847 ) @Export("world") public int world; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1246846103 + intValue = 1487463363 ) @Export("int2") public int int2; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -247571967 + intValue = -838100941 ) @Export("rank") public int rank; @@ -35,10 +33,10 @@ public class Buddy extends User { this.world = -1; } - @ObfuscatedName("ah") + @ObfuscatedName("aq") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-1729653997" + garbageValue = "-1748427179" ) @Export("set") void set(int var1, int var2) { @@ -46,53 +44,33 @@ public class Buddy extends User { this.int2 = var2; } - @ObfuscatedName("am") + @ObfuscatedName("ay") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "212736889" + garbageValue = "-1469335924" ) @Export("getWorld") public int getWorld() { return this.world; } - @ObfuscatedName("ay") + @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "-4" + signature = "(I)Z", + garbageValue = "-1595892037" ) @Export("hasWorld") public boolean hasWorld() { return this.world > 0; } - @ObfuscatedName("q") + @ObfuscatedName("bk") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "1131109761" + signature = "(Ljava/lang/String;I)I", + garbageValue = "1544989297" ) - @Export("ViewportMouse_unpackX") - public static int ViewportMouse_unpackX(int var0) { - long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; - int var1 = (int)(var2 >>> 0 & 127L); - return var1; - } - - @ObfuscatedName("eq") - @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "0" - ) - static int method5176() { - if (Client.archiveLoaders != null && Client.archiveLoaderArchive < Client.archiveLoaders.size()) { - int var0 = 0; - - for (int var1 = 0; var1 <= Client.archiveLoaderArchive; ++var1) { - var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; - } - - return var0 * 10000 / Client.field927; - } - return 10000; + @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 b0013f11c4..94630b6f0b 100644 --- a/runescape-client/src/main/java/BuddyRankComparator.java +++ b/runescape-client/src/main/java/BuddyRankComparator.java @@ -1,20 +1,12 @@ -import java.awt.image.BufferedImage; -import java.awt.image.PixelGrabber; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import javax.imageio.ImageIO; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fg") +@ObfuscatedName("fi") @Implements("BuddyRankComparator") public class BuddyRankComparator extends AbstractUserComparator { - @ObfuscatedName("m") - @Export("musicTrackBoolean") - public static boolean musicTrackBoolean; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("reversed") final boolean reversed; @@ -22,44 +14,156 @@ public class BuddyRankComparator extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ljz;Ljz;I)I", - garbageValue = "-813496584" + signature = "(Ljt;Ljt;I)I", + garbageValue = "1327154519" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { if (var2.rank != var1.rank) { return this.reversed ? var1.rank - var2.rank : var2.rank - var1.rank; + } else { + return this.compareUser(var1, var2); } - return this.compareUser(var1, var2); } public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "([BB)Lly;", - garbageValue = "-3" + signature = "(ILkv;Lid;I)V", + garbageValue = "1244891024" ) - @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[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) { + static void method3376(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); } - return new Sprite(0, 0); + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { + if (ArchiveDiskActionHandler.field3124 == 0) { + class13.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); + class13.ArchiveDiskActionHandler_thread.setDaemon(true); + class13.ArchiveDiskActionHandler_thread.start(); + class13.ArchiveDiskActionHandler_thread.setPriority(5); + } + + ArchiveDiskActionHandler.field3124 = 600; + } + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "(Lid;IIIBZI)V", + garbageValue = "-800902094" + ) + @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("fs") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)V", + garbageValue = "124595109" + ) + @Export("doCheat") + static final void doCheat(String var0) { + if (var0.equalsIgnoreCase("toggleroof")) { + GrandExchangeOffer.clientPreferences.roofsHidden = !GrandExchangeOffer.clientPreferences.roofsHidden; + GrandExchangeOfferAgeComparator.savePreferences(); + if (GrandExchangeOffer.clientPreferences.roofsHidden) { + DirectByteArrayCopier.addGameMessage(99, "", "Roofs are now all hidden"); + } else { + DirectByteArrayCopier.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")) { + WorldMapCacheName.worldMap.showCoord = !WorldMapCacheName.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")) { + class2.method31(); + } + } + + PacketBufferNode var1 = MenuAction.getPacketBufferNode(ClientPacket.field2238, 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/Buffer.java b/runescape-client/src/main/java/Buffer.java index 6a45de5258..d370a57f4c 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("kf") +@ObfuscatedName("ky") @Implements("Buffer") public class Buffer extends Node { - @ObfuscatedName("i") + @ObfuscatedName("q") @Export("crc32Table") - static int[] crc32Table; - @ObfuscatedName("f") + public static int[] crc32Table; + @ObfuscatedName("d") @Export("crc64Table") static long[] crc64Table; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("array") public byte[] array; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -231155257 + intValue = -823557765 ) @Export("offset") public int offset; @@ -48,7 +48,7 @@ public class Buffer extends Node { long var4 = (long)var2; for (int var3 = 0; var3 < 8; ++var3) { - if ((var4 & 1L) == 1L) { + if (1L == (var4 & 1L)) { var4 = var4 >>> 1 ^ -3932672073523589310L; } else { var4 >>>= 1; @@ -61,7 +61,7 @@ public class Buffer extends Node { } public Buffer(int var1) { - this.array = TextureProvider.ByteArrayPool_getArray(var1); + this.array = class60.ByteArrayPool_getArray(var1); this.offset = 0; } @@ -70,34 +70,34 @@ public class Buffer extends Node { this.offset = 0; } - @ObfuscatedName("au") + @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "581390013" + signature = "(B)V", + garbageValue = "1" ) @Export("releaseArray") public void releaseArray() { if (this.array != null) { - SoundSystem.ByteArrayPool_release(this.array); + WorldMapElement.ByteArrayPool_release(this.array); } this.array = null; } - @ObfuscatedName("ai") + @ObfuscatedName("ay") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "534610428" + garbageValue = "26222460" ) @Export("writeByte") public void writeByte(int var1) { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("ak") + @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "0" + signature = "(II)V", + garbageValue = "1309375768" ) @Export("writeShort") public void writeShort(int var1) { @@ -105,10 +105,10 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("ah") + @ObfuscatedName("al") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1223441989" + garbageValue = "1866078389" ) @Export("writeMedium") public void writeMedium(int var1) { @@ -117,10 +117,10 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("am") + @ObfuscatedName("ah") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "230474351" + garbageValue = "1393781479" ) @Export("writeInt") public void writeInt(int var1) { @@ -130,7 +130,7 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("ay") + @ObfuscatedName("ab") @Export("writeLongMedium") public void writeLongMedium(long var1) { this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); @@ -141,7 +141,7 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)((int)var1); } - @ObfuscatedName("af") + @ObfuscatedName("aw") @Export("writeLong") public void writeLong(long var1) { this.array[++this.offset - 1] = (byte)((int)(var1 >> 56)); @@ -154,58 +154,61 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)((int)var1); } - @ObfuscatedName("ab") + @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "-1376620834" + signature = "(ZB)V", + garbageValue = "15" ) @Export("writeBoolean") public void writeBoolean(boolean var1) { this.writeByte(var1 ? 1 : 0); } - @ObfuscatedName("bz") + @ObfuscatedName("bw") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "891058638" + signature = "(Ljava/lang/String;B)V", + garbageValue = "-97" ) @Export("writeStringCp1252NullTerminated") public void writeStringCp1252NullTerminated(String var1) { int var2 = var1.indexOf(0); if (var2 >= 0) { throw new IllegalArgumentException(""); + } else { + this.offset += ChatChannel.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); + this.array[++this.offset - 1] = 0; } - this.offset += WorldMapSection0.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); - this.array[++this.offset - 1] = 0; } - @ObfuscatedName("bg") + @ObfuscatedName("bn") @ObfuscatedSignature( signature = "(Ljava/lang/String;I)V", - garbageValue = "160692340" + garbageValue = "1644174948" ) @Export("writeStringCp1252NullCircumfixed") public void writeStringCp1252NullCircumfixed(String var1) { int var2 = var1.indexOf(0); if (var2 >= 0) { throw new IllegalArgumentException(""); + } else { + this.array[++this.offset - 1] = 0; + this.offset += ChatChannel.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); + this.array[++this.offset - 1] = 0; } - this.array[++this.offset - 1] = 0; - this.offset += WorldMapSection0.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); - this.array[++this.offset - 1] = 0; } - @ObfuscatedName("bh") + @ObfuscatedName("bp") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)V", - garbageValue = "1643646908" + signature = "(Ljava/lang/CharSequence;S)V", + garbageValue = "6886" ) @Export("writeCESU8") public void writeCESU8(CharSequence var1) { int var3 = var1.length(); int var4 = 0; - for (int var5 = 0; var5 < var3; ++var5) { + int var5; + for (var5 = 0; var5 < var3; ++var5) { char var6 = var1.charAt(var5); if (var6 <= 127) { ++var4; @@ -218,13 +221,34 @@ public class Buffer extends Node { this.array[++this.offset - 1] = 0; this.writeVarInt(var4); - this.offset += class80.method1979(this.array, this.offset, var1); + var4 = this.offset; + byte[] var12 = this.array; + int var7 = this.offset; + int var8 = var1.length(); + int var9 = var7; + + for (int var10 = 0; var10 < var8; ++var10) { + char var11 = var1.charAt(var10); + if (var11 <= 127) { + var12[var9++] = (byte)var11; + } else if (var11 <= 2047) { + var12[var9++] = (byte)(192 | var11 >> 6); + var12[var9++] = (byte)(128 | var11 & '?'); + } else { + var12[var9++] = (byte)(224 | var11 >> '\f'); + var12[var9++] = (byte)(128 | var11 >> 6 & 63); + var12[var9++] = (byte)(128 | var11 & '?'); + } + } + + var5 = var9 - var7; + this.offset = var5 + var4; } - @ObfuscatedName("bm") + @ObfuscatedName("bz") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "910134597" + garbageValue = "-2063630322" ) @Export("writeBytes") public void writeBytes(byte[] var1, int var2, int var3) { @@ -234,30 +258,31 @@ public class Buffer extends Node { } - @ObfuscatedName("bn") + @ObfuscatedName("bh") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-1846433239" + garbageValue = "1257286815" ) @Export("writeLengthInt") public void writeLengthInt(int var1) { if (var1 < 0) { throw new IllegalArgumentException(); + } else { + this.array[this.offset - var1 - 4] = (byte)(var1 >> 24); + this.array[this.offset - var1 - 3] = (byte)(var1 >> 16); + this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); + this.array[this.offset - var1 - 1] = (byte)var1; } - this.array[this.offset - var1 - 4] = (byte)(var1 >> 24); - this.array[this.offset - var1 - 3] = (byte)(var1 >> 16); - this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); - this.array[this.offset - var1 - 1] = (byte)var1; } - @ObfuscatedName("bc") + @ObfuscatedName("bv") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "613117959" + signature = "(IB)V", + garbageValue = "50" ) @Export("writeLengthShort") public void writeLengthShort(int var1) { - if (var1 >= 0 && var1 <= 0xffff) { + if (var1 >= 0 && var1 <= 65535) { this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); this.array[this.offset - var1 - 1] = (byte)var1; } else { @@ -265,10 +290,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("bx") + @ObfuscatedName("bj") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-1716988438" + garbageValue = "380591196" ) @Export("writeLengthByte") public void writeLengthByte(int var1) { @@ -279,10 +304,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("bo") + @ObfuscatedName("bq") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "38" + signature = "(II)V", + garbageValue = "-2115031789" ) @Export("writeSmartByteShort") public void writeSmartByteShort(int var1) { @@ -295,10 +320,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("bb") + @ObfuscatedName("by") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-1995040852" + garbageValue = "2105291599" ) @Export("writeVarInt") public void writeVarInt(int var1) { @@ -323,28 +348,28 @@ public class Buffer extends Node { @ObfuscatedName("bs") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "25" + signature = "(I)I", + garbageValue = "-1804591207" ) @Export("readUnsignedByte") public int readUnsignedByte() { return this.array[++this.offset - 1] & 255; } - @ObfuscatedName("bj") + @ObfuscatedName("bi") @ObfuscatedSignature( - signature = "(B)B", - garbageValue = "0" + signature = "(I)B", + garbageValue = "2067539630" ) @Export("readByte") public byte readByte() { return this.array[++this.offset - 1]; } - @ObfuscatedName("bl") + @ObfuscatedName("bf") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-1459053594" + signature = "(B)I", + garbageValue = "15" ) @Export("readUnsignedShort") public int readUnsignedShort() { @@ -355,23 +380,23 @@ public class Buffer extends Node { @ObfuscatedName("bd") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1327508233" + garbageValue = "-861597845" ) @Export("readShort") public int readShort() { this.offset += 2; int var1 = (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); - if (var1 > 0x7fff) { + if (var1 > 32767) { var1 -= 65536; } return var1; } - @ObfuscatedName("by") + @ObfuscatedName("br") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1182668344" + garbageValue = "-598726421" ) @Export("readMedium") public int readMedium() { @@ -379,10 +404,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("bt") + @ObfuscatedName("bm") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "-107" + garbageValue = "3" ) @Export("readInt") public int readInt() { @@ -390,46 +415,47 @@ 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("bq") + @ObfuscatedName("bu") @ObfuscatedSignature( - signature = "(B)J", - garbageValue = "85" + signature = "(I)J", + garbageValue = "1115582555" ) @Export("readLong") public long readLong() { long var1 = (long)this.readInt() & 4294967295L; long var3 = (long)this.readInt() & 4294967295L; - return var3 + (var1 << 32); + return (var1 << 32) + var3; } - @ObfuscatedName("bu") + @ObfuscatedName("bb") @ObfuscatedSignature( - signature = "(S)Z", - garbageValue = "12452" + signature = "(I)Z", + garbageValue = "2141139990" ) @Export("readBoolean") public boolean readBoolean() { return (this.readUnsignedByte() & 1) == 1; } - @ObfuscatedName("bw") + @ObfuscatedName("bl") @ObfuscatedSignature( signature = "(I)Ljava/lang/String;", - garbageValue = "-289262260" + garbageValue = "-373862586" ) @Export("readStringCp1252NullTerminatedOrNull") public String readStringCp1252NullTerminatedOrNull() { if (this.array[this.offset] == 0) { ++this.offset; return null; + } else { + return this.readStringCp1252NullTerminated(); } - return this.readStringCp1252NullTerminated(); } - @ObfuscatedName("br") + @ObfuscatedName("bt") @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", - garbageValue = "-231155257" + signature = "(S)Ljava/lang/String;", + garbageValue = "-25708" ) @Export("readStringCp1252NullTerminated") public String readStringCp1252NullTerminated() { @@ -439,53 +465,56 @@ public class Buffer extends Node { } int var2 = this.offset - var1 - 1; - return var2 == 0 ? "" : FriendSystem.decodeStringCp1252(this.array, var1, var2); + return var2 == 0 ? "" : ViewportMouse.decodeStringCp1252(this.array, var1, var2); } - @ObfuscatedName("bk") + @ObfuscatedName("bx") @ObfuscatedSignature( signature = "(I)Ljava/lang/String;", - garbageValue = "1224856688" + garbageValue = "1244023154" ) @Export("readStringCp1252NullCircumfixed") public String readStringCp1252NullCircumfixed() { byte var1 = this.array[++this.offset - 1]; if (var1 != 0) { throw new IllegalStateException(""); - } - int var2 = this.offset; + } else { + int var2 = this.offset; - while (this.array[++this.offset - 1] != 0) { - } + while (this.array[++this.offset - 1] != 0) { + } - int var3 = this.offset - var2 - 1; - return var3 == 0 ? "" : FriendSystem.decodeStringCp1252(this.array, var2, var3); + int var3 = this.offset - var2 - 1; + return var3 == 0 ? "" : ViewportMouse.decodeStringCp1252(this.array, var2, var3); + } } - @ObfuscatedName("bf") + @ObfuscatedName("ba") @ObfuscatedSignature( signature = "(I)Ljava/lang/String;", - garbageValue = "-534152321" + garbageValue = "812121562" ) @Export("readCESU8") public String readCESU8() { byte var1 = this.array[++this.offset - 1]; if (var1 != 0) { throw new IllegalStateException(""); + } else { + int var2 = this.readVarInt(); + if (var2 + this.offset > this.array.length) { + throw new IllegalStateException(""); + } else { + String var3 = KeyHandler.method786(this.array, this.offset, var2); + this.offset += var2; + return var3; + } } - int var2 = this.readVarInt(); - if (var2 + this.offset > this.array.length) { - throw new IllegalStateException(""); - } - String var3 = ClientPreferences.method1755(this.array, this.offset, var2); - this.offset += var2; - return var3; } - @ObfuscatedName("bv") + @ObfuscatedName("bg") @ObfuscatedSignature( - signature = "([BIIB)V", - garbageValue = "1" + signature = "([BIII)V", + garbageValue = "1127647987" ) @Export("readBytes") public void readBytes(byte[] var1, int var2, int var3) { @@ -497,8 +526,8 @@ public class Buffer extends Node { @ObfuscatedName("be") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1645687054" + signature = "(B)I", + garbageValue = "8" ) @Export("readShortSmart") public int readShortSmart() { @@ -506,10 +535,10 @@ public class Buffer extends Node { return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; } - @ObfuscatedName("ba") + @ObfuscatedName("bc") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "497319136" + garbageValue = "-1325782569" ) @Export("readUShortSmart") public int readUShortSmart() { @@ -517,49 +546,50 @@ public class Buffer extends Node { return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; } - @ObfuscatedName("cr") + @ObfuscatedName("ce") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-126181090" + signature = "(B)I", + garbageValue = "-121" ) - public int method5509() { + public int method5565() { int var1 = 0; int var2; - for (var2 = this.readUShortSmart(); var2 == 0x7fff; var2 = this.readUShortSmart()) { - var1 += 0x7fff; + for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) { + var1 += 32767; } var1 += var2; return var1; } - @ObfuscatedName("cf") + @ObfuscatedName("ci") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "55" + signature = "(I)I", + garbageValue = "-572319792" ) - public int method5685() { + public int method5423() { return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); } - @ObfuscatedName("cj") + @ObfuscatedName("ck") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "4" + signature = "(I)I", + garbageValue = "-551220605" ) - public int method5511() { + public int method5602() { if (this.array[this.offset] < 0) { return this.readInt() & Integer.MAX_VALUE; + } else { + int var1 = this.readUnsignedShort(); + return var1 == 32767 ? -1 : var1; } - int var1 = this.readUnsignedShort(); - return var1 == 0x7fff ? -1 : var1; } - @ObfuscatedName("cl") + @ObfuscatedName("cc") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-31" + signature = "(I)I", + garbageValue = "1421419631" ) @Export("readVarInt") public int readVarInt() { @@ -573,10 +603,10 @@ public class Buffer extends Node { return var2 | var1; } - @ObfuscatedName("cn") + @ObfuscatedName("cd") @ObfuscatedSignature( signature = "([II)V", - garbageValue = "-1108447488" + garbageValue = "-1793126662" ) @Export("xteaEncryptAll") public void xteaEncryptAll(int[] var1) { @@ -601,10 +631,10 @@ public class Buffer extends Node { } - @ObfuscatedName("cy") + @ObfuscatedName("cf") @ObfuscatedSignature( - signature = "([II)V", - garbageValue = "2019803853" + signature = "([IB)V", + garbageValue = "-13" ) @Export("xteaDecryptAll") public void xteaDecryptAll(int[] var1) { @@ -629,10 +659,10 @@ public class Buffer extends Node { } - @ObfuscatedName("ct") + @ObfuscatedName("cw") @ObfuscatedSignature( signature = "([IIII)V", - garbageValue = "1174596892" + garbageValue = "-364788606" ) @Export("xteaEncrypt") public void xteaEncrypt(int[] var1, int var2, int var3) { @@ -659,10 +689,10 @@ public class Buffer extends Node { this.offset = var4; } - @ObfuscatedName("cq") + @ObfuscatedName("cj") @ObfuscatedSignature( signature = "([IIII)V", - garbageValue = "1963802752" + garbageValue = "1445467920" ) @Export("xteaDecrypt") public void xteaDecrypt(int[] var1, int var2, int var3) { @@ -691,8 +721,8 @@ public class Buffer extends Node { @ObfuscatedName("cp") @ObfuscatedSignature( - signature = "(Ljava/math/BigInteger;Ljava/math/BigInteger;B)V", - garbageValue = "-32" + signature = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V", + garbageValue = "-1886495382" ) @Export("encryptRsa") public void encryptRsa(BigInteger var1, BigInteger var2) { @@ -708,117 +738,134 @@ public class Buffer extends Node { this.writeBytes(var7, 0, var7.length); } - @ObfuscatedName("ch") + @ObfuscatedName("cu") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "1250667479" + signature = "(IB)I", + garbageValue = "6" ) @Export("writeCrc") public int writeCrc(int var1) { - int var2 = class2.method18(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("co") + @ObfuscatedName("cm") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-269588856" + garbageValue = "-11685633" ) @Export("checkCrc") public boolean checkCrc() { this.offset -= 4; - int var1 = class2.method18(this.array, 0, this.offset); - int var2 = this.readInt(); - return var1 == var2; - } + byte[] var2 = this.array; + int var3 = this.offset; + int var4 = -1; - @ObfuscatedName("cw") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-350257918" - ) - public void method5520(int var1) { - this.array[++this.offset - 1] = (byte)(var1 + 128); - } + int var5; + for (var5 = 0; var5 < var3; ++var5) { + var4 = var4 >>> 8 ^ crc32Table[(var4 ^ var2[var5]) & 255]; + } - @ObfuscatedName("ca") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-83332801" - ) - public void method5521(int var1) { - this.array[++this.offset - 1] = (byte)(0 - var1); + var4 = ~var4; + var5 = this.readInt(); + return var5 == var4; } @ObfuscatedName("cb") @ObfuscatedSignature( - signature = "(IS)V", - garbageValue = "-28428" + signature = "(IB)V", + garbageValue = "12" ) - public void method5502(int var1) { + public void method5433(int var1) { + this.array[++this.offset - 1] = (byte)(var1 + 128); + } + + @ObfuscatedName("ch") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "-1332263426" + ) + public void method5545(int var1) { + this.array[++this.offset - 1] = (byte)(0 - var1); + } + + @ObfuscatedName("cn") + @ObfuscatedSignature( + signature = "(IB)V", + garbageValue = "10" + ) + public void method5435(int var1) { this.array[++this.offset - 1] = (byte)(128 - var1); } - @ObfuscatedName("cx") + @ObfuscatedName("cr") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1995893034" + signature = "(B)I", + garbageValue = "-34" ) - public int method5722() { + public int method5436() { return this.array[++this.offset - 1] - 128 & 255; } - @ObfuscatedName("cu") + @ObfuscatedName("cl") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-4" + signature = "(I)I", + garbageValue = "1565223364" ) @Export("readUnsignedByteNegate") public int readUnsignedByteNegate() { return 0 - this.array[++this.offset - 1] & 255; } - @ObfuscatedName("cs") + @ObfuscatedName("cg") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "758948119" + signature = "(B)I", + garbageValue = "-121" ) - public int method5525() { + public int method5438() { return 128 - this.array[++this.offset - 1] & 255; } - @ObfuscatedName("cg") + @ObfuscatedName("cy") @ObfuscatedSignature( signature = "(I)B", - garbageValue = "-1190131063" + garbageValue = "-1467076143" ) - public byte method5694() { + public byte method5616() { return (byte)(this.array[++this.offset - 1] - 128); } + @ObfuscatedName("cz") + @ObfuscatedSignature( + signature = "(I)B", + garbageValue = "1466744800" + ) + public byte method5421() { + return (byte)(0 - this.array[++this.offset - 1]); + } + @ObfuscatedName("cv") @ObfuscatedSignature( signature = "(I)B", - garbageValue = "433221072" + garbageValue = "-1597148556" ) - public byte method5527() { - return (byte)(0 - this.array[++this.offset - 1]); - } - - @ObfuscatedName("ce") - @ObfuscatedSignature( - signature = "(I)B", - garbageValue = "-166242071" - ) - public byte method5528() { + public byte method5441() { return (byte)(128 - this.array[++this.offset - 1]); } - @ObfuscatedName("cz") + @ObfuscatedName("cq") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "3" + signature = "(II)V", + garbageValue = "-785731883" ) @Export("writeShortLE") public void writeShortLE(int var1) { @@ -826,100 +873,100 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)(var1 >> 8); } - @ObfuscatedName("cm") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "-54" - ) - public void method5530(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); - this.array[++this.offset - 1] = (byte)(var1 + 128); - } - - @ObfuscatedName("ck") + @ObfuscatedName("ct") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "2137220162" + garbageValue = "1047736204" ) - public void method5475(int var1) { + public void method5443(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); + this.array[++this.offset - 1] = (byte)(var1 + 128); + } + + @ObfuscatedName("cx") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "1307961550" + ) + public void method5432(int var1) { this.array[++this.offset - 1] = (byte)(var1 + 128); this.array[++this.offset - 1] = (byte)(var1 >> 8); } - @ObfuscatedName("cc") + @ObfuscatedName("ca") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "41" + garbageValue = "34" ) - public int method5532() { + public int method5445() { this.offset += 2; return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); } - @ObfuscatedName("ci") + @ObfuscatedName("cs") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "0" + garbageValue = "52" ) - public int method5518() { + public int method5446() { this.offset += 2; return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); } - @ObfuscatedName("cd") + @ObfuscatedName("co") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-2136582954" + garbageValue = "203510338" ) - public int method5534() { + public int method5447() { this.offset += 2; return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); } @ObfuscatedName("dr") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-86" + signature = "(I)I", + garbageValue = "-823557765" ) - public int method5535() { + public int method5448() { this.offset += 2; int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); - if (var1 > 0x7fff) { + if (var1 > 32767) { var1 -= 65536; } return var1; } - @ObfuscatedName("dn") + @ObfuscatedName("dd") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1793884033" + garbageValue = "-1479368922" ) - public int method5500() { + public int method5434() { this.offset += 2; int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); - if (var1 > 0x7fff) { + if (var1 > 32767) { var1 -= 65536; } return var1; } - @ObfuscatedName("dw") + @ObfuscatedName("dv") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "940152634" + garbageValue = "-1804428572" ) - public int method5591() { + public int method5449() { this.offset += 3; return (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 1] & 255) << 16); } - @ObfuscatedName("dg") + @ObfuscatedName("da") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1386013852" + garbageValue = "997752481" ) @Export("writeIntLE") public void writeIntLE(int var1) { @@ -929,10 +976,10 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)(var1 >> 24); } - @ObfuscatedName("df") + @ObfuscatedName("dh") @ObfuscatedSignature( signature = "(IB)V", - garbageValue = "-73" + garbageValue = "94" ) @Export("writeIntME") public void writeIntME(int var1) { @@ -942,10 +989,10 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)(var1 >> 16); } - @ObfuscatedName("dt") + @ObfuscatedName("dm") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "703583712" + garbageValue = "742164705" ) @Export("writeIntLE16") public void writeIntLE16(int var1) { @@ -958,42 +1005,51 @@ public class Buffer extends Node { @ObfuscatedName("dj") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-897690370" + garbageValue = "-1937988665" ) - public int method5541() { + public int method5505() { 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("dl") + @ObfuscatedName("dc") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "113" + garbageValue = "98" ) - public int method5542() { + public int method5455() { 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("dz") + @ObfuscatedName("db") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-264665087" + signature = "(B)I", + garbageValue = "-33" ) - public int method5543() { + public int method5414() { 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("dh") + @ObfuscatedName("dx") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "-467001406" + garbageValue = "1071281288" ) - public void method5544(byte[] var1, int var2, int var3) { + public void method5457(byte[] var1, int var2, int var3) { for (int var4 = var2; var4 < var3 + var2; ++var4) { var1[var4] = (byte)(this.array[++this.offset - 1] - 128); } } + + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(I)Lgq;", + garbageValue = "-1208544567" + ) + static PacketBufferNode method5567() { + return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; + } } diff --git a/runescape-client/src/main/java/BufferedFile.java b/runescape-client/src/main/java/BufferedFile.java index 803c688bd7..66bb02ae18 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("mn") +@ObfuscatedName("mw") @Implements("BufferedFile") public class BufferedFile { - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lma;" + signature = "Lmm;" ) @Export("accessFile") AccessFile accessFile; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("readBuffer") byte[] readBuffer; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - longValue = -5630904549833157093L + longValue = 6930797311862622501L ) @Export("readBufferOffset") long readBufferOffset; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1225882999 + intValue = 324861765 ) @Export("readBufferLength") int readBufferLength; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("writeBuffer") byte[] writeBuffer; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - longValue = 225596692322175817L + longValue = 2678508088338929319L ) @Export("writeBufferOffset") long writeBufferOffset; - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -299149629 + intValue = -1286336757 ) @Export("writeBufferLength") int writeBufferLength; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - longValue = -8683938208221515491L + longValue = -1907180336926601455L ) @Export("offset") long offset; - @ObfuscatedName("f") + @ObfuscatedName("d") @ObfuscatedGetter( - longValue = 6190164439722426599L + longValue = 4723760243484879195L ) @Export("fileLength") long fileLength; - @ObfuscatedName("m") + @ObfuscatedName("f") @ObfuscatedGetter( - longValue = 6621326623419959019L + longValue = 2095185296289778233L ) @Export("length") long length; - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedGetter( - longValue = -8187358352341044117L + longValue = -4232607220009999679L ) @Export("fileOffset") long fileOffset; @ObfuscatedSignature( - signature = "(Lma;II)V" + signature = "(Lmm;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("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "41" + signature = "(I)V", + garbageValue = "-2018301044" ) @Export("close") public void close() throws IOException { @@ -95,39 +95,40 @@ public class BufferedFile { this.accessFile.close(); } - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("seek") public void seek(long var1) throws IOException { if (var1 < 0L) { throw new IOException(""); + } else { + this.offset = var1; } - this.offset = var1; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(S)J", - garbageValue = "21690" + signature = "(B)J", + garbageValue = "54" ) @Export("length") public long length() { return this.length; } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "([BI)V", - garbageValue = "-981743247" + garbageValue = "-1442283725" ) @Export("readFully") public void readFully(byte[] var1) throws IOException { this.read(var1, 0, var1.length); } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "1308534455" + garbageValue = "-481612055" ) @Export("read") public void read(byte[] var1, int var2, int var3) throws IOException { @@ -136,7 +137,7 @@ public class BufferedFile { throw new ArrayIndexOutOfBoundsException(var3 + var2 - var1.length); } - if (-1L != this.writeBufferOffset && this.offset >= this.writeBufferOffset && this.offset + (long)var3 <= this.writeBufferOffset + (long)this.writeBufferLength) { + if (-1L != this.writeBufferOffset && this.offset >= this.writeBufferOffset && (long)var3 + this.offset <= this.writeBufferOffset + (long)this.writeBufferLength) { System.arraycopy(this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var1, var2, var3); this.offset += (long)var3; return; @@ -145,7 +146,7 @@ public class BufferedFile { long var4 = this.offset; int var7 = var3; int var8; - if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) { + if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { var8 = (int)((long)this.readBufferLength - (this.offset - this.readBufferOffset)); if (var8 > var3) { var8 = var3; @@ -199,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 < this.writeBufferOffset + (long)this.writeBufferLength) { var13 = var4; } - if (this.writeBufferOffset + (long)this.writeBufferLength > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= var4 + (long)var7) { - var10 = (long)this.writeBufferLength + this.writeBufferOffset; - } else if (var4 + (long)var7 > this.writeBufferOffset && (long)var7 + var4 <= this.writeBufferOffset + (long)this.writeBufferLength) { + if (this.writeBufferOffset + (long)this.writeBufferLength > var4 && (long)this.writeBufferLength + this.writeBufferOffset <= var4 + (long)var7) { + var10 = this.writeBufferOffset + (long)this.writeBufferLength; + } else if ((long)var7 + var4 > this.writeBufferOffset && (long)var7 + var4 <= this.writeBufferOffset + (long)this.writeBufferLength) { var10 = var4 + (long)var7; } @@ -230,10 +231,10 @@ public class BufferedFile { } } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-364747525" + garbageValue = "-263792175" ) @Export("load") void load() throws IOException { @@ -260,23 +261,23 @@ public class BufferedFile { } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "-1530751884" + garbageValue = "-516860317" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { try { - if (this.offset + (long)var3 > this.length) { - this.length = this.offset + (long)var3; + if ((long)var3 + this.offset > this.length) { + this.length = (long)var3 + this.offset; } if (-1L != this.writeBufferOffset && (this.offset < this.writeBufferOffset || this.offset > (long)this.writeBufferLength + this.writeBufferOffset)) { this.flush(); } - if (this.writeBufferOffset != -1L && this.offset + (long)var3 > this.writeBufferOffset + (long)this.writeBuffer.length) { + if (-1L != this.writeBufferOffset && (long)var3 + this.offset > (long)this.writeBuffer.length + this.writeBufferOffset) { 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; @@ -300,7 +301,7 @@ public class BufferedFile { } } else { - if (this.fileOffset != this.offset) { + if (this.offset != this.fileOffset) { this.accessFile.seek(this.offset); this.fileOffset = this.offset; } @@ -313,14 +314,14 @@ public class BufferedFile { long var9 = -1L; long var6 = -1L; - if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { + if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) { var9 = this.offset; } else if (this.readBufferOffset >= this.offset && this.readBufferOffset < (long)var3 + this.offset) { var9 = this.readBufferOffset; } - if (this.offset + (long)var3 > this.readBufferOffset && this.offset + (long)var3 <= (long)this.readBufferLength + this.readBufferOffset) { - var6 = (long)var3 + this.offset; + if (this.offset + (long)var3 > this.readBufferOffset && (long)var3 + this.offset <= (long)this.readBufferLength + this.readBufferOffset) { + var6 = this.offset + (long)var3; } else if (this.readBufferOffset + (long)this.readBufferLength > this.offset && (long)this.readBufferLength + this.readBufferOffset <= this.offset + (long)var3) { var6 = (long)this.readBufferLength + this.readBufferOffset; } @@ -338,36 +339,36 @@ public class BufferedFile { } } - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "813445771" + garbageValue = "2123212638" ) @Export("flush") void flush() throws IOException { - if (this.writeBufferOffset != -1L) { + if (-1L != this.writeBufferOffset) { if (this.writeBufferOffset != this.fileOffset) { this.accessFile.seek(this.writeBufferOffset); this.fileOffset = this.writeBufferOffset; } this.accessFile.write(this.writeBuffer, 0, this.writeBufferLength); - this.fileOffset += -299149629L * (long)(this.writeBufferLength * -1383888405); + this.fileOffset += (long)(this.writeBufferLength * 1940047011) * -1286336757L; 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 < this.writeBufferOffset + (long)this.writeBufferLength) { var1 = this.readBufferOffset; } - if ((long)this.writeBufferLength + this.writeBufferOffset > 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 && this.readBufferOffset + (long)this.readBufferLength <= this.writeBufferOffset + (long)this.writeBufferLength) { + if (this.writeBufferOffset + (long)this.writeBufferLength > this.readBufferOffset && this.writeBufferOffset + (long)this.writeBufferLength <= (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 = (long)this.readBufferLength + this.readBufferOffset; } @@ -381,28 +382,4 @@ public class BufferedFile { } } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-1560259071" - ) - static int method6528(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var2 == null) { - return 0; - } - if (var1 == -1) { - return 0; - } - int var3 = 0; - - for (int var4 = 0; var4 < var2.quantities.length; ++var4) { - if (var2.ids[var4] == var1) { - var3 += var2.quantities[var4]; - } - } - - return var3; - } } diff --git a/runescape-client/src/main/java/BufferedNetSocket.java b/runescape-client/src/main/java/BufferedNetSocket.java index 3b4413f910..5e0ff43323 100644 --- a/runescape-client/src/main/java/BufferedNetSocket.java +++ b/runescape-client/src/main/java/BufferedNetSocket.java @@ -5,26 +5,26 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kb") +@ObfuscatedName("ko") @Implements("BufferedNetSocket") public class BufferedNetSocket extends AbstractSocket { - @ObfuscatedName("q") - @Export("socket") - Socket socket; - @ObfuscatedName("w") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lks;" + signature = "Lkh;" ) @Export("source") BufferedSource source; - @ObfuscatedName("e") + @ObfuscatedName("j") + @Export("socket") + Socket socket; + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lkp;" + signature = "Lki;" ) @Export("sink") BufferedSink sink; - BufferedNetSocket(Socket var1, int var2, int var3) throws IOException { + public BufferedNetSocket(Socket var1, int var2, int var3) throws IOException { this.socket = var1; this.socket.setSoTimeout(30000); this.socket.setTcpNoDelay(true); @@ -34,10 +34,10 @@ public class BufferedNetSocket extends AbstractSocket { this.sink = new BufferedSink(this.socket.getOutputStream(), var3); } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1144636612" + garbageValue = "-1798752769" ) @Export("close") public void close() { @@ -51,57 +51,65 @@ public class BufferedNetSocket extends AbstractSocket { this.source.close(); } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "2" + signature = "(I)I", + garbageValue = "547465689" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { return this.source.readUnsignedByte(); } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "55" + garbageValue = "83" ) @Export("available") public int available() throws IOException { return this.source.available(); } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "1948150862" + garbageValue = "156087109" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { return this.source.isAvailable(var1); } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "([BIIB)I", - garbageValue = "26" + garbageValue = "100" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { return this.source.read(var1, var2, var3); } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "-1696227994" + garbageValue = "638463675" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { this.sink.write(var1, var2, var3); } + protected void abt() { + this.close(); + } + protected void finalize() { this.close(); } + + protected void abi() { + this.close(); + } } diff --git a/runescape-client/src/main/java/BufferedSink.java b/runescape-client/src/main/java/BufferedSink.java index a77023b182..159d834849 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("kp") +@ObfuscatedName("ki") @Implements("BufferedSink") public class BufferedSink implements Runnable { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("thread") Thread thread; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("outputStream") OutputStream outputStream; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -273498913 + intValue = -2122061045 ) @Export("capacity") int capacity; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("buffer") byte[] buffer; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -173399327 + intValue = -786239105 ) @Export("position") int position; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1895147359 + intValue = -225046667 ) @Export("limit") int limit; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("exception") IOException exception; - @ObfuscatedName("i") + @ObfuscatedName("q") @Export("closed") boolean closed; @@ -54,10 +54,10 @@ public class BufferedSink implements Runnable { this.thread.start(); } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(B)Z", - garbageValue = "-14" + garbageValue = "-52" ) @Export("isClosed") boolean isClosed() { @@ -74,14 +74,15 @@ public class BufferedSink implements Runnable { } return true; + } else { + return false; } - return false; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "([BIIB)V", - garbageValue = "37" + garbageValue = "22" ) @Export("write") void write(byte[] var1, int var2, int var3) throws IOException { @@ -89,37 +90,39 @@ public class BufferedSink implements Runnable { synchronized(this) { if (this.exception != null) { throw new IOException(this.exception.toString()); - } - int var5; - if (this.position <= this.limit) { - var5 = this.capacity - this.limit + this.position - 1; } else { - var5 = this.position - this.limit - 1; - } + int var5; + if (this.position <= this.limit) { + var5 = this.capacity - this.limit + this.position - 1; + } else { + var5 = this.position - this.limit - 1; + } - if (var5 < var3) { - throw new IOException(""); - } - if (var3 + this.limit <= this.capacity) { - System.arraycopy(var1, var2, this.buffer, this.limit, var3); - } else { - int var6 = this.capacity - this.limit; - System.arraycopy(var1, var2, this.buffer, this.limit, var6); - System.arraycopy(var1, var6 + var2, this.buffer, 0, var3 - var6); - } + if (var5 < var3) { + throw new IOException(""); + } else { + if (var3 + this.limit <= this.capacity) { + System.arraycopy(var1, var2, this.buffer, this.limit, var3); + } else { + int var6 = this.capacity - this.limit; + System.arraycopy(var1, var2, this.buffer, this.limit, var6); + System.arraycopy(var1, var6 + var2, this.buffer, 0, var3 - var6); + } - this.limit = (var3 + this.limit) % this.capacity; - this.notifyAll(); + this.limit = (var3 + this.limit) % this.capacity; + this.notifyAll(); + } + } } } else { throw new IOException(); } } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1881137071" + signature = "(B)V", + garbageValue = "4" ) @Export("close") void close() { diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java index 1805629031..8313c968d0 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("ks") +@ObfuscatedName("kh") @Implements("BufferedSource") public class BufferedSource implements Runnable { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("thread") Thread thread; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 491736021 + intValue = -219567751 ) @Export("capacity") int capacity; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("buffer") byte[] buffer; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -570790809 + intValue = 779012297 ) @Export("position") int position; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -902879681 + intValue = 1500766173 ) @Export("limit") int limit; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("exception") IOException exception; @@ -52,17 +52,16 @@ public class BufferedSource implements Runnable { this.thread.start(); } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "-1294773775" + garbageValue = "188903163" ) @Export("isAvailable") boolean isAvailable(int var1) throws IOException { if (var1 == 0) { return true; - } - if (var1 > 0 && var1 < this.capacity) { + } else if (var1 > 0 && var1 < this.capacity) { synchronized(this) { int var3; if (this.position <= this.limit) { @@ -74,20 +73,23 @@ public class BufferedSource implements Runnable { if (var3 < var1) { if (this.exception != null) { throw new IOException(this.exception.toString()); + } else { + this.notifyAll(); + return false; } - this.notifyAll(); - return false; + } else { + return true; } - return true; } + } else { + throw new IOException(); } - throw new IOException(); } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-72711599" + signature = "(B)I", + garbageValue = "-85" ) @Export("available") int available() throws IOException { @@ -101,16 +103,17 @@ public class BufferedSource implements Runnable { if (var2 <= 0 && this.exception != null) { throw new IOException(this.exception.toString()); + } else { + this.notifyAll(); + return var2; } - this.notifyAll(); - return var2; } } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "797723305" + garbageValue = "1102638305" ) @Export("readUnsignedByte") int readUnsignedByte() throws IOException { @@ -118,20 +121,22 @@ public class BufferedSource implements Runnable { if (this.limit == this.position) { if (this.exception != null) { throw new IOException(this.exception.toString()); + } else { + return -1; } - return -1; + } else { + int var2 = this.buffer[this.position] & 255; + this.position = (this.position + 1) % this.capacity; + this.notifyAll(); + return var2; } - int var2 = this.buffer[this.position] & 255; - this.position = (this.position + 1) % this.capacity; - this.notifyAll(); - return var2; } } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "([BIIS)I", - garbageValue = "28253" + garbageValue = "128" ) @Export("read") int read(byte[] var1, int var2, int var3) throws IOException { @@ -150,27 +155,29 @@ public class BufferedSource implements Runnable { if (var3 == 0 && this.exception != null) { throw new IOException(this.exception.toString()); - } - if (var3 + this.position <= this.capacity) { - System.arraycopy(this.buffer, this.position, var1, var2, var3); } else { - int var6 = this.capacity - this.position; - System.arraycopy(this.buffer, this.position, var1, var2, var6); - System.arraycopy(this.buffer, 0, var1, var6 + var2, var3 - var6); - } + if (var3 + this.position <= this.capacity) { + System.arraycopy(this.buffer, this.position, var1, var2, var3); + } else { + int var6 = this.capacity - this.position; + System.arraycopy(this.buffer, this.position, var1, var2, var6); + System.arraycopy(this.buffer, 0, var1, var6 + var2, var3 - var6); + } - this.position = (var3 + this.position) % this.capacity; - this.notifyAll(); - return var3; + this.position = (var3 + this.position) % this.capacity; + this.notifyAll(); + return var3; + } } + } else { + throw new IOException(); } - throw new IOException(); } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1361407903" + signature = "(S)V", + garbageValue = "6608" ) @Export("close") void close() { @@ -236,85 +243,4 @@ public class BufferedSource implements Runnable { } } } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(Lhp;Lhp;ZII)V", - garbageValue = "-273498913" - ) - static void method5892(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { - if (Login.field1179) { - if (var3 == 4) { - Login.loginIndex = 4; - } - return; - } - Login.loginIndex = var3; - Rasterizer2D.Rasterizer2D_clear(); - byte[] var4 = var0.takeFileByNames("title.jpg", ""); - GrandExchangeOfferWorldComparator.leftTitleSprite = BuddyRankComparator.convertJpgToSprite(var4); - NPC.rightTitleSprite = GrandExchangeOfferWorldComparator.leftTitleSprite.mirrorHorizontally(); - if ((Client.worldProperties & 536870912) != 0) { - TileItem.logoSprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); - } else { - TileItem.logoSprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); - } - - Login.titleboxSprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); - VarpDefinition.titlebuttonSprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); - int var6 = var1.getGroupId("runes"); - int var7 = var1.getFileId(var6, ""); - IndexedSprite[] var5 = class289.SpriteBuffer_getIndexedSpriteArray(var1, var6, var7); - Login.runesSprite = var5; - var7 = var1.getGroupId("title_mute"); - int var8 = var1.getFileId(var7, ""); - IndexedSprite[] var9 = class289.SpriteBuffer_getIndexedSpriteArray(var1, var7, var8); - Login.title_muteSprite = var9; - Login.options_buttons_0Sprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); - Message.field606 = class215.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); - Decimator.options_buttons_2Sprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); - Login.field1185 = class215.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); - class237.field3191 = Login.options_buttons_0Sprite.subWidth; - WorldMapDecoration.field212 = Login.options_buttons_0Sprite.subHeight; - Ignored.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite); - if (var2) { - Login.Login_username = ""; - Login.Login_password = ""; - } - - GrandExchangeOffer.field65 = 0; - WorldMapManager.otp = ""; - Login.field1201 = true; - Login.worldSelectOpen = false; - if (!WorldMapLabelSize.clientPreferences.titleMusicDisabled) { - WorldMapRegion.playMusicTrackByName(2, WorldMapRegion.archive6, "scape main", "", 255, false); - } else { - class40.method729(2); - } - - if (NetCache.NetCache_socket != null) { - try { - Buffer var10 = new Buffer(4); - var10.writeByte(3); - var10.writeMedium(0); - NetCache.NetCache_socket.write(var10.array, 0, 4); - } catch (IOException var13) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var12) { - } - - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; - } - } - - Login.field1179 = true; - Login.xPadding = (GrandExchangeEvent.canvasWidth - 765) / 2; - Login.loginBoxX = Login.xPadding + 202; - ScriptEvent.loginBoxCenter = Login.loginBoxX + 180; - GrandExchangeOfferWorldComparator.leftTitleSprite.drawAt(Login.xPadding, 0); - NPC.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - TileItem.logoSprite.drawAt(Login.xPadding + 382 - TileItem.logoSprite.subWidth / 2, 18); - } } diff --git a/runescape-client/src/main/java/ByteArrayNode.java b/runescape-client/src/main/java/ByteArrayNode.java index 21dc74e4d1..56230b8679 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("fd") +@ObfuscatedName("fl") @Implements("ByteArrayNode") public class ByteArrayNode extends Node { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("byteArray") public byte[] byteArray; diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java index b88f7461d3..6eece2fdd0 100644 --- a/runescape-client/src/main/java/ByteArrayPool.java +++ b/runescape-client/src/main/java/ByteArrayPool.java @@ -4,39 +4,41 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kr") +@ObfuscatedName("km") @Implements("ByteArrayPool") public class ByteArrayPool { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -2074547709 + intValue = -2023224885 ) @Export("ByteArrayPool_smallCount") static int ByteArrayPool_smallCount; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 371626607 + intValue = -770015567 ) @Export("ByteArrayPool_mediumCount") static int ByteArrayPool_mediumCount; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1320623185 + intValue = -155376471 ) @Export("ByteArrayPool_largeCount") static int ByteArrayPool_largeCount; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("ByteArrayPool_small") static byte[][] ByteArrayPool_small; - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("ByteArrayPool_medium") static byte[][] ByteArrayPool_medium; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("ByteArrayPool_large") static byte[][] ByteArrayPool_large; - @ObfuscatedName("b") - @Export("ByteArrayPool_alternativeSizes") - public static int[] ByteArrayPool_alternativeSizes; + @ObfuscatedName("q") + @Export("ByteArrayPool_altSizeArrayCounts") + public static int[] ByteArrayPool_altSizeArrayCounts; + @ObfuscatedName("w") + public static String field3708; static { ByteArrayPool_smallCount = 0; @@ -47,10 +49,10 @@ public class ByteArrayPool { ByteArrayPool_large = new byte[50][]; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(IZB)[B", - garbageValue = "58" + garbageValue = "82" ) @Export("ByteArrayPool_getArrayBool") static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) { @@ -82,14 +84,14 @@ public class ByteArrayPool { return var2; } - if (class189.ByteArrayPool_arrays != null) { - for (int var4 = 0; var4 < ByteArrayPool_alternativeSizes.length; ++var4) { - if (ByteArrayPool_alternativeSizes[var4] != var0) { - if (var0 < ByteArrayPool_alternativeSizes[var4]) { + if (FaceNormal.ByteArrayPool_arrays != null) { + for (int var4 = 0; var4 < UserComparator4.ByteArrayPool_alternativeSizes.length; ++var4) { + if (UserComparator4.ByteArrayPool_alternativeSizes[var4] != var0) { + if (var0 < UserComparator4.ByteArrayPool_alternativeSizes[var4]) { } - } else if (class43.ByteArrayPool_altSizeArrayCounts[var4] > 0) { - byte[] var3 = class189.ByteArrayPool_arrays[var4][--class43.ByteArrayPool_altSizeArrayCounts[var4]]; - class189.ByteArrayPool_arrays[var4][class43.ByteArrayPool_altSizeArrayCounts[var4]] = null; + } else if (ByteArrayPool_altSizeArrayCounts[var4] > 0) { + byte[] var3 = FaceNormal.ByteArrayPool_arrays[var4][--ByteArrayPool_altSizeArrayCounts[var4]]; + FaceNormal.ByteArrayPool_arrays[var4][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 348a980af9..67a169dbfd 100644 --- a/runescape-client/src/main/java/Calendar.java +++ b/runescape-client/src/main/java/Calendar.java @@ -4,25 +4,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gv") +@ObfuscatedName("gz") @Implements("Calendar") public class Calendar { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("MONTH_NAMES_ENGLISH_GERMAN") - public static final String[][] MONTH_NAMES_ENGLISH_GERMAN; - @ObfuscatedName("w") + static final String[][] MONTH_NAMES_ENGLISH_GERMAN; + @ObfuscatedName("j") @Export("DAYS_OF_THE_WEEK") - public static final String[] DAYS_OF_THE_WEEK; - @ObfuscatedName("e") + static final String[] DAYS_OF_THE_WEEK; + @ObfuscatedName("i") @Export("Calendar_calendar") - public static java.util.Calendar Calendar_calendar; - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lhj;" - ) - static Widget field2507; - @ObfuscatedName("ch") - public static char field2508; + static java.util.Calendar Calendar_calendar; 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"}}; @@ -31,16 +24,211 @@ public class Calendar { Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT")); } - @ObfuscatedName("g") + @ObfuscatedName("ip") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-50" + signature = "(IIIII)V", + garbageValue = "516952450" ) - @Export("Widget_clearCached") - public static void Widget_clearCached() { - Widget.Widget_cachedSprites.clear(); - Widget.Widget_cachedModels.clear(); - Widget.Widget_cachedFonts.clear(); - Widget.Widget_cachedSpriteMasks.clear(); + @Export("addSceneMenuOptions") + static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { + if (Client.isItemSelected == 0 && !Client.isSpellSelected) { + WorldMapData_0.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 (-1L != var4) { + var8 = (int)(var4 >>> 0 & 127L); + var10 = (int)(var4 >>> 7 & 127L); + Player var12 = Client.players[Client.combatTargetPlayerIndex]; + class51.addPlayerToMenu(var12, Client.combatTargetPlayerIndex, var8, var10); + } + + return; + } + + long var27 = ViewportMouse.ViewportMouse_entityTags[var8]; + if (var27 != var6) { + label319: { + var6 = var27; + int var15 = class218.ViewportMouse_unpackX(var8); + int var16 = GameObject.ViewportMouse_unpackY(var8); + int var17 = class40.method729(ViewportMouse.ViewportMouse_entityTags[var8]); + int var19 = BoundaryObject.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var8]); + int var20 = var19; + if (var17 == 2 && Player.scene.getObjectFlags(ItemContainer.plane, var15, var16, var27) >= 0) { + ObjectDefinition var21 = class215.getObjectDefinition(var19); + if (var21.transforms != null) { + var21 = var21.transform(); + } + + if (var21 == null) { + break label319; + } + + if (Client.isItemSelected == 1) { + WorldMapData_0.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class16.colorStartTag(65535) + var21.name, 1, var19, var15, var16); + } else if (Client.isSpellSelected) { + if ((WorldMapSectionType.selectedSpellFlags & 4) == 4) { + WorldMapData_0.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class16.colorStartTag(65535) + var21.name, 2, var19, var15, var16); + } + } else { + String[] var29 = var21.actions; + if (var29 != null) { + for (int var32 = 4; var32 >= 0; --var32) { + if (var29[var32] != null) { + short var24 = 0; + if (var32 == 0) { + var24 = 3; + } + + if (var32 == 1) { + var24 = 4; + } + + if (var32 == 2) { + var24 = 5; + } + + if (var32 == 3) { + var24 = 6; + } + + if (var32 == 4) { + var24 = 1001; + } + + WorldMapData_0.insertMenuItemNoShift(var29[var32], class16.colorStartTag(65535) + var21.name, var24, var20, var15, var16); + } + } + } + + WorldMapData_0.insertMenuItemNoShift("Examine", class16.colorStartTag(65535) + var21.name, 1002, var21.id, var15, var16); + } + } + + int var22; + NPC var23; + Player var25; + int[] var36; + int var38; + if (var17 == 1) { + NPC var33 = Client.npcs[var20]; + if (var33 == null) { + break label319; + } + + if (var33.definition.size == 1 && (var33.x & 127) == 64 && (var33.y & 127) == 64) { + for (var22 = 0; var22 < Client.npcCount; ++var22) { + var23 = Client.npcs[Client.npcIndices[var22]]; + if (var23 != null && var33 != var23 && var23.definition.size == 1 && var23.x == var33.x && var23.y == var33.y) { + class65.addNpcToMenu(var23.definition, Client.npcIndices[var22], var15, var16); + } + } + + var22 = Players.Players_count; + var36 = Players.Players_indices; + + for (var38 = 0; var38 < var22; ++var38) { + var25 = Client.players[var36[var38]]; + if (var25 != null && var33.x == var25.x && var25.y == var33.y) { + class51.addPlayerToMenu(var25, var36[var38], var15, var16); + } + } + } + + class65.addNpcToMenu(var33.definition, var20, var15, var16); + } + + if (var17 == 0) { + Player var34 = Client.players[var20]; + if (var34 == null) { + break label319; + } + + if ((var34.x & 127) == 64 && (var34.y & 127) == 64) { + for (var22 = 0; var22 < Client.npcCount; ++var22) { + var23 = Client.npcs[Client.npcIndices[var22]]; + if (var23 != null && var23.definition.size == 1 && var34.x == var23.x && var34.y == var23.y) { + class65.addNpcToMenu(var23.definition, Client.npcIndices[var22], var15, var16); + } + } + + var22 = Players.Players_count; + var36 = Players.Players_indices; + + for (var38 = 0; var38 < var22; ++var38) { + var25 = Client.players[var36[var38]]; + if (var25 != null && var25 != var34 && var25.x == var34.x && var34.y == var25.y) { + class51.addPlayerToMenu(var25, var36[var38], var15, var16); + } + } + } + + if (var20 != Client.combatTargetPlayerIndex) { + class51.addPlayerToMenu(var34, var20, var15, var16); + } else { + var4 = var27; + } + } + + if (var17 == 3) { + NodeDeque var35 = Client.groundItems[ItemContainer.plane][var15][var16]; + if (var35 != null) { + for (TileItem var39 = (TileItem)var35.first(); var39 != null; var39 = (TileItem)var35.next()) { + ItemDefinition var37 = WorldMapData_0.ItemDefinition_get(var39.id); + if (Client.isItemSelected == 1) { + WorldMapData_0.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class16.colorStartTag(16748608) + var37.name, 16, var39.id, var15, var16); + } else if (Client.isSpellSelected) { + if ((WorldMapSectionType.selectedSpellFlags & 1) == 1) { + WorldMapData_0.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class16.colorStartTag(16748608) + var37.name, 17, var39.id, var15, var16); + } + } else { + String[] var30 = var37.groundActions; + + for (int var31 = 4; var31 >= 0; --var31) { + if (var30 != null && var30[var31] != null) { + byte var26 = 0; + if (var31 == 0) { + var26 = 18; + } + + if (var31 == 1) { + var26 = 19; + } + + if (var31 == 2) { + var26 = 20; + } + + if (var31 == 3) { + var26 = 21; + } + + if (var31 == 4) { + var26 = 22; + } + + WorldMapData_0.insertMenuItemNoShift(var30[var31], class16.colorStartTag(16748608) + var37.name, var26, var39.id, var15, var16); + } else if (var31 == 2) { + WorldMapData_0.insertMenuItemNoShift("Take", class16.colorStartTag(16748608) + var37.name, 20, var39.id, var15, var16); + } + } + + WorldMapData_0.insertMenuItemNoShift("Examine", class16.colorStartTag(16748608) + var37.name, 1004, var39.id, var15, var16); + } + } + } + } + } + } + + ++var8; + } } } diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index 0ce84c0bec..6e784825bd 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -5,21 +5,23 @@ 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("am") +@ObfuscatedName("ah") @Implements("Canvas") public final class Canvas extends java.awt.Canvas { - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 1323988023 + @ObfuscatedName("ob") + @ObfuscatedSignature( + signature = "Lfo;" ) - static int field422; - @ObfuscatedName("fd") + @Export("mouseWheel") + static MouseWheel mouseWheel; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 983351575 + intValue = 1288652121 ) - static int field418; - @ObfuscatedName("q") + static int field389; + @ObfuscatedName("s") @Export("component") Component component; @@ -35,63 +37,228 @@ public final class Canvas extends java.awt.Canvas { this.component.update(var1); } - @ObfuscatedName("i") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(I)Lbw;", - garbageValue = "-1579773205" + signature = "(IIIII)V", + garbageValue = "260955923" ) - @Export("getNextWorldListWorld") - static World getNextWorldListWorld() { - return World.World_listCount < World.World_count ? World.World_worlds[++World.World_listCount - 1] : null; + @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; } - @ObfuscatedName("au") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1705541685" + signature = "(ILcr;ZI)I", + garbageValue = "65535" ) - @Export("runWidgetOnLoadListener") - static void runWidgetOnLoadListener(int var0) { - if (var0 == -1 || !class162.loadInterface(var0)) { - return; + static int method806(int var0, Script var1, boolean var2) { + int var4 = -1; + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var3 = WorldMapElement.getWidget(var4); + } else { + var3 = var2 ? class286.field3623 : class297.field3693; } - Widget[] var1 = Widget.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; - class96.runScript(var4, 5000000); + if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { + Interpreter.Interpreter_intStackSize -= 2; + var3.scrollX = Interpreter.Interpreter_intStack[Interpreter.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[Interpreter.Interpreter_intStackSize + 1]; + if (var3.scrollY > var3.scrollHeight - var3.height) { + var3.scrollY = var3.scrollHeight - var3.height; + } + + if (var3.scrollY < 0) { + var3.scrollY = 0; + } + + FriendSystem.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { + var3.color = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + FriendSystem.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETFILL) { + var3.fill = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + FriendSystem.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTRANS) { + var3.transparencyTop = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + FriendSystem.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { + var3.lineWid = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + FriendSystem.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { + var3.spriteId2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + FriendSystem.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { + var3.spriteAngle = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + FriendSystem.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTILING) { + var3.spriteTiling = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + FriendSystem.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETMODEL) { + var3.modelType = 1; + var3.modelId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + FriendSystem.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { + Interpreter.Interpreter_intStackSize -= 6; + var3.modelOffsetX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var3.modelOffsetY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var3.modelAngleX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + var3.modelAngleY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; + var3.modelAngleZ = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4]; + var3.modelZoom = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 5]; + FriendSystem.invalidateWidget(var3); + return 1; + } else { + int var8; + if (var0 == ScriptOpcodes.CC_SETMODELANIM) { + var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var8 != var3.sequenceId) { + var3.sequenceId = var8; + var3.modelFrame = 0; + var3.modelFrameCycle = 0; + FriendSystem.invalidateWidget(var3); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { + var3.modelOrthog = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + FriendSystem.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTEXT) { + String var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + if (!var7.equals(var3.text)) { + var3.text = var7; + FriendSystem.invalidateWidget(var3); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { + var3.fontId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + FriendSystem.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { + Interpreter.Interpreter_intStackSize -= 3; + var3.textXAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var3.textYAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var3.textLineHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + FriendSystem.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { + var3.textShadowed = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + FriendSystem.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { + var3.outline = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + FriendSystem.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { + var3.spriteShadow = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + FriendSystem.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { + var3.spriteFlipV = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + FriendSystem.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { + var3.spriteFlipH = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + FriendSystem.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { + Interpreter.Interpreter_intStackSize -= 2; + var3.scrollWidth = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var3.scrollHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + FriendSystem.invalidateWidget(var3); + if (var4 != -1 && var3.type == 0) { + WorldMapAreaData.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var4 >> 16], var3, false); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { + GameShell.resumePauseWidget(var3.id, var3.childIndex); + Client.meslayerContinueWidget = var3; + FriendSystem.invalidateWidget(var3); + return 1; + } else if (var0 == 1122) { + var3.spriteId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + FriendSystem.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { + var3.color2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + FriendSystem.invalidateWidget(var3); + return 1; + } else if (var0 == 1124) { + var3.transparencyBot = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + FriendSystem.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETFILLMODE) { + var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + FillMode var6 = (FillMode)FriendSystem.findEnumerated(SequenceDefinition.FillMode_values(), var8); + if (var6 != null) { + var3.fillMode = var6; + FriendSystem.invalidateWidget(var3); + } + + return 1; + } else { + boolean var5; + if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { + var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + var3.field2601 = var5; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { + var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + var3.modelTransparency = var5; + return 1; + } else { + return 2; + } } } - - } - - @ObfuscatedName("jb") - @ObfuscatedSignature( - signature = "(IIIILly;Lhg;I)V", - garbageValue = "-1460314936" - ) - @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; - UserComparator4.redHintArrowSprite.method6193(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); - } else { - Interpreter.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); - } - } } diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java index f91a2506f6..c3d0f43ff4 100644 --- a/runescape-client/src/main/java/ChatChannel.java +++ b/runescape-client/src/main/java/ChatChannel.java @@ -1,29 +1,27 @@ -import java.lang.reflect.Field; -import java.lang.reflect.Method; 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.Reflection; -@ObfuscatedName("cs") +@ObfuscatedName("cg") @Implements("ChatChannel") public class ChatChannel { - @ObfuscatedName("gr") - @ObfuscatedGetter( - intValue = 1055466439 - ) - static int field1306; - @ObfuscatedName("w") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "[Lbj;" + signature = "[Lbl;" + ) + @Export("World_worlds") + static World[] World_worlds; + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "[Lbi;" ) @Export("messages") Message[] messages; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 754027225 + intValue = 532462751 ) @Export("count") int count; @@ -32,10 +30,10 @@ public class ChatChannel { this.messages = new Message[100]; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)Lbj;", - garbageValue = "0" + signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbi;", + garbageValue = "125041712" ) @Export("addMessage") Message addMessage(int var1, String var2, String var3, String var4) { @@ -63,200 +61,138 @@ public class ChatChannel { return var5; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(II)Lbj;", - garbageValue = "-55997964" + signature = "(II)Lbi;", + garbageValue = "673075059" ) @Export("getMessage") Message getMessage(int var1) { return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-410884165" + signature = "(B)I", + garbageValue = "76" ) @Export("size") int size() { return this.count; } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkf;IB)V", - garbageValue = "67" + signature = "(IB)V", + garbageValue = "1" ) - @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) { - var5 = var0.readStringCp1252NullTerminated(); - var6 = var0.readStringCp1252NullTerminated(); - var7 = 0; - if (var4 == 1) { - var7 = var0.readInt(); - } - - var2.operations[var3] = var4; - var2.intReplaceValues[var3] = var7; - if (User.loadClassFromDescriptor(var5).getClassLoader() == null) { - throw new SecurityException(); - } - - var2.fields[var3] = Reflection.findField(User.loadClassFromDescriptor(var5), var6); - } else 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] = User.loadClassFromDescriptor(var8[var12]); - } - - Class var22 = User.loadClassFromDescriptor(var20); - if (User.loadClassFromDescriptor(var5).getClassLoader() == null) { - throw new SecurityException(); - } - - Method[] var13 = User.loadClassFromDescriptor(var5).getDeclaredMethods(); - Method[] var14 = var13; - - for (int var15 = 0; var15 < var14.length; ++var15) { - Method var16 = var14[var15]; - if (!Reflection.getMethodName(var16).equals(var6)) { - continue; - } - Class[] var17 = Reflection.getParameterTypes(var16); - if (var17.length != var21.length) { - continue; - } - 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; - } - } 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; - } - } - - class96.reflectionChecks.addFirst(var2); - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-4" - ) - @Export("openWorldSelect") - static void openWorldSelect() { - if (UserComparator3.loadWorlds()) { - Login.worldSelectOpen = true; - Login.worldSelectPage = 0; - Login.worldSelectPagesCount = 0; + public static void method2163(int var0) { + if (class197.field2378 != 0) { + WorldMapSprite.field222 = var0; + } else { + class197.midiPcmStream.method3670(var0); } } - @ObfuscatedName("hh") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "-2069013220" + signature = "(Ljava/lang/CharSequence;II[BII)I", + garbageValue = "-1719820728" ) - static final void method2215(int var0, int var1, int var2, int var3) { - for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { - if (Client.rootWidgetXs[var4] + Client.rootWidgetWidths[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetHeights[var4] + Client.rootWidgetYs[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { - Client.field843[var4] = true; + @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("ie") + @ObfuscatedName("ac") @ObfuscatedSignature( - signature = "(Lhj;I)Z", - garbageValue = "-1045685499" + signature = "(II)I", + garbageValue = "1934933433" ) - @Export("runCs1") - static final boolean runCs1(Widget var0) { - if (var0.cs1Comparisons == null) { - return false; - } - for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { - int var2 = Varps.method3969(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 (var2 == var3) { - return false; - } - } else if (var2 != var3) { - return false; + static int method2165(int var0) { + return (int)((Math.log((double)var0) / Interpreter.field1078 - 7.0D) * 256.0D); + } + + @ObfuscatedName("hg") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-595413655" + ) + static final void method2161() { + for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var0.hitpoints == -1) { + var0.delay = 0; + WorldMapManager.method607(var0); + } else { + var0.remove(); } } - return true; } } diff --git a/runescape-client/src/main/java/ClanChat.java b/runescape-client/src/main/java/ClanChat.java index 0a320a4362..61f25f052e 100644 --- a/runescape-client/src/main/java/ClanChat.java +++ b/runescape-client/src/main/java/ClanChat.java @@ -4,134 +4,163 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jx") +@ObfuscatedName("jl") @Implements("ClanChat") public class ClanChat extends UserList { - @ObfuscatedName("gi") + @ObfuscatedName("bf") @ObfuscatedSignature( - signature = "[Llx;" + signature = "Llq;" ) - @Export("mapSceneSprites") - static IndexedSprite[] mapSceneSprites; - @ObfuscatedName("w") + @Export("worldSelectRightSprite") + static IndexedSprite worldSelectRightSprite; + @ObfuscatedName("go") + @Export("regionLandArchiveIds") + static int[] regionLandArchiveIds; + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lmu;" + signature = "Llu;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Ljg;" + signature = "Ljs;" ) @Export("localUser") final Usernamed localUser; - @ObfuscatedName("f") + @ObfuscatedName("d") @Export("name") public String name; - @ObfuscatedName("m") + @ObfuscatedName("f") @Export("owner") public String owner; - @ObfuscatedName("u") + @ObfuscatedName("c") @Export("minKick") public byte minKick; - @ObfuscatedName("x") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 737707483 + intValue = 1566602861 ) @Export("rank") public int rank; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1009556639 + intValue = 984476847 ) - int field3659; + int field3616; @ObfuscatedSignature( - signature = "(Lmu;Ljg;)V" + signature = "(Llu;Ljs;)V" ) public ClanChat(LoginType var1, Usernamed var2) { super(100); this.name = null; this.owner = null; - this.field3659 = 1; + this.field3616 = 1; this.loginType = var1; this.localUser = var2; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(I)Ljd;", - garbageValue = "2016619159" + signature = "(I)Lju;", + garbageValue = "-192021045" ) @Export("newInstance") User newInstance() { return new ClanMate(); } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(II)[Ljd;", - garbageValue = "2126056206" + signature = "(II)[Lju;", + garbageValue = "518998026" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new ClanMate[var1]; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "-1948396413" + signature = "(Ljava/lang/String;B)V", + garbageValue = "-16" ) @Export("readName") final void readName(String var1) { - this.name = VarcInt.base37Decode(var1); + this.name = FaceNormal.base37Decode(var1); } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "537403926" + signature = "(Ljava/lang/String;B)V", + garbageValue = "1" ) @Export("setOwner") final void setOwner(String var1) { - this.owner = VarcInt.base37Decode(var1); + this.owner = FaceNormal.base37Decode(var1); } - @ObfuscatedName("u") + @ObfuscatedName("ck") @ObfuscatedSignature( - signature = "(Lkf;I)V", - garbageValue = "-1982298123" + signature = "(Lky;B)V", + garbageValue = "8" ) @Export("readUpdate") public final void readUpdate(Buffer var1) { this.setOwner(var1.readStringCp1252NullTerminated()); long var2 = var1.readLong(); - this.readName(Tile.method2855(var2)); + long var5 = var2; + String var4; + int var7; + if (var2 > 0L && var2 < 6582952005840035281L) { + if (var2 % 37L == 0L) { + 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(class288.base37Table[(int)(var11 - 37L * var5)]); + } + + var4 = var15.reverse().toString(); + } + } else { + var4 = null; + } + + this.readName(var4); this.minKick = var1.readByte(); - int var4 = var1.readUnsignedByte(); - if (var4 == 255) { - return; - } - this.clear(); + 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.field3659 - 1); - var6.rank = var1.readByte(); - var1.readStringCp1252NullTerminated(); - this.isLocalPlayer(var6); - } + 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.field3616 - 1); + var9.rank = var1.readByte(); + var1.readStringCp1252NullTerminated(); + this.isLocalPlayer(var9); + } + } } - @ObfuscatedName("ct") + @ObfuscatedName("cc") @ObfuscatedSignature( - signature = "(Lkf;I)V", - garbageValue = "-891757405" + signature = "(Lky;I)V", + garbageValue = "-1757818732" ) - public final void method5234(Buffer var1) { + public final void method5135(Buffer var1) { Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); int var3 = var1.readUnsignedShort(); byte var4 = var1.readByte(); @@ -161,17 +190,17 @@ public class ClanChat extends UserList { var6 = (ClanMate)this.addLastNoPreviousUsername(var2); } - var6.set(var3, ++this.field3659 - 1); + var6.set(var3, ++this.field3616 - 1); var6.rank = var4; this.isLocalPlayer(var6); } } - @ObfuscatedName("cq") + @ObfuscatedName("cd") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-415731818" + garbageValue = "-1788817000" ) @Export("clearFriends") public final void clearFriends() { @@ -181,10 +210,10 @@ public class ClanChat extends UserList { } - @ObfuscatedName("cp") + @ObfuscatedName("cf") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "17638925" + garbageValue = "-109825958" ) @Export("invalidateIgnoreds") public final void invalidateIgnoreds() { @@ -194,10 +223,10 @@ public class ClanChat extends UserList { } - @ObfuscatedName("ch") + @ObfuscatedName("cw") @ObfuscatedSignature( - signature = "(Ljw;I)V", - garbageValue = "1755545327" + signature = "(Ljr;I)V", + garbageValue = "-54614880" ) @Export("isLocalPlayer") final void isLocalPlayer(ClanMate var1) { diff --git a/runescape-client/src/main/java/ClanMate.java b/runescape-client/src/main/java/ClanMate.java index daa980f5e3..9f806bd4e7 100644 --- a/runescape-client/src/main/java/ClanMate.java +++ b/runescape-client/src/main/java/ClanMate.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("ClanMate") public class ClanMate extends Buddy { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Ljy;" + signature = "Ljj;" ) @Export("friend") TriBool friend; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Ljy;" + signature = "Ljj;" ) @Export("ignored") TriBool ignored; @@ -24,20 +24,20 @@ public class ClanMate extends Buddy { this.ignored = TriBool.TriBool_unknown; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1319461047" + garbageValue = "1629200475" ) @Export("clearIsFriend") void clearIsFriend() { this.friend = TriBool.TriBool_unknown; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "16711935" + garbageValue = "-431370449" ) @Export("isFriend") public final boolean isFriend() { @@ -48,30 +48,30 @@ public class ClanMate extends Buddy { return this.friend == TriBool.TriBool_true; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "78" + signature = "(I)V", + garbageValue = "-2053877048" ) @Export("fillIsFriend") void fillIsFriend() { - this.friend = ArchiveLoader.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.friend = class32.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1980920067" + signature = "(B)V", + garbageValue = "-72" ) @Export("clearIsIgnored") void clearIsIgnored() { this.ignored = TriBool.TriBool_unknown; } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "15" + signature = "(I)Z", + garbageValue = "1045653770" ) @Export("isIgnored") public final boolean isIgnored() { @@ -82,13 +82,23 @@ public class ClanMate extends Buddy { return this.ignored == TriBool.TriBool_true; } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1426345969" + garbageValue = "-1531975898" ) @Export("fillIsIgnored") void fillIsIgnored() { - this.ignored = ArchiveLoader.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.ignored = class32.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(CB)Z", + garbageValue = "96" + ) + @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/Client.java b/runescape-client/src/main/java/Client.java index a1465271dd..586bc7644f 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -1,8 +1,10 @@ +import java.io.File; import java.io.IOException; 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,1278 +15,1267 @@ import netscape.javascript.JSObject; @Implements("Client") @ObfuscatedName("client") public final class Client extends GameShell implements Usernamed { - @ObfuscatedName("mz") + @ObfuscatedName("oj") @ObfuscatedSignature( - signature = "Lhj;" - ) - @Export("clickedWidget") - static Widget clickedWidget; - @ObfuscatedName("ou") - @ObfuscatedGetter( - intValue = -2092613105 - ) - @Export("rootWidgetCount") - static int rootWidgetCount; - @ObfuscatedName("on") - @ObfuscatedGetter( - intValue = -2121832293 - ) - static int field741; - @ObfuscatedName("oz") - @ObfuscatedGetter( - longValue = 3232986536737283167L - ) - static long field868; - @ObfuscatedName("qe") - static boolean field699; - @ObfuscatedName("os") - static boolean[] field843; - @ObfuscatedName("oh") - static boolean[] field862; - @ObfuscatedName("ot") - static boolean[] field861; - @ObfuscatedName("nt") - static boolean field745; - @ObfuscatedName("nh") - @ObfuscatedGetter( - intValue = -800135319 - ) - @Export("cycleCntr") - static int cycleCntr; - @ObfuscatedName("ob") - @Export("isResizable") - static boolean isResizable; - @ObfuscatedName("sl") - @ObfuscatedGetter( - intValue = -441370687 - ) - public static int field924; - @ObfuscatedName("ny") - @ObfuscatedGetter( - intValue = 791405777 - ) - static int field672; - @ObfuscatedName("nr") - static boolean field873; - @ObfuscatedName("mo") - @ObfuscatedGetter( - intValue = -1889780377 - ) - @Export("widgetClickX") - static int widgetClickX; - @ObfuscatedName("mi") - @ObfuscatedGetter( - intValue = -367998477 - ) - @Export("widgetClickY") - static int widgetClickY; - @ObfuscatedName("nx") - @ObfuscatedGetter( - intValue = -1397532923 - ) - static int field834; - @ObfuscatedName("of") - @ObfuscatedSignature( - signature = "Llc;" + signature = "Llm;" ) @Export("widgetClickMasks") static NodeHashTable widgetClickMasks; - @ObfuscatedName("mf") + @ObfuscatedName("ps") @ObfuscatedSignature( - signature = "Lhj;" + signature = "Ljl;" + ) + @Export("clanChat") + static ClanChat clanChat; + @ObfuscatedName("mh") + @ObfuscatedSignature( + signature = "Lhp;" + ) + @Export("clickedWidget") + static Widget clickedWidget; + @ObfuscatedName("ol") + @ObfuscatedGetter( + intValue = 1199265875 + ) + @Export("rootWidgetCount") + static int rootWidgetCount; + @ObfuscatedName("oo") + @ObfuscatedGetter( + intValue = -1904808037 + ) + static int field752; + @ObfuscatedName("oq") + @ObfuscatedGetter( + longValue = 3836241446737313129L + ) + static long field836; + @ObfuscatedName("sk") + @ObfuscatedGetter( + intValue = 2060318015 + ) + public static int field892; + @ObfuscatedName("ow") + static boolean[] field703; + @ObfuscatedName("oa") + static boolean[] field830; + @ObfuscatedName("oy") + static boolean[] field829; + @ObfuscatedName("nd") + static boolean field804; + @ObfuscatedName("nc") + static boolean field641; + @ObfuscatedName("oc") + @Export("isResizable") + static boolean isResizable; + @ObfuscatedName("ns") + @ObfuscatedGetter( + intValue = 612002381 + ) + @Export("cycleCntr") + static int cycleCntr; + @ObfuscatedName("no") + @ObfuscatedGetter( + intValue = 686779073 + ) + static int field629; + @ObfuscatedName("qb") + static boolean field858; + @ObfuscatedName("mp") + @ObfuscatedGetter( + intValue = -772624841 + ) + @Export("widgetClickX") + static int widgetClickX; + @ObfuscatedName("mx") + @ObfuscatedGetter( + intValue = 324303259 + ) + @Export("widgetClickY") + static int widgetClickY; + @ObfuscatedName("nm") + @ObfuscatedGetter( + intValue = 1015270749 + ) + static int field802; + @ObfuscatedName("ms") + @ObfuscatedSignature( + signature = "Lhp;" ) @Export("clickedWidgetParent") static Widget clickedWidgetParent; - @ObfuscatedName("oj") + @ObfuscatedName("mi") + @ObfuscatedSignature( + signature = "Llm;" + ) + @Export("interfaceParents") + static NodeHashTable interfaceParents; + @ObfuscatedName("on") @Export("rootWidgetXs") static int[] rootWidgetXs; - @ObfuscatedName("od") + @ObfuscatedName("ou") @Export("rootWidgetWidths") static int[] rootWidgetWidths; - @ObfuscatedName("ni") + @ObfuscatedName("nf") @ObfuscatedGetter( - intValue = 583654473 + intValue = -958579239 ) - static int field835; - @ObfuscatedName("mg") + static int field803; + @ObfuscatedName("mo") @ObfuscatedSignature( - signature = "Lhj;" + signature = "Lhp;" ) @Export("viewportWidget") static Widget viewportWidget; - @ObfuscatedName("op") + @ObfuscatedName("ox") @ObfuscatedGetter( - intValue = -1450875753 + intValue = 1767414743 ) @Export("gameDrawingMode") static int gameDrawingMode; - @ObfuscatedName("om") + @ObfuscatedName("ov") @Export("rootWidgetHeights") static int[] rootWidgetHeights; - @ObfuscatedName("md") + @ObfuscatedName("my") @ObfuscatedGetter( - intValue = -1872633373 + intValue = 2067641259 ) @Export("staffModLevel") public static int staffModLevel; - @ObfuscatedName("oo") + @ObfuscatedName("ot") @Export("rootWidgetYs") static int[] rootWidgetYs; - @ObfuscatedName("qc") - @ObfuscatedGetter( - intValue = -1390257223 - ) - @Export("minimapState") - static int minimapState; - @ObfuscatedName("tn") + @ObfuscatedName("tz") + static int[] field697; + @ObfuscatedName("tk") + static int[] field898; + @ObfuscatedName("tr") @ObfuscatedSignature( - signature = "Lbl;" + signature = "Lbf;" ) - static final class65 field735; + static final class65 field684; @ObfuscatedName("og") @ObfuscatedSignature( - signature = "Ljh;" + signature = "Ljc;" ) @Export("scriptEvents") static NodeDeque scriptEvents; - @ObfuscatedName("py") - @ObfuscatedGetter( - intValue = 1200756083 - ) - @Export("destinationX") - static int destinationX; - @ObfuscatedName("ns") - @ObfuscatedGetter( - intValue = 1534205153 - ) - static int field837; - @ObfuscatedName("pe") - @ObfuscatedGetter( - intValue = -1422277425 - ) - @Export("destinationY") - static int destinationY; - @ObfuscatedName("nq") - @ObfuscatedGetter( - intValue = -22489899 - ) - static int field838; - @ObfuscatedName("tq") - static int[] field929; @ObfuscatedName("nl") - static int[] field888; - @ObfuscatedName("tz") - static int[] field930; - @ObfuscatedName("nm") @ObfuscatedGetter( - intValue = 1100765031 + intValue = 438883805 ) - static int field671; - @ObfuscatedName("nn") - @Export("isDraggingWidget") - static boolean isDraggingWidget; - @ObfuscatedName("my") + static int field805; + @ObfuscatedName("nr") @ObfuscatedGetter( - intValue = 1548302943 - ) - @Export("runEnergy") - static int runEnergy; - @ObfuscatedName("nk") - static int[] field863; - @ObfuscatedName("nu") - @ObfuscatedGetter( - intValue = -1356950915 - ) - static int field844; - @ObfuscatedName("nf") - @ObfuscatedGetter( - intValue = 1622588879 + intValue = -179501637 ) static int field806; - @ObfuscatedName("mh") - @ObfuscatedGetter( - intValue = 1071213383 - ) - @Export("weight") - static int weight; - @ObfuscatedName("qr") - @ObfuscatedGetter( - intValue = -582627637 - ) - static int field892; - @ObfuscatedName("qg") - @ObfuscatedGetter( - intValue = -1930874469 - ) - @Export("soundEffectVolume") - static int soundEffectVolume; - @ObfuscatedName("sc") - @ObfuscatedGetter( - intValue = 1724997489 - ) - static int field919; - @ObfuscatedName("rg") - @ObfuscatedSignature( - signature = "Lhh;" - ) - @Export("playerAppearance") - static PlayerAppearance playerAppearance; - @ObfuscatedName("qq") - @ObfuscatedGetter( - intValue = 1799450873 - ) - @Export("soundEffectCount") - static int soundEffectCount; - @ObfuscatedName("rt") - static boolean[] field886; - @ObfuscatedName("qd") - @Export("soundEffectIds") - static int[] soundEffectIds; @ObfuscatedName("qi") - @Export("isCameraLocked") - static boolean isCameraLocked; - @ObfuscatedName("rh") - static int[] field901; - @ObfuscatedName("sp") @ObfuscatedGetter( - intValue = 1680257497 + intValue = -290458443 ) - static int field920; - @ObfuscatedName("oc") + static int field857; + @ObfuscatedName("ne") + @Export("isDraggingWidget") + static boolean isDraggingWidget; + @ObfuscatedName("pt") @ObfuscatedGetter( - intValue = 328709835 - ) - @Export("mouseWheelRotation") - static int mouseWheelRotation; - @ObfuscatedName("me") - @ObfuscatedSignature( - signature = "Lhj;" - ) - @Export("draggedOnWidget") - static Widget draggedOnWidget; - @ObfuscatedName("qs") - @Export("queuedSoundEffectLoops") - static int[] queuedSoundEffectLoops; - @ObfuscatedName("rl") - static int[] field902; - @ObfuscatedName("rn") - static int[] field903; - @ObfuscatedName("qo") - @Export("queuedSoundEffectDelays") - static int[] queuedSoundEffectDelays; - @ObfuscatedName("ri") - static int[] field904; - @ObfuscatedName("qx") - @ObfuscatedSignature( - signature = "[Lcc;" - ) - @Export("soundEffects") - static SoundEffect[] soundEffects; - @ObfuscatedName("qt") - @Export("soundLocations") - static int[] soundLocations; - @ObfuscatedName("qh") - @ObfuscatedGetter( - intValue = 1808140467 - ) - static int field911; - @ObfuscatedName("qf") - @ObfuscatedGetter( - intValue = 374364257 - ) - static int field889; - @ObfuscatedName("so") - @Export("archiveLoaders") - static ArrayList archiveLoaders; - @ObfuscatedName("sj") - @ObfuscatedGetter( - intValue = 510604993 - ) - @Export("archiveLoaderArchive") - static int archiveLoaderArchive; - @ObfuscatedName("pb") - @ObfuscatedGetter( - intValue = -73161017 - ) - static int field747; - @ObfuscatedName("mv") - @ObfuscatedSignature( - signature = "Lhj;" - ) - @Export("meslayerContinueWidget") - static Widget meslayerContinueWidget; - @ObfuscatedName("mx") - @ObfuscatedGetter( - intValue = 176559841 - ) - @Export("chatEffects") - static int chatEffects; - @ObfuscatedName("mt") - @ObfuscatedGetter( - intValue = -112633937 - ) - static int field809; - @ObfuscatedName("ms") - @ObfuscatedGetter( - intValue = -1088998805 - ) - @Export("followerIndex") - static int followerIndex; - @ObfuscatedName("pg") - @ObfuscatedGetter( - intValue = -1777296197 - ) - @Export("mapIconCount") - static int mapIconCount; - @ObfuscatedName("nv") - @ObfuscatedGetter( - intValue = -1637199243 - ) - static int field849; - @ObfuscatedName("sn") - @ObfuscatedSignature( - signature = "Llu;" - ) - @Export("platformInfoProvider") - static PlatformInfoProvider platformInfoProvider; - @ObfuscatedName("rf") - static short field782; - @ObfuscatedName("pz") - @Export("mapIconXs") - static int[] mapIconXs; - @ObfuscatedName("rs") - static short field651; - @ObfuscatedName("rm") - static short field732; - @ObfuscatedName("rp") - static short field659; - @ObfuscatedName("ry") - static short field790; - @ObfuscatedName("ru") - @ObfuscatedGetter( - intValue = -1499125381 - ) - @Export("viewportZoom") - static int viewportZoom; - @ObfuscatedName("ph") - @Export("mapIconYs") - static int[] mapIconYs; - @ObfuscatedName("re") - static short field820; - @ObfuscatedName("rw") - @ObfuscatedGetter( - intValue = 1398487807 - ) - @Export("viewportWidth") - static int viewportWidth; - @ObfuscatedName("pu") - @ObfuscatedSignature( - signature = "[Lly;" - ) - @Export("mapIcons") - static Sprite[] mapIcons; - @ObfuscatedName("pc") - @ObfuscatedGetter( - intValue = -1217345061 - ) - static int field754; - @ObfuscatedName("pa") - static long[] field922; - @ObfuscatedName("po") - @ObfuscatedGetter( - longValue = -4978726531999304555L - ) - static long field879; - @ObfuscatedName("ro") - @ObfuscatedGetter( - intValue = 1243224603 - ) - @Export("viewportHeight") - static int viewportHeight; - @ObfuscatedName("nj") - @Export("changedSkills") - static int[] changedSkills; - @ObfuscatedName("rd") - @ObfuscatedGetter( - intValue = 355845697 - ) - @Export("viewportOffsetX") - static int viewportOffsetX; - @ObfuscatedName("no") - @ObfuscatedGetter( - intValue = 872784567 - ) - @Export("changedSkillsCount") - static int changedSkillsCount; - @ObfuscatedName("rq") - @ObfuscatedGetter( - intValue = -1819632499 - ) - @Export("viewportOffsetY") - static int viewportOffsetY; - @ObfuscatedName("sf") - @ObfuscatedSignature( - signature = "[Lf;" - ) - @Export("grandExchangeOffers") - static GrandExchangeOffer[] grandExchangeOffers; - @ObfuscatedName("ra") - @Export("zoomHeight") - static short zoomHeight; - @ObfuscatedName("rv") - @Export("zoomWidth") - static short zoomWidth; - @ObfuscatedName("pw") - @ObfuscatedGetter( - intValue = 1092581053 - ) - static int field875; - @ObfuscatedName("nb") - @ObfuscatedGetter( - intValue = 1755198585 - ) - static int field915; - @ObfuscatedName("pk") - static int[] field921; - @ObfuscatedName("ok") - @ObfuscatedSignature( - signature = "Ljh;" - ) - static NodeDeque field852; - @ObfuscatedName("pd") - static int[] field877; - @ObfuscatedName("ov") - @ObfuscatedSignature( - signature = "Ljh;" - ) - static NodeDeque field856; - @ObfuscatedName("st") - @ObfuscatedGetter( - intValue = 980120409 - ) - static int field927; - @ObfuscatedName("nw") - @ObfuscatedGetter( - intValue = -382720859 - ) - @Export("chatCycle") - static int chatCycle; - @ObfuscatedName("mc") - @ObfuscatedGetter( - intValue = 431417087 - ) - static int field817; - @ObfuscatedName("mm") - @Export("playerMod") - static boolean playerMod; - @ObfuscatedName("mw") - @ObfuscatedGetter( - intValue = -49080109 - ) - static int field818; - @ObfuscatedName("pl") - @ObfuscatedGetter( - intValue = -602987385 + intValue = -216729541 ) @Export("tradeChatMode") static int tradeChatMode; - @ObfuscatedName("pv") + @ObfuscatedName("mk") @ObfuscatedGetter( - intValue = -547874643 + intValue = 904442413 + ) + @Export("runEnergy") + static int runEnergy; + @ObfuscatedName("mb") + @ObfuscatedGetter( + intValue = -1945437307 + ) + @Export("weight") + static int weight; + @ObfuscatedName("pz") + @ObfuscatedGetter( + intValue = 1231685339 ) @Export("publicChatMode") static int publicChatMode; - @ObfuscatedName("nz") + @ObfuscatedName("py") @ObfuscatedGetter( - intValue = -792356641 + intValue = -1551675657 ) - static int field851; - @ObfuscatedName("pj") - static String field762; + @Export("destinationX") + static int destinationX; + @ObfuscatedName("pp") + @ObfuscatedGetter( + intValue = 799266575 + ) + @Export("destinationY") + static int destinationY; + @ObfuscatedName("na") + @ObfuscatedGetter( + intValue = 109681511 + ) + static int field819; + @ObfuscatedName("mc") + @ObfuscatedSignature( + signature = "Lhp;" + ) + @Export("meslayerContinueWidget") + static Widget meslayerContinueWidget; + @ObfuscatedName("so") + @ObfuscatedGetter( + intValue = 410840719 + ) + static int field733; + @ObfuscatedName("qa") + @ObfuscatedGetter( + intValue = -1271857437 + ) + static int field856; + @ObfuscatedName("rs") + @ObfuscatedSignature( + signature = "Lhy;" + ) + @Export("playerAppearance") + static PlayerAppearance playerAppearance; + @ObfuscatedName("qj") + @ObfuscatedGetter( + intValue = 300836983 + ) + static int field860; + @ObfuscatedName("sv") + @ObfuscatedGetter( + intValue = -1054213827 + ) + static int field888; + @ObfuscatedName("om") + @ObfuscatedGetter( + intValue = 963636473 + ) + @Export("mouseWheelRotation") + static int mouseWheelRotation; + @ObfuscatedName("mt") + @ObfuscatedSignature( + signature = "Lhp;" + ) + @Export("draggedOnWidget") + static Widget draggedOnWidget; + @ObfuscatedName("qr") + @ObfuscatedGetter( + intValue = -1057223309 + ) + @Export("soundEffectCount") + static int soundEffectCount; + @ObfuscatedName("qn") + @Export("soundEffectIds") + static int[] soundEffectIds; + @ObfuscatedName("qq") + @Export("queuedSoundEffectLoops") + static int[] queuedSoundEffectLoops; + @ObfuscatedName("qx") + @ObfuscatedGetter( + intValue = 1818057855 + ) + @Export("minimapState") + static int minimapState; + @ObfuscatedName("qm") + @Export("queuedSoundEffectDelays") + static int[] queuedSoundEffectDelays; + @ObfuscatedName("qg") + @ObfuscatedSignature( + signature = "[Lca;" + ) + @Export("soundEffects") + static SoundEffect[] soundEffects; + @ObfuscatedName("nh") + @ObfuscatedGetter( + intValue = -28645539 + ) + static int field820; + @ObfuscatedName("qh") + @Export("soundLocations") + static int[] soundLocations; + @ObfuscatedName("si") + @Export("archiveLoaders") + static ArrayList archiveLoaders; + @ObfuscatedName("sp") + @ObfuscatedGetter( + intValue = -234202221 + ) + @Export("archiveLoaderArchive") + static int archiveLoaderArchive; + @ObfuscatedName("ni") + static int[] field811; + @ObfuscatedName("ny") + @ObfuscatedGetter( + intValue = 1453639439 + ) + static int field812; + @ObfuscatedName("pq") + @ObfuscatedGetter( + longValue = -7134048785617706275L + ) + static long field847; + @ObfuscatedName("rv") + @ObfuscatedGetter( + intValue = -1113546575 + ) + @Export("viewportOffsetX") + static int viewportOffsetX; + @ObfuscatedName("rt") + @ObfuscatedGetter( + intValue = -413974869 + ) + @Export("viewportOffsetY") + static int viewportOffsetY; + @ObfuscatedName("rw") + @ObfuscatedGetter( + intValue = -784086909 + ) + @Export("viewportWidth") + static int viewportWidth; + @ObfuscatedName("rq") + @ObfuscatedGetter( + intValue = -1159342953 + ) + @Export("viewportHeight") + static int viewportHeight; + @ObfuscatedName("pl") + @ObfuscatedGetter( + intValue = -657852683 + ) + static int field651; + @ObfuscatedName("rl") + static boolean[] field897; @ObfuscatedName("sb") @ObfuscatedSignature( - signature = "Lby;" + signature = "[Ld;" + ) + @Export("grandExchangeOffers") + static GrandExchangeOffer[] grandExchangeOffers; + @ObfuscatedName("rk") + static int[] field869; + @ObfuscatedName("qu") + @Export("isCameraLocked") + static boolean isCameraLocked; + @ObfuscatedName("rd") + static int[] field694; + @ObfuscatedName("rc") + static int[] field758; + @ObfuscatedName("ro") + static int[] field872; + @ObfuscatedName("nx") + @ObfuscatedGetter( + intValue = -1845844437 + ) + static int field818; + @ObfuscatedName("sa") + @ObfuscatedSignature( + signature = "Llw;" + ) + @Export("platformInfoProvider") + static PlatformInfoProvider platformInfoProvider; + @ObfuscatedName("pb") + @ObfuscatedGetter( + intValue = 116545085 + ) + @Export("mapIconCount") + static int mapIconCount; + @ObfuscatedName("pu") + @Export("mapIconXs") + static int[] mapIconXs; + @ObfuscatedName("px") + @Export("mapIconYs") + static int[] mapIconYs; + @ObfuscatedName("rf") + static short field873; + @ObfuscatedName("rx") + static short field822; + @ObfuscatedName("ru") + static short field652; + @ObfuscatedName("ri") + static short field791; + @ObfuscatedName("pc") + @ObfuscatedSignature( + signature = "[Lls;" + ) + @Export("mapIcons") + static Sprite[] mapIcons; + @ObfuscatedName("rz") + static short field661; + @ObfuscatedName("ry") + @ObfuscatedGetter( + intValue = -769323395 + ) + @Export("viewportZoom") + static int viewportZoom; + @ObfuscatedName("re") + static short field795; + @ObfuscatedName("qd") + @ObfuscatedGetter( + intValue = 45254171 + ) + @Export("soundEffectVolume") + static int soundEffectVolume; + @ObfuscatedName("np") + static int[] field809; + @ObfuscatedName("rg") + @Export("zoomHeight") + static short zoomHeight; + @ObfuscatedName("nt") + @ObfuscatedGetter( + intValue = -1478120285 + ) + static int field800; + @ObfuscatedName("rn") + @Export("zoomWidth") + static short zoomWidth; + @ObfuscatedName("mf") + @Export("playerMod") + static boolean playerMod; + @ObfuscatedName("pg") + @ObfuscatedGetter( + intValue = 1836754959 + ) + static int field677; + @ObfuscatedName("sw") + @ObfuscatedGetter( + intValue = -1082381649 + ) + static int field895; + @ObfuscatedName("nv") + @ObfuscatedGetter( + intValue = -884673245 + ) + static int field817; + @ObfuscatedName("pr") + static int[] field815; + @ObfuscatedName("ok") + @ObfuscatedSignature( + signature = "Ljc;" + ) + static NodeDeque field633; + @ObfuscatedName("pi") + static int[] field845; + @ObfuscatedName("nq") + @Export("changedSkills") + static int[] changedSkills; + @ObfuscatedName("nu") + @ObfuscatedGetter( + intValue = -1859324819 + ) + @Export("changedSkillsCount") + static int changedSkillsCount; + @ObfuscatedName("od") + @ObfuscatedSignature( + signature = "Ljc;" + ) + static NodeDeque field824; + @ObfuscatedName("mr") + @ObfuscatedGetter( + intValue = -2146322835 + ) + @Export("chatEffects") + static int chatEffects; + @ObfuscatedName("mu") + @ObfuscatedGetter( + intValue = 1488851157 + ) + static int field788; + @ObfuscatedName("ml") + @ObfuscatedGetter( + intValue = -764637271 + ) + static int field638; + @ObfuscatedName("mn") + @ObfuscatedGetter( + intValue = 471173501 + ) + static int field786; + @ObfuscatedName("mg") + @ObfuscatedGetter( + intValue = 1069095505 + ) + @Export("followerIndex") + static int followerIndex; + @ObfuscatedName("pv") + static long[] field842; + @ObfuscatedName("pj") + static int[] field643; + @ObfuscatedName("pm") + @ObfuscatedGetter( + intValue = 1799961229 + ) + static int field843; + @ObfuscatedName("pd") + static String field668; + @ObfuscatedName("sh") + @ObfuscatedSignature( + signature = "Lbr;" ) @Export("GrandExchangeEvents_worldComparator") static GrandExchangeOfferOwnWorldComparator GrandExchangeEvents_worldComparator; - @ObfuscatedName("ps") - static int[] field870; + @ObfuscatedName("nb") + @ObfuscatedGetter( + intValue = 887611573 + ) + @Export("chatCycle") + static int chatCycle; @ObfuscatedName("w") @ObfuscatedSignature( - signature = "[Lfv;" + signature = "[Lfm;" ) @Export("collisionMaps") static CollisionMap[] collisionMaps; - @ObfuscatedName("ab") - static boolean field912; - @ObfuscatedName("bp") + @ObfuscatedName("ae") + static boolean field783; + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = -1673280657 + intValue = -99475413 ) @Export("worldId") public static int worldId; - @ObfuscatedName("bz") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = 5468995 + intValue = -196512875 ) @Export("worldProperties") static int worldProperties; - @ObfuscatedName("bg") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = -1579822855 + intValue = -507352025 ) @Export("gameBuild") static int gameBuild; - @ObfuscatedName("bn") + @ObfuscatedName("bh") @Export("isMembersWorld") public static boolean isMembersWorld; - @ObfuscatedName("bc") + @ObfuscatedName("bv") @Export("isLowDetail") static boolean isLowDetail; - @ObfuscatedName("bj") + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = 483842531 + intValue = 580705437 ) @Export("clientType") static int clientType; - @ObfuscatedName("bl") + @ObfuscatedName("bf") @Export("onMobile") static boolean onMobile; @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = -1965849977 + intValue = 600567601 ) @Export("gameState") static int gameState; - @ObfuscatedName("ct") + @ObfuscatedName("cw") @Export("isLoading") static boolean isLoading; - @ObfuscatedName("cq") + @ObfuscatedName("cj") @ObfuscatedGetter( - intValue = 594809673 + intValue = -462561221 ) @Export("cycle") static int cycle; @ObfuscatedName("cp") @ObfuscatedGetter( - longValue = -8976739109298152429L + longValue = -3264456649992457541L ) @Export("mouseLastLastPressedTimeMillis") static long mouseLastLastPressedTimeMillis; - @ObfuscatedName("co") + @ObfuscatedName("cm") @ObfuscatedGetter( - intValue = -315292611 + intValue = 1567709733 ) - static int field717; - @ObfuscatedName("cw") - @ObfuscatedGetter( - intValue = -1280751431 - ) - static int field665; - @ObfuscatedName("ca") - @ObfuscatedGetter( - longValue = 4427744799360755687L - ) - static long field666; + static int field838; @ObfuscatedName("cb") + @ObfuscatedGetter( + intValue = 519692055 + ) + static int field637; + @ObfuscatedName("ch") + @ObfuscatedGetter( + longValue = -2755527832911265383L + ) + static long field889; + @ObfuscatedName("cn") @Export("hadFocus") static boolean hadFocus; - @ObfuscatedName("cx") + @ObfuscatedName("cr") @Export("displayFps") static boolean displayFps; - @ObfuscatedName("cu") + @ObfuscatedName("cl") @ObfuscatedGetter( - intValue = 1770117359 + intValue = 275974395 ) @Export("rebootTimer") static int rebootTimer; - @ObfuscatedName("cs") + @ObfuscatedName("cg") @ObfuscatedGetter( - intValue = -1858899151 + intValue = -271547777 ) @Export("hintArrowType") static int hintArrowType; - @ObfuscatedName("cg") + @ObfuscatedName("cy") @ObfuscatedGetter( - intValue = -1235944977 + intValue = -262489269 ) @Export("hintArrowNpcIndex") static int hintArrowNpcIndex; - @ObfuscatedName("cv") + @ObfuscatedName("cz") @ObfuscatedGetter( - intValue = -837382687 + intValue = 1310447751 ) @Export("hintArrowPlayerIndex") static int hintArrowPlayerIndex; - @ObfuscatedName("ce") + @ObfuscatedName("cv") @ObfuscatedGetter( - intValue = 139732677 + intValue = -1091650667 ) @Export("hintArrowX") static int hintArrowX; - @ObfuscatedName("cz") + @ObfuscatedName("cq") @ObfuscatedGetter( - intValue = -722044991 + intValue = -133934205 ) @Export("hintArrowY") static int hintArrowY; - @ObfuscatedName("cm") + @ObfuscatedName("ct") @ObfuscatedGetter( - intValue = -1604787030 + intValue = -709011140 ) @Export("hintArrowHeight") static int hintArrowHeight; - @ObfuscatedName("ck") + @ObfuscatedName("cx") @ObfuscatedGetter( - intValue = -317820992 + intValue = 154264000 ) @Export("hintArrowSubX") static int hintArrowSubX; - @ObfuscatedName("cc") + @ObfuscatedName("ca") @ObfuscatedGetter( - intValue = -1180209715 + intValue = -2027343753 ) @Export("hintArrowSubY") static int hintArrowSubY; - @ObfuscatedName("cd") + @ObfuscatedName("co") @ObfuscatedSignature( - signature = "Lct;" + signature = "Lcw;" ) @Export("playerAttackOption") static AttackOption playerAttackOption; @ObfuscatedName("dr") @ObfuscatedSignature( - signature = "Lct;" + signature = "Lcw;" ) @Export("npcAttackOption") static AttackOption npcAttackOption; - @ObfuscatedName("dw") + @ObfuscatedName("dv") @ObfuscatedGetter( - intValue = -452542481 + intValue = -2076451089 ) @Export("titleLoadingStage") static int titleLoadingStage; - @ObfuscatedName("dt") + @ObfuscatedName("dh") + @ObfuscatedSignature( + signature = "Lkg;" + ) + @Export("js5Socket") + static AbstractSocket js5Socket; + @ObfuscatedName("dm") @ObfuscatedGetter( - intValue = -371718323 + intValue = 80587017 ) @Export("js5ConnectState") static int js5ConnectState; @ObfuscatedName("dj") @ObfuscatedGetter( - intValue = -1459342861 + intValue = -1829390107 ) - static int field682; - @ObfuscatedName("dc") + static int field681; + @ObfuscatedName("db") @ObfuscatedSignature( - signature = "Liu;" + signature = "Lid;" ) - @Export("archive8") - static Archive archive8; - @ObfuscatedName("dd") - @ObfuscatedSignature( - signature = "Liu;" - ) - @Export("archive18") - static Archive archive18; - @ObfuscatedName("ej") + @Export("archive0") + static Archive archive0; + @ObfuscatedName("ex") @ObfuscatedGetter( - intValue = -3082483 + intValue = -353333359 ) @Export("js5Errors") static int js5Errors; - @ObfuscatedName("eu") + @ObfuscatedName("em") @ObfuscatedGetter( - intValue = -787005109 + intValue = 1287215825 ) @Export("loginState") static int loginState; - @ObfuscatedName("eo") - @ObfuscatedGetter( - intValue = -829514867 - ) - static int field687; - @ObfuscatedName("em") - @ObfuscatedGetter( - intValue = -1325230059 - ) - static int field688; @ObfuscatedName("en") @ObfuscatedGetter( - intValue = -2114710821 + intValue = -611023551 ) - static int field836; - @ObfuscatedName("ek") + static int field658; + @ObfuscatedName("ey") + @ObfuscatedGetter( + intValue = 1589887601 + ) + static int field659; + @ObfuscatedName("ei") + @ObfuscatedGetter( + intValue = -95830179 + ) + static int field660; + @ObfuscatedName("ee") @ObfuscatedSignature( signature = "Lfn;" ) - static class160 field690; - @ObfuscatedName("ep") + static class160 field870; + @ObfuscatedName("ek") @Export("Login_isUsernameRemembered") static boolean Login_isUsernameRemembered; - @ObfuscatedName("eq") + @ObfuscatedName("et") @ObfuscatedSignature( - signature = "Lco;" + signature = "Lcm;" ) @Export("secureRandomFuture") static SecureRandomFuture secureRandomFuture; - @ObfuscatedName("ee") + @ObfuscatedName("ez") @Export("randomDatData") static byte[] randomDatData; - @ObfuscatedName("ec") + @ObfuscatedName("ew") @ObfuscatedSignature( - signature = "[Lcf;" + signature = "[Lci;" ) @Export("npcs") static NPC[] npcs; - @ObfuscatedName("eb") + @ObfuscatedName("ev") @ObfuscatedGetter( - intValue = 1517220319 + intValue = 134647317 ) @Export("npcCount") static int npcCount; - @ObfuscatedName("fi") + @ObfuscatedName("fz") @Export("npcIndices") static int[] npcIndices; - @ObfuscatedName("fk") + @ObfuscatedName("fd") @ObfuscatedGetter( - intValue = -48606641 + intValue = 1857623211 ) - static int field697; - @ObfuscatedName("fg") - static int[] field859; - @ObfuscatedName("fr") + static int field861; + @ObfuscatedName("fi") + static int[] field669; + @ObfuscatedName("fc") @ObfuscatedSignature( - signature = "Lcg;" + signature = "Lcy;" ) @Export("packetWriter") public static final PacketWriter packetWriter; - @ObfuscatedName("ft") + @ObfuscatedName("fy") @ObfuscatedGetter( - intValue = 722667803 + intValue = 664871625 ) @Export("logoutTimer") static int logoutTimer; - @ObfuscatedName("fe") - static boolean field701; - @ObfuscatedName("fa") + @ObfuscatedName("fg") + static boolean field672; + @ObfuscatedName("ft") @Export("useBufferedSocket") static boolean useBufferedSocket; - @ObfuscatedName("fs") + @ObfuscatedName("fu") @ObfuscatedSignature( - signature = "Ljr;" + signature = "Ljd;" ) @Export("timer") static Timer timer; - @ObfuscatedName("fv") + @ObfuscatedName("fm") @Export("fontsMap") static HashMap fontsMap; - @ObfuscatedName("fc") + @ObfuscatedName("fr") @ObfuscatedGetter( - intValue = -1588873731 + intValue = -899956101 ) - static int field705; + static int field676; + @ObfuscatedName("fb") + @ObfuscatedGetter( + intValue = -736504201 + ) + static int field886; @ObfuscatedName("fw") @ObfuscatedGetter( - intValue = -793247523 + intValue = -1345680285 ) - static int field706; - @ObfuscatedName("fh") - @ObfuscatedGetter( - intValue = 1860321263 - ) - static int field707; - @ObfuscatedName("gc") - @ObfuscatedGetter( - intValue = -665684815 - ) - static int field896; - @ObfuscatedName("gx") - @ObfuscatedGetter( - intValue = -954194667 - ) - static int field709; + static int field678; @ObfuscatedName("gj") - @Export("isInInstance") - static boolean isInInstance; - @ObfuscatedName("gd") - @Export("instanceChunkTemplates") - static int[][][] instanceChunkTemplates; - @ObfuscatedName("gt") - static final int[] field713; - @ObfuscatedName("gk") @ObfuscatedGetter( - intValue = -540714619 + intValue = 2003337393 ) static int field718; - @ObfuscatedName("ha") + @ObfuscatedName("gv") @ObfuscatedGetter( - intValue = 1887719159 + intValue = 417524189 ) - static int field715; - @ObfuscatedName("hk") + static int field719; + @ObfuscatedName("gr") + @Export("isInInstance") + static boolean isInInstance; + @ObfuscatedName("gm") + @Export("instanceChunkTemplates") + static int[][][] instanceChunkTemplates; + @ObfuscatedName("gu") + static final int[] field665; + @ObfuscatedName("gf") @ObfuscatedGetter( - intValue = 1382994973 + intValue = -1005084219 ) - static int field716; - @ObfuscatedName("hu") + static int field879; + @ObfuscatedName("hc") @ObfuscatedGetter( - intValue = 1317142395 + intValue = 676975455 ) - static int field720; + static int field702; + @ObfuscatedName("hr") + @ObfuscatedGetter( + intValue = 1917879357 + ) + static int field687; + @ObfuscatedName("he") + @ObfuscatedGetter( + intValue = 1550854211 + ) + static int field688; @ObfuscatedName("hg") @ObfuscatedGetter( - intValue = -2094416073 + intValue = -1131531425 ) - static int field772; - @ObfuscatedName("he") - static boolean field719; - @ObfuscatedName("hv") + static int field689; + @ObfuscatedName("hi") + static boolean field725; + @ObfuscatedName("hd") @ObfuscatedGetter( - intValue = 1590040777 + intValue = -240458459 ) @Export("alternativeScrollbarWidth") static int alternativeScrollbarWidth; - @ObfuscatedName("hz") + @ObfuscatedName("hx") @ObfuscatedGetter( - intValue = -404113937 + intValue = 933386243 ) @Export("camAngleX") static int camAngleX; - @ObfuscatedName("ho") + @ObfuscatedName("hm") @ObfuscatedGetter( - intValue = -637746905 + intValue = -1970714441 ) @Export("camAngleY") static int camAngleY; - @ObfuscatedName("hs") + @ObfuscatedName("hq") @ObfuscatedGetter( - intValue = -719815433 + intValue = -1869718523 ) @Export("camAngleDY") static int camAngleDY; - @ObfuscatedName("hx") + @ObfuscatedName("ht") @ObfuscatedGetter( - intValue = 1112873513 + intValue = 1514258351 ) @Export("camAngleDX") static int camAngleDX; - @ObfuscatedName("hf") + @ObfuscatedName("ho") @ObfuscatedGetter( - intValue = 79946767 + intValue = -515756443 ) @Export("mouseCamClickedX") static int mouseCamClickedX; - @ObfuscatedName("hw") + @ObfuscatedName("hf") @ObfuscatedGetter( - intValue = 991416029 + intValue = 1600800987 ) @Export("mouseCamClickedY") static int mouseCamClickedY; - @ObfuscatedName("hi") + @ObfuscatedName("hu") @ObfuscatedGetter( - intValue = 107452813 + intValue = -123122863 ) @Export("oculusOrbState") static int oculusOrbState; - @ObfuscatedName("hn") + @ObfuscatedName("hh") @ObfuscatedGetter( - intValue = 1876317847 + intValue = 1491883569 ) @Export("camFollowHeight") static int camFollowHeight; @ObfuscatedName("hl") @ObfuscatedGetter( - intValue = 803728993 + intValue = 189377225 ) - static int field729; - @ObfuscatedName("hq") + static int field700; + @ObfuscatedName("hz") @ObfuscatedGetter( - intValue = -1013143657 + intValue = -407641659 ) - static int field928; - @ObfuscatedName("hp") + static int field701; + @ObfuscatedName("iw") @ObfuscatedGetter( - intValue = 1195552185 + intValue = 1308112361 ) - static int field731; - @ObfuscatedName("ir") + static int field680; + @ObfuscatedName("iy") @ObfuscatedGetter( - intValue = -199932621 - ) - static int field871; - @ObfuscatedName("ii") - @ObfuscatedGetter( - intValue = 424110155 + intValue = -259522237 ) @Export("oculusOrbNormalSpeed") static int oculusOrbNormalSpeed; - @ObfuscatedName("ih") + @ObfuscatedName("ic") @ObfuscatedGetter( - intValue = 1830393715 + intValue = -117213855 ) @Export("oculusOrbSlowedSpeed") static int oculusOrbSlowedSpeed; - @ObfuscatedName("if") + @ObfuscatedName("ia") @ObfuscatedGetter( - intValue = 1225894931 + intValue = 1865864529 ) - static int field855; - @ObfuscatedName("ig") - static boolean field736; - @ObfuscatedName("ik") + static int field705; + @ObfuscatedName("in") + static boolean field706; + @ObfuscatedName("iq") @ObfuscatedGetter( - intValue = -609136969 + intValue = 1190550561 ) - static int field822; - @ObfuscatedName("iw") - static boolean field878; - @ObfuscatedName("id") + static int field712; + @ObfuscatedName("ip") + static boolean field708; + @ObfuscatedName("il") @ObfuscatedGetter( - intValue = -1173416107 + intValue = -1101305947 ) - static int field739; - @ObfuscatedName("ib") + static int field635; + @ObfuscatedName("ie") @ObfuscatedGetter( - intValue = -1867488915 + intValue = -589346943 ) @Export("overheadTextCount") static int overheadTextCount; - @ObfuscatedName("ic") + @ObfuscatedName("if") @ObfuscatedGetter( - intValue = -115800179 + intValue = -1255115843 ) @Export("overheadTextLimit") static int overheadTextLimit; - @ObfuscatedName("im") + @ObfuscatedName("ig") @Export("overheadTextXs") static int[] overheadTextXs; - @ObfuscatedName("ip") + @ObfuscatedName("it") + @Export("selectedItemName") + static String selectedItemName; + @ObfuscatedName("im") @Export("overheadTextYs") static int[] overheadTextYs; - @ObfuscatedName("il") + @ObfuscatedName("is") @Export("overheadTextAscents") static int[] overheadTextAscents; - @ObfuscatedName("ia") + @ObfuscatedName("ir") @Export("overheadTextXOffsets") static int[] overheadTextXOffsets; - @ObfuscatedName("ie") + @ObfuscatedName("io") @Export("overheadTextColors") static int[] overheadTextColors; - @ObfuscatedName("in") + @ObfuscatedName("ik") @Export("overheadTextEffects") static int[] overheadTextEffects; - @ObfuscatedName("iv") + @ObfuscatedName("iu") @Export("overheadTextCyclesRemaining") static int[] overheadTextCyclesRemaining; - @ObfuscatedName("io") + @ObfuscatedName("ib") @Export("overheadText") static String[] overheadText; - @ObfuscatedName("iy") + @ObfuscatedName("ii") @Export("tileLastDrawnActor") static int[][] tileLastDrawnActor; - @ObfuscatedName("iq") + @ObfuscatedName("iv") @ObfuscatedGetter( - intValue = -448428969 + intValue = -573447391 ) @Export("viewportDrawCount") static int viewportDrawCount; @ObfuscatedName("ij") @ObfuscatedGetter( - intValue = -532739551 + intValue = 257969471 ) @Export("viewportTempX") static int viewportTempX; - @ObfuscatedName("it") - @Export("selectedItemName") - static String selectedItemName; - @ObfuscatedName("is") + @ObfuscatedName("ih") @ObfuscatedGetter( - intValue = 1355001797 + intValue = -983509355 ) @Export("viewportTempY") static int viewportTempY; - @ObfuscatedName("ju") + @ObfuscatedName("jp") @ObfuscatedGetter( - intValue = 410769587 + intValue = 2019424665 ) @Export("mouseCrossX") static int mouseCrossX; - @ObfuscatedName("jh") + @ObfuscatedName("jc") @ObfuscatedGetter( - intValue = -2093504551 + intValue = -1900152601 ) @Export("mouseCrossY") static int mouseCrossY; - @ObfuscatedName("je") + @ObfuscatedName("jf") @ObfuscatedGetter( - intValue = -189615988 + intValue = -579281601 ) @Export("mouseCrossState") static int mouseCrossState; - @ObfuscatedName("jl") + @ObfuscatedName("jz") @ObfuscatedGetter( - intValue = -183021951 + intValue = 1535156455 ) @Export("mouseCrossColor") static int mouseCrossColor; - @ObfuscatedName("jq") + @ObfuscatedName("jn") @Export("showMouseCross") static boolean showMouseCross; - @ObfuscatedName("jt") + @ObfuscatedName("jh") @ObfuscatedGetter( - intValue = 600396425 + intValue = 121716981 ) - static int field759; - @ObfuscatedName("jn") + static int field729; + @ObfuscatedName("jq") @ObfuscatedGetter( - intValue = 939295689 + intValue = -236430235 ) - static int field698; - @ObfuscatedName("jm") + static int field730; + @ObfuscatedName("ji") @ObfuscatedGetter( - intValue = -1095334823 + intValue = 2086457457 ) @Export("dragItemSlotSource") static int dragItemSlotSource; - @ObfuscatedName("jj") + @ObfuscatedName("jd") @ObfuscatedGetter( - intValue = 697955855 + intValue = 1027711881 ) - static int field654; + static int field732; @ObfuscatedName("jr") @ObfuscatedGetter( - intValue = 528486729 + intValue = 879520429 ) - static int field763; - @ObfuscatedName("jw") + static int field744; + @ObfuscatedName("ju") @ObfuscatedGetter( - intValue = -552088935 + intValue = 505726403 ) @Export("dragItemSlotDestination") static int dragItemSlotDestination; - @ObfuscatedName("jd") - static boolean field874; - @ObfuscatedName("ja") + @ObfuscatedName("je") + static boolean field867; + @ObfuscatedName("jk") @ObfuscatedGetter( - intValue = -1275196777 + intValue = 952757877 ) @Export("itemDragDuration") static int itemDragDuration; - @ObfuscatedName("jf") + @ObfuscatedName("jw") @ObfuscatedGetter( - intValue = 1610586469 + intValue = 1710791043 ) - static int field767; - @ObfuscatedName("jo") + static int field737; + @ObfuscatedName("jt") @Export("showLoadingMessages") static boolean showLoadingMessages; - @ObfuscatedName("jg") + @ObfuscatedName("jj") @ObfuscatedSignature( signature = "[Lbd;" ) @Export("players") static Player[] players; - @ObfuscatedName("jc") + @ObfuscatedName("jx") @ObfuscatedGetter( - intValue = -1642092337 + intValue = 108652351 ) @Export("localPlayerIndex") static int localPlayerIndex; - @ObfuscatedName("jv") + @ObfuscatedName("ja") @ObfuscatedGetter( - intValue = -1101635381 + intValue = -534802235 ) - static int field771; - @ObfuscatedName("js") - @ObfuscatedSignature( - signature = "Lbd;" - ) - @Export("localPlayer") - static Player localPlayer; - @ObfuscatedName("jx") + static int field741; + @ObfuscatedName("jv") @Export("renderSelf") static boolean renderSelf; - @ObfuscatedName("kk") + @ObfuscatedName("kq") @ObfuscatedGetter( - intValue = -36674671 + intValue = -1853655733 ) @Export("drawPlayerNames") static int drawPlayerNames; - @ObfuscatedName("kv") - @ObfuscatedGetter( - intValue = -469680529 - ) - static int field775; - @ObfuscatedName("kd") - static int[] field776; @ObfuscatedName("kz") + @ObfuscatedGetter( + intValue = 935391775 + ) + static int field899; + @ObfuscatedName("kr") + static int[] field655; + @ObfuscatedName("kb") @Export("playerMenuOpcodes") static final int[] playerMenuOpcodes; - @ObfuscatedName("ke") + @ObfuscatedName("kl") @Export("playerMenuActions") static String[] playerMenuActions; @ObfuscatedName("kn") @Export("playerOptionsPriorities") static boolean[] playerOptionsPriorities; - @ObfuscatedName("kh") + @ObfuscatedName("ke") @Export("defaultRotations") static int[] defaultRotations; - @ObfuscatedName("kq") + @ObfuscatedName("kx") @ObfuscatedGetter( - intValue = -1939972393 + intValue = -1785392333 ) @Export("combatTargetPlayerIndex") static int combatTargetPlayerIndex; - @ObfuscatedName("kx") + @ObfuscatedName("ky") @ObfuscatedSignature( - signature = "[[[Ljh;" + signature = "[[[Ljc;" ) @Export("groundItems") static NodeDeque[][][] groundItems; - @ObfuscatedName("kf") + @ObfuscatedName("kd") @ObfuscatedSignature( - signature = "Ljh;" + signature = "Ljc;" ) @Export("pendingSpawns") static NodeDeque pendingSpawns; - @ObfuscatedName("kw") + @ObfuscatedName("km") @ObfuscatedSignature( - signature = "Ljh;" + signature = "Ljc;" ) @Export("projectiles") static NodeDeque projectiles; - @ObfuscatedName("kr") + @ObfuscatedName("kw") @ObfuscatedSignature( - signature = "Ljh;" + signature = "Ljc;" ) @Export("graphicsObjects") static NodeDeque graphicsObjects; - @ObfuscatedName("ki") + @ObfuscatedName("ku") @Export("currentLevels") static int[] currentLevels; @ObfuscatedName("kg") @Export("levels") static int[] levels; - @ObfuscatedName("ky") + @ObfuscatedName("ko") @Export("experience") static int[] experience; - @ObfuscatedName("kb") + @ObfuscatedName("ki") @ObfuscatedGetter( - intValue = 1151779303 + intValue = 280970801 ) @Export("leftClickOpensMenu") static int leftClickOpensMenu; - @ObfuscatedName("kp") + @ObfuscatedName("kv") @Export("isMenuOpen") static boolean isMenuOpen; - @ObfuscatedName("ln") + @ObfuscatedName("lf") @ObfuscatedGetter( - intValue = 1305438411 + intValue = 670271749 ) @Export("menuOptionsCount") static int menuOptionsCount; - @ObfuscatedName("lq") + @ObfuscatedName("li") @Export("menuArguments1") static int[] menuArguments1; - @ObfuscatedName("le") + @ObfuscatedName("ln") @Export("menuArguments2") static int[] menuArguments2; - @ObfuscatedName("la") + @ObfuscatedName("lo") @Export("menuOpcodes") static int[] menuOpcodes; - @ObfuscatedName("lg") + @ObfuscatedName("lm") @Export("menuIdentifiers") static int[] menuIdentifiers; - @ObfuscatedName("lc") + @ObfuscatedName("lh") @Export("menuActions") static String[] menuActions; - @ObfuscatedName("ls") + @ObfuscatedName("lp") @Export("menuTargets") static String[] menuTargets; - @ObfuscatedName("lk") + @ObfuscatedName("lj") @Export("menuShiftClick") static boolean[] menuShiftClick; - @ObfuscatedName("lb") + @ObfuscatedName("lg") @Export("followerOpsLowPriority") static boolean followerOpsLowPriority; - @ObfuscatedName("ll") + @ObfuscatedName("lq") @Export("shiftClickDrop") static boolean shiftClickDrop; - @ObfuscatedName("lx") + @ObfuscatedName("ls") @Export("tapToDrop") static boolean tapToDrop; - @ObfuscatedName("ly") + @ObfuscatedName("ld") @Export("showMouseOverText") static boolean showMouseOverText; - @ObfuscatedName("lm") + @ObfuscatedName("lt") @ObfuscatedGetter( - intValue = 1100971195 + intValue = -519368399 ) @Export("viewportX") static int viewportX; - @ObfuscatedName("lz") + @ObfuscatedName("le") @ObfuscatedGetter( - intValue = 361474091 + intValue = 731762713 ) @Export("viewportY") static int viewportY; + @ObfuscatedName("la") + @ObfuscatedGetter( + intValue = -296280915 + ) + static int field774; @ObfuscatedName("lv") - @ObfuscatedSignature( - signature = "Lcn;" - ) - @Export("tempMenuAction") - static MenuAction tempMenuAction; - @ObfuscatedName("lo") @ObfuscatedGetter( - intValue = 1637922117 + intValue = 904105341 ) - static int field840; - @ObfuscatedName("lh") + static int field848; + @ObfuscatedName("lc") @ObfuscatedGetter( - intValue = -1769719033 - ) - static int field833; - @ObfuscatedName("lw") - @ObfuscatedGetter( - intValue = -1049024873 + intValue = 474967141 ) @Export("isItemSelected") static int isItemSelected; - @ObfuscatedName("lj") + @ObfuscatedName("ll") @Export("isSpellSelected") static boolean isSpellSelected; - @ObfuscatedName("li") + @ObfuscatedName("lu") @ObfuscatedGetter( - intValue = -822866207 + intValue = -636405785 ) - static int field848; - @ObfuscatedName("mu") + static int field816; + @ObfuscatedName("mj") @ObfuscatedGetter( - intValue = -897107203 + intValue = 1298304865 ) - static int field812; - @ObfuscatedName("mq") + static int field736; + @ObfuscatedName("mv") @Export("selectedSpellActionName") static String selectedSpellActionName; - @ObfuscatedName("ml") + @ObfuscatedName("mw") @Export("selectedSpellName") static String selectedSpellName; - @ObfuscatedName("mn") + @ObfuscatedName("mm") @ObfuscatedGetter( - intValue = 1510354633 + intValue = 452430417 ) @Export("rootInterface") static int rootInterface; - @ObfuscatedName("ma") - @ObfuscatedSignature( - signature = "Llc;" - ) - @Export("interfaceParents") - static NodeHashTable interfaceParents; static { - field912 = true; + field783 = true; worldId = 1; worldProperties = 0; gameBuild = 0; @@ -1296,9 +1287,9 @@ public final class Client extends GameShell implements Usernamed { isLoading = true; cycle = 0; mouseLastLastPressedTimeMillis = 1L; - field717 = -1; - field665 = -1; - field666 = -1L; + field838 = -1; + field637 = -1; + field889 = -1L; hadFocus = true; displayFps = false; rebootTimer = 0; @@ -1314,42 +1305,42 @@ public final class Client extends GameShell implements Usernamed { npcAttackOption = AttackOption.AttackOption_hidden; titleLoadingStage = 0; js5ConnectState = 0; - field682 = 0; + field681 = 0; js5Errors = 0; loginState = 0; - field687 = 0; - field688 = 0; - field836 = 0; - field690 = class160.field2001; + field658 = 0; + field659 = 0; + field660 = 0; + field870 = class160.field1984; Login_isUsernameRemembered = false; secureRandomFuture = new SecureRandomFuture(); randomDatData = null; npcs = new NPC[32768]; npcCount = 0; npcIndices = new int[32768]; - field697 = 0; - field859 = new int[250]; + field861 = 0; + field669 = new int[250]; packetWriter = new PacketWriter(); logoutTimer = 0; - field701 = false; + field672 = false; useBufferedSocket = true; timer = new Timer(); fontsMap = new HashMap(); - field705 = 0; - field706 = 1; - field707 = 0; - field896 = 1; - field709 = 0; + field676 = 0; + field886 = 1; + field678 = 0; + field718 = 1; + field719 = 0; collisionMaps = new CollisionMap[4]; isInInstance = false; instanceChunkTemplates = new int[4][13][13]; - field713 = 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}; - field718 = 0; - field715 = 0x23201b; - field716 = 0x4d4233; - field720 = 0x332d25; - field772 = 0x766654; - field719 = false; + field665 = 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}; + field879 = 0; + field702 = 2301979; + field687 = 5063219; + field688 = 3353893; + field689 = 7759444; + field725 = false; alternativeScrollbarWidth = 0; camAngleX = 128; camAngleY = 0; @@ -1359,16 +1350,16 @@ public final class Client extends GameShell implements Usernamed { mouseCamClickedY = 0; oculusOrbState = 0; camFollowHeight = 50; - field928 = 0; - field731 = 0; - field871 = 0; + field700 = 0; + field701 = 0; + field680 = 0; oculusOrbNormalSpeed = 12; oculusOrbSlowedSpeed = 6; - field855 = 0; - field736 = false; - field822 = 0; - field878 = false; - field739 = 0; + field705 = 0; + field706 = false; + field712 = 0; + field708 = false; + field635 = 0; overheadTextCount = 0; overheadTextLimit = 50; overheadTextXs = new int[overheadTextLimit]; @@ -1388,23 +1379,23 @@ public final class Client extends GameShell implements Usernamed { mouseCrossState = 0; mouseCrossColor = 0; showMouseCross = true; - field759 = 0; - field698 = 0; + field729 = 0; + field730 = 0; dragItemSlotSource = 0; - field654 = 0; - field763 = 0; + field732 = 0; + field744 = 0; dragItemSlotDestination = 0; - field874 = false; + field867 = false; itemDragDuration = 0; - field767 = 0; + field737 = 0; showLoadingMessages = true; players = new Player[2048]; localPlayerIndex = -1; - field771 = 0; + field741 = 0; renderSelf = true; drawPlayerNames = 0; - field775 = 0; - field776 = new int[1000]; + field899 = 0; + field655 = new int[1000]; playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; playerMenuActions = new String[8]; playerOptionsPriorities = new boolean[8]; @@ -1433,21 +1424,21 @@ public final class Client extends GameShell implements Usernamed { showMouseOverText = true; viewportX = -1; viewportY = -1; - field840 = 0; - field833 = 50; + field774 = 0; + field848 = 50; isItemSelected = 0; selectedItemName = null; isSpellSelected = false; - field848 = -1; - field812 = -1; + field816 = -1; + field736 = -1; selectedSpellActionName = null; selectedSpellName = null; rootInterface = -1; interfaceParents = new NodeHashTable(8); - field817 = 0; - field818 = -1; + field638 = 0; + field786 = -1; chatEffects = 0; - field809 = 0; + field788 = 0; meslayerContinueWidget = null; runEnergy = 0; weight = 0; @@ -1460,54 +1451,54 @@ public final class Client extends GameShell implements Usernamed { widgetClickX = 0; widgetClickY = 0; draggedOnWidget = null; - field873 = false; - field834 = -1; - field835 = -1; - field745 = false; - field837 = -1; - field838 = -1; + field641 = false; + field802 = -1; + field803 = -1; + field804 = false; + field805 = -1; + field806 = -1; isDraggingWidget = false; cycleCntr = 1; - field863 = new int[32]; - field806 = 0; - field888 = new int[32]; - field671 = 0; + field809 = new int[32]; + field800 = 0; + field811 = new int[32]; + field812 = 0; changedSkills = new int[32]; changedSkillsCount = 0; chatCycle = 0; - field672 = 0; - field849 = 0; - field915 = 0; - field851 = 0; - field844 = 0; + field629 = 0; + field817 = 0; + field818 = 0; + field819 = 0; + field820 = 0; mouseWheelRotation = 0; scriptEvents = new NodeDeque(); - field852 = new NodeDeque(); - field856 = new NodeDeque(); + field633 = new NodeDeque(); + field824 = new NodeDeque(); widgetClickMasks = new NodeHashTable(512); rootWidgetCount = 0; - field741 = -2; - field843 = new boolean[100]; - field861 = new boolean[100]; - field862 = new boolean[100]; + field752 = -2; + field703 = new boolean[100]; + field829 = new boolean[100]; + field830 = new boolean[100]; rootWidgetXs = new int[100]; rootWidgetYs = new int[100]; rootWidgetWidths = new int[100]; rootWidgetHeights = new int[100]; gameDrawingMode = 0; - field868 = 0L; + field836 = 0L; isResizable = true; - field870 = new int[]{0xffff00, 0xff0000, 0x00ff00, 0x00ffff, 0xff00ff, 0xffffff}; + field643 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; publicChatMode = 0; tradeChatMode = 0; - field762 = ""; - field922 = new long[100]; - field875 = 0; - field754 = 0; - field877 = new int[128]; - field921 = new int[128]; - field879 = -1L; - field747 = -1; + field668 = ""; + field842 = new long[100]; + field843 = 0; + field677 = 0; + field845 = new int[128]; + field815 = new int[128]; + field847 = -1L; + field651 = -1; mapIconCount = 0; mapIconXs = new int[1000]; mapIconYs = new int[1000]; @@ -1515,11 +1506,11 @@ public final class Client extends GameShell implements Usernamed { destinationX = 0; destinationY = 0; minimapState = 0; - field911 = 255; - field889 = -1; - field699 = false; + field856 = 255; + field857 = -1; + field858 = false; soundEffectVolume = 127; - field892 = 127; + field860 = 127; soundEffectCount = 0; soundEffectIds = new int[50]; queuedSoundEffectLoops = new int[50]; @@ -1527,47 +1518,47 @@ public final class Client extends GameShell implements Usernamed { soundLocations = new int[50]; soundEffects = new SoundEffect[50]; isCameraLocked = false; - field886 = new boolean[5]; - field901 = new int[5]; - field902 = new int[5]; - field903 = new int[5]; - field904 = new int[5]; - field782 = 256; - field651 = 205; + field897 = new boolean[5]; + field869 = new int[5]; + field694 = new int[5]; + field758 = new int[5]; + field872 = new int[5]; + field873 = 256; + field822 = 205; zoomHeight = 256; zoomWidth = 320; - field820 = 1; - field790 = 0x7fff; - field732 = 1; - field659 = 0x7fff; + field795 = 1; + field661 = 32767; + field652 = 1; + field791 = 32767; viewportOffsetX = 0; viewportOffsetY = 0; viewportWidth = 0; viewportHeight = 0; viewportZoom = 0; playerAppearance = new PlayerAppearance(); - field919 = -1; - field920 = -1; + field733 = -1; + field888 = -1; platformInfoProvider = new DesktopPlatformInfoProvider(); grandExchangeOffers = new GrandExchangeOffer[8]; GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); - field924 = -1; + field892 = -1; archiveLoaders = new ArrayList(10); archiveLoaderArchive = 0; - field927 = 0; - field735 = new class65(); - field929 = new int[50]; - field930 = new int[50]; + field895 = 0; + field684 = new class65(); + field697 = new int[50]; + field898 = new int[50]; } - @ObfuscatedName("x") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "869486116" + garbageValue = "-1917236425" ) @Export("resizeGame") protected final void resizeGame() { - field868 = DirectByteArrayCopier.currentTimeMs() + 500L; + field836 = SequenceDefinition.method4686() + 500L; this.resizeJS(); if (rootInterface != -1) { this.resizeRoot(true); @@ -1575,174 +1566,600 @@ public final class Client extends GameShell implements Usernamed { } - @ObfuscatedName("aw") + @ObfuscatedName("az") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "2070235141" + garbageValue = "-1264140224" ) @Export("setUp") protected final void setUp() { int[] var1 = new int[]{20, 260, 10000}; int[] var2 = new int[]{1000, 100, 500}; if (var1 != null && var2 != null) { - ByteArrayPool.ByteArrayPool_alternativeSizes = var1; - class43.ByteArrayPool_altSizeArrayCounts = new int[var1.length]; - class189.ByteArrayPool_arrays = new byte[var1.length][][]; + UserComparator4.ByteArrayPool_alternativeSizes = var1; + ByteArrayPool.ByteArrayPool_altSizeArrayCounts = new int[var1.length]; + FaceNormal.ByteArrayPool_arrays = new byte[var1.length][][]; - for (int var3 = 0; var3 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var3) { - class189.ByteArrayPool_arrays[var3] = new byte[var2[var3]][]; + for (int var3 = 0; var3 < UserComparator4.ByteArrayPool_alternativeSizes.length; ++var3) { + FaceNormal.ByteArrayPool_arrays[var3] = new byte[var2[var3]][]; } } else { - ByteArrayPool.ByteArrayPool_alternativeSizes = null; - class43.ByteArrayPool_altSizeArrayCounts = null; - class189.ByteArrayPool_arrays = null; + UserComparator4.ByteArrayPool_alternativeSizes = null; + ByteArrayPool.ByteArrayPool_altSizeArrayCounts = null; + FaceNormal.ByteArrayPool_arrays = null; } - Language.port1 = gameBuild == 0 ? 43594 : worldId + 40000; - Skeleton.port2 = gameBuild == 0 ? 443 : worldId + 50000; - Varcs.port3 = Language.port1; - ModelData0.field1870 = class215.field2540; - class247.field3291 = class215.field2541; - WorldMapCacheName.field309 = class215.field2542; - Message.field604 = class215.field2546; - SequenceDefinition.urlRequester = new UrlRequester(); + WorldMapRectangle.port1 = gameBuild == 0 ? 43594 : worldId + 40000; + FloorDecoration.port2 = gameBuild == 0 ? 443 : worldId + 50000; + SecureRandomCallable.port3 = WorldMapRectangle.port1; + KeyHandler.field387 = class215.field2529; + FontName.field3651 = class215.field2531; + PlayerAppearance.field2523 = class215.field2528; + SoundCache.field1418 = class215.field2527; + ScriptEvent.urlRequester = new UrlRequester(); this.setUpKeyboard(); this.setUpMouse(); - WorldMapManager.mouseWheel = this.mouseWheel(); - ScriptEvent.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); - WorldMapLabelSize.clientPreferences = ModelData0.loadClientPreferences(); + Canvas.mouseWheel = this.mouseWheel(); + class293.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); + AccessFile var4 = null; + ClientPreferences var5 = new ClientPreferences(); + + try { + var4 = TaskHandler.getPreferencesFile("", WorldMapRectangle.field166.name, false); + byte[] var6 = new byte[(int)var4.length()]; + + int var8; + for (int var7 = 0; var7 < var6.length; var7 += var8) { + var8 = var4.read(var6, var7, var6.length - var7); + if (var8 == -1) { + throw new IOException(); + } + } + + var5 = new ClientPreferences(new Buffer(var6)); + } catch (Exception var11) { + } + + try { + if (var4 != null) { + var4.close(); + } + } catch (Exception var10) { + } + + GrandExchangeOffer.clientPreferences = var5; this.setUpClipboard(); - class218.method4110(this, class60.null_string); + Player.method1223(this, class4.null_string); if (gameBuild != 0) { displayFps = true; } - Clock.setWindowedMode(WorldMapLabelSize.clientPreferences.windowMode); - ArchiveLoader.friendSystem = new FriendSystem(class40.loginType); + StudioGame.setWindowedMode(GrandExchangeOffer.clientPreferences.windowMode); + class32.friendSystem = new FriendSystem(FontName.loginType); } - @ObfuscatedName("ad") + @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-3" + signature = "(I)V", + garbageValue = "712398470" ) @Export("doCycle") protected final void doCycle() { ++cycle; this.doCycleJs5(); + class32.method543(); - while (true) { - ArchiveDiskAction var1; - synchronized (ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - var1 = (ArchiveDiskAction) ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); - } - - if (var1 == null) { - break; - } - - var1.archive.load(var1.archiveDisk, (int) var1.key, var1.data, false); - } - - int var6; + int var1; try { - if (class197.field2402 == 1) { - var6 = Interpreter.midiPcmStream.method3707(); - if (var6 > 0 && Interpreter.midiPcmStream.isReady()) { - var6 -= class197.field2404; - if (var6 < 0) { - var6 = 0; + if (class197.field2378 == 1) { + var1 = class197.midiPcmStream.method3648(); + if (var1 > 0 && class197.midiPcmStream.isReady()) { + var1 -= class16.field98; + if (var1 < 0) { + var1 = 0; } - Interpreter.midiPcmStream.method3706(var6); + class197.midiPcmStream.method3670(var1); } else { - Interpreter.midiPcmStream.clear(); - Interpreter.midiPcmStream.removeAll(); - if (GrandExchangeOfferNameComparator.musicTrackArchive != null) { - class197.field2402 = 2; + class197.midiPcmStream.clear(); + class197.midiPcmStream.removeAll(); + if (WorldMapDecoration.musicTrackArchive != null) { + class197.field2378 = 2; } else { - class197.field2402 = 0; + class197.field2378 = 0; } - UserComparator10.musicTrack = null; - WorldMapLabelSize.soundCache = null; + FontName.musicTrack = null; + class189.soundCache = null; } } - } catch (Exception var11) { - var11.printStackTrace(); - Interpreter.midiPcmStream.clear(); - class197.field2402 = 0; - UserComparator10.musicTrack = null; - WorldMapLabelSize.soundCache = null; - GrandExchangeOfferNameComparator.musicTrackArchive = null; + } catch (Exception var44) { + var44.printStackTrace(); + class197.midiPcmStream.clear(); + class197.field2378 = 0; + FontName.musicTrack = null; + class189.soundCache = null; + WorldMapDecoration.musicTrackArchive = null; } - class186.playPcmPlayers(); + WorldMapSectionType.playPcmPlayers(); + int var2; synchronized(KeyHandler.KeyHandler_instance) { ++KeyHandler.KeyHandler_idleCycles; - KeyHandler.field396 = KeyHandler.field385; - KeyHandler.field386 = 0; - int var7; - if (KeyHandler.field398 >= 0) { - while (KeyHandler.field388 != KeyHandler.field398) { - var7 = KeyHandler.field391[KeyHandler.field388]; - KeyHandler.field388 = KeyHandler.field388 + 1 & 127; - if (var7 < 0) { - KeyHandler.KeyHandler_pressedKeys[~var7] = false; + KeyHandler.field385 = KeyHandler.field383; + KeyHandler.field380 = 0; + if (KeyHandler.field378 >= 0) { + while (KeyHandler.field378 != KeyHandler.field375) { + var2 = KeyHandler.field374[KeyHandler.field375]; + KeyHandler.field375 = KeyHandler.field375 + 1 & 127; + if (var2 < 0) { + KeyHandler.KeyHandler_pressedKeys[~var2] = false; } else { - if (!KeyHandler.KeyHandler_pressedKeys[var7] && KeyHandler.field386 < KeyHandler.field401.length - 1) { - KeyHandler.field401[++KeyHandler.field386 - 1] = var7; + if (!KeyHandler.KeyHandler_pressedKeys[var2] && KeyHandler.field380 < KeyHandler.field379.length - 1) { + KeyHandler.field379[++KeyHandler.field380 - 1] = var2; } - KeyHandler.KeyHandler_pressedKeys[var7] = true; + KeyHandler.KeyHandler_pressedKeys[var2] = true; } } } else { - for (var7 = 0; var7 < 112; ++var7) { - KeyHandler.KeyHandler_pressedKeys[var7] = false; + for (var2 = 0; var2 < 112; ++var2) { + KeyHandler.KeyHandler_pressedKeys[var2] = false; } - KeyHandler.field398 = KeyHandler.field388; + KeyHandler.field378 = KeyHandler.field375; } - if (KeyHandler.field386 > 0) { + if (KeyHandler.field380 > 0) { KeyHandler.KeyHandler_idleCycles = 0; } - KeyHandler.field385 = KeyHandler.field404; + KeyHandler.field383 = KeyHandler.field382; } - 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 (WorldMapManager.mouseWheel != null) { - var6 = WorldMapManager.mouseWheel.useRotation(); - mouseWheelRotation = var6; + class192.method3617(); + if (Canvas.mouseWheel != null) { + var1 = Canvas.mouseWheel.useRotation(); + mouseWheelRotation = var1; } if (gameState == 0) { - Timer.load(); - WallDecoration.method3291(); + ItemContainer.load(); + GameShell.clock.mark(); + + for (var1 = 0; var1 < 32; ++var1) { + GameShell.field423[var1] = 0L; + } + + for (var1 = 0; var1 < 32; ++var1) { + GameShell.field417[var1] = 0L; + } + + GameShell.field413 = 0; } else if (gameState == 5) { - VarbitDefinition.method4484(this); - Timer.load(); - WallDecoration.method3291(); - } else if (gameState == 10 || gameState == 11) { - VarbitDefinition.method4484(this); - } else if (gameState == 20) { - VarbitDefinition.method4484(this); - this.doCycleLoggedOut(); - } else if (gameState == 25) { - PacketBufferNode.method3628(); + WorldMapDecoration.method326(this); + ItemContainer.load(); + GameShell.clock.mark(); + + for (var1 = 0; var1 < 32; ++var1) { + GameShell.field423[var1] = 0L; + } + + for (var1 = 0; var1 < 32; ++var1) { + GameShell.field417[var1] = 0L; + } + + GameShell.field413 = 0; + } else if (gameState != 10 && gameState != 11) { + if (gameState == 20) { + WorldMapDecoration.method326(this); + this.doCycleLoggedOut(); + } else if (gameState == 25) { + KeyHandler.method787(false); + field676 = 0; + boolean var46 = true; + + for (var2 = 0; var2 < GraphicsObject.regionLandArchives.length; ++var2) { + if (MouseHandler.regionMapArchiveIds[var2] != -1 && GraphicsObject.regionLandArchives[var2] == null) { + GraphicsObject.regionLandArchives[var2] = WorldMapDecoration.archive5.takeFile(MouseHandler.regionMapArchiveIds[var2], 0); + if (GraphicsObject.regionLandArchives[var2] == null) { + var46 = false; + ++field676; + } + } + + if (ClanChat.regionLandArchiveIds[var2] != -1 && Messages.regionMapArchives[var2] == null) { + Messages.regionMapArchives[var2] = WorldMapDecoration.archive5.takeFileEncrypted(ClanChat.regionLandArchiveIds[var2], 0, ModelData0.xteaKeys[var2]); + if (Messages.regionMapArchives[var2] == null) { + var46 = false; + ++field676; + } + } + } + + if (!var46) { + field719 = 1; + } else { + field678 = 0; + var46 = true; + + int var4; + int var5; + for (var2 = 0; var2 < GraphicsObject.regionLandArchives.length; ++var2) { + byte[] var3 = Messages.regionMapArchives[var2]; + if (var3 != null) { + var4 = (class186.regions[var2] >> 8) * 64 - PacketWriter.baseX * 64; + var5 = (class186.regions[var2] & 255) * 64 - RouteStrategy.baseY * 64; + if (isInInstance) { + var4 = 10; + var5 = 10; + } + + var46 &= WorldMapSection2.method325(var3, var4, var5); + } + } + + if (!var46) { + field719 = 2; + } else { + if (field719 != 0) { + MusicPatch.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); + } + + WorldMapSectionType.playPcmPlayers(); + Player.scene.clear(); + + for (var2 = 0; var2 < 4; ++var2) { + collisionMaps[var2].clear(); + } + + int var37; + for (var2 = 0; var2 < 4; ++var2) { + for (var37 = 0; var37 < 104; ++var37) { + for (var4 = 0; var4 < 104; ++var4) { + Tiles.Tiles_renderFlags[var2][var37][var4] = 0; + } + } + } + + WorldMapSectionType.playPcmPlayers(); + Tiles.Tiles_minPlane = 99; + Tiles.field485 = new byte[4][104][104]; + AccessFile.field4061 = new byte[4][104][104]; + class210.field2492 = new byte[4][104][104]; + Tiles.field475 = new byte[4][104][104]; + Tiles.field483 = new int[4][105][105]; + class188.field2321 = new byte[4][105][105]; + class4.field31 = new int[105][105]; + Tiles.Tiles_hue = new int[104]; + class3.Tiles_saturation = new int[104]; + Buddy.Tiles_lightness = new int[104]; + class49.Tiles_hueMultiplier = new int[104]; + MenuAction.field1129 = new int[104]; + var2 = GraphicsObject.regionLandArchives.length; + + for (ObjectSound var45 = (ObjectSound)ObjectSound.objectSounds.last(); var45 != null; var45 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var45.stream1 != null) { + IgnoreList.pcmStreamMixer.removeSubStream(var45.stream1); + var45.stream1 = null; + } + + if (var45.stream2 != null) { + IgnoreList.pcmStreamMixer.removeSubStream(var45.stream2); + var45.stream2 = null; + } + } + + ObjectSound.objectSounds.clear(); + KeyHandler.method787(true); + int var7; + int var8; + int var10; + int var11; + int var12; + int var13; + int var40; + if (!isInInstance) { + var37 = 0; + + label587: + while (true) { + byte[] var6; + if (var37 >= var2) { + for (var37 = 0; var37 < var2; ++var37) { + var4 = (class186.regions[var37] >> 8) * 64 - PacketWriter.baseX * 64; + var5 = (class186.regions[var37] & 255) * 64 - RouteStrategy.baseY * 64; + var6 = GraphicsObject.regionLandArchives[var37]; + if (var6 == null && class16.field101 < 800) { + WorldMapSectionType.playPcmPlayers(); + class195.method3627(var4, var5, 64, 64); + } + } + + KeyHandler.method787(true); + var37 = 0; + + while (true) { + if (var37 >= var2) { + break label587; + } + + byte[] var39 = Messages.regionMapArchives[var37]; + if (var39 != null) { + var5 = (class186.regions[var37] >> 8) * 64 - PacketWriter.baseX * 64; + var40 = (class186.regions[var37] & 255) * 64 - RouteStrategy.baseY * 64; + WorldMapSectionType.playPcmPlayers(); + WorldMapIcon_0.method203(var39, var5, var40, Player.scene, collisionMaps); + } + + ++var37; + } + } + + var4 = (class186.regions[var37] >> 8) * 64 - PacketWriter.baseX * 64; + var5 = (class186.regions[var37] & 255) * 64 - RouteStrategy.baseY * 64; + var6 = GraphicsObject.regionLandArchives[var37]; + if (var6 != null) { + WorldMapSectionType.playPcmPlayers(); + var7 = class13.field86 * 8 - 48; + var8 = class16.field101 * 8 - 48; + CollisionMap[] var9 = collisionMaps; + var10 = 0; + + label584: + while (true) { + if (var10 >= 4) { + Buffer var38 = new Buffer(var6); + var11 = 0; + + while (true) { + if (var11 >= 4) { + break label584; + } + + for (var12 = 0; var12 < 64; ++var12) { + for (var13 = 0; var13 < 64; ++var13) { + class30.loadTerrain(var38, var11, var4 + var12, var5 + var13, var7, var8, 0); + } + } + + ++var11; + } + } + + for (var11 = 0; var11 < 64; ++var11) { + for (var12 = 0; var12 < 64; ++var12) { + if (var4 + var11 > 0 && var4 + var11 < 103 && var5 + var12 > 0 && var12 + var5 < 103) { + int[] var10000 = var9[var10].flags[var4 + var11]; + var10000[var12 + var5] &= -16777217; + } + } + } + + ++var10; + } + } + + ++var37; + } + } + + int var41; + if (isInInstance) { + var37 = 0; + + label533: + while (true) { + if (var37 >= 4) { + for (var37 = 0; var37 < 13; ++var37) { + for (var4 = 0; var4 < 13; ++var4) { + var5 = instanceChunkTemplates[0][var37][var4]; + if (var5 == -1) { + class195.method3627(var37 * 8, var4 * 8, 8, 8); + } + } + } + + KeyHandler.method787(true); + var37 = 0; + + while (true) { + if (var37 >= 4) { + break label533; + } + + WorldMapSectionType.playPcmPlayers(); + + for (var4 = 0; var4 < 13; ++var4) { + label490: + for (var5 = 0; var5 < 13; ++var5) { + var40 = instanceChunkTemplates[var37][var4][var5]; + if (var40 != -1) { + var7 = var40 >> 24 & 3; + var8 = var40 >> 1 & 3; + var41 = var40 >> 14 & 1023; + var10 = var40 >> 3 & 2047; + var11 = (var41 / 8 << 8) + var10 / 8; + + for (var12 = 0; var12 < class186.regions.length; ++var12) { + if (class186.regions[var12] == var11 && Messages.regionMapArchives[var12] != null) { + byte[] var42 = Messages.regionMapArchives[var12]; + int var14 = var4 * 8; + int var15 = var5 * 8; + int var16 = (var41 & 7) * 8; + int var17 = (var10 & 7) * 8; + Scene var18 = Player.scene; + CollisionMap[] var19 = collisionMaps; + Buffer var20 = new Buffer(var42); + int var21 = -1; + + while (true) { + int var22 = var20.method5565(); + if (var22 == 0) { + continue label490; + } + + 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 (var27 == var7 && var26 >= var16 && var26 < var16 + 8 && var25 >= var17 && var25 < var17 + 8) { + ObjectDefinition var31 = class215.getObjectDefinition(var21); + int var32 = var14 + UserComparator5.method3366(var26 & 7, var25 & 7, var8, var31.sizeX, var31.sizeY, var30); + int var33 = var15 + PlayerAppearance.method3944(var26 & 7, var25 & 7, var8, var31.sizeX, var31.sizeY, var30); + if (var32 > 0 && var33 > 0 && var32 < 103 && var33 < 103) { + int var34 = var37; + if ((Tiles.Tiles_renderFlags[1][var32][var33] & 2) == 2) { + var34 = var37 - 1; + } + + CollisionMap var35 = null; + if (var34 >= 0) { + var35 = var19[var34]; + } + + class32.method544(var37, var32, var33, var21, var8 + var30 & 3, var29, var18, var35); + } + } + } + } + } + } + } + } + } + + ++var37; + } + } + + WorldMapSectionType.playPcmPlayers(); + + for (var4 = 0; var4 < 13; ++var4) { + for (var5 = 0; var5 < 13; ++var5) { + boolean var48 = false; + var7 = instanceChunkTemplates[var37][var4][var5]; + if (var7 != -1) { + var8 = var7 >> 24 & 3; + var41 = var7 >> 1 & 3; + var10 = var7 >> 14 & 1023; + var11 = var7 >> 3 & 2047; + var12 = (var10 / 8 << 8) + var11 / 8; + + for (var13 = 0; var13 < class186.regions.length; ++var13) { + if (class186.regions[var13] == var12 && GraphicsObject.regionLandArchives[var13] != null) { + class269.method4894(GraphicsObject.regionLandArchives[var13], var37, var4 * 8, var5 * 8, var8, (var10 & 7) * 8, (var11 & 7) * 8, var41, collisionMaps); + var48 = true; + break; + } + } + } + + if (!var48) { + class312.method5787(var37, var4 * 8, var5 * 8); + } + } + } + + ++var37; + } + } + + KeyHandler.method787(true); + WorldMapSectionType.playPcmPlayers(); + GrandExchangeOfferTotalQuantityComparator.method98(Player.scene, collisionMaps); + KeyHandler.method787(true); + var37 = Tiles.Tiles_minPlane; + if (var37 > ItemContainer.plane) { + var37 = ItemContainer.plane; + } + + if (var37 < ItemContainer.plane - 1) { + var37 = ItemContainer.plane - 1; + } + + if (isLowDetail) { + Player.scene.init(Tiles.Tiles_minPlane); + } else { + Player.scene.init(0); + } + + for (var4 = 0; var4 < 104; ++var4) { + for (var5 = 0; var5 < 104; ++var5) { + class189.updateItemPile(var4, var5); + } + } + + WorldMapSectionType.playPcmPlayers(); + ChatChannel.method2161(); + ObjectDefinition.ObjectDefinition_cachedModelData.clear(); + PacketBufferNode var47; + if (WorldMapID.client.hasFrame()) { + var47 = MenuAction.getPacketBufferNode(ClientPacket.field2189, packetWriter.isaacCipher); + var47.packetBuffer.writeInt(1057001181); + packetWriter.addNode(var47); + } + + if (!isInInstance) { + var4 = (class13.field86 - 6) / 8; + var5 = (class13.field86 + 6) / 8; + var40 = (class16.field101 - 6) / 8; + var7 = (class16.field101 + 6) / 8; + + for (var8 = var4 - 1; var8 <= var5 + 1; ++var8) { + for (var41 = var40 - 1; var41 <= var7 + 1; ++var41) { + if (var8 < var4 || var8 > var5 || var41 < var40 || var41 > var7) { + WorldMapDecoration.archive5.loadRegionFromName("m" + var8 + "_" + var41); + WorldMapDecoration.archive5.loadRegionFromName("l" + var8 + "_" + var41); + } + } + } + } + + FloorDecoration.updateGameState(30); + WorldMapSectionType.playPcmPlayers(); + Tiles.field485 = null; + AccessFile.field4061 = null; + class210.field2492 = null; + Tiles.field475 = null; + Tiles.field483 = null; + class188.field2321 = null; + class4.field31 = null; + Tiles.Tiles_hue = null; + class3.Tiles_saturation = null; + Buddy.Tiles_lightness = null; + class49.Tiles_hueMultiplier = null; + MenuAction.field1129 = null; + var47 = MenuAction.getPacketBufferNode(ClientPacket.field2261, packetWriter.isaacCipher); + packetWriter.addNode(var47); + GameShell.clock.mark(); + + for (var5 = 0; var5 < 32; ++var5) { + GameShell.field423[var5] = 0L; + } + + for (var5 = 0; var5 < 32; ++var5) { + GameShell.field417[var5] = 0L; + } + + GameShell.field413 = 0; + } + } + } + } else { + WorldMapDecoration.method326(this); } if (gameState == 30) { @@ -1750,291 +2167,424 @@ public final class Client extends GameShell implements Usernamed { } else if (gameState == 40 || gameState == 45) { this.doCycleLoggedOut(); } + } - @ObfuscatedName("ag") + @ObfuscatedName("an") @ObfuscatedSignature( - signature = "(ZB)V", - garbageValue = "-5" + signature = "(ZI)V", + garbageValue = "2115085971" ) @Export("draw") protected final void draw(boolean var1) { boolean var2; - label168: { + label173: { try { - if (class197.field2402 == 2) { - if (UserComparator10.musicTrack == null) { - UserComparator10.musicTrack = MusicTrack.readTrack(GrandExchangeOfferNameComparator.musicTrackArchive, class197.musicTrackGroupId, class197.musicTrackFileId); - if (UserComparator10.musicTrack == null) { + if (class197.field2378 == 2) { + if (FontName.musicTrack == null) { + FontName.musicTrack = MusicTrack.readTrack(WorldMapDecoration.musicTrackArchive, class197.musicTrackGroupId, class197.musicTrackFileId); + if (FontName.musicTrack == null) { var2 = false; - break label168; + break label173; } } - if (WorldMapLabelSize.soundCache == null) { - WorldMapLabelSize.soundCache = new SoundCache(class197.soundEffectsArchive, class197.musicSamplesArchive); + if (class189.soundCache == null) { + class189.soundCache = new SoundCache(class197.soundEffectsArchive, class197.musicSamplesArchive); } - if (Interpreter.midiPcmStream.loadMusicTrack(UserComparator10.musicTrack, class197.musicPatchesArchive, WorldMapLabelSize.soundCache, 22050)) { - Interpreter.midiPcmStream.clearAll(); - Interpreter.midiPcmStream.method3706(ScriptFrame.field529); - Interpreter.midiPcmStream.setMusicTrack(UserComparator10.musicTrack, BuddyRankComparator.musicTrackBoolean); - class197.field2402 = 0; - UserComparator10.musicTrack = null; - WorldMapLabelSize.soundCache = null; - GrandExchangeOfferNameComparator.musicTrackArchive = null; + if (class197.midiPcmStream.loadMusicTrack(FontName.musicTrack, class197.musicPatchesArchive, class189.soundCache, 22050)) { + class197.midiPcmStream.clearAll(); + class197.midiPcmStream.method3670(WorldMapSprite.field222); + class197.midiPcmStream.setMusicTrack(FontName.musicTrack, Varcs.musicTrackBoolean); + class197.field2378 = 0; + FontName.musicTrack = null; + class189.soundCache = null; + WorldMapDecoration.musicTrackArchive = null; var2 = true; - break label168; + break label173; } } } catch (Exception var6) { var6.printStackTrace(); - Interpreter.midiPcmStream.clear(); - class197.field2402 = 0; - UserComparator10.musicTrack = null; - WorldMapLabelSize.soundCache = null; - GrandExchangeOfferNameComparator.musicTrackArchive = null; + class197.midiPcmStream.clear(); + class197.field2378 = 0; + FontName.musicTrack = null; + class189.soundCache = null; + WorldMapDecoration.musicTrackArchive = null; } var2 = false; } - if (var2 && field699 && class80.pcmPlayer0 != null) { - class80.pcmPlayer0.tryDiscard(); + if (var2 && field858 && MouseRecorder.pcmPlayer0 != null) { + MouseRecorder.pcmPlayer0.tryDiscard(); } - if ((gameState == 10 || gameState == 20 || gameState == 30) && field868 != 0L && DirectByteArrayCopier.currentTimeMs() > field868) { - Clock.setWindowedMode(AbstractWorldMapIcon.getWindowedMode()); + if ((gameState == 10 || gameState == 20 || gameState == 30) && 0L != field836 && SequenceDefinition.method4686() > field836) { + StudioGame.setWindowedMode(UserComparator7.getWindowedMode()); } int var4; if (var1) { for (var4 = 0; var4 < 100; ++var4) { - field843[var4] = true; + field703[var4] = true; } } if (gameState == 0) { this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1); } else if (gameState == 5) { - class189.drawTitle(WorldMapIcon_1.fontBold12, Coord.fontPlain11, FileSystem.fontPlain12); - } else if (gameState == 10 || gameState == 11) { - class189.drawTitle(WorldMapIcon_1.fontBold12, Coord.fontPlain11, FileSystem.fontPlain12); - } else if (gameState == 20) { - class189.drawTitle(WorldMapIcon_1.fontBold12, Coord.fontPlain11, FileSystem.fontPlain12); - } else if (gameState == 25) { - if (field709 == 1) { - if (field705 > field706) { - field706 = field705; - } + GrandExchangeEvent.drawTitle(class43.fontBold12, class30.fontPlain11, ClientPacket.fontPlain12); + } else if (gameState != 10 && gameState != 11) { + if (gameState == 20) { + GrandExchangeEvent.drawTitle(class43.fontBold12, class30.fontPlain11, ClientPacket.fontPlain12); + } else if (gameState == 25) { + if (field719 == 1) { + if (field676 > field886) { + field886 = field676; + } - var4 = (field706 * 50 - field705 * 50) / field706; - TriBool.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); - } else if (field709 == 2) { - if (field707 > field896) { - field896 = field707; - } + var4 = (field886 * 50 - field676 * 50) / field886; + MusicPatch.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); + } else if (field719 == 2) { + if (field678 > field718) { + field718 = field678; + } - var4 = (field896 * 50 - field707 * 50) / field896 + 50; - TriBool.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); - } else { - TriBool.drawLoadingMessage("Loading - please wait.", false); + var4 = (field718 * 50 - field678 * 50) / field718 + 50; + MusicPatch.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); + } else { + MusicPatch.drawLoadingMessage("Loading - please wait.", false); + } + } else if (gameState == 30) { + this.drawLoggedIn(); + } else if (gameState == 40) { + MusicPatch.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); + } else if (gameState == 45) { + MusicPatch.drawLoadingMessage("Please wait...", false); } - } else if (gameState == 30) { - this.drawLoggedIn(); - } else if (gameState == 40) { - TriBool.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); - } else if (gameState == 45) { - TriBool.drawLoadingMessage("Please wait...", false); + } else { + GrandExchangeEvent.drawTitle(class43.fontBold12, class30.fontPlain11, ClientPacket.fontPlain12); } if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { for (var4 = 0; var4 < rootWidgetCount; ++var4) { - if (field861[var4]) { - MusicPatchPcmStream.rasterProvider.draw(rootWidgetXs[var4], rootWidgetYs[var4], rootWidgetWidths[var4], rootWidgetHeights[var4]); - field861[var4] = false; + if (field829[var4]) { + SpotAnimationDefinition.rasterProvider.draw(rootWidgetXs[var4], rootWidgetYs[var4], rootWidgetWidths[var4], rootWidgetHeights[var4]); + field829[var4] = false; } } } else if (gameState > 0) { - MusicPatchPcmStream.rasterProvider.drawFull(0, 0); + SpotAnimationDefinition.rasterProvider.drawFull(0, 0); for (var4 = 0; var4 < rootWidgetCount; ++var4) { - field861[var4] = false; + field829[var4] = false; } } } - @ObfuscatedName("ar") + @ObfuscatedName("at") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1344457794" + garbageValue = "1993845226" ) @Export("kill0") protected final void kill0() { - if (Clock.varcs.hasUnwrittenChanges()) { - Clock.varcs.write(); + if (KeyHandler.varcs.hasUnwrittenChanges()) { + KeyHandler.varcs.write(); } - if (class40.mouseRecorder != null) { - class40.mouseRecorder.isRunning = false; + if (Language.mouseRecorder != null) { + Language.mouseRecorder.isRunning = false; } - class40.mouseRecorder = null; + Language.mouseRecorder = null; packetWriter.close(); - FloorDecoration.KeyHandler_exit(); - Widget.method4091(); - WorldMapManager.mouseWheel = null; - if (class80.pcmPlayer0 != null) { - class80.pcmPlayer0.shutdown(); + if (KeyHandler.KeyHandler_instance != null) { + synchronized(KeyHandler.KeyHandler_instance) { + KeyHandler.KeyHandler_instance = null; + } } - if (Language.pcmPlayer1 != null) { - Language.pcmPlayer1.shutdown(); + if (MouseHandler.MouseHandler_instance != null) { + synchronized(MouseHandler.MouseHandler_instance) { + MouseHandler.MouseHandler_instance = null; + } + } + + Canvas.mouseWheel = null; + if (MouseRecorder.pcmPlayer0 != null) { + MouseRecorder.pcmPlayer0.shutdown(); + } + + if (SoundCache.pcmPlayer1 != null) { + SoundCache.pcmPlayer1.shutdown(); } if (NetCache.NetCache_socket != null) { NetCache.NetCache_socket.close(); } - Players.method2093(); - if (SequenceDefinition.urlRequester != null) { - SequenceDefinition.urlRequester.close(); - SequenceDefinition.urlRequester = null; + class60.method1122(); + if (ScriptEvent.urlRequester != null) { + ScriptEvent.urlRequester.close(); + ScriptEvent.urlRequester = null; } try { JagexCache.JagexCache_dat2File.close(); - for (int var1 = 0; var1 < class40.idxCount; ++var1) { - JagexCache.JagexCache_idxFiles[var1].close(); + for (int var4 = 0; var4 < JagexCache.idxCount; ++var4) { + WorldMapSection1.JagexCache_idxFiles[var4].close(); } JagexCache.JagexCache_idx255File.close(); JagexCache.JagexCache_randomDat.close(); - } catch (Exception var3) { + } catch (Exception var7) { } } - @ObfuscatedName("ap") + @ObfuscatedName("ag") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-779141254" + garbageValue = "1142845100" ) - protected final void vmethod1273() { + protected final void vmethod1655() { + } + + @ObfuscatedSignature( + signature = "()Ljx;" + ) + public Username aaj() { + return WorldMapIcon_1.localPlayer != null ? WorldMapIcon_1.localPlayer.username : null; } public final void init() { try { - if (!this.checkHost()) { - return; - } + if (this.checkHost()) { + int var4; + int var6; + for (int var1 = 0; var1 <= 19; ++var1) { + String var2 = this.getParameter(Integer.toString(var1)); + if (var2 != null) { + switch(var1) { + case 1: + useBufferedSocket = Integer.parseInt(var2) != 0; + case 2: + case 11: + case 13: + case 16: + default: + break; + case 3: + if (var2.equalsIgnoreCase("true")) { + isMembersWorld = true; + } else { + isMembersWorld = false; + } + break; + case 4: + if (clientType == -1) { + clientType = Integer.parseInt(var2); + } + break; + case 5: + worldProperties = Integer.parseInt(var2); + break; + case 6: + class60.clientLanguage = Language.method3602(Integer.parseInt(var2)); + break; + case 7: + var4 = Integer.parseInt(var2); + ServerBuild[] var5 = Fonts.method5240(); + var6 = 0; - ClientParameter[] var1 = FaceNormal.ClientParameter_values(); + ServerBuild var3; + while (true) { + if (var6 >= var5.length) { + var3 = null; + break; + } - for (int var2 = 0; var2 < var1.length; ++var2) { - ClientParameter var3 = var1[var2]; - String var4 = this.getParameter(var3.id); - if (var4 == null) { - continue; + ServerBuild var7 = var5[var6]; + if (var4 == var7.field3080) { + var3 = var7; + break; + } + + ++var6; + } + + SequenceDefinition.field3507 = var3; + break; + case 8: + if (var2.equalsIgnoreCase("true")) { + } + break; + case 9: + Clock.field2037 = var2; + break; + case 10: + WorldMapRectangle.field166 = (StudioGame)FriendSystem.findEnumerated(WorldMapSprite.method402(), Integer.parseInt(var2)); + if (StudioGame.oldscape == WorldMapRectangle.field166) { + FontName.loginType = LoginType.oldscape; + } else { + FontName.loginType = LoginType.field4032; + } + break; + case 12: + worldId = Integer.parseInt(var2); + break; + case 14: + SoundSystem.field1414 = Integer.parseInt(var2); + break; + case 15: + gameBuild = Integer.parseInt(var2); + break; + case 17: + class1.field6 = var2; + } + } } - switch(Integer.parseInt(var3.id)) { - case 1: - useBufferedSocket = Integer.parseInt(var4) != 0; - case 2: - case 11: - case 13: - case 16: - default: - break; - case 3: - if (var4.equalsIgnoreCase("true")) { - isMembersWorld = true; - } else { - isMembersWorld = false; - } - break; - case 4: - if (clientType == -1) { - clientType = Integer.parseInt(var4); - } - break; - case 5: - worldProperties = Integer.parseInt(var4); - break; - case 6: - int var6 = Integer.parseInt(var4); - Language var11; - if (var6 >= 0 && var6 < Language.Language_valuesOrdered.length) { - var11 = Language.Language_valuesOrdered[var6]; - } else { - var11 = null; + + Scene.Scene_isLowDetail = false; + isLowDetail = false; + NetFileRequest.worldHost = this.getCodeBase().getHost(); + String var8 = SequenceDefinition.field3507.name; + byte var9 = 0; + + try { + JagexCache.idxCount = 21; + InterfaceParent.cacheGamebuild = var9; + + try { + Decimator.field1439 = System.getProperty("os.name"); + } catch (Exception var14) { + Decimator.field1439 = "Unknown"; } - ScriptFrame.clientLanguage = var11; - break; - case 7: - PacketBufferNode.serverBuild = ServerBuild.valueOf(Integer.parseInt(var4)); - break; - case 8: - if (var4.equalsIgnoreCase("true")) { + ByteArrayPool.field3708 = Decimator.field1439.toLowerCase(); + + try { + FontName.userHomeDirectory = System.getProperty("user.home"); + if (FontName.userHomeDirectory != null) { + FontName.userHomeDirectory = FontName.userHomeDirectory + "/"; + } + } catch (Exception var13) { } - break; - case 9: - class294.field3695 = var4; - break; - case 10: - StudioGame[] var5 = new StudioGame[]{StudioGame.oldscape, StudioGame.runescape, StudioGame.game5, StudioGame.stellardawn, StudioGame.game4, StudioGame.game3}; - WorldMapRegion.studioGame = (StudioGame)SoundSystem.findEnumerated(var5, Integer.parseInt(var4)); - if (WorldMapRegion.studioGame == StudioGame.oldscape) { - class40.loginType = LoginType.oldscape; - } else { - class40.loginType = LoginType.field4056; + + try { + if (ByteArrayPool.field3708.startsWith("win")) { + if (FontName.userHomeDirectory == null) { + FontName.userHomeDirectory = System.getenv("USERPROFILE"); + } + } else if (FontName.userHomeDirectory == null) { + FontName.userHomeDirectory = System.getenv("HOME"); + } + + if (FontName.userHomeDirectory != null) { + FontName.userHomeDirectory = FontName.userHomeDirectory + "/"; + } + } catch (Exception var12) { } - break; - case 12: - worldId = Integer.parseInt(var4); - break; - case 14: - InvDefinition.field3199 = Integer.parseInt(var4); - break; - case 15: - gameBuild = Integer.parseInt(var4); - break; - case 17: - WorldMapArea.field213 = var4; + + if (FontName.userHomeDirectory == null) { + FontName.userHomeDirectory = "~/"; + } + + GrandExchangeEvent.field47 = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", FontName.userHomeDirectory, "/tmp/", ""}; + Login.field1181 = new String[]{".jagex_cache_" + InterfaceParent.cacheGamebuild, ".file_store_" + InterfaceParent.cacheGamebuild}; + + label133: + for (int var10 = 0; var10 < 4; ++var10) { + JagexCache.cacheDir = class4.getCacheDir("oldschool", var8, var10); + if (!JagexCache.cacheDir.exists()) { + JagexCache.cacheDir.mkdirs(); + } + + File[] var11 = JagexCache.cacheDir.listFiles(); + if (var11 == null) { + break; + } + + File[] var18 = var11; + var6 = 0; + + while (true) { + if (var6 >= var18.length) { + break label133; + } + + File var19 = var18[var6]; + if (!GameShell.testReadWritePermissions(var19, false)) { + break; + } + + ++var6; + } + } + + File var17 = JagexCache.cacheDir; + FileSystem.FileSystem_cacheDir = var17; + if (!FileSystem.FileSystem_cacheDir.exists()) { + throw new RuntimeException(""); + } + + FileSystem.FileSystem_hasPermissions = true; + SoundSystem.method2417(); + JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(class42.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); + JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(class42.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); + WorldMapSection1.JagexCache_idxFiles = new BufferedFile[JagexCache.idxCount]; + + for (var4 = 0; var4 < JagexCache.idxCount; ++var4) { + WorldMapSection1.JagexCache_idxFiles[var4] = new BufferedFile(new AccessFile(class42.getFile("main_file_cache.idx" + var4), "rw", 1048576L), 6000, 0); + } + } catch (Exception var15) { + class3.RunException_sendStackTrace((String)null, var15); } + + WorldMapID.client = this; + GZipDecompressor.field4007 = clientType; + this.startThread(765, 503, 182); } - - class215.setLowDetailOff(); - ClientPreferences.worldHost = this.getCodeBase().getHost(); - String var9 = PacketBufferNode.serverBuild.name; - byte var10 = 0; - - try { - UserComparator6.JagexCache_init("oldschool", var9, var10, 21); - } catch (Exception var7) { - HitSplatDefinition.RunException_sendStackTrace((String)null, var7); - } - - WorldMapSprite.client = this; - RunException.RunException_clientType = clientType; - this.startThread(765, 503, 181); - } catch (RuntimeException var8) { - throw UserComparator9.newRunException(var8, "client.init(" + ')'); + } catch (RuntimeException var16) { + throw class195.newRunException(var16, "client.init(" + ')'); } } - @ObfuscatedName("es") + @ObfuscatedSignature( + signature = "()Ljx;" + ) + public Username aag() { + return WorldMapIcon_1.localPlayer != null ? WorldMapIcon_1.localPlayer.username : null; + } + + @ObfuscatedSignature( + signature = "()Ljx;" + ) + public Username abc() { + return WorldMapIcon_1.localPlayer != null ? WorldMapIcon_1.localPlayer.username : null; + } + + @ObfuscatedSignature( + signature = "()Ljx;" + ) + public Username aba() { + return WorldMapIcon_1.localPlayer != null ? WorldMapIcon_1.localPlayer.username : null; + } + + @ObfuscatedName("ep") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1600104353" + garbageValue = "-1547089502" ) @Export("doCycleJs5") void doCycleJs5() { if (gameState != 1000) { - boolean var1 = WorldMapArea.method365(); + boolean var1 = TilePaint.method3007(); if (!var1) { this.doCycleJs5Connect(); } @@ -2042,106 +2592,107 @@ public final class Client extends GameShell implements Usernamed { } } - @ObfuscatedName("ez") + @ObfuscatedName("ek") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1712345498" + garbageValue = "529231386" ) @Export("doCycleJs5Connect") void doCycleJs5Connect() { if (NetCache.NetCache_crcMismatches >= 4) { this.error("js5crc"); gameState = 1000; - return; - } - if (NetCache.NetCache_ioExceptions >= 4) { - if (gameState <= 5) { - this.error("js5io"); - gameState = 1000; - return; - } - - field682 = 3000; - NetCache.NetCache_ioExceptions = 3; - } - - if (--field682 + 1 > 0) { - return; - } - try { - if (js5ConnectState == 0) { - class191.js5SocketTask = GameShell.taskHandler.newSocketTask(ClientPreferences.worldHost, Varcs.port3); - ++js5ConnectState; - } - - if (js5ConnectState == 1) { - if (class191.js5SocketTask.status == 2) { - this.js5Error(-1); + } else { + if (NetCache.NetCache_ioExceptions >= 4) { + if (gameState <= 5) { + this.error("js5io"); + gameState = 1000; return; } - if (class191.js5SocketTask.status == 1) { - ++js5ConnectState; - } + field681 = 3000; + NetCache.NetCache_ioExceptions = 3; } - if (js5ConnectState == 2) { - if (useBufferedSocket) { - HealthBarUpdate.js5Socket = BZip2State.newBufferedNetSocket((Socket)class191.js5SocketTask.result, 40000, 5000); - } else { - HealthBarUpdate.js5Socket = new NetSocket((Socket)class191.js5SocketTask.result, GameShell.taskHandler, 5000); - } - - Buffer var1 = new Buffer(5); - var1.writeByte(15); - var1.writeInt(181); - HealthBarUpdate.js5Socket.write(var1.array, 0, 5); - ++js5ConnectState; - class192.js5ConnectionMs = DirectByteArrayCopier.currentTimeMs(); - } - - if (js5ConnectState == 3) { - if (HealthBarUpdate.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { - int var2 = HealthBarUpdate.js5Socket.readUnsignedByte(); - if (var2 != 0) { - this.js5Error(var2); - return; + if (--field681 + 1 <= 0) { + try { + if (js5ConnectState == 0) { + RouteStrategy.js5SocketTask = GameShell.taskHandler.newSocketTask(NetFileRequest.worldHost, SecureRandomCallable.port3); + ++js5ConnectState; } - ++js5ConnectState; - } else if (DirectByteArrayCopier.currentTimeMs() - class192.js5ConnectionMs > 30000L) { - this.js5Error(-2); - return; + if (js5ConnectState == 1) { + if (RouteStrategy.js5SocketTask.status == 2) { + this.js5Error(-1); + return; + } + + if (RouteStrategy.js5SocketTask.status == 1) { + ++js5ConnectState; + } + } + + if (js5ConnectState == 2) { + if (useBufferedSocket) { + Socket var2 = (Socket)RouteStrategy.js5SocketTask.result; + BufferedNetSocket var1 = new BufferedNetSocket(var2, 40000, 5000); + js5Socket = var1; + } else { + js5Socket = new NetSocket((Socket)RouteStrategy.js5SocketTask.result, GameShell.taskHandler, 5000); + } + + Buffer var5 = new Buffer(5); + var5.writeByte(15); + var5.writeInt(182); + js5Socket.write(var5.array, 0, 5); + ++js5ConnectState; + Coord.field2511 = SequenceDefinition.method4686(); + } + + if (js5ConnectState == 3) { + if (js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { + int var3 = js5Socket.readUnsignedByte(); + if (var3 != 0) { + this.js5Error(var3); + return; + } + + ++js5ConnectState; + } else if (SequenceDefinition.method4686() - Coord.field2511 > 30000L) { + this.js5Error(-2); + return; + } + } + + if (js5ConnectState == 4) { + class83.NetCache_connect(js5Socket, gameState > 20); + RouteStrategy.js5SocketTask = null; + js5Socket = null; + js5ConnectState = 0; + js5Errors = 0; + } + } catch (IOException var4) { + this.js5Error(-3); } - } - if (js5ConnectState == 4) { - DynamicObject.NetCache_connect(HealthBarUpdate.js5Socket, gameState > 20); - class191.js5SocketTask = null; - HealthBarUpdate.js5Socket = null; - js5ConnectState = 0; - js5Errors = 0; } - } catch (IOException var3) { - this.js5Error(-3); } - } - @ObfuscatedName("ex") + @ObfuscatedName("et") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "3" + signature = "(II)V", + garbageValue = "1888640319" ) @Export("js5Error") void js5Error(int var1) { - class191.js5SocketTask = null; - HealthBarUpdate.js5Socket = null; + RouteStrategy.js5SocketTask = null; + js5Socket = null; js5ConnectState = 0; - if (Language.port1 == Varcs.port3) { - Varcs.port3 = Skeleton.port2; + if (WorldMapRectangle.port1 == SecureRandomCallable.port3) { + SecureRandomCallable.port3 = FloorDecoration.port2; } else { - Varcs.port3 = Language.port1; + SecureRandomCallable.port3 = WorldMapRectangle.port1; } ++js5Errors; @@ -2150,7 +2701,7 @@ public final class Client extends GameShell implements Usernamed { this.error("js5connect_full"); gameState = 1000; } else { - field682 = 3000; + field681 = 3000; } } else if (js5Errors >= 2 && var1 == 6) { this.error("js5connect_outofdate"); @@ -2160,16 +2711,16 @@ public final class Client extends GameShell implements Usernamed { this.error("js5connect"); gameState = 1000; } else { - field682 = 3000; + field681 = 3000; } } } - @ObfuscatedName("ea") + @ObfuscatedName("el") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1078015369" + garbageValue = "-1767576334" ) @Export("doCycleLoggedOut") final void doCycleLoggedOut() { @@ -2178,94 +2729,87 @@ public final class Client extends GameShell implements Usernamed { try { if (loginState == 0) { - if (WorldMapIcon_1.secureRandom == null && (secureRandomFuture.isDone() || field687 > 250)) { - WorldMapIcon_1.secureRandom = secureRandomFuture.get(); + if (class2.secureRandom == null && (secureRandomFuture.isDone() || field658 > 250)) { + class2.secureRandom = secureRandomFuture.get(); secureRandomFuture.shutdown(); secureRandomFuture = null; } - if (WorldMapIcon_1.secureRandom != null) { + if (class2.secureRandom != null) { if (var1 != null) { ((AbstractSocket)var1).close(); var1 = null; } - Ignored.socketTask = null; - field701 = false; - field687 = 0; + WorldMapIcon_0.socketTask = null; + field672 = false; + field658 = 0; loginState = 1; } } if (loginState == 1) { - if (Ignored.socketTask == null) { - Ignored.socketTask = GameShell.taskHandler.newSocketTask(ClientPreferences.worldHost, Varcs.port3); + if (WorldMapIcon_0.socketTask == null) { + WorldMapIcon_0.socketTask = GameShell.taskHandler.newSocketTask(NetFileRequest.worldHost, SecureRandomCallable.port3); } - if (Ignored.socketTask.status == 2) { + if (WorldMapIcon_0.socketTask.status == 2) { throw new IOException(); } - if (Ignored.socketTask.status == 1) { + if (WorldMapIcon_0.socketTask.status == 1) { if (useBufferedSocket) { - var1 = BZip2State.newBufferedNetSocket((Socket)Ignored.socketTask.result, 40000, 5000); + Socket var4 = (Socket)WorldMapIcon_0.socketTask.result; + BufferedNetSocket var3 = new BufferedNetSocket(var4, 40000, 5000); + var1 = var3; } else { - var1 = new NetSocket((Socket)Ignored.socketTask.result, GameShell.taskHandler, 5000); + var1 = new NetSocket((Socket)WorldMapIcon_0.socketTask.result, GameShell.taskHandler, 5000); } packetWriter.setSocket((AbstractSocket)var1); - Ignored.socketTask = null; + WorldMapIcon_0.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]; - } - - var4.clientPacket = null; - var4.clientPacketLength = 0; - var4.packetBuffer = new PacketBuffer(5000); - var4.packetBuffer.writeByte(LoginPacket.field2306.id); - packetWriter.addNode(var4); + PacketBufferNode var21 = class2.method29(); + var21.packetBuffer.writeByte(LoginPacket.field2291.id); + packetWriter.addNode(var21); packetWriter.flush(); var2.offset = 0; loginState = 3; } - boolean var14; - int var15; + boolean var12; + int var13; if (loginState == 3) { - if (class80.pcmPlayer0 != null) { - class80.pcmPlayer0.method2407(); + if (MouseRecorder.pcmPlayer0 != null) { + MouseRecorder.pcmPlayer0.method2397(); } - if (Language.pcmPlayer1 != null) { - Language.pcmPlayer1.method2407(); + if (SoundCache.pcmPlayer1 != null) { + SoundCache.pcmPlayer1.method2397(); } - var14 = true; + var12 = true; if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { - var14 = false; + var12 = false; } - if (var14) { - var15 = ((AbstractSocket)var1).readUnsignedByte(); - if (class80.pcmPlayer0 != null) { - class80.pcmPlayer0.method2407(); + if (var12) { + var13 = ((AbstractSocket)var1).readUnsignedByte(); + if (MouseRecorder.pcmPlayer0 != null) { + MouseRecorder.pcmPlayer0.method2397(); } - if (Language.pcmPlayer1 != null) { - Language.pcmPlayer1.method2407(); + if (SoundCache.pcmPlayer1 != null) { + SoundCache.pcmPlayer1.method2397(); } - if (var15 != 0) { - WorldMapIcon_1.getLoginError(var15); + if (var13 != 0) { + GrandExchangeOfferOwnWorldComparator.getLoginError(var13); return; } @@ -2274,318 +2818,283 @@ public final class Client extends GameShell implements Usernamed { } } - int var30; + int var33; if (loginState == 4) { if (var2.offset < 8) { - var30 = ((AbstractSocket)var1).available(); - if (var30 > 8 - var2.offset) { - var30 = 8 - var2.offset; + var33 = ((AbstractSocket)var1).available(); + if (var33 > 8 - var2.offset) { + var33 = 8 - var2.offset; } - if (var30 > 0) { - ((AbstractSocket)var1).read(var2.array, var2.offset, var30); - var2.offset += var30; + if (var33 > 0) { + ((AbstractSocket)var1).read(var2.array, var2.offset, var33); + var2.offset += var33; } } if (var2.offset == 8) { var2.offset = 0; - Entity.field1872 = var2.readLong(); + class65.field586 = var2.readLong(); loginState = 5; } } + int var7; + int var9; + int var14; if (loginState == 5) { packetWriter.packetBuffer.offset = 0; packetWriter.clearBuffer(); - PacketBuffer var3 = new PacketBuffer(500); - int[] var24 = new int[]{WorldMapIcon_1.secureRandom.nextInt(), WorldMapIcon_1.secureRandom.nextInt(), WorldMapIcon_1.secureRandom.nextInt(), WorldMapIcon_1.secureRandom.nextInt()}; - var3.offset = 0; - var3.writeByte(1); - var3.writeInt(var24[0]); - var3.writeInt(var24[1]); - var3.writeInt(var24[2]); - var3.writeInt(var24[3]); - var3.writeLong(Entity.field1872); + PacketBuffer var22 = new PacketBuffer(500); + int[] var24 = new int[]{class2.secureRandom.nextInt(), class2.secureRandom.nextInt(), class2.secureRandom.nextInt(), class2.secureRandom.nextInt()}; + var22.offset = 0; + var22.writeByte(1); + var22.writeInt(var24[0]); + var22.writeInt(var24[1]); + var22.writeInt(var24[2]); + var22.writeInt(var24[3]); + var22.writeLong(class65.field586); + int var10; if (gameState == 40) { - var3.writeInt(FriendSystem.field1074[0]); - var3.writeInt(FriendSystem.field1074[1]); - var3.writeInt(FriendSystem.field1074[2]); - var3.writeInt(FriendSystem.field1074[3]); + var22.writeInt(class192.field2365[0]); + var22.writeInt(class192.field2365[1]); + var22.writeInt(class192.field2365[2]); + var22.writeInt(class192.field2365[3]); } else { - var3.writeByte(field690.rsOrdinal()); - switch(field690.field2003) { + var22.writeByte(field870.rsOrdinal()); + switch(field870.field1986) { case 0: - var3.writeInt((Integer)WorldMapLabelSize.clientPreferences.parameters.get(ViewportMouse.method2971(Login.Login_username))); - break; case 1: + var22.writeMedium(SecureRandomCallable.field500); + ++var22.offset; + break; case 2: - var3.writeMedium(GrandExchangeOffer.field65); - ++var3.offset; + LinkedHashMap var6 = GrandExchangeOffer.clientPreferences.parameters; + String var8 = Login.Login_username; + var9 = var8.length(); + var10 = 0; + + for (int var11 = 0; var11 < var9; ++var11) { + var10 = (var10 << 5) - var10 + var8.charAt(var11); + } + + var22.writeInt((Integer)var6.get(var10)); break; case 3: - var3.offset += 4; + var22.offset += 4; } - var3.writeByte(class313.field3837.rsOrdinal()); - var3.writeStringCp1252NullTerminated(Login.Login_password); + var22.writeByte(class312.field3810.rsOrdinal()); + var22.writeStringCp1252NullTerminated(Login.Login_password); } - var3.encryptRsa(class83.field1165, class83.field1162); - FriendSystem.field1074 = var24; - 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; + var22.encryptRsa(class83.field1138, class83.field1137); + class192.field2365 = var24; + PacketBufferNode var5 = class2.method29(); + var5.packetBuffer.offset = 0; if (gameState == 40) { - var6.packetBuffer.writeByte(LoginPacket.field2311.id); + var5.packetBuffer.writeByte(LoginPacket.field2292.id); } else { - var6.packetBuffer.writeByte(LoginPacket.field2308.id); + var5.packetBuffer.writeByte(LoginPacket.field2295.id); } - var6.packetBuffer.writeShort(0); - int var16 = var6.packetBuffer.offset; - var6.packetBuffer.writeInt(181); - 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(GrandExchangeEvent.canvasWidth); - var6.packetBuffer.writeShort(ParamDefinition.canvasHeight); - PacketBuffer var9 = var6.packetBuffer; - int var12; - if (randomDatData != null) { - var9.writeBytes(randomDatData, 0, randomDatData.length); - } else { - byte[] var11 = new byte[24]; - - try { - JagexCache.JagexCache_randomDat.seek(0L); - JagexCache.JagexCache_randomDat.readFully(var11); - - for (var12 = 0; var12 < 24 && var11[var12] == 0; ++var12) { - } - - if (var12 >= 24) { - throw new IOException(); - } - } catch (Exception var21) { - for (int var13 = 0; var13 < 24; ++var13) { - var11[var13] = -1; - } - } - - var9.writeBytes(var11, 0, var11.length); - } - - var6.packetBuffer.writeStringCp1252NullTerminated(class294.field3695); - var6.packetBuffer.writeInt(InvDefinition.field3199); - Buffer var10 = new Buffer(WorldMapRectangle.platformInfo.size()); - WorldMapRectangle.platformInfo.write(var10); - var6.packetBuffer.writeBytes(var10.array, 0, var10.array.length); - var6.packetBuffer.writeByte(clientType); - var6.packetBuffer.writeInt(0); - var6.packetBuffer.writeInt(class197.archive0.hash); - var6.packetBuffer.writeInt(JagexCache.archive1.hash); - var6.packetBuffer.writeInt(class215.archive2.hash); - var6.packetBuffer.writeInt(class43.archive3.hash); - var6.packetBuffer.writeInt(class13.archive4.hash); - var6.packetBuffer.writeInt(WorldMapCacheName.archive5.hash); - var6.packetBuffer.writeInt(WorldMapRegion.archive6.hash); - var6.packetBuffer.writeInt(NPCDefinition.archive7.hash); - var6.packetBuffer.writeInt(archive8.hash); - var6.packetBuffer.writeInt(class4.archive9.hash); - var6.packetBuffer.writeInt(WorldMapLabelSize.archive10.hash); - var6.packetBuffer.writeInt(class32.archive11.hash); - var6.packetBuffer.writeInt(UserComparator4.archive12.hash); - var6.packetBuffer.writeInt(class2.archive13.hash); - var6.packetBuffer.writeInt(Tile.archive14.hash); - var6.packetBuffer.writeInt(GrandExchangeOfferOwnWorldComparator.archive15.hash); - var6.packetBuffer.writeInt(0); - var6.packetBuffer.writeInt(WorldMapSprite.archive17.hash); - var6.packetBuffer.writeInt(archive18.hash); - var6.packetBuffer.writeInt(ItemDefinition.archive19.hash); - var6.packetBuffer.writeInt(Entity.archive20.hash); - var6.packetBuffer.xteaEncrypt(var24, var8, var6.packetBuffer.offset); - var6.packetBuffer.writeLengthShort(var6.packetBuffer.offset - var16); - packetWriter.addNode(var6); + var5.packetBuffer.writeShort(0); + var14 = var5.packetBuffer.offset; + var5.packetBuffer.writeInt(182); + var5.packetBuffer.writeInt(1); + var5.packetBuffer.writeByte(clientType); + var5.packetBuffer.writeBytes(var22.array, 0, var22.offset); + var7 = var5.packetBuffer.offset; + var5.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); + var5.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); + var5.packetBuffer.writeShort(KitDefinition.canvasWidth); + var5.packetBuffer.writeShort(class30.canvasHeight); + FloorDecoration.method2787(var5.packetBuffer); + var5.packetBuffer.writeStringCp1252NullTerminated(Clock.field2037); + var5.packetBuffer.writeInt(SoundSystem.field1414); + Buffer var31 = new Buffer(World.platformInfo.size()); + World.platformInfo.write(var31); + var5.packetBuffer.writeBytes(var31.array, 0, var31.array.length); + var5.packetBuffer.writeByte(clientType); + var5.packetBuffer.writeInt(0); + var5.packetBuffer.writeInt(archive0.hash); + var5.packetBuffer.writeInt(class269.archive1.hash); + var5.packetBuffer.writeInt(HealthBarUpdate.archive2.hash); + var5.packetBuffer.writeInt(UserComparator8.archive3.hash); + var5.packetBuffer.writeInt(WorldMapSprite.archive4.hash); + var5.packetBuffer.writeInt(WorldMapDecoration.archive5.hash); + var5.packetBuffer.writeInt(GrandExchangeEvent.archive6.hash); + var5.packetBuffer.writeInt(class51.archive7.hash); + var5.packetBuffer.writeInt(class2.archive8.hash); + var5.packetBuffer.writeInt(WorldMapDecoration.archive9.hash); + var5.packetBuffer.writeInt(GameObject.archive10.hash); + var5.packetBuffer.writeInt(WorldMapRectangle.archive11.hash); + var5.packetBuffer.writeInt(GameShell.archive12.hash); + var5.packetBuffer.writeInt(WorldMapID.archive13.hash); + var5.packetBuffer.writeInt(WorldMapSection1.archive14.hash); + var5.packetBuffer.writeInt(GrandExchangeOfferWorldComparator.archive15.hash); + var5.packetBuffer.writeInt(0); + var5.packetBuffer.writeInt(WorldMapIcon_1.archive17.hash); + var5.packetBuffer.writeInt(class40.archive18.hash); + var5.packetBuffer.writeInt(SoundCache.archive19.hash); + var5.packetBuffer.writeInt(Script.archive20.hash); + var5.packetBuffer.xteaEncrypt(var24, var7, var5.packetBuffer.offset); + var5.packetBuffer.writeLengthShort(var5.packetBuffer.offset - var14); + packetWriter.addNode(var5); packetWriter.flush(); packetWriter.isaacCipher = new IsaacCipher(var24); - int[] var29 = new int[4]; + int[] var15 = new int[4]; - for (var12 = 0; var12 < 4; ++var12) { - var29[var12] = var24[var12] + 50; + for (var10 = 0; var10 < 4; ++var10) { + var15[var10] = var24[var10] + 50; } - var2.newIsaacCipher(var29); + var2.newIsaacCipher(var15); loginState = 6; } if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { - var30 = ((AbstractSocket)var1).readUnsignedByte(); - if (var30 == 21 && gameState == 20) { + var33 = ((AbstractSocket)var1).readUnsignedByte(); + if (var33 == 21 && gameState == 20) { loginState = 9; - } else if (var30 == 2) { + } else if (var33 == 2) { loginState = 11; - } else if (var30 == 15 && gameState == 40) { + } else if (var33 == 15 && gameState == 40) { packetWriter.serverPacketLength = -1; loginState = 16; - } else if (var30 == 64) { + } else if (var33 == 64) { loginState = 7; - } else if (var30 == 23 && field688 < 1) { - ++field688; + } else if (var33 == 23 && field659 < 1) { + ++field659; loginState = 0; - } else if (var30 == 29) { - loginState = 14; } else { - WorldMapIcon_1.getLoginError(var30); - return; + if (var33 != 29) { + GrandExchangeOfferOwnWorldComparator.getLoginError(var33); + return; + } + + loginState = 14; } } if (loginState == 7 && ((AbstractSocket)var1).available() > 0) { - FillMode.field3884 = ((AbstractSocket)var1).readUnsignedByte(); + WorldMapSection2.field183 = ((AbstractSocket)var1).readUnsignedByte(); loginState = 8; } - if (loginState == 8 && ((AbstractSocket)var1).available() >= FillMode.field3884) { - ((AbstractSocket)var1).read(var2.array, 0, FillMode.field3884); + if (loginState == 8 && ((AbstractSocket)var1).available() >= WorldMapSection2.field183) { + ((AbstractSocket)var1).read(var2.array, 0, WorldMapSection2.field183); var2.offset = 0; loginState = 6; } if (loginState == 9 && ((AbstractSocket)var1).available() > 0) { - field836 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; + field660 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; loginState = 10; } if (loginState == 10) { - field687 = 0; - class268.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field836 / 60 + " seconds."); - if (--field836 <= 0) { + field658 = 0; + GrandExchangeOfferOwnWorldComparator.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field660 / 60 + " seconds."); + if (--field660 <= 0) { loginState = 0; } } else { if (loginState == 11 && ((AbstractSocket)var1).available() >= 1) { - EnumDefinition.field3324 = ((AbstractSocket)var1).readUnsignedByte(); + GameShell.field425 = ((AbstractSocket)var1).readUnsignedByte(); loginState = 12; } - if (loginState == 12 && ((AbstractSocket)var1).available() >= EnumDefinition.field3324) { - var14 = ((AbstractSocket)var1).readUnsignedByte() == 1; + if (loginState == 12 && ((AbstractSocket)var1).available() >= GameShell.field425) { + var12 = ((AbstractSocket)var1).readUnsignedByte() == 1; ((AbstractSocket)var1).read(var2.array, 0, 4); var2.offset = 0; - boolean var31 = false; - if (var14) { - var15 = var2.readByteIsaac() << 24; - var15 |= var2.readByteIsaac() << 16; - var15 |= var2.readByteIsaac() << 8; - var15 |= var2.readByteIsaac(); - int var18 = ViewportMouse.method2971(Login.Login_username); - if (WorldMapLabelSize.clientPreferences.parameters.size() >= 10 && !WorldMapLabelSize.clientPreferences.parameters.containsKey(var18)) { - Iterator var28 = WorldMapLabelSize.clientPreferences.parameters.entrySet().iterator(); - var28.next(); - var28.remove(); - } + boolean var34 = false; + if (var12) { + var13 = var2.readByteIsaac() << 24; + var13 |= var2.readByteIsaac() << 16; + var13 |= var2.readByteIsaac() << 8; + var13 |= var2.readByteIsaac(); + String var30 = Login.Login_username; + var7 = var30.length(); + int var16 = 0; + var9 = 0; - WorldMapLabelSize.clientPreferences.parameters.put(var18, var15); + while (true) { + if (var9 >= var7) { + if (GrandExchangeOffer.clientPreferences.parameters.size() >= 10 && !GrandExchangeOffer.clientPreferences.parameters.containsKey(var16)) { + Iterator var32 = GrandExchangeOffer.clientPreferences.parameters.entrySet().iterator(); + var32.next(); + var32.remove(); + } + + GrandExchangeOffer.clientPreferences.parameters.put(var16, var13); + break; + } + + var16 = (var16 << 5) - var16 + var30.charAt(var9); + ++var9; + } } if (Login_isUsernameRemembered) { - WorldMapLabelSize.clientPreferences.rememberedUsername = Login.Login_username; + GrandExchangeOffer.clientPreferences.rememberedUsername = Login.Login_username; } else { - WorldMapLabelSize.clientPreferences.rememberedUsername = null; + GrandExchangeOffer.clientPreferences.rememberedUsername = null; } - ReflectionCheck.savePreferences(); + GrandExchangeOfferAgeComparator.savePreferences(); staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); localPlayerIndex <<= 8; localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); - field771 = ((AbstractSocket)var1).readUnsignedByte(); + field741 = ((AbstractSocket)var1).readUnsignedByte(); ((AbstractSocket)var1).read(var2.array, 0, 1); var2.offset = 0; - ServerPacket[] var5 = Interpreter.ServerPacket_values(); - int var19 = var2.readSmartByteShortIsaac(); - if (var19 < 0 || var19 >= var5.length) { - throw new IOException(var19 + " " + var2.offset); + ServerPacket[] var28 = MouseRecorder.ServerPacket_values(); + var14 = var2.readSmartByteShortIsaac(); + if (var14 < 0 || var14 >= var28.length) { + throw new IOException(var14 + " " + var2.offset); } - packetWriter.serverPacket = var5[var19]; + packetWriter.serverPacket = var28[var14]; packetWriter.serverPacketLength = packetWriter.serverPacket.length; ((AbstractSocket)var1).read(var2.array, 0, 2); var2.offset = 0; packetWriter.serverPacketLength = var2.readUnsignedShort(); try { - Client var7 = WorldMapSprite.client; - JSObject.getWindow(var7).call("zap", (Object[])null); - } catch (Throwable var20) { + Client var18 = WorldMapID.client; + JSObject.getWindow(var18).call("zap", (Object[])null); + } catch (Throwable var19) { } loginState = 13; } - if (loginState == 13) { - if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { - var2.offset = 0; - ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); - timer.method5014(); - FaceNormal.method3264(); - WorldMapSectionType.updatePlayer(var2); - Canvas.field418 = -1; - Tiles.loadRegions(false, var2); - packetWriter.serverPacket = null; - } - - } else { + if (loginState != 13) { if (loginState == 14 && ((AbstractSocket)var1).available() >= 2) { var2.offset = 0; ((AbstractSocket)var1).read(var2.array, 0, 2); var2.offset = 0; - AbstractWorldMapData.field155 = var2.readUnsignedShort(); + GrandExchangeOfferTotalQuantityComparator.field59 = var2.readUnsignedShort(); loginState = 15; } - if (loginState == 15 && ((AbstractSocket)var1).available() >= AbstractWorldMapData.field155) { + if (loginState == 15 && ((AbstractSocket)var1).available() >= GrandExchangeOfferTotalQuantityComparator.field59) { var2.offset = 0; - ((AbstractSocket)var1).read(var2.array, 0, AbstractWorldMapData.field155); + ((AbstractSocket)var1).read(var2.array, 0, GrandExchangeOfferTotalQuantityComparator.field59); var2.offset = 0; - String var23 = var2.readStringCp1252NullTerminated(); String var25 = var2.readStringCp1252NullTerminated(); - String var26 = var2.readStringCp1252NullTerminated(); - class268.setLoginResponseString(var23, var25, var26); - class96.updateGameState(10); + String var27 = var2.readStringCp1252NullTerminated(); + String var29 = var2.readStringCp1252NullTerminated(); + GrandExchangeOfferOwnWorldComparator.setLoginResponseString(var25, var27, var29); + FloorDecoration.updateGameState(10); } - if (loginState != 16) { - ++field687; - if (field687 > 2000) { - if (field688 < 1) { - if (Language.port1 == Varcs.port3) { - Varcs.port3 = Skeleton.port2; - } else { - Varcs.port3 = Language.port1; - } - - ++field688; - loginState = 0; - } else { - WorldMapIcon_1.getLoginError(-3); - } - } - } else { + if (loginState == 16) { if (packetWriter.serverPacketLength == -1) { if (((AbstractSocket)var1).available() < 2) { return; @@ -2599,71 +3108,168 @@ 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; - var30 = packetWriter.serverPacketLength; - timer.method5000(); - packetWriter.clearBuffer(); - packetWriter.packetBuffer.offset = 0; - packetWriter.serverPacket = null; - packetWriter.field1309 = null; - packetWriter.field1321 = null; - packetWriter.field1317 = null; - packetWriter.serverPacketLength = 0; - packetWriter.field1318 = 0; - rebootTimer = 0; - Strings.resetMenuEntries(); - minimapState = 0; - destinationX = 0; - - for (var15 = 0; var15 < 2048; ++var15) { - players[var15] = null; - } - - localPlayer = null; - - for (var15 = 0; var15 < npcs.length; ++var15) { - NPC var27 = npcs[var15]; - if (var27 != null) { - var27.targetIndex = -1; - var27.false0 = false; - } - } - - ItemContainer.itemContainers = new NodeHashTable(32); - class96.updateGameState(30); - - for (var15 = 0; var15 < 100; ++var15) { - field843[var15] = true; - } - - HealthBarUpdate.method1677(); - WorldMapSectionType.updatePlayer(var2); - if (var30 != var2.offset) { + var33 = packetWriter.serverPacketLength; + timer.method4901(); + WorldMapAreaData.method654(); + ScriptFrame.updatePlayer(var2); + if (var33 != var2.offset) { throw new RuntimeException(); } } + } else { + ++field658; + if (field658 > 2000) { + if (field659 < 1) { + if (SecureRandomCallable.port3 == WorldMapRectangle.port1) { + SecureRandomCallable.port3 = FloorDecoration.port2; + } else { + SecureRandomCallable.port3 = WorldMapRectangle.port1; + } + + ++field659; + loginState = 0; + } else { + GrandExchangeOfferOwnWorldComparator.getLoginError(-3); + } + } } + } else { + if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { + var2.offset = 0; + ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); + timer.method4900(); + mouseLastLastPressedTimeMillis = 1L; + Language.mouseRecorder.index = 0; + class3.hasFocus = true; + hadFocus = true; + field847 = -1L; + class96.reflectionChecks = new IterableNodeDeque(); + packetWriter.clearBuffer(); + packetWriter.packetBuffer.offset = 0; + packetWriter.serverPacket = null; + packetWriter.field1295 = null; + packetWriter.field1296 = null; + packetWriter.field1291 = null; + packetWriter.serverPacketLength = 0; + packetWriter.field1293 = 0; + rebootTimer = 0; + logoutTimer = 0; + hintArrowType = 0; + menuOptionsCount = 0; + isMenuOpen = false; + MouseHandler.MouseHandler_idleCycles = 0; + class219.method4021(); + isItemSelected = 0; + isSpellSelected = false; + soundEffectCount = 0; + camAngleY = 0; + oculusOrbState = 0; + GameObject.field1921 = null; + minimapState = 0; + field651 = -1; + destinationX = 0; + destinationY = 0; + playerAttackOption = AttackOption.AttackOption_hidden; + npcAttackOption = AttackOption.AttackOption_hidden; + npcCount = 0; + MenuAction.method1993(); + + for (var33 = 0; var33 < 2048; ++var33) { + players[var33] = null; + } + + for (var33 = 0; var33 < 32768; ++var33) { + npcs[var33] = null; + } + + combatTargetPlayerIndex = -1; + projectiles.clear(); + graphicsObjects.clear(); + + for (var33 = 0; var33 < 4; ++var33) { + for (var13 = 0; var13 < 104; ++var13) { + for (int var17 = 0; var17 < 104; ++var17) { + groundItems[var33][var13][var17] = null; + } + } + } + + pendingSpawns = new NodeDeque(); + class32.friendSystem.clear(); + + for (var33 = 0; var33 < VarpDefinition.VarpDefinition_fileCount; ++var33) { + VarpDefinition var26 = class16.method180(var33); + if (var26 != null) { + Varps.Varps_temp[var33] = 0; + Varps.Varps_main[var33] = 0; + } + } + + KeyHandler.varcs.clearTransient(); + followerIndex = -1; + if (rootInterface != -1) { + UrlRequester.method3250(rootInterface); + } + + for (InterfaceParent var23 = (InterfaceParent)interfaceParents.first(); var23 != null; var23 = (InterfaceParent)interfaceParents.next()) { + VarpDefinition.closeInterface(var23, true); + } + + rootInterface = -1; + interfaceParents = new NodeHashTable(8); + meslayerContinueWidget = null; + menuOptionsCount = 0; + isMenuOpen = false; + playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); + + for (var33 = 0; var33 < 8; ++var33) { + playerMenuActions[var33] = null; + playerOptionsPriorities[var33] = false; + } + + ItemContainer.itemContainers = new NodeHashTable(32); + isLoading = true; + + for (var33 = 0; var33 < 100; ++var33) { + field703[var33] = true; + } + + WorldMapCacheName.method593(); + clanChat = null; + + for (var33 = 0; var33 < 8; ++var33) { + grandExchangeOffers[var33] = new GrandExchangeOffer(); + } + + class2.grandExchangeEvents = null; + ScriptFrame.updatePlayer(var2); + class13.field86 = -1; + PendingSpawn.loadRegions(false, var2); + packetWriter.serverPacket = null; + } + } } - } catch (IOException var22) { - if (field688 < 1) { - if (Varcs.port3 == Language.port1) { - Varcs.port3 = Skeleton.port2; + } catch (IOException var20) { + if (field659 < 1) { + if (WorldMapRectangle.port1 == SecureRandomCallable.port3) { + SecureRandomCallable.port3 = FloorDecoration.port2; } else { - Varcs.port3 = Language.port1; + SecureRandomCallable.port3 = WorldMapRectangle.port1; } - ++field688; + ++field659; loginState = 0; } else { - WorldMapIcon_1.getLoginError(-2); + GrandExchangeOfferOwnWorldComparator.getLoginError(-2); } } } - @ObfuscatedName("fg") + @ObfuscatedName("fc") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1319159959" + garbageValue = "784775140" ) @Export("doCycleLoggedIn") final void doCycleLoggedIn() { @@ -2675,722 +3281,649 @@ public final class Client extends GameShell implements Usernamed { --logoutTimer; } - if (field701) { - field701 = false; - ScriptFrame.method1090(); - return; - } - - if (!isMenuOpen) { - GraphicsObject.addCancelMenuEntry(); - } - - for (int var1 = 0; var1 < 100; ++var1) { - if (!this.method1451(packetWriter)) { - break; + if (field672) { + field672 = false; + class2.method31(); + } else { + if (!isMenuOpen) { + LoginScreenAnimation.addCancelMenuEntry(); } - } - if (gameState != 30) { - return; - } + int var1; + for (var1 = 0; var1 < 100 && this.method1467(packetWriter); ++var1) { + } - while (MidiPcmStream.hasReflectionCheck()) { - PacketBufferNode var15 = Archive.getPacketBufferNode(ClientPacket.field2252, packetWriter.isaacCipher); - var15.packetBuffer.writeByte(0); - int var2 = var15.packetBuffer.offset; - HealthBarUpdate.performReflectionCheck(var15.packetBuffer); - var15.packetBuffer.writeLengthByte(var15.packetBuffer.offset - var2); - packetWriter.addNode(var15); - } + if (gameState == 30) { + int var2; + PacketBufferNode var14; + while (GraphicsObject.hasReflectionCheck()) { + var14 = MenuAction.getPacketBufferNode(ClientPacket.field2285, packetWriter.isaacCipher); + var14.packetBuffer.writeByte(0); + var2 = var14.packetBuffer.offset; + InterfaceParent.performReflectionCheck(var14.packetBuffer); + var14.packetBuffer.writeLengthByte(var14.packetBuffer.offset - var2); + packetWriter.addNode(var14); + } - if (timer.field3605) { - PacketBufferNode var15 = Archive.getPacketBufferNode(ClientPacket.field2217, packetWriter.isaacCipher); - var15.packetBuffer.writeByte(0); - int var2 = var15.packetBuffer.offset; - timer.write(var15.packetBuffer); - var15.packetBuffer.writeLengthByte(var15.packetBuffer.offset - var2); - packetWriter.addNode(var15); - timer.method4998(); - } + if (timer.field3560) { + var14 = MenuAction.getPacketBufferNode(ClientPacket.field2195, 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.method4925(); + } - - synchronized(class40.mouseRecorder.lock) { - if (!field912) { - class40.mouseRecorder.index = 0; - } else if (MouseHandler.MouseHandler_lastButton != 0 || class40.mouseRecorder.index >= 40) { - PacketBufferNode var16 = null; - int var3 = 0; - int var4 = 0; - int var5 = 0; - int var6 = 0; - - for (int var7 = 0; var7 < class40.mouseRecorder.index && (var16 == null || var16.packetBuffer.offset - var3 < 246); ++var7, ++var6, field666 = class40.mouseRecorder.millis[var7]) { - var4 = var7; - int var8 = class40.mouseRecorder.ys[var7]; - if (var8 < -1) { - var8 = -1; - } else if (var8 > 65534) { - var8 = 65534; - } - - int var9 = class40.mouseRecorder.xs[var7]; - if (var9 < -1) { - var9 = -1; - } else if (var9 > 65534) { - var9 = 65534; - } - - if (var9 == field717 && var8 == field665) { - continue; - } - if (var16 == null) { - var16 = Archive.getPacketBufferNode(ClientPacket.field2237, packetWriter.isaacCipher); - var16.packetBuffer.writeByte(0); - var3 = var16.packetBuffer.offset; - PacketBuffer var10000 = var16.packetBuffer; - var10000.offset += 2; + int var3; + int var4; + int var5; + int var6; + int var7; + int var8; + int var9; + PacketBuffer var10000; + synchronized(Language.mouseRecorder.lock) { + if (!field783) { + Language.mouseRecorder.index = 0; + } else if (MouseHandler.MouseHandler_lastButton != 0 || Language.mouseRecorder.index >= 40) { + PacketBufferNode var15 = null; + var3 = 0; + var4 = 0; var5 = 0; var6 = 0; - } - int var10, var11, var12; - if (-1L != field666) { - var10 = var9 - field717; - var11 = var8 - field665; - var12 = (int)((class40.mouseRecorder.millis[var7] - field666) / 20L); - var5 = (int)((long)var5 + (class40.mouseRecorder.millis[var7] - field666) % 20L); - } else { - var10 = var9; - var11 = var8; - var12 = Integer.MAX_VALUE; - } - field717 = var9; - field665 = var8; - if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { - var10 += 32; - var11 += 32; - var16.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); - } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { - var10 += 128; - var11 += 128; - var16.packetBuffer.writeByte(var12 + 128); - var16.packetBuffer.writeShort(var11 + (var10 << 8)); - } else if (var12 < 32) { - var16.packetBuffer.writeByte(var12 + 192); - if (var9 != -1 && var8 != -1) { - var16.packetBuffer.writeInt(var9 | var8 << 16); - } else { - var16.packetBuffer.writeInt(Integer.MIN_VALUE); - } - } else { - var16.packetBuffer.writeShort((var12 & 8191) + 57344); - if (var9 != -1 && var8 != -1) { - var16.packetBuffer.writeInt(var9 | var8 << 16); - } else { - var16.packetBuffer.writeInt(Integer.MIN_VALUE); - } - } - } + for (var7 = 0; var7 < Language.mouseRecorder.index && (var15 == null || var15.packetBuffer.offset - var3 < 246); ++var7) { + var4 = var7; + var8 = Language.mouseRecorder.ys[var7]; + if (var8 < -1) { + var8 = -1; + } else if (var8 > 65534) { + var8 = 65534; + } - if (var16 != null) { - var16.packetBuffer.writeLengthByte(var16.packetBuffer.offset - var3); - int var7 = var16.packetBuffer.offset; - var16.packetBuffer.offset = var3; - var16.packetBuffer.writeByte(var5 / var6); - var16.packetBuffer.writeByte(var5 % var6); - var16.packetBuffer.offset = var7; - packetWriter.addNode(var16); - } + var9 = Language.mouseRecorder.xs[var7]; + if (var9 < -1) { + var9 = -1; + } else if (var9 > 65534) { + var9 = 65534; + } - if (var4 >= class40.mouseRecorder.index) { - class40.mouseRecorder.index = 0; - } else { - MouseRecorder var43 = class40.mouseRecorder; - var43.index -= var4; - System.arraycopy(class40.mouseRecorder.xs, var4, class40.mouseRecorder.xs, 0, class40.mouseRecorder.index); - System.arraycopy(class40.mouseRecorder.ys, var4, class40.mouseRecorder.ys, 0, class40.mouseRecorder.index); - System.arraycopy(class40.mouseRecorder.millis, var4, class40.mouseRecorder.millis, 0, class40.mouseRecorder.index); - } - } - } + if (var9 != field838 || var8 != field637) { + if (var15 == null) { + var15 = MenuAction.getPacketBufferNode(ClientPacket.field2219, packetWriter.isaacCipher); + var15.packetBuffer.writeByte(0); + var3 = var15.packetBuffer.offset; + var10000 = var15.packetBuffer; + var10000.offset += 2; + var5 = 0; + var6 = 0; + } - if (MouseHandler.MouseHandler_lastButton == 1 || !DevicePcmPlayerProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { - long var17 = (MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis * -1L) / 50L; - if (var17 > 4095L) { - var17 = 4095L; - } + int var10; + int var11; + int var12; + if (field889 != -1L) { + var10 = var9 - field838; + var11 = var8 - field637; + var12 = (int)((Language.mouseRecorder.millis[var7] - field889) / 20L); + var5 = (int)((long)var5 + (Language.mouseRecorder.millis[var7] - field889) % 20L); + } else { + var10 = var9; + var11 = var8; + var12 = Integer.MAX_VALUE; + } - mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis * -1L; - int var3 = MouseHandler.MouseHandler_lastPressedY; - if (var3 < 0) { - var3 = 0; - } else if (var3 > ParamDefinition.canvasHeight) { - var3 = ParamDefinition.canvasHeight; - } + field838 = var9; + field637 = var8; + if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { + var10 += 32; + var11 += 32; + var15.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); + } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { + var10 += 128; + var11 += 128; + var15.packetBuffer.writeByte(var12 + 128); + var15.packetBuffer.writeShort(var11 + (var10 << 8)); + } else if (var12 < 32) { + var15.packetBuffer.writeByte(var12 + 192); + if (var9 != -1 && var8 != -1) { + var15.packetBuffer.writeInt(var9 | var8 << 16); + } else { + var15.packetBuffer.writeInt(Integer.MIN_VALUE); + } + } else { + var15.packetBuffer.writeShort((var12 & 8191) + 57344); + if (var9 != -1 && var8 != -1) { + var15.packetBuffer.writeInt(var9 | var8 << 16); + } else { + var15.packetBuffer.writeInt(Integer.MIN_VALUE); + } + } - int var4 = MouseHandler.MouseHandler_lastPressedX; - if (var4 < 0) { - var4 = 0; - } else if (var4 > GrandExchangeEvent.canvasWidth) { - var4 = GrandExchangeEvent.canvasWidth; - } - - int var5 = (int)var17; - PacketBufferNode var19 = Archive.getPacketBufferNode(ClientPacket.field2234, packetWriter.isaacCipher); - var19.packetBuffer.writeShort((MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0) + (var5 << 1)); - var19.packetBuffer.writeShort(var4); - var19.packetBuffer.writeShort(var3); - packetWriter.addNode(var19); - } - - if (KeyHandler.field386 > 0) { - PacketBufferNode var15 = Archive.getPacketBufferNode(ClientPacket.field2270, packetWriter.isaacCipher); - var15.packetBuffer.writeShort(0); - int var2 = var15.packetBuffer.offset; - long var20 = DirectByteArrayCopier.currentTimeMs(); - - for (int var5 = 0; var5 < KeyHandler.field386; ++var5) { - long var22 = var20 - field879; - if (var22 > 0xffffffL) { - var22 = 0xffffffL; - } - - field879 = var20; - var15.packetBuffer.method5521(KeyHandler.field401[var5]); - var15.packetBuffer.writeMedium((int)var22); - } - - var15.packetBuffer.writeLengthShort(var15.packetBuffer.offset - var2); - packetWriter.addNode(var15); - } - - if (field822 > 0) { - --field822; - } - - if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { - field878 = true; - } - - if (field878 && field822 <= 0) { - field822 = 20; - field878 = false; - PacketBufferNode var15 = Archive.getPacketBufferNode(ClientPacket.field2242, packetWriter.isaacCipher); - var15.packetBuffer.method5475(camAngleX); - var15.packetBuffer.writeShortLE(camAngleY); - packetWriter.addNode(var15); - } - - if (class267.hasFocus && !hadFocus) { - hadFocus = true; - PacketBufferNode var15 = Archive.getPacketBufferNode(ClientPacket.field2276, packetWriter.isaacCipher); - var15.packetBuffer.writeByte(1); - packetWriter.addNode(var15); - } - - if (!class267.hasFocus && hadFocus) { - hadFocus = false; - PacketBufferNode var15 = Archive.getPacketBufferNode(ClientPacket.field2276, packetWriter.isaacCipher); - var15.packetBuffer.writeByte(0); - packetWriter.addNode(var15); - } - - if (BoundaryObject.worldMap != null) { - BoundaryObject.worldMap.method6299(); - } - - KeyHandler.ClanChat_leave(); - if (field747 != class42.plane) { - field747 = class42.plane; - int var1 = class42.plane; - int[] var37 = RouteStrategy.sceneMinimapSprite.pixels; - int var3 = var37.length; - - for (int var4 = 0; var4 < var3; ++var4) { - var37[var4] = 0; - } - - for (int var4 = 1; var4 < 103; ++var4) { - int var5 = (103 - var4) * 2048 + 24628; - - for (int var6 = 1; var6 < 103; ++var6) { - if ((Tiles.Tiles_renderFlags[var1][var6][var4] & 24) == 0) { - GrandExchangeOfferWorldComparator.scene.drawTileMinimap(var37, var5, 512, var1, var6, var4); - } - - if (var1 < 3 && (Tiles.Tiles_renderFlags[var1 + 1][var6][var4] & 8) != 0) { - GrandExchangeOfferWorldComparator.scene.drawTileMinimap(var37, var5, 512, var1 + 1, var6, var4); - } - - var5 += 4; - } - } - - int var4 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); - int var5 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; - RouteStrategy.sceneMinimapSprite.setRaster(); - - for (int var6 = 1; var6 < 103; ++var6) { - for (int var7 = 1; var7 < 103; ++var7) { - if ((Tiles.Tiles_renderFlags[var1][var7][var6] & 24) == 0) { - class3.drawObject(var1, var7, var6, var4, var5); - } - - if (var1 < 3 && (Tiles.Tiles_renderFlags[var1 + 1][var7][var6] & 8) != 0) { - class3.drawObject(var1 + 1, var7, var6, var4, var5); - } - } - } - - mapIconCount = 0; - - for (int var6 = 0; var6 < 104; ++var6) { - for (int var7 = 0; var7 < 104; ++var7) { - long var24 = GrandExchangeOfferWorldComparator.scene.getFloorDecorationTag(class42.plane, var6, var7); - if (0L != var24) { - int var10 = class43.Entity_unpackID(var24); - int var11 = ViewportMouse.getObjectDefinition(var10).mapIconId; - if (var11 >= 0) { - mapIcons[mapIconCount] = class222.WorldMapElement_get(var11).getSpriteBool(false); - mapIconXs[mapIconCount] = var6; - mapIconYs[mapIconCount] = var7; - ++mapIconCount; - } - } - } - } - - MusicPatchPcmStream.rasterProvider.apply(); - } - - if (gameState != 30) { - return; - } - for (PendingSpawn var35 = (PendingSpawn)pendingSpawns.last(); var35 != null; var35 = (PendingSpawn)pendingSpawns.previous()) { - if (var35.hitpoints > 0) { - --var35.hitpoints; - } - - if (var35.hitpoints == 0) { - if (var35.objectId < 0 || Players.method2091(var35.objectId, var35.field933)) { - DirectByteArrayCopier.addPendingSpawnToScene(var35.plane, var35.type, var35.x, var35.y, var35.objectId, var35.field936, var35.field933); - var35.remove(); - } - continue; - } - if (var35.delay > 0) { - --var35.delay; - } - - if (var35.delay != 0 || var35.x < 1 || var35.y < 1 || var35.x > 102 || var35.y > 102 || (var35.id >= 0 && !Players.method2091(var35.id, var35.field940))) { - continue; - } - DirectByteArrayCopier.addPendingSpawnToScene(var35.plane, var35.type, var35.x, var35.y, var35.id, var35.orientation, var35.field940); - var35.delay = -1; - if (var35.id == var35.objectId && var35.objectId == -1) { - var35.remove(); - } else if (var35.objectId == var35.id && var35.field936 == var35.orientation && var35.field933 == var35.field940) { - var35.remove(); - } - } - - KitDefinition.method4461(); - ++packetWriter.field1318; - if (packetWriter.field1318 > 750) { - ScriptFrame.method1090(); - return; - } - int var1 = Players.Players_count; - int[] var37 = Players.Players_indices; - - for (int var3 = 0; var3 < var1; ++var3) { - Player var26 = players[var37[var3]]; - if (var26 != null) { - StructDefinition.calculateActorPosition(var26, 1); - } - } - - MouseRecorder.method1141(); - Player.processOverheadText(); - ++field718; - if (mouseCrossColor != 0) { - mouseCrossState = mouseCrossState * 400 + 400; - if (mouseCrossState * 20 >= 400) { - mouseCrossColor = 0; - } - } - - if (ItemContainer.field549 != null) { - ++field759; - if (field759 >= 15) { - Strings.invalidateWidget(ItemContainer.field549); - ItemContainer.field549 = null; - } - } - - Widget var36 = LoginScreenAnimation.mousedOverWidgetIf1; - Widget var38 = class32.field284; - LoginScreenAnimation.mousedOverWidgetIf1 = null; - class32.field284 = null; - draggedOnWidget = null; - field745 = false; - field873 = false; - field754 = 0; - - while (class218.isKeyDown() && field754 < 128) { - if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && ReflectionCheck.field1338 == 66) { - String var27 = UrlRequester.getChatMessagesAsString(); - WorldMapSprite.client.clipboardSetString(var27); - } else if (oculusOrbState != 1 || Calendar.field2508 <= 0) { - field921[field754] = ReflectionCheck.field1338; - field877[field754] = Calendar.field2508; - ++field754; - } - } - - boolean var33 = staffModLevel >= 2; - if (var33 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { - int var4 = localPlayer.plane - mouseWheelRotation; - if (var4 < 0) { - var4 = 0; - } else if (var4 > 3) { - var4 = 3; - } - - if (var4 != localPlayer.plane) { - WorldMapLabel.changePlane(localPlayer.pathX[0] + MusicPatchNode2.baseX * 64, localPlayer.pathY[0] + class1.baseY * 64, var4, false); - } - - mouseWheelRotation = 0; - } - - if (rootInterface != -1) { - Skills.updateRootInterface(rootInterface, 0, 0, GrandExchangeEvent.canvasWidth, ParamDefinition.canvasHeight, 0, 0); - } - - ++cycleCntr; - while (true) { - ScriptEvent var41 = (ScriptEvent)Client.field852.removeLast(); - if (var41 == null) { - break; - } - Widget var28 = var41.widget; - if (var28.childIndex >= 0) { - final Widget var39 = class80.getWidget(var28.parentId); - if (var39 == null || var39.children == null || var28.childIndex >= var39.children.length) { - continue; - } - if (var28 != var39.children[var28.childIndex]) { - continue; - } - } - LoginPacket.runScriptEvent(var41); - } - while (true) { - ScriptEvent var41 = (ScriptEvent)Client.field856.removeLast(); - if (var41 == null) { - break; - } - Widget var28 = var41.widget; - if (var28.childIndex >= 0) { - final Widget var39 = class80.getWidget(var28.parentId); - if (var39 == null || var39.children == null || var28.childIndex >= var39.children.length) { - continue; - } - if (var28 != var39.children[var28.childIndex]) { - continue; - } - } - LoginPacket.runScriptEvent(var41); - } - while (true) { - ScriptEvent var41 = (ScriptEvent)Client.scriptEvents.removeLast(); - if (var41 == null) { - break; - } - Widget var28 = var41.widget; - if (var28.childIndex >= 0) { - final Widget var39 = class80.getWidget(var28.parentId); - if (var39 == null || var39.children == null || var28.childIndex >= var39.children.length) { - continue; - } - if (var28 != var39.children[var28.childIndex]) { - continue; - } - } - LoginPacket.runScriptEvent(var41); - } - - this.method1333(); - SpotAnimationDefinition.method4415(); - if (clickedWidget != null) { - this.method1641(); - } - - if (WorldMapIcon_0.dragInventoryWidget != null) { - Strings.invalidateWidget(WorldMapIcon_0.dragInventoryWidget); - ++itemDragDuration; - if (MouseHandler.MouseHandler_currentButton != 0) { - if (itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > field654 + 5 || MouseHandler.MouseHandler_x < field654 - 5 || MouseHandler.MouseHandler_y > field763 + 5 || MouseHandler.MouseHandler_y < field763 - 5)) { - field874 = true; - } - } else if (field874) { - if (class294.field3697 == WorldMapIcon_0.dragInventoryWidget && dragItemSlotDestination != dragItemSlotSource) { - Widget var42 = WorldMapIcon_0.dragInventoryWidget; - byte var34 = 0; - if (field809 == 1 && var42.contentType == 206) { - var34 = 1; - } - - if (var42.itemIds[dragItemSlotDestination] <= 0) { - var34 = 0; - } - - if (UserComparator4.method3382(class268.getWidgetClickMask(var42))) { - int var6 = dragItemSlotSource; - int var7 = dragItemSlotDestination; - var42.itemIds[var7] = var42.itemIds[var6]; - var42.itemQuantities[var7] = var42.itemQuantities[var6]; - var42.itemIds[var6] = -1; - var42.itemQuantities[var6] = 0; - } else if (var34 != 1) { - var42.swapItems(dragItemSlotDestination, dragItemSlotSource); - } else { - int var6 = dragItemSlotSource; - int var7 = dragItemSlotDestination; - - while (var6 != var7) { - if (var6 > var7) { - var42.swapItems(var6 - 1, var6); - --var6; - } else if (var6 < var7) { - var42.swapItems(var6 + 1, var6); ++var6; + field889 = Language.mouseRecorder.millis[var7]; } } + + if (var15 != null) { + var15.packetBuffer.writeLengthByte(var15.packetBuffer.offset - var3); + var7 = var15.packetBuffer.offset; + var15.packetBuffer.offset = var3; + var15.packetBuffer.writeByte(var5 / var6); + var15.packetBuffer.writeByte(var5 % var6); + var15.packetBuffer.offset = var7; + packetWriter.addNode(var15); + } + + if (var4 >= Language.mouseRecorder.index) { + Language.mouseRecorder.index = 0; + } else { + MouseRecorder var47 = Language.mouseRecorder; + var47.index -= var4; + System.arraycopy(Language.mouseRecorder.xs, var4, Language.mouseRecorder.xs, 0, Language.mouseRecorder.index); + System.arraycopy(Language.mouseRecorder.ys, var4, Language.mouseRecorder.ys, 0, Language.mouseRecorder.index); + System.arraycopy(Language.mouseRecorder.millis, var4, Language.mouseRecorder.millis, 0, Language.mouseRecorder.index); + } + } + } + + PacketBufferNode var18; + if (MouseHandler.MouseHandler_lastButton == 1 || !FriendSystem.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { + long var16 = (MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis * -1L) / 50L; + if (var16 > 4095L) { + var16 = 4095L; } - PacketBufferNode var19 = Archive.getPacketBufferNode(ClientPacket.field2283, packetWriter.isaacCipher); - var19.packetBuffer.writeShort(dragItemSlotDestination); - var19.packetBuffer.writeShortLE(dragItemSlotSource); - var19.packetBuffer.writeInt(WorldMapIcon_0.dragInventoryWidget.id); - var19.packetBuffer.method5521(var34); - packetWriter.addNode(var19); + mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis * -1L; + var3 = MouseHandler.MouseHandler_lastPressedY; + if (var3 < 0) { + var3 = 0; + } else if (var3 > class30.canvasHeight) { + var3 = class30.canvasHeight; + } + + var4 = MouseHandler.MouseHandler_lastPressedX; + if (var4 < 0) { + var4 = 0; + } else if (var4 > KitDefinition.canvasWidth) { + var4 = KitDefinition.canvasWidth; + } + + var5 = (int)var16; + var18 = MenuAction.getPacketBufferNode(ClientPacket.field2226, packetWriter.isaacCipher); + var18.packetBuffer.writeShort((var5 << 1) + (MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0)); + var18.packetBuffer.writeShort(var4); + var18.packetBuffer.writeShort(var3); + packetWriter.addNode(var18); } - } else if (this.shouldLeftClickOpenMenu()) { - this.openMenu(field654, field763); - } else if (menuOptionsCount > 0) { - int var4 = field654; - int var5 = field763; - MenuAction var40 = tempMenuAction; - Messages.menuAction(var40.argument1, var40.argument2, var40.opcode, var40.argument0, var40.action, var40.action, var4, var5); - tempMenuAction = null; - } - field759 = 10; - MouseHandler.MouseHandler_lastButton = 0; - WorldMapIcon_0.dragInventoryWidget = null; - } + if (KeyHandler.field380 > 0) { + var14 = MenuAction.getPacketBufferNode(ClientPacket.field2252, packetWriter.isaacCipher); + var14.packetBuffer.writeShort(0); + var2 = var14.packetBuffer.offset; + long var19 = SequenceDefinition.method4686(); - if (Scene.method3105()) { - int var4 = Scene.Scene_selectedX; - int var5 = Scene.Scene_selectedY; - PacketBufferNode var19 = Archive.getPacketBufferNode(ClientPacket.field2299, packetWriter.isaacCipher); - var19.packetBuffer.writeByte(5); - var19.packetBuffer.method5530(class1.baseY * 64 + var5); - var19.packetBuffer.method5530(MusicPatchNode2.baseX * 64 + var4); - var19.packetBuffer.method5520(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); - packetWriter.addNode(var19); - Scene.method3222(); - mouseCrossX = MouseHandler.MouseHandler_lastPressedX; - mouseCrossY = MouseHandler.MouseHandler_lastPressedY; - mouseCrossColor = 1; - mouseCrossState = 0; - destinationX = var4; - destinationY = var5; - } + for (var5 = 0; var5 < KeyHandler.field380; ++var5) { + long var21 = var19 - field847; + if (var21 > 16777215L) { + var21 = 16777215L; + } - if (var36 != LoginScreenAnimation.mousedOverWidgetIf1) { - if (var36 != null) { - Strings.invalidateWidget(var36); - } + field847 = var19; + var14.packetBuffer.method5545(KeyHandler.field379[var5]); + var14.packetBuffer.writeMedium((int)var21); + } - if (LoginScreenAnimation.mousedOverWidgetIf1 != null) { - Strings.invalidateWidget(LoginScreenAnimation.mousedOverWidgetIf1); - } - } + var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var2); + packetWriter.addNode(var14); + } - if (var38 != class32.field284 && field840 == field833) { - if (var38 != null) { - Strings.invalidateWidget(var38); - } + if (field712 > 0) { + --field712; + } - if (class32.field284 != null) { - Strings.invalidateWidget(class32.field284); - } - } + if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { + field708 = true; + } - if (class32.field284 == null) { - if (field840 > 0) { - --field840; - } - } else if (field840 < field833) { - ++field840; - if (field840 == field833) { - Strings.invalidateWidget(class32.field284); - } - } + if (field708 && field712 <= 0) { + field712 = 20; + field708 = false; + var14 = MenuAction.getPacketBufferNode(ClientPacket.field2224, packetWriter.isaacCipher); + var14.packetBuffer.method5432(camAngleX); + var14.packetBuffer.writeShortLE(camAngleY); + packetWriter.addNode(var14); + } - class80.method1982(); - if (isCameraLocked) { - int var4 = DevicePcmPlayerProvider.field412 * 16384 + 64; - int var5 = class210.field2516 * 16384 + 64; - int var6 = ScriptEvent.getTileHeight(var4, var5, class42.plane) - Language.field2345; - if (PacketBuffer.cameraX < var4) { - PacketBuffer.cameraX = (var4 - PacketBuffer.cameraX) * class96.field1327 / 1000 + PacketBuffer.cameraX + class83.field1166; - if (PacketBuffer.cameraX > var4) { - PacketBuffer.cameraX = var4; + if (class3.hasFocus && !hadFocus) { + hadFocus = true; + var14 = MenuAction.getPacketBufferNode(ClientPacket.field2258, packetWriter.isaacCipher); + var14.packetBuffer.writeByte(1); + packetWriter.addNode(var14); + } + + if (!class3.hasFocus && hadFocus) { + hadFocus = false; + var14 = MenuAction.getPacketBufferNode(ClientPacket.field2258, packetWriter.isaacCipher); + var14.packetBuffer.writeByte(0); + packetWriter.addNode(var14); + } + + if (WorldMapCacheName.worldMap != null) { + WorldMapCacheName.worldMap.method6187(); + } + + if (class13.ClanChat_inClanChat) { + if (clanChat != null) { + clanChat.sort(); + } + + for (var1 = 0; var1 < Players.Players_count; ++var1) { + Player var34 = players[Players.Players_indices[var1]]; + var34.clearIsInClanChat(); + } + + class13.ClanChat_inClanChat = false; + } + + GrandExchangeOfferUnitPriceComparator.method133(); + if (gameState == 30) { + FloorDecoration.method2788(); + + int var10002; + for (var1 = 0; var1 < soundEffectCount; ++var1) { + var10002 = queuedSoundEffectDelays[var1]--; + if (queuedSoundEffectDelays[var1] >= -10) { + SoundEffect var35 = soundEffects[var1]; + if (var35 == null) { + var10000 = null; + var35 = SoundEffect.readSoundEffect(WorldMapSprite.archive4, soundEffectIds[var1], 0); + if (var35 == null) { + continue; + } + + int[] var48 = queuedSoundEffectDelays; + var48[var1] += var35.calculateDelay(); + soundEffects[var1] = var35; + } + + if (queuedSoundEffectDelays[var1] < 0) { + if (soundLocations[var1] != 0) { + var4 = (soundLocations[var1] & 255) * 128; + var5 = soundLocations[var1] >> 16 & 255; + var6 = var5 * 128 + 64 - WorldMapIcon_1.localPlayer.x; + if (var6 < 0) { + var6 = -var6; + } + + var7 = soundLocations[var1] >> 8 & 255; + var8 = var7 * 128 + 64 - WorldMapIcon_1.localPlayer.y; + if (var8 < 0) { + var8 = -var8; + } + + var9 = var8 + var6 - 128; + if (var9 > var4) { + queuedSoundEffectDelays[var1] = -100; + continue; + } + + if (var9 < 0) { + var9 = 0; + } + + var3 = (var4 - var9) * field860 / var4; + } else { + var3 = soundEffectVolume; + } + + if (var3 > 0) { + RawSound var23 = var35.toRawSound().resample(class247.decimator); + RawPcmStream var24 = RawPcmStream.createRawPcmStream(var23, 100, var3); + var24.setNumLoops(queuedSoundEffectLoops[var1] - 1); + IgnoreList.pcmStreamMixer.addSubStream(var24); + } + + queuedSoundEffectDelays[var1] = -100; + } + } else { + --soundEffectCount; + + for (var2 = var1; var2 < soundEffectCount; ++var2) { + soundEffectIds[var2] = soundEffectIds[var2 + 1]; + soundEffects[var2] = soundEffects[var2 + 1]; + queuedSoundEffectLoops[var2] = queuedSoundEffectLoops[var2 + 1]; + queuedSoundEffectDelays[var2] = queuedSoundEffectDelays[var2 + 1]; + soundLocations[var2] = soundLocations[var2 + 1]; + } + + --var1; + } + } + + if (field858) { + boolean var29; + if (class197.field2378 != 0) { + var29 = true; + } else { + var29 = class197.midiPcmStream.isReady(); + } + + if (!var29) { + if (field856 != 0 && field857 != -1) { + PacketBufferNode.method3574(GrandExchangeEvent.archive6, field857, 0, field856, false); + } + + field858 = false; + } + } + + ++packetWriter.field1293; + if (packetWriter.field1293 > 750) { + class2.method31(); + } else { + var1 = Players.Players_count; + int[] var36 = Players.Players_indices; + + for (var3 = 0; var3 < var1; ++var3) { + Player var41 = players[var36[var3]]; + if (var41 != null) { + class1.calculateActorPosition(var41, 1); + } + } + + WorldMapRectangle.method280(); + UserComparator3.processOverheadText(); + ++field879; + if (mouseCrossColor != 0) { + mouseCrossState = mouseCrossState * 400 + 20; + if (mouseCrossState * 400 >= 400) { + mouseCrossColor = 0; + } + } + + if (Actor.field978 != null) { + ++field729; + if (field729 >= 15) { + FriendSystem.invalidateWidget(Actor.field978); + Actor.field978 = null; + } + } + + Widget var33 = class65.mousedOverWidgetIf1; + Widget var38 = WorldMapDecoration.field198; + class65.mousedOverWidgetIf1 = null; + WorldMapDecoration.field198 = null; + draggedOnWidget = null; + field804 = false; + field641 = false; + field677 = 0; + + while (FontName.isKeyDown() && field677 < 128) { + if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && ReflectionCheck.field1307 == 66) { + String var42 = ""; + + Message var37; + for (Iterator var43 = Messages.Messages_hashTable.iterator(); var43.hasNext(); var42 = var42 + var37.sender + ':' + var37.text + '\n') { + var37 = (Message)var43.next(); + } + + WorldMapID.client.clipboardSetString(var42); + } else if (oculusOrbState != 1 || SpriteMask.field2499 <= 0) { + field815[field677] = ReflectionCheck.field1307; + field845[field677] = SpriteMask.field2499; + ++field677; + } + } + + boolean var30 = staffModLevel >= 2; + if (var30 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { + var4 = WorldMapIcon_1.localPlayer.plane - mouseWheelRotation; + if (var4 < 0) { + var4 = 0; + } else if (var4 > 3) { + var4 = 3; + } + + if (var4 != WorldMapIcon_1.localPlayer.plane) { + BoundaryObject.method3215(WorldMapIcon_1.localPlayer.pathX[0] + PacketWriter.baseX * 64, WorldMapIcon_1.localPlayer.pathY[0] + RouteStrategy.baseY * 64, var4, false); + } + + mouseWheelRotation = 0; + } + + if (rootInterface != -1) { + MouseRecorder.updateRootInterface(rootInterface, 0, 0, KitDefinition.canvasWidth, class30.canvasHeight, 0, 0); + } + + ++cycleCntr; + + while (true) { + Widget var39; + ScriptEvent var44; + Widget var45; + do { + var44 = (ScriptEvent)field633.removeLast(); + if (var44 == null) { + while (true) { + do { + var44 = (ScriptEvent)field824.removeLast(); + if (var44 == null) { + while (true) { + do { + var44 = (ScriptEvent)scriptEvents.removeLast(); + if (var44 == null) { + this.method1293(); + if (WorldMapCacheName.worldMap != null) { + WorldMapCacheName.worldMap.method6193(ItemContainer.plane, PacketWriter.baseX * 64 + (WorldMapIcon_1.localPlayer.x >> 7), RouteStrategy.baseY * 64 + (WorldMapIcon_1.localPlayer.y >> 7), false); + WorldMapCacheName.worldMap.loadCache(); + } + + if (clickedWidget != null) { + this.method1615(); + } + + if (class188.dragInventoryWidget != null) { + FriendSystem.invalidateWidget(class188.dragInventoryWidget); + ++itemDragDuration; + if (MouseHandler.MouseHandler_currentButton == 0) { + if (field867) { + if (class188.dragInventoryWidget == class222.field2730 && dragItemSlotSource != dragItemSlotDestination) { + Widget var46 = class188.dragInventoryWidget; + byte var31 = 0; + if (field788 == 1 && var46.contentType == 206) { + var31 = 1; + } + + if (var46.itemIds[dragItemSlotDestination] <= 0) { + var31 = 0; + } + + var7 = ParamDefinition.getWidgetClickMask(var46); + boolean var32 = (var7 >> 29 & 1) != 0; + if (var32) { + var8 = dragItemSlotSource; + var9 = dragItemSlotDestination; + var46.itemIds[var9] = var46.itemIds[var8]; + var46.itemQuantities[var9] = var46.itemQuantities[var8]; + var46.itemIds[var8] = -1; + var46.itemQuantities[var8] = 0; + } else if (var31 == 1) { + var8 = dragItemSlotSource; + var9 = dragItemSlotDestination; + + while (var8 != var9) { + if (var8 > var9) { + var46.swapItems(var8 - 1, var8); + --var8; + } else if (var8 < var9) { + var46.swapItems(var8 + 1, var8); + ++var8; + } + } + } else { + var46.swapItems(dragItemSlotDestination, dragItemSlotSource); + } + + PacketBufferNode var26 = MenuAction.getPacketBufferNode(ClientPacket.field2265, packetWriter.isaacCipher); + var26.packetBuffer.writeShort(dragItemSlotDestination); + var26.packetBuffer.writeShortLE(dragItemSlotSource); + var26.packetBuffer.writeInt(class188.dragInventoryWidget.id); + var26.packetBuffer.method5545(var31); + packetWriter.addNode(var26); + } + } else if (this.shouldLeftClickOpenMenu()) { + this.openMenu(field732, field744); + } else if (menuOptionsCount > 0) { + var4 = field732; + var5 = field744; + MenuAction var40 = class1.tempMenuAction; + SecureRandomFuture.menuAction(var40.argument1, var40.argument2, var40.opcode, var40.argument0, var40.action, var40.action, var4, var5); + class1.tempMenuAction = null; + } + + field729 = 10; + MouseHandler.MouseHandler_lastButton = 0; + class188.dragInventoryWidget = null; + } else if (itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > field732 + 5 || MouseHandler.MouseHandler_x < field732 - 5 || MouseHandler.MouseHandler_y > field744 + 5 || MouseHandler.MouseHandler_y < field744 - 5)) { + field867 = true; + } + } + + if (Scene.method3049()) { + var4 = Scene.Scene_selectedX; + var5 = Scene.Scene_selectedY; + var18 = MenuAction.getPacketBufferNode(ClientPacket.field2281, packetWriter.isaacCipher); + var18.packetBuffer.writeByte(5); + var18.packetBuffer.method5443(RouteStrategy.baseY * 64 + var5); + var18.packetBuffer.method5443(PacketWriter.baseX * 64 + var4); + var18.packetBuffer.method5433(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); + packetWriter.addNode(var18); + Scene.method3050(); + mouseCrossX = MouseHandler.MouseHandler_lastPressedX; + mouseCrossY = MouseHandler.MouseHandler_lastPressedY; + mouseCrossColor = 1; + mouseCrossState = 0; + destinationX = var4; + destinationY = var5; + } + + if (var33 != class65.mousedOverWidgetIf1) { + if (var33 != null) { + FriendSystem.invalidateWidget(var33); + } + + if (class65.mousedOverWidgetIf1 != null) { + FriendSystem.invalidateWidget(class65.mousedOverWidgetIf1); + } + } + + if (var38 != WorldMapDecoration.field198 && field774 == field848) { + if (var38 != null) { + FriendSystem.invalidateWidget(var38); + } + + if (WorldMapDecoration.field198 != null) { + FriendSystem.invalidateWidget(WorldMapDecoration.field198); + } + } + + if (WorldMapDecoration.field198 != null) { + if (field774 < field848) { + ++field774; + if (field774 == field848) { + FriendSystem.invalidateWidget(WorldMapDecoration.field198); + } + } + } else if (field774 > 0) { + --field774; + } + + MilliClock.method3405(); + if (isCameraLocked) { + WorldMapIcon_1.method294(); + } + + for (var4 = 0; var4 < 5; ++var4) { + var10002 = field872[var4]++; + } + + KeyHandler.varcs.tryWrite(); + var4 = UserComparator3.method3371(); + var5 = Skeleton.method3008(); + if (var4 > 15000 && var5 > 15000) { + logoutTimer = 250; + MouseHandler.MouseHandler_idleCycles = 14500; + var18 = MenuAction.getPacketBufferNode(ClientPacket.field2234, packetWriter.isaacCipher); + packetWriter.addNode(var18); + } + + class32.friendSystem.processFriendUpdates(); + ++packetWriter.pendingWrites; + if (packetWriter.pendingWrites > 50) { + var18 = MenuAction.getPacketBufferNode(ClientPacket.field2207, packetWriter.isaacCipher); + packetWriter.addNode(var18); + } + + try { + packetWriter.flush(); + } catch (IOException var27) { + class2.method31(); + } + + return; + } + + var45 = var44.widget; + if (var45.childIndex < 0) { + break; + } + + var39 = WorldMapElement.getWidget(var45.parentId); + } while(var39 == null || var39.children == null || var45.childIndex >= var39.children.length || var45 != var39.children[var45.childIndex]); + + class81.runScriptEvent(var44); + } + } + + var45 = var44.widget; + if (var45.childIndex < 0) { + break; + } + + var39 = WorldMapElement.getWidget(var45.parentId); + } while(var39 == null || var39.children == null || var45.childIndex >= var39.children.length || var45 != var39.children[var45.childIndex]); + + class81.runScriptEvent(var44); + } + } + + var45 = var44.widget; + if (var45.childIndex < 0) { + break; + } + + var39 = WorldMapElement.getWidget(var45.parentId); + } while(var39 == null || var39.children == null || var45.childIndex >= var39.children.length || var45 != var39.children[var45.childIndex]); + + class81.runScriptEvent(var44); + } + } } } - - if (PacketBuffer.cameraX > var4) { - PacketBuffer.cameraX -= class96.field1327 * (PacketBuffer.cameraX - var4) / 1000 + class83.field1166; - if (PacketBuffer.cameraX < var4) { - PacketBuffer.cameraX = var4; - } - } - - if (class43.cameraY < var6) { - class43.cameraY = (var6 - class43.cameraY) * class96.field1327 / 1000 + class43.cameraY + class83.field1166; - if (class43.cameraY > var6) { - class43.cameraY = var6; - } - } - - if (class43.cameraY > var6) { - class43.cameraY -= class96.field1327 * (class43.cameraY - var6) / 1000 + class83.field1166; - if (class43.cameraY < var6) { - class43.cameraY = var6; - } - } - - if (class1.cameraZ < var5) { - class1.cameraZ = (var5 - class1.cameraZ) * class96.field1327 / 1000 + class1.cameraZ + class83.field1166; - if (class1.cameraZ > var5) { - class1.cameraZ = var5; - } - } - - if (class1.cameraZ > var5) { - class1.cameraZ -= class96.field1327 * (class1.cameraZ - var5) / 1000 + class83.field1166; - if (class1.cameraZ < var5) { - class1.cameraZ = var5; - } - } - - var4 = HealthBarUpdate.field1017 * 16384 + 64; - var5 = class30.field259 * 16384 + 64; - var6 = ScriptEvent.getTileHeight(var4, var5, class42.plane) - WorldMapID.field268; - int var7 = var4 - PacketBuffer.cameraX; - int var8 = var6 - class43.cameraY; - int var9 = var5 - class1.cameraZ; - int var10 = (int) Math.sqrt((double) (var7 * var7 + var9 * var9)); - int var11 = (int) (Math.atan2((double) var8, (double) var10) * 325.949D) & 2047; - int var12 = (int) (Math.atan2((double) var7, (double) var9) * -325.949D) & 2047; - if (var11 < 128) { - var11 = 128; - } - - if (var11 > 383) { - var11 = 383; - } - - if (GrandExchangeOfferNameComparator.cameraPitch < var11) { - GrandExchangeOfferNameComparator.cameraPitch = (var11 - GrandExchangeOfferNameComparator.cameraPitch) * Tiles.field501 / 1000 + GrandExchangeOfferNameComparator.cameraPitch + ScriptFrame.field526; - if (GrandExchangeOfferNameComparator.cameraPitch > var11) { - GrandExchangeOfferNameComparator.cameraPitch = var11; - } - } - - if (GrandExchangeOfferNameComparator.cameraPitch > var11) { - GrandExchangeOfferNameComparator.cameraPitch -= Tiles.field501 * (GrandExchangeOfferNameComparator.cameraPitch - var11) / 1000 + ScriptFrame.field526; - if (GrandExchangeOfferNameComparator.cameraPitch < var11) { - GrandExchangeOfferNameComparator.cameraPitch = var11; - } - } - - int var29 = var12 - Interpreter.cameraYaw; - if (var29 > 1024) { - var29 -= 2048; - } - - if (var29 < -1024) { - var29 += 2048; - } - - if (var29 > 0) { - Interpreter.cameraYaw = var29 * Tiles.field501 / 1000 + Interpreter.cameraYaw + ScriptFrame.field526; - Interpreter.cameraYaw &= 2047; - } - - if (var29 < 0) { - Interpreter.cameraYaw -= -var29 * Tiles.field501 / 1000 + ScriptFrame.field526; - Interpreter.cameraYaw &= 2047; - } - - int var14 = var12 - Interpreter.cameraYaw; - if (var14 > 1024) { - var14 -= 2048; - } - - if (var14 < -1024) { - var14 += 2048; - } - - if (var14 < 0 && var29 > 0 || var14 > 0 && var29 < 0) { - Interpreter.cameraYaw = var12; - } - } - - for (int var4 = 0; var4 < 5; ++var4) { - field904[var4]++; - } - - Clock.varcs.tryWrite(); - int var4 = ++MouseHandler.MouseHandler_idleCycles - 1; - int var6 = KeyHandler.KeyHandler_idleCycles; - PacketBufferNode var30; - if (var4 > 15000 && var6 > 15000) { - logoutTimer = 250; - MouseHandler.MouseHandler_idleCycles = 14500; - var30 = Archive.getPacketBufferNode(ClientPacket.field2300, packetWriter.isaacCipher); - packetWriter.addNode(var30); - } - - ArchiveLoader.friendSystem.processFriendUpdates(); - ++packetWriter.pendingWrites; - if (packetWriter.pendingWrites > 50) { - var30 = Archive.getPacketBufferNode(ClientPacket.field2225, packetWriter.isaacCipher); - packetWriter.addNode(var30); - } - - try { - packetWriter.flush(); - } catch (IOException var31) { - ScriptFrame.method1090(); } } - @ObfuscatedName("fq") + @ObfuscatedName("gj") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1617101116" + signature = "(B)V", + garbageValue = "48" ) @Export("resizeJS") void resizeJS() { - int var1 = GrandExchangeEvent.canvasWidth; - int var2 = ParamDefinition.canvasHeight; + int var1 = KitDefinition.canvasWidth; + int var2 = class30.canvasHeight; if (super.contentWidth < var1) { var1 = super.contentWidth; } @@ -3399,2017 +3932,2529 @@ public final class Client extends GameShell implements Usernamed { var2 = super.contentHeight; } - if (WorldMapLabelSize.clientPreferences != null) { + if (GrandExchangeOffer.clientPreferences != null) { try { - class47.method806(WorldMapSprite.client, "resize", new Object[]{AbstractWorldMapIcon.getWindowedMode()}); + class47.method795(WorldMapID.client, "resize", new Object[]{UserComparator7.getWindowedMode()}); } catch (Throwable var4) { } } } - @ObfuscatedName("fc") + @ObfuscatedName("gv") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "2072838249" + garbageValue = "-1443286014" ) @Export("drawLoggedIn") final void drawLoggedIn() { if (rootInterface != -1) { - Archive.drawInterfaceModelComponents(rootInterface); + CollisionMap.drawInterfaceModelComponents(rootInterface); } - for (int var1 = 0; var1 < rootWidgetCount; ++var1) { - if (field843[var1]) { - field861[var1] = true; + int var1; + for (var1 = 0; var1 < rootWidgetCount; ++var1) { + if (field703[var1]) { + field829[var1] = true; } - field862[var1] = field843[var1]; - field843[var1] = false; + field830[var1] = field703[var1]; + field703[var1] = false; } - field741 = cycle; + field752 = cycle; viewportX = -1; viewportY = -1; - class294.field3697 = null; + class222.field2730 = null; if (rootInterface != -1) { rootWidgetCount = 0; - class191.drawWidgets(rootInterface, 0, 0, GrandExchangeEvent.canvasWidth, ParamDefinition.canvasHeight, 0, 0, -1); + class2.drawWidgets(rootInterface, 0, 0, KitDefinition.canvasWidth, class30.canvasHeight, 0, 0, -1); } Rasterizer2D.Rasterizer2D_resetClip(); if (showMouseCross) { if (mouseCrossColor == 1) { - Occluder.crossSprites[mouseCrossState * 20 / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); + DefaultsGroup.crossSprites[mouseCrossState * 400 / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); } if (mouseCrossColor == 2) { - Occluder.crossSprites[mouseCrossState * 20 / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); + DefaultsGroup.crossSprites[mouseCrossState * 400 / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); } } if (!isMenuOpen) { if (viewportX != -1) { - WorldMapSprite.drawMenuActionTextAt(viewportX, viewportY); + var1 = viewportX; + int var2 = viewportY; + if ((menuOptionsCount >= 2 || isItemSelected != 0 || isSpellSelected) && showMouseOverText) { + int var3 = Player.getNewestMenuIdx(); + String var4; + if (isItemSelected == 1 && menuOptionsCount < 2) { + var4 = "Use" + " " + selectedItemName + " " + "->"; + } else if (isSpellSelected && menuOptionsCount < 2) { + var4 = selectedSpellActionName + " " + selectedSpellName + " " + "->"; + } else { + String var5; + if (var3 < 0) { + var5 = ""; + } else if (menuTargets[var3].length() > 0) { + var5 = menuActions[var3] + " " + menuTargets[var3]; + } else { + var5 = menuActions[var3]; + } + + var4 = var5; + } + + if (menuOptionsCount > 2) { + var4 = var4 + class16.colorStartTag(16777215) + " " + '/' + " " + (menuOptionsCount - 2) + " more options"; + } + + class43.fontBold12.drawRandomAlphaAndSpacing(var4, var1 + 4, var2 + 15, 16777215, 0, cycle / 1000); + } } } else { - int var1 = class247.menuX; - int var2 = class30.menuY; - int var3 = class42.menuWidth; - int var4 = ObjectSound.menuHeight; - int var14 = 0x5d5447; - Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, var14); - Rasterizer2D.Rasterizer2D_fillRectangle(var1 + 1, var2 + 1, var3 - 2, 16, 0); - Rasterizer2D.Rasterizer2D_drawRectangle(var1 + 1, var2 + 18, var3 - 2, var4 - 19, 0); - WorldMapIcon_1.fontBold12.draw("Choose Option", var1 + 3, var2 + 14, var14, -1); - int var6 = MouseHandler.MouseHandler_x; - int var7 = MouseHandler.MouseHandler_y; - - for (int var13 = 0; var13 < menuOptionsCount; ++var13) { - int var15 = var2 + (menuOptionsCount - 1 - var13) * 15 + 31; - int var16 = 0xffffff; - if (var6 > var1 && var6 < var1 + var3 && var7 > var15 - 13 && var7 < var15 + 3) { - var16 = 0xffff00; - } - - WorldMapIcon_1.fontBold12.draw(WorldMapLabel.getMenuText(var13), var1 + 3, var15, var16, 0); - } - - int var13 = class247.menuX; - int var15 = class30.menuY; - int var16 = class42.menuWidth; - int var17 = ObjectSound.menuHeight; - - for (int var12 = 0; var12 < rootWidgetCount; ++var12) { - if (rootWidgetXs[var12] + rootWidgetWidths[var12] > var13 && rootWidgetXs[var12] < var13 + var16 && rootWidgetHeights[var12] + rootWidgetYs[var12] > var15 && rootWidgetYs[var12] < var15 + var17) { - field861[var12] = true; - } - } + WorldMapData_0.method176(); } if (gameDrawingMode == 3) { - for (int var1 = 0; var1 < rootWidgetCount; ++var1) { - if (field862[var1]) { - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 0xff00ff, 128); - } else if (field861[var1]) { - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 0xff0000, 128); + for (var1 = 0; var1 < rootWidgetCount; ++var1) { + if (field830[var1]) { + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); + } else if (field829[var1]) { + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); } } } - int var1 = class42.plane; - int var2 = localPlayer.x; - int var3 = localPlayer.y; - int var4 = field718; - - for (ObjectSound var5 = (ObjectSound)ObjectSound.objectSounds.last(); var5 != null; var5 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var5.soundEffectId == -1 && var5.soundEffectIds == null) { - continue; - } - int var6 = 0; - if (var2 > var5.field1077 * 128) { - var6 += var2 - var5.field1077 * 128; - } else if (var2 < var5.x * 16384) { - var6 += var5.x * 16384 - var2; - } - - if (var3 > var5.field1082 * 128) { - var6 += var3 - var5.field1082 * 128; - } else if (var3 < var5.y * 128) { - var6 += var5.y * 128 - var3; - } - - if (var6 - 64 > var5.field1091 || field892 == 0 || var1 != var5.plane) { - if (var5.stream1 != null) { - SecureRandomCallable.pcmStreamMixer.removeSubStream(var5.stream1); - var5.stream1 = null; - } - - if (var5.stream2 != null) { - SecureRandomCallable.pcmStreamMixer.removeSubStream(var5.stream2); - var5.stream2 = null; - } - continue; - } - var6 -= 64; - if (var6 < 0) { - var6 = 0; - } - - int var7 = (var5.field1091 - var6) * field892 / var5.field1091; - Object var10000; - if (var5.stream1 != null) { - var5.stream1.method2527(var7); - } else if (var5.soundEffectId >= 0) { - var10000 = null; - SoundEffect var8 = SoundEffect.readSoundEffect(class13.archive4, var5.soundEffectId, 0); - if (var8 != null) { - RawSound var9 = var8.toRawSound().resample(AttackOption.decimator); - RawPcmStream var10 = RawPcmStream.createRawPcmStream(var9, 100, var7); - var10.setNumLoops(-1); - SecureRandomCallable.pcmStreamMixer.addSubStream(var10); - var5.stream1 = var10; - } - } - - if (var5.stream2 != null) { - var5.stream2.method2527(var7); - if (!var5.stream2.hasNext()) { - var5.stream2 = null; - } - } else if (var5.soundEffectIds != null && (var5.field1089 -= var4) <= 0) { - int var13 = (int) (Math.random() * (double) var5.soundEffectIds.length); - var10000 = null; - SoundEffect var18 = SoundEffect.readSoundEffect(class13.archive4, var5.soundEffectIds[var13], 0); - if (var18 != null) { - RawSound var19 = var18.toRawSound().resample(AttackOption.decimator); - RawPcmStream var11 = RawPcmStream.createRawPcmStream(var19, 100, var7); - var11.setNumLoops(0); - SecureRandomCallable.pcmStreamMixer.addSubStream(var11); - var5.stream2 = var11; - var5.field1089 = var5.field1086 + (int) (Math.random() * (double) (var5.field1081 - var5.field1086)); - } - } - } - - field718 = 0; + GrandExchangeOfferAgeComparator.method156(ItemContainer.plane, WorldMapIcon_1.localPlayer.x, WorldMapIcon_1.localPlayer.y, field879); + field879 = 0; } - @ObfuscatedName("gg") + @ObfuscatedName("hc") @ObfuscatedSignature( - signature = "(Lcg;I)Z", - garbageValue = "1494391815" + signature = "(Lcy;B)Z", + garbageValue = "104" ) - final boolean method1451(PacketWriter var1) { + final boolean method1467(PacketWriter var1) { AbstractSocket var2 = var1.getSocket(); PacketBuffer var3 = var1.packetBuffer; if (var2 == null) { return false; - } - String var18; - try { - int var5; - if (var1.serverPacket == null) { - if (var1.field1322) { + } else { + int var6; + String var19; + try { + int var5; + if (var1.serverPacket == null) { + if (var1.field1284) { + if (!var2.isAvailable(1)) { + return false; + } + + var2.read(var1.packetBuffer.array, 0, 1); + var1.field1293 = 0; + var1.field1284 = false; + } + + var3.offset = 0; + if (var3.method5353()) { + if (!var2.isAvailable(1)) { + return false; + } + + var2.read(var1.packetBuffer.array, 1, 1); + var1.field1293 = 0; + } + + var1.field1284 = true; + ServerPacket[] var4 = MouseRecorder.ServerPacket_values(); + var5 = var3.readSmartByteShortIsaac(); + if (var5 < 0 || var5 >= var4.length) { + throw new IOException(var5 + " " + var3.offset); + } + + var1.serverPacket = var4[var5]; + var1.serverPacketLength = var1.serverPacket.length; + } + + if (var1.serverPacketLength == -1) { if (!var2.isAvailable(1)) { return false; } - var2.read(var1.packetBuffer.array, 0, 1); - var1.field1318 = 0; - var1.field1322 = false; + var1.getSocket().read(var3.array, 0, 1); + var1.serverPacketLength = var3.array[0] & 255; } - var3.offset = 0; - if (var3.method5441()) { - if (!var2.isAvailable(1)) { + if (var1.serverPacketLength == -2) { + if (!var2.isAvailable(2)) { return false; } - var2.read(var1.packetBuffer.array, 1, 1); - var1.field1318 = 0; + var1.getSocket().read(var3.array, 0, 2); + var3.offset = 0; + var1.serverPacketLength = var3.readUnsignedShort(); } - var1.field1322 = true; - ServerPacket[] var4 = Interpreter.ServerPacket_values(); - var5 = var3.readSmartByteShortIsaac(); - if (var5 < 0 || var5 >= var4.length) { - throw new IOException(var5 + " " + var3.offset); - } - - var1.serverPacket = var4[var5]; - var1.serverPacketLength = var1.serverPacket.length; - } - - if (var1.serverPacketLength == -1) { - if (!var2.isAvailable(1)) { + if (!var2.isAvailable(var1.serverPacketLength)) { return false; } - var1.getSocket().read(var3.array, 0, 1); - var1.serverPacketLength = var3.array[0] & 255; - } - - if (var1.serverPacketLength == -2) { - if (!var2.isAvailable(2)) { - return false; - } - - var1.getSocket().read(var3.array, 0, 2); var3.offset = 0; - var1.serverPacketLength = var3.readUnsignedShort(); - } - - if (!var2.isAvailable(var1.serverPacketLength)) { - return false; - } - - var3.offset = 0; - var2.read(var3.array, 0, var1.serverPacketLength); - var1.field1318 = 0; - timer.method5005(); - var1.field1317 = var1.field1321; - var1.field1321 = var1.field1309; - var1.field1309 = var1.serverPacket; - Widget var6; - int var16; - boolean var47; - if (ServerPacket.field2136 == var1.serverPacket) { - var16 = var3.readInt(); - var47 = var3.readUnsignedByte() == 1; - var6 = class80.getWidget(var16); - if (var47 != var6.isHidden) { - var6.isHidden = var47; - Strings.invalidateWidget(var6); + var2.read(var3.array, 0, var1.serverPacketLength); + var1.field1293 = 0; + timer.method4897(); + var1.field1291 = var1.field1296; + var1.field1296 = var1.field1295; + var1.field1295 = var1.serverPacket; + if (ServerPacket.field2150 == var1.serverPacket) { + SoundSystem.readReflectionCheck(var3, var1.serverPacketLength); + var1.serverPacket = null; + return true; } - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2115 == var1.serverPacket) { - minimapState = var3.readUnsignedByte(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2200 == var1.serverPacket) { - var16 = var3.readUnsignedByte(); - SoundCache.method2491(var16); - var1.serverPacket = null; - return false; - } - - if (ServerPacket.field2128 == var1.serverPacket) { - class1.method10(class185.field2320); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2168 == var1.serverPacket) { - byte var60 = var3.method5694(); - var5 = var3.method5518(); - Varps.Varps_temp[var5] = var60; - if (Varps.Varps_main[var5] != var60) { - Varps.Varps_main[var5] = var60; + if (ServerPacket.field2139 == var1.serverPacket) { + JagexCache.method3438(class185.field2298); + var1.serverPacket = null; + return true; } - GrandExchangeOfferUnitPriceComparator.method124(var5); - field863[++field806 - 1 & 31] = var5; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2179 == var1.serverPacket) { - DefaultsGroup.field3819 = var3.readUnsignedByteNegate(); - ChatChannel.field1306 = var3.method5525(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2161 == var1.serverPacket) { - var16 = var3.method5532(); - TileItemPile.method2764(var16); - field888[++field671 - 1 & 31] = var16 & 0x7fff; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2149 == var1.serverPacket) { - var16 = var3.readUnsignedByte(); - class192.setOculusOrbState(var16); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2137 == var1.serverPacket) { - class1.method10(class185.field2315); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2187 == var1.serverPacket) { - rebootTimer = var3.readUnsignedShort() * 30; - field844 = cycleCntr; - var1.serverPacket = null; - return true; - } - - int var7; - Widget var8; - if (ServerPacket.field2123 == var1.serverPacket) { - var16 = var3.method5534(); - var5 = var3.method5534(); - int var17 = var3.method5534(); - var7 = var3.method5543(); - var8 = class80.getWidget(var7); - if (var16 != var8.modelAngleX || var17 != var8.modelAngleY || var5 != var8.modelZoom) { - var8.modelAngleX = var16; - var8.modelAngleY = var17; - var8.modelZoom = var5; - Strings.invalidateWidget(var8); + if (ServerPacket.field2125 == var1.serverPacket) { + PendingSpawn.loadRegions(true, var1.packetBuffer); + var1.serverPacket = null; + return true; } - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2120 == var1.serverPacket) { - ChatChannel.field1306 = var3.method5525(); - DefaultsGroup.field3819 = var3.readUnsignedByteNegate(); - - while (var3.offset < var1.serverPacketLength) { - var16 = var3.readUnsignedByte(); - class185 var58 = GrandExchangeEvents.method70()[var16]; - class1.method10(var58); + if (ServerPacket.field2155 == var1.serverPacket) { + class32.friendSystem.readUpdate(var3, var1.serverPacketLength); + field629 = cycleCntr; + var1.serverPacket = null; + return true; } - var1.serverPacket = null; - return true; - } - - Widget var19; - if (ServerPacket.field2125 == var1.serverPacket) { - var16 = var3.readInt(); - var5 = var3.readUnsignedShort(); - if (var5 == 0xffff) { - var5 = -1; - } - - int var17 = var3.method5543(); - var19 = class80.getWidget(var16); - ItemDefinition var43; - if (!var19.isIf3) { - if (var5 == -1) { - var19.modelType = 0; - var1.serverPacket = null; - return true; + InterfaceParent var7; + int var16; + if (ServerPacket.field2174 == var1.serverPacket) { + var16 = var3.method5436(); + var5 = var3.method5455(); + var6 = var3.method5447(); + var7 = (InterfaceParent)interfaceParents.get((long)var5); + if (var7 != null) { + VarpDefinition.closeInterface(var7, var6 != var7.group); } - var43 = WorldMapArea.ItemDefinition_get(var5); - var19.modelType = 4; - var19.modelId = var5; - var19.modelAngleX = var43.xan2d; - var19.modelAngleY = var43.yan2d; - var19.modelZoom = var43.zoom2d * 100 / var17; - Strings.invalidateWidget(var19); - } else { - var19.itemId = var5; - var19.itemQuantity = var17; - var43 = WorldMapArea.ItemDefinition_get(var5); - var19.modelAngleX = var43.xan2d; - var19.modelAngleY = var43.yan2d; - var19.modelAngleZ = var43.zan2d; - var19.modelOffsetX = var43.offsetX2d; - var19.modelOffsetY = var43.offsetY2d; - var19.modelZoom = var43.zoom2d; - if (var43.isStackable == 1) { - var19.itemQuantityMode = 1; - } else { - var19.itemQuantityMode = 2; - } - - if (var19.field2619 > 0) { - var19.modelZoom = var19.modelZoom * 32 / var19.field2619; - } else if (var19.rawWidth > 0) { - var19.modelZoom = var19.modelZoom * 32 / var19.rawWidth; - } - - Strings.invalidateWidget(var19); + NPC.method1967(var5, var6, var16); + var1.serverPacket = null; + return true; } - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2158 == var1.serverPacket) { - var16 = var3.readUnsignedShort(); - var5 = var3.readUnsignedByte(); - int var17 = var3.readUnsignedShort(); - class81.queueSoundEffect(var16, var5, var17); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2154 == var1.serverPacket) { - var16 = var3.readUnsignedByte(); - var5 = var3.readUnsignedByte(); - int var17 = var3.readUnsignedByte(); - var7 = var3.readUnsignedByte(); - field886[var16] = true; - field901[var16] = var5; - field902[var16] = var17; - field903[var16] = var7; - field904[var16] = 0; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2166 == var1.serverPacket) { - Tiles.loadRegions(true, var1.packetBuffer); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2194 == var1.serverPacket) { - InterfaceParent.updatePlayers(var3, var1.serverPacketLength); - ObjectSound.method1827(); - var1.serverPacket = null; - return true; - } - - int var9; - int var10; - int var20; - if (ServerPacket.field2198 == var1.serverPacket) { - isCameraLocked = true; - HealthBarUpdate.field1017 = var3.readUnsignedByte() * 128; - class30.field259 = var3.readUnsignedByte() * 128; - WorldMapID.field268 = var3.readUnsignedShort(); - ScriptFrame.field526 = var3.readUnsignedByte(); - Tiles.field501 = var3.readUnsignedByte(); - if (Tiles.field501 >= 100) { - var16 = HealthBarUpdate.field1017 * 16384 + 64; - var5 = class30.field259 * 16384 + 64; - int var17 = ScriptEvent.getTileHeight(var16, var5, class42.plane) - WorldMapID.field268; - var7 = var16 - PacketBuffer.cameraX; - var20 = var17 - class43.cameraY; - var9 = var5 - class1.cameraZ; - var10 = (int)Math.sqrt((double)(var9 * var9 + var7 * var7)); - GrandExchangeOfferNameComparator.cameraPitch = (int)(Math.atan2((double)var20, (double)var10) * 325.949D) & 2047; - Interpreter.cameraYaw = (int)(Math.atan2((double)var7, (double)var9) * -325.949D) & 2047; - if (GrandExchangeOfferNameComparator.cameraPitch < 128) { - GrandExchangeOfferNameComparator.cameraPitch = 128; - } - - if (GrandExchangeOfferNameComparator.cameraPitch > 383) { - GrandExchangeOfferNameComparator.cameraPitch = 383; - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2116 == var1.serverPacket) { - RouteStrategy.method3593(); - var1.serverPacket = null; - return false; - } - - if (ServerPacket.field2150 == var1.serverPacket) { - World var40 = new World(); - var40.host = var3.readStringCp1252NullTerminated(); - var40.id = var3.readUnsignedShort(); - var5 = var3.readInt(); - var40.properties = var5; - class96.updateGameState(45); - var2.close(); - var2 = null; - MusicPatchPcmStream.changeWorld(var40); - var1.serverPacket = null; - return false; - } - - if (ServerPacket.field2157 == var1.serverPacket) { - class1.method10(class185.field2318); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2164 == var1.serverPacket) { - class1.method10(class185.field2324); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2145 == var1.serverPacket) { - var16 = var3.method5543(); - var5 = var3.method5534(); - var6 = class80.getWidget(var16); - if (var6 != null && var6.type == 0) { - if (var5 > var6.scrollHeight - var6.height) { - var5 = var6.scrollHeight - var6.height; - } - - if (var5 < 0) { - var5 = 0; - } - - if (var5 != var6.scrollY) { - var6.scrollY = var5; - Strings.invalidateWidget(var6); - } - } - - var1.serverPacket = null; - return true; - } - - long var21; - if (ServerPacket.field2163 == var1.serverPacket) { - var16 = var3.method5541(); - var5 = var3.method5518(); - if (var5 == 0xffff) { - var5 = -1; - } - - int var17 = var3.method5543(); - var7 = var3.readUnsignedShort(); - if (var7 == 0xffff) { - var7 = -1; - } - - for (var20 = var7; var20 <= var5; ++var20) { - var21 = (long)var20 + ((long)var17 << 32); - Node var46 = widgetClickMasks.get(var21); - if (var46 != null) { - var46.remove(); - } - - widgetClickMasks.put(new IntegerNode(var16), var21); - } - - var1.serverPacket = null; - return true; - } - - Widget var53; - if (ServerPacket.field2122 == var1.serverPacket) { - var16 = var3.method5542(); - var53 = class80.getWidget(var16); - - for (int var17 = 0; var17 < var53.itemIds.length; ++var17) { - var53.itemIds[var17] = -1; - var53.itemIds[var17] = 0; - } - - Strings.invalidateWidget(var53); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2165 == var1.serverPacket) { - var16 = var3.readInt(); - if (var16 != field855) { - field855 = var16; - Actor.method1670(); - } - - var1.serverPacket = null; - return true; - } - - InterfaceParent var52; - if (ServerPacket.field2192 == var1.serverPacket) { - var16 = var3.method5722(); - var5 = var3.method5542(); - int var17 = var3.method5534(); - var52 = (InterfaceParent)interfaceParents.get((long)var5); - if (var52 != null) { - class197.closeInterface(var52, var17 != var52.group); - } - - PendingSpawn.method1652(var5, var17, var16); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2183 == var1.serverPacket) { - class226.privateChatMode = NetSocket.ChatMode_find(var3.readUnsignedByte()); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2138 == var1.serverPacket) { - var16 = var3.method5534(); - if (var16 == 0xffff) { - var16 = -1; - } - - GrandExchangeOfferTotalQuantityComparator.playSong(var16); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2155 == var1.serverPacket) { - var16 = var3.method5591(); - var5 = var3.method5518(); - if (var5 == 0xffff) { - var5 = -1; - } - - WorldMapLabelSize.playSoundJingle(var5, var16); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2124 == var1.serverPacket) { - var16 = var3.readShort(); - var5 = var3.method5543(); - var6 = class80.getWidget(var5); - if (var16 != var6.sequenceId || var16 == -1) { - var6.sequenceId = var16; - var6.modelFrame = 0; - var6.modelFrameCycle = 0; - Strings.invalidateWidget(var6); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2147 == var1.serverPacket) { - ArchiveLoader.friendSystem.ignoreList.read(var3, var1.serverPacketLength); - class2.FriendSystem_invalidateIgnoreds(); - field672 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2196 == var1.serverPacket) { - ScriptFrame.updateNpcs(true, var3); - var1.serverPacket = null; - return true; - } - - long var12; - long var23; - long var25; - String var37; - if (ServerPacket.field2142 == var1.serverPacket) { - var37 = var3.readStringCp1252NullTerminated(); - var23 = var3.readLong(); - var25 = (long)var3.readUnsignedShort(); - var21 = (long)var3.readMedium(); - PlayerType var11 = (PlayerType)SoundSystem.findEnumerated(UserComparator5.PlayerType_values(), var3.readUnsignedByte()); - var12 = (var25 << 32) + var21; - boolean var49 = false; - - for (int var15 = 0; var15 < 100; ++var15) { - if (field922[var15] == var12) { - var49 = true; - break; - } - } - - if (var11.isUser && ArchiveLoader.friendSystem.isIgnored(new Username(var37, class40.loginType))) { - var49 = true; - } - - if (!var49 && field767 == 0) { - field922[field875] = var12; - field875 = (field875 + 1) % 100; - String var27 = AbstractFont.escapeBrackets(class1.method17(DefaultsGroup.method5898(var3))); - if (var11.modIcon != -1) { - class14.addChatMessage(9, WorldMapSection1.getModIconString(var11.modIcon) + var37, var27, class215.base37DecodeLong(var23)); - } else { - class14.addChatMessage(9, var37, var27, class215.base37DecodeLong(var23)); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2177 == var1.serverPacket) { - var37 = var3.readStringCp1252NullTerminated(); - Object[] var57 = new Object[var37.length() + 1]; - - for (int var17 = var37.length() - 1; var17 >= 0; --var17) { - if (var37.charAt(var17) == 's') { - var57[var17 + 1] = var3.readStringCp1252NullTerminated(); - } else { - var57[var17 + 1] = new Integer(var3.readInt()); - } - } - - var57[0] = new Integer(var3.readInt()); - ScriptEvent var48 = new ScriptEvent(); - var48.args = var57; - LoginPacket.runScriptEvent(var48); - var1.serverPacket = null; - return true; - } - - String var44; - if (ServerPacket.field2133 == var1.serverPacket) { - byte[] var39 = new byte[var1.serverPacketLength]; - var3.method5443(var39, 0, var39.length); - Buffer var55 = new Buffer(var39); - var44 = var55.readStringCp1252NullTerminated(); - GrandExchangeOfferWorldComparator.openURL(var44, true, false); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2162 == var1.serverPacket) { - if (var1.serverPacketLength == 0) { - DevicePcmPlayerProvider.clanChat = null; - } else { - if (DevicePcmPlayerProvider.clanChat == null) { - DevicePcmPlayerProvider.clanChat = new ClanChat(class40.loginType, WorldMapSprite.client); - } - - DevicePcmPlayerProvider.clanChat.readUpdate(var3); - } - - class267.method4986(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2143 == var1.serverPacket) { - for (var16 = 0; var16 < players.length; ++var16) { - if (players[var16] != null) { - players[var16].sequence = -1; - } - } - - for (var16 = 0; var16 < npcs.length; ++var16) { - if (npcs[var16] != null) { - npcs[var16].sequence = -1; - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2189 == var1.serverPacket) { - if (DevicePcmPlayerProvider.clanChat != null) { - DevicePcmPlayerProvider.clanChat.method5234(var3); - } - - class267.method4986(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2121 == var1.serverPacket) { - isCameraLocked = true; - DevicePcmPlayerProvider.field412 = var3.readUnsignedByte() * 128; - class210.field2516 = var3.readUnsignedByte() * 128; - Language.field2345 = var3.readUnsignedShort(); - class83.field1166 = var3.readUnsignedByte(); - class96.field1327 = var3.readUnsignedByte(); - if (class96.field1327 >= 100) { - PacketBuffer.cameraX = DevicePcmPlayerProvider.field412 * 16384 + 64; - class1.cameraZ = class210.field2516 * 16384 + 64; - class43.cameraY = ScriptEvent.getTileHeight(PacketBuffer.cameraX, class1.cameraZ, class42.plane) - Language.field2345; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2117 == var1.serverPacket) { - isCameraLocked = false; - - for (var16 = 0; var16 < 5; ++var16) { - field886[var16] = false; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2127 == var1.serverPacket) { - class1.method10(class185.field2319); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2144 == var1.serverPacket) { - ArchiveLoader.friendSystem.method1760(); - field672 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2191 == var1.serverPacket) { - class65.method1176(); - var16 = var3.method5541(); - var5 = var3.readUnsignedByteNegate(); - int var17 = var3.readUnsignedByte(); - experience[var5] = var16; - currentLevels[var5] = var17; - levels[var5] = 1; - - for (var7 = 0; var7 < 98; ++var7) { - if (var16 >= Skills.Skills_experienceTable[var7]) { - levels[var5] = var7 + 2; - } - } - - changedSkills[++changedSkillsCount - 1 & 31] = var5; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2190 == var1.serverPacket) { - class1.method10(class185.field2317); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2129 == var1.serverPacket) { - class1.method10(class185.field2321); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2130 == var1.serverPacket) { - class1.method10(class185.field2322); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2173 == var1.serverPacket) { - var16 = var3.method5722(); - var5 = var3.method5722(); - var44 = var3.readStringCp1252NullTerminated(); - if (var5 >= 1 && var5 <= 8) { - if (var44.equalsIgnoreCase("null")) { - var44 = null; - } - - playerMenuActions[var5 - 1] = var44; - playerOptionsPriorities[var5 - 1] = var16 == 0; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2176 == var1.serverPacket) { - var16 = var3.readInt(); - InterfaceParent var54 = (InterfaceParent)interfaceParents.get((long)var16); - if (var54 != null) { - class197.closeInterface(var54, true); - } - - if (meslayerContinueWidget != null) { - Strings.invalidateWidget(meslayerContinueWidget); - meslayerContinueWidget = null; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2170 == var1.serverPacket) { - var16 = var3.readUnsignedByte(); - if (var3.readUnsignedByte() == 0) { - grandExchangeOffers[var16] = new GrandExchangeOffer(); - var3.offset += 18; - } else { - --var3.offset; - grandExchangeOffers[var16] = new GrandExchangeOffer(var3, false); - } - - field915 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2188 == var1.serverPacket) { - for (var16 = 0; var16 < Varps.Varps_main.length; ++var16) { - if (Varps.Varps_temp[var16] != Varps.Varps_main[var16]) { - Varps.Varps_main[var16] = Varps.Varps_temp[var16]; - GrandExchangeOfferUnitPriceComparator.method124(var16); - field863[++field806 - 1 & 31] = var16; - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2118 == var1.serverPacket) { - var16 = var3.method5534(); - var5 = var3.method5543(); - var6 = class80.getWidget(var5); - if (var6.modelType != 2 || var16 != var6.modelId) { - var6.modelType = 2; - var6.modelId = var16; - Strings.invalidateWidget(var6); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2174 == var1.serverPacket) { - var16 = var3.method5542(); - var5 = var3.method5500(); - int var17 = var3.method5535(); - var19 = class80.getWidget(var16); - if (var17 != var19.rawX || var5 != var19.rawY || var19.xAlignment != 0 || var19.yAlignment != 0) { - var19.rawX = var17; - var19.rawY = var5; - var19.xAlignment = 0; - var19.yAlignment = 0; - Strings.invalidateWidget(var19); - this.alignWidget(var19); - if (var19.type == 0) { - WorldMapSprite.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var16 >> 16], var19, false); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2160 == var1.serverPacket) { - Tiles.loadRegions(false, var1.packetBuffer); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2152 == var1.serverPacket) { - var16 = var3.readUShortSmart(); - var47 = var3.readUnsignedByte() == 1; - var44 = ""; - boolean var45 = false; - if (var47) { - var44 = var3.readStringCp1252NullTerminated(); - if (ArchiveLoader.friendSystem.isIgnored(new Username(var44, class40.loginType))) { - var45 = true; - } - } - - String var42 = var3.readStringCp1252NullTerminated(); - if (!var45) { - ScriptEvent.addGameMessage(var16, var44, var42); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2119 == var1.serverPacket) { - var16 = var3.readUnsignedShort(); - var5 = var3.readInt(); - Varps.Varps_temp[var16] = var5; - if (Varps.Varps_main[var16] != var5) { - Varps.Varps_main[var16] = var5; - } - - GrandExchangeOfferUnitPriceComparator.method124(var16); - field863[++field806 - 1 & 31] = var16; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2140 == var1.serverPacket) { - ChatChannel.field1306 = var3.readUnsignedByteNegate(); - DefaultsGroup.field3819 = var3.readUnsignedByte(); - - for (var16 = DefaultsGroup.field3819; var16 < DefaultsGroup.field3819 + 8; ++var16) { - for (var5 = ChatChannel.field1306; var5 < ChatChannel.field1306 + 8; ++var5) { - if (groundItems[class42.plane][var16][var5] != null) { - groundItems[class42.plane][var16][var5] = null; - GrandExchangeOfferWorldComparator.updateItemPile(var16, var5); + boolean var46; + String var49; + if (ServerPacket.field2183 == var1.serverPacket) { + var16 = var3.readUShortSmart(); + var46 = var3.readUnsignedByte() == 1; + var49 = ""; + boolean var59 = false; + if (var46) { + var49 = var3.readStringCp1252NullTerminated(); + if (class32.friendSystem.isIgnored(new Username(var49, FontName.loginType))) { + var59 = true; } } - } - for (PendingSpawn var38 = (PendingSpawn)pendingSpawns.last(); var38 != null; var38 = (PendingSpawn)pendingSpawns.previous()) { - if (var38.x >= DefaultsGroup.field3819 && var38.x < DefaultsGroup.field3819 + 8 && var38.y >= ChatChannel.field1306 && var38.y < ChatChannel.field1306 + 8 && var38.plane == class42.plane) { - var38.hitpoints = 0; - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2184 == var1.serverPacket) { - var16 = var3.readInt(); - var5 = var3.readInt(); - int var17 = SoundSystem.getGcDuration(); - PacketBufferNode var56 = Archive.getPacketBufferNode(ClientPacket.field2236, packetWriter.isaacCipher); - var56.packetBuffer.method5521(var17); - var56.packetBuffer.writeByte(GameShell.fps); - var56.packetBuffer.writeIntME(var16); - var56.packetBuffer.writeIntLE(var5); - packetWriter.addNode(var56); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2199 == var1.serverPacket) { - var16 = var3.method5534(); - rootInterface = var16; - this.resizeRoot(false); - GrandExchangeOfferAgeComparator.Widget_resetModelFrames(var16); - Canvas.runWidgetOnLoadListener(rootInterface); - - for (var5 = 0; var5 < 100; ++var5) { - field843[var5] = true; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2181 == var1.serverPacket) { - var16 = var3.method5543(); - var53 = class80.getWidget(var16); - var53.modelType = 3; - var53.modelId = localPlayer.appearance.getChatHeadId(); - Strings.invalidateWidget(var53); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2180 == var1.serverPacket) { - var37 = var3.readStringCp1252NullTerminated(); - var18 = AbstractFont.escapeBrackets(class1.method17(DefaultsGroup.method5898(var3))); - ScriptEvent.addGameMessage(6, var37, var18); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2153 == var1.serverPacket) { - ChatChannel.readReflectionCheck(var3, var1.serverPacketLength); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2151 == var1.serverPacket) { - hintArrowType = var3.readUnsignedByte(); - if (hintArrowType == 1) { - hintArrowNpcIndex = var3.readUnsignedShort(); - } - - if (hintArrowType >= 2 && hintArrowType <= 6) { - if (hintArrowType == 2) { - hintArrowSubX = 4096; - hintArrowSubY = 64; + String var44 = var3.readStringCp1252NullTerminated(); + if (!var59) { + DirectByteArrayCopier.addGameMessage(var16, var49, var44); } - if (hintArrowType == 3) { - hintArrowSubX = 0; - hintArrowSubY = 64; - } - - if (hintArrowType == 4) { - hintArrowSubX = 8192; - hintArrowSubY = 64; - } - - if (hintArrowType == 5) { - hintArrowSubX = 4096; - hintArrowSubY = 0; - } - - if (hintArrowType == 6) { - hintArrowSubX = 4096; - hintArrowSubY = 128; - } - - hintArrowType = 2; - hintArrowX = var3.readUnsignedShort(); - hintArrowY = var3.readUnsignedShort(); - hintArrowHeight = var3.readUnsignedByte() * 2; + var1.serverPacket = null; + return true; } - if (hintArrowType == 10) { - hintArrowPlayerIndex = var3.readUnsignedShort(); + if (ServerPacket.field2165 == var1.serverPacket) { + WorldMapIcon_0.privateChatMode = class270.method4895(var3.readUnsignedByte()); + var1.serverPacket = null; + return true; } - var1.serverPacket = null; - return true; - } + Widget var17; + if (ServerPacket.field2173 == var1.serverPacket) { + var16 = var3.method5414(); + var5 = var3.method5447(); + var17 = WorldMapElement.getWidget(var16); + if (var17 != null && var17.type == 0) { + if (var5 > var17.scrollHeight - var17.height) { + var5 = var17.scrollHeight - var17.height; + } - if (ServerPacket.field2178 == var1.serverPacket) { - class1.method10(class185.field2323); - var1.serverPacket = null; - return true; - } + if (var5 < 0) { + var5 = 0; + } - if (ServerPacket.field2193 == var1.serverPacket) { - for (var16 = 0; var16 < VarpDefinition.VarpDefinition_fileCount; ++var16) { - VarpDefinition var51 = GrandExchangeOfferWorldComparator.method61(var16); - if (var51 != null) { - Varps.Varps_temp[var16] = 0; - Varps.Varps_main[var16] = 0; + if (var5 != var17.scrollY) { + var17.scrollY = var5; + FriendSystem.invalidateWidget(var17); + } } + + var1.serverPacket = null; + return true; } - class65.method1176(); - field806 += 32; - var1.serverPacket = null; - return true; - } + if (ServerPacket.field2108 == var1.serverPacket) { + JagexCache.method3438(class185.field2306); + var1.serverPacket = null; + return true; + } - if (ServerPacket.field2171 == var1.serverPacket) { - var16 = var3.offset + var1.serverPacketLength; - var5 = var3.readUnsignedShort(); - int var17 = var3.readUnsignedShort(); - if (var5 != rootInterface) { - rootInterface = var5; + if (ServerPacket.field2177 == var1.serverPacket) { + tradeChatMode = var3.readUnsignedByteNegate(); + publicChatMode = var3.readUnsignedByteNegate(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2098 == var1.serverPacket) { + class65.method1182(); + var1.serverPacket = null; + return false; + } + + if (ServerPacket.field2164 == var1.serverPacket) { + destinationX = var3.readUnsignedByte(); + if (destinationX == 255) { + destinationX = 0; + } + + destinationY = var3.readUnsignedByte(); + if (destinationY == 255) { + destinationY = 0; + } + + var1.serverPacket = null; + return true; + } + + boolean var48; + if (ServerPacket.field2124 == var1.serverPacket) { + var48 = var3.readUnsignedByte() == 1; + if (var48) { + Occluder.field1890 = SequenceDefinition.method4686() - var3.readLong(); + class2.grandExchangeEvents = new GrandExchangeEvents(var3, true); + } else { + class2.grandExchangeEvents = null; + } + + field819 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2120 == var1.serverPacket) { + var16 = var3.method5447(); + if (var16 == 65535) { + var16 = -1; + } + + SoundCache.playSong(var16); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2175 == var1.serverPacket) { + var16 = var3.method5449(); + var5 = var3.method5446(); + if (var5 == 65535) { + var5 = -1; + } + + MouseRecorder.playSoundJingle(var5, var16); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2133 == var1.serverPacket) { + hintArrowType = var3.readUnsignedByte(); + if (hintArrowType == 1) { + hintArrowNpcIndex = var3.readUnsignedShort(); + } + + if (hintArrowType >= 2 && hintArrowType <= 6) { + if (hintArrowType == 2) { + hintArrowSubX = 4096; + hintArrowSubY = 64; + } + + if (hintArrowType == 3) { + hintArrowSubX = 0; + hintArrowSubY = 64; + } + + if (hintArrowType == 4) { + hintArrowSubX = 8192; + hintArrowSubY = 64; + } + + if (hintArrowType == 5) { + hintArrowSubX = 4096; + hintArrowSubY = 0; + } + + if (hintArrowType == 6) { + hintArrowSubX = 4096; + hintArrowSubY = 128; + } + + hintArrowType = 2; + hintArrowX = var3.readUnsignedShort(); + hintArrowY = var3.readUnsignedShort(); + hintArrowHeight = var3.readUnsignedByte() * 4; + } + + if (hintArrowType == 10) { + hintArrowPlayerIndex = var3.readUnsignedShort(); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2179 == var1.serverPacket) { + var16 = var3.readInt(); + var5 = var3.readInt(); + var6 = class225.getGcDuration(); + PacketBufferNode var43 = MenuAction.getPacketBufferNode(ClientPacket.field2203, packetWriter.isaacCipher); + var43.packetBuffer.method5545(var6); + var43.packetBuffer.writeByte(GameShell.fps); + var43.packetBuffer.writeIntME(var16); + var43.packetBuffer.writeIntLE(var5); + packetWriter.addNode(var43); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2126 == var1.serverPacket) { + class32.friendSystem.method1774(); + field629 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2181 == var1.serverPacket) { + var16 = var3.method5447(); + rootInterface = var16; this.resizeRoot(false); - GrandExchangeOfferAgeComparator.Widget_resetModelFrames(rootInterface); - Canvas.runWidgetOnLoadListener(rootInterface); + WorldMapSectionType.Widget_resetModelFrames(var16); + class51.runWidgetOnLoadListener(rootInterface); - for (var7 = 0; var7 < 100; ++var7) { - field843[var7] = true; - } - } - - InterfaceParent var59; - for (; var17-- > 0; var59.field567 = true) { - var7 = var3.readInt(); - var20 = var3.readUnsignedShort(); - var9 = var3.readUnsignedByte(); - var59 = (InterfaceParent)interfaceParents.get((long)var7); - if (var59 != null && var20 != var59.group) { - class197.closeInterface(var59, true); - var59 = null; + for (var5 = 0; var5 < 100; ++var5) { + field703[var5] = true; } - if (var59 == null) { - var59 = PendingSpawn.method1652(var7, var20, var9); - } + var1.serverPacket = null; + return true; } - for (var52 = (InterfaceParent)interfaceParents.first(); var52 != null; var52 = (InterfaceParent)interfaceParents.next()) { - if (var52.field567) { - var52.field567 = false; - } else { - class197.closeInterface(var52, true); - } - } - - widgetClickMasks = new NodeHashTable(512); - - while (var3.offset < var16) { - var7 = var3.readInt(); - var20 = var3.readUnsignedShort(); - var9 = var3.readUnsignedShort(); - var10 = var3.readInt(); - - for (int var29 = var20; var29 <= var9; ++var29) { - var12 = ((long)var7 << 32) + (long)var29; - widgetClickMasks.put(new IntegerNode(var10), var12); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2185 == var1.serverPacket) { - var16 = var3.readInt(); - var5 = var3.readUnsignedShort(); - if (var16 < -70000) { - var5 += 32768; - } - - if (var16 >= 0) { - var6 = class80.getWidget(var16); - } else { - var6 = null; - } - - if (var6 != null) { - for (var7 = 0; var7 < var6.itemIds.length; ++var7) { - var6.itemIds[var7] = 0; - var6.itemQuantities[var7] = 0; - } - } - - GrandExchangeOfferAgeComparator.clearItemContainer(var5); - var7 = var3.readUnsignedShort(); - - for (var20 = 0; var20 < var7; ++var20) { - var9 = var3.readUnsignedShort(); - var10 = var3.readUnsignedByte(); - if (var10 == 255) { - var10 = var3.method5543(); + if (ServerPacket.field2134 == var1.serverPacket) { + var16 = var3.readInt(); + var46 = var3.readUnsignedByte() == 1; + var17 = WorldMapElement.getWidget(var16); + if (var46 != var17.isHidden) { + var17.isHidden = var46; + FriendSystem.invalidateWidget(var17); } - if (var6 != null && var20 < var6.itemIds.length) { - var6.itemIds[var20] = var9; - var6.itemQuantities[var20] = var10; - } - - GrandExchangeOfferAgeComparator.itemContainerSetItem(var5, var20, var9 - 1, var10); + var1.serverPacket = null; + return true; } - if (var6 != null) { - Strings.invalidateWidget(var6); + if (ServerPacket.field2129 == var1.serverPacket) { + UrlRequest.method3258(var3.readStringCp1252NullTerminated()); + var1.serverPacket = null; + return true; } - class65.method1176(); - field888[++field671 - 1 & 31] = var5 & 0x7fff; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2182 == var1.serverPacket) { - destinationX = var3.readUnsignedByte(); - if (destinationX == 255) { - destinationX = 0; + if (ServerPacket.field2118 == var1.serverPacket) { + WorldMapIcon_0.method207(); + runEnergy = var3.readUnsignedByte(); + field820 = cycleCntr; + var1.serverPacket = null; + return true; } - destinationY = var3.readUnsignedByte(); - if (destinationY == 255) { - destinationY = 0; + if (ServerPacket.field2113 == var1.serverPacket) { + GrandExchangeOffer.updateNpcs(true, var3); + var1.serverPacket = null; + return true; } - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2186 == var1.serverPacket) { - class65.method1176(); - weight = var3.readShort(); - field844 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2195 == var1.serverPacket) { - tradeChatMode = var3.readUnsignedByteNegate(); - publicChatMode = var3.readUnsignedByteNegate(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2134 == var1.serverPacket) { - var16 = var3.readInt(); - var18 = var3.readStringCp1252NullTerminated(); - var6 = class80.getWidget(var16); - if (!var18.equals(var6.text)) { - var6.text = var18; - Strings.invalidateWidget(var6); + if (ServerPacket.field2184 == var1.serverPacket) { + JagexCache.method3438(class185.field2302); + var1.serverPacket = null; + return true; } - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2167 == var1.serverPacket) { - if (rootInterface != -1) { - WorldMapLabelSize.runIntfCloseListeners(rootInterface, 0); + if (ServerPacket.field2143 == var1.serverPacket) { + var16 = var3.method5445(); + class1.method21(var16); + field811[++field812 - 1 & 31] = var16 & 32767; + var1.serverPacket = null; + return true; } - var1.serverPacket = null; - return true; - } + if (ServerPacket.field2122 == var1.serverPacket) { + Varps.field2507 = var3.readUnsignedByteNegate(); + WorldMapSection1.field283 = var3.readUnsignedByte(); - boolean var50; - if (ServerPacket.field2131 == var1.serverPacket) { - var50 = var3.readBoolean(); - if (var50) { - if (PendingSpawn.field944 == null) { - PendingSpawn.field944 = new class237(); - } - } else { - PendingSpawn.field944 = null; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2135 == var1.serverPacket) { - var50 = var3.readUnsignedByte() == 1; - if (var50) { - Buddy.field3632 = DirectByteArrayCopier.currentTimeMs() - var3.readLong(); - PendingSpawn.grandExchangeEvents = new GrandExchangeEvents(var3, true); - } else { - PendingSpawn.grandExchangeEvents = null; - } - - field851 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2139 == var1.serverPacket) { - var16 = var3.method5542(); - var5 = var3.method5518(); - int var17 = var5 >> 10 & 31; - var7 = var5 >> 5 & 31; - var20 = var5 & 31; - var9 = (var7 << 11) + (var17 << 19) + (var20 << 3); - Widget var28 = class80.getWidget(var16); - if (var9 != var28.color) { - var28.color = var9; - Strings.invalidateWidget(var28); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2172 == var1.serverPacket) { - var3.offset += 28; - if (var3.checkCrc()) { - WorldMapSprite.writeNewRandomDat(var3, var3.offset - 28); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2126 == var1.serverPacket) { - class1.method10(class185.field2316); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2197 == var1.serverPacket) { - var16 = var3.readInt(); - var5 = var3.readInt(); - InterfaceParent var41 = (InterfaceParent)interfaceParents.get((long)var5); - var52 = (InterfaceParent)interfaceParents.get((long)var16); - if (var52 != null) { - class197.closeInterface(var52, var41 == null || var41.group != var52.group); - } - - if (var41 != null) { - var41.remove(); - interfaceParents.put(var41, (long)var16); - } - - var8 = class80.getWidget(var5); - if (var8 != null) { - Strings.invalidateWidget(var8); - } - - var8 = class80.getWidget(var16); - if (var8 != null) { - Strings.invalidateWidget(var8); - WorldMapSprite.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var8.id >>> 16], var8, true); - } - - if (rootInterface != -1) { - WorldMapLabelSize.runIntfCloseListeners(rootInterface, 1); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2141 == var1.serverPacket) { - var37 = var3.readStringCp1252NullTerminated(); - var23 = (long)var3.readUnsignedShort(); - var25 = (long)var3.readMedium(); - PlayerType var30 = (PlayerType)SoundSystem.findEnumerated(UserComparator5.PlayerType_values(), var3.readUnsignedByte()); - long var31 = (var23 << 32) + var25; - boolean var33 = false; - - for (int var13 = 0; var13 < 100; ++var13) { - if (var31 == field922[var13]) { - var33 = true; - break; - } - } - - if (ArchiveLoader.friendSystem.isIgnored(new Username(var37, class40.loginType))) { - var33 = true; - } - - if (!var33 && field767 == 0) { - field922[field875] = var31; - field875 = (field875 + 1) % 100; - String var34 = AbstractFont.escapeBrackets(class1.method17(DefaultsGroup.method5898(var3))); - byte var14; - if (var30.isPrivileged) { - var14 = 7; - } else { - var14 = 3; - } - - if (var30.modIcon != -1) { - ScriptEvent.addGameMessage(var14, WorldMapSection1.getModIconString(var30.modIcon) + var37, var34); - } else { - ScriptEvent.addGameMessage(var14, var37, var34); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2148 == var1.serverPacket) { - ScriptFrame.updateNpcs(false, var3); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2156 == var1.serverPacket) { - var16 = var3.method5518(); - var5 = var3.method5532(); - int var17 = var3.method5542(); - var19 = class80.getWidget(var17); - var19.field2575 = var16 + (var5 << 16); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2132 == var1.serverPacket) { - ArchiveLoader.friendSystem.readUpdate(var3, var1.serverPacketLength); - field672 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2175 == var1.serverPacket) { - var16 = var3.method5543(); - var5 = var3.method5534(); - var6 = class80.getWidget(var16); - if (var6.modelType != 1 || var5 != var6.modelId) { - var6.modelType = 1; - var6.modelId = var5; - Strings.invalidateWidget(var6); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2159 == var1.serverPacket) { - var16 = var3.readInt(); - var5 = var3.readUnsignedShort(); - if (var16 < -70000) { - var5 += 32768; - } - - if (var16 >= 0) { - var6 = class80.getWidget(var16); - } else { - var6 = null; - } - - for (; var3.offset < var1.serverPacketLength; GrandExchangeOfferAgeComparator.itemContainerSetItem(var5, var7, var20 - 1, var9)) { - var7 = var3.readUShortSmart(); - var20 = var3.readUnsignedShort(); - var9 = 0; - if (var20 != 0) { - var9 = var3.readUnsignedByte(); - if (var9 == 255) { - var9 = var3.readInt(); + for (var16 = WorldMapSection1.field283; var16 < WorldMapSection1.field283 + 8; ++var16) { + for (var5 = Varps.field2507; var5 < Varps.field2507 + 8; ++var5) { + if (groundItems[ItemContainer.plane][var16][var5] != null) { + groundItems[ItemContainer.plane][var16][var5] = null; + class189.updateItemPile(var16, var5); + } } } - if (var6 != null && var7 >= 0 && var7 < var6.itemIds.length) { - var6.itemIds[var7] = var20; - var6.itemQuantities[var7] = var9; + for (PendingSpawn var40 = (PendingSpawn)pendingSpawns.last(); var40 != null; var40 = (PendingSpawn)pendingSpawns.previous()) { + if (var40.x >= WorldMapSection1.field283 && var40.x < WorldMapSection1.field283 + 8 && var40.y >= Varps.field2507 && var40.y < Varps.field2507 + 8 && var40.plane == ItemContainer.plane) { + var40.hitpoints = 0; + } } + + var1.serverPacket = null; + return true; } - if (var6 != null) { - Strings.invalidateWidget(var6); + if (ServerPacket.field2182 == var1.serverPacket) { + var16 = var3.readUnsignedByte(); + class83.method1997(var16); + var1.serverPacket = null; + return false; } - class65.method1176(); - field888[++field671 - 1 & 31] = var5 & 0x7fff; - var1.serverPacket = null; - return true; + if (ServerPacket.field2128 == var1.serverPacket) { + var16 = var3.method5414(); + var5 = var3.method5447(); + var17 = WorldMapElement.getWidget(var16); + if (var17.modelType != 1 || var5 != var17.modelId) { + var17.modelType = 1; + var17.modelId = var5; + FriendSystem.invalidateWidget(var17); + } + + var1.serverPacket = null; + return true; + } + + String var38; + if (ServerPacket.field2135 == var1.serverPacket) { + var38 = var3.readStringCp1252NullTerminated(); + var19 = AbstractFont.escapeBrackets(class189.method3596(class51.method845(var3))); + DirectByteArrayCopier.addGameMessage(6, var38, var19); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2170 == var1.serverPacket) { + var16 = var3.readInt(); + if (var16 != field705) { + field705 = var16; + ItemContainer.method1111(); + } + + var1.serverPacket = null; + return true; + } + + int var9; + int var18; + int var20; + if (ServerPacket.field2141 == var1.serverPacket) { + var16 = var3.readInt(); + var5 = var3.readUnsignedShort(); + if (var16 < -70000) { + var5 += 32768; + } + + if (var16 >= 0) { + var17 = WorldMapElement.getWidget(var16); + } else { + var17 = null; + } + + for (; var3.offset < var1.serverPacketLength; Canvas.itemContainerSetItem(var5, var18, var20 - 1, var9)) { + var18 = var3.readUShortSmart(); + var20 = var3.readUnsignedShort(); + var9 = 0; + if (var20 != 0) { + var9 = var3.readUnsignedByte(); + if (var9 == 255) { + var9 = var3.readInt(); + } + } + + if (var17 != null && var18 >= 0 && var18 < var17.itemIds.length) { + var17.itemIds[var18] = var20; + var17.itemQuantities[var18] = var9; + } + } + + if (var17 != null) { + FriendSystem.invalidateWidget(var17); + } + + WorldMapIcon_0.method207(); + field811[++field812 - 1 & 31] = var5 & 32767; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2148 == var1.serverPacket) { + var16 = var3.readUnsignedByte(); + var5 = var3.readUnsignedByte(); + var6 = var3.readUnsignedByte(); + var18 = var3.readUnsignedByte(); + field897[var16] = true; + field869[var16] = var5; + field694[var16] = var6; + field758[var16] = var18; + field872[var16] = 0; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2152 == var1.serverPacket) { + var16 = var3.readUnsignedByte(); + if (var3.readUnsignedByte() == 0) { + grandExchangeOffers[var16] = new GrandExchangeOffer(); + var3.offset += 18; + } else { + --var3.offset; + grandExchangeOffers[var16] = new GrandExchangeOffer(var3, false); + } + + field818 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2159 == var1.serverPacket) { + for (var16 = 0; var16 < players.length; ++var16) { + if (players[var16] != null) { + players[var16].sequence = -1; + } + } + + for (var16 = 0; var16 < npcs.length; ++var16) { + if (npcs[var16] != null) { + npcs[var16].sequence = -1; + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2154 == var1.serverPacket) { + var16 = var3.method5436(); + var5 = var3.method5436(); + var49 = var3.readStringCp1252NullTerminated(); + if (var5 >= 1 && var5 <= 8) { + if (var49.equalsIgnoreCase("null")) { + var49 = null; + } + + playerMenuActions[var5 - 1] = var49; + playerOptionsPriorities[var5 - 1] = var16 == 0; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2106 == var1.serverPacket) { + var16 = var3.readInt(); + InterfaceParent var57 = (InterfaceParent)interfaceParents.get((long)var16); + if (var57 != null) { + VarpDefinition.closeInterface(var57, true); + } + + if (meslayerContinueWidget != null) { + FriendSystem.invalidateWidget(meslayerContinueWidget); + meslayerContinueWidget = null; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2102 == var1.serverPacket) { + PendingSpawn.loadRegions(false, var1.packetBuffer); + var1.serverPacket = null; + return true; + } + + Widget var8; + if (ServerPacket.field2147 == var1.serverPacket) { + var16 = var3.method5447(); + var5 = var3.method5447(); + var6 = var3.method5447(); + var18 = var3.method5414(); + var8 = WorldMapElement.getWidget(var18); + if (var16 != var8.modelAngleX || var6 != var8.modelAngleY || var5 != var8.modelZoom) { + var8.modelAngleX = var16; + var8.modelAngleY = var6; + var8.modelZoom = var5; + FriendSystem.invalidateWidget(var8); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2114 == var1.serverPacket) { + Varps.field2507 = var3.method5438(); + WorldMapSection1.field283 = var3.readUnsignedByteNegate(); + + while (var3.offset < var1.serverPacketLength) { + var16 = var3.readUnsignedByte(); + class185 var55 = WorldMapDecoration.method327()[var16]; + JagexCache.method3438(var55); + } + + var1.serverPacket = null; + return true; + } + + Widget var52; + if (ServerPacket.field2136 == var1.serverPacket) { + var16 = var3.method5414(); + var52 = WorldMapElement.getWidget(var16); + var52.modelType = 3; + var52.modelId = WorldMapIcon_1.localPlayer.appearance.getChatHeadId(); + FriendSystem.invalidateWidget(var52); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2112 == var1.serverPacket) { + JagexCache.method3438(class185.field2301); + var1.serverPacket = null; + return true; + } + + int var10; + if (ServerPacket.field2180 == var1.serverPacket) { + isCameraLocked = true; + WorldMapSection2.field190 = var3.readUnsignedByte() * 128; + UrlRequest.field1932 = var3.readUnsignedByte() * 16384; + GameShell.field446 = var3.readUnsignedShort(); + GrandExchangeOfferWorldComparator.field34 = var3.readUnsignedByte(); + Player.field605 = var3.readUnsignedByte(); + if (Player.field605 >= 100) { + var16 = WorldMapSection2.field190 * 16384 + 64; + var5 = UrlRequest.field1932 * 128 + 64; + var6 = GrandExchangeOfferTotalQuantityComparator.getTileHeight(var16, var5, ItemContainer.plane) - GameShell.field446; + var18 = var16 - WallDecoration.cameraX; + var20 = var6 - Coord.cameraY; + var9 = var5 - UserComparator7.cameraZ; + var10 = (int)Math.sqrt((double)(var18 * var18 + var9 * var9)); + class43.cameraPitch = (int)(Math.atan2((double)var20, (double)var10) * 325.949D) & 2047; + class40.cameraYaw = (int)(Math.atan2((double)var18, (double)var9) * -325.949D) & 2047; + if (class43.cameraPitch < 128) { + class43.cameraPitch = 128; + } + + if (class43.cameraPitch > 383) { + class43.cameraPitch = 383; + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2121 == var1.serverPacket) { + var16 = var3.method5455(); + var5 = var3.method5446(); + var6 = var5 >> 10 & 31; + var18 = var5 >> 5 & 31; + var20 = var5 & 31; + var9 = (var18 << 11) + (var6 << 19) + (var20 << 3); + Widget var58 = WorldMapElement.getWidget(var16); + if (var9 != var58.color) { + var58.color = var9; + FriendSystem.invalidateWidget(var58); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2171 == var1.serverPacket) { + minimapState = var3.readUnsignedByte(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2178 == var1.serverPacket) { + JagexCache.method3438(class185.field2297); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2166 == 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]; + ObjectSound.method1837(var16); + field809[++field800 - 1 & 31] = var16; + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2110 == var1.serverPacket) { + var38 = var3.readStringCp1252NullTerminated(); + Object[] var54 = new Object[var38.length() + 1]; + + for (var6 = var38.length() - 1; var6 >= 0; --var6) { + if (var38.charAt(var6) == 's') { + var54[var6 + 1] = var3.readStringCp1252NullTerminated(); + } else { + var54[var6 + 1] = new Integer(var3.readInt()); + } + } + + var54[0] = new Integer(var3.readInt()); + ScriptEvent var50 = new ScriptEvent(); + var50.args = var54; + class81.runScriptEvent(var50); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2163 == var1.serverPacket) { + class32.friendSystem.ignoreList.read(var3, var1.serverPacketLength); + InterfaceParent.FriendSystem_invalidateIgnoreds(); + field629 = cycleCntr; + var1.serverPacket = null; + return true; + } + + Widget var41; + if (ServerPacket.field2115 == var1.serverPacket) { + var16 = var3.readInt(); + var5 = var3.readUnsignedShort(); + if (var5 == 65535) { + var5 = -1; + } + + var6 = var3.method5414(); + var41 = WorldMapElement.getWidget(var16); + ItemDefinition var42; + if (!var41.isIf3) { + if (var5 == -1) { + var41.modelType = 0; + var1.serverPacket = null; + return true; + } + + var42 = WorldMapData_0.ItemDefinition_get(var5); + var41.modelType = 4; + var41.modelId = var5; + var41.modelAngleX = var42.xan2d; + var41.modelAngleY = var42.yan2d; + var41.modelZoom = var42.zoom2d * 100 / var6; + FriendSystem.invalidateWidget(var41); + } else { + var41.itemId = var5; + var41.itemQuantity = var6; + var42 = WorldMapData_0.ItemDefinition_get(var5); + var41.modelAngleX = var42.xan2d; + var41.modelAngleY = var42.yan2d; + var41.modelAngleZ = var42.zan2d; + var41.modelOffsetX = var42.offsetX2d; + var41.modelOffsetY = var42.offsetY2d; + var41.modelZoom = var42.zoom2d; + if (var42.isStackable == 1) { + var41.itemQuantityMode = 1; + } else { + var41.itemQuantityMode = 2; + } + + if (var41.field2638 > 0) { + var41.modelZoom = var41.modelZoom * 32 / var41.field2638; + } else if (var41.rawWidth > 0) { + var41.modelZoom = var41.modelZoom * 32 / var41.rawWidth; + } + + FriendSystem.invalidateWidget(var41); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2132 == var1.serverPacket) { + var16 = var3.readShort(); + var5 = var3.method5414(); + var17 = WorldMapElement.getWidget(var5); + if (var16 != var17.sequenceId || var16 == -1) { + var17.sequenceId = var16; + var17.modelFrame = 0; + var17.modelFrameCycle = 0; + FriendSystem.invalidateWidget(var17); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2146 == var1.serverPacket) { + JagexCache.method3438(class185.field2300); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2161 == var1.serverPacket) { + JagexCache.method3438(class185.field2304); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2117 == var1.serverPacket) { + GrandExchangeOffer.updateNpcs(false, var3); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2104 == var1.serverPacket) { + byte[] var39 = new byte[var1.serverPacketLength]; + var3.method5384(var39, 0, var39.length); + Buffer var53 = new Buffer(var39); + var49 = var53.readStringCp1252NullTerminated(); + GameObject.openURL(var49, true, false); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2168 == var1.serverPacket) { + WorldMapIcon_0.method207(); + weight = var3.readShort(); + field820 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2097 == var1.serverPacket) { + var3.offset += 28; + if (var3.checkCrc()) { + Login.method2031(var3, var3.offset - 28); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2172 == var1.serverPacket) { + isCameraLocked = true; + GraphicsObject.field1079 = var3.readUnsignedByte() * 16384; + class3.field24 = var3.readUnsignedByte() * 16384; + WorldMapSection0.field129 = var3.readUnsignedShort(); + WorldMapSectionType.field142 = var3.readUnsignedByte(); + WorldMapSection2.field191 = var3.readUnsignedByte(); + if (WorldMapSection2.field191 >= 100) { + WallDecoration.cameraX = GraphicsObject.field1079 * 128 + 64; + UserComparator7.cameraZ = class3.field24 * 128 + 64; + Coord.cameraY = GrandExchangeOfferTotalQuantityComparator.getTileHeight(WallDecoration.cameraX, UserComparator7.cameraZ, ItemContainer.plane) - WorldMapSection0.field129; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2101 == var1.serverPacket) { + var16 = var3.readUnsignedShort(); + var5 = var3.readInt(); + Varps.Varps_temp[var16] = var5; + if (Varps.Varps_main[var16] != var5) { + Varps.Varps_main[var16] = var5; + } + + ObjectSound.method1837(var16); + field809[++field800 - 1 & 31] = var16; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2160 == var1.serverPacket) { + byte var56 = var3.method5616(); + var5 = var3.method5446(); + Varps.Varps_temp[var5] = var56; + if (Varps.Varps_main[var5] != var56) { + Varps.Varps_main[var5] = var56; + } + + ObjectSound.method1837(var5); + field809[++field800 - 1 & 31] = var5; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2142 == var1.serverPacket) { + if (clanChat != null) { + clanChat.method5135(var3); + } + + FaceNormal.method3221(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2123 == var1.serverPacket) { + JagexCache.method3438(class185.field2303); + var1.serverPacket = null; + return true; + } + + long var12; + if (ServerPacket.field2162 == var1.serverPacket) { + var16 = var3.offset + var1.serverPacketLength; + var5 = var3.readUnsignedShort(); + var6 = var3.readUnsignedShort(); + if (var5 != rootInterface) { + rootInterface = var5; + this.resizeRoot(false); + WorldMapSectionType.Widget_resetModelFrames(rootInterface); + class51.runWidgetOnLoadListener(rootInterface); + + for (var18 = 0; var18 < 100; ++var18) { + field703[var18] = true; + } + } + + InterfaceParent var21; + for (; var6-- > 0; var21.field540 = true) { + var18 = var3.readInt(); + var20 = var3.readUnsignedShort(); + var9 = var3.readUnsignedByte(); + var21 = (InterfaceParent)interfaceParents.get((long)var18); + if (var21 != null && var20 != var21.group) { + VarpDefinition.closeInterface(var21, true); + var21 = null; + } + + if (var21 == null) { + var21 = NPC.method1967(var18, var20, var9); + } + } + + for (var7 = (InterfaceParent)interfaceParents.first(); var7 != null; var7 = (InterfaceParent)interfaceParents.next()) { + if (var7.field540) { + var7.field540 = false; + } else { + VarpDefinition.closeInterface(var7, true); + } + } + + widgetClickMasks = new NodeHashTable(512); + + while (var3.offset < var16) { + var18 = var3.readInt(); + var20 = var3.readUnsignedShort(); + var9 = var3.readUnsignedShort(); + var10 = var3.readInt(); + + for (int var11 = var20; var11 <= var9; ++var11) { + var12 = (long)var11 + ((long)var18 << 32); + widgetClickMasks.put(new IntegerNode(var10), var12); + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2156 == var1.serverPacket) { + var16 = var3.method5455(); + var5 = var3.method5434(); + var6 = var3.method5448(); + var41 = WorldMapElement.getWidget(var16); + if (var6 != var41.rawX || var5 != var41.rawY || var41.xAlignment != 0 || var41.yAlignment != 0) { + var41.rawX = var6; + var41.rawY = var5; + var41.xAlignment = 0; + var41.yAlignment = 0; + FriendSystem.invalidateWidget(var41); + this.alignWidget(var41); + if (var41.type == 0) { + WorldMapAreaData.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var16 >> 16], var41, false); + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2119 == var1.serverPacket) { + WorldMapIcon_0.method207(); + var16 = var3.method5505(); + var5 = var3.readUnsignedByteNegate(); + var6 = var3.readUnsignedByte(); + experience[var5] = var16; + currentLevels[var5] = var6; + levels[var5] = 1; + + for (var18 = 0; var18 < 98; ++var18) { + if (var16 >= Skills.Skills_experienceTable[var18]) { + levels[var5] = var18 + 2; + } + } + + changedSkills[++changedSkillsCount - 1 & 31] = var5; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2176 == var1.serverPacket) { + class30.updatePlayers(var3, var1.serverPacketLength); + WorldMapSection0.method230(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2131 == var1.serverPacket) { + var16 = var3.readUnsignedByte(); + AbstractWorldMapData.method272(var16); + var1.serverPacket = null; + return true; + } + + long var22; + if (ServerPacket.field2145 == var1.serverPacket) { + var16 = var3.method5505(); + var5 = var3.method5446(); + if (var5 == 65535) { + var5 = -1; + } + + var6 = var3.method5414(); + var18 = var3.readUnsignedShort(); + if (var18 == 65535) { + var18 = -1; + } + + for (var20 = var18; var20 <= var5; ++var20) { + var22 = (long)var20 + ((long)var6 << 32); + Node var60 = widgetClickMasks.get(var22); + if (var60 != null) { + var60.remove(); + } + + widgetClickMasks.put(new IntegerNode(var16), var22); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2138 == var1.serverPacket) { + var16 = var3.method5446(); + var5 = var3.method5445(); + var6 = var3.method5455(); + var41 = WorldMapElement.getWidget(var6); + var41.field2602 = var16 + (var5 << 16); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2157 == var1.serverPacket) { + var16 = var3.readInt(); + var5 = var3.readInt(); + InterfaceParent var47 = (InterfaceParent)interfaceParents.get((long)var5); + var7 = (InterfaceParent)interfaceParents.get((long)var16); + if (var7 != null) { + VarpDefinition.closeInterface(var7, var47 == null || var7.group != var47.group); + } + + if (var47 != null) { + var47.remove(); + interfaceParents.put(var47, (long)var16); + } + + var8 = WorldMapElement.getWidget(var5); + if (var8 != null) { + FriendSystem.invalidateWidget(var8); + } + + var8 = WorldMapElement.getWidget(var16); + if (var8 != null) { + FriendSystem.invalidateWidget(var8); + WorldMapAreaData.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var8.id >>> 16], var8, true); + } + + if (rootInterface != -1) { + UserComparator6.runIntfCloseListeners(rootInterface, 1); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2167 == var1.serverPacket) { + var16 = var3.readInt(); + var5 = var3.readUnsignedShort(); + if (var16 < -70000) { + var5 += 32768; + } + + if (var16 >= 0) { + var17 = WorldMapElement.getWidget(var16); + } else { + var17 = null; + } + + if (var17 != null) { + for (var18 = 0; var18 < var17.itemIds.length; ++var18) { + var17.itemIds[var18] = 0; + var17.itemQuantities[var18] = 0; + } + } + + class13.clearItemContainer(var5); + var18 = var3.readUnsignedShort(); + + for (var20 = 0; var20 < var18; ++var20) { + var9 = var3.readUnsignedShort(); + var10 = var3.readUnsignedByte(); + if (var10 == 255) { + var10 = var3.method5414(); + } + + if (var17 != null && var20 < var17.itemIds.length) { + var17.itemIds[var20] = var9; + var17.itemQuantities[var20] = var10; + } + + Canvas.itemContainerSetItem(var5, var20, var9 - 1, var10); + } + + if (var17 != null) { + FriendSystem.invalidateWidget(var17); + } + + WorldMapIcon_0.method207(); + field811[++field812 - 1 & 31] = var5 & 32767; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2103 == var1.serverPacket) { + WorldMapSection1.field283 = var3.readUnsignedByteNegate(); + Varps.field2507 = var3.method5438(); + var1.serverPacket = null; + return true; + } + + long var25; + long var27; + if (ServerPacket.field2107 == var1.serverPacket) { + var38 = var3.readStringCp1252NullTerminated(); + var25 = (long)var3.readUnsignedShort(); + var27 = (long)var3.readMedium(); + PlayerType var29 = (PlayerType)FriendSystem.findEnumerated(class191.PlayerType_values(), var3.readUnsignedByte()); + long var30 = (var25 << 32) + var27; + boolean var32 = false; + + for (int var13 = 0; var13 < 100; ++var13) { + if (field842[var13] == var30) { + var32 = true; + break; + } + } + + if (class32.friendSystem.isIgnored(new Username(var38, FontName.loginType))) { + var32 = true; + } + + if (!var32 && field737 == 0) { + field842[field843] = var30; + field843 = (field843 + 1) % 100; + String var33 = AbstractFont.escapeBrackets(class189.method3596(class51.method845(var3))); + byte var45; + if (var29.isPrivileged) { + var45 = 7; + } else { + var45 = 3; + } + + if (var29.modIcon * 714577229 != -1) { + DirectByteArrayCopier.addGameMessage(var45, AbstractWorldMapData.method278(var29.modIcon * 714577229) + var38, var33); + } else { + DirectByteArrayCopier.addGameMessage(var45, var38, var33); + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2149 == var1.serverPacket) { + if (rootInterface != -1) { + UserComparator6.runIntfCloseListeners(rootInterface, 0); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2137 == var1.serverPacket) { + var48 = var3.readBoolean(); + if (var48) { + if (GameObject.field1921 == null) { + GameObject.field1921 = new class237(); + } + } else { + GameObject.field1921 = null; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2169 == var1.serverPacket) { + rebootTimer = var3.readUnsignedShort() * 30; + field820 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2127 == var1.serverPacket) { + var16 = var3.readUnsignedShort(); + var5 = var3.readUnsignedByte(); + var6 = var3.readUnsignedShort(); + GrandExchangeOfferUnitPriceComparator.queueSoundEffect(var16, var5, var6); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2130 == var1.serverPacket) { + var16 = var3.method5447(); + var5 = var3.method5414(); + var17 = WorldMapElement.getWidget(var5); + if (var17.modelType != 2 || var16 != var17.modelId) { + var17.modelType = 2; + var17.modelId = var16; + FriendSystem.invalidateWidget(var17); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2158 == var1.serverPacket) { + var16 = var3.method5455(); + var52 = WorldMapElement.getWidget(var16); + + for (var6 = 0; var6 < var52.itemIds.length; ++var6) { + var52.itemIds[var6] = -1; + var52.itemIds[var6] = 0; + } + + FriendSystem.invalidateWidget(var52); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2140 == var1.serverPacket) { + if (var1.serverPacketLength == 0) { + clanChat = null; + } else { + if (clanChat == null) { + clanChat = new ClanChat(FontName.loginType, WorldMapID.client); + } + + clanChat.readUpdate(var3); + } + + FaceNormal.method3221(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2151 == var1.serverPacket) { + var38 = var3.readStringCp1252NullTerminated(); + var25 = var3.readLong(); + var27 = (long)var3.readUnsignedShort(); + var22 = (long)var3.readMedium(); + PlayerType var24 = (PlayerType)FriendSystem.findEnumerated(class191.PlayerType_values(), var3.readUnsignedByte()); + var12 = var22 + (var27 << 32); + boolean var14 = false; + + for (int var15 = 0; var15 < 100; ++var15) { + if (field842[var15] == var12) { + var14 = true; + break; + } + } + + if (var24.isUser && class32.friendSystem.isIgnored(new Username(var38, FontName.loginType))) { + var14 = true; + } + + if (!var14 && field737 == 0) { + field842[field843] = var12; + field843 = (field843 + 1) % 100; + String var34 = AbstractFont.escapeBrackets(class189.method3596(class51.method845(var3))); + if (var24.modIcon * 714577229 != -1) { + MilliClock.addChatMessage(9, AbstractWorldMapData.method278(var24.modIcon * 714577229) + var38, var34, class266.base37DecodeLong(var25)); + } else { + MilliClock.addChatMessage(9, var38, var34, class266.base37DecodeLong(var25)); + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2100 == var1.serverPacket) { + JagexCache.method3438(class185.field2305); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2099 == var1.serverPacket) { + isCameraLocked = false; + + for (var16 = 0; var16 < 5; ++var16) { + field897[var16] = false; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2153 == var1.serverPacket) { + for (var16 = 0; var16 < VarpDefinition.VarpDefinition_fileCount; ++var16) { + VarpDefinition var51 = class16.method180(var16); + if (var51 != null) { + Varps.Varps_temp[var16] = 0; + Varps.Varps_main[var16] = 0; + } + } + + WorldMapIcon_0.method207(); + field800 += 32; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2144 == var1.serverPacket) { + World var37 = new World(); + var37.host = var3.readStringCp1252NullTerminated(); + var37.id = var3.readUnsignedShort(); + var5 = var3.readInt(); + var37.properties = var5; + FloorDecoration.updateGameState(45); + var2.close(); + var2 = null; + class65.changeWorld(var37); + var1.serverPacket = null; + return false; + } + + if (ServerPacket.field2116 == var1.serverPacket) { + var16 = var3.readInt(); + var19 = var3.readStringCp1252NullTerminated(); + var17 = WorldMapElement.getWidget(var16); + if (!var19.equals(var17.text)) { + var17.text = var19; + FriendSystem.invalidateWidget(var17); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2105 == var1.serverPacket) { + JagexCache.method3438(class185.field2299); + var1.serverPacket = null; + return true; + } + + class3.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id : -1) + "," + (var1.field1296 != null ? var1.field1296.id : -1) + "," + (var1.field1291 != null ? var1.field1291.id : -1) + "," + var1.serverPacketLength, (Throwable)null); + class65.method1182(); + } catch (IOException var35) { + class2.method31(); + } catch (Exception var36) { + var19 = "" + (var1.serverPacket != null ? var1.serverPacket.id : -1) + "," + (var1.field1296 != null ? var1.field1296.id : -1) + "," + (var1.field1291 != null ? var1.field1291.id : -1) + "," + var1.serverPacketLength + "," + (WorldMapIcon_1.localPlayer.pathX[0] + PacketWriter.baseX * 64) + "," + (WorldMapIcon_1.localPlayer.pathY[0] + RouteStrategy.baseY * 64) + ","; + + for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { + var19 = var19 + var3.array[var6] + ","; + } + + class3.RunException_sendStackTrace(var19, var36); + class65.method1182(); } - if (ServerPacket.field2202 == var1.serverPacket) { - class14.method155(var3.readStringCp1252NullTerminated()); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2169 == var1.serverPacket) { - class65.method1176(); - runEnergy = var3.readUnsignedByte(); - field844 = cycleCntr; - var1.serverPacket = null; - return true; - } - - HitSplatDefinition.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id : -1) + "," + (var1.field1321 != null ? var1.field1321.id : -1) + "," + (var1.field1317 != null ? var1.field1317.id : -1) + "," + var1.serverPacketLength, (Throwable)null); - RouteStrategy.method3593(); - } catch (IOException var35) { - ScriptFrame.method1090(); - } catch (Exception var36) { - var18 = "" + (var1.serverPacket != null ? var1.serverPacket.id : -1) + "," + (var1.field1321 != null ? var1.field1321.id : -1) + "," + (var1.field1317 != null ? var1.field1317.id : -1) + "," + var1.serverPacketLength + "," + (localPlayer.pathX[0] + MusicPatchNode2.baseX * 64) + "," + (localPlayer.pathY[0] + class1.baseY * 64) + ","; - - for (int var17 = 0; var17 < var1.serverPacketLength && var17 < 50; ++var17) { - var18 = var18 + var3.array[var17] + ","; - } - - HitSplatDefinition.RunException_sendStackTrace(var18, var36); - RouteStrategy.method3593(); + return true; } - - return true; } - @ObfuscatedName("hy") + @ObfuscatedName("ho") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "116" + garbageValue = "1" ) - final void method1333() { - boolean var1 = false; + final void method1293() { + WorldMapID.method537(); + if (class188.dragInventoryWidget == null) { + if (clickedWidget == null) { + int var2; + int var4; + int var5; + int var10; + int var19; + label274: { + int var1 = MouseHandler.MouseHandler_lastButton; + int var3; + int var6; + int var8; + if (isMenuOpen) { + if (var1 != 1 && (FriendSystem.mouseCam || var1 != 4)) { + var2 = MouseHandler.MouseHandler_x; + var3 = MouseHandler.MouseHandler_y; + if (var2 < MilliClock.menuX - 10 || var2 > World.menuWidth + MilliClock.menuX + 10 || var3 < class96.menuY - 10 || var3 > class1.menuHeight + class96.menuY + 10) { + isMenuOpen = false; + FloorDecoration.method2786(MilliClock.menuX, class96.menuY, World.menuWidth, class1.menuHeight); + } + } - while (!var1) { - var1 = true; + if (var1 == 1 || !FriendSystem.mouseCam && var1 == 4) { + var2 = MilliClock.menuX; + var3 = class96.menuY; + var4 = World.menuWidth; + var5 = MouseHandler.MouseHandler_lastPressedX; + var6 = MouseHandler.MouseHandler_lastPressedY; + int var18 = -1; - for (int var2 = 0; var2 < menuOptionsCount - 1; ++var2) { - if (menuOpcodes[var2] < 1000 && menuOpcodes[var2 + 1] > 1000) { - String var3 = menuTargets[var2]; - menuTargets[var2] = menuTargets[var2 + 1]; - menuTargets[var2 + 1] = var3; - String var4 = menuActions[var2]; - menuActions[var2] = menuActions[var2 + 1]; - menuActions[var2 + 1] = var4; - int var5 = menuOpcodes[var2]; - menuOpcodes[var2] = menuOpcodes[var2 + 1]; - menuOpcodes[var2 + 1] = var5; - var5 = menuArguments1[var2]; - menuArguments1[var2] = menuArguments1[var2 + 1]; - menuArguments1[var2 + 1] = var5; - var5 = menuArguments2[var2]; - menuArguments2[var2] = menuArguments2[var2 + 1]; - menuArguments2[var2 + 1] = var5; - var5 = menuIdentifiers[var2]; - menuIdentifiers[var2] = menuIdentifiers[var2 + 1]; - menuIdentifiers[var2 + 1] = var5; - boolean var6 = menuShiftClick[var2]; - menuShiftClick[var2] = menuShiftClick[var2 + 1]; - menuShiftClick[var2 + 1] = var6; - var1 = false; - } - } - } + for (var8 = 0; var8 < menuOptionsCount; ++var8) { + var19 = var3 + (menuOptionsCount - 1 - var8) * 15 + 31; + if (var5 > var2 && var5 < var4 + var2 && var6 > var19 - 13 && var6 < var19 + 3) { + var18 = var8; + } + } - if (WorldMapIcon_0.dragInventoryWidget != null || clickedWidget != null) { - return; - } - int var20 = MouseHandler.MouseHandler_lastButton; - int var8; - int var9; - int var10; - int var14; - int var15; - int var21; - if (isMenuOpen) { - if (var20 != 1 && (DevicePcmPlayerProvider.mouseCam || var20 != 4)) { - int var2 = MouseHandler.MouseHandler_x; - var14 = MouseHandler.MouseHandler_y; - if (var2 < class247.menuX - 10 || var2 > class247.menuX + class42.menuWidth + 10 || var14 < class30.menuY - 10 || var14 > class30.menuY + ObjectSound.menuHeight + 10) { - isMenuOpen = false; - ChatChannel.method2215(class247.menuX, class30.menuY, class42.menuWidth, ObjectSound.menuHeight); - } - } + if (var18 != -1 && var18 >= 0) { + var8 = menuArguments1[var18]; + var19 = menuArguments2[var18]; + var10 = menuOpcodes[var18]; + int var17 = menuIdentifiers[var18]; + String var12 = menuActions[var18]; + String var13 = menuTargets[var18]; + SecureRandomFuture.menuAction(var8, var19, var10, var17, var12, var13, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); + } - if (var20 != 1 && (DevicePcmPlayerProvider.mouseCam || var20 != 4)) { - return; - } - int var2 = class247.menuX; - var14 = class30.menuY; - var15 = class42.menuWidth; - int var5 = MouseHandler.MouseHandler_lastPressedX; - var21 = MouseHandler.MouseHandler_lastPressedY; - int var22 = -1; + isMenuOpen = false; + FloorDecoration.method2786(MilliClock.menuX, class96.menuY, World.menuWidth, class1.menuHeight); + } + } else { + var2 = Player.getNewestMenuIdx(); + if ((var1 == 1 || !FriendSystem.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 var14 = WorldMapElement.getWidget(var5); + var8 = ParamDefinition.getWidgetClickMask(var14); + boolean var7 = (var8 >> 28 & 1) != 0; + if (var7) { + break label274; + } - for (var8 = 0; var8 < menuOptionsCount; ++var8) { - var9 = (menuOptionsCount - 1 - var8) * 15 + var14 + 31; - if (var5 > var2 && var5 < var15 + var2 && var21 > var9 - 13 && var21 < var9 + 3) { - var22 = var8; - } - } + var10 = ParamDefinition.getWidgetClickMask(var14); + boolean var9 = (var10 >> 29 & 1) != 0; + if (var9) { + break label274; + } + } + } - if (var22 != -1 && var22 >= 0) { - var8 = menuArguments1[var22]; - var9 = menuArguments2[var22]; - var10 = menuOpcodes[var22]; - int var19 = menuIdentifiers[var22]; - String var12 = menuActions[var22]; - String var13 = menuTargets[var22]; - Messages.menuAction(var8, var9, var10, var19, var12, var13, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); - } + if ((var1 == 1 || !FriendSystem.mouseCam && var1 == 4) && this.shouldLeftClickOpenMenu()) { + var1 = 2; + } - isMenuOpen = false; - ChatChannel.method2215(class247.menuX, class30.menuY, class42.menuWidth, ObjectSound.menuHeight); - return; - } + if ((var1 == 1 || !FriendSystem.mouseCam && var1 == 4) && menuOptionsCount > 0 && var2 >= 0) { + var3 = menuArguments1[var2]; + var4 = menuArguments2[var2]; + var5 = menuOpcodes[var2]; + var6 = menuIdentifiers[var2]; + String var15 = menuActions[var2]; + String var16 = menuTargets[var2]; + SecureRandomFuture.menuAction(var3, var4, var5, var6, var15, var16, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); + } - int var2 = class13.getNewestMenuIdx(); - if ((var20 == 1 || !DevicePcmPlayerProvider.mouseCam && var20 == 4) && var2 >= 0) { - var14 = menuOpcodes[var2]; - if (var14 == 39 || var14 == 40 || var14 == 41 || var14 == 42 || var14 == 43 || var14 == 33 || var14 == 34 || var14 == 35 || var14 == 36 || var14 == 37 || var14 == 38 || var14 == 1005) { - var15 = menuArguments1[var2]; - int var5 = menuArguments2[var2]; - Widget var16 = class80.getWidget(var5); - var8 = class268.getWidgetClickMask(var16); - if ( ((var8 >> 28 & 1) != 0) || UserComparator4.method3382(class268.getWidgetClickMask(var16))) { - if (WorldMapIcon_0.dragInventoryWidget != null && !field874 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { - var9 = field654; - var10 = field763; - MenuAction var11 = tempMenuAction; - Messages.menuAction(var11.argument1, var11.argument2, var11.opcode, var11.argument0, var11.action, var11.action, var9, var10); - tempMenuAction = null; + if (var1 == 2 && menuOptionsCount > 0) { + this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); + } } - field874 = false; - itemDragDuration = 0; - if (WorldMapIcon_0.dragInventoryWidget != null) { - Strings.invalidateWidget(WorldMapIcon_0.dragInventoryWidget); - } - - WorldMapIcon_0.dragInventoryWidget = class80.getWidget(var5); - dragItemSlotSource = var15; - field654 = MouseHandler.MouseHandler_lastPressedX; - field763 = MouseHandler.MouseHandler_lastPressedY; - if (var2 >= 0) { - Decimator.saveTempMenuAction(var2); - } - - Strings.invalidateWidget(WorldMapIcon_0.dragInventoryWidget); return; } + if (class188.dragInventoryWidget != null && !field867 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { + var19 = field732; + var10 = field744; + MenuAction var11 = class1.tempMenuAction; + SecureRandomFuture.menuAction(var11.argument1, var11.argument2, var11.opcode, var11.argument0, var11.action, var11.action, var19, var10); + class1.tempMenuAction = null; + } + + field867 = false; + itemDragDuration = 0; + if (class188.dragInventoryWidget != null) { + FriendSystem.invalidateWidget(class188.dragInventoryWidget); + } + + class188.dragInventoryWidget = WorldMapElement.getWidget(var5); + dragItemSlotSource = var4; + field732 = MouseHandler.MouseHandler_lastPressedX; + field744 = MouseHandler.MouseHandler_lastPressedY; + if (var2 >= 0) { + class1.tempMenuAction = new MenuAction(); + class1.tempMenuAction.argument1 = menuArguments1[var2]; + class1.tempMenuAction.argument2 = menuArguments2[var2]; + class1.tempMenuAction.opcode = menuOpcodes[var2]; + class1.tempMenuAction.argument0 = menuIdentifiers[var2]; + class1.tempMenuAction.action = menuActions[var2]; + } + + FriendSystem.invalidateWidget(class188.dragInventoryWidget); } } - - if ((var20 == 1 || !DevicePcmPlayerProvider.mouseCam && var20 == 4) && this.shouldLeftClickOpenMenu()) { - var20 = 2; - } - - if ((var20 == 1 || !DevicePcmPlayerProvider.mouseCam && var20 == 4) && menuOptionsCount > 0 && var2 >= 0) { - var14 = menuArguments1[var2]; - var15 = menuArguments2[var2]; - int var5 = menuOpcodes[var2]; - var21 = menuIdentifiers[var2]; - String var17 = menuActions[var2]; - String var18 = menuTargets[var2]; - Messages.menuAction(var14, var15, var5, var21, var17, var18, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); - } - - if (var20 == 2 && menuOptionsCount > 0) { - this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); - } } - @ObfuscatedName("hd") + @ObfuscatedName("hf") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-246080062" + garbageValue = "-1478367843" ) @Export("shouldLeftClickOpenMenu") final boolean shouldLeftClickOpenMenu() { - int var1 = class13.getNewestMenuIdx(); - return (leftClickOpensMenu == 1 && menuOptionsCount > 2 || Interpreter.isRightClickOnlyMenu(var1)) && !menuShiftClick[var1]; + int var1 = Player.getNewestMenuIdx(); + return (leftClickOpensMenu == 1 && menuOptionsCount > 2 || ClientPacket.isRightClickOnlyMenu(var1)) && !menuShiftClick[var1]; } - @ObfuscatedName("hj") + @ObfuscatedName("hu") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "-1898435320" + signature = "(IIB)V", + garbageValue = "7" ) @Export("openMenu") final void openMenu(int var1, int var2) { - NetCache.calculateMenuBounds(var1, var2); - GrandExchangeOfferWorldComparator.scene.menuOpen(class42.plane, var1, var2, false); + WorldMapData_1.calculateMenuBounds(var1, var2); + Player.scene.menuOpen(ItemContainer.plane, var1, var2, false); isMenuOpen = true; } - @ObfuscatedName("ik") + @ObfuscatedName("ir") @ObfuscatedSignature( signature = "(ZI)V", - garbageValue = "831397747" + garbageValue = "1310115319" ) @Export("resizeRoot") final void resizeRoot(boolean var1) { - WorldMapSprite.resizeComponents(rootInterface, GrandExchangeEvent.canvasWidth, ParamDefinition.canvasHeight, var1); + GrandExchangeOfferNameComparator.resizeComponents(rootInterface, KitDefinition.canvasWidth, class30.canvasHeight, var1); } - @ObfuscatedName("iw") + @ObfuscatedName("io") @ObfuscatedSignature( - signature = "(Lhj;I)V", - garbageValue = "2120964597" + signature = "(Lhp;B)V", + garbageValue = "53" ) @Export("alignWidget") void alignWidget(Widget var1) { - Widget var2 = var1.parentId == -1 ? null : class80.getWidget(var1.parentId); + Widget var2 = var1.parentId == -1 ? null : WorldMapElement.getWidget(var1.parentId); int var3; int var4; if (var2 == null) { - var3 = GrandExchangeEvent.canvasWidth; - var4 = ParamDefinition.canvasHeight; + var3 = KitDefinition.canvasWidth; + var4 = class30.canvasHeight; } else { var3 = var2.width; var4 = var2.height; } - class219.alignWidgetSize(var1, var3, var4, false); - PcmPlayer.alignWidgetPosition(var1, var3, var4); + NetSocket.alignWidgetSize(var1, var3, var4, false); + Message.alignWidgetPosition(var1, var3, var4); } - @ObfuscatedName("jh") + @ObfuscatedName("ju") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "41" + signature = "(I)V", + garbageValue = "-1084041497" ) - final void method1641() { - Strings.invalidateWidget(clickedWidget); - ++class80.widgetDragDuration; - if (!field745 || !field873) { - if (class80.widgetDragDuration > 1) { - clickedWidget = null; + final void method1615() { + FriendSystem.invalidateWidget(clickedWidget); + ++class60.widgetDragDuration; + if (field804 && field641) { + int var1 = MouseHandler.MouseHandler_x; + int var2 = MouseHandler.MouseHandler_y; + var1 -= widgetClickX; + var2 -= widgetClickY; + if (var1 < field802) { + var1 = field802; } - return; - } - int var1 = MouseHandler.MouseHandler_x; - int var2 = MouseHandler.MouseHandler_y; - var1 -= widgetClickX; - var2 -= widgetClickY; - if (var1 < field834) { - var1 = field834; - } - if (var1 + clickedWidget.width > field834 + clickedWidgetParent.width) { - var1 = field834 + clickedWidgetParent.width - clickedWidget.width; - } + if (var1 + clickedWidget.width > field802 + clickedWidgetParent.width) { + var1 = field802 + clickedWidgetParent.width - clickedWidget.width; + } - if (var2 < field835) { - var2 = field835; - } + if (var2 < field803) { + var2 = field803; + } - if (var2 + clickedWidget.height > field835 + clickedWidgetParent.height) { - var2 = field835 + clickedWidgetParent.height - clickedWidget.height; - } + if (var2 + clickedWidget.height > field803 + clickedWidgetParent.height) { + var2 = field803 + clickedWidgetParent.height - clickedWidget.height; + } - int var3 = var1 - field837; - int var4 = var2 - field838; - int var5 = clickedWidget.dragZoneSize; - if (class80.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { - isDraggingWidget = true; - } + int var3 = var1 - field805; + int var4 = var2 - field806; + int var5 = clickedWidget.dragZoneSize; + if (class60.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { + isDraggingWidget = true; + } - int var6 = var1 - field834 + clickedWidgetParent.scrollX; - int var7 = var2 - field835 + clickedWidgetParent.scrollY; - ScriptEvent var8; - if (clickedWidget.onDrag != null && isDraggingWidget) { - var8 = new ScriptEvent(); - var8.widget = clickedWidget; - var8.mouseX = var6; - var8.mouseY = var7; - var8.args = clickedWidget.onDrag; - LoginPacket.runScriptEvent(var8); - } - - if (MouseHandler.MouseHandler_currentButton != 0) { - return; - } - if (isDraggingWidget) { - if (clickedWidget.onDragComplete != null) { + int var6 = var1 - field802 + clickedWidgetParent.scrollX; + int var7 = var2 - field803 + clickedWidgetParent.scrollY; + ScriptEvent var8; + if (clickedWidget.onDrag != null && isDraggingWidget) { var8 = new ScriptEvent(); var8.widget = clickedWidget; var8.mouseX = var6; var8.mouseY = var7; - var8.dragTarget = draggedOnWidget; - var8.args = clickedWidget.onDragComplete; - LoginPacket.runScriptEvent(var8); + var8.args = clickedWidget.onDrag; + class81.runScriptEvent(var8); } - if (draggedOnWidget != null) { - Widget var9 = clickedWidget; - int var10 = class32.method545(class268.getWidgetClickMask(var9)); - Widget var15; - if (var10 == 0) { - var15 = null; - } else { - for (int var11 = 0; var11 < var10; var11++) { - var9 = class80.getWidget(var9.parentId); - if (var9 == null) { - break; - } - + if (MouseHandler.MouseHandler_currentButton == 0) { + if (isDraggingWidget) { + if (clickedWidget.onDragComplete != null) { + var8 = new ScriptEvent(); + var8.widget = clickedWidget; + var8.mouseX = var6; + var8.mouseY = var7; + var8.dragTarget = draggedOnWidget; + var8.args = clickedWidget.onDragComplete; + class81.runScriptEvent(var8); } - var15 = var9; + + if (draggedOnWidget != null && AbstractByteArrayCopier.method3871(clickedWidget) != null) { + PacketBufferNode var9 = MenuAction.getPacketBufferNode(ClientPacket.field2213, packetWriter.isaacCipher); + var9.packetBuffer.method5443(clickedWidget.childIndex); + var9.packetBuffer.method5443(draggedOnWidget.itemId); + var9.packetBuffer.writeShort(draggedOnWidget.childIndex); + var9.packetBuffer.writeIntLE(clickedWidget.id); + var9.packetBuffer.writeIntME(draggedOnWidget.id); + var9.packetBuffer.writeShort(clickedWidget.itemId); + packetWriter.addNode(var9); + } + } else if (this.shouldLeftClickOpenMenu()) { + this.openMenu(field805 + widgetClickX, field806 + widgetClickY); + } else if (menuOptionsCount > 0) { + ScriptFrame.method1092(field805 + widgetClickX, field806 + widgetClickY); } - if (var15 != null) { - PacketBufferNode var16 = Archive.getPacketBufferNode(ClientPacket.field2260, packetWriter.isaacCipher); - var16.packetBuffer.method5530(clickedWidget.childIndex); - var16.packetBuffer.method5530(draggedOnWidget.itemId); - var16.packetBuffer.writeShort(draggedOnWidget.childIndex); - var16.packetBuffer.writeIntLE(clickedWidget.id); - var16.packetBuffer.writeIntME(draggedOnWidget.id); - var16.packetBuffer.writeShort(clickedWidget.itemId); - packetWriter.addNode(var16); - } + clickedWidget = null; } - } else if (this.shouldLeftClickOpenMenu()) { - this.openMenu(widgetClickX + field837, widgetClickY + field838); - } else if (menuOptionsCount > 0) { - int var13 = widgetClickX + field837; - int var14 = field838 + widgetClickY; - MenuAction var12 = tempMenuAction; - Messages.menuAction(var12.argument1, var12.argument2, var12.opcode, var12.argument0, var12.action, var12.action, var13, var14); - tempMenuAction = null; - } - clickedWidget = null; + } else { + if (class60.widgetDragDuration > 1) { + clickedWidget = null; + } + + } } - @ObfuscatedName("ku") + @ObfuscatedName("kk") @ObfuscatedSignature( - signature = "(B)Ljv;", - garbageValue = "-19" + signature = "(I)Ljx;", + garbageValue = "962934553" ) @Export("username") public Username username() { - return localPlayer != null ? localPlayer.username : null; + return WorldMapIcon_1.localPlayer != null ? WorldMapIcon_1.localPlayer.username : null; } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(III)Lhj;", - garbageValue = "323433634" + signature = "(IIIIIIILea;Lfm;I)V", + garbageValue = "1851683520" ) - @Export("getWidgetChild") - public static Widget getWidgetChild(int var0, int var1) { - Widget var2 = class80.getWidget(var0); - if (var1 == -1) { - return var2; + @Export("addPendingGameObject") + static final void addPendingGameObject(int var0, int var1, int var2, int var3, int var4, int var5, int var6, Scene var7, CollisionMap var8) { + ObjectDefinition var9 = class215.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[var12][var15] + var16[var13][var14] + var16[var12][var14] >> 2; + int var18 = (var2 << 7) + (var10 << 6); + int var19 = (var3 << 7) + (var11 << 6); + long var20 = WorldMapSprite.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); + } + + var7.method3013(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.field479[var5], 0, var20, var22); + if (var9.interactType != 0) { + var8.method3495(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.field480[var5], 0, var20, var22); + if (var9.interactType != 0) { + var8.method3495(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.field479[var5], Tiles.field479[var29], var20, var22); + if (var9.interactType != 0) { + var8.method3495(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.field480[var5], 0, var20, var22); + if (var9.interactType != 0) { + var8.method3495(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.method3013(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.field479[var5], 0, 0, 0, var20, var22); + } else { + Object var26; + long var30; + if (var6 == 5) { + var29 = 16; + var30 = var7.getBoundaryObjectTag(var0, var2, var3); + if (0L != var30) { + var29 = class215.getObjectDefinition(BoundaryObject.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.field479[var5], 0, var29 * Tiles.field481[var5], var29 * Tiles.field482[var5], var20, var22); + } else if (var6 == 6) { + var29 = 8; + var30 = var7.getBoundaryObjectTag(var0, var2, var3); + if (var30 != 0L) { + var29 = class215.getObjectDefinition(BoundaryObject.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.field478[var5], var29 * Tiles.field484[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 = class215.getObjectDefinition(BoundaryObject.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.field478[var5], var29 * Tiles.field484[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.method3013(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 var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; } - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "([Lbw;II[I[IB)V", - garbageValue = "-109" - ) - @Export("sortWorlds") - static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) { - if (var1 >= var2) { - return; + static void abv(int var0) { + oculusOrbState = var0 * 1185562872; + } + + static void aar(byte[] var0, int var1) { + if (randomDatData == null) { + randomDatData = new byte[24]; } - 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; + class300.writeRandomDat(var0, var1, randomDatData, 0, 24); + } - int var10; - int var11; - int var12; - do { - --var6; + @ObfuscatedSignature( + signature = "(Lhp;I)Ljava/lang/String;" + ) + static String aas(Widget var0, int var1) { + int var3 = ParamDefinition.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; + } + } - 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; - } + @ObfuscatedSignature( + signature = "(Lhp;)Z" + ) + static boolean aaa(Widget var0) { + return var0.isHidden; + } - 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; - } + static String abr(String var0) { + PlayerType[] var1 = class191.PlayerType_values(); - if (var12 == var11) { - if (var10 == 3) { - var9 = false; - } - continue; - } - if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { - var9 = false; - } - break; - - } - } 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 (var11 != var12) - { - if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { - var9 = false; - } - break; - } - else - { - if (var10 == 3) { - var9 = false; - } - } - - } - } while(var9); - - if (var5 < var6) { - World var13 = var0[var5]; - var0[var5] = var0[var6]; - var0[var6] = var13; + for (int var2 = 0; var2 < var1.length; ++var2) { + PlayerType var3 = var1[var2]; + if (var3.modIcon * 714577229 != -1 && var0.startsWith(AbstractWorldMapData.method278(var3.modIcon * 714577229))) { + var0 = var0.substring(6 + Integer.toString(var3.modIcon * -474347898).length()); + break; } } - sortWorlds(var0, var1, var6, var3, var4); - sortWorlds(var0, var6 + 1, var2, var3, var4); + return var0; + } + + static void aaq(String var0) { + Clock.field2037 = var0; + + try { + String var1 = WorldMapID.client.getParameter(Integer.toString(18)); + String var2 = WorldMapID.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=" + MusicPatchPcmStream.method3831(SequenceDefinition.method4686() + 94608000000L) + "; Max-Age=" + 94608000L; + } + + class47.method796(WorldMapID.client, "document.cookie=\"" + var3 + "\""); + } catch (Throwable var4) { + } } - @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "1487250543" + signature = "(Lky;I)V" ) - @Export("FriendSystem_alreadyIgnoredMes") - static final void FriendSystem_alreadyIgnoredMes(String var0) { - StringBuilder var10000 = (new StringBuilder()).append(var0); - Object var10001 = null; - String var1 = var10000.append(" is already on your ignore list").toString(); - ScriptEvent.addGameMessage(30, "", var1); + static void aap(Buffer var0, int var1) { + Tiles.method1088(var0.array, var1); + WorldMapIcon_1.method295(var0, var1); + } + + @ObfuscatedSignature( + signature = "(Lhp;)Z" + ) + static boolean aaw(Widget var0) { + return var0.isHidden; + } + + static void abz(int var0) { + oculusOrbState = var0; + } + + static void aay(String var0, boolean var1) { + var0 = var0.toLowerCase(); + short[] var2 = new short[16]; + int var3 = 0; + + for (int var4 = 0; var4 < MouseRecorder.ItemDefinition_fileCount; ++var4) { + ItemDefinition var5 = WorldMapData_0.ItemDefinition_get(var4); + if ((!var1 || var5.isTradable) && var5.noteTemplate * -600977204 == -1 && var5.name.toLowerCase().indexOf(var0) != -1) { + if (var3 >= 250) { + Language.foundItemIdCount = -1; + SecureRandomCallable.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; + } + } + + SecureRandomCallable.foundItemIds = var2; + GrandExchangeOffer.foundItemIndex = 0; + Language.foundItemIdCount = var3; + String[] var8 = new String[Language.foundItemIdCount * 1188384709]; + + for (int var9 = 0; var9 < Language.foundItemIdCount * -269707746; ++var9) { + var8[var9] = WorldMapData_0.ItemDefinition_get(var2[var9]).name; + } + + short[] var10 = SecureRandomCallable.foundItemIds; + ModelData0.sortItemsByName(var8, var10, 0, var8.length - 1); + } + + static void abs() { + packetWriter.addNode(MenuAction.getPacketBufferNode(ClientPacket.field2222, packetWriter.isaacCipher)); + oculusOrbState = 0; + } + + @ObfuscatedSignature( + signature = "(Lky;)V" + ) + static void aad(Buffer var0) { + if (randomDatData != null) { + var0.writeBytes(randomDatData, 0, randomDatData.length); + } else { + byte[] var2 = new byte[24]; + + try { + JagexCache.JagexCache_randomDat.seek(0L); + JagexCache.JagexCache_randomDat.readFully(var2); + + int var3; + for (var3 = 0; var3 < 24 && var2[var3] == 0; ++var3) { + } + + if (var3 >= 24) { + throw new IOException(); + } + } catch (Exception var6) { + for (int var4 = 0; var4 < 24; ++var4) { + var2[var4] = -1; + } + } + + var0.writeBytes(var2, 0, var2.length); + } + } + + @ObfuscatedSignature( + signature = "(Lky;I)V" + ) + static void aav(Buffer var0, int var1) { + Tiles.method1088(var0.array, var1); + WorldMapIcon_1.method295(var0, var1); + } + + public static void abp(int var0, int var1, int var2, boolean var3) { + PacketBufferNode var4 = MenuAction.getPacketBufferNode(ClientPacket.field2255, packetWriter.isaacCipher); + var4.packetBuffer.writeIntME(var3 ? field705 * -412206939 : 0); + var4.packetBuffer.writeShortLE(var1); + var4.packetBuffer.method5545(var2); + var4.packetBuffer.writeShort(var0); + packetWriter.addNode(var4); + } + + @ObfuscatedSignature( + signature = "(Lhp;)Ljava/lang/String;" + ) + static String aak(Widget var0) { + if (WorldMapRegion.method530(ParamDefinition.getWidgetClickMask(var0)) == 0) { + return null; + } else { + return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; + } + } + + @ObfuscatedSignature( + signature = "(Lky;)V" + ) + static void aaf(Buffer var0) { + if (randomDatData != null) { + var0.writeBytes(randomDatData, 0, randomDatData.length); + } else { + byte[] var2 = new byte[24]; + + try { + JagexCache.JagexCache_randomDat.seek(0L); + JagexCache.JagexCache_randomDat.readFully(var2); + + int var3; + for (var3 = 0; var3 < 24 && var2[var3] == 0; ++var3) { + } + + if (var3 >= 24) { + throw new IOException(); + } + } catch (Exception var6) { + for (int var4 = 0; var4 < 24; ++var4) { + var2[var4] = -1; + } + } + + var0.writeBytes(var2, 0, var2.length); + } + } + + @ObfuscatedSignature( + signature = "(Lhp;)Z" + ) + static boolean aax(Widget var0) { + return var0.isHidden; + } + + @ObfuscatedSignature( + signature = "(Lhp;)Z" + ) + static boolean aah(Widget var0) { + return var0.isHidden; + } + + @ObfuscatedSignature( + signature = "(Lhp;I)Ljava/lang/String;" + ) + static String aat(Widget var0, int var1) { + int var3 = ParamDefinition.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; + } + } + + @ObfuscatedSignature( + signature = "(Lhp;)Ljava/lang/String;" + ) + static String aai(Widget var0) { + if (WorldMapRegion.method530(ParamDefinition.getWidgetClickMask(var0)) == 0) { + return null; + } else { + return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; + } + } + + @ObfuscatedSignature( + signature = "(Lhp;)Ljava/lang/String;" + ) + static String aan(Widget var0) { + if (WorldMapRegion.method530(ParamDefinition.getWidgetClickMask(var0)) == 0) { + return null; + } else { + return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; + } + } + + static String aae(String var0, boolean var1) { + String var2 = var1 ? "https://" : "http://"; + if (gameBuild == 1) { + var0 = var0 + "-wtrc"; + } else if (gameBuild == 2) { + var0 = var0 + "-wtqa"; + } else if (gameBuild == 3) { + var0 = var0 + "-wtwip"; + } else if (gameBuild == 5) { + var0 = var0 + "-wti"; + } else if (gameBuild == 4) { + var0 = "local"; + } + + String var3 = ""; + if (Clock.field2037 != null) { + var3 = "/p=" + Clock.field2037; + } + + String var4 = "runescape.com"; + return var2 + var0 + "." + var4 + "/l=" + class60.clientLanguage + "/a=" + SoundSystem.field1414 + var3 + "/"; + } + + static String aao(String var0, boolean var1) { + String var2 = var1 ? "https://" : "http://"; + if (gameBuild == 1) { + var0 = var0 + "-wtrc"; + } else if (gameBuild == 2) { + var0 = var0 + "-wtqa"; + } else if (gameBuild == 3) { + var0 = var0 + "-wtwip"; + } else if (gameBuild == 5) { + var0 = var0 + "-wti"; + } else if (gameBuild == 4) { + var0 = "local"; + } + + String var3 = ""; + if (Clock.field2037 != null) { + var3 = "/p=" + Clock.field2037; + } + + String var4 = "runescape.com"; + return var2 + var0 + "." + var4 + "/l=" + class60.clientLanguage + "/a=" + SoundSystem.field1414 + var3 + "/"; + } + + static String aac(String var0, boolean var1) { + String var2 = var1 ? "https://" : "http://"; + if (gameBuild == 1) { + var0 = var0 + "-wtrc"; + } else if (gameBuild == 2) { + var0 = var0 + "-wtqa"; + } else if (gameBuild == 3) { + var0 = var0 + "-wtwip"; + } else if (gameBuild == 5) { + var0 = var0 + "-wti"; + } else if (gameBuild * 281503877 == 4) { + var0 = "local"; + } + + String var3 = ""; + if (Clock.field2037 != null) { + var3 = "/p=" + Clock.field2037; + } + + String var4 = "runescape.com"; + return var2 + var0 + "." + var4 + "/l=" + class60.clientLanguage + "/a=" + SoundSystem.field1414 * -1347342514 + var3 + "/"; + } + + static void aal(byte[] var0, int var1) { + if (randomDatData == null) { + randomDatData = new byte[24]; + } + + class300.writeRandomDat(var0, var1, randomDatData, 0, 24); + } + + @ObfuscatedSignature( + signature = "(Lky;I)V" + ) + static void aaz(Buffer var0, int var1) { + Tiles.method1088(var0.array, var1); + WorldMapIcon_1.method295(var0, var1); + } + + @ObfuscatedSignature( + signature = "(Lky;I)V" + ) + static void aab(Buffer var0, int var1) { + Tiles.method1088(var0.array, var1); + WorldMapIcon_1.method295(var0, var1); + } + + @ObfuscatedSignature( + signature = "(Lky;)V" + ) + static void aam(Buffer var0) { + if (randomDatData != null) { + var0.writeBytes(randomDatData, 0, randomDatData.length); + } else { + byte[] var2 = new byte[24]; + + try { + JagexCache.JagexCache_randomDat.seek(0L); + JagexCache.JagexCache_randomDat.readFully(var2); + + int var3; + for (var3 = 0; var3 < 24 && var2[var3] == 0; ++var3) { + } + + if (var3 >= 24) { + throw new IOException(); + } + } catch (Exception var6) { + for (int var4 = 0; var4 < 24; ++var4) { + var2[var4] = -1; + } + } + + var0.writeBytes(var2, 0, var2.length); + } + } + + public static void abm(int var0, int var1, int var2, boolean var3) { + PacketBufferNode var4 = MenuAction.getPacketBufferNode(ClientPacket.field2255, packetWriter.isaacCipher); + var4.packetBuffer.writeIntME(var3 ? field705 : 0); + var4.packetBuffer.writeShortLE(var1); + var4.packetBuffer.method5545(var2); + var4.packetBuffer.writeShort(var0); + packetWriter.addNode(var4); + } + + static void abf(int var0) { + oculusOrbState = var0; + } + + static void abh(int var0) { + oculusOrbState = var0; + } + + static void aau(String var0) { + Clock.field2037 = var0; + + try { + String var1 = WorldMapID.client.getParameter(Integer.toString(18)); + String var2 = WorldMapID.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=" + MusicPatchPcmStream.method3831(SequenceDefinition.method4686() + 94608000000L) + "; Max-Age=" + 94608000L; + } + + class47.method796(WorldMapID.client, "document.cookie=\"" + var3 + "\""); + } catch (Throwable var4) { + } + + } + + static void abj() { + packetWriter.addNode(MenuAction.getPacketBufferNode(ClientPacket.field2222, packetWriter.isaacCipher)); + oculusOrbState = 0; + } + + static void aby() { + packetWriter.addNode(MenuAction.getPacketBufferNode(ClientPacket.field2222, packetWriter.isaacCipher)); + oculusOrbState = 0; + } + + static void abx() { + if (field706 && WorldMapIcon_1.localPlayer != null) { + int var0 = WorldMapIcon_1.localPlayer.pathX[0]; + int var1 = WorldMapIcon_1.localPlayer.pathY[0]; + if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) { + return; + } + + DynamicObject.oculusOrbFocalPointX = WorldMapIcon_1.localPlayer.x; + int var2 = GrandExchangeOfferTotalQuantityComparator.getTileHeight(WorldMapIcon_1.localPlayer.x, WorldMapIcon_1.localPlayer.y, ItemContainer.plane) - camFollowHeight; + if (var2 < ScriptEvent.field559) { + ScriptEvent.field559 = var2; + } + + FriendSystem.oculusOrbFocalPointY = WorldMapIcon_1.localPlayer.y; + field706 = false; + } + + } + + static String abq(String var0) { + PlayerType[] var1 = class191.PlayerType_values(); + + for (int var2 = 0; var2 < var1.length; ++var2) { + PlayerType var3 = var1[var2]; + if (var3.modIcon * 714577229 != -1 && var0.startsWith(AbstractWorldMapData.method278(var3.modIcon * 714577229))) { + var0 = var0.substring(6 + Integer.toString(var3.modIcon * 714577229).length()); + break; + } + } + + return var0; + } + + static String abl(String var0) { + PlayerType[] var1 = class191.PlayerType_values(); + + for (int var2 = 0; var2 < var1.length; ++var2) { + PlayerType var3 = var1[var2]; + if (var3.modIcon * -474359768 != -1 && var0.startsWith(AbstractWorldMapData.method278(var3.modIcon * 714577229))) { + var0 = var0.substring(6 + Integer.toString(var3.modIcon * 64500931).length()); + break; + } + } + + return var0; + } + + static String abu(String var0) { + PlayerType[] var1 = class191.PlayerType_values(); + + for (int var2 = 0; var2 < var1.length; ++var2) { + PlayerType var3 = var1[var2]; + if (var3.modIcon * 1421818761 != -1 && var0.startsWith(AbstractWorldMapData.method278(var3.modIcon * 714577229))) { + var0 = var0.substring(6 + Integer.toString(var3.modIcon * -1744443394).length()); + break; + } + } + + return var0; + } + + static String abw(String var0) { + PlayerType[] var1 = class191.PlayerType_values(); + + for (int var2 = 0; var2 < var1.length; ++var2) { + PlayerType var3 = var1[var2]; + if (var3.modIcon * 869307039 != -1 && var0.startsWith(AbstractWorldMapData.method278(var3.modIcon * 714577229))) { + var0 = var0.substring(6 + Integer.toString(var3.modIcon * 714577229).length()); + break; + } + } + + return var0; + } + + static void abk() { + if (GameObject.field1921 != null) { + field892 = cycle; + GameObject.field1921.method4241(); + + for (int var0 = 0; var0 < players.length; ++var0) { + if (players[var0] != null) { + GameObject.field1921.method4237(PacketWriter.baseX * 64 + (players[var0].x >> 7), RouteStrategy.baseY * 64 + (players[var0].y >> 7)); + } + } + } + + } + + static void abg() { + if (GameObject.field1921 != null) { + field892 = cycle; + GameObject.field1921.method4241(); + + for (int var0 = 0; var0 < players.length; ++var0) { + if (players[var0] != null) { + GameObject.field1921.method4237(PacketWriter.baseX * -1245657920 + (players[var0].x >> 7), RouteStrategy.baseY * 64 + (players[var0].y >> 7)); + } + } + } + } } diff --git a/runescape-client/src/main/java/ClientPacket.java b/runescape-client/src/main/java/ClientPacket.java index 563cd46652..0725049e4d 100644 --- a/runescape-client/src/main/java/ClientPacket.java +++ b/runescape-client/src/main/java/ClientPacket.java @@ -4,628 +4,635 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gx") +@ObfuscatedName("gv") @Implements("ClientPacket") -public class ClientPacket implements ClientPacketMarker { - @ObfuscatedName("ng") - @ObfuscatedGetter( - intValue = -1373117165 - ) - static int field2305; - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2289; - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2204; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2232; - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2259; - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2217; - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2208; - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2269; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2281; - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2211; - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2212; - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2213; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2236; - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2215; - @ObfuscatedName("r") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2216; - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2251; - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2294; - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2219; - @ObfuscatedName("a") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2220; - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2221; - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2222; - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2223; - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2255; - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2225; - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2207; +public class ClientPacket implements class181 { @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2227; - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2228; - @ObfuscatedName("al") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2229; - @ObfuscatedName("av") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2230; - @ObfuscatedName("as") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2231; - @ObfuscatedName("aw") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2203; - @ObfuscatedName("ad") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2233; - @ObfuscatedName("ag") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2214; - @ObfuscatedName("ar") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2235; - @ObfuscatedName("ax") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2254; - @ObfuscatedName("az") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2237; - @ObfuscatedName("ae") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2238; - @ObfuscatedName("ao") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2244; - @ObfuscatedName("aj") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2240; - @ObfuscatedName("at") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2205; - @ObfuscatedName("ac") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2242; - @ObfuscatedName("ap") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2243; - @ObfuscatedName("aq") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2234; - @ObfuscatedName("aa") - @ObfuscatedSignature( - signature = "Lgx;" + signature = "Lgv;" ) public static final ClientPacket field2245; - @ObfuscatedName("an") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lgx;" + signature = "Lgv;" ) - static final ClientPacket field2246; - @ObfuscatedName("au") + public static final ClientPacket field2186; + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lgx;" + signature = "Lgv;" ) - public static final ClientPacket field2247; - @ObfuscatedName("ai") + public static final ClientPacket field2187; + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lgx;" + signature = "Lgv;" ) public static final ClientPacket field2248; - @ObfuscatedName("ak") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lgx;" + signature = "Lgv;" ) - public static final ClientPacket field2249; - @ObfuscatedName("ah") + public static final ClientPacket field2195; + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lgx;" + signature = "Lgv;" ) - public static final ClientPacket field2250; - @ObfuscatedName("am") + public static final ClientPacket field2190; + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lgx;" + signature = "Lgv;" + ) + public static final ClientPacket field2191; + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2188; + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2194; + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2189; + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2212; + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2203; + @ObfuscatedName("r") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2197; + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2198; + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2199; + @ObfuscatedName("b") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2200; + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2232; + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2202; + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2251; + @ObfuscatedName("a") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2204; + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2205; + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "Lgv;" ) public static final ClientPacket field2206; - @ObfuscatedName("ay") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Lgx;" + signature = "Lgv;" ) - public static final ClientPacket field2300; + public static final ClientPacket field2207; + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2208; + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2209; + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2210; + @ObfuscatedName("av") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2211; + @ObfuscatedName("am") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2279; + @ObfuscatedName("ai") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2266; @ObfuscatedName("af") @ObfuscatedSignature( - signature = "Lgx;" + signature = "Lgv;" ) - public static final ClientPacket field2253; - @ObfuscatedName("ab") + public static final ClientPacket field2214; + @ObfuscatedName("az") @ObfuscatedSignature( - signature = "Lgx;" + signature = "Lgv;" + ) + public static final ClientPacket field2215; + @ObfuscatedName("aj") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2216; + @ObfuscatedName("an") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2268; + @ObfuscatedName("at") + @ObfuscatedSignature( + signature = "Lgv;" ) public static final ClientPacket field2218; - @ObfuscatedName("bp") + @ObfuscatedName("as") @ObfuscatedSignature( - signature = "Lgx;" + signature = "Lgv;" ) - public static final ClientPacket field2262; - @ObfuscatedName("bz") + public static final ClientPacket field2219; + @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "Lgx;" + signature = "Lgv;" ) - public static final ClientPacket field2293; - @ObfuscatedName("bi") + public static final ClientPacket field2220; + @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "Lgx;" + signature = "Lgv;" + ) + public static final ClientPacket field2239; + @ObfuscatedName("ac") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2222; + @ObfuscatedName("ar") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2223; + @ObfuscatedName("au") + @ObfuscatedSignature( + signature = "Lgv;" ) public static final ClientPacket field2224; - @ObfuscatedName("bg") + @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "Lgx;" + signature = "Lgv;" ) - public static final ClientPacket field2277; - @ObfuscatedName("bh") + public static final ClientPacket field2221; + @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "Lgx;" + signature = "Lgv;" ) - public static final ClientPacket field2301; - @ObfuscatedName("bm") + public static final ClientPacket field2226; + @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "Lgx;" + signature = "Lgv;" ) - public static final ClientPacket field2260; + public static final ClientPacket field2227; + @ObfuscatedName("ap") + @ObfuscatedSignature( + signature = "Lgv;" + ) + static final ClientPacket field2228; + @ObfuscatedName("aq") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2270; + @ObfuscatedName("ay") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2230; + @ObfuscatedName("ad") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2231; + @ObfuscatedName("al") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2272; + @ObfuscatedName("ah") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2233; + @ObfuscatedName("ab") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2234; + @ObfuscatedName("aw") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2273; + @ObfuscatedName("ae") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2236; + @ObfuscatedName("bk") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2237; + @ObfuscatedName("bw") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2217; + @ObfuscatedName("bo") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2225; @ObfuscatedName("bn") @ObfuscatedSignature( - signature = "Lgx;" + signature = "Lgv;" + ) + public static final ClientPacket field2240; + @ObfuscatedName("bp") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2241; + @ObfuscatedName("bz") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2213; + @ObfuscatedName("bh") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2243; + @ObfuscatedName("bv") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2196; + @ObfuscatedName("bj") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2238; + @ObfuscatedName("bq") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2255; + @ObfuscatedName("by") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2247; + @ObfuscatedName("bs") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2229; + @ObfuscatedName("bi") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2193; + @ObfuscatedName("bf") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2250; + @ObfuscatedName("bd") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2244; + @ObfuscatedName("br") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2252; + @ObfuscatedName("bm") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2253; + @ObfuscatedName("bu") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2254; + @ObfuscatedName("bb") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2192; + @ObfuscatedName("bl") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2256; + @ObfuscatedName("bt") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2257; + @ObfuscatedName("bx") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2258; + @ObfuscatedName("ba") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2259; + @ObfuscatedName("bg") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2260; + @ObfuscatedName("be") + @ObfuscatedSignature( + signature = "Lgv;" ) public static final ClientPacket field2261; @ObfuscatedName("bc") @ObfuscatedSignature( - signature = "Lgx;" + signature = "Lgv;" ) - public static final ClientPacket field2303; - @ObfuscatedName("bx") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2263; - @ObfuscatedName("bo") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2296; - @ObfuscatedName("bb") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2209; - @ObfuscatedName("bs") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2266; - @ObfuscatedName("bj") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2267; - @ObfuscatedName("bl") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2268; - @ObfuscatedName("bd") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2264; - @ObfuscatedName("by") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2270; - @ObfuscatedName("bt") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2271; - @ObfuscatedName("bq") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2272; - @ObfuscatedName("bu") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2273; - @ObfuscatedName("bw") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2274; - @ObfuscatedName("br") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2265; - @ObfuscatedName("bk") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2276; - @ObfuscatedName("bf") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2256; - @ObfuscatedName("bv") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2278; - @ObfuscatedName("be") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2279; - @ObfuscatedName("ba") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2280; - @ObfuscatedName("cr") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2286; - @ObfuscatedName("cf") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2282; - @ObfuscatedName("cj") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2283; - @ObfuscatedName("cl") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2284; - @ObfuscatedName("cn") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2285; - @ObfuscatedName("cy") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2241; - @ObfuscatedName("ct") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2287; - @ObfuscatedName("cq") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2288; - @ObfuscatedName("cp") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2304; - @ObfuscatedName("ch") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2290; - @ObfuscatedName("co") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2291; - @ObfuscatedName("cw") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2292; - @ObfuscatedName("ca") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2210; - @ObfuscatedName("cb") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2252; - @ObfuscatedName("cx") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2295; - @ObfuscatedName("cu") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2257; - @ObfuscatedName("cs") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2226; - @ObfuscatedName("cg") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2298; - @ObfuscatedName("cv") - @ObfuscatedSignature( - signature = "Lgx;" - ) - public static final ClientPacket field2299; + public static final ClientPacket field2269; @ObfuscatedName("ce") @ObfuscatedSignature( - signature = "Lgx;" + signature = "Lgv;" ) - public static final ClientPacket field2258; - @ObfuscatedName("cz") + public static final ClientPacket field2263; + @ObfuscatedName("ci") @ObfuscatedSignature( - signature = "Lgx;" + signature = "Lgv;" ) - public static final ClientPacket field2239; + public static final ClientPacket field2264; + @ObfuscatedName("ck") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2265; + @ObfuscatedName("cc") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2242; + @ObfuscatedName("cd") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2246; + @ObfuscatedName("cf") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2262; + @ObfuscatedName("cw") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2288; + @ObfuscatedName("cj") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2276; + @ObfuscatedName("cp") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2271; + @ObfuscatedName("cu") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2235; @ObfuscatedName("cm") @ObfuscatedSignature( - signature = "Lgx;" + signature = "Lgv;" ) - static final ClientPacket field2302; - @ObfuscatedName("ck") + public static final ClientPacket field2201; + @ObfuscatedName("cb") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2274; + @ObfuscatedName("ch") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2275; + @ObfuscatedName("cn") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2285; + @ObfuscatedName("cr") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2277; + @ObfuscatedName("cl") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2249; + @ObfuscatedName("cg") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2287; + @ObfuscatedName("cy") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2280; + @ObfuscatedName("cz") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2281; + @ObfuscatedName("cv") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2282; + @ObfuscatedName("cq") + @ObfuscatedSignature( + signature = "Lgv;" + ) + public static final ClientPacket field2283; + @ObfuscatedName("ct") + @ObfuscatedSignature( + signature = "Lgv;" + ) + static final ClientPacket field2284; + @ObfuscatedName("cx") + @ObfuscatedSignature( + signature = "Lgv;" + ) + static final ClientPacket field2278; + @ObfuscatedName("fs") + @ObfuscatedSignature( + signature = "Lkb;" + ) + @Export("fontPlain12") + static Font fontPlain12; + @ObfuscatedName("ca") @ObfuscatedGetter( - intValue = 690809523 + intValue = 116143945 ) @Export("id") final int id; - @ObfuscatedName("cc") + @ObfuscatedName("cs") @ObfuscatedGetter( - intValue = -571017815 + intValue = -836888501 ) @Export("length") final int length; static { - field2289 = new ClientPacket(0, 8); - field2204 = new ClientPacket(1, 3); - field2232 = new ClientPacket(2, 14); - field2259 = new ClientPacket(3, 7); - field2217 = new ClientPacket(4, -1); - field2208 = new ClientPacket(5, 7); - field2269 = new ClientPacket(6, 7); - field2281 = new ClientPacket(7, 8); - field2211 = new ClientPacket(8, -1); - field2212 = new ClientPacket(9, 4); - field2213 = new ClientPacket(10, 7); - field2236 = new ClientPacket(11, 10); - field2215 = new ClientPacket(12, 13); - field2216 = new ClientPacket(13, -1); - field2251 = new ClientPacket(14, 8); - field2294 = new ClientPacket(15, 3); - field2219 = new ClientPacket(16, -2); - field2220 = new ClientPacket(17, 4); - field2221 = new ClientPacket(18, 15); - field2222 = new ClientPacket(19, 8); - field2223 = new ClientPacket(20, 0); - field2255 = new ClientPacket(21, 8); - field2225 = new ClientPacket(22, 0); - field2207 = new ClientPacket(23, 11); - field2227 = new ClientPacket(24, 2); - field2228 = new ClientPacket(25, -2); - field2229 = new ClientPacket(26, 8); - field2230 = new ClientPacket(27, 3); - field2231 = new ClientPacket(28, -1); - field2203 = new ClientPacket(29, 7); - field2233 = new ClientPacket(30, 2); - field2214 = new ClientPacket(31, 3); - field2235 = new ClientPacket(32, 8); - field2254 = new ClientPacket(33, 3); - field2237 = new ClientPacket(34, -1); - field2238 = new ClientPacket(35, 5); - field2244 = new ClientPacket(36, 2); - field2240 = new ClientPacket(37, 0); - field2205 = new ClientPacket(38, -1); - field2242 = new ClientPacket(39, 4); - field2243 = new ClientPacket(40, 8); - field2234 = new ClientPacket(41, 6); - field2245 = new ClientPacket(42, 2); - field2246 = new ClientPacket(43, -1); - field2247 = new ClientPacket(44, 15); - field2248 = new ClientPacket(45, 4); - field2249 = new ClientPacket(46, 8); - field2250 = new ClientPacket(47, 3); - field2206 = new ClientPacket(48, 8); - field2300 = new ClientPacket(49, 0); - field2253 = new ClientPacket(50, 3); - field2218 = new ClientPacket(51, 7); - field2262 = new ClientPacket(52, -1); - field2293 = new ClientPacket(53, 13); - field2224 = new ClientPacket(54, -1); - field2277 = new ClientPacket(55, 9); - field2301 = new ClientPacket(56, 3); - field2260 = new ClientPacket(57, 16); - field2261 = new ClientPacket(58, 8); - field2303 = new ClientPacket(59, 3); - field2263 = new ClientPacket(60, -1); - field2296 = new ClientPacket(61, 9); - field2209 = new ClientPacket(62, 3); - field2266 = new ClientPacket(63, 16); - field2267 = new ClientPacket(64, 8); - field2268 = new ClientPacket(65, 8); - field2264 = new ClientPacket(66, 8); - field2270 = new ClientPacket(67, -2); - field2271 = new ClientPacket(68, 8); - field2272 = new ClientPacket(69, 4); - field2273 = new ClientPacket(70, 6); - field2274 = new ClientPacket(71, 3); - field2265 = new ClientPacket(72, 8); - field2276 = new ClientPacket(73, 1); - field2256 = new ClientPacket(74, 7); - field2278 = new ClientPacket(75, 3); - field2279 = new ClientPacket(76, 0); - field2280 = new ClientPacket(77, -1); - field2286 = new ClientPacket(78, -1); - field2282 = new ClientPacket(79, 7); - field2283 = new ClientPacket(80, 9); - field2284 = new ClientPacket(81, 11); - field2285 = new ClientPacket(82, 16); - field2241 = new ClientPacket(83, 3); - field2287 = new ClientPacket(84, 8); - field2288 = new ClientPacket(85, 8); - field2304 = new ClientPacket(86, 9); - field2290 = new ClientPacket(87, 8); - field2291 = new ClientPacket(88, -1); - field2292 = new ClientPacket(89, 7); - field2210 = new ClientPacket(90, -1); - field2252 = new ClientPacket(91, -1); - field2295 = new ClientPacket(92, 13); - field2257 = new ClientPacket(93, 3); - field2226 = new ClientPacket(94, 7); - field2298 = new ClientPacket(95, -1); - field2299 = new ClientPacket(96, -1); - field2258 = new ClientPacket(97, -1); - field2239 = new ClientPacket(98, 8); - field2302 = new ClientPacket(99, 7); + field2245 = new ClientPacket(0, 8); + field2186 = new ClientPacket(1, 3); + field2187 = new ClientPacket(2, 14); + field2248 = new ClientPacket(3, 7); + field2195 = new ClientPacket(4, -1); + field2190 = new ClientPacket(5, 7); + field2191 = new ClientPacket(6, 7); + field2188 = new ClientPacket(7, 8); + field2194 = new ClientPacket(8, -1); + field2189 = new ClientPacket(9, 4); + field2212 = new ClientPacket(10, 7); + field2203 = new ClientPacket(11, 10); + field2197 = new ClientPacket(12, 13); + field2198 = new ClientPacket(13, -1); + field2199 = new ClientPacket(14, 8); + field2200 = new ClientPacket(15, 3); + field2232 = new ClientPacket(16, -2); + field2202 = new ClientPacket(17, 4); + field2251 = new ClientPacket(18, 15); + field2204 = new ClientPacket(19, 8); + field2205 = new ClientPacket(20, 0); + field2206 = new ClientPacket(21, 8); + field2207 = new ClientPacket(22, 0); + field2208 = new ClientPacket(23, 11); + field2209 = new ClientPacket(24, 2); + field2210 = new ClientPacket(25, -2); + field2211 = new ClientPacket(26, 8); + field2279 = new ClientPacket(27, 3); + field2266 = new ClientPacket(28, -1); + field2214 = new ClientPacket(29, 7); + field2215 = new ClientPacket(30, 2); + field2216 = new ClientPacket(31, 3); + field2268 = new ClientPacket(32, 8); + field2218 = new ClientPacket(33, 3); + field2219 = new ClientPacket(34, -1); + field2220 = new ClientPacket(35, 5); + field2239 = new ClientPacket(36, 2); + field2222 = new ClientPacket(37, 0); + field2223 = new ClientPacket(38, -1); + field2224 = new ClientPacket(39, 4); + field2221 = new ClientPacket(40, 8); + field2226 = new ClientPacket(41, 6); + field2227 = new ClientPacket(42, 2); + field2228 = new ClientPacket(43, -1); + field2270 = new ClientPacket(44, 15); + field2230 = new ClientPacket(45, 4); + field2231 = new ClientPacket(46, 8); + field2272 = new ClientPacket(47, 3); + field2233 = new ClientPacket(48, 8); + field2234 = new ClientPacket(49, 0); + field2273 = new ClientPacket(50, 3); + field2236 = new ClientPacket(51, 7); + field2237 = new ClientPacket(52, -1); + field2217 = new ClientPacket(53, 13); + field2225 = new ClientPacket(54, -1); + field2240 = new ClientPacket(55, 9); + field2241 = new ClientPacket(56, 3); + field2213 = new ClientPacket(57, 16); + field2243 = new ClientPacket(58, 8); + field2196 = new ClientPacket(59, 3); + field2238 = new ClientPacket(60, -1); + field2255 = new ClientPacket(61, 9); + field2247 = new ClientPacket(62, 3); + field2229 = new ClientPacket(63, 16); + field2193 = new ClientPacket(64, 8); + field2250 = new ClientPacket(65, 8); + field2244 = new ClientPacket(66, 8); + field2252 = new ClientPacket(67, -2); + field2253 = new ClientPacket(68, 8); + field2254 = new ClientPacket(69, 4); + field2192 = new ClientPacket(70, 6); + field2256 = new ClientPacket(71, 3); + field2257 = new ClientPacket(72, 8); + field2258 = new ClientPacket(73, 1); + field2259 = new ClientPacket(74, 7); + field2260 = new ClientPacket(75, 3); + field2261 = new ClientPacket(76, 0); + field2269 = new ClientPacket(77, -1); + field2263 = new ClientPacket(78, -1); + field2264 = new ClientPacket(79, 7); + field2265 = new ClientPacket(80, 9); + field2242 = new ClientPacket(81, 11); + field2246 = new ClientPacket(82, 16); + field2262 = new ClientPacket(83, 3); + field2288 = new ClientPacket(84, 8); + field2276 = new ClientPacket(85, 8); + field2271 = new ClientPacket(86, 9); + field2235 = new ClientPacket(87, 8); + field2201 = new ClientPacket(88, -1); + field2274 = new ClientPacket(89, 7); + field2275 = new ClientPacket(90, -1); + field2285 = new ClientPacket(91, -1); + field2277 = new ClientPacket(92, 13); + field2249 = new ClientPacket(93, 3); + field2287 = new ClientPacket(94, 7); + field2280 = new ClientPacket(95, -1); + field2281 = new ClientPacket(96, -1); + field2282 = new ClientPacket(97, -1); + field2283 = new ClientPacket(98, 8); + field2284 = new ClientPacket(99, 7); + field2278 = new ClientPacket(100, 2); } ClientPacket(int var1, int var2) { @@ -633,243 +640,208 @@ public class ClientPacket implements ClientPacketMarker { this.length = var2; } - @ObfuscatedName("v") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", - garbageValue = "-231155257" + signature = "(IIIB)J", + garbageValue = "-10" ) - @Export("passwordStarChars") - public static String passwordStarChars(CharSequence var0) { - int var2 = var0.length(); - char[] var3 = new char[var2]; - - for (int var4 = 0; var4 < var2; ++var4) { - var3[var4] = '*'; - } - - String var1 = new String(var3); - return var1; + @Export("getWorldMapSpriteHash") + static long getWorldMapSpriteHash(int var0, int var1, int var2) { + return (long)(var2 << 16 | var0 << 8 | var1); } - @ObfuscatedName("d") + @ObfuscatedName("hv") @ObfuscatedSignature( - signature = "(IIIIIIILer;Lfv;I)V", - garbageValue = "1078750200" + signature = "(II)Z", + garbageValue = "1826064013" ) - @Export("addPendingGameObject") - static final void addPendingGameObject(int plane, int var1, int x, int y, int id, int rotation, int objectType, Scene scene, CollisionMap collision) { - ObjectDefinition var9 = ViewportMouse.getObjectDefinition(id); - int var10; - int var11; - if (rotation != 1 && rotation != 3) { - var10 = var9.sizeX; - var11 = var9.sizeY; + @Export("isRightClickOnlyMenu") + static final boolean isRightClickOnlyMenu(int var0) { + if (var0 < 0) { + return false; } else { - var10 = var9.sizeY; - var11 = var9.sizeX; + int var1 = Client.menuOpcodes[var0]; + if (var1 >= 2000) { + var1 -= 2000; + } + + return var1 == 1007; + } + } + + @ObfuscatedName("jn") + @ObfuscatedSignature( + signature = "(Lhp;III)V", + garbageValue = "-1618436422" + ) + static final void method3558(Widget var0, int var1, int var2) { + if (var0.buttonType == 1) { + WorldMapData_0.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); } - int var12; - int var13; - if (var10 + x <= 104) { - var12 = (var10 >> 1) + x; - var13 = x + (var10 + 1 >> 1); - } else { - var12 = x; - var13 = x + 1; + String var3; + if (var0.buttonType == 2 && !Client.isSpellSelected) { + var3 = class173.method3529(var0); + if (var3 != null) { + WorldMapData_0.insertMenuItemNoShift(var3, class16.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); + } } - int var14; + if (var0.buttonType == 3) { + WorldMapData_0.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); + } + + if (var0.buttonType == 4) { + WorldMapData_0.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); + } + + if (var0.buttonType == 5) { + WorldMapData_0.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); + } + + if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { + WorldMapData_0.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); + } + + int var4; + int var5; int var15; - if (y + var11 <= 104) { - var14 = y + (var11 >> 1); - var15 = y + (var11 + 1 >> 1); - } else { - var14 = y; - var15 = y + 1; + if (var0.type == 2) { + var15 = 0; + + for (var4 = 0; var4 < var0.height; ++var4) { + for (var5 = 0; var5 < var0.width; ++var5) { + int var6 = (var0.paddingX + 32) * var5; + int var7 = (var0.paddingY + 32) * var4; + if (var15 < 20) { + var6 += var0.inventoryXOffsets[var15]; + var7 += var0.inventoryYOffsets[var15]; + } + + if (var1 >= var6 && var2 >= var7 && var1 < var6 + 32 && var2 < var7 + 32) { + Client.dragItemSlotDestination = var15; + class222.field2730 = var0; + if (var0.itemIds[var15] > 0) { + ItemDefinition var8 = WorldMapData_0.ItemDefinition_get(var0.itemIds[var15] - 1); + if (Client.isItemSelected == 1 && Huffman.method3901(ParamDefinition.getWidgetClickMask(var0))) { + if (var0.id != FontName.selectedItemWidget || var15 != class185.selectedItemSlot) { + WorldMapData_0.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class16.colorStartTag(16748608) + var8.name, 31, var8.id, var15, var0.id); + } + } else if (Client.isSpellSelected && Huffman.method3901(ParamDefinition.getWidgetClickMask(var0))) { + if ((WorldMapSectionType.selectedSpellFlags & 16) == 16) { + WorldMapData_0.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class16.colorStartTag(16748608) + var8.name, 32, var8.id, var15, var0.id); + } + } else { + String[] var9 = var8.inventoryActions; + int var10 = -1; + boolean var11; + if (Client.shiftClickDrop) { + var11 = Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; + if (var11) { + var10 = var8.getShiftClickIndex(); + } + } + + if (Huffman.method3901(ParamDefinition.getWidgetClickMask(var0))) { + for (int var19 = 4; var19 >= 3; --var19) { + if (var10 != var19) { + DynamicObject.addWidgetItemMenuItem(var0, var8, var15, var19, false); + } + } + } + + int var12 = ParamDefinition.getWidgetClickMask(var0); + var11 = (var12 >> 31 & 1) != 0; + if (var11) { + WorldMapData_0.insertMenuItemNoShift("Use", class16.colorStartTag(16748608) + var8.name, 38, var8.id, var15, var0.id); + } + + Object var10000 = null; + int var13; + if (Huffman.method3901(ParamDefinition.getWidgetClickMask(var0))) { + for (var13 = 2; var13 >= 0; --var13) { + if (var13 != var10) { + DynamicObject.addWidgetItemMenuItem(var0, var8, var15, var13, false); + } + } + + if (var10 >= 0) { + DynamicObject.addWidgetItemMenuItem(var0, var8, var15, var10, true); + } + } + + var9 = var0.itemActions; + if (var9 != null) { + for (var13 = 4; var13 >= 0; --var13) { + if (var9[var13] != null) { + byte var14 = 0; + if (var13 == 0) { + var14 = 39; + } + + if (var13 == 1) { + var14 = 40; + } + + if (var13 == 2) { + var14 = 41; + } + + if (var13 == 3) { + var14 = 42; + } + + if (var13 == 4) { + var14 = 43; + } + + WorldMapData_0.insertMenuItemNoShift(var9[var13], class16.colorStartTag(16748608) + var8.name, var14, var8.id, var15, var0.id); + } + } + } + + WorldMapData_0.insertMenuItemNoShift("Examine", class16.colorStartTag(16748608) + var8.name, 1005, var8.id, var15, var0.id); + } + } + } + + ++var15; + } + } } - int[][] var16 = Tiles.Tiles_heights[var1]; - int var17 = var16[var12][var14] + var16[var13][var14] + var16[var12][var15] + var16[var13][var15] >> 2; - int var18 = (x << 7) + (var10 << 6); - int var19 = (y << 7) + (var11 << 6); - long var20 = Tile.calculateTag(x, y, 2, var9.int1 == 0, id); - int var22 = (rotation << 6) + objectType; - if (var9.int3 == 1) { - var22 += 256; + if (var0.isIf3) { + if (Client.isSpellSelected) { + if (PcmPlayer.method2396(ParamDefinition.getWidgetClickMask(var0)) && (WorldMapSectionType.selectedSpellFlags & 32) == 32) { + WorldMapData_0.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); + } + } else { + for (var15 = 9; var15 >= 5; --var15) { + String var16 = GrandExchangeOfferUnitPriceComparator.method125(var0, var15); + if (var16 != null) { + WorldMapData_0.insertMenuItemNoShift(var16, var0.dataText, 1007, var15 + 1, var0.childIndex, var0.id); + } + } + + var3 = class173.method3529(var0); + if (var3 != null) { + WorldMapData_0.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); + } + + for (var4 = 4; var4 >= 0; --var4) { + String var17 = GrandExchangeOfferUnitPriceComparator.method125(var0, var4); + if (var17 != null) { + NetCache.insertMenuItem(var17, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.field2688); + } + } + + var5 = ParamDefinition.getWidgetClickMask(var0); + boolean var18 = (var5 & 1) != 0; + if (var18) { + WorldMapData_0.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); + } + } } - Object var23; - if (objectType == 22) { - if (var9.animationId == -1 && var9.transforms == null) { - var23 = var9.getModel(22, rotation, var16, var18, var17, var19); - } else { - var23 = new DynamicObject(id, 22, rotation, var1, x, y, var9.animationId, true, (Entity)null); - } - - scene.newFloorDecoration(plane, x, y, var17, (Entity)var23, var20, var22); - if (var9.interactType == 1) { - collision.setBlockedByFloorDec(x, y); - } - - } else if (objectType == 10 || objectType == 11) { - if (var9.animationId == -1 && var9.transforms == null) { - var23 = var9.getModel(10, rotation, var16, var18, var17, var19); - } else { - var23 = new DynamicObject(id, 10, rotation, var1, x, y, var9.animationId, true, (Entity)null); - } - - if (var23 != null) { - scene.method3076(plane, x, y, var17, var10, var11, (Entity)var23, objectType == 11 ? 256 : 0, var20, var22); - } - - if (var9.interactType != 0) { - collision.addGameObject(x, y, var10, var11, var9.boolean1); - } - - } else if (objectType >= 12) { - if (var9.animationId == -1 && var9.transforms == null) { - var23 = var9.getModel(objectType, rotation, var16, var18, var17, var19); - } else { - var23 = new DynamicObject(id, objectType, rotation, var1, x, y, var9.animationId, true, (Entity) null); - } - - scene.method3076(plane, x, y, var17, 1, 1, (Entity) var23, 0, var20, var22); - if (var9.interactType != 0) { - collision.addGameObject(x, y, var10, var11, var9.boolean1); - } - - } else if (objectType == 0) { - if (var9.animationId == -1 && var9.transforms == null) { - var23 = var9.getModel(0, rotation, var16, var18, var17, var19); - } else { - var23 = new DynamicObject(id, 0, rotation, var1, x, y, var9.animationId, true, (Entity) null); - } - - scene.newBoundaryObject(plane, x, y, var17, (Entity) var23, (Entity) null, Tiles.field512[rotation], 0, var20, var22); - if (var9.interactType != 0) { - collision.method3559(x, y, objectType, rotation, var9.boolean1); - } - - } else if (objectType == 1) { - if (var9.animationId == -1 && var9.transforms == null) { - var23 = var9.getModel(1, rotation, var16, var18, var17, var19); - } else { - var23 = new DynamicObject(id, 1, rotation, var1, x, y, var9.animationId, true, (Entity) null); - } - - scene.newBoundaryObject(plane, x, y, var17, (Entity) var23, (Entity) null, Tiles.field513[rotation], 0, var20, var22); - if (var9.interactType != 0) { - collision.method3559(x, y, objectType, rotation, var9.boolean1); - } - - } else if (objectType == 2) { - int var29 = rotation + 1 & 3; - Object var24; - Object var25; - if (var9.animationId == -1 && var9.transforms == null) { - var24 = var9.getModel(2, rotation + 4, var16, var18, var17, var19); - var25 = var9.getModel(2, var29, var16, var18, var17, var19); - } else { - var24 = new DynamicObject(id, 2, rotation + 4, var1, x, y, var9.animationId, true, (Entity) null); - var25 = new DynamicObject(id, 2, var29, var1, x, y, var9.animationId, true, (Entity) null); - } - - scene.newBoundaryObject(plane, x, y, var17, (Entity) var24, (Entity) var25, Tiles.field512[rotation], Tiles.field512[var29], var20, var22); - if (var9.interactType != 0) { - collision.method3559(x, y, objectType, rotation, var9.boolean1); - } - - } else if (objectType == 3) { - if (var9.animationId == -1 && var9.transforms == null) { - var23 = var9.getModel(3, rotation, var16, var18, var17, var19); - } else { - var23 = new DynamicObject(id, 3, rotation, var1, x, y, var9.animationId, true, (Entity) null); - } - - scene.newBoundaryObject(plane, x, y, var17, (Entity) var23, (Entity) null, Tiles.field513[rotation], 0, var20, var22); - if (var9.interactType != 0) { - collision.method3559(x, y, objectType, rotation, var9.boolean1); - } - - } else if (objectType == 9) { - if (var9.animationId == -1 && var9.transforms == null) { - var23 = var9.getModel(objectType, rotation, var16, var18, var17, var19); - } else { - var23 = new DynamicObject(id, objectType, rotation, var1, x, y, var9.animationId, true, (Entity) null); - } - - scene.method3076(plane, x, y, var17, 1, 1, (Entity) var23, 0, var20, var22); - if (var9.interactType != 0) { - collision.addGameObject(x, y, var10, var11, var9.boolean1); - } - - } else if (objectType == 4) { - if (var9.animationId == -1 && var9.transforms == null) { - var23 = var9.getModel(4, rotation, var16, var18, var17, var19); - } else { - var23 = new DynamicObject(id, 4, rotation, var1, x, y, var9.animationId, true, (Entity) null); - } - - scene.newWallDecoration(plane, x, y, var17, (Entity) var23, (Entity) null, Tiles.field512[rotation], 0, 0, 0, var20, var22); - } else if (objectType == 5) { - int var29 = 16; - long var30 = scene.getBoundaryObjectTag(plane, x, y); - if (var30 != 0L) { - var29 = ViewportMouse.getObjectDefinition(class43.Entity_unpackID(var30)).int2; - } - Object var26; - - if (var9.animationId == -1 && var9.transforms == null) { - var26 = var9.getModel(4, rotation, var16, var18, var17, var19); - } else { - var26 = new DynamicObject(id, 4, rotation, var1, x, y, var9.animationId, true, (Entity) null); - } - - scene.newWallDecoration(plane, x, y, var17, (Entity) var26, (Entity) null, Tiles.field512[rotation], 0, var29 * Tiles.field514[rotation], var29 * Tiles.field520[rotation], var20, var22); - } else if (objectType == 6) { - int var29 = 8; - long var30 = scene.getBoundaryObjectTag(plane, x, y); - if (var30 != 0L) { - var29 = ViewportMouse.getObjectDefinition(class43.Entity_unpackID(var30)).int2 / 2; - } - Object var26; - - if (var9.animationId == -1 && var9.transforms == null) { - var26 = var9.getModel(4, rotation + 4, var16, var18, var17, var19); - } else { - var26 = new DynamicObject(id, 4, rotation + 4, var1, x, y, var9.animationId, true, (Entity) null); - } - - scene.newWallDecoration(plane, x, y, var17, (Entity) var26, (Entity) null, 256, rotation, var29 * Tiles.field509[rotation], var29 * Tiles.field517[rotation], var20, var22); - } else if (objectType == 7) { - int var32 = rotation + 2 & 3; - if (var9.animationId == -1 && var9.transforms == null) { - var23 = var9.getModel(4, var32 + 4, var16, var18, var17, var19); - } else { - var23 = new DynamicObject(id, 4, var32 + 4, var1, x, y, var9.animationId, true, (Entity) null); - } - - scene.newWallDecoration(plane, x, y, var17, (Entity) var23, (Entity) null, 256, var32, 0, 0, var20, var22); - } else if (objectType == 8) { - int var29 = 8; - long var30 = scene.getBoundaryObjectTag(plane, x, y); - if (var30 != 0L) { - var29 = ViewportMouse.getObjectDefinition(class43.Entity_unpackID(var30)).int2 / 2; - } - - Object var26; - int var28 = rotation + 2 & 3; - Object var27; - if (var9.animationId == -1 && var9.transforms == null) { - var26 = var9.getModel(4, rotation + 4, var16, var18, var17, var19); - var27 = var9.getModel(4, var28 + 4, var16, var18, var17, var19); - } else { - var26 = new DynamicObject(id, 4, rotation + 4, var1, x, y, var9.animationId, true, (Entity) null); - var27 = new DynamicObject(id, 4, var28 + 4, var1, x, y, var9.animationId, true, (Entity) null); - } - - scene.newWallDecoration(plane, x, y, var17, (Entity) var26, (Entity) var27, 256, rotation, var29 * Tiles.field509[rotation], var29 * Tiles.field517[rotation], var20, var22); - } } } diff --git a/runescape-client/src/main/java/ClientPacketMarker.java b/runescape-client/src/main/java/ClientPacketMarker.java deleted file mode 100644 index 1b6b9e296c..0000000000 --- a/runescape-client/src/main/java/ClientPacketMarker.java +++ /dev/null @@ -1,7 +0,0 @@ -import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("fh") -@Implements("ClientPacketMarker") -public interface ClientPacketMarker { -} diff --git a/runescape-client/src/main/java/ClientParameter.java b/runescape-client/src/main/java/ClientParameter.java deleted file mode 100644 index 249c00cc34..0000000000 --- a/runescape-client/src/main/java/ClientParameter.java +++ /dev/null @@ -1,157 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("jj") -@Implements("ClientParameter") -public class ClientParameter { - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "Ljj;" - ) - static final ClientParameter field3589; - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Ljj;" - ) - static final ClientParameter field3582; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Ljj;" - ) - static final ClientParameter field3583; - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Ljj;" - ) - static final ClientParameter field3591; - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Ljj;" - ) - static final ClientParameter field3585; - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "Ljj;" - ) - static final ClientParameter field3581; - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Ljj;" - ) - static final ClientParameter field3584; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Ljj;" - ) - static final ClientParameter field3588; - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Ljj;" - ) - static final ClientParameter field3600; - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Ljj;" - ) - static final ClientParameter field3593; - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "Ljj;" - ) - static final ClientParameter field3590; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Ljj;" - ) - static final ClientParameter field3592; - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Ljj;" - ) - public static final ClientParameter field3587; - @ObfuscatedName("r") - @ObfuscatedSignature( - signature = "Ljj;" - ) - public static final ClientParameter field3594; - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "Ljj;" - ) - static final ClientParameter field3595; - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "Ljj;" - ) - static final ClientParameter field3596; - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "Ljj;" - ) - static final ClientParameter field3586; - @ObfuscatedName("a") - @ObfuscatedSignature( - signature = "Ljj;" - ) - static final ClientParameter field3598; - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "Ljj;" - ) - static final ClientParameter field3599; - @ObfuscatedName("t") - @Export("id") - public final String id; - - static { - field3589 = new ClientParameter("8", "8"); - field3582 = new ClientParameter("15", "15"); - field3583 = new ClientParameter("7", "7"); - field3591 = new ClientParameter("10", "10"); - field3585 = new ClientParameter("16", "16"); - field3581 = new ClientParameter("12", "12"); - field3584 = new ClientParameter("3", "3"); - field3588 = new ClientParameter("6", "6"); - field3600 = new ClientParameter("17", "17"); - field3593 = new ClientParameter("5", "5"); - field3590 = new ClientParameter("9", "9"); - field3592 = new ClientParameter("14", "14"); - field3587 = new ClientParameter("18", "18"); - field3594 = new ClientParameter("13", "13"); - field3595 = new ClientParameter("4", "4"); - field3596 = new ClientParameter("1", "1"); - field3586 = new ClientParameter("11", "11"); - field3598 = new ClientParameter("2", "2"); - field3599 = new ClientParameter("19", "19"); - } - - ClientParameter(String var1, String var2) { - this.id = var2; - } - - @ObfuscatedName("q") - static double method4991(double var0) { - return Math.exp(-var0 * var0 / 2.0D) / Math.sqrt(6.283185307179586D); - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(DDII)[D", - garbageValue = "-694088627" - ) - public static double[] method4992(double var0, double var2, int var4) { - int var5 = var4 * 2 + 1; - double[] var6 = new double[var5]; - int var7 = -var4; - - for (int var8 = 0; var7 <= var4; ++var8) { - double var11 = method4991(((double)var7 - var0) / var2) / var2; - var6[var8] = var11; - ++var7; - } - - return var6; - } -} diff --git a/runescape-client/src/main/java/ClientPreferences.java b/runescape-client/src/main/java/ClientPreferences.java index 917757c8eb..d0ae1956c4 100644 --- a/runescape-client/src/main/java/ClientPreferences.java +++ b/runescape-client/src/main/java/ClientPreferences.java @@ -6,39 +6,41 @@ 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("bx") @Implements("ClientPreferences") public class ClientPreferences { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -802793057 + intValue = -1051861033 ) @Export("ClientPreferences_optionCount") static int ClientPreferences_optionCount; - @ObfuscatedName("ef") - @Export("worldHost") - static String worldHost; - @ObfuscatedName("e") + @ObfuscatedName("gb") + @ObfuscatedSignature( + signature = "[Llq;" + ) + @Export("scrollBarSprites") + static IndexedSprite[] scrollBarSprites; + @ObfuscatedName("i") @Export("roofsHidden") boolean roofsHidden; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("titleMusicDisabled") boolean titleMusicDisabled; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1863029767 + intValue = -1686961453 ) @Export("windowMode") int windowMode; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("rememberedUsername") String rememberedUsername; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("hideUsername") boolean hideUsername; - @ObfuscatedName("i") + @ObfuscatedName("q") @Export("parameters") LinkedHashMap parameters; @@ -51,11 +53,11 @@ public class ClientPreferences { this.rememberedUsername = null; this.hideUsername = false; this.parameters = new LinkedHashMap(); - this.method1749(true); + this.method1763(true); } @ObfuscatedSignature( - signature = "(Lkf;)V" + signature = "(Lky;)V" ) ClientPreferences(Buffer var1) { this.windowMode = 1; @@ -95,26 +97,26 @@ public class ClientPreferences { this.hideUsername = var1.readBoolean(); } } else { - this.method1749(true); + this.method1763(true); } } else { - this.method1749(true); + this.method1763(true); } } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(ZS)V", - garbageValue = "-11262" + signature = "(ZI)V", + garbageValue = "912146837" ) - void method1749(boolean var1) { + void method1763(boolean var1) { } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)Lkf;", - garbageValue = "-2138331500" + signature = "(I)Lky;", + garbageValue = "1073230660" ) @Export("toBuffer") Buffer toBuffer() { @@ -136,373 +138,4 @@ public class ClientPreferences { var1.writeBoolean(this.hideUsername); return var1; } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "([BIII)Ljava/lang/String;", - garbageValue = "917330802" - ) - public static String method1755(byte[] var0, int var1, int var2) { - char[] var3 = new char[var2]; - int var4 = 0; - int var5 = var1; - - int var8; - for (int var6 = var2 + var1; var5 < var6; var3[var4++] = (char)var8) { - int var7 = var0[var5++] & 255; - if (var7 < 128) { - if (var7 == 0) { - var8 = 65533; - } else { - var8 = var7; - } - } else if (var7 < 192) { - var8 = 65533; - } else if (var7 < 224) { - if (var5 < var6 && (var0[var5] & 192) == 128) { - var8 = (var7 & 31) << 6 | var0[var5++] & 63; - if (var8 < 128) { - var8 = 65533; - } - } else { - var8 = 65533; - } - } else if (var7 < 240) { - if (var5 + 1 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128) { - var8 = (var7 & 15) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63; - if (var8 < 2048) { - var8 = 65533; - } - } else { - var8 = 65533; - } - } else if (var7 < 248) { - if (var5 + 2 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128 && (var0[var5 + 2] & 192) == 128) { - var8 = (var7 & 7) << 18 | (var0[var5++] & 63) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63; - if (var8 >= 65536 && var8 <= 1114111) { - var8 = 65533; - } else { - var8 = 65533; - } - } else { - var8 = 65533; - } - } else { - var8 = 65533; - } - } - - return new String(var3, 0, var4); - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(II)Ljava/lang/String;", - garbageValue = "-844505624" - ) - @Export("colorStartTag") - static String colorStartTag(int var0) { - return ""; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "-46" - ) - public static int method1757(int var0, int var1) { - int var2; - for (var2 = 0; var1 > 0; --var1) { - var2 = var2 << 1 | var0 & 1; - var0 >>>= 1; - } - - return var2; - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - signature = "(ILcx;ZB)I", - garbageValue = "-94" - ) - static int method1753(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.publicChatMode; - return 1; - } - if (var0 == ScriptOpcodes.CHAT_SETFILTER) { - HealthBarUpdate.Interpreter_intStackSize -= 3; - Client.publicChatMode = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - class226.privateChatMode = NetSocket.ChatMode_find(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]); - if (class226.privateChatMode == null) { - class226.privateChatMode = PrivateChatMode.field3816; - } - - Client.tradeChatMode = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2]; - PacketBufferNode var18 = Archive.getPacketBufferNode(ClientPacket.field2294, Client.packetWriter.isaacCipher); - var18.packetBuffer.writeByte(Client.publicChatMode); - var18.packetBuffer.writeByte(class226.privateChatMode.field3815); - var18.packetBuffer.writeByte(Client.tradeChatMode); - Client.packetWriter.addNode(var18); - return 1; - } - String var3; - int var4; - if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - HealthBarUpdate.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - int var5 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - PacketBufferNode var6 = Archive.getPacketBufferNode(ClientPacket.field2205, Client.packetWriter.isaacCipher); - var6.packetBuffer.writeByte(Huffman.stringCp1252NullTerminatedByteSize(var3) + 2); - var6.packetBuffer.writeStringCp1252NullTerminated(var3); - var6.packetBuffer.writeByte(var4 - 1); - var6.packetBuffer.writeByte(var5); - Client.packetWriter.addNode(var6); - return 1; - } - int var10; - if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var10 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Message var15 = TileItem.Messages_getByChannelAndID(var10, var4); - if (var15 != null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var15.count; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var15.cycle; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var15.sender != null ? var15.sender : ""; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var15.prefix != null ? var15.prefix : ""; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var15.text != null ? var15.text : ""; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var15.isFromFriend() ? 1 : (var15.isFromIgnored() ? 2 : 0); - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } - if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { - var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Message var16 = WorldMapIcon_1.Messages_getMessage(var10); - if (var16 != null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var16.type; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var16.cycle; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var16.sender != null ? var16.sender : ""; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var16.prefix != null ? var16.prefix : ""; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var16.text != null ? var16.text : ""; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var16.isFromFriend() ? 1 : (var16.isFromIgnored() ? 2 : 0); - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } - if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { - if (class226.privateChatMode == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = class226.privateChatMode.field3815; - } - - return 1; - } - if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.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 (ScriptFrame.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 (Language.Language_EN != ScriptFrame.clientLanguage) { - 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 = Archive.getPacketBufferNode(ClientPacket.field2258, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeByte(0); - int var9 = var8.packetBuffer.offset; - var8.packetBuffer.writeByte(var4); - var8.packetBuffer.writeByte(var17); - var8.packetBuffer.writeByte(var7); - Skeleton.method3063(var8.packetBuffer, var3); - var8.packetBuffer.writeLengthByte(var8.packetBuffer.offset - var9); - Client.packetWriter.addNode(var8); - return 1; - } - if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { - Skills.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize]; - String var12 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize + 1]; - PacketBufferNode var11 = Archive.getPacketBufferNode(ClientPacket.field2228, Client.packetWriter.isaacCipher); - var11.packetBuffer.writeShort(0); - int var13 = var11.packetBuffer.offset; - var11.packetBuffer.writeStringCp1252NullTerminated(var3); - Skeleton.method3063(var11.packetBuffer, var12); - var11.packetBuffer.writeLengthShort(var11.packetBuffer.offset - var13); - Client.packetWriter.addNode(var11); - return 1; - } - if (var0 == ScriptOpcodes.CHAT_PLAYERNAME) { - if (Client.localPlayer != null && Client.localPlayer.username != null) { - var3 = Client.localPlayer.username.getName(); - } else { - var3 = ""; - } - - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3; - return 1; - } - if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.tradeChatMode; - return 1; - } - if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { - var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = LoginScreenAnimation.Messages_getHistorySize(var10); - return 1; - } - if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { - var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = MusicPatchNode2.Messages_getNextChatID(var10); - return 1; - } - if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { - var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = class192.Messages_getLastChatID(var10); - return 1; - } - if (var0 == ScriptOpcodes.DOCHEAT) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - UserComparator1.doCheat(var3); - return 1; - } - if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { - Client.field762 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize].toLowerCase().trim(); - return 1; - } - if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = Client.field762; - return 1; - } - if (var0 == 5023) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - System.out.println(var3); - return 1; - } - return 2; - } } diff --git a/runescape-client/src/main/java/Clock.java b/runescape-client/src/main/java/Clock.java index d6b707f2cc..c27323f1b4 100644 --- a/runescape-client/src/main/java/Clock.java +++ b/runescape-client/src/main/java/Clock.java @@ -3,58 +3,52 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fu") +@ObfuscatedName("fs") @Implements("Clock") public abstract class Clock { - @ObfuscatedName("oi") - @ObfuscatedSignature( - signature = "Lca;" - ) - @Export("varcs") - static Varcs varcs; + @ObfuscatedName("by") + static String field2037; Clock() { } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1402657312" + garbageValue = "-779324795" ) @Export("mark") public abstract void mark(); - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "-333181863" + garbageValue = "930751718" ) @Export("wait") - public abstract int wait(int tickLength, int fiveOrOne); + public abstract int wait(int var1, int var2); - @ObfuscatedName("fx") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1434133306" + signature = "(Lhz;IIB)Llq;", + garbageValue = "-2" ) - @Export("setWindowedMode") - static void setWindowedMode(int var0) { - Client.field868 = 0L; - if (var0 >= 2) { - Client.isResizable = true; + @Export("SpriteBuffer_getIndexedSprite") + static IndexedSprite SpriteBuffer_getIndexedSprite(AbstractArchive var0, int var1, int var2) { + if (!World.SpriteBuffer_bufferFile(var0, var1, var2)) { + return null; } else { - Client.isResizable = false; + IndexedSprite var4 = new IndexedSprite(); + var4.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth; + var4.height = class325.SpriteBuffer_spriteHeight; + var4.xOffset = class325.SpriteBuffer_xOffsets[0]; + var4.yOffset = class325.SpriteBuffer_yOffsets[0]; + var4.subWidth = class325.SpriteBuffer_spriteWidths[0]; + var4.subHeight = class225.SpriteBuffer_spriteHeights[0]; + var4.palette = class325.SpriteBuffer_spritePalette; + var4.pixels = WorldMapSection1.SpriteBuffer_pixels[0]; + UserComparator7.SpriteBuffer_clear(); + return var4; } - - if (AbstractWorldMapIcon.getWindowedMode() == 1) { - WorldMapSprite.client.setMaxCanvasSize(765, 503); - } else { - WorldMapSprite.client.setMaxCanvasSize(7680, 2160); - } - - if (Client.gameState >= 25) { - HealthBarUpdate.method1677(); - } - } } diff --git a/runescape-client/src/main/java/CollisionMap.java b/runescape-client/src/main/java/CollisionMap.java index fa1355fc76..6a48e42384 100644 --- a/runescape-client/src/main/java/CollisionMap.java +++ b/runescape-client/src/main/java/CollisionMap.java @@ -4,40 +4,34 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fv") +@ObfuscatedName("fm") @Implements("CollisionMap") public class CollisionMap { - @ObfuscatedName("k") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -1785681501 - ) - @Export("PcmPlayer_sampleRate") - public static int PcmPlayer_sampleRate; - @ObfuscatedName("ax") - @ObfuscatedGetter( - intValue = -1007844033 + intValue = 379779745 ) @Export("xInset") public int xInset; - @ObfuscatedName("az") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 97844873 + intValue = 899493249 ) @Export("yInset") public int yInset; - @ObfuscatedName("ae") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -1249565113 + intValue = -67571785 ) @Export("xSize") int xSize; @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 1188758843 + intValue = 1623106677 ) @Export("ySize") int ySize; - @ObfuscatedName("aj") + @ObfuscatedName("ac") @Export("flags") public int[][] flags; @@ -50,195 +44,195 @@ public class CollisionMap { this.clear(); } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1772918444" + signature = "(S)V", + garbageValue = "8482" ) @Export("clear") public void clear() { for (int var1 = 0; var1 < this.xSize; ++var1) { for (int var2 = 0; var2 < this.ySize; ++var2) { if (var1 != 0 && var2 != 0 && var1 < this.xSize - 5 && var2 < this.ySize - 5) { - this.flags[var1][var2] = 0x1000000; + this.flags[var1][var2] = 16777216; } else { - this.flags[var1][var2] = 0xffffff; + this.flags[var1][var2] = 16777215; } } } } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(IIIIZB)V", - garbageValue = "91" + garbageValue = "-37" ) - public void method3559(int x, int y, int objectType, int rotation, boolean var5) { - x -= this.xInset; - y -= this.yInset; - if (objectType == 0) { - if (rotation == 0) { - this.setFlag(x, y, 0x80); - this.setFlag(x - 1, y, 8); + public void method3495(int var1, int var2, int var3, int var4, boolean var5) { + var1 -= this.xInset; + var2 -= this.yInset; + if (var3 == 0) { + if (var4 == 0) { + this.setFlag(var1, var2, 128); + this.setFlag(var1 - 1, var2, 8); } - if (rotation == 1) { - this.setFlag(x, y, 2); - this.setFlag(x, y + 1, 32); + if (var4 == 1) { + this.setFlag(var1, var2, 2); + this.setFlag(var1, var2 + 1, 32); } - if (rotation == 2) { - this.setFlag(x, y, 8); - this.setFlag(x + 1, y, 128); + if (var4 == 2) { + this.setFlag(var1, var2, 8); + this.setFlag(var1 + 1, var2, 128); } - if (rotation == 3) { - this.setFlag(x, y, 32); - this.setFlag(x, y - 1, 2); + if (var4 == 3) { + this.setFlag(var1, var2, 32); + this.setFlag(var1, var2 - 1, 2); } } - if (objectType == 1 || objectType == 3) { - if (rotation == 0) { - this.setFlag(x, y, 1); - this.setFlag(x - 1, y + 1, 16); + if (var3 == 1 || var3 == 3) { + if (var4 == 0) { + this.setFlag(var1, var2, 1); + this.setFlag(var1 - 1, var2 + 1, 16); } - if (rotation == 1) { - this.setFlag(x, y, 4); - this.setFlag(x + 1, y + 1, 64); + if (var4 == 1) { + this.setFlag(var1, var2, 4); + this.setFlag(var1 + 1, var2 + 1, 64); } - if (rotation == 2) { - this.setFlag(x, y, 16); - this.setFlag(x + 1, y - 1, 1); + if (var4 == 2) { + this.setFlag(var1, var2, 16); + this.setFlag(var1 + 1, var2 - 1, 1); } - if (rotation == 3) { - this.setFlag(x, y, 64); - this.setFlag(x - 1, y - 1, 4); + if (var4 == 3) { + this.setFlag(var1, var2, 64); + this.setFlag(var1 - 1, var2 - 1, 4); } } - if (objectType == 2) { - if (rotation == 0) { - this.setFlag(x, y, 130); - this.setFlag(x - 1, y, 8); - this.setFlag(x, y + 1, 32); + if (var3 == 2) { + if (var4 == 0) { + this.setFlag(var1, var2, 130); + this.setFlag(var1 - 1, var2, 8); + this.setFlag(var1, var2 + 1, 32); } - if (rotation == 1) { - this.setFlag(x, y, 10); - this.setFlag(x, y + 1, 32); - this.setFlag(x + 1, y, 128); + if (var4 == 1) { + this.setFlag(var1, var2, 10); + this.setFlag(var1, var2 + 1, 32); + this.setFlag(var1 + 1, var2, 128); } - if (rotation == 2) { - this.setFlag(x, y, 40); - this.setFlag(x + 1, y, 128); - this.setFlag(x, y - 1, 2); + if (var4 == 2) { + this.setFlag(var1, var2, 40); + this.setFlag(var1 + 1, var2, 128); + this.setFlag(var1, var2 - 1, 2); } - if (rotation == 3) { - this.setFlag(x, y, 160); - this.setFlag(x, y - 1, 2); - this.setFlag(x - 1, y, 8); + if (var4 == 3) { + this.setFlag(var1, var2, 160); + this.setFlag(var1, var2 - 1, 2); + this.setFlag(var1 - 1, var2, 8); } } if (var5) { - if (objectType == 0) { - if (rotation == 0) { - this.setFlag(x, y, 65536); - this.setFlag(x - 1, y, 4096); + if (var3 == 0) { + if (var4 == 0) { + this.setFlag(var1, var2, 65536); + this.setFlag(var1 - 1, var2, 4096); } - if (rotation == 1) { - this.setFlag(x, y, 1024); - this.setFlag(x, y + 1, 16384); + if (var4 == 1) { + this.setFlag(var1, var2, 1024); + this.setFlag(var1, var2 + 1, 16384); } - if (rotation == 2) { - this.setFlag(x, y, 4096); - this.setFlag(x + 1, y, 65536); + if (var4 == 2) { + this.setFlag(var1, var2, 4096); + this.setFlag(var1 + 1, var2, 65536); } - if (rotation == 3) { - this.setFlag(x, y, 16384); - this.setFlag(x, y - 1, 1024); + if (var4 == 3) { + this.setFlag(var1, var2, 16384); + this.setFlag(var1, var2 - 1, 1024); } } - if (objectType == 1 || objectType == 3) { - if (rotation == 0) { - this.setFlag(x, y, 512); - this.setFlag(x - 1, y + 1, 8192); + if (var3 == 1 || var3 == 3) { + if (var4 == 0) { + this.setFlag(var1, var2, 512); + this.setFlag(var1 - 1, var2 + 1, 8192); } - if (rotation == 1) { - this.setFlag(x, y, 2048); - this.setFlag(x + 1, y + 1, 32768); + if (var4 == 1) { + this.setFlag(var1, var2, 2048); + this.setFlag(var1 + 1, var2 + 1, 32768); } - if (rotation == 2) { - this.setFlag(x, y, 8192); - this.setFlag(x + 1, y - 1, 512); + if (var4 == 2) { + this.setFlag(var1, var2, 8192); + this.setFlag(var1 + 1, var2 - 1, 512); } - if (rotation == 3) { - this.setFlag(x, y, 32768); - this.setFlag(x - 1, y - 1, 2048); + if (var4 == 3) { + this.setFlag(var1, var2, 32768); + this.setFlag(var1 - 1, var2 - 1, 2048); } } - if (objectType == 2) { - if (rotation == 0) { - this.setFlag(x, y, 66560); - this.setFlag(x - 1, y, 4096); - this.setFlag(x, y + 1, 16384); + if (var3 == 2) { + if (var4 == 0) { + this.setFlag(var1, var2, 66560); + this.setFlag(var1 - 1, var2, 4096); + this.setFlag(var1, var2 + 1, 16384); } - if (rotation == 1) { - this.setFlag(x, y, 5120); - this.setFlag(x, y + 1, 16384); - this.setFlag(x + 1, y, 65536); + if (var4 == 1) { + this.setFlag(var1, var2, 5120); + this.setFlag(var1, var2 + 1, 16384); + this.setFlag(var1 + 1, var2, 65536); } - if (rotation == 2) { - this.setFlag(x, y, 20480); - this.setFlag(x + 1, y, 65536); - this.setFlag(x, y - 1, 1024); + if (var4 == 2) { + this.setFlag(var1, var2, 20480); + this.setFlag(var1 + 1, var2, 65536); + this.setFlag(var1, var2 - 1, 1024); } - if (rotation == 3) { - this.setFlag(x, y, 0x14000); - this.setFlag(x, y - 1, 1024); - this.setFlag(x - 1, y, 4096); + if (var4 == 3) { + this.setFlag(var1, var2, 81920); + this.setFlag(var1, var2 - 1, 1024); + this.setFlag(var1 - 1, var2, 4096); } } } } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(IIIIZI)V", - garbageValue = "-1502680936" + garbageValue = "-1939556917" ) @Export("addGameObject") - public void addGameObject(int x, int y, int w, int h, boolean blockSight) { - int var6 = 0x100; - if (blockSight) { - var6 += 0x20000; + public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) { + int var6 = 256; + if (var5) { + var6 += 131072; } - x -= this.xInset; - y -= this.yInset; + var1 -= this.xInset; + var2 -= this.yInset; - for (int var7 = x; var7 < w + x; ++var7) { + for (int var7 = var1; var7 < var3 + var1; ++var7) { if (var7 >= 0 && var7 < this.xSize) { - for (int var8 = y; var8 < y + h; ++var8) { + for (int var8 = var2; var8 < var2 + var4; ++var8) { if (var8 >= 0 && var8 < this.ySize) { this.setFlag(var7, var8, var6); } @@ -248,46 +242,49 @@ public class CollisionMap { } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-2087203619" + garbageValue = "-2081310668" ) @Export("setBlockedByFloor") public void setBlockedByFloor(int var1, int var2) { var1 -= this.xInset; var2 -= this.yInset; - this.flags[var1][var2] |= 0x200000; + int[] var10000 = this.flags[var1]; + var10000[var2] |= 2097152; } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "-363679248" + signature = "(IIS)V", + garbageValue = "5864" ) @Export("setBlockedByFloorDec") public void setBlockedByFloorDec(int var1, int var2) { var1 -= this.xInset; var2 -= this.yInset; - this.flags[var1][var2] |= 0x40000; + int[] var10000 = this.flags[var1]; + var10000[var2] |= 262144; } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(IIII)V", - garbageValue = "-883048141" + signature = "(IIIB)V", + garbageValue = "79" ) @Export("setFlag") void setFlag(int var1, int var2, int var3) { - this.flags[var1][var2] |= var3; + int[] var10000 = this.flags[var1]; + var10000[var2] |= var3; } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(IIIIZI)V", - garbageValue = "-1166825819" + garbageValue = "1397124488" ) - public void method3564(int var1, int var2, int var3, int var4, boolean var5) { + public void method3497(int var1, int var2, int var3, int var4, boolean var5) { var1 -= this.xInset; var2 -= this.yInset; if (var3 == 0) { @@ -434,30 +431,30 @@ public class CollisionMap { } - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(IIIIIZB)V", - garbageValue = "-77" + garbageValue = "25" ) @Export("setFlagOffNonSquare") - public void setFlagOffNonSquare(int x, int y, int w, int h, int rotation, boolean var6) { - int var7 = 0x100; + public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) { + int var7 = 256; if (var6) { - var7 += 0x20000; + var7 += 131072; } - x -= this.xInset; - y -= this.yInset; + var1 -= this.xInset; + var2 -= this.yInset; int var8; - if (rotation == 1 || rotation == 3) { - var8 = w; - w = h; - h = var8; + if (var5 == 1 || var5 == 3) { + var8 = var3; + var3 = var4; + var4 = var8; } - for (var8 = x; var8 < w + x; ++var8) { + for (var8 = var1; var8 < var3 + var1; ++var8) { if (var8 >= 0 && var8 < this.xSize) { - for (int var9 = y; var9 < y + h; ++var9) { + for (int var9 = var2; var9 < var2 + var4; ++var9) { if (var9 >= 0 && var9 < this.ySize) { this.setFlagOff(var8, var9, var7); } @@ -467,24 +464,48 @@ public class CollisionMap { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(IIII)V", - garbageValue = "-1617846942" + garbageValue = "1656686360" ) @Export("setFlagOff") void setFlagOff(int var1, int var2, int var3) { - this.flags[var1][var2] &= ~var3; + int[] var10000 = this.flags[var1]; + var10000[var2] &= ~var3; } - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "-34" + signature = "(III)V", + garbageValue = "-1414783341" ) - public void method3567(int var1, int var2) { + public void method3527(int var1, int var2) { var1 -= this.xInset; var2 -= this.yInset; - this.flags[var1][var2] &= 0xfffbffff; + int[] var10000 = this.flags[var1]; + var10000[var2] &= -262145; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(Lhz;I)V", + garbageValue = "-1914788069" + ) + @Export("FloorUnderlayDefinition_setArchives") + public static void FloorUnderlayDefinition_setArchives(AbstractArchive var0) { + FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0; + } + + @ObfuscatedName("js") + @ObfuscatedSignature( + signature = "(IS)V", + garbageValue = "-3946" + ) + @Export("drawInterfaceModelComponents") + static final void drawInterfaceModelComponents(int var0) { + if (Projectile.loadInterface(var0)) { + Tile.drawModelComponents(Widget.Widget_interfaceComponents[var0], -1); + } } } diff --git a/runescape-client/src/main/java/Coord.java b/runescape-client/src/main/java/Coord.java index 67e0cb4aea..52f11d5f3f 100644 --- a/runescape-client/src/main/java/Coord.java +++ b/runescape-client/src/main/java/Coord.java @@ -4,36 +4,44 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hv") +@ObfuscatedName("hd") @Implements("Coord") public class Coord { - @ObfuscatedName("fy") - @ObfuscatedSignature( - signature = "Lke;" - ) - @Export("fontPlain11") - static Font fontPlain11; - @ObfuscatedName("q") + @ObfuscatedName("m") + @Export("BZip2Decompressor_block") + static int[] BZip2Decompressor_block; + @ObfuscatedName("dc") @ObfuscatedGetter( - intValue = -618740747 + longValue = 8705560174832439427L + ) + static long field2511; + @ObfuscatedName("hp") + @ObfuscatedGetter( + intValue = -312378443 + ) + @Export("cameraY") + static int cameraY; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -22513413 ) @Export("plane") public int plane; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -224554023 + intValue = -611305657 ) @Export("x") public int x; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1025191447 + intValue = -2088749017 ) @Export("y") public int y; @ObfuscatedSignature( - signature = "(Lhv;)V" + signature = "(Lhd;)V" ) public Coord(Coord var1) { this.plane = var1.plane; @@ -58,74 +66,63 @@ public class Coord { } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-1529444039" + signature = "(B)I", + garbageValue = "2" ) @Export("packed") public int packed() { return this.plane << 28 | this.x << 14 | this.y; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lhv;I)Z", - garbageValue = "2096599249" + signature = "(Lhd;B)Z", + garbageValue = "-61" ) @Export("equalsCoord") boolean equalsCoord(Coord var1) { if (this.plane != var1.plane) { return false; - } - if (this.x != var1.x) { + } else if (this.x != var1.x) { return false; + } else { + return this.y == var1.y; } - return this.y == var1.y; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1242820641" + garbageValue = "-1334181457" ) @Export("toString") String toString(String var1) { return this.plane + var1 + (this.x >> 6) + var1 + (this.y >> 6) + var1 + (this.x & 63) + var1 + (this.y & 63); } - public int hashCode() { - return this.packed(); + public String toString() { + return this.toString(","); } public boolean equals(Object var1) { if (this == var1) { return true; + } else { + return !(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1); } - return !(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1); } - public String toString() { + public int hashCode() { + return this.packed(); + } + + public String abd() { return this.toString(","); } - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1626401232" - ) - @Export("ParamDefinition_clearCached") - public static void ParamDefinition_clearCached() { - ParamDefinition.ParamDefinition_cached.clear(); - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-40" - ) - static void method3990() { - Login.loginIndex = 24; - class268.setLoginResponseString("", "You were disconnected from the server.", ""); + public String abb() { + return this.toString(","); } } diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index 61461711a1..b679908ae9 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -4,134 +4,145 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dz") +@ObfuscatedName("db") @Implements("Decimator") public class Decimator { - @ObfuscatedName("x") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Llx;" + signature = "Lky;" ) - @Export("options_buttons_2Sprite") - static IndexedSprite options_buttons_2Sprite; - @ObfuscatedName("p") + @Export("NetCache_reference") + static Buffer NetCache_reference; + @ObfuscatedName("l") + public static String field1439; + @ObfuscatedName("as") + @ObfuscatedSignature( + signature = "Llh;" + ) + static Bounds field1443; + @ObfuscatedName("bq") + @ObfuscatedSignature( + signature = "[Llq;" + ) + @Export("worldSelectArrows") + static IndexedSprite[] worldSelectArrows; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1067673039 + intValue = -617171721 ) @Export("inputRate") int inputRate; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1870278153 + intValue = 72965647 ) @Export("outputRate") int outputRate; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("table") int[][] table; public Decimator(int var1, int var2) { - if (var2 == var1) { - return; - } - int var3 = FriendSystem.method1819(var1, var2); - var1 /= var3; - var2 /= var3; - this.inputRate = var1; - this.outputRate = var2; - this.table = new int[var1][14]; + if (var2 != var1) { + int var3 = WorldMapIcon_1.method301(var1, var2); + var1 /= var3; + var2 /= var3; + this.inputRate = var1; + this.outputRate = var2; + this.table = new int[var1][14]; - for (int var4 = 0; var4 < var1; ++var4) { - int[] var5 = this.table[var4]; - double var6 = (double)var4 / (double)var1 + 6.0D; - int var8 = (int)Math.floor(1.0D + (var6 - 7.0D)); - if (var8 < 0) { - var8 = 0; - } - - int var9 = (int)Math.ceil(7.0D + var6); - if (var9 > 14) { - var9 = 14; - } - - for (double var10 = (double)var2 / (double)var1; var8 < var9; ++var8) { - double var12 = 3.141592653589793D * ((double)var8 - var6); - double var14 = var10; - if (var12 < -1.0E-4D || var12 > 1.0E-4D) { - var14 = var10 * (Math.sin(var12) / var12); + for (int var4 = 0; var4 < var1; ++var4) { + int[] var5 = this.table[var4]; + double var6 = 6.0D + (double)var4 / (double)var1; + int var8 = (int)Math.floor(var6 - 7.0D + 1.0D); + if (var8 < 0) { + var8 = 0; } - var14 *= 0.54D + 0.46D * Math.cos(((double)var8 - var6) * 0.2243994752564138D); - var5[var8] = (int)Math.floor(0.5D + var14 * 65536.0D); - } - } + int var9 = (int)Math.ceil(var6 + 7.0D); + if (var9 > 14) { + var9 = 14; + } + for (double var10 = (double)var2 / (double)var1; var8 < var9; ++var8) { + double var12 = ((double)var8 - var6) * 3.141592653589793D; + double var14 = var10; + if (var12 < -1.0E-4D || var12 > 1.0E-4D) { + var14 = var10 * (Math.sin(var12) / var12); + } + + var14 *= 0.54D + 0.46D * Math.cos(((double)var8 - var6) * 0.2243994752564138D); + var5[var8] = (int)Math.floor(0.5D + var14 * 65536.0D); + } + } + + } } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "([BB)[B", - garbageValue = "68" + garbageValue = "1" ) @Export("resample") byte[] resample(byte[] var1) { - if (this.table == null) { - return var1; - } - int var2 = (int)((long)this.outputRate * (long)var1.length / (long)this.inputRate) + 14; - int[] var3 = new int[var2]; - int var4 = 0; - int var5 = 0; + if (this.table != null) { + int var2 = (int)((long)var1.length * (long)this.outputRate / (long)this.inputRate) + 14; + int[] var3 = new int[var2]; + int var4 = 0; + int var5 = 0; - int var6; - for (var6 = 0; var6 < var1.length; ++var6) { - byte var7 = var1[var6]; - int[] var8 = this.table[var5]; + int var6; + for (var6 = 0; var6 < var1.length; ++var6) { + byte var7 = var1[var6]; + int[] var8 = this.table[var5]; - int var9; - for (var9 = 0; var9 < 14; ++var9) { - var3[var4 + var9] += var7 * var8[var9]; + int var9; + for (var9 = 0; var9 < 14; ++var9) { + var3[var9 + var4] += var7 * var8[var9]; + } + + var5 += this.outputRate; + var9 = var5 / this.inputRate; + var4 += var9; + var5 -= var9 * this.inputRate; } - var5 += this.outputRate; - var9 = var5 / this.inputRate; - var4 += var9; - var5 -= var9 * this.inputRate; - } + var1 = new byte[var2]; - var1 = new byte[var2]; - - for (var6 = 0; var6 < var2; ++var6) { - int var10 = var3[var6] + 32768 >> 16; - if (var10 < -128) { - var1[var6] = -128; - } else if (var10 > 127) { - var1[var6] = 127; - } else { - var1[var6] = (byte)var10; + for (var6 = 0; var6 < var2; ++var6) { + int var10 = var3[var6] + 32768 >> 16; + if (var10 < -128) { + var1[var6] = -128; + } else if (var10 > 127) { + var1[var6] = 127; + } else { + var1[var6] = (byte)var10; + } } } return var1; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(II)I", - garbageValue = "1569802818" + garbageValue = "-2098361715" ) @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("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "1732624791" + signature = "(IB)I", + garbageValue = "45" ) @Export("scalePosition") int scalePosition(int var1) { @@ -142,679 +153,80 @@ public class Decimator { return var1; } - @ObfuscatedName("a") - @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "1" - ) - static final int method2517(int var0, int var1) { - if (var0 == -2) { - return 12345678; - } - if (var0 == -1) { - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; + @ObfuscatedName("s") + public static final int method2452(double var0, double var2, double var4) { + double var6 = var4; + double var8 = var4; + double var10 = var4; + if (0.0D != var2) { + double var12; + if (var4 < 0.5D) { + var12 = (var2 + 1.0D) * var4; + } else { + var12 = var4 + var2 - var4 * var2; } - return var1; - } - var1 = (var0 & 127) * var1 / 128; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; + double var14 = 2.0D * var4 - 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 = var16 * 6.0D * (var12 - var14) + var14; + } 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 (6.0D * var0 < 1.0D) { + var8 = var14 + (var12 - var14) * 6.0D * var0; + } else if (var0 * 2.0D < 1.0D) { + var8 = var12; + } else if (3.0D * var0 < 2.0D) { + var8 = 6.0D * (var12 - var14) * (0.6666666666666666D - var0) + var14; + } else { + var8 = var14; + } + + if (var20 * 6.0D < 1.0D) { + var10 = var20 * 6.0D * (var12 - var14) + var14; + } else if (2.0D * var20 < 1.0D) { + var10 = var12; + } else if (var20 * 3.0D < 2.0D) { + var10 = (var12 - var14) * (0.6666666666666666D - var20) * 6.0D + var14; + } else { + var10 = var14; + } } - return (var0 & 65408) + var1; + int var22 = (int)(var6 * 256.0D); + int var13 = (int)(var8 * 256.0D); + int var23 = (int)(256.0D * var10); + int var15 = var23 + (var13 << 8) + (var22 << 16); + return var15; } - @ObfuscatedName("ge") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lbq;IIIIII)V", - garbageValue = "-1193836953" + signature = "(III)I", + garbageValue = "-882236217" ) - @Export("drawActor2d") - static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { - if (var0 == null || !var0.isVisible()) { - return; - } - if (var0 instanceof NPC) { - NPCDefinition var6 = ((NPC)var0).definition; - if (var6.transforms != null) { - var6 = var6.transform(); - } - - if (var6 == null) { - return; - } - } - - int var75 = Players.Players_count; - int[] var7 = Players.Players_indices; - byte var8 = 0; - Player var10; - if (var1 < var75 && var0.playerCycle == Client.cycle) { - var10 = (Player)var0; - boolean var9; - if (Client.drawPlayerNames == 0) { - var9 = false; - } else { - boolean var78; - if (var10 != Client.localPlayer) { - var78 = (Client.drawPlayerNames & 4) != 0; - boolean var79 = var78; - boolean var13; - if (!var78) { - var13 = (Client.drawPlayerNames & 1) != 0; - var79 = var13 && var10.isFriend(); - } - - var13 = var79; - if (!var79) { - boolean var80 = (Client.drawPlayerNames & 2) != 0; - var13 = var80 && var10.isClanMember(); - } - - var9 = var13; - } else { - var78 = (Client.drawPlayerNames & 8) != 0; - var9 = var78; - } - } - - if (var9) { - Player var11 = (Player)var0; - if (var1 < var75) { - class219.getActorScreenLocation(var0, var0.defaultHeight + 15); - AbstractFont var12 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); - byte var92 = 9; - var12.drawCentered(var11.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var92, 0xffffff, 0); - var8 = 18; - } - } - } - - int var87 = -2; - int var15; - int var22; - int var23; - if (!var0.healthBars.isEmpty()) { - class219.getActorScreenLocation(var0, var0.defaultHeight + 15); - - for (HealthBar var88 = (HealthBar)var0.healthBars.last(); var88 != null; var88 = (HealthBar)var0.healthBars.previous()) { - HealthBarUpdate var89 = var88.get(Client.cycle); - if (var89 == null) { - if (var88.isEmpty()) { - var88.remove(); - } - continue; - } - - HealthBarDefinition var91 = var88.definition; - Sprite var76 = var91.getBackSprite(); - Sprite var14 = var91.getFrontSprite(); - int var16 = 0; - if (var76 != null && var14 != null) { - if (var91.widthPadding * 2 < var14.subWidth) { - var16 = var91.widthPadding; - } - - var15 = var14.subWidth - var16 * 2; - } else { - var15 = var91.width; - } - - int var17 = 255; - boolean var18 = true; - int var19 = Client.cycle - var89.cycle; - int var20 = var15 * var89.health2 / var91.width; - int var21; - int var93; - if (var89.cycleOffset > var19) { - var21 = var91.int4 == 0 ? 0 : var91.int4 * (var19 / var91.int4); - var22 = var15 * var89.health / var91.width; - var93 = var21 * (var20 - var22) / var89.cycleOffset + var22; - } else { - var93 = var20; - var21 = var89.cycleOffset + var91.int5 - var19; - if (var91.int3 >= 0) { - var17 = (var21 << 8) / (var91.int5 - var91.int3); - } - } - - if (var89.health2 > 0 && var93 < 1) { - var93 = 1; - } - - if (var76 == null || var14 == null) { - var87 += 5; - if (Client.viewportTempX > -1) { - var21 = var2 + Client.viewportTempX - (var15 >> 1); - var22 = var3 + Client.viewportTempY - var87; - Rasterizer2D.Rasterizer2D_fillRectangle(var21, var22, var93, 5, 0xff00); - Rasterizer2D.Rasterizer2D_fillRectangle(var21 + var93, var22, var15 - var93, 5, 0xff0000); - } - - var87 += 2; - continue; - } - - if (var93 == var15) { - var93 += var16 * 2; - } else { - var93 += var16; - } - - var21 = var76.subHeight; - var87 += var21; - var22 = var2 + Client.viewportTempX - (var15 >> 1); - var23 = var3 + Client.viewportTempY - var87; - var22 -= var16; - if (var17 >= 0 && var17 < 255) { - var76.drawTransAt(var22, var23, var17); - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var93 + var22, var21 + var23); - var14.drawTransAt(var22, var23, var17); - } else { - var76.drawTransBgAt(var22, var23); - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var93 + var22, var21 + var23); - var14.drawTransBgAt(var22, var23); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); - var87 += 2; - } - } - - if (var87 == -2) { - var87 += 7; - } - - var87 += var8; - if (var1 < var75) { - var10 = (Player)var0; - if (var10.isHidden) { - return; - } - - if (var10.headIconPk != -1 || var10.headIconPrayer != -1) { - class219.getActorScreenLocation(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - if (var10.headIconPk != -1) { - var87 += 25; - UserComparator3.headIconPkSprites[var10.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); - } - - if (var10.headIconPrayer != -1) { - var87 += 25; - SoundCache.headIconPrayerSprites[var10.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); - } - } - } - - if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { - class219.getActorScreenLocation(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - var87 += class173.headIconHintSprites[1].subHeight; - class173.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); - } - } + @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 { - NPCDefinition var90 = ((NPC)var0).definition; - if (var90.transforms != null) { - var90 = var90.transform(); - } - - if (var90.headIconPrayer >= 0 && var90.headIconPrayer < SoundCache.headIconPrayerSprites.length) { - class219.getActorScreenLocation(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - SoundCache.headIconPrayerSprites[var90.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); - } - } - - if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { - class219.getActorScreenLocation(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - class173.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); - } - } + return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; } - - if (var0.overheadText != null && (var1 >= var75 || !var0.field998 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { - class219.getActorScreenLocation(var0, var0.defaultHeight); - if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { - Client.overheadTextXOffsets[Client.overheadTextCount] = WorldMapIcon_1.fontBold12.stringWidth(var0.overheadText) / 2; - Client.overheadTextAscents[Client.overheadTextCount] = WorldMapIcon_1.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 var77 = 0; var77 < 4; ++var77) { - int var96 = var0.hitSplatCycles[var77]; - int var97 = var0.hitSplatTypes[var77]; - HitSplatDefinition var95 = null; - int var98 = 0; - if (var97 >= 0) { - if (var96 <= Client.cycle) { - continue; - } - - var95 = Projectile.HitSplatDefinition_get(var0.hitSplatTypes[var77]); - var98 = var95.field3344; - if (var95 != null && var95.transforms != null) { - var95 = var95.transform(); - if (var95 == null) { - var0.hitSplatCycles[var77] = -1; - continue; - } - } - } else if (var96 < 0) { - continue; - } - - var15 = var0.hitSplatTypes2[var77]; - HitSplatDefinition var81 = null; - if (var15 >= 0) { - var81 = Projectile.HitSplatDefinition_get(var15); - if (var81 != null && var81.transforms != null) { - var81 = var81.transform(); - } - } - - if (var96 - var98 > Client.cycle) { - continue; - } - if (var95 == null) { - var0.hitSplatCycles[var77] = -1; - continue; - } - class219.getActorScreenLocation(var0, var0.defaultHeight / 2); - if (Client.viewportTempX <= -1) { - continue; - } - if (var77 == 1) { - Client.viewportTempY -= 20; - } - - if (var77 == 2) { - Client.viewportTempX -= 15; - Client.viewportTempY -= 10; - } - - if (var77 == 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 = var95.method4551(); - int var43; - if (var82 != null) { - var22 = var82.subWidth; - var43 = var82.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var26 = var82.xOffset; - } - - var83 = var95.method4557(); - if (var83 != null) { - var23 = var83.subWidth; - var43 = var83.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var27 = var83.xOffset; - } - - var84 = var95.method4558(); - if (var84 != null) { - var24 = var84.subWidth; - var43 = var84.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var28 = var84.xOffset; - } - - var85 = var95.method4583(); - if (var85 != null) { - var25 = var85.subWidth; - var43 = var85.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var29 = var85.xOffset; - } - - if (var81 != null) { - var30 = var81.method4551(); - if (var30 != null) { - var34 = var30.subWidth; - var43 = var30.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var38 = var30.xOffset; - } - - var31 = var81.method4557(); - if (var31 != null) { - var35 = var31.subWidth; - var43 = var31.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var39 = var31.xOffset; - } - - var32 = var81.method4558(); - if (var32 != null) { - var36 = var32.subWidth; - var43 = var32.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var40 = var32.xOffset; - } - - var33 = var81.method4583(); - if (var33 != null) { - var37 = var33.subWidth; - var43 = var33.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var41 = var33.xOffset; - } - } - - Font var86 = var95.getFont(); - if (var86 == null) { - var86 = Coord.fontPlain11; - } - - Font var44; - if (var81 != null) { - var44 = var81.getFont(); - if (var44 == null) { - var44 = Coord.fontPlain11; - } - } else { - var44 = Coord.fontPlain11; - } - - String var45 = null; - String var46 = null; - boolean var47 = false; - int var48 = 0; - var45 = var95.getString(var0.hitSplatValues[var77]); - int var94 = var86.stringWidth(var45); - if (var81 != null) { - var46 = var81.getString(var0.hitSplatValues2[var77]); - var48 = var44.stringWidth(var46); - } - - int var49 = 0; - int var50 = 0; - if (var23 > 0) { - if (var84 == null && var85 == null) { - var49 = 1; - } else { - var49 = var94 / 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 = var23 * var49; - var51 += var56; - var55 += (var56 - var94) / 2; - } else { - var51 += var94; - } - - 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 = var50 * var35; - var51 += var62; - var61 += (var62 - var48) / 2; - } else { - var51 += var48; - } - - var60 = var51; - if (var37 > 0) { - var51 += var37; - } - } - - var62 = var0.hitSplatCycles[var77] - Client.cycle; - int var63 = var95.field3335 - var62 * var95.field3335 / var95.field3344; - int var64 = var62 * var95.field3340 / var95.field3344 + -var95.field3340; - int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1)); - int var66 = var3 + Client.viewportTempY - 12 + var64; - int var67 = var66; - int var68 = var42 + var66; - int var69 = var66 + var95.field3328 + 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.field3328 + 15; - var73 = var72 - var44.maxAscent; - var74 = var72 + var44.maxDescent; - if (var73 < var67) { - ; - } - - if (var74 > var68) { - ; - } - } - - var73 = 255; - if (var95.field3341 >= 0) { - var73 = (var62 << 8) / (var95.field3344 - var95.field3341); - } - - if (var73 >= 0 && var73 < 255) { - if (var82 != null) { - var82.drawTransAt(var65 + var52 - var26, var66, var73); - } - - if (var84 != null) { - var84.drawTransAt(var65 + var53 - var28, var66, var73); - } - - if (var83 != null) { - for (var74 = 0; var74 < var49; ++var74) { - var83.drawTransAt(var23 * var74 + (var54 + var65 - var27), var66, var73); - } - } - - if (var85 != null) { - var85.drawTransAt(var56 + var65 - var29, var66, var73); - } - - var86.drawAlpha(var45, var55 + var65, var69, var95.textColor, 0, var73); - if (var81 != null) { - if (var30 != null) { - var30.drawTransAt(var65 + var57 - 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 + (var65 + var59 - var39), var66, var73); - } - } - - if (var33 != null) { - var33.drawTransAt(var60 + var65 - 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 + (var65 + var54 - var27), var66); - } - } - - if (var85 != null) { - var85.drawTransBgAt(var65 + var56 - var29, var66); - } - - var86.draw(var45, var65 + var55, var69, var95.textColor | 0xff000000, 0); - if (var81 == null) { - continue; - } - if (var30 != null) { - var30.drawTransBgAt(var57 + var65 - var38, var66); - } - - if (var32 != null) { - var32.drawTransBgAt(var58 + var65 - var40, var66); - } - - if (var31 != null) { - for (var74 = 0; var74 < var50; ++var74) { - var31.drawTransBgAt(var74 * var35 + (var65 + var59 - var39), var66); - } - } - - if (var33 != null) { - var33.drawTransBgAt(var60 + var65 - var41, var66); - } - - var44.draw(var46, var61 + var65, var72, var81.textColor | 0xff000000, 0); - } - } - - } - - @ObfuscatedName("je") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1767057302" - ) - @Export("saveTempMenuAction") - static void saveTempMenuAction(int var0) { - Client.tempMenuAction = new MenuAction(); - Client.tempMenuAction.argument1 = Client.menuArguments1[var0]; - Client.tempMenuAction.argument2 = Client.menuArguments2[var0]; - Client.tempMenuAction.opcode = Client.menuOpcodes[var0]; - Client.tempMenuAction.argument0 = Client.menuIdentifiers[var0]; - Client.tempMenuAction.action = Client.menuActions[var0]; } } diff --git a/runescape-client/src/main/java/DefaultsGroup.java b/runescape-client/src/main/java/DefaultsGroup.java index b2b43ac0ba..b082158709 100644 --- a/runescape-client/src/main/java/DefaultsGroup.java +++ b/runescape-client/src/main/java/DefaultsGroup.java @@ -4,40 +4,32 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kt") +@ObfuscatedName("ka") @Implements("DefaultsGroup") public class DefaultsGroup { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lkt;" + signature = "Lka;" ) - static final DefaultsGroup field3821; - @ObfuscatedName("go") - @ObfuscatedGetter( - intValue = -909445377 + static final DefaultsGroup field3794; + @ObfuscatedName("gs") + @ObfuscatedSignature( + signature = "[Lls;" ) - static int field3819; - @ObfuscatedName("w") + @Export("crossSprites") + static Sprite[] crossSprites; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1207021413 + intValue = 879655985 ) @Export("group") final int group; static { - field3821 = new DefaultsGroup(3); + field3794 = new DefaultsGroup(3); } DefaultsGroup(int var1) { this.group = var1; } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(Lkf;B)Ljava/lang/String;", - garbageValue = "39" - ) - public static String method5898(Buffer var0) { - return WorldMapIcon_0.method194(var0, 0x7fff); - } } diff --git a/runescape-client/src/main/java/DemotingHashTable.java b/runescape-client/src/main/java/DemotingHashTable.java index 435c7849c9..5ed1f1abd7 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("ed") +@ObfuscatedName("es") @Implements("DemotingHashTable") public final class DemotingHashTable { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("capacity") int capacity; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("remaining") int remaining; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lla;" + signature = "Lln;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Ljk;" + signature = "Ljm;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lep;" + signature = "Lek;" ) - class146 field1966; + class146 field1944; public DemotingHashTable(int var1, int var2) { this.queue = new IterableDualNodeQueue(); @@ -42,45 +42,47 @@ public final class DemotingHashTable { this.hashTable = new IterableNodeHashTable(var3); } - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("get") public Object get(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); if (var3 == null) { return null; - } - Object var4 = var3.get(); - if (var4 == null) { - var3.remove(); - var3.removeDual(); - this.remaining += var3.size; - return null; - } - if (var3.isSoft()) { - DirectWrapper var5 = new DirectWrapper(var4, var3.size); - this.hashTable.put(var5, var3.key); - this.queue.add(var5); - var5.keyDual = 0L; - var3.remove(); - var3.removeDual(); } else { - this.queue.add(var3); - var3.keyDual = 0L; - } + Object var4 = var3.get(); + if (var4 == null) { + var3.remove(); + var3.removeDual(); + this.remaining += var3.size; + return null; + } else { + if (var3.isSoft()) { + DirectWrapper var5 = new DirectWrapper(var4, var3.size); + this.hashTable.put(var5, var3.key); + this.queue.add(var5); + var5.keyDual = 0L; + var3.remove(); + var3.removeDual(); + } else { + this.queue.add(var3); + var3.keyDual = 0L; + } - return var4; + return var4; + } + } } - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("remove") void remove(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); this.removeWrapper(var3); } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lew;)V" + signature = "(Led;)V" ) @Export("removeWrapper") void removeWrapper(Wrapper var1) { @@ -92,37 +94,38 @@ public final class DemotingHashTable { } - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("put") public void put(Object var1, long var2, int var4) { if (var4 > this.capacity) { throw new IllegalStateException(); + } else { + this.remove(var2); + this.remaining -= var4; + + while (this.remaining < 0) { + Wrapper var5 = (Wrapper)this.queue.removeLast(); + if (var5 == null) { + throw new RuntimeException(""); + } + + if (!var5.isSoft()) { + } + + this.removeWrapper(var5); + if (this.field1944 != null) { + this.field1944.method3280(var5.get()); + } + } + + DirectWrapper var6 = new DirectWrapper(var1, var4); + this.hashTable.put(var6, var2); + this.queue.add(var6); + var6.keyDual = 0L; } - this.remove(var2); - this.remaining -= var4; - - while (this.remaining < 0) { - Wrapper var5 = (Wrapper)this.queue.removeLast(); - if (var5 == null) { - throw new RuntimeException(""); - } - - if (!var5.isSoft()) { - } - - this.removeWrapper(var5); - if (this.field1966 != null) { - this.field1966.method3338(var5.get()); - } - } - - DirectWrapper var6 = new DirectWrapper(var1, var4); - this.hashTable.put(var6, var2); - this.queue.add(var6); - var6.keyDual = 0L; } - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("demote") public void demote(int var1) { for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) { @@ -143,7 +146,7 @@ public final class DemotingHashTable { } - @ObfuscatedName("l") + @ObfuscatedName("n") @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 6ab8130365..4847498ad7 100644 --- a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java +++ b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java @@ -5,38 +5,38 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lf") +@ObfuscatedName("lk") @Implements("DesktopPlatformInfoProvider") public class DesktopPlatformInfoProvider implements PlatformInfoProvider { - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 1888864715 - ) - int field3930; @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1057820263 + intValue = -1435561195 ) - int field3928; - @ObfuscatedName("l") + int field3903; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1079401835 + intValue = -1717280991 ) - int field3926; + int field3901; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 1506800737 + ) + int field3904; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(I)Llo;", - garbageValue = "1619784372" + signature = "(I)Llx;", + garbageValue = "-1719381077" ) @Export("get") public PlatformInfo get() { byte var1; - if (GrandExchangeOfferOwnWorldComparator.operatingSystemLC.startsWith("win")) { + if (ByteArrayPool.field3708.startsWith("win")) { var1 = 1; - } else if (GrandExchangeOfferOwnWorldComparator.operatingSystemLC.startsWith("mac")) { + } else if (ByteArrayPool.field3708.startsWith("mac")) { var1 = 2; - } else if (GrandExchangeOfferOwnWorldComparator.operatingSystemLC.startsWith("linux")) { + } else if (ByteArrayPool.field3708.startsWith("linux")) { var1 = 3; } else { var1 = 4; @@ -134,11 +134,11 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { var8 = 4; } - this.method6258(var5); + this.method6147(var5); Runtime.getRuntime(); int var10 = (int)((long)((new Random()).nextInt(31457280) + 230686720) / 1048576L) + 1; int var11; - if (this.field3930 > 3) { + if (this.field3903 > 3) { var11 = Runtime.getRuntime().availableProcessors(); } else { var11 = 0; @@ -152,55 +152,127 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { String var17 = ""; String var18 = ""; int[] var23 = new int[3]; - return new PlatformInfo(var1, var24, var7, var8, this.field3930, this.field3928, this.field3926, 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.field3903, this.field3901, this.field3904, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); } - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "-1874796410" - ) - void method6258(String var1) { - if (var1.startsWith("1.")) { - this.method6260(var1); - } else { - this.method6261(var1); - } - - } - - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(Ljava/lang/String;B)V", - garbageValue = "93" + garbageValue = "28" ) - void method6260(String var1) { - String[] var2 = var1.split("\\."); - - try { - this.field3930 = Integer.parseInt(var2[1]); - var2 = var2[2].split("_"); - this.field3928 = Integer.parseInt(var2[0]); - this.field3926 = Integer.parseInt(var2[1]); - } catch (Exception var4) { + void method6147(String var1) { + if (var1.startsWith("1.")) { + this.method6148(var1); + } else { + this.method6145(var1); } } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(Ljava/lang/String;I)V", - garbageValue = "-265029998" + garbageValue = "1225882646" ) - void method6261(String var1) { + void method6148(String var1) { String[] var2 = var1.split("\\."); try { - this.field3930 = Integer.parseInt(var2[0]); - this.field3928 = Integer.parseInt(var2[1]); - this.field3926 = Integer.parseInt(var2[2]); + this.field3903 = Integer.parseInt(var2[1]); + var2 = var2[2].split("_"); + this.field3901 = Integer.parseInt(var2[0]); + this.field3904 = Integer.parseInt(var2[1]); } catch (Exception var4) { } } + + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;S)V", + garbageValue = "-31875" + ) + void method6145(String var1) { + String[] var2 = var1.split("\\."); + + try { + this.field3903 = Integer.parseInt(var2[0]); + this.field3901 = Integer.parseInt(var2[1]); + this.field3904 = Integer.parseInt(var2[2]); + } catch (Exception var4) { + } + + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "([BS)Lcr;", + garbageValue = "10322" + ) + @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); + + 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(); + } else { + var1.intOperands[var7] = var2.readUnsignedByte(); + } + } + + return var1; + } } diff --git a/runescape-client/src/main/java/DevicePcmPlayer.java b/runescape-client/src/main/java/DevicePcmPlayer.java index 2654a8e2ea..3b4d7b7f61 100644 --- a/runescape-client/src/main/java/DevicePcmPlayer.java +++ b/runescape-client/src/main/java/DevicePcmPlayer.java @@ -9,48 +9,48 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("af") +@ObfuscatedName("aw") @Implements("DevicePcmPlayer") public class DevicePcmPlayer extends PcmPlayer { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("format") AudioFormat format; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("line") SourceDataLine line; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1783357217 + intValue = 305940879 ) @Export("capacity2") int capacity2; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("byteSamples") byte[] byteSamples; DevicePcmPlayer() { } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1518489339" + signature = "(B)V", + garbageValue = "1" ) @Export("init") protected void init() { - this.format = new AudioFormat((float)CollisionMap.PcmPlayer_sampleRate, 16, FileSystem.PcmPlayer_stereo ? 2 : 1, true, false); - this.byteSamples = new byte[256 << (FileSystem.PcmPlayer_stereo ? 2 : 1)]; + this.format = new AudioFormat((float)PcmPlayer.PcmPlayer_sampleRate, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false); + this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "2" + signature = "(II)V", + garbageValue = "1939802329" ) @Export("open") protected void open(int var1) throws LineUnavailableException { try { - Info var2 = new Info(SourceDataLine.class, this.format, var1 << (FileSystem.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(); @@ -78,27 +78,27 @@ public class DevicePcmPlayer extends PcmPlayer { } } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "97" + signature = "(I)I", + garbageValue = "428413683" ) @Export("position") protected int position() { - return this.capacity2 - (this.line.available() >> (FileSystem.PcmPlayer_stereo ? 2 : 1)); + return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); } - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("write") protected void write() { int var1 = 256; - if (FileSystem.PcmPlayer_stereo) { + if (PcmPlayer.PcmPlayer_stereo) { var1 <<= 1; } for (int var2 = 0; var2 < var1; ++var2) { int var3 = super.samples[var2]; - if ((var3 + 8388608 & 0xff000000) != 0) { + if ((var3 + 8388608 & -16777216) != 0) { var3 = 8388607 ^ var3 >> 31; } @@ -109,10 +109,10 @@ public class DevicePcmPlayer extends PcmPlayer { this.line.write(this.byteSamples, 0, var1 << 1); } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "57" + signature = "(I)V", + garbageValue = "37766209" ) @Export("close") protected void close() { @@ -123,10 +123,10 @@ public class DevicePcmPlayer extends PcmPlayer { } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-313753219" + garbageValue = "645078569" ) @Export("discard") protected void discard() { diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index aa9028e296..699eddc04c 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -1,52 +1,56 @@ 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("ak") +@ObfuscatedName("ad") @Implements("DevicePcmPlayerProvider") public class DevicePcmPlayerProvider implements PcmPlayerProvider { - @ObfuscatedName("pf") - @ObfuscatedSignature( - signature = "Ljx;" - ) - @Export("clanChat") - static ClanChat clanChat; - @ObfuscatedName("qn") - @ObfuscatedGetter( - intValue = 490221952 - ) - static int field412; - @ObfuscatedName("q") - @ObfuscatedGetter( - longValue = 95792887242414313L - ) - static long field416; - @ObfuscatedName("ci") - @Export("mouseCam") - static boolean mouseCam; - DevicePcmPlayerProvider() { } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(B)Ldn;", - garbageValue = "1" + signature = "(S)Ldd;", + garbageValue = "-22145" ) @Export("player") public PcmPlayer player() { return new DevicePcmPlayer(); } - @ObfuscatedName("kn") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-5" + signature = "(IIB)Z", + garbageValue = "1" ) - static void method805() { - Client.packetWriter.addNode(Archive.getPacketBufferNode(ClientPacket.field2240, Client.packetWriter.isaacCipher)); - Client.oculusOrbState = 0; + static boolean method794(int var0, int var1) { + return var0 != 4 || var1 < 8; + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "895453465" + ) + public static void method793(int var0) { + class197.field2378 = 1; + WorldMapDecoration.musicTrackArchive = null; + class197.musicTrackGroupId = -1; + class197.musicTrackFileId = -1; + WorldMapSprite.field222 = 0; + Varcs.musicTrackBoolean = false; + class16.field98 = var0; + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(I)Lbl;", + garbageValue = "-1981262323" + ) + @Export("worldListStart") + static World worldListStart() { + World.World_listCount = 0; + return GrandExchangeOfferAgeComparator.getNextWorldListWorld(); } } diff --git a/runescape-client/src/main/java/DirectByteArrayCopier.java b/runescape-client/src/main/java/DirectByteArrayCopier.java index 4e0b1d7a4f..fe2c644407 100644 --- a/runescape-client/src/main/java/DirectByteArrayCopier.java +++ b/runescape-client/src/main/java/DirectByteArrayCopier.java @@ -4,26 +4,20 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gn") +@ObfuscatedName("gb") @Implements("DirectByteArrayCopier") public class DirectByteArrayCopier extends AbstractByteArrayCopier { - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lhp;" - ) - @Export("Widget_fontsArchive") - static AbstractArchive Widget_fontsArchive; - @ObfuscatedName("gh") - @Export("regions") - static int[] regions; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("directBuffer") ByteBuffer directBuffer; - @ObfuscatedName("e") + DirectByteArrayCopier() { + } + + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(I)[B", - garbageValue = "1071129091" + garbageValue = "-1040345200" ) @Export("get") byte[] get() { @@ -33,116 +27,35 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { return var1; } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "([BI)V", - garbageValue = "594076777" + garbageValue = "38240743" ) @Export("set") - public void set(byte[] var1) { + void set(byte[] var1) { this.directBuffer = ByteBuffer.allocateDirect(var1.length); this.directBuffer.position(0); this.directBuffer.put(var1); } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(I)J", - garbageValue = "-960689616" + signature = "(ILjava/lang/String;Ljava/lang/String;I)V", + garbageValue = "2110102488" ) - @Export("currentTimeMs") - public static final synchronized long currentTimeMs() { - long var0 = System.currentTimeMillis(); - if (var0 < DevicePcmPlayerProvider.field416) { - class2.field4 += DevicePcmPlayerProvider.field416 - var0; - } - - DevicePcmPlayerProvider.field416 = var0; - return class2.field4 + var0; + @Export("addGameMessage") + static void addGameMessage(int var0, String var1, String var2) { + MilliClock.addChatMessage(var0, var1, var2, (String)null); } - @ObfuscatedName("gz") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(IIIIIIII)V", - garbageValue = "1456819139" + signature = "(II)Z", + garbageValue = "470994563" ) - @Export("addPendingSpawnToScene") - static final void addPendingSpawnToScene(int plane, int type, int x, int y, int id, int orientation, int var6) { - if (x < 1 || y < 1 || x > 102 || y > 102) { - return; - } - if (Client.isLowDetail && plane != class42.plane) { - return; - } - - long var7 = 0L; - boolean var9 = true; - boolean var10 = false; - boolean var11 = false; - if (type == 0) { - var7 = GrandExchangeOfferWorldComparator.scene.getBoundaryObjectTag(plane, x, y); - } - - if (type == 1) { - var7 = GrandExchangeOfferWorldComparator.scene.getWallDecorationTag(plane, x, y); - } - - if (type == 2) { - var7 = GrandExchangeOfferWorldComparator.scene.getGameObjectTag(plane, x, y); - } - - if (type == 3) { - var7 = GrandExchangeOfferWorldComparator.scene.getFloorDecorationTag(plane, x, y); - } - - int var12; - if (0L != var7) { - var12 = GrandExchangeOfferWorldComparator.scene.getObjectFlags(plane, x, y, var7); - int var14 = class43.Entity_unpackID(var7); - int var15 = var12 & 31; - int var16 = var12 >> 6 & 3; - ObjectDefinition var13; - if (type == 0) { - GrandExchangeOfferWorldComparator.scene.removeBoundaryObject(plane, x, y); - var13 = ViewportMouse.getObjectDefinition(var14); - if (var13.interactType != 0) { - Client.collisionMaps[plane].method3564(x, y, var15, var16, var13.boolean1); - } - } - - if (type == 1) { - GrandExchangeOfferWorldComparator.scene.removeWallDecoration(plane, x, y); - } - - if (type == 2) { - GrandExchangeOfferWorldComparator.scene.removeGameObject(plane, x, y); - var13 = ViewportMouse.getObjectDefinition(var14); - if (x + var13.sizeX > 103 || y + var13.sizeX > 103 || x + var13.sizeY > 103 || y + var13.sizeY > 103) { - return; - } - - if (var13.interactType != 0) { - Client.collisionMaps[plane].setFlagOffNonSquare(x, y, var13.sizeX, var13.sizeY, var16, var13.boolean1); - } - } - - if (type == 3) { - GrandExchangeOfferWorldComparator.scene.removeFloorDecoration(plane, x, y); - var13 = ViewportMouse.getObjectDefinition(var14); - if (var13.interactType == 1) { - Client.collisionMaps[plane].method3567(x, y); - } - } - } - - if (id >= 0) { - var12 = plane; - if (plane < 3 && (Tiles.Tiles_renderFlags[1][x][y] & 2) == 2) { - var12 = plane + 1; - } - - ClientPacket.addPendingGameObject(plane, var12, x, y, id, orientation, var6, GrandExchangeOfferWorldComparator.scene, Client.collisionMaps[plane]); - } - + @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/DirectWrapper.java b/runescape-client/src/main/java/DirectWrapper.java index b9f21a2ab5..b9ea0c1c90 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("eq") +@ObfuscatedName("et") @Implements("DirectWrapper") public class DirectWrapper extends Wrapper { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("obj") Object obj; @@ -14,13 +14,13 @@ public class DirectWrapper extends Wrapper { this.obj = var1; } - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("get") Object get() { return this.obj; } - @ObfuscatedName("w") + @ObfuscatedName("j") @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 8ffd672bd2..c35785088d 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("fb") +@ObfuscatedName("fe") @Implements("DualNode") public class DualNode extends Node { - @ObfuscatedName("cx") + @ObfuscatedName("cr") @Export("keyDual") public long keyDual; - @ObfuscatedName("cu") + @ObfuscatedName("cl") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lfe;" ) @Export("previousDual") public DualNode previousDual; - @ObfuscatedName("cs") + @ObfuscatedName("cg") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lfe;" ) @Export("nextDual") public DualNode nextDual; - @ObfuscatedName("cm") + @ObfuscatedName("cl") @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 ae485b993c..6926e9e670 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("ix") +@ObfuscatedName("ih") @Implements("DualNodeDeque") public final class DualNodeDeque { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lfe;" ) @Export("sentinel") DualNode sentinel; @@ -19,9 +19,9 @@ public final class DualNodeDeque { this.sentinel.nextDual = this.sentinel; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lfb;)V" + signature = "(Lfe;)V" ) @Export("addFirst") public void addFirst(DualNode var1) { @@ -35,9 +35,9 @@ public final class DualNodeDeque { var1.previousDual.nextDual = var1; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lfb;)V" + signature = "(Lfe;)V" ) @Export("addLast") public void addLast(DualNode var1) { @@ -51,9 +51,9 @@ public final class DualNodeDeque { var1.previousDual.nextDual = var1; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "()Lfb;" + signature = "()Lfe;" ) @Export("removeLast") public DualNode removeLast() { diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index c642860604..077f479cc7 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -1,73 +1,77 @@ -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("cu") +@ObfuscatedName("cl") @Implements("DynamicObject") public class DynamicObject extends Entity { - @ObfuscatedName("x") - @Export("Tiles_hueMultiplier") - static int[] Tiles_hueMultiplier; - @ObfuscatedName("q") + @ObfuscatedName("at") + static String field1268; + @ObfuscatedName("ha") @ObfuscatedGetter( - intValue = -982722193 + intValue = -775717141 + ) + @Export("oculusOrbFocalPointX") + static int oculusOrbFocalPointX; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -760390045 ) @Export("id") int id; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1770938715 + intValue = -980932459 ) @Export("type") int type; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 187564889 + intValue = -400059677 ) @Export("orientation") int orientation; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 618802147 + intValue = 1290123367 ) @Export("plane") int plane; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 490427017 + intValue = -508815789 ) @Export("x") int x; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 660251733 + intValue = -490638225 ) @Export("y") int y; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lis;" + signature = "Lij;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1570424885 + intValue = 156262843 ) @Export("frame") int frame; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1283893717 + intValue = 1843823299 ) @Export("cycleStart") int cycleStart; @ObfuscatedSignature( - signature = "(IIIIIIIZLeo;)V" + signature = "(IIIIIIIZLen;)V" ) DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Entity var9) { this.id = var1; @@ -76,32 +80,31 @@ public class DynamicObject extends Entity { this.plane = var4; this.x = var5; this.y = var6; - if (var7 == -1) { - return; - } - this.sequenceDefinition = GrandExchangeEvent.SequenceDefinition_get(var7); - this.frame = 0; - this.cycleStart = Client.cycle - 1; - if (this.sequenceDefinition.field3529 == 0 && var9 != null && var9 instanceof DynamicObject) { - DynamicObject var10 = (DynamicObject)var9; - if (var10.sequenceDefinition == this.sequenceDefinition) { - this.frame = var10.frame; - this.cycleStart = var10.cycleStart; - return; + if (var7 != -1) { + this.sequenceDefinition = Widget.SequenceDefinition_get(var7); + this.frame = 0; + this.cycleStart = Client.cycle - 1; + if (this.sequenceDefinition.field3492 == 0 && var9 != null && var9 instanceof DynamicObject) { + DynamicObject var10 = (DynamicObject)var9; + if (this.sequenceDefinition == var10.sequenceDefinition) { + this.frame = var10.frame; + this.cycleStart = var10.cycleStart; + return; + } } - } - if (var8 && this.sequenceDefinition.frameCount != -1) { - this.frame = (int)(Math.random() * (double)this.sequenceDefinition.frameIds.length); - this.cycleStart -= (int)(Math.random() * (double)this.sequenceDefinition.frameLengths[this.frame]); + if (var8 && this.sequenceDefinition.frameCount != -1) { + this.frame = (int)(Math.random() * (double)this.sequenceDefinition.frameIds.length); + this.cycleStart -= (int)(Math.random() * (double)this.sequenceDefinition.frameLengths[this.frame]); + } } } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)Ldm;", - garbageValue = "759381421" + signature = "(I)Ldo;", + garbageValue = "-419920513" ) @Export("getModel") protected final Model getModel() { @@ -111,11 +114,11 @@ public class DynamicObject extends Entity { var1 = 100; } - label56: { + label55: { do { do { if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) { - break label56; + break label55; } var1 -= this.sequenceDefinition.frameLengths[this.frame]; @@ -131,177 +134,132 @@ public class DynamicObject extends Entity { this.cycleStart = Client.cycle - var1; } - ObjectDefinition var12 = ViewportMouse.getObjectDefinition(this.id); + ObjectDefinition var12 = class215.getObjectDefinition(this.id); if (var12.transforms != null) { var12 = var12.transform(); } if (var12 == null) { return null; - } - int var2; - int var3; - if (this.orientation != 1 && this.orientation != 3) { - var2 = var12.sizeX; - var3 = var12.sizeY; } else { - var2 = var12.sizeY; - var3 = var12.sizeX; - } + int var2; + int var3; + if (this.orientation != 1 && this.orientation != 3) { + var2 = var12.sizeX; + var3 = var12.sizeY; + } else { + var2 = var12.sizeY; + var3 = var12.sizeX; + } - int var4 = (var2 >> 1) + this.x; - int var5 = (var2 + 1 >> 1) + this.x; - int var6 = (var3 >> 1) + this.y; - int var7 = (var3 + 1 >> 1) + this.y; - int[][] var8 = Tiles.Tiles_heights[this.plane]; - 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); + int var4 = (var2 >> 1) + this.x; + int var5 = (var2 + 1 >> 1) + this.x; + int var6 = (var3 >> 1) + this.y; + int var7 = (var3 + 1 >> 1) + this.y; + int[][] var8 = Tiles.Tiles_heights[this.plane]; + int var9 = var8[var5][var6] + var8[var4][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("w") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lky;ZS)V", - garbageValue = "-31468" + signature = "(Lky;Lln;I)Lln;", + garbageValue = "796089456" ) - @Export("NetCache_connect") - public static void NetCache_connect(AbstractSocket var0, boolean var1) { - if (NetCache.NetCache_socket != null) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var8) { - } - - NetCache.NetCache_socket = null; + @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); } - NetCache.NetCache_socket = var0; - Buffer var2; - if (NetCache.NetCache_socket != null) { - try { - var2 = new Buffer(4); - var2.writeByte(var1 ? 2 : 3); - var2.writeMedium(0); - NetCache.NetCache_socket.write(var2.array, 0, 4); - } catch (IOException var7) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var6) { - } - - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; + 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); } - NetCache.NetCache_responseHeaderBuffer.offset = 0; - class226.NetCache_currentResponse = null; - VarpDefinition.NetCache_responseArchiveBuffer = null; - NetCache.field3175 = 0; - - while (true) { - NetFileRequest var9 = (NetFileRequest) NetCache.NetCache_pendingPriorityResponses.first(); - if (var9 == null) { - break; - } - NetCache.NetCache_pendingPriorityWrites.put(var9, var9.key); - ++NetCache.NetCache_pendingPriorityWritesCount; - --NetCache.NetCache_pendingPriorityResponsesCount; - } - - while (true) { - NetFileRequest var9 = (NetFileRequest) NetCache.NetCache_pendingResponses.first(); - if (var9 == null) { - break; - } - NetCache.NetCache_pendingWritesQueue.addLast(var9); - NetCache.NetCache_pendingWrites.put(var9, var9.key); - ++NetCache.NetCache_pendingWritesCount; - --NetCache.NetCache_pendingResponsesCount; - } - - if (NetCache.field3181 != 0) { - try { - var2 = new Buffer(4); - var2.writeByte(4); - var2.writeByte(NetCache.field3181); - var2.writeShort(0); - NetCache.NetCache_socket.write(var2.array, 0, 4); - } catch (IOException var5) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var4) { - } - - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; - } - } - NetCache.NetCache_loadTime = 0; - NetCache.NetCache_timeMs = DirectByteArrayCopier.currentTimeMs(); + return var1; } - @ObfuscatedName("l") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Lbw;Lbw;IZB)I", - garbageValue = "24" + signature = "(I)V", + garbageValue = "-513328656" ) - @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; + static void method2153() { + if (Login.field1146) { + Login.titleboxSprite = null; + Login.titlebuttonSprite = null; + ItemDefinition.runesSprite = null; + Login.leftTitleSprite = null; + Login.rightTitleSprite = null; + class51.logoSprite = null; + BoundaryObject.title_muteSprite = null; + Login.options_buttons_0Sprite = null; + Login.options_buttons_2Sprite = null; + SoundCache.worldSelectBackSprites = null; + class1.worldSelectFlagSprites = null; + Decimator.worldSelectArrows = null; + NetFileRequest.worldSelectStars = null; + class195.field2368 = null; + Bounds.loginScreenRunesAnimation.method1731(); + DevicePcmPlayerProvider.method793(2); + NPC.method1977(true); + Login.field1146 = false; } - if (var2 == 2) { - return var0.location - var1.location; - } - if (var2 == 3) { - if (var0.activity.equals("-")) { - if (var1.activity.equals("-")) { - return 0; - } - return var3 ? -1 : 1; - } - if (var1.activity.equals("-")) { - return var3 ? 1 : -1; - } - return var0.activity.compareTo(var1.activity); - } - if (var2 == 4) { - return var0.method1698() ? (var1.method1698() ? 0 : 1) : (var1.method1698() ? -1 : 0); - } - if (var2 == 5) { - return var0.method1682() ? (var1.method1682() ? 0 : 1) : (var1.method1682() ? -1 : 0); - } - if (var2 == 6) { - return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0); - } - if (var2 == 7) { - return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0); - } - return var0.id - var1.id; } - @ObfuscatedName("b") + @ObfuscatedName("jz") @ObfuscatedSignature( - signature = "(I)Lbw;", - garbageValue = "-1381660129" + signature = "(Lhp;Liu;IIZB)V", + garbageValue = "41" ) - @Export("worldListStart") - static World worldListStart() { - World.World_listCount = 0; - return Canvas.getNextWorldListWorld(); + @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) { + NetCache.insertMenuItem(var7, class16.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); + } + } } diff --git a/runescape-client/src/main/java/Entity.java b/runescape-client/src/main/java/Entity.java index ccf5701de4..290ffd54a5 100644 --- a/runescape-client/src/main/java/Entity.java +++ b/runescape-client/src/main/java/Entity.java @@ -3,24 +3,14 @@ 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("eo") +@ObfuscatedName("en") @Implements("Entity") public abstract class Entity extends DualNode { - @ObfuscatedName("ev") - @ObfuscatedSignature( - signature = "Liu;" - ) - @Export("archive20") - static Archive archive20; - @ObfuscatedName("fz") + @ObfuscatedName("cn") @ObfuscatedGetter( - longValue = -4807383784337722267L - ) - static long field1872; - @ObfuscatedName("cb") - @ObfuscatedGetter( - intValue = -1527077961 + intValue = 747190067 ) @Export("height") public int height; @@ -29,17 +19,17 @@ public abstract class Entity extends DualNode { this.height = 1000; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)Ldm;", - garbageValue = "759381421" + signature = "(I)Ldo;", + garbageValue = "-419920513" ) @Export("getModel") protected Model getModel() { return null; } - @ObfuscatedName("ct") + @ObfuscatedName("cm") @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(); @@ -50,27 +40,62 @@ public abstract class Entity extends DualNode { } - @ObfuscatedName("hn") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V", - garbageValue = "-224975698" + signature = "([BZB)Ljava/lang/Object;", + garbageValue = "42" ) - @Export("insertMenuItem") - static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) { - if (Client.isMenuOpen) { - return; + public static Object method3209(byte[] var0, boolean var1) { + if (var0 == null) { + return null; + } else if (var0.length > 136) { + DirectByteArrayCopier var2 = new DirectByteArrayCopier(); + var2.set(var0); + return var2; + } else { + return var0; } - if (Client.menuOptionsCount >= 500) { - return; - } - 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; + } + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(DDII)[D", + garbageValue = "-361048020" + ) + public static double[] method3211(double var0, double var2, int var4) { + int var5 = var4 * 2 + 1; + double[] var6 = new double[var5]; + int var7 = -var4; + + for (int var8 = 0; var7 <= var4; ++var8) { + var6[var8] = class195.method3623((double)var7, var0, var2); + ++var7; + } + + return var6; + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + signature = "(ILcr;ZI)I", + garbageValue = "-1173626349" + ) + static int method3210(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.LOGOUT) { + Client.logoutTimer = 250; + return 1; + } else { + return 2; + } + } + + @ObfuscatedName("gd") + @ObfuscatedSignature( + signature = "(Lbu;II)V", + garbageValue = "558636836" + ) + @Export("getActorScreenLocation") + static final void getActorScreenLocation(Actor var0, int var1) { + WorldMapAreaData.worldToScreen(var0.x, var0.y, var1); } } diff --git a/runescape-client/src/main/java/EnumDefinition.java b/runescape-client/src/main/java/EnumDefinition.java index ff21f7a4ea..dff70f1d8f 100644 --- a/runescape-client/src/main/java/EnumDefinition.java +++ b/runescape-client/src/main/java/EnumDefinition.java @@ -3,56 +3,50 @@ 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("iv") +@ObfuscatedName("ir") @Implements("EnumDefinition") public class EnumDefinition extends DualNode { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("EnumDefinition_archive") public static AbstractArchive EnumDefinition_archive; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lep;" ) @Export("EnumDefinition_cached") static EvictingDualNodeHashTable EnumDefinition_cached; - @ObfuscatedName("ez") - @ObfuscatedGetter( - intValue = -1722936721 - ) - static int field3324; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("inputType") public char inputType; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("outputType") public char outputType; - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1879425987 + intValue = -1123521351 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1202748617 + intValue = 1569400369 ) @Export("outputCount") public int outputCount; - @ObfuscatedName("i") + @ObfuscatedName("q") @Export("keys") public int[] keys; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("intVals") public int[] intVals; - @ObfuscatedName("f") + @ObfuscatedName("d") @Export("strVals") public String[] strVals; @@ -65,10 +59,10 @@ public class EnumDefinition extends DualNode { this.outputCount = 0; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkf;B)V", - garbageValue = "49" + signature = "(Lky;I)V", + garbageValue = "-339661207" ) @Export("decode") void decode(Buffer var1) { @@ -82,10 +76,10 @@ public class EnumDefinition extends DualNode { } } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkf;IB)V", - garbageValue = "19" + signature = "(Lky;II)V", + garbageValue = "-1462723166" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -122,198 +116,13 @@ public class EnumDefinition extends DualNode { } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "-54" + garbageValue = "0" ) @Export("size") public int size() { return this.outputCount; } - - @ObfuscatedName("q") - @Export("sleepMillis") - public static final void sleepMillis(long var0) { - if (var0 <= 0L) { - return; - } - if (0L != var0 % 10L) { - try { - Thread.sleep(var0); - } catch (InterruptedException var6) { - } - return; - } - long var2 = var0 - 1L; - - try { - Thread.sleep(var2); - } catch (InterruptedException var8) { - } - - try { - Thread.sleep(1L); - } catch (InterruptedException var7) { - } - - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - signature = "(ILcx;ZI)I", - garbageValue = "-2052329100" - ) - static int method4532(int var0, Script var1, boolean var2) { - int var3; - int var4; - if (var0 == ScriptOpcodes.ADD) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var4 + var3; - return 1; - } - if (var0 == ScriptOpcodes.SUB) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 - var4; - return 1; - } - if (var0 == ScriptOpcodes.MULTIPLY) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 * var4; - return 1; - } - if (var0 == ScriptOpcodes.DIV) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 / var4; - return 1; - } - if (var0 == ScriptOpcodes.RANDOM) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); - return 1; - } - if (var0 == ScriptOpcodes.RANDOMINC) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); - return 1; - } - if (var0 == ScriptOpcodes.INTERPOLATE) { - HealthBarUpdate.Interpreter_intStackSize -= 5; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - int var5 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2]; - int var6 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 3]; - int var7 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 4]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5); - return 1; - } - if (var0 == ScriptOpcodes.ADDPERCENT) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 + var4 * var3 / 100; - return 1; - } - if (var0 == ScriptOpcodes.SETBIT) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 | 1 << var4; - return 1; - } - if (var0 == ScriptOpcodes.CLEARBIT) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); - return 1; - } - if (var0 == ScriptOpcodes.TESTBIT) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; - return 1; - } - if (var0 == ScriptOpcodes.MOD) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 % var4; - return 1; - } - if (var0 == ScriptOpcodes.POW) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - if (var3 == 0) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); - } - - return 1; - } - if (var0 == ScriptOpcodes.INVPOW) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - if (var3 == 0) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - return 1; - } - switch(var4) { - case 0: - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; - break; - case 1: - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3; - break; - case 2: - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); - break; - case 3: - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); - break; - case 4: - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); - break; - default: - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); - } - - return 1; - } - if (var0 == ScriptOpcodes.AND) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 & var4; - return 1; - } - if (var0 == ScriptOpcodes.OR) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 | var4; - return 1; - } - if (var0 == ScriptOpcodes.SCALE) { - HealthBarUpdate.Interpreter_intStackSize -= 3; - long var9 = (long)Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - long var11 = (long)Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - long var13 = (long)Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (int)(var13 * var9 / var11); - return 1; - } - return 2; - } } diff --git a/runescape-client/src/main/java/Enumerated.java b/runescape-client/src/main/java/Enumerated.java index b31363c567..9da47f1a73 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("go") +@ObfuscatedName("gn") @Implements("Enumerated") public interface Enumerated { - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "320353268" + signature = "(B)I", + garbageValue = "-32" ) @Export("rsOrdinal") int rsOrdinal(); diff --git a/runescape-client/src/main/java/EvictingDualNodeHashTable.java b/runescape-client/src/main/java/EvictingDualNodeHashTable.java index bcb22c8131..47fa85c57c 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("el") +@ObfuscatedName("ep") @Implements("EvictingDualNodeHashTable") public final class EvictingDualNodeHashTable { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lfe;" ) - DualNode field1959; - @ObfuscatedName("w") + DualNode field1935; + @ObfuscatedName("j") @Export("capacity") int capacity; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("remainingCapacity") int remainingCapacity; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lla;" + signature = "Lln;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Ljk;" + signature = "Ljm;" ) @Export("deque") IterableDualNodeQueue deque; public EvictingDualNodeHashTable(int var1) { - this.field1959 = new DualNode(); + this.field1935 = 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("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(J)Lfb;" + signature = "(J)Lfe;" ) @Export("get") public DualNode get(long var1) { @@ -57,7 +57,7 @@ public final class EvictingDualNodeHashTable { return var3; } - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("remove") public void remove(long var1) { DualNode var3 = (DualNode)this.hashTable.get(var1); @@ -69,9 +69,9 @@ public final class EvictingDualNodeHashTable { } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lfb;J)V" + signature = "(Lfe;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.field1959) { + if (var4 == this.field1935) { var4 = this.deque.removeLast(); var4.remove(); var4.removeDual(); @@ -92,12 +92,12 @@ public final class EvictingDualNodeHashTable { this.deque.add(var1); } - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("clear") public void clear() { this.deque.clear(); this.hashTable.clear(); - this.field1959 = new DualNode(); + this.field1935 = 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 df312154bf..cb32309887 100644 --- a/runescape-client/src/main/java/FaceNormal.java +++ b/runescape-client/src/main/java/FaceNormal.java @@ -4,26 +4,27 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("en") +@ObfuscatedName("ei") @Implements("FaceNormal") public class FaceNormal { - @ObfuscatedName("v") - static int[][][] field1887; - @ObfuscatedName("q") + @ObfuscatedName("x") + @Export("ByteArrayPool_arrays") + public static byte[][][] ByteArrayPool_arrays; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 2130535467 + intValue = 672881507 ) @Export("x") int x; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 522108407 + intValue = -1754026933 ) @Export("y") int y; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1566565487 + intValue = -2141931209 ) @Export("z") int z; @@ -31,190 +32,75 @@ public class FaceNormal { FaceNormal() { } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(I)[Ljj;", - garbageValue = "1137342160" + signature = "(CB)Z", + garbageValue = "-36" ) - @Export("ClientParameter_values") - public static ClientParameter[] ClientParameter_values() { - return new ClientParameter[]{ClientParameter.field3593, ClientParameter.field3589, ClientParameter.field3594, ClientParameter.field3591, ClientParameter.field3600, ClientParameter.field3599, ClientParameter.field3592, ClientParameter.field3595, ClientParameter.field3585, ClientParameter.field3587, ClientParameter.field3582, ClientParameter.field3586, ClientParameter.field3581, ClientParameter.field3598, ClientParameter.field3590, ClientParameter.field3588, ClientParameter.field3584, ClientParameter.field3596, ClientParameter.field3583}; + static final boolean method3222(char var0) { + return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-'; } - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lhp;Lhp;B)V", - garbageValue = "-92" + signature = "(Ljava/lang/CharSequence;B)Ljava/lang/String;", + garbageValue = "1" ) - @Export("NpcDefinition_setArchives") - public static void NpcDefinition_setArchives(AbstractArchive var0, AbstractArchive var1) { - NPCDefinition.NpcDefinition_archive = var0; - NPCDefinition.NpcDefinition_modelArchive = var1; - } + @Export("base37Decode") + public static String base37Decode(CharSequence var0) { + long var3 = 0L; + int var5 = var0.length(); - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "-545171198" - ) - static void method3266(boolean var0) { - Login.Login_response1 = ""; - Login.Login_response2 = "Enter your username/email & password."; - Login.Login_response3 = ""; - Login.loginIndex = 2; - if (var0) { - Login.Login_password = ""; + for (int var6 = 0; var6 < var5; ++var6) { + var3 *= 37L; + char var7 = var0.charAt(var6); + if (var7 >= 'A' && var7 <= 'Z') { + var3 += (long)(var7 + 1 - 65); + } else if (var7 >= 'a' && var7 <= 'z') { + var3 += (long)(var7 + 1 - 97); + } else if (var7 >= '0' && var7 <= '9') { + var3 += (long)(var7 + 27 - 48); + } + + if (var3 >= 177917621779460413L) { + break; + } } - class49.method815(); - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { - Login.currentLoginField = 1; + while (0L == var3 % 37L && var3 != 0L) { + var3 /= 37L; + } + + String var8 = class266.base37DecodeLong(var3); + if (var8 == null) { + var8 = ""; + } + + return var8; + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(IB)I", + garbageValue = "105" + ) + @Export("Messages_getNextChatID") + static int Messages_getNextChatID(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); + if (var1 == null) { + return -1; } else { - Login.currentLoginField = 0; + return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; } - } - @ObfuscatedName("eh") + @ObfuscatedName("kb") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1702335616" + garbageValue = "1280047556" ) - static void method3264() { - Client.mouseLastLastPressedTimeMillis = 1L; - class40.mouseRecorder.index = 0; - class267.hasFocus = true; - Client.hadFocus = true; - Client.field879 = -1L; - class192.initReflectionChecksDeque(); - Client.packetWriter.clearBuffer(); - Client.packetWriter.packetBuffer.offset = 0; - Client.packetWriter.serverPacket = null; - Client.packetWriter.field1309 = null; - Client.packetWriter.field1321 = null; - Client.packetWriter.field1317 = null; - Client.packetWriter.serverPacketLength = 0; - Client.packetWriter.field1318 = 0; - Client.rebootTimer = 0; - Client.logoutTimer = 0; - Client.hintArrowType = 0; - Strings.resetMenuEntries(); - MouseHandler.MouseHandler_idleCycles = 0; - Messages.Messages_channels.clear(); - Messages.Messages_hashTable.clear(); - Messages.Messages_queue.clear(); - Messages.Messages_count = 0; - Client.isItemSelected = 0; - Client.isSpellSelected = false; - Client.soundEffectCount = 0; - Client.camAngleY = 0; - Client.oculusOrbState = 0; - PendingSpawn.field944 = null; - Client.minimapState = 0; - Client.field747 = -1; - Client.destinationX = 0; - Client.destinationY = 0; - Client.playerAttackOption = AttackOption.AttackOption_hidden; - Client.npcAttackOption = AttackOption.AttackOption_hidden; - Client.npcCount = 0; - Players.Players_count = 0; - - int var0; - for (var0 = 0; var0 < 2048; ++var0) { - Players.field1254[var0] = null; - Players.field1250[var0] = 1; - } - - 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(); - - int var2; - for (var0 = 0; var0 < 4; ++var0) { - for (int var1 = 0; var1 < 104; ++var1) { - for (var2 = 0; var2 < 104; ++var2) { - Client.groundItems[var0][var1][var2] = null; - } - } - } - - Client.pendingSpawns = new NodeDeque(); - ArchiveLoader.friendSystem.clear(); - - for (var0 = 0; var0 < VarpDefinition.VarpDefinition_fileCount; ++var0) { - VarpDefinition var3 = GrandExchangeOfferWorldComparator.method61(var0); - if (var3 != null) { - Varps.Varps_temp[var0] = 0; - Varps.Varps_main[var0] = 0; - } - } - - Clock.varcs.clearTransient(); - Client.followerIndex = -1; - if (Client.rootInterface != -1) { - var0 = Client.rootInterface; - if (var0 != -1 && ViewportMouse.Widget_loadedInterfaces[var0]) { - Widget.Widget_archive.clearFilesGroup(var0); - if (Widget.Widget_interfaceComponents[var0] != null) { - boolean var5 = true; - - for (var2 = 0; var2 < Widget.Widget_interfaceComponents[var0].length; ++var2) { - if (Widget.Widget_interfaceComponents[var0][var2] == null) { - continue; - } - if (Widget.Widget_interfaceComponents[var0][var2].type != 2) { - Widget.Widget_interfaceComponents[var0][var2] = null; - } else { - var5 = false; - } - } - - if (var5) { - Widget.Widget_interfaceComponents[var0] = null; - } - - ViewportMouse.Widget_loadedInterfaces[var0] = false; - } - } - } - - for (InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.first(); var4 != null; var4 = (InterfaceParent)Client.interfaceParents.next()) { - class197.closeInterface(var4, true); - } - - Client.rootInterface = -1; - Client.interfaceParents = new NodeHashTable(8); - Client.meslayerContinueWidget = null; - Strings.resetMenuEntries(); - 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; - } - - ItemContainer.itemContainers = new NodeHashTable(32); - Client.isLoading = true; - - for (var0 = 0; var0 < 100; ++var0) { - Client.field843[var0] = true; - } - - HealthBarUpdate.method1677(); - DevicePcmPlayerProvider.clanChat = null; - - for (var0 = 0; var0 < 8; ++var0) { - Client.grandExchangeOffers[var0] = new GrandExchangeOffer(); - } - - PendingSpawn.grandExchangeEvents = null; + static final void method3221() { + Client.field817 = Client.cycleCntr; + class13.ClanChat_inClanChat = true; } } diff --git a/runescape-client/src/main/java/FileSystem.java b/runescape-client/src/main/java/FileSystem.java index 8e15326563..8d48368da5 100644 --- a/runescape-client/src/main/java/FileSystem.java +++ b/runescape-client/src/main/java/FileSystem.java @@ -4,80 +4,78 @@ 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("fy") +@ObfuscatedName("fj") @Implements("FileSystem") public class FileSystem { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("FileSystem_hasPermissions") - static boolean FileSystem_hasPermissions; - @ObfuscatedName("w") + public static boolean FileSystem_hasPermissions; + @ObfuscatedName("j") @Export("FileSystem_cacheDir") - static File FileSystem_cacheDir; - @ObfuscatedName("e") + public static File FileSystem_cacheDir; + @ObfuscatedName("i") @Export("FileSystem_cacheFiles") static Hashtable FileSystem_cacheFiles; - @ObfuscatedName("l") - @Export("PcmPlayer_stereo") - protected static boolean PcmPlayer_stereo; - @ObfuscatedName("fj") - @ObfuscatedSignature( - signature = "Lku;" - ) - @Export("WorldMapElement_fonts") - static Fonts WorldMapElement_fonts; - @ObfuscatedName("fu") - @ObfuscatedSignature( - signature = "Lke;" - ) - @Export("fontPlain12") - static Font fontPlain12; static { FileSystem_hasPermissions = false; FileSystem_cacheFiles = new Hashtable(16); } - @ObfuscatedName("e") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lhp;IIIZI)V", - garbageValue = "1090882543" + signature = "(II)Lip;", + garbageValue = "-760710815" ) - public static void method3503(AbstractArchive var0, int group, int file, int bitRateMaybe, boolean _false) { - class197.field2402 = 1; - GrandExchangeOfferNameComparator.musicTrackArchive = var0; - class197.musicTrackGroupId = group; - class197.musicTrackFileId = file; - ScriptFrame.field529 = bitRateMaybe; - BuddyRankComparator.musicTrackBoolean = _false; - class197.field2404 = 10000; - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "(ILcx;ZI)I", - garbageValue = "-786180451" - ) - static int method3501(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? Interpreter.field1111 : Calendar.field2507; - if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.itemId; - return 1; - } - if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { - if (var3.itemId != -1) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.itemQuantity; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + public static VarcInt method3447(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.method4314(new Buffer(var2)); } - return 1; + VarcInt.VarcInt_cached.put(var1, (long)var0); + return var1; } - if (var0 == ScriptOpcodes.CC_GETID) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.childIndex; - return 1; + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(IIB)Lbi;", + garbageValue = "17" + ) + @Export("Messages_getByChannelAndID") + static Message Messages_getByChannelAndID(int var0, int var1) { + ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); + return var2.getMessage(var1); + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "(Lhz;Lhz;III)Lkb;", + garbageValue = "1068587353" + ) + @Export("SpriteBuffer_getFont") + public static Font SpriteBuffer_getFont(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { + if (!World.SpriteBuffer_bufferFile(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, class325.SpriteBuffer_xOffsets, class325.SpriteBuffer_yOffsets, class325.SpriteBuffer_spriteWidths, class225.SpriteBuffer_spriteHeights, class325.SpriteBuffer_spritePalette, WorldMapSection1.SpriteBuffer_pixels); + UserComparator7.SpriteBuffer_clear(); + var4 = var6; + } + + return var4; } - return 2; } } diff --git a/runescape-client/src/main/java/FillMode.java b/runescape-client/src/main/java/FillMode.java index 2f65f8e546..fb0dbddf99 100644 --- a/runescape-client/src/main/java/FillMode.java +++ b/runescape-client/src/main/java/FillMode.java @@ -4,42 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ll") +@ObfuscatedName("lb") @Implements("FillMode") public enum FillMode implements Enumerated { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lll;" + signature = "Llb;" ) @Export("SOLID") SOLID(0, 0), - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lll;" + signature = "Llb;" ) - @Export("GRADIENT") - GRADIENT(1, 1), - @ObfuscatedName("e") + field3858(1, 1), + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lll;" + signature = "Llb;" ) - @Export("GRADIENTALPHA") - GRADIENTALPHA(2, 2); + field3860(2, 2); - @ObfuscatedName("ex") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1628488091 - ) - static int field3884; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 215627811 + intValue = -375665689 ) @Export("value") public final int value; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 198667019 + intValue = -839626013 ) @Export("id") final int id; @@ -49,10 +42,10 @@ public enum FillMode implements Enumerated { this.id = var4; } - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "320353268" + signature = "(B)I", + garbageValue = "-32" ) @Export("rsOrdinal") public int rsOrdinal() { diff --git a/runescape-client/src/main/java/FloorDecoration.java b/runescape-client/src/main/java/FloorDecoration.java index 8a1db386b0..ec25111bcd 100644 --- a/runescape-client/src/main/java/FloorDecoration.java +++ b/runescape-client/src/main/java/FloorDecoration.java @@ -1,50 +1,58 @@ -import java.io.BufferedReader; import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringReader; -import java.io.StringWriter; 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("dq") +@ObfuscatedName("dy") @Implements("FloorDecoration") public final class FloorDecoration { - @ObfuscatedName("q") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -311515591 + intValue = -513074151 + ) + @Export("PcmPlayer_count") + static int PcmPlayer_count; + @ObfuscatedName("ec") + @ObfuscatedGetter( + intValue = -1042709879 + ) + @Export("port2") + static int port2; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 577791457 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1344271777 + intValue = 2080109751 ) @Export("x") int x; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -779439179 + intValue = 748443287 ) @Export("y") int y; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Leo;" + signature = "Len;" ) @Export("entity") public Entity entity; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - longValue = -3653968665269180135L + longValue = 6356128824356996537L ) @Export("tag") public long tag; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1094759427 + intValue = -1037477129 ) @Export("flags") int flags; @@ -52,70 +60,135 @@ public final class FloorDecoration { FloorDecoration() { } - @ObfuscatedName("w") + @ObfuscatedName("er") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "3762" + signature = "(II)V", + garbageValue = "-1136881308" ) - @Export("KeyHandler_exit") - public static void KeyHandler_exit() { - if (KeyHandler.KeyHandler_instance != null) { - synchronized(KeyHandler.KeyHandler_instance) { - KeyHandler.KeyHandler_instance = null; + @Export("updateGameState") + static void updateGameState(int var0) { + if (var0 != Client.gameState) { + if (Client.gameState == 0) { + WorldMapID.client.method891(); + } + + if (var0 == 20 || var0 == 40 || var0 == 45) { + Client.loginState = 0; + Client.field658 = 0; + Client.field659 = 0; + Client.timer.method4899(var0); + if (var0 != 20) { + WorldMapArea.method358(false); + } + } + + if (var0 != 20 && var0 != 40 && Bounds.field3845 != null) { + Bounds.field3845.close(); + Bounds.field3845 = null; + } + + if (Client.gameState == 25) { + Client.field719 = 0; + Client.field676 = 0; + Client.field886 = 1; + Client.field678 = 0; + Client.field718 = 1; + } + + if (var0 != 5 && var0 != 10) { + if (var0 == 20) { + BoundaryObject.method3213(GameObject.archive10, class2.archive8, true, Client.gameState == 11 ? 4 : 0); + } else if (var0 == 11) { + BoundaryObject.method3213(GameObject.archive10, class2.archive8, false, 4); + } else { + DynamicObject.method2153(); + } + } else { + BoundaryObject.method3213(GameObject.archive10, class2.archive8, true, 0); + } + + Client.gameState = var0; + } + } + + @ObfuscatedName("hd") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1412444391" + ) + static final void method2788() { + for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var0.hitpoints > 0) { + --var0.hitpoints; + } + + if (var0.hitpoints == 0) { + if (var0.objectId < 0 || WorldMapSprite.method404(var0.objectId, var0.field903)) { + Script.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.objectId, var0.field907, var0.field903); + var0.remove(); + } + } else { + if (var0.delay > 0) { + --var0.delay; + } + + if (var0.delay == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102 && (var0.id < 0 || WorldMapSprite.method404(var0.id, var0.field911))) { + Script.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field911); + var0.delay = -1; + if (var0.id == var0.objectId && var0.objectId == -1) { + var0.remove(); + } else if (var0.id == var0.objectId && var0.orientation == var0.field907 && var0.field903 == var0.field911) { + var0.remove(); + } + } } } } - @ObfuscatedName("e") + @ObfuscatedName("hq") @ObfuscatedSignature( - signature = "(Ljava/lang/Throwable;B)Ljava/lang/String;", - garbageValue = "1" + signature = "(IIIII)V", + garbageValue = "507499403" ) - @Export("shortenStackTrace") - static String shortenStackTrace(Throwable var0) throws IOException { - String var1; - if (var0 instanceof RunException) { - RunException var2 = (RunException)var0; - var1 = var2.message + " | "; - var0 = var2.throwable; + static final void method2786(int var0, int var1, int var2, int var3) { + for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { + if (Client.rootWidgetXs[var4] + Client.rootWidgetWidths[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetHeights[var4] + Client.rootWidgetYs[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { + Client.field703[var4] = true; + } + } + + } + + @ObfuscatedName("kh") + @ObfuscatedSignature( + signature = "(Lky;I)V", + garbageValue = "183516662" + ) + static void method2787(Buffer var0) { + if (Client.randomDatData != null) { + var0.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); } else { - var1 = ""; - } + byte[] var2 = new byte[24]; - 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(); + try { + JagexCache.JagexCache_randomDat.seek(0L); + JagexCache.JagexCache_randomDat.readFully(var2); - while (true) { - String var7 = var5.readLine(); - if (var7 == null) { - break; - } - - 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; + int var3; + for (var3 = 0; var3 < 24 && var2[var3] == 0; ++var3) { } - 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 + ' '; - } - var1 = var1 + "| " + var6; - return var1; + if (var3 >= 24) { + throw new IOException(); + } + } catch (Exception var6) { + for (int var4 = 0; var4 < 24; ++var4) { + var2[var4] = -1; + } + } + + var0.writeBytes(var2, 0, var2.length); + } } } diff --git a/runescape-client/src/main/java/FloorOverlayDefinition.java b/runescape-client/src/main/java/FloorOverlayDefinition.java index 55241b9548..092460a659 100644 --- a/runescape-client/src/main/java/FloorOverlayDefinition.java +++ b/runescape-client/src/main/java/FloorOverlayDefinition.java @@ -4,81 +4,75 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("it") +@ObfuscatedName("iv") @Implements("FloorOverlayDefinition") public class FloorOverlayDefinition extends DualNode { - @ObfuscatedName("sh") - @ObfuscatedGetter( - intValue = -739683293 - ) - @Export("foundItemIdCount") - static int foundItemIdCount; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("FloorOverlayDefinition_archive") public static AbstractArchive FloorOverlayDefinition_archive; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lep;" ) @Export("FloorOverlayDefinition_cached") public static EvictingDualNodeHashTable FloorOverlayDefinition_cached; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1387781245 + intValue = 1186285675 ) @Export("primaryRgb") public int primaryRgb; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -138481691 + intValue = 1987325665 ) @Export("texture") public int texture; - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("hideUnderlay") public boolean hideUnderlay; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1829885045 + intValue = -375374105 ) @Export("secondaryRgb") public int secondaryRgb; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1785369295 + intValue = 1926193945 ) @Export("hue") public int hue; - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 844527765 + intValue = -1588177313 ) @Export("saturation") public int saturation; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -649539923 + intValue = -1646509357 ) @Export("lightness") public int lightness; - @ObfuscatedName("f") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1982106487 + intValue = -1281479925 ) @Export("secondaryHue") public int secondaryHue; - @ObfuscatedName("m") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -241902903 + intValue = 1612990267 ) @Export("secondarySaturation") public int secondarySaturation; - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -2090498171 + intValue = -520563245 ) @Export("secondaryLightness") public int secondaryLightness; @@ -94,10 +88,10 @@ public class FloorOverlayDefinition extends DualNode { this.secondaryRgb = -1; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-866326245" + signature = "(B)V", + garbageValue = "-32" ) @Export("postDecode") public void postDecode() { @@ -111,10 +105,10 @@ public class FloorOverlayDefinition extends DualNode { this.setHsl(this.primaryRgb); } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkf;IB)V", - garbageValue = "-93" + signature = "(Lky;II)V", + garbageValue = "-1938903864" ) @Export("decode") public void decode(Buffer var1, int var2) { @@ -128,10 +122,10 @@ public class FloorOverlayDefinition extends DualNode { } } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkf;IIB)V", - garbageValue = "0" + signature = "(Lky;III)V", + garbageValue = "-1583990473" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { @@ -148,10 +142,10 @@ public class FloorOverlayDefinition extends DualNode { } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-1232631755" + garbageValue = "923759114" ) @Export("setHsl") void setHsl(int var1) { @@ -179,28 +173,28 @@ public class FloorOverlayDefinition extends DualNode { double var12 = 0.0D; double var14 = 0.0D; double var16 = (var10 + var8) / 2.0D; - if (var8 != var10) { + if (var10 != var8) { if (var16 < 0.5D) { - var14 = (var10 - var8) / (var8 + var10); + var14 = (var10 - var8) / (var10 + var8); } if (var16 >= 0.5D) { var14 = (var10 - var8) / (2.0D - var10 - var8); } - if (var2 == var10) { + if (var10 == var2) { var12 = (var4 - var6) / (var10 - var8); - } else if (var10 == var4) { + } else if (var4 == var10) { var12 = (var6 - var2) / (var10 - var8) + 2.0D; - } else if (var10 == var6) { - var12 = 4.0D + (var2 - var4) / (var10 - var8); + } else if (var6 == var10) { + var12 = (var2 - var4) / (var10 - var8) + 4.0D; } } var12 /= 6.0D; this.hue = (int)(256.0D * var12); - this.saturation = (int)(256.0D * var14); - this.lightness = (int)(256.0D * var16); + this.saturation = (int)(var14 * 256.0D); + this.lightness = (int)(var16 * 256.0D); if (this.saturation < 0) { this.saturation = 0; } else if (this.saturation > 255) { @@ -214,58 +208,4 @@ public class FloorOverlayDefinition extends DualNode { } } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(Lhj;I[B[BI)V", - garbageValue = "610677249" - ) - @Export("Widget_setKey") - static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { - if (var0.field2650 == null) { - if (var2 == null) { - return; - } - - var0.field2650 = new byte[11][]; - var0.field2625 = new byte[11][]; - var0.field2641 = new int[11]; - var0.field2588 = new int[11]; - } - - var0.field2650[var1] = var2; - if (var2 != null) { - var0.field2704 = true; - } else { - var0.field2704 = false; - - for (int var4 = 0; var4 < var0.field2650.length; ++var4) { - if (var0.field2650[var4] != null) { - var0.field2704 = true; - break; - } - } - } - - var0.field2625[var1] = var3; - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(IIIB)I", - garbageValue = "127" - ) - static final int method4757(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 = TileItemPile.method2765(var3, var5); - int var8 = TileItemPile.method2765(var3 + 1, var5); - int var9 = TileItemPile.method2765(var3, var5 + 1); - int var10 = TileItemPile.method2765(var3 + 1, var5 + 1); - int var11 = class4.method49(var7, var8, var4, var2); - int var12 = class4.method49(var9, var10, var4, var2); - return class4.method49(var11, var12, var6, var2); - } } diff --git a/runescape-client/src/main/java/FloorUnderlayDefinition.java b/runescape-client/src/main/java/FloorUnderlayDefinition.java index 6258939616..da81111c04 100644 --- a/runescape-client/src/main/java/FloorUnderlayDefinition.java +++ b/runescape-client/src/main/java/FloorUnderlayDefinition.java @@ -3,50 +3,49 @@ 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("ic") +@ObfuscatedName("ie") @Implements("FloorUnderlayDefinition") public class FloorUnderlayDefinition extends DualNode { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("FloorUnderlayDefinition_archive") - public static AbstractArchive FloorUnderlayDefinition_archive; - @ObfuscatedName("w") + static AbstractArchive FloorUnderlayDefinition_archive; + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lep;" ) @Export("FloorUnderlayDefinition_cached") public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -361069037 + intValue = 1690185973 ) @Export("rgb") int rgb; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1680352847 + intValue = -1561731435 ) @Export("hue") public int hue; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1411467289 + intValue = 56370407 ) @Export("saturation") public int saturation; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 223485885 + intValue = -1143874615 ) @Export("lightness") public int lightness; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -907654805 + intValue = -780904451 ) @Export("hueMultiplier") public int hueMultiplier; @@ -55,27 +54,27 @@ public class FloorUnderlayDefinition extends DualNode { FloorUnderlayDefinition_cached = new EvictingDualNodeHashTable(64); } - public FloorUnderlayDefinition() { + FloorUnderlayDefinition() { this.rgb = 0; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-165448710" + signature = "(B)V", + garbageValue = "38" ) @Export("postDecode") - public void postDecode() { + void postDecode() { this.setHsl(this.rgb); } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lkf;II)V", - garbageValue = "1618503924" + signature = "(Lky;IB)V", + garbageValue = "118" ) @Export("decode") - public void decode(Buffer var1, int var2) { + void decode(Buffer var1, int var2) { while (true) { int var3 = var1.readUnsignedByte(); if (var3 == 0) { @@ -86,10 +85,10 @@ public class FloorUnderlayDefinition extends DualNode { } } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Lkf;IIB)V", - garbageValue = "115" + signature = "(Lky;III)V", + garbageValue = "2131813988" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { @@ -99,10 +98,10 @@ public class FloorUnderlayDefinition extends DualNode { } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-1792138465" + garbageValue = "-28210148" ) @Export("setHsl") void setHsl(int var1) { @@ -129,28 +128,28 @@ public class FloorUnderlayDefinition extends DualNode { double var12 = 0.0D; double var14 = 0.0D; - double var16 = (var8 + var10) / 2.0D; + 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) { var14 = (var10 - var8) / (2.0D - var10 - var8); } - if (var2 == var10) { + if (var10 == var2) { var12 = (var4 - var6) / (var10 - var8); } else if (var10 == var4) { - var12 = (var6 - var2) / (var10 - var8) + 2.0D; + var12 = 2.0D + (var6 - var2) / (var10 - var8); } else if (var10 == var6) { - var12 = (var2 - var4) / (var10 - var8) + 4.0D; + var12 = 4.0D + (var2 - var4) / (var10 - var8); } } var12 /= 6.0D; this.saturation = (int)(256.0D * var14); - this.lightness = (int)(var16 * 256.0D); + this.lightness = (int)(256.0D * var16); if (this.saturation < 0) { this.saturation = 0; } else if (this.saturation > 255) { @@ -164,9 +163,9 @@ public class FloorUnderlayDefinition extends DualNode { } if (var16 > 0.5D) { - this.hueMultiplier = (int)((1.0D - var16) * var14 * 512.0D); + this.hueMultiplier = (int)(512.0D * var14 * (1.0D - var16)); } else { - this.hueMultiplier = (int)(var14 * var16 * 512.0D); + this.hueMultiplier = (int)(var16 * var14 * 512.0D); } if (this.hueMultiplier < 1) { @@ -175,38 +174,4 @@ public class FloorUnderlayDefinition extends DualNode { this.hue = (int)(var12 * (double)this.hueMultiplier); } - - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "(ILcx;ZI)I", - garbageValue = "1586535295" - ) - static int method4433(int var0, Script var1, boolean var2) { - Widget var3 = class80.getWidget(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = HealthBar.method1957(class268.getWidgetClickMask(var3)); - return 1; - } - if (var0 == ScriptOpcodes.IF_GETOP) { - int var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - --var4; - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.actions[var4]; - } else { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } - if (var0 == ScriptOpcodes.IF_GETOPBASE) { - if (var3.dataText == null) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.dataText; - } - - return 1; - } - return 2; - } } diff --git a/runescape-client/src/main/java/Font.java b/runescape-client/src/main/java/Font.java index e7a0f9fff6..9c457d9ac7 100644 --- a/runescape-client/src/main/java/Font.java +++ b/runescape-client/src/main/java/Font.java @@ -2,7 +2,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ke") +@ObfuscatedName("kb") @Implements("Font") public final class Font extends AbstractFont { public Font(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) { @@ -13,7 +13,7 @@ public final class Font extends AbstractFont { super(var1); } - @ObfuscatedName("q") + @ObfuscatedName("s") @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("w") + @ObfuscatedName("j") @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 6bdd47833f..d25ecda2ff 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -1,49 +1,72 @@ 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("kd") +@ObfuscatedName("kz") @Implements("FontName") public class FontName { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lkd;" + signature = "Lkz;" ) @Export("FontName_plain11") public static final FontName FontName_plain11; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lkd;" + signature = "Lkz;" ) @Export("FontName_plain12") public static final FontName FontName_plain12; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lkd;" + signature = "Lkz;" ) @Export("FontName_bold12") public static final FontName FontName_bold12; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lkd;" + signature = "Lkz;" ) @Export("FontName_verdana11") public static final FontName FontName_verdana11; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lkd;" + signature = "Lkz;" ) @Export("FontName_verdana13") public static final FontName FontName_verdana13; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lkd;" + signature = "Lkz;" ) @Export("FontName_verdana15") public static final FontName FontName_verdana15; - @ObfuscatedName("b") + @ObfuscatedName("q") + public static short[][] field3651; + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "Lgy;" + ) + @Export("musicTrack") + public static MusicTrack musicTrack; + @ObfuscatedName("h") + @Export("userHomeDirectory") + public static String userHomeDirectory; + @ObfuscatedName("bz") + @ObfuscatedSignature( + signature = "Llu;" + ) + @Export("loginType") + static LoginType loginType; + @ObfuscatedName("ix") + @ObfuscatedGetter( + intValue = -1325782569 + ) + @Export("selectedItemWidget") + static int selectedItemWidget; + @ObfuscatedName("t") @Export("name") String name; @@ -60,790 +83,65 @@ public class FontName { this.name = var1; } + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(B)Z", + garbageValue = "-11" + ) + @Export("isKeyDown") + public static final boolean isKeyDown() { + synchronized(KeyHandler.KeyHandler_instance) { + if (KeyHandler.field385 == KeyHandler.field383) { + return false; + } else { + ReflectionCheck.field1307 = KeyHandler.field376[KeyHandler.field385]; + SpriteMask.field2499 = KeyHandler.field377[KeyHandler.field385]; + KeyHandler.field385 = KeyHandler.field385 + 1 & 127; + return true; + } + } + } + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "(Lhp;IIII)V", + garbageValue = "452430417" + ) + @Export("Widget_setKeyRate") + static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { + if (var0.field2623 == null) { + throw new RuntimeException(); + } else { + var0.field2623[var1] = var2; + var0.field2581[var1] = var3; + } + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(CII)Ljava/lang/String;", + garbageValue = "993620587" + ) + static String method5230(char var0, int var1) { + char[] var2 = new char[var1]; + + for (int var3 = 0; var3 < var1; ++var3) { + var2[var3] = var0; + } + + return new String(var2); + } + + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-201583329" + garbageValue = "-1040867769" ) - public static void method5317() { - ItemDefinition.ItemDefinition_cachedSprites.clear(); - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - signature = "(ILcx;ZI)I", - garbageValue = "-225592066" - ) - static int method5316(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.OC_NAME) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = WorldMapArea.ItemDefinition_get(var3).name; - return 1; - } - int var4; - ItemDefinition var5; - if (var0 == ScriptOpcodes.OC_OP) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - var5 = WorldMapArea.ItemDefinition_get(var3); - if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } - if (var0 == ScriptOpcodes.OC_IOP) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - var5 = WorldMapArea.ItemDefinition_get(var3); - if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } - if (var0 == ScriptOpcodes.OC_COST) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapArea.ItemDefinition_get(var3).price; - return 1; - } - if (var0 == ScriptOpcodes.OC_STACKABLE) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapArea.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; - return 1; - } - ItemDefinition var6; - if (var0 == ScriptOpcodes.OC_CERT) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var6 = WorldMapArea.ItemDefinition_get(var3); - if (var6.noteTemplate == -1 && var6.note >= 0) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.note; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } - if (var0 == ScriptOpcodes.OC_UNCERT) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var6 = WorldMapArea.ItemDefinition_get(var3); - if (var6.noteTemplate >= 0 && var6.note >= 0) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.note; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } - if (var0 == ScriptOpcodes.OC_MEMBERS) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapArea.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; - return 1; - } - if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var6 = WorldMapArea.ItemDefinition_get(var3); - if (var6.placeholderTemplate == -1 && var6.placeholder >= 0) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.placeholder; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } - if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var6 = WorldMapArea.ItemDefinition_get(var3); - if (var6.placeholderTemplate >= 0 && var6.placeholder >= 0) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.placeholder; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } - if (var0 == ScriptOpcodes.OC_FIND) { - String var7 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - WorldMapDecoration.findItemDefinitions(var7, var4 == 1); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = FloorOverlayDefinition.foundItemIdCount; - return 1; - } - if (var0 == ScriptOpcodes.OC_FINDNEXT) { - if (WorldMapData_1.foundItemIds != null && class32.foundItemIndex < FloorOverlayDefinition.foundItemIdCount) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapData_1.foundItemIds[++class32.foundItemIndex - 1] & 0xffff; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - } - - return 1; - } - if (var0 == ScriptOpcodes.OC_FINDRESET) { - class32.foundItemIndex = 0; - return 1; - } - return 2; - } - - @ObfuscatedName("ii") - @ObfuscatedSignature( - signature = "([Lhj;IIIIIIIII)V", - garbageValue = "-414433713" - ) - @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 != 0xabcdabcd || var10 != Client.clickedWidget))) { - continue; - } - - 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 && ScriptEvent.isComponentHidden(var10)) { - continue; - } - - if (var10.contentType > 0) { - GrandExchangeOfferTotalQuantityComparator.method85(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 != 0xabcdabcd && !var10.isScrollBar) { - WorldMapIcon_1.field188 = var0; - WorldMapDecorationType.field2742 = var6; - ClientPacket.field2305 = var7; - continue; - } - - if (Client.isDraggingWidget && Client.field873) { - var15 = MouseHandler.MouseHandler_x; - var16 = MouseHandler.MouseHandler_y; - var15 -= Client.widgetClickX; - var16 -= Client.widgetClickY; - if (var15 < Client.field834) { - var15 = Client.field834; - } - - if (var15 + var10.width > Client.field834 + Client.clickedWidgetParent.width) { - var15 = Client.field834 + Client.clickedWidgetParent.width - var10.width; - } - - if (var16 < Client.field835) { - var16 = Client.field835; - } - - if (var16 + var10.height > Client.field835 + Client.clickedWidgetParent.height) { - var16 = Client.field835 + Client.clickedWidgetParent.height - var10.height; - } - - var12 = var15; - var13 = var16; - } - - if (!var10.isScrollBar) { - var14 = 128; - } - } - - int var17; - int var18; - int var19; - int var20; - int var21; - int var22; - if (var10.type == 2) { - var15 = var2; - var16 = var3; - var17 = var4; - var18 = var5; - } else if (var10.type == 9) { - var19 = var12; - var20 = var13; - var21 = var12 + var10.width; - var22 = var13 + var10.height; - if (var21 < var12) { - var19 = var21; - var21 = var12; - } - - if (var22 < var13) { - var20 = var22; - var22 = var13; - } - - ++var21; - ++var22; - var15 = var19 > var2 ? var19 : var2; - var16 = var20 > var3 ? var20 : var3; - var17 = var21 < var4 ? var21 : var4; - var18 = var22 < var5 ? var22 : var5; - } else { - var19 = var12 + var10.width; - var20 = var13 + var10.height; - var15 = var12 > var2 ? var12 : var2; - var16 = var13 > var3 ? var13 : var3; - var17 = var19 < var4 ? var19 : var4; - var18 = var20 < var5 ? var20 : var5; - } - - if (var10.isIf3 && (var15 >= var17 || var16 >= var18)) { - continue; - } - if (var10.contentType != 0) { - if (var10.contentType == 1336) { - if (Client.displayFps) { - var13 += 15; - FileSystem.fontPlain12.drawRightAligned("Fps:" + GameShell.fps, var12 + var10.width, var13, 0xffff00, -1); - var13 += 15; - Runtime var42 = Runtime.getRuntime(); - var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L); - var21 = 0xffff00; - if (var20 > 0x50000 && !Client.isLowDetail) { - var21 = 0xff0000; - } - - FileSystem.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); - var13 += 15; - } - continue; - } - - if (var10.contentType == 1337) { - Client.viewportX = var12; - Client.viewportY = var13; - class4.drawEntities(var12, var13, var10.width, var10.height); - Client.field843[var10.rootIndex] = true; - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1338) { - ArchiveLoader.drawMinimap(var10, var12, var13, var11); - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1339) { - WorldMapIcon_0.drawCompass(var10, var12, var13, var11); - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1400) { - BoundaryObject.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); - } - - if (var10.contentType == 1401) { - BoundaryObject.worldMap.drawOverview(var12, var13, var10.width, var10.height); - } - - if (var10.contentType == 1402) { - Ignored.loginScreenRunesAnimation.draw(var12, Client.cycle); - } - } - - if (var10.type == 0) { - if (!var10.isIf3 && ScriptEvent.isComponentHidden(var10) && var10 != LoginScreenAnimation.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 var30 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); - if (var30 != null) { - class191.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - } - - if (!Client.isResizable && !Client.field862[var11] && Client.gameDrawingMode <= 1) { - continue; - } - - if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { - NetFileRequest.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); - } - - if (var10.type == 1) { - continue; - } - int var23; - int var24; - int var25; - int var26; - if (var10.type == 2) { - var19 = 0; - - for (var20 = 0; var20 < var10.rawHeight; ++var20) { - for (var21 = 0; var21 < var10.rawWidth; ++var21, ++var19) { - var22 = var12 + var21 * (var10.paddingX + 32); - var23 = var13 + var20 * (var10.paddingY + 32); - if (var19 < 20) { - var22 += var10.inventoryXOffsets[var19]; - var23 += var10.inventoryYOffsets[var19]; - } - - if (var10.itemIds[var19] <= 0) { - if (var10.inventorySprites != null && var19 < 20) { - Sprite var46 = var10.getInventorySprite(var19); - if (var46 != null) { - var46.drawTransBgAt(var22, var23); - } else if (Widget.field2562) { - Strings.invalidateWidget(var10); - } - } - continue; - } - boolean var37 = false; - boolean var38 = false; - var26 = var10.itemIds[var19] - 1; - if ((var22 + 32 <= var2 || var22 >= var4 || var23 + 32 <= var3 || var23 >= var5) && (var10 != WorldMapIcon_0.dragInventoryWidget || var19 != Client.dragItemSlotSource)) { - continue; - } - Sprite var27; - if (Client.isItemSelected == 1 && var19 == WorldMapIcon_1.selectedItemSlot && var10.id == MouseRecorder.selectedItemWidget) { - var27 = WorldMapSection0.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false); - } else { - var27 = WorldMapSection0.getItemSprite(var26, var10.itemQuantities[var19], 1, 0x302020, 2, false); - } - - if (var27 == null) { - Strings.invalidateWidget(var10); - continue; - } - if (var10 == WorldMapIcon_0.dragInventoryWidget && var19 == Client.dragItemSlotSource) { - var24 = MouseHandler.MouseHandler_x - Client.field654; - var25 = MouseHandler.MouseHandler_y - Client.field763; - 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) { - continue; - } - Widget var28 = var0[var1 & 0xffff]; - int var29; - if (var23 + var25 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { - var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field718 / 3; - if (var29 > Client.field718 * 10) { - var29 = Client.field718 * 10; - } - - if (var29 > var28.scrollY) { - var29 = var28.scrollY; - } - - var28.scrollY -= var29; - Client.field763 += var29; - Strings.invalidateWidget(var28); - } - - if (var25 + var23 + 32 <= Rasterizer2D.Rasterizer2D_yClipEnd || var28.scrollY >= var28.scrollHeight - var28.height) { - continue; - } - var29 = (var25 + var23 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field718 / 3; - if (var29 > Client.field718 * 10) { - var29 = Client.field718 * 10; - } - - if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { - var29 = var28.scrollHeight - var28.height - var28.scrollY; - } - - var28.scrollY += var29; - Client.field763 -= var29; - Strings.invalidateWidget(var28); - } else if (var10 == ItemContainer.field549 && var19 == Client.field698) { - var27.drawTransAt(var22, var23, 128); - } else { - var27.drawTransBgAt(var22, var23); - } - } - } - continue; - } - if (var10.type == 3) { - if (ChatChannel.runCs1(var10)) { - var19 = var10.color2; - if (var10 == LoginScreenAnimation.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { - var19 = var10.mouseOverColor2; - } - } else { - var19 = var10.color; - if (var10 == LoginScreenAnimation.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { - var19 = 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, var19); - } else { - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); - } - } - } else if (var14 == 0) { - Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var19); - } else { - Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); - } - continue; - } - Font var39; - if (var10.type == 4) { - var39 = var10.getFont(); - if (var39 == null) { - if (Widget.field2562) { - Strings.invalidateWidget(var10); - } - continue; - } - String var44 = var10.text; - if (ChatChannel.runCs1(var10)) { - var20 = var10.color2; - if (var10 == LoginScreenAnimation.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { - var20 = var10.mouseOverColor2; - } - - if (var10.text2.length() > 0) { - var44 = var10.text2; - } - } else { - var20 = var10.color; - if (var10 == LoginScreenAnimation.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { - var20 = var10.mouseOverColor; - } - } - - if (var10.isIf3 && var10.itemId != -1) { - ItemDefinition var45 = WorldMapArea.ItemDefinition_get(var10.itemId); - var44 = var45.name; - if (var44 == null) { - var44 = "null"; - } - - if ((var45.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { - var44 = ClientPreferences.colorStartTag(0xff9040) + var44 + "" + " " + 'x' + class188.formatItemStacks(var10.itemQuantity); - } - } - - if (var10 == Client.meslayerContinueWidget) { - var44 = "Please wait..."; - var20 = var10.color; - } - - if (!var10.isIf3) { - var44 = GrandExchangeOfferTotalQuantityComparator.method92(var44, var10); - } - - var39.drawLines(var44, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); - continue; - } - if (var10.type == 5) { - Sprite var40; - if (!var10.isIf3) { - var40 = var10.getSprite(ChatChannel.runCs1(var10)); - if (var40 != null) { - var40.drawTransBgAt(var12, var13); - } else if (Widget.field2562) { - Strings.invalidateWidget(var10); - } - continue; - } - if (var10.itemId != -1) { - var40 = WorldMapSection0.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); - } else { - var40 = var10.getSprite(false); - } - - if (var40 == null) { - if (Widget.field2562) { - Strings.invalidateWidget(var10); - } - continue; - } - var20 = var40.width; - var21 = var40.height; - if (!var10.spriteTiling) { - var22 = var10.width * 4096 / var20; - if (var10.spriteAngle != 0) { - var40.method6186(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); - } else if (var14 != 0) { - var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); - } else if (var20 == var10.width && var21 == var10.height) { - var40.drawTransBgAt(var12, var13); - } else { - var40.drawScaledAt(var12, var13, var10.width, var10.height); - } - continue; - } - 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) { - var40.method6186(var20 / 2 + var12 + var24 * var20, var21 / 2 + var13 + var21 * var25, var10.spriteAngle, 4096); - } else if (var14 != 0) { - var40.drawTransAt(var12 + var24 * var20, var13 + var25 * var21, 256 - (var14 & 255)); - } else { - var40.drawTransBgAt(var12 + var24 * var20, var13 + var21 * var25); - } - } - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - ItemDefinition var33; - if (var10.type == 6) { - boolean var36 = ChatChannel.runCs1(var10); - if (var36) { - var20 = var10.sequenceId2; - } else { - var20 = var10.sequenceId; - } - - Model var41 = null; - var22 = 0; - if (var10.itemId != -1) { - var33 = WorldMapArea.ItemDefinition_get(var10.itemId); - if (var33 != null) { - var33 = var33.getCountObj(var10.itemQuantity); - var41 = var33.getModel(1); - if (var41 != null) { - var41.calculateBoundsCylinder(); - var22 = var41.height / 2; - } else { - Strings.invalidateWidget(var10); - } - } - } else if (var10.modelType == 5) { - if (var10.modelId == 0) { - var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); - } else { - var41 = Client.localPlayer.getModel(); - } - } else if (var20 == -1) { - var41 = var10.getModel((SequenceDefinition)null, -1, var36, Client.localPlayer.appearance); - if (var41 == null && Widget.field2562) { - Strings.invalidateWidget(var10); - } - } else { - SequenceDefinition var47 = GrandExchangeEvent.SequenceDefinition_get(var20); - var41 = var10.getModel(var47, var10.modelFrame, var36, Client.localPlayer.appearance); - if (var41 == null && Widget.field2562) { - Strings.invalidateWidget(var10); - } - } - - Rasterizer3D.method2976(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.calculateBoundsCylinder(); - if (var10.modelOrthog) { - var41.method2876(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); - } else { - var41.method2866(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY); - } - } else { - var41.method2866(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); - } - } - - Rasterizer3D.Rasterizer3D_method3(); - continue; - } - if (var10.type == 7) { - var39 = var10.getFont(); - if (var39 == null) { - if (Widget.field2562) { - Strings.invalidateWidget(var10); - } - continue; - } - - var20 = 0; - - for (var21 = 0; var21 < var10.rawHeight; ++var21) { - for (var22 = 0; var22 < var10.rawWidth; ++var22, ++var20) { - if (var10.itemIds[var20] <= 0) { - continue; - } - var33 = WorldMapArea.ItemDefinition_get(var10.itemIds[var20] - 1); - String var34; - if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { - var34 = ClientPreferences.colorStartTag(0xff9040) + var33.name + ""; - } else { - var34 = ClientPreferences.colorStartTag(0xff9040) + var33.name + "" + " " + 'x' + class188.formatItemStacks(var10.itemQuantities[var20]); - } - - var25 = var22 * (var10.paddingX + 115) + var12; - var26 = var21 * (var10.paddingY + 12) + var13; - if (var10.textXAlignment == 0) { - var39.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1); - } else if (var10.textXAlignment == 1) { - var39.drawCentered(var34, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1); - } else { - var39.drawRightAligned(var34, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); - } - } - } - } - - if (var10.type == 8 && var10 == class32.field284 && Client.field833 == Client.field840) { - var19 = 0; - var20 = 0; - Font var31 = FileSystem.fontPlain12; - String var32 = var10.text; - - String var43; - for (var32 = GrandExchangeOfferTotalQuantityComparator.method92(var32, var10); var32.length() > 0; var20 = var20 + var31.ascent + 1) { - var24 = var32.indexOf("
"); - if (var24 != -1) { - var43 = var32.substring(0, var24); - var32 = var32.substring(var24 + 4); - } else { - var43 = var32; - var32 = ""; - } - - var25 = var31.stringWidth(var43); - if (var25 > var19) { - var19 = var25; - } - } - - var19 += 6; - var20 += 7; - var24 = var12 + var10.width - 5 - var19; - var25 = var13 + var10.height + 5; - if (var24 < var12 + 5) { - var24 = var12 + 5; - } - - if (var24 + var19 > var4) { - var24 = var4 - var19; - } - - if (var20 + var25 > var5) { - var25 = var5 - var20; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 0xffffa0); - Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); - var32 = var10.text; - var26 = var25 + var31.ascent + 2; - - for (var32 = GrandExchangeOfferTotalQuantityComparator.method92(var32, var10); var32.length() > 0; var26 = var26 + var31.ascent + 1) { - int var35 = var32.indexOf("
"); - if (var35 != -1) { - var43 = var32.substring(0, var35); - var32 = var32.substring(var35 + 4); - } else { - var43 = var32; - var32 = ""; - } - - var31.draw(var43, var24 + 3, var26, 0, -1); - } - } - - if (var10.type == 9) { - if (var10.field2598) { - var19 = var12; - var20 = var13 + var10.height; - var21 = var12 + var10.width; - var22 = var13; - } else { - var19 = var12; - var20 = var13; - var21 = var12 + var10.width; - var22 = var13 + var10.height; - } - - if (var10.lineWid == 1) { - Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); - } else { - MusicPatchPcmStream.method3912(var19, var20, var21, var22, var10.color, var10.lineWid); - } - } - } - - } - - @ObfuscatedName("ka") - @ObfuscatedSignature( - signature = "(Lhj;B)Ljava/lang/String;", - garbageValue = "70" - ) - static String method5318(Widget var0) { - if (HealthBar.method1957(class268.getWidgetClickMask(var0)) == 0) { - return null; - } - return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; + @Export("ObjectDefinition_clearCached") + public static void ObjectDefinition_clearCached() { + ObjectDefinition.ObjectDefinition_cached.clear(); + ObjectDefinition.ObjectDefinition_cachedModelData.clear(); + ObjectDefinition.ObjectDefinition_cachedEntities.clear(); + ObjectDefinition.ObjectDefinition_cachedModels.clear(); } } diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java index 14a0192063..41ac16dbc5 100644 --- a/runescape-client/src/main/java/Fonts.java +++ b/runescape-client/src/main/java/Fonts.java @@ -4,29 +4,27 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ku") +@ObfuscatedName("kr") @Implements("Fonts") public class Fonts { - @ObfuscatedName("r") - static int[] field3689; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("spritesArchive") AbstractArchive spritesArchive; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("fontsArchive") AbstractArchive fontsArchive; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("map") HashMap map; @ObfuscatedSignature( - signature = "(Lhp;Lhp;)V" + signature = "(Lhz;Lhz;)V" ) public Fonts(AbstractArchive var1, AbstractArchive var2) { this.spritesArchive = var1; @@ -34,10 +32,10 @@ public class Fonts { this.map = new HashMap(); } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "([Lkd;I)Ljava/util/HashMap;", - garbageValue = "-354104614" + signature = "([Lkz;I)Ljava/util/HashMap;", + garbageValue = "2107388628" ) @Export("createMap") public HashMap createMap(FontName[] var1) { @@ -49,7 +47,7 @@ public class Fonts { if (this.map.containsKey(var5)) { var2.put(var5, this.map.get(var5)); } else { - Font var6 = class287.SpriteBuffer_getFontByName(this.spritesArchive, this.fontsArchive, var5.name, ""); + Font var6 = PcmPlayer.SpriteBuffer_getFontByName(this.spritesArchive, this.fontsArchive, var5.name, ""); if (var6 != null) { this.map.put(var5, var6); var2.put(var5, var6); @@ -59,4 +57,24 @@ public class Fonts { return var2; } + + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(I)[Lha;", + garbageValue = "1384146854" + ) + public static ServerBuild[] method5240() { + return new ServerBuild[]{ServerBuild.WIP, ServerBuild.LIVE, ServerBuild.BUILDLIVE, ServerBuild.RC}; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(Lhz;Lhz;Lhz;I)V", + garbageValue = "-1215139257" + ) + public static void method5234(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { + SequenceDefinition.SequenceDefinition_archive = var0; + SequenceDefinition.SequenceDefinition_animationsArchive = var1; + SequenceDefinition.SequenceDefinition_skeletonsArchive = var2; + } } diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java index f051629af5..92e09fd6bb 100644 --- a/runescape-client/src/main/java/Frames.java +++ b/runescape-client/src/main/java/Frames.java @@ -3,23 +3,27 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ek") +@ObfuscatedName("ee") @Implements("Frames") public class Frames extends DualNode { - @ObfuscatedName("i") - @Export("SpriteBuffer_spritePalette") - public static int[] SpriteBuffer_spritePalette; - @ObfuscatedName("q") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "[Lda;" + signature = "Lhz;" + ) + @Export("ItemDefinition_modelArchive") + static AbstractArchive ItemDefinition_modelArchive; + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "[Ldi;" ) @Export("frames") Animation[] frames; @ObfuscatedSignature( - signature = "(Lhp;Lhp;IZ)V" + signature = "(Lhz;Lhz;IZ)V", + garbageValue = "0" ) - Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { + public Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { NodeDeque var5 = new NodeDeque(); int var6 = var1.getGroupFileCount(var3); this.frames = new Animation[var6]; @@ -38,13 +42,7 @@ public class Frames extends DualNode { } if (var10 == null) { - byte[] var13; - if (var4) { - var13 = var2.getFile(0, var11); - } else { - var13 = var2.getFile(var11, 0); - } - + byte[] var13 = var2.getFile(var11, 0); var10 = new Skeleton(var11, var13); var5.addFirst(var10); } @@ -54,199 +52,33 @@ public class Frames extends DualNode { } - @ObfuscatedName("w") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "1644534064" + signature = "(IB)Z", + garbageValue = "-5" ) @Export("hasAlphaTransform") public boolean hasAlphaTransform(int var1) { return this.frames[var1].hasAlphaTransform; } - @ObfuscatedName("q") + @ObfuscatedName("ix") @ObfuscatedSignature( - signature = "(IILfl;Lfv;I)Z", - garbageValue = "4377134" + signature = "(II)Ljava/lang/String;", + garbageValue = "-737033535" ) - public static final boolean method3267(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; - int var18 = var10 + 1; - class173.bufferY[var10] = var1; - int[][] var12 = var3.flags; + @Export("formatItemStacks") + static final String formatItemStacks(int var0) { + String var1 = Integer.toString(var0); - 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(2, var4, var5, var3)) { - class173.field2088 = var4; - class218.field2707 = var5; - return true; - } - - 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; - } + for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { + var1 = var1.substring(0, var2) + "," + var1.substring(var2); } - class173.field2088 = var4; - class218.field2707 = var5; - return false; - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(Ldm;IIIB)Z", - garbageValue = "44" - ) - @Export("boundingBoxCheck") - static final boolean boundingBoxCheck(Model var0, int var1, int var2, int var3) { - boolean var4 = ViewportMouse.ViewportMouse_isInViewport; - if (!var4) { - return false; + if (var1.length() > 9) { + return " " + class16.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; + } else { + return var1.length() > 6 ? " " + class16.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + class16.colorStartTag(16776960) + var1 + ""; } - int var5; - int var6; - int var7; - int var8; - int var11; - int var12; - int var13; - int var16; - int var17; - if (!ViewportMouse.ViewportMouse_false0) { - var5 = Scene.Scene_cameraPitchSine; - var6 = Scene.Scene_cameraPitchCosine; - var7 = Scene.Scene_cameraYawSine; - var8 = Scene.Scene_cameraYawCosine; - byte var9 = 50; - short var10 = 3500; - var11 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var9 / Rasterizer3D.Rasterizer3D_zoom; - var12 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var9 / Rasterizer3D.Rasterizer3D_zoom; - var13 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var10 / Rasterizer3D.Rasterizer3D_zoom; - int var14 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var10 / Rasterizer3D.Rasterizer3D_zoom; - int var15 = Rasterizer3D.rot1(var12, var9, var6, var5); - var16 = Rasterizer3D.rot2(var12, var9, var6, var5); - var12 = var15; - var15 = Rasterizer3D.rot1(var14, var10, var6, var5); - var17 = Rasterizer3D.rot2(var14, var10, var6, var5); - var14 = var15; - var15 = Rasterizer3D.rot3(var11, var16, var8, var7); - var16 = Rasterizer3D.rot4(var11, var16, var8, var7); - var11 = var15; - var15 = Rasterizer3D.rot3(var13, var17, var8, var7); - var17 = Rasterizer3D.rot4(var13, var17, var8, var7); - ModelData0.field1871 = (var11 + var15) / 2; - ViewportMouse.field1745 = (var12 + var14) / 2; - ViewportMouse.field1746 = (var16 + var17) / 2; - TileItem.field1242 = (var15 - var11) / 2; - GrandExchangeEvent.field48 = (var14 - var12) / 2; - Canvas.field422 = (var17 - var16) / 2; - ScriptFrame.field527 = Math.abs(TileItem.field1242); - ViewportMouse.field1741 = Math.abs(GrandExchangeEvent.field48); - MenuAction.field1160 = Math.abs(Canvas.field422); - } - - var5 = var0.xMid + var1; - var6 = var2 + var0.yMid; - var7 = var3 + var0.zMid; - var8 = var0.xMidOffset; - var16 = var0.yMidOffset; - var17 = var0.zMidOffset; - var11 = ModelData0.field1871 - var5; - var12 = ViewportMouse.field1745 - var6; - var13 = ViewportMouse.field1746 - var7; - if (Math.abs(var11) > var8 + ScriptFrame.field527) { - return false; - } - if (Math.abs(var12) > var16 + ViewportMouse.field1741) { - return false; - } - if (Math.abs(var13) > var17 + MenuAction.field1160) { - return false; - } - if (Math.abs(var13 * GrandExchangeEvent.field48 - var12 * Canvas.field422) > var17 * ViewportMouse.field1741 + var16 * MenuAction.field1160) { - return false; - } - if (Math.abs(var11 * Canvas.field422 - var13 * TileItem.field1242) > var8 * MenuAction.field1160 + var17 * ScriptFrame.field527) { - return false; - } - return Math.abs(var12 * TileItem.field1242 - var11 * GrandExchangeEvent.field48) <= var16 * ScriptFrame.field527 + var8 * ViewportMouse.field1741; } } diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java index 6b824be621..39ec4d118a 100644 --- a/runescape-client/src/main/java/Friend.java +++ b/runescape-client/src/main/java/Friend.java @@ -3,55 +3,49 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("js") +@ObfuscatedName("ja") @Implements("Friend") public class Friend extends Buddy { - @ObfuscatedName("q") - boolean field3650; - @ObfuscatedName("w") - boolean field3651; + @ObfuscatedName("s") + boolean field3607; + @ObfuscatedName("j") + boolean field3606; Friend() { } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ljs;I)I", - garbageValue = "-1814764429" + signature = "(Lja;B)I", + garbageValue = "113" ) @Export("compareToFriend") int compareToFriend(Friend var1) { if (super.world == Client.worldId && Client.worldId != var1.world) { return -1; - } - if (Client.worldId == var1.world && super.world != Client.worldId) { + } else if (Client.worldId == var1.world && super.world != Client.worldId) { return 1; - } - if (super.world != 0 && var1.world == 0) { + } else if (super.world != 0 && var1.world == 0) { return -1; - } - if (var1.world != 0 && super.world == 0) { + } else if (var1.world != 0 && super.world == 0) { return 1; - } - if (this.field3650 && !var1.field3650) { + } else if (this.field3607 && !var1.field3607) { return -1; - } - if (!this.field3650 && var1.field3650) { + } else if (!this.field3607 && var1.field3607) { return 1; - } - if (this.field3651 && !var1.field3651) { + } else if (this.field3606 && !var1.field3606) { return -1; - } - if (!this.field3651 && var1.field3651) { + } else if (!this.field3606 && var1.field3606) { return 1; + } else { + return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; } - return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; } - @ObfuscatedName("ax") + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(Ljd;I)I", - garbageValue = "-1938562722" + signature = "(Lju;B)I", + garbageValue = "1" ) @Export("compareTo_user") public int compareTo_user(User var1) { @@ -62,100 +56,45 @@ public class Friend extends Buddy { return this.compareToFriend((Friend)var1); } - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Lhp;IIB)Z", - garbageValue = "-3" + signature = "(IZB)Ljava/lang/String;", + garbageValue = "104" ) - @Export("SpriteBuffer_bufferFile") - public static boolean SpriteBuffer_bufferFile(AbstractArchive var0, int var1, int var2) { - byte[] var3 = var0.takeFile(var1, var2); - if (var3 == null) { - return false; - } - class185.SpriteBuffer_decode(var3); - return true; - } + @Export("intToString") + public static String intToString(int var0, boolean var1) { + if (var1 && var0 >= 0) { + int var3 = var0; + String var2; + if (var1 && var0 >= 0) { + int var4 = 2; - @ObfuscatedName("fv") - @ObfuscatedSignature( - signature = "(Lbq;I)V", - garbageValue = "230469601" - ) - static final void method5226(Actor var0) { - if (var0.field948 == 0) { - return; - } - 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; + for (int var5 = var0 / 10; var5 != 0; ++var4) { + var5 /= 10; } - } else if (var0.false0) { - var0.targetIndex = -1; - var0.false0 = false; - } - } - if (var0.field976 != -1 && (var0.pathLength == 0 || var0.field1007 > 0)) { - var0.orientation = var0.field976; - var0.field976 = -1; - } + char[] var6 = new char[var4]; + var6[0] = '+'; - int var4 = var0.orientation - var0.rotation & 2047; - if (var4 == 0 && var0.false0) { - var0.targetIndex = -1; - var0.false0 = false; - } - - if (var4 == 0) { - var0.field1009 = 0; - return; - } - ++var0.field1009; - boolean var6; - if (var4 > 1024) { - var0.rotation -= var0.field948; - var6 = true; - if (var4 < var0.field948 || var4 > 2048 - var0.field948) { - var0.rotation = var0.orientation; - var6 = false; - } - - if (var0.movementSequence == var0.readySequence && (var0.field1009 > 25 || var6)) { - if (var0.turnLeftSequence != -1) { - var0.movementSequence = var0.turnLeftSequence; - } else { - var0.movementSequence = var0.walkSequence; + for (int var7 = var4 - 1; var7 > 0; --var7) { + int var8 = var3; + var3 /= 10; + int var9 = var8 - var3 * 10; + if (var9 >= 10) { + var6[var7] = (char)(var9 + 87); + } else { + var6[var7] = (char)(var9 + 48); + } } + + var2 = new String(var6); + } else { + var2 = Integer.toString(var0, 10); } + + return var2; } else { - var0.rotation += var0.field948; - var6 = true; - if (var4 < var0.field948 || var4 > 2048 - var0.field948) { - var0.rotation = var0.orientation; - var6 = false; - } - - if (var0.readySequence == var0.movementSequence && (var0.field1009 > 25 || var6)) { - if (var0.turnRightSequence != -1) { - var0.movementSequence = var0.turnRightSequence; - } else { - var0.movementSequence = var0.walkSequence; - } - } + return Integer.toString(var0); } - - var0.rotation &= 2047; - } } diff --git a/runescape-client/src/main/java/FriendLoginUpdate.java b/runescape-client/src/main/java/FriendLoginUpdate.java index eee80b3e0a..f568092ace 100644 --- a/runescape-client/src/main/java/FriendLoginUpdate.java +++ b/runescape-client/src/main/java/FriendLoginUpdate.java @@ -4,31 +4,116 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kc") +@ObfuscatedName("jv") @Implements("FriendLoginUpdate") public class FriendLoginUpdate extends Link { - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1546177207 + intValue = -684756909 ) - @Export("friendUpdateTimeSecs") - public int friendUpdateTimeSecs; - @ObfuscatedName("p") + public int field3621; + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Ljv;" + signature = "Ljx;" ) @Export("username") public Username username; - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("world") public short world; @ObfuscatedSignature( - signature = "(Ljv;I)V" + signature = "(Ljx;I)V" ) FriendLoginUpdate(Username var1, int var2) { - this.friendUpdateTimeSecs = (int)(DirectByteArrayCopier.currentTimeMs() / 1000L); + this.field3621 = (int)(SequenceDefinition.method4686() / 1000L); this.username = var1; this.world = (short)var2; } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(CLgk;I)C", + garbageValue = "-2143738383" + ) + @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 { + return var0 == 376 ? 'Y' : var0; + } + } } diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index 51220aab20..9a36422aa0 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -5,287 +5,292 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bf") +@ObfuscatedName("ba") @Implements("FriendSystem") public class FriendSystem { - @ObfuscatedName("bb") - @ObfuscatedSignature( - signature = "[Llx;" + @ObfuscatedName("cs") + @Export("mouseCam") + static boolean mouseCam; + @ObfuscatedName("hn") + @ObfuscatedGetter( + intValue = 2015707871 ) - @Export("worldSelectStars") - static IndexedSprite[] worldSelectStars; - @ObfuscatedName("ed") - static int[] field1074; - @ObfuscatedName("p") + @Export("oculusOrbFocalPointY") + static int oculusOrbFocalPointY; + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lmu;" + signature = "Llu;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Ljc;" + signature = "Ljo;" ) @Export("friendsList") public final FriendsList friendsList; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Ljf;" + signature = "Ljk;" ) @Export("ignoreList") public final IgnoreList ignoreList; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1533704569 + intValue = 1694848325 ) - int field1076; + int field1045; @ObfuscatedSignature( - signature = "(Lmu;)V" + signature = "(Llu;)V" ) FriendSystem(LoginType var1) { - this.field1076 = 0; + this.field1045 = 0; this.loginType = var1; this.friendsList = new FriendsList(var1); this.ignoreList = new IgnoreList(var1); } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-1493055205" + signature = "(S)Z", + garbageValue = "-3646" ) - boolean method1791() { - return this.field1076 == 2; + boolean method1773() { + return this.field1045 == 2; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "2033101779" + signature = "(B)V", + garbageValue = "-52" ) - final void method1760() { - this.field1076 = 1; + final void method1774() { + this.field1045 = 1; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkf;II)V", - garbageValue = "499123399" + signature = "(Lky;II)V", + garbageValue = "-1957399935" ) @Export("readUpdate") final void readUpdate(Buffer var1, int var2) { this.friendsList.read(var1, var2); - this.field1076 = 2; - VertexNormal.FriendSystem_invalidateFriends(); - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "9" - ) - @Export("processFriendUpdates") - final void processFriendUpdates() { - for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { - if ((long) var1.friendUpdateTimeSecs >= DirectByteArrayCopier.currentTimeMs() / 1000L - 5L) { - continue; - } - if (var1.world > 0) { - ScriptEvent.addGameMessage(5, "", var1.username + " has logged in."); - } - - if (var1.world == 0) { - ScriptEvent.addGameMessage(5, "", var1.username + " has logged out."); - } - - var1.remove(); - } - + this.field1045 = 2; + class3.FriendSystem_invalidateFriends(); } @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "487" + signature = "(I)V", + garbageValue = "-688345786" + ) + @Export("processFriendUpdates") + final void processFriendUpdates() { + for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { + if ((long)var1.field3621 < SequenceDefinition.method4686() / 1000L - 5L) { + if (var1.world > 0) { + DirectByteArrayCopier.addGameMessage(5, "", var1.username + " has logged in."); + } + + if (var1.world == 0) { + DirectByteArrayCopier.addGameMessage(5, "", var1.username + " has logged out."); + } + + var1.remove(); + } + } + + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "452224146" ) @Export("clear") final void clear() { - this.field1076 = 0; + this.field1045 = 0; this.friendsList.clear(); this.ignoreList.clear(); } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Ljv;ZI)Z", - garbageValue = "277105745" + signature = "(Ljx;ZI)Z", + garbageValue = "1695640889" ) @Export("isFriended") final boolean isFriended(Username var1, boolean var2) { if (var1 == null) { return false; - } - if (var1.equals(Client.localPlayer.username)) { + } else if (var1.equals(WorldMapIcon_1.localPlayer.username)) { return true; + } else { + return this.friendsList.isFriended(var1, var2); } - return this.friendsList.isFriended(var1, var2); } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Ljv;B)Z", - garbageValue = "-1" + signature = "(Ljx;I)Z", + garbageValue = "-33196880" ) @Export("isIgnored") final boolean isIgnored(Username var1) { if (var1 == null) { return false; + } else { + return this.ignoreList.contains(var1); } - return this.ignoreList.contains(var1); } - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "-1616773862" + signature = "(Ljava/lang/String;B)V", + garbageValue = "6" ) @Export("addFriend") final void addFriend(String var1) { - if (var1 == null) { - return; - } - Username var2 = new Username(var1, this.loginType); - if (!var2.hasCleanName()) { - return; - } - if (this.friendsListIsFull()) { - MouseRecorder.FriendSystem_friendsListFullMes(); - } else { - StringBuilder var10000; - String var4; - if (Client.localPlayer.username.equals(var2)) { - var4 = "You can't add yourself to your own friend list"; - ScriptEvent.addGameMessage(30, "", var4); - } else if (this.isFriended(var2, false)) { - WorldMapManager.FriendSystem_alreadyFriendMes(var1); - } else if (this.isIgnored(var2)) { - var10000 = new StringBuilder(); - var10000.append("Please remove ").append(var1); - var4 = var10000.append(" from your ignore list first").toString(); - ScriptEvent.addGameMessage(30, "", var4); - } else { - PacketBufferNode var3 = Archive.getPacketBufferNode(ClientPacket.field2291, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(Huffman.stringCp1252NullTerminatedByteSize(var1)); - var3.packetBuffer.writeStringCp1252NullTerminated(var1); - Client.packetWriter.addNode(var3); + if (var1 != null) { + Username var2 = new Username(var1, this.loginType); + if (var2.hasCleanName()) { + if (this.friendsListIsFull()) { + class3.method53(); + } else { + StringBuilder var10000; + String var4; + if (WorldMapIcon_1.localPlayer.username.equals(var2)) { + var10000 = null; + var4 = "You can't add yourself to your own friend list"; + DirectByteArrayCopier.addGameMessage(30, "", var4); + } else if (this.isFriended(var2, false)) { + NPC.method1976(var1); + } else if (this.isIgnored(var2)) { + var10000 = new StringBuilder(); + Object var10001 = null; + var10000 = var10000.append("Please remove ").append(var1); + var10001 = null; + var4 = var10000.append(" from your ignore list first").toString(); + DirectByteArrayCopier.addGameMessage(30, "", var4); + } else { + PacketBufferNode var3 = MenuAction.getPacketBufferNode(ClientPacket.field2201, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var1)); + var3.packetBuffer.writeStringCp1252NullTerminated(var1); + Client.packetWriter.addNode(var3); + } + } } } } - @ObfuscatedName("x") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-1832843555" + signature = "(B)Z", + garbageValue = "-21" ) @Export("friendsListIsFull") final boolean friendsListIsFull() { - return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field771 != 1; + return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field741 != 1; } - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "1" + signature = "(Ljava/lang/String;I)V", + garbageValue = "1615716489" ) @Export("addIgnore") final void addIgnore(String var1) { - if (var1 == null) { - return; - } - Username var2 = new Username(var1, this.loginType); - if (!var2.hasCleanName()) { - return; - } - if (this.canAddIgnore()) { - Object var10000 = null; - String var3 = "Your ignore list is full. Max of 100 for free users, and 400 for members"; - ScriptEvent.addGameMessage(30, "", var3); - } else if (Client.localPlayer.username.equals(var2)) { - WorldMapEvent.FriendSystem_cantIgnoreSelfMes(); - } else if (this.isIgnored(var2)) { - Client.FriendSystem_alreadyIgnoredMes(var1); - } else if (this.isFriended(var2, false)) { - WorldMapID.FriendSystem_cantIgnoreFriendMes(var1); - } else { - class219.method4111(var1); + if (var1 != null) { + Username var2 = new Username(var1, this.loginType); + if (var2.hasCleanName()) { + StringBuilder var10000; + String var3; + if (this.canAddIgnore()) { + var10000 = null; + var3 = "Your ignore list is full. Max of 100 for free users, and 400 for members"; + DirectByteArrayCopier.addGameMessage(30, "", var3); + } else if (WorldMapIcon_1.localPlayer.username.equals(var2)) { + var10000 = null; + var3 = "You can't add yourself to your own ignore list"; + DirectByteArrayCopier.addGameMessage(30, "", var3); + } else if (this.isIgnored(var2)) { + AbstractWorldMapIcon.method591(var1); + } else if (this.isFriended(var2, false)) { + var10000 = new StringBuilder(); + Object var10001 = null; + var10000 = var10000.append("Please remove ").append(var1); + var10001 = null; + var3 = var10000.append(" from your friend list first").toString(); + DirectByteArrayCopier.addGameMessage(30, "", var3); + } else { + Huffman.method3902(var1); + } + } } } - @ObfuscatedName("j") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-81479393" + garbageValue = "1672650441" ) @Export("canAddIgnore") final boolean canAddIgnore() { - return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field771 != 1; + return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field741 != 1; } - @ObfuscatedName("o") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "-1086170142" + signature = "(Ljava/lang/String;B)V", + garbageValue = "-123" ) @Export("removeFriend") final void removeFriend(String var1) { - if (var1 == null) { - return; - } - Username var2 = new Username(var1, this.loginType); - if (!var2.hasCleanName()) { - return; - } - if (this.friendsList.removeByUsername(var2)) { - Client.field672 = Client.cycleCntr; - PacketBufferNode var3 = Archive.getPacketBufferNode(ClientPacket.field2224, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(Huffman.stringCp1252NullTerminatedByteSize(var1)); - var3.packetBuffer.writeStringCp1252NullTerminated(var1); - Client.packetWriter.addNode(var3); - } + if (var1 != null) { + Username var2 = new Username(var1, this.loginType); + if (var2.hasCleanName()) { + if (this.friendsList.removeByUsername(var2)) { + class43.method759(); + PacketBufferNode var3 = MenuAction.getPacketBufferNode(ClientPacket.field2225, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var1)); + var3.packetBuffer.writeStringCp1252NullTerminated(var1); + Client.packetWriter.addNode(var3); + } - VertexNormal.FriendSystem_invalidateFriends(); + class3.FriendSystem_invalidateFriends(); + } + } } - @ObfuscatedName("d") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(Ljava/lang/String;B)V", - garbageValue = "8" + garbageValue = "2" ) @Export("removeIgnore") final void removeIgnore(String var1) { - if (var1 == null) { - return; - } - Username var2 = new Username(var1, this.loginType); - if (!var2.hasCleanName()) { - return; - } - if (this.ignoreList.removeByUsername(var2)) { - Client.field672 = Client.cycleCntr; - PacketBufferNode var3 = Archive.getPacketBufferNode(ClientPacket.field2231, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(Huffman.stringCp1252NullTerminatedByteSize(var1)); - var3.packetBuffer.writeStringCp1252NullTerminated(var1); - Client.packetWriter.addNode(var3); - } + if (var1 != null) { + Username var2 = new Username(var1, this.loginType); + if (var2.hasCleanName()) { + if (this.ignoreList.removeByUsername(var2)) { + class43.method759(); + PacketBufferNode var3 = MenuAction.getPacketBufferNode(ClientPacket.field2266, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var1)); + var3.packetBuffer.writeStringCp1252NullTerminated(var1); + Client.packetWriter.addNode(var3); + } - class2.FriendSystem_invalidateIgnoreds(); + InterfaceParent.FriendSystem_invalidateIgnoreds(); + } + } } - @ObfuscatedName("z") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Ljv;I)Z", - garbageValue = "1053718867" + signature = "(Ljx;I)Z", + garbageValue = "2127242291" ) @Export("isFriendAndHasWorld") final boolean isFriendAndHasWorld(Username var1) { @@ -293,226 +298,146 @@ public class FriendSystem { return var2 != null && var2.hasWorld(); } - @ObfuscatedName("w") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "1745629182" + signature = "([Lgn;II)Lgn;", + garbageValue = "-2035427993" ) - public static int method1819(int var0, int var1) { - int var2; - if (var1 > var0) { - var2 = var0; - var0 = var1; - var1 = 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; + } } - while (var1 != 0) { - var2 = var0 % var1; - var0 = var1; - var1 = var2; - } - - return var0; + return null; } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "([BIIB)Ljava/lang/String;", - garbageValue = "52" + signature = "(I)[Lia;", + garbageValue = "173195137" ) - @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) { - continue; - } - if (var6 >= 128 && var6 < 160) { - char var7 = class288.cp1252AsciiExtension[var6 - 128]; - if (var7 == 0) { - var7 = '?'; - } - - var6 = var7; - } - - var3[var4++] = (char)var6; - } - - return new String(var3, 0, var4); + static VerticalAlignment[] method1830() { + return new VerticalAlignment[]{VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field3172, VerticalAlignment.field3174}; } @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-77884497" + signature = "(ILcr;ZI)I", + garbageValue = "1342968347" ) - @Export("ViewportMouse_unpackID") - public static int ViewportMouse_unpackID(int i) { - return class43.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[i]); + static int method1831(int var0, Script var1, boolean var2) { + int var3; + int var4; + if (var0 == ScriptOpcodes.CC_CREATE) { + Interpreter.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + if (var4 == 0) { + throw new RuntimeException(); + } else { + Widget var6 = WorldMapElement.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) { + class286.field3623 = var12; + } else { + class297.field3693 = var12; + } + + invalidateWidget(var6); + return 1; + } + } + } else { + Widget var9; + if (var0 == ScriptOpcodes.CC_DELETE) { + var9 = var2 ? class286.field3623 : class297.field3693; + Widget var10 = WorldMapElement.getWidget(var9.id); + var10.children[var9.childIndex] = null; + invalidateWidget(var10); + return 1; + } else if (var0 == ScriptOpcodes.CC_DELETEALL) { + var9 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + var9.children = null; + invalidateWidget(var9); + return 1; + } else if (var0 != ScriptOpcodes.CC_FIND) { + if (var0 == ScriptOpcodes.IF_FIND) { + var9 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + if (var9 != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + if (var2) { + class286.field3623 = var9; + } else { + class297.field3693 = var9; + } + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else { + return 2; + } + } else { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Widget var11 = ModelData0.getWidgetChild(var3, var4); + if (var11 != null && var4 != -1) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + if (var2) { + class286.field3623 = var11; + } else { + class297.field3693 = var11; + } + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + } } - @ObfuscatedName("ag") + @ObfuscatedName("jk") @ObfuscatedSignature( - signature = "(ILcx;ZI)I", - garbageValue = "-680519065" + signature = "(Lhp;I)V", + garbageValue = "-1019792182" ) - static int method1817(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); - return 1; + @Export("invalidateWidget") + static void invalidateWidget(Widget var0) { + if (var0.cycle == Client.field752) { + Client.field703[var0.rootIndex] = true; } - if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; - return 1; - } - if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; - return 1; - } - if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; - return 1; - } - if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; - return 1; - } - if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; - return 1; - } - int var12; - if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 0 ? 1 : 0; - return 1; - } - if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 2 ? 1 : 0; - return 1; - } - if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 5 ? 1 : 0; - return 1; - } - if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 1 ? 1 : 0; - return 1; - } - boolean var13; - if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { - var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (PendingSpawn.grandExchangeEvents != null) { - PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var13); - } - return 1; - } - if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { - var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (PendingSpawn.grandExchangeEvents != null) { - PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var13); - } - - return 1; - } - if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var13 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] == 1; - boolean var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1] == 1; - if (PendingSpawn.grandExchangeEvents != null) { - Client.GrandExchangeEvents_worldComparator.filterWorlds = var4; - PendingSpawn.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var13); - } - - return 1; - } - if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { - var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (PendingSpawn.grandExchangeEvents != null) { - PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var13); - } - - return 1; - } - if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { - var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (PendingSpawn.grandExchangeEvents != null) { - PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var13); - } - - return 1; - } - if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = PendingSpawn.grandExchangeEvents == null ? 0 : PendingSpawn.grandExchangeEvents.events.size(); - return 1; - } - GrandExchangeEvent var11; - if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.world; - return 1; - } - if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var11.getOfferName(); - return 1; - } - if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var11.getPreviousOfferName(); - return 1; - } - if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); - long var5 = DirectByteArrayCopier.currentTimeMs() - Buddy.field3632 - 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[++Skills.Interpreter_stringStackSize - 1] = var10; - return 1; - } - if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity; - return 1; - } - if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice; - return 1; - } - if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id; - return 1; - } - return 2; } } diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java index 174ccb1d62..7f9562e7b7 100644 --- a/runescape-client/src/main/java/FriendsList.java +++ b/runescape-client/src/main/java/FriendsList.java @@ -4,152 +4,202 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jc") +@ObfuscatedName("jo") @Implements("FriendsList") public class FriendsList extends UserList { - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lmu;" + signature = "Llu;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("f") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -374978569 + intValue = 1273879743 ) - int field3643; - @ObfuscatedName("m") + int field3600; + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lje;" + signature = "Ljf;" ) @Export("friendLoginUpdates") public LinkDeque friendLoginUpdates; @ObfuscatedSignature( - signature = "(Lmu;)V" + signature = "(Llu;)V" ) public FriendsList(LoginType var1) { super(400); - this.field3643 = 1; + this.field3600 = 1; this.friendLoginUpdates = new LinkDeque(); this.loginType = var1; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(I)Ljd;", - garbageValue = "2016619159" + signature = "(I)Lju;", + garbageValue = "-192021045" ) @Export("newInstance") User newInstance() { return new Friend(); } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(II)[Ljd;", - garbageValue = "2126056206" + signature = "(II)[Lju;", + garbageValue = "518998026" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new Friend[var1]; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Ljv;ZI)Z", - garbageValue = "547540517" + signature = "(Ljx;ZI)Z", + garbageValue = "-1515368457" ) @Export("isFriended") public boolean isFriended(Username var1, boolean var2) { Friend var3 = (Friend)this.getByUsername(var1); if (var3 == null) { return false; + } else { + return !var2 || var3.world != 0; } - return !var2 || var3.world != 0; } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkf;II)V", - garbageValue = "2066125669" + signature = "(Lky;IB)V", + garbageValue = "0" ) @Export("read") public void read(Buffer var1, int var2) { - while (var1.offset < var2) { - boolean var3 = var1.readUnsignedByte() == 1; - Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); - Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); - int var6 = var1.readUnsignedShort(); - int var7 = var1.readUnsignedByte(); - int var8 = var1.readUnsignedByte(); - boolean var9 = (var8 & 2) != 0; - boolean var10 = (var8 & 1) != 0; - if (var6 > 0) { - var1.readStringCp1252NullTerminated(); - var1.readUnsignedByte(); - var1.readInt(); - } - - var1.readStringCp1252NullTerminated(); - if (var4 != null && var4.hasCleanName()) { - Friend var11 = (Friend) this.getByCurrentUsername(var4); - if (var3) { - Friend var12 = (Friend) this.getByCurrentUsername(var5); - if (var12 != null && var11 != var12) { - if (var11 != null) { - this.remove(var12); - } else { - var11 = var12; - } - } + while (true) { + if (var1.offset < var2) { + boolean var3 = var1.readUnsignedByte() == 1; + Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); + Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); + int var6 = var1.readUnsignedShort(); + int var7 = var1.readUnsignedByte(); + int var8 = var1.readUnsignedByte(); + boolean var9 = (var8 & 2) != 0; + boolean var10 = (var8 & 1) != 0; + if (var6 > 0) { + var1.readStringCp1252NullTerminated(); + var1.readUnsignedByte(); + var1.readInt(); } - if (var11 != null) { - this.changeName(var11, var4, var5); - if (var6 != var11.world) { - boolean var14 = true; - - for (FriendLoginUpdate var13 = (FriendLoginUpdate) this.friendLoginUpdates.last(); var13 != null; var13 = (FriendLoginUpdate) this.friendLoginUpdates.previous()) { - if (var13.username.equals(var4)) { - if (var6 != 0 && var13.world == 0) { - var13.remove(); - var14 = false; - } else if (var6 == 0 && var13.world != 0) { - var13.remove(); - var14 = false; - } + var1.readStringCp1252NullTerminated(); + if (var4 != null && var4.hasCleanName()) { + Friend var11 = (Friend)this.getByCurrentUsername(var4); + if (var3) { + Friend var12 = (Friend)this.getByCurrentUsername(var5); + if (var12 != null && var12 != var11) { + if (var11 != null) { + this.remove(var12); + } else { + var11 = var12; } } + } - if (var14) { - this.friendLoginUpdates.addFirst(new FriendLoginUpdate(var4, var6)); + if (var11 != null) { + this.changeName(var11, var4, var5); + if (var6 != var11.world) { + boolean var14 = true; + + for (FriendLoginUpdate var13 = (FriendLoginUpdate)this.friendLoginUpdates.last(); var13 != null; var13 = (FriendLoginUpdate)this.friendLoginUpdates.previous()) { + if (var13.username.equals(var4)) { + if (var6 != 0 && var13.world == 0) { + var13.remove(); + var14 = false; + } else if (var6 == 0 && var13.world != 0) { + var13.remove(); + var14 = false; + } + } + } + + if (var14) { + this.friendLoginUpdates.addFirst(new FriendLoginUpdate(var4, var6)); + } } - } - } else { - if (this.getSize() >= 400) { - continue; + } else { + if (this.getSize() >= 400) { + continue; + } + + var11 = (Friend)this.addLast(var4, var5); } - var11 = (Friend) this.addLast(var4, var5); + if (var6 != var11.world) { + var11.int2 = ++this.field3600 - 1; + if (var11.world == -1 && var6 == 0) { + var11.int2 = -(var11.int2 * 1037739243) * 1487463363; + } + + var11.world = var6; + } + + var11.rank = var7; + var11.field3607 = var9; + var11.field3606 = var10; + continue; } - if (var6 != var11.world) { - var11.int2 = ++this.field3643 - 1; - if (var11.world == -1 && var6 == 0) { - var11.int2 = -(var11.int2 * -782754599) * -1246846103; - } - - var11.world = var6; - } - - var11.rank = var7; - var11.field3650 = var9; - var11.field3651 = var10; - } else { throw new IllegalStateException(); } + + this.sort(); + return; } - this.sort(); + } + + @ObfuscatedName("fk") + @ObfuscatedSignature( + signature = "(Lbd;III)V", + garbageValue = "1475900100" + ) + @Export("performPlayerAnimation") + static void performPlayerAnimation(Player var0, int var1, int var2) { + if (var0.sequence == var1 && var1 != -1) { + int var3 = Widget.SequenceDefinition_get(var1).field3492; + if (var3 == 1) { + var0.sequenceFrame = 0; + var0.sequenceFrameCycle = 0; + var0.sequenceDelay = var2; + var0.field964 = 0; + } + + if (var3 == 2) { + var0.field964 = 0; + } + } else if (var1 == -1 || var0.sequence == -1 || Widget.SequenceDefinition_get(var1).field3508 >= Widget.SequenceDefinition_get(var0.sequence).field3508) { + var0.sequence = var1; + var0.sequenceFrame = 0; + var0.sequenceFrameCycle = 0; + var0.sequenceDelay = var2; + var0.field964 = 0; + var0.field947 = var0.pathLength; + } + + } + + @ObfuscatedName("ht") + @ObfuscatedSignature( + signature = "(IIIIB)V", + garbageValue = "-11" + ) + static final void method5102(int var0, int var1, int var2, int var3) { + for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { + if (Client.rootWidgetXs[var4] + Client.rootWidgetWidths[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetYs[var4] + Client.rootWidgetHeights[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { + Client.field829[var4] = true; + } + } + } } diff --git a/runescape-client/src/main/java/GZipDecompressor.java b/runescape-client/src/main/java/GZipDecompressor.java index e671b02691..804297355e 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("ld") +@ObfuscatedName("lc") @Implements("GZipDecompressor") public class GZipDecompressor { - @ObfuscatedName("p") - @Export("Interpreter_stringLocals") - static String[] Interpreter_stringLocals; - @ObfuscatedName("q") + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -145342191 + ) + public static int field4007; + @ObfuscatedName("s") @Export("inflater") Inflater inflater; + public GZipDecompressor() { + this(-1, 1000000, 1000000); + } + @ObfuscatedSignature( signature = "(III)V", garbageValue = "1000000" @@ -21,14 +28,10 @@ public class GZipDecompressor { GZipDecompressor(int var1, int var2, int var3) { } - public GZipDecompressor() { - this(-1, 1000000, 1000000); - } - - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lkf;[BI)V", - garbageValue = "1327705943" + signature = "(Lky;[BI)V", + garbageValue = "-1662982609" ) @Export("decompress") public void decompress(Buffer var1, byte[] var2) { @@ -50,4 +53,27 @@ public class GZipDecompressor { throw new RuntimeException(""); } } + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(ZI)V", + garbageValue = "-2077179875" + ) + static void method6390(boolean var0) { + Login.Login_response1 = ""; + Login.Login_response2 = "Enter your username/email & password."; + Login.Login_response3 = ""; + Login.loginIndex = 2; + if (var0) { + Login.Login_password = ""; + } + + ItemContainer.method1120(); + 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/GameObject.java b/runescape-client/src/main/java/GameObject.java index 998d380936..6090a85fe4 100644 --- a/runescape-client/src/main/java/GameObject.java +++ b/runescape-client/src/main/java/GameObject.java @@ -4,89 +4,100 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("es") +@ObfuscatedName("ej") @Implements("GameObject") public final class GameObject { - @ObfuscatedName("q") + @ObfuscatedName("sg") + @ObfuscatedSignature( + signature = "Lic;" + ) + public static class237 field1921; + @ObfuscatedName("dg") + @ObfuscatedSignature( + signature = "Lid;" + ) + @Export("archive10") + static Archive archive10; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1570301061 + intValue = 744501361 ) @Export("plane") int plane; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1372995053 + intValue = 2026651009 ) @Export("height") int height; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 3597047 + intValue = -500411517 ) @Export("centerX") int centerX; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1286023919 + intValue = -560576891 ) @Export("centerY") int centerY; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Leo;" + signature = "Len;" ) @Export("entity") public Entity entity; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1679497939 + intValue = 939156699 ) @Export("orientation") int orientation; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 2072838249 + intValue = 86850281 ) @Export("startX") int startX; - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1679068867 + intValue = -698919929 ) @Export("endX") int endX; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1593954751 + intValue = 1676112193 ) @Export("startY") int startY; - @ObfuscatedName("f") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 614764075 + intValue = 2114738955 ) @Export("endY") int endY; - @ObfuscatedName("m") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -2081842773 + intValue = -1792624973 ) - int field1939; - @ObfuscatedName("u") + int field1916; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1806951057 + intValue = 1739525873 ) @Export("lastDrawn") int lastDrawn; - @ObfuscatedName("x") + @ObfuscatedName("r") @ObfuscatedGetter( - longValue = -3308425322664563893L + longValue = 7927595607641920085L ) @Export("tag") public long tag; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -320745509 + intValue = 692610593 ) @Export("flags") int flags; @@ -96,13 +107,25 @@ public final class GameObject { this.flags = 0; } + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;ZZI)V", + garbageValue = "-1828723850" + ) + @Export("openURL") + public static void openURL(String var0, boolean var1, boolean var2) { + StudioGame.method4056(var0, var1, "openjs", var2); + } + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lhp;Lhp;III)Lke;", - garbageValue = "-1252480817" + signature = "(II)I", + garbageValue = "-2110373438" ) - @Export("SpriteBuffer_getFont") - public static Font SpriteBuffer_getFont(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { - return !Friend.SpriteBuffer_bufferFile(var0, var2, var3) ? null : WallDecoration.SpriteBuffer_createFont(var1.takeFile(var2, var3)); + @Export("ViewportMouse_unpackY") + public static int ViewportMouse_unpackY(int var0) { + long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; + int var1 = (int)(var2 >>> 7 & 127L); + return var1; } } diff --git a/runescape-client/src/main/java/GameShell.java b/runescape-client/src/main/java/GameShell.java index 40185fee2b..4ffa40c5c2 100644 --- a/runescape-client/src/main/java/GameShell.java +++ b/runescape-client/src/main/java/GameShell.java @@ -17,175 +17,193 @@ import java.awt.event.FocusListener; import java.awt.event.WindowEvent; import java.awt.event.WindowListener; import java.awt.image.ImageObserver; +import java.io.File; +import java.io.RandomAccessFile; 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("bz") +@ObfuscatedName("bw") @Implements("GameShell") public abstract class GameShell extends Applet implements Runnable, FocusListener, WindowListener { - @ObfuscatedName("q") + @ObfuscatedName("ra") + @ObfuscatedGetter( + intValue = 714484919 + ) + static int field446; + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lfs;" + signature = "Lfu;" ) @Export("taskHandler") protected static TaskHandler taskHandler; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lbz;" + signature = "Lbw;" ) @Export("gameShell") static GameShell gameShell; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 308300489 + intValue = 2058939599 ) @Export("GameShell_redundantStartThreadCount") static int GameShell_redundantStartThreadCount; @ObfuscatedName("k") @ObfuscatedGetter( - longValue = -2144214957557478601L + longValue = -5623486627210401515L ) @Export("stopTimeMs") static long stopTimeMs; - @ObfuscatedName("l") + @ObfuscatedName("u") @Export("isKilled") static boolean isKilled; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 658052799 + intValue = -205705569 ) - static int field449; - @ObfuscatedName("c") + protected static int field413; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 798302801 + intValue = 1354464911 ) @Export("cycleDurationMillis") static int cycleDurationMillis; - @ObfuscatedName("f") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 369880599 + intValue = -986211423 ) @Export("fiveOrOne") static int fiveOrOne; - @ObfuscatedName("m") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1519220993 + intValue = 1118839049 ) @Export("fps") protected static int fps; - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lfu;" + signature = "Lfs;" ) @Export("clock") - static Clock clock; - @ObfuscatedName("v") - static long[] field452; - @ObfuscatedName("a") - static long[] field453; - @ObfuscatedName("ae") + protected static Clock clock; + @ObfuscatedName("p") + protected static long[] field423; + @ObfuscatedName("g") + protected static long[] field417; + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 1067662057 + intValue = 868948239 ) - static int field465; - @ObfuscatedName("au") + static int field436; + @ObfuscatedName("aq") @Export("volatileFocus") static volatile boolean volatileFocus; - @ObfuscatedName("ah") + @ObfuscatedName("al") @ObfuscatedGetter( - longValue = -5454616642198733289L + longValue = -299899639913478455L ) @Export("garbageCollectorLastCollectionTime") static long garbageCollectorLastCollectionTime; - @ObfuscatedName("am") + @ObfuscatedName("ah") @ObfuscatedGetter( - longValue = -449195260368923757L + longValue = 3151603748493899241L ) @Export("garbageCollectorLastCheckTimeMs") static long garbageCollectorLastCheckTimeMs; - @ObfuscatedName("b") + @ObfuscatedName("dk") + @ObfuscatedSignature( + signature = "Lid;" + ) + @Export("archive12") + static Archive archive12; + @ObfuscatedName("eg") + @ObfuscatedGetter( + intValue = -225444477 + ) + static int field425; + @ObfuscatedName("n") @Export("hasErrored") boolean hasErrored; - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 93625917 + intValue = -2070164479 ) @Export("contentWidth") protected int contentWidth; - @ObfuscatedName("h") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1254319767 + intValue = -1790253551 ) @Export("contentHeight") protected int contentHeight; - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 508992057 + intValue = -1852258925 ) @Export("canvasX") int canvasX; - @ObfuscatedName("n") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -374740257 + intValue = 115241741 ) @Export("canvasY") int canvasY; - @ObfuscatedName("z") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1498137065 + intValue = -1396606465 ) - int field476; - @ObfuscatedName("al") - @ObfuscatedGetter( - intValue = -606153011 - ) - int field459; + int field429; @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -107216011 + intValue = 1761285899 + ) + int field428; + @ObfuscatedName("am") + @ObfuscatedGetter( + intValue = 554974645 ) @Export("maxCanvasWidth") int maxCanvasWidth; - @ObfuscatedName("as") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = -559664859 + intValue = 890524941 ) @Export("maxCanvasHeight") int maxCanvasHeight; - @ObfuscatedName("ag") + @ObfuscatedName("aj") @Export("frame") Frame frame; - @ObfuscatedName("ar") + @ObfuscatedName("an") @Export("canvas") java.awt.Canvas canvas; - @ObfuscatedName("ax") - volatile boolean field464; + @ObfuscatedName("at") + volatile boolean field435; @ObfuscatedName("ao") @Export("resizeCanvasNextFrame") boolean resizeCanvasNextFrame; - @ObfuscatedName("aj") + @ObfuscatedName("ac") @Export("isCanvasInvalid") volatile boolean isCanvasInvalid; - @ObfuscatedName("at") + @ObfuscatedName("ar") @ObfuscatedGetter( - longValue = -2360419381324286669L + longValue = -267626387501554735L ) - @Export("lastDrawnTime") - volatile long lastDrawnTime; - @ObfuscatedName("aq") + volatile long field424; + @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "Lau;" + signature = "Laq;" ) @Export("mouseWheelHandler") MouseWheelHandler mouseWheelHandler; @ObfuscatedName("aa") @Export("clipboard") Clipboard clipboard; - @ObfuscatedName("an") + @ObfuscatedName("ap") @Export("eventQueue") final EventQueue eventQueue; @@ -197,9 +215,9 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene cycleDurationMillis = 20; fiveOrOne = 1; fps = 0; - field452 = new long[32]; - field453 = new long[32]; - field465 = 500; + field423 = new long[32]; + field417 = new long[32]; + field436 = 500; volatileFocus = true; garbageCollectorLastCollectionTime = -1L; garbageCollectorLastCheckTimeMs = -1L; @@ -209,10 +227,10 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.hasErrored = false; this.canvasX = 0; this.canvasY = 0; - this.field464 = true; + this.field435 = true; this.resizeCanvasNextFrame = false; this.isCanvasInvalid = false; - this.lastDrawnTime = 0L; + this.field424 = 0L; EventQueue var1 = null; try { @@ -221,49 +239,47 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } this.eventQueue = var1; - DevicePcmPlayerProvider var2 = new DevicePcmPlayerProvider(); - class32.pcmPlayerProvider = var2; + ViewportMouse.method2891(new DevicePcmPlayerProvider()); } - @ObfuscatedName("e") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "34519869" + garbageValue = "1609844156" ) @Export("setMaxCanvasSize") protected final void setMaxCanvasSize(int var1, int var2) { if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { - this.method890(); + this.method880(); } this.maxCanvasWidth = var1; this.maxCanvasHeight = var2; } - @ObfuscatedName("p") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(Ljava/lang/Object;I)V", - garbageValue = "1151565468" + garbageValue = "1177266220" ) @Export("post") final void post(Object var1) { - if (this.eventQueue == null) { - return; - } - for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { - EnumDefinition.sleepMillis(1L); - } + if (this.eventQueue != null) { + for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { + UserList.sleepMillis(1L); + } - if (var1 != null) { - this.eventQueue.postEvent(new ActionEvent(var1, 1001, "dummy")); - } + if (var1 != null) { + this.eventQueue.postEvent(new ActionEvent(var1, 1001, "dummy")); + } + } } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(B)Lfj;", - garbageValue = "24" + signature = "(B)Lfo;", + garbageValue = "61" ) @Export("mouseWheel") protected MouseWheel mouseWheel() { @@ -275,30 +291,30 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene return this.mouseWheelHandler; } - @ObfuscatedName("l") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-661756545" + signature = "(B)V", + garbageValue = "0" ) @Export("setUpClipboard") protected void setUpClipboard() { this.clipboard = this.getToolkit().getSystemClipboard(); } - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "54" + signature = "(Ljava/lang/String;I)V", + garbageValue = "976986957" ) @Export("clipboardSetString") protected void clipboardSetString(String var1) { this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); } - @ObfuscatedName("i") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-454668122" + garbageValue = "406545365" ) @Export("setUpKeyboard") protected final void setUpKeyboard() { @@ -330,146 +346,146 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene KeyHandler.KeyHandler_keyCodes[520] = 59; } - class81.method1990(this.canvas); + java.awt.Canvas var1 = this.canvas; + var1.setFocusTraversalKeysEnabled(false); + var1.addKeyListener(KeyHandler.KeyHandler_instance); + var1.addFocusListener(KeyHandler.KeyHandler_instance); } @ObfuscatedName("c") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1746094131" + garbageValue = "-1643960217" ) @Export("setUpMouse") protected final void setUpMouse() { - WorldMapIcon_0.method200(this.canvas); + SecureRandomFuture.method2061(this.canvas); } - @ObfuscatedName("u") + @ObfuscatedName("r") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-517749579" + garbageValue = "-1946782906" ) @Export("resizeCanvas") final void resizeCanvas() { Container var1 = this.container(); - if (var1 == null) { - return; - } - Bounds var2 = this.getFrameContentBounds(); - this.contentWidth = Math.max(var2.highX, this.field476); - this.contentHeight = Math.max(var2.highY, this.field459); - if (this.contentWidth <= 0) { - this.contentWidth = 1; - } + if (var1 != null) { + Bounds var2 = this.getFrameContentBounds(); + this.contentWidth = Math.max(var2.highX, this.field429); + this.contentHeight = Math.max(var2.highY, this.field428); + if (this.contentWidth <= 0) { + this.contentWidth = 1; + } - if (this.contentHeight <= 0) { - this.contentHeight = 1; - } + if (this.contentHeight <= 0) { + this.contentHeight = 1; + } - GrandExchangeEvent.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); - ParamDefinition.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); - this.canvasX = (this.contentWidth - GrandExchangeEvent.canvasWidth) / 2; - this.canvasY = 0; - this.canvas.setSize(GrandExchangeEvent.canvasWidth, ParamDefinition.canvasHeight); - MusicPatchPcmStream.rasterProvider = new RasterProvider(GrandExchangeEvent.canvasWidth, ParamDefinition.canvasHeight, this.canvas); - if (var1 == this.frame) { - Insets var3 = this.frame.getInsets(); - this.canvas.setLocation(var3.left + this.canvasX, this.canvasY + var3.top); - } else { - this.canvas.setLocation(this.canvasX, this.canvasY); - } + KitDefinition.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); + class30.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); + this.canvasX = (this.contentWidth - KitDefinition.canvasWidth) / 2; + this.canvasY = 0; + this.canvas.setSize(KitDefinition.canvasWidth, class30.canvasHeight); + SpotAnimationDefinition.rasterProvider = new RasterProvider(KitDefinition.canvasWidth, class30.canvasHeight, this.canvas); + if (var1 == this.frame) { + Insets var3 = this.frame.getInsets(); + this.canvas.setLocation(var3.left + this.canvasX, var3.top + this.canvasY); + } else { + this.canvas.setLocation(this.canvasX, this.canvasY); + } - this.field464 = true; - this.resizeGame(); + this.field435 = true; + this.resizeGame(); + } } - @ObfuscatedName("x") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "869486116" + garbageValue = "-1917236425" ) @Export("resizeGame") protected abstract void resizeGame(); - @ObfuscatedName("r") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-42" + signature = "(I)V", + garbageValue = "159297486" ) @Export("clearBackground") void clearBackground() { int var1 = this.canvasX; int var2 = this.canvasY; - int var3 = this.contentWidth - GrandExchangeEvent.canvasWidth - var1; - int var4 = this.contentHeight - ParamDefinition.canvasHeight - var2; - if (var1 <= 0 && var3 <= 0 && var2 <= 0 && var4 <= 0) { - return; - } - try { - Container var5 = this.container(); - int var6 = 0; - int var7 = 0; - if (var5 == this.frame) { - Insets var8 = this.frame.getInsets(); - var6 = var8.left; - var7 = var8.top; - } + int var3 = this.contentWidth - KitDefinition.canvasWidth - var1; + int var4 = this.contentHeight - class30.canvasHeight - var2; + if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { + try { + Container var5 = this.container(); + int var6 = 0; + int var7 = 0; + if (var5 == this.frame) { + Insets var8 = this.frame.getInsets(); + var6 = var8.left; + var7 = var8.top; + } - Graphics var10 = var5.getGraphics(); - var10.setColor(Color.black); - if (var1 > 0) { - var10.fillRect(var6, var7, var1, this.contentHeight); - } + Graphics var10 = var5.getGraphics(); + var10.setColor(Color.black); + if (var1 > 0) { + var10.fillRect(var6, var7, var1, this.contentHeight); + } - if (var2 > 0) { - var10.fillRect(var6, var7, this.contentWidth, var2); - } + if (var2 > 0) { + var10.fillRect(var6, var7, this.contentWidth, var2); + } - if (var3 > 0) { - var10.fillRect(var6 + this.contentWidth - var3, var7, var3, this.contentHeight); - } + if (var3 > 0) { + var10.fillRect(var6 + this.contentWidth - var3, var7, var3, this.contentHeight); + } - if (var4 > 0) { - var10.fillRect(var6, var7 + this.contentHeight - var4, this.contentWidth, var4); + if (var4 > 0) { + var10.fillRect(var6, var7 + this.contentHeight - var4, this.contentWidth, var4); + } + } catch (Exception var9) { } - } catch (Exception var9) { } } - @ObfuscatedName("v") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "165240301" + garbageValue = "-715138989" ) @Export("replaceCanvas") final void replaceCanvas() { - java.awt.Canvas var1 = this.canvas; - var1.removeKeyListener(KeyHandler.KeyHandler_instance); - var1.removeFocusListener(KeyHandler.KeyHandler_instance); - KeyHandler.field398 = -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; + ParamDefinition.method4420(this.canvas); + class195.method3629(this.canvas); if (this.mouseWheelHandler != null) { this.mouseWheelHandler.removeFrom(this.canvas); } this.addCanvas(); - class81.method1990(this.canvas); - WorldMapIcon_0.method200(this.canvas); + java.awt.Canvas var1 = this.canvas; + var1.setFocusTraversalKeysEnabled(false); + var1.addKeyListener(KeyHandler.KeyHandler_instance); + var1.addFocusListener(KeyHandler.KeyHandler_instance); + java.awt.Canvas var2 = this.canvas; + var2.addMouseListener(MouseHandler.MouseHandler_instance); + var2.addMouseMotionListener(MouseHandler.MouseHandler_instance); + var2.addFocusListener(MouseHandler.MouseHandler_instance); if (this.mouseWheelHandler != null) { this.mouseWheelHandler.addTo(this.canvas); } - this.method890(); + this.method880(); } - @ObfuscatedName("y") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(IIII)V", - garbageValue = "-1542260379" + signature = "(IIIB)V", + garbageValue = "-56" ) @Export("startThread") protected final void startThread(int var1, int var2, int var3) { @@ -486,9 +502,9 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } gameShell = this; - GrandExchangeEvent.canvasWidth = var1; - ParamDefinition.canvasHeight = var2; - RunException.RunException_revision = var3; + KitDefinition.canvasWidth = var1; + class30.canvasHeight = var2; + class208.RunException_revision = var3; RunException.RunException_applet = this; if (taskHandler == null) { taskHandler = new TaskHandler(); @@ -496,16 +512,16 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene taskHandler.newThreadTask(this, 1); } catch (Exception var5) { - HitSplatDefinition.RunException_sendStackTrace((String)null, var5); + class3.RunException_sendStackTrace((String)null, var5); this.error("crash"); } } - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1073262022" + garbageValue = "5178053" ) @Export("addCanvas") final synchronized void addCanvas() { @@ -515,20 +531,20 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene var1.remove(this.canvas); } - GrandExchangeEvent.canvasWidth = Math.max(var1.getWidth(), this.field476); - ParamDefinition.canvasHeight = Math.max(var1.getHeight(), this.field459); + KitDefinition.canvasWidth = Math.max(var1.getWidth(), this.field429); + class30.canvasHeight = Math.max(var1.getHeight(), this.field428); Insets var2; if (this.frame != null) { var2 = this.frame.getInsets(); - GrandExchangeEvent.canvasWidth -= var2.right + var2.left; - ParamDefinition.canvasHeight -= var2.top + var2.bottom; + KitDefinition.canvasWidth -= var2.right + var2.left; + class30.canvasHeight -= var2.bottom + var2.top; } this.canvas = new Canvas(this); var1.setBackground(Color.BLACK); var1.setLayout((LayoutManager)null); var1.add(this.canvas); - this.canvas.setSize(GrandExchangeEvent.canvasWidth, ParamDefinition.canvasHeight); + this.canvas.setSize(KitDefinition.canvasWidth, class30.canvasHeight); this.canvas.setVisible(true); this.canvas.setBackground(Color.BLACK); if (var1 == this.frame) { @@ -540,90 +556,94 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.canvas.addFocusListener(this); this.canvas.requestFocus(); - this.field464 = true; - if (MusicPatchPcmStream.rasterProvider != null && GrandExchangeEvent.canvasWidth == MusicPatchPcmStream.rasterProvider.width && ParamDefinition.canvasHeight == MusicPatchPcmStream.rasterProvider.height) { - ((RasterProvider)MusicPatchPcmStream.rasterProvider).setComponent(this.canvas); - MusicPatchPcmStream.rasterProvider.drawFull(0, 0); + this.field435 = true; + if (SpotAnimationDefinition.rasterProvider != null && KitDefinition.canvasWidth == SpotAnimationDefinition.rasterProvider.width && class30.canvasHeight == SpotAnimationDefinition.rasterProvider.height) { + ((RasterProvider)SpotAnimationDefinition.rasterProvider).setComponent(this.canvas); + SpotAnimationDefinition.rasterProvider.drawFull(0, 0); } else { - MusicPatchPcmStream.rasterProvider = new RasterProvider(GrandExchangeEvent.canvasWidth, ParamDefinition.canvasHeight, this.canvas); + SpotAnimationDefinition.rasterProvider = new RasterProvider(KitDefinition.canvasWidth, class30.canvasHeight, this.canvas); } this.isCanvasInvalid = false; - this.lastDrawnTime = DirectByteArrayCopier.currentTimeMs(); + this.field424 = SequenceDefinition.method4686(); } - @ObfuscatedName("a") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-878010075" + garbageValue = "2140072733" ) @Export("checkHost") protected final boolean checkHost() { String var1 = this.getDocumentBase().getHost().toLowerCase(); - if (var1.equals("jagex.com") || var1.endsWith(".jagex.com")) { - return true; - } - if (var1.equals("runescape.com") || var1.endsWith(".runescape.com")) { - return true; - } - if (var1.endsWith("127.0.0.1")) { - return true; - } - while (var1.length() > 0 && var1.charAt(var1.length() - 1) >= '0' && var1.charAt(var1.length() - 1) <= '9') { - var1 = var1.substring(0, var1.length() - 1); - } + if (!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) { + if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) { + if (var1.endsWith("127.0.0.1")) { + return true; + } else { + while (var1.length() > 0 && var1.charAt(var1.length() - 1) >= '0' && var1.charAt(var1.length() - 1) <= '9') { + var1 = var1.substring(0, var1.length() - 1); + } - if (var1.endsWith("192.168.1.")) { + if (var1.endsWith("192.168.1.")) { + return true; + } else { + this.error("invalidhost"); + return false; + } + } + } else { + return true; + } + } else { return true; } - this.error("invalidhost"); - return false; } - @ObfuscatedName("j") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1989434416" + garbageValue = "276918533" ) - void method953() { - long var1 = DirectByteArrayCopier.currentTimeMs(); - long var3 = field453[SpotAnimationDefinition.field3248]; - field453[SpotAnimationDefinition.field3248] = var1; - SpotAnimationDefinition.field3248 = SpotAnimationDefinition.field3248 + 1 & 31; + void method877() { + long var1 = SequenceDefinition.method4686(); + long var3 = field417[class319.field3846]; + field417[class319.field3846] = var1; + class319.field3846 = class319.field3846 + 1 & 31; if (var3 != 0L && var1 > var3) { } synchronized(this) { - class267.hasFocus = volatileFocus; + class3.hasFocus = volatileFocus; } this.doCycle(); } - @ObfuscatedName("s") + @ObfuscatedName("av") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1190727122" + garbageValue = "-1961975804" ) - void method910() { + void method878() { Container var1 = this.container(); - long var2 = DirectByteArrayCopier.currentTimeMs(); - long var4 = field452[VerticalAlignment.field3192]; - field452[VerticalAlignment.field3192] = var2; - VerticalAlignment.field3192 = VerticalAlignment.field3192 + 1 & 31; + long var2 = SequenceDefinition.method4686(); + long var4 = field423[class40.field330]; + field423[class40.field330] = var2; + class40.field330 = class40.field330 + 1 & 31; if (0L != var4 && var2 > var4) { int var6 = (int)(var2 - var4); fps = ((var6 >> 1) + 32000) / var6; } - if (++field465 - 1 > 50) { - field465 -= 50; - this.field464 = true; - this.canvas.setSize(GrandExchangeEvent.canvasWidth, ParamDefinition.canvasHeight); + if (++field436 - 1 > 50) { + field436 -= 50; + this.field435 = true; + this.canvas.setSize(KitDefinition.canvasWidth, class30.canvasHeight); this.canvas.setVisible(true); if (var1 == this.frame) { Insets var7 = this.frame.getInsets(); - this.canvas.setLocation(this.canvasX + var7.left, var7.top + this.canvasY); + this.canvas.setLocation(this.canvasX + var7.left, this.canvasY + var7.top); } else { this.canvas.setLocation(this.canvasX, this.canvasY); } @@ -633,158 +653,157 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.replaceCanvas(); } - this.method970(); - this.draw(this.field464); - if (this.field464) { + this.method925(); + this.draw(this.field435); + if (this.field435) { this.clearBackground(); } - this.field464 = false; + this.field435 = false; } - @ObfuscatedName("z") + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-2058666477" + signature = "(B)V", + garbageValue = "63" ) - final void method970() { + final void method925() { Bounds var1 = this.getFrameContentBounds(); - if (this.contentWidth != var1.highX || var1.highY != this.contentHeight || this.resizeCanvasNextFrame) { + if (this.contentWidth != var1.highX || this.contentHeight != var1.highY || this.resizeCanvasNextFrame) { this.resizeCanvas(); this.resizeCanvasNextFrame = false; } } - @ObfuscatedName("al") + @ObfuscatedName("ai") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "501361759" + garbageValue = "-1905198552" ) - final void method890() { + final void method880() { this.resizeCanvasNextFrame = true; } - @ObfuscatedName("av") + @ObfuscatedName("af") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "-95" + garbageValue = "-97" ) @Export("kill") final synchronized void kill() { - if (isKilled) { - return; - } - isKilled = true; + if (!isKilled) { + isKilled = true; - try { - this.canvas.removeFocusListener(this); - } catch (Exception var5) { - } - - try { - this.kill0(); - } catch (Exception var4) { - } - - if (this.frame != null) { try { - System.exit(0); - } catch (Throwable var3) { + this.canvas.removeFocusListener(this); + } catch (Exception var5) { } - } - if (taskHandler != null) { try { - taskHandler.close(); - } catch (Exception var2) { + this.kill0(); + } catch (Exception var4) { } - } - this.vmethod1273(); + if (this.frame != null) { + try { + System.exit(0); + } catch (Throwable var3) { + } + } + + if (taskHandler != null) { + try { + taskHandler.close(); + } catch (Exception var2) { + } + } + + this.vmethod1655(); + } } - @ObfuscatedName("aw") + @ObfuscatedName("az") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "2070235141" + garbageValue = "-1264140224" ) @Export("setUp") protected abstract void setUp(); - @ObfuscatedName("ad") + @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-3" + signature = "(I)V", + garbageValue = "712398470" ) @Export("doCycle") protected abstract void doCycle(); - @ObfuscatedName("ag") + @ObfuscatedName("an") @ObfuscatedSignature( - signature = "(ZB)V", - garbageValue = "-5" + signature = "(ZI)V", + garbageValue = "2115085971" ) @Export("draw") protected abstract void draw(boolean var1); - @ObfuscatedName("ar") + @ObfuscatedName("at") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1344457794" + garbageValue = "1993845226" ) @Export("kill0") protected abstract void kill0(); - @ObfuscatedName("ax") + @ObfuscatedName("as") @ObfuscatedSignature( - signature = "(ILjava/lang/String;ZB)V", - garbageValue = "-111" + signature = "(ILjava/lang/String;ZI)V", + garbageValue = "-1643615386" ) @Export("drawInitial") protected final void drawInitial(int var1, String var2, boolean var3) { try { Graphics var4 = this.canvas.getGraphics(); - if (class313.fontHelvetica13 == null) { - class313.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); - GrandExchangeOfferAgeComparator.loginScreenFontMetrics = this.canvas.getFontMetrics(class313.fontHelvetica13); + if (WorldMapData_1.fontHelvetica13 == null) { + WorldMapData_1.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); + HealthBarUpdate.loginScreenFontMetrics = this.canvas.getFontMetrics(WorldMapData_1.fontHelvetica13); } if (var3) { var4.setColor(Color.black); - var4.fillRect(0, 0, GrandExchangeEvent.canvasWidth, ParamDefinition.canvasHeight); + var4.fillRect(0, 0, KitDefinition.canvasWidth, class30.canvasHeight); } Color var5 = new Color(140, 17, 17); try { - if (NetFileRequest.field3125 == null) { - NetFileRequest.field3125 = this.canvas.createImage(304, 34); + if (GrandExchangeOfferUnitPriceComparator.field74 == null) { + GrandExchangeOfferUnitPriceComparator.field74 = this.canvas.createImage(304, 34); } - Graphics var6 = NetFileRequest.field3125.getGraphics(); + Graphics var6 = GrandExchangeOfferUnitPriceComparator.field74.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(class313.fontHelvetica13); + var6.setFont(WorldMapData_1.fontHelvetica13); var6.setColor(Color.white); - var6.drawString(var2, (304 - GrandExchangeOfferAgeComparator.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); - var4.drawImage(NetFileRequest.field3125, GrandExchangeEvent.canvasWidth / 2 - 152, ParamDefinition.canvasHeight / 2 - 18, (ImageObserver)null); + var6.drawString(var2, (304 - HealthBarUpdate.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); + var4.drawImage(GrandExchangeOfferUnitPriceComparator.field74, KitDefinition.canvasWidth / 2 - 152, class30.canvasHeight / 2 - 18, (ImageObserver)null); } catch (Exception var9) { - int var7 = GrandExchangeEvent.canvasWidth / 2 - 152; - int var8 = ParamDefinition.canvasHeight / 2 - 18; + int var7 = KitDefinition.canvasWidth / 2 - 152; + int var8 = class30.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(class313.fontHelvetica13); + var4.fillRect(var1 * 3 + var7 + 2, var8 + 2, 300 - var1 * 3, 30); + var4.setFont(WorldMapData_1.fontHelvetica13); var4.setColor(Color.white); - var4.drawString(var2, var7 + (304 - GrandExchangeOfferAgeComparator.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); + var4.drawString(var2, var7 + (304 - HealthBarUpdate.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); } } catch (Exception var10) { this.canvas.repaint(); @@ -792,89 +811,96 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } - @ObfuscatedName("az") + @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "11" + signature = "(I)V", + garbageValue = "-1281252486" ) - protected final void method885() { - NetFileRequest.field3125 = null; - class313.fontHelvetica13 = null; - GrandExchangeOfferAgeComparator.loginScreenFontMetrics = null; - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "-54" - ) - @Export("error") - protected void error(String var1) { - if (this.hasErrored) { - return; - } - this.hasErrored = true; - System.out.println("error_game_" + var1); - - try { - this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); - } catch (Exception var3) { - } - + protected final void method891() { + GrandExchangeOfferUnitPriceComparator.field74 = null; + WorldMapData_1.fontHelvetica13 = null; + HealthBarUpdate.loginScreenFontMetrics = null; } @ObfuscatedName("ao") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)V", + garbageValue = "-1919436562" + ) + @Export("error") + protected void error(String var1) { + if (!this.hasErrored) { + this.hasErrored = true; + System.out.println("error_game_" + var1); + + try { + this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); + } catch (Exception var3) { + } + + } + } + + @ObfuscatedName("ac") @ObfuscatedSignature( signature = "(I)Ljava/awt/Container;", - garbageValue = "2083877937" + garbageValue = "-133476889" ) @Export("container") Container container() { return (Container)(this.frame != null ? this.frame : this); } - @ObfuscatedName("aj") + @ObfuscatedName("ar") @ObfuscatedSignature( - signature = "(I)Lls;", - garbageValue = "-357178622" + signature = "(B)Llh;", + garbageValue = "0" ) @Export("getFrameContentBounds") Bounds getFrameContentBounds() { Container var1 = this.container(); - int var2 = Math.max(var1.getWidth(), this.field476); - int var3 = Math.max(var1.getHeight(), this.field459); + int var2 = Math.max(var1.getWidth(), this.field429); + int var3 = Math.max(var1.getHeight(), this.field428); if (this.frame != null) { Insets var4 = this.frame.getInsets(); - var2 -= var4.left + var4.right; + var2 -= var4.right + var4.left; var3 -= var4.bottom + var4.top; } return new Bounds(var2, var3); } - @ObfuscatedName("at") + @ObfuscatedName("au") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "285080873" + garbageValue = "-1028625375" ) @Export("hasFrame") protected final boolean hasFrame() { return this.frame != null; } - @ObfuscatedName("ap") + @ObfuscatedName("ag") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-779141254" + garbageValue = "1142845100" ) - protected abstract void vmethod1273(); + protected abstract void vmethod1655(); + + public final void destroy() { + if (this == gameShell && !isKilled) { + stopTimeMs = SequenceDefinition.method4686(); + UserList.sleepMillis(5000L); + this.kill(); + } + } public final synchronized void paint(Graphics var1) { if (this == gameShell && !isKilled) { - this.field464 = true; - if (DirectByteArrayCopier.currentTimeMs() - this.lastDrawnTime > 1000L) { + this.field435 = true; + if (SequenceDefinition.method4686() - this.field424 > 1000L) { Rectangle var2 = var1.getClipBounds(); - if (var2 == null || var2.width >= GrandExchangeEvent.canvasWidth && var2.height >= ParamDefinition.canvasHeight) { + if (var2 == null || var2.width >= KitDefinition.canvasWidth && var2.height >= class30.canvasHeight) { this.isCanvasInvalid = true; } } @@ -882,14 +908,49 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } - public final void destroy() { + public final void start() { if (this == gameShell && !isKilled) { - stopTimeMs = DirectByteArrayCopier.currentTimeMs(); - EnumDefinition.sleepMillis(5000L); - this.kill(); + stopTimeMs = 0L; } } + public final void stop() { + if (this == gameShell && !isKilled) { + stopTimeMs = SequenceDefinition.method4686() + 4000L; + } + } + + public final void focusGained(FocusEvent var1) { + volatileFocus = true; + this.field435 = true; + } + + public final void focusLost(FocusEvent var1) { + volatileFocus = false; + } + + public final void windowClosing(WindowEvent var1) { + this.destroy(); + } + + public final void windowClosed(WindowEvent var1) { + } + + public final void windowDeiconified(WindowEvent var1) { + } + + public final void update(Graphics var1) { + this.paint(var1); + } + + public final void windowOpened(WindowEvent var1) { + } + + public abstract void init(); + + public final void windowIconified(WindowEvent var1) { + } + public void run() { try { if (TaskHandler.javaVendor != null) { @@ -903,11 +964,11 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene if (var2.startsWith("1.6.0_")) { int var3; - for (var3 = 6; var3 < var2.length() && class49.isDigit(var2.charAt(var3)); ++var3) { + for (var3 = 6; var3 < var2.length() && NetCache.isDigit(var2.charAt(var3)); ++var3) { } String var4 = var2.substring(6, var3); - if (class192.isNumber(var4) && class3.parseInt(var4) < 10) { + if (TaskHandler.isNumber(var4) && WallDecoration.parseInt(var4) < 10) { this.error("wrongjava"); return; } @@ -920,95 +981,174 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.setFocusCycleRoot(true); this.addCanvas(); this.setUp(); - clock = class173.newClock(); + clock = Bounds.newClock(); - while (0L == stopTimeMs || DirectByteArrayCopier.currentTimeMs() < stopTimeMs) { - field449 = clock.wait(cycleDurationMillis, fiveOrOne); + while (stopTimeMs == 0L || SequenceDefinition.method4686() < stopTimeMs) { + field413 = clock.wait(cycleDurationMillis, fiveOrOne); - for (int var5 = 0; var5 < field449; ++var5) { - this.method953(); + for (int var5 = 0; var5 < field413; ++var5) { + this.method877(); } - this.method910(); + this.method878(); this.post(this.canvas); } } catch (Exception var6) { - HitSplatDefinition.RunException_sendStackTrace((String)null, var6); + class3.RunException_sendStackTrace((String)null, var6); this.error("crash"); } this.kill(); } - public final void windowDeiconified(WindowEvent var1) { - } - - public final void start() { - if (this == gameShell && !isKilled) { - stopTimeMs = 0L; - } - } - - public final void stop() { - if (this == gameShell && !isKilled) { - stopTimeMs = DirectByteArrayCopier.currentTimeMs() + 4000L; - } - } - - public final void update(Graphics var1) { - this.paint(var1); - } - - public final void focusGained(FocusEvent var1) { - volatileFocus = true; - this.field464 = true; - } - - public final void focusLost(FocusEvent var1) { - volatileFocus = false; - } - public final void windowActivated(WindowEvent var1) { } - public final void windowClosed(WindowEvent var1) { - } - - public final void windowClosing(WindowEvent var1) { - this.destroy(); - } - public final void windowDeactivated(WindowEvent var1) { } - public final void windowOpened(WindowEvent var1) { - } - - public final void windowIconified(WindowEvent var1) { - } - - public abstract void init(); - - @ObfuscatedName("w") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(IB)Lij;", - garbageValue = "-91" + signature = "(II)Lif;", + garbageValue = "-2072465026" ) - @Export("getNpcDefinition") - public static NPCDefinition getNpcDefinition(int var0) { - NPCDefinition var1 = (NPCDefinition)NPCDefinition.NpcDefinition_cached.get((long)var0); + @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 = class297.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; } - byte[] var2 = NPCDefinition.NpcDefinition_archive.takeFile(9, var0); - var1 = new NPCDefinition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(I[BLkv;I)V", + garbageValue = "-651832532" + ) + static void method1005(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); } - var1.postDecode(); - NPCDefinition.NpcDefinition_cached.put(var1, (long)var0); - return var1; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { + if (ArchiveDiskActionHandler.field3124 == 0) { + class13.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); + class13.ArchiveDiskActionHandler_thread.setDaemon(true); + class13.ArchiveDiskActionHandler_thread.start(); + class13.ArchiveDiskActionHandler_thread.setPriority(5); + } + + ArchiveDiskActionHandler.field3124 = 600; + } + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(Ljava/io/File;ZB)Z", + garbageValue = "1" + ) + @Export("testReadWritePermissions") + public static boolean testReadWritePermissions(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; + } + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(I)[Lls;", + garbageValue = "-575278819" + ) + static Sprite[] method897() { + Sprite[] var0 = new Sprite[class325.SpriteBuffer_spriteCount]; + + for (int var1 = 0; var1 < class325.SpriteBuffer_spriteCount; ++var1) { + Sprite var2 = var0[var1] = new Sprite(); + var2.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth; + var2.height = class325.SpriteBuffer_spriteHeight; + var2.xOffset = class325.SpriteBuffer_xOffsets[var1]; + var2.yOffset = class325.SpriteBuffer_yOffsets[var1]; + var2.subWidth = class325.SpriteBuffer_spriteWidths[var1]; + var2.subHeight = class225.SpriteBuffer_spriteHeights[var1]; + int var3 = var2.subHeight * var2.subWidth; + byte[] var4 = WorldMapSection1.SpriteBuffer_pixels[var1]; + var2.pixels = new int[var3]; + + for (int var5 = 0; var5 < var3; ++var5) { + var2.pixels[var5] = class325.SpriteBuffer_spritePalette[var4[var5] & 255]; + } + } + + UserComparator7.SpriteBuffer_clear(); + return var0; + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "(ILcr;ZI)I", + garbageValue = "853473447" + ) + static int method1003(int var0, Script var1, boolean var2) { + Widget var3 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + if (var0 == ScriptOpcodes.IF_GETX) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.x; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETY) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.y; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.width; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.height; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETHIDE) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETLAYER) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.parentId; + return 1; + } else { + return 2; + } + } + + @ObfuscatedName("id") + @ObfuscatedSignature( + signature = "(III)V", + garbageValue = "153547504" + ) + @Export("resumePauseWidget") + static void resumePauseWidget(int var0, int var1) { + PacketBufferNode var2 = MenuAction.getPacketBufferNode(ClientPacket.field2192, Client.packetWriter.isaacCipher); + var2.packetBuffer.writeIntLE16(var0); + var2.packetBuffer.method5443(var1); + Client.packetWriter.addNode(var2); } } diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index a5e28c59a1..cf3403e5a9 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -1,53 +1,56 @@ +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("i") +@ObfuscatedName("q") @Implements("GrandExchangeEvent") public class GrandExchangeEvent { - @ObfuscatedName("pp") - @Export("ClanChat_inClanChat") - static boolean ClanChat_inClanChat; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 2059259505 - ) - static int field48; @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1493732941 + intValue = 1320136717 ) - @Export("canvasWidth") - public static int canvasWidth; - @ObfuscatedName("q") + static int field50; + @ObfuscatedName("g") + public static String[] field47; + @ObfuscatedName("ad") + @Export("garbageCollector") + static GarbageCollectorMXBean garbageCollector; + @ObfuscatedName("ds") + @ObfuscatedSignature( + signature = "Lid;" + ) + @Export("archive6") + static Archive archive6; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 839136523 + intValue = -997401899 ) @Export("world") public final int world; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - longValue = -2993174266726390291L + longValue = 3311995201519859273L ) @Export("age") public final long age; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lf;" + signature = "Ld;" ) @Export("grandExchangeOffer") public final GrandExchangeOffer grandExchangeOffer; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("offerName") String offerName; - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("previousOfferName") String previousOfferName; @ObfuscatedSignature( - signature = "(Lkf;BI)V" + signature = "(Lky;BI)V" ) GrandExchangeEvent(Buffer var1, byte var2, int var3) { this.offerName = var1.readStringCp1252NullTerminated(); @@ -57,8 +60,8 @@ public class GrandExchangeEvent { int var4 = var1.readInt(); int var5 = var1.readInt(); this.grandExchangeOffer = new GrandExchangeOffer(); - this.grandExchangeOffer.method115(2); - this.grandExchangeOffer.method100(var2); + this.grandExchangeOffer.method108(2); + this.grandExchangeOffer.method124(var2); this.grandExchangeOffer.unitPrice = var4; this.grandExchangeOffer.totalQuantity = var5; this.grandExchangeOffer.currentQuantity = 0; @@ -66,67 +69,675 @@ public class GrandExchangeEvent { this.grandExchangeOffer.id = var3; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(B)Ljava/lang/String;", - garbageValue = "-114" + signature = "(I)Ljava/lang/String;", + garbageValue = "-894568552" ) @Export("getOfferName") public String getOfferName() { return this.offerName; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(S)Ljava/lang/String;", - garbageValue = "27688" + signature = "(I)Ljava/lang/String;", + garbageValue = "1580771980" ) @Export("getPreviousOfferName") public String getPreviousOfferName() { return this.previousOfferName; } - @ObfuscatedName("q") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IB)Lis;", - garbageValue = "1" + signature = "(Lkb;Lkb;Lkb;B)V", + garbageValue = "-43" ) - @Export("SequenceDefinition_get") - public static SequenceDefinition SequenceDefinition_get(int var0) { - SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } - 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("jj") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-583790135" - ) - static final void method73() { - PacketBufferNode var0 = Archive.getPacketBufferNode(ClientPacket.field2223, 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) { - class197.closeInterface(var1, true); + @Export("drawTitle") + static void drawTitle(Font var0, Font var1, Font var2) { + Login.xPadding = (KitDefinition.canvasWidth - 765) / 2; + Login.loginBoxX = Login.xPadding + 202; + Login.loginBoxCenter = Login.loginBoxX + 180; + byte var23; + int var24; + int var27; + int var35; + int var46; + if (Login.worldSelectOpen) { + if (SoundCache.worldSelectBackSprites == null) { + SoundCache.worldSelectBackSprites = class30.method535(class2.archive8, "sl_back", ""); } - } - if (Client.meslayerContinueWidget != null) { - Strings.invalidateWidget(Client.meslayerContinueWidget); - Client.meslayerContinueWidget = null; - } + IndexedSprite[] var7; + IndexedSprite[] var29; + IndexedSprite var30; + Archive var33; + int var34; + int var39; + if (class1.worldSelectFlagSprites == null) { + var33 = class2.archive8; + var35 = var33.getGroupId("sl_flags"); + var34 = var33.getFileId(var35, ""); + if (!World.SpriteBuffer_bufferFile(var33, var35, var34)) { + var7 = null; + } else { + var29 = new IndexedSprite[class325.SpriteBuffer_spriteCount]; + for (var39 = 0; var39 < class325.SpriteBuffer_spriteCount; ++var39) { + var30 = var29[var39] = new IndexedSprite(); + var30.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth; + var30.height = class325.SpriteBuffer_spriteHeight; + var30.xOffset = class325.SpriteBuffer_xOffsets[var39]; + var30.yOffset = class325.SpriteBuffer_yOffsets[var39]; + var30.subWidth = class325.SpriteBuffer_spriteWidths[var39]; + var30.subHeight = class225.SpriteBuffer_spriteHeights[var39]; + var30.palette = class325.SpriteBuffer_spritePalette; + var30.pixels = WorldMapSection1.SpriteBuffer_pixels[var39]; + } + + UserComparator7.SpriteBuffer_clear(); + var7 = var29; + } + + class1.worldSelectFlagSprites = var7; + } + + if (Decimator.worldSelectArrows == null) { + var33 = class2.archive8; + var35 = var33.getGroupId("sl_arrows"); + var34 = var33.getFileId(var35, ""); + if (!World.SpriteBuffer_bufferFile(var33, var35, var34)) { + var7 = null; + } else { + var29 = new IndexedSprite[class325.SpriteBuffer_spriteCount]; + + for (var39 = 0; var39 < class325.SpriteBuffer_spriteCount; ++var39) { + var30 = var29[var39] = new IndexedSprite(); + var30.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth; + var30.height = class325.SpriteBuffer_spriteHeight; + var30.xOffset = class325.SpriteBuffer_xOffsets[var39]; + var30.yOffset = class325.SpriteBuffer_yOffsets[var39]; + var30.subWidth = class325.SpriteBuffer_spriteWidths[var39]; + var30.subHeight = class225.SpriteBuffer_spriteHeights[var39]; + var30.palette = class325.SpriteBuffer_spritePalette; + var30.pixels = WorldMapSection1.SpriteBuffer_pixels[var39]; + } + + UserComparator7.SpriteBuffer_clear(); + var7 = var29; + } + + Decimator.worldSelectArrows = var7; + } + + if (NetFileRequest.worldSelectStars == null) { + var33 = class2.archive8; + var35 = var33.getGroupId("sl_stars"); + var34 = var33.getFileId(var35, ""); + if (!World.SpriteBuffer_bufferFile(var33, var35, var34)) { + var7 = null; + } else { + var29 = new IndexedSprite[class325.SpriteBuffer_spriteCount]; + + for (var39 = 0; var39 < class325.SpriteBuffer_spriteCount; ++var39) { + var30 = var29[var39] = new IndexedSprite(); + var30.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth; + var30.height = class325.SpriteBuffer_spriteHeight; + var30.xOffset = class325.SpriteBuffer_xOffsets[var39]; + var30.yOffset = class325.SpriteBuffer_yOffsets[var39]; + var30.subWidth = class325.SpriteBuffer_spriteWidths[var39]; + var30.subHeight = class225.SpriteBuffer_spriteHeights[var39]; + var30.palette = class325.SpriteBuffer_spritePalette; + var30.pixels = WorldMapSection1.SpriteBuffer_pixels[var39]; + } + + UserComparator7.SpriteBuffer_clear(); + var7 = var29; + } + + NetFileRequest.worldSelectStars = var7; + } + + if (AbstractWorldMapIcon.worldSelectLeftSprite == null) { + AbstractWorldMapIcon.worldSelectLeftSprite = VertexNormal.SpriteBuffer_getIndexedSpriteByName(class2.archive8, "leftarrow", ""); + } + + if (ClanChat.worldSelectRightSprite == null) { + ClanChat.worldSelectRightSprite = VertexNormal.SpriteBuffer_getIndexedSpriteByName(class2.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 (NetFileRequest.worldSelectStars != null) { + NetFileRequest.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); + var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); + NetFileRequest.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); + var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); + } + + if (Decimator.worldSelectArrows != null) { + var46 = Login.xPadding + 280; + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { + Decimator.worldSelectArrows[2].drawAt(var46, 4); + } else { + Decimator.worldSelectArrows[0].drawAt(var46, 4); + } + + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { + Decimator.worldSelectArrows[3].drawAt(var46 + 15, 4); + } else { + Decimator.worldSelectArrows[1].drawAt(var46 + 15, 4); + } + + var0.draw("World", var46 + 32, 17, 16777215, -1); + var24 = Login.xPadding + 390; + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { + Decimator.worldSelectArrows[2].drawAt(var24, 4); + } else { + Decimator.worldSelectArrows[0].drawAt(var24, 4); + } + + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { + Decimator.worldSelectArrows[3].drawAt(var24 + 15, 4); + } else { + Decimator.worldSelectArrows[1].drawAt(var24 + 15, 4); + } + + var0.draw("Players", var24 + 32, 17, 16777215, -1); + var35 = Login.xPadding + 500; + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { + Decimator.worldSelectArrows[2].drawAt(var35, 4); + } else { + Decimator.worldSelectArrows[0].drawAt(var35, 4); + } + + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { + Decimator.worldSelectArrows[3].drawAt(var35 + 15, 4); + } else { + Decimator.worldSelectArrows[1].drawAt(var35 + 15, 4); + } + + var0.draw("Location", var35 + 32, 17, 16777215, -1); + var34 = Login.xPadding + 610; + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { + Decimator.worldSelectArrows[2].drawAt(var34, 4); + } else { + Decimator.worldSelectArrows[0].drawAt(var34, 4); + } + + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { + Decimator.worldSelectArrows[3].drawAt(var34 + 15, 4); + } else { + Decimator.worldSelectArrows[1].drawAt(var34 + 15, 4); + } + + var0.draw("Type", var34 + 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 (SoundCache.worldSelectBackSprites != null) { + var23 = 88; + byte var49 = 19; + var35 = 765 / (var23 + 1) - 1; + var34 = 480 / (var49 + 1); + + int var38; + do { + var27 = var34; + var38 = var35; + if (var34 * (var35 - 1) >= World.World_count) { + --var35; + } + + if (var35 * (var34 - 1) >= World.World_count) { + --var34; + } + + if (var35 * (var34 - 1) >= World.World_count) { + --var34; + } + } while(var27 != var34 || var35 != var38); + + var27 = (765 - var23 * var35) / (var35 + 1); + if (var27 > 5) { + var27 = 5; + } + + var38 = (480 - var34 * var49) / (var34 + 1); + if (var38 > 5) { + var38 = 5; + } + + int var37 = (765 - var35 * var23 - var27 * (var35 - 1)) / 2; + var39 = (480 - var49 * var34 - var38 * (var34 - 1)) / 2; + int var11 = (var34 + World.World_count - 1) / var34; + Login.worldSelectPagesCount = var11 - var35; + if (AbstractWorldMapIcon.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { + AbstractWorldMapIcon.worldSelectLeftSprite.drawAt(8, class30.canvasHeight / 2 - AbstractWorldMapIcon.worldSelectLeftSprite.subHeight / 2); + } + + if (ClanChat.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { + ClanChat.worldSelectRightSprite.drawAt(KitDefinition.canvasWidth - ClanChat.worldSelectRightSprite.subWidth - 8, class30.canvasHeight / 2 - ClanChat.worldSelectRightSprite.subHeight / 2); + } + + int var12 = var39 + 23; + int var40 = var37 + Login.xPadding; + int var41 = 0; + boolean var42 = false; + int var43 = Login.worldSelectPage; + + int var17; + for (var17 = var34 * var43; var17 < World.World_count && var43 - Login.worldSelectPage < var35; ++var17) { + World var28 = ChatChannel.World_worlds[var17]; + boolean var19 = true; + String var20 = Integer.toString(var28.population); + if (var28.population == -1) { + var20 = "OFF"; + var19 = false; + } else if (var28.population > 1980) { + var20 = "FULL"; + var19 = false; + } + + int var22 = 0; + byte var21; + if (var28.isBeta()) { + if (var28.isMembersOnly()) { + var21 = 7; + } else { + var21 = 6; + } + } else if (var28.isDeadman()) { + var22 = 16711680; + if (var28.isMembersOnly()) { + var21 = 5; + } else { + var21 = 4; + } + } else if (var28.isPvp()) { + if (var28.isMembersOnly()) { + var21 = 3; + } else { + var21 = 2; + } + } else if (var28.isMembersOnly()) { + var21 = 1; + } else { + var21 = 0; + } + + if (MouseHandler.MouseHandler_x >= var40 && MouseHandler.MouseHandler_y >= var12 && MouseHandler.MouseHandler_x < var40 + var23 && MouseHandler.MouseHandler_y < var12 + var49 && var19) { + Login.hoveredWorldIndex = var17; + SoundCache.worldSelectBackSprites[var21].drawTransOverlayAt(var40, var12, 128, 16777215); + var42 = true; + } else { + SoundCache.worldSelectBackSprites[var21].drawAt(var40, var12); + } + + if (class1.worldSelectFlagSprites != null) { + class1.worldSelectFlagSprites[(var28.isMembersOnly() ? 8 : 0) + var28.location].drawAt(var40 + 29, var12); + } + + var0.drawCentered(Integer.toString(var28.id), var40 + 15, var49 / 2 + var12 + 5, var22, -1); + var1.drawCentered(var20, var40 + 60, var49 / 2 + var12 + 5, 268435455, -1); + var12 = var12 + var38 + var49; + ++var41; + if (var41 >= var34) { + var12 = var39 + 23; + var40 = var40 + var23 + var27; + var41 = 0; + ++var43; + } + } + + if (var42) { + var17 = var1.stringWidth(ChatChannel.World_worlds[Login.hoveredWorldIndex].activity) + 6; + int var18 = var1.ascent + 8; + int var44 = MouseHandler.MouseHandler_y + 25; + if (var18 + var44 > 480) { + var44 = MouseHandler.MouseHandler_y - 25 - var18; + } + + Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var17 / 2, var44, var17, var18, 16777120); + Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var17 / 2, var44, var17, var18, 0); + var1.drawCentered(ChatChannel.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var44 + var1.ascent + 4, 0, -1); + } + } + + SpotAnimationDefinition.rasterProvider.drawFull(0, 0); + } else { + Login.leftTitleSprite.drawAt(Login.xPadding, 0); + Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + class51.logoSprite.drawAt(Login.xPadding + 382 - class51.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.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var24 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); + var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var23, 16777215, -1); + } + + String var25; + String var26; + short var45; + short var47; + if (Client.gameState == 20) { + Login.titleboxSprite.drawAt(Login.loginBoxX + 180 - Login.titleboxSprite.subWidth / 2, 271 - Login.titleboxSprite.subHeight / 2); + var45 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var45, 16776960, 0); + var46 = var45 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var46, 16776960, 0); + var46 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var46, 16776960, 0); + var46 += 15; + var46 += 7; + if (Login.loginIndex != 4) { + var0.draw("Login: ", Login.loginBoxX + 180 - 110, var46, 16777215, 0); + var47 = 200; + var25 = GrandExchangeOffer.clientPreferences.hideUsername ? Huffman.method3903(Login.Login_username) : Login.Login_username; + + for (var26 = var25; var0.stringWidth(var26) > var47; var26 = var26.substring(0, var26.length() - 1)) { + } + + var0.draw(AbstractFont.escapeBrackets(var26), Login.loginBoxX + 180 - 70, var46, 16777215, 0); + var46 += 15; + var0.draw("Password: " + Huffman.method3903(Login.Login_password), Login.loginBoxX + 180 - 108, var46, 16777215, 0); + var46 += 15; + } + } + + if (Client.gameState == 10 || Client.gameState == 11) { + Login.titleboxSprite.drawAt(Login.loginBoxX, 171); + short var5; + if (Login.loginIndex == 0) { + var45 = 251; + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var45, 16776960, 0); + var46 = var45 + 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); + var45 = 236; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var45, 16777215, 0); + var46 = var45 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var46, 16777215, 0); + var46 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var46, 16777215, 0); + var46 += 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) { + var45 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxCenter, var45, 16776960, 0); + var46 = var45 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxCenter, var46, 16776960, 0); + var46 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxCenter, var46, 16776960, 0); + var46 += 15; + var46 += 7; + var0.draw("Login: ", Login.loginBoxCenter - 110, var46, 16777215, 0); + var47 = 200; + var25 = GrandExchangeOffer.clientPreferences.hideUsername ? Huffman.method3903(Login.Login_username) : Login.Login_username; + + for (var26 = var25; var0.stringWidth(var26) > var47; var26 = var26.substring(1)) { + } + + var0.draw(AbstractFont.escapeBrackets(var26) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? class16.colorStartTag(16776960) + "|" : ""), Login.loginBoxCenter - 70, var46, 16777215, 0); + var46 += 15; + var0.draw("Password: " + Huffman.method3903(Login.Login_password) + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? class16.colorStartTag(16776960) + "|" : ""), Login.loginBoxCenter - 108, var46, 16777215, 0); + var46 += 15; + var45 = 277; + var27 = Login.loginBoxCenter + -117; + boolean var9 = Client.Login_isUsernameRemembered; + boolean var10 = Login.field1169; + IndexedSprite var31 = var9 ? (var10 ? class96.field1303 : Login.options_buttons_2Sprite) : (var10 ? class83.field1136 : Login.options_buttons_0Sprite); + var31.drawAt(var27, var45); + var27 = var27 + var31.subWidth + 5; + var1.draw("Remember username", var27, var45 + 13, 16776960, 0); + var27 = Login.loginBoxCenter + 24; + boolean var13 = GrandExchangeOffer.clientPreferences.hideUsername; + boolean var14 = Login.field1170; + IndexedSprite var32 = var13 ? (var14 ? class96.field1303 : Login.options_buttons_2Sprite) : (var14 ? class83.field1136 : Login.options_buttons_0Sprite); + var32.drawAt(var27, var45); + var27 = var27 + var32.subWidth + 5; + var1.draw("Hide username", var27, var45 + 13, 16776960, 0); + var46 = var45 + 15; + int var15 = Login.loginBoxCenter - 80; + short var16 = 321; + Login.titlebuttonSprite.drawAt(var15 - 73, var16 - 20); + var0.drawCentered("Login", var15, var16 + 5, 16777215, 0); + var15 = Login.loginBoxCenter + 80; + Login.titlebuttonSprite.drawAt(var15 - 73, var16 - 20); + var0.drawCentered("Cancel", var15, var16 + 5, 16777215, 0); + var45 = 357; + switch(Login.field1161) { + case 2: + DynamicObject.field1268 = "Having trouble logging in?"; + break; + default: + DynamicObject.field1268 = "Can't login? Click here."; + } + + Decimator.field1443 = new Bounds(Login.loginBoxCenter, var45, var1.stringWidth(DynamicObject.field1268), 11); + MusicPatchPcmStream.field2466 = new Bounds(Login.loginBoxCenter, var45, var1.stringWidth("Still having trouble logging in?"), 11); + var1.drawCentered(DynamicObject.field1268, Login.loginBoxCenter, var45, 16777215, 0); + } else if (Login.loginIndex == 3) { + var45 = 201; + var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var45, 16776960, 0); + var46 = var45 + 20; + var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var46, 16776960, 0); + var46 += 15; + var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var46, 16776960, 0); + var46 += 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); + var45 = 236; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var45, 16777215, 0); + var46 = var45 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var46, 16777215, 0); + var46 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var46, 16777215, 0); + var46 += 15; + var0.draw("PIN: " + Huffman.method3903(WorldMapSection1.otp) + (Client.cycle % 40 < 20 ? class16.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var46, 16777215, 0); + var46 -= 8; + var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var46, 16776960, 0); + var46 += 15; + var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var46, 16776960, 0); + var24 = 180 + Login.loginBoxX - 9 + var0.stringWidth("for 30 days: ") + 15; + var35 = var46 - var0.ascent; + IndexedSprite var48; + if (Login.field1171) { + var48 = Login.options_buttons_2Sprite; + } else { + var48 = Login.options_buttons_0Sprite; + } + + var48.drawAt(var24, var35); + var46 += 15; + var27 = Login.loginBoxX + 180 - 80; + var8 = 321; + Login.titlebuttonSprite.drawAt(var27 - 73, var8 - 20); + var0.drawCentered("Continue", var27, var8 + 5, 16777215, 0); + var27 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var27 - 73, var8 - 20); + var0.drawCentered("Cancel", var27, 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); + var45 = 221; + var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var45, 16776960, 0); + var46 = var45 + 15; + var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var46, 16776960, 0); + var46 += 15; + var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var46, 16776960, 0); + var46 += 15; + var46 += 14; + var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var46, 16777215, 0); + var47 = 174; + var25 = GrandExchangeOffer.clientPreferences.hideUsername ? Huffman.method3903(Login.Login_username) : Login.Login_username; + + for (var26 = var25; var0.stringWidth(var26) > var47; var26 = var26.substring(1)) { + } + + var0.draw(AbstractFont.escapeBrackets(var26) + (Client.cycle % 40 < 20 ? class16.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var46, 16777215, 0); + var46 += 15; + var27 = Login.loginBoxX + 180 - 80; + var8 = 321; + Login.titlebuttonSprite.drawAt(var27 - 73, var8 - 20); + var0.drawCentered("Recover", var27, var8 + 5, 16777215, 0); + var27 = Login.loginBoxX + 180 + 80; + Login.titlebuttonSprite.drawAt(var27 - 73, var8 - 20); + var0.drawCentered("Back", var27, var8 + 5, 16777215, 0); + var8 = 356; + var1.drawCentered("Still having trouble logging in?", Login.loginBoxCenter, var8, 268435455, 0); + } else if (Login.loginIndex == 6) { + var45 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var45, 16776960, 0); + var46 = var45 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var46, 16776960, 0); + var46 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var46, 16776960, 0); + var46 += 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) { + var45 = 216; + var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var45, 16776960, 0); + var46 = var45 + 15; + var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var46, 16776960, 0); + var46 += 15; + var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var46, 16776960, 0); + var46 += 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) { + var45 = 216; + var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var45, 16776960, 0); + var46 = var45 + 15; + var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var46, 16776960, 0); + var46 += 15; + var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var46, 16776960, 0); + var46 += 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) { + var45 = 201; + String var4 = ""; + var25 = ""; + var26 = ""; + switch(Login.field1160) { + case 0: + var4 = "Your account has been disabled."; + var25 = Strings.field2992; + var26 = ""; + break; + case 1: + var4 = "Account locked as we suspect it has been stolen."; + var25 = Strings.field2831; + var26 = ""; + break; + default: + GZipDecompressor.method6390(false); + } + + var0.drawCentered(var4, Login.loginBoxX + 180, var45, 16776960, 0); + var46 = var45 + 15; + var2.drawCentered(var25, Login.loginBoxX + 180, var46, 16776960, 0); + var46 += 15; + var2.drawCentered(var26, Login.loginBoxX + 180, var46, 16776960, 0); + var46 += 15; + var27 = Login.loginBoxX + 180; + var8 = 276; + Login.titlebuttonSprite.drawAt(var27 - 73, var8 - 20); + var0.drawCentered("Support Page", var27, var8 + 5, 16777215, 0); + var27 = Login.loginBoxX + 180; + var8 = 326; + Login.titlebuttonSprite.drawAt(var27 - 73, var8 - 20); + var0.drawCentered("Back", var27, var8 + 5, 16777215, 0); + } else if (Login.loginIndex == 24) { + var45 = 221; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var45, 16777215, 0); + var46 = var45 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var46, 16777215, 0); + var46 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var46, 16777215, 0); + var46 += 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, class30.canvasHeight); + Bounds.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); + Bounds.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); + Rasterizer2D.Rasterizer2D_setClipArray(var3); + } + + BoundaryObject.title_muteSprite[GrandExchangeOffer.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); + if (Client.gameState > 5 && Language.Language_EN == class60.clientLanguage) { + if (class195.field2368 != null) { + var46 = Login.xPadding + 5; + var47 = 463; + byte var36 = 100; + byte var6 = 35; + class195.field2368.drawAt(var46, var47); + var0.drawCentered("World" + " " + Client.worldId, var36 / 2 + var46, var6 / 2 + var47 - 2, 16777215, 0); + if (IgnoreList.World_request != null) { + var1.drawCentered("Loading...", var36 / 2 + var46, var6 / 2 + var47 + 12, 16777215, 0); + } else { + var1.drawCentered("Click to switch", var36 / 2 + var46, var6 / 2 + var47 + 12, 16777215, 0); + } + } else { + class195.field2368 = VertexNormal.SpriteBuffer_getIndexedSpriteByName(class2.archive8, "sl_button", ""); + } + } + + } } } diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java index 6e77d5f5c6..fc14e3dfd1 100644 --- a/runescape-client/src/main/java/GrandExchangeEvents.java +++ b/runescape-client/src/main/java/GrandExchangeEvents.java @@ -6,29 +6,24 @@ 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("b") +@ObfuscatedName("t") @Implements("GrandExchangeEvents") public class GrandExchangeEvents { - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("GrandExchangeEvents_ageComparator") public static Comparator GrandExchangeEvents_ageComparator; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("GrandExchangeEvents_priceComparator") public static Comparator GrandExchangeEvents_priceComparator; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("GrandExchangeEvents_nameComparator") public static Comparator GrandExchangeEvents_nameComparator; - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("GrandExchangeEvents_quantityComparator") public static Comparator GrandExchangeEvents_quantityComparator; - @ObfuscatedName("jb") - @ObfuscatedSignature( - signature = "Ldo;" - ) - @Export("textureProvider") - static TextureProvider textureProvider; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("events") public final List events; @@ -41,7 +36,7 @@ public class GrandExchangeEvents { } @ObfuscatedSignature( - signature = "(Lkf;Z)V", + signature = "(Lky;Z)V", garbageValue = "1" ) public GrandExchangeEvents(Buffer var1, boolean var2) { @@ -63,10 +58,10 @@ public class GrandExchangeEvents { } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ljava/util/Comparator;ZS)V", - garbageValue = "128" + signature = "(Ljava/util/Comparator;ZB)V", + garbageValue = "64" ) @Export("sort") public void sort(Comparator var1, boolean var2) { @@ -78,562 +73,50 @@ public class GrandExchangeEvents { } - @ObfuscatedName("q") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(I)[Lgw;", - garbageValue = "-249126537" + signature = "(ILcr;ZS)I", + garbageValue = "-10184" ) - public static class185[] method70() { - return new class185[]{class185.field2322, class185.field2316, class185.field2318, class185.field2317, class185.field2324, class185.field2319, class185.field2320, class185.field2321, class185.field2315, class185.field2323}; - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(Lhp;Lhp;B)V", - garbageValue = "-127" - ) - @Export("KitDefinition_setArchives") - public static void KitDefinition_setArchives(AbstractArchive var0, AbstractArchive var1) { - KitDefinition.KitDefinition_archive = var0; - class288.KitDefinition_modelsArchive = var1; - KitDefinition.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(Lhp;B)V", - garbageValue = "1" - ) - @Export("VarpDefinition_setArchives") - public static void VarpDefinition_setArchives(AbstractArchive var0) { - VarpDefinition.VarpDefinition_archive = var0; - VarpDefinition.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(Ler;[Lfv;I)V", - garbageValue = "-1548454076" - ) - static final void method72(Scene var0, CollisionMap[] var1) { - for (int var2 = 0; var2 < 4; ++var2) { - for (int var3 = 0; var3 < 104; ++var3) { - for (int var4 = 0; var4 < 104; ++var4) { - if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) != 1) { - continue; - } - int var5 = var2; - if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { - var5 = var2 - 1; - } - - if (var5 >= 0) { - var1[var5].setBlockedByFloor(var3, var4); - } - } - } - } - - Tiles.field519 += (int)(Math.random() * 5.0D) - 2; - if (Tiles.field519 < -8) { - Tiles.field519 = -8; - } - - if (Tiles.field519 > 8) { - Tiles.field519 = 8; - } - - Tiles.field510 += (int)(Math.random() * 5.0D) - 2; - if (Tiles.field510 < -16) { - Tiles.field510 = -16; - } - - if (Tiles.field510 > 16) { - Tiles.field510 = 16; - } - - int var9; - int var10; - int var11; - int var12; - int var13; - int var14; - int var15; - int var16; - int var17; - int var18; - for (int var2 = 0; var2 < 4; ++var2) { - byte[][] var44 = class32.field282[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 = (var18 * -50 + var16 * -50 + var17 * -10) / var10 + 96; - var20 = (var44[var12][var11 + 1] >> 3) + (var44[var12 - 1][var11] >> 2) + (var44[var12][var11 - 1] >> 2) + (var44[var12 + 1][var11] >> 3) + (var44[var12][var11] >> 1); - Tiles.field515[var12][var11] = var19 - var20; - } + static int method84(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { + var3 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemId; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { + var3 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + if (var3.itemId != -1) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; } - for (var11 = 0; var11 < 104; ++var11) { - ServerBuild.Tiles_hue[var11] = 0; - Tiles.Tiles_saturation[var11] = 0; - Tiles.Tiles_lightness[var11] = 0; - DynamicObject.Tiles_hueMultiplier[var11] = 0; - Fonts.field3689[var11] = 0; + return 1; + } else if (var0 == ScriptOpcodes.IF_HASSUB) { + int var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var5); + if (var4 != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; } - for (var11 = -5; var11 < 109; ++var11) { - for (var12 = 0; var12 < 104; ++var12) { - var13 = var11 + 5; - if (var13 >= 0 && var13 < 104) { - var14 = Tiles.field504[var2][var13][var12] & 255; - if (var14 > 0) { - FloorUnderlayDefinition var45 = ItemContainer.FloorUnderlayDefinition_get(var14 - 1); - ServerBuild.Tiles_hue[var12] += var45.hue; - Tiles.Tiles_saturation[var12] += var45.saturation; - Tiles.Tiles_lightness[var12] += var45.lightness; - DynamicObject.Tiles_hueMultiplier[var12] += var45.hueMultiplier; - Fonts.field3689[var12]++; - } - } - - var14 = var11 - 5; - if (var14 >= 0 && var14 < 104) { - var15 = Tiles.field504[var2][var14][var12] & 255; - if (var15 > 0) { - var17 = var15 - 1; - FloorUnderlayDefinition var46 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var17); - FloorUnderlayDefinition var47; - if (var46 != null) { - var47 = var46; - } else { - byte[] var48 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var17); - var46 = new FloorUnderlayDefinition(); - if (var48 != null) { - var46.decode(new Buffer(var48), var17); - } - - var46.postDecode(); - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var46, (long)var17); - var47 = var46; - } - - ServerBuild.Tiles_hue[var12] -= var47.hue; - Tiles.Tiles_saturation[var12] -= var47.saturation; - Tiles.Tiles_lightness[var12] -= var47.lightness; - DynamicObject.Tiles_hueMultiplier[var12] -= var47.hueMultiplier; - Fonts.field3689[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 += ServerBuild.Tiles_hue[var18]; - var13 += Tiles.Tiles_saturation[var18]; - var14 += Tiles.Tiles_lightness[var18]; - var15 += DynamicObject.Tiles_hueMultiplier[var18]; - var16 += Fonts.field3689[var18]; - } - - var19 = var17 - 5; - if (var19 >= 0 && var19 < 104) { - var12 -= ServerBuild.Tiles_hue[var19]; - var13 -= Tiles.Tiles_saturation[var19]; - var14 -= Tiles.Tiles_lightness[var19]; - var15 -= DynamicObject.Tiles_hueMultiplier[var19]; - var16 -= Fonts.field3689[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.field504[var2][var11][var17] & 255; - int var21 = Tiles.field505[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.field515[var11][var17]; - int var27 = Tiles.field515[var11 + 1][var17]; - int var28 = Tiles.field515[var11 + 1][var17 + 1]; - int var29 = Tiles.field515[var11][var17 + 1]; - int var30 = -1; - int var31 = -1; - int var32; - int var33; - int var34; - if (var20 > 0) { - var32 = var12 * 256 / var15; - var33 = var13 / var16; - var34 = var14 / var16; - var30 = class327.hslToRgb(var32, var33, var34); - var32 = var32 + Tiles.field519 & 255; - var34 += Tiles.field510; - if (var34 < 0) { - var34 = 0; - } else if (var34 > 255) { - var34 = 255; - } - - var31 = class327.hslToRgb(var32, var33, var34); - } - - FloorOverlayDefinition var35; - if (var2 > 0) { - boolean var53 = true; - if (var20 == 0 && Tiles.field506[var2][var11][var17] != 0) { - var53 = false; - } - - if (var21 > 0) { - var34 = var21 - 1; - var35 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var34); - FloorOverlayDefinition var49; - if (var35 != null) { - var49 = var35; - } else { - byte[] var36 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var34); - var35 = new FloorOverlayDefinition(); - if (var36 != null) { - var35.decode(new Buffer(var36), var34); - } - - var35.postDecode(); - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var35, (long)var34); - var49 = var35; - } - - if (!var49.hideUnderlay) { - var53 = false; - } - } - - if (var53 && var23 == var22 && var22 == var24 && var25 == var22) { - FaceNormal.field1887[var2][var11][var17] |= 2340; - } - } - - var32 = 0; - if (var31 != -1) { - var32 = Rasterizer3D.Rasterizer3D_colorPalette[GraphicsObject.method1948(var31, 96)]; - } - - if (var21 == 0) { - var0.addTile(var2, var11, var17, 0, 0, -1, var22, var23, var24, var25, GraphicsObject.method1948(var30, var26), GraphicsObject.method1948(var30, var27), GraphicsObject.method1948(var30, var28), GraphicsObject.method1948(var30, var29), 0, 0, 0, 0, var32, 0); - } else { - var33 = Tiles.field506[var2][var11][var17] + 1; - byte var54 = class268.field3561[var2][var11][var17]; - int var50 = var21 - 1; - FloorOverlayDefinition var37 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var50); - if (var37 != null) { - var35 = var37; - } else { - byte[] var38 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var50); - var37 = new FloorOverlayDefinition(); - if (var38 != null) { - var37.decode(new Buffer(var38), var50); - } - - var37.postDecode(); - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var37, (long)var50); - var35 = var37; - } - - int var51 = var35.texture; - int var39; - int var40; - int var41; - int var42; - if (var51 >= 0) { - var40 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var51); - var39 = -1; - } else if (var35.primaryRgb == 0xff00ff) { - var39 = -2; - var51 = -1; - var40 = -2; - } else { - var39 = class327.hslToRgb(var35.hue, var35.saturation, var35.lightness); - var41 = var35.hue + Tiles.field519 & 255; - var42 = var35.lightness + Tiles.field510; - if (var42 < 0) { - var42 = 0; - } else if (var42 > 255) { - var42 = 255; - } - - var40 = class327.hslToRgb(var41, var35.saturation, var42); - } - - var41 = 0; - if (var40 != -2) { - var41 = Rasterizer3D.Rasterizer3D_colorPalette[Decimator.method2517(var40, 96)]; - } - - if (var35.secondaryRgb != -1) { - var42 = var35.secondaryHue + Tiles.field519 & 255; - int var43 = var35.secondaryLightness + Tiles.field510; - if (var43 < 0) { - var43 = 0; - } else if (var43 > 255) { - var43 = 255; - } - - var40 = class327.hslToRgb(var42, var35.secondarySaturation, var43); - var41 = Rasterizer3D.Rasterizer3D_colorPalette[Decimator.method2517(var40, 96)]; - } - - var0.addTile(var2, var11, var17, var33, var54, var51, var22, var23, var24, var25, GraphicsObject.method1948(var30, var26), GraphicsObject.method1948(var30, var27), GraphicsObject.method1948(var30, var28), GraphicsObject.method1948(var30, var29), Decimator.method2517(var39, var26), Decimator.method2517(var39, var27), Decimator.method2517(var39, var28), Decimator.method2517(var39, var29), var32, var41); - } - } - } - } - } - } - - for (var11 = 1; var11 < 103; ++var11) { - for (var12 = 1; var12 < 103; ++var12) { - var0.setTileMinPlane(var2, var12, var11, MilliClock.method3468(var2, var12, var11)); - } - } - - Tiles.field504[var2] = null; - Tiles.field505[var2] = null; - Tiles.field506[var2] = null; - class268.field3561[var2] = null; - class32.field282[var2] = null; - } - - var0.method3097(-50, -10, -50); - - for (int var2 = 0; var2 < 104; ++var2) { - for (int var3 = 0; var3 < 104; ++var3) { - if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { - var0.setLinkBelow(var2, var3); - } - } - } - - for (int var2 = 1, var3 = 2, var4 = 4, 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) { - if ((FaceNormal.field1887[var6][var8][var7] & var2) != 0) { - var9 = var7; - var10 = var7; - var11 = var6; - - for (var12 = var6; var9 > 0 && (FaceNormal.field1887[var6][var8][var9 - 1] & var2) != 0; --var9) { - } - - while (var10 < 104 && (FaceNormal.field1887[var6][var8][var10 + 1] & var2) != 0) { - ++var10; - } - - label478: - while (var11 > 0) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((FaceNormal.field1887[var11 - 1][var8][var13] & var2) == 0) { - break label478; - } - } - - --var11; - } - - label467: - while (var12 < var5) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((FaceNormal.field1887[var12 + 1][var8][var13] & var2) == 0) { - break label467; - } - } - - ++var12; - } - - var13 = (var12 + 1 - var11) * (var10 - var9 + 1); - if (var13 >= 8) { - var15 = Tiles.Tiles_heights[var12][var8][var9] - 240; - 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) { - FaceNormal.field1887[var17][var8][var18] &= ~var2; - } - } - } - } - - if ((FaceNormal.field1887[var6][var8][var7] & var3) != 0) { - var9 = var8; - var10 = var8; - var11 = var6; - - for (var12 = var6; var9 > 0 && (FaceNormal.field1887[var6][var9 - 1][var7] & var3) != 0; --var9) { - } - - while (var10 < 104 && (FaceNormal.field1887[var6][var10 + 1][var7] & var3) != 0) { - ++var10; - } - - label531: - while (var11 > 0) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((FaceNormal.field1887[var11 - 1][var13][var7] & var3) == 0) { - break label531; - } - } - - --var11; - } - - label520: - while (var12 < var5) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((FaceNormal.field1887[var12 + 1][var13][var7] & var3) == 0) { - break label520; - } - } - - ++var12; - } - - var13 = (var10 - var9 + 1) * (var12 + 1 - var11); - if (var13 >= 8) { - var15 = Tiles.Tiles_heights[var12][var9][var7] - 240; - 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) { - FaceNormal.field1887[var17][var18][var7] &= ~var3; - } - } - } - } - - if ((FaceNormal.field1887[var6][var8][var7] & var4) != 0) { - var9 = var8; - var10 = var8; - var11 = var7; - - for (var12 = var7; var11 > 0 && (FaceNormal.field1887[var6][var8][var11 - 1] & var4) != 0; --var11) { - } - - while (var12 < 104 && (FaceNormal.field1887[var6][var8][var12 + 1] & var4) != 0) { - ++var12; - } - - label584: - while (var9 > 0) { - for (var13 = var11; var13 <= var12; ++var13) { - if ((FaceNormal.field1887[var6][var9 - 1][var13] & var4) == 0) { - break label584; - } - } - - --var9; - } - - label573: - while (var10 < 104) { - for (var13 = var11; var13 <= var12; ++var13) { - if ((FaceNormal.field1887[var6][var10 + 1][var13] & var4) == 0) { - break label573; - } - } - - ++var10; - } - - if ((var10 - var9 + 1) * (var12 - var11 + 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) { - FaceNormal.field1887[var6][var14][var15] &= ~var4; - } - } - } - } - } - } - } - } - - } - - @ObfuscatedName("il") - @ObfuscatedSignature( - signature = "(Lhj;IIIIIII)V", - garbageValue = "-2024126373" - ) - static final void method71(Widget var0, int x, int y, int height, int scrollHeight, int mouseX, int mouseY) { - if (Client.field719) { - Client.alternativeScrollbarWidth = 32; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETTOP) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rootInterface; + return 1; } else { - Client.alternativeScrollbarWidth = 0; - } - - Client.field719 = false; - int var7; - if (MouseHandler.MouseHandler_currentButton == 1 || !DevicePcmPlayerProvider.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { - if (mouseX >= x && mouseX < x + 16 && mouseY >= y && mouseY < y + 16) { - var0.scrollY -= 4; - Strings.invalidateWidget(var0); - } else if (mouseX >= x && mouseX < x + 16 && mouseY >= height + y - 16 && mouseY < height + y) { - var0.scrollY += 4; - Strings.invalidateWidget(var0); - } else if (mouseX >= x - Client.alternativeScrollbarWidth && mouseX < Client.alternativeScrollbarWidth + x + 16 && mouseY >= y + 16 && mouseY < height + y - 16) { - var7 = height * (height - 32) / scrollHeight; - if (var7 < 8) { - var7 = 8; - } - - int var8 = mouseY - y - 16 - var7 / 2; - int var9 = height - 32 - var7; - var0.scrollY = var8 * (scrollHeight - height) / var9; - Strings.invalidateWidget(var0); - Client.field719 = true; - } - } - - if (Client.mouseWheelRotation != 0) { - var7 = var0.width; - if (mouseX >= x - var7 && mouseY >= y && mouseX < x + 16 && mouseY <= height + y) { - var0.scrollY += Client.mouseWheelRotation * 45; - Strings.invalidateWidget(var0); - } + return 2; } + } + @ObfuscatedName("gc") + @ObfuscatedSignature( + signature = "(B)Z", + garbageValue = "0" + ) + static boolean method81() { + return (Client.drawPlayerNames & 1) != 0; } } diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java index 08c3bbb2a3..3032005634 100644 --- a/runescape-client/src/main/java/GrandExchangeOffer.java +++ b/runescape-client/src/main/java/GrandExchangeOffer.java @@ -5,44 +5,51 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("f") +@ObfuscatedName("d") @Implements("GrandExchangeOffer") public class GrandExchangeOffer { - @ObfuscatedName("ab") + @ObfuscatedName("st") @ObfuscatedGetter( - intValue = 1444342479 + intValue = 549974423 ) - static int field65; - @ObfuscatedName("q") + @Export("foundItemIndex") + static int foundItemIndex; + @ObfuscatedName("se") + @ObfuscatedSignature( + signature = "Lbx;" + ) + @Export("clientPreferences") + static ClientPreferences clientPreferences; + @ObfuscatedName("s") @Export("state") byte state; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1838555809 + intValue = 416922963 ) @Export("id") public int id; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -2108350067 + intValue = 1858157699 ) @Export("unitPrice") public int unitPrice; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -725683921 + intValue = -214524093 ) @Export("totalQuantity") public int totalQuantity; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 663706157 + intValue = 280180281 ) @Export("currentQuantity") public int currentQuantity; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1954345153 + intValue = 24514895 ) @Export("currentPrice") public int currentPrice; @@ -51,7 +58,7 @@ public class GrandExchangeOffer { } @ObfuscatedSignature( - signature = "(Lkf;Z)V", + signature = "(Lky;Z)V", garbageValue = "0" ) public GrandExchangeOffer(Buffer var1, boolean var2) { @@ -63,42 +70,42 @@ public class GrandExchangeOffer { this.currentPrice = var1.readInt(); } - @ObfuscatedName("w") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "0" + signature = "(I)I", + garbageValue = "-1032509365" ) @Export("status") public int status() { return this.state & 7; } - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1998926597" + garbageValue = "-636010194" ) @Export("type") public int type() { return (this.state & 8) == 8 ? 1 : 0; } - @ObfuscatedName("p") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "126" + signature = "(II)V", + garbageValue = "1701823469" ) - void method115(int var1) { + void method108(int var1) { this.state &= -8; this.state = (byte)(this.state | var1 & 7); } - @ObfuscatedName("k") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "874487771" + garbageValue = "-184114003" ) - void method100(int var1) { + void method124(int var1) { this.state &= -9; if (var1 == 1) { this.state = (byte)(this.state | 8); @@ -106,488 +113,269 @@ public class GrandExchangeOffer { } - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "([Ljava/lang/String;[SIIB)V", - garbageValue = "32" - ) - @Export("sortItemsByName") - static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) { - if (var2 >= var3) { - return; - } - 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("k") @ObfuscatedSignature( - signature = "(IIIZIZB)V", - garbageValue = "1" + signature = "(Ljava/lang/String;II)Z", + garbageValue = "-1475643333" ) - @Export("doWorldSorting") - static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) { - if (var0 >= var1) { - return; - } - int var6 = (var0 + var1) / 2; - int var7 = var0; - World var8 = World.World_worlds[var6]; - World.World_worlds[var6] = World.World_worlds[var1]; - World.World_worlds[var1] = var8; - - for (int var9 = var0; var9 < var1; ++var9) { - World var11 = World.World_worlds[var9]; - int var12 = DynamicObject.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 = DynamicObject.compareWorlds(var11, var8, var4, var5); - if (var5) { - var10 = -var13; - } else { - var10 = var13; - } - } - - if (var10 <= 0) { - World var14 = World.World_worlds[var9]; - World.World_worlds[var9] = World.World_worlds[var7]; - World.World_worlds[var7++] = var14; - } - } - - World.World_worlds[var1] = World.World_worlds[var7]; - World.World_worlds[var7] = var8; - doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); - doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); - + static boolean method109(String var0, int var1) { + return WorldMapSection0.method232(var0, var1, "openjs"); } - @ObfuscatedName("an") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(ILcx;ZI)I", - garbageValue = "1926107602" + signature = "(ILcr;ZB)I", + garbageValue = "5" ) - static int method114(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 6600) { - var3 = class42.plane; - int var9 = MusicPatchNode2.baseX * 64 + (Client.localPlayer.x >> 7); - int var5 = class1.baseY * 64 + (Client.localPlayer.y >> 7); - WorldMapID.getWorldMap().method6309(var3, var9, var5, true); - return 1; - } - WorldMapArea var11; - if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - String var16 = ""; - var11 = WorldMapID.getWorldMap().getMapArea(var3); - if (var11 != null) { - var16 = var11.getExternalName(); - } - - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var16; - return 1; - } - if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - WorldMapID.getWorldMap().setCurrentMapAreaId(var3); - return 1; - } - if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getZoomLevel(); - return 1; - } - if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - WorldMapID.getWorldMap().setZoomPercentage(var3); - return 1; - } - if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().isCacheLoaded() ? 1 : 0; - return 1; - } - Coord var15; - if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { - var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - WorldMapID.getWorldMap().setWorldMapPositionTarget(var15.x, var15.y); - return 1; - } - if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { - var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - WorldMapID.getWorldMap().setWorldMapPositionTargetInstant(var15.x, var15.y); - return 1; - } - if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { - var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - WorldMapID.getWorldMap().jumpToSourceCoord(var15.plane, var15.x, var15.y); - return 1; - } - if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { - var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - WorldMapID.getWorldMap().jumpToSourceCoordInstant(var15.plane, var15.x, var15.y); - return 1; - } - if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getDisplayX(); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getDisplayY(); - return 1; - } - WorldMapArea var13; - if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var13 = WorldMapID.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getOrigin().packed(); - } - - return 1; - } - if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var13 = WorldMapID.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (var13.getRegionHighX() - var13.getRegionLowX() + 1) * 64; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (var13.getRegionHighY() - var13.getRegionLowY() + 1) * 64; - } - - return 1; - } - if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var13 = WorldMapID.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getRegionLowX() * 64; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getRegionLowY() * 64; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getRegionHighX() * 64 + 64 - 1; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getRegionHighY() * 64 + 64 - 1; - } - - return 1; - } - if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var13 = WorldMapID.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getZoom(); - } - - return 1; - } - if (var0 == 6615) { - var15 = WorldMapID.getWorldMap().getDisplayCoord(); - if (var15 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var15.x; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var15.y; - } - - return 1; - } - if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().currentMapAreaId(); - return 1; - } - if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { - var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - var13 = WorldMapID.getWorldMap().getCurrentMapArea(); - if (var13 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - return 1; - } - int[] var14 = var13.position(var15.plane, var15.x, var15.y); - if (var14 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var14[0]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var14[1]; - } - - return 1; - } - Coord var7; - if (var0 == 6618) { - var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - var13 = WorldMapID.getWorldMap().getCurrentMapArea(); - if (var13 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - return 1; - } - var7 = var13.coord(var15.x, var15.y); - if (var7 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var7.packed(); - } - - return 1; - } - Coord var12; - if (var0 == 6619) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]); - ObjectSound.method1824(var3, var12, false); - return 1; - } - if (var0 == 6620) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]); - ObjectSound.method1824(var3, var12, true); - return 1; - } - if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]); - var11 = WorldMapID.getWorldMap().getMapArea(var3); - if (var11 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - return 1; - } - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.containsCoord(var12.plane, var12.x, var12.y) ? 1 : 0; - return 1; - } - if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getDisplayWith(); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getDisplayHeight(); - return 1; - } - if (var0 == 6623) { - var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - var13 = WorldMapID.getWorldMap().mapAreaAtCoord(var15.plane, var15.x, var15.y); - if (var13 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getId(); - } - - return 1; - } - if (var0 == 6624) { - WorldMapID.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - return 1; - } - if (var0 == 6625) { - WorldMapID.getWorldMap().resetMaxFlashCount(); - return 1; - } - if (var0 == 6626) { - WorldMapID.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - return 1; - } - if (var0 == 6627) { - WorldMapID.getWorldMap().resetCyclesPerFlash(); - return 1; - } - boolean var10; - if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { - var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - WorldMapID.getWorldMap().setPerpetualFlash(var10); - return 1; - } - if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - WorldMapID.getWorldMap().flashElement(var3); - return 1; - } - if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - WorldMapID.getWorldMap().flashCategory(var3); - return 1; - } - if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { - WorldMapID.getWorldMap().stopCurrentFlashes(); - return 1; - } - if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { - var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - WorldMapID.getWorldMap().setElementsDisabled(var10); - return 1; - } - boolean var4; - if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1] == 1; - WorldMapID.getWorldMap().disableElement(var3, var4); - return 1; - } - if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1] == 1; - WorldMapID.getWorldMap().setCategoryDisabled(var3, var4); - return 1; - } - if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getElementsDisabled() ? 1 : 0; - return 1; - } - if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().isElementDisabled(var3) ? 1 : 0; - return 1; - } - if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; - return 1; - } - if (var0 == 6638) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]); - var7 = WorldMapID.getWorldMap().method6352(var3, var12); - if (var7 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var7.packed(); - } - - return 1; - } - AbstractWorldMapIcon var8; - if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { - var8 = WorldMapID.getWorldMap().iconStart(); - if (var8 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var8.getElement(); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var8.coord2.packed(); - } - - return 1; - } - if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { - var8 = WorldMapID.getWorldMap().iconNext(); - if (var8 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var8.getElement(); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var8.coord2.packed(); - } - - return 1; - } - WorldMapElement var6; - if (var0 == ScriptOpcodes.MEC_TEXT) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var6 = class222.WorldMapElement_get(var3); - if (var6.name == null) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var6.name; - } - - return 1; - } - if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var6 = class222.WorldMapElement_get(var3); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.textSize; - return 1; - } - if (var0 == ScriptOpcodes.MEC_CATEGORY) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var6 = class222.WorldMapElement_get(var3); - if (var6 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.category; - } - - return 1; - } - if (var0 == ScriptOpcodes.MEC_SPRITE) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var6 = class222.WorldMapElement_get(var3); - if (var6 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.sprite1; - } - - return 1; - } - if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapIcon_0.worldMapEvent.mapElement; - return 1; - } - if (var0 == 6698) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapIcon_0.worldMapEvent.coord1.packed(); - return 1; - } - if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapIcon_0.worldMapEvent.coord2.packed(); - return 1; - } - return 2; - } - - @ObfuscatedName("fk") - @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "-1093013043" - ) - static final void method99(boolean var0) { - if (var0) { - Client.field690 = Login.field1201 ? class160.field2004 : class160.field2002; + static int method123(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var3 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); } else { - Client.field690 = WorldMapLabelSize.clientPreferences.parameters.containsKey(ViewportMouse.method2971(Login.Login_username)) ? class160.field2005 : class160.field2001; + var3 = var2 ? class286.field3623 : class297.field3693; + } + + FriendSystem.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[--Interpreter.Interpreter_intStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { + var3.modelType = 3; + var3.modelId = WorldMapIcon_1.localPlayer.appearance.getChatHeadId(); + return 1; + } else { + return 2; + } + } else { + Interpreter.Interpreter_intStackSize -= 2; + int var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var3.itemId = var4; + var3.itemQuantity = var5; + ItemDefinition var6 = WorldMapData_0.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.field2638 > 0) { + var3.modelZoom = var3.modelZoom * 32 / var3.field2638; + } else if (var3.rawWidth > 0) { + var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; + } + + return 1; + } + } + + @ObfuscatedName("hs") + @ObfuscatedSignature( + signature = "(ZLkx;B)V", + garbageValue = "104" + ) + @Export("updateNpcs") + static final void updateNpcs(boolean var0, PacketBuffer var1) { + Client.field899 = 0; + Client.field861 = 0; + GrandExchangeOfferUnitPriceComparator.readNpcUpdates(); + BoundaryObject.method3216(var0, var1); + method112(var1); + + int var2; + for (var2 = 0; var2 < Client.field899; ++var2) { + int var3 = Client.field655[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); + } + } + + } + } + + @ObfuscatedName("hj") + @ObfuscatedSignature( + signature = "(Lkx;I)V", + garbageValue = "494584381" + ) + static final void method112(PacketBuffer var0) { + for (int var1 = 0; var1 < Client.field861; ++var1) { + int var2 = Client.field669[var1]; + NPC var3 = Client.npcs[var2]; + int var4 = var0.readUnsignedByte(); + if ((var4 & 1) != 0) { + var3.targetIndex = var0.method5445(); + if (var3.targetIndex == 65535) { + var3.targetIndex = -1; + } + } + + int var5; + int var6; + int var7; + int var8; + if ((var4 & 64) != 0) { + var5 = var0.method5447(); + var6 = var0.method5447(); + var7 = var3.x - (var5 - PacketWriter.baseX * 64 - PacketWriter.baseX * 64) * 64; + var8 = var3.y - (var6 - RouteStrategy.baseY * 64 - RouteStrategy.baseY * 64) * 64; + if (var7 != 0 || var8 != 0) { + var3.field946 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047; + } + } + + if ((var4 & 32) != 0) { + var5 = var0.readUnsignedShort(); + if (var5 == 65535) { + var5 = -1; + } + + var6 = var0.method5438(); + if (var5 == var3.sequence && var5 != -1) { + var7 = Widget.SequenceDefinition_get(var5).field3492; + if (var7 == 1) { + var3.sequenceFrame = 0; + var3.sequenceFrameCycle = 0; + var3.sequenceDelay = var6; + var3.field964 = 0; + } + + if (var7 == 2) { + var3.field964 = 0; + } + } else if (var5 == -1 || var3.sequence == -1 || Widget.SequenceDefinition_get(var5).field3508 >= Widget.SequenceDefinition_get(var3.sequence).field3508) { + var3.sequence = var5; + var3.sequenceFrame = 0; + var3.sequenceFrameCycle = 0; + var3.sequenceDelay = var6; + var3.field964 = 0; + var3.field947 = var3.pathLength; + } + } + + if ((var4 & 4) != 0) { + var3.definition = ViewportMouse.getNpcDefinition(var0.readUnsignedShort()); + var3.size = var3.definition.size * 64; + var3.field971 = 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 & 16) != 0) { + var5 = var0.readUnsignedByteNegate(); + 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.method5436(); + 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.method5438() : var11; + var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); + } else { + var3.removeHealthBar(var8); + } + } + } + } + + if ((var4 & 8) != 0) { + var3.spotAnimation = var0.method5445(); + var5 = var0.method5455(); + var3.heightOffset = var5 >> 16; + var3.field958 = (var5 & 65535) + Client.cycle; + var3.spotAnimationFrame = 0; + var3.spotAnimationFrameCycle = 0; + if (var3.field958 > Client.cycle) { + var3.spotAnimationFrame = -1; + } + + if (var3.spotAnimation == 65535) { + var3.spotAnimation = -1; + } + } + + if ((var4 & 2) != 0) { + var3.overheadText = var0.readStringCp1252NullTerminated(); + var3.overheadTextCyclesRemaining = 100; + } + } + + } + + @ObfuscatedName("li") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "869899201" + ) + static void method122() { + if (Client.field706 && WorldMapIcon_1.localPlayer != null) { + int var0 = WorldMapIcon_1.localPlayer.pathX[0]; + int var1 = WorldMapIcon_1.localPlayer.pathY[0]; + if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) { + return; + } + + DynamicObject.oculusOrbFocalPointX = WorldMapIcon_1.localPlayer.x; + int var2 = GrandExchangeOfferTotalQuantityComparator.getTileHeight(WorldMapIcon_1.localPlayer.x, WorldMapIcon_1.localPlayer.y, ItemContainer.plane) - Client.camFollowHeight; + if (var2 < ScriptEvent.field559) { + ScriptEvent.field559 = var2; + } + + FriendSystem.oculusOrbFocalPointY = WorldMapIcon_1.localPlayer.y; + Client.field706 = false; } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java index 143cd2a81b..f7bc568d98 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java @@ -1,32 +1,20 @@ -import java.awt.FontMetrics; 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("x") +@ObfuscatedName("r") @Implements("GrandExchangeOfferAgeComparator") final class GrandExchangeOfferAgeComparator implements Comparator { - @ObfuscatedName("ad") - @Export("loginScreenFontMetrics") - static FontMetrics loginScreenFontMetrics; - @ObfuscatedName("gn") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "[Llx;" - ) - @Export("scrollBarSprites") - static IndexedSprite[] scrollBarSprites; - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(Li;Li;I)I", - garbageValue = "-502692128" + signature = "(Lq;Lq;B)I", + garbageValue = "-1" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - return var1.age < var2.age ? -1 : (var2.age == var1.age ? 0 : 1); + return var1.age < var2.age ? -1 : (var1.age == var2.age ? 0 : 1); } public boolean equals(Object var1) { @@ -37,182 +25,129 @@ final class GrandExchangeOfferAgeComparator implements Comparator { return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "-1058025130" + signature = "(IIIIB)V", + garbageValue = "125" ) - @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); - } + static void method156(int var0, int var1, int var2, int var3) { + for (ObjectSound var4 = (ObjectSound)ObjectSound.objectSounds.last(); var4 != null; var4 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var4.soundEffectId != -1 || var4.soundEffectIds != null) { + int var5 = 0; + if (var1 > var4.field1052 * 16384) { + var5 += var1 - var4.field1052 * 16384; + } else if (var1 < var4.x * 16384) { + var5 += var4.x * 16384 - var1; + } - if (var4.ids.length <= var1) { - int[] var5 = new int[var1 + 1]; - int[] var6 = new int[var1 + 1]; + if (var2 > var4.field1053 * 16384) { + var5 += var2 - var4.field1053 * 16384; + } else if (var2 < var4.y * 16384) { + var5 += var4.y * 16384 - var2; + } - int var7; - for (var7 = 0; var7 < var4.ids.length; ++var7) { - var5[var7] = var4.ids[var7]; - var6[var7] = var4.quantities[var7]; + if (var5 - 64 <= var4.field1054 && Client.field860 != 0 && var0 == var4.plane) { + var5 -= 64; + if (var5 < 0) { + var5 = 0; + } + + int var6 = (var4.field1054 - var5) * Client.field860 / var4.field1054; + if (var4.stream1 == null) { + if (var4.soundEffectId >= 0) { + SoundEffect var7 = SoundEffect.readSoundEffect(WorldMapSprite.archive4, var4.soundEffectId, 0); + if (var7 != null) { + RawSound var8 = var7.toRawSound().resample(class247.decimator); + RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6); + var9.setNumLoops(-1); + IgnoreList.pcmStreamMixer.addSubStream(var9); + var4.stream1 = var9; + } + } + } else { + var4.stream1.method2599(var6); + } + + if (var4.stream2 == null) { + if (var4.soundEffectIds != null && (var4.field1056 -= var3) <= 0) { + int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length); + SoundEffect var12 = SoundEffect.readSoundEffect(WorldMapSprite.archive4, var4.soundEffectIds[var11], 0); + if (var12 != null) { + RawSound var13 = var12.toRawSound().resample(class247.decimator); + RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6); + var10.setNumLoops(0); + IgnoreList.pcmStreamMixer.addSubStream(var10); + var4.stream2 = var10; + var4.field1056 = var4.field1057 + (int)(Math.random() * (double)(var4.field1058 - var4.field1057)); + } + } + } else { + var4.stream2.method2599(var6); + if (!var4.stream2.hasNext()) { + var4.stream2 = null; + } + } + } else { + if (var4.stream1 != null) { + IgnoreList.pcmStreamMixer.removeSubStream(var4.stream1); + var4.stream1 = null; + } + + if (var4.stream2 != null) { + IgnoreList.pcmStreamMixer.removeSubStream(var4.stream2); + var4.stream2 = null; + } + } } + } - for (var7 = var4.ids.length; var7 < var1; ++var7) { - var5[var7] = -1; - var6[var7] = 0; + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1443594244" + ) + @Export("savePreferences") + static void savePreferences() { + AccessFile var0 = null; + + try { + var0 = TaskHandler.getPreferencesFile("", WorldMapRectangle.field166.name, true); + Buffer var1 = GrandExchangeOffer.clientPreferences.toBuffer(); + var0.write(var1.array, 0, var1.offset); + } catch (Exception var3) { + } + + try { + if (var0 != null) { + var0.closeSync(true); } - - var4.ids = var5; - var4.quantities = var6; + } catch (Exception var2) { } - var4.ids[var1] = var2; - var4.quantities[var1] = var3; } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1192487451" + signature = "(I)Lbl;", + garbageValue = "-1436154979" ) - @Export("clearItemContainer") - static void clearItemContainer(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var1 == null) { - return; - } - for (int var2 = 0; var2 < var1.ids.length; ++var2) { - var1.ids[var2] = -1; - var1.quantities[var2] = 0; - } - + @Export("getNextWorldListWorld") + static World getNextWorldListWorld() { + return World.World_listCount < World.World_count ? ChatChannel.World_worlds[++World.World_listCount - 1] : null; } - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;B)I", - garbageValue = "65" - ) - @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 + ItemDefinition.charToByteCp1252(var0.charAt(var3)); - } - - return var2; - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "(ILcx;ZI)I", - garbageValue = "1661608853" - ) - static int method147(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? Interpreter.field1111 : Calendar.field2507; - if (var0 == ScriptOpcodes.CC_GETX) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.x; - return 1; - } - if (var0 == ScriptOpcodes.CC_GETY) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.y; - return 1; - } - if (var0 == ScriptOpcodes.CC_GETWIDTH) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.width; - return 1; - } - if (var0 == ScriptOpcodes.CC_GETHEIGHT) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.height; - return 1; - } - if (var0 == ScriptOpcodes.CC_GETHIDE) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; - return 1; - } - if (var0 == ScriptOpcodes.CC_GETLAYER) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.parentId; - return 1; - } - return 2; - } - - @ObfuscatedName("hb") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "20" + garbageValue = "4" ) - @Export("calculateMenuBounds") - static void calculateMenuBounds() { - NetCache.calculateMenuBounds(class42.menuWidth / 2 + class247.menuX, class30.menuY); - } - - @ObfuscatedName("jt") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-2136228205" - ) - @Export("Widget_resetModelFrames") - static final void Widget_resetModelFrames(int var0) { - if (!class162.loadInterface(var0)) { - return; - } - Widget[] var1 = Widget.Widget_interfaceComponents[var0]; - - for (int var2 = 0; var2 < var1.length; ++var2) { - Widget var3 = var1[var2]; - if (var3 != null) { - var3.modelFrame = 0; - var3.modelFrameCycle = 0; - } - } - - } - - @ObfuscatedName("jd") - @ObfuscatedSignature( - signature = "(Lhj;B)Z", - garbageValue = "34" - ) - static final boolean method149(Widget var0) { - int var1 = var0.contentType; - if (var1 == 205) { - Client.logoutTimer = 250; - return true; - } - int var2; - int var3; - if (var1 >= 300 && var1 <= 313) { - var2 = (var1 - 300) / 2; - var3 = var1 & 1; - Client.playerAppearance.changeAppearance(var2, var3 == 1); - } - - if (var1 >= 314 && var1 <= 323) { - var2 = (var1 - 314) / 2; - var3 = var1 & 1; - Client.playerAppearance.method3993(var2, var3 == 1); - } - - if (var1 == 324) { - Client.playerAppearance.changeSex(false); - } - - if (var1 == 325) { - Client.playerAppearance.changeSex(true); - } - - if (var1 == 326) { - PacketBufferNode var4 = Archive.getPacketBufferNode(ClientPacket.field2215, Client.packetWriter.isaacCipher); - Client.playerAppearance.write(var4.packetBuffer); - Client.packetWriter.addNode(var4); - return true; - } - return false; + @Export("Widget_clearCached") + public static void Widget_clearCached() { + Widget.Widget_cachedSprites.clear(); + Widget.Widget_cachedModels.clear(); + Widget.Widget_cachedFonts.clear(); + Widget.Widget_cachedSpriteMasks.clear(); } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java index 6cc02a74f3..4f43b80115 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java @@ -1,36 +1,17 @@ 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; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("u") +@ObfuscatedName("c") @Implements("GrandExchangeOfferNameComparator") final class GrandExchangeOfferNameComparator implements Comparator { - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lhp;" - ) - @Export("musicTrackArchive") - public static AbstractArchive musicTrackArchive; - @ObfuscatedName("gv") - @ObfuscatedSignature( - signature = "[Llx;" - ) - @Export("modIconSprites") - static IndexedSprite[] modIconSprites; - @ObfuscatedName("hm") - @ObfuscatedGetter( - intValue = 477835103 - ) - @Export("cameraPitch") - static int cameraPitch; - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(Li;Li;B)I", - garbageValue = "-74" + signature = "(Lq;Lq;B)I", + garbageValue = "68" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -44,4 +25,426 @@ final class GrandExchangeOfferNameComparator implements Comparator { public boolean equals(Object var1) { return super.equals(var1); } + + @ObfuscatedName("an") + @ObfuscatedSignature( + signature = "(ILcr;ZB)I", + garbageValue = "68" + ) + static int method150(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.publicChatMode; + return 1; + } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { + Interpreter.Interpreter_intStackSize -= 3; + Client.publicChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + WorldMapIcon_0.privateChatMode = class270.method4895(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); + if (WorldMapIcon_0.privateChatMode == null) { + WorldMapIcon_0.privateChatMode = PrivateChatMode.field3788; + } + + Client.tradeChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + PacketBufferNode var18 = MenuAction.getPacketBufferNode(ClientPacket.field2200, Client.packetWriter.isaacCipher); + var18.packetBuffer.writeByte(Client.publicChatMode); + var18.packetBuffer.writeByte(WorldMapIcon_0.privateChatMode.field3791); + 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[--Interpreter.Interpreter_stringStackSize]; + Interpreter.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + PacketBufferNode var6 = MenuAction.getPacketBufferNode(ClientPacket.field2223, 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) { + Interpreter.Interpreter_intStackSize -= 2; + var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Message var15 = FileSystem.Messages_getByChannelAndID(var10, var4); + if (var15 != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var15.count; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var15.cycle; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.sender != null ? var15.sender : ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.prefix != null ? var15.prefix : ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.text != null ? var15.text : ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var15.isFromFriend() ? 1 : (var15.isFromIgnored() ? 2 : 0); + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Message var16 = class227.Messages_getMessage(var10); + if (var16 != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var16.type; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var16.cycle; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.sender != null ? var16.sender : ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.prefix != null ? var16.prefix : ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.text != null ? var16.text : ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var16.isFromFriend() ? 1 : (var16.isFromIgnored() ? 2 : 0); + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { + if (WorldMapIcon_0.privateChatMode == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapIcon_0.privateChatMode.field3791; + } + + return 1; + } else if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--Interpreter.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 (class60.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 (Language.Language_EN != class60.clientLanguage) { + 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 = MenuAction.getPacketBufferNode(ClientPacket.field2282, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeByte(0); + int var9 = var8.packetBuffer.offset; + var8.packetBuffer.writeByte(var4); + var8.packetBuffer.writeByte(var17); + var8.packetBuffer.writeByte(var7); + SpotAnimationDefinition.method4334(var8.packetBuffer, var3); + var8.packetBuffer.writeLengthByte(var8.packetBuffer.offset - var9); + Client.packetWriter.addNode(var8); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { + Interpreter.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; + String var12 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; + PacketBufferNode var11 = MenuAction.getPacketBufferNode(ClientPacket.field2210, Client.packetWriter.isaacCipher); + var11.packetBuffer.writeShort(0); + int var13 = var11.packetBuffer.offset; + var11.packetBuffer.writeStringCp1252NullTerminated(var3); + SpotAnimationDefinition.method4334(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[++Interpreter.Interpreter_intStackSize - 1] = Client.tradeChatMode; + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = BoundaryObject.Messages_getHistorySize(var10); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = FaceNormal.Messages_getNextChatID(var10); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Language.Messages_getLastChatID(var10); + return 1; + } else if (var0 == ScriptOpcodes.DOCHEAT) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + BuddyRankComparator.doCheat(var3); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { + Client.field668 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize].toLowerCase().trim(); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.field668; + return 1; + } else if (var0 == 5023) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + System.out.println(var3); + return 1; + } else { + return 2; + } + } else { + if (WorldMapIcon_1.localPlayer != null && WorldMapIcon_1.localPlayer.username != null) { + var3 = WorldMapIcon_1.localPlayer.username.getName(); + } else { + var3 = ""; + } + + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3; + return 1; + } + } + } + } + + @ObfuscatedName("fl") + @ObfuscatedSignature( + signature = "(Lbu;S)V", + garbageValue = "134" + ) + static final void method149(Actor var0) { + var0.isWalking = false; + SequenceDefinition var1; + if (var0.movementSequence != -1) { + var1 = Widget.SequenceDefinition_get(var0.movementSequence); + if (var1 != null && var1.frameIds != null) { + ++var0.movementFrameCycle; + if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) { + var0.movementFrameCycle = 1; + ++var0.movementFrame; + class325.addSequenceSoundEffect(var1, var0.movementFrame, var0.x, var0.y); + } + + if (var0.movementFrame >= var1.frameIds.length) { + var0.movementFrameCycle = 0; + var0.movementFrame = 0; + class325.addSequenceSoundEffect(var1, var0.movementFrame, var0.x, var0.y); + } + } else { + var0.movementSequence = -1; + } + } + + if (var0.spotAnimation != -1 && Client.cycle >= var0.field958) { + if (var0.spotAnimationFrame < 0) { + var0.spotAnimationFrame = 0; + } + + int var3 = HealthBarUpdate.SpotAnimationDefinition_get(var0.spotAnimation).sequence; + if (var3 != -1) { + SequenceDefinition var2 = Widget.SequenceDefinition_get(var3); + if (var2 != null && var2.frameIds != null) { + ++var0.spotAnimationFrameCycle; + if (var0.spotAnimationFrame < var2.frameIds.length && var0.spotAnimationFrameCycle > var2.frameLengths[var0.spotAnimationFrame]) { + var0.spotAnimationFrameCycle = 1; + ++var0.spotAnimationFrame; + class325.addSequenceSoundEffect(var2, var0.spotAnimationFrame, var0.x, var0.y); + } + + if (var0.spotAnimationFrame >= var2.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var2.frameIds.length)) { + var0.spotAnimation = -1; + } + } else { + var0.spotAnimation = -1; + } + } else { + var0.spotAnimation = -1; + } + } + + if (var0.sequence != -1 && var0.sequenceDelay <= 1) { + var1 = Widget.SequenceDefinition_get(var0.sequence); + if (var1.field3506 == 1 && var0.field947 > 0 && var0.field941 <= Client.cycle && var0.field965 < Client.cycle) { + var0.sequenceDelay = 1; + return; + } + } + + if (var0.sequence != -1 && var0.sequenceDelay == 0) { + var1 = Widget.SequenceDefinition_get(var0.sequence); + if (var1 != null && var1.frameIds != null) { + ++var0.sequenceFrameCycle; + if (var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) { + var0.sequenceFrameCycle = 1; + ++var0.sequenceFrame; + class325.addSequenceSoundEffect(var1, var0.sequenceFrame, var0.x, var0.y); + } + + if (var0.sequenceFrame >= var1.frameIds.length) { + var0.sequenceFrame -= var1.frameCount; + ++var0.field964; + if (var0.field964 >= var1.field3502) { + var0.sequence = -1; + } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) { + class325.addSequenceSoundEffect(var1, var0.sequenceFrame, var0.x, var0.y); + } else { + var0.sequence = -1; + } + } + + var0.isWalking = var1.field3501; + } else { + var0.sequence = -1; + } + } + + if (var0.sequenceDelay > 0) { + --var0.sequenceDelay; + } + + } + + @ObfuscatedName("hh") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1895114197" + ) + @Export("calculateMenuBounds") + static void calculateMenuBounds() { + WorldMapData_1.calculateMenuBounds(World.menuWidth / 2 + MilliClock.menuX, class96.menuY); + } + + @ObfuscatedName("iu") + @ObfuscatedSignature( + signature = "(IIIZI)V", + garbageValue = "1199898430" + ) + @Export("resizeComponents") + static final void resizeComponents(int var0, int var1, int var2, boolean var3) { + if (Projectile.loadInterface(var0)) { + ItemContainer.resizeInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3); + } + } + + @ObfuscatedName("kc") + @ObfuscatedSignature( + signature = "(IIIILls;Lhg;I)V", + garbageValue = "1652604393" + ) + @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; + UserComparator3.redHintArrowSprite.method6022(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); + } else { + class191.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); + } + + } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java index 1755ffc3ce..b8132203d3 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java @@ -4,435 +4,159 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("by") +@ObfuscatedName("br") @Implements("GrandExchangeOfferOwnWorldComparator") public class GrandExchangeOfferOwnWorldComparator implements Comparator { - @ObfuscatedName("h") - @Export("operatingSystemLC") - public static String operatingSystemLC; - @ObfuscatedName("dm") + @ObfuscatedName("gd") @ObfuscatedSignature( - signature = "Liu;" + signature = "[Llq;" ) - @Export("archive15") - static Archive archive15; - @ObfuscatedName("q") + @Export("mapSceneSprites") + static IndexedSprite[] mapSceneSprites; + @ObfuscatedName("s") @Export("filterWorlds") boolean filterWorlds; GrandExchangeOfferOwnWorldComparator() { } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Li;Li;I)I", - garbageValue = "150441453" + signature = "(Lq;Lq;I)I", + garbageValue = "-1137362043" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { if (var2.world == var1.world) { return 0; - } - if (this.filterWorlds) { - if (Client.worldId == var1.world) { - return -1; + } else { + if (this.filterWorlds) { + if (Client.worldId == var1.world) { + return -1; + } + + if (var2.world == Client.worldId) { + return 1; + } } - if (var2.world == Client.worldId) { - return 1; - } + return var1.world < var2.world ? -1 : 1; } - - return var1.world < var2.world ? -1 : 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("q") - @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-836499887" - ) - @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 { - byte[] var7 = VarbitDefinition.VarbitDefinition_archive.takeFile(14, var0); - var2 = new VarbitDefinition(); - if (var7 != null) { - var2.decode(new Buffer(var7)); - } - - 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; + public boolean equals(Object var1) { + return super.equals(var1); } - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(IIIIIILer;Lfv;S)V", - garbageValue = "-19782" + signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "1333427398" ) - static final void method1236(int plane, int x, int y, int objectID, int rotation, int objectType, Scene var6, CollisionMap var7) { - if (Client.isLowDetail && (Tiles.Tiles_renderFlags[0][x][y] & 2) == 0 && (Tiles.Tiles_renderFlags[plane][x][y] & 16) != 0) { - return; - } - if (plane < Tiles.Tiles_minPlane) { - Tiles.Tiles_minPlane = plane; - } + @Export("setLoginResponseString") + static void setLoginResponseString(String var0, String var1, String var2) { + Login.Login_response1 = var0; + Login.Login_response2 = var1; + Login.Login_response3 = var2; + } - ObjectDefinition var8 = ViewportMouse.getObjectDefinition(objectID); - int var9; - int var10; - if (rotation != 1 && rotation != 3) { - var9 = var8.sizeX; - var10 = var8.sizeY; + @ObfuscatedName("ev") + @ObfuscatedSignature( + signature = "(IB)V", + garbageValue = "-84" + ) + @Export("getLoginError") + static void getLoginError(int var0) { + if (var0 == -3) { + setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); + } else if (var0 == -2) { + setLoginResponseString("", "Error connecting to server.", ""); + } else if (var0 == -1) { + setLoginResponseString("No response from server.", "Please try using a different world.", ""); + } else if (var0 == 3) { + Login.loginIndex = 3; + Login.field1161 = 1; + } else if (var0 == 4) { + Login.loginIndex = 12; + Login.field1160 = 0; + } else if (var0 == 5) { + Login.field1161 = 2; + 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) { + setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); + } else if (var0 == 7) { + setLoginResponseString("This world is full.", "Please use a different world.", ""); + } else if (var0 == 8) { + setLoginResponseString("Unable to connect.", "Login server offline.", ""); + } else if (var0 == 9) { + setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); + } else if (var0 == 10) { + setLoginResponseString("Unable to connect.", "Bad session id.", ""); + } else if (var0 == 11) { + setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); + } else if (var0 == 12) { + setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); + } else if (var0 == 13) { + setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); + } else if (var0 == 14) { + setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 16) { + setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); + } else if (var0 == 17) { + 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.field1160 = 1; + } else if (var0 == 19) { + setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); + } else if (var0 == 20) { + setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); + } else if (var0 == 22) { + setLoginResponseString("Malformed login packet.", "Please try again.", ""); + } else if (var0 == 23) { + setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 24) { + setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); + } else if (var0 == 25) { + setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); + } else if (var0 == 26) { + setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); + } else if (var0 == 27) { + setLoginResponseString("", "Service unavailable.", ""); + } else if (var0 == 31) { + 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) { + 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) { + setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); + } else if (var0 == 38) { + 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 { - var9 = var8.sizeY; - var10 = var8.sizeX; - } - - int var11; - int var12; - if (var9 + x <= 104) { - var11 = (var9 >> 1) + x; - var12 = (var9 + 1 >> 1) + x; - } else { - var11 = x; - var12 = x + 1; - } - - int var13; - int var14; - if (var10 + y <= 104) { - var13 = (var10 >> 1) + y; - var14 = y + (var10 + 1 >> 1); - } else { - var13 = y; - var14 = y + 1; - } - - int[][] var15 = Tiles.Tiles_heights[plane]; - int var16 = var15[var11][var14] + var15[var12][var13] + var15[var11][var13] + var15[var12][var14] >> 2; - int var17 = (x << 7) + (var9 << 6); - int var18 = (y << 7) + (var10 << 6); - long var19 = Tile.calculateTag(x, y, 2, var8.int1 == 0, objectID); - int var21 = objectType + (rotation << 6); - if (var8.int3 == 1) { - var21 += 256; - } - - if (var8.hasSound()) { - class83.newObjectSound(plane, x, y, var8, rotation); - } - - Object var22; - if (objectType == 22) { - if (Client.isLowDetail && var8.int1 == 0 && var8.interactType != 1 && !var8.boolean2) { + if (var0 == 56) { + setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); + FloorDecoration.updateGameState(11); return; } - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(22, rotation, var15, var17, var16, var18); + + if (var0 == 57) { + setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); + FloorDecoration.updateGameState(11); + return; + } + + if (var0 == 61) { + Login.loginIndex = 7; } else { - var22 = new DynamicObject(objectID, 22, rotation, plane, x, y, var8.animationId, true, (Entity)null); + setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); } - - var6.newFloorDecoration(plane, x, y, var16, (Entity)var22, var19, var21); - if (var8.interactType == 1 && var7 != null) { - var7.setBlockedByFloorDec(x, y); - } - - } else if (objectType == 10 || objectType == 11) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(10, rotation, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(objectID, 10, rotation, plane, x, y, var8.animationId, true, (Entity) null); - } - - if (var22 != null && var6.method3076(plane, x, y, var16, var9, var10, (Entity) var22, objectType == 11 ? 256 : 0, var19, var21) && var8.clipped) { - int var23 = 15; - if (var22 instanceof Model) { - var23 = ((Model) var22).method2864() / 4; - if (var23 > 30) { - var23 = 30; - } - } - - for (int var24 = 0; var24 <= var9; ++var24) { - for (int var25 = 0; var25 <= var10; ++var25) { - if (var23 > class32.field282[plane][var24 + x][var25 + y]) { - class32.field282[plane][var24 + x][var25 + y] = (byte) var23; - } - } - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(x, y, var9, var10, var8.boolean1); - } - - } else if (objectType >= 12) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(objectType, rotation, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(objectID, objectType, rotation, plane, x, y, var8.animationId, true, (Entity) null); - } - - var6.method3076(plane, x, y, var16, 1, 1, (Entity) var22, 0, var19, var21); - if (objectType >= 12 && objectType <= 17 && objectType != 13 && plane > 0) { - FaceNormal.field1887[plane][x][y] |= 2340; - } - - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(x, y, var9, var10, var8.boolean1); - } - - } else if (objectType == 0) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(0, rotation, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(objectID, 0, rotation, plane, x, y, var8.animationId, true, (Entity) null); - } - - var6.newBoundaryObject(plane, x, y, var16, (Entity) var22, (Entity) null, Tiles.field512[rotation], 0, var19, var21); - if (rotation == 0) { - if (var8.clipped) { - class32.field282[plane][x][y] = 50; - class32.field282[plane][x][y + 1] = 50; - } - - if (var8.modelClipped) { - FaceNormal.field1887[plane][x][y] |= 585; - } - } else if (rotation == 1) { - if (var8.clipped) { - class32.field282[plane][x][y + 1] = 50; - class32.field282[plane][x + 1][y + 1] = 50; - } - - if (var8.modelClipped) { - FaceNormal.field1887[plane][x][1 + y] |= 1170; - } - } else if (rotation == 2) { - if (var8.clipped) { - class32.field282[plane][x + 1][y] = 50; - class32.field282[plane][x + 1][y + 1] = 50; - } - - if (var8.modelClipped) { - FaceNormal.field1887[plane][x + 1][y] |= 585; - } - } else if (rotation == 3) { - if (var8.clipped) { - class32.field282[plane][x][y] = 50; - class32.field282[plane][x + 1][y] = 50; - } - - if (var8.modelClipped) { - FaceNormal.field1887[plane][x][y] |= 1170; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3559(x, y, objectType, rotation, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method3082(plane, x, y, var8.int2); - } - - } else if (objectType == 1) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(1, rotation, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(objectID, 1, rotation, plane, x, y, var8.animationId, true, (Entity) null); - } - - var6.newBoundaryObject(plane, x, y, var16, (Entity) var22, (Entity) null, Tiles.field513[rotation], 0, var19, var21); - if (var8.clipped) { - if (rotation == 0) { - class32.field282[plane][x][y + 1] = 50; - } else if (rotation == 1) { - class32.field282[plane][x + 1][y + 1] = 50; - } else if (rotation == 2) { - class32.field282[plane][x + 1][y] = 50; - } else if (rotation == 3) { - class32.field282[plane][x][y] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3559(x, y, objectType, rotation, var8.boolean1); - } - - } else if (objectType == 2) { - int var28 = rotation + 1 & 3; - Object var29; - Object var30; - if (var8.animationId == -1 && var8.transforms == null) { - var29 = var8.getEntity(2, rotation + 4, var15, var17, var16, var18); - var30 = var8.getEntity(2, var28, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(objectID, 2, rotation + 4, plane, x, y, var8.animationId, true, (Entity) null); - var30 = new DynamicObject(objectID, 2, var28, plane, x, y, var8.animationId, true, (Entity) null); - } - - var6.newBoundaryObject(plane, x, y, var16, (Entity) var29, (Entity) var30, Tiles.field512[rotation], Tiles.field512[var28], var19, var21); - if (var8.modelClipped) { - if (rotation == 0) { - FaceNormal.field1887[plane][x][y] |= 585; - FaceNormal.field1887[plane][x][y + 1] |= 1170; - } else if (rotation == 1) { - FaceNormal.field1887[plane][x][y + 1] |= 1170; - FaceNormal.field1887[plane][x + 1][y] |= 585; - } else if (rotation == 2) { - FaceNormal.field1887[plane][x + 1][y] |= 585; - FaceNormal.field1887[plane][x][y] |= 1170; - } else if (rotation == 3) { - FaceNormal.field1887[plane][x][y] |= 1170; - FaceNormal.field1887[plane][x][y] |= 585; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3559(x, y, objectType, rotation, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method3082(plane, x, y, var8.int2); - } - - } else if (objectType == 3) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(3, rotation, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(objectID, 3, rotation, plane, x, y, var8.animationId, true, (Entity) null); - } - - var6.newBoundaryObject(plane, x, y, var16, (Entity) var22, (Entity) null, Tiles.field513[rotation], 0, var19, var21); - if (var8.clipped) { - if (rotation == 0) { - class32.field282[plane][x][y + 1] = 50; - } else if (rotation == 1) { - class32.field282[plane][x + 1][y + 1] = 50; - } else if (rotation == 2) { - class32.field282[plane][x + 1][y] = 50; - } else if (rotation == 3) { - class32.field282[plane][x][y] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3559(x, y, objectType, rotation, var8.boolean1); - } - - } else if (objectType == 9) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(objectType, rotation, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(objectID, objectType, rotation, plane, x, y, var8.animationId, true, (Entity) null); - } - - var6.method3076(plane, x, y, var16, 1, 1, (Entity) var22, 0, var19, var21); - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(x, y, var9, var10, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method3082(plane, x, y, var8.int2); - } - - } else if (objectType == 4) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(4, rotation, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(objectID, 4, rotation, plane, x, y, var8.animationId, true, (Entity) null); - } - - var6.newWallDecoration(plane, x, y, var16, (Entity) var22, (Entity) null, Tiles.field512[rotation], 0, 0, 0, var19, var21); - } else if (objectType == 5) { - int var28 = 16; - long var31 = var6.getBoundaryObjectTag(plane, x, y); - Object var33; - if (var31 != 0L) { - var28 = ViewportMouse.getObjectDefinition(class43.Entity_unpackID(var31)).int2; - } - - if (var8.animationId == -1 && var8.transforms == null) { - var33 = var8.getEntity(4, rotation, var15, var17, var16, var18); - } else { - var33 = new DynamicObject(objectID, 4, rotation, plane, x, y, var8.animationId, true, (Entity) null); - } - - var6.newWallDecoration(plane, x, y, var16, (Entity) var33, (Entity) null, Tiles.field512[rotation], 0, var28 * Tiles.field514[rotation], var28 * Tiles.field520[rotation], var19, var21); - } else if (objectType == 6) { - int var28 = 8; - long var31 = var6.getBoundaryObjectTag(plane, x, y); - Object var33; - if (0L != var31) { - var28 = ViewportMouse.getObjectDefinition(class43.Entity_unpackID(var31)).int2 / 2; - } - - if (var8.animationId == -1 && var8.transforms == null) { - var33 = var8.getEntity(4, rotation + 4, var15, var17, var16, var18); - } else { - var33 = new DynamicObject(objectID, 4, rotation + 4, plane, x, y, var8.animationId, true, (Entity) null); - } - - var6.newWallDecoration(plane, x, y, var16, (Entity) var33, (Entity) null, 256, rotation, var28 * Tiles.field509[rotation], var28 * Tiles.field517[rotation], var19, var21); - } else if (objectType == 7) { - int var23 = rotation + 2 & 3; - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(4, var23 + 4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(objectID, 4, var23 + 4, plane, x, y, var8.animationId, true, (Entity) null); - } - - var6.newWallDecoration(plane, x, y, var16, (Entity) var22, (Entity) null, 256, var23, 0, 0, var19, var21); - } else if (objectType == 8) { - int var28 = 8; - long var31 = var6.getBoundaryObjectTag(plane, x, y); - if (var31 != 0L) { - var28 = ViewportMouse.getObjectDefinition(class43.Entity_unpackID(var31)).int2 / 2; - } - - int var27 = rotation + 2 & 3; - Object var26; - Object var33; - if (var8.animationId == -1 && var8.transforms == null) { - var33 = var8.getEntity(4, rotation + 4, var15, var17, var16, var18); - var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); - } else { - var33 = new DynamicObject(objectID, 4, rotation + 4, plane, x, y, var8.animationId, true, (Entity) null); - var26 = new DynamicObject(objectID, 4, var27 + 4, plane, x, y, var8.animationId, true, (Entity) null); - } - - var6.newWallDecoration(plane, x, y, var16, (Entity) var33, (Entity) var26, 256, rotation, var28 * Tiles.field509[rotation], var28 * Tiles.field517[rotation], var19, var21); } - } - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(CI)Z", - garbageValue = "81197967" - ) - @Export("isAlphaNumeric") - public static boolean isAlphaNumeric(char var0) { - return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; + FloorDecoration.updateGameState(10); } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java index c0f09a5518..07a42e8099 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java @@ -1,147 +1,572 @@ 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("x") @Implements("GrandExchangeOfferTotalQuantityComparator") final class GrandExchangeOfferTotalQuantityComparator implements Comparator { - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Li;Li;I)I", - garbageValue = "-918016039" + signature = "Lhz;" + ) + @Export("HitSplatDefinition_spritesArchive") + public static AbstractArchive HitSplatDefinition_spritesArchive; + @ObfuscatedName("ep") + @ObfuscatedGetter( + intValue = 349503159 + ) + static int field59; + + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(Lq;Lq;I)I", + garbageValue = "-1907717670" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.grandExchangeOffer.totalQuantity < var2.grandExchangeOffer.totalQuantity ? -1 : (var2.grandExchangeOffer.totalQuantity == var1.grandExchangeOffer.totalQuantity ? 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("ft") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1523306949" - ) - @Export("playSong") - static void playSong(int groupId) { - if (groupId == -1 && !Client.field699) { - NetSocket.method3553(); - } else if (groupId != -1 && groupId != Client.field889 && Client.field911 != 0 && !Client.field699) { - Archive var1 = WorldMapRegion.archive6; - int var2 = Client.field911; - class197.field2402 = 1; - GrandExchangeOfferNameComparator.musicTrackArchive = var1; - class197.musicTrackGroupId = groupId; - class197.musicTrackFileId = 0; - ScriptFrame.field529 = var2; - BuddyRankComparator.musicTrackBoolean = false; - class197.field2404 = 2; - } - - Client.field889 = groupId; + public int compare(Object var1, Object var2) { + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } - @ObfuscatedName("if") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Lhj;I)Ljava/lang/String;", - garbageValue = "16777215" + signature = "(Lea;[Lfm;I)V", + garbageValue = "-207613599" ) - static String method92(String var0, Widget var1) { - if (var0.indexOf("%") == -1) { - return var0; + static final void method98(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); + } + } + } + } } - for (int var2 = 1; var2 <= 5; ++var2) { - while (true) { - int var3 = var0.indexOf("%" + var2); - if (var3 == -1) { - break; + + Tiles.field477 += (int)(Math.random() * 5.0D) - 2; + if (Tiles.field477 < -8) { + Tiles.field477 = -8; + } + + if (Tiles.field477 > 8) { + Tiles.field477 = 8; + } + + Tiles.field486 += (int)(Math.random() * 5.0D) - 2; + if (Tiles.field486 < -16) { + Tiles.field486 = -16; + } + + if (Tiles.field486 > 16) { + Tiles.field486 = 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[][] var44 = class188.field2321[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 = (var16 * -50 + var18 * -50 + var17 * -10) / var10 + 96; + var20 = (var44[var12][var11 + 1] >> 3) + (var44[var12 - 1][var11] >> 2) + (var44[var12][var11 - 1] >> 2) + (var44[var12 + 1][var11] >> 3) + (var44[var12][var11] >> 1); + class4.field31[var12][var11] = var19 - var20; + } + } + + for (var11 = 0; var11 < 104; ++var11) { + Tiles.Tiles_hue[var11] = 0; + class3.Tiles_saturation[var11] = 0; + Buddy.Tiles_lightness[var11] = 0; + class49.Tiles_hueMultiplier[var11] = 0; + MenuAction.field1129[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 = Tiles.field485[var2][var13][var12] & 255; + if (var14 > 0) { + FloorUnderlayDefinition var45 = StudioGame.FloorUnderlayDefinition_get(var14 - 1); + var10000 = Tiles.Tiles_hue; + var10000[var12] += var45.hue; + var10000 = class3.Tiles_saturation; + var10000[var12] += var45.saturation; + var10000 = Buddy.Tiles_lightness; + var10000[var12] += var45.lightness; + var10000 = class49.Tiles_hueMultiplier; + var10000[var12] += var45.hueMultiplier; + var10002 = MenuAction.field1129[var12]++; + } + } + + var14 = var11 - 5; + if (var14 >= 0 && var14 < 104) { + var15 = Tiles.field485[var2][var14][var12] & 255; + if (var15 > 0) { + FloorUnderlayDefinition var46 = StudioGame.FloorUnderlayDefinition_get(var15 - 1); + var10000 = Tiles.Tiles_hue; + var10000[var12] -= var46.hue; + var10000 = class3.Tiles_saturation; + var10000[var12] -= var46.saturation; + var10000 = Buddy.Tiles_lightness; + var10000[var12] -= var46.lightness; + var10000 = class49.Tiles_hueMultiplier; + var10000[var12] -= var46.hueMultiplier; + var10002 = MenuAction.field1129[var12]--; + } + } } - String var4 = var0.substring(0, var3); - int var6 = Varps.method3969(var1, var2 - 1); - String var5; - if (var6 < 999999999) { - var5 = Integer.toString(var6); - } else { - var5 = "*"; + 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 += Tiles.Tiles_hue[var18]; + var13 += class3.Tiles_saturation[var18]; + var14 += Buddy.Tiles_lightness[var18]; + var15 += class49.Tiles_hueMultiplier[var18]; + var16 += MenuAction.field1129[var18]; + } + + var19 = var17 - 5; + if (var19 >= 0 && var19 < 104) { + var12 -= Tiles.Tiles_hue[var19]; + var13 -= class3.Tiles_saturation[var19]; + var14 -= Buddy.Tiles_lightness[var19]; + var15 -= class49.Tiles_hueMultiplier[var19]; + var16 -= MenuAction.field1129[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.field485[var2][var11][var17] & 255; + int var21 = AccessFile.field4061[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 = class4.field31[var11][var17]; + int var27 = class4.field31[var11 + 1][var17]; + int var28 = class4.field31[var11 + 1][var17 + 1]; + int var29 = class4.field31[var11][var17 + 1]; + int var30 = -1; + int var31 = -1; + int var32; + int var33; + int var34; + if (var20 > 0) { + var32 = var12 * 256 / var15; + var33 = var13 / var16; + var34 = var14 / var16; + var30 = BoundaryObject.hslToRgb(var32, var33, var34); + var32 = var32 + Tiles.field477 & 255; + var34 += Tiles.field486; + if (var34 < 0) { + var34 = 0; + } else if (var34 > 255) { + var34 = 255; + } + + var31 = BoundaryObject.hslToRgb(var32, var33, var34); + } + + FloorOverlayDefinition var35; + if (var2 > 0) { + boolean var51 = true; + if (var20 == 0 && class210.field2492[var2][var11][var17] != 0) { + var51 = false; + } + + if (var21 > 0) { + var34 = var21 - 1; + var35 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var34); + FloorOverlayDefinition var47; + if (var35 != null) { + var47 = var35; + } else { + byte[] var49 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var34); + var35 = new FloorOverlayDefinition(); + if (var49 != null) { + var35.decode(new Buffer(var49), var34); + } + + var35.postDecode(); + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var35, (long)var34); + var47 = var35; + } + + if (!var47.hideUnderlay) { + var51 = false; + } + } + + if (var51 && var23 == var22 && var24 == var22 && var22 == var25) { + var10000 = Tiles.field483[var2][var11]; + var10000[var17] |= 2340; + } + } + + var32 = 0; + if (var31 != -1) { + var32 = Rasterizer3D.Rasterizer3D_colorPalette[class197.method3645(var31, 96)]; + } + + if (var21 == 0) { + var0.addTile(var2, var11, var17, 0, 0, -1, var22, var23, var24, var25, class197.method3645(var30, var26), class197.method3645(var30, var27), class197.method3645(var30, var28), class197.method3645(var30, var29), 0, 0, 0, 0, var32, 0); + } else { + var33 = class210.field2492[var2][var11][var17] + 1; + byte var52 = Tiles.field475[var2][var11][var17]; + int var36 = var21 - 1; + FloorOverlayDefinition var37 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var36); + if (var37 != null) { + var35 = var37; + } else { + byte[] var48 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var36); + var37 = new FloorOverlayDefinition(); + if (var48 != null) { + var37.decode(new Buffer(var48), var36); + } + + var37.postDecode(); + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var37, (long)var36); + var35 = var37; + } + + int var38 = var35.texture; + int var39; + int var40; + int var41; + int var42; + if (var38 >= 0) { + var40 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var38); + var39 = -1; + } else if (var35.primaryRgb == 16711935) { + var39 = -2; + var38 = -1; + var40 = -2; + } else { + var39 = BoundaryObject.hslToRgb(var35.hue, var35.saturation, var35.lightness); + var41 = var35.hue + Tiles.field477 & 255; + var42 = var35.lightness + Tiles.field486; + if (var42 < 0) { + var42 = 0; + } else if (var42 > 255) { + var42 = 255; + } + + var40 = BoundaryObject.hslToRgb(var41, var35.saturation, var42); + } + + var41 = 0; + if (var40 != -2) { + var41 = Rasterizer3D.Rasterizer3D_colorPalette[RouteStrategy.method3533(var40, 96)]; + } + + if (var35.secondaryRgb != -1) { + var42 = var35.secondaryHue + Tiles.field477 & 255; + int var43 = var35.secondaryLightness + Tiles.field486; + if (var43 < 0) { + var43 = 0; + } else if (var43 > 255) { + var43 = 255; + } + + var40 = BoundaryObject.hslToRgb(var42, var35.secondarySaturation, var43); + var41 = Rasterizer3D.Rasterizer3D_colorPalette[RouteStrategy.method3533(var40, 96)]; + } + + var0.addTile(var2, var11, var17, var33, var52, var38, var22, var23, var24, var25, class197.method3645(var30, var26), class197.method3645(var30, var27), class197.method3645(var30, var28), class197.method3645(var30, var29), RouteStrategy.method3533(var39, var26), RouteStrategy.method3533(var39, var27), RouteStrategy.method3533(var39, var28), RouteStrategy.method3533(var39, var29), var32, var41); + } + } + } + } } + } - var0 = var4 + var5 + var0.substring(var3 + 2); + for (var11 = 1; var11 < 103; ++var11) { + for (var12 = 1; var12 < 103; ++var12) { + var0.setTileMinPlane(var2, var12, var11, ObjectDefinition.method4545(var2, var12, var11)); + } + } + + Tiles.field485[var2] = null; + AccessFile.field4061[var2] = null; + class210.field2492[var2] = null; + Tiles.field475[var2] = null; + class188.field2321[var2] = null; + } + + var0.method3100(-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 var50; + if ((Tiles.field483[var6][var8][var7] & var2) != 0) { + var9 = var7; + var10 = var7; + var11 = var6; + + for (var12 = var6; var9 > 0 && (Tiles.field483[var6][var8][var9 - 1] & var2) != 0; --var9) { + } + + while (var10 < 104 && (Tiles.field483[var6][var8][var10 + 1] & var2) != 0) { + ++var10; + } + + label483: + while (var11 > 0) { + for (var13 = var9; var13 <= var10; ++var13) { + if ((Tiles.field483[var11 - 1][var8][var13] & var2) == 0) { + break label483; + } + } + + --var11; + } + + label472: + while (var12 < var5) { + for (var13 = var9; var13 <= var10; ++var13) { + if ((Tiles.field483[var12 + 1][var8][var13] & var2) == 0) { + break label472; + } + } + + ++var12; + } + + var13 = (var10 - var9 + 1) * (var12 + 1 - var11); + if (var13 >= 8) { + var50 = 240; + var15 = Tiles.Tiles_heights[var12][var8][var9] - var50; + 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.field483[var17][var8]; + var10000[var18] &= ~var2; + } + } + } + } + + if ((Tiles.field483[var6][var8][var7] & var3) != 0) { + var9 = var8; + var10 = var8; + var11 = var6; + + for (var12 = var6; var9 > 0 && (Tiles.field483[var6][var9 - 1][var7] & var3) != 0; --var9) { + } + + while (var10 < 104 && (Tiles.field483[var6][var10 + 1][var7] & var3) != 0) { + ++var10; + } + + label536: + while (var11 > 0) { + for (var13 = var9; var13 <= var10; ++var13) { + if ((Tiles.field483[var11 - 1][var13][var7] & var3) == 0) { + break label536; + } + } + + --var11; + } + + label525: + while (var12 < var5) { + for (var13 = var9; var13 <= var10; ++var13) { + if ((Tiles.field483[var12 + 1][var13][var7] & var3) == 0) { + break label525; + } + } + + ++var12; + } + + var13 = (var12 + 1 - var11) * (var10 - var9 + 1); + if (var13 >= 8) { + var50 = 240; + var15 = Tiles.Tiles_heights[var12][var9][var7] - var50; + 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.field483[var17][var18]; + var10000[var7] &= ~var3; + } + } + } + } + + if ((Tiles.field483[var6][var8][var7] & var4) != 0) { + var9 = var8; + var10 = var8; + var11 = var7; + + for (var12 = var7; var11 > 0 && (Tiles.field483[var6][var8][var11 - 1] & var4) != 0; --var11) { + } + + while (var12 < 104 && (Tiles.field483[var6][var8][var12 + 1] & var4) != 0) { + ++var12; + } + + label589: + while (var9 > 0) { + for (var13 = var11; var13 <= var12; ++var13) { + if ((Tiles.field483[var6][var9 - 1][var13] & var4) == 0) { + break label589; + } + } + + --var9; + } + + label578: + while (var10 < 104) { + for (var13 = var11; var13 <= var12; ++var13) { + if ((Tiles.field483[var6][var10 + 1][var13] & var4) == 0) { + break label578; + } + } + + ++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.field483[var6][var14]; + var10000[var15] &= ~var4; + } + } + } + } + } + } } } - return var0; } - @ObfuscatedName("jm") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lhj;I)V", - garbageValue = "-1619270893" + signature = "(III)I", + garbageValue = "510477713" ) - static final void method85(Widget var0) { - int var1 = var0.contentType; - if (var1 == 324) { - if (Client.field919 == -1) { - Client.field919 = var0.spriteId2; - Client.field920 = var0.spriteId; - } - - if (Client.playerAppearance.isFemale) { - var0.spriteId2 = Client.field919; - } else { - var0.spriteId2 = Client.field920; - } - - } else if (var1 == 325) { - if (Client.field919 == -1) { - Client.field919 = var0.spriteId2; - Client.field920 = var0.spriteId; - } - - if (Client.playerAppearance.isFemale) { - var0.spriteId2 = Client.field920; - } else { - var0.spriteId2 = Client.field919; - } - - } 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; + static final int method101(int var0, int var1) { + int var2 = User.method4969(var0 + 45365, var1 + 91923, 4) - 128 + (User.method4969(var0 + 10294, 37821 + var1, 2) - 128 >> 1) + (User.method4969(var0, var1, 1) - 128 >> 2); + var2 = (int)(0.3D * (double)var2) + 35; + if (var2 < 10) { + var2 = 10; + } else if (var2 > 60) { + var2 = 60; } + + return var2; } - @ObfuscatedName("kx") + @ObfuscatedName("gg") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "-282995090" + signature = "(IIIB)I", + garbageValue = "-30" ) - @Export("removeImageTag") - static String removeImageTag(String var0) { - PlayerType[] var1 = UserComparator5.PlayerType_values(); - - for (int var2 = 0; var2 < var1.length; ++var2) { - PlayerType var3 = var1[var2]; - if (var3.modIcon != -1 && var0.startsWith(WorldMapSection1.getModIconString(var3.modIcon))) { - var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); - break; + @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; } - } - return var0; + int var6 = var0 & 127; + int var7 = var1 & 127; + int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + Tiles.Tiles_heights[var5][var3 + 1][var4] * var6 >> 7; + int var9 = Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) + Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] * var6 >> 7; + return var8 * (128 - var7) + var9 * var7 >> 7; + } else { + return 0; + } } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java index e02b32ace1..7f3bfd3f1c 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java @@ -1,20 +1,28 @@ +import java.awt.Image; 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; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("m") +@ObfuscatedName("f") @Implements("GrandExchangeOfferUnitPriceComparator") final class GrandExchangeOfferUnitPriceComparator implements Comparator { - @ObfuscatedName("w") - @Export("localPlayerName") - public static String localPlayerName; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -1744737453 + ) + @Export("SpriteBuffer_spriteWidth") + public static int SpriteBuffer_spriteWidth; + @ObfuscatedName("as") + static Image field74; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Li;Li;B)I", - garbageValue = "-46" + signature = "(Lq;Lq;I)I", + garbageValue = "1336373316" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -29,169 +37,302 @@ final class GrandExchangeOfferUnitPriceComparator implements Comparator { return super.equals(var1); } - @ObfuscatedName("jp") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "31" + signature = "(II)Lig;", + garbageValue = "-2004472785" ) - static final void method124(int var0) { - class65.method1176(); - - for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var1.obj != null) { - var1.set(); + @Export("HealthBarDefinition_get") + public static HealthBarDefinition HealthBarDefinition_get(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; } + } - int var4 = GrandExchangeOfferWorldComparator.method61(var0).type; - if (var4 == 0) { - return; - } - int var2 = Varps.Varps_main[var0]; - if (var4 == 1) { - if (var2 == 1) { - Rasterizer3D.Rasterizer3D_setBrightness(0.9D); - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.9D); + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "75" + ) + @Export("VarbitDefinition_clearCached") + public static void VarbitDefinition_clearCached() { + VarbitDefinition.VarbitDefinition_cached.clear(); + } + + @ObfuscatedName("af") + @ObfuscatedSignature( + signature = "(ILcr;ZI)I", + garbageValue = "1195585580" + ) + static int method136(int var0, Script var1, boolean var2) { + int var3; + int var4; + if (var0 == ScriptOpcodes.ADD) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 + var4; + return 1; + } else if (var0 == ScriptOpcodes.SUB) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 - var4; + return 1; + } else if (var0 == ScriptOpcodes.MULTIPLY) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 * var4; + return 1; + } else if (var0 == ScriptOpcodes.DIV) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 / var4; + return 1; + } else if (var0 == ScriptOpcodes.RANDOM) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); + return 1; + } else if (var0 == ScriptOpcodes.RANDOMINC) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); + return 1; + } else if (var0 == ScriptOpcodes.INTERPOLATE) { + Interpreter.Interpreter_intStackSize -= 5; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + int var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; + int var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 + (var4 - var3) * (var7 - var5) / (var6 - var5); + return 1; + } else if (var0 == ScriptOpcodes.ADDPERCENT) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 + var4 * var3 / 100; + return 1; + } else if (var0 == ScriptOpcodes.SETBIT) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 | 1 << var4; + return 1; + } else if (var0 == ScriptOpcodes.CLEARBIT) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); + return 1; + } else if (var0 == ScriptOpcodes.TESTBIT) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.MOD) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 % var4; + return 1; + } else if (var0 == ScriptOpcodes.POW) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + if (var3 == 0) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); } - 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); - } - - FontName.method5317(); - } - - if (var4 == 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.field911) { - if (Client.field911 == 0 && Client.field889 != -1) { - FileSystem.method3503(WorldMapRegion.archive6, Client.field889, 0, var3, false); - Client.field699 = false; - } else if (var3 == 0) { - NetSocket.method3553(); - Client.field699 = false; - } else if (class197.field2402 != 0) { - ScriptFrame.field529 = var3; - } else { - Interpreter.midiPcmStream.method3706(var3); + return 1; + } else if (var0 == ScriptOpcodes.INVPOW) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + if (var3 == 0) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else { + switch(var4) { + case 0: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; + break; + case 1: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; + break; + case 2: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); + break; + case 3: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); + break; + case 4: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); + break; + default: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); } - Client.field911 = var3; + return 1; } + } else if (var0 == ScriptOpcodes.AND) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & var4; + return 1; + } else if (var0 == ScriptOpcodes.OR) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 | var4; + return 1; + } else if (var0 == ScriptOpcodes.SCALE) { + Interpreter.Interpreter_intStackSize -= 3; + long var9 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + long var11 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + long var13 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(var9 * var13 / var11); + return 1; + } else { + return 2; } + } - if (var4 == 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 (var4 == 5) { - Client.leftClickOpensMenu = var2; - } - - if (var4 == 6) { - Client.chatEffects = var2; - } - - if (var4 == 9) { - Client.field809 = var2; - } - - if (var4 == 10) { - if (var2 == 0) { - Client.field892 = 127; - } - - if (var2 == 1) { - Client.field892 = 96; - } - - if (var2 == 2) { - Client.field892 = 64; - } - - if (var2 == 3) { - Client.field892 = 32; - } - - if (var2 == 4) { - Client.field892 = 0; - } - } - - if (var4 == 17) { - Client.followerIndex = var2 & 0xffff; - } - - if (var4 == 18) { - Client.playerAttackOption = (AttackOption)SoundSystem.findEnumerated(AbstractArchive.AttackOption_values(), var2); - if (Client.playerAttackOption == null) { - Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - - if (var4 == 19) { - if (var2 == -1) { - Client.combatTargetPlayerIndex = -1; - } else { - Client.combatTargetPlayerIndex = var2 & 2047; - } - } - - if (var4 == 22) { - Client.npcAttackOption = (AttackOption)SoundSystem.findEnumerated(AbstractArchive.AttackOption_values(), var2); - if (Client.npcAttackOption == null) { - Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } + @ObfuscatedName("fg") + @ObfuscatedSignature( + signature = "(IIII)V", + garbageValue = "773083265" + ) + @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("fh") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "-38" + ) + static final void method133() { + if (Client.field651 != ItemContainer.plane) { + Client.field651 = ItemContainer.plane; + AbstractWorldMapData.method264(ItemContainer.plane); + } + + } + + @ObfuscatedName("hp") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "78" + ) + @Export("readNpcUpdates") + static final void readNpcUpdates() { + 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.field655[++Client.field899 - 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.field669[++Client.field861 - 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.method1961(var7, (byte)1); + var8 = var0.readBits(1); + if (var8 == 1) { + Client.field669[++Client.field861 - 1] = var3; + } + } else if (var6 == 2) { + Client.npcIndices[++Client.npcCount - 1] = var3; + var4.npcCycle = Client.cycle; + var7 = var0.readBits(3); + var4.method1961(var7, (byte)2); + var8 = var0.readBits(3); + var4.method1961(var8, (byte)2); + int var9 = var0.readBits(1); + if (var9 == 1) { + Client.field669[++Client.field861 - 1] = var3; + } + } else if (var6 == 3) { + Client.field655[++Client.field899 - 1] = var3; + } + } + } + } + + } + } + + @ObfuscatedName("jp") + @ObfuscatedSignature( + signature = "(II)Ljava/lang/String;", + garbageValue = "-59560739" + ) + static final String method127(int var0) { + return var0 < 999999999 ? Integer.toString(var0) : "*"; + } + + @ObfuscatedName("km") + @ObfuscatedSignature( + signature = "(Lhp;IB)Ljava/lang/String;", + garbageValue = "0" + ) + static String method125(Widget var0, int var1) { + int var3 = ParamDefinition.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; + } + } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java index 61367effd7..f131a2fe63 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java @@ -1,185 +1,125 @@ import java.util.Comparator; +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("l") +@ObfuscatedName("n") @Implements("GrandExchangeOfferWorldComparator") final class GrandExchangeOfferWorldComparator implements Comparator { - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Lly;" + @ObfuscatedName("rr") + @ObfuscatedGetter( + intValue = 133251749 ) - @Export("leftTitleSprite") - static Sprite leftTitleSprite; - @ObfuscatedName("gu") - @ObfuscatedSignature( - signature = "Ler;" - ) - @Export("scene") - static Scene scene; - + static int field34; @ObfuscatedName("q") + @Export("soundSystemExecutor") + static ScheduledExecutorService soundSystemExecutor; + @ObfuscatedName("do") @ObfuscatedSignature( - signature = "(Li;Li;I)I", - garbageValue = "1850890964" + signature = "Lid;" + ) + @Export("archive15") + static Archive archive15; + + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(Lq;Lq;I)I", + garbageValue = "1902979302" ) @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("q") - @ObfuscatedSignature( - signature = "(Lhp;B)V", - garbageValue = "0" - ) - @Export("VarcInt_setArchives") - public static void VarcInt_setArchives(AbstractArchive var0) { - VarcInt.VarcInt_archive = var0; + public int compare(Object var1, Object var2) { + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", - garbageValue = "-2102370448" + signature = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", + garbageValue = "1594628992" ) - public static String method63(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 = ItemDefinition.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("w") - @ObfuscatedSignature( - signature = "(Lla;ILjava/lang/String;B)Ljava/lang/String;", - garbageValue = "-9" - ) - static String method54(IterableNodeHashTable var0, int var1, String var2) { - if (var0 == null) { - return var2; - } - ObjectNode var3 = (ObjectNode)var0.get((long)var1); - return var3 == null ? var2 : (String)var3.obj; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(II)Lik;", - garbageValue = "-1961052460" - ) - public static VarpDefinition method61(int var0) { - VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } - byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); - var1 = new VarpDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); - return var1; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZZI)V", - garbageValue = "-1344972354" - ) - @Export("openURL") - public static void openURL(String var0, boolean var1, boolean var2) { - SpriteBuffer.method6243(var0, var1, "openjs", var2); - } - - @ObfuscatedName("gn") - @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "-51" - ) - @Export("updateItemPile") - static final void updateItemPile(int var0, int var1) { - NodeDeque var2 = Client.groundItems[class42.plane][var0][var1]; - if (var2 == null) { - scene.removeGroundItemPile(class42.plane, var0, var1); - return; - } - long var3 = -99999999L; - TileItem var5 = null; - - TileItem var6; - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { - ItemDefinition var7 = WorldMapArea.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) { - scene.removeGroundItemPile(class42.plane, var0, var1); + public static String method74(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 { - var2.addLast(var5); - TileItem var12 = null; - TileItem var11 = null; + int var8 = var2 + var1; + int var4 = 0; - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { - if (var5.id != var6.id) { - if (var12 == null) { - var12 = var6; - } - - if (var6.id != var12.id && var11 == null) { - var11 = var6; - } + for (int var5 = var1; var5 < var8; ++var5) { + CharSequence var6 = var0[var5]; + if (var6 == null) { + var4 += 4; + } else { + var4 += var6.length(); } } - long var9 = Tile.calculateTag(var0, var1, 3, false, 0); - scene.newGroundItemPile(class42.plane, var0, var1, ScriptEvent.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, class42.plane), var5, var9, var12, var11); + 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("e") + @ObfuscatedSignature( + signature = "(ILcr;ZI)I", + garbageValue = "-1665010136" + ) + static int method79(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var3 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + } else { + var3 = var2 ? class286.field3623 : class297.field3693; + } + + if (var0 == ScriptOpcodes.CC_CALLONRESIZE) { + if (Interpreter.field1064 >= 10) { + throw new RuntimeException(); + } else if (var3.onResize == null) { + return 0; + } else { + ScriptEvent var4 = new ScriptEvent(); + var4.widget = var3; + var4.args = var3.onResize; + var4.field555 = Interpreter.field1064 + 1; + Client.scriptEvents.addFirst(var4); + return 1; + } + } else { + return 2; + } + } + + @ObfuscatedName("bo") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)I", + garbageValue = "516723982" + ) + public static int method80(String var0) { + return var0.length() + 2; + } } diff --git a/runescape-client/src/main/java/GraphicsDefaults.java b/runescape-client/src/main/java/GraphicsDefaults.java index 3a2b5bed7b..0cfc3d0b74 100644 --- a/runescape-client/src/main/java/GraphicsDefaults.java +++ b/runescape-client/src/main/java/GraphicsDefaults.java @@ -4,90 +4,90 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lp") +@ObfuscatedName("kp") @Implements("GraphicsDefaults") public class GraphicsDefaults { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -598930279 + intValue = -2112004677 ) @Export("compass") public int compass; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -996722769 + intValue = -258294563 ) - public int field3823; - @ObfuscatedName("e") + public int field3806; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1830782467 + intValue = 701602469 ) @Export("mapScenes") public int mapScenes; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 2115046595 + intValue = -2141260483 ) @Export("headIconsPk") public int headIconsPk; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1511309833 + intValue = -479103763 ) - public int field3830; - @ObfuscatedName("l") + public int field3805; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1434571323 + intValue = -556598901 ) - public int field3827; - @ObfuscatedName("b") + public int field3802; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -385142187 + intValue = 885733673 ) - public int field3828; - @ObfuscatedName("i") + public int field3798; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 326746637 + intValue = 1784857591 ) - public int field3829; - @ObfuscatedName("c") + public int field3804; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1387311669 + intValue = 2055927251 ) - public int field3832; + public int field3797; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -1869072211 + ) + public int field3801; @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1775888463 + intValue = 1312425167 ) - public int field3831; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 347558277 - ) - public int field3822; + public int field3807; public GraphicsDefaults() { this.compass = -1; - this.field3823 = -1; + this.field3806 = -1; this.mapScenes = -1; this.headIconsPk = -1; - this.field3830 = -1; - this.field3827 = -1; - this.field3828 = -1; - this.field3829 = -1; - this.field3832 = -1; - this.field3831 = -1; - this.field3822 = -1; + this.field3805 = -1; + this.field3802 = -1; + this.field3798 = -1; + this.field3804 = -1; + this.field3797 = -1; + this.field3801 = -1; + this.field3807 = -1; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lhp;B)V", - garbageValue = "104" + signature = "(Lhz;I)V", + garbageValue = "-2074842335" ) @Export("decode") public void decode(AbstractArchive var1) { - byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3821.group); + byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3794.group); Buffer var3 = new Buffer(var2); while (true) { @@ -101,28 +101,18 @@ public class GraphicsDefaults { var3.readMedium(); break; case 2: - this.compass = var3.method5511(); - this.field3823 = var3.method5511(); - this.mapScenes = var3.method5511(); - this.headIconsPk = var3.method5511(); - this.field3830 = var3.method5511(); - this.field3827 = var3.method5511(); - this.field3828 = var3.method5511(); - this.field3829 = var3.method5511(); - this.field3832 = var3.method5511(); - this.field3831 = var3.method5511(); - this.field3822 = var3.method5511(); + this.compass = var3.method5602(); + this.field3806 = var3.method5602(); + this.mapScenes = var3.method5602(); + this.headIconsPk = var3.method5602(); + this.field3805 = var3.method5602(); + this.field3802 = var3.method5602(); + this.field3798 = var3.method5602(); + this.field3804 = var3.method5602(); + this.field3797 = var3.method5602(); + this.field3801 = var3.method5602(); + this.field3807 = var3.method5602(); } } } - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "-122" - ) - @Export("getWorldMapScriptIdCategory") - public static int getWorldMapScriptIdCategory(int var0, int var1) { - return var1 + (var0 + 40000 << 8); - } } diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java index 2fb2ff1a79..da71d1074c 100644 --- a/runescape-client/src/main/java/GraphicsObject.java +++ b/runescape-client/src/main/java/GraphicsObject.java @@ -5,64 +5,72 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ba") +@ObfuscatedName("bc") @Implements("GraphicsObject") public final class GraphicsObject extends Entity { - @ObfuscatedName("q") + @ObfuscatedName("qe") @ObfuscatedGetter( - intValue = -1729585911 + intValue = -487309312 + ) + static int field1079; + @ObfuscatedName("gx") + @Export("regionLandArchives") + static byte[][] regionLandArchives; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -609520515 ) @Export("id") int id; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1383922821 + intValue = 528073861 ) @Export("cycleStart") int cycleStart; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -973375147 + intValue = 1305204903 ) @Export("plane") int plane; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1889549973 + intValue = 1986692437 ) @Export("x") int x; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -938790661 + intValue = 575337647 ) @Export("y") int y; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -955418477 + intValue = -893117639 ) @Export("height") int height; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lis;" + signature = "Lij;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1315114867 + intValue = -1568571077 ) @Export("frame") int frame; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1432178363 + intValue = -1439045539 ) @Export("frameCycle") int frameCycle; - @ObfuscatedName("f") + @ObfuscatedName("d") @Export("isFinished") boolean isFinished; @@ -76,47 +84,46 @@ public final class GraphicsObject extends Entity { this.y = var4; this.height = var5; this.cycleStart = var7 + var6; - int var8 = MusicPatch.SpotAnimationDefinition_get(this.id).sequence; + int var8 = HealthBarUpdate.SpotAnimationDefinition_get(this.id).sequence; if (var8 != -1) { this.isFinished = false; - this.sequenceDefinition = GrandExchangeEvent.SequenceDefinition_get(var8); + this.sequenceDefinition = Widget.SequenceDefinition_get(var8); } else { this.isFinished = true; } } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "4" + signature = "(IS)V", + garbageValue = "-9690" ) @Export("advance") final void advance(int var1) { - if (this.isFinished) { - return; - } - this.frameCycle += var1; + if (!this.isFinished) { + this.frameCycle += var1; - while (this.frameCycle > this.sequenceDefinition.frameLengths[this.frame]) { - this.frameCycle -= this.sequenceDefinition.frameLengths[this.frame]; - ++this.frame; - if (this.frame >= this.sequenceDefinition.frameIds.length) { - this.isFinished = true; - break; + while (this.frameCycle > this.sequenceDefinition.frameLengths[this.frame]) { + this.frameCycle -= this.sequenceDefinition.frameLengths[this.frame]; + ++this.frame; + if (this.frame >= this.sequenceDefinition.frameIds.length) { + this.isFinished = true; + break; + } } - } + } } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)Ldm;", - garbageValue = "759381421" + signature = "(I)Ldo;", + garbageValue = "-419920513" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = MusicPatch.SpotAnimationDefinition_get(this.id); + SpotAnimationDefinition var1 = HealthBarUpdate.SpotAnimationDefinition_get(this.id); Model var2; if (!this.isFinished) { var2 = var1.getModel(this.frame); @@ -127,164 +134,49 @@ public final class GraphicsObject extends Entity { return var2 == null ? null : var2; } - @ObfuscatedName("r") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(ILcx;ZS)I", - garbageValue = "-11723" + signature = "(II)Z", + garbageValue = "971415890" ) - static int method1943(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var3 = class80.getWidget(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - } else { - var3 = var2 ? Interpreter.field1111 : Calendar.field2507; - } + public static boolean method1946(int var0) { + return var0 == WorldMapDecorationType.field2722.id; + } - String var4 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - int[] var5 = null; - if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { - int var6 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - if (var6 > 0) { - for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]) { - } - } + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(I)Z", + garbageValue = "85520367" + ) + @Export("hasReflectionCheck") + public static boolean hasReflectionCheck() { + ReflectionCheck var0 = (ReflectionCheck)class96.reflectionChecks.last(); + return var0 != null; + } - 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[--Skills.Interpreter_stringStackSize]; + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "(ILcr;ZI)I", + garbageValue = "886521701" + ) + static int method1939(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? class286.field3623 : class297.field3693; + if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemId; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { + if (var3.itemId != -1) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemQuantity; } else { - var8[var7] = new Integer(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; } - } - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.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.field2681 = var8; - } else if (var0 == ScriptOpcodes.CC_SETONRESIZE) { - var3.onResize = var8; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETID) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.childIndex; + return 1; } else { return 2; } - - var3.hasListener = true; - return 1; - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "1550273173" - ) - static final int method1948(int var0, int var1) { - if (var0 == -1) { - return 12345678; - } - var1 = (var0 & 127) * var1 / 128; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } - - return (var0 & 65408) + var1; - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - signature = "(Ldx;I)V", - garbageValue = "-1064292468" - ) - @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); - } - - } - - @ObfuscatedName("he") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1819884546" - ) - @Export("addCancelMenuEntry") - static void addCancelMenuEntry() { - Strings.resetMenuEntries(); - Client.menuActions[0] = "Cancel"; - Client.menuTargets[0] = ""; - Client.menuOpcodes[0] = 1006; - Client.menuShiftClick[0] = false; - Client.menuOptionsCount = 1; } } diff --git a/runescape-client/src/main/java/HealthBar.java b/runescape-client/src/main/java/HealthBar.java index 9b576a03ce..863efac97b 100644 --- a/runescape-client/src/main/java/HealthBar.java +++ b/runescape-client/src/main/java/HealthBar.java @@ -3,40 +3,34 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cr") +@ObfuscatedName("ce") @Implements("HealthBar") public class HealthBar extends Node { - @ObfuscatedName("x") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lke;" - ) - @Export("ItemDefinition_fontPlain11") - public static Font ItemDefinition_fontPlain11; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lip;" + signature = "Lig;" ) @Export("definition") HealthBarDefinition definition; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lju;" + signature = "Ljp;" ) @Export("updates") IterableNodeDeque updates; @ObfuscatedSignature( - signature = "(Lip;)V" + signature = "(Lig;)V" ) HealthBar(HealthBarDefinition var1) { this.updates = new IterableNodeDeque(); this.definition = var1; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(IIIIB)V", - garbageValue = "87" + signature = "(IIIII)V", + garbageValue = "1581438808" ) @Export("put") void put(int var1, int var2, int var3, int var4) { @@ -69,45 +63,38 @@ public class HealthBar extends Node { } } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IB)Lbu;", - garbageValue = "41" + signature = "(IB)Lbb;", + garbageValue = "-77" ) @Export("get") HealthBarUpdate get(int var1) { HealthBarUpdate var2 = (HealthBarUpdate)this.updates.last(); - if (var2 == null || var2.cycle > var1) { - return null; - } - for (HealthBarUpdate var3 = (HealthBarUpdate)this.updates.previous(); var3 != null && var3.cycle <= var1; var3 = (HealthBarUpdate)this.updates.previous()) { - var2.remove(); - var2 = var3; - } + if (var2 != null && var2.cycle <= var1) { + for (HealthBarUpdate var3 = (HealthBarUpdate)this.updates.previous(); var3 != null && var3.cycle <= var1; var3 = (HealthBarUpdate)this.updates.previous()) { + var2.remove(); + var2 = var3; + } - if (this.definition.int5 + var2.cycle + var2.cycleOffset <= var1) { - var2.remove(); + if (this.definition.int5 + var2.cycleOffset + var2.cycle > var1) { + return var2; + } else { + var2.remove(); + return null; + } + } else { return null; } - return var2; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-16711936" + signature = "(B)Z", + garbageValue = "88" ) @Export("isEmpty") boolean isEmpty() { - return this.updates.isEmpty(); - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "35" - ) - public static int method1957(int var0) { - return var0 >> 11 & 63; + return this.updates.method4729(); } } diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java index a75a96ab77..e98482ddd3 100644 --- a/runescape-client/src/main/java/HealthBarDefinition.java +++ b/runescape-client/src/main/java/HealthBarDefinition.java @@ -4,89 +4,89 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ip") +@ObfuscatedName("ig") @Implements("HealthBarDefinition") public class HealthBarDefinition extends DualNode { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("HealthBarDefinition_archive") public static AbstractArchive HealthBarDefinition_archive; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("HealthBarDefinition_spritesArchive") public static AbstractArchive HealthBarDefinition_spritesArchive; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lep;" ) @Export("HealthBarDefinition_cached") static EvictingDualNodeHashTable HealthBarDefinition_cached; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lep;" ) @Export("HealthBarDefinition_cachedSprites") static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1770918457 + intValue = -1504637567 ) - public int field3279; - @ObfuscatedName("i") + public int field3264; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 2068006773 + intValue = -1807788243 ) @Export("int1") public int int1; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -63517075 + intValue = 1909708279 ) @Export("int2") public int int2; - @ObfuscatedName("f") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -177821987 + intValue = -1885853349 ) @Export("int3") public int int3; - @ObfuscatedName("m") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1811876659 + intValue = -563818397 ) @Export("int4") public int int4; - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1986405241 + intValue = -74768593 ) @Export("int5") public int int5; - @ObfuscatedName("x") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1715225113 + intValue = -1506111747 ) @Export("frontSpriteID") int frontSpriteID; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 124716389 + intValue = -1208608669 ) @Export("backSpriteID") int backSpriteID; - @ObfuscatedName("v") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 502151103 + intValue = -567354113 ) @Export("width") public int width; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 485619037 + intValue = 1929001923 ) @Export("widthPadding") public int widthPadding; @@ -108,23 +108,27 @@ public class HealthBarDefinition extends DualNode { this.widthPadding = 0; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkf;B)V", - garbageValue = "-11" + signature = "(Lky;I)V", + garbageValue = "-2108312426" ) @Export("decode") void decode(Buffer var1) { - int var2; - while ((var2 = var1.readUnsignedByte()) != 0) { + while (true) { + int var2 = var1.readUnsignedByte(); + if (var2 == 0) { + return; + } + this.decodeNext(var1, var2); } } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkf;IB)V", - garbageValue = "-62" + signature = "(Lky;II)V", + garbageValue = "1232956083" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -141,9 +145,9 @@ public class HealthBarDefinition extends DualNode { } else if (var2 == 6) { var1.readUnsignedByte(); } else if (var2 == 7) { - this.frontSpriteID = var1.method5511(); + this.frontSpriteID = var1.method5602(); } else if (var2 == 8) { - this.backSpriteID = var1.method5511(); + this.backSpriteID = var1.method5602(); } else if (var2 == 11) { this.int3 = var1.readUnsignedShort(); } else if (var2 == 14) { @@ -154,47 +158,51 @@ public class HealthBarDefinition extends DualNode { } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(B)Lly;", - garbageValue = "39" + signature = "(I)Lls;", + garbageValue = "32246110" ) @Export("getFrontSprite") public Sprite getFrontSprite() { if (this.frontSpriteID < 0) { return null; - } - Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID); - if (var1 != null) { - return var1; - } - var1 = class65.SpriteBuffer_getSprite(HealthBarDefinition_spritesArchive, this.frontSpriteID, 0); - if (var1 != null) { - HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID); - } + } else { + Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID); + if (var1 != null) { + return var1; + } else { + var1 = TilePaint.SpriteBuffer_getSprite(HealthBarDefinition_spritesArchive, this.frontSpriteID, 0); + if (var1 != null) { + HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID); + } - return var1; + return var1; + } + } } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(I)Lly;", - garbageValue = "879066493" + signature = "(I)Lls;", + garbageValue = "2113280722" ) @Export("getBackSprite") public Sprite getBackSprite() { if (this.backSpriteID < 0) { return null; - } - Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); - if (var1 != null) { - return var1; - } - var1 = class65.SpriteBuffer_getSprite(HealthBarDefinition_spritesArchive, this.backSpriteID, 0); - if (var1 != null) { - HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); - } + } else { + Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); + if (var1 != null) { + return var1; + } else { + var1 = TilePaint.SpriteBuffer_getSprite(HealthBarDefinition_spritesArchive, this.backSpriteID, 0); + if (var1 != null) { + HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); + } - return var1; + return var1; + } + } } } diff --git a/runescape-client/src/main/java/HealthBarUpdate.java b/runescape-client/src/main/java/HealthBarUpdate.java index 7eab530c18..7bb30b212b 100644 --- a/runescape-client/src/main/java/HealthBarUpdate.java +++ b/runescape-client/src/main/java/HealthBarUpdate.java @@ -1,62 +1,48 @@ -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.net.MalformedURLException; -import java.net.URL; +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; -import net.runelite.rs.Reflection; -@ObfuscatedName("bu") +@ObfuscatedName("bb") @Implements("HealthBarUpdate") public class HealthBarUpdate extends Node { - @ObfuscatedName("rb") + @ObfuscatedName("nk") @ObfuscatedGetter( - intValue = 1430067072 + intValue = -1632744841 ) - static int field1017; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -1252480817 - ) - @Export("Interpreter_intStackSize") - static int Interpreter_intStackSize; - @ObfuscatedName("df") + static int field986; + @ObfuscatedName("az") + @Export("loginScreenFontMetrics") + static FontMetrics loginScreenFontMetrics; + @ObfuscatedName("dp") @ObfuscatedSignature( - signature = "Lky;" + signature = "Lid;" ) - @Export("js5Socket") - static AbstractSocket js5Socket; - @ObfuscatedName("q") + @Export("archive2") + static Archive archive2; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 520006407 + intValue = 1232956083 ) @Export("cycle") int cycle; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -381285951 + intValue = -840023753 ) @Export("health") int health; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -881200951 + intValue = -207161283 ) @Export("health2") int health2; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1165972721 + intValue = 309403729 ) @Export("cycleOffset") int cycleOffset; @@ -68,10 +54,10 @@ public class HealthBarUpdate extends Node { this.cycleOffset = var4; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(IIIII)V", - garbageValue = "1833806724" + garbageValue = "-782735751" ) @Export("set") void set(int var1, int var2, int var3, int var4) { @@ -81,165 +67,35 @@ public class HealthBarUpdate extends Node { this.cycleOffset = var4; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)Z", - garbageValue = "-1155103111" + signature = "(II)Lil;", + garbageValue = "-790003135" ) - @Export("isValidURL") - static boolean isValidURL(String var0) { - if (var0 == null) { - return false; - } - try { - new URL(var0); - return true; - } catch (MalformedURLException var2) { - return false; - } - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(Lkx;I)V", - garbageValue = "-2067523200" - ) - @Export("performReflectionCheck") - public static void performReflectionCheck(PacketBuffer var0) { - ReflectionCheck var1 = (ReflectionCheck)class96.reflectionChecks.last(); - if (var1 == null) { - return; - } - 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]); - continue; - } - 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) { - 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); - } - } else if (var4 == 4) { - var25 = var1.methods[var3]; - var6 = var25.getModifiers(); - var0.writeByte(0); - var0.writeInt(var6); - } - } 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(); - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - signature = "([BI)[B", - garbageValue = "-303237660" - ) - @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.field3143 != 0 && var3 > AbstractArchive.field3143) { - throw new RuntimeException(); - } - if (var2 == 0) { - byte[] var4 = new byte[var3]; - var1.readBytes(var4, 0, var3); - return var4; - } - int var6 = var1.readInt(); - if (var6 < 0 || AbstractArchive.field3143 != 0 && var6 > AbstractArchive.field3143) { - throw new RuntimeException(); - } - byte[] var5 = new byte[var6]; - if (var2 == 1) { - BZip2Decompressor.BZip2Decompressor_decompress(var5, var6, var0, var3, 9); + @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 { - AbstractArchive.gzipDecompressor.decompress(var1, var5); - } + byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); + var1 = new SpotAnimationDefinition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); + } - return var5; + SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); + return var1; + } } - @ObfuscatedName("fd") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1624187030" + signature = "(B)I", + garbageValue = "0" ) - static void method1677() { - PacketBufferNode var0 = Archive.getPacketBufferNode(ClientPacket.field2238, Client.packetWriter.isaacCipher); - var0.packetBuffer.writeByte(AbstractWorldMapIcon.getWindowedMode()); - var0.packetBuffer.writeShort(GrandExchangeEvent.canvasWidth); - var0.packetBuffer.writeShort(ParamDefinition.canvasHeight); - Client.packetWriter.addNode(var0); + static int method1683() { + return 11; } } diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index 05b465549c..90ed8435ae 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -1,5 +1,3 @@ -import java.io.DataInputStream; -import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; @@ -9,118 +7,106 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("io") @Implements("HitSplatDefinition") public class HitSplatDefinition extends DualNode { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("HitSplatDefinition_archive") public static AbstractArchive HitSplatDefinition_archive; - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lhp;" - ) - @Export("HitSplatDefinition_spritesArchive") - public static AbstractArchive HitSplatDefinition_spritesArchive; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lhp;" - ) - @Export("HitSplatDefinition_fontsArchive") - public static AbstractArchive HitSplatDefinition_fontsArchive; - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lel;" - ) - @Export("HitSplatDefinition_cached") - public static EvictingDualNodeHashTable HitSplatDefinition_cached; @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lep;" + ) + @Export("HitSplatDefinition_cached") + static EvictingDualNodeHashTable HitSplatDefinition_cached; + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Lep;" ) @Export("HitSplatDefinition_cachedSprites") - public static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; - @ObfuscatedName("l") + static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lep;" ) @Export("HitSplatDefinition_cachedFonts") - public static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; - @ObfuscatedName("u") + static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 676904717 + intValue = -1215732899 ) @Export("fontId") int fontId; - @ObfuscatedName("x") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1445466235 + intValue = -1479775449 ) @Export("textColor") public int textColor; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = -1814689987 - ) - public int field3344; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 499426669 - ) - int field3334; @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 919035525 + intValue = -999843627 ) - int field3336; + public int field3314; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -478859311 + ) + int field3315; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 1276859251 + ) + int field3316; @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1569596867 + intValue = -348958833 ) - int field3337; - @ObfuscatedName("a") + int field3311; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -2118170041 + intValue = 740187387 ) - int field3338; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -751318081 - ) - public int field3335; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 184032475 - ) - public int field3340; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -604427311 - ) - public int field3341; - @ObfuscatedName("o") - String field3342; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -916102957 - ) - public int field3348; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 1597610159 - ) - public int field3328; - @ObfuscatedName("s") - @Export("transforms") - public int[] transforms; + int field3312; @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1769273857 + intValue = 417347841 + ) + public int field3319; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 1914679 + ) + public int field3307; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 348395975 + ) + public int field3318; + @ObfuscatedName("l") + String field3322; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -172728541 + ) + public int field3323; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 1823926687 + ) + public int field3324; + @ObfuscatedName("m") + @Export("transforms") + public int[] transforms; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1435373639 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("al") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 468792805 + intValue = -1817930543 ) @Export("transformVarp") int transformVarp; @@ -133,26 +119,26 @@ public class HitSplatDefinition extends DualNode { HitSplatDefinition() { this.fontId = -1; - this.textColor = 0xffffff; - this.field3344 = 70; - this.field3334 = -1; - this.field3336 = -1; - this.field3337 = -1; - this.field3338 = -1; - this.field3335 = 0; - this.field3340 = 0; - this.field3341 = -1; - this.field3342 = ""; - this.field3348 = -1; - this.field3328 = 0; + this.textColor = 16777215; + this.field3314 = 70; + this.field3315 = -1; + this.field3316 = -1; + this.field3311 = -1; + this.field3312 = -1; + this.field3319 = 0; + this.field3307 = 0; + this.field3318 = -1; + this.field3322 = ""; + this.field3323 = -1; + this.field3324 = 0; this.transformVarbit = -1; this.transformVarp = -1; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkf;B)V", - garbageValue = "1" + signature = "(Lky;I)V", + garbageValue = "513120287" ) @Export("decode") void decode(Buffer var1) { @@ -166,56 +152,56 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkf;II)V", - garbageValue = "1504666290" + signature = "(Lky;II)V", + garbageValue = "198357624" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - this.fontId = var1.method5511(); + this.fontId = var1.method5602(); } else if (var2 == 2) { this.textColor = var1.readMedium(); } else if (var2 == 3) { - this.field3334 = var1.method5511(); + this.field3315 = var1.method5602(); } else if (var2 == 4) { - this.field3337 = var1.method5511(); + this.field3311 = var1.method5602(); } else if (var2 == 5) { - this.field3336 = var1.method5511(); + this.field3316 = var1.method5602(); } else if (var2 == 6) { - this.field3338 = var1.method5511(); + this.field3312 = var1.method5602(); } else if (var2 == 7) { - this.field3335 = var1.readShort(); + this.field3319 = var1.readShort(); } else if (var2 == 8) { - this.field3342 = var1.readStringCp1252NullCircumfixed(); + this.field3322 = var1.readStringCp1252NullCircumfixed(); } else if (var2 == 9) { - this.field3344 = var1.readUnsignedShort(); + this.field3314 = var1.readUnsignedShort(); } else if (var2 == 10) { - this.field3340 = var1.readShort(); + this.field3307 = var1.readShort(); } else if (var2 == 11) { - this.field3341 = 0; + this.field3318 = 0; } else if (var2 == 12) { - this.field3348 = var1.readUnsignedByte(); + this.field3323 = var1.readUnsignedByte(); } else if (var2 == 13) { - this.field3328 = var1.readShort(); + this.field3324 = var1.readShort(); } else if (var2 == 14) { - this.field3341 = var1.readUnsignedShort(); + this.field3318 = var1.readUnsignedShort(); } else if (var2 == 17 || var2 == 18) { this.transformVarbit = var1.readUnsignedShort(); - if (this.transformVarbit == 0xffff) { + if (this.transformVarbit == 65535) { this.transformVarbit = -1; } this.transformVarp = var1.readUnsignedShort(); - if (this.transformVarp == 0xffff) { + if (this.transformVarp == 65535) { this.transformVarp = -1; } int var3 = -1; if (var2 == 18) { var3 = var1.readUnsignedShort(); - if (var3 == 0xffff) { + if (var3 == 65535) { var3 = -1; } } @@ -225,7 +211,7 @@ public class HitSplatDefinition extends DualNode { for (int var5 = 0; var5 <= var4; ++var5) { this.transforms[var5] = var1.readUnsignedShort(); - if (this.transforms[var5] == 0xffff) { + if (this.transforms[var5] == 65535) { this.transforms[var5] = -1; } } @@ -235,16 +221,16 @@ public class HitSplatDefinition extends DualNode { } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(B)Lio;", - garbageValue = "0" + signature = "(I)Lio;", + garbageValue = "-1634643296" ) @Export("transform") public final HitSplatDefinition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = GrandExchangeOfferOwnWorldComparator.getVarbit(this.transformVarbit); + var1 = class208.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -256,17 +242,17 @@ public class HitSplatDefinition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? Projectile.HitSplatDefinition_get(var2) : null; + return var2 != -1 ? StructDefinition.HitSplatDefinition_get(var2) : null; } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(II)Ljava/lang/String;", - garbageValue = "-1319187584" + garbageValue = "188489511" ) @Export("getString") public String getString(int var1) { - String var2 = this.field3342; + String var2 = this.field3322; while (true) { int var3 = var2.indexOf("%1"); @@ -274,165 +260,159 @@ public class HitSplatDefinition extends DualNode { return var2; } - var2 = var2.substring(0, var3) + class195.intToString(var1, false) + var2.substring(var3 + 2); + var2 = var2.substring(0, var3) + Friend.intToString(var1, false) + var2.substring(var3 + 2); } } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(I)Lly;", - garbageValue = "-1354583226" + signature = "(B)Lls;", + garbageValue = "108" ) - public Sprite method4551() { - if (this.field3334 < 0) { + public Sprite method4494() { + if (this.field3315 < 0) { return null; - } - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3334); - if (var1 != null) { - return var1; - } - var1 = class65.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.field3334, 0); - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3334); - } + } else { + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3315); + if (var1 != null) { + return var1; + } else { + var1 = TilePaint.SpriteBuffer_getSprite(GrandExchangeOfferTotalQuantityComparator.HitSplatDefinition_spritesArchive, this.field3315, 0); + if (var1 != null) { + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3315); + } - return var1; + return var1; + } + } } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)Lly;", - garbageValue = "-2099712719" + signature = "(I)Lls;", + garbageValue = "1004292382" ) - public Sprite method4557() { - if (this.field3336 < 0) { + public Sprite method4468() { + if (this.field3316 < 0) { return null; - } - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3336); - if (var1 != null) { - return var1; - } - var1 = class65.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.field3336, 0); - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3336); - } + } else { + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3316); + if (var1 != null) { + return var1; + } else { + var1 = TilePaint.SpriteBuffer_getSprite(GrandExchangeOfferTotalQuantityComparator.HitSplatDefinition_spritesArchive, this.field3316, 0); + if (var1 != null) { + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3316); + } - return var1; + return var1; + } + } } - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(B)Lly;", - garbageValue = "-48" + signature = "(B)Lls;", + garbageValue = "101" ) - public Sprite method4558() { - if (this.field3337 < 0) { + public Sprite method4472() { + if (this.field3311 < 0) { return null; - } - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3337); - if (var1 != null) { - return var1; - } - var1 = class65.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.field3337, 0); - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3337); - } + } else { + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3311); + if (var1 != null) { + return var1; + } else { + var1 = TilePaint.SpriteBuffer_getSprite(GrandExchangeOfferTotalQuantityComparator.HitSplatDefinition_spritesArchive, this.field3311, 0); + if (var1 != null) { + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3311); + } - return var1; + return var1; + } + } } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)Lly;", - garbageValue = "-1606516448" + signature = "(B)Lls;", + garbageValue = "-74" ) - public Sprite method4583() { - if (this.field3338 < 0) { + public Sprite method4470() { + if (this.field3312 < 0) { return null; - } - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3338); - if (var1 != null) { - return var1; - } - var1 = class65.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.field3338, 0); - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3338); - } + } else { + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3312); + if (var1 != null) { + return var1; + } else { + var1 = TilePaint.SpriteBuffer_getSprite(GrandExchangeOfferTotalQuantityComparator.HitSplatDefinition_spritesArchive, this.field3312, 0); + if (var1 != null) { + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3312); + } - return var1; + return var1; + } + } } - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)Lke;", - garbageValue = "-1472977599" + signature = "(I)Lkb;", + garbageValue = "489170470" ) @Export("getFont") public Font getFont() { if (this.fontId == -1) { return null; - } - Font var1 = (Font)HitSplatDefinition_cachedFonts.get((long)this.fontId); - if (var1 != null) { - return var1; - } - AbstractArchive var3 = HitSplatDefinition_spritesArchive; - AbstractArchive var4 = HitSplatDefinition_fontsArchive; - int var5 = this.fontId; - Font var2; - if (!Friend.SpriteBuffer_bufferFile(var3, var5, 0)) { - var2 = null; } else { - var2 = WallDecoration.SpriteBuffer_createFont(var4.takeFile(var5, 0)); - } - - if (var2 != null) { - HitSplatDefinition_cachedFonts.put(var2, (long)this.fontId); - } - - return var2; - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/Throwable;B)V", - garbageValue = "40" - ) - @Export("RunException_sendStackTrace") - public static void RunException_sendStackTrace(String var0, Throwable var1) { - if (var1 != null) { - var1.printStackTrace(); - return; - } - try { - String var2 = ""; + Font var1 = (Font)HitSplatDefinition_cachedFonts.get((long)this.fontId); if (var1 != null) { - var2 = FloorDecoration.shortenStackTrace(var1); - } - - if (var0 != null) { + return var1; + } else { + var1 = FileSystem.SpriteBuffer_getFont(GrandExchangeOfferTotalQuantityComparator.HitSplatDefinition_spritesArchive, class43.HitSplatDefinition_fontsArchive, this.fontId, 0); if (var1 != null) { - var2 = var2 + " | "; + HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId); } - var2 = var2 + var0; + return var1; } + } + } - System.out.println("Error: " + var2); - var2 = var2.replace(':', '.'); - var2 = var2.replace('@', '_'); - var2 = var2.replace('&', '_'); - var2 = var2.replace('#', '_'); - if (RunException.RunException_applet == null) { - return; - } + @ObfuscatedName("gn") + @ObfuscatedSignature( + signature = "(I)Z", + garbageValue = "-977763631" + ) + static boolean method4497() { + return (Client.drawPlayerNames & 4) != 0; + } - URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + GrandExchangeOfferUnitPriceComparator.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + RunException.RunException_clientType + "&e=" + var2); - DataInputStream var4 = new DataInputStream(var3.openStream()); - var4.read(); - var4.close(); - } catch (Exception var5) { + @ObfuscatedName("ih") + @ObfuscatedSignature( + signature = "(IIIIII)V", + garbageValue = "-380288285" + ) + @Export("drawScrollBar") + static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { + ClientPreferences.scrollBarSprites[0].drawAt(var0, var1); + ClientPreferences.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field702); + 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.field687); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field689); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field689); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field689); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field689); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field688); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field688); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field688); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var5 + var6 + var1 + 14, 15, Client.field688); } } diff --git a/runescape-client/src/main/java/HorizontalAlignment.java b/runescape-client/src/main/java/HorizontalAlignment.java index f0217bde60..4cad594e17 100644 --- a/runescape-client/src/main/java/HorizontalAlignment.java +++ b/runescape-client/src/main/java/HorizontalAlignment.java @@ -4,35 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iz") +@ObfuscatedName("ib") @Implements("HorizontalAlignment") public enum HorizontalAlignment implements Enumerated { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Liz;" + signature = "Lib;" ) - field3461(0, 0), - @ObfuscatedName("w") + field3436(2, 0), + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Liz;" + signature = "Lib;" ) @Export("HorizontalAlignment_centered") - HorizontalAlignment_centered(2, 1), - @ObfuscatedName("e") + HorizontalAlignment_centered(1, 1), + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Liz;" + signature = "Lib;" ) - field3460(1, 2); + field3435(0, 2); - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1984645021 + intValue = -1418723399 ) @Export("value") public final int value; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -2141408149 + intValue = 1581275369 ) @Export("id") final int id; @@ -42,22 +42,13 @@ public enum HorizontalAlignment implements Enumerated { this.id = var4; } - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "320353268" + signature = "(B)I", + garbageValue = "-32" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-71692752" - ) - static int method4701() { - return ++Messages.Messages_count - 1; - } } diff --git a/runescape-client/src/main/java/Huffman.java b/runescape-client/src/main/java/Huffman.java index b700392578..25c06bcd5e 100644 --- a/runescape-client/src/main/java/Huffman.java +++ b/runescape-client/src/main/java/Huffman.java @@ -3,16 +3,24 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hk") +@ObfuscatedName("hr") @Implements("Huffman") public class Huffman { - @ObfuscatedName("q") + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "Lhz;" + ) + @Export("Widget_modelsArchive") + static AbstractArchive Widget_modelsArchive; + @ObfuscatedName("r") + static boolean field2486; + @ObfuscatedName("s") @Export("masks") int[] masks; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("bits") byte[] bits; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("keys") int[] keys; @@ -26,84 +34,83 @@ public class Huffman { for (int var5 = 0; var5 < var2; ++var5) { byte var6 = var1[var5]; - if (var6 == 0) { - continue; - } - int var7 = 1 << 32 - var6; - int var8 = var3[var6]; - this.masks[var5] = var8; - int var9; - int var10; - int var11; - int var12; - if ((var8 & var7) != 0) { - var9 = var3[var6 - 1]; - } else { - var9 = var8 | var7; - - for (var10 = var6 - 1; var10 >= 1; --var10) { - var11 = var3[var10]; - if (var11 != var8) { - break; - } - - var12 = 1 << 32 - var10; - if ((var11 & var12) != 0) { - var3[var10] = var3[var10 - 1]; - break; - } - - var3[var10] = var11 | var12; - } - } - - var3[var6] = var9; - - for (var10 = var6 + 1; var10 <= 32; ++var10) { - if (var8 == var3[var10]) { - var3[var10] = var9; - } - } - - var10 = 0; - - for (var11 = 0; var11 < var6; ++var11) { - var12 = Integer.MIN_VALUE >>> var11; - if ((var8 & var12) != 0) { - if (this.keys[var10] == 0) { - this.keys[var10] = var4; - } - - var10 = this.keys[var10]; + if (var6 != 0) { + int var7 = 1 << 32 - var6; + int var8 = var3[var6]; + this.masks[var5] = var8; + int var9; + int var10; + int var11; + int var12; + if ((var8 & var7) != 0) { + var9 = var3[var6 - 1]; } else { - ++var10; + var9 = var8 | var7; + + for (var10 = var6 - 1; var10 >= 1; --var10) { + var11 = var3[var10]; + if (var8 != var11) { + break; + } + + var12 = 1 << 32 - var10; + if ((var11 & var12) != 0) { + var3[var10] = var3[var10 - 1]; + break; + } + + var3[var10] = var11 | var12; + } } - if (var10 >= this.keys.length) { - int[] var13 = new int[this.keys.length * 2]; + var3[var6] = var9; - for (int var14 = 0; var14 < this.keys.length; ++var14) { - var13[var14] = this.keys[var14]; + for (var10 = var6 + 1; var10 <= 32; ++var10) { + if (var8 == var3[var10]) { + var3[var10] = var9; + } + } + + var10 = 0; + + for (var11 = 0; var11 < var6; ++var11) { + var12 = Integer.MIN_VALUE >>> var11; + if ((var8 & var12) != 0) { + if (this.keys[var10] == 0) { + this.keys[var10] = var4; + } + + var10 = this.keys[var10]; + } else { + ++var10; } - this.keys = var13; + if (var10 >= this.keys.length) { + int[] var13 = new int[this.keys.length * 2]; + + for (int var14 = 0; var14 < this.keys.length; ++var14) { + var13[var14] = this.keys[var14]; + } + + this.keys = var13; + } + + var12 >>>= 1; } - var12 >>>= 1; - } - - this.keys[var10] = ~var5; - if (var10 >= var4) { - var4 = var10 + 1; + this.keys[var10] = ~var5; + if (var10 >= var4) { + var4 = var10 + 1; + } } } } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "([BII[BII)I", - garbageValue = "-1706453276" + signature = "([BII[BIB)I", + garbageValue = "75" ) @Export("compress") int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) { @@ -151,215 +158,177 @@ public class Huffman { return (var7 + 7 >> 3) - var5; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "([BI[BIII)I", - garbageValue = "2122202814" + garbageValue = "-1981194731" ) @Export("decompress") int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) { if (var5 == 0) { return 0; - } - int var6 = 0; - var5 += var4; - int var7 = var2; + } else { + int var6 = 0; + var5 += var4; + int var7 = var2; - while (true) { - byte var8 = var1[var7]; - if (var8 < 0) { - var6 = this.keys[var6]; - } else { - ++var6; - } - - int var9; - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); - if (var4 >= var5) { - break; + while (true) { + byte var8 = var1[var7]; + if (var8 < 0) { + var6 = this.keys[var6]; + } else { + ++var6; } - var6 = 0; - } - - if ((var8 & 64) != 0) { - var6 = this.keys[var6]; - } else { - ++var6; - } - - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); - if (var4 >= var5) { - break; - } - - var6 = 0; - } - - if ((var8 & 32) != 0) { - var6 = this.keys[var6]; - } else { - ++var6; - } - - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); - if (var4 >= var5) { - break; - } - - var6 = 0; - } - - if ((var8 & 16) != 0) { - var6 = this.keys[var6]; - } else { - ++var6; - } - - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); - if (var4 >= var5) { - break; - } - - var6 = 0; - } - - if ((var8 & 8) != 0) { - var6 = this.keys[var6]; - } else { - ++var6; - } - - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); - if (var4 >= var5) { - break; - } - - var6 = 0; - } - - if ((var8 & 4) != 0) { - var6 = this.keys[var6]; - } else { - ++var6; - } - - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); - if (var4 >= var5) { - break; - } - - var6 = 0; - } - - if ((var8 & 2) != 0) { - var6 = this.keys[var6]; - } else { - ++var6; - } - - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); - if (var4 >= var5) { - break; - } - - var6 = 0; - } - - if ((var8 & 1) != 0) { - var6 = this.keys[var6]; - } else { - ++var6; - } - - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); - if (var4 >= var5) { - break; - } - - var6 = 0; - } - - ++var7; - } - - return var7 + 1 - var2; - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "5" - ) - static int method3948(int var0, int var1) { - long var2 = (long)((var0 << 16) + var1); - return class226.NetCache_currentResponse != null && class226.NetCache_currentResponse.key == var2 ? VarpDefinition.NetCache_responseArchiveBuffer.offset * 99 / (VarpDefinition.NetCache_responseArchiveBuffer.array.length - class226.NetCache_currentResponse.padding) + 1 : 0; - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "([BIII)Z", - garbageValue = "-1212406127" - ) - static final boolean method3947(byte[] var0, int var1, int var2) { - boolean var3 = true; - Buffer var4 = new Buffer(var0); - int var5 = -1; - int var6; - - while ((var6 = var4.method5509()) != 0) { - var5 += var6; - int var7 = 0; - boolean var8 = false; - int var9; - while (!var8) { - var9 = var4.readUShortSmart(); - if (var9 == 0) { - continue; - } - 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 = ViewportMouse.getObjectDefinition(var5); - if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { - if (!var15.needsModelFiles()) { - ++Client.field707; - var3 = false; - } - - var8 = true; + int var9; + if ((var9 = this.keys[var6]) < 0) { + var3[var4++] = (byte)(~var9); + if (var4 >= var5) { + break; } + + var6 = 0; } + + if ((var8 & 64) != 0) { + var6 = this.keys[var6]; + } else { + ++var6; + } + + if ((var9 = this.keys[var6]) < 0) { + var3[var4++] = (byte)(~var9); + if (var4 >= var5) { + break; + } + + var6 = 0; + } + + if ((var8 & 32) != 0) { + var6 = this.keys[var6]; + } else { + ++var6; + } + + if ((var9 = this.keys[var6]) < 0) { + var3[var4++] = (byte)(~var9); + if (var4 >= var5) { + break; + } + + var6 = 0; + } + + if ((var8 & 16) != 0) { + var6 = this.keys[var6]; + } else { + ++var6; + } + + if ((var9 = this.keys[var6]) < 0) { + var3[var4++] = (byte)(~var9); + if (var4 >= var5) { + break; + } + + var6 = 0; + } + + if ((var8 & 8) != 0) { + var6 = this.keys[var6]; + } else { + ++var6; + } + + if ((var9 = this.keys[var6]) < 0) { + var3[var4++] = (byte)(~var9); + if (var4 >= var5) { + break; + } + + var6 = 0; + } + + if ((var8 & 4) != 0) { + var6 = this.keys[var6]; + } else { + ++var6; + } + + if ((var9 = this.keys[var6]) < 0) { + var3[var4++] = (byte)(~var9); + if (var4 >= var5) { + break; + } + + var6 = 0; + } + + if ((var8 & 2) != 0) { + var6 = this.keys[var6]; + } else { + ++var6; + } + + if ((var9 = this.keys[var6]) < 0) { + var3[var4++] = (byte)(~var9); + if (var4 >= var5) { + break; + } + + var6 = 0; + } + + if ((var8 & 1) != 0) { + var6 = this.keys[var6]; + } else { + ++var6; + } + + if ((var9 = this.keys[var6]) < 0) { + var3[var4++] = (byte)(~var9); + if (var4 >= var5) { + break; + } + + var6 = 0; + } + + ++var7; } - var9 = var4.readUShortSmart(); - if (var9 == 0) { - continue; - } - var4.readUnsignedByte(); + return var7 + 1 - var2; } - return var3; } - @ObfuscatedName("bp") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)I", - garbageValue = "350180445" + signature = "(II)Z", + garbageValue = "762083438" ) - @Export("stringCp1252NullTerminatedByteSize") - public static int stringCp1252NullTerminatedByteSize(String var0) { - return var0.length() + 1; + public static boolean method3901(int var0) { + return (var0 >> 30 & 1) != 0; + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + signature = "(Ljava/lang/CharSequence;B)Ljava/lang/String;", + garbageValue = "24" + ) + public static String method3903(CharSequence var0) { + return FontName.method5230('*', var0.length()); + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)V", + garbageValue = "191831617" + ) + static final void method3902(String var0) { + PacketBufferNode var1 = MenuAction.getPacketBufferNode(ClientPacket.field2275, 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/IgnoreList.java b/runescape-client/src/main/java/IgnoreList.java index 087d3c2a6f..9acce921a8 100644 --- a/runescape-client/src/main/java/IgnoreList.java +++ b/runescape-client/src/main/java/IgnoreList.java @@ -3,48 +3,60 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jf") +@ObfuscatedName("jk") @Implements("IgnoreList") public class IgnoreList extends UserList { - @ObfuscatedName("e") + @ObfuscatedName("qz") @ObfuscatedSignature( - signature = "Lmu;" + signature = "Lcq;" + ) + @Export("pcmStreamMixer") + static PcmStreamMixer pcmStreamMixer; + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "Ler;" + ) + @Export("World_request") + static UrlRequest World_request; + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "Llu;" ) @Export("loginType") final LoginType loginType; @ObfuscatedSignature( - signature = "(Lmu;)V" + signature = "(Llu;)V" ) public IgnoreList(LoginType var1) { super(400); this.loginType = var1; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(I)Ljd;", - garbageValue = "2016619159" + signature = "(I)Lju;", + garbageValue = "-192021045" ) @Export("newInstance") User newInstance() { return new Ignored(); } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(II)[Ljd;", - garbageValue = "2126056206" + signature = "(II)[Lju;", + garbageValue = "518998026" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new Ignored[var1]; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkf;II)V", - garbageValue = "-726342746" + signature = "(Lky;II)V", + garbageValue = "-1855918635" ) @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 5a236d32f5..5d90ccacc6 100644 --- a/runescape-client/src/main/java/Ignored.java +++ b/runescape-client/src/main/java/Ignored.java @@ -4,24 +4,12 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jo") +@ObfuscatedName("jb") @Implements("Ignored") public class Ignored extends User { - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "Lbr;" - ) - @Export("loginScreenRunesAnimation") - static LoginScreenAnimation loginScreenRunesAnimation; - @ObfuscatedName("fn") - @ObfuscatedSignature( - signature = "Lfa;" - ) - @Export("socketTask") - static Task socketTask; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -361646417 + intValue = -1012205769 ) @Export("id") int id; @@ -29,20 +17,20 @@ public class Ignored extends User { Ignored() { } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ljo;I)I", - garbageValue = "-1242016495" + signature = "(Ljb;I)I", + garbageValue = "-765920098" ) @Export("compareTo_ignored") int compareTo_ignored(Ignored var1) { return this.id - var1.id; } - @ObfuscatedName("ax") + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(Ljd;I)I", - garbageValue = "-1938562722" + signature = "(Lju;B)I", + garbageValue = "1" ) @Export("compareTo_user") public int compareTo_user(User var1) { @@ -53,19 +41,69 @@ public class Ignored extends User { return this.compareTo_ignored((Ignored)var1); } - @ObfuscatedName("y") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(CB)Z", - garbageValue = "103" + signature = "(Ljava/lang/CharSequence;IZI)I", + garbageValue = "-1916519196" ) - @Export("isCharPrintable") - public static boolean isCharPrintable(char var0) { - if (var0 >= ' ' && var0 <= '~') { - return true; + @Export("parseIntCustomRadix") + public 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; + } + + if (!var4) { + throw new NumberFormatException(); + } else { + return var5; + } + } else { + throw new IllegalArgumentException("" + var1); } - if (var0 >= 160 && var0 <= 255) { - return true; - } - return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; } } diff --git a/runescape-client/src/main/java/IndexedSprite.java b/runescape-client/src/main/java/IndexedSprite.java index c55e9bf00f..083ff62210 100644 --- a/runescape-client/src/main/java/IndexedSprite.java +++ b/runescape-client/src/main/java/IndexedSprite.java @@ -2,35 +2,35 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("lx") +@ObfuscatedName("lq") @Implements("IndexedSprite") public final class IndexedSprite extends Rasterizer2D { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("pixels") public byte[] pixels; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("palette") public int[] palette; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("subWidth") public int subWidth; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("subHeight") public int subHeight; - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("xOffset") public int xOffset; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("yOffset") public int yOffset; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("width") public int width; - @ObfuscatedName("i") + @ObfuscatedName("q") @Export("height") public int height; - @ObfuscatedName("q") + @ObfuscatedName("s") @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("w") + @ObfuscatedName("j") @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("e") + @ObfuscatedName("i") @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; @@ -130,8 +130,8 @@ public final class IndexedSprite extends Rasterizer2D { } } - @ObfuscatedName("k") - public void method6093(int var1, int var2, int var3, int var4) { + @ObfuscatedName("u") + public void method5979(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("p") + @ObfuscatedName("k") @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("l") + @ObfuscatedName("n") @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 8c49b99258..944b158db8 100644 --- a/runescape-client/src/main/java/Instrument.java +++ b/runescape-client/src/main/java/Instrument.java @@ -4,109 +4,109 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("de") +@ObfuscatedName("dn") @Implements("Instrument") public class Instrument { - @ObfuscatedName("a") + @ObfuscatedName("e") @Export("Instrument_samples") static int[] Instrument_samples; - @ObfuscatedName("j") + @ObfuscatedName("z") @Export("Instrument_noise") static int[] Instrument_noise; - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("Instrument_sine") static int[] Instrument_sine; - @ObfuscatedName("o") + @ObfuscatedName("l") @Export("Instrument_phases") static int[] Instrument_phases; - @ObfuscatedName("n") + @ObfuscatedName("h") @Export("Instrument_delays") static int[] Instrument_delays; - @ObfuscatedName("d") + @ObfuscatedName("v") @Export("Instrument_volumeSteps") static int[] Instrument_volumeSteps; - @ObfuscatedName("s") + @ObfuscatedName("m") @Export("Instrument_pitchSteps") static int[] Instrument_pitchSteps; - @ObfuscatedName("z") + @ObfuscatedName("o") @Export("Instrument_pitchBaseSteps") static int[] Instrument_pitchBaseSteps; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Ldw;" + signature = "Ldv;" ) @Export("pitch") SoundEnvelope pitch; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Ldw;" + signature = "Ldv;" ) @Export("volume") SoundEnvelope volume; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Ldw;" + signature = "Ldv;" ) @Export("pitchModifier") SoundEnvelope pitchModifier; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Ldw;" + signature = "Ldv;" ) @Export("pitchModifierAmplitude") SoundEnvelope pitchModifierAmplitude; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Ldw;" + signature = "Ldv;" ) @Export("volumeMultiplier") SoundEnvelope volumeMultiplier; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Ldw;" + signature = "Ldv;" ) @Export("volumeMultiplierAmplitude") SoundEnvelope volumeMultiplierAmplitude; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Ldw;" + signature = "Ldv;" ) @Export("release") SoundEnvelope release; - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Ldw;" + signature = "Ldv;" ) @Export("attack") SoundEnvelope attack; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("oscillatorVolume") int[] oscillatorVolume; - @ObfuscatedName("f") + @ObfuscatedName("d") @Export("oscillatorPitch") int[] oscillatorPitch; - @ObfuscatedName("m") + @ObfuscatedName("f") @Export("oscillatorDelays") int[] oscillatorDelays; - @ObfuscatedName("u") + @ObfuscatedName("c") @Export("delayTime") int delayTime; - @ObfuscatedName("x") + @ObfuscatedName("r") @Export("delayDecay") int delayDecay; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Ldy;" + signature = "Ldp;" ) @Export("filter") AudioFilter filter; - @ObfuscatedName("v") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Ldw;" + signature = "Ldv;" ) @Export("filterEnvelope") SoundEnvelope filterEnvelope; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("duration") int duration; @ObfuscatedName("g") @@ -146,219 +146,230 @@ public class Instrument { this.offset = 0; } - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("synthesize") final int[] synthesize(int var1, int var2) { - class301.clearIntArray(Instrument_samples, 0, var1); + class300.clearIntArray(Instrument_samples, 0, var1); if (var2 < 10) { return Instrument_samples; - } - double var3 = (double)var1 / ((double)var2 + 0.0D); - this.pitch.reset(); - this.volume.reset(); - int var5 = 0; - int var6 = 0; - int var7 = 0; - if (this.pitchModifier != null) { - this.pitchModifier.reset(); - this.pitchModifierAmplitude.reset(); - var5 = (int)((double)(this.pitchModifier.end - this.pitchModifier.start) * 32.768D / var3); - var6 = (int)((double)this.pitchModifier.start * 32.768D / var3); - } - - int var8 = 0; - int var9 = 0; - int var10 = 0; - if (this.volumeMultiplier != null) { - this.volumeMultiplier.reset(); - this.volumeMultiplierAmplitude.reset(); - var8 = (int)((this.volumeMultiplier.end - this.volumeMultiplier.start) * 32.768D / var3); - var9 = (int)(this.volumeMultiplier.start * 32.768D / var3); - } - - for (int var11 = 0; var11 < 5; ++var11) { - if (this.oscillatorVolume[var11] != 0) { - Instrument_phases[var11] = 0; - Instrument_delays[var11] = (int)((double)this.oscillatorDelays[var11] * var3); - Instrument_volumeSteps[var11] = (this.oscillatorVolume[var11] << 14) / 100; - Instrument_pitchSteps[var11] = (int)((double)(this.pitch.end - this.pitch.start) * 32.768D * Math.pow(1.0057929410678534D, (double)this.oscillatorPitch[var11]) / var3); - Instrument_pitchBaseSteps[var11] = (int)((double)this.pitch.start * 32.768D / var3); - } - } - - for (int var11 = 0; var11 < var1; ++var11) { - int var12 = this.pitch.doStep(var1); - int var13 = this.volume.doStep(var1); + } else { + double var3 = (double)var1 / ((double)var2 + 0.0D); + this.pitch.reset(); + this.volume.reset(); + int var5 = 0; + int var6 = 0; + int var7 = 0; if (this.pitchModifier != null) { - int var14 = this.pitchModifier.doStep(var1); - int var15 = this.pitchModifierAmplitude.doStep(var1); - var12 += this.evaluateWave(var7, var15, this.pitchModifier.form) >> 1; - var7 = var7 + var6 + (var14 * var5 >> 16); + this.pitchModifier.reset(); + this.pitchModifierAmplitude.reset(); + var5 = (int)((double)(this.pitchModifier.end - this.pitchModifier.start) * 32.768D / var3); + var6 = (int)((double)this.pitchModifier.start * 32.768D / var3); } + int var8 = 0; + int var9 = 0; + int var10 = 0; if (this.volumeMultiplier != null) { - int var14 = this.volumeMultiplier.doStep(var1); - int var15 = this.volumeMultiplierAmplitude.doStep(var1); - var13 = var13 * ((this.evaluateWave(var10, var15, this.volumeMultiplier.form) >> 1) + 32768) >> 15; - var10 = var10 + var9 + (var14 * var8 >> 16); + this.volumeMultiplier.reset(); + this.volumeMultiplierAmplitude.reset(); + var8 = (int)((double)(this.volumeMultiplier.end - this.volumeMultiplier.start) * 32.768D / var3); + var9 = (int)((double)this.volumeMultiplier.start * 32.768D / var3); } - for (int var14 = 0; var14 < 5; ++var14) { - if (this.oscillatorVolume[var14] != 0) { - int var15 = Instrument_delays[var14] + var11; - if (var15 < var1) { - Instrument_samples[var15] += this.evaluateWave(Instrument_phases[var14], var13 * Instrument_volumeSteps[var14] >> 15, this.pitch.form); - Instrument_phases[var14] += (var12 * Instrument_pitchSteps[var14] >> 16) + Instrument_pitchBaseSteps[var14]; + int var11; + for (var11 = 0; var11 < 5; ++var11) { + if (this.oscillatorVolume[var11] != 0) { + Instrument_phases[var11] = 0; + Instrument_delays[var11] = (int)((double)this.oscillatorDelays[var11] * var3); + Instrument_volumeSteps[var11] = (this.oscillatorVolume[var11] << 14) / 100; + Instrument_pitchSteps[var11] = (int)((double)(this.pitch.end - this.pitch.start) * 32.768D * Math.pow(1.0057929410678534D, (double)this.oscillatorPitch[var11]) / var3); + Instrument_pitchBaseSteps[var11] = (int)((double)this.pitch.start * 32.768D / var3); + } + } + + int var12; + int var13; + int var14; + int var15; + int[] var10000; + for (var11 = 0; var11 < var1; ++var11) { + var12 = this.pitch.doStep(var1); + var13 = this.volume.doStep(var1); + if (this.pitchModifier != null) { + var14 = this.pitchModifier.doStep(var1); + var15 = this.pitchModifierAmplitude.doStep(var1); + var12 += this.evaluateWave(var7, var15, this.pitchModifier.form) >> 1; + var7 = var7 + var6 + (var14 * var5 >> 16); + } + + if (this.volumeMultiplier != null) { + var14 = this.volumeMultiplier.doStep(var1); + var15 = this.volumeMultiplierAmplitude.doStep(var1); + var13 = var13 * ((this.evaluateWave(var10, var15, this.volumeMultiplier.form) >> 1) + 32768) >> 15; + var10 = var10 + var9 + (var14 * var8 >> 16); + } + + for (var14 = 0; var14 < 5; ++var14) { + if (this.oscillatorVolume[var14] != 0) { + var15 = Instrument_delays[var14] + var11; + if (var15 < var1) { + var10000 = Instrument_samples; + var10000[var15] += this.evaluateWave(Instrument_phases[var14], var13 * Instrument_volumeSteps[var14] >> 15, this.pitch.form); + var10000 = Instrument_phases; + var10000[var14] += (var12 * Instrument_pitchSteps[var14] >> 16) + Instrument_pitchBaseSteps[var14]; + } } } } - } - if (this.release != null) { - this.release.reset(); - this.attack.reset(); - int var11 = 0; - boolean var19 = false; - boolean var20 = true; - for (int var14 = 0; var14 < var1; ++var14) { - int var12; - int var15 = this.release.doStep(var1); - int var16 = this.attack.doStep(var1); - if (var20) { - var12 = (var15 * (this.release.end - this.release.start) >> 8) + this.release.start; - } else { - var12 = (var16 * (this.release.end - this.release.start) >> 8) + this.release.start; - } + int var16; + if (this.release != null) { + this.release.reset(); + this.attack.reset(); + var11 = 0; + boolean var19 = false; + boolean var20 = true; - var11 += 256; - if (var11 >= var12) { - var11 = 0; - var20 = !var20; - } - - if (var20) { - Instrument_samples[var14] = 0; - } - } - } - - if (this.delayTime > 0 && this.delayDecay > 0) { - int var11 = (int)((double)this.delayTime * var3); - - for (int var12 = var11; var12 < var1; ++var12) { - Instrument_samples[var12] += Instrument_samples[var12 - var11] * this.delayDecay / 100; - } - } - - if (this.filter.pairs[0] > 0 || this.filter.pairs[1] > 0) { - this.filterEnvelope.reset(); - int var11 = this.filterEnvelope.doStep(var1 + 1); - int var12 = this.filter.compute(0, (float)var11 / 65536.0F); - int var13 = this.filter.compute(1, (float)var11 / 65536.0F); - if (var1 >= var12 + var13) { - int var14 = 0; - int var15 = var13; - if (var13 > var1 - var12) { - var15 = var1 - var12; - } - - while (var14 < var15) { - int var16 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16); - - for (int var17 = 0; var17 < var12; ++var17) { - var16 += (int)((long)Instrument_samples[var14 + var12 - 1 - var17] * (long)AudioFilter.coefficients[0][var17] >> 16); + for (var14 = 0; var14 < var1; ++var14) { + var15 = this.release.doStep(var1); + var16 = this.attack.doStep(var1); + if (var20) { + var12 = (var15 * (this.release.end - this.release.start) >> 8) + this.release.start; + } else { + var12 = (var16 * (this.release.end - this.release.start) >> 8) + this.release.start; } - for (int var17 = 0; var17 < var14; ++var17) { - var16 -= (int)((long)Instrument_samples[var14 - 1 - var17] * (long)AudioFilter.coefficients[1][var17] >> 16); + var11 += 256; + if (var11 >= var12) { + var11 = 0; + var20 = !var20; } - Instrument_samples[var14] = var16; - var11 = this.filterEnvelope.doStep(var1 + 1); - ++var14; + if (var20) { + Instrument_samples[var14] = 0; + } } + } - var15 = 128; + if (this.delayTime > 0 && this.delayDecay > 0) { + var11 = (int)((double)this.delayTime * var3); - while (true) { - if (var15 > var1 - var12) { + for (var12 = var11; var12 < var1; ++var12) { + var10000 = Instrument_samples; + var10000[var12] += Instrument_samples[var12 - var11] * this.delayDecay / 100; + } + } + + if (this.filter.pairs[0] > 0 || this.filter.pairs[1] > 0) { + this.filterEnvelope.reset(); + var11 = this.filterEnvelope.doStep(var1 + 1); + var12 = this.filter.compute(0, (float)var11 / 65536.0F); + var13 = this.filter.compute(1, (float)var11 / 65536.0F); + if (var1 >= var12 + var13) { + var14 = 0; + var15 = var13; + if (var13 > var1 - var12) { var15 = var1 - var12; } + int var17; while (var14 < var15) { - int var17 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16); + var16 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16); - for (int var18 = 0; var18 < var12; ++var18) { - var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var18] * (long)AudioFilter.coefficients[0][var18] >> 16); + for (var17 = 0; var17 < var12; ++var17) { + var16 += (int)((long)Instrument_samples[var14 + var12 - 1 - var17] * (long)AudioFilter.coefficients[0][var17] >> 16); } - for (int var18 = 0; var18 < var13; ++var18) { - var17 -= (int)((long)Instrument_samples[var14 - 1 - var18] * (long)AudioFilter.coefficients[1][var18] >> 16); + for (var17 = 0; var17 < var14; ++var17) { + var16 -= (int)((long)Instrument_samples[var14 - 1 - var17] * (long)AudioFilter.coefficients[1][var17] >> 16); } - Instrument_samples[var14] = var17; + Instrument_samples[var14] = var16; var11 = this.filterEnvelope.doStep(var1 + 1); ++var14; } - if (var14 < var1 - var12) { - var12 = this.filter.compute(0, (float) var11 / 65536.0F); - var13 = this.filter.compute(1, (float) var11 / 65536.0F); + var15 = 128; + + while (true) { + if (var15 > var1 - var12) { + var15 = var1 - var12; + } + + int var18; + while (var14 < var15) { + var17 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16); + + for (var18 = 0; var18 < var12; ++var18) { + var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var18] * (long)AudioFilter.coefficients[0][var18] >> 16); + } + + for (var18 = 0; var18 < var13; ++var18) { + var17 -= (int)((long)Instrument_samples[var14 - 1 - var18] * (long)AudioFilter.coefficients[1][var18] >> 16); + } + + Instrument_samples[var14] = var17; + var11 = this.filterEnvelope.doStep(var1 + 1); + ++var14; + } + + if (var14 >= var1 - var12) { + while (var14 < var1) { + var17 = 0; + + for (var18 = var14 + var12 - var1; var18 < var12; ++var18) { + var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var18] * (long)AudioFilter.coefficients[0][var18] >> 16); + } + + for (var18 = 0; var18 < var13; ++var18) { + var17 -= (int)((long)Instrument_samples[var14 - 1 - var18] * (long)AudioFilter.coefficients[1][var18] >> 16); + } + + Instrument_samples[var14] = var17; + this.filterEnvelope.doStep(var1 + 1); + ++var14; + } + break; + } + + var12 = this.filter.compute(0, (float)var11 / 65536.0F); + var13 = this.filter.compute(1, (float)var11 / 65536.0F); var15 += 128; - } else { - break; } - - } - while (var14 < var1) { - int var17 = 0; - - for (int var18 = var14 + var12 - var1; var18 < var12; ++var18) { - var17 += (int) ((long) Instrument_samples[var14 + var12 - 1 - var18] * (long) AudioFilter.coefficients[0][var18] >> 16); - } - - for (int var18 = 0; var18 < var13; ++var18) { - var17 -= (int) ((long) Instrument_samples[var14 - 1 - var18] * (long) AudioFilter.coefficients[1][var18] >> 16); - } - - Instrument_samples[var14] = var17; - this.filterEnvelope.doStep(var1 + 1); - ++var14; } } - } - for (int var11 = 0; var11 < var1; ++var11) { - if (Instrument_samples[var11] < -32768) { - Instrument_samples[var11] = -32768; + for (var11 = 0; var11 < var1; ++var11) { + if (Instrument_samples[var11] < -32768) { + Instrument_samples[var11] = -32768; + } + + if (Instrument_samples[var11] > 32767) { + Instrument_samples[var11] = 32767; + } } - if (Instrument_samples[var11] > 0x7fff) { - Instrument_samples[var11] = 0x7fff; - } + return Instrument_samples; } - - return Instrument_samples; } - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("evaluateWave") final int evaluateWave(int var1, int var2, int var3) { if (var3 == 1) { - return (var1 & 0x7fff) < 16384 ? var2 : -var2; + return (var1 & 32767) < 16384 ? var2 : -var2; + } else if (var3 == 2) { + return Instrument_sine[var1 & 32767] * var2 >> 14; + } else if (var3 == 3) { + return (var2 * (var1 & 32767) >> 14) - var2; + } else { + return var3 == 4 ? var2 * Instrument_noise[var1 / 2607 & 32767] : 0; } - if (var3 == 2) { - return Instrument_sine[var1 & 0x7fff] * var2 >> 14; - } - if (var3 == 3) { - return (var2 * (var1 & 0x7fff) >> 14) - var2; - } - return var3 == 4 ? var2 * Instrument_noise[var1 / 2607 & 0x7fff] : 0; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkf;)V" + signature = "(Lky;)V" ) @Export("decode") final void decode(Buffer var1) { @@ -410,6 +421,6 @@ public class Instrument { this.offset = var1.readUnsignedShort(); this.filter = new AudioFilter(); this.filterEnvelope = new SoundEnvelope(); - this.filter.method2680(var1, this.filterEnvelope); + this.filter.method2637(var1, this.filterEnvelope); } } diff --git a/runescape-client/src/main/java/IntHashTable.java b/runescape-client/src/main/java/IntHashTable.java index cb3d4f42db..446aafc909 100644 --- a/runescape-client/src/main/java/IntHashTable.java +++ b/runescape-client/src/main/java/IntHashTable.java @@ -3,10 +3,16 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lj") +@ObfuscatedName("ly") @Implements("IntHashTable") public class IntHashTable { - @ObfuscatedName("q") + @ObfuscatedName("gg") + @ObfuscatedSignature( + signature = "[Lls;" + ) + @Export("headIconPrayerSprites") + static Sprite[] headIconPrayerSprites; + @ObfuscatedName("s") @Export("array") int[] array; @@ -32,10 +38,10 @@ public class IntHashTable { } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "1528091447" + signature = "(IS)I", + garbageValue = "2215" ) @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 46e62b6f8c..7e8c32d9d7 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("fc") +@ObfuscatedName("fr") @Implements("IntegerNode") public class IntegerNode extends Node { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("integer") public int integer; diff --git a/runescape-client/src/main/java/InterfaceParent.java b/runescape-client/src/main/java/InterfaceParent.java index 1744f8ea53..f372064957 100644 --- a/runescape-client/src/main/java/InterfaceParent.java +++ b/runescape-client/src/main/java/InterfaceParent.java @@ -1,64 +1,647 @@ +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.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.Reflection; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bo") +@ObfuscatedName("bq") @Implements("InterfaceParent") public class InterfaceParent extends Node { - @ObfuscatedName("q") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1594443761 + intValue = -744478163 + ) + @Export("cacheGamebuild") + public static int cacheGamebuild; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 345321709 ) @Export("group") int group; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -721304619 + intValue = 336963959 ) @Export("type") int type; - @ObfuscatedName("e") - boolean field567; + @ObfuscatedName("i") + boolean field540; InterfaceParent() { - this.field567 = false; + this.field540 = false; } - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "-673878359" + signature = "(Lkx;B)V", + garbageValue = "1" ) - public static boolean method1119(int var0) { - return (var0 & 1) != 0; - } + @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); - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(Lkx;II)V", - garbageValue = "2052544381" - ) - @Export("updatePlayers") - static final void updatePlayers(PacketBuffer var0, int var1) { - int var2 = var0.offset; - Players.Players_pendingUpdateCount = 0; - MouseHandler.method1037(var0); + 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); + } - for (int var3 = 0; var3 < Players.Players_pendingUpdateCount; ++var3) { - int var4 = Players.Players_pendingUpdateIndices[var3]; - Player var5 = Client.players[var4]; - int var6 = var0.readUnsignedByte(); - if ((var6 & 8) != 0) { - var6 += var0.readUnsignedByte() << 8; + 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); + } + } } - WorldMapEvent.method736(var0, var4, var5, var6); - } - - if (var0.offset - var2 != var1) { - throw new RuntimeException(var0.offset - var2 + " " + var1); + var0.writeCrc(var2); + var1.remove(); } } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + signature = "(ILcr;ZB)I", + garbageValue = "-76" + ) + static int method1126(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 6600) { + var3 = ItemContainer.plane; + int var9 = PacketWriter.baseX * 64 + (WorldMapIcon_1.localPlayer.x >> 7); + int var5 = RouteStrategy.baseY * 64 + (WorldMapIcon_1.localPlayer.y >> 7); + LoginScreenAnimation.getWorldMap().method6193(var3, var9, var5, true); + return 1; + } else { + WorldMapArea var11; + if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + String var16 = ""; + var11 = LoginScreenAnimation.getWorldMap().getMapArea(var3); + if (var11 != null) { + var16 = var11.getExternalName(); + } + + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16; + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + LoginScreenAnimation.getWorldMap().setCurrentMapAreaId(var3); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = LoginScreenAnimation.getWorldMap().getZoomLevel(); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + LoginScreenAnimation.getWorldMap().setZoomPercentage(var3); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = LoginScreenAnimation.getWorldMap().isCacheLoaded() ? 1 : 0; + return 1; + } else { + Coord var15; + if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { + var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + LoginScreenAnimation.getWorldMap().setWorldMapPositionTarget(var15.x, var15.y); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { + var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + LoginScreenAnimation.getWorldMap().setWorldMapPositionTargetInstant(var15.x, var15.y); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { + var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + LoginScreenAnimation.getWorldMap().jumpToSourceCoord(var15.plane, var15.x, var15.y); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { + var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + LoginScreenAnimation.getWorldMap().jumpToSourceCoordInstant(var15.plane, var15.x, var15.y); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = LoginScreenAnimation.getWorldMap().getDisplayX(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = LoginScreenAnimation.getWorldMap().getDisplayY(); + return 1; + } else { + WorldMapArea var13; + if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var13 = LoginScreenAnimation.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getOrigin().packed(); + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var13 = LoginScreenAnimation.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var13.getRegionHighX() - var13.getRegionLowX() + 1) * 64; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var13.getRegionHighY() - var13.getRegionLowY() + 1) * 64; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var13 = LoginScreenAnimation.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getRegionLowX() * 64; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getRegionLowY() * 64; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getRegionHighX() * 64 + 64 - 1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getRegionHighY() * 64 + 64 - 1; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var13 = LoginScreenAnimation.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getZoom(); + } + + return 1; + } else if (var0 == 6615) { + var15 = LoginScreenAnimation.getWorldMap().getDisplayCoord(); + if (var15 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var15.x; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var15.y; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = LoginScreenAnimation.getWorldMap().currentMapAreaId(); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { + var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + var13 = LoginScreenAnimation.getWorldMap().getCurrentMapArea(); + if (var13 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + return 1; + } else { + int[] var14 = var13.position(var15.plane, var15.x, var15.y); + if (var14 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14[0]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14[1]; + } + + return 1; + } + } else { + Coord var7; + if (var0 == 6618) { + var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + var13 = LoginScreenAnimation.getWorldMap().getCurrentMapArea(); + if (var13 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + return 1; + } else { + var7 = var13.coord(var15.x, var15.y); + if (var7 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.packed(); + } + + return 1; + } + } else { + Coord var12; + if (var0 == 6619) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var12 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); + class208.method3893(var3, var12, false); + return 1; + } else if (var0 == 6620) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var12 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); + class208.method3893(var3, var12, true); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var12 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); + var11 = LoginScreenAnimation.getWorldMap().getMapArea(var3); + if (var11 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.containsCoord(var12.plane, var12.x, var12.y) ? 1 : 0; + return 1; + } + } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = LoginScreenAnimation.getWorldMap().getDisplayWith(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = LoginScreenAnimation.getWorldMap().getDisplayHeight(); + return 1; + } else if (var0 == 6623) { + var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + var13 = LoginScreenAnimation.getWorldMap().mapAreaAtCoord(var15.plane, var15.x, var15.y); + if (var13 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getId(); + } + + return 1; + } else if (var0 == 6624) { + LoginScreenAnimation.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + return 1; + } else if (var0 == 6625) { + LoginScreenAnimation.getWorldMap().resetMaxFlashCount(); + return 1; + } else if (var0 == 6626) { + LoginScreenAnimation.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + return 1; + } else if (var0 == 6627) { + LoginScreenAnimation.getWorldMap().resetCyclesPerFlash(); + return 1; + } else { + boolean var10; + if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + LoginScreenAnimation.getWorldMap().setPerpetualFlash(var10); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + LoginScreenAnimation.getWorldMap().flashElement(var3); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + LoginScreenAnimation.getWorldMap().flashCategory(var3); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { + LoginScreenAnimation.getWorldMap().stopCurrentFlashes(); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + LoginScreenAnimation.getWorldMap().setElementsDisabled(var10); + return 1; + } else { + boolean var4; + if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; + LoginScreenAnimation.getWorldMap().disableElement(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; + LoginScreenAnimation.getWorldMap().setCategoryDisabled(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = LoginScreenAnimation.getWorldMap().getElementsDisabled() ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = LoginScreenAnimation.getWorldMap().isElementDisabled(var3) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = LoginScreenAnimation.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; + return 1; + } else if (var0 == 6638) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var12 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); + var7 = LoginScreenAnimation.getWorldMap().method6237(var3, var12); + if (var7 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.packed(); + } + + return 1; + } else { + AbstractWorldMapIcon var8; + if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { + var8 = LoginScreenAnimation.getWorldMap().iconStart(); + if (var8 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.getElement(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.coord2.packed(); + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { + var8 = LoginScreenAnimation.getWorldMap().iconNext(); + if (var8 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.getElement(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.coord2.packed(); + } + + return 1; + } else { + WorldMapElement var6; + if (var0 == ScriptOpcodes.MEC_TEXT) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var6 = WorldMapData_0.WorldMapElement_get(var3); + if (var6.name == null) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.name; + } + + return 1; + } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var6 = WorldMapData_0.WorldMapElement_get(var3); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.textSize; + return 1; + } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var6 = WorldMapData_0.WorldMapElement_get(var3); + if (var6 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.category; + } + + return 1; + } else if (var0 == ScriptOpcodes.MEC_SPRITE) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var6 = WorldMapData_0.WorldMapElement_get(var3); + if (var6 == null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.sprite1; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class162.worldMapEvent.mapElement; + return 1; + } else if (var0 == 6698) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class162.worldMapEvent.coord1.packed(); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class162.worldMapEvent.coord2.packed(); + return 1; + } else { + return 2; + } + } + } + } + } + } + } + } + } + } + } + + @ObfuscatedName("ed") + @ObfuscatedSignature( + signature = "(Lid;Ljava/lang/String;I)V", + garbageValue = "-1272768850" + ) + static void method1125(Archive var0, String var1) { + ArchiveLoader var2 = new ArchiveLoader(var0, var1); + Client.archiveLoaders.add(var2); + Client.field895 += var2.groupCount; + } + + @ObfuscatedName("iy") + @ObfuscatedSignature( + signature = "(IIIILjava/lang/String;I)V", + garbageValue = "-1914919482" + ) + static void method1127(int var0, int var1, int var2, int var3, String var4) { + Widget var5 = ModelData0.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; + class81.runScriptEvent(var6); + } + + boolean var11 = true; + if (var5.contentType > 0) { + var11 = WorldMapSection1.method563(var5); + } + + if (var11) { + int var8 = ParamDefinition.getWidgetClickMask(var5); + int var9 = var0 - 1; + boolean var7 = (var8 >> var9 + 1 & 1) != 0; + if (var7) { + PacketBufferNode var10; + if (var0 == 1) { + var10 = MenuAction.getPacketBufferNode(ClientPacket.field2253, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 2) { + var10 = MenuAction.getPacketBufferNode(ClientPacket.field2206, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 3) { + var10 = MenuAction.getPacketBufferNode(ClientPacket.field2233, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 4) { + var10 = MenuAction.getPacketBufferNode(ClientPacket.field2204, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 5) { + var10 = MenuAction.getPacketBufferNode(ClientPacket.field2221, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 6) { + var10 = MenuAction.getPacketBufferNode(ClientPacket.field2244, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 7) { + var10 = MenuAction.getPacketBufferNode(ClientPacket.field2276, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 8) { + var10 = MenuAction.getPacketBufferNode(ClientPacket.field2199, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 9) { + var10 = MenuAction.getPacketBufferNode(ClientPacket.field2288, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 10) { + var10 = MenuAction.getPacketBufferNode(ClientPacket.field2245, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + } + } + } + } + + @ObfuscatedName("kr") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1999960041" + ) + @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 (Client.clanChat != null) { + Client.clanChat.invalidateIgnoreds(); + } + + } } diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index 53aeb88627..395fc20dc8 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -7,67 +7,59 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("be") @Implements("Interpreter") public class Interpreter { - @ObfuscatedName("e") - @Export("Interpreter_intLocals") - static int[] Interpreter_intLocals; - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lga;" - ) - @Export("midiPcmStream") - public static MidiPcmStream midiPcmStream; - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("Interpreter_arrayLengths") static int[] Interpreter_arrayLengths; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("Interpreter_arrays") static int[][] Interpreter_arrays; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("Interpreter_intStack") static int[] Interpreter_intStack; - @ObfuscatedName("c") + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 1267204541 + ) + @Export("Interpreter_intStackSize") + static int Interpreter_intStackSize; + @ObfuscatedName("x") @Export("Interpreter_stringStack") static String[] Interpreter_stringStack; - @ObfuscatedName("m") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -340268151 + intValue = -1592164881 + ) + @Export("Interpreter_stringStackSize") + static int Interpreter_stringStackSize; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 579682077 ) @Export("Interpreter_frameDepth") static int Interpreter_frameDepth; - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "[Lbh;" + signature = "[Lbp;" ) @Export("Interpreter_frames") static ScriptFrame[] Interpreter_frames; - @ObfuscatedName("r") - @ObfuscatedSignature( - signature = "Lhj;" - ) - static Widget field1111; - @ObfuscatedName("v") + @ObfuscatedName("p") @Export("Interpreter_calendar") static java.util.Calendar Interpreter_calendar; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("Interpreter_MONTHS") static final String[] Interpreter_MONTHS; + @ObfuscatedName("e") + static boolean field1074; + @ObfuscatedName("z") + static boolean field1072; @ObfuscatedName("a") - static boolean field1104; - @ObfuscatedName("j") - static boolean field1105; - @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -662324053 + intValue = -1440593965 ) - static int field1106; - @ObfuscatedName("d") - static final double field1110; - @ObfuscatedName("hr") - @ObfuscatedGetter( - intValue = 973734975 - ) - @Export("cameraYaw") - static int cameraYaw; + static int field1064; + @ObfuscatedName("v") + static final double field1078; static { Interpreter_arrayLengths = new int[5]; @@ -78,62 +70,9 @@ 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"}; - field1104 = false; - field1105 = false; - field1106 = 0; - field1110 = Math.log(2.0D); - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(I)[Lgc;", - garbageValue = "-23272757" - ) - @Export("ServerPacket_values") - public static ServerPacket[] ServerPacket_values() { - return new ServerPacket[]{ServerPacket.field2160, ServerPacket.field2116, ServerPacket.field2117, ServerPacket.field2152, ServerPacket.field2119, ServerPacket.field2165, ServerPacket.field2178, ServerPacket.field2122, ServerPacket.field2190, ServerPacket.field2176, ServerPacket.field2141, ServerPacket.field2126, ServerPacket.field2127, ServerPacket.field2128, ServerPacket.field2129, ServerPacket.field2130, ServerPacket.field2131, ServerPacket.field2120, ServerPacket.field2133, ServerPacket.field2134, ServerPacket.field2125, ServerPacket.field2136, ServerPacket.field2191, ServerPacket.field2138, ServerPacket.field2139, ServerPacket.field2140, ServerPacket.field2137, ServerPacket.field2135, ServerPacket.field2143, ServerPacket.field2144, ServerPacket.field2181, ServerPacket.field2175, ServerPacket.field2147, ServerPacket.field2148, ServerPacket.field2149, ServerPacket.field2118, ServerPacket.field2151, ServerPacket.field2202, ServerPacket.field2180, ServerPacket.field2154, ServerPacket.field2155, ServerPacket.field2156, ServerPacket.field2157, ServerPacket.field2162, ServerPacket.field2159, ServerPacket.field2189, ServerPacket.field2161, ServerPacket.field2150, ServerPacket.field2163, ServerPacket.field2164, ServerPacket.field2123, ServerPacket.field2166, ServerPacket.field2167, ServerPacket.field2153, ServerPacket.field2142, ServerPacket.field2170, ServerPacket.field2171, ServerPacket.field2172, ServerPacket.field2132, ServerPacket.field2174, ServerPacket.field2169, ServerPacket.field2124, ServerPacket.field2177, ServerPacket.field2168, ServerPacket.field2179, ServerPacket.field2158, ServerPacket.field2173, ServerPacket.field2182, ServerPacket.field2183, ServerPacket.field2184, ServerPacket.field2185, ServerPacket.field2186, ServerPacket.field2187, ServerPacket.field2188, ServerPacket.field2115, ServerPacket.field2121, ServerPacket.field2145, ServerPacket.field2192, ServerPacket.field2193, ServerPacket.field2194, ServerPacket.field2195, ServerPacket.field2196, ServerPacket.field2197, ServerPacket.field2198, ServerPacket.field2199, ServerPacket.field2200}; - } - - @ObfuscatedName("hr") - @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "1044045879" - ) - @Export("isRightClickOnlyMenu") - static final boolean isRightClickOnlyMenu(int var0) { - if (var0 < 0) { - return false; - } - int var1 = Client.menuOpcodes[var0]; - if (var1 >= 2000) { - var1 -= 2000; - } - - return var1 == 1007; - } - - @ObfuscatedName("jo") - @ObfuscatedSignature( - signature = "(IIIILly;Lhg;B)V", - garbageValue = "73" - ) - @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.method6146(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); - } - - } - } + field1074 = false; + field1072 = false; + field1064 = 0; + field1078 = Math.log(2.0D); } } diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java index ab88c2bb06..3dc23bcb27 100644 --- a/runescape-client/src/main/java/InvDefinition.java +++ b/runescape-client/src/main/java/InvDefinition.java @@ -4,29 +4,24 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ig") +@ObfuscatedName("iz") @Implements("InvDefinition") public class InvDefinition extends DualNode { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("InvDefinition_archive") static AbstractArchive InvDefinition_archive; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lep;" ) @Export("InvDefinition_cached") static EvictingDualNodeHashTable InvDefinition_cached; - @ObfuscatedName("bs") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1665309649 - ) - static int field3199; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = 2126077973 + intValue = -1030135997 ) @Export("size") public int size; @@ -39,10 +34,10 @@ public class InvDefinition extends DualNode { this.size = 0; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkf;I)V", - garbageValue = "-1922259569" + signature = "(Lky;I)V", + garbageValue = "1381455080" ) @Export("decode") void decode(Buffer var1) { @@ -56,10 +51,10 @@ public class InvDefinition extends DualNode { } } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lkf;II)V", - garbageValue = "-745252030" + signature = "(Lky;II)V", + garbageValue = "1993704887" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -68,4 +63,32 @@ public class InvDefinition extends DualNode { } } + + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1920949744" + ) + @Export("HealthBarDefinition_clearCached") + public static void HealthBarDefinition_clearCached() { + HealthBarDefinition.HealthBarDefinition_cached.clear(); + HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); + } + + @ObfuscatedName("gx") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "797834957" + ) + static void method4273() { + 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) { + class80.addPlayerToScene(Client.players[var1[var2]], true); + } + } + + } } diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java index ed3ebccf84..a674bb824e 100644 --- a/runescape-client/src/main/java/IsaacCipher.java +++ b/runescape-client/src/main/java/IsaacCipher.java @@ -4,36 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lv") +@ObfuscatedName("le") @Implements("IsaacCipher") public final class IsaacCipher { - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -568134249 + intValue = 2101983613 ) @Export("valuesRemaining") int valuesRemaining; - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("results") int[] results; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("mm") int[] mm; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1494247529 + intValue = 1847891637 ) @Export("aa") int aa; - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 2002844889 + intValue = -633737627 ) @Export("bb") int bb; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -917806503 + intValue = 1193813871 ) @Export("cc") int cc; @@ -46,13 +46,13 @@ public final class IsaacCipher { this.results[var2] = var1[var2]; } - this.method6247(); + this.method6135(); } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "15" + signature = "(I)I", + garbageValue = "226324510" ) @Export("nextInt") public final int nextInt() { @@ -64,12 +64,12 @@ public final class IsaacCipher { return this.results[--this.valuesRemaining]; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "7" + signature = "(S)I", + garbageValue = "-3994" ) - public final int method6254() { + public final int method6134() { if (this.valuesRemaining == 0) { this.generateMoreResults(); this.valuesRemaining = 256; @@ -78,10 +78,10 @@ public final class IsaacCipher { return this.results[this.valuesRemaining - 1]; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1888611260" + signature = "(B)V", + garbageValue = "70" ) @Export("generateMoreResults") final void generateMoreResults() { @@ -101,20 +101,20 @@ public final class IsaacCipher { this.aa ^= this.aa >>> 16; } - this.aa += this.mm[128 + var1 & 255]; + this.aa += this.mm[var1 + 128 & 255]; int var3; - this.mm[var1] = var3 = this.mm[(var2 & 1020) >> 2] + this.aa + this.bb; + this.mm[var1] = var3 = this.mm[(var2 & 1020) >> 2] + this.bb + this.aa; this.results[var1] = this.bb = this.mm[(var3 >> 8 & 1020) >> 2] + var2; } } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "2" + garbageValue = "1" ) - final void method6247() { + final void method6135() { int var9 = -1640531527; int var8 = -1640531527; int var7 = -1640531527; @@ -241,14 +241,4 @@ public final class IsaacCipher { this.generateMoreResults(); this.valuesRemaining = 256; } - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(I)[Lht;", - garbageValue = "547339899" - ) - @Export("ServerBuild_values") - static ServerBuild[] ServerBuild_values() { - return new ServerBuild[]{ServerBuild.RC, ServerBuild.LIVE, ServerBuild.WIP, ServerBuild.BUILDLIVE}; - } } diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java index afd79d9ce4..a9dab62006 100644 --- a/runescape-client/src/main/java/ItemContainer.java +++ b/runescape-client/src/main/java/ItemContainer.java @@ -1,26 +1,33 @@ +import java.io.InputStream; +import java.io.OutputStreamWriter; +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("bc") +@ObfuscatedName("bv") @Implements("ItemContainer") public class ItemContainer extends Node { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Llc;" + signature = "Llm;" ) @Export("itemContainers") static NodeHashTable itemContainers; - @ObfuscatedName("jk") - @ObfuscatedSignature( - signature = "Lhj;" + @ObfuscatedName("jo") + @ObfuscatedGetter( + intValue = -311647147 ) - static Widget field549; - @ObfuscatedName("w") + @Export("plane") + static int plane; + @ObfuscatedName("j") @Export("ids") int[] ids; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("quantities") int[] quantities; @@ -33,34 +40,820 @@ public class ItemContainer extends Node { this.quantities = new int[]{0}; } - @ObfuscatedName("w") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(IB)Lic;", - garbageValue = "-70" + signature = "(B)V", + garbageValue = "124" ) - @Export("FloorUnderlayDefinition_get") - public static FloorUnderlayDefinition FloorUnderlayDefinition_get(int var0) { - FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } - byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0); - var1 = new FloorUnderlayDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2), var0); - } + static void method1120() { + if (Login.Login_username == null || Login.Login_username.length() <= 0) { + if (GrandExchangeOffer.clientPreferences.rememberedUsername != null) { + Login.Login_username = GrandExchangeOffer.clientPreferences.rememberedUsername; + Client.Login_isUsernameRemembered = true; + } else { + Client.Login_isUsernameRemembered = false; + } - var1.postDecode(); - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); - return var1; + } } - @ObfuscatedName("ac") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-1225456641" + signature = "(B)V", + garbageValue = "70" ) - static int method1116(int var0) { - return (int)Math.pow(2.0D, (double)(var0 / 256.0F + 7.0F)); + static void method1118() { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + GrandExchangeOfferOwnWorldComparator.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); + } else { + long var1 = ObjectSound.method1836(); + byte var0; + if (var1 == 0L) { + var0 = 5; + } else { + String var4 = Login.Login_username; + Random var5 = new Random(); + Buffer var6 = new Buffer(128); + Buffer var7 = new Buffer(128); + int[] var8 = new int[]{var5.nextInt(), var5.nextInt(), (int)(var1 >> 32), (int)var1}; + var6.writeByte(10); + + int var9; + for (var9 = 0; var9 < 4; ++var9) { + var6.writeInt(var5.nextInt()); + } + + var6.writeInt(var8[0]); + var6.writeInt(var8[1]); + var6.writeLong(var1); + var6.writeLong(0L); + + for (var9 = 0; var9 < 4; ++var9) { + var6.writeInt(var5.nextInt()); + } + + var6.encryptRsa(class80.field1108, class80.field1110); + var7.writeByte(10); + + for (var9 = 0; var9 < 3; ++var9) { + var7.writeInt(var5.nextInt()); + } + + var7.writeLong(var5.nextLong()); + var7.writeLongMedium(var5.nextLong()); + FloorDecoration.method2787(var7); + var7.writeLong(var5.nextLong()); + var7.encryptRsa(class80.field1108, class80.field1110); + var9 = Buddy.stringCp1252NullTerminatedByteSize(var4); + if (var9 % 8 != 0) { + var9 += 8 - var9 % 8; + } + + Buffer var10 = new Buffer(var9); + var10.writeStringCp1252NullTerminated(var4); + var10.offset = var9; + var10.xteaEncryptAll(var8); + Buffer var11 = new Buffer(var7.offset + var6.offset + var10.offset + 5); + var11.writeByte(2); + var11.writeByte(var6.offset); + var11.writeBytes(var6.array, 0, var6.offset); + var11.writeByte(var7.offset); + var11.writeBytes(var7.array, 0, var7.offset); + var11.writeShort(var10.offset); + var11.writeBytes(var10.array, 0, var10.offset); + String var12 = ViewportMouse.method2902(var11.array); + + byte var3; + try { + URL var13 = new URL(RouteStrategy.method3534("services", false) + "m=accountappeal/login.ws"); + URLConnection var14 = var13.openConnection(); + var14.setDoInput(true); + var14.setDoOutput(true); + var14.setConnectTimeout(5000); + OutputStreamWriter var15 = new OutputStreamWriter(var14.getOutputStream()); + var15.write("data2=" + WorldMapAreaData.method658(var12) + "&dest=" + WorldMapAreaData.method658("passwordchoice.ws")); + var15.flush(); + InputStream var16 = var14.getInputStream(); + var11 = new Buffer(new byte[1000]); + + while (true) { + int var17 = var16.read(var11.array, var11.offset, 1000 - var11.offset); + if (var17 == -1) { + var15.close(); + var16.close(); + String var18 = new String(var11.array); + if (var18.startsWith("OFFLINE")) { + var3 = 4; + } else if (var18.startsWith("WRONG")) { + var3 = 7; + } else if (var18.startsWith("RELOAD")) { + var3 = 3; + } else if (var18.startsWith("Not permitted for social network accounts.")) { + var3 = 6; + } else { + var11.xteaDecryptAll(var8); + + while (var11.offset > 0 && var11.array[var11.offset - 1] == 0) { + --var11.offset; + } + + var18 = new String(var11.array, 0, var11.offset); + if (class3.isValidURL(var18)) { + GameObject.openURL(var18, true, false); + var3 = 2; + } else { + var3 = 5; + } + } + break; + } + + var11.offset += var17; + if (var11.offset >= 1000) { + var3 = 5; + break; + } + } + } catch (Throwable var19) { + var19.printStackTrace(); + var3 = 5; + } + + var0 = var3; + } + + switch(var0) { + case 2: + GrandExchangeOfferOwnWorldComparator.setLoginResponseString(Strings.field3007, Strings.field3008, Strings.field3009); + Login.loginIndex = 6; + break; + case 3: + GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "Error connecting to server.", ""); + break; + case 4: + GrandExchangeOfferOwnWorldComparator.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); + break; + case 5: + GrandExchangeOfferOwnWorldComparator.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); + break; + case 6: + GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "Error connecting to server.", ""); + break; + case 7: + GrandExchangeOfferOwnWorldComparator.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("eb") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "22" + ) + @Export("load") + static void load() { + int var0; + if (Client.titleLoadingStage == 0) { + Player.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); + + for (var0 = 0; var0 < 4; ++var0) { + Client.collisionMaps[var0] = new CollisionMap(104, 104); + } + + ParamDefinition.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) { + Client.archive0 = UserComparator10.newArchive(0, false, true, true); + class269.archive1 = UserComparator10.newArchive(1, false, true, true); + HealthBarUpdate.archive2 = UserComparator10.newArchive(2, true, false, true); + UserComparator8.archive3 = UserComparator10.newArchive(3, false, true, true); + WorldMapSprite.archive4 = UserComparator10.newArchive(4, false, true, true); + WorldMapDecoration.archive5 = UserComparator10.newArchive(5, true, true, true); + GrandExchangeEvent.archive6 = UserComparator10.newArchive(6, true, true, true); + class51.archive7 = UserComparator10.newArchive(7, false, true, true); + class2.archive8 = UserComparator10.newArchive(8, false, true, true); + WorldMapDecoration.archive9 = UserComparator10.newArchive(9, false, true, true); + GameObject.archive10 = UserComparator10.newArchive(10, false, true, true); + WorldMapRectangle.archive11 = UserComparator10.newArchive(11, false, true, true); + GameShell.archive12 = UserComparator10.newArchive(12, false, true, true); + WorldMapID.archive13 = UserComparator10.newArchive(13, true, false, true); + WorldMapSection1.archive14 = UserComparator10.newArchive(14, false, true, true); + GrandExchangeOfferWorldComparator.archive15 = UserComparator10.newArchive(15, false, true, true); + WorldMapIcon_1.archive17 = UserComparator10.newArchive(17, true, true, true); + class40.archive18 = UserComparator10.newArchive(18, false, true, true); + SoundCache.archive19 = UserComparator10.newArchive(19, false, true, true); + Script.archive20 = UserComparator10.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 var31 = 0; + var0 = var31 + Client.archive0.percentage() * 4 / 100; + var0 += class269.archive1.percentage() * 4 / 100; + var0 += HealthBarUpdate.archive2.percentage() * 2 / 100; + var0 += UserComparator8.archive3.percentage() * 2 / 100; + var0 += WorldMapSprite.archive4.percentage() * 6 / 100; + var0 += WorldMapDecoration.archive5.percentage() * 4 / 100; + var0 += GrandExchangeEvent.archive6.percentage() * 2 / 100; + var0 += class51.archive7.percentage() * 56 / 100; + var0 += class2.archive8.percentage() * 2 / 100; + var0 += WorldMapDecoration.archive9.percentage() * 2 / 100; + var0 += GameObject.archive10.percentage() * 2 / 100; + var0 += WorldMapRectangle.archive11.percentage() * 2 / 100; + var0 += GameShell.archive12.percentage() * 2 / 100; + var0 += WorldMapID.archive13.percentage() * 2 / 100; + var0 += WorldMapSection1.archive14.percentage() * 2 / 100; + var0 += GrandExchangeOfferWorldComparator.archive15.percentage() * 2 / 100; + var0 += SoundCache.archive19.percentage() / 100; + var0 += class40.archive18.percentage() / 100; + var0 += Script.archive20.percentage() / 100; + var0 += WorldMapIcon_1.archive17.method4177() && WorldMapIcon_1.archive17.isFullyLoaded() ? 1 : 0; + if (var0 != 100) { + if (var0 != 0) { + Login.Login_loadingText = "Checking for updates - " + var0 + "%"; + } + + Login.Login_loadingPercent = 30; + } else { + InterfaceParent.method1125(Client.archive0, "Animations"); + InterfaceParent.method1125(class269.archive1, "Skeletons"); + InterfaceParent.method1125(WorldMapSprite.archive4, "Sound FX"); + InterfaceParent.method1125(WorldMapDecoration.archive5, "Maps"); + InterfaceParent.method1125(GrandExchangeEvent.archive6, "Music Tracks"); + InterfaceParent.method1125(class51.archive7, "Models"); + InterfaceParent.method1125(class2.archive8, "Sprites"); + InterfaceParent.method1125(WorldMapRectangle.archive11, "Music Jingles"); + InterfaceParent.method1125(WorldMapSection1.archive14, "Music Samples"); + InterfaceParent.method1125(GrandExchangeOfferWorldComparator.archive15, "Music Patches"); + InterfaceParent.method1125(SoundCache.archive19, "World Map"); + InterfaceParent.method1125(class40.archive18, "World Map Geography"); + InterfaceParent.method1125(Script.archive20, "World Map Ground"); + class197.spriteIds = new GraphicsDefaults(); + class197.spriteIds.decode(WorldMapIcon_1.archive17); + Login.Login_loadingText = "Loaded update list"; + Login.Login_loadingPercent = 30; + Client.titleLoadingStage = 45; + } + } else if (Client.titleLoadingStage == 45) { + PlayerType.PcmPlayer_configure(22050, !Client.isLowDetail, 2); + MidiPcmStream var34 = new MidiPcmStream(); + var34.method3655(9, 128); + MouseRecorder.pcmPlayer0 = ArchiveDisk.method5757(GameShell.taskHandler, 0, 22050); + MouseRecorder.pcmPlayer0.setStream(var34); + PlayerType.setAudioArchives(GrandExchangeOfferWorldComparator.archive15, WorldMapSection1.archive14, WorldMapSprite.archive4, var34); + SoundCache.pcmPlayer1 = ArchiveDisk.method5757(GameShell.taskHandler, 1, 2048); + IgnoreList.pcmStreamMixer = new PcmStreamMixer(); + SoundCache.pcmPlayer1.setStream(IgnoreList.pcmStreamMixer); + class247.decimator = new Decimator(22050, PcmPlayer.PcmPlayer_sampleRate); + Login.Login_loadingText = "Prepared sound engine"; + Login.Login_loadingPercent = 35; + Client.titleLoadingStage = 50; + UserComparator7.WorldMapElement_fonts = new Fonts(class2.archive8, WorldMapID.archive13); + } else { + int var1; + if (Client.titleLoadingStage == 50) { + FontName[] var33 = new FontName[]{FontName.FontName_verdana13, FontName.FontName_bold12, FontName.FontName_plain11, FontName.FontName_verdana15, FontName.FontName_verdana11, FontName.FontName_plain12}; + var1 = var33.length; + Fonts var28 = UserComparator7.WorldMapElement_fonts; + FontName[] var29 = new FontName[]{FontName.FontName_verdana13, FontName.FontName_bold12, FontName.FontName_plain11, FontName.FontName_verdana15, FontName.FontName_verdana11, FontName.FontName_plain12}; + Client.fontsMap = var28.createMap(var29); + if (Client.fontsMap.size() < var1) { + Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var1 + "%"; + Login.Login_loadingPercent = 40; + } else { + class30.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); + ClientPacket.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); + class43.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); + World.platformInfo = Client.platformInfoProvider.get(); + Login.Login_loadingText = "Loaded fonts"; + Login.Login_loadingPercent = 40; + Client.titleLoadingStage = 60; + } + } else if (Client.titleLoadingStage == 60) { + var0 = Language.method3607(GameObject.archive10, class2.archive8); + var1 = HealthBarUpdate.method1683(); + if (var0 < var1) { + Login.Login_loadingText = "Loading title screen - " + var0 * 100 / var1 + "%"; + Login.Login_loadingPercent = 50; + } else { + Login.Login_loadingText = "Loaded title screen"; + Login.Login_loadingPercent = 50; + FloorDecoration.updateGameState(5); + Client.titleLoadingStage = 70; + } + } else { + Archive var2; + if (Client.titleLoadingStage == 70) { + if (!HealthBarUpdate.archive2.isFullyLoaded()) { + Login.Login_loadingText = "Loading config - " + HealthBarUpdate.archive2.loadPercent() + "%"; + Login.Login_loadingPercent = 60; + } else { + Archive var32 = HealthBarUpdate.archive2; + FloorOverlayDefinition.FloorOverlayDefinition_archive = var32; + CollisionMap.FloorUnderlayDefinition_setArchives(HealthBarUpdate.archive2); + Archive var35 = HealthBarUpdate.archive2; + var2 = class51.archive7; + class297.KitDefinition_archive = var35; + KitDefinition.KitDefinition_modelsArchive = var2; + KitDefinition.KitDefinition_fileCount = class297.KitDefinition_archive.getGroupFileCount(3); + Archive var3 = HealthBarUpdate.archive2; + Archive var4 = class51.archive7; + boolean var5 = Client.isLowDetail; + ObjectDefinition.ObjectDefinition_archive = var3; + ObjectDefinition.ObjectDefinition_modelsArchive = var4; + ObjectDefinition.ObjectDefinition_isLowDetail = var5; + WorldMapArea.NpcDefinition_setArchives(HealthBarUpdate.archive2, class51.archive7); + Archive var6 = HealthBarUpdate.archive2; + StructDefinition.StructDefinition_archive = var6; + class188.method3589(HealthBarUpdate.archive2, class51.archive7, Client.isMembersWorld, class30.fontPlain11); + Fonts.method5234(HealthBarUpdate.archive2, Client.archive0, class269.archive1); + Archive var30 = HealthBarUpdate.archive2; + Archive var8 = class51.archive7; + SpotAnimationDefinition.SpotAnimationDefinition_archive = var30; + SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var8; + class192.method3614(HealthBarUpdate.archive2); + Tiles.VarpDefinition_setArchives(HealthBarUpdate.archive2); + UserComparator10.Widget_setArchives(UserComparator8.archive3, class51.archive7, class2.archive8, WorldMapID.archive13); + KeyHandler.InvDefinition_setArchives(HealthBarUpdate.archive2); + Archive var9 = HealthBarUpdate.archive2; + EnumDefinition.EnumDefinition_archive = var9; + Archive var10 = HealthBarUpdate.archive2; + VarcInt.VarcInt_archive = var10; + Archive var11 = HealthBarUpdate.archive2; + class339.ParamDefinition_archive = var11; + KeyHandler.varcs = new Varcs(); + Archive var12 = HealthBarUpdate.archive2; + Archive var13 = class2.archive8; + Archive var14 = WorldMapID.archive13; + HitSplatDefinition.HitSplatDefinition_archive = var12; + GrandExchangeOfferTotalQuantityComparator.HitSplatDefinition_spritesArchive = var13; + class43.HitSplatDefinition_fontsArchive = var14; + Archive var15 = HealthBarUpdate.archive2; + Archive var16 = class2.archive8; + HealthBarDefinition.HealthBarDefinition_archive = var15; + HealthBarDefinition.HealthBarDefinition_spritesArchive = var16; + Archive var17 = HealthBarUpdate.archive2; + Archive var18 = class2.archive8; + WorldMapElement.WorldMapElement_archive = var18; + if (var17.isFullyLoaded()) { + WorldMapElement.WorldMapElement_count = var17.getGroupFileCount(35); + WorldMapElement.WorldMapElement_cached = new WorldMapElement[WorldMapElement.WorldMapElement_count]; + + for (int var19 = 0; var19 < WorldMapElement.WorldMapElement_count; ++var19) { + byte[] var20 = var17.takeFile(35, var19); + WorldMapElement.WorldMapElement_cached[var19] = new WorldMapElement(var19); + if (var20 != null) { + WorldMapElement.WorldMapElement_cached[var19].decode(new Buffer(var20)); + WorldMapElement.WorldMapElement_cached[var19].method4290(); + } + } + } + + Login.Login_loadingText = "Loaded config"; + Login.Login_loadingPercent = 60; + Client.titleLoadingStage = 80; + } + } else if (Client.titleLoadingStage == 80) { + var0 = 0; + if (class32.compass == null) { + class32.compass = TilePaint.SpriteBuffer_getSprite(class2.archive8, class197.spriteIds.compass, 0); + } else { + ++var0; + } + + if (UserComparator3.redHintArrowSprite == null) { + UserComparator3.redHintArrowSprite = TilePaint.SpriteBuffer_getSprite(class2.archive8, class197.spriteIds.field3806, 0); + } else { + ++var0; + } + + IndexedSprite var7; + IndexedSprite[] var22; + int var23; + IndexedSprite[] var24; + int var25; + if (GrandExchangeOfferOwnWorldComparator.mapSceneSprites == null) { + var2 = class2.archive8; + var23 = class197.spriteIds.mapScenes; + if (!World.SpriteBuffer_bufferFile(var2, var23, 0)) { + var22 = null; + } else { + var24 = new IndexedSprite[class325.SpriteBuffer_spriteCount]; + + for (var25 = 0; var25 < class325.SpriteBuffer_spriteCount; ++var25) { + var7 = var24[var25] = new IndexedSprite(); + var7.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth; + var7.height = class325.SpriteBuffer_spriteHeight; + var7.xOffset = class325.SpriteBuffer_xOffsets[var25]; + var7.yOffset = class325.SpriteBuffer_yOffsets[var25]; + var7.subWidth = class325.SpriteBuffer_spriteWidths[var25]; + var7.subHeight = class225.SpriteBuffer_spriteHeights[var25]; + var7.palette = class325.SpriteBuffer_spritePalette; + var7.pixels = WorldMapSection1.SpriteBuffer_pixels[var25]; + } + + UserComparator7.SpriteBuffer_clear(); + var22 = var24; + } + + GrandExchangeOfferOwnWorldComparator.mapSceneSprites = var22; + } else { + ++var0; + } + + if (UserComparator6.headIconPkSprites == null) { + UserComparator6.headIconPkSprites = WorldMapID.SpriteBuffer_getSpriteArray(class2.archive8, class197.spriteIds.headIconsPk, 0); + } else { + ++var0; + } + + if (IntHashTable.headIconPrayerSprites == null) { + IntHashTable.headIconPrayerSprites = WorldMapID.SpriteBuffer_getSpriteArray(class2.archive8, class197.spriteIds.field3805, 0); + } else { + ++var0; + } + + if (WorldMapData_1.headIconHintSprites == null) { + WorldMapData_1.headIconHintSprites = WorldMapID.SpriteBuffer_getSpriteArray(class2.archive8, class197.spriteIds.field3802, 0); + } else { + ++var0; + } + + if (WorldMapSection1.mapMarkerSprites == null) { + WorldMapSection1.mapMarkerSprites = WorldMapID.SpriteBuffer_getSpriteArray(class2.archive8, class197.spriteIds.field3798, 0); + } else { + ++var0; + } + + if (DefaultsGroup.crossSprites == null) { + DefaultsGroup.crossSprites = WorldMapID.SpriteBuffer_getSpriteArray(class2.archive8, class197.spriteIds.field3804, 0); + } else { + ++var0; + } + + if (WorldMapLabel.mapDotSprites == null) { + WorldMapLabel.mapDotSprites = WorldMapID.SpriteBuffer_getSpriteArray(class2.archive8, class197.spriteIds.field3797, 0); + } else { + ++var0; + } + + if (ClientPreferences.scrollBarSprites == null) { + var2 = class2.archive8; + var23 = class197.spriteIds.field3801; + if (!World.SpriteBuffer_bufferFile(var2, var23, 0)) { + var22 = null; + } else { + var24 = new IndexedSprite[class325.SpriteBuffer_spriteCount]; + + for (var25 = 0; var25 < class325.SpriteBuffer_spriteCount; ++var25) { + var7 = var24[var25] = new IndexedSprite(); + var7.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth; + var7.height = class325.SpriteBuffer_spriteHeight; + var7.xOffset = class325.SpriteBuffer_xOffsets[var25]; + var7.yOffset = class325.SpriteBuffer_yOffsets[var25]; + var7.subWidth = class325.SpriteBuffer_spriteWidths[var25]; + var7.subHeight = class225.SpriteBuffer_spriteHeights[var25]; + var7.palette = class325.SpriteBuffer_spritePalette; + var7.pixels = WorldMapSection1.SpriteBuffer_pixels[var25]; + } + + UserComparator7.SpriteBuffer_clear(); + var22 = var24; + } + + ClientPreferences.scrollBarSprites = var22; + } else { + ++var0; + } + + if (Messages.modIconSprites == null) { + var2 = class2.archive8; + var23 = class197.spriteIds.field3807; + if (!World.SpriteBuffer_bufferFile(var2, var23, 0)) { + var22 = null; + } else { + var24 = new IndexedSprite[class325.SpriteBuffer_spriteCount]; + + for (var25 = 0; var25 < class325.SpriteBuffer_spriteCount; ++var25) { + var7 = var24[var25] = new IndexedSprite(); + var7.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth; + var7.height = class325.SpriteBuffer_spriteHeight; + var7.xOffset = class325.SpriteBuffer_xOffsets[var25]; + var7.yOffset = class325.SpriteBuffer_yOffsets[var25]; + var7.subWidth = class325.SpriteBuffer_spriteWidths[var25]; + var7.subHeight = class225.SpriteBuffer_spriteHeights[var25]; + var7.palette = class325.SpriteBuffer_spritePalette; + var7.pixels = WorldMapSection1.SpriteBuffer_pixels[var25]; + } + + UserComparator7.SpriteBuffer_clear(); + var22 = var24; + } + + Messages.modIconSprites = var22; + } else { + ++var0; + } + + if (var0 < 11) { + Login.Login_loadingText = "Loading sprites - " + var0 * 100 / 12 + "%"; + Login.Login_loadingPercent = 70; + } else { + AbstractFont.AbstractFont_modIconSprites = Messages.modIconSprites; + UserComparator3.redHintArrowSprite.normalize(); + var1 = (int)(Math.random() * 21.0D) - 10; + int var26 = (int)(Math.random() * 21.0D) - 10; + var23 = (int)(Math.random() * 21.0D) - 10; + int var27 = (int)(Math.random() * 41.0D) - 20; + GrandExchangeOfferOwnWorldComparator.mapSceneSprites[0].shiftColors(var1 + var27, var26 + var27, var23 + var27); + Login.Login_loadingText = "Loaded sprites"; + Login.Login_loadingPercent = 70; + Client.titleLoadingStage = 90; + } + } else if (Client.titleLoadingStage == 90) { + if (!WorldMapDecoration.archive9.isFullyLoaded()) { + Login.Login_loadingText = "Loading textures - " + "0%"; + Login.Login_loadingPercent = 90; + } else { + MenuAction.textureProvider = new TextureProvider(WorldMapDecoration.archive9, class2.archive8, 20, 0.8D, Client.isLowDetail ? 64 : 128); + Rasterizer3D.Rasterizer3D_setTextureLoader(MenuAction.textureProvider); + Rasterizer3D.Rasterizer3D_setBrightness(0.8D); + Client.titleLoadingStage = 100; + } + } else if (Client.titleLoadingStage == 100) { + var0 = MenuAction.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) { + Language.mouseRecorder = new MouseRecorder(); + GameShell.taskHandler.newThreadTask(Language.mouseRecorder, 10); + Login.Login_loadingText = "Loaded input handler"; + Login.Login_loadingPercent = 92; + Client.titleLoadingStage = 120; + } else if (Client.titleLoadingStage == 120) { + if (!GameObject.archive10.tryLoadFileByNames("huffman", "")) { + Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; + Login.Login_loadingPercent = 94; + } else { + Huffman var21 = new Huffman(GameObject.archive10.takeFileByNames("huffman", "")); + class210.huffman = var21; + Login.Login_loadingText = "Loaded wordpack"; + Login.Login_loadingPercent = 94; + Client.titleLoadingStage = 130; + } + } else if (Client.titleLoadingStage == 130) { + if (!UserComparator8.archive3.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + UserComparator8.archive3.loadPercent() * 4 / 5 + "%"; + Login.Login_loadingPercent = 96; + } else if (!GameShell.archive12.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + (80 + GameShell.archive12.loadPercent() / 6) + "%"; + Login.Login_loadingPercent = 96; + } else if (!WorldMapID.archive13.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + (96 + WorldMapID.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 (!SoundCache.archive19.tryLoadGroupByName(WorldMapCacheName.field295.name)) { + Login.Login_loadingText = "Loading world map - " + SoundCache.archive19.groupLoadPercentByName(WorldMapCacheName.field295.name) / 10 + "%"; + } else { + if (WorldMapCacheName.worldMap == null) { + WorldMapCacheName.worldMap = new WorldMap(); + WorldMapCacheName.worldMap.init(SoundCache.archive19, class40.archive18, Script.archive20, class43.fontBold12, Client.fontsMap, GrandExchangeOfferOwnWorldComparator.mapSceneSprites); + } + + Login.Login_loadingText = "Loaded world map"; + Client.titleLoadingStage = 150; + } + } else if (Client.titleLoadingStage == 150) { + FloorDecoration.updateGameState(10); + } + } + } + } + + @ObfuscatedName("gi") + @ObfuscatedSignature( + signature = "(IIIII)V", + garbageValue = "-14379933" + ) + static final void method1119(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 == WorldMapIcon_1.localPlayer) { + var6 = var9; + continue; + } + } else { + var10 = Client.npcs[Client.npcIndices[var9 - var7]]; + } + + ObjectSound.drawActor2d((Actor)var10, var9, var0, var1, var2, var3); + } + + if (Client.renderSelf && var6 != -1) { + ObjectSound.drawActor2d(WorldMapIcon_1.localPlayer, var6, var0, var1, var2, var3); + } + + if (var4) { + ObjectSound.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.overheadTextXs[var15] + Client.overheadTextXOffsets[var15] && var12 + var19 > 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.field643[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) { + class43.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0); + } + + if (Client.overheadTextEffects[var9] == 1) { + class43.fontBold12.drawCenteredWave(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var9] == 2) { + class43.fontBold12.drawCenteredWave2(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var9] == 3) { + class43.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]) * (class43.fontBold12.stringWidth(var20) + 100) / 150; + Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); + class43.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 - class43.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); + class43.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, var18 + Client.viewportTempY + var1, var16, 0); + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); + } + } else { + class43.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); + } + } + + } + + @ObfuscatedName("ib") + @ObfuscatedSignature( + signature = "([Lhp;IIIZB)V", + garbageValue = "47" + ) + @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) { + NetSocket.alignWidgetSize(var6, var2, var3, var4); + Message.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) { + WorldMapAreaData.revalidateWidgetScroll(var0, var6, var4); + } + } + } + + } + + @ObfuscatedName("lf") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-829944775" + ) + static void method1111() { + if (Client.oculusOrbState == 1) { + Client.field706 = true; + } + } } diff --git a/runescape-client/src/main/java/ItemDefinition.java b/runescape-client/src/main/java/ItemDefinition.java index 7b0cab235d..6d872514f3 100644 --- a/runescape-client/src/main/java/ItemDefinition.java +++ b/runescape-client/src/main/java/ItemDefinition.java @@ -4,291 +4,279 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iq") +@ObfuscatedName("iu") @Implements("ItemDefinition") public class ItemDefinition extends DualNode { - @ObfuscatedName("b") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lhp;" + signature = "[Llq;" ) - @Export("ItemDefinition_modelArchive") - public static AbstractArchive ItemDefinition_modelArchive; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 1955296431 - ) - @Export("ItemDefinition_fileCount") - public static int ItemDefinition_fileCount; - @ObfuscatedName("f") + @Export("runesSprite") + static IndexedSprite[] runesSprite; + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lep;" ) @Export("ItemDefinition_cached") - public static EvictingDualNodeHashTable ItemDefinition_cached; - @ObfuscatedName("m") + static EvictingDualNodeHashTable ItemDefinition_cached; + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lep;" ) @Export("ItemDefinition_cachedModels") - public static EvictingDualNodeHashTable ItemDefinition_cachedModels; - @ObfuscatedName("u") + static EvictingDualNodeHashTable ItemDefinition_cachedModels; + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lep;" ) @Export("ItemDefinition_cachedSprites") - public static EvictingDualNodeHashTable ItemDefinition_cachedSprites; - @ObfuscatedName("di") - @ObfuscatedSignature( - signature = "Liu;" - ) - @Export("archive19") - static Archive archive19; - @ObfuscatedName("r") + static EvictingDualNodeHashTable ItemDefinition_cachedSprites; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1125758167 + intValue = -743623299 ) @Export("id") public int id; - @ObfuscatedName("v") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 236850469 + intValue = 99735635 ) @Export("model") int model; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("name") public String name; @ObfuscatedName("g") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("a") + @ObfuscatedName("e") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("j") + @ObfuscatedName("z") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("h") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 648131705 + intValue = 1471819061 ) @Export("zoom2d") public int zoom2d; - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -2041418537 + intValue = 2046385989 ) @Export("xan2d") public int xan2d; - @ObfuscatedName("n") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -671192963 + intValue = -903640025 ) @Export("yan2d") public int yan2d; - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 341964125 + intValue = -2140416829 ) @Export("zan2d") public int zan2d; - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1318890447 + intValue = 1948155361 ) @Export("offsetX2d") public int offsetX2d; - @ObfuscatedName("z") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -596274979 + intValue = -1478685099 ) @Export("offsetY2d") public int offsetY2d; - @ObfuscatedName("al") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -1559472195 + intValue = -1354276567 ) @Export("isStackable") public int isStackable; - @ObfuscatedName("av") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -1792947379 + intValue = -958289557 ) @Export("price") public int price; - @ObfuscatedName("as") + @ObfuscatedName("ai") @Export("isMembersOnly") public boolean isMembersOnly; - @ObfuscatedName("aw") + @ObfuscatedName("af") @Export("groundActions") public String[] groundActions; - @ObfuscatedName("ad") + @ObfuscatedName("az") @Export("inventoryActions") public String[] inventoryActions; - @ObfuscatedName("ar") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -512213461 + intValue = -1835834263 ) @Export("shiftClickIndex") int shiftClickIndex; - @ObfuscatedName("ax") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -1692288497 + intValue = 1757719401 ) @Export("maleModel") int maleModel; - @ObfuscatedName("az") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -556087575 + intValue = -525657011 ) @Export("maleModel1") int maleModel1; - @ObfuscatedName("ae") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 1912194671 + intValue = -980941699 ) @Export("maleOffset") int maleOffset; @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -146998099 + intValue = 613539499 ) @Export("femaleModel") int femaleModel; - @ObfuscatedName("aj") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 2144334865 + intValue = -414427589 ) @Export("femaleModel1") int femaleModel1; - @ObfuscatedName("at") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -1180133207 + intValue = -718468765 ) @Export("femaleOffset") int femaleOffset; - @ObfuscatedName("ac") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -305647331 + intValue = 1212372923 ) @Export("maleModel2") int maleModel2; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -1450274431 + intValue = 236235039 ) @Export("femaleModel2") int femaleModel2; - @ObfuscatedName("aq") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -1628193913 + intValue = 276710593 ) @Export("maleHeadModel") int maleHeadModel; @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -2118725777 + intValue = 1055800501 ) @Export("maleHeadModel2") int maleHeadModel2; - @ObfuscatedName("an") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -625019589 + intValue = -811931801 ) @Export("femaleHeadModel") int femaleHeadModel; - @ObfuscatedName("au") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -1334996063 + intValue = -1948782947 ) @Export("femaleHeadModel2") int femaleHeadModel2; - @ObfuscatedName("ai") + @ObfuscatedName("ay") @Export("countobj") int[] countobj; - @ObfuscatedName("ak") + @ObfuscatedName("ad") @Export("countco") int[] countco; - @ObfuscatedName("ah") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -1940881747 + intValue = 1728909215 ) @Export("note") public int note; - @ObfuscatedName("am") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = 365521045 + intValue = -563104197 ) @Export("noteTemplate") public int noteTemplate; - @ObfuscatedName("ay") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 661147087 + intValue = -1992600907 ) @Export("resizeX") int resizeX; - @ObfuscatedName("af") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = 518092073 + intValue = 1092606201 ) @Export("resizeY") int resizeY; - @ObfuscatedName("ab") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -1262249025 + intValue = 501819811 ) @Export("resizeZ") int resizeZ; - @ObfuscatedName("bp") + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = -736032181 + intValue = -720780359 ) @Export("ambient") public int ambient; - @ObfuscatedName("bz") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = 1047757649 + intValue = 1974435819 ) @Export("contrast") public int contrast; - @ObfuscatedName("bi") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = -1847441921 + intValue = -759816347 ) @Export("team") public int team; - @ObfuscatedName("bg") + @ObfuscatedName("bn") @ObfuscatedSignature( - signature = "Lla;" + signature = "Lln;" ) @Export("params") IterableNodeHashTable params; - @ObfuscatedName("bh") + @ObfuscatedName("bp") @Export("isTradable") public boolean isTradable; - @ObfuscatedName("bm") + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = -1928639407 + intValue = 611554827 ) @Export("unnotedId") int unnotedId; - @ObfuscatedName("bn") + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = 1293175459 + intValue = -759297675 ) @Export("notedId") int notedId; - @ObfuscatedName("bc") + @ObfuscatedName("bv") @ObfuscatedGetter( - intValue = -471389045 + intValue = 1761724879 ) @Export("placeholder") public int placeholder; - @ObfuscatedName("bx") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = 169889369 + intValue = 1472577679 ) @Export("placeholderTemplate") public int placeholderTemplate; @@ -340,19 +328,19 @@ public class ItemDefinition extends DualNode { this.placeholderTemplate = -1; } - @ObfuscatedName("w") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1271908540" + garbageValue = "1179170394" ) @Export("post") void post() { } - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lkf;B)V", - garbageValue = "-39" + signature = "(Lky;B)V", + garbageValue = "-89" ) @Export("decode") void decode(Buffer var1) { @@ -366,10 +354,10 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("p") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Lkf;II)V", - garbageValue = "808674402" + signature = "(Lky;IB)V", + garbageValue = "1" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -385,12 +373,12 @@ public class ItemDefinition extends DualNode { this.yan2d = var1.readUnsignedShort(); } else if (var2 == 7) { this.offsetX2d = var1.readUnsignedShort(); - if (this.offsetX2d > 0x7fff) { + if (this.offsetX2d > 32767) { this.offsetX2d -= 65536; } } else if (var2 == 8) { this.offsetY2d = var1.readUnsignedShort(); - if (this.offsetY2d > 0x7fff) { + if (this.offsetY2d > 32767) { this.offsetY2d -= 65536; } } else if (var2 == 11) { @@ -416,84 +404,88 @@ public class ItemDefinition extends DualNode { } } else if (var2 >= 35 && var2 < 40) { this.inventoryActions[var2 - 35] = var1.readStringCp1252NullTerminated(); - } else if (var2 == 40) { - int var3 = var1.readUnsignedByte(); - this.recolorFrom = new short[var3]; - this.recolorTo = new short[var3]; + } else { + int var3; + int var4; + if (var2 == 40) { + var3 = var1.readUnsignedByte(); + this.recolorFrom = new short[var3]; + this.recolorTo = new short[var3]; - for (int var4 = 0; var4 < var3; ++var4) { - this.recolorFrom[var4] = (short) var1.readUnsignedShort(); - this.recolorTo[var4] = (short) var1.readUnsignedShort(); - } - } else if (var2 == 41) { - int var3 = var1.readUnsignedByte(); - this.retextureFrom = new short[var3]; - this.retextureTo = new short[var3]; + for (var4 = 0; var4 < var3; ++var4) { + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); + this.recolorTo[var4] = (short)var1.readUnsignedShort(); + } + } else if (var2 == 41) { + var3 = var1.readUnsignedByte(); + this.retextureFrom = new short[var3]; + this.retextureTo = new short[var3]; - for (int var4 = 0; var4 < var3; ++var4) { - this.retextureFrom[var4] = (short) var1.readUnsignedShort(); - this.retextureTo[var4] = (short) var1.readUnsignedShort(); - } - } else if (var2 == 42) { - this.shiftClickIndex = var1.readByte(); - } else if (var2 == 65) { - this.isTradable = true; - } else if (var2 == 78) { - this.maleModel2 = var1.readUnsignedShort(); - } else if (var2 == 79) { - this.femaleModel2 = var1.readUnsignedShort(); - } else if (var2 == 90) { - this.maleHeadModel = var1.readUnsignedShort(); - } else if (var2 == 91) { - this.femaleHeadModel = var1.readUnsignedShort(); - } else if (var2 == 92) { - this.maleHeadModel2 = var1.readUnsignedShort(); - } else if (var2 == 93) { - this.femaleHeadModel2 = var1.readUnsignedShort(); - } else if (var2 == 95) { - this.zan2d = var1.readUnsignedShort(); - } else if (var2 == 97) { - this.note = var1.readUnsignedShort(); - } else if (var2 == 98) { - this.noteTemplate = var1.readUnsignedShort(); - } else if (var2 >= 100 && var2 < 110) { - if (this.countobj == null) { - this.countobj = new int[10]; - this.countco = new int[10]; - } + for (var4 = 0; var4 < var3; ++var4) { + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); + this.retextureTo[var4] = (short)var1.readUnsignedShort(); + } + } else if (var2 == 42) { + this.shiftClickIndex = var1.readByte(); + } else if (var2 == 65) { + this.isTradable = true; + } else if (var2 == 78) { + this.maleModel2 = var1.readUnsignedShort(); + } else if (var2 == 79) { + this.femaleModel2 = var1.readUnsignedShort(); + } else if (var2 == 90) { + this.maleHeadModel = var1.readUnsignedShort(); + } else if (var2 == 91) { + this.femaleHeadModel = var1.readUnsignedShort(); + } else if (var2 == 92) { + this.maleHeadModel2 = var1.readUnsignedShort(); + } else if (var2 == 93) { + this.femaleHeadModel2 = var1.readUnsignedShort(); + } else if (var2 == 95) { + this.zan2d = var1.readUnsignedShort(); + } else if (var2 == 97) { + this.note = var1.readUnsignedShort(); + } else if (var2 == 98) { + this.noteTemplate = var1.readUnsignedShort(); + } else if (var2 >= 100 && var2 < 110) { + if (this.countobj == null) { + this.countobj = new int[10]; + this.countco = new int[10]; + } - this.countobj[var2 - 100] = var1.readUnsignedShort(); - this.countco[var2 - 100] = var1.readUnsignedShort(); - } else if (var2 == 110) { - this.resizeX = var1.readUnsignedShort(); - } else if (var2 == 111) { - this.resizeY = var1.readUnsignedShort(); - } else if (var2 == 112) { - this.resizeZ = var1.readUnsignedShort(); - } else if (var2 == 113) { - this.ambient = var1.readByte(); - } else if (var2 == 114) { - this.contrast = var1.readByte() * 5; - } else if (var2 == 115) { - this.team = var1.readUnsignedByte(); - } else if (var2 == 139) { - this.unnotedId = var1.readUnsignedShort(); - } else if (var2 == 140) { - this.notedId = var1.readUnsignedShort(); - } else if (var2 == 148) { - this.placeholder = var1.readUnsignedShort(); - } else if (var2 == 149) { - this.placeholderTemplate = var1.readUnsignedShort(); - } else if (var2 == 249) { - this.params = WorldMapArea.readStringIntParameters(var1, this.params); + this.countobj[var2 - 100] = var1.readUnsignedShort(); + this.countco[var2 - 100] = var1.readUnsignedShort(); + } else if (var2 == 110) { + this.resizeX = var1.readUnsignedShort(); + } else if (var2 == 111) { + this.resizeY = var1.readUnsignedShort(); + } else if (var2 == 112) { + this.resizeZ = var1.readUnsignedShort(); + } else if (var2 == 113) { + this.ambient = var1.readByte(); + } else if (var2 == 114) { + this.contrast = var1.readByte() * 5; + } else if (var2 == 115) { + this.team = var1.readUnsignedByte(); + } else if (var2 == 139) { + this.unnotedId = var1.readUnsignedShort(); + } else if (var2 == 140) { + this.notedId = var1.readUnsignedShort(); + } else if (var2 == 148) { + this.placeholder = var1.readUnsignedShort(); + } else if (var2 == 149) { + this.placeholderTemplate = var1.readUnsignedShort(); + } else if (var2 == 249) { + this.params = DynamicObject.readStringIntParameters(var1, this.params); + } } } - @ObfuscatedName("k") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Liq;Liq;I)V", - garbageValue = "-1452987438" + signature = "(Liu;Liu;I)V", + garbageValue = "-1790253551" ) @Export("genCert") void genCert(ItemDefinition var1, ItemDefinition var2) { @@ -514,10 +506,10 @@ public class ItemDefinition extends DualNode { this.isStackable = 1; } - @ObfuscatedName("l") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Liq;Liq;B)V", - garbageValue = "0" + signature = "(Liu;Liu;I)V", + garbageValue = "1803564610" ) @Export("genBought") void genBought(ItemDefinition var1, ItemDefinition var2) { @@ -558,10 +550,10 @@ public class ItemDefinition extends DualNode { this.price = 0; } - @ObfuscatedName("b") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Liq;Liq;B)V", - garbageValue = "109" + signature = "(Liu;Liu;B)V", + garbageValue = "56" ) @Export("genPlaceholder") void genPlaceholder(ItemDefinition var1, ItemDefinition var2) { @@ -583,10 +575,10 @@ public class ItemDefinition extends DualNode { this.isTradable = false; } - @ObfuscatedName("i") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(II)Lds;", - garbageValue = "1813353109" + signature = "(II)Ldq;", + garbageValue = "-1231151583" ) @Export("getModelData") public final ModelData getModelData(int var1) { @@ -601,37 +593,38 @@ public class ItemDefinition extends DualNode { } if (var2 != -1) { - return WorldMapArea.ItemDefinition_get(var2).getModelData(1); + return WorldMapData_0.ItemDefinition_get(var2).getModelData(1); } } - ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); + ModelData var4 = ModelData.ModelData_get(Frames.ItemDefinition_modelArchive, this.model, 0); if (var4 == null) { return null; - } - if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { - var4.resize(this.resizeX, this.resizeY, this.resizeZ); - } - - if (this.recolorFrom != null) { - for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { - var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); + } else { + if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { + var4.resize(this.resizeX, this.resizeY, this.resizeZ); } - } - if (this.retextureFrom != null) { - for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { - var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); + if (this.recolorFrom != null) { + for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { + var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); + } } - } - return var4; + if (this.retextureFrom != null) { + for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { + var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); + } + } + + return var4; + } } - @ObfuscatedName("c") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(II)Ldm;", - garbageValue = "-682416240" + signature = "(IB)Ldo;", + garbageValue = "108" ) @Export("getModel") public final Model getModel(int var1) { @@ -645,162 +638,165 @@ public class ItemDefinition extends DualNode { } if (var2 != -1) { - return WorldMapArea.ItemDefinition_get(var2).getModel(1); + return WorldMapData_0.ItemDefinition_get(var2).getModel(1); } } Model var5 = (Model)ItemDefinition_cachedModels.get((long)this.id); if (var5 != null) { return var5; - } - ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); - if (var6 == null) { - return null; - } - if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { - var6.resize(this.resizeX, this.resizeY, this.resizeZ); - } + } else { + ModelData var6 = ModelData.ModelData_get(Frames.ItemDefinition_modelArchive, this.model, 0); + if (var6 == null) { + return null; + } else { + if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { + var6.resize(this.resizeX, this.resizeY, this.resizeZ); + } - int var4; - if (this.recolorFrom != null) { - for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { - var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); + int var4; + if (this.recolorFrom != null) { + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { + var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); + } + } + + if (this.retextureFrom != null) { + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { + var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); + } + } + + var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); + var5.isSingleTile = true; + ItemDefinition_cachedModels.put(var5, (long)this.id); + return var5; } } - - if (this.retextureFrom != null) { - for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { - var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); - } - } - - var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); - var5.isSingleTile = true; - ItemDefinition_cachedModels.put(var5, (long)this.id); - return var5; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(IB)Liq;", - garbageValue = "-52" + signature = "(II)Liu;", + garbageValue = "-16777216" ) @Export("getCountObj") public ItemDefinition getCountObj(int var1) { - if (this.countobj == null || var1 <= 1) { - return this; - } - int var2 = -1; + if (this.countobj != null && var1 > 1) { + int var2 = -1; - for (int var3 = 0; var3 < 10; ++var3) { - if (var1 >= this.countco[var3] && this.countco[var3] != 0) { - var2 = this.countobj[var3]; + for (int var3 = 0; var3 < 10; ++var3) { + if (var1 >= this.countco[var3] && this.countco[var3] != 0) { + var2 = this.countobj[var3]; + } + } + + if (var2 != -1) { + return WorldMapData_0.ItemDefinition_get(var2); } } - if (var2 == -1) { - return this; - } - - return WorldMapArea.ItemDefinition_get(var2); - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - signature = "(ZB)Z", - garbageValue = "-66" - ) - @Export("hasNoValidModel") - public final boolean hasNoValidModel(boolean forGender) { - int var2 = this.maleModel; - int var3 = this.maleModel1; - int var4 = this.maleModel2; - if (forGender) { - var2 = this.femaleModel; - var3 = this.femaleModel1; - var4 = this.femaleModel2; - } - - if (var2 == -1) { - return true; - } - boolean var5 = true; - if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { - var5 = false; - } - - if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { - var5 = false; - } - - if (var4 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { - var5 = false; - } - - return var5; - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "(ZB)Lds;", - garbageValue = "36" - ) - public final ModelData method4694(boolean var1) { - int var2 = this.maleModel; - int var3 = this.maleModel1; - int var4 = this.maleModel2; - if (var1) { - var2 = this.femaleModel; - var3 = this.femaleModel1; - var4 = this.femaleModel2; - } - - if (var2 == -1) { - return null; - } - ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); - if (var3 != -1) { - ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); - if (var4 != -1) { - ModelData var7 = ModelData.ModelData_get(ItemDefinition_modelArchive, var4, 0); - ModelData[] var8 = new ModelData[]{var5, var6, var7}; - var5 = new ModelData(var8, 3); - } else { - ModelData[] var10 = new ModelData[]{var5, var6}; - var5 = new ModelData(var10, 2); - } - } - - if (!var1 && this.maleOffset != 0) { - var5.changeOffset(0, this.maleOffset, 0); - } - - if (var1 && this.femaleOffset != 0) { - var5.changeOffset(0, this.femaleOffset, 0); - } - - int var9; - if (this.recolorFrom != null) { - for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { - var5.recolor(this.recolorFrom[var9], this.recolorTo[var9]); - } - } - - if (this.retextureFrom != null) { - for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { - var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]); - } - } - - return var5; + return this; } @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(ZI)Z", - garbageValue = "-447503257" + signature = "(ZB)Z", + garbageValue = "14" ) - public final boolean method4683(boolean var1) { + @Export("hasNoValidModel") + public final boolean hasNoValidModel(boolean var1) { + int var2 = this.maleModel; + int var3 = this.maleModel1; + int var4 = this.maleModel2; + if (var1) { + var2 = this.femaleModel; + var3 = this.femaleModel1; + var4 = this.femaleModel2; + } + + if (var2 == -1) { + return true; + } else { + boolean var5 = true; + if (!Frames.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { + var5 = false; + } + + if (var3 != -1 && !Frames.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { + var5 = false; + } + + if (var4 != -1 && !Frames.ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { + var5 = false; + } + + return var5; + } + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "(ZI)Ldq;", + garbageValue = "637382984" + ) + public final ModelData method4557(boolean var1) { + int var2 = this.maleModel; + int var3 = this.maleModel1; + int var4 = this.maleModel2; + if (var1) { + var2 = this.femaleModel; + var3 = this.femaleModel1; + var4 = this.femaleModel2; + } + + if (var2 == -1) { + return null; + } else { + ModelData var5 = ModelData.ModelData_get(Frames.ItemDefinition_modelArchive, var2, 0); + if (var3 != -1) { + ModelData var6 = ModelData.ModelData_get(Frames.ItemDefinition_modelArchive, var3, 0); + if (var4 != -1) { + ModelData var7 = ModelData.ModelData_get(Frames.ItemDefinition_modelArchive, var4, 0); + ModelData[] var8 = new ModelData[]{var5, var6, var7}; + var5 = new ModelData(var8, 3); + } else { + ModelData[] var10 = new ModelData[]{var5, var6}; + var5 = new ModelData(var10, 2); + } + } + + if (!var1 && this.maleOffset != 0) { + var5.changeOffset(0, this.maleOffset, 0); + } + + if (var1 && this.femaleOffset != 0) { + var5.changeOffset(0, this.femaleOffset, 0); + } + + int var9; + if (this.recolorFrom != null) { + for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { + var5.recolor(this.recolorFrom[var9], this.recolorTo[var9]); + } + } + + if (this.retextureFrom != null) { + for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { + var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]); + } + } + + return var5; + } + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "(ZI)Z", + garbageValue = "-1070545015" + ) + public final boolean method4558(boolean var1) { int var2 = this.maleHeadModel; int var3 = this.maleHeadModel2; if (var1) { @@ -810,25 +806,26 @@ public class ItemDefinition extends DualNode { if (var2 == -1) { return true; - } - boolean var4 = true; - if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { - var4 = false; - } + } else { + boolean var4 = true; + if (!Frames.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { + var4 = false; + } - if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { - var4 = false; - } + if (var3 != -1 && !Frames.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { + var4 = false; + } - return var4; + return var4; + } } - @ObfuscatedName("g") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(ZB)Lds;", - garbageValue = "81" + signature = "(ZI)Ldq;", + garbageValue = "1261696933" ) - public final ModelData method4649(boolean var1) { + public final ModelData method4559(boolean var1) { int var2 = this.maleHeadModel; int var3 = this.maleHeadModel2; if (var1) { @@ -838,34 +835,35 @@ public class ItemDefinition extends DualNode { if (var2 == -1) { return null; - } - ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); - if (var3 != -1) { - ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); - ModelData[] var6 = new ModelData[]{var4, var5}; - var4 = new ModelData(var6, 2); - } - - int var7; - if (this.recolorFrom != null) { - for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { - var4.recolor(this.recolorFrom[var7], this.recolorTo[var7]); + } else { + ModelData var4 = ModelData.ModelData_get(Frames.ItemDefinition_modelArchive, var2, 0); + if (var3 != -1) { + ModelData var5 = ModelData.ModelData_get(Frames.ItemDefinition_modelArchive, var3, 0); + ModelData[] var6 = new ModelData[]{var4, var5}; + var4 = new ModelData(var6, 2); } - } - if (this.retextureFrom != null) { - for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { - var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]); + int var7; + if (this.recolorFrom != null) { + for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { + var4.recolor(this.recolorFrom[var7], this.recolorTo[var7]); + } } - } - return var4; + if (this.retextureFrom != null) { + for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { + var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]); + } + } + + return var4; + } } - @ObfuscatedName("a") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "-52" + signature = "(III)I", + garbageValue = "65280" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { @@ -885,100 +883,44 @@ public class ItemDefinition extends DualNode { return var3; } - @ObfuscatedName("j") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-204298018" + garbageValue = "-1785229735" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return GrandExchangeOfferWorldComparator.method54(this.params, var1, var2); + return class227.method4041(this.params, var1, var2); } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "19" + garbageValue = "-41" ) @Export("getShiftClickIndex") public int getShiftClickIndex() { if (this.shiftClickIndex != -1 && this.inventoryActions != null) { if (this.shiftClickIndex >= 0) { return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex : -1; + } else { + return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; } - return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; + } else { + return -1; } - return -1; } - @ObfuscatedName("q") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(CS)B", - garbageValue = "11190" + signature = "(III)V", + garbageValue = "2111287919" ) - @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; - } - - return var1; + public static final void method4629(int var0, int var1) { + ViewportMouse.ViewportMouse_x = var0; + ViewportMouse.ViewportMouse_y = var1; + ViewportMouse.ViewportMouse_isInViewport = true; + ViewportMouse.ViewportMouse_entityCount = 0; + ViewportMouse.ViewportMouse_false0 = false; } } diff --git a/runescape-client/src/main/java/IterableDualNodeQueue.java b/runescape-client/src/main/java/IterableDualNodeQueue.java index 4e50989541..b6fb288953 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("jk") +@ObfuscatedName("jm") @Implements("IterableDualNodeQueue") public class IterableDualNodeQueue implements Iterable { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lfe;" ) @Export("sentinel") public DualNode sentinel; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lfe;" ) @Export("head") DualNode head; @@ -26,7 +26,7 @@ public class IterableDualNodeQueue implements Iterable { this.sentinel.nextDual = this.sentinel; } - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("clear") public void clear() { while (this.sentinel.previousDual != this.sentinel) { @@ -35,9 +35,9 @@ public class IterableDualNodeQueue implements Iterable { } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lfb;)V" + signature = "(Lfe;)V" ) @Export("add") public void add(DualNode var1) { @@ -51,32 +51,33 @@ public class IterableDualNodeQueue implements Iterable { var1.previousDual.nextDual = var1; } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "()Lfb;" + signature = "()Lfe;" ) @Export("removeLast") public DualNode removeLast() { DualNode var1 = this.sentinel.previousDual; if (var1 == this.sentinel) { return null; + } else { + var1.removeDual(); + return var1; } - var1.removeDual(); - return var1; } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "()Lfb;" + signature = "()Lfe;" ) @Export("last") public DualNode last() { return this.previousOrLast((DualNode)null); } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Lfb;)Lfb;" + signature = "(Lfe;)Lfe;" ) @Export("previousOrLast") DualNode previousOrLast(DualNode var1) { @@ -90,14 +91,15 @@ public class IterableDualNodeQueue implements Iterable { if (var2 == this.sentinel) { this.head = null; return null; + } else { + this.head = var2.previousDual; + return var2; } - this.head = var2.previousDual; - return var2; } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "()Lfb;" + signature = "()Lfe;" ) @Export("previous") public DualNode previous() { @@ -105,18 +107,19 @@ public class IterableDualNodeQueue implements Iterable { if (var1 == this.sentinel) { this.head = null; return null; + } else { + this.head = var1.previousDual; + return var1; } - this.head = var1.previousDual; - return var1; } public Iterator iterator() { return new IterableDualNodeQueueIterator(this); } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lfb;Lfb;)V" + signature = "(Lfe;Lfe;)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 b5aea42027..3cc6eb8e6e 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("jl") +@ObfuscatedName("jz") @Implements("IterableDualNodeQueueIterator") public class IterableDualNodeQueueIterator implements Iterator { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Ljk;" + signature = "Ljm;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lfe;" ) @Export("head") DualNode head; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lfe;" ) @Export("last") DualNode last; @ObfuscatedSignature( - signature = "(Ljk;)V" + signature = "(Ljm;)V" ) IterableDualNodeQueueIterator(IterableDualNodeQueue var1) { this.last = null; @@ -40,6 +40,15 @@ public class IterableDualNodeQueueIterator implements Iterator { return this.queue.sentinel != this.head; } + public void remove() { + if (this.last == null) { + throw new IllegalStateException(); + } else { + this.last.removeDual(); + this.last = null; + } + } + public Object next() { DualNode var1 = this.head; if (var1 == this.queue.sentinel) { @@ -52,12 +61,4 @@ public class IterableDualNodeQueueIterator implements Iterator { this.last = var1; return var1; } - - public void remove() { - if (this.last == null) { - throw new IllegalStateException(); - } - this.last.removeDual(); - this.last = null; - } } diff --git a/runescape-client/src/main/java/IterableNodeDeque.java b/runescape-client/src/main/java/IterableNodeDeque.java index 919cd71d1a..8198d99358 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("ju") +@ObfuscatedName("jp") @Implements("IterableNodeDeque") public class IterableNodeDeque implements Iterable, Collection { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lfw;" + signature = "Lfb;" ) @Export("sentinel") Node sentinel; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lfw;" + signature = "Lfb;" ) - Node field3538; + Node field3511; public IterableNodeDeque() { this.sentinel = new Node(); @@ -26,7 +26,7 @@ public class IterableNodeDeque implements Iterable, Collection { this.sentinel.next = this.sentinel; } - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("rsClear") public void rsClear() { while (this.sentinel.previous != this.sentinel) { @@ -35,9 +35,9 @@ public class IterableNodeDeque implements Iterable, Collection { } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lfw;)V" + signature = "(Lfb;)V" ) @Export("addFirst") public void addFirst(Node var1) { @@ -51,9 +51,9 @@ public class IterableNodeDeque implements Iterable, Collection { var1.previous.next = var1; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lfw;)V" + signature = "(Lfb;)V" ) @Export("addLast") public void addLast(Node var1) { @@ -67,20 +67,20 @@ public class IterableNodeDeque implements Iterable, Collection { var1.previous.next = var1; } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "()Lfw;" + signature = "()Lfb;" ) @Export("last") public Node last() { - return this.method4807((Node)null); + return this.method4726((Node)null); } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Lfw;)Lfw;" + signature = "(Lfb;)Lfb;" ) - Node method4807(Node var1) { + Node method4726(Node var1) { Node var2; if (var1 == null) { var2 = this.sentinel.previous; @@ -89,30 +89,32 @@ public class IterableNodeDeque implements Iterable, Collection { } if (var2 == this.sentinel) { - this.field3538 = null; + this.field3511 = null; return null; + } else { + this.field3511 = var2.previous; + return var2; } - this.field3538 = var2.previous; - return var2; } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "()Lfw;" + signature = "()Lfb;" ) @Export("previous") public Node previous() { - Node var1 = this.field3538; + Node var1 = this.field3511; if (var1 == this.sentinel) { - this.field3538 = null; + this.field3511 = null; return null; + } else { + this.field3511 = var1.previous; + return var1; } - this.field3538 = var1.previous; - return var1; } - @ObfuscatedName("i") - int method4884() { + @ObfuscatedName("q") + int method4728() { int var1 = 0; for (Node var2 = this.sentinel.previous; var2 != this.sentinel; var2 = var2.previous) { @@ -122,18 +124,17 @@ public class IterableNodeDeque implements Iterable, Collection { return var1; } - @ObfuscatedName("c") - @Export("rsIsEmpty") - public boolean rsIsEmpty() { + @ObfuscatedName("x") + public boolean method4729() { return this.sentinel.previous == this.sentinel; } - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "()[Lfw;" + signature = "()[Lfb;" ) - Node[] method4811() { - Node[] var1 = new Node[this.method4884()]; + Node[] method4730() { + Node[] var1 = new Node[this.method4728()]; int var2 = 0; for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { @@ -143,29 +144,69 @@ public class IterableNodeDeque implements Iterable, Collection { return var1; } - @ObfuscatedName("x") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lfw;)Z" + signature = "(Lfb;)Z" ) - boolean method4847(Node var1) { + boolean method4735(Node var1) { this.addFirst(var1); return true; } + public boolean isEmpty() { + return this.method4729(); + } + + public int size() { + return this.method4728(); + } + public void clear() { this.rsClear(); } - public boolean isEmpty() { - return this.rsIsEmpty(); + public boolean remove(Object var1) { + throw new RuntimeException(); + } + + public boolean containsAll(Collection var1) { + throw new RuntimeException(); + } + + public boolean removeAll(Collection var1) { + throw new RuntimeException(); + } + + public boolean retainAll(Collection var1) { + throw new RuntimeException(); + } + + public Iterator iterator() { + return new IterableNodeDequeDescendingIterator(this); + } + + public boolean add(Object var1) { + return this.method4735((Node)var1); } public boolean contains(Object var1) { throw new RuntimeException(); } + public boolean equals(Object var1) { + return super.equals(var1); + } + + public boolean addAll(Collection var1) { + throw new RuntimeException(); + } + + public int hashCode() { + return super.hashCode(); + } + public Object[] toArray() { - return this.method4811(); + return this.method4730(); } public Object[] toArray(Object[] var1) { @@ -178,49 +219,9 @@ public class IterableNodeDeque implements Iterable, Collection { return var1; } - public boolean containsAll(Collection var1) { - throw new RuntimeException(); - } - - public boolean removeAll(Collection var1) { - throw new RuntimeException(); - } - - public int hashCode() { - return super.hashCode(); - } - - public boolean addAll(Collection var1) { - throw new RuntimeException(); - } - - public int size() { - return this.method4884(); - } - - public boolean remove(Object var1) { - throw new RuntimeException(); - } - - public Iterator iterator() { - return new IterableNodeDequeDescendingIterator(this); - } - - public boolean equals(Object var1) { - return super.equals(var1); - } - - public boolean retainAll(Collection var1) { - throw new RuntimeException(); - } - - public boolean add(Object var1) { - return this.method4847((Node)var1); - } - - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lfw;Lfw;)V" + signature = "(Lfb;Lfb;)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 05f683e5cd..647e023985 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("jq") +@ObfuscatedName("jn") @Implements("IterableNodeDequeDescendingIterator") public class IterableNodeDequeDescendingIterator implements Iterator { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lju;" + signature = "Ljp;" ) @Export("deque") IterableNodeDeque deque; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lfw;" + signature = "Lfb;" ) - Node field3549; - @ObfuscatedName("e") + Node field3521; + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lfw;" + signature = "Lfb;" ) @Export("last") Node last; @ObfuscatedSignature( - signature = "(Lju;)V" + signature = "(Ljp;)V" ) IterableNodeDequeDescendingIterator(IterableNodeDeque var1) { this.last = null; this.setDeque(var1); } - @ObfuscatedName("b") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(Lju;)V" + signature = "(Ljp;)V" ) @Export("setDeque") void setDeque(IterableNodeDeque var1) { @@ -43,35 +43,36 @@ public class IterableNodeDequeDescendingIterator implements Iterator { this.start(); } - @ObfuscatedName("i") + @ObfuscatedName("y") @Export("start") void start() { - this.field3549 = this.deque != null ? this.deque.sentinel.previous : null; + this.field3521 = this.deque != null ? this.deque.sentinel.previous : null; this.last = null; } + public boolean hasNext() { + return this.deque.sentinel != this.field3521; + } + public void remove() { if (this.last == null) { throw new IllegalStateException(); + } else { + this.last.remove(); + this.last = null; } - this.last.remove(); - this.last = null; } public Object next() { - Node var1 = this.field3549; + Node var1 = this.field3521; if (var1 == this.deque.sentinel) { var1 = null; - this.field3549 = null; + this.field3521 = null; } else { - this.field3549 = var1.previous; + this.field3521 = var1.previous; } this.last = var1; return var1; } - - public boolean hasNext() { - return this.deque.sentinel != this.field3549; - } } diff --git a/runescape-client/src/main/java/IterableNodeHashTable.java b/runescape-client/src/main/java/IterableNodeHashTable.java index 46e0c1ab2b..77e982c36c 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("la") +@ObfuscatedName("ln") @Implements("IterableNodeHashTable") public final class IterableNodeHashTable implements Iterable { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("size") int size; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "[Lfw;" + signature = "[Lfb;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lfw;" + signature = "Lfb;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lfw;" + signature = "Lfb;" ) @Export("current") Node current; - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("index") int index; @@ -45,9 +45,9 @@ public final class IterableNodeHashTable implements Iterable { } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(J)Lfw;" + signature = "(J)Lfb;" ) @Export("get") public Node get(long var1) { @@ -65,9 +65,9 @@ public final class IterableNodeHashTable implements Iterable { return null; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lfw;J)V" + signature = "(Lfb;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("e") + @ObfuscatedName("i") @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("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "()Lfw;" + signature = "()Lfb;" ) @Export("first") public Node first() { @@ -113,28 +113,29 @@ public final class IterableNodeHashTable implements Iterable { return this.next(); } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "()Lfw;" + signature = "()Lfb;" ) @Export("next") public Node next() { Node var1; if (this.index > 0 && this.buckets[this.index - 1] != this.current) { var1 = this.current; + this.current = var1.previous; + return var1; + } else { + do { + if (this.index >= this.size) { + return null; + } + + var1 = this.buckets[this.index++].previous; + } while(var1 == this.buckets[this.index - 1]); + this.current = var1.previous; return var1; } - do { - if (this.index >= this.size) { - return null; - } - - var1 = this.buckets[this.index++].previous; - } while(var1 == this.buckets[this.index - 1]); - - this.current = var1.previous; - return var1; } public Iterator iterator() { diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java index 72fcfeb640..72a90848c1 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("lg") +@ObfuscatedName("lo") @Implements("IterableNodeHashTableIterator") public class IterableNodeHashTableIterator implements Iterator { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lla;" + signature = "Lln;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lfw;" + signature = "Lfb;" ) @Export("head") Node head; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("index") int index; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lfw;" + signature = "Lfb;" ) @Export("last") Node last; @ObfuscatedSignature( - signature = "(Lla;)V" + signature = "(Lln;)V" ) IterableNodeHashTableIterator(IterableNodeHashTable var1) { this.last = null; @@ -38,7 +38,7 @@ public class IterableNodeHashTableIterator implements Iterator { this.start(); } - @ObfuscatedName("b") + @ObfuscatedName("r") @Export("start") void start() { this.head = this.hashTable.buckets[0].previous; @@ -46,48 +46,47 @@ public class IterableNodeHashTableIterator implements Iterator { this.last = null; } - public boolean hasNext() { - if (this.hashTable.buckets[this.index - 1] != this.head) { - return true; - } - while (this.index < this.hashTable.size) { - if (this.hashTable.buckets[this.index++].previous != this.hashTable.buckets[this.index - 1]) { - this.head = this.hashTable.buckets[this.index - 1].previous; - return true; - } - - this.head = this.hashTable.buckets[this.index - 1]; - } - - return false; - } - public Object next() { Node var1; if (this.hashTable.buckets[this.index - 1] != this.head) { var1 = this.head; + this.head = var1.previous; + this.last = var1; + return var1; + } else { + do { + if (this.index >= this.hashTable.size) { + return null; + } + + var1 = this.hashTable.buckets[this.index++].previous; + } while(var1 == this.hashTable.buckets[this.index - 1]); + this.head = var1.previous; this.last = var1; return var1; } - do { - if (this.index >= this.hashTable.size) { - return null; - } - - var1 = this.hashTable.buckets[this.index++].previous; - } while(var1 == this.hashTable.buckets[this.index - 1]); - - this.head = var1.previous; - this.last = var1; - return var1; } public void remove() { - if (this.last == null) { - throw new IllegalStateException(); - } this.last.remove(); this.last = null; } + + public boolean hasNext() { + if (this.hashTable.buckets[this.index - 1] != this.head) { + return true; + } else { + while (this.index < this.hashTable.size) { + if (this.hashTable.buckets[this.index++].previous != this.hashTable.buckets[this.index - 1]) { + this.head = this.hashTable.buckets[this.index - 1].previous; + return true; + } + + this.head = this.hashTable.buckets[this.index - 1]; + } + + return false; + } + } } diff --git a/runescape-client/src/main/java/JagexCache.java b/runescape-client/src/main/java/JagexCache.java index dafe0d312e..f80420a340 100644 --- a/runescape-client/src/main/java/JagexCache.java +++ b/runescape-client/src/main/java/JagexCache.java @@ -1,52 +1,379 @@ 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("ff") +@ObfuscatedName("fh") @Implements("JagexCache") public class JagexCache { - @ObfuscatedName("p") - @Export("JagexCache_locationFile") - static File JagexCache_locationFile; @ObfuscatedName("u") + @Export("cacheDir") + public static File cacheDir; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 1902063795 + ) + @Export("idxCount") + public static int idxCount; + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lmn;" + signature = "Lmw;" ) @Export("JagexCache_randomDat") public static BufferedFile JagexCache_randomDat; - @ObfuscatedName("x") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "Lmn;" + signature = "Lmw;" ) @Export("JagexCache_dat2File") public static BufferedFile JagexCache_dat2File; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lmn;" + signature = "Lmw;" ) @Export("JagexCache_idx255File") public static BufferedFile JagexCache_idx255File; - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "[Lmn;" - ) - @Export("JagexCache_idxFiles") - public static BufferedFile[] JagexCache_idxFiles; - @ObfuscatedName("g") - @Export("JagexCache_validCacheLocations") - static String[] JagexCache_validCacheLocations; - @ObfuscatedName("dh") - @ObfuscatedSignature( - signature = "Liu;" - ) - @Export("archive1") - static Archive archive1; static { JagexCache_randomDat = null; JagexCache_dat2File = null; JagexCache_idx255File = null; } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(CLgk;I)I", + garbageValue = "57673109" + ) + @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("hr") + @ObfuscatedSignature( + signature = "(Lgt;I)V", + garbageValue = "-2026077501" + ) + static final void method3438(class185 var0) { + PacketBuffer var1 = Client.packetWriter.packetBuffer; + int var2; + int var3; + int var4; + int var5; + int var6; + int var7; + int var8; + int var9; + int var42; + if (class185.field2300 == var0) { + var2 = var1.method5438(); + var3 = var2 >> 2; + var4 = var2 & 3; + var5 = Client.field665[var3]; + var6 = var1.readUnsignedByteNegate(); + var7 = (var6 >> 4 & 7) + WorldMapSection1.field283; + var8 = (var6 & 7) + Varps.field2507; + var9 = var1.readUnsignedShort(); + if (var7 >= 0 && var8 >= 0 && var7 < 103 && var8 < 103) { + if (var5 == 0) { + BoundaryObject var10 = Player.scene.method3032(ItemContainer.plane, var7, var8); + if (var10 != null) { + var42 = BoundaryObject.Entity_unpackID(var10.tag); + if (var3 == 2) { + var10.entity1 = new DynamicObject(var42, 2, var4 + 4, ItemContainer.plane, var7, var8, var9, false, var10.entity1); + var10.entity2 = new DynamicObject(var42, 2, var4 + 1 & 3, ItemContainer.plane, var7, var8, var9, false, var10.entity2); + } else { + var10.entity1 = new DynamicObject(var42, var3, var4, ItemContainer.plane, var7, var8, var9, false, var10.entity1); + } + } + } + + if (var5 == 1) { + WallDecoration var39 = Player.scene.method3033(ItemContainer.plane, var7, var8); + if (var39 != null) { + var42 = BoundaryObject.Entity_unpackID(var39.tag); + if (var3 != 4 && var3 != 5) { + if (var3 == 6) { + var39.entity1 = new DynamicObject(var42, 4, var4 + 4, ItemContainer.plane, var7, var8, var9, false, var39.entity1); + } else if (var3 == 7) { + var39.entity1 = new DynamicObject(var42, 4, (var4 + 2 & 3) + 4, ItemContainer.plane, var7, var8, var9, false, var39.entity1); + } else if (var3 == 8) { + var39.entity1 = new DynamicObject(var42, 4, var4 + 4, ItemContainer.plane, var7, var8, var9, false, var39.entity1); + var39.entity2 = new DynamicObject(var42, 4, (var4 + 2 & 3) + 4, ItemContainer.plane, var7, var8, var9, false, var39.entity2); + } + } else { + var39.entity1 = new DynamicObject(var42, 4, var4, ItemContainer.plane, var7, var8, var9, false, var39.entity1); + } + } + } + + if (var5 == 2) { + GameObject var40 = Player.scene.method3034(ItemContainer.plane, var7, var8); + if (var3 == 11) { + var3 = 10; + } + + if (var40 != null) { + var40.entity = new DynamicObject(BoundaryObject.Entity_unpackID(var40.tag), var3, var4, ItemContainer.plane, var7, var8, var9, false, var40.entity); + } + } + + if (var5 == 3) { + FloorDecoration var41 = Player.scene.getFloorDecoration(ItemContainer.plane, var7, var8); + if (var41 != null) { + var41.entity = new DynamicObject(BoundaryObject.Entity_unpackID(var41.tag), 22, var4, ItemContainer.plane, var7, var8, var9, false, var41.entity); + } + } + } + + } else if (class185.field2301 == var0) { + var2 = var1.method5445(); + var3 = var1.method5447(); + var4 = var1.method5445(); + var5 = var1.method5436(); + var6 = (var5 >> 4 & 7) + WorldMapSection1.field283; + var7 = (var5 & 7) + Varps.field2507; + if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { + NodeDeque var45 = Client.groundItems[ItemContainer.plane][var6][var7]; + if (var45 != null) { + for (TileItem var32 = (TileItem)var45.last(); var32 != null; var32 = (TileItem)var45.previous()) { + if ((var2 & 32767) == var32.id && var4 == var32.quantity) { + var32.quantity = var3; + break; + } + } + + class189.updateItemPile(var6, var7); + } + } + + } else if (class185.field2299 == var0) { + var2 = var1.readUnsignedShort(); + var3 = var1.method5436(); + var4 = var1.method5446(); + var5 = var1.readUnsignedByte(); + var6 = (var5 >> 4 & 7) + WorldMapSection1.field283; + var7 = (var5 & 7) + Varps.field2507; + if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { + var6 = var6 * 128 + 64; + var7 = var7 * 128 + 64; + GraphicsObject var31 = new GraphicsObject(var2, ItemContainer.plane, var6, var7, GrandExchangeOfferTotalQuantityComparator.getTileHeight(var6, var7, ItemContainer.plane) - var3, var4, Client.cycle); + Client.graphicsObjects.addFirst(var31); + } + + } else { + int var12; + byte var13; + int var14; + int var33; + if (class185.field2306 == var0) { + var2 = var1.method5438() * 4; + var3 = var1.readUnsignedShort(); + var4 = var1.method5446(); + var5 = var1.method5438() * 4; + var6 = var1.method5448(); + var7 = var1.readUnsignedByte(); + var8 = var1.method5438(); + var9 = var1.method5445(); + var33 = var1.method5436(); + var42 = (var33 >> 4 & 7) + WorldMapSection1.field283; + var12 = (var33 & 7) + Varps.field2507; + var13 = var1.method5616(); + byte var43 = var1.method5421(); + var14 = var43 + var42; + int var44 = var13 + var12; + if (var42 >= 0 && var12 >= 0 && var42 < 104 && var12 < 104 && var14 >= 0 && var44 >= 0 && var14 < 104 && var44 < 104 && var4 != 65535) { + var42 = var42 * 128 + 64; + var12 = var12 * 128 + 64; + var14 = var14 * 128 + 64; + var44 = var44 * 128 + 64; + Projectile var15 = new Projectile(var4, ItemContainer.plane, var42, var12, GrandExchangeOfferTotalQuantityComparator.getTileHeight(var42, var12, ItemContainer.plane) - var5, var9 + Client.cycle, var3 + Client.cycle, var7, var8, var6, var2); + var15.setDestination(var14, var44, GrandExchangeOfferTotalQuantityComparator.getTileHeight(var14, var44, ItemContainer.plane) - var2, var9 + Client.cycle); + Client.projectiles.addFirst(var15); + } + + } else if (class185.field2302 == var0) { + var2 = var1.method5438(); + var3 = var2 >> 2; + var4 = var2 & 3; + var5 = Client.field665[var3]; + var6 = var1.method5438(); + var7 = (var6 >> 4 & 7) + WorldMapSection1.field283; + var8 = (var6 & 7) + Varps.field2507; + if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { + StudioGame.updatePendingSpawn(ItemContainer.plane, var7, var8, var5, -1, var3, var4, 0, -1); + } + + } else { + TileItem var35; + if (class185.field2297 == var0) { + var2 = var1.method5436(); + var3 = (var2 >> 4 & 7) + WorldMapSection1.field283; + var4 = (var2 & 7) + Varps.field2507; + var5 = var1.method5447(); + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { + NodeDeque var34 = Client.groundItems[ItemContainer.plane][var3][var4]; + if (var34 != null) { + for (var35 = (TileItem)var34.last(); var35 != null; var35 = (TileItem)var34.previous()) { + if ((var5 & 32767) == var35.id) { + var35.remove(); + break; + } + } + + if (var34.last() == null) { + Client.groundItems[ItemContainer.plane][var3][var4] = null; + } + + class189.updateItemPile(var3, var4); + } + } + + } else { + if (class185.field2304 == var0) { + var2 = var1.readUnsignedByte(); + var3 = (var2 >> 4 & 7) + WorldMapSection1.field283; + var4 = (var2 & 7) + Varps.field2507; + var5 = var1.method5438(); + var6 = var1.method5436(); + var7 = var6 >> 4 & 15; + var8 = var6 & 7; + var9 = var1.method5447(); + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { + var33 = var7 + 1; + if (WorldMapIcon_1.localPlayer.pathX[0] >= var3 - var33 && WorldMapIcon_1.localPlayer.pathX[0] <= var3 + var33 && WorldMapIcon_1.localPlayer.pathY[0] >= var4 - var33 && WorldMapIcon_1.localPlayer.pathY[0] <= var33 + var4 && Client.field860 != 0 && var8 > 0 && Client.soundEffectCount < 50) { + Client.soundEffectIds[Client.soundEffectCount] = var9; + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var8; + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var5; + Client.soundEffects[Client.soundEffectCount] = null; + Client.soundLocations[Client.soundEffectCount] = var7 + (var4 << 8) + (var3 << 16); + ++Client.soundEffectCount; + } + } + } + + if (class185.field2303 == var0) { + var2 = var1.method5446(); + var3 = var1.method5447(); + var4 = var1.method5436(); + var5 = (var4 >> 4 & 7) + WorldMapSection1.field283; + var6 = (var4 & 7) + Varps.field2507; + if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { + var35 = new TileItem(); + var35.id = var3; + var35.quantity = var2; + if (Client.groundItems[ItemContainer.plane][var5][var6] == null) { + Client.groundItems[ItemContainer.plane][var5][var6] = new NodeDeque(); + } + + Client.groundItems[ItemContainer.plane][var5][var6].addFirst(var35); + class189.updateItemPile(var5, var6); + } + + } else { + if (class185.field2298 == var0) { + byte var37 = var1.method5421(); + var3 = var1.method5447(); + byte var38 = var1.method5421(); + var5 = var1.method5446(); + var6 = var1.readUnsignedShort(); + var7 = var1.method5436(); + var8 = var7 >> 2; + var9 = var7 & 3; + var33 = Client.field665[var8]; + byte var11 = var1.method5616(); + var12 = var1.method5445(); + var13 = var1.method5421(); + var14 = var1.readUnsignedByteNegate(); + int var36 = (var14 >> 4 & 7) + WorldMapSection1.field283; + int var16 = (var14 & 7) + Varps.field2507; + Player var17; + if (var12 == Client.localPlayerIndex) { + var17 = WorldMapIcon_1.localPlayer; + } else { + var17 = Client.players[var12]; + } + + if (var17 != null) { + ObjectDefinition var18 = class215.getObjectDefinition(var5); + int var19; + int var20; + if (var9 != 1 && var9 != 3) { + var19 = var18.sizeX; + var20 = var18.sizeY; + } else { + var19 = var18.sizeY; + var20 = var18.sizeX; + } + + int var21 = var36 + (var19 >> 1); + int var22 = var36 + (var19 + 1 >> 1); + int var23 = var16 + (var20 >> 1); + int var24 = var16 + (var20 + 1 >> 1); + int[][] var25 = Tiles.Tiles_heights[ItemContainer.plane]; + int var26 = var25[var22][var24] + var25[var22][var23] + var25[var21][var23] + var25[var21][var24] >> 2; + int var27 = (var36 << 7) + (var19 << 6); + int var28 = (var16 << 7) + (var20 << 6); + Model var29 = var18.getModel(var8, var9, var25, var27, var26, var28); + if (var29 != null) { + StudioGame.updatePendingSpawn(ItemContainer.plane, var36, var16, var33, -1, 0, 0, var6 + 1, var3 + 1); + var17.animationCycleStart = var6 + Client.cycle; + var17.animationCycleEnd = var3 + Client.cycle; + var17.model0 = var29; + var17.field599 = var36 * 128 + var19 * 64; + var17.field601 = var16 * 128 + var20 * 64; + var17.tileHeight2 = var26; + byte var30; + if (var37 > var13) { + var30 = var37; + var37 = var13; + var13 = var30; + } + + if (var11 > var38) { + var30 = var11; + var11 = var38; + var38 = var30; + } + + var17.field603 = var37 + var36; + var17.field616 = var36 + var13; + var17.field604 = var16 + var11; + var17.field606 = var38 + var16; + } + } + } + + if (class185.field2305 == var0) { + var2 = var1.method5436(); + var3 = (var2 >> 4 & 7) + WorldMapSection1.field283; + var4 = (var2 & 7) + Varps.field2507; + var5 = var1.method5438(); + var6 = var5 >> 2; + var7 = var5 & 3; + var8 = Client.field665[var6]; + var9 = var1.method5446(); + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { + StudioGame.updatePendingSpawn(ItemContainer.plane, var3, var4, var8, var9, var6, var7, 0, -1); + } + + } + } + } + } + } + } } diff --git a/runescape-client/src/main/java/KeyHandler.java b/runescape-client/src/main/java/KeyHandler.java index ce5d95e79b..11bf8ec799 100644 --- a/runescape-client/src/main/java/KeyHandler.java +++ b/runescape-client/src/main/java/KeyHandler.java @@ -2,85 +2,94 @@ import java.awt.event.FocusEvent; import java.awt.event.FocusListener; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; +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("ai") +@ObfuscatedName("ay") @Implements("KeyHandler") public final class KeyHandler implements KeyListener, FocusListener { - @ObfuscatedName("q") + @ObfuscatedName("oh") @ObfuscatedSignature( - signature = "Lai;" + signature = "Lch;" + ) + @Export("varcs") + static Varcs varcs; + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "Lay;" ) @Export("KeyHandler_instance") public static KeyHandler KeyHandler_instance; + @ObfuscatedName("t") + public static short[] field387; @ObfuscatedName("cp") @Export("KeyHandler_pressedKeys") public static boolean[] KeyHandler_pressedKeys; - @ObfuscatedName("cw") - public static int[] field391; - @ObfuscatedName("ca") - @ObfuscatedGetter( - intValue = 1600715529 - ) - public static int field388; @ObfuscatedName("cb") + public static int[] field374; + @ObfuscatedName("ch") @ObfuscatedGetter( - intValue = -957146255 + intValue = 495485409 ) - public static int field398; - @ObfuscatedName("cx") - static char[] field399; - @ObfuscatedName("cu") - static int[] field400; - @ObfuscatedName("cs") - public static int[] field401; + public static int field375; + @ObfuscatedName("cn") + @ObfuscatedGetter( + intValue = -2076273353 + ) + public static int field378; + @ObfuscatedName("cr") + static char[] field377; + @ObfuscatedName("cl") + static int[] field376; @ObfuscatedName("cg") + public static int[] field379; + @ObfuscatedName("cy") @ObfuscatedGetter( - intValue = 1304098679 + intValue = -1379841439 ) - public static int field386; - @ObfuscatedName("cv") - @ObfuscatedGetter( - intValue = -1704948479 - ) - public static int field396; - @ObfuscatedName("ce") - @ObfuscatedGetter( - intValue = 1813513045 - ) - public static int field404; + public static int field380; @ObfuscatedName("cz") @ObfuscatedGetter( - intValue = 1799937551 + intValue = -1494145321 ) public static int field385; - @ObfuscatedName("cm") + @ObfuscatedName("cv") @ObfuscatedGetter( - intValue = -1118160033 + intValue = 1845463833 + ) + public static int field382; + @ObfuscatedName("cq") + @ObfuscatedGetter( + intValue = 1982695045 + ) + public static int field383; + @ObfuscatedName("ct") + @ObfuscatedGetter( + intValue = 1884223821 ) @Export("KeyHandler_idleCycles") public static volatile int KeyHandler_idleCycles; - @ObfuscatedName("ck") + @ObfuscatedName("cx") @Export("KeyHandler_keyCodes") static int[] KeyHandler_keyCodes; static { KeyHandler_instance = new KeyHandler(); KeyHandler_pressedKeys = new boolean[112]; - field391 = new int[128]; - field388 = 0; - field398 = 0; - field399 = new char[128]; - field400 = new int[128]; - field401 = new int[128]; - field386 = 0; - field396 = 0; - field404 = 0; + field374 = new int[128]; + field375 = 0; + field378 = 0; + field377 = new char[128]; + field376 = new int[128]; + field379 = new int[128]; + field380 = 0; field385 = 0; + field382 = 0; + field383 = 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, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -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,21 +109,21 @@ public final class KeyHandler implements KeyListener, FocusListener { var2 = -1; } - if (field398 >= 0 && var2 >= 0) { - field391[field398] = var2; - field398 = field398 + 1 & 127; - if (field398 == field388) { - field398 = -1; + if (field378 >= 0 && var2 >= 0) { + field374[field378] = var2; + field378 = field378 + 1 & 127; + if (field375 == field378) { + field378 = -1; } } int var3; if (var2 >= 0) { - var3 = field404 + 1 & 127; - if (var3 != field396) { - field400[field404] = var2; - field399[field404] = 0; - field404 = var3; + var3 = field382 + 1 & 127; + if (var3 != field385) { + field376[field382] = var2; + field377[field382] = 0; + field382 = var3; } } @@ -135,11 +144,11 @@ public final class KeyHandler implements KeyListener, FocusListener { var2 = -1; } - if (field398 >= 0 && var2 >= 0) { - field391[field398] = ~var2; - field398 = field398 + 1 & 127; - if (field388 == field398) { - field398 = -1; + if (field378 >= 0 && var2 >= 0) { + field374[field378] = ~var2; + field378 = field378 + 1 & 127; + if (field375 == field378) { + field378 = -1; } } } @@ -147,25 +156,25 @@ public final class KeyHandler implements KeyListener, FocusListener { var1.consume(); } + public final synchronized void focusLost(FocusEvent var1) { + if (KeyHandler_instance != null) { + field378 = -1; + } + + } + public final void focusGained(FocusEvent var1) { } - public final synchronized void focusLost(FocusEvent var1) { - if (KeyHandler_instance != null) { - field398 = -1; - } - - } - public final void keyTyped(KeyEvent var1) { if (KeyHandler_instance != null) { char var2 = var1.getKeyChar(); - if (var2 != 0 && var2 != 0xffff && VarpDefinition.method4366(var2)) { - int var3 = field404 + 1 & 127; - if (var3 != field396) { - field400[field404] = -1; - field399[field404] = var2; - field404 = var3; + if (var2 != 0 && var2 != '\uffff' && class218.method4019(var2)) { + int var3 = field382 + 1 & 127; + if (var3 != field385) { + field376[field382] = -1; + field377[field382] = var2; + field382 = var3; } } } @@ -173,56 +182,125 @@ public final class KeyHandler implements KeyListener, FocusListener { var1.consume(); } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lhp;I)V", - garbageValue = "-939658474" + signature = "([BIII)Ljava/lang/String;", + garbageValue = "1700061188" ) - @Export("ParamDefinition_setArchives") - public static void ParamDefinition_setArchives(AbstractArchive var0) { - ParamDefinition.ParamDefinition_archive = var0; + public static String method786(byte[] var0, int var1, int var2) { + char[] var3 = new char[var2]; + int var4 = 0; + int var5 = var1; + + int var8; + for (int var6 = var2 + var1; var5 < var6; var3[var4++] = (char)var8) { + int var7 = var0[var5++] & 255; + if (var7 < 128) { + if (var7 == 0) { + var8 = 65533; + } else { + var8 = var7; + } + } else if (var7 < 192) { + var8 = 65533; + } else if (var7 < 224) { + if (var5 < var6 && (var0[var5] & 192) == 128) { + var8 = (var7 & 31) << 6 | var0[var5++] & 63; + if (var8 < 128) { + var8 = 65533; + } + } else { + var8 = 65533; + } + } else if (var7 < 240) { + if (var5 + 1 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128) { + var8 = (var7 & 15) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63; + if (var8 < 2048) { + var8 = 65533; + } + } else { + var8 = 65533; + } + } else if (var7 < 248) { + if (var5 + 2 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128 && (var0[var5 + 2] & 192) == 128) { + var8 = (var7 & 7) << 18 | (var0[var5++] & 63) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63; + if (var8 >= 65536 && var8 <= 1114111) { + var8 = 65533; + } else { + var8 = 65533; + } + } else { + var8 = 65533; + } + } else { + var8 = 65533; + } + } + + return new String(var3, 0, var4); } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "337917094" + signature = "(Lhz;B)V", + garbageValue = "-71" ) - static void method787() { - Tiles.field504 = null; - Tiles.field505 = null; - Tiles.field506 = null; - class268.field3561 = null; - FaceNormal.field1887 = null; - class32.field282 = null; - Tiles.field515 = null; - ServerBuild.Tiles_hue = null; - Tiles.Tiles_saturation = null; - Tiles.Tiles_lightness = null; - DynamicObject.Tiles_hueMultiplier = null; - Fonts.field3689 = null; + @Export("InvDefinition_setArchives") + public static void InvDefinition_setArchives(AbstractArchive var0) { + InvDefinition.InvDefinition_archive = var0; } - @ObfuscatedName("fa") + @ObfuscatedName("gk") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-2003037366" + signature = "(ZI)V", + garbageValue = "2136399840" ) - @Export("ClanChat_leave") - static final void ClanChat_leave() { - if (!GrandExchangeEvent.ClanChat_inClanChat) { - return; - } - if (DevicePcmPlayerProvider.clanChat != null) { - DevicePcmPlayerProvider.clanChat.sort(); + @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.size * -1143635904 == 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 = WorldMapSprite.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); + var2.playerCycle = Client.cycle; + Player.scene.drawEntity(ItemContainer.plane, var2.x, var2.y, GrandExchangeOfferTotalQuantityComparator.getTileHeight(var2.size * -178253824 - 64 + var2.x, var2.size * -178253824 - 64 + var2.y, ItemContainer.plane), var2.size * -178253824 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); + } + } } - for (int var0 = 0; var0 < Players.Players_count; ++var0) { - Player var1 = Client.players[Players.Players_indices[var0]]; - var1.clearIsInClanChat(); + } + + @ObfuscatedName("gl") + @ObfuscatedSignature( + signature = "(ZI)V", + garbageValue = "2032247175" + ) + static final void method787(boolean var0) { + WorldMapSectionType.playPcmPlayers(); + ++Client.packetWriter.pendingWrites; + if (Client.packetWriter.pendingWrites >= 50 || var0) { + Client.packetWriter.pendingWrites = 0; + if (!Client.field672 && Client.packetWriter.getSocket() != null) { + PacketBufferNode var1 = MenuAction.getPacketBufferNode(ClientPacket.field2207, Client.packetWriter.isaacCipher); + Client.packetWriter.addNode(var1); + + try { + Client.packetWriter.flush(); + } catch (IOException var3) { + Client.field672 = true; + } + } + } - - GrandExchangeEvent.ClanChat_inClanChat = false; - } } diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index 5bbcad15ad..cfd072e7e6 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -4,52 +4,58 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("im") +@ObfuscatedName("if") @Implements("KitDefinition") public class KitDefinition extends DualNode { - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) - @Export("KitDefinition_archive") - static AbstractArchive KitDefinition_archive; - @ObfuscatedName("e") + @Export("KitDefinition_modelsArchive") + public static AbstractArchive KitDefinition_modelsArchive; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -2099754999 + intValue = 542914887 ) @Export("KitDefinition_fileCount") public static int KitDefinition_fileCount; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lep;" ) @Export("KitDefinition_cached") public static EvictingDualNodeHashTable KitDefinition_cached; - @ObfuscatedName("k") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 603181695 + intValue = -1059023965 + ) + @Export("canvasWidth") + public static int canvasWidth; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 131123301 ) @Export("bodypartID") public int bodypartID; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("models2") int[] models2; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("i") + @ObfuscatedName("q") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("f") + @ObfuscatedName("d") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("m") + @ObfuscatedName("f") @Export("models") int[] models; - @ObfuscatedName("u") + @ObfuscatedName("c") @Export("nonSelectable") public boolean nonSelectable; @@ -63,10 +69,10 @@ public class KitDefinition extends DualNode { this.nonSelectable = false; } - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkf;I)V", - garbageValue = "517161236" + signature = "(Lky;I)V", + garbageValue = "-2134697309" ) @Export("decode") void decode(Buffer var1) { @@ -80,44 +86,48 @@ public class KitDefinition extends DualNode { } } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkf;II)V", - garbageValue = "-1946344058" + signature = "(Lky;IB)V", + garbageValue = "8" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { this.bodypartID = var1.readUnsignedByte(); - } else if (var2 == 2) { - int var3 = var1.readUnsignedByte(); - this.models2 = new int[var3]; + } else { + int var3; + int var4; + if (var2 == 2) { + var3 = var1.readUnsignedByte(); + this.models2 = new int[var3]; - for (int var4 = 0; var4 < var3; ++var4) { - this.models2[var4] = var1.readUnsignedShort(); - } - } else if (var2 == 3) { - this.nonSelectable = true; - } else if (var2 == 40) { - int var3 = var1.readUnsignedByte(); - this.recolorFrom = new short[var3]; - this.recolorTo = new short[var3]; + for (var4 = 0; var4 < var3; ++var4) { + this.models2[var4] = var1.readUnsignedShort(); + } + } else if (var2 == 3) { + this.nonSelectable = true; + } else if (var2 == 40) { + var3 = var1.readUnsignedByte(); + this.recolorFrom = new short[var3]; + this.recolorTo = new short[var3]; - for (int var4 = 0; var4 < var3; ++var4) { - this.recolorFrom[var4] = (short) var1.readUnsignedShort(); - this.recolorTo[var4] = (short) var1.readUnsignedShort(); - } - } else if (var2 == 41) { - int var3 = var1.readUnsignedByte(); - this.retextureFrom = new short[var3]; - this.retextureTo = new short[var3]; + for (var4 = 0; var4 < var3; ++var4) { + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); + this.recolorTo[var4] = (short)var1.readUnsignedShort(); + } + } else if (var2 == 41) { + var3 = var1.readUnsignedByte(); + this.retextureFrom = new short[var3]; + this.retextureTo = new short[var3]; - for (int var4 = 0; var4 < var3; ++var4) { - this.retextureFrom[var4] = (short) var1.readUnsignedShort(); - this.retextureTo[var4] = (short) var1.readUnsignedShort(); + for (var4 = 0; var4 < var3; ++var4) { + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); + this.retextureTo[var4] = (short)var1.readUnsignedShort(); + } + } else if (var2 >= 60 && var2 < 70) { + this.models[var2 - 60] = var1.readUnsignedShort(); } - } else if (var2 >= 60 && var2 < 70) { - this.models[var2 - 60] = var1.readUnsignedShort(); } } @@ -125,73 +135,75 @@ public class KitDefinition extends DualNode { @ObfuscatedName("k") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1807295410" + garbageValue = "-1116849084" ) @Export("ready") public boolean ready() { if (this.models2 == null) { return true; - } - boolean var1 = true; + } else { + boolean var1 = true; - for (int var2 = 0; var2 < this.models2.length; ++var2) { - if (!class288.KitDefinition_modelsArchive.tryLoadFile(this.models2[var2], 0)) { - var1 = false; + for (int var2 = 0; var2 < this.models2.length; ++var2) { + if (!KitDefinition_modelsArchive.tryLoadFile(this.models2[var2], 0)) { + var1 = false; + } } - } - return var1; + return var1; + } } - @ObfuscatedName("l") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(I)Lds;", - garbageValue = "-1043358409" + signature = "(I)Ldq;", + garbageValue = "1270539488" ) @Export("getModelData") public ModelData getModelData() { if (this.models2 == null) { return null; - } - ModelData[] var1 = new ModelData[this.models2.length]; - - for (int var2 = 0; var2 < this.models2.length; ++var2) { - var1[var2] = ModelData.ModelData_get(class288.KitDefinition_modelsArchive, this.models2[var2], 0); - } - - ModelData var4; - if (var1.length == 1) { - var4 = var1[0]; } else { - var4 = new ModelData(var1, var1.length); - } + ModelData[] var1 = new ModelData[this.models2.length]; - int var3; - if (this.recolorFrom != null) { - for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { - var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); + for (int var2 = 0; var2 < this.models2.length; ++var2) { + var1[var2] = ModelData.ModelData_get(KitDefinition_modelsArchive, this.models2[var2], 0); } - } - if (this.retextureFrom != null) { - for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { - var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); + ModelData var4; + if (var1.length == 1) { + var4 = var1[0]; + } else { + var4 = new ModelData(var1, var1.length); } - } - return var4; + int var3; + if (this.recolorFrom != null) { + for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { + var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); + } + } + + if (this.retextureFrom != null) { + for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { + var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); + } + } + + return var4; + } } - @ObfuscatedName("b") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "1439364369" + garbageValue = "874200774" ) - public boolean method4445() { + public boolean method4360() { boolean var1 = true; for (int var2 = 0; var2 < 5; ++var2) { - if (this.models[var2] != -1 && !class288.KitDefinition_modelsArchive.tryLoadFile(this.models[var2], 0)) { + if (this.models[var2] != -1 && !KitDefinition_modelsArchive.tryLoadFile(this.models[var2], 0)) { var1 = false; } } @@ -199,10 +211,10 @@ public class KitDefinition extends DualNode { return var1; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(B)Lds;", - garbageValue = "-27" + signature = "(I)Ldq;", + garbageValue = "-743084523" ) @Export("getKitDefinitionModels") public ModelData getKitDefinitionModels() { @@ -211,7 +223,7 @@ public class KitDefinition extends DualNode { for (int var3 = 0; var3 < 5; ++var3) { if (this.models[var3] != -1) { - var1[var2++] = ModelData.ModelData_get(class288.KitDefinition_modelsArchive, this.models[var3], 0); + var1[var2++] = ModelData.ModelData_get(KitDefinition_modelsArchive, this.models[var3], 0); } } @@ -231,101 +243,4 @@ public class KitDefinition extends DualNode { return var5; } - - @ObfuscatedName("fn") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1752614077" - ) - static final void method4461() { - for (int var0 = 0; var0 < Client.soundEffectCount; ++var0) { - int var10002 = Client.queuedSoundEffectDelays[var0]--; - if (Client.queuedSoundEffectDelays[var0] < -10) { - --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; - continue; - } - SoundEffect var9 = Client.soundEffects[var0]; - if (var9 == null) { - Object var10000 = null; - var9 = SoundEffect.readSoundEffect(class13.archive4, Client.soundEffectIds[var0], 0); - if (var9 == null) { - continue; - } - - Client.queuedSoundEffectDelays[var0] += var9.calculateDelay(); - Client.soundEffects[var0] = var9; - } - - if (Client.queuedSoundEffectDelays[var0] >= 0) { - continue; - } - int var2; - if (Client.soundLocations[var0] == 0) { - var2 = Client.soundEffectVolume; - } else { - int var3 = (Client.soundLocations[var0] & 255) * 128; - int var4 = Client.soundLocations[var0] >> 16 & 255; - int var5 = var4 * 128 + 64 - Client.localPlayer.x; - if (var5 < 0) { - var5 = -var5; - } - - int var6 = Client.soundLocations[var0] >> 8 & 255; - int var7 = var6 * 128 + 64 - Client.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.field892 / var3; - } - - if (var2 > 0) { - RawSound var10 = var9.toRawSound().resample(AttackOption.decimator); - RawPcmStream var11 = RawPcmStream.createRawPcmStream(var10, 100, var2); - var11.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1); - SecureRandomCallable.pcmStreamMixer.addSubStream(var11); - } - - Client.queuedSoundEffectDelays[var0] = -100; - } - - if (!Client.field699) { - return; - } - boolean var12; - if (class197.field2402 != 0) { - var12 = true; - } else { - var12 = Interpreter.midiPcmStream.isReady(); - } - - if (!var12) { - if (Client.field911 != 0 && Client.field889 != -1) { - FileSystem.method3503(WorldMapRegion.archive6, Client.field889, 0, Client.field911, false); - } - - Client.field699 = false; - } - - } } diff --git a/runescape-client/src/main/java/Language.java b/runescape-client/src/main/java/Language.java index 4f470ef241..e1dbbe6daa 100644 --- a/runescape-client/src/main/java/Language.java +++ b/runescape-client/src/main/java/Language.java @@ -5,215 +5,295 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gu") +@ObfuscatedName("gk") @Implements("Language") public class Language implements Enumerated { - @ObfuscatedName("qk") - @ObfuscatedSignature( - signature = "Ldn;" - ) - @Export("pcmPlayer1") - static PcmPlayer pcmPlayer1; - @ObfuscatedName("qb") + @ObfuscatedName("sz") @ObfuscatedGetter( - intValue = -429347521 + intValue = -16153155 ) - static int field2345; - @ObfuscatedName("q") + @Export("foundItemIdCount") + static int foundItemIdCount; + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lgu;" + signature = "Lgk;" ) @Export("Language_EN") public static final Language Language_EN; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lgu;" + signature = "Lgk;" ) @Export("Language_DE") static final Language Language_DE; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lgu;" + signature = "Lgk;" ) @Export("Language_FR") public static final Language Language_FR; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lgu;" + signature = "Lgk;" ) @Export("Language_PT") static final Language Language_PT; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lgu;" + signature = "Lgk;" ) @Export("Language_NL") static final Language Language_NL; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lgu;" + signature = "Lgk;" ) @Export("Language_ES") public static final Language Language_ES; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lgu;" + signature = "Lgk;" ) @Export("Language_ES_MX") static final Language Language_ES_MX; - @ObfuscatedName("m") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "[Lgu;" + signature = "[Lgk;" ) @Export("Language_valuesOrdered") - public static final Language[] Language_valuesOrdered; - @ObfuscatedName("eg") - @ObfuscatedGetter( - intValue = -1179519055 + static final Language[] Language_valuesOrdered; + @ObfuscatedName("cu") + @ObfuscatedSignature( + signature = "Lbs;" ) - @Export("port1") - static int port1; - @ObfuscatedName("i") - final String field2346; - @ObfuscatedName("c") + @Export("mouseRecorder") + static MouseRecorder mouseRecorder; + @ObfuscatedName("q") + final String field2330; + @ObfuscatedName("x") @Export("language") final String language; - @ObfuscatedName("f") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1003386863 + intValue = 327521065 ) @Export("id") final int id; static { - Language_EN = new Language("EN", "en", "English", class192.field2375, 0, "GB"); - Language_DE = new Language("DE", "de", "German", class192.field2375, 1, "DE"); - Language_FR = new Language("FR", "fr", "French", class192.field2375, 2, "FR"); - Language_PT = new Language("PT", "pt", "Portuguese", class192.field2375, 3, "BR"); - Language_NL = new Language("NL", "nl", "Dutch", class192.field2381, 4, "NL"); - Language_ES = new Language("ES", "es", "Spanish", class192.field2381, 5, "ES"); - Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", class192.field2375, 6, "MX"); - Language[] var0 = Language_values(); + Language_EN = new Language("EN", "en", "English", class192.field2360, 0, "GB"); + Language_DE = new Language("DE", "de", "German", class192.field2360, 1, "DE"); + Language_FR = new Language("FR", "fr", "French", class192.field2360, 2, "FR"); + Language_PT = new Language("PT", "pt", "Portuguese", class192.field2360, 3, "BR"); + Language_NL = new Language("NL", "nl", "Dutch", class192.field2361, 4, "NL"); + Language_ES = new Language("ES", "es", "Spanish", class192.field2361, 5, "ES"); + Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", class192.field2360, 6, "MX"); + Language[] var0 = new Language[]{Language_ES_MX, Language_DE, Language_FR, Language_EN, Language_PT, Language_ES, Language_NL}; Language_valuesOrdered = new Language[var0.length]; - Language[] var1 = var0; + Language[] var2 = var0; - for (int var2 = 0; var2 < var1.length; ++var2) { - Language var3 = var1[var2]; - if (Language_valuesOrdered[var3.id] != null) { + for (int var3 = 0; var3 < var2.length; ++var3) { + Language var4 = var2[var3]; + if (Language_valuesOrdered[var4.id] != null) { throw new IllegalStateException(); } - Language_valuesOrdered[var3.id] = var3; + Language_valuesOrdered[var4.id] = var4; } } @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lgd;ILjava/lang/String;)V" + signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lgm;ILjava/lang/String;)V" ) - Language(String var1, String language, String var3, class192 var4, int var5, String country) { - this.field2346 = var1; - this.language = language; + Language(String var1, String var2, String var3, class192 var4, int var5, String var6) { + this.field2330 = var1; + this.language = var2; this.id = var5; - if (country != null) { - new Locale(language.substring(0, 2), country); + if (var6 != null) { + new Locale(var2.substring(0, 2), var6); } else { - new Locale(language.substring(0, 2)); + new Locale(var2.substring(0, 2)); } } - @ObfuscatedName("w") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", - garbageValue = "1097353533" + signature = "(B)Ljava/lang/String;", + garbageValue = "2" ) @Export("getLanguage") String getLanguage() { return this.language; } - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "320353268" + signature = "(B)I", + garbageValue = "-32" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } + public String abb() { + return this.getLanguage().toLowerCase(Locale.ENGLISH); + } + + public String abd() { + return this.getLanguage().toLowerCase(Locale.ENGLISH); + } + public String toString() { return this.getLanguage().toLowerCase(Locale.ENGLISH); } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(B)[Lgu;", - garbageValue = "99" + signature = "(Lhz;Lhz;B)I", + garbageValue = "7" ) - @Export("Language_values") - static Language[] Language_values() { - return new Language[]{Language_DE, Language_NL, Language_FR, Language_ES, Language_EN, Language_ES_MX, Language_PT}; + static int method3607(AbstractArchive var0, AbstractArchive var1) { + int var2 = 0; + if (var0.tryLoadFileByNames("title.jpg", "")) { + ++var2; + } + + if (var1.tryLoadFileByNames("logo", "")) { + ++var2; + } + + if (var1.tryLoadFileByNames("logo_deadman_mode", "")) { + ++var2; + } + + if (var1.tryLoadFileByNames("titlebox", "")) { + ++var2; + } + + if (var1.tryLoadFileByNames("titlebutton", "")) { + ++var2; + } + + if (var1.tryLoadFileByNames("runes", "")) { + ++var2; + } + + if (var1.tryLoadFileByNames("title_mute", "")) { + ++var2; + } + + if (var1.tryLoadFileByNames("options_radio_buttons,0", "")) { + ++var2; + } + + if (var1.tryLoadFileByNames("options_radio_buttons,2", "")) { + ++var2; + } + + if (var1.tryLoadFileByNames("options_radio_buttons,4", "")) { + ++var2; + } + + if (var1.tryLoadFileByNames("options_radio_buttons,6", "")) { + ++var2; + } + + var1.tryLoadFileByNames("sl_back", ""); + var1.tryLoadFileByNames("sl_flags", ""); + var1.tryLoadFileByNames("sl_arrows", ""); + var1.tryLoadFileByNames("sl_stars", ""); + var1.tryLoadFileByNames("sl_button", ""); + return var2; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(III)I", + garbageValue = "1963190030" + ) + static int method3605(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("i") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1942171448" + signature = "(II)Lgk;", + garbageValue = "1747092797" ) - @Export("ViewportMouse_clear") - public static final void ViewportMouse_clear() { - ViewportMouse.ViewportMouse_isInViewport = false; - ViewportMouse.ViewportMouse_entityCount = 0; + public static Language method3602(int var0) { + return var0 >= 0 && var0 < Language_valuesOrdered.length ? Language_valuesOrdered[var0] : null; } - @ObfuscatedName("ep") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "1477910272" + signature = "(IIIZIZI)V", + garbageValue = "1439063090" ) - static boolean method3667() { - if (Client.archiveLoaders == null || Client.archiveLoaderArchive >= Client.archiveLoaders.size()) { - return true; - } - while (Client.archiveLoaderArchive < Client.archiveLoaders.size()) { - ArchiveLoader var0 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoaderArchive); - if (!var0.isLoaded()) { - return false; + @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 = ChatChannel.World_worlds[var6]; + ChatChannel.World_worlds[var6] = ChatChannel.World_worlds[var1]; + ChatChannel.World_worlds[var1] = var8; + + for (int var9 = var0; var9 < var1; ++var9) { + World var11 = ChatChannel.World_worlds[var9]; + int var12 = SoundSystem.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 = SoundSystem.compareWorlds(var11, var8, var4, var5); + if (var5) { + var10 = -var13; + } else { + var10 = var13; + } + } + + if (var10 <= 0) { + World var14 = ChatChannel.World_worlds[var9]; + ChatChannel.World_worlds[var9] = ChatChannel.World_worlds[var7]; + ChatChannel.World_worlds[var7++] = var14; + } } - ++Client.archiveLoaderArchive; + ChatChannel.World_worlds[var1] = ChatChannel.World_worlds[var7]; + ChatChannel.World_worlds[var7] = var8; + doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); + doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); } - return true; } - @ObfuscatedName("ko") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZI)Ljava/lang/String;", - garbageValue = "-1044311329" + signature = "(II)I", + garbageValue = "987428009" ) - static String method3666(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"; + @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; } - - String var3 = ""; - if (class294.field3695 != null) { - var3 = "/p=" + class294.field3695; - } - - String var4 = "runescape.com"; - return var2 + var0 + "." + var4 + "/l=" + ScriptFrame.clientLanguage + "/a=" + InvDefinition.field3199 + var3 + "/"; } } diff --git a/runescape-client/src/main/java/Link.java b/runescape-client/src/main/java/Link.java index d60aba3f9d..e1e6c40ff8 100644 --- a/runescape-client/src/main/java/Link.java +++ b/runescape-client/src/main/java/Link.java @@ -3,31 +3,30 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fq") +@ObfuscatedName("fk") @Implements("Link") public class Link { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lfq;" + signature = "Lfk;" ) @Export("previous") public Link previous; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lfq;" + signature = "Lfk;" ) @Export("next") public Link next; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("remove") public void remove() { - if (this.next == null) { - return; + if (this.next != null) { + this.next.previous = this.previous; + this.previous.next = this.next; + this.previous = null; + this.next = null; } - this.next.previous = this.previous; - this.previous.next = this.next; - this.previous = null; - this.next = null; } } diff --git a/runescape-client/src/main/java/LinkDeque.java b/runescape-client/src/main/java/LinkDeque.java index 0edbdbf4b1..5714321544 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("je") +@ObfuscatedName("jf") @Implements("LinkDeque") public class LinkDeque { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lfq;" + signature = "Lfk;" ) @Export("sentinel") Link sentinel; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lfq;" + signature = "Lfk;" ) @Export("current") Link current; @@ -25,9 +25,9 @@ public class LinkDeque { this.sentinel.next = this.sentinel; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lfq;)V" + signature = "(Lfk;)V" ) @Export("addFirst") public void addFirst(Link var1) { @@ -41,9 +41,9 @@ public class LinkDeque { var1.previous.next = var1; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "()Lfq;" + signature = "()Lfk;" ) @Export("last") public Link last() { @@ -51,14 +51,15 @@ public class LinkDeque { if (var1 == this.sentinel) { this.current = null; return null; + } else { + this.current = var1.previous; + return var1; } - this.current = var1.previous; - return var1; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "()Lfq;" + signature = "()Lfk;" ) @Export("previous") public Link previous() { @@ -66,8 +67,9 @@ public class LinkDeque { if (var1 == this.sentinel) { this.current = null; return null; + } else { + this.current = var1.previous; + return var1; } - this.current = var1.previous; - return var1; } } diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java index 32457a8bfe..af917d4602 100644 --- a/runescape-client/src/main/java/Login.java +++ b/runescape-client/src/main/java/Login.java @@ -5,152 +5,161 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cq") +@ObfuscatedName("cj") @Implements("Login") public class Login { - @ObfuscatedName("w") - static boolean field1179; - @ObfuscatedName("e") + @ObfuscatedName("j") + static boolean field1146; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -581394193 + intValue = -1653930727 ) @Export("xPadding") static int xPadding; - @ObfuscatedName("p") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "[Llx;" - ) - @Export("runesSprite") - static IndexedSprite[] runesSprite; - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Llx;" + signature = "Llq;" ) @Export("titleboxSprite") static IndexedSprite titleboxSprite; + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "Llq;" + ) + @Export("titlebuttonSprite") + static IndexedSprite titlebuttonSprite; + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "Lls;" + ) + @Export("leftTitleSprite") + static Sprite leftTitleSprite; + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "Lls;" + ) + @Export("rightTitleSprite") + static Sprite rightTitleSprite; @ObfuscatedName("f") @ObfuscatedSignature( - signature = "[Llx;" - ) - @Export("title_muteSprite") - static IndexedSprite[] title_muteSprite; - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "Llx;" + signature = "Llq;" ) @Export("options_buttons_0Sprite") static IndexedSprite options_buttons_0Sprite; @ObfuscatedName("r") @ObfuscatedSignature( - signature = "Llx;" + signature = "Llq;" ) - static IndexedSprite field1185; - @ObfuscatedName("t") + @Export("options_buttons_2Sprite") + static IndexedSprite options_buttons_2Sprite; + @ObfuscatedName("e") + public static String[] field1181; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1807280197 + intValue = 751514225 ) @Export("loginBoxX") static int loginBoxX; - @ObfuscatedName("o") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 779254255 + intValue = -1040783223 + ) + @Export("loginBoxCenter") + static int loginBoxCenter; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 1487498995 ) @Export("Login_loadingPercent") static int Login_loadingPercent; - @ObfuscatedName("n") + @ObfuscatedName("h") @Export("Login_loadingText") static String Login_loadingText; - @ObfuscatedName("aw") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -642459289 + intValue = -577440455 ) - static int field1182; - @ObfuscatedName("ar") + static int field1160; + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -2013151801 + intValue = 226287731 ) - static int field1212; + static int field1161; @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 2026223077 + intValue = -847558949 ) @Export("loginIndex") static int loginIndex; - @ObfuscatedName("aj") + @ObfuscatedName("ac") @Export("Login_response0") static String Login_response0; - @ObfuscatedName("at") + @ObfuscatedName("ar") @Export("Login_response1") static String Login_response1; - @ObfuscatedName("ac") + @ObfuscatedName("au") @Export("Login_response2") static String Login_response2; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("Login_response3") static String Login_response3; - @ObfuscatedName("aq") + @ObfuscatedName("ag") @Export("Login_username") static String Login_username; @ObfuscatedName("aa") @Export("Login_password") static String Login_password; - @ObfuscatedName("ay") - static boolean field1199; - @ObfuscatedName("af") - static boolean field1184; - @ObfuscatedName("bz") - static boolean field1201; - @ObfuscatedName("bi") + @ObfuscatedName("ab") + static boolean field1169; + @ObfuscatedName("aw") + static boolean field1170; + @ObfuscatedName("bw") + static boolean field1171; + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = 59123185 + intValue = -1465778129 ) @Export("currentLoginField") static int currentLoginField; - @ObfuscatedName("bn") + @ObfuscatedName("bh") @Export("worldSelectOpen") static boolean worldSelectOpen; - @ObfuscatedName("bj") - @ObfuscatedSignature( - signature = "Llx;" - ) - @Export("worldSelectLeftSprite") - static IndexedSprite worldSelectLeftSprite; @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = 1090438369 + intValue = 1853226103 ) @Export("hoveredWorldIndex") static int hoveredWorldIndex; - @ObfuscatedName("by") + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = -2109532815 + intValue = 585792987 ) @Export("worldSelectPage") static int worldSelectPage; - @ObfuscatedName("bt") + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = -1875714111 + intValue = -2101798589 ) @Export("worldSelectPagesCount") static int worldSelectPagesCount; - @ObfuscatedName("bq") - @ObfuscatedGetter( - longValue = 7221732976161775211L - ) - static long field1193; @ObfuscatedName("bu") @ObfuscatedGetter( - longValue = -1649813103700171861L + longValue = 2127987050025711637L ) - static long field1211; + static long field1179; + @ObfuscatedName("bb") + @ObfuscatedGetter( + longValue = 2452989139374894339L + ) + static long field1150; static { xPadding = 0; loginBoxX = xPadding + 202; Login_loadingPercent = 10; Login_loadingText = ""; - field1182 = -1; - field1212 = 1; + field1160 = -1; + field1161 = 1; loginIndex = 0; Login_response0 = ""; Login_response1 = ""; @@ -158,9 +167,9 @@ public class Login { Login_response3 = ""; Login_username = ""; Login_password = ""; - field1199 = false; - field1184 = false; - field1201 = true; + field1169 = false; + field1170 = false; + field1171 = true; currentLoginField = 0; worldSelectOpen = false; hoveredWorldIndex = -1; @@ -168,7 +177,17 @@ public class Login { worldSelectPagesCount = 0; new DecimalFormat("##0.00"); new class162(); - field1193 = -1L; - field1211 = -1L; + field1179 = -1L; + field1150 = -1L; + } + + @ObfuscatedName("kv") + @ObfuscatedSignature( + signature = "(Lky;II)V", + garbageValue = "1329186424" + ) + static void method2031(Buffer var0, int var1) { + Tiles.method1088(var0.array, var1); + WorldMapIcon_1.method295(var0, var1); } } diff --git a/runescape-client/src/main/java/LoginPacket.java b/runescape-client/src/main/java/LoginPacket.java index 3a299a0617..c21f1974f3 100644 --- a/runescape-client/src/main/java/LoginPacket.java +++ b/runescape-client/src/main/java/LoginPacket.java @@ -4,63 +4,58 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gh") +@ObfuscatedName("ge") @Implements("LoginPacket") -public class LoginPacket implements ClientPacketMarker -{ - @ObfuscatedName("q") +public class LoginPacket implements class181 { + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lgh;" + signature = "Lge;" ) - public static final LoginPacket field2306; - @ObfuscatedName("w") + public static final LoginPacket field2291; + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lgh;" + signature = "Lge;" ) - static final LoginPacket field2307; - @ObfuscatedName("e") + static final LoginPacket field2293; + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lgh;" + signature = "Lge;" ) - public static final LoginPacket field2308; - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lgh;" - ) - public static final LoginPacket field2311; + public static final LoginPacket field2295; @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lgh;" + signature = "Lge;" ) - static final LoginPacket field2310; - @ObfuscatedName("b") + public static final LoginPacket field2292; + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "[Lgh;" + signature = "Lge;" + ) + static final LoginPacket field2289; + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "[Lge;" ) @Export("LoginPacket_indexedValues") static final LoginPacket[] LoginPacket_indexedValues; - @ObfuscatedName("a") - @Export("validCacheNames") - static String[] validCacheNames; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1829786709 + intValue = 1160024949 ) @Export("id") public final int id; static { - field2306 = new LoginPacket(14, 0); - field2307 = new LoginPacket(15, 4); - field2308 = new LoginPacket(16, -2); - field2311 = new LoginPacket(18, -2); - field2310 = new LoginPacket(27, 0); + field2291 = new LoginPacket(14, 0); + field2293 = new LoginPacket(15, 4); + field2295 = new LoginPacket(16, -2); + field2292 = new LoginPacket(18, -2); + field2289 = new LoginPacket(27, 0); LoginPacket_indexedValues = new LoginPacket[32]; - LoginPacket[] var0 = new LoginPacket[]{field2310, field2306, field2308, field2311, field2307}; - LoginPacket[] var1 = var0; + LoginPacket[] var0 = class16.method183(); - for (int var2 = 0; var2 < var1.length; ++var2) { - LoginPacket_indexedValues[var1[var2].id] = var1[var2]; + for (int var1 = 0; var1 < var0.length; ++var1) { + LoginPacket_indexedValues[var0[var1].id] = var0[var1]; } } @@ -73,13 +68,50 @@ public class LoginPacket implements ClientPacketMarker this.id = var1; } - @ObfuscatedName("q") + @ObfuscatedName("ko") @ObfuscatedSignature( - signature = "(Lbb;B)V", - garbageValue = "-119" + signature = "(Ljava/lang/String;ZI)V", + garbageValue = "237960990" ) - @Export("runScriptEvent") - public static void runScriptEvent(ScriptEvent var0) { - class96.runScript(var0, 500000); + @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 < MouseRecorder.ItemDefinition_fileCount; ++var4) { + ItemDefinition var5 = WorldMapData_0.ItemDefinition_get(var4); + if ((!var1 || var5.isTradable) && var5.noteTemplate == -1 && var5.name.toLowerCase().indexOf(var0) != -1) { + if (var3 >= 250) { + Language.foundItemIdCount = -1; + SecureRandomCallable.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; + } + } + + SecureRandomCallable.foundItemIds = var2; + GrandExchangeOffer.foundItemIndex = 0; + Language.foundItemIdCount = var3; + String[] var8 = new String[Language.foundItemIdCount]; + + for (int var9 = 0; var9 < Language.foundItemIdCount; ++var9) { + var8[var9] = WorldMapData_0.ItemDefinition_get(var2[var9]).name; + } + + short[] var10 = SecureRandomCallable.foundItemIds; + ModelData0.sortItemsByName(var8, var10, 0, var8.length - 1); } } diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index bc91db69a9..73e1144f8d 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -1,217 +1,212 @@ +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("br") +@ObfuscatedName("bt") @Implements("LoginScreenAnimation") public class LoginScreenAnimation { - @ObfuscatedName("lf") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lhj;" - ) - @Export("mousedOverWidgetIf1") - static Widget mousedOverWidgetIf1; - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "[Llx;" + signature = "[Llq;" ) @Export("sprites") IndexedSprite[] sprites; - @ObfuscatedName("b") - int[] field1042; - @ObfuscatedName("i") + @ObfuscatedName("t") + int[] field1010; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1717008553 + intValue = -792132795 ) - int field1058; - @ObfuscatedName("c") - int[] field1044; - @ObfuscatedName("f") - int[] field1045; - @ObfuscatedName("m") - int[] field1046; - @ObfuscatedName("u") - int[] field1047; + int field1007; @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -2128952243 - ) - int field1048; + int[] field1012; + @ObfuscatedName("d") + int[] field1013; + @ObfuscatedName("f") + int[] field1014; + @ObfuscatedName("c") + int[] field1025; @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1545183041 + intValue = -1331139095 ) - int field1049; - @ObfuscatedName("v") - int[] field1039; + int field1016; @ObfuscatedName("y") - int[] field1043; + @ObfuscatedGetter( + intValue = -637921111 + ) + int field1017; + @ObfuscatedName("p") + int[] field1018; + @ObfuscatedName("b") + int[] field1019; @ObfuscatedName("g") - int[] field1041; + int[] field1020; + @ObfuscatedName("e") + int[] field1024; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 2061231381 + ) + int field1022; @ObfuscatedName("a") - int[] field1053; - @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1480925265 + intValue = 580244368 ) - int field1054; - @ObfuscatedName("t") + int field1023; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 826478180 + intValue = -801970233 ) - int field1055; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -1956845489 - ) - int field1056; + int field1009; @ObfuscatedSignature( - signature = "([Llx;)V" + signature = "([Llq;)V" ) LoginScreenAnimation(IndexedSprite[] var1) { - this.field1042 = new int[256]; - this.field1058 = 0; - this.field1048 = 0; - this.field1049 = 0; - this.field1054 = 0; - this.field1055 = 0; - this.field1056 = 0; + this.field1010 = new int[256]; + this.field1007 = 0; + this.field1016 = 0; + this.field1017 = 0; + this.field1022 = 0; + this.field1023 = 0; + this.field1009 = 0; this.sprites = var1; this.initColors(); } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1195148401" + garbageValue = "1703436788" ) @Export("initColors") void initColors() { - this.field1045 = new int[256]; + this.field1013 = new int[256]; int var1; for (var1 = 0; var1 < 64; ++var1) { - this.field1045[var1] = var1 * 0x40000; + this.field1013[var1] = var1 * 262144; } for (var1 = 0; var1 < 64; ++var1) { - this.field1045[var1 + 64] = var1 * 1024 + 0xff0000; + this.field1013[var1 + 64] = var1 * 1024 + 16711680; } for (var1 = 0; var1 < 64; ++var1) { - this.field1045[var1 + 128] = var1 * 4 + 0xffff00; + this.field1013[var1 + 128] = var1 * 4 + 16776960; } for (var1 = 0; var1 < 64; ++var1) { - this.field1045[var1 + 192] = 0xffffff; + this.field1013[var1 + 192] = 16777215; } - this.field1046 = new int[256]; + this.field1014 = new int[256]; for (var1 = 0; var1 < 64; ++var1) { - this.field1046[var1] = var1 * 1024; + this.field1014[var1] = var1 * 1024; } for (var1 = 0; var1 < 64; ++var1) { - this.field1046[var1 + 64] = var1 * 4 + 0xff00; + this.field1014[var1 + 64] = var1 * 4 + 65280; } for (var1 = 0; var1 < 64; ++var1) { - this.field1046[var1 + 128] = var1 * 0x40000 + 0xffff; + this.field1014[var1 + 128] = var1 * 262144 + 65535; } for (var1 = 0; var1 < 64; ++var1) { - this.field1046[var1 + 192] = 0xffffff; + this.field1014[var1 + 192] = 16777215; } - this.field1047 = new int[256]; + this.field1025 = new int[256]; for (var1 = 0; var1 < 64; ++var1) { - this.field1047[var1] = var1 * 4; + this.field1025[var1] = var1 * 4; } for (var1 = 0; var1 < 64; ++var1) { - this.field1047[var1 + 64] = var1 * 0x40000 + 255; + this.field1025[var1 + 64] = var1 * 262144 + 255; } for (var1 = 0; var1 < 64; ++var1) { - this.field1047[var1 + 128] = var1 * 1024 + 0xff00ff; + this.field1025[var1 + 128] = var1 * 1024 + 16711935; } for (var1 = 0; var1 < 64; ++var1) { - this.field1047[var1 + 192] = 0xffffff; + this.field1025[var1 + 192] = 16777215; } - this.field1044 = new int[256]; - this.field1054 = 0; - this.field1041 = new int[32768]; - this.field1053 = new int[32768]; - this.method1723((IndexedSprite)null); - this.field1039 = new int[32768]; - this.field1043 = new int[32768]; + this.field1012 = new int[256]; + this.field1022 = 0; + this.field1020 = new int[32768]; + this.field1024 = new int[32768]; + this.method1738((IndexedSprite)null); + this.field1018 = new int[32768]; + this.field1019 = new int[32768]; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "0" + garbageValue = "47" ) - void method1720() { - this.field1045 = null; - this.field1046 = null; - this.field1047 = null; - this.field1044 = null; - this.field1041 = null; - this.field1053 = null; - this.field1039 = null; - this.field1043 = null; - this.field1054 = 0; - this.field1055 = 0; + void method1731() { + this.field1013 = null; + this.field1014 = null; + this.field1025 = null; + this.field1012 = null; + this.field1020 = null; + this.field1024 = null; + this.field1018 = null; + this.field1019 = null; + this.field1022 = 0; + this.field1023 = 0; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(IIB)V", - garbageValue = "-86" + garbageValue = "-52" ) @Export("draw") void draw(int var1, int var2) { - if (this.field1039 == null) { + if (this.field1018 == null) { this.initColors(); } - if (this.field1056 == 0) { - this.field1056 = var2; + if (this.field1009 == 0) { + this.field1009 = var2; } - int var3 = var2 - this.field1056; + int var3 = var2 - this.field1009; if (var3 >= 256) { var3 = 0; } - this.field1056 = var2; + this.field1009 = var2; if (var3 > 0) { - this.method1722(var3); + this.method1756(var3); } - this.method1726(var1); + this.method1754(var1); } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "2053204142" + garbageValue = "2129521769" ) - final void method1722(int var1) { - this.field1054 += 128 * var1; + final void method1756(int var1) { + this.field1022 += 128 * var1; int var2; - if (this.field1054 > this.field1041.length) { - this.field1054 -= this.field1041.length; + if (this.field1022 > this.field1020.length) { + this.field1022 -= this.field1020.length; var2 = (int)(Math.random() * 12.0D); - this.method1723(this.sprites[var2]); + this.method1738(this.sprites[var2]); } var2 = 0; @@ -220,12 +215,12 @@ public class LoginScreenAnimation { int var6; for (int var5 = 0; var5 < var4; ++var5) { - var6 = this.field1039[var3 + var2] - this.field1041[var2 + this.field1054 & this.field1041.length - 1] * var1 / 6; + var6 = this.field1018[var3 + var2] - this.field1020[var2 + this.field1022 & this.field1020.length - 1] * var1 / 6; if (var6 < 0) { var6 = 0; } - this.field1039[var2++] = var6; + this.field1018[var2++] = var6; } byte var15 = 10; @@ -239,42 +234,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.field1039[var9 + var8] = 255; + this.field1018[var8 + var9] = 255; } else { - this.field1039[var9 + var8] = 0; + this.field1018[var8 + var9] = 0; } } } - if (this.field1048 * 16 > 0) { - this.field1048 = this.field1048 * 16 - var1 * 4; + if (this.field1016 * 16 > 0) { + this.field1016 = this.field1016 * 16 - var1 * 4; } - if (this.field1049 * 16 > 0) { - this.field1049 = this.field1049 * 16 - var1 * 4; + if (this.field1017 * 16 > 0) { + this.field1017 = this.field1017 * 16 - var1 * 4; } - if (this.field1048 * 16 == 0 && this.field1049 * 16 == 0) { + if (this.field1016 * 16 == 0 && this.field1017 * 16 == 0) { var7 = (int)(Math.random() * (double)(2000 / var1)); if (var7 == 0) { - this.field1048 = 1024; + this.field1016 = 1024; } if (var7 == 1) { - this.field1049 = 1024; + this.field1017 = 1024; } } for (var7 = 0; var7 < 256 - var1; ++var7) { - this.field1042[var7] = this.field1042[var7 + var1]; + this.field1010[var7] = this.field1010[var7 + var1]; } for (var7 = 256 - var1; var7 < 256; ++var7) { - this.field1042[var7] = (int)(Math.sin((double)this.field1058 / 14.0D) * 16.0D + Math.sin((double)this.field1058 / 15.0D) * 14.0D + Math.sin((double)this.field1058 / 16.0D) * 12.0D); - ++this.field1058; + this.field1010[var7] = (int)(Math.sin((double)this.field1007 / 14.0D) * 16.0D + Math.sin((double)this.field1007 / 15.0D) * 14.0D + Math.sin((double)this.field1007 / 16.0D) * 12.0D); + ++this.field1007; } - this.field1055 = this.field1055 * 10000 + var1 * 100; + this.field1023 = this.field1023 * 10000 + var1 * 10000; var7 = ((Client.cycle & 1) + var1) / 2; if (var7 > 0) { short var16 = 128; @@ -284,13 +279,13 @@ public class LoginScreenAnimation { int var11; int var12; int var13; - for (var11 = 0; var11 < this.field1055 * 10000; ++var11) { + for (var11 = 0; var11 < this.field1023 * 100; ++var11) { var12 = (int)(Math.random() * (double)var10) + var17; var13 = (int)(Math.random() * (double)var16) + var16; - this.field1039[var12 + (var13 << 7)] = 192; + this.field1018[var12 + (var13 << 7)] = 192; } - this.field1055 = 0; + this.field1023 = 0; int var14; for (var11 = 0; var11 < 256; ++var11) { @@ -298,16 +293,16 @@ public class LoginScreenAnimation { var13 = var11 * 128; for (var14 = -var7; var14 < 128; ++var14) { - if (var7 + var14 < 128) { - var12 += this.field1039[var13 + var14 + var7]; + if (var14 + var7 < 128) { + var12 += this.field1018[var13 + var14 + var7]; } if (var14 - (var7 + 1) >= 0) { - var12 -= this.field1039[var13 + var14 - (var7 + 1)]; + var12 -= this.field1018[var14 + var13 - (var7 + 1)]; } if (var14 >= 0) { - this.field1043[var13 + var14] = var12 / (var7 * 2 + 1); + this.field1019[var13 + var14] = var12 / (var7 * 2 + 1); } } } @@ -318,15 +313,15 @@ public class LoginScreenAnimation { for (var13 = -var7; var13 < 256; ++var13) { var14 = var13 * 128; if (var13 + var7 < 256) { - var12 += this.field1043[var14 + var11 + var7 * 128]; + var12 += this.field1019[var7 * 128 + var14 + var11]; } if (var13 - (var7 + 1) >= 0) { - var12 -= this.field1043[var11 + var14 - (var7 + 1) * 128]; + var12 -= this.field1019[var11 + var14 - (var7 + 1) * 128]; } if (var13 >= 0) { - this.field1039[var11 + var14] = var12 / (var7 * 2 + 1); + this.field1018[var11 + var14] = var12 / (var7 * 2 + 1); } } } @@ -334,66 +329,66 @@ public class LoginScreenAnimation { } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(IIII)I", - garbageValue = "-1694024652" + garbageValue = "-12618056" ) - final int method1725(int var1, int var2, int var3) { + final int method1734(int var1, int var2, int var3) { int var4 = 256 - var3; - return (var4 * (var1 & 0xff00ff) + var3 * (var2 & 0xff00ff) & 0xff00ff00) + (var3 * (var2 & 0xff00) + var4 * (var1 & 0xff00) & 0xff0000) >> 8; + return (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) + (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) >> 8; } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-1640931413" + garbageValue = "1298717611" ) - final void method1726(int var1) { - int var2 = this.field1044.length; - if (this.field1048 * 16 > 0) { - this.method1727(this.field1048 * 16, this.field1046); - } else if (this.field1049 * 16 > 0) { - this.method1727(this.field1049 * 16, this.field1047); + final void method1754(int var1) { + int var2 = this.field1012.length; + if (this.field1016 * 16 > 0) { + this.method1736(this.field1016 * 16, this.field1014); + } else if (this.field1017 * 16 > 0) { + this.method1736(this.field1017 * 16, this.field1025); } else { for (int var3 = 0; var3 < var2; ++var3) { - this.field1044[var3] = this.field1045[var3]; + this.field1012[var3] = this.field1013[var3]; } } - this.method1728(var1); + this.method1733(var1); } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I[IB)V", - garbageValue = "117" + garbageValue = "36" ) - final void method1727(int var1, int[] var2) { - int var3 = this.field1044.length; + final void method1736(int var1, int[] var2) { + int var3 = this.field1012.length; for (int var4 = 0; var4 < var3; ++var4) { if (var1 > 768) { - this.field1044[var4] = this.method1725(this.field1045[var4], var2[var4], 1024 - var1); + this.field1012[var4] = this.method1734(this.field1013[var4], var2[var4], 1024 - var1); } else if (var1 > 256) { - this.field1044[var4] = var2[var4]; + this.field1012[var4] = var2[var4]; } else { - this.field1044[var4] = this.method1725(var2[var4], this.field1045[var4], 256 - var1); + this.field1012[var4] = this.method1734(var2[var4], this.field1013[var4], 256 - var1); } } } - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "379301456" + signature = "(IB)V", + garbageValue = "23" ) - final void method1728(int var1) { + final void method1733(int var1) { int var2 = 0; for (int var3 = 1; var3 < 255; ++var3) { - int var4 = (256 - var3) * this.field1042[var3] / 256; + int var4 = (256 - var3) * this.field1010[var3] / 256; int var5 = var4 + var1; int var6 = 0; int var7 = 128; @@ -402,22 +397,22 @@ public class LoginScreenAnimation { var5 = 0; } - if (var5 + 128 >= MusicPatchPcmStream.rasterProvider.width) { - var7 = MusicPatchPcmStream.rasterProvider.width - var5; + if (var5 + 128 >= SpotAnimationDefinition.rasterProvider.width) { + var7 = SpotAnimationDefinition.rasterProvider.width - var5; } - int var8 = var5 + (var3 + 8) * MusicPatchPcmStream.rasterProvider.width; + int var8 = var5 + (var3 + 8) * SpotAnimationDefinition.rasterProvider.width; var2 += var6; for (int var9 = var6; var9 < var7; ++var9) { - int var10 = this.field1039[var2++]; + int var10 = this.field1018[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.field1044[var10]; - int var14 = MusicPatchPcmStream.rasterProvider.pixels[var8]; - MusicPatchPcmStream.rasterProvider.pixels[var8++] = 0xff000000 | (var13 * (var14 & 0xff00) + var12 * (var10 & 0xff00) & 0xff0000) + ((var14 & 0xff00ff) * var13 + (var10 & 0xff00ff) * var12 & 0xff00ff00) >> 8; + var10 = this.field1012[var10]; + int var14 = SpotAnimationDefinition.rasterProvider.pixels[var8]; + SpotAnimationDefinition.rasterProvider.pixels[var8++] = -16777216 | ((var10 & 16711935) * var12 + (var14 & 16711935) * var13 & -16711936) + (var12 * (var10 & 65280) + var13 * (var14 & 65280) & 16711680) >> 8; } else { ++var8; } @@ -428,21 +423,21 @@ public class LoginScreenAnimation { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Llx;I)V", - garbageValue = "956004569" + signature = "(Llq;I)V", + garbageValue = "1544028562" ) - final void method1723(IndexedSprite var1) { + final void method1738(IndexedSprite var1) { int var2; - for (var2 = 0; var2 < this.field1041.length; ++var2) { - this.field1041[var2] = 0; + for (var2 = 0; var2 < this.field1020.length; ++var2) { + this.field1020[var2] = 0; } int var3; for (var2 = 0; var2 < 5000; ++var2) { var3 = (int)(Math.random() * 128.0D * 256.0D); - this.field1041[var3] = (int)(Math.random() * 256.0D); + this.field1020[var3] = (int)(Math.random() * 256.0D); } int var4; @@ -451,13 +446,13 @@ public class LoginScreenAnimation { for (var3 = 1; var3 < 255; ++var3) { for (var4 = 1; var4 < 127; ++var4) { var5 = var4 + (var3 << 7); - this.field1053[var5] = (this.field1041[var5 + 128] + this.field1041[var5 - 128] + this.field1041[var5 + 1] + this.field1041[var5 - 1]) / 4; + this.field1024[var5] = (this.field1020[var5 + 128] + this.field1020[var5 - 128] + this.field1020[var5 + 1] + this.field1020[var5 - 1]) / 4; } } - int[] var8 = this.field1041; - this.field1041 = this.field1053; - this.field1053 = var8; + int[] var8 = this.field1020; + this.field1020 = this.field1024; + this.field1024 = var8; } if (var1 != null) { @@ -469,7 +464,7 @@ public class LoginScreenAnimation { var5 = var4 + var1.xOffset + 16; int var6 = var3 + var1.yOffset + 16; int var7 = var5 + (var6 << 7); - this.field1041[var7] = 0; + this.field1020[var7] = 0; } } } @@ -477,67 +472,118 @@ public class LoginScreenAnimation { } - @ObfuscatedName("l") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-1877742024" + signature = "(I)V", + garbageValue = "-1780006768" ) - @Export("Messages_getHistorySize") - static int Messages_getHistorySize(int var0) { - ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); - return var1 == null ? 0 : var1.size(); + static void method1758() { + Iterator var0 = Messages.Messages_hashTable.iterator(); + + while (var0.hasNext()) { + Message var1 = (Message)var0.next(); + var1.clearIsFromFriend(); + } + } - @ObfuscatedName("gr") + @ObfuscatedName("ej") @ObfuscatedSignature( - signature = "(IIIIIIII)V", - garbageValue = "806808180" + signature = "(I)Llv;", + garbageValue = "158652413" ) - static final void method1724(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var8 = var6 - 334; - if (var8 < 0) { - var8 = 0; - } else if (var8 > 100) { - var8 = 100; + @Export("getWorldMap") + static WorldMap getWorldMap() { + return WorldMapCacheName.worldMap; + } + + @ObfuscatedName("go") + @ObfuscatedSignature( + signature = "(IIIIZI)V", + garbageValue = "1846245684" + ) + @Export("setViewportShape") + static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { + if (var2 < 1) { + var2 = 1; } - int var9 = (Client.zoomWidth - Client.zoomHeight) * var8 / 100 + Client.zoomHeight; - int var7 = var5 * var9 / 256; - var8 = 2048 - var3 & 2047; - var9 = 2048 - var4 & 2047; - int var10 = 0; - int var11 = 0; - int var12 = var7; - int var13; - int var14; - int var15; - if (var8 != 0) { - var13 = Rasterizer3D.Rasterizer3D_sine[var8]; - var14 = Rasterizer3D.Rasterizer3D_cosine[var8]; - var15 = var11 * var14 - var13 * var7 >> 16; - var12 = var11 * var13 + var14 * var7 >> 16; - var11 = var15; + if (var3 < 1) { + var3 = 1; } - if (var9 != 0) { - var13 = Rasterizer3D.Rasterizer3D_sine[var9]; - var14 = Rasterizer3D.Rasterizer3D_cosine[var9]; - var15 = var13 * var12 + var14 * var10 >> 16; - var12 = var14 * var12 - var13 * var10 >> 16; - var10 = var15; + int var5 = var3 - 334; + int var6; + if (var5 < 0) { + var6 = Client.field873; + } else if (var5 >= 100) { + var6 = Client.field822; + } else { + var6 = (Client.field822 - Client.field873) * var5 / 100 + Client.field873; } - PacketBuffer.cameraX = var0 - var10; - class43.cameraY = var1 - var11; - class1.cameraZ = var2 - var12; - GrandExchangeOfferNameComparator.cameraPitch = var3; - Interpreter.cameraYaw = var4; - if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (MouseHandler.oculusOrbFocalPointX >> 7 != Client.localPlayer.x >> 7 || WorldMapArea.oculusOrbFocalPointY >> 7 != Client.localPlayer.y >> 7)) { - var13 = Client.localPlayer.plane; - var14 = MusicPatchNode2.baseX * 64 + (MouseHandler.oculusOrbFocalPointX >> 7); - var15 = class1.baseY * 64 + (WorldMapArea.oculusOrbFocalPointY >> 7); - WorldMapLabel.changePlane(var14, var15, var13, true); + int var7 = var3 * var6 * 512 / (var2 * 334); + int var8; + int var9; + short var10; + if (var7 < Client.field652) { + var10 = Client.field652; + var6 = var10 * var2 * 334 / (var3 * 512); + if (var6 > Client.field661) { + var6 = Client.field661; + 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.field791) { + var10 = Client.field791; + var6 = var10 * var2 * 334 / (var3 * 512); + if (var6 < Client.field795) { + var6 = Client.field795; + 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) { + TilePaint.method3005(var2, var3); + } + + Client.viewportOffsetX = var0; + Client.viewportOffsetY = var1; + Client.viewportWidth = var2; + Client.viewportHeight = var3; + } + + @ObfuscatedName("hx") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "121" + ) + @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; } } diff --git a/runescape-client/src/main/java/LoginType.java b/runescape-client/src/main/java/LoginType.java index 33a2335037..cca9f99255 100644 --- a/runescape-client/src/main/java/LoginType.java +++ b/runescape-client/src/main/java/LoginType.java @@ -4,89 +4,97 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mu") +@ObfuscatedName("lu") @Implements("LoginType") public class LoginType { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lmu;" + signature = "Llu;" ) @Export("oldscape") public static final LoginType oldscape; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lmu;" + signature = "Llu;" ) - static final LoginType field4049; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lmu;" - ) - static final LoginType field4050; - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lmu;" - ) - static final LoginType field4051; - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Lmu;" - ) - static final LoginType field4058; - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "Lmu;" - ) - static final LoginType field4053; - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Lmu;" - ) - static final LoginType field4054; + static final LoginType field4025; @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lmu;" + signature = "Llu;" ) - static final LoginType field4055; - @ObfuscatedName("c") + static final LoginType field4026; + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lmu;" + signature = "Llu;" ) - public static final LoginType field4056; - @ObfuscatedName("f") + static final LoginType field4034; + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Llu;" + ) + static final LoginType field4028; + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "Llu;" + ) + static final LoginType field4027; + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "Llu;" + ) + static final LoginType field4030; + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "Llu;" + ) + static final LoginType field4029; + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "Llu;" + ) + public static final LoginType field4032; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1957513145 + intValue = -327526177 ) - final int field4057; - @ObfuscatedName("m") - final String field4048; + final int field4033; + @ObfuscatedName("f") + final String field4024; static { - oldscape = new LoginType(0, 0, "", ""); - field4049 = new LoginType(3, 1, "", ""); - field4050 = new LoginType(4, 2, "", ""); - field4051 = new LoginType(7, 3, "", ""); - field4058 = new LoginType(5, 4, "", ""); - field4053 = new LoginType(8, 5, "", ""); - field4054 = new LoginType(1, 6, "", ""); - field4055 = new LoginType(6, 7, "", ""); - field4056 = new LoginType(2, -1, "", "", true, new LoginType[]{oldscape, field4049, field4050, field4058, field4051}); + oldscape = new LoginType(7, 0, "", ""); + field4025 = new LoginType(8, 1, "", ""); + field4026 = new LoginType(0, 2, "", ""); + field4034 = new LoginType(2, 3, "", ""); + field4028 = new LoginType(5, 4, "", ""); + field4027 = new LoginType(1, 5, "", ""); + field4030 = new LoginType(3, 6, "", ""); + field4029 = new LoginType(6, 7, "", ""); + field4032 = new LoginType(4, -1, "", "", true, new LoginType[]{oldscape, field4025, field4026, field4028, field4034}); } LoginType(int var1, int var2, String var3, String var4) { - this.field4057 = var1; - this.field4048 = var4; + this.field4033 = var1; + this.field4024 = var4; } @ObfuscatedSignature( - signature = "(IILjava/lang/String;Ljava/lang/String;Z[Lmu;)V" + signature = "(IILjava/lang/String;Ljava/lang/String;Z[Llu;)V" ) LoginType(int var1, int var2, String var3, String var4, boolean var5, LoginType[] var6) { - this.field4057 = var1; - this.field4048 = var4; + this.field4033 = var1; + this.field4024 = var4; } public String toString() { - return this.field4048; + return this.field4024; + } + + public String abd() { + return this.field4024; + } + + public String abb() { + return this.field4024; } } diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java index 9f906ee130..428ed9f31d 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -3,245 +3,111 @@ 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("cn") +@ObfuscatedName("cd") @Implements("MenuAction") public class MenuAction { - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 1339211825 + @ObfuscatedName("y") + static int[] field1129; + @ObfuscatedName("jb") + @ObfuscatedSignature( + signature = "Ldt;" ) - static int field1160; - @ObfuscatedName("q") + @Export("textureProvider") + static TextureProvider textureProvider; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 627171033 + intValue = 1847436075 ) @Export("argument1") int argument1; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1724157347 + intValue = -833920995 ) @Export("argument2") int argument2; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -748556303 + intValue = -1626023363 ) @Export("opcode") int opcode; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 641907059 + intValue = 1315061643 ) @Export("argument0") int argument0; - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("action") String action; MenuAction() { } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lgu;B)I", - garbageValue = "-1" + signature = "(IB)Lir;", + garbageValue = "65" ) - @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; + @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 = EnumDefinition.EnumDefinition_archive.takeFile(8, var0); + var1 = new EnumDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); } - 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 = PacketBufferNode.standardizeChar(var9, var2); - var10 = PacketBufferNode.standardizeChar(var10, var2); - if (var10 != var9 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { - var9 = Character.toLowerCase(var9); - var10 = Character.toLowerCase(var10); - if (var10 != var9) { - return WorldMapArea.lowercaseChar(var9, var2) - WorldMapArea.lowercaseChar(var10, var2); - } - } + EnumDefinition.EnumDefinition_cached.put(var1, (long)var0); + return var1; } - - 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 (var18 != var20 && Character.toUpperCase(var18) != Character.toUpperCase(var20)) { - var18 = Character.toLowerCase(var18); - var20 = Character.toLowerCase(var20); - if (var18 != var20) { - return WorldMapArea.lowercaseChar(var18, var2) - WorldMapArea.lowercaseChar(var20, var2); - } - } - } - - var17 = var3 - var4; - if (var17 != 0) { - return var17; - } - for (int var19 = 0; var19 < var16; ++var19) { - var20 = var0.charAt(var19); - char var13 = var1.charAt(var19); - if (var13 != var20) { - return WorldMapArea.lowercaseChar(var20, var2) - WorldMapArea.lowercaseChar(var13, var2); - } - } - - return 0; } - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "([Ljava/lang/String;[SS)V", - garbageValue = "-2750" + signature = "(Lgv;Lle;B)Lgq;", + garbageValue = "35" ) - @Export("startSortingItemsByName") - public static void startSortingItemsByName(String[] var0, short[] var1) { - GrandExchangeOffer.sortItemsByName(var0, var1, 0, var0.length - 1); + @Export("getPacketBufferNode") + public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { + PacketBufferNode var2 = Buffer.method5567(); + 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("y") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(ILcx;ZI)I", - garbageValue = "-426931132" + signature = "(I)V", + garbageValue = "-2010675599" ) - static int method1992(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? Interpreter.field1111 : Calendar.field2507; - if (var0 == ScriptOpcodes.CC_GETSCROLLX) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.scrollX; - return 1; + static void method1993() { + Players.Players_count = 0; + + for (int var0 = 0; var0 < 2048; ++var0) { + Players.field1219[var0] = null; + Players.field1230[var0] = 1; } - if (var0 == ScriptOpcodes.CC_GETSCROLLY) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.scrollY; - return 1; - } - if (var0 == ScriptOpcodes.CC_GETTEXT) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.text; - return 1; - } - if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.scrollWidth; - return 1; - } - if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.scrollHeight; - return 1; - } - if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.modelZoom; - return 1; - } - if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.modelAngleX; - return 1; - } - if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.modelAngleZ; - return 1; - } - if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.modelAngleY; - return 1; - } - if (var0 == ScriptOpcodes.CC_GETTRANSTOP) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.transparencyTop; - return 1; - } - if (var0 == ScriptOpcodes.CC_GETTRANSBOT) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.transparencyBot; - return 1; - } - if (var0 == ScriptOpcodes.CC_GETCOLOUR) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.color; - return 1; - } - if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.color2; - return 1; - } - if (var0 == ScriptOpcodes.CC_GETFILLMODE) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); - return 1; - } - if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; - return 1; - } - return 2; + } } diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java index a6c9dcde0c..10d6c3950e 100644 --- a/runescape-client/src/main/java/Message.java +++ b/runescape-client/src/main/java/Message.java @@ -1,68 +1,57 @@ +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("bj") +@ObfuscatedName("bi") @Implements("Message") public class Message extends DualNode { - @ObfuscatedName("f") - public static short[][] field604; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Llx;" - ) - static IndexedSprite field606; - @ObfuscatedName("gf") - @ObfuscatedSignature( - signature = "Lly;" - ) - @Export("compass") - static Sprite compass; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -235508607 + intValue = -2140169479 ) @Export("count") int count; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 468304279 + intValue = -515858111 ) @Export("cycle") int cycle; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1991230871 + intValue = 1304431151 ) @Export("type") int type; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("sender") String sender; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Ljv;" + signature = "Ljx;" ) @Export("senderUsername") Username senderUsername; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Ljy;" + signature = "Ljj;" ) @Export("isFromFriend0") TriBool isFromFriend0; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Ljy;" + signature = "Ljj;" ) @Export("isFromIgnored0") TriBool isFromIgnored0; - @ObfuscatedName("i") + @ObfuscatedName("q") @Export("prefix") String prefix; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("text") String text; @@ -72,14 +61,15 @@ public class Message extends DualNode { this.set(var1, var2, var3, var4); } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V", - garbageValue = "-46" + signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-855898041" ) @Export("set") void set(int var1, String var2, String var3, String var4) { - this.count = HorizontalAlignment.method4701(); + int var5 = ++Messages.Messages_count - 1; + this.count = var5; this.cycle = Client.cycle; this.type = var1; this.sender = var2; @@ -90,20 +80,20 @@ public class Message extends DualNode { this.clearIsFromIgnored(); } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1828914917" + garbageValue = "613551051" ) @Export("clearIsFromFriend") void clearIsFromFriend() { this.isFromFriend0 = TriBool.TriBool_unknown; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "1322141944" + garbageValue = "16711680" ) @Export("isFromFriend") final boolean isFromFriend() { @@ -114,30 +104,30 @@ public class Message extends DualNode { return this.isFromFriend0 == TriBool.TriBool_true; } - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-728879206" - ) - @Export("fillIsFromFriend") - void fillIsFromFriend() { - this.isFromFriend0 = ArchiveLoader.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; - } - @ObfuscatedName("k") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-391302038" + garbageValue = "560292414" + ) + @Export("fillIsFromFriend") + void fillIsFromFriend() { + this.isFromFriend0 = class32.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "959069374" ) @Export("clearIsFromIgnored") void clearIsFromIgnored() { this.isFromIgnored0 = TriBool.TriBool_unknown; } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "1146765519" + signature = "(B)Z", + garbageValue = "44" ) @Export("isFromIgnored") final boolean isFromIgnored() { @@ -148,28 +138,399 @@ public class Message extends DualNode { return this.isFromIgnored0 == TriBool.TriBool_true; } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1299937735" + garbageValue = "984556307" ) @Export("fillIsFromIgnored") void fillIsFromIgnored() { - this.isFromIgnored0 = ArchiveLoader.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isFromIgnored0 = class32.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1250059182" + garbageValue = "-1799643505" ) @Export("fillSenderUsername") final void fillSenderUsername() { if (this.sender != null) { - this.senderUsername = new Username(GrandExchangeOfferTotalQuantityComparator.removeImageTag(this.sender), class40.loginType); + this.senderUsername = new Username(NetSocket.method3489(this.sender), FontName.loginType); } else { this.senderUsername = null; } } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(IB)Z", + garbageValue = "-10" + ) + public static boolean method1173(int var0) { + return (var0 >> 20 & 1) != 0; + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + signature = "(ILcr;ZS)I", + garbageValue = "13452" + ) + static int method1172(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; + return 1; + } else { + int var12; + if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12 == 0 ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12 == 2 ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12 == 5 ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12 == 1 ? 1 : 0; + return 1; + } else { + boolean var13; + if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { + var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (class2.grandExchangeEvents != null) { + class2.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var13); + } + + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { + var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (class2.grandExchangeEvents != null) { + class2.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var13); + } + + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { + Interpreter.Interpreter_intStackSize -= 2; + var13 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] == 1; + boolean var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; + if (class2.grandExchangeEvents != null) { + Client.GrandExchangeEvents_worldComparator.filterWorlds = var4; + class2.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var13); + } + + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { + var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (class2.grandExchangeEvents != null) { + class2.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var13); + } + + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { + var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (class2.grandExchangeEvents != null) { + class2.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var13); + } + + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class2.grandExchangeEvents == null ? 0 : class2.grandExchangeEvents.events.size(); + return 1; + } else { + GrandExchangeEvent var11; + if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)class2.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.world; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)class2.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.getOfferName(); + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)class2.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.getPreviousOfferName(); + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)class2.grandExchangeEvents.events.get(var3); + long var5 = SequenceDefinition.method4686() - Occluder.field1890 - 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[++Interpreter.Interpreter_stringStackSize - 1] = var10; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)class2.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)class2.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)class2.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id; + return 1; + } else { + return 2; + } + } + } + } + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + signature = "(ILcr;ZI)I", + garbageValue = "750943960" + ) + static int method1174(int var0, Script var1, boolean var2) { + String var3; + int var4; + if (var0 == ScriptOpcodes.APPEND_NUM) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var4; + return 1; + } else { + String var9; + if (var0 == ScriptOpcodes.APPEND) { + Interpreter.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var9; + return 1; + } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + Friend.intToString(var4, true); + return 1; + } else if (var0 == ScriptOpcodes.LOWERCASE) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.toLowerCase(); + return 1; + } else { + int var6; + int var10; + if (var0 == ScriptOpcodes.FROMDATE) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + long var11 = (11745L + (long)var10) * 86400000L; + 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[++Interpreter.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[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Integer.toString(var10); + return 1; + } else if (var0 == ScriptOpcodes.COMPARE) { + Interpreter.Interpreter_stringStackSize -= 2; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WallDecoration.method3245(TriBool.compareStrings(Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1], class60.clientLanguage)); + return 1; + } else { + int var5; + byte[] var13; + Font var14; + if (var0 == ScriptOpcodes.PARAHEIGHT) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + Interpreter.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var13 = WorldMapID.archive13.takeFile(var5, 0); + var14 = new Font(var13); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.lineCount(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.PARAWIDTH) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + Interpreter.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var13 = WorldMapID.archive13.takeFile(var5, 0); + var14 = new Font(var13); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.lineWidth(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { + Interpreter.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; + if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3; + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9; + } + + return 1; + } else if (var0 == ScriptOpcodes.ESCAPE) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); + return 1; + } else if (var0 == ScriptOpcodes.APPEND_CHAR) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + (char)var4; + return 1; + } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ArchiveDiskActionHandler.isCharPrintable((char)var10) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = RouteStrategy.isAlphaNumeric((char)var10) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClanMate.isCharAlphabetic((char)var10) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = NetCache.isDigit((char)var10) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.STRING_LENGTH) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + if (var3 != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.length(); + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.SUBSTRING) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + Interpreter.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.substring(var4, var5); + return 1; + } else if (var0 == ScriptOpcodes.REMOVETAGS) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.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[++Interpreter.Interpreter_stringStackSize - 1] = var17.toString(); + return 1; + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.indexOf(var4); + return 1; + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { + Interpreter.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.indexOf(var9, var5); + return 1; + } else if (var0 == ScriptOpcodes.UPPERCASE) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.toUpperCase(); + return 1; + } else { + return 2; + } + } + } else { + Interpreter.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; + if (WorldMapIcon_1.localPlayer.appearance != null && WorldMapIcon_1.localPlayer.appearance.isFemale) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9; + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3; + } + + return 1; + } + } + } + } + + @ObfuscatedName("iv") + @ObfuscatedSignature( + signature = "(Lhp;III)V", + garbageValue = "1258326389" + ) + @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 = (var1 - var0.width) / 2 + (var0.rawX * var1 >> 14); + } 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); + } + + } } diff --git a/runescape-client/src/main/java/Messages.java b/runescape-client/src/main/java/Messages.java index cc2884311b..9d9165d7c7 100644 --- a/runescape-client/src/main/java/Messages.java +++ b/runescape-client/src/main/java/Messages.java @@ -6,36 +6,39 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cb") +@ObfuscatedName("cn") @Implements("Messages") public class Messages { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("Messages_channels") static final Map Messages_channels; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lla;" + signature = "Lln;" ) @Export("Messages_hashTable") static final IterableNodeHashTable Messages_hashTable; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Ljk;" + signature = "Ljm;" ) @Export("Messages_queue") static final IterableDualNodeQueue Messages_queue; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -125602517 + intValue = -1379002883 ) @Export("Messages_count") static int Messages_count; - @ObfuscatedName("l") + @ObfuscatedName("gw") + @Export("regionMapArchives") + static byte[][] regionMapArchives; + @ObfuscatedName("gz") @ObfuscatedSignature( - signature = "Lhp;" + signature = "[Llq;" ) - @Export("ItemDefinition_archive") - public static AbstractArchive ItemDefinition_archive; + @Export("modIconSprites") + static IndexedSprite[] modIconSprites; static { Messages_channels = new HashMap(); @@ -43,868 +46,4 @@ public class Messages { Messages_queue = new IterableDualNodeQueue(); Messages_count = 0; } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "102" - ) - @Export("ViewportMouse_unpackY") - public static int ViewportMouse_unpackY(int var0) { - long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; - int var1 = (int)(var2 >>> 7 & 127L); - return var1; - } - - @ObfuscatedName("hz") - @ObfuscatedSignature( - signature = "(IIIILjava/lang/String;Ljava/lang/String;III)V", - garbageValue = "-1471324986" - ) - @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 = Archive.getPacketBufferNode(ClientPacket.field2247, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5475(class1.baseY * 64 + var1); - var8.packetBuffer.writeShortLE(WorldMapIcon_1.selectedItemSlot); - var8.packetBuffer.method5520(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeIntLE(MouseRecorder.selectedItemWidget); - var8.packetBuffer.method5475(MusicPatchNode2.baseX * 64 + var0); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.writeShortLE(class4.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 = Archive.getPacketBufferNode(ClientPacket.field2295, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShort(MusicPatchNode2.baseX * 64 + var0); - var8.packetBuffer.method5530(var3); - var8.packetBuffer.writeIntLE16(WorldMapEvent.field359); - var8.packetBuffer.writeShort(Client.field848); - var8.packetBuffer.writeShortLE(class1.baseY * 64 + var1); - 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 = Archive.getPacketBufferNode(ClientPacket.field2213, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(class1.baseY * 64 + var1); - var8.packetBuffer.method5502(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5530(var3); - var8.packetBuffer.method5475(MusicPatchNode2.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 = Archive.getPacketBufferNode(ClientPacket.field2282, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5520(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.writeShort(class1.baseY * 64 + var1); - var8.packetBuffer.writeShort(MusicPatchNode2.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 = Archive.getPacketBufferNode(ClientPacket.field2292, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5475(MusicPatchNode2.baseX * 64 + var0); - var8.packetBuffer.method5530(var3); - var8.packetBuffer.method5475(class1.baseY * 64 + var1); - var8.packetBuffer.method5520(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - 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 = Archive.getPacketBufferNode(ClientPacket.field2259, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5520(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5530(class1.baseY * 64 + var1); - var8.packetBuffer.method5530(MusicPatchNode2.baseX * 64 + var0); - var8.packetBuffer.writeShortLE(var3); - Client.packetWriter.addNode(var8); - } else if (var2 == 7) { - NPC 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; - PacketBufferNode var9 = Archive.getPacketBufferNode(ClientPacket.field2207, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5475(class4.selectedItemId); - var9.packetBuffer.writeShort(WorldMapIcon_1.selectedItemSlot); - var9.packetBuffer.method5475(var3); - var9.packetBuffer.method5521(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeInt(MouseRecorder.selectedItemWidget); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 8) { - NPC 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; - PacketBufferNode var9 = Archive.getPacketBufferNode(ClientPacket.field2304, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5475(var3); - var9.packetBuffer.method5521(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeIntLE(WorldMapEvent.field359); - var9.packetBuffer.method5530(Client.field848); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 9) { - NPC 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; - PacketBufferNode var9 = Archive.getPacketBufferNode(ClientPacket.field2274, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5521(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeShortLE(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 10) { - NPC 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; - PacketBufferNode var9 = Archive.getPacketBufferNode(ClientPacket.field2204, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5530(var3); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 11) { - NPC 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; - PacketBufferNode var9 = Archive.getPacketBufferNode(ClientPacket.field2254, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5475(var3); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 12) { - NPC 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; - PacketBufferNode var9 = Archive.getPacketBufferNode(ClientPacket.field2303, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(var3); - var9.packetBuffer.method5520(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 13) { - NPC 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; - PacketBufferNode var9 = Archive.getPacketBufferNode(ClientPacket.field2214, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5530(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 14) { - Player 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; - PacketBufferNode var9 = Archive.getPacketBufferNode(ClientPacket.field2284, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5475(WorldMapIcon_1.selectedItemSlot); - var9.packetBuffer.method5502(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeIntME(MouseRecorder.selectedItemWidget); - var9.packetBuffer.writeShort(var3); - var9.packetBuffer.writeShort(class4.selectedItemId); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 15) { - Player 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; - PacketBufferNode var9 = Archive.getPacketBufferNode(ClientPacket.field2277, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeIntLE16(WorldMapEvent.field359); - var9.packetBuffer.method5502(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5530(Client.field848); - var9.packetBuffer.writeShort(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 = Archive.getPacketBufferNode(ClientPacket.field2221, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(MouseRecorder.selectedItemWidget); - var8.packetBuffer.method5475(class4.selectedItemId); - var8.packetBuffer.method5520(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShortLE(WorldMapIcon_1.selectedItemSlot); - var8.packetBuffer.method5475(var3); - var8.packetBuffer.method5475(MusicPatchNode2.baseX * 64 + var0); - var8.packetBuffer.writeShortLE(class1.baseY * 64 + var1); - 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 = Archive.getPacketBufferNode(ClientPacket.field2293, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(WorldMapEvent.field359); - var8.packetBuffer.writeShort(Client.field848); - var8.packetBuffer.method5530(class1.baseY * 64 + var1); - var8.packetBuffer.method5530(MusicPatchNode2.baseX * 64 + var0); - var8.packetBuffer.method5520(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShortLE(var3); - 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 = Archive.getPacketBufferNode(ClientPacket.field2208, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5475(class1.baseY * 64 + var1); - var8.packetBuffer.writeShortLE(var3); - var8.packetBuffer.writeShortLE(MusicPatchNode2.baseX * 64 + var0); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - 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 = Archive.getPacketBufferNode(ClientPacket.field2256, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5475(var3); - var8.packetBuffer.method5530(MusicPatchNode2.baseX * 64 + var0); - var8.packetBuffer.writeShort(class1.baseY * 64 + var1); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - 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 = Archive.getPacketBufferNode(ClientPacket.field2269, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(class1.baseY * 64 + var1); - var8.packetBuffer.method5502(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShortLE(MusicPatchNode2.baseX * 64 + var0); - var8.packetBuffer.writeShortLE(var3); - 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 = Archive.getPacketBufferNode(ClientPacket.field2203, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5530(class1.baseY * 64 + var1); - var8.packetBuffer.writeShortLE(var3); - var8.packetBuffer.writeShort(MusicPatchNode2.baseX * 64 + var0); - var8.packetBuffer.method5502(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 = Archive.getPacketBufferNode(ClientPacket.field2218, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5475(var3); - var8.packetBuffer.method5530(class1.baseY * 64 + var1); - var8.packetBuffer.writeShort(MusicPatchNode2.baseX * 64 + var0); - Client.packetWriter.addNode(var8); - } else if (var2 == 23) { - if (Client.isMenuOpen) { - GrandExchangeOfferWorldComparator.scene.setViewportWalking(); - } else { - GrandExchangeOfferWorldComparator.scene.menuOpen(class42.plane, var0, var1, true); - } - } else if (var2 == 24) { - Widget var16 = class80.getWidget(var1); - boolean var12 = true; - if (var16.contentType > 0) { - var12 = GrandExchangeOfferAgeComparator.method149(var16); - } - - if (var12) { - PacketBufferNode var10 = Archive.getPacketBufferNode(ClientPacket.field2272, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var10); - } - } else if (var2 == 25) { - Widget var16 = Client.getWidgetChild(var1, var0); - if (var16 != null) { - WorldMapID.Widget_runOnTargetLeave(); - TileItem.method2053(var1, var0, HealthBar.method1957(class268.getWidgetClickMask(var16)), var16.itemId); - Client.isItemSelected = 0; - Client.selectedSpellActionName = FontName.method5318(var16); - if (Client.selectedSpellActionName == null) { - Client.selectedSpellActionName = "null"; - } - - if (var16.isIf3) { - Client.selectedSpellName = var16.dataText + ClientPreferences.colorStartTag(0xffffff); - } else { - Client.selectedSpellName = ClientPreferences.colorStartTag(0xff00) + var16.spellName + ClientPreferences.colorStartTag(0xffffff); - } - } - - return; - } else if (var2 == 26) { - GrandExchangeEvent.method73(); - } else if (var2 == 28) { - var8 = Archive.getPacketBufferNode(ClientPacket.field2272, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var8); - Widget var14 = class80.getWidget(var1); - if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { - int var11 = var14.cs1Instructions[0][1]; - Varps.Varps_main[var11] = 1 - Varps.Varps_main[var11]; - GrandExchangeOfferUnitPriceComparator.method124(var11); - } - } else if (var2 == 29) { - var8 = Archive.getPacketBufferNode(ClientPacket.field2272, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var8); - Widget var14 = class80.getWidget(var1); - if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { - int var11 = var14.cs1Instructions[0][1]; - if (Varps.Varps_main[var11] != var14.cs1ComparisonValues[0]) { - Varps.Varps_main[var11] = var14.cs1ComparisonValues[0]; - GrandExchangeOfferUnitPriceComparator.method124(var11); - } - } - } else if (var2 == 30) { - if (Client.meslayerContinueWidget == null) { - ScriptFrame.resumePauseWidget(var1, var0); - Client.meslayerContinueWidget = Client.getWidgetChild(var1, var0); - Strings.invalidateWidget(Client.meslayerContinueWidget); - } - } else if (var2 == 31) { - var8 = Archive.getPacketBufferNode(ClientPacket.field2266, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(var1); - var8.packetBuffer.writeIntLE16(MouseRecorder.selectedItemWidget); - var8.packetBuffer.method5475(WorldMapIcon_1.selectedItemSlot); - var8.packetBuffer.writeShortLE(class4.selectedItemId); - var8.packetBuffer.writeShortLE(var0); - var8.packetBuffer.method5475(var3); - Client.packetWriter.addNode(var8); - Client.field759 = 0; - ItemContainer.field549 = class80.getWidget(var1); - Client.field698 = var0; - } else if (var2 == 32) { - var8 = Archive.getPacketBufferNode(ClientPacket.field2232, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(WorldMapEvent.field359); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.writeShort(var0); - var8.packetBuffer.writeShortLE(var3); - var8.packetBuffer.writeShortLE(Client.field848); - Client.packetWriter.addNode(var8); - Client.field759 = 0; - ItemContainer.field549 = class80.getWidget(var1); - Client.field698 = var0; - } else if (var2 == 33) { - var8 = Archive.getPacketBufferNode(ClientPacket.field2290, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(var3); - var8.packetBuffer.writeIntME(var1); - var8.packetBuffer.writeShort(var0); - Client.packetWriter.addNode(var8); - Client.field759 = 0; - ItemContainer.field549 = class80.getWidget(var1); - Client.field698 = var0; - } else if (var2 == 34) { - var8 = Archive.getPacketBufferNode(ClientPacket.field2239, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5530(var3); - var8.packetBuffer.writeIntLE16(var1); - var8.packetBuffer.method5475(var0); - Client.packetWriter.addNode(var8); - Client.field759 = 0; - ItemContainer.field549 = class80.getWidget(var1); - Client.field698 = var0; - } else if (var2 == 35) { - var8 = Archive.getPacketBufferNode(ClientPacket.field2265, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntLE(var1); - var8.packetBuffer.method5475(var0); - var8.packetBuffer.method5475(var3); - Client.packetWriter.addNode(var8); - Client.field759 = 0; - ItemContainer.field549 = class80.getWidget(var1); - Client.field698 = var0; - } else if (var2 == 36) { - var8 = Archive.getPacketBufferNode(ClientPacket.field2281, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5475(var3); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.method5475(var0); - Client.packetWriter.addNode(var8); - Client.field759 = 0; - ItemContainer.field549 = class80.getWidget(var1); - Client.field698 = var0; - } else if (var2 == 37) { - var8 = Archive.getPacketBufferNode(ClientPacket.field2261, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.writeShort(var0); - var8.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var8); - Client.field759 = 0; - ItemContainer.field549 = class80.getWidget(var1); - Client.field698 = var0; - } else if (var2 == 38) { - WorldMapID.Widget_runOnTargetLeave(); - Widget var16 = class80.getWidget(var1); - Client.isItemSelected = 1; - WorldMapIcon_1.selectedItemSlot = var0; - MouseRecorder.selectedItemWidget = var1; - class4.selectedItemId = var3; - Strings.invalidateWidget(var16); - Client.selectedItemName = ClientPreferences.colorStartTag(0xff9040) + WorldMapArea.ItemDefinition_get(var3).name + ClientPreferences.colorStartTag(0xffffff); - if (Client.selectedItemName == null) { - Client.selectedItemName = "null"; - } - - return; - } else if (var2 == 39) { - var8 = Archive.getPacketBufferNode(ClientPacket.field2249, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5475(var3); - var8.packetBuffer.writeIntLE16(var1); - var8.packetBuffer.writeShortLE(var0); - Client.packetWriter.addNode(var8); - Client.field759 = 0; - ItemContainer.field549 = class80.getWidget(var1); - Client.field698 = var0; - } else if (var2 == 40) { - var8 = Archive.getPacketBufferNode(ClientPacket.field2229, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntLE16(var1); - var8.packetBuffer.writeShortLE(var0); - var8.packetBuffer.method5530(var3); - Client.packetWriter.addNode(var8); - Client.field759 = 0; - ItemContainer.field549 = class80.getWidget(var1); - Client.field698 = var0; - } else if (var2 == 41) { - var8 = Archive.getPacketBufferNode(ClientPacket.field2268, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntLE(var1); - var8.packetBuffer.method5530(var0); - var8.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var8); - Client.field759 = 0; - ItemContainer.field549 = class80.getWidget(var1); - Client.field698 = var0; - } else if (var2 == 42) { - var8 = Archive.getPacketBufferNode(ClientPacket.field2267, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.method5530(var0); - var8.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var8); - Client.field759 = 0; - ItemContainer.field549 = class80.getWidget(var1); - Client.field698 = var0; - } else if (var2 == 43) { - var8 = Archive.getPacketBufferNode(ClientPacket.field2235, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.writeIntME(var1); - var8.packetBuffer.writeShort(var0); - Client.packetWriter.addNode(var8); - Client.field759 = 0; - ItemContainer.field549 = class80.getWidget(var1); - Client.field698 = var0; - } else if (var2 == 44) { - Player 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; - PacketBufferNode var9 = Archive.getPacketBufferNode(ClientPacket.field2250, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(var3); - var9.packetBuffer.method5521(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 45) { - Player 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; - PacketBufferNode var9 = Archive.getPacketBufferNode(ClientPacket.field2301, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5520(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5530(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 46) { - Player 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; - PacketBufferNode var9 = Archive.getPacketBufferNode(ClientPacket.field2209, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5530(var3); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 47) { - Player 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; - PacketBufferNode var9 = Archive.getPacketBufferNode(ClientPacket.field2230, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5475(var3); - var9.packetBuffer.method5521(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 48) { - Player 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; - PacketBufferNode var9 = Archive.getPacketBufferNode(ClientPacket.field2241, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5520(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5530(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 49) { - Player 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; - PacketBufferNode var9 = Archive.getPacketBufferNode(ClientPacket.field2257, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5530(var3); - var9.packetBuffer.method5502(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 50) { - Player 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; - PacketBufferNode var9 = Archive.getPacketBufferNode(ClientPacket.field2278, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5502(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeShortLE(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 51) { - Player 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; - PacketBufferNode var9 = Archive.getPacketBufferNode(ClientPacket.field2253, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5521(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5475(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 57) { - Widget var16 = Client.getWidgetChild(var1, var0); - if (var16 != null) { - method2163(var3, var1, var0, var16.itemId, var5); - } - } else if (var2 == 58) { - Widget var16 = Client.getWidgetChild(var1, var0); - if (var16 != null) { - PacketBufferNode var9 = Archive.getPacketBufferNode(ClientPacket.field2285, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShortLE(Client.field848); - var9.packetBuffer.writeIntLE16(var1); - var9.packetBuffer.writeShortLE(Client.field812); - var9.packetBuffer.method5475(var0); - var9.packetBuffer.writeInt(WorldMapEvent.field359); - var9.packetBuffer.method5475(var16.itemId); - Client.packetWriter.addNode(var9); - } - - } else if (var2 == 1001) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = Archive.getPacketBufferNode(ClientPacket.field2226, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.method5520(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5530(MusicPatchNode2.baseX * 64 + var0); - var8.packetBuffer.method5475(class1.baseY * 64 + var1); - Client.packetWriter.addNode(var8); - - } else if (var2 == 1002) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var8 = Archive.getPacketBufferNode(ClientPacket.field2244, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5530(var3); - Client.packetWriter.addNode(var8); - - } else if (var2 == 1003) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - NPC var13 = Client.npcs[var3]; - if (var13 != null) { - NPCDefinition var17 = var13.definition; - if (var17.transforms != null) { - var17 = var17.transform(); - } - - if (var17 != null) { - PacketBufferNode var10 = Archive.getPacketBufferNode(ClientPacket.field2233, Client.packetWriter.isaacCipher); - var10.packetBuffer.method5530(var17.id); - Client.packetWriter.addNode(var10); - } - } - - } else if (var2 == 1004) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var8 = Archive.getPacketBufferNode(ClientPacket.field2227, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(var3); - Client.packetWriter.addNode(var8); - - } else if (var2 == 1005) { - Widget var16 = class80.getWidget(var1); - if (var16 != null && var16.itemQuantities[var0] >= 100000) { - ScriptEvent.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + WorldMapArea.ItemDefinition_get(var3).name); - } else { - PacketBufferNode var9 = Archive.getPacketBufferNode(ClientPacket.field2227, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShortLE(var3); - Client.packetWriter.addNode(var9); - } - - Client.field759 = 0; - ItemContainer.field549 = class80.getWidget(var1); - Client.field698 = var0; - - } else if (var2 != 1007) { - if (var2 == 1011 || var2 == 1008 || var2 == 1010 || var2 == 1009 || var2 == 1012) { - BoundaryObject.worldMap.menuAction(var2, var3, new Coord(var0), new Coord(var1)); - } - } - - if (Client.isItemSelected != 0) { - Client.isItemSelected = 0; - Strings.invalidateWidget(class80.getWidget(MouseRecorder.selectedItemWidget)); - } - - if (Client.isSpellSelected) { - WorldMapID.Widget_runOnTargetLeave(); - } - - if (ItemContainer.field549 != null && Client.field759 == 0) { - Strings.invalidateWidget(ItemContainer.field549); - } - - } - - @ObfuscatedName("hw") - @ObfuscatedSignature( - signature = "(IIIILjava/lang/String;B)V", - garbageValue = "48" - ) - static void method2163(int var0, int var1, int var2, int var3, String var4) { - Widget var5 = Client.getWidgetChild(var1, var2); - if (var5 == null) { - return; - } - if (var5.onOp != null) { - ScriptEvent var6 = new ScriptEvent(); - var6.widget = var5; - var6.opIndex = var0; - var6.targetName = var4; - var6.args = var5.onOp; - LoginPacket.runScriptEvent(var6); - } - - boolean var11 = true; - if (var5.contentType > 0) { - var11 = GrandExchangeOfferAgeComparator.method149(var5); - } - - if (!var11) { - return; - } - int var8 = class268.getWidgetClickMask(var5); - int var9 = var0 - 1; - boolean var7 = (var8 >> var9 + 1 & 1) != 0; - if (var7) { - PacketBufferNode var10; - if (var0 == 1) { - var10 = Archive.getPacketBufferNode(ClientPacket.field2271, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 2) { - var10 = Archive.getPacketBufferNode(ClientPacket.field2255, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 3) { - var10 = Archive.getPacketBufferNode(ClientPacket.field2206, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 4) { - var10 = Archive.getPacketBufferNode(ClientPacket.field2222, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 5) { - var10 = Archive.getPacketBufferNode(ClientPacket.field2243, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 6) { - var10 = Archive.getPacketBufferNode(ClientPacket.field2264, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 7) { - var10 = Archive.getPacketBufferNode(ClientPacket.field2288, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 8) { - var10 = Archive.getPacketBufferNode(ClientPacket.field2251, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 9) { - var10 = Archive.getPacketBufferNode(ClientPacket.field2287, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 10) { - var10 = Archive.getPacketBufferNode(ClientPacket.field2289, 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/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java index 79eac6f5ca..3911d2229e 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("gm") +@ObfuscatedName("ga") @Implements("MidiFileReader") public class MidiFileReader { - @ObfuscatedName("f") - static final byte[] field2468; - @ObfuscatedName("q") + @ObfuscatedName("d") + static final byte[] field2452; + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lkf;" + signature = "Lky;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("division") int division; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("trackStarts") int[] trackStarts; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("trackPositions") int[] trackPositions; - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("trackLengths") int[] trackLengths; - @ObfuscatedName("l") - int[] field2464; - @ObfuscatedName("b") - int field2460; - @ObfuscatedName("c") - long field2472; + @ObfuscatedName("n") + int[] field2446; + @ObfuscatedName("t") + int field2444; + @ObfuscatedName("x") + long field2449; static { - field2468 = 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}; + field2452 = 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,18 +46,20 @@ public class MidiFileReader { this.buffer = new Buffer((byte[])null); } - @ObfuscatedName("q") + @ObfuscatedName("s") @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.field2460 = 500000; + this.field2444 = 500000; this.trackStarts = new int[var2]; + Buffer var10000; + int var3; int var5; - for (int var3 = 0; var3 < var2; this.buffer.offset += var5) { + for (var3 = 0; var3 < var2; var10000.offset += var5) { int var4 = this.buffer.readInt(); var5 = this.buffer.readInt(); if (var4 == 1297379947) { @@ -65,144 +67,153 @@ public class MidiFileReader { ++var3; } + var10000 = this.buffer; } - this.field2472 = 0L; + this.field2449 = 0L; this.trackPositions = new int[var2]; - for (int var3 = 0; var3 < var2; ++var3) { + for (var3 = 0; var3 < var2; ++var3) { this.trackPositions[var3] = this.trackStarts[var3]; } this.trackLengths = new int[var2]; - this.field2464 = new int[var2]; + this.field2446 = new int[var2]; } - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("clear") void clear() { this.buffer.array = null; this.trackStarts = null; this.trackPositions = null; this.trackLengths = null; - this.field2464 = null; + this.field2446 = null; } - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("isReady") boolean isReady() { return this.buffer.array != null; } - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("trackCount") int trackCount() { return this.trackPositions.length; } - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("gotoTrack") void gotoTrack(int var1) { this.buffer.offset = this.trackPositions[var1]; } - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("markTrackPosition") void markTrackPosition(int var1) { this.trackPositions[var1] = this.buffer.offset; } - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("setTrackDone") void setTrackDone() { this.buffer.offset = -1; } - @ObfuscatedName("i") + @ObfuscatedName("q") @Export("readTrackLength") void readTrackLength(int var1) { int var2 = this.buffer.readVarInt(); - this.trackLengths[var1] += var2; + int[] var10000 = this.trackLengths; + var10000[var1] += var2; } - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("readMessage") int readMessage(int var1) { int var2 = this.readMessage0(var1); return var2; } - @ObfuscatedName("u") + @ObfuscatedName("d") @Export("readMessage0") int readMessage0(int var1) { byte var2 = this.buffer.array[this.buffer.offset]; int var5; if (var2 < 0) { var5 = var2 & 255; - this.field2464[var1] = var5; + this.field2446[var1] = var5; ++this.buffer.offset; } else { - var5 = this.field2464[var1]; + var5 = this.field2446[var1]; } if (var5 != 240 && var5 != 247) { - return this.method3840(var1, var5); - } - 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.field2464[var1] = var4; - return this.method3840(var1, var4); + return this.method3785(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.field2446[var1] = var4; + return this.method3785(var1, var4); + } } - } - this.buffer.offset += var3; - return 0; + Buffer var10000 = this.buffer; + var10000.offset += var3; + return 0; + } } - @ObfuscatedName("x") - int method3840(int var1, int var2) { + @ObfuscatedName("f") + int method3785(int var1, int var2) { int var4; if (var2 == 255) { int var7 = this.buffer.readUnsignedByte(); var4 = this.buffer.readVarInt(); + Buffer var10000; if (var7 == 47) { - this.buffer.offset += var4; + var10000 = this.buffer; + var10000.offset += var4; return 1; - } - if (var7 == 81) { + } else if (var7 == 81) { int var5 = this.buffer.readMedium(); var4 -= 3; int var6 = this.trackLengths[var1]; - this.field2472 += (long)var6 * (long)(this.field2460 - var5); - this.field2460 = var5; - this.buffer.offset += var4; + this.field2449 += (long)var6 * (long)(this.field2444 - var5); + this.field2444 = var5; + var10000 = this.buffer; + var10000.offset += var4; return 2; + } else { + var10000 = this.buffer; + var10000.offset += var4; + return 3; + } + } else { + byte var3 = field2452[var2 - 128]; + var4 = var2; + if (var3 >= 1) { + var4 = var2 | this.buffer.readUnsignedByte() << 8; } - this.buffer.offset += var4; - return 3; - } - byte var3 = field2468[var2 - 128]; - var4 = var2; - if (var3 >= 1) { - var4 = var2 | this.buffer.readUnsignedByte() << 8; - } - if (var3 >= 2) { - var4 |= this.buffer.readUnsignedByte() << 16; - } + if (var3 >= 2) { + var4 |= this.buffer.readUnsignedByte() << 16; + } - return var4; + return var4; + } + } + + @ObfuscatedName("c") + long method3786(int var1) { + return this.field2449 + (long)var1 * (long)this.field2444; } @ObfuscatedName("r") - long method3861(int var1) { - return this.field2472 + (long)var1 * (long)this.field2460; - } - - @ObfuscatedName("v") @Export("getPrioritizedTrack") int getPrioritizedTrack() { int var1 = this.trackPositions.length; @@ -233,15 +244,15 @@ public class MidiFileReader { return true; } - @ObfuscatedName("g") + @ObfuscatedName("p") @Export("reset") void reset(long var1) { - this.field2472 = var1; + this.field2449 = var1; int var3 = this.trackPositions.length; for (int var4 = 0; var4 < var3; ++var4) { this.trackLengths[var4] = 0; - this.field2464[var4] = 0; + this.field2446[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 4354df5fa2..9750d729a4 100644 --- a/runescape-client/src/main/java/MidiPcmStream.java +++ b/runescape-client/src/main/java/MidiPcmStream.java @@ -4,154 +4,154 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ga") +@ObfuscatedName("gp") @Implements("MidiPcmStream") public class MidiPcmStream extends PcmStream { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Llc;" + signature = "Llm;" ) @Export("musicPatches") NodeHashTable musicPatches; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -520728357 + intValue = 185095361 ) - int field2409; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 740980141 - ) - int field2426; - @ObfuscatedName("k") - int[] field2411; - @ObfuscatedName("l") - int[] field2412; - @ObfuscatedName("b") - int[] field2422; + int field2390; @ObfuscatedName("i") - int[] field2414; - @ObfuscatedName("c") - int[] field2413; - @ObfuscatedName("f") - int[] field2415; - @ObfuscatedName("m") - int[] field2429; + @ObfuscatedGetter( + intValue = 1841466363 + ) + int field2391; + @ObfuscatedName("k") + int[] field2406; @ObfuscatedName("u") - int[] field2418; - @ObfuscatedName("x") - int[] field2419; - @ObfuscatedName("t") - int[] field2421; - @ObfuscatedName("h") - int[] field2424; - @ObfuscatedName("o") - int[] field2423; + int[] field2393; @ObfuscatedName("n") - int[] field2410; + int[] field2394; + @ObfuscatedName("t") + int[] field2395; + @ObfuscatedName("q") + int[] field2413; + @ObfuscatedName("x") + int[] field2397; @ObfuscatedName("d") - int[] field2425; - @ObfuscatedName("s") + int[] field2398; + @ObfuscatedName("f") + int[] field2399; + @ObfuscatedName("c") + int[] field2400; + @ObfuscatedName("a") + int[] field2414; + @ObfuscatedName("w") + int[] field2403; + @ObfuscatedName("l") int[] field2408; - @ObfuscatedName("z") + @ObfuscatedName("h") + int[] field2389; + @ObfuscatedName("v") + int[] field2409; + @ObfuscatedName("m") + int[] field2415; + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "[[Lgi;" + signature = "[[Lgd;" ) - MusicPatchNode[][] field2427; - @ObfuscatedName("al") - @ObfuscatedSignature( - signature = "[[Lgi;" - ) - MusicPatchNode[][] field2428; + MusicPatchNode[][] field2405; @ObfuscatedName("av") @ObfuscatedSignature( - signature = "Lgm;" + signature = "[[Lgd;" + ) + MusicPatchNode[][] field2402; + @ObfuscatedName("am") + @ObfuscatedSignature( + signature = "Lga;" ) @Export("midiFile") MidiFileReader midiFile; - @ObfuscatedName("as") - boolean field2430; - @ObfuscatedName("aw") + @ObfuscatedName("ai") + boolean field2411; + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 56317899 + intValue = -2055331589 ) @Export("track") int track; - @ObfuscatedName("ad") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 1379550315 + intValue = -554202803 ) @Export("trackLength") int trackLength; - @ObfuscatedName("ag") + @ObfuscatedName("aj") @ObfuscatedGetter( - longValue = -8333505041211180397L + longValue = 3749824554300054537L ) - long field2433; - @ObfuscatedName("ar") + long field2396; + @ObfuscatedName("an") @ObfuscatedGetter( - longValue = -1344180019540033721L + longValue = -6758315928508632083L ) - long field2434; - @ObfuscatedName("ax") + long field2407; + @ObfuscatedName("at") @ObfuscatedSignature( - signature = "Lgq;" + signature = "Lgh;" ) @Export("patchStream") MusicPatchPcmStream patchStream; public MidiPcmStream() { - this.field2409 = 256; - this.field2426 = 1000000; - this.field2411 = new int[16]; - this.field2412 = new int[16]; - this.field2422 = new int[16]; - this.field2414 = new int[16]; + this.field2390 = 256; + this.field2391 = 1000000; + this.field2406 = new int[16]; + this.field2393 = new int[16]; + this.field2394 = new int[16]; + this.field2395 = new int[16]; this.field2413 = new int[16]; - this.field2415 = new int[16]; - this.field2429 = new int[16]; - this.field2418 = new int[16]; - this.field2419 = new int[16]; - this.field2421 = new int[16]; - this.field2424 = new int[16]; - this.field2423 = new int[16]; - this.field2410 = new int[16]; - this.field2425 = new int[16]; + this.field2397 = new int[16]; + this.field2398 = new int[16]; + this.field2399 = new int[16]; + this.field2400 = new int[16]; + this.field2414 = new int[16]; + this.field2403 = new int[16]; this.field2408 = new int[16]; - this.field2427 = new MusicPatchNode[16][128]; - this.field2428 = new MusicPatchNode[16][128]; + this.field2389 = new int[16]; + this.field2409 = new int[16]; + this.field2415 = new int[16]; + this.field2405 = new MusicPatchNode[16][128]; + this.field2402 = new MusicPatchNode[16][128]; this.midiFile = new MidiFileReader(); this.patchStream = new MusicPatchPcmStream(this); this.musicPatches = new NodeHashTable(128); - this.method3726(); + this.method3746(); } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "985423372" + garbageValue = "111893823" ) - public synchronized void method3706(int var1) { - this.field2409 = var1; + public synchronized void method3670(int var1) { + this.field2390 = var1; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "911615124" + garbageValue = "150252238" ) - public int method3707() { - return this.field2409; + public int method3648() { + return this.field2390; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lgl;Lhp;Ldf;II)Z", - garbageValue = "-2127323557" + signature = "(Lgy;Lhz;Ldh;II)Z", + garbageValue = "2084569814" ) @Export("loadMusicTrack") public synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) { - var1.method3925(); + var1.method3853(); boolean var5 = true; int[] var6 = null; if (var4 > 0) { @@ -179,7 +179,7 @@ public class MidiPcmStream extends PcmStream { this.musicPatches.put(var10, (long)var8); } - if (!var9.method3883(var3, var7.byteArray, var6)) { + if (!var9.method3825(var3, var7.byteArray, var6)) { var5 = false; } } @@ -191,10 +191,10 @@ public class MidiPcmStream extends PcmStream { return var5; } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-444816783" + garbageValue = "1428915424" ) @Export("clearAll") public synchronized void clearAll() { @@ -204,10 +204,10 @@ public class MidiPcmStream extends PcmStream { } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "535953816" + signature = "(B)V", + garbageValue = "-65" ) @Export("removeAll") public synchronized void removeAll() { @@ -217,65 +217,65 @@ public class MidiPcmStream extends PcmStream { } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "()Ldx;" + signature = "()Ldz;" ) @Export("firstSubStream") protected synchronized PcmStream firstSubStream() { return this.patchStream; } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "()Ldx;" + signature = "()Ldz;" ) @Export("nextSubStream") protected synchronized PcmStream nextSubStream() { return null; } - @ObfuscatedName("i") - protected synchronized int vmethod3892() { + @ObfuscatedName("q") + protected synchronized int vmethod3834() { return 0; } - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("fill") protected synchronized void fill(int[] var1, int var2, int var3) { if (this.midiFile.isReady()) { - int var4 = this.midiFile.division * this.field2426 * -727379968 / CollisionMap.PcmPlayer_sampleRate; + int var4 = this.midiFile.division * this.field2391 * -727379968 / PcmPlayer.PcmPlayer_sampleRate; do { - long var5 = this.field2433 + (long)var3 * (long)var4; - if (this.field2434 - var5 >= 0L) { - this.field2433 = var5; + long var5 = this.field2396 + (long)var3 * (long)var4; + if (this.field2407 - var5 >= 0L) { + this.field2396 = var5; break; } - int var7 = (int)(((long)var4 + (this.field2434 - this.field2433) - 1L) / (long)var4); - this.field2433 += (long)var7 * (long)var4; + int var7 = (int)(((long)var4 + (this.field2407 - this.field2396) - 1L) / (long)var4); + this.field2396 += (long)var7 * (long)var4; this.patchStream.fill(var1, var2, var7); var2 += var7; var3 -= var7; - this.method3738(); + this.method3679(); } while(this.midiFile.isReady()); } this.patchStream.fill(var1, var2, var3); } - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lgl;ZI)V", - garbageValue = "-2040319753" + signature = "(Lgy;ZB)V", + garbageValue = "69" ) @Export("setMusicTrack") public synchronized void setMusicTrack(MusicTrack var1, boolean var2) { this.clear(); this.midiFile.parse(var1.midi); - this.field2430 = var2; - this.field2433 = 0L; + this.field2411 = var2; + this.field2396 = 0L; int var3 = this.midiFile.trackCount(); for (int var4 = 0; var4 < var3; ++var4) { @@ -286,48 +286,48 @@ public class MidiPcmStream extends PcmStream { this.track = this.midiFile.getPrioritizedTrack(); this.trackLength = this.midiFile.trackLengths[this.track]; - this.field2434 = this.midiFile.method3861(this.trackLength); + this.field2407 = this.midiFile.method3786(this.trackLength); } - @ObfuscatedName("x") + @ObfuscatedName("f") @Export("skip") protected synchronized void skip(int var1) { if (this.midiFile.isReady()) { - int var2 = this.midiFile.division * this.field2426 * -727379968 / CollisionMap.PcmPlayer_sampleRate; + int var2 = this.midiFile.division * this.field2391 * -727379968 / PcmPlayer.PcmPlayer_sampleRate; do { - long var3 = this.field2433 + (long)var2 * (long)var1; - if (this.field2434 - var3 >= 0L) { - this.field2433 = var3; + long var3 = (long)var2 * (long)var1 + this.field2396; + if (this.field2407 - var3 >= 0L) { + this.field2396 = var3; break; } - int var5 = (int)((this.field2434 - this.field2433 + (long)var2 - 1L) / (long)var2); - this.field2433 += (long)var5 * (long)var2; + int var5 = (int)((this.field2407 - this.field2396 + (long)var2 - 1L) / (long)var2); + this.field2396 += (long)var2 * (long)var5; this.patchStream.skip(var5); var1 -= var5; - this.method3738(); + this.method3679(); } while(this.midiFile.isReady()); } this.patchStream.skip(var1); } - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1239536546" + signature = "(B)V", + garbageValue = "17" ) @Export("clear") public synchronized void clear() { this.midiFile.clear(); - this.method3726(); + this.method3746(); } - @ObfuscatedName("v") + @ObfuscatedName("r") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "529284444" + garbageValue = "52176988" ) @Export("isReady") public synchronized boolean isReady() { @@ -337,56 +337,56 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("y") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-1686884768" + garbageValue = "-847662861" ) - public synchronized void method3720(int var1, int var2) { - this.method3824(var1, var2); + public synchronized void method3655(int var1, int var2) { + this.method3739(var1, var2); + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "(IIB)V", + garbageValue = "-34" + ) + void method3739(int var1, int var2) { + this.field2395[var1] = var2; + this.field2397[var1] = var2 & -128; + this.method3657(var1, var2); } @ObfuscatedName("g") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "2040435181" + garbageValue = "-958579239" ) - void method3824(int var1, int var2) { - this.field2414[var1] = var2; - this.field2415[var1] = var2 & -128; - this.method3716(var1, var2); - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "5" - ) - void method3716(int var1, int var2) { + void method3657(int var1, int var2) { if (var2 != this.field2413[var1]) { this.field2413[var1] = var2; for (int var3 = 0; var3 < 128; ++var3) { - this.field2428[var1][var3] = null; + this.field2402[var1][var3] = null; } } } - @ObfuscatedName("j") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(IIII)V", - garbageValue = "659813426" + garbageValue = "1813896856" ) - void method3717(int var1, int var2, int var3) { - this.method3729(var1, var2, 64); - if ((this.field2421[var1] & 2) != 0) { + void method3658(int var1, int var2, int var3) { + this.method3752(var1, var2, 64); + if ((this.field2414[var1] & 2) != 0) { for (MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) { - if (var4.field2440 == var1 && var4.field2436 < 0) { - this.field2427[var1][var4.field2450] = null; - this.field2427[var1][var2] = var4; - int var5 = (var4.field2445 * var4.field2446 >> 12) + var4.field2441; - var4.field2441 += var2 - var4.field2450 << 8; - var4.field2445 = var5 - var4.field2441; - var4.field2446 = 4096; - var4.field2450 = var2; + if (var4.field2437 == var1 && var4.field2433 < 0) { + this.field2405[var1][var4.field2424] = null; + this.field2405[var1][var2] = var4; + int var5 = (var4.field2428 * var4.field2440 >> 12) + var4.field2426; + var4.field2426 += var2 - var4.field2424 << 8; + var4.field2428 = var5 - var4.field2426; + var4.field2440 = 4096; + var4.field2424 = var2; return; } } @@ -397,137 +397,137 @@ public class MidiPcmStream extends PcmStream { RawSound var8 = var9.rawSounds[var2]; if (var8 != null) { MusicPatchNode var6 = new MusicPatchNode(); - var6.field2440 = var1; + var6.field2437 = var1; var6.patch = var9; var6.rawSound = var8; - var6.field2452 = var9.field2481[var2]; - var6.field2438 = var9.field2479[var2]; - var6.field2450 = var2; - var6.field2442 = var3 * var3 * var9.field2476[var2] * var9.field2475 + 1024 >> 11; - var6.field2443 = var9.field2477[var2] & 255; - var6.field2441 = (var2 << 8) - (var9.field2482[var2] & 0x7fff); - var6.field2447 = 0; - var6.field2448 = 0; - var6.field2449 = 0; - var6.field2436 = -1; - var6.field2451 = 0; - if (this.field2410[var1] == 0) { - var6.stream = RawPcmStream.method2524(var8, this.method3730(var6), this.method3731(var6), this.method3732(var6)); + var6.field2422 = var9.field2460[var2]; + var6.field2423 = var9.field2461[var2]; + var6.field2424 = var2; + var6.field2425 = var3 * var3 * var9.field2462[var2] * var9.field2459 + 1024 >> 11; + var6.field2429 = var9.field2463[var2] & 255; + var6.field2426 = (var2 << 8) - (var9.field2457[var2] & 32767); + var6.field2430 = 0; + var6.field2431 = 0; + var6.field2432 = 0; + var6.field2433 = -1; + var6.field2434 = 0; + if (this.field2389[var1] == 0) { + var6.stream = RawPcmStream.method2460(var8, this.method3660(var6), this.method3704(var6), this.method3673(var6)); } else { - var6.stream = RawPcmStream.method2524(var8, this.method3730(var6), 0, this.method3732(var6)); - this.method3767(var6, var9.field2482[var2] < 0); + var6.stream = RawPcmStream.method2460(var8, this.method3660(var6), 0, this.method3673(var6)); + this.method3731(var6, var9.field2457[var2] < 0); } - if (var9.field2482[var2] < 0) { + if (var9.field2457[var2] < 0) { var6.stream.setNumLoops(-1); } - if (var6.field2438 >= 0) { - MusicPatchNode var7 = this.field2428[var1][var6.field2438]; - if (var7 != null && var7.field2436 < 0) { - this.field2427[var1][var7.field2450] = null; - var7.field2436 = 0; + if (var6.field2423 >= 0) { + MusicPatchNode var7 = this.field2402[var1][var6.field2423]; + if (var7 != null && var7.field2433 < 0) { + this.field2405[var1][var7.field2424] = null; + var7.field2433 = 0; } - this.field2428[var1][var6.field2438] = var6; + this.field2402[var1][var6.field2423] = var6; } this.patchStream.queue.addFirst(var6); - this.field2427[var1][var2] = var6; + this.field2405[var1][var2] = var6; } } } - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "(Lgi;ZB)V", - garbageValue = "-58" - ) - void method3767(MusicPatchNode var1, boolean var2) { - int var3 = var1.rawSound.samples.length; - int var4; - if (var2 && var1.rawSound.field1393) { - int var5 = var3 + var3 - var1.rawSound.start; - var4 = (int)((long)var5 * (long)this.field2410[var1.field2440] >> 6); - var3 <<= 8; - if (var4 >= var3) { - var4 = var3 + var3 - 1 - var4; - var1.stream.method2614(); - } - } else { - var4 = (int)((long)var3 * (long)this.field2410[var1.field2440] >> 6); - } - - var1.stream.method2596(var4); - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "(IIII)V", - garbageValue = "-1579005533" - ) - void method3729(int var1, int var2, int var3) { - MusicPatchNode var4 = this.field2427[var1][var2]; - if (var4 != null) { - this.field2427[var1][var2] = null; - if ((this.field2421[var1] & 2) != 0) { - for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var5.field2440 == var4.field2440 && var5.field2436 < 0 && var4 != var5) { - var4.field2436 = 0; - break; - } - } - } else { - var4.field2436 = 0; - } - - } - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "(IIII)V", - garbageValue = "2105784371" - ) - void method3788(int var1, int var2, int var3) { - } - @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "8" + signature = "(Lgd;ZI)V", + garbageValue = "942908769" ) - void method3793(int var1, int var2) { + void method3731(MusicPatchNode var1, boolean var2) { + int var3 = var1.rawSound.samples.length; + int var4; + if (var2 && var1.rawSound.field1362) { + int var5 = var3 + var3 - var1.rawSound.start; + var4 = (int)((long)this.field2389[var1.field2437] * (long)var5 >> 6); + var3 <<= 8; + if (var4 >= var3) { + var4 = var3 + var3 - 1 - var4; + var1.stream.method2469(); + } + } else { + var4 = (int)((long)var3 * (long)this.field2389[var1.field2437] >> 6); + } + + var1.stream.method2468(var4); } - @ObfuscatedName("al") + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "(IIIB)V", + garbageValue = "19" + ) + void method3752(int var1, int var2, int var3) { + MusicPatchNode var4 = this.field2405[var1][var2]; + if (var4 != null) { + this.field2405[var1][var2] = null; + if ((this.field2414[var1] & 2) != 0) { + for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { + if (var5.field2437 == var4.field2437 && var5.field2433 < 0 && var4 != var5) { + var4.field2433 = 0; + break; + } + } + } else { + var4.field2433 = 0; + } + + } + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "(IIII)V", + garbageValue = "-942200921" + ) + void method3661(int var1, int var2, int var3) { + } + + @ObfuscatedName("az") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "1785966044" + garbageValue = "-12366119" ) - void method3722(int var1, int var2) { - this.field2429[var1] = var2; + void method3662(int var1, int var2) { } - @ObfuscatedName("av") + @ObfuscatedName("at") + @ObfuscatedSignature( + signature = "(III)V", + garbageValue = "-1514841200" + ) + void method3663(int var1, int var2) { + this.field2398[var1] = var2; + } + + @ObfuscatedName("as") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "889719076" + garbageValue = "-1503846449" ) - void method3723(int var1) { + void method3736(int var1) { for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var1 < 0 || var2.field2440 == var1) { + if (var1 < 0 || var2.field2437 == var1) { if (var2.stream != null) { - var2.stream.method2540(CollisionMap.PcmPlayer_sampleRate / 100); - if (var2.stream.method2585()) { + var2.stream.method2473(PcmPlayer.PcmPlayer_sampleRate / 100); + if (var2.stream.method2457()) { this.patchStream.mixer.addSubStream(var2.stream); } - var2.method3826(); + var2.method3767(); } - if (var2.field2436 < 0) { - this.field2427[var2.field2440][var2.field2450] = null; + if (var2.field2433 < 0) { + this.field2405[var2.field2437][var2.field2424] = null; } var2.remove(); @@ -536,80 +536,44 @@ public class MidiPcmStream extends PcmStream { } - @ObfuscatedName("as") + @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "112" + signature = "(II)V", + garbageValue = "1795083748" ) - void method3724(int var1) { + void method3737(int var1) { if (var1 >= 0) { - this.field2411[var1] = 12800; - this.field2412[var1] = 8192; - this.field2422[var1] = 16383; - this.field2429[var1] = 8192; - this.field2418[var1] = 0; - this.field2419[var1] = 8192; - this.method3715(var1); - this.method3784(var1); - this.field2421[var1] = 0; - this.field2424[var1] = 0x7fff; - this.field2423[var1] = 256; - this.field2410[var1] = 0; - this.method3754(var1, 8192); + this.field2406[var1] = 12800; + this.field2393[var1] = 8192; + this.field2394[var1] = 16383; + this.field2398[var1] = 8192; + this.field2399[var1] = 0; + this.field2400[var1] = 8192; + this.method3659(var1); + this.method3765(var1); + this.field2414[var1] = 0; + this.field2403[var1] = 32767; + this.field2408[var1] = 256; + this.field2389[var1] = 0; + this.method3671(var1, 8192); } else { for (var1 = 0; var1 < 16; ++var1) { - this.method3724(var1); + this.method3737(var1); } } } - @ObfuscatedName("aw") + @ObfuscatedName("ac") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "786188119" + garbageValue = "-2085170598" ) - void method3714(int var1) { + void method3685(int var1) { for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if ((var1 < 0 || var2.field2440 == var1) && var2.field2436 < 0) { - this.field2427[var2.field2440][var2.field2450] = null; - var2.field2436 = 0; - } - } - - } - - @ObfuscatedName("ad") - @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "23201" - ) - void method3726() { - this.method3723(-1); - this.method3724(-1); - - int var1; - for (var1 = 0; var1 < 16; ++var1) { - this.field2413[var1] = this.field2414[var1]; - } - - for (var1 = 0; var1 < 16; ++var1) { - this.field2415[var1] = this.field2414[var1] & -128; - } - - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-117878160" - ) - void method3715(int var1) { - if ((this.field2421[var1] & 2) != 0) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var2.field2440 == var1 && this.field2427[var1][var2.field2450] == null && var2.field2436 < 0) { - var2.field2436 = 0; - } + if ((var1 < 0 || var2.field2437 == var1) && var2.field2433 < 0) { + this.field2405[var2.field2437][var2.field2424] = null; + var2.field2433 = 0; } } @@ -617,14 +581,34 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("ar") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1541338262" + signature = "(I)V", + garbageValue = "541615354" ) - void method3784(int var1) { - if ((this.field2421[var1] & 4) != 0) { + void method3746() { + this.method3736(-1); + this.method3737(-1); + + int var1; + for (var1 = 0; var1 < 16; ++var1) { + this.field2413[var1] = this.field2395[var1]; + } + + for (var1 = 0; var1 < 16; ++var1) { + this.field2397[var1] = this.field2395[var1] & -128; + } + + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "955617478" + ) + void method3659(int var1) { + if ((this.field2414[var1] & 2) != 0) { for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var2.field2440 == var1) { - var2.field2444 = 0; + if (var2.field2437 == var1 && this.field2405[var1][var2.field2424] == null && var2.field2433 < 0) { + var2.field2433 = 0; } } } @@ -634,9 +618,25 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("ax") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "946217459" + garbageValue = "127764810" ) - void method3728(int var1) { + void method3765(int var1) { + if ((this.field2414[var1] & 4) != 0) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { + if (var2.field2437 == var1) { + var2.field2439 = 0; + } + } + } + + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "-2066346211" + ) + void method3697(int var1) { int var2 = var1 & 240; int var3; int var4; @@ -645,257 +645,260 @@ public class MidiPcmStream extends PcmStream { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; - this.method3729(var3, var4, var5); + this.method3752(var3, var4, var5); } else if (var2 == 144) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; if (var5 > 0) { - this.method3717(var3, var4, var5); + this.method3658(var3, var4, var5); } else { - this.method3729(var3, var4, 64); + this.method3752(var3, var4, 64); } } else if (var2 == 160) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; - this.method3788(var3, var4, var5); + this.method3661(var3, var4, var5); } else if (var2 == 176) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; if (var4 == 0) { - this.field2415[var3] = (var5 << 14) + (this.field2415[var3] & -2080769); + this.field2397[var3] = (var5 << 14) + (this.field2397[var3] & -2080769); } if (var4 == 32) { - this.field2415[var3] = (var5 << 7) + (this.field2415[var3] & -16257); + this.field2397[var3] = (var5 << 7) + (this.field2397[var3] & -16257); } if (var4 == 1) { - this.field2418[var3] = (var5 << 7) + (this.field2418[var3] & -16257); + this.field2399[var3] = (var5 << 7) + (this.field2399[var3] & -16257); } if (var4 == 33) { - this.field2418[var3] = var5 + (this.field2418[var3] & -128); + this.field2399[var3] = var5 + (this.field2399[var3] & -128); } if (var4 == 5) { - this.field2419[var3] = (var5 << 7) + (this.field2419[var3] & -16257); + this.field2400[var3] = (var5 << 7) + (this.field2400[var3] & -16257); } if (var4 == 37) { - this.field2419[var3] = var5 + (this.field2419[var3] & -128); + this.field2400[var3] = var5 + (this.field2400[var3] & -128); } if (var4 == 7) { - this.field2411[var3] = (var5 << 7) + (this.field2411[var3] & -16257); + this.field2406[var3] = (var5 << 7) + (this.field2406[var3] & -16257); } if (var4 == 39) { - this.field2411[var3] = var5 + (this.field2411[var3] & -128); + this.field2406[var3] = var5 + (this.field2406[var3] & -128); } if (var4 == 10) { - this.field2412[var3] = (var5 << 7) + (this.field2412[var3] & -16257); + this.field2393[var3] = (var5 << 7) + (this.field2393[var3] & -16257); } if (var4 == 42) { - this.field2412[var3] = var5 + (this.field2412[var3] & -128); + this.field2393[var3] = var5 + (this.field2393[var3] & -128); } if (var4 == 11) { - this.field2422[var3] = (var5 << 7) + (this.field2422[var3] & -16257); + this.field2394[var3] = (var5 << 7) + (this.field2394[var3] & -16257); } if (var4 == 43) { - this.field2422[var3] = var5 + (this.field2422[var3] & -128); + this.field2394[var3] = var5 + (this.field2394[var3] & -128); } int[] var10000; if (var4 == 64) { if (var5 >= 64) { - var10000 = this.field2421; + var10000 = this.field2414; var10000[var3] |= 1; } else { - var10000 = this.field2421; + var10000 = this.field2414; var10000[var3] &= -2; } } if (var4 == 65) { if (var5 >= 64) { - var10000 = this.field2421; + var10000 = this.field2414; var10000[var3] |= 2; } else { - this.method3715(var3); - var10000 = this.field2421; + this.method3659(var3); + var10000 = this.field2414; var10000[var3] &= -3; } } if (var4 == 99) { - this.field2424[var3] = (var5 << 7) + (this.field2424[var3] & 127); + this.field2403[var3] = (var5 << 7) + (this.field2403[var3] & 127); } if (var4 == 98) { - this.field2424[var3] = (this.field2424[var3] & 16256) + var5; + this.field2403[var3] = (this.field2403[var3] & 16256) + var5; } if (var4 == 101) { - this.field2424[var3] = (var5 << 7) + (this.field2424[var3] & 127) + 16384; + this.field2403[var3] = (var5 << 7) + (this.field2403[var3] & 127) + 16384; } if (var4 == 100) { - this.field2424[var3] = (this.field2424[var3] & 16256) + var5 + 16384; + this.field2403[var3] = (this.field2403[var3] & 16256) + var5 + 16384; } if (var4 == 120) { - this.method3723(var3); + this.method3736(var3); } if (var4 == 121) { - this.method3724(var3); + this.method3737(var3); } if (var4 == 123) { - this.method3714(var3); + this.method3685(var3); } int var6; if (var4 == 6) { - var6 = this.field2424[var3]; + var6 = this.field2403[var3]; if (var6 == 16384) { - this.field2423[var3] = (var5 << 7) + (this.field2423[var3] & -16257); + this.field2408[var3] = (var5 << 7) + (this.field2408[var3] & -16257); } } if (var4 == 38) { - var6 = this.field2424[var3]; + var6 = this.field2403[var3]; if (var6 == 16384) { - this.field2423[var3] = var5 + (this.field2423[var3] & -128); + this.field2408[var3] = var5 + (this.field2408[var3] & -128); } } if (var4 == 16) { - this.field2410[var3] = (var5 << 7) + (this.field2410[var3] & -16257); + this.field2389[var3] = (var5 << 7) + (this.field2389[var3] & -16257); } if (var4 == 48) { - this.field2410[var3] = var5 + (this.field2410[var3] & -128); + this.field2389[var3] = var5 + (this.field2389[var3] & -128); } if (var4 == 81) { if (var5 >= 64) { - var10000 = this.field2421; + var10000 = this.field2414; var10000[var3] |= 4; } else { - this.method3784(var3); - var10000 = this.field2421; + this.method3765(var3); + var10000 = this.field2414; var10000[var3] &= -5; } } if (var4 == 17) { - this.method3754(var3, (var5 << 7) + (this.field2425[var3] & -16257)); + this.method3671(var3, (var5 << 7) + (this.field2409[var3] & -16257)); } if (var4 == 49) { - this.method3754(var3, var5 + (this.field2425[var3] & -128)); + this.method3671(var3, var5 + (this.field2409[var3] & -128)); } } else if (var2 == 192) { var3 = var1 & 15; var4 = var1 >> 8 & 127; - this.method3716(var3, var4 + this.field2415[var3]); + this.method3657(var3, var4 + this.field2397[var3]); } else if (var2 == 208) { var3 = var1 & 15; var4 = var1 >> 8 & 127; - this.method3793(var3, var4); + this.method3662(var3, var4); } else if (var2 == 224) { var3 = var1 & 15; var4 = (var1 >> 8 & 127) + (var1 >> 9 & 16256); - this.method3722(var3, var4); - } else if ((var1 & 255) == 255) { - this.method3726(); + this.method3663(var3, var4); + } else { + var2 = var1 & 255; + if (var2 == 255) { + this.method3746(); + } } } - @ObfuscatedName("ai") + @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "14" + signature = "(III)V", + garbageValue = "-1884051216" ) - void method3754(int var1, int var2) { - this.field2425[var1] = var2; - this.field2408[var1] = (int)(2097152.0D * Math.pow(2.0D, (double)var2 * 5.4931640625E-4D) + 0.5D); + void method3671(int var1, int var2) { + this.field2409[var1] = var2; + this.field2415[var1] = (int)(2097152.0D * Math.pow(2.0D, (double)var2 * 5.4931640625E-4D) + 0.5D); } - @ObfuscatedName("ak") + @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "(Lgi;I)I", - garbageValue = "-1889826116" + signature = "(Lgd;I)I", + garbageValue = "1407355408" ) - int method3730(MusicPatchNode var1) { - int var2 = (var1.field2445 * var1.field2446 >> 12) + var1.field2441; - var2 += (this.field2429[var1.field2440] - 8192) * this.field2423[var1.field2440] >> 12; - MusicPatchNode2 var3 = var1.field2452; + int method3660(MusicPatchNode var1) { + int var2 = (var1.field2428 * var1.field2440 >> 12) + var1.field2426; + var2 += (this.field2398[var1.field2437] - 8192) * this.field2408[var1.field2437] >> 12; + MusicPatchNode2 var3 = var1.field2422; int var4; - if (var3.field2394 > 0 && (var3.field2393 > 0 || this.field2418[var1.field2440] > 0)) { - var4 = var3.field2393 << 2; - int var5 = var3.field2395 << 1; - if (var1.field2458 < var5) { - var4 = var4 * var1.field2458 / var5; + if (var3.field2376 > 0 && (var3.field2375 > 0 || this.field2399[var1.field2437] > 0)) { + var4 = var3.field2375 << 2; + int var5 = var3.field2377 << 1; + if (var1.field2435 < var5) { + var4 = var4 * var1.field2435 / var5; } - var4 += this.field2418[var1.field2440] >> 7; - double var6 = Math.sin(0.01227184630308513D * (double)(var1.field2453 & 511)); - var2 += (int)(var6 * (double)var4); + var4 += this.field2399[var1.field2437] >> 7; + double var6 = Math.sin(0.01227184630308513D * (double)(var1.field2436 & 511)); + var2 += (int)((double)var4 * var6); } - var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)CollisionMap.PcmPlayer_sampleRate + 0.5D); + var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)PcmPlayer.PcmPlayer_sampleRate + 0.5D); return var4 < 1 ? 1 : var4; } - @ObfuscatedName("ah") + @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "(Lgi;B)I", - garbageValue = "-94" + signature = "(Lgd;B)I", + garbageValue = "114" ) - int method3731(MusicPatchNode var1) { - MusicPatchNode2 var2 = var1.field2452; - int var3 = this.field2422[var1.field2440] * this.field2411[var1.field2440] + 4096 >> 13; + int method3704(MusicPatchNode var1) { + MusicPatchNode2 var2 = var1.field2422; + int var3 = this.field2394[var1.field2437] * this.field2406[var1.field2437] + 4096 >> 13; var3 = var3 * var3 + 16384 >> 15; - var3 = var3 * var1.field2442 + 16384 >> 15; - var3 = var3 * this.field2409 + 128 >> 8; - if (var2.field2392 > 0) { - var3 = (int)((double)var3 * Math.pow(0.5D, 1.953125E-5D * (double)var1.field2447 * (double)var2.field2392) + 0.5D); + var3 = var3 * var1.field2425 + 16384 >> 15; + var3 = var3 * this.field2390 + 128 >> 8; + if (var2.field2372 > 0) { + var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field2372 * 1.953125E-5D * (double)var1.field2430) + 0.5D); } int var4; int var5; int var6; int var7; - if (var2.field2387 != null) { - var4 = var1.field2448; - var5 = var2.field2387[var1.field2449 * 4 + 1]; - if (var1.field2449 * 4 < var2.field2387.length - 2) { - var6 = (var2.field2387[var1.field2449 * 4] & 255) << 8; - var7 = (var2.field2387[var1.field2449 * 4 + 2] & 255) << 8; - var5 += (var2.field2387[var1.field2449 * 4 + 3] - var5) * (var4 - var6) / (var7 - var6); + if (var2.field2369 != null) { + var4 = var1.field2431; + var5 = var2.field2369[var1.field2432 * 4 + 1]; + if (var1.field2432 * 4 < var2.field2369.length - 2) { + var6 = (var2.field2369[var1.field2432 * 4] & 255) << 8; + var7 = (var2.field2369[var1.field2432 * 4 + 2] & 255) << 8; + var5 += (var2.field2369[var1.field2432 * 4 + 3] - var5) * (var4 - var6) / (var7 - var6); } - var3 = var5 * var3 + 32 >> 6; + var3 = var3 * var5 + 32 >> 6; } - if (var1.field2436 > 0 && var2.field2388 != null) { - var4 = var1.field2436; - var5 = var2.field2388[var1.field2451 * 4 + 1]; - if (var1.field2451 * 4 < var2.field2388.length - 2) { - var6 = (var2.field2388[var1.field2451 * 4] & 255) << 8; - var7 = (var2.field2388[var1.field2451 * 4 + 2] & 255) << 8; - var5 += (var2.field2388[var1.field2451 * 4 + 3] - var5) * (var4 - var6) / (var7 - var6); + if (var1.field2433 > 0 && var2.field2370 != null) { + var4 = var1.field2433; + var5 = var2.field2370[var1.field2434 * 2 + 1]; + if (var1.field2434 * 2 < var2.field2370.length - 2) { + var6 = (var2.field2370[var1.field2434 * 2] & 255) << 8; + var7 = (var2.field2370[var1.field2434 * 2 + 2] & 255) << 8; + var5 += (var4 - var6) * (var2.field2370[var1.field2434 * 2 + 3] - var5) / (var7 - var6); } var3 = var5 * var3 + 32 >> 6; @@ -904,51 +907,52 @@ public class MidiPcmStream extends PcmStream { return var3; } - @ObfuscatedName("am") + @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "(Lgi;I)I", - garbageValue = "-1266735092" + signature = "(Lgd;B)I", + garbageValue = "0" ) - int method3732(MusicPatchNode var1) { - int var2 = this.field2412[var1.field2440]; - return var2 < 8192 ? var2 * var1.field2443 + 32 >> 6 : 16384 - ((128 - var1.field2443) * (16384 - var2) + 32 >> 6); + int method3673(MusicPatchNode var1) { + int var2 = this.field2393[var1.field2437]; + return var2 < 8192 ? var2 * var1.field2429 + 32 >> 6 : 16384 - ((128 - var1.field2429) * (16384 - var2) + 32 >> 6); } - @ObfuscatedName("af") + @ObfuscatedName("ad") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1310291586" + garbageValue = "1618427490" ) - void method3738() { + void method3679() { int var1 = this.track; int var2 = this.trackLength; long var3; - for (var3 = this.field2434; var2 == this.trackLength; var3 = this.midiFile.method3861(var2)) { + for (var3 = this.field2407; var2 == this.trackLength; var3 = this.midiFile.method3786(var2)) { while (var2 == this.midiFile.trackLengths[var1]) { this.midiFile.gotoTrack(var1); int var5 = this.midiFile.readMessage(var1); if (var5 == 1) { + this.midiFile.setTrackDone(); + this.midiFile.markTrackPosition(var1); + if (this.midiFile.isDone()) { + if (!this.field2411 || var2 == 0) { + this.method3746(); + this.midiFile.clear(); + return; + } + + this.midiFile.reset(var3); + } break; } + if ((var5 & 128) != 0) { - this.method3728(var5); + this.method3697(var5); } this.midiFile.readTrackLength(var1); this.midiFile.markTrackPosition(var1); - } - this.midiFile.setTrackDone(); - this.midiFile.markTrackPosition(var1); - if (this.midiFile.isDone()) { - if (!this.field2430 || var2 == 0) { - this.method3726(); - this.midiFile.clear(); - return; - } - } - this.midiFile.reset(var3); var1 = this.midiFile.getPrioritizedTrack(); var2 = this.midiFile.trackLengths[var1]; @@ -956,134 +960,176 @@ public class MidiPcmStream extends PcmStream { this.track = var1; this.trackLength = var2; - this.field2434 = var3; + this.field2407 = var3; } - @ObfuscatedName("ab") + @ObfuscatedName("al") @ObfuscatedSignature( - signature = "(Lgi;I)Z", - garbageValue = "2116286373" + signature = "(Lgd;B)Z", + garbageValue = "0" ) - boolean method3739(MusicPatchNode var1) { - if (var1.stream != null) { - return false; - } - if (var1.field2436 >= 0) { - var1.remove(); - if (var1.field2438 > 0 && var1 == this.field2428[var1.field2440][var1.field2438]) { - this.field2428[var1.field2440][var1.field2438] = null; - } - } - - return true; - } - - @ObfuscatedName("bp") - @ObfuscatedSignature( - signature = "(Lgi;[IIII)Z", - garbageValue = "-176973860" - ) - boolean method3740(MusicPatchNode var1, int[] var2, int var3, int var4) { - var1.field2455 = CollisionMap.PcmPlayer_sampleRate / 100; - if (var1.field2436 >= 0 && (var1.stream == null || var1.stream.method2558())) { - var1.method3826(); - var1.remove(); - if (var1.field2438 > 0 && var1 == this.field2428[var1.field2440][var1.field2438]) { - this.field2428[var1.field2440][var1.field2438] = null; - } - - return true; - } - int var5 = var1.field2446; - if (var5 > 0) { - var5 -= (int) (16.0D * Math.pow(2.0D, 4.921259842519685E-4D * (double) this.field2419[var1.field2440]) + 0.5D); - if (var5 < 0) { - var5 = 0; - } - - var1.field2446 = var5; - } - - var1.stream.method2538(this.method3730(var1)); - MusicPatchNode2 var6 = var1.field2452; - boolean var7 = false; - ++var1.field2458; - var1.field2453 += var6.field2394; - double var8 = 5.086263020833333E-6D * (double) ((var1.field2450 - 60 << 8) + (var1.field2445 * var1.field2446 >> 12)); - if (var6.field2392 > 0) { - if (var6.field2391 > 0) { - var1.field2447 += (int) (128.0D * Math.pow(2.0D, var8 * (double) var6.field2391) + 0.5D); - } else { - var1.field2447 += 128; - } - } - - if (var6.field2387 != null) { - if (var6.field2390 > 0) { - var1.field2448 += (int) (128.0D * Math.pow(2.0D, (double) var6.field2390 * var8) + 0.5D); - } else { - var1.field2448 += 128; - } - - while (var1.field2449 * 4 < var6.field2387.length - 2 && var1.field2448 > (var6.field2387[var1.field2449 * 4 + 2] & 255) << 8) { - var1.field2449 = var1.field2449 * 4 + 2; - } - - if (var1.field2449 * 4 == var6.field2387.length - 2 && var6.field2387[var1.field2449 * 4 + 1] == 0) { - var7 = true; - } - } - - if (var1.field2436 >= 0 && var6.field2388 != null && (this.field2421[var1.field2440] & 1) == 0 && (var1.field2438 < 0 || var1 != this.field2428[var1.field2440][var1.field2438])) { - if (var6.field2398 > 0) { - var1.field2436 += (int) (128.0D * Math.pow(2.0D, (double) var6.field2398 * var8) + 0.5D); - } else { - var1.field2436 += 128; - } - - while (var1.field2451 * 4 < var6.field2388.length - 2 && var1.field2436 > (var6.field2388[var1.field2451 * 4 + 2] & 255) << 8) { - var1.field2451 = var1.field2451 * 4 + 2; - } - - if (var1.field2451 * 4 == var6.field2388.length - 2) { - var7 = true; - } - } - - if (var7) { - var1.stream.method2540(var1.field2455); - if (var2 != null) { - var1.stream.fill(var2, var3, var4); - } else { - var1.stream.skip(var4); - } - - if (var1.stream.method2585()) { - this.patchStream.mixer.addSubStream(var1.stream); - } - - var1.method3826(); - if (var1.field2436 >= 0) { + boolean method3680(MusicPatchNode var1) { + if (var1.stream == null) { + if (var1.field2433 >= 0) { var1.remove(); - if (var1.field2438 > 0 && var1 == this.field2428[var1.field2440][var1.field2438]) { - this.field2428[var1.field2440][var1.field2438] = null; + if (var1.field2423 > 0 && var1 == this.field2402[var1.field2437][var1.field2423]) { + this.field2402[var1.field2437][var1.field2423] = null; } } return true; + } else { + return false; } - var1.stream.method2536(var1.field2455, this.method3731(var1), this.method3732(var1)); - return false; } - @ObfuscatedName("w") + @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "1881799127" + signature = "(Lgd;[IIIB)Z", + garbageValue = "96" ) - @Export("hasReflectionCheck") - public static boolean hasReflectionCheck() { - ReflectionCheck var0 = (ReflectionCheck)class96.reflectionChecks.last(); - return var0 != null; + boolean method3665(MusicPatchNode var1, int[] var2, int var3, int var4) { + var1.field2438 = PcmPlayer.PcmPlayer_sampleRate / 100; + if (var1.field2433 < 0 || var1.stream != null && !var1.stream.method2476()) { + int var5 = var1.field2440; + if (var5 > 0) { + var5 -= (int)(16.0D * Math.pow(2.0D, 4.921259842519685E-4D * (double)this.field2400[var1.field2437]) + 0.5D); + if (var5 < 0) { + var5 = 0; + } + + var1.field2440 = var5; + } + + var1.stream.method2474(this.method3660(var1)); + MusicPatchNode2 var6 = var1.field2422; + boolean var7 = false; + ++var1.field2435; + var1.field2436 += var6.field2376; + double var8 = (double)((var1.field2424 - 60 << 8) + (var1.field2428 * var1.field2440 >> 12)) * 5.086263020833333E-6D; + if (var6.field2372 > 0) { + if (var6.field2374 > 0) { + var1.field2430 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2374 * var8) + 0.5D); + } else { + var1.field2430 += 128; + } + } + + if (var6.field2369 != null) { + if (var6.field2371 > 0) { + var1.field2431 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2371 * var8) + 0.5D); + } else { + var1.field2431 += 128; + } + + while (var1.field2432 * 4 < var6.field2369.length - 2 && var1.field2431 > (var6.field2369[var1.field2432 * 4 + 2] & 255) << 8) { + var1.field2432 = var1.field2432 * 4 + 2; + } + + if (var1.field2432 * 4 == var6.field2369.length - 2 && var6.field2369[var1.field2432 * 4 + 1] == 0) { + var7 = true; + } + } + + if (var1.field2433 >= 0 && var6.field2370 != null && (this.field2414[var1.field2437] & 1) == 0 && (var1.field2423 < 0 || var1 != this.field2402[var1.field2437][var1.field2423])) { + if (var6.field2373 > 0) { + var1.field2433 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2373) + 0.5D); + } else { + var1.field2433 += 128; + } + + while (var1.field2434 * 2 < var6.field2370.length - 2 && var1.field2433 > (var6.field2370[var1.field2434 * 2 + 2] & 255) << 8) { + var1.field2434 = var1.field2434 * 4 + 4; + } + + if (var1.field2434 * 2 == var6.field2370.length - 2) { + var7 = true; + } + } + + if (var7) { + var1.stream.method2473(var1.field2438); + if (var2 != null) { + var1.stream.fill(var2, var3, var4); + } else { + var1.stream.skip(var4); + } + + if (var1.stream.method2457()) { + this.patchStream.mixer.addSubStream(var1.stream); + } + + var1.method3767(); + if (var1.field2433 >= 0) { + var1.remove(); + if (var1.field2423 > 0 && var1 == this.field2402[var1.field2437][var1.field2423]) { + this.field2402[var1.field2437][var1.field2423] = null; + } + } + + return true; + } else { + var1.stream.method2472(var1.field2438, this.method3704(var1), this.method3673(var1)); + return false; + } + } else { + var1.method3767(); + var1.remove(); + if (var1.field2423 > 0 && var1 == this.field2402[var1.field2437][var1.field2423]) { + this.field2402[var1.field2437][var1.field2423] = null; + } + + return true; + } + } + + @ObfuscatedName("fo") + @ObfuscatedSignature( + signature = "(Lhp;III)V", + garbageValue = "-799494099" + ) + @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 || !FriendSystem.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 = var4 * var8 + var5 * var7 >> 11; + int var10 = var8 * var5 - var7 * var4 >> 11; + int var11 = var9 + WorldMapIcon_1.localPlayer.x >> 7; + int var12 = WorldMapIcon_1.localPlayer.y - var10 >> 7; + PacketBufferNode var13 = MenuAction.getPacketBufferNode(ClientPacket.field2237, Client.packetWriter.isaacCipher); + var13.packetBuffer.writeByte(18); + var13.packetBuffer.method5443(RouteStrategy.baseY * 64 + var12); + var13.packetBuffer.method5443(PacketWriter.baseX * 64 + var11); + var13.packetBuffer.method5433(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(WorldMapIcon_1.localPlayer.x); + var13.packetBuffer.writeShort(WorldMapIcon_1.localPlayer.y); + var13.packetBuffer.writeByte(63); + Client.packetWriter.addNode(var13); + Client.destinationX = var11; + Client.destinationY = var12; + } + } + + } } } diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java index 64e33f8e39..7eef410229 100644 --- a/runescape-client/src/main/java/MilliClock.java +++ b/runescape-client/src/main/java/MilliClock.java @@ -4,129 +4,324 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fe") +@ObfuscatedName("fg") @Implements("MilliClock") public class MilliClock extends Clock { - @ObfuscatedName("q") - long[] field2011; - @ObfuscatedName("w") + @ObfuscatedName("kh") @ObfuscatedGetter( - intValue = 406251697 + intValue = 145701519 ) - int field2014; - @ObfuscatedName("e") + @Export("menuX") + static int menuX; + @ObfuscatedName("s") + long[] field2002; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1542069259 + intValue = -986799109 ) - int field2013; - @ObfuscatedName("p") + int field1999; + @ObfuscatedName("i") @ObfuscatedGetter( - longValue = -5256643665710280471L + intValue = -1675223211 ) - long field2012; + int field2000; @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 729258425 + longValue = 5516400529090944549L ) - int field2015; - @ObfuscatedName("l") + long field2003; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1018209541 + intValue = -1296421545 ) - int field2016; + int field2001; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 1277322541 + ) + int field1998; MilliClock() { - this.field2011 = new long[10]; - this.field2014 = 256; - this.field2013 = 1; - this.field2015 = 0; - this.field2012 = DirectByteArrayCopier.currentTimeMs(); + this.field2002 = new long[10]; + this.field1999 = 256; + this.field2000 = 1; + this.field2001 = 0; + this.field2003 = SequenceDefinition.method4686(); for (int var1 = 0; var1 < 10; ++var1) { - this.field2011[var1] = this.field2012; + this.field2002[var1] = this.field2003; } } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1402657312" + garbageValue = "-779324795" ) @Export("mark") public void mark() { for (int var1 = 0; var1 < 10; ++var1) { - this.field2011[var1] = 0L; + this.field2002[var1] = 0L; } } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "-333181863" + garbageValue = "930751718" ) @Export("wait") - public int wait(int tickLength, int fiveOrOne) { - int var3 = this.field2014; - int var4 = this.field2013; - this.field2014 = 300; - this.field2013 = 1; - this.field2012 = DirectByteArrayCopier.currentTimeMs(); - if (this.field2011[this.field2016] == 0L) { - this.field2014 = var3; - this.field2013 = var4; - } else if (this.field2012 > this.field2011[this.field2016]) { - this.field2014 = (int)((long)(tickLength * 2560) / (this.field2012 - this.field2011[this.field2016])); + public int wait(int var1, int var2) { + int var3 = this.field1999; + int var4 = this.field2000; + this.field1999 = 300; + this.field2000 = 1; + this.field2003 = SequenceDefinition.method4686(); + if (this.field2002[this.field1998] == 0L) { + this.field1999 = var3; + this.field2000 = var4; + } else if (this.field2003 > this.field2002[this.field1998]) { + this.field1999 = (int)((long)(var1 * 2560) / (this.field2003 - this.field2002[this.field1998])); } - if (this.field2014 < 25) { - this.field2014 = 25; + if (this.field1999 < 25) { + this.field1999 = 25; } - if (this.field2014 > 256) { - this.field2014 = 256; - this.field2013 = (int)((long) tickLength - (this.field2012 - this.field2011[this.field2016]) / 10L); + if (this.field1999 > 256) { + this.field1999 = 256; + this.field2000 = (int)((long)var1 - (this.field2003 - this.field2002[this.field1998]) / 10L); } - if (this.field2013 > tickLength) { - this.field2013 = tickLength; + if (this.field2000 > var1) { + this.field2000 = var1; } - this.field2011[this.field2016] = this.field2012; - this.field2016 = (this.field2016 + 1) % 10; + this.field2002[this.field1998] = this.field2003; + this.field1998 = (this.field1998 + 1) % 10; int var5; - if (this.field2013 > 1) { + if (this.field2000 > 1) { for (var5 = 0; var5 < 10; ++var5) { - if (0L != this.field2011[var5]) { - this.field2011[var5] += (long)this.field2013; + if (0L != this.field2002[var5]) { + this.field2002[var5] += (long)this.field2000; } } } - if (this.field2013 < fiveOrOne) { - this.field2013 = fiveOrOne; + if (this.field2000 < var2) { + this.field2000 = var2; } - EnumDefinition.sleepMillis((long)this.field2013); + UserList.sleepMillis((long)this.field2000); - for (var5 = 0; this.field2015 < 256; this.field2015 += this.field2014) { + for (var5 = 0; this.field2001 < 256; this.field2001 += this.field1999) { ++var5; } - this.field2015 &= 255; + this.field2001 &= 255; return var5; } - @ObfuscatedName("c") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IIIB)I", - garbageValue = "-93" + signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-1790253551" ) - static int method3468(int var0, int var1, int var2) { - if ((Tiles.Tiles_renderFlags[var0][var1][var2] & 8) != 0) { - return 0; + @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); } - return var0 > 0 && (Tiles.Tiles_renderFlags[1][var1][var2] & 2) != 0 ? var0 - 1 : var0; + + 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; + } + + @ObfuscatedName("fm") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1981832610" + ) + static final void method3405() { + int var0; + int var1; + int var2; + int var3; + int var4; + int var5; + if (Client.oculusOrbState == 0) { + var0 = WorldMapIcon_1.localPlayer.x; + var1 = WorldMapIcon_1.localPlayer.y; + if (DynamicObject.oculusOrbFocalPointX - var0 < -500 || DynamicObject.oculusOrbFocalPointX - var0 > 500 || FriendSystem.oculusOrbFocalPointY - var1 < -500 || FriendSystem.oculusOrbFocalPointY - var1 > 500) { + DynamicObject.oculusOrbFocalPointX = var0; + FriendSystem.oculusOrbFocalPointY = var1; + } + + if (var0 != DynamicObject.oculusOrbFocalPointX) { + DynamicObject.oculusOrbFocalPointX += (var0 - DynamicObject.oculusOrbFocalPointX) / 16; + } + + if (var1 != FriendSystem.oculusOrbFocalPointY) { + FriendSystem.oculusOrbFocalPointY += (var1 - FriendSystem.oculusOrbFocalPointY) / 16; + } + + var2 = DynamicObject.oculusOrbFocalPointX >> 7; + var3 = FriendSystem.oculusOrbFocalPointY >> 7; + var4 = GrandExchangeOfferTotalQuantityComparator.getTileHeight(DynamicObject.oculusOrbFocalPointX, FriendSystem.oculusOrbFocalPointY, ItemContainer.plane); + var5 = 0; + int var6; + if (var2 > 3 && var3 > 3 && var2 < 100 && var3 < 100) { + for (var6 = var2 - 4; var6 <= var2 + 4; ++var6) { + for (int var7 = var3 - 4; var7 <= var3 + 4; ++var7) { + int var8 = ItemContainer.plane; + if (var8 < 3 && (Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) { + ++var8; + } + + int var9 = var4 - Tiles.Tiles_heights[var8][var6][var7]; + if (var9 > var5) { + var5 = var9; + } + } + } + } + + var6 = var5 * 192; + if (var6 > 98048) { + var6 = 98048; + } + + if (var6 < 32768) { + var6 = 32768; + } + + if (var6 > Client.field635) { + Client.field635 += (var6 - Client.field635) / 24; + } else if (var6 < Client.field635) { + Client.field635 += (var6 - Client.field635) / 80; + } + + ScriptEvent.field559 = GrandExchangeOfferTotalQuantityComparator.getTileHeight(WorldMapIcon_1.localPlayer.x, WorldMapIcon_1.localPlayer.y, ItemContainer.plane) - Client.camFollowHeight; + } else if (Client.oculusOrbState == 1) { + GrandExchangeOffer.method122(); + short var10 = -1; + if (KeyHandler.KeyHandler_pressedKeys[33]) { + var10 = 0; + } else if (KeyHandler.KeyHandler_pressedKeys[49]) { + var10 = 1024; + } + + if (KeyHandler.KeyHandler_pressedKeys[48]) { + if (var10 == 0) { + var10 = 1792; + } else if (var10 == 1024) { + var10 = 1280; + } else { + var10 = 1536; + } + } else if (KeyHandler.KeyHandler_pressedKeys[50]) { + if (var10 == 0) { + var10 = 256; + } else if (var10 == 1024) { + var10 = 768; + } else { + var10 = 512; + } + } + + byte var11 = 0; + if (KeyHandler.KeyHandler_pressedKeys[35]) { + var11 = -1; + } else if (KeyHandler.KeyHandler_pressedKeys[51]) { + var11 = 1; + } + + var2 = 0; + if (var10 >= 0 || var11 != 0) { + var2 = KeyHandler.KeyHandler_pressedKeys[81] ? Client.oculusOrbSlowedSpeed : Client.oculusOrbNormalSpeed; + var2 *= 16; + Client.field701 = var10; + Client.field680 = var11; + } + + if (Client.field700 < var2) { + Client.field700 += var2 / 8; + if (Client.field700 > var2) { + Client.field700 = var2; + } + } else if (Client.field700 > var2) { + Client.field700 = Client.field700 * 9 / 10; + } + + if (Client.field700 > 0) { + var3 = Client.field700 / 16; + if (Client.field701 >= 0) { + var0 = Client.field701 - class40.cameraYaw & 2047; + var4 = Rasterizer3D.Rasterizer3D_sine[var0]; + var5 = Rasterizer3D.Rasterizer3D_cosine[var0]; + DynamicObject.oculusOrbFocalPointX += var4 * var3 / 65536; + FriendSystem.oculusOrbFocalPointY += var5 * var3 / 65536; + } + + if (Client.field680 != 0) { + ScriptEvent.field559 += var3 * Client.field680; + if (ScriptEvent.field559 > 0) { + ScriptEvent.field559 = 0; + } + } + } else { + Client.field701 = -1; + Client.field680 = -1; + } + + if (KeyHandler.KeyHandler_pressedKeys[13]) { + WorldMapSection0.method221(); + } + } + + if (MouseHandler.MouseHandler_currentButton == 4 && FriendSystem.mouseCam) { + var0 = MouseHandler.MouseHandler_y - Client.mouseCamClickedY; + Client.camAngleDX = var0 * 2; + Client.mouseCamClickedY = var0 != -1 && var0 != 1 ? (MouseHandler.MouseHandler_y + Client.mouseCamClickedY) / 2 : MouseHandler.MouseHandler_y; + var1 = Client.mouseCamClickedX - MouseHandler.MouseHandler_x; + Client.camAngleDY = var1 * 2; + Client.mouseCamClickedX = var1 != -1 && var1 != 1 ? (MouseHandler.MouseHandler_x + Client.mouseCamClickedX) / 2 : MouseHandler.MouseHandler_x; + } else { + if (KeyHandler.KeyHandler_pressedKeys[96]) { + Client.camAngleDY += (-24 - Client.camAngleDY) / 2; + } else if (KeyHandler.KeyHandler_pressedKeys[97]) { + Client.camAngleDY += (24 - Client.camAngleDY) / 2; + } else { + Client.camAngleDY /= 2; + } + + if (KeyHandler.KeyHandler_pressedKeys[98]) { + Client.camAngleDX += (12 - Client.camAngleDX) / 2; + } else if (KeyHandler.KeyHandler_pressedKeys[99]) { + Client.camAngleDX += (-12 - Client.camAngleDX) / 2; + } else { + Client.camAngleDX /= 2; + } + + Client.mouseCamClickedY = MouseHandler.MouseHandler_y; + Client.mouseCamClickedX = MouseHandler.MouseHandler_x; + } + + Client.camAngleY = Client.camAngleDY / 2 + Client.camAngleY & 2047; + Client.camAngleX += Client.camAngleDX / 2; + if (Client.camAngleX < 128) { + Client.camAngleX = 128; + } + + if (Client.camAngleX > 383) { + Client.camAngleX = 383; + } + } } diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java index bede3a457a..f11411dbf3 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("dm") +@ObfuscatedName("do") @Implements("Model") public class Model extends Entity { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Ldm;" + signature = "Ldo;" ) @Export("Model_sharedSequenceModel") static Model Model_sharedSequenceModel; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("Model_sharedSequenceModelFaceAlphas") static byte[] Model_sharedSequenceModelFaceAlphas; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Ldm;" + signature = "Ldo;" ) @Export("Model_sharedSpotAnimationModel") static Model Model_sharedSpotAnimationModel; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("Model_sharedSpotAnimationModelFaceAlphas") static byte[] Model_sharedSpotAnimationModelFaceAlphas; - @ObfuscatedName("ac") - static boolean[] field1710; - @ObfuscatedName("ap") - static boolean[] field1723; - @ObfuscatedName("aq") + @ObfuscatedName("au") + static boolean[] field1670; + @ObfuscatedName("ax") + static boolean[] field1689; + @ObfuscatedName("ag") @Export("modelViewportXs") static int[] modelViewportXs; @ObfuscatedName("aa") @Export("modelViewportYs") static int[] modelViewportYs; - @ObfuscatedName("an") - static int[] field1714; - @ObfuscatedName("au") - static int[] field1715; - @ObfuscatedName("ai") - static int[] field1716; - @ObfuscatedName("ak") - static int[] field1717; - @ObfuscatedName("am") - static int[] field1711; + @ObfuscatedName("ap") + static int[] field1692; + @ObfuscatedName("aq") + static int[] field1708; @ObfuscatedName("ay") - static int[][] field1720; - @ObfuscatedName("af") - static int[] field1721; + static int[] field1663; + @ObfuscatedName("ad") + static int[] field1695; + @ObfuscatedName("ah") + static int[] field1696; @ObfuscatedName("ab") - static int[][] field1729; - @ObfuscatedName("bp") - static int[] field1739; - @ObfuscatedName("bz") - static int[] field1724; - @ObfuscatedName("bi") - static int[] field1725; - @ObfuscatedName("bg") - static int[] field1726; - @ObfuscatedName("bh") - static int[] field1699; - @ObfuscatedName("bm") - static int[] field1728; + static int[][] field1698; + @ObfuscatedName("aw") + static int[] field1669; + @ObfuscatedName("ae") + static int[][] field1700; + @ObfuscatedName("bk") + static int[] field1701; + @ObfuscatedName("bw") + static int[] field1660; + @ObfuscatedName("bo") + static int[] field1703; @ObfuscatedName("bn") + static int[] field1704; + @ObfuscatedName("bp") + static int[] field1705; + @ObfuscatedName("bz") + static int[] field1706; + @ObfuscatedName("bh") @Export("Model_transformTempX") static int Model_transformTempX; - @ObfuscatedName("bc") + @ObfuscatedName("bv") @Export("Model_transformTempY") static int Model_transformTempY; - @ObfuscatedName("bx") + @ObfuscatedName("bj") @Export("Model_transformTempZ") static int Model_transformTempZ; - @ObfuscatedName("bo") - static boolean field1732; - @ObfuscatedName("bj") + @ObfuscatedName("bq") + static boolean field1710; + @ObfuscatedName("bi") @Export("Model_sine") static int[] Model_sine; - @ObfuscatedName("bl") + @ObfuscatedName("bf") @Export("Model_cosine") static int[] Model_cosine; @ObfuscatedName("bd") - static int[] field1737; - @ObfuscatedName("by") - static int[] field1738; - @ObfuscatedName("k") + static int[] field1715; + @ObfuscatedName("br") + static int[] field1716; + @ObfuscatedName("u") @Export("verticesCount") int verticesCount; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("verticesX") int[] verticesX; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("verticesY") int[] verticesY; - @ObfuscatedName("i") + @ObfuscatedName("q") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("indicesCount") int indicesCount; - @ObfuscatedName("f") + @ObfuscatedName("d") @Export("indices1") int[] indices1; - @ObfuscatedName("m") + @ObfuscatedName("f") @Export("indices2") int[] indices2; - @ObfuscatedName("u") + @ObfuscatedName("c") @Export("indices3") int[] indices3; - @ObfuscatedName("x") + @ObfuscatedName("r") @Export("faceColors1") int[] faceColors1; - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("faceColors2") int[] faceColors2; - @ObfuscatedName("v") + @ObfuscatedName("p") @Export("faceColors3") int[] faceColors3; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("faceRenderPriorities") byte[] faceRenderPriorities; @ObfuscatedName("g") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("a") - byte[] field1688; - @ObfuscatedName("j") + @ObfuscatedName("e") + byte[] field1666; + @ObfuscatedName("z") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("t") + @ObfuscatedName("a") byte field1690; + @ObfuscatedName("w") + int field1699; + @ObfuscatedName("l") + int[] field1691; @ObfuscatedName("h") - int field1691; - @ObfuscatedName("o") - int[] field1692; - @ObfuscatedName("n") - int[] field1693; - @ObfuscatedName("d") - int[] field1694; - @ObfuscatedName("s") + int[] field1671; + @ObfuscatedName("v") + int[] field1672; + @ObfuscatedName("m") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("z") + @ObfuscatedName("o") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("al") + @ObfuscatedName("av") @Export("isSingleTile") public boolean isSingleTile; - @ObfuscatedName("av") + @ObfuscatedName("am") @Export("boundsType") int boundsType; - @ObfuscatedName("as") + @ObfuscatedName("ai") @Export("bottomY") int bottomY; - @ObfuscatedName("aw") + @ObfuscatedName("af") @Export("xzRadius") int xzRadius; - @ObfuscatedName("ad") + @ObfuscatedName("az") @Export("diameter") int diameter; - @ObfuscatedName("ag") + @ObfuscatedName("aj") @Export("radius") int radius; - @ObfuscatedName("ar") + @ObfuscatedName("an") @Export("xMid") int xMid; - @ObfuscatedName("ax") + @ObfuscatedName("at") @Export("yMid") int yMid; - @ObfuscatedName("az") + @ObfuscatedName("as") @Export("zMid") int zMid; - @ObfuscatedName("ae") + @ObfuscatedName("ak") @Export("xMidOffset") int xMidOffset; @ObfuscatedName("ao") @Export("yMidOffset") int yMidOffset; - @ObfuscatedName("aj") + @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]; - field1710 = new boolean[4700]; - field1723 = new boolean[4700]; + field1670 = new boolean[4700]; + field1689 = new boolean[4700]; modelViewportXs = new int[4700]; modelViewportYs = new int[4700]; - field1714 = new int[4700]; - field1715 = new int[4700]; - field1716 = new int[4700]; - field1717 = new int[4700]; - field1711 = new int[1600]; - field1720 = new int[1600][512]; - field1721 = new int[12]; - field1729 = new int[12][2000]; - field1739 = new int[2000]; - field1724 = new int[2000]; - field1725 = new int[12]; - field1726 = new int[10]; - field1699 = new int[10]; - field1728 = new int[10]; - field1732 = true; + field1692 = new int[4700]; + field1708 = new int[4700]; + field1663 = new int[4700]; + field1695 = new int[4700]; + field1696 = new int[1600]; + field1698 = new int[1600][512]; + field1669 = new int[12]; + field1700 = new int[12][2000]; + field1701 = new int[2000]; + field1660 = new int[2000]; + field1703 = new int[12]; + field1704 = new int[10]; + field1705 = new int[10]; + field1706 = new int[10]; + field1710 = true; Model_sine = Rasterizer3D.Rasterizer3D_sine; Model_cosine = Rasterizer3D.Rasterizer3D_cosine; - field1737 = Rasterizer3D.Rasterizer3D_colorPalette; - field1738 = Rasterizer3D.field1786; + field1715 = Rasterizer3D.Rasterizer3D_colorPalette; + field1716 = Rasterizer3D.field1765; } Model() { this.verticesCount = 0; this.indicesCount = 0; this.field1690 = 0; - this.field1691 = 0; + this.field1699 = 0; this.isSingleTile = false; this.xMidOffset = -1; this.yMidOffset = -1; @@ -222,13 +222,13 @@ public class Model extends Entity { } @ObfuscatedSignature( - signature = "([Ldm;I)V" + signature = "([Ldo;I)V" ) public Model(Model[] var1, int var2) { this.verticesCount = 0; this.indicesCount = 0; this.field1690 = 0; - this.field1691 = 0; + this.field1699 = 0; this.isSingleTile = false; this.xMidOffset = -1; this.yMidOffset = -1; @@ -239,7 +239,7 @@ public class Model extends Entity { boolean var6 = false; this.verticesCount = 0; this.indicesCount = 0; - this.field1691 = 0; + this.field1699 = 0; this.field1690 = -1; int var7; @@ -249,7 +249,7 @@ public class Model extends Entity { if (var8 != null) { this.verticesCount += var8.verticesCount; this.indicesCount += var8.indicesCount; - this.field1691 += var8.field1691; + this.field1699 += var8.field1699; if (var8.faceRenderPriorities != null) { var3 = true; } else { @@ -264,7 +264,7 @@ public class Model extends Entity { var4 |= var8.faceAlphas != null; var5 |= var8.faceTextures != null; - var6 |= var8.field1688 != null; + var6 |= var8.field1666 != null; } } @@ -290,18 +290,18 @@ public class Model extends Entity { } if (var6) { - this.field1688 = new byte[this.indicesCount]; + this.field1666 = new byte[this.indicesCount]; } - if (this.field1691 > 0) { - this.field1692 = new int[this.field1691]; - this.field1693 = new int[this.field1691]; - this.field1694 = new int[this.field1691]; + if (this.field1699 > 0) { + this.field1691 = new int[this.field1699]; + this.field1671 = new int[this.field1699]; + this.field1672 = new int[this.field1699]; } this.verticesCount = 0; this.indicesCount = 0; - this.field1691 = 0; + this.field1699 = 0; for (var7 = 0; var7 < var2; ++var7) { var8 = var1[var7]; @@ -335,21 +335,21 @@ public class Model extends Entity { } if (var6) { - if (var8.field1688 != null && var8.field1688[var9] != -1) { - this.field1688[this.indicesCount] = (byte)(this.field1691 + var8.field1688[var9]); + if (var8.field1666 != null && var8.field1666[var9] != -1) { + this.field1666[this.indicesCount] = (byte)(this.field1699 + var8.field1666[var9]); } else { - this.field1688[this.indicesCount] = -1; + this.field1666[this.indicesCount] = -1; } } ++this.indicesCount; } - for (var9 = 0; var9 < var8.field1691; ++var9) { - this.field1692[this.field1691] = this.verticesCount + var8.field1692[var9]; - this.field1693[this.field1691] = this.verticesCount + var8.field1693[var9]; - this.field1694[this.field1691] = this.verticesCount + var8.field1694[var9]; - ++this.field1691; + for (var9 = 0; var9 < var8.field1699; ++var9) { + this.field1691[this.field1699] = this.verticesCount + var8.field1691[var9]; + this.field1671[this.field1699] = this.verticesCount + var8.field1671[var9]; + this.field1672[this.field1699] = this.verticesCount + var8.field1672[var9]; + ++this.field1699; } for (var9 = 0; var9 < var8.verticesCount; ++var9) { @@ -363,9 +363,9 @@ public class Model extends Entity { } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "([[IIIIZI)Ldm;" + signature = "([[IIIIZI)Ldo;" ) @Export("contourGround") public Model contourGround(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { @@ -374,95 +374,96 @@ public class Model extends Entity { int var8 = var2 + this.xzRadius; int var9 = var4 - this.xzRadius; int var10 = var4 + this.xzRadius; - if (var7 < 0 || var8 + 128 >> 7 >= var1.length || var9 < 0 || var10 + 128 >> 7 >= var1[0].length) { - return this; - } - var7 >>= 7; - var8 = var8 + 127 >> 7; - var9 >>= 7; - var10 = var10 + 127 >> 7; - if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) { - return this; - } - Model var11; - if (var5) { - var11 = new Model(); - var11.verticesCount = this.verticesCount; - var11.indicesCount = this.indicesCount; - var11.field1691 = this.field1691; - var11.verticesX = this.verticesX; - var11.verticesZ = this.verticesZ; - var11.indices1 = this.indices1; - var11.indices2 = this.indices2; - var11.indices3 = this.indices3; - var11.faceColors1 = this.faceColors1; - var11.faceColors2 = this.faceColors2; - var11.faceColors3 = this.faceColors3; - var11.faceRenderPriorities = this.faceRenderPriorities; - var11.faceAlphas = this.faceAlphas; - var11.field1688 = this.field1688; - var11.faceTextures = this.faceTextures; - var11.field1690 = this.field1690; - var11.field1692 = this.field1692; - var11.field1693 = this.field1693; - var11.field1694 = this.field1694; - var11.vertexLabels = this.vertexLabels; - var11.faceLabelsAlpha = this.faceLabelsAlpha; - var11.isSingleTile = this.isSingleTile; - var11.verticesY = new int[var11.verticesCount]; - } else { - var11 = this; - } - - int var12; - int var13; - int var14; - int var15; - int var16; - int var17; - int var18; - int var19; - int var20; - int var21; - if (var6 == 0) { - for (var12 = 0; var12 < var11.verticesCount; ++var12) { - var13 = var2 + this.verticesX[var12]; - var14 = var4 + this.verticesZ[var12]; - var15 = var13 & 127; - var16 = var14 & 127; - var17 = var13 >> 7; - var18 = var14 >> 7; - var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7; - var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7; - var21 = var19 * (128 - var16) + var20 * var16 >> 7; - var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; - } - } else { - for (var12 = 0; var12 < var11.verticesCount; ++var12) { - var13 = (-this.verticesY[var12] << 16) / super.height; - if (var13 >= var6) { - continue; + if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { + var7 >>= 7; + var8 = var8 + 127 >> 7; + var9 >>= 7; + var10 = var10 + 127 >> 7; + if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) { + return this; + } else { + Model var11; + if (var5) { + var11 = new Model(); + var11.verticesCount = this.verticesCount; + var11.indicesCount = this.indicesCount; + var11.field1699 = this.field1699; + var11.verticesX = this.verticesX; + var11.verticesZ = this.verticesZ; + var11.indices1 = this.indices1; + var11.indices2 = this.indices2; + var11.indices3 = this.indices3; + var11.faceColors1 = this.faceColors1; + var11.faceColors2 = this.faceColors2; + var11.faceColors3 = this.faceColors3; + var11.faceRenderPriorities = this.faceRenderPriorities; + var11.faceAlphas = this.faceAlphas; + var11.field1666 = this.field1666; + var11.faceTextures = this.faceTextures; + var11.field1690 = this.field1690; + var11.field1691 = this.field1691; + var11.field1671 = this.field1671; + var11.field1672 = this.field1672; + var11.vertexLabels = this.vertexLabels; + var11.faceLabelsAlpha = this.faceLabelsAlpha; + var11.isSingleTile = this.isSingleTile; + var11.verticesY = new int[var11.verticesCount]; + } else { + var11 = this; } - var14 = var2 + this.verticesX[var12]; - var15 = var4 + this.verticesZ[var12]; - var16 = var14 & 127; - var17 = var15 & 127; - var18 = var14 >> 7; - var19 = var15 >> 7; - var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7; - var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7; - int var22 = var20 * (128 - var17) + var21 * var17 >> 7; - var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; - } - } - var11.resetBounds(); - return var11; + int var12; + int var13; + int var14; + int var15; + int var16; + int var17; + int var18; + int var19; + int var20; + int var21; + if (var6 == 0) { + for (var12 = 0; var12 < var11.verticesCount; ++var12) { + var13 = var2 + this.verticesX[var12]; + var14 = var4 + this.verticesZ[var12]; + var15 = var13 & 127; + var16 = var14 & 127; + var17 = var13 >> 7; + var18 = var14 >> 7; + var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7; + var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7; + var21 = var19 * (128 - var16) + var20 * var16 >> 7; + var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; + } + } else { + for (var12 = 0; var12 < var11.verticesCount; ++var12) { + var13 = (-this.verticesY[var12] << 16) / super.height; + if (var13 < var6) { + var14 = var2 + this.verticesX[var12]; + var15 = var4 + this.verticesZ[var12]; + var16 = var14 & 127; + var17 = var15 & 127; + var18 = var14 >> 7; + var19 = var15 >> 7; + var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7; + var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7; + int var22 = var20 * (128 - var17) + var21 * var17 >> 7; + var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; + } + } + } + + var11.resetBounds(); + return var11; + } + } else { + return this; + } } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Z)Ldm;" + signature = "(Z)Ldo;" ) @Export("toSharedSequenceModel") public Model toSharedSequenceModel(boolean var1) { @@ -473,9 +474,9 @@ public class Model extends Entity { return this.buildSharedModel(var1, Model_sharedSequenceModel, Model_sharedSequenceModelFaceAlphas); } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Z)Ldm;" + signature = "(Z)Ldo;" ) @Export("toSharedSpotAnimationModel") public Model toSharedSpotAnimationModel(boolean var1) { @@ -486,15 +487,15 @@ public class Model extends Entity { return this.buildSharedModel(var1, Model_sharedSpotAnimationModel, Model_sharedSpotAnimationModelFaceAlphas); } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(ZLdm;[B)Ldm;" + signature = "(ZLdo;[B)Ldo;" ) @Export("buildSharedModel") Model buildSharedModel(boolean var1, Model var2, byte[] var3) { var2.verticesCount = this.verticesCount; var2.indicesCount = this.indicesCount; - var2.field1691 = this.field1691; + var2.field1699 = this.field1699; if (var2.verticesX == null || var2.verticesX.length < this.verticesCount) { var2.verticesX = new int[this.verticesCount + 100]; var2.verticesY = new int[this.verticesCount + 100]; @@ -530,12 +531,12 @@ public class Model extends Entity { var2.faceColors2 = this.faceColors2; var2.faceColors3 = this.faceColors3; var2.faceRenderPriorities = this.faceRenderPriorities; - var2.field1688 = this.field1688; + var2.field1666 = this.field1666; var2.faceTextures = this.faceTextures; var2.field1690 = this.field1690; - var2.field1692 = this.field1692; - var2.field1693 = this.field1693; - var2.field1694 = this.field1694; + var2.field1691 = this.field1691; + var2.field1671 = this.field1671; + var2.field1672 = this.field1672; var2.vertexLabels = this.vertexLabels; var2.faceLabelsAlpha = this.faceLabelsAlpha; var2.isSingleTile = this.isSingleTile; @@ -543,218 +544,215 @@ public class Model extends Entity { return var2; } - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("calculateBoundingBox") void calculateBoundingBox(int var1) { - if (this.xMidOffset != -1) { - return; + if (this.xMidOffset == -1) { + int var2 = 0; + int var3 = 0; + int var4 = 0; + int var5 = 0; + int var6 = 0; + int var7 = 0; + int var8 = Model_cosine[var1]; + int var9 = Model_sine[var1]; + + for (int var10 = 0; var10 < this.verticesCount; ++var10) { + int var11 = Rasterizer3D.method2943(this.verticesX[var10], this.verticesZ[var10], var8, var9); + int var12 = this.verticesY[var10]; + int var13 = Rasterizer3D.method2944(this.verticesX[var10], this.verticesZ[var10], var8, var9); + if (var11 < var2) { + var2 = var11; + } + + if (var11 > var5) { + var5 = var11; + } + + if (var12 < var3) { + var3 = var12; + } + + if (var12 > var6) { + var6 = var12; + } + + if (var13 < var4) { + var4 = var13; + } + + if (var13 > var7) { + var7 = var13; + } + } + + this.xMid = (var5 + var2) / 2; + this.yMid = (var6 + var3) / 2; + this.zMid = (var7 + var4) / 2; + this.xMidOffset = (var5 - var2 + 1) / 2; + this.yMidOffset = (var6 - var3 + 1) / 2; + this.zMidOffset = (var7 - var4 + 1) / 2; + if (this.xMidOffset < 32) { + this.xMidOffset = 32; + } + + if (this.zMidOffset < 32) { + this.zMidOffset = 32; + } + + if (this.isSingleTile) { + this.xMidOffset += 8; + this.zMidOffset += 8; + } + } - int var2 = 0; - int var3 = 0; - int var4 = 0; - int var5 = 0; - int var6 = 0; - int var7 = 0; - int var8 = Model_cosine[var1]; - int var9 = Model_sine[var1]; - - for (int var10 = 0; var10 < this.verticesCount; ++var10) { - int var11 = Rasterizer3D.method3040(this.verticesX[var10], this.verticesZ[var10], var8, var9); - int var12 = this.verticesY[var10]; - int var13 = Rasterizer3D.method3061(this.verticesX[var10], this.verticesZ[var10], var8, var9); - if (var11 < var2) { - var2 = var11; - } - - if (var11 > var5) { - var5 = var11; - } - - if (var12 < var3) { - var3 = var12; - } - - if (var12 > var6) { - var6 = var12; - } - - if (var13 < var4) { - var4 = var13; - } - - if (var13 > var7) { - var7 = var13; - } - } - - this.xMid = (var5 + var2) / 2; - this.yMid = (var6 + var3) / 2; - this.zMid = (var7 + var4) / 2; - this.xMidOffset = (var5 - var2 + 1) / 2; - this.yMidOffset = (var6 - var3 + 1) / 2; - this.zMidOffset = (var7 - var4 + 1) / 2; - if (this.xMidOffset < 32) { - this.xMidOffset = 32; - } - - if (this.zMidOffset < 32) { - this.zMidOffset = 32; - } - - if (this.isSingleTile) { - this.xMidOffset += 8; - this.zMidOffset += 8; - } - } - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("calculateBoundsCylinder") public void calculateBoundsCylinder() { - if (this.boundsType == 1) { - return; + if (this.boundsType != 1) { + this.boundsType = 1; + super.height = 0; + this.bottomY = 0; + this.xzRadius = 0; + + for (int var1 = 0; var1 < this.verticesCount; ++var1) { + int var2 = this.verticesX[var1]; + int var3 = this.verticesY[var1]; + int var4 = this.verticesZ[var1]; + if (-var3 > super.height) { + super.height = -var3; + } + + if (var3 > this.bottomY) { + this.bottomY = var3; + } + + int var5 = var2 * var2 + var4 * var4; + if (var5 > this.xzRadius) { + this.xzRadius = var5; + } + } + + this.xzRadius = (int)(Math.sqrt((double)this.xzRadius) + 0.99D); + this.radius = (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + super.height * super.height)) + 0.99D); + this.diameter = this.radius + (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + this.bottomY * this.bottomY)) + 0.99D); } - this.boundsType = 1; - super.height = 0; - this.bottomY = 0; - this.xzRadius = 0; - - for (int var1 = 0; var1 < this.verticesCount; ++var1) { - int var2 = this.verticesX[var1]; - int var3 = this.verticesY[var1]; - int var4 = this.verticesZ[var1]; - if (-var3 > super.height) { - super.height = -var3; - } - - if (var3 > this.bottomY) { - this.bottomY = var3; - } - - int var5 = var2 * var2 + var4 * var4; - if (var5 > this.xzRadius) { - this.xzRadius = var5; - } - } - - this.xzRadius = (int)(Math.sqrt((double)this.xzRadius) + 0.99D); - this.radius = (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + super.height * super.height)) + 0.99D); - this.diameter = this.radius + (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + this.bottomY * this.bottomY)) + 0.99D); } - @ObfuscatedName("b") - void method2910() { - if (this.boundsType == 2) { - return; - } - this.boundsType = 2; - this.xzRadius = 0; + @ObfuscatedName("t") + void method2887() { + if (this.boundsType != 2) { + this.boundsType = 2; + this.xzRadius = 0; - for (int var1 = 0; var1 < this.verticesCount; ++var1) { - int var2 = this.verticesX[var1]; - int var3 = this.verticesY[var1]; - int var4 = this.verticesZ[var1]; - int var5 = var2 * var2 + var4 * var4 + var3 * var3; - if (var5 > this.xzRadius) { - this.xzRadius = var5; + for (int var1 = 0; var1 < this.verticesCount; ++var1) { + int var2 = this.verticesX[var1]; + int var3 = this.verticesY[var1]; + int var4 = this.verticesZ[var1]; + int var5 = var2 * var2 + var4 * var4 + var3 * var3; + if (var5 > this.xzRadius) { + this.xzRadius = var5; + } } - } - this.xzRadius = (int)(Math.sqrt((double)this.xzRadius) + 0.99D); - this.radius = this.xzRadius; - this.diameter = this.xzRadius + this.xzRadius; + this.xzRadius = (int)(Math.sqrt((double)this.xzRadius) + 0.99D); + this.radius = this.xzRadius; + this.diameter = this.xzRadius + this.xzRadius; + } } - @ObfuscatedName("i") - public int method2864() { + @ObfuscatedName("q") + public int method2839() { this.calculateBoundsCylinder(); return this.xzRadius; } - @ObfuscatedName("u") + @ObfuscatedName("d") @Export("resetBounds") void resetBounds() { this.boundsType = 0; this.xMidOffset = -1; } - @ObfuscatedName("x") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Lek;I)V" + signature = "(Lee;I)V" ) @Export("animate") public void animate(Frames var1, int var2) { - if (this.vertexLabels == null || var2 == -1) { - return; - } - Animation var3 = var1.frames[var2]; - Skeleton var4 = var3.skeleton; - Model_transformTempX = 0; - Model_transformTempY = 0; - Model_transformTempZ = 0; + if (this.vertexLabels != null) { + if (var2 != -1) { + Animation var3 = var1.frames[var2]; + Skeleton var4 = var3.skeleton; + Model_transformTempX = 0; + Model_transformTempY = 0; + Model_transformTempZ = 0; - for (int var5 = 0; var5 < var3.transformCount; ++var5) { - int var6 = var3.transformSkeletonLabels[var5]; - this.transform(var4.transformTypes[var6], var4.labels[var6], var3.transformXs[var5], var3.transformYs[var5], var3.transformZs[var5]); - } + for (int var5 = 0; var5 < var3.transformCount; ++var5) { + int var6 = var3.transformSkeletonLabels[var5]; + this.transform(var4.transformTypes[var6], var4.labels[var6], var3.transformXs[var5], var3.transformYs[var5], var3.transformZs[var5]); + } - this.resetBounds(); + this.resetBounds(); + } + } } - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lek;ILek;I[I)V" + signature = "(Lee;ILee;I[I)V" ) @Export("animate2") public void animate2(Frames var1, int var2, Frames var3, int var4, int[] var5) { - if (var2 == -1) { - return; - } - if (var5 == null || var4 == -1) { - this.animate(var1, var2); - return; - } - Animation var6 = var1.frames[var2]; - Animation var7 = var3.frames[var4]; - Skeleton var8 = var6.skeleton; - Model_transformTempX = 0; - Model_transformTempY = 0; - Model_transformTempZ = 0; - byte var9 = 0; - int var13 = var9 + 1; - int var10 = var5[var9]; + if (var2 != -1) { + if (var5 != null && var4 != -1) { + Animation var6 = var1.frames[var2]; + Animation var7 = var3.frames[var4]; + Skeleton var8 = var6.skeleton; + Model_transformTempX = 0; + Model_transformTempY = 0; + Model_transformTempZ = 0; + byte var9 = 0; + int var13 = var9 + 1; + int var10 = var5[var9]; - int var11; - int var12; - for (var11 = 0; var11 < var6.transformCount; ++var11) { - for (var12 = var6.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) { - } + int var11; + int var12; + for (var11 = 0; var11 < var6.transformCount; ++var11) { + for (var12 = var6.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) { + } - if (var12 != var10 || var8.transformTypes[var12] == 0) { - this.transform(var8.transformTypes[var12], var8.labels[var12], var6.transformXs[var11], var6.transformYs[var11], var6.transformZs[var11]); + if (var12 != var10 || var8.transformTypes[var12] == 0) { + this.transform(var8.transformTypes[var12], var8.labels[var12], var6.transformXs[var11], var6.transformYs[var11], var6.transformZs[var11]); + } + } + + Model_transformTempX = 0; + Model_transformTempY = 0; + Model_transformTempZ = 0; + var9 = 0; + var13 = var9 + 1; + var10 = var5[var9]; + + for (var11 = 0; var11 < var7.transformCount; ++var11) { + for (var12 = var7.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) { + } + + if (var12 == var10 || var8.transformTypes[var12] == 0) { + this.transform(var8.transformTypes[var12], var8.labels[var12], var7.transformXs[var11], var7.transformYs[var11], var7.transformZs[var11]); + } + } + + this.resetBounds(); + } else { + this.animate(var1, var2); } } - - Model_transformTempX = 0; - Model_transformTempY = 0; - Model_transformTempZ = 0; - var9 = 0; - var13 = var9 + 1; - var10 = var5[var9]; - - for (var11 = 0; var11 < var7.transformCount; ++var11) { - for (var12 = var7.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) { - } - - if (var12 == var10 || var8.transformTypes[var12] == 0) { - this.transform(var8.transformTypes[var12], var8.labels[var12], var7.transformXs[var11], var7.transformYs[var11], var7.transformZs[var11]); - } - } - - this.resetBounds(); } - @ObfuscatedName("v") + @ObfuscatedName("r") @Export("transform") void transform(int var1, int[] var2, int var3, int var4, int var5) { int var6 = var2.length; @@ -770,17 +768,16 @@ public class Model extends Entity { for (var8 = 0; var8 < var6; ++var8) { int var9 = var2[var8]; - if (var9 >= this.vertexLabels.length) { - continue; - } - int[] var10 = this.vertexLabels[var9]; + if (var9 < this.vertexLabels.length) { + int[] var10 = this.vertexLabels[var9]; - for (var11 = 0; var11 < var10.length; ++var11) { - var12 = var10[var11]; - Model_transformTempX += this.verticesX[var12]; - Model_transformTempY += this.verticesY[var12]; - Model_transformTempZ += this.verticesZ[var12]; - ++var7; + for (var11 = 0; var11 < var10.length; ++var11) { + var12 = var10[var11]; + Model_transformTempX += this.verticesX[var12]; + Model_transformTempY += this.verticesY[var12]; + Model_transformTempZ += this.verticesZ[var12]; + ++var7; + } } } @@ -794,115 +791,132 @@ public class Model extends Entity { Model_transformTempZ = var5; } - } else if (var1 == 1) { - for (var7 = 0; var7 < var6; ++var7) { - var8 = var2[var7]; - if (var8 >= this.vertexLabels.length) { - continue; - } - int[] var18 = this.vertexLabels[var8]; + } else { + int[] var10000; + int[] var18; + int var19; + if (var1 == 1) { + for (var7 = 0; var7 < var6; ++var7) { + var8 = var2[var7]; + if (var8 < this.vertexLabels.length) { + var18 = this.vertexLabels[var8]; - for (int var19 = 0; var19 < var18.length; ++var19) { - var11 = var18[var19]; - this.verticesX[var11] += var3; - this.verticesY[var11] += var4; - this.verticesZ[var11] += var5; - } - } - - } else if (var1 == 2) { - for (var7 = 0; var7 < var6; ++var7) { - var8 = var2[var7]; - if (var8 >= this.vertexLabels.length) { - continue; - } - int[] var18 = this.vertexLabels[var8]; - - for (int var19 = 0; var19 < var18.length; ++var19) { - var11 = var18[var19]; - this.verticesX[var11] -= Model_transformTempX; - this.verticesY[var11] -= Model_transformTempY; - this.verticesZ[var11] -= Model_transformTempZ; - var12 = (var3 & 255) * 8; - int var13 = (var4 & 255) * 8; - int var14 = (var5 & 255) * 8; - int var15; - int var16; - int var17; - if (var14 != 0) { - var15 = Model_sine[var14]; - var16 = Model_cosine[var14]; - var17 = var15 * this.verticesY[var11] + var16 * this.verticesX[var11] >> 16; - this.verticesY[var11] = var16 * this.verticesY[var11] - var15 * this.verticesX[var11] >> 16; - this.verticesX[var11] = var17; - } - - if (var12 != 0) { - var15 = Model_sine[var12]; - var16 = Model_cosine[var12]; - var17 = var16 * this.verticesY[var11] - var15 * this.verticesZ[var11] >> 16; - this.verticesZ[var11] = var15 * this.verticesY[var11] + var16 * this.verticesZ[var11] >> 16; - this.verticesY[var11] = var17; - } - - if (var13 != 0) { - var15 = Model_sine[var13]; - var16 = Model_cosine[var13]; - var17 = var15 * this.verticesZ[var11] + var16 * this.verticesX[var11] >> 16; - this.verticesZ[var11] = var16 * this.verticesZ[var11] - var15 * this.verticesX[var11] >> 16; - this.verticesX[var11] = var17; - } - - this.verticesX[var11] += Model_transformTempX; - this.verticesY[var11] += Model_transformTempY; - this.verticesZ[var11] += Model_transformTempZ; - } - } - - } else if (var1 == 3) { - for (var7 = 0; var7 < var6; ++var7) { - var8 = var2[var7]; - if (var8 < this.vertexLabels.length) { - int[] var18 = this.vertexLabels[var8]; - - for (int var19 = 0; var19 < var18.length; ++var19) { - var11 = var18[var19]; - this.verticesX[var11] -= Model_transformTempX; - this.verticesY[var11] -= Model_transformTempY; - this.verticesZ[var11] -= Model_transformTempZ; - this.verticesX[var11] = var3 * this.verticesX[var11] / 128; - this.verticesY[var11] = var4 * this.verticesY[var11] / 128; - this.verticesZ[var11] = var5 * this.verticesZ[var11] / 128; - this.verticesX[var11] += Model_transformTempX; - this.verticesY[var11] += Model_transformTempY; - this.verticesZ[var11] += Model_transformTempZ; + for (var19 = 0; var19 < var18.length; ++var19) { + var11 = var18[var19]; + var10000 = this.verticesX; + var10000[var11] += var3; + var10000 = this.verticesY; + var10000[var11] += var4; + var10000 = this.verticesZ; + var10000[var11] += var5; + } } } - } - } else if (var1 == 5) { - if (this.faceLabelsAlpha == null || this.faceAlphas == null) { - return; - } - for (var7 = 0; var7 < var6; ++var7) { - var8 = var2[var7]; - if (var8 >= this.faceLabelsAlpha.length) { - continue; - } - int[] var18 = this.faceLabelsAlpha[var8]; - for (int var19 = 0; var19 < var18.length; ++var19) { - var11 = var18[var19]; - var12 = (this.faceAlphas[var11] & 255) + var3 * 8; - if (var12 < 0) { - var12 = 0; - } else if (var12 > 255) { - var12 = 255; + } else if (var1 == 2) { + for (var7 = 0; var7 < var6; ++var7) { + var8 = var2[var7]; + if (var8 < this.vertexLabels.length) { + var18 = this.vertexLabels[var8]; + + for (var19 = 0; var19 < var18.length; ++var19) { + var11 = var18[var19]; + var10000 = this.verticesX; + var10000[var11] -= Model_transformTempX; + var10000 = this.verticesY; + var10000[var11] -= Model_transformTempY; + var10000 = this.verticesZ; + var10000[var11] -= Model_transformTempZ; + var12 = (var3 & 255) * 8; + int var13 = (var4 & 255) * 8; + int var14 = (var5 & 255) * 8; + int var15; + int var16; + int var17; + if (var14 != 0) { + var15 = Model_sine[var14]; + var16 = Model_cosine[var14]; + var17 = var15 * this.verticesY[var11] + var16 * this.verticesX[var11] >> 16; + this.verticesY[var11] = var16 * this.verticesY[var11] - var15 * this.verticesX[var11] >> 16; + this.verticesX[var11] = var17; + } + + if (var12 != 0) { + var15 = Model_sine[var12]; + var16 = Model_cosine[var12]; + var17 = var16 * this.verticesY[var11] - var15 * this.verticesZ[var11] >> 16; + this.verticesZ[var11] = var15 * this.verticesY[var11] + var16 * this.verticesZ[var11] >> 16; + this.verticesY[var11] = var17; + } + + if (var13 != 0) { + var15 = Model_sine[var13]; + var16 = Model_cosine[var13]; + var17 = var15 * this.verticesZ[var11] + var16 * this.verticesX[var11] >> 16; + this.verticesZ[var11] = var16 * this.verticesZ[var11] - var15 * this.verticesX[var11] >> 16; + this.verticesX[var11] = var17; + } + + var10000 = this.verticesX; + var10000[var11] += Model_transformTempX; + var10000 = this.verticesY; + var10000[var11] += Model_transformTempY; + var10000 = this.verticesZ; + var10000[var11] += Model_transformTempZ; + } } - - this.faceAlphas[var11] = (byte) var12; } - } + } else if (var1 == 3) { + for (var7 = 0; var7 < var6; ++var7) { + var8 = var2[var7]; + if (var8 < this.vertexLabels.length) { + var18 = this.vertexLabels[var8]; + + for (var19 = 0; var19 < var18.length; ++var19) { + var11 = var18[var19]; + var10000 = this.verticesX; + var10000[var11] -= Model_transformTempX; + var10000 = this.verticesY; + var10000[var11] -= Model_transformTempY; + var10000 = this.verticesZ; + var10000[var11] -= Model_transformTempZ; + this.verticesX[var11] = var3 * this.verticesX[var11] / 128; + this.verticesY[var11] = var4 * this.verticesY[var11] / 128; + this.verticesZ[var11] = var5 * this.verticesZ[var11] / 128; + var10000 = this.verticesX; + var10000[var11] += Model_transformTempX; + var10000 = this.verticesY; + var10000[var11] += Model_transformTempY; + var10000 = this.verticesZ; + var10000[var11] += Model_transformTempZ; + } + } + } + + } else if (var1 == 5) { + if (this.faceLabelsAlpha != null && this.faceAlphas != null) { + for (var7 = 0; var7 < var6; ++var7) { + var8 = var2[var7]; + if (var8 < this.faceLabelsAlpha.length) { + var18 = this.faceLabelsAlpha[var8]; + + for (var19 = 0; var19 < var18.length; ++var19) { + var11 = var18[var19]; + var12 = (this.faceAlphas[var11] & 255) + var3 * 8; + if (var12 < 0) { + var12 = 0; + } else if (var12 > 255) { + var12 = 255; + } + + this.faceAlphas[var11] = (byte)var12; + } + } + } + } + + } } } @@ -918,7 +932,7 @@ public class Model extends Entity { this.resetBounds(); } - @ObfuscatedName("g") + @ObfuscatedName("p") @Export("rotateY180") public void rotateY180() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { @@ -929,7 +943,7 @@ public class Model extends Entity { this.resetBounds(); } - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("rotateY270Ccw") public void rotateY270Ccw() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { @@ -941,7 +955,7 @@ public class Model extends Entity { this.resetBounds(); } - @ObfuscatedName("j") + @ObfuscatedName("e") @Export("rotateZ") public void rotateZ(int var1) { int var2 = Model_sine[var1]; @@ -956,19 +970,22 @@ public class Model extends Entity { this.resetBounds(); } - @ObfuscatedName("o") + @ObfuscatedName("z") @Export("offsetBy") public void offsetBy(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { - this.verticesX[var4] += var1; - this.verticesY[var4] += var2; - this.verticesZ[var4] += var3; + int[] var10000 = this.verticesX; + var10000[var4] += var1; + var10000 = this.verticesY; + var10000[var4] += var2; + var10000 = this.verticesZ; + var10000[var4] += var3; } this.resetBounds(); } - @ObfuscatedName("d") + @ObfuscatedName("w") @Export("scale") public void scale(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { @@ -980,23 +997,23 @@ public class Model extends Entity { this.resetBounds(); } - @ObfuscatedName("s") - public final void method2866(int modelAngleY, int modelAngleZ, int modelAngleX, int modelOffsetX, int var5, int var6, int var7) { - field1711[0] = -1; + @ObfuscatedName("l") + public final void method2874(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + field1696[0] = -1; if (this.boundsType != 2 && this.boundsType != 1) { - this.method2910(); + this.method2887(); } int var8 = Rasterizer3D.Rasterizer3D_clipMidX; int var9 = Rasterizer3D.Rasterizer3D_clipMidY; - int var10 = Model_sine[modelAngleY]; - int var11 = Model_cosine[modelAngleY]; - int var12 = Model_sine[modelAngleZ]; - int var13 = Model_cosine[modelAngleZ]; - int var14 = Model_sine[modelAngleX]; - int var15 = Model_cosine[modelAngleX]; - int var16 = Model_sine[modelOffsetX]; - int var17 = Model_cosine[modelOffsetX]; + int var10 = Model_sine[var1]; + int var11 = Model_cosine[var1]; + int var12 = Model_sine[var2]; + int var13 = Model_cosine[var2]; + int var14 = Model_sine[var3]; + int var15 = Model_cosine[var3]; + int var16 = Model_sine[var4]; + int var17 = Model_cosine[var4]; int var18 = var16 * var6 + var17 * var7 >> 16; for (int var19 = 0; var19 < this.verticesCount; ++var19) { @@ -1004,19 +1021,19 @@ public class Model extends Entity { int var21 = this.verticesY[var19]; int var22 = this.verticesZ[var19]; int var23; - if (modelAngleX != 0) { + if (var3 != 0) { var23 = var21 * var14 + var20 * var15 >> 16; var21 = var21 * var15 - var20 * var14 >> 16; var20 = var23; } - if (modelAngleY != 0) { + if (var1 != 0) { var23 = var21 * var11 - var22 * var10 >> 16; var22 = var21 * var10 + var22 * var11 >> 16; var21 = var23; } - if (modelAngleZ != 0) { + if (var2 != 0) { var23 = var22 * var12 + var20 * var13 >> 16; var22 = var22 * var13 - var20 * var12 >> 16; var20 = var23; @@ -1027,13 +1044,13 @@ public class Model extends Entity { var22 += var7; var23 = var21 * var17 - var22 * var16 >> 16; var22 = var21 * var16 + var22 * var17 >> 16; - field1714[var19] = var22 - var18; + field1692[var19] = var22 - var18; modelViewportXs[var19] = var20 * Rasterizer3D.Rasterizer3D_zoom / var22 + var8; modelViewportYs[var19] = var23 * Rasterizer3D.Rasterizer3D_zoom / var22 + var9; - if (this.field1691 > 0) { - field1715[var19] = var20; - field1716[var19] = var23; - field1717[var19] = var22; + if (this.field1699 > 0) { + field1708[var19] = var20; + field1663[var19] = var23; + field1695[var19] = var22; } } @@ -1044,11 +1061,11 @@ public class Model extends Entity { } - @ObfuscatedName("z") - public final void method2876(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - field1711[0] = -1; + @ObfuscatedName("h") + public final void method2810(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + field1696[0] = -1; if (this.boundsType != 2 && this.boundsType != 1) { - this.method2910(); + this.method2887(); } int var9 = Rasterizer3D.Rasterizer3D_clipMidX; @@ -1091,13 +1108,13 @@ public class Model extends Entity { var23 += var7; var24 = var22 * var18 - var23 * var17 >> 16; var23 = var22 * var17 + var23 * var18 >> 16; - field1714[var20] = var23 - var19; + field1692[var20] = var23 - var19; modelViewportXs[var20] = var9 + var21 * Rasterizer3D.Rasterizer3D_zoom / var8; modelViewportYs[var20] = var10 + var24 * Rasterizer3D.Rasterizer3D_zoom / var8; - if (this.field1691 > 0) { - field1715[var20] = var21; - field1716[var20] = var24; - field1717[var20] = var23; + if (this.field1699 > 0) { + field1708[var20] = var21; + field1663[var20] = var24; + field1695[var20] = var23; } } @@ -1108,270 +1125,269 @@ public class Model extends Entity { } - @ObfuscatedName("al") + @ObfuscatedName("v") @Export("draw0") final void draw0(boolean var1, boolean var2, boolean var3, long var4) { - if (this.diameter >= 1600) { - return; - } - int var6; - for (var6 = 0; var6 < this.diameter; ++var6) { - field1711[var6] = 0; - } - - var6 = var3 ? 20 : 5; - - int var7; - int var8; - int var10; - int var11; - int var12; - int var13; - int var15; - int var16; - int var18; - int var27; - for (var7 = 0; var7 < this.indicesCount; ++var7) { - if (this.faceColors3[var7] == -2) { - continue; + if (this.diameter < 1600) { + int var6; + for (var6 = 0; var6 < this.diameter; ++var6) { + field1696[var6] = 0; } - var8 = this.indices1[var7]; - var27 = this.indices2[var7]; - var10 = this.indices3[var7]; - var11 = modelViewportXs[var8]; - var12 = modelViewportXs[var27]; - var13 = modelViewportXs[var10]; - int var14; - int var17; - if (!var1 || var11 != -5000 && var12 != -5000 && var13 != -5000) { - if (var2) { - var15 = modelViewportYs[var8]; - var16 = modelViewportYs[var27]; - var17 = modelViewportYs[var10]; - var18 = var6 + ViewportMouse.ViewportMouse_y; - boolean var34; - if (var18 < var15 && var18 < var16 && var18 < var17) { - var34 = false; - } else { - var18 = ViewportMouse.ViewportMouse_y - var6; - if (var18 > var15 && var18 > var16 && var18 > var17) { - var34 = false; - } else { - var18 = var6 + ViewportMouse.ViewportMouse_x; - if (var18 < var11 && var18 < var12 && var18 < var13) { - var34 = false; + + var6 = var3 ? 20 : 5; + + int var7; + int var8; + int var10; + int var11; + int var12; + int var13; + int var15; + int var16; + int var18; + int var27; + for (var7 = 0; var7 < this.indicesCount; ++var7) { + if (this.faceColors3[var7] != -2) { + var8 = this.indices1[var7]; + var27 = this.indices2[var7]; + var10 = this.indices3[var7]; + var11 = modelViewportXs[var8]; + var12 = modelViewportXs[var27]; + var13 = modelViewportXs[var10]; + int var14; + int var17; + if (!var1 || var11 != -5000 && var12 != -5000 && var13 != -5000) { + if (var2) { + var15 = modelViewportYs[var8]; + var16 = modelViewportYs[var27]; + var17 = modelViewportYs[var10]; + var18 = var6 + ViewportMouse.ViewportMouse_y; + boolean var32; + if (var18 < var15 && var18 < var16 && var18 < var17) { + var32 = false; } else { - var18 = ViewportMouse.ViewportMouse_x - var6; - if (var18 > var11 && var18 > var12 && var18 > var13) { - var34 = false; + var18 = ViewportMouse.ViewportMouse_y - var6; + if (var18 > var15 && var18 > var16 && var18 > var17) { + var32 = false; } else { - var34 = true; + var18 = var6 + ViewportMouse.ViewportMouse_x; + if (var18 < var11 && var18 < var12 && var18 < var13) { + var32 = false; + } else { + var18 = ViewportMouse.ViewportMouse_x - var6; + if (var18 > var11 && var18 > var12 && var18 > var13) { + var32 = false; + } else { + var32 = true; + } + } } } + + if (var32) { + class42.method752(var4); + var2 = false; + } + } + + if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var27]) - (var13 - var12) * (modelViewportYs[var8] - modelViewportYs[var27]) > 0) { + field1689[var7] = false; + if (var11 >= 0 && var12 >= 0 && var13 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var13 <= Rasterizer3D.Rasterizer3D_clipWidth) { + field1670[var7] = false; + } else { + field1670[var7] = true; + } + + var14 = (field1692[var8] + field1692[var27] + field1692[var10]) / 3 + this.radius; + field1698[var14][field1696[var14]++] = var7; + } + } else { + var14 = field1708[var8]; + var15 = field1708[var27]; + var16 = field1708[var10]; + var17 = field1663[var8]; + var18 = field1663[var27]; + int var19 = field1663[var10]; + int var20 = field1695[var8]; + int var21 = field1695[var27]; + int var22 = field1695[var10]; + var14 -= 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; + if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { + field1689[var7] = true; + int var26 = (field1692[var8] + field1692[var27] + field1692[var10]) / 3 + this.radius; + field1698[var26][field1696[var26]++] = var7; + } + } + } + } + + int[] var9; + if (this.faceRenderPriorities == null) { + for (var7 = this.diameter - 1; var7 >= 0; --var7) { + var8 = field1696[var7]; + if (var8 > 0) { + var9 = field1698[var7]; + + for (var10 = 0; var10 < var8; ++var10) { + this.method2830(var9[var10]); + } + } + } + + } else { + for (var7 = 0; var7 < 12; ++var7) { + field1669[var7] = 0; + field1703[var7] = 0; + } + + for (var7 = this.diameter - 1; var7 >= 0; --var7) { + var8 = field1696[var7]; + if (var8 > 0) { + var9 = field1698[var7]; + + for (var10 = 0; var10 < var8; ++var10) { + var11 = var9[var10]; + byte var31 = this.faceRenderPriorities[var11]; + var13 = field1669[var31]++; + field1700[var31][var13] = var11; + if (var31 < 10) { + int[] var10000 = field1703; + var10000[var31] += var7; + } else if (var31 == 10) { + field1701[var13] = var7; + } else { + field1660[var13] = var7; + } } } - - if (var34) { - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var4; - var2 = false; - } } - if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var27]) - (var13 - var12) * (modelViewportYs[var8] - modelViewportYs[var27]) > 0) { - field1723[var7] = false; - if (var11 >= 0 && var12 >= 0 && var13 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var13 <= Rasterizer3D.Rasterizer3D_clipWidth) { - field1710[var7] = false; - } else { - field1710[var7] = true; - } - - var14 = (field1714[var8] + field1714[var27] + field1714[var10]) / 3 + this.radius; - field1720[var14][field1711[var14]++] = var7; + var7 = 0; + if (field1669[1] > 0 || field1669[2] > 0) { + var7 = (field1703[1] + field1703[2]) / (field1669[1] + field1669[2]); } - } else { - var14 = field1715[var8]; - var15 = field1715[var27]; - var16 = field1715[var10]; - var17 = field1716[var8]; - var18 = field1716[var27]; - int var19 = field1716[var10]; - int var20 = field1717[var8]; - int var21 = field1717[var27]; - int var22 = field1717[var10]; - var14 -= 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; - if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { - field1723[var7] = true; - int var26 = (field1714[var8] + field1714[var27] + field1714[var10]) / 3 + this.radius; - field1720[var26][field1711[var26]++] = var7; + + var8 = 0; + if (field1669[3] > 0 || field1669[4] > 0) { + var8 = (field1703[3] + field1703[4]) / (field1669[3] + field1669[4]); } - } - } - int[] var9; - if (this.faceRenderPriorities == null) { - for (var7 = this.diameter - 1; var7 >= 0; --var7) { - var8 = field1711[var7]; - if (var8 > 0) { - var9 = field1720[var7]; - - for (var10 = 0; var10 < var8; ++var10) { - this.method2879(var9[var10]); - } + var27 = 0; + if (field1669[6] > 0 || field1669[8] > 0) { + var27 = (field1703[8] + field1703[6]) / (field1669[8] + field1669[6]); } - } - } else { - for (var7 = 0; var7 < 12; ++var7) { - field1721[var7] = 0; - field1725[var7] = 0; - } - - for (var7 = this.diameter - 1; var7 >= 0; --var7) { - var8 = field1711[var7]; - if (var8 > 0) { - var9 = field1720[var7]; - - for (var10 = 0; var10 < var8; ++var10) { - var11 = var9[var10]; - byte var33 = this.faceRenderPriorities[var11]; - var13 = field1721[var33]++; - field1729[var33][var13] = var11; - if (var33 < 10) { - field1725[var33] += var7; - } else if (var33 == 10) { - field1739[var13] = var7; - } else { - field1724[var13] = var7; - } - } - } - } - - var7 = 0; - if (field1721[1] > 0 || field1721[2] > 0) { - var7 = (field1725[1] + field1725[2]) / (field1721[1] + field1721[2]); - } - - var8 = 0; - if (field1721[3] > 0 || field1721[4] > 0) { - var8 = (field1725[3] + field1725[4]) / (field1721[3] + field1721[4]); - } - - var27 = 0; - if (field1721[6] > 0 || field1721[8] > 0) { - var27 = (field1725[8] + field1725[6]) / (field1721[8] + field1721[6]); - } - - var11 = 0; - var12 = field1721[10]; - int[] var30 = field1729[10]; - int[] var31 = field1739; - if (var11 == var12) { var11 = 0; - var12 = field1721[11]; - var30 = field1729[11]; - var31 = field1724; - } - - if (var11 < var12) { - var10 = var31[var11]; - } else { - var10 = -1000; - } - - for (var15 = 0; var15 < 10; ++var15) { - while (var15 == 0 && var10 > var7) { - this.method2879(var30[var11++]); - if (var11 == var12 && var30 != field1729[11]) { - var11 = 0; - var12 = field1721[11]; - var30 = field1729[11]; - var31 = field1724; - } - - if (var11 < var12) { - var10 = var31[var11]; - } else { - var10 = -1000; - } - } - - while (var15 == 3 && var10 > var8) { - this.method2879(var30[var11++]); - if (var11 == var12 && var30 != field1729[11]) { - var11 = 0; - var12 = field1721[11]; - var30 = field1729[11]; - var31 = field1724; - } - - if (var11 < var12) { - var10 = var31[var11]; - } else { - var10 = -1000; - } - } - - while (var15 == 5 && var10 > var27) { - this.method2879(var30[var11++]); - if (var11 == var12 && var30 != field1729[11]) { - var11 = 0; - var12 = field1721[11]; - var30 = field1729[11]; - var31 = field1724; - } - - if (var11 < var12) { - var10 = var31[var11]; - } else { - var10 = -1000; - } - } - - var16 = field1721[var15]; - int[] var32 = field1729[var15]; - - for (var18 = 0; var18 < var16; ++var18) { - this.method2879(var32[var18]); - } - } - - while (var10 != -1000) { - this.method2879(var30[var11++]); - if (var11 == var12 && var30 != field1729[11]) { + var12 = field1669[10]; + int[] var28 = field1700[10]; + int[] var29 = field1701; + if (var11 == var12) { var11 = 0; - var30 = field1729[11]; - var12 = field1721[11]; - var31 = field1724; + var12 = field1669[11]; + var28 = field1700[11]; + var29 = field1660; } if (var11 < var12) { - var10 = var31[var11]; + var10 = var29[var11]; } else { var10 = -1000; } - } + for (var15 = 0; var15 < 10; ++var15) { + while (var15 == 0 && var10 > var7) { + this.method2830(var28[var11++]); + if (var11 == var12 && var28 != field1700[11]) { + var11 = 0; + var12 = field1669[11]; + var28 = field1700[11]; + var29 = field1660; + } + + if (var11 < var12) { + var10 = var29[var11]; + } else { + var10 = -1000; + } + } + + while (var15 == 3 && var10 > var8) { + this.method2830(var28[var11++]); + if (var11 == var12 && var28 != field1700[11]) { + var11 = 0; + var12 = field1669[11]; + var28 = field1700[11]; + var29 = field1660; + } + + if (var11 < var12) { + var10 = var29[var11]; + } else { + var10 = -1000; + } + } + + while (var15 == 5 && var10 > var27) { + this.method2830(var28[var11++]); + if (var11 == var12 && var28 != field1700[11]) { + var11 = 0; + var12 = field1669[11]; + var28 = field1700[11]; + var29 = field1660; + } + + if (var11 < var12) { + var10 = var29[var11]; + } else { + var10 = -1000; + } + } + + var16 = field1669[var15]; + int[] var30 = field1700[var15]; + + for (var18 = 0; var18 < var16; ++var18) { + this.method2830(var30[var18]); + } + } + + while (var10 != -1000) { + this.method2830(var28[var11++]); + if (var11 == var12 && var28 != field1700[11]) { + var11 = 0; + var28 = field1700[11]; + var12 = field1669[11]; + var29 = field1660; + } + + if (var11 < var12) { + var10 = var29[var11]; + } else { + var10 = -1000; + } + } + + } } } - @ObfuscatedName("av") - final void method2879(int var1) { - if (field1723[var1]) { - this.method2880(var1); + @ObfuscatedName("m") + final void method2830(int var1) { + if (field1689[var1]) { + this.method2829(var1); } else { int var2 = this.indices1[var1]; int var3 = this.indices2[var1]; int var4 = this.indices3[var1]; - Rasterizer3D.field1763 = field1710[var1]; + Rasterizer3D.field1760 = field1670[var1]; if (this.faceAlphas == null) { Rasterizer3D.Rasterizer3D_alpha = 0; } else { @@ -1382,11 +1398,11 @@ public class Model extends Entity { int var5; int var6; int var7; - if (this.field1688 != null && this.field1688[var1] != -1) { - int var8 = this.field1688[var1] & 255; - var5 = this.field1692[var8]; - var6 = this.field1693[var8]; - var7 = this.field1694[var8]; + if (this.field1666 != null && this.field1666[var1] != -1) { + int var8 = this.field1666[var1] & 255; + var5 = this.field1691[var8]; + var6 = this.field1671[var8]; + var7 = this.field1672[var8]; } else { var5 = var2; var6 = var3; @@ -1394,30 +1410,30 @@ public class Model extends Entity { } if (this.faceColors3[var1] == -1) { - Rasterizer3D.method2986(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1715[var5], field1715[var6], field1715[var7], field1716[var5], field1716[var6], field1716[var7], field1717[var5], field1717[var6], field1717[var7], this.faceTextures[var1]); + Rasterizer3D.method2938(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1708[var5], field1708[var6], field1708[var7], field1663[var5], field1663[var6], field1663[var7], field1695[var5], field1695[var6], field1695[var7], this.faceTextures[var1]); } else { - Rasterizer3D.method2986(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field1715[var5], field1715[var6], field1715[var7], field1716[var5], field1716[var6], field1716[var7], field1717[var5], field1717[var6], field1717[var7], this.faceTextures[var1]); + Rasterizer3D.method2938(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field1708[var5], field1708[var6], field1708[var7], field1663[var5], field1663[var6], field1663[var7], field1695[var5], field1695[var6], field1695[var7], this.faceTextures[var1]); } } else if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3007(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field1737[this.faceColors1[var1]]); + Rasterizer3D.method2936(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field1715[this.faceColors1[var1]]); } else { - Rasterizer3D.method3020(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); + Rasterizer3D.method2934(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 method2880(int var1) { + @ObfuscatedName("o") + final void method2829(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 = field1717[var5]; - int var9 = field1717[var6]; - int var10 = field1717[var7]; + int var8 = field1695[var5]; + int var9 = field1695[var6]; + int var10 = field1695[var7]; if (this.faceAlphas == null) { Rasterizer3D.Rasterizer3D_alpha = 0; } else { @@ -1429,96 +1445,96 @@ public class Model extends Entity { int var13; int var14; if (var8 >= 50) { - field1726[var4] = modelViewportXs[var5]; - field1699[var4] = modelViewportYs[var5]; - field1728[var4++] = this.faceColors1[var1]; + field1704[var4] = modelViewportXs[var5]; + field1705[var4] = modelViewportYs[var5]; + field1706[var4++] = this.faceColors1[var1]; } else { - var11 = field1715[var5]; - var12 = field1716[var5]; + var11 = field1708[var5]; + var12 = field1663[var5]; var13 = this.faceColors1[var1]; if (var10 >= 50) { - var14 = field1738[var10 - var8] * (50 - var8); - field1726[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1715[var7] - var11) * var14 >> 16)) / 50; - field1699[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1716[var7] - var12) * var14 >> 16)) / 50; - field1728[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); + var14 = field1716[var10 - var8] * (50 - var8); + field1704[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1708[var7] - var11) * var14 >> 16)) / 50; + field1705[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1663[var7] - var12) * var14 >> 16)) / 50; + field1706[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); } if (var9 >= 50) { - var14 = field1738[var9 - var8] * (50 - var8); - field1726[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1715[var6] - var11) * var14 >> 16)) / 50; - field1699[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1716[var6] - var12) * var14 >> 16)) / 50; - field1728[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); + var14 = field1716[var9 - var8] * (50 - var8); + field1704[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1708[var6] - var11) * var14 >> 16)) / 50; + field1705[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1663[var6] - var12) * var14 >> 16)) / 50; + field1706[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); } } if (var9 >= 50) { - field1726[var4] = modelViewportXs[var6]; - field1699[var4] = modelViewportYs[var6]; - field1728[var4++] = this.faceColors2[var1]; + field1704[var4] = modelViewportXs[var6]; + field1705[var4] = modelViewportYs[var6]; + field1706[var4++] = this.faceColors2[var1]; } else { - var11 = field1715[var6]; - var12 = field1716[var6]; + var11 = field1708[var6]; + var12 = field1663[var6]; var13 = this.faceColors2[var1]; if (var8 >= 50) { - var14 = field1738[var8 - var9] * (50 - var9); - field1726[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1715[var5] - var11) * var14 >> 16)) / 50; - field1699[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1716[var5] - var12) * var14 >> 16)) / 50; - field1728[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); + var14 = field1716[var8 - var9] * (50 - var9); + field1704[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1708[var5] - var11) * var14 >> 16)) / 50; + field1705[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1663[var5] - var12) * var14 >> 16)) / 50; + field1706[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); } if (var10 >= 50) { - var14 = field1738[var10 - var9] * (50 - var9); - field1726[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1715[var7] - var11) * var14 >> 16)) / 50; - field1699[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1716[var7] - var12) * var14 >> 16)) / 50; - field1728[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); + var14 = field1716[var10 - var9] * (50 - var9); + field1704[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1708[var7] - var11) * var14 >> 16)) / 50; + field1705[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1663[var7] - var12) * var14 >> 16)) / 50; + field1706[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); } } if (var10 >= 50) { - field1726[var4] = modelViewportXs[var7]; - field1699[var4] = modelViewportYs[var7]; - field1728[var4++] = this.faceColors3[var1]; + field1704[var4] = modelViewportXs[var7]; + field1705[var4] = modelViewportYs[var7]; + field1706[var4++] = this.faceColors3[var1]; } else { - var11 = field1715[var7]; - var12 = field1716[var7]; + var11 = field1708[var7]; + var12 = field1663[var7]; var13 = this.faceColors3[var1]; if (var9 >= 50) { - var14 = field1738[var9 - var10] * (50 - var10); - field1726[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1715[var6] - var11) * var14 >> 16)) / 50; - field1699[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1716[var6] - var12) * var14 >> 16)) / 50; - field1728[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); + var14 = field1716[var9 - var10] * (50 - var10); + field1704[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1708[var6] - var11) * var14 >> 16)) / 50; + field1705[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1663[var6] - var12) * var14 >> 16)) / 50; + field1706[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); } if (var8 >= 50) { - var14 = field1738[var8 - var10] * (50 - var10); - field1726[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1715[var5] - var11) * var14 >> 16)) / 50; - field1699[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1716[var5] - var12) * var14 >> 16)) / 50; - field1728[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); + var14 = field1716[var8 - var10] * (50 - var10); + field1704[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1708[var5] - var11) * var14 >> 16)) / 50; + field1705[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1663[var5] - var12) * var14 >> 16)) / 50; + field1706[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); } } - var11 = field1726[0]; - var12 = field1726[1]; - var13 = field1726[2]; - var14 = field1699[0]; - int var15 = field1699[1]; - int var16 = field1699[2]; - Rasterizer3D.field1763 = false; + var11 = field1704[0]; + var12 = field1704[1]; + var13 = field1704[2]; + var14 = field1705[0]; + int var15 = field1705[1]; + int var16 = field1705[2]; + Rasterizer3D.field1760 = 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.field1763 = true; + Rasterizer3D.field1760 = true; } if (this.faceTextures != null && this.faceTextures[var1] != -1) { - if (this.field1688 != null && this.field1688[var1] != -1) { - var20 = this.field1688[var1] & 255; - var17 = this.field1692[var20]; - var18 = this.field1693[var20]; - var19 = this.field1694[var20]; + if (this.field1666 != null && this.field1666[var1] != -1) { + var20 = this.field1666[var1] & 255; + var17 = this.field1691[var20]; + var18 = this.field1671[var20]; + var19 = this.field1672[var20]; } else { var17 = var5; var18 = var6; @@ -1526,28 +1542,28 @@ public class Model extends Entity { } if (this.faceColors3[var1] == -1) { - Rasterizer3D.method2986(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1715[var17], field1715[var18], field1715[var19], field1716[var17], field1716[var18], field1716[var19], field1717[var17], field1717[var18], field1717[var19], this.faceTextures[var1]); + Rasterizer3D.method2938(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1708[var17], field1708[var18], field1708[var19], field1663[var17], field1663[var18], field1663[var19], field1695[var17], field1695[var18], field1695[var19], this.faceTextures[var1]); } else { - Rasterizer3D.method2986(var14, var15, var16, var11, var12, var13, field1728[0], field1728[1], field1728[2], field1715[var17], field1715[var18], field1715[var19], field1716[var17], field1716[var18], field1716[var19], field1717[var17], field1717[var18], field1717[var19], this.faceTextures[var1]); + Rasterizer3D.method2938(var14, var15, var16, var11, var12, var13, field1706[0], field1706[1], field1706[2], field1708[var17], field1708[var18], field1708[var19], field1663[var17], field1663[var18], field1663[var19], field1695[var17], field1695[var18], field1695[var19], this.faceTextures[var1]); } } else if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3007(var14, var15, var16, var11, var12, var13, field1737[this.faceColors1[var1]]); + Rasterizer3D.method2936(var14, var15, var16, var11, var12, var13, field1715[this.faceColors1[var1]]); } else { - Rasterizer3D.method3020(var14, var15, var16, var11, var12, var13, field1728[0], field1728[1], field1728[2]); + Rasterizer3D.method2934(var14, var15, var16, var11, var12, var13, field1706[0], field1706[1], field1706[2]); } } if (var4 == 4) { - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field1726[3] < 0 || field1726[3] > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field1763 = true; + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field1704[3] < 0 || field1704[3] > Rasterizer3D.Rasterizer3D_clipWidth) { + Rasterizer3D.field1760 = true; } if (this.faceTextures != null && this.faceTextures[var1] != -1) { - if (this.field1688 != null && this.field1688[var1] != -1) { - var20 = this.field1688[var1] & 255; - var17 = this.field1692[var20]; - var18 = this.field1693[var20]; - var19 = this.field1694[var20]; + if (this.field1666 != null && this.field1666[var1] != -1) { + var20 = this.field1666[var1] & 255; + var17 = this.field1691[var20]; + var18 = this.field1671[var20]; + var19 = this.field1672[var20]; } else { var17 = var5; var18 = var6; @@ -1556,28 +1572,28 @@ public class Model extends Entity { short var21 = this.faceTextures[var1]; if (this.faceColors3[var1] == -1) { - Rasterizer3D.method2986(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1715[var17], field1715[var18], field1715[var19], field1716[var17], field1716[var18], field1716[var19], field1717[var17], field1717[var18], field1717[var19], var21); - Rasterizer3D.method2986(var14, var16, field1699[3], var11, var13, field1726[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1715[var17], field1715[var18], field1715[var19], field1716[var17], field1716[var18], field1716[var19], field1717[var17], field1717[var18], field1717[var19], var21); + Rasterizer3D.method2938(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1708[var17], field1708[var18], field1708[var19], field1663[var17], field1663[var18], field1663[var19], field1695[var17], field1695[var18], field1695[var19], var21); + Rasterizer3D.method2938(var14, var16, field1705[3], var11, var13, field1704[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1708[var17], field1708[var18], field1708[var19], field1663[var17], field1663[var18], field1663[var19], field1695[var17], field1695[var18], field1695[var19], var21); } else { - Rasterizer3D.method2986(var14, var15, var16, var11, var12, var13, field1728[0], field1728[1], field1728[2], field1715[var17], field1715[var18], field1715[var19], field1716[var17], field1716[var18], field1716[var19], field1717[var17], field1717[var18], field1717[var19], var21); - Rasterizer3D.method2986(var14, var16, field1699[3], var11, var13, field1726[3], field1728[0], field1728[2], field1728[3], field1715[var17], field1715[var18], field1715[var19], field1716[var17], field1716[var18], field1716[var19], field1717[var17], field1717[var18], field1717[var19], var21); + Rasterizer3D.method2938(var14, var15, var16, var11, var12, var13, field1706[0], field1706[1], field1706[2], field1708[var17], field1708[var18], field1708[var19], field1663[var17], field1663[var18], field1663[var19], field1695[var17], field1695[var18], field1695[var19], var21); + Rasterizer3D.method2938(var14, var16, field1705[3], var11, var13, field1704[3], field1706[0], field1706[2], field1706[3], field1708[var17], field1708[var18], field1708[var19], field1663[var17], field1663[var18], field1663[var19], field1695[var17], field1695[var18], field1695[var19], var21); } } else if (this.faceColors3[var1] == -1) { - var17 = field1737[this.faceColors1[var1]]; - Rasterizer3D.method3007(var14, var15, var16, var11, var12, var13, var17); - Rasterizer3D.method3007(var14, var16, field1699[3], var11, var13, field1726[3], var17); + var17 = field1715[this.faceColors1[var1]]; + Rasterizer3D.method2936(var14, var15, var16, var11, var12, var13, var17); + Rasterizer3D.method2936(var14, var16, field1705[3], var11, var13, field1704[3], var17); } else { - Rasterizer3D.method3020(var14, var15, var16, var11, var12, var13, field1728[0], field1728[1], field1728[2]); - Rasterizer3D.method3020(var14, var16, field1699[3], var11, var13, field1726[3], field1728[0], field1728[2], field1728[3]); + Rasterizer3D.method2934(var14, var15, var16, var11, var12, var13, field1706[0], field1706[1], field1706[2]); + Rasterizer3D.method2934(var14, var16, field1705[3], var11, var13, field1704[3], field1706[0], field1706[2], field1706[3]); } } } - @ObfuscatedName("ct") + @ObfuscatedName("cm") @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { - field1711[0] = -1; + field1696[0] = -1; if (this.boundsType != 1) { this.calculateBoundsCylinder(); } @@ -1587,141 +1603,200 @@ public class Model extends Entity { int var12 = var2 * var7 + var3 * var11 >> 16; int var13 = var3 * this.xzRadius >> 16; int var14 = var12 + var13; - if (var14 <= 50 || var12 >= 3500) { - return; - } - int var15 = var8 * var4 + var5 * var6 >> 16; - int var16 = (var15 - this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; - if (var16 / var14 >= Rasterizer3D.Rasterizer3D_clipMidX2) { - return; - } - int var17 = (var15 + this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; - if (var17 / var14 <= Rasterizer3D.Rasterizer3D_clipNegativeMidX) { - return; - } - int var18 = var3 * var7 - var11 * var2 >> 16; - int var19 = var2 * this.xzRadius >> 16; - int var20 = (var18 + var19) * Rasterizer3D.Rasterizer3D_zoom; - if (var20 / var14 <= Rasterizer3D.Rasterizer3D_clipNegativeMidY) { - return; - } - int var21 = (var3 * super.height >> 16) + var19; - int var22 = (var18 - var21) * Rasterizer3D.Rasterizer3D_zoom; - if (var22 / var14 >= Rasterizer3D.Rasterizer3D_clipMidY2) { - return; - } - int var23 = var13 + (var2 * super.height >> 16); - boolean var24 = false; - boolean var25 = false; - if (var12 - var23 <= 50) { - var25 = true; - } + if (var14 > 50 && var12 < 3500) { + int var15 = var8 * var4 + var5 * var6 >> 16; + int var16 = (var15 - this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; + if (var16 / var14 < Rasterizer3D.Rasterizer3D_clipMidX2) { + int var17 = (var15 + this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; + if (var17 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidX) { + int var18 = var3 * var7 - var11 * var2 >> 16; + int var19 = var2 * this.xzRadius >> 16; + int var20 = (var18 + var19) * Rasterizer3D.Rasterizer3D_zoom; + if (var20 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidY) { + int var21 = (var3 * super.height >> 16) + var19; + int var22 = (var18 - var21) * Rasterizer3D.Rasterizer3D_zoom; + if (var22 / var14 < Rasterizer3D.Rasterizer3D_clipMidY2) { + int var23 = var13 + (var2 * super.height >> 16); + boolean var24 = false; + boolean var25 = false; + if (var12 - var23 <= 50) { + var25 = true; + } - boolean var26 = var25 || this.field1691 > 0; - int var27 = ViewportMouse.ViewportMouse_x; - int var29 = ViewportMouse.ViewportMouse_y; - boolean var31 = ViewportMouse.ViewportMouse_isInViewport; - boolean var34 = 0L != var9; - boolean var35; - if (var34) { - var35 = (int)(var9 >>> 16 & 1L) == 1; - var34 = !var35; - } + boolean var26 = var25 || this.field1699 > 0; + int var27 = class65.method1180(); + int var28 = ViewportMouse.ViewportMouse_y; + boolean var30 = class188.method3588(); + boolean var31 = SpotAnimationDefinition.method4333(var9); + boolean var32 = false; + int var36; + int var37; + int var38; + int var39; + int var47; + int var51; + int var52; + int var53; + if (var31 && var30) { + boolean var33 = false; + if (field1710) { + boolean var34; + if (!class188.method3588()) { + var34 = false; + } else { + int var42; + int var43; + int var44; + if (!ViewportMouse.ViewportMouse_false0) { + var36 = Scene.Scene_cameraPitchSine; + var37 = Scene.Scene_cameraPitchCosine; + var38 = Scene.Scene_cameraYawSine; + var39 = Scene.Scene_cameraYawCosine; + byte var40 = 50; + short var41 = 3500; + var42 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var40 / Rasterizer3D.Rasterizer3D_zoom; + var43 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var40 / Rasterizer3D.Rasterizer3D_zoom; + var44 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var41 / Rasterizer3D.Rasterizer3D_zoom; + int var45 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var41 / Rasterizer3D.Rasterizer3D_zoom; + int var46 = Rasterizer3D.method2947(var43, var40, var37, var36); + var52 = Rasterizer3D.method2946(var43, var40, var37, var36); + var43 = var46; + var46 = Rasterizer3D.method2947(var45, var41, var37, var36); + var53 = Rasterizer3D.method2946(var45, var41, var37, var36); + var45 = var46; + var46 = Rasterizer3D.method2945(var42, var52, var39, var38); + var52 = Rasterizer3D.method2963(var42, var52, var39, var38); + var42 = var46; + var46 = Rasterizer3D.method2945(var44, var53, var39, var38); + var53 = Rasterizer3D.method2963(var44, var53, var39, var38); + ViewportMouse.field1723 = (var46 + var42) / 2; + ViewportMouse.field1724 = (var45 + var43) / 2; + class189.field2328 = (var52 + var53) / 2; + ViewportMouse.field1725 = (var46 - var42) / 2; + ViewportMouse.field1726 = (var45 - var43) / 2; + GrandExchangeEvent.field50 = (var53 - var52) / 2; + SoundCache.field1424 = Math.abs(ViewportMouse.field1725); + Canvas.field389 = Math.abs(ViewportMouse.field1726); + ViewportMouse.field1727 = Math.abs(GrandExchangeEvent.field50); + } - var35 = false; - int var37; - int var38; - int var39; - if (var34 && var31) { - boolean var36 = false; - if (field1732) { - var36 = Frames.boundingBoxCheck(this, var6, var7, var8); - } else { - var37 = var12 - var13; - if (var37 <= 50) { - var37 = 50; - } + var36 = this.xMid + var6; + var37 = var7 + this.yMid; + var38 = var8 + this.zMid; + var39 = this.xMidOffset; + var52 = this.yMidOffset; + var53 = this.zMidOffset; + var42 = ViewportMouse.field1723 - var36; + var43 = ViewportMouse.field1724 - var37; + var44 = class189.field2328 - var38; + if (Math.abs(var42) > var39 + SoundCache.field1424) { + var34 = false; + } else if (Math.abs(var43) > var52 + Canvas.field389) { + var34 = false; + } else if (Math.abs(var44) > var53 + ViewportMouse.field1727) { + var34 = false; + } else if (Math.abs(var44 * ViewportMouse.field1726 - var43 * GrandExchangeEvent.field50) > var53 * Canvas.field389 + var52 * ViewportMouse.field1727) { + var34 = false; + } else if (Math.abs(var42 * GrandExchangeEvent.field50 - var44 * ViewportMouse.field1725) > var39 * ViewportMouse.field1727 + var53 * SoundCache.field1424) { + var34 = false; + } else if (Math.abs(var43 * ViewportMouse.field1725 - var42 * ViewportMouse.field1726) > var52 * SoundCache.field1424 + var39 * Canvas.field389) { + var34 = false; + } else { + var34 = true; + } + } - if (var15 > 0) { - var16 /= var14; - var17 /= var37; - } else { - var17 /= var14; - var16 /= var37; - } + var33 = var34; + } else { + var51 = var12 - var13; + if (var51 <= 50) { + var51 = 50; + } - if (var18 > 0) { - var22 /= var14; - var20 /= var37; - } else { - var20 /= var14; - var22 /= var37; - } + if (var15 > 0) { + var16 /= var14; + var17 /= var51; + } else { + var17 /= var14; + var16 /= var51; + } - var38 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; - var39 = var29 - Rasterizer3D.Rasterizer3D_clipMidY; - if (var38 > var16 && var38 < var17 && var39 > var22 && var39 < var20) { - var36 = true; - } - } + if (var18 > 0) { + var22 /= var14; + var20 /= var51; + } else { + var20 /= var14; + var22 /= var51; + } - if (var36) { - if (this.isSingleTile) { - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var9; - } else { - var35 = true; + var47 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; + var36 = var28 - Rasterizer3D.Rasterizer3D_clipMidY; + if (var47 > var16 && var47 < var17 && var36 > var22 && var36 < var20) { + var33 = true; + } + } + + if (var33) { + if (this.isSingleTile) { + class42.method752(var9); + } else { + var32 = true; + } + } + } + + int var50 = Rasterizer3D.Rasterizer3D_clipMidX; + var51 = Rasterizer3D.Rasterizer3D_clipMidY; + var47 = 0; + var36 = 0; + if (var1 != 0) { + var47 = Model_sine[var1]; + var36 = Model_cosine[var1]; + } + + for (var37 = 0; var37 < this.verticesCount; ++var37) { + var38 = this.verticesX[var37]; + var39 = this.verticesY[var37]; + var52 = this.verticesZ[var37]; + if (var1 != 0) { + var53 = var52 * var47 + var38 * var36 >> 16; + var52 = var52 * var36 - var38 * var47 >> 16; + var38 = var53; + } + + var38 += var6; + var39 += var7; + var52 += var8; + var53 = var52 * var4 + var5 * var38 >> 16; + var52 = var5 * var52 - var38 * var4 >> 16; + var38 = var53; + var53 = var3 * var39 - var52 * var2 >> 16; + var52 = var39 * var2 + var3 * var52 >> 16; + field1692[var37] = var52 - var12; + if (var52 >= 50) { + modelViewportXs[var37] = var38 * Rasterizer3D.Rasterizer3D_zoom / var52 + var50; + modelViewportYs[var37] = var53 * Rasterizer3D.Rasterizer3D_zoom / var52 + var51; + } else { + modelViewportXs[var37] = -5000; + var24 = true; + } + + if (var26) { + field1708[var37] = var38; + field1663[var37] = var53; + field1695[var37] = var52; + } + } + + try { + this.draw0(var24, var32, this.isSingleTile, var9); + } catch (Exception var49) { + } + + } + } } } } - - int var49 = Rasterizer3D.Rasterizer3D_clipMidX; - var37 = Rasterizer3D.Rasterizer3D_clipMidY; - var38 = 0; - var39 = 0; - if (var1 != 0) { - var38 = Model_sine[var1]; - var39 = Model_cosine[var1]; - } - - for (int var40 = 0; var40 < this.verticesCount; ++var40) { - int var41 = this.verticesX[var40]; - int var42 = this.verticesY[var40]; - int var43 = this.verticesZ[var40]; - int var44; - if (var1 != 0) { - var44 = var43 * var38 + var41 * var39 >> 16; - var43 = var43 * var39 - var41 * var38 >> 16; - var41 = var44; - } - - var41 += var6; - var42 += var7; - var43 += var8; - var44 = var43 * var4 + var5 * var41 >> 16; - var43 = var5 * var43 - var41 * var4 >> 16; - var41 = var44; - var44 = var3 * var42 - var43 * var2 >> 16; - var43 = var42 * var2 + var3 * var43 >> 16; - field1714[var40] = var43 - var12; - if (var43 >= 50) { - modelViewportXs[var40] = var41 * Rasterizer3D.Rasterizer3D_zoom / var43 + var49; - modelViewportYs[var40] = var44 * Rasterizer3D.Rasterizer3D_zoom / var43 + var37; - } else { - modelViewportXs[var40] = -5000; - var24 = true; - } - - if (var26) { - field1715[var40] = var41; - field1716[var40] = var44; - field1717[var40] = var43; - } - } - - try { - this.draw0(var24, var35, this.isSingleTile, var9); - } catch (Exception var48) { - } - } } diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java index f8657c3c22..9bf14319ca 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("ds") +@ObfuscatedName("dq") @Implements("ModelData") public class ModelData extends Entity { - @ObfuscatedName("ae") - static int[] field1584; + @ObfuscatedName("ak") + static int[] field1563; @ObfuscatedName("ao") - static int[] field1585; - @ObfuscatedName("aj") - static int field1586; - @ObfuscatedName("at") + static int[] field1564; + @ObfuscatedName("ac") + static int field1565; + @ObfuscatedName("ar") @Export("ModelData_sine") static int[] ModelData_sine; - @ObfuscatedName("ac") + @ObfuscatedName("au") @Export("ModelData_cosine") static int[] ModelData_cosine; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("verticesCount") int verticesCount; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("verticesX") int[] verticesX; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("verticesY") int[] verticesY; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("faceCount") int faceCount; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("indices1") int[] indices1; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("indices2") int[] indices2; - @ObfuscatedName("i") + @ObfuscatedName("q") @Export("indices3") int[] indices3; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("faceRenderTypes") byte[] faceRenderTypes; - @ObfuscatedName("f") + @ObfuscatedName("d") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("m") + @ObfuscatedName("f") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("u") + @ObfuscatedName("c") @Export("textureCoords") byte[] textureCoords; - @ObfuscatedName("x") + @ObfuscatedName("r") @Export("faceColors") short[] faceColors; - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("v") + @ObfuscatedName("p") @Export("priority") byte priority; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("textureTriangleCount") int textureTriangleCount; @ObfuscatedName("g") @Export("textureRenderTypes") byte[] textureRenderTypes; - @ObfuscatedName("a") + @ObfuscatedName("e") @Export("texTriangleX") short[] texTriangleX; - @ObfuscatedName("j") + @ObfuscatedName("z") @Export("texTriangleY") short[] texTriangleY; - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("texTriangleZ") short[] texTriangleZ; - @ObfuscatedName("h") + @ObfuscatedName("w") @Export("vertexSkins") int[] vertexSkins; - @ObfuscatedName("o") + @ObfuscatedName("l") @Export("faceSkins") int[] faceSkins; - @ObfuscatedName("n") + @ObfuscatedName("h") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("d") + @ObfuscatedName("v") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "[Len;" + signature = "[Lei;" ) @Export("faceNormals") FaceNormal[] faceNormals; - @ObfuscatedName("z") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "[Ldd;" + signature = "[Ldl;" ) @Export("vertexNormals") VertexNormal[] vertexNormals; - @ObfuscatedName("al") - @ObfuscatedSignature( - signature = "[Ldd;" - ) - VertexNormal[] field1581; @ObfuscatedName("av") + @ObfuscatedSignature( + signature = "[Ldl;" + ) + VertexNormal[] field1566; + @ObfuscatedName("am") @Export("ambient") public short ambient; - @ObfuscatedName("as") + @ObfuscatedName("ai") @Export("contrast") public short contrast; - @ObfuscatedName("aw") + @ObfuscatedName("af") @Export("isBoundsCalculated") boolean isBoundsCalculated; - @ObfuscatedName("ad") - int field1579; - @ObfuscatedName("ag") - int field1575; - @ObfuscatedName("ar") - int field1564; - @ObfuscatedName("ax") - int field1582; @ObfuscatedName("az") - int field1554; + int field1558; + @ObfuscatedName("aj") + int field1559; + @ObfuscatedName("an") + int field1560; + @ObfuscatedName("at") + int field1535; + @ObfuscatedName("as") + int field1562; static { - field1584 = new int[10000]; - field1585 = new int[10000]; - field1586 = 0; + field1563 = new int[10000]; + field1564 = new int[10000]; + field1565 = 0; ModelData_sine = Rasterizer3D.Rasterizer3D_sine; ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; } @@ -143,7 +143,7 @@ public class ModelData extends Entity { } @ObfuscatedSignature( - signature = "([Lds;I)V" + signature = "([Ldq;I)V" ) public ModelData(ModelData[] var1, int var2) { this.verticesCount = 0; @@ -165,29 +165,28 @@ public class ModelData extends Entity { ModelData var10; for (var9 = 0; var9 < var2; ++var9) { var10 = var1[var9]; - if (var10 == null) { - continue; - } - this.verticesCount += var10.verticesCount; - this.faceCount += var10.faceCount; - this.textureTriangleCount += var10.textureTriangleCount; - if (var10.faceRenderPriorities != null) { - var4 = true; - } else { - if (this.priority == -1) { - this.priority = var10.priority; - } - - if (this.priority != var10.priority) { + if (var10 != null) { + this.verticesCount += var10.verticesCount; + this.faceCount += var10.faceCount; + this.textureTriangleCount += var10.textureTriangleCount; + if (var10.faceRenderPriorities != null) { var4 = true; - } - } + } else { + if (this.priority == -1) { + this.priority = var10.priority; + } - var3 |= var10.faceRenderTypes != null; - var5 |= var10.faceAlphas != null; - var6 |= var10.faceSkins != null; - var7 |= var10.faceTextures != null; - var8 |= var10.textureCoords != null; + if (this.priority != var10.priority) { + var4 = true; + } + } + + var3 |= var10.faceRenderTypes != null; + var5 |= var10.faceAlphas != null; + var6 |= var10.faceSkins != null; + var7 |= var10.faceTextures != null; + var8 |= var10.textureCoords != null; + } } this.verticesX = new int[this.verticesCount]; @@ -235,63 +234,62 @@ public class ModelData extends Entity { for (var9 = 0; var9 < var2; ++var9) { var10 = var1[var9]; - if (var10 == null) { - continue; - } - int var11; - for (var11 = 0; var11 < var10.faceCount; ++var11) { - if (var3 && var10.faceRenderTypes != null) { - this.faceRenderTypes[this.faceCount] = var10.faceRenderTypes[var11]; - } - - if (var4) { - if (var10.faceRenderPriorities != null) { - this.faceRenderPriorities[this.faceCount] = var10.faceRenderPriorities[var11]; - } else { - this.faceRenderPriorities[this.faceCount] = var10.priority; + if (var10 != null) { + int var11; + for (var11 = 0; var11 < var10.faceCount; ++var11) { + if (var3 && var10.faceRenderTypes != null) { + this.faceRenderTypes[this.faceCount] = var10.faceRenderTypes[var11]; } - } - if (var5 && var10.faceAlphas != null) { - this.faceAlphas[this.faceCount] = var10.faceAlphas[var11]; - } - - if (var6 && var10.faceSkins != null) { - this.faceSkins[this.faceCount] = var10.faceSkins[var11]; - } - - if (var7) { - if (var10.faceTextures != null) { - this.faceTextures[this.faceCount] = var10.faceTextures[var11]; - } else { - this.faceTextures[this.faceCount] = -1; + if (var4) { + if (var10.faceRenderPriorities != null) { + this.faceRenderPriorities[this.faceCount] = var10.faceRenderPriorities[var11]; + } else { + this.faceRenderPriorities[this.faceCount] = var10.priority; + } } - } - if (var8) { - if (var10.textureCoords != null && var10.textureCoords[var11] != -1) { - this.textureCoords[this.faceCount] = (byte)(this.textureTriangleCount + var10.textureCoords[var11]); - } else { - this.textureCoords[this.faceCount] = -1; + if (var5 && var10.faceAlphas != null) { + this.faceAlphas[this.faceCount] = var10.faceAlphas[var11]; } + + if (var6 && var10.faceSkins != null) { + this.faceSkins[this.faceCount] = var10.faceSkins[var11]; + } + + if (var7) { + if (var10.faceTextures != null) { + this.faceTextures[this.faceCount] = var10.faceTextures[var11]; + } else { + this.faceTextures[this.faceCount] = -1; + } + } + + if (var8) { + if (var10.textureCoords != null && var10.textureCoords[var11] != -1) { + this.textureCoords[this.faceCount] = (byte)(this.textureTriangleCount + var10.textureCoords[var11]); + } else { + this.textureCoords[this.faceCount] = -1; + } + } + + this.faceColors[this.faceCount] = var10.faceColors[var11]; + this.indices1[this.faceCount] = this.method2707(var10, var10.indices1[var11]); + this.indices2[this.faceCount] = this.method2707(var10, var10.indices2[var11]); + this.indices3[this.faceCount] = this.method2707(var10, var10.indices3[var11]); + ++this.faceCount; } - this.faceColors[this.faceCount] = var10.faceColors[var11]; - this.indices1[this.faceCount] = this.method2816(var10, var10.indices1[var11]); - this.indices2[this.faceCount] = this.method2816(var10, var10.indices2[var11]); - this.indices3[this.faceCount] = this.method2816(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.method2707(var10, var10.texTriangleX[var11]); + this.texTriangleY[this.textureTriangleCount] = (short)this.method2707(var10, var10.texTriangleY[var11]); + this.texTriangleZ[this.textureTriangleCount] = (short)this.method2707(var10, var10.texTriangleZ[var11]); + } - 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.method2816(var10, var10.texTriangleX[var11]); - this.texTriangleY[this.textureTriangleCount] = (short)this.method2816(var10, var10.texTriangleY[var11]); - this.texTriangleZ[this.textureTriangleCount] = (short)this.method2816(var10, var10.texTriangleZ[var11]); + ++this.textureTriangleCount; } - - ++this.textureTriangleCount; } } @@ -303,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.method2770(var1); + this.method2705(var1); } else { - this.method2793(var1); + this.method2706(var1); } } @ObfuscatedSignature( - signature = "(Lds;ZZZZ)V", + signature = "(Ldq;ZZZZ)V", garbageValue = "1" ) public ModelData(ModelData var1, boolean var2, boolean var3, boolean var4, boolean var5) { @@ -377,13 +375,13 @@ public class ModelData extends Entity { this.faceLabelsAlpha = var1.faceLabelsAlpha; this.vertexNormals = var1.vertexNormals; this.faceNormals = var1.faceNormals; - this.field1581 = var1.field1581; + this.field1566 = var1.field1566; this.ambient = var1.ambient; this.contrast = var1.contrast; } - @ObfuscatedName("w") - void method2770(byte[] var1) { + @ObfuscatedName("j") + void method2705(byte[] var1) { Buffer var2 = new Buffer(var1); Buffer var3 = new Buffer(var1); Buffer var4 = new Buffer(var1); @@ -688,8 +686,8 @@ public class ModelData extends Entity { } - @ObfuscatedName("e") - void method2793(byte[] var1) { + @ObfuscatedName("i") + void method2706(byte[] var1) { boolean var2 = false; boolean var3 = false; Buffer var4 = new Buffer(var1); @@ -941,13 +939,12 @@ public class ModelData extends Entity { for (var43 = 0; var43 < var10; ++var43) { var44 = this.textureCoords[var43] & 255; - if (var44 == 255) { - continue; - } - if (this.indices1[var43] == (this.texTriangleX[var44] & 0xffff) && this.indices2[var43] == (this.texTriangleY[var44] & 0xffff) && this.indices3[var43] == (this.texTriangleZ[var44] & 0xffff)) { - this.textureCoords[var43] = -1; - } else { - var46 = true; + if (var44 != 255) { + if (this.indices1[var43] == (this.texTriangleX[var44] & '\uffff') && this.indices2[var43] == (this.texTriangleY[var44] & '\uffff') && this.indices3[var43] == (this.texTriangleZ[var44] & '\uffff')) { + this.textureCoords[var43] = -1; + } else { + var46 = true; + } } } @@ -966,11 +963,11 @@ public class ModelData extends Entity { } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lds;I)I" + signature = "(Ldq;I)I" ) - final int method2816(ModelData var1, int var2) { + final int method2707(ModelData var1, int var2) { int var3 = -1; int var4 = var1.verticesX[var2]; int var5 = var1.verticesY[var2]; @@ -997,11 +994,11 @@ public class ModelData extends Entity { return var3; } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "()Lds;" + signature = "()Ldq;" ) - public ModelData method2775() { + public ModelData method2708() { ModelData var1 = new ModelData(); if (this.faceRenderTypes != null) { var1.faceRenderTypes = new byte[this.faceCount]; @@ -1041,103 +1038,105 @@ public class ModelData extends Entity { return var1; } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "([[IIIIZI)Lds;" + signature = "([[IIIIZI)Ldq;" ) - public ModelData method2776(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { + public ModelData method2709(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { this.calculateBounds(); - int var7 = var2 + this.field1575; - int var8 = var2 + this.field1564; - int var9 = var4 + this.field1554; - int var10 = var4 + this.field1582; - if (var7 < 0 || var8 + 128 >> 7 >= var1.length || var9 < 0 || var10 + 128 >> 7 >= var1[0].length) { - return this; - } - var7 >>= 7; - var8 = var8 + 127 >> 7; - var9 >>= 7; - var10 = var10 + 127 >> 7; - if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) { - return this; - } - ModelData var11 = new ModelData(); - var11.verticesCount = this.verticesCount; - var11.faceCount = this.faceCount; - var11.textureTriangleCount = this.textureTriangleCount; - var11.verticesX = this.verticesX; - var11.verticesZ = this.verticesZ; - var11.indices1 = this.indices1; - var11.indices2 = this.indices2; - var11.indices3 = this.indices3; - var11.faceRenderTypes = this.faceRenderTypes; - var11.faceRenderPriorities = this.faceRenderPriorities; - var11.faceAlphas = this.faceAlphas; - var11.textureCoords = this.textureCoords; - var11.faceColors = this.faceColors; - var11.faceTextures = this.faceTextures; - var11.priority = this.priority; - var11.textureRenderTypes = this.textureRenderTypes; - var11.texTriangleX = this.texTriangleX; - var11.texTriangleY = this.texTriangleY; - var11.texTriangleZ = this.texTriangleZ; - var11.vertexSkins = this.vertexSkins; - var11.faceSkins = this.faceSkins; - var11.vertexLabels = this.vertexLabels; - var11.faceLabelsAlpha = this.faceLabelsAlpha; - var11.ambient = this.ambient; - var11.contrast = this.contrast; - var11.verticesY = new int[var11.verticesCount]; - int var12; - int var13; - int var14; - int var15; - int var16; - int var17; - int var18; - int var19; - int var20; - int var21; - if (var6 == 0) { - for (var12 = 0; var12 < var11.verticesCount; ++var12) { - var13 = var2 + this.verticesX[var12]; - var14 = var4 + this.verticesZ[var12]; - var15 = var13 & 127; - var16 = var14 & 127; - var17 = var13 >> 7; - var18 = var14 >> 7; - var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7; - var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7; - var21 = var19 * (128 - var16) + var20 * var16 >> 7; - var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; + int var7 = var2 + this.field1559; + int var8 = var2 + this.field1560; + int var9 = var4 + this.field1562; + int var10 = var4 + this.field1535; + if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { + var7 >>= 7; + var8 = var8 + 127 >> 7; + var9 >>= 7; + var10 = var10 + 127 >> 7; + if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) { + return this; + } else { + ModelData var11 = new ModelData(); + var11.verticesCount = this.verticesCount; + var11.faceCount = this.faceCount; + var11.textureTriangleCount = this.textureTriangleCount; + var11.verticesX = this.verticesX; + var11.verticesZ = this.verticesZ; + var11.indices1 = this.indices1; + var11.indices2 = this.indices2; + var11.indices3 = this.indices3; + var11.faceRenderTypes = this.faceRenderTypes; + var11.faceRenderPriorities = this.faceRenderPriorities; + var11.faceAlphas = this.faceAlphas; + var11.textureCoords = this.textureCoords; + var11.faceColors = this.faceColors; + var11.faceTextures = this.faceTextures; + var11.priority = this.priority; + var11.textureRenderTypes = this.textureRenderTypes; + var11.texTriangleX = this.texTriangleX; + var11.texTriangleY = this.texTriangleY; + var11.texTriangleZ = this.texTriangleZ; + var11.vertexSkins = this.vertexSkins; + var11.faceSkins = this.faceSkins; + var11.vertexLabels = this.vertexLabels; + var11.faceLabelsAlpha = this.faceLabelsAlpha; + var11.ambient = this.ambient; + var11.contrast = this.contrast; + var11.verticesY = new int[var11.verticesCount]; + int var12; + int var13; + int var14; + int var15; + int var16; + int var17; + int var18; + int var19; + int var20; + int var21; + if (var6 == 0) { + for (var12 = 0; var12 < var11.verticesCount; ++var12) { + var13 = var2 + this.verticesX[var12]; + var14 = var4 + this.verticesZ[var12]; + var15 = var13 & 127; + var16 = var14 & 127; + var17 = var13 >> 7; + var18 = var14 >> 7; + var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7; + var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7; + var21 = var19 * (128 - var16) + var20 * var16 >> 7; + var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; + } + } else { + for (var12 = 0; var12 < var11.verticesCount; ++var12) { + var13 = (-this.verticesY[var12] << 16) / super.height; + if (var13 < var6) { + var14 = var2 + this.verticesX[var12]; + var15 = var4 + this.verticesZ[var12]; + var16 = var14 & 127; + var17 = var15 & 127; + var18 = var14 >> 7; + var19 = var15 >> 7; + var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7; + var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7; + int var22 = var20 * (128 - var17) + var21 * var17 >> 7; + var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; + } + } + } + + var11.invalidate(); + return var11; } } else { - for (var12 = 0; var12 < var11.verticesCount; ++var12) { - var13 = (-this.verticesY[var12] << 16) / super.height; - if (var13 >= var6) { - continue; - } - var14 = var2 + this.verticesX[var12]; - var15 = var4 + this.verticesZ[var12]; - var16 = var14 & 127; - var17 = var15 & 127; - var18 = var14 >> 7; - var19 = var15 >> 7; - var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7; - var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7; - int var22 = var20 * (128 - var17) + var21 * var17 >> 7; - var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; - } + return this; } - - var11.invalidate(); - return var11; } - @ObfuscatedName("b") - void method2777() { + @ObfuscatedName("t") + void method2710() { int[] var1; int var2; + int var10002; int var3; int var4; if (this.vertexSkins != null) { @@ -1146,7 +1145,7 @@ public class ModelData extends Entity { for (var3 = 0; var3 < this.verticesCount; ++var3) { var4 = this.vertexSkins[var3]; - var1[var4]++; + var10002 = var1[var4]++; if (var4 > var2) { var2 = var4; } @@ -1172,7 +1171,7 @@ public class ModelData extends Entity { for (var3 = 0; var3 < this.faceCount; ++var3) { var4 = this.faceSkins[var3]; - var1[var4]++; + var10002 = var1[var4]++; if (var4 > var2) { var2 = var4; } @@ -1194,8 +1193,8 @@ public class ModelData extends Entity { } - @ObfuscatedName("i") - public void method2778() { + @ObfuscatedName("q") + public void method2769() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { int var2 = this.verticesX[var1]; this.verticesX[var1] = this.verticesZ[var1]; @@ -1205,8 +1204,8 @@ public class ModelData extends Entity { this.invalidate(); } - @ObfuscatedName("u") - public void method2797() { + @ObfuscatedName("d") + public void method2712() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { this.verticesX[var1] = -this.verticesX[var1]; this.verticesZ[var1] = -this.verticesZ[var1]; @@ -1215,8 +1214,8 @@ public class ModelData extends Entity { this.invalidate(); } - @ObfuscatedName("x") - public void method2780() { + @ObfuscatedName("f") + public void method2713() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { int var2 = this.verticesZ[var1]; this.verticesZ[var1] = this.verticesX[var1]; @@ -1226,8 +1225,8 @@ public class ModelData extends Entity { this.invalidate(); } - @ObfuscatedName("r") - public void method2781(int var1) { + @ObfuscatedName("c") + public void method2714(int var1) { int var2 = ModelData_sine[var1]; int var3 = ModelData_cosine[var1]; @@ -1240,13 +1239,16 @@ public class ModelData extends Entity { this.invalidate(); } - @ObfuscatedName("v") + @ObfuscatedName("r") @Export("changeOffset") public void changeOffset(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { - this.verticesX[var4] += var1; - this.verticesY[var4] += var2; - this.verticesZ[var4] += var3; + int[] var10000 = this.verticesX; + var10000[var4] += var1; + var10000 = this.verticesY; + var10000[var4] += var2; + var10000 = this.verticesZ; + var10000[var4] += var3; } this.invalidate(); @@ -1254,31 +1256,30 @@ public class ModelData extends Entity { @ObfuscatedName("y") @Export("recolor") - public void recolor(short from, short to) { + public void recolor(short var1, short var2) { for (int var3 = 0; var3 < this.faceCount; ++var3) { - if (this.faceColors[var3] == from) { - this.faceColors[var3] = to; + if (this.faceColors[var3] == var1) { + this.faceColors[var3] = var2; } } } + @ObfuscatedName("p") + @Export("retexture") + public void retexture(short var1, short var2) { + if (this.faceTextures != null) { + for (int var3 = 0; var3 < this.faceCount; ++var3) { + if (this.faceTextures[var3] == var1) { + this.faceTextures[var3] = var2; + } + } + + } + } + @ObfuscatedName("g") - @Export("retexture") - public void retexture(short var1, short var2) { - if (this.faceTextures == null) { - return; - } - for (int var3 = 0; var3 < this.faceCount; ++var3) { - if (this.faceTextures[var3] == var1) { - this.faceTextures[var3] = var2; - } - } - - } - - @ObfuscatedName("a") - public void method2785() { + public void method2718() { int var1; for (var1 = 0; var1 < this.verticesCount; ++var1) { this.verticesZ[var1] = -this.verticesZ[var1]; @@ -1293,151 +1294,150 @@ public class ModelData extends Entity { this.invalidate(); } - @ObfuscatedName("j") + @ObfuscatedName("e") @Export("resize") - public void resize(int x, int y, int z) { + public void resize(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { - this.verticesX[var4] = this.verticesX[var4] * x / 128; - this.verticesY[var4] = y * this.verticesY[var4] / 128; - this.verticesZ[var4] = z * this.verticesZ[var4] / 128; + this.verticesX[var4] = this.verticesX[var4] * var1 / 128; + this.verticesY[var4] = var2 * this.verticesY[var4] / 128; + this.verticesZ[var4] = var3 * this.verticesZ[var4] / 128; } this.invalidate(); } - @ObfuscatedName("o") + @ObfuscatedName("z") @Export("calculateVertexNormals") public void calculateVertexNormals() { - if (this.vertexNormals != null) { - return; - } - this.vertexNormals = new VertexNormal[this.verticesCount]; + if (this.vertexNormals == null) { + this.vertexNormals = new VertexNormal[this.verticesCount]; - int var1; - for (var1 = 0; var1 < this.verticesCount; ++var1) { - this.vertexNormals[var1] = new VertexNormal(); - } - - for (var1 = 0; var1 < this.faceCount; ++var1) { - int var2 = this.indices1[var1]; - int var3 = this.indices2[var1]; - int var4 = this.indices3[var1]; - int var5 = this.verticesX[var3] - this.verticesX[var2]; - int var6 = this.verticesY[var3] - this.verticesY[var2]; - int var7 = this.verticesZ[var3] - this.verticesZ[var2]; - int var8 = this.verticesX[var4] - this.verticesX[var2]; - int var9 = this.verticesY[var4] - this.verticesY[var2]; - int var10 = this.verticesZ[var4] - this.verticesZ[var2]; - int var11 = var6 * var10 - var9 * var7; - int var12 = var7 * var8 - var10 * var5; - - int var13; - for (var13 = var5 * var9 - var8 * var6; var11 > 8192 || var12 > 8192 || var13 > 8192 || var11 < -8192 || var12 < -8192 || var13 < -8192; var13 >>= 1) { - var11 >>= 1; - var12 >>= 1; + int var1; + for (var1 = 0; var1 < this.verticesCount; ++var1) { + this.vertexNormals[var1] = new VertexNormal(); } - int var14 = (int)Math.sqrt((double)(var11 * var11 + var12 * var12 + var13 * var13)); - if (var14 <= 0) { - var14 = 1; - } + for (var1 = 0; var1 < this.faceCount; ++var1) { + int var2 = this.indices1[var1]; + int var3 = this.indices2[var1]; + int var4 = this.indices3[var1]; + int var5 = this.verticesX[var3] - this.verticesX[var2]; + int var6 = this.verticesY[var3] - this.verticesY[var2]; + int var7 = this.verticesZ[var3] - this.verticesZ[var2]; + int var8 = this.verticesX[var4] - this.verticesX[var2]; + int var9 = this.verticesY[var4] - this.verticesY[var2]; + int var10 = this.verticesZ[var4] - this.verticesZ[var2]; + int var11 = var6 * var10 - var9 * var7; + int var12 = var7 * var8 - var10 * var5; - var11 = var11 * 256 / var14; - var12 = var12 * 256 / var14; - var13 = var13 * 256 / var14; - byte var15; - if (this.faceRenderTypes == null) { - var15 = 0; - } else { - var15 = this.faceRenderTypes[var1]; - } - - if (var15 == 0) { - VertexNormal var16 = this.vertexNormals[var2]; - var16.x += var11; - var16.y += var12; - var16.z += var13; - ++var16.magnitude; - var16 = this.vertexNormals[var3]; - var16.x += var11; - var16.y += var12; - var16.z += var13; - ++var16.magnitude; - var16 = this.vertexNormals[var4]; - var16.x += var11; - var16.y += var12; - var16.z += var13; - ++var16.magnitude; - } else if (var15 == 1) { - if (this.faceNormals == null) { - this.faceNormals = new FaceNormal[this.faceCount]; + int var13; + for (var13 = var5 * var9 - var8 * var6; var11 > 8192 || var12 > 8192 || var13 > 8192 || var11 < -8192 || var12 < -8192 || var13 < -8192; var13 >>= 1) { + var11 >>= 1; + var12 >>= 1; } - FaceNormal var17 = this.faceNormals[var1] = new FaceNormal(); - var17.x = var11; - var17.y = var12; - var17.z = var13; + int var14 = (int)Math.sqrt((double)(var11 * var11 + var12 * var12 + var13 * var13)); + if (var14 <= 0) { + var14 = 1; + } + + var11 = var11 * 256 / var14; + var12 = var12 * 256 / var14; + var13 = var13 * 256 / var14; + byte var15; + if (this.faceRenderTypes == null) { + var15 = 0; + } else { + var15 = this.faceRenderTypes[var1]; + } + + if (var15 == 0) { + VertexNormal var16 = this.vertexNormals[var2]; + var16.x += var11; + var16.y += var12; + var16.z += var13; + ++var16.magnitude; + var16 = this.vertexNormals[var3]; + var16.x += var11; + var16.y += var12; + var16.z += var13; + ++var16.magnitude; + var16 = this.vertexNormals[var4]; + var16.x += var11; + var16.y += var12; + var16.z += var13; + ++var16.magnitude; + } else if (var15 == 1) { + if (this.faceNormals == null) { + this.faceNormals = new FaceNormal[this.faceCount]; + } + + FaceNormal var17 = this.faceNormals[var1] = new FaceNormal(); + var17.x = var11; + var17.y = var12; + var17.z = var13; + } } + } } - @ObfuscatedName("d") + @ObfuscatedName("w") @Export("invalidate") void invalidate() { this.vertexNormals = null; - this.field1581 = null; + this.field1566 = null; this.faceNormals = null; this.isBoundsCalculated = false; } - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("calculateBounds") void calculateBounds() { - if (this.isBoundsCalculated) { - return; + if (!this.isBoundsCalculated) { + super.height = 0; + this.field1558 = 0; + this.field1559 = 999999; + this.field1560 = -999999; + this.field1535 = -99999; + this.field1562 = 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.field1559) { + this.field1559 = var2; + } + + if (var2 > this.field1560) { + this.field1560 = var2; + } + + if (var4 < this.field1562) { + this.field1562 = var4; + } + + if (var4 > this.field1535) { + this.field1535 = var4; + } + + if (-var3 > super.height) { + super.height = -var3; + } + + if (var3 > this.field1558) { + this.field1558 = var3; + } + } + + this.isBoundsCalculated = true; } - super.height = 0; - this.field1579 = 0; - this.field1575 = 999999; - this.field1564 = -999999; - this.field1582 = -99999; - this.field1554 = 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.field1575) { - this.field1575 = var2; - } - - if (var2 > this.field1564) { - this.field1564 = var2; - } - - if (var4 < this.field1554) { - this.field1554 = var4; - } - - if (var4 > this.field1582) { - this.field1582 = var4; - } - - if (-var3 > super.height) { - super.height = -var3; - } - - if (var3 > this.field1579) { - this.field1579 = var3; - } - } - - this.isBoundsCalculated = true; } - @ObfuscatedName("al") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(IIIII)Ldm;" + signature = "(IIIII)Ldo;" ) @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.field1691 = 0; + var8.field1699 = 0; for (var10 = 0; var10 < this.textureTriangleCount; ++var10) { if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { - ++var8.field1691; + ++var8.field1699; } } - var8.field1692 = new int[var8.field1691]; - var8.field1693 = new int[var8.field1691]; - var8.field1694 = new int[var8.field1691]; + var8.field1691 = new int[var8.field1699]; + var8.field1671 = new int[var8.field1699]; + var8.field1672 = new int[var8.field1699]; var10 = 0; int var11; for (var11 = 0; var11 < this.textureTriangleCount; ++var11) { if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { - var8.field1692[var10] = this.texTriangleX[var11] & 0xffff; - var8.field1693[var10] = this.texTriangleY[var11] & 0xffff; - var8.field1694[var10] = this.texTriangleZ[var11] & 0xffff; + var8.field1691[var10] = this.texTriangleX[var11] & '\uffff'; + var8.field1671[var10] = this.texTriangleY[var11] & '\uffff'; + var8.field1672[var10] = this.texTriangleZ[var11] & '\uffff'; var9[var11] = var10++; } else { var9[var11] = -1; } } - var8.field1688 = new byte[this.faceCount]; + var8.field1666 = new byte[this.faceCount]; for (var11 = 0; var11 < this.faceCount; ++var11) { if (this.textureCoords[var11] != -1) { - var8.field1688[var11] = (byte)var9[this.textureCoords[var11] & 255]; + var8.field1666[var11] = (byte)var9[this.textureCoords[var11] & 255]; } else { - var8.field1688[var11] = -1; + var8.field1666[var11] = -1; } } } @@ -1528,79 +1528,83 @@ public class ModelData extends Entity { int var14; FaceNormal var19; if (var12 == -1) { - if (var17 == 0) { - int var15 = this.faceColors[var16] & 0xffff; - if (this.field1581 != null && this.field1581[this.indices1[var16]] != null) { - var13 = this.field1581[this.indices1[var16]]; + 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] = method2725(this.faceColors[var16] & '\uffff', var14); + var8.faceColors3[var16] = -1; + } else if (var17 == 3) { + var8.faceColors1[var16] = 128; + var8.faceColors3[var16] = -1; + } else { + var8.faceColors3[var16] = -2; + } + } else { + int var15 = this.faceColors[var16] & '\uffff'; + if (this.field1566 != null && this.field1566[this.indices1[var16]] != null) { + var13 = this.field1566[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] = method2792(var15, var14); - if (this.field1581 != null && this.field1581[this.indices2[var16]] != null) { - var13 = this.field1581[this.indices2[var16]]; + var8.faceColors1[var16] = method2725(var15, var14); + if (this.field1566 != null && this.field1566[this.indices2[var16]] != null) { + var13 = this.field1566[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] = method2792(var15, var14); - if (this.field1581 != null && this.field1581[this.indices3[var16]] != null) { - var13 = this.field1581[this.indices3[var16]]; + var8.faceColors2[var16] = method2725(var15, var14); + if (this.field1566 != null && this.field1566[this.indices3[var16]] != null) { + var13 = this.field1566[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] = method2792(var15, var14); - } else if (var17 == 1) { + var8.faceColors3[var16] = method2725(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] = method2792(this.faceColors[var16] & 0xffff, var14); - var8.faceColors3[var16] = -1; - } else if (var17 == 3) { - var8.faceColors1[var16] = 128; + var8.faceColors1[var16] = method2741(var14); var8.faceColors3[var16] = -1; } else { var8.faceColors3[var16] = -2; } - } else if (var17 == 0) { - if (this.field1581 != null && this.field1581[this.indices1[var16]] != null) { - var13 = this.field1581[this.indices1[var16]]; + } else { + if (this.field1566 != null && this.field1566[this.indices1[var16]] != null) { + var13 = this.field1566[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] = method2818(var14); - if (this.field1581 != null && this.field1581[this.indices2[var16]] != null) { - var13 = this.field1581[this.indices2[var16]]; + var8.faceColors1[var16] = method2741(var14); + if (this.field1566 != null && this.field1566[this.indices2[var16]] != null) { + var13 = this.field1566[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] = method2818(var14); - if (this.field1581 != null && this.field1581[this.indices3[var16]] != null) { - var13 = this.field1581[this.indices3[var16]]; + var8.faceColors2[var16] = method2741(var14); + if (this.field1566 != null && this.field1566[this.indices3[var16]] != null) { + var13 = this.field1566[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] = method2818(var14); - } else if (var17 == 1) { - var19 = this.faceNormals[var16]; - var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; - var8.faceColors1[var16] = method2818(var14); - var8.faceColors3[var16] = -1; - } else { - var8.faceColors3[var16] = -2; + var8.faceColors3[var16] = method2741(var14); } } - this.method2777(); + this.method2710(); var8.verticesCount = this.verticesCount; var8.verticesX = this.verticesX; var8.verticesY = this.verticesY; @@ -1618,9 +1622,9 @@ public class ModelData extends Entity { return var8; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lhp;II)Lds;" + signature = "(Lhz;II)Ldq;" ) @Export("ModelData_get") public static ModelData ModelData_get(AbstractArchive var0, int var1, int var2) { @@ -1628,16 +1632,16 @@ public class ModelData extends Entity { return var3 == null ? null : new ModelData(var3); } - @ObfuscatedName("z") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(Lds;Lds;IIIZ)V" + signature = "(Ldq;Ldq;IIIZ)V" ) - static void method2790(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { + static void method2745(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { var0.calculateBounds(); var0.calculateVertexNormals(); var1.calculateBounds(); var1.calculateVertexNormals(); - ++field1586; + ++field1565; int var6 = 0; int[] var7 = var1.verticesX; int var8 = var1.verticesCount; @@ -1645,87 +1649,79 @@ public class ModelData extends Entity { int var9; for (var9 = 0; var9 < var0.verticesCount; ++var9) { VertexNormal var10 = var0.vertexNormals[var9]; - if (var10.magnitude == 0) { - continue; - } - int var11 = var0.verticesY[var9] - var3; - if (var11 > var1.field1579) { - continue; - } - int var12 = var0.verticesX[var9] - var2; - if (var12 < var1.field1575 || var12 > var1.field1564) { - continue; - } - int var13 = var0.verticesZ[var9] - var4; - if (var13 < var1.field1554 || var13 > var1.field1582) { - continue; - } - 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) { - continue; - } - if (var0.field1581 == null) { - var0.field1581 = new VertexNormal[var0.verticesCount]; - } + if (var10.magnitude != 0) { + int var11 = var0.verticesY[var9] - var3; + if (var11 <= var1.field1558) { + int var12 = var0.verticesX[var9] - var2; + if (var12 >= var1.field1559 && var12 <= var1.field1560) { + int var13 = var0.verticesZ[var9] - var4; + if (var13 >= var1.field1562 && var13 <= var1.field1535) { + 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.field1566 == null) { + var0.field1566 = new VertexNormal[var0.verticesCount]; + } - if (var1.field1581 == null) { - var1.field1581 = new VertexNormal[var8]; - } + if (var1.field1566 == null) { + var1.field1566 = new VertexNormal[var8]; + } - VertexNormal var16 = var0.field1581[var9]; - if (var16 == null) { - var16 = var0.field1581[var9] = new VertexNormal(var10); - } + VertexNormal var16 = var0.field1566[var9]; + if (var16 == null) { + var16 = var0.field1566[var9] = new VertexNormal(var10); + } - VertexNormal var17 = var1.field1581[var14]; - if (var17 == null) { - var17 = var1.field1581[var14] = new VertexNormal(var15); - } + VertexNormal var17 = var1.field1566[var14]; + if (var17 == null) { + var17 = var1.field1566[var14] = new VertexNormal(var15); + } - var16.x += var15.x; - var16.y += var15.y; - var16.z += var15.z; - var16.magnitude += var15.magnitude; - var17.x += var10.x; - var17.y += var10.y; - var17.z += var10.z; - var17.magnitude += var10.magnitude; - ++var6; - field1584[var9] = field1586; - field1585[var14] = field1586; + var16.x += var15.x; + var16.y += var15.y; + var16.z += var15.z; + var16.magnitude += var15.magnitude; + var17.x += var10.x; + var17.y += var10.y; + var17.z += var10.z; + var17.magnitude += var10.magnitude; + ++var6; + field1563[var9] = field1565; + field1564[var14] = field1565; + } + } + } + } + } } } - if (var6 < 3 || !var5) { - return; + if (var6 >= 3 && var5) { + for (var9 = 0; var9 < var0.faceCount; ++var9) { + if (field1563[var0.indices1[var9]] == field1565 && field1563[var0.indices2[var9]] == field1565 && field1563[var0.indices3[var9]] == field1565) { + if (var0.faceRenderTypes == null) { + var0.faceRenderTypes = new byte[var0.faceCount]; + } + + var0.faceRenderTypes[var9] = 2; + } + } + + for (var9 = 0; var9 < var1.faceCount; ++var9) { + if (field1565 == field1564[var1.indices1[var9]] && field1565 == field1564[var1.indices2[var9]] && field1565 == field1564[var1.indices3[var9]]) { + if (var1.faceRenderTypes == null) { + var1.faceRenderTypes = new byte[var1.faceCount]; + } + + var1.faceRenderTypes[var9] = 2; + } + } + } - for (var9 = 0; var9 < var0.faceCount; ++var9) { - if (field1584[var0.indices1[var9]] != field1586 || field1584[var0.indices2[var9]] != field1586 || field1584[var0.indices3[var9]] != field1586) { - continue; - } - if (var0.faceRenderTypes == null) { - var0.faceRenderTypes = new byte[var0.faceCount]; - } - - var0.faceRenderTypes[var9] = 2; - } - - for (var9 = 0; var9 < var1.faceCount; ++var9) { - if (field1586 != field1585[var1.indices1[var9]] || field1586 != field1585[var1.indices2[var9]] || field1586 != field1585[var1.indices3[var9]]) { - continue; - } - if (var1.faceRenderTypes == null) { - var1.faceRenderTypes = new byte[var1.faceCount]; - } - - var1.faceRenderTypes[var9] = 2; - } - } - @ObfuscatedName("av") - static final int method2792(int var0, int var1) { + @ObfuscatedName("m") + static final int method2725(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; if (var1 < 2) { var1 = 2; @@ -1736,8 +1732,8 @@ public class ModelData extends Entity { return (var0 & 65408) + var1; } - @ObfuscatedName("as") - static final int method2818(int var0) { + @ObfuscatedName("o") + static final int method2741(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 4c0c457147..c301765947 100644 --- a/runescape-client/src/main/java/ModelData0.java +++ b/runescape-client/src/main/java/ModelData0.java @@ -1,125 +1,274 @@ -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("eu") +@ObfuscatedName("em") @Implements("ModelData0") public class ModelData0 { - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 109358047 - ) - static int field1871; - @ObfuscatedName("b") - public static short[] field1870; - @ObfuscatedName("i") - @Export("ItemDefinition_inMembersWorld") - public static boolean ItemDefinition_inMembersWorld; + @ObfuscatedName("gq") + @Export("xteaKeys") + static int[][] xteaKeys; ModelData0() { } - @ObfuscatedName("e") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(I)Lbk;", - garbageValue = "1887842280" + signature = "([Ljava/lang/String;[SIII)V", + garbageValue = "-2014451002" ) - @Export("loadClientPreferences") - static ClientPreferences loadClientPreferences() { - AccessFile var0 = null; - ClientPreferences var1 = new ClientPreferences(); + @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; - try { - var0 = WorldMapIcon_0.getPreferencesFile("", WorldMapRegion.studioGame.name, false); - byte[] var2 = new byte[(int)var0.length()]; - - int var4; - for (int var3 = 0; var3 < var2.length; var3 += var4) { - var4 = var0.read(var2, var3, var2.length - var3); - if (var4 == -1) { - throw new IOException(); + 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; } } - var1 = new ClientPreferences(new Buffer(var2)); - } catch (Exception var6) { + 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); } - try { - if (var0 != null) { - var0.close(); - } - } catch (Exception var5) { - } - - return var1; } - @ObfuscatedName("k") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(ILcx;ZB)I", - garbageValue = "-93" + signature = "(III)Lhp;", + garbageValue = "927119221" ) - static int method3250(int var0, Script var1, boolean var2) { - int var3 = -1; - Widget var4; - if (var0 >= 2000) { - var0 -= 1000; - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var4 = class80.getWidget(var3); + @Export("getWidgetChild") + public static Widget getWidgetChild(int var0, int var1) { + Widget var2 = WorldMapElement.getWidget(var0); + if (var1 == -1) { + return var2; } else { - var4 = var2 ? Interpreter.field1111 : Calendar.field2507; + return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; + } + } + + @ObfuscatedName("gr") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1772928872" + ) + @Export("drawProjectiles") + static final void drawProjectiles() { + for (Projectile var0 = (Projectile)Client.projectiles.last(); var0 != null; var0 = (Projectile)Client.projectiles.previous()) { + if (var0.plane == ItemContainer.plane && Client.cycle <= var0.cycleEnd) { + if (Client.cycle >= var0.cycleStart) { + if (var0.targetIndex > 0) { + NPC var1 = Client.npcs[var0.targetIndex - 1]; + if (var1 != null && var1.x >= 0 && var1.x < 13312 && var1.y >= 0 && var1.y < 13312) { + var0.setDestination(var1.x, var1.y, GrandExchangeOfferTotalQuantityComparator.getTileHeight(var1.x, var1.y, var0.plane) - var0.endHeight, Client.cycle); + } + } + + if (var0.targetIndex < 0) { + int var2 = -var0.targetIndex - 1; + Player var3; + if (var2 == Client.localPlayerIndex) { + var3 = WorldMapIcon_1.localPlayer; + } else { + var3 = Client.players[var2]; + } + + if (var3 != null && var3.x >= 0 && var3.x < 13312 && var3.y >= 0 && var3.y < 13312) { + var0.setDestination(var3.x, var3.y, GrandExchangeOfferTotalQuantityComparator.getTileHeight(var3.x, var3.y, var0.plane) - var0.endHeight, Client.cycle); + } + } + + var0.advance(Client.field879); + Player.scene.drawEntity(ItemContainer.plane, (int)var0.x, (int)var0.y, (int)var0.z, 60, var0, var0.yaw, -1L, false); + } + } else { + var0.remove(); + } } - if (var0 == ScriptOpcodes.CC_SETPOSITION) { - HealthBarUpdate.Interpreter_intStackSize -= 4; - var4.rawX = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4.rawY = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - var4.xAlignment = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2]; - var4.yAlignment = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 3]; - Strings.invalidateWidget(var4); - WorldMapSprite.client.alignWidget(var4); - if (var3 != -1 && var4.type == 0) { - WorldMapSprite.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); + } + + @ObfuscatedName("gs") + @ObfuscatedSignature( + signature = "(IIZI)V", + garbageValue = "1845013682" + ) + static final void method3198(int var0, int var1, boolean var2) { + if (!var2 || var0 != class13.field86 || class16.field101 != var1) { + class13.field86 = var0; + class16.field101 = var1; + FloorDecoration.updateGameState(25); + MusicPatch.drawLoadingMessage("Loading - please wait.", true); + int var3 = PacketWriter.baseX * 64; + int var4 = RouteStrategy.baseY * 64; + PacketWriter.baseX = (var0 - 6) * 8; + RouteStrategy.baseY = (var1 - 6) * 8; + int var5 = PacketWriter.baseX * 64 - var3; + int var6 = RouteStrategy.baseY * 64 - var4; + var3 = PacketWriter.baseX * 64; + var4 = RouteStrategy.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; + } } - return 1; - } - if (var0 == ScriptOpcodes.CC_SETSIZE) { - HealthBarUpdate.Interpreter_intStackSize -= 4; - var4.rawWidth = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4.rawHeight = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - var4.widthAlignment = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2]; - var4.heightAlignment = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 3]; - Strings.invalidateWidget(var4); - WorldMapSprite.client.alignWidget(var4); - if (var3 != -1 && var4.type == 0) { - WorldMapSprite.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); + 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; + } } - return 1; - } - if (var0 == ScriptOpcodes.CC_SETHIDE) { - boolean var5 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (var5 != var4.isHidden) { - var4.isHidden = var5; - Strings.invalidateWidget(var4); + 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 = var5 + var13; + 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; + WallDecoration.cameraX -= var5 << 7; + UserComparator7.cameraZ -= var6 << 7; + DynamicObject.oculusOrbFocalPointX -= var5 << 7; + FriendSystem.oculusOrbFocalPointY -= var6 << 7; + Client.field651 = -1; + Client.graphicsObjects.clear(); + Client.projectiles.clear(); + + for (var14 = 0; var14 < 4; ++var14) { + Client.collisionMaps[var14].clear(); } - return 1; } - if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { - var4.noClickThrough = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - return 1; + } + + @ObfuscatedName("hl") + @ObfuscatedSignature( + signature = "(ILjava/lang/String;B)V", + garbageValue = "-38" + ) + static void method3201(int var0, String var1) { + int var2 = Players.Players_count; + int[] var3 = Players.Players_indices; + boolean var4 = false; + Username var5 = new Username(var1, FontName.loginType); + + for (int var6 = 0; var6 < var2; ++var6) { + Player var7 = Client.players[var3[var6]]; + if (var7 != null && var7 != WorldMapIcon_1.localPlayer && var7.username != null && var7.username.equals(var5)) { + PacketBufferNode var8; + if (var0 == 1) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2272, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShort(var3[var6]); + var8.packetBuffer.method5545(0); + Client.packetWriter.addNode(var8); + } else if (var0 == 4) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2279, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5432(var3[var6]); + var8.packetBuffer.method5545(0); + Client.packetWriter.addNode(var8); + } else if (var0 == 6) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2249, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5443(var3[var6]); + var8.packetBuffer.method5435(0); + Client.packetWriter.addNode(var8); + } else if (var0 == 7) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2260, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5435(0); + var8.packetBuffer.writeShortLE(var3[var6]); + Client.packetWriter.addNode(var8); + } + + var4 = true; + break; + } } - if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { - var4.noScrollThrough = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - return 1; + + if (!var4) { + DirectByteArrayCopier.addGameMessage(4, "", "Unable to find " + var1); } - return 2; + } } diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java index c240cbda7d..0ce53da7c7 100644 --- a/runescape-client/src/main/java/MouseHandler.java +++ b/runescape-client/src/main/java/MouseHandler.java @@ -3,129 +3,129 @@ import java.awt.event.FocusListener; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; +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("bi") +@ObfuscatedName("bo") @Implements("MouseHandler") public class MouseHandler implements MouseListener, MouseMotionListener, FocusListener { - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lbi;" - ) - @Export("MouseHandler_instance") - public static MouseHandler MouseHandler_instance; @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1010010923 + intValue = -93099155 ) @Export("MouseHandler_x") public static int MouseHandler_x; - @ObfuscatedName("l") + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Lbo;" + ) + @Export("MouseHandler_instance") + public static MouseHandler MouseHandler_instance; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 224194115 + intValue = -1641933139 ) @Export("MouseHandler_idleCycles") public static volatile int MouseHandler_idleCycles; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1710921911 + intValue = -1870128511 ) @Export("MouseHandler_currentButtonVolatile") - public static volatile int MouseHandler_currentButtonVolatile; - @ObfuscatedName("i") + static volatile int MouseHandler_currentButtonVolatile; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1256133149 + intValue = 1230571699 ) @Export("MouseHandler_xVolatile") - public static volatile int MouseHandler_xVolatile; - @ObfuscatedName("c") + static volatile int MouseHandler_xVolatile; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1661434067 - ) - @Export("MouseHandler_yVolatile") - public static volatile int MouseHandler_yVolatile; - @ObfuscatedName("f") - @ObfuscatedGetter( - longValue = -8614064843857647631L - ) - @Export("MouseHandler_lastMovedVolatile") - public static volatile long MouseHandler_lastMovedVolatile; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 1270652981 - ) - @Export("MouseHandler_currentButton") - public static int MouseHandler_currentButton; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -1776792987 + intValue = -1059786001 ) @Export("MouseHandler_y") public static int MouseHandler_y; - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedGetter( - longValue = 5241023896637855779L + intValue = 311656783 + ) + @Export("MouseHandler_yVolatile") + static volatile int MouseHandler_yVolatile; + @ObfuscatedName("f") + @ObfuscatedGetter( + longValue = 7196021325649186919L + ) + @Export("MouseHandler_lastMovedVolatile") + static volatile long MouseHandler_lastMovedVolatile; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -1297098921 + ) + @Export("MouseHandler_currentButton") + public static int MouseHandler_currentButton; + @ObfuscatedName("r") + @ObfuscatedGetter( + longValue = 619055357369552987L ) @Export("MouseHandler_millis") public static long MouseHandler_millis; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = -1163235529 - ) - @Export("MouseHandler_lastButtonVolatile") - public static volatile int MouseHandler_lastButtonVolatile; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -1839013683 - ) - @Export("MouseHandler_lastPressedXVolatile") - public static volatile int MouseHandler_lastPressedXVolatile; @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -62123151 + intValue = -1157657453 + ) + @Export("MouseHandler_lastButtonVolatile") + static volatile int MouseHandler_lastButtonVolatile; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -1268176769 + ) + @Export("MouseHandler_lastPressedXVolatile") + static volatile int MouseHandler_lastPressedXVolatile; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 73180775 ) @Export("MouseHandler_lastPressedYVolatile") - public static volatile int MouseHandler_lastPressedYVolatile; + static volatile int MouseHandler_lastPressedYVolatile; @ObfuscatedName("g") @ObfuscatedGetter( - longValue = -4691083224527858071L + longValue = 8295957419767528369L ) @Export("MouseHandler_lastPressedTimeMillisVolatile") - public static volatile long MouseHandler_lastPressedTimeMillisVolatile; - @ObfuscatedName("a") + static volatile long MouseHandler_lastPressedTimeMillisVolatile; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1647189949 + intValue = -1949699637 ) @Export("MouseHandler_lastButton") public static int MouseHandler_lastButton; - @ObfuscatedName("j") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -836499887 + intValue = 683803083 ) @Export("MouseHandler_lastPressedX") public static int MouseHandler_lastPressedX; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 201376633 + intValue = -1446302593 ) @Export("MouseHandler_lastPressedY") public static int MouseHandler_lastPressedY; - @ObfuscatedName("h") + @ObfuscatedName("w") @ObfuscatedGetter( - longValue = -687699044042245685L + longValue = 1144028975339776835L ) @Export("MouseHandler_lastPressedTimeMillis") public static long MouseHandler_lastPressedTimeMillis; - @ObfuscatedName("ht") - @ObfuscatedGetter( - intValue = -400570657 - ) - @Export("oculusOrbFocalPointX") - static int oculusOrbFocalPointX; + @ObfuscatedName("gt") + @Export("regionMapArchiveIds") + static int[] regionMapArchiveIds; static { MouseHandler_instance = new MouseHandler(); @@ -151,18 +151,19 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi MouseHandler() { } - @ObfuscatedName("e") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Ljava/awt/event/MouseEvent;I)I", - garbageValue = "-1900631244" + signature = "(Ljava/awt/event/MouseEvent;S)I", + garbageValue = "-1859" ) @Export("getButton") final int getButton(MouseEvent var1) { int var2 = var1.getButton(); if (!var1.isAltDown() && var2 != 2) { return !var1.isMetaDown() && var2 != 3 ? 1 : 2; + } else { + return 4; } - return 4; } public final synchronized void mouseMoved(MouseEvent var1) { @@ -180,7 +181,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi MouseHandler_idleCycles = 0; MouseHandler_lastPressedXVolatile = var1.getX(); MouseHandler_lastPressedYVolatile = var1.getY(); - MouseHandler_lastPressedTimeMillisVolatile = DirectByteArrayCopier.currentTimeMs(); + MouseHandler_lastPressedTimeMillisVolatile = SequenceDefinition.method4686(); MouseHandler_lastButtonVolatile = this.getButton(var1); if (MouseHandler_lastButtonVolatile != 0) { MouseHandler_currentButtonVolatile = MouseHandler_lastButtonVolatile; @@ -193,16 +194,8 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi } - public final synchronized void mouseReleased(MouseEvent var1) { - if (MouseHandler_instance != null) { - MouseHandler_idleCycles = 0; - MouseHandler_currentButtonVolatile = 0; - } - - if (var1.isPopupTrigger()) { - var1.consume(); - } - + public final synchronized void mouseEntered(MouseEvent var1) { + this.mouseMoved(var1); } public final void mouseClicked(MouseEvent var1) { @@ -212,17 +205,6 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi } - public final synchronized void mouseDragged(MouseEvent var1) { - this.mouseMoved(var1); - } - - public final synchronized void focusLost(FocusEvent var1) { - if (MouseHandler_instance != null) { - MouseHandler_currentButtonVolatile = 0; - } - - } - public final synchronized void mouseExited(MouseEvent var1) { if (MouseHandler_instance != null) { MouseHandler_idleCycles = 0; @@ -233,165 +215,227 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi } - public final void focusGained(FocusEvent var1) { - } - - public final synchronized void mouseEntered(MouseEvent var1) { + public final synchronized void mouseDragged(MouseEvent var1) { this.mouseMoved(var1); } - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-102731253" - ) - public static int method1009(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; - } - return var2; + public final void focusGained(FocusEvent var1) { } - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(Lkx;I)V", - garbageValue = "-685707928" - ) - static final void method1037(PacketBuffer var0) { - int var1 = 0; - var0.importIndex(); + public final synchronized void mouseReleased(MouseEvent var1) { + if (MouseHandler_instance != null) { + MouseHandler_idleCycles = 0; + MouseHandler_currentButtonVolatile = 0; + } - int var2; + if (var1.isPopupTrigger()) { + var1.consume(); + } + + } + + public final synchronized void focusLost(FocusEvent var1) { + if (MouseHandler_instance != null) { + MouseHandler_currentButtonVolatile = 0; + } + + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(Ljava/io/File;Ljava/io/File;I)V", + garbageValue = "-768479838" + ) + static void method1041(File var0, File var1) { + try { + AccessFile var2 = new AccessFile(class290.JagexCache_locationFile, "rw", 10000L); + Buffer var3 = new Buffer(500); + var3.writeByte(3); + var3.writeByte(var1 != null ? 1 : 0); + var3.writeCESU8(var0.getPath()); + if (var1 != null) { + var3.writeCESU8(""); + } + + var2.write(var3.array, 0, var3.offset); + var2.close(); + } catch (IOException var4) { + var4.printStackTrace(); + } + + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(III)V", + garbageValue = "-409012679" + ) + public static void method1040(int var0, int var1) { + VarbitDefinition var3 = (VarbitDefinition)VarbitDefinition.VarbitDefinition_cached.get((long)var0); + VarbitDefinition var2; + if (var3 != null) { + var2 = var3; + } else { + byte[] var8 = VarbitDefinition.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("k") + @ObfuscatedSignature( + signature = "(IZIZB)V", + garbageValue = "43" + ) + @Export("sortWorldList") + static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { + if (ChatChannel.World_worlds != null) { + Language.doWorldSorting(0, ChatChannel.World_worlds.length - 1, var0, var1, var2, var3); + } + + } + + @ObfuscatedName("aj") + @ObfuscatedSignature( + signature = "(ILcr;ZB)I", + garbageValue = "96" + ) + static int method1043(int var0, Script var1, boolean var2) { int var3; - for (var2 = 0; var2 < Players.Players_count; ++var2) { - var3 = Players.Players_indices[var2]; - if ((Players.field1252[var3] & 1) != 0) { - continue; - } - if (var1 > 0) { - --var1; - Players.field1252[var3] = (byte)(Players.field1252[var3] | 2); - } else if (var0.readBits(1) == 0) { - var1 = World.decode(var0); - Players.field1252[var3] = (byte) (Players.field1252[var3] | 2); + if (var0 == ScriptOpcodes.OC_NAME) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = WorldMapData_0.ItemDefinition_get(var3).name; + return 1; + } else { + int var4; + ItemDefinition var5; + if (var0 == ScriptOpcodes.OC_OP) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = WorldMapData_0.ItemDefinition_get(var3); + if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_IOP) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = WorldMapData_0.ItemDefinition_get(var3); + if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_COST) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapData_0.ItemDefinition_get(var3).price; + return 1; + } else if (var0 == ScriptOpcodes.OC_STACKABLE) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapData_0.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; + return 1; } else { - WorldMapIcon_0.readPlayerUpdate(var0, var3); + ItemDefinition var6; + if (var0 == ScriptOpcodes.OC_CERT) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var6 = WorldMapData_0.ItemDefinition_get(var3); + if (var6.noteTemplate == -1 && var6.note >= 0) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.note; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_UNCERT) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var6 = WorldMapData_0.ItemDefinition_get(var3); + if (var6.noteTemplate >= 0 && var6.note >= 0) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.note; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_MEMBERS) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapData_0.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var6 = WorldMapData_0.ItemDefinition_get(var3); + if (var6.placeholderTemplate == -1 && var6.placeholder >= 0) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.placeholder; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var6 = WorldMapData_0.ItemDefinition_get(var3); + if (var6.placeholderTemplate >= 0 && var6.placeholder >= 0) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.placeholder; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_FIND) { + String var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + LoginPacket.findItemDefinitions(var7, var4 == 1); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Language.foundItemIdCount; + return 1; + } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { + if (var0 == ScriptOpcodes.OC_FINDRESET) { + GrandExchangeOffer.foundItemIndex = 0; + return 1; + } else { + return 2; + } + } else { + if (SecureRandomCallable.foundItemIds != null && GrandExchangeOffer.foundItemIndex < Language.foundItemIdCount) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SecureRandomCallable.foundItemIds[++GrandExchangeOffer.foundItemIndex - 1] & '\uffff'; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } + + return 1; + } } } - - var0.exportIndex(); - if (var1 != 0) { - throw new RuntimeException(); - } - var0.importIndex(); - - for (var2 = 0; var2 < Players.Players_count; ++var2) { - var3 = Players.Players_indices[var2]; - if ((Players.field1252[var3] & 1) == 0) { - continue; - } - if (var1 > 0) { - --var1; - Players.field1252[var3] = (byte)(Players.field1252[var3] | 2); - } else if (var0.readBits(1) == 0) { - var1 = World.decode(var0); - Players.field1252[var3] = (byte) (Players.field1252[var3] | 2); - } else { - WorldMapIcon_0.readPlayerUpdate(var0, var3); - } - } - - var0.exportIndex(); - if (var1 != 0) { - throw new RuntimeException(); - } - var0.importIndex(); - - for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { - var3 = Players.Players_emptyIndices[var2]; - if ((Players.field1252[var3] & 1) == 0) { - continue; - } - if (var1 > 0) { - --var1; - Players.field1252[var3] = (byte)(Players.field1252[var3] | 2); - } else if (var0.readBits(1) == 0) { - var1 = World.decode(var0); - Players.field1252[var3] = (byte) (Players.field1252[var3] | 2); - } else if (class226.updateExternalPlayer(var0, var3)) { - Players.field1252[var3] = (byte) (Players.field1252[var3] | 2); - } - } - - var0.exportIndex(); - if (var1 != 0) { - throw new RuntimeException(); - } - var0.importIndex(); - - for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { - var3 = Players.Players_emptyIndices[var2]; - if ((Players.field1252[var3] & 1) != 0) { - continue; - } - if (var1 > 0) { - --var1; - Players.field1252[var3] = (byte)(Players.field1252[var3] | 2); - } else if (var0.readBits(1) == 0) { - var1 = World.decode(var0); - Players.field1252[var3] = (byte) (Players.field1252[var3] | 2); - } else if (class226.updateExternalPlayer(var0, var3)) { - Players.field1252[var3] = (byte) (Players.field1252[var3] | 2); - } - } - - var0.exportIndex(); - if (var1 != 0) { - throw new RuntimeException(); - } - Players.Players_count = 0; - Players.Players_emptyIdxCount = 0; - - for (var2 = 1; var2 < 2048; ++var2) { - Players.field1252[var2] = (byte)(Players.field1252[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("v") + @ObfuscatedName("jh") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-37" + signature = "(B)Z", + garbageValue = "-23" ) - static void method1039() { - Login.loginIndex = 24; - class268.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "1793626495" - ) - static final int method1021(int var0, int var1) { - int var2 = var0 + var1 * 0x39; - var2 ^= var2 << 0xd; - int var3 = (var2 * var2 * 0x3d73 + 0xc0ae5) * var2 + 0x5208dd0d & Integer.MAX_VALUE; - return var3 >> 0x13 & 0xff; + @Export("getTapToDrop") + static boolean getTapToDrop() { + return Client.tapToDrop; } } diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java index 581a3f7ff9..738849a9b0 100644 --- a/runescape-client/src/main/java/MouseRecorder.java +++ b/runescape-client/src/main/java/MouseRecorder.java @@ -7,31 +7,37 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("bs") @Implements("MouseRecorder") public class MouseRecorder implements Runnable { - @ObfuscatedName("ix") - @ObfuscatedGetter( - intValue = -2050629733 + @ObfuscatedName("qs") + @ObfuscatedSignature( + signature = "Ldd;" ) - @Export("selectedItemWidget") - static int selectedItemWidget; - @ObfuscatedName("q") + @Export("pcmPlayer0") + static PcmPlayer pcmPlayer0; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -694423597 + ) + @Export("ItemDefinition_fileCount") + public static int ItemDefinition_fileCount; + @ObfuscatedName("s") @Export("isRunning") boolean isRunning; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("lock") Object lock; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -944219323 + intValue = -958051971 ) @Export("index") int index; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("xs") int[] xs; - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("ys") int[] ys; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("millis") long[] millis; @@ -45,7 +51,7 @@ public class MouseRecorder implements Runnable { } public void run() { - for (; this.isRunning; EnumDefinition.sleepMillis(50L)) { + for (; this.isRunning; UserList.sleepMillis(50L)) { synchronized(this.lock) { if (this.index < 500) { this.xs[this.index] = MouseHandler.MouseHandler_x; @@ -58,81 +64,39 @@ public class MouseRecorder implements Runnable { } - @ObfuscatedName("i") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "5" + signature = "(B)[Lgj;", + garbageValue = "58" ) - @Export("WorldMapElement_clearCached") - public static void WorldMapElement_clearCached() { - WorldMapElement.WorldMapElement_cachedSprites.clear(); - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "234130562" - ) - @Export("FriendSystem_friendsListFullMes") - static final void FriendSystem_friendsListFullMes() { - Object var10000 = null; - String var0 = "Your friend list is full. Max of 200 for free users, and 400 for members"; - ScriptEvent.addGameMessage(30, "", var0); - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1823729833" - ) - static void method1137(int var0) { - Login.loginIndex = 12; - Login.field1182 = var0; + @Export("ServerPacket_values") + public static ServerPacket[] ServerPacket_values() { + return new ServerPacket[]{ServerPacket.field2102, ServerPacket.field2098, ServerPacket.field2099, ServerPacket.field2183, ServerPacket.field2101, ServerPacket.field2170, ServerPacket.field2100, ServerPacket.field2158, ServerPacket.field2105, ServerPacket.field2106, ServerPacket.field2107, ServerPacket.field2108, ServerPacket.field2161, ServerPacket.field2184, ServerPacket.field2178, ServerPacket.field2112, ServerPacket.field2137, ServerPacket.field2114, ServerPacket.field2104, ServerPacket.field2116, ServerPacket.field2115, ServerPacket.field2134, ServerPacket.field2119, ServerPacket.field2120, ServerPacket.field2121, ServerPacket.field2122, ServerPacket.field2123, ServerPacket.field2124, ServerPacket.field2159, ServerPacket.field2126, ServerPacket.field2136, ServerPacket.field2128, ServerPacket.field2163, ServerPacket.field2117, ServerPacket.field2131, ServerPacket.field2130, ServerPacket.field2133, ServerPacket.field2129, ServerPacket.field2135, ServerPacket.field2148, ServerPacket.field2175, ServerPacket.field2138, ServerPacket.field2139, ServerPacket.field2140, ServerPacket.field2141, ServerPacket.field2142, ServerPacket.field2143, ServerPacket.field2144, ServerPacket.field2145, ServerPacket.field2146, ServerPacket.field2147, ServerPacket.field2125, ServerPacket.field2149, ServerPacket.field2150, ServerPacket.field2151, ServerPacket.field2152, ServerPacket.field2162, ServerPacket.field2097, ServerPacket.field2155, ServerPacket.field2156, ServerPacket.field2118, ServerPacket.field2132, ServerPacket.field2110, ServerPacket.field2160, ServerPacket.field2103, ServerPacket.field2127, ServerPacket.field2154, ServerPacket.field2164, ServerPacket.field2165, ServerPacket.field2179, ServerPacket.field2167, ServerPacket.field2168, ServerPacket.field2169, ServerPacket.field2166, ServerPacket.field2171, ServerPacket.field2172, ServerPacket.field2173, ServerPacket.field2174, ServerPacket.field2153, ServerPacket.field2176, ServerPacket.field2177, ServerPacket.field2113, ServerPacket.field2157, ServerPacket.field2180, ServerPacket.field2181, ServerPacket.field2182}; } @ObfuscatedName("fu") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1953240154" + signature = "(IIB)V", + garbageValue = "-5" ) - static final void method1141() { - for (int var0 = 0; var0 < Client.npcCount; ++var0) { - int var1 = Client.npcIndices[var0]; - NPC var2 = Client.npcs[var1]; - if (var2 != null) { - StructDefinition.calculateActorPosition(var2, var2.definition.size); - } + @Export("playSoundJingle") + static void playSoundJingle(int var0, int var1) { + if (Client.field856 != 0 && var0 != -1) { + PacketBufferNode.method3574(WorldMapRectangle.archive11, var0, 0, Client.field856, false); + Client.field858 = true; } } - @ObfuscatedName("fl") + @ObfuscatedName("jq") @ObfuscatedSignature( - signature = "(Lbd;IIB)V", - garbageValue = "-124" + signature = "(IIIIIIIB)V", + garbageValue = "-63" ) - @Export("performPlayerAnimation") - static void performPlayerAnimation(Player var0, int var1, int var2) { - if (var0.sequence == var1 && var1 != -1) { - int var3 = GrandExchangeEvent.SequenceDefinition_get(var1).field3529; - if (var3 == 1) { - var0.sequenceFrame = 0; - var0.sequenceFrameCycle = 0; - var0.sequenceDelay = var2; - var0.field985 = 0; - } - - if (var3 == 2) { - var0.field985 = 0; - } - } else if (var1 == -1 || var0.sequence == -1 || GrandExchangeEvent.SequenceDefinition_get(var1).field3533 >= GrandExchangeEvent.SequenceDefinition_get(var0.sequence).field3533) { - var0.sequence = var1; - var0.sequenceFrame = 0; - var0.sequenceFrameCycle = 0; - var0.sequenceDelay = var2; - var0.field985 = 0; - var0.field1008 = var0.pathLength; + @Export("updateRootInterface") + static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (Projectile.loadInterface(var0)) { + Occluder.updateInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); } - } } diff --git a/runescape-client/src/main/java/MouseWheel.java b/runescape-client/src/main/java/MouseWheel.java index 13576c8737..38b2bbe60f 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("fj") +@ObfuscatedName("fo") @Implements("MouseWheel") public interface MouseWheel { - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1768142580" + garbageValue = "286451237" ) @Export("useRotation") int useRotation(); diff --git a/runescape-client/src/main/java/MouseWheelHandler.java b/runescape-client/src/main/java/MouseWheelHandler.java index 1e76822066..311162e1f9 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("au") +@ObfuscatedName("aq") @Implements("MouseWheelHandler") public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -362089629 + intValue = 2022124205 ) @Export("rotation") int rotation; @@ -21,30 +21,30 @@ public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { this.rotation = 0; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ljava/awt/Component;B)V", - garbageValue = "31" + signature = "(Ljava/awt/Component;I)V", + garbageValue = "-110983172" ) @Export("addTo") void addTo(Component var1) { var1.addMouseWheelListener(this); } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(Ljava/awt/Component;I)V", - garbageValue = "-325226469" + garbageValue = "1653862050" ) @Export("removeFrom") void removeFrom(Component var1) { var1.removeMouseWheelListener(this); } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1768142580" + garbageValue = "286451237" ) @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 89311e9450..3eb476a394 100644 --- a/runescape-client/src/main/java/MusicPatch.java +++ b/runescape-client/src/main/java/MusicPatch.java @@ -7,41 +7,41 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("gg") @Implements("MusicPatch") public class MusicPatch extends Node { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 954776245 + intValue = 1055401795 ) - int field2475; - @ObfuscatedName("w") + int field2459; + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "[Lcd;" + signature = "[Lco;" ) @Export("rawSounds") RawSound[] rawSounds; - @ObfuscatedName("e") - short[] field2482; - @ObfuscatedName("p") - byte[] field2476; - @ObfuscatedName("k") - byte[] field2477; - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "[Lgk;" - ) - MusicPatchNode2[] field2481; - @ObfuscatedName("b") - byte[] field2479; @ObfuscatedName("i") - int[] field2480; + short[] field2457; + @ObfuscatedName("k") + byte[] field2462; + @ObfuscatedName("u") + byte[] field2463; + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "[Lgf;" + ) + MusicPatchNode2[] field2460; + @ObfuscatedName("t") + byte[] field2461; + @ObfuscatedName("q") + int[] field2455; MusicPatch(byte[] var1) { this.rawSounds = new RawSound[128]; - this.field2482 = new short[128]; - this.field2476 = new byte[128]; - this.field2477 = new byte[128]; - this.field2481 = new MusicPatchNode2[128]; - this.field2479 = new byte[128]; - this.field2480 = new int[128]; + this.field2457 = new short[128]; + this.field2462 = new byte[128]; + this.field2463 = new byte[128]; + this.field2460 = new MusicPatchNode2[128]; + this.field2461 = new byte[128]; + this.field2455 = new int[128]; Buffer var2 = new Buffer(var1); int var3; @@ -121,13 +121,13 @@ public class MusicPatch extends Node { var38 = var37[var14] = new MusicPatchNode2(); int var16 = var2.readUnsignedByte(); if (var16 > 0) { - var38.field2387 = new byte[var16 * 2]; + var38.field2369 = new byte[var16 * 2]; } var16 = var2.readUnsignedByte(); if (var16 > 0) { - var38.field2388 = new byte[var16 * 2 + 2]; - var38.field2388[1] = 64; + var38.field2370 = new byte[var16 * 2 + 2]; + var38.field2370[1] = 64; } } @@ -154,7 +154,7 @@ public class MusicPatch extends Node { int var20; for (var20 = 0; var20 < 128; ++var20) { var19 += var2.readUnsignedByte(); - this.field2482[var20] = (short)var19; + this.field2457[var20] = (short)var19; } var19 = 0; @@ -162,7 +162,7 @@ public class MusicPatch extends Node { short[] var48; for (var20 = 0; var20 < 128; ++var20) { var19 += var2.readUnsignedByte(); - var48 = this.field2482; + var48 = this.field2457; var48[var20] = (short)(var48[var20] + (var19 << 8)); } @@ -182,9 +182,9 @@ public class MusicPatch extends Node { var22 = var2.readVarInt(); } - var48 = this.field2482; + var48 = this.field2457; var48[var23] = (short)(var48[var23] + ((var22 - 1 & 2) << 14)); - this.field2480[var23] = var22; + this.field2455[var23] = var22; --var20; } @@ -194,7 +194,7 @@ public class MusicPatch extends Node { int var24; for (var24 = 0; var24 < 128; ++var24) { - if (this.field2480[var24] != 0) { + if (this.field2455[var24] != 0) { if (var20 == 0) { if (var21 < var4.length) { var20 = var4[var21++]; @@ -205,7 +205,7 @@ public class MusicPatch extends Node { var23 = var2.array[var5++] - 1; } - this.field2479[var24] = (byte)var23; + this.field2461[var24] = (byte)var23; --var20; } } @@ -215,7 +215,7 @@ public class MusicPatch extends Node { var24 = 0; for (int var25 = 0; var25 < 128; ++var25) { - if (this.field2480[var25] != 0) { + if (this.field2455[var25] != 0) { if (var20 == 0) { if (var21 < var7.length) { var20 = var7[var21++]; @@ -226,7 +226,7 @@ public class MusicPatch extends Node { var24 = var2.array[var8++] + 16 << 2; } - this.field2477[var25] = (byte)var24; + this.field2463[var25] = (byte)var24; --var20; } } @@ -237,7 +237,7 @@ public class MusicPatch extends Node { int var26; for (var26 = 0; var26 < 128; ++var26) { - if (this.field2480[var26] != 0) { + if (this.field2455[var26] != 0) { if (var20 == 0) { var40 = var37[var36[var21]]; if (var21 < var10.length) { @@ -247,7 +247,7 @@ public class MusicPatch extends Node { } } - this.field2481[var26] = var40; + this.field2460[var26] = var40; --var20; } } @@ -265,30 +265,30 @@ public class MusicPatch extends Node { var20 = -1; } - if (this.field2480[var27] > 0) { + if (this.field2455[var27] > 0) { var26 = var2.readUnsignedByte() + 1; } } - this.field2476[var27] = (byte)var26; + this.field2462[var27] = (byte)var26; --var20; } - this.field2475 = var2.readUnsignedByte() + 1; + this.field2459 = var2.readUnsignedByte() + 1; MusicPatchNode2 var28; int var29; for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2387 != null) { - for (var29 = 1; var29 < var28.field2387.length; var29 += 2) { - var28.field2387[var29] = var2.readByte(); + if (var28.field2369 != null) { + for (var29 = 1; var29 < var28.field2369.length; var29 += 2) { + var28.field2369[var29] = var2.readByte(); } } - if (var28.field2388 != null) { - for (var29 = 3; var29 < var28.field2388.length - 2; var29 += 2) { - var28.field2388[var29] = var2.readByte(); + if (var28.field2370 != null) { + for (var29 = 3; var29 < var28.field2370.length - 2; var29 += 2) { + var28.field2370[var29] = var2.readByte(); } } } @@ -307,24 +307,24 @@ public class MusicPatch extends Node { for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2388 != null) { + if (var28.field2370 != null) { var19 = 0; - for (var29 = 2; var29 < var28.field2388.length; var29 += 2) { + for (var29 = 2; var29 < var28.field2370.length; var29 += 2) { var19 = var19 + 1 + var2.readUnsignedByte(); - var28.field2388[var29] = (byte)var19; + var28.field2370[var29] = (byte)var19; } } } for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2387 != null) { + if (var28.field2369 != null) { var19 = 0; - for (var29 = 2; var29 < var28.field2387.length; var29 += 2) { + for (var29 = 2; var29 < var28.field2369.length; var29 += 2) { var19 = var19 + 1 + var2.readUnsignedByte(); - var28.field2387[var29] = (byte)var19; + var28.field2369[var29] = (byte)var19; } } } @@ -348,7 +348,7 @@ public class MusicPatch extends Node { byte var41 = var45[1]; for (var29 = 0; var29 < var44; ++var29) { - this.field2476[var29] = (byte)(var41 * this.field2476[var29] + 32 >> 6); + this.field2462[var29] = (byte)(var41 * this.field2462[var29] + 32 >> 6); } for (var29 = 2; var29 < var45.length; var29 += 2) { @@ -357,8 +357,8 @@ public class MusicPatch extends Node { var32 = var41 * (var30 - var44) + (var30 - var44) / 2; for (var33 = var44; var33 < var30; ++var33) { - var34 = TileItemPile.method2767(var32, var30 - var44); - this.field2476[var33] = (byte)(var34 * this.field2476[var33] + 32 >> 6); + var34 = TaskHandler.method3411(var32, var30 - var44); + this.field2462[var33] = (byte)(var34 * this.field2462[var33] + 32 >> 6); var32 += var31 - var41; } @@ -367,7 +367,7 @@ public class MusicPatch extends Node { } for (var42 = var44; var42 < 128; ++var42) { - this.field2476[var42] = (byte)(var41 * this.field2476[var42] + 32 >> 6); + this.field2462[var42] = (byte)(var41 * this.field2462[var42] + 32 >> 6); } var38 = null; @@ -386,7 +386,7 @@ public class MusicPatch extends Node { int var47 = var39[1] << 1; for (var29 = 0; var29 < var44; ++var29) { - var42 = var47 + (this.field2477[var29] & 255); + var42 = var47 + (this.field2463[var29] & 255); if (var42 < 0) { var42 = 0; } @@ -395,7 +395,7 @@ public class MusicPatch extends Node { var42 = 128; } - this.field2477[var29] = (byte)var42; + this.field2463[var29] = (byte)var42; } int var43; @@ -405,8 +405,8 @@ public class MusicPatch extends Node { var32 = var47 * (var30 - var44) + (var30 - var44) / 2; for (var33 = var44; var33 < var30; ++var33) { - var34 = TileItemPile.method2767(var32, var30 - var44); - int var35 = var34 + (this.field2477[var33] & 255); + var34 = TaskHandler.method3411(var32, var30 - var44); + int var35 = var34 + (this.field2463[var33] & 255); if (var35 < 0) { var35 = 0; } @@ -415,7 +415,7 @@ public class MusicPatch extends Node { var35 = 128; } - this.field2477[var33] = (byte)var35; + this.field2463[var33] = (byte)var35; var32 += var43 - var47; } @@ -424,7 +424,7 @@ public class MusicPatch extends Node { } for (var42 = var44; var42 < 128; ++var42) { - var43 = var47 + (this.field2477[var42] & 255); + var43 = var47 + (this.field2463[var42] & 255); if (var43 < 0) { var43 = 0; } @@ -433,163 +433,122 @@ public class MusicPatch extends Node { var43 = 128; } - this.field2477[var42] = (byte)var43; + this.field2463[var42] = (byte)var43; } Object var46 = null; } for (var27 = 0; var27 < var12; ++var27) { - var37[var27].field2392 = var2.readUnsignedByte(); + var37[var27].field2372 = var2.readUnsignedByte(); } for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2387 != null) { - var28.field2390 = var2.readUnsignedByte(); + if (var28.field2369 != null) { + var28.field2371 = var2.readUnsignedByte(); } - if (var28.field2388 != null) { - var28.field2398 = var2.readUnsignedByte(); + if (var28.field2370 != null) { + var28.field2373 = var2.readUnsignedByte(); } - if (var28.field2392 > 0) { - var28.field2391 = var2.readUnsignedByte(); + if (var28.field2372 > 0) { + var28.field2374 = var2.readUnsignedByte(); } } for (var27 = 0; var27 < var12; ++var27) { - var37[var27].field2394 = var2.readUnsignedByte(); + var37[var27].field2376 = var2.readUnsignedByte(); } for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2394 > 0) { - var28.field2393 = var2.readUnsignedByte(); + if (var28.field2376 > 0) { + var28.field2375 = var2.readUnsignedByte(); } } for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2393 > 0) { - var28.field2395 = var2.readUnsignedByte(); + if (var28.field2375 > 0) { + var28.field2377 = var2.readUnsignedByte(); } } } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ldf;[B[II)Z", - garbageValue = "1229710126" + signature = "(Ldh;[B[II)Z", + garbageValue = "-291456557" ) - boolean method3883(SoundCache var1, byte[] var2, int[] var3) { + boolean method3825(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) { - continue; - } - int var8 = this.field2480[var7]; - if (var8 == 0) { - continue; - } - if (var8 != var5) { - var5 = var8--; - if ((var8 & 1) == 0) { - var6 = var1.getSoundEffect(var8 >> 2, var3); - } else { - var6 = var1.getMusicSample(var8 >> 2, var3); - } + if (var2 == null || var2[var7] != 0) { + int var8 = this.field2455[var7]; + if (var8 != 0) { + if (var8 != var5) { + var5 = var8--; + if ((var8 & 1) == 0) { + var6 = var1.getSoundEffect(var8 >> 2, var3); + } else { + var6 = var1.getMusicSample(var8 >> 2, var3); + } - if (var6 == null) { - var4 = false; - } - } + if (var6 == null) { + var4 = false; + } + } - if (var6 != null) { - this.rawSounds[var7] = var6; - this.field2480[var7] = 0; + if (var6 != null) { + this.rawSounds[var7] = var6; + this.field2455[var7] = 0; + } + } } } return var4; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "56898655" + garbageValue = "-1724066088" ) @Export("clear") void clear() { - this.field2480 = null; + this.field2455 = null; } - @ObfuscatedName("q") + @ObfuscatedName("ge") @ObfuscatedSignature( - signature = "(IB)Lib;", - garbageValue = "-20" + signature = "(Ljava/lang/String;ZB)V", + garbageValue = "0" ) - @Export("SpotAnimationDefinition_get") - public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) { - SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } - byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); - var1 = new SpotAnimationDefinition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); - return var1; - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "1" - ) - @Export("VarbitDefinition_clearCached") - public static void VarbitDefinition_clearCached() { - VarbitDefinition.VarbitDefinition_cached.clear(); - } - - @ObfuscatedName("gl") - @ObfuscatedSignature( - signature = "(IIIIIIIIII)V", - garbageValue = "-1700353173" - ) - @Export("updatePendingSpawn") - static final void updatePendingSpawn(int plane, int x, int y, int type, int id, int var5, int orientation, int delay, int hitpoints) { - PendingSpawn var9 = null; - - for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (plane == var10.plane && var10.x == x && y == var10.y && type == var10.type) { - var9 = var10; - break; + @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 = ClientPacket.fontPlain12.lineWidth(var0, 250); + int var6 = ClientPacket.fontPlain12.lineCount(var0, 250) * 13; + Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var6 + var2 + var2, 0); + Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var2 + var5, var2 + var6 + var2, 16777215); + ClientPacket.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); + FloorDecoration.method2786(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var6 + var2); + if (var1) { + SpotAnimationDefinition.rasterProvider.drawFull(0, 0); + } else { + FriendsList.method5102(var3, var4, var5, var6); } - } - if (var9 == null) { - var9 = new PendingSpawn(); - var9.plane = plane; - var9.type = type; - var9.x = x; - var9.y = y; - class294.method5327(var9); - Client.pendingSpawns.addFirst(var9); } - - var9.id = id; - var9.field940 = var5; - var9.orientation = orientation; - var9.delay = delay; - var9.hitpoints = hitpoints; } } diff --git a/runescape-client/src/main/java/MusicPatchNode.java b/runescape-client/src/main/java/MusicPatchNode.java index d3bfd6affb..f73b2d7b4d 100644 --- a/runescape-client/src/main/java/MusicPatchNode.java +++ b/runescape-client/src/main/java/MusicPatchNode.java @@ -4,130 +4,242 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gi") +@ObfuscatedName("gd") @Implements("MusicPatchNode") public class MusicPatchNode extends Node { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1987451655 + intValue = -1897745195 ) - int field2440; - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lgk;" - ) - MusicPatchNode2 field2452; - @ObfuscatedName("e") + int field2437; + @ObfuscatedName("j") @ObfuscatedSignature( signature = "Lgg;" ) @Export("patch") MusicPatch patch; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lcd;" + signature = "Lco;" ) @Export("rawSound") RawSound rawSound; @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Lgf;" + ) + MusicPatchNode2 field2422; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1602742247 + intValue = 1864243687 + ) + int field2423; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -1872653771 + ) + int field2424; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 1424781673 + ) + int field2425; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 923985799 + ) + int field2429; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -1213046501 + ) + int field2426; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -322919449 + ) + int field2428; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 1828519475 + ) + int field2440; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -1131883179 + ) + int field2430; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -392347845 + ) + int field2431; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = -610654257 + ) + int field2432; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -1442847957 + ) + int field2433; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 1807257146 + ) + int field2434; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -1173270761 + ) + int field2435; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -549746549 + ) + int field2436; + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "Ldx;" + ) + @Export("stream") + RawPcmStream stream; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 1101531435 ) int field2438; @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -2106336541 + intValue = 994945393 ) - int field2450; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -871817931 - ) - int field2442; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -968890095 - ) - int field2443; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -1922706661 - ) - int field2441; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -1739231469 - ) - int field2445; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 959590897 - ) - int field2446; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -182096649 - ) - int field2447; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 1688509749 - ) - int field2448; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = -79165823 - ) - int field2449; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 1291015747 - ) - int field2436; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = -174266075 - ) - int field2451; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 889616959 - ) - int field2458; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 602095745 - ) - int field2453; - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "Ldh;" - ) - @Export("stream") - RawPcmStream stream; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 1993238455 - ) - int field2455; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1377522023 - ) - int field2444; + int field2439; MusicPatchNode() { } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "-18" + garbageValue = "87" ) - void method3826() { + void method3767() { this.patch = null; this.rawSound = null; - this.field2452 = null; + this.field2422 = null; this.stream = null; } + + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "(Lbw;I)V", + garbageValue = "-313141068" + ) + static void method3772(GameShell var0) { + while (FontName.isKeyDown()) { + if (ReflectionCheck.field1307 == 13) { + class13.method163(); + return; + } + + if (ReflectionCheck.field1307 == 96) { + if (Login.worldSelectPage > 0 && AbstractWorldMapIcon.worldSelectLeftSprite != null) { + --Login.worldSelectPage; + } + } else if (ReflectionCheck.field1307 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && ClanChat.worldSelectRightSprite != null) { + ++Login.worldSelectPage; + } + } + + if (MouseHandler.MouseHandler_lastButton == 1 || !FriendSystem.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) { + class65.changeWorldSelectSorting(0, 0); + return; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + class65.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) { + class65.changeWorldSelectSorting(1, 0); + return; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + class65.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) { + class65.changeWorldSelectSorting(2, 0); + return; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + class65.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) { + class65.changeWorldSelectSorting(3, 0); + return; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + class65.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) { + class13.method163(); + return; + } + + if (Login.hoveredWorldIndex != -1) { + World var5 = ChatChannel.World_worlds[Login.hoveredWorldIndex]; + class65.changeWorld(var5); + class13.method163(); + return; + } + + if (Login.worldSelectPage > 0 && AbstractWorldMapIcon.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= AbstractWorldMapIcon.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= class30.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class30.canvasHeight / 2 + 50) { + --Login.worldSelectPage; + } + + if (Login.worldSelectPage < Login.worldSelectPagesCount && ClanChat.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= KitDefinition.canvasWidth - ClanChat.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= KitDefinition.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= class30.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class30.canvasHeight / 2 + 50) { + ++Login.worldSelectPage; + } + } + + } + + @ObfuscatedName("gp") + @ObfuscatedSignature( + signature = "(IIIII)V", + garbageValue = "-1852337060" + ) + static final void method3771(int var0, int var1, int var2, int var3) { + Client.field737 = 0; + int var4 = PacketWriter.baseX * 64 + (WorldMapIcon_1.localPlayer.x >> 7); + int var5 = RouteStrategy.baseY * 64 + (WorldMapIcon_1.localPlayer.y >> 7); + if (var4 >= 3053 && var4 <= 3156 && var5 >= 3056 && var5 <= 3136) { + Client.field737 = 1; + } + + if (var4 >= 3072 && var4 <= 3118 && var5 >= 9492 && var5 <= 9535) { + Client.field737 = 1; + } + + if (Client.field737 == 1 && var4 >= 3139 && var4 <= 3199 && var5 >= 3008 && var5 <= 3062) { + Client.field737 = 0; + } + + } } diff --git a/runescape-client/src/main/java/MusicPatchNode2.java b/runescape-client/src/main/java/MusicPatchNode2.java index f8b2af3363..f8aff5e331 100644 --- a/runescape-client/src/main/java/MusicPatchNode2.java +++ b/runescape-client/src/main/java/MusicPatchNode2.java @@ -1,72 +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("gk") +@ObfuscatedName("gf") @Implements("MusicPatchNode2") public class MusicPatchNode2 { - @ObfuscatedName("fb") - @ObfuscatedGetter( - intValue = 1668948707 - ) - @Export("baseX") - static int baseX; - @ObfuscatedName("q") - byte[] field2387; - @ObfuscatedName("w") - byte[] field2388; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -1099658343 - ) - int field2392; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -369193851 - ) - int field2390; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -1130103085 - ) - int field2398; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 582227349 - ) - int field2391; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 371780499 - ) - int field2393; + @ObfuscatedName("s") + byte[] field2369; + @ObfuscatedName("j") + byte[] field2370; @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -273928819 + intValue = 978792497 ) - int field2394; - @ObfuscatedName("c") + int field2372; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 934948077 + intValue = 517757635 ) - int field2395; + int field2371; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 17424383 + ) + int field2373; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 1999348799 + ) + int field2374; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 221013475 + ) + int field2375; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 1667955655 + ) + int field2376; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 1659265709 + ) + int field2377; MusicPatchNode2() { } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(IS)I", - garbageValue = "17338" - ) - @Export("Messages_getNextChatID") - static int Messages_getNextChatID(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); - if (var1 == null) { - return -1; - } - return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; - } } diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java index f40e1091e8..2ed16bd80b 100644 --- a/runescape-client/src/main/java/MusicPatchPcmStream.java +++ b/runescape-client/src/main/java/MusicPatchPcmStream.java @@ -1,38 +1,38 @@ +import java.util.Date; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gq") +@ObfuscatedName("gh") @Implements("MusicPatchPcmStream") public class MusicPatchPcmStream extends PcmStream { - @ObfuscatedName("ap") + @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "Llt;" + signature = "Llh;" ) - @Export("rasterProvider") - public static AbstractRasterProvider rasterProvider; - @ObfuscatedName("q") + static Bounds field2466; + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lga;" + signature = "Lgp;" ) @Export("superStream") MidiPcmStream superStream; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Ljh;" + signature = "Ljc;" ) @Export("queue") NodeDeque queue; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lcz;" + signature = "Lcq;" ) @Export("mixer") PcmStreamMixer mixer; @ObfuscatedSignature( - signature = "(Lga;)V" + signature = "(Lgp;)V" ) MusicPatchPcmStream(MidiPcmStream var1) { this.queue = new NodeDeque(); @@ -40,48 +40,48 @@ public class MusicPatchPcmStream extends PcmStream { this.superStream = var1; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lgi;[IIIII)V", - garbageValue = "1316254184" + signature = "(Lgd;[IIIII)V", + garbageValue = "-1894415083" ) - void method3895(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { - if ((this.superStream.field2421[var1.field2440] & 4) != 0 && var1.field2436 < 0) { - int var6 = this.superStream.field2408[var1.field2440] / CollisionMap.PcmPlayer_sampleRate; + void method3846(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { + if ((this.superStream.field2414[var1.field2437] & 4) != 0 && var1.field2433 < 0) { + int var6 = this.superStream.field2415[var1.field2437] / PcmPlayer.PcmPlayer_sampleRate; while (true) { - int var7 = (var6 + 1048575 - var1.field2444) / var6; + int var7 = (var6 + 1048575 - var1.field2439) / var6; if (var7 > var4) { - var1.field2444 += var4 * var6; + var1.field2439 += var6 * var4; break; } var1.stream.fill(var2, var3, var7); var3 += var7; var4 -= var7; - var1.field2444 += var6 * var7 - 1048576; - int var8 = CollisionMap.PcmPlayer_sampleRate / 100; - int var9 = 0x40000 / var6; + var1.field2439 += var7 * var6 - 1048576; + int var8 = PcmPlayer.PcmPlayer_sampleRate / 100; + int var9 = 262144 / var6; if (var9 < var8) { var8 = var9; } RawPcmStream var10 = var1.stream; - if (this.superStream.field2410[var1.field2440] == 0) { - var1.stream = RawPcmStream.method2524(var1.rawSound, var10.method2539(), var10.method2531(), var10.method2541()); + if (this.superStream.field2389[var1.field2437] == 0) { + var1.stream = RawPcmStream.method2460(var1.rawSound, var10.method2603(), var10.method2455(), var10.method2467()); } else { - var1.stream = RawPcmStream.method2524(var1.rawSound, var10.method2539(), 0, var10.method2541()); - this.superStream.method3767(var1, var1.patch.field2482[var1.field2450] < 0); - var1.stream.method2535(var8, var10.method2531()); + var1.stream = RawPcmStream.method2460(var1.rawSound, var10.method2603(), 0, var10.method2467()); + this.superStream.method3731(var1, var1.patch.field2457[var1.field2424] < 0); + var1.stream.method2470(var8, var10.method2455()); } - if (var1.patch.field2482[var1.field2450] < 0) { + if (var1.patch.field2457[var1.field2424] < 0) { var1.stream.setNumLoops(-1); } - var10.method2540(var8); + var10.method2473(var8); var10.fill(var2, var3, var5 - var3); - if (var10.method2585()) { + if (var10.method2457()) { this.mixer.addSubStream(var10); } } @@ -90,51 +90,52 @@ public class MusicPatchPcmStream extends PcmStream { var1.stream.fill(var2, var3, var4); } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lgi;II)V", - garbageValue = "1166888342" + signature = "(Lgd;II)V", + garbageValue = "1679066242" ) - void method3896(MusicPatchNode var1, int var2) { - if ((this.superStream.field2421[var1.field2440] & 4) != 0 && var1.field2436 < 0) { - int var3 = this.superStream.field2408[var1.field2440] / CollisionMap.PcmPlayer_sampleRate; - int var4 = (var3 + 1048575 - var1.field2444) / var3; - var1.field2444 = var3 * var2 + var1.field2444 & 1048575; + void method3837(MusicPatchNode var1, int var2) { + if ((this.superStream.field2414[var1.field2437] & 4) != 0 && var1.field2433 < 0) { + int var3 = this.superStream.field2415[var1.field2437] / PcmPlayer.PcmPlayer_sampleRate; + int var4 = (var3 + 1048575 - var1.field2439) / var3; + var1.field2439 = var3 * var2 + var1.field2439 & 1048575; if (var4 <= var2) { - if (this.superStream.field2410[var1.field2440] == 0) { - var1.stream = RawPcmStream.method2524(var1.rawSound, var1.stream.method2539(), var1.stream.method2531(), var1.stream.method2541()); + if (this.superStream.field2389[var1.field2437] == 0) { + var1.stream = RawPcmStream.method2460(var1.rawSound, var1.stream.method2603(), var1.stream.method2455(), var1.stream.method2467()); } else { - var1.stream = RawPcmStream.method2524(var1.rawSound, var1.stream.method2539(), 0, var1.stream.method2541()); - this.superStream.method3767(var1, var1.patch.field2482[var1.field2450] < 0); + var1.stream = RawPcmStream.method2460(var1.rawSound, var1.stream.method2603(), 0, var1.stream.method2467()); + this.superStream.method3731(var1, var1.patch.field2457[var1.field2424] < 0); } - if (var1.patch.field2482[var1.field2450] < 0) { + if (var1.patch.field2457[var1.field2424] < 0) { var1.stream.setNumLoops(-1); } - var2 = var1.field2444 / var3; + var2 = var1.field2439 / var3; } } var1.stream.skip(var2); } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "()Ldx;" + signature = "()Ldz;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { MusicPatchNode var1 = (MusicPatchNode)this.queue.last(); if (var1 == null) { return null; + } else { + return (PcmStream)(var1.stream != null ? var1.stream : this.nextSubStream()); } - return (PcmStream)(var1.stream != null ? var1.stream : this.nextSubStream()); } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "()Ldx;" + signature = "()Ldz;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { @@ -149,129 +150,71 @@ public class MusicPatchPcmStream extends PcmStream { return var1.stream; } - @ObfuscatedName("i") - protected int vmethod3892() { + @ObfuscatedName("q") + protected int vmethod3834() { return 0; } - @ObfuscatedName("c") + @ObfuscatedName("x") @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.method3739(var6)) { + if (!this.superStream.method3680(var6)) { int var4 = var2; int var5 = var3; do { - if (var5 <= var6.field2455) { - this.method3895(var6, var1, var4, var5, var4 + var5); - var6.field2455 -= var5; + if (var5 <= var6.field2438) { + this.method3846(var6, var1, var4, var5, var5 + var4); + var6.field2438 -= var5; break; } - this.method3895(var6, var1, var4, var6.field2455, var5 + var4); - var4 += var6.field2455; - var5 -= var6.field2455; - } while(!this.superStream.method3740(var6, var1, var4, var5)); + this.method3846(var6, var1, var4, var6.field2438, var5 + var4); + var4 += var6.field2438; + var5 -= var6.field2438; + } while(!this.superStream.method3665(var6, var1, var4, var5)); } } } - @ObfuscatedName("x") + @ObfuscatedName("f") @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.method3739(var3)) { + if (!this.superStream.method3680(var3)) { int var2 = var1; do { - if (var2 <= var3.field2455) { - this.method3896(var3, var2); - var3.field2455 -= var2; + if (var2 <= var3.field2438) { + this.method3837(var3, var2); + var3.field2438 -= var2; break; } - this.method3896(var3, var3.field2455); - var2 -= var3.field2455; - } while(!this.superStream.method3740(var3, (int[])null, 0, var2)); + this.method3837(var3, var3.field2438); + var2 -= var3.field2438; + } while(!this.superStream.method3665(var3, (int[])null, 0, var2)); } } } - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(Lbw;B)V", - garbageValue = "35" - ) - @Export("changeWorld") - static void changeWorld(World var0) { - if (var0.isMembersOnly() != Client.isMembersWorld) { - Client.isMembersWorld = var0.isMembersOnly(); - boolean var1 = var0.isMembersOnly(); - if (var1 != ModelData0.ItemDefinition_inMembersWorld) { - ItemDefinition.ItemDefinition_cached.clear(); - ItemDefinition.ItemDefinition_cachedModels.clear(); - ItemDefinition.ItemDefinition_cachedSprites.clear(); - ModelData0.ItemDefinition_inMembersWorld = var1; - } - } - - ClientPreferences.worldHost = var0.host; - Client.worldId = var0.id; - Client.worldProperties = var0.properties; - Language.port1 = Client.gameBuild == 0 ? 43594 : var0.id + 40000; - Skeleton.port2 = Client.gameBuild == 0 ? 443 : var0.id + 50000; - Varcs.port3 = Language.port1; - } - - @ObfuscatedName("ih") - @ObfuscatedSignature( - signature = "(IIIIIII)V", - garbageValue = "2095922546" - ) - static final void method3912(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 = var7 + var15 + var1; - Rasterizer3D.method2981(var17, var18, var19); - Rasterizer3D.method3007(var21, var22, var23, var17, var18, var19, var4); - Rasterizer3D.method2981(var17, var19, var20); - Rasterizer3D.method3007(var21, var23, var24, var17, var19, var20, var4); - } + @ObfuscatedName("s") + public static String method3831(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"; } } diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java index 732c81f51c..61b7eed9af 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("gl") +@ObfuscatedName("gy") @Implements("MusicTrack") public class MusicTrack extends Node { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Llc;" + signature = "Llm;" ) @Export("table") NodeHashTable table; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("midi") byte[] midi; @ObfuscatedSignature( - signature = "(Lkf;)V" + signature = "(Lky;)V" ) MusicTrack(Buffer var1) { var1.offset = var1.array.length - 3; @@ -65,10 +65,12 @@ public class MusicTrack extends Node { ++var10; } else if (var14 == 5) { ++var11; - } else if (var14 == 6) { - ++var12; } else { - throw new RuntimeException(); + if (var14 != 6) { + throw new RuntimeException(); + } + + ++var12; } } } @@ -102,32 +104,34 @@ public class MusicTrack extends Node { int var29; for (var29 = 0; var29 < var6; ++var29) { var28 = var28 + var1.readUnsignedByte() & 127; - if (var28 == 0 || var28 == 32) { - ++var12; - } else if (var28 == 1) { - ++var16; - } else if (var28 == 33) { - ++var17; - } else if (var28 == 7) { - ++var18; - } else if (var28 == 39) { - ++var19; - } else if (var28 == 10) { - ++var20; - } else if (var28 == 42) { - ++var21; - } else if (var28 == 99) { - ++var22; - } else if (var28 == 98) { - ++var23; - } else if (var28 == 101) { - ++var24; - } else if (var28 == 100) { - ++var25; - } else if (var28 == 64 || var28 == 65 || var28 == 120 || var28 == 121 || var28 == 123) { - ++var26; + if (var28 != 0 && var28 != 32) { + if (var28 == 1) { + ++var16; + } else if (var28 == 33) { + ++var17; + } else if (var28 == 7) { + ++var18; + } else if (var28 == 39) { + ++var19; + } else if (var28 == 10) { + ++var20; + } else if (var28 == 42) { + ++var21; + } else if (var28 == 99) { + ++var22; + } else if (var28 == 98) { + ++var23; + } else if (var28 == 101) { + ++var24; + } else if (var28 == 100) { + ++var25; + } else if (var28 != 64 && var28 != 65 && var28 != 120 && var28 != 121 && var28 != 123) { + ++var27; + } else { + ++var26; + } } else { - ++var27; + ++var12; } } @@ -176,7 +180,7 @@ public class MusicTrack extends Node { var1.offset += var5 * 3; this.midi = new byte[var4]; Buffer var51 = new Buffer(this.midi); - var51.writeInt(0x4d546864); + var51.writeInt(1297377380); var51.writeInt(6); var51.writeShort(var2 > 1 ? 1 : 0); var51.writeShort(var2); @@ -192,230 +196,235 @@ public class MusicTrack extends Node { int[] var59 = new int[128]; var28 = 0; - label235: + label224: for (int var60 = 0; var60 < var2; ++var60) { - var51.writeInt(0x4d54726b); + var51.writeInt(1297379947); var51.offset += 4; int var61 = var51.offset; int var62 = -1; while (true) { - int var63 = var1.readVarInt(); - var51.writeVarInt(var63); - int var64 = var1.array[var29++] & 255; - boolean var65 = var64 != var62; - var62 = var64 & 15; - if (var64 == 7) { - if (var65) { - var51.writeByte(255); + while (true) { + int var63 = var1.readVarInt(); + var51.writeVarInt(var63); + int var64 = var1.array[var29++] & 255; + boolean var65 = var64 != var62; + var62 = var64 & 15; + if (var64 == 7) { + if (var65) { + var51.writeByte(255); + } + + var51.writeByte(47); + var51.writeByte(0); + var51.writeLengthInt(var51.offset - var61); + continue label224; } - var51.writeByte(47); - var51.writeByte(0); - var51.writeLengthInt(var51.offset - var61); - continue label235; - } + if (var64 == 23) { + if (var65) { + var51.writeByte(255); + } - if (var64 == 23) { - if (var65) { - var51.writeByte(255); - } - - var51.writeByte(81); - var51.writeByte(3); - var51.writeByte(var1.array[var50++]); - var51.writeByte(var1.array[var50++]); - var51.writeByte(var1.array[var50++]); - continue; - } - var52 ^= var64 >> 4; - if (var62 == 0) { - if (var65) { - var51.writeByte(var52 + 144); - } - - var53 += var1.array[var37++]; - var54 += var1.array[var38++]; - var51.writeByte(var53 & 127); - var51.writeByte(var54 & 127); - } else if (var62 == 1) { - if (var65) { - var51.writeByte(var52 + 128); - } - - var53 += var1.array[var37++]; - var55 += var1.array[var40++]; - var51.writeByte(var53 & 127); - var51.writeByte(var55 & 127); - } else if (var62 == 2) { - if (var65) { - var51.writeByte(var52 + 176); - } - - var28 = var28 + var1.array[var15++] & 127; - var51.writeByte(var28); - byte var66; - if (var28 == 0 || var28 == 32) { - var66 = var1.array[var44++]; - } else if (var28 == 1) { - var66 = var1.array[var34++]; - } else if (var28 == 33) { - var66 = var1.array[var41++]; - } else if (var28 == 7) { - var66 = var1.array[var35++]; - } else if (var28 == 39) { - var66 = var1.array[var42++]; - } else if (var28 == 10) { - var66 = var1.array[var36++]; - } else if (var28 == 42) { - var66 = var1.array[var43++]; - } else if (var28 == 99) { - var66 = var1.array[var46++]; - } else if (var28 == 98) { - var66 = var1.array[var47++]; - } else if (var28 == 101) { - var66 = var1.array[var48++]; - } else if (var28 == 100) { - var66 = var1.array[var49++]; - } else if (var28 != 64 && var28 != 65 && var28 != 120 && var28 != 121 && var28 != 123) { - var66 = var1.array[var39++]; + var51.writeByte(81); + var51.writeByte(3); + var51.writeByte(var1.array[var50++]); + var51.writeByte(var1.array[var50++]); + var51.writeByte(var1.array[var50++]); } else { - var66 = var1.array[var30++]; - } - - int var67 = var66 + var59[var28]; - var59[var28] = var67; - var51.writeByte(var67 & 127); - } else if (var62 == 3) { - if (var65) { - var51.writeByte(var52 + 224); - } - - var56 += var1.array[var45++]; - var56 += var1.array[var33++] << 7; - var51.writeByte(var56 & 127); - var51.writeByte(var56 >> 7 & 127); - } else if (var62 == 4) { - if (var65) { - var51.writeByte(var52 + 208); - } - - var57 += var1.array[var32++]; - var51.writeByte(var57 & 127); - } else if (var62 == 5) { - if (var65) { - var51.writeByte(var52 + 160); - } - - var53 += var1.array[var37++]; - var58 += var1.array[var31++]; - var51.writeByte(var53 & 127); - var51.writeByte(var58 & 127); - } else if (var62 == 6) { - if (var65) { - var51.writeByte(var52 + 192); - } - - var51.writeByte(var1.array[var44++]); - } else { - throw new RuntimeException(); - } - } - } - - } - - @ObfuscatedName("w") - void method3925() { - if (this.table != null) { - return; - } - this.table = new NodeHashTable(16); - int[] var1 = new int[16]; - int[] var2 = new int[16]; - var2[9] = 128; - var1[9] = 128; - MidiFileReader var4 = new MidiFileReader(this.midi); - int var5 = var4.trackCount(); - - int var6; - for (var6 = 0; var6 < var5; ++var6) { - var4.gotoTrack(var6); - var4.readTrackLength(var6); - var4.markTrackPosition(var6); - } - - label53: - do { - while (true) { - var6 = var4.getPrioritizedTrack(); - int var7 = var4.trackLengths[var6]; - - while (var7 == var4.trackLengths[var6]) { - var4.gotoTrack(var6); - int var8 = var4.readMessage(var6); - if (var8 == 1) { - var4.setTrackDone(); - var4.markTrackPosition(var6); - continue label53; - } - - int var9 = var8 & 240; - int var10; - int var11; - int var12; - if (var9 == 176) { - var10 = var8 & 15; - var11 = var8 >> 8 & 127; - var12 = var8 >> 16 & 127; - if (var11 == 0) { - var1[var10] = (var12 << 14) + (var1[var10] & 0xffe03fff); - } - - if (var11 == 32) { - var1[var10] = (var1[var10] & 0xffffc07f) + (var12 << 7); - } - } - - if (var9 == 192) { - var10 = var8 & 15; - var11 = var8 >> 8 & 127; - var2[var10] = var11 + var1[var10]; - } - - if (var9 == 144) { - var10 = var8 & 15; - var11 = var8 >> 8 & 127; - var12 = var8 >> 16 & 127; - if (var12 > 0) { - int var13 = var2[var10]; - ByteArrayNode var14 = (ByteArrayNode)this.table.get((long)var13); - if (var14 == null) { - var14 = new ByteArrayNode(new byte[128]); - this.table.put(var14, (long)var13); + var52 ^= var64 >> 4; + if (var62 == 0) { + if (var65) { + var51.writeByte(var52 + 144); } - var14.byteArray[var11] = 1; + var53 += var1.array[var37++]; + var54 += var1.array[var38++]; + var51.writeByte(var53 & 127); + var51.writeByte(var54 & 127); + } else if (var62 == 1) { + if (var65) { + var51.writeByte(var52 + 128); + } + + var53 += var1.array[var37++]; + var55 += var1.array[var40++]; + var51.writeByte(var53 & 127); + var51.writeByte(var55 & 127); + } else if (var62 == 2) { + if (var65) { + var51.writeByte(var52 + 176); + } + + var28 = var28 + var1.array[var15++] & 127; + var51.writeByte(var28); + byte var66; + if (var28 != 0 && var28 != 32) { + if (var28 == 1) { + var66 = var1.array[var34++]; + } else if (var28 == 33) { + var66 = var1.array[var41++]; + } else if (var28 == 7) { + var66 = var1.array[var35++]; + } else if (var28 == 39) { + var66 = var1.array[var42++]; + } else if (var28 == 10) { + var66 = var1.array[var36++]; + } else if (var28 == 42) { + var66 = var1.array[var43++]; + } else if (var28 == 99) { + var66 = var1.array[var46++]; + } else if (var28 == 98) { + var66 = var1.array[var47++]; + } else if (var28 == 101) { + var66 = var1.array[var48++]; + } else if (var28 == 100) { + var66 = var1.array[var49++]; + } else if (var28 != 64 && var28 != 65 && var28 != 120 && var28 != 121 && var28 != 123) { + var66 = var1.array[var39++]; + } else { + var66 = var1.array[var30++]; + } + } else { + var66 = var1.array[var44++]; + } + + int var67 = var66 + var59[var28]; + var59[var28] = var67; + var51.writeByte(var67 & 127); + } else if (var62 == 3) { + if (var65) { + var51.writeByte(var52 + 224); + } + + var56 += var1.array[var45++]; + var56 += var1.array[var33++] << 7; + var51.writeByte(var56 & 127); + var51.writeByte(var56 >> 7 & 127); + } else if (var62 == 4) { + if (var65) { + var51.writeByte(var52 + 208); + } + + var57 += var1.array[var32++]; + var51.writeByte(var57 & 127); + } else if (var62 == 5) { + if (var65) { + var51.writeByte(var52 + 160); + } + + var53 += var1.array[var37++]; + var58 += var1.array[var31++]; + var51.writeByte(var53 & 127); + var51.writeByte(var58 & 127); + } else { + if (var62 != 6) { + throw new RuntimeException(); + } + + if (var65) { + var51.writeByte(var52 + 192); + } + + var51.writeByte(var1.array[var44++]); } } - - var4.readTrackLength(var6); - var4.markTrackPosition(var6); } } - } while(!var4.isDone()); + } } - @ObfuscatedName("e") + @ObfuscatedName("j") + void method3853() { + if (this.table == null) { + this.table = new NodeHashTable(16); + int[] var1 = new int[16]; + int[] var2 = new int[16]; + var2[9] = 128; + var1[9] = 128; + MidiFileReader var4 = new MidiFileReader(this.midi); + int var5 = var4.trackCount(); + + int var6; + for (var6 = 0; var6 < var5; ++var6) { + var4.gotoTrack(var6); + var4.readTrackLength(var6); + var4.markTrackPosition(var6); + } + + label52: + do { + while (true) { + var6 = var4.getPrioritizedTrack(); + int var7 = var4.trackLengths[var6]; + + while (var7 == var4.trackLengths[var6]) { + var4.gotoTrack(var6); + int var8 = var4.readMessage(var6); + if (var8 == 1) { + var4.setTrackDone(); + var4.markTrackPosition(var6); + continue label52; + } + + int var9 = var8 & 240; + int var10; + int var11; + int var12; + if (var9 == 176) { + var10 = var8 & 15; + var11 = var8 >> 8 & 127; + var12 = var8 >> 16 & 127; + if (var11 == 0) { + var1[var10] = (var12 << 14) + (var1[var10] & -2080769); + } + + if (var11 == 32) { + var1[var10] = (var1[var10] & -16257) + (var12 << 7); + } + } + + if (var9 == 192) { + var10 = var8 & 15; + var11 = var8 >> 8 & 127; + var2[var10] = var11 + var1[var10]; + } + + if (var9 == 144) { + var10 = var8 & 15; + var11 = var8 >> 8 & 127; + var12 = var8 >> 16 & 127; + if (var12 > 0) { + int var13 = var2[var10]; + ByteArrayNode var14 = (ByteArrayNode)this.table.get((long)var13); + if (var14 == null) { + var14 = new ByteArrayNode(new byte[128]); + this.table.put(var14, (long)var13); + } + + var14.byteArray[var11] = 1; + } + } + + var4.readTrackLength(var6); + var4.markTrackPosition(var6); + } + } + } while(!var4.isDone()); + + } + } + + @ObfuscatedName("i") @Export("clear") void clear() { this.table = null; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lhp;II)Lgl;" + signature = "(Lhz;II)Lgy;" ) @Export("readTrack") public 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 e30258d2f3..64b56c43e6 100644 --- a/runescape-client/src/main/java/NPC.java +++ b/runescape-client/src/main/java/NPC.java @@ -1,20 +1,16 @@ +import java.io.IOException; 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("cf") +@ObfuscatedName("ci") @Implements("NPC") public final class NPC extends Actor { - @ObfuscatedName("i") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lly;" - ) - @Export("rightTitleSprite") - static Sprite rightTitleSprite; - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "Lij;" + signature = "Lii;" ) @Export("definition") NPCDefinition definition; @@ -22,12 +18,12 @@ public final class NPC extends Actor { NPC() { } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(IBI)V", - garbageValue = "1156693210" + signature = "(IBB)V", + garbageValue = "24" ) - final void method1974(int var1, byte var2) { + final void method1961(int var1, byte var2) { int var3 = super.pathX[0]; int var4 = super.pathY[0]; if (var1 == 0) { @@ -66,7 +62,7 @@ public final class NPC extends Actor { --var4; } - if (super.sequence != -1 && GrandExchangeEvent.SequenceDefinition_get(super.sequence).field3532 == 1) { + if (super.sequence != -1 && Widget.SequenceDefinition_get(super.sequence).field3505 == 1) { super.sequence = -1; } @@ -85,13 +81,13 @@ public final class NPC extends Actor { super.pathTraversed[0] = var2; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IIZS)V", - garbageValue = "128" + signature = "(IIZI)V", + garbageValue = "-1744737453" ) - final void method1963(int var1, int var2, boolean var3) { - if (super.sequence != -1 && GrandExchangeEvent.SequenceDefinition_get(super.sequence).field3532 == 1) { + final void method1970(int var1, int var2, boolean var3) { + if (super.sequence != -1 && Widget.SequenceDefinition_get(super.sequence).field3505 == 1) { super.sequence = -1; } @@ -117,172 +113,252 @@ public final class NPC extends Actor { } super.pathLength = 0; - super.field1008 = 0; - super.field1007 = 0; + super.field947 = 0; + super.field976 = 0; super.pathX[0] = var1; super.pathY[0] = var2; - super.x = super.size * -1342954560 + super.pathX[0] * 128; - super.y = super.pathY[0] * 128 + super.size * -1342954560; + super.x = super.size * -178253824 + super.pathX[0] * 128; + super.y = super.pathY[0] * 128 + super.size * -178253824; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)Ldm;", - garbageValue = "759381421" + signature = "(I)Ldo;", + garbageValue = "-419920513" ) @Export("getModel") protected final Model getModel() { if (this.definition == null) { return null; - } - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? GrandExchangeEvent.SequenceDefinition_get(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence != -1 && (super.readySequence != super.movementSequence || var1 == null) ? GrandExchangeEvent.SequenceDefinition_get(super.movementSequence) : null; - Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); - if (var3 == null) { - return null; - } - var3.calculateBoundsCylinder(); - super.defaultHeight = var3.height; - if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { - Model var4 = MusicPatch.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); - if (var4 != null) { - var4.offsetBy(0, -super.heightOffset, 0); - Model[] var5 = new Model[]{var3, var4}; - var3 = new Model(var5, 2); + } else { + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? Widget.SequenceDefinition_get(super.sequence) : null; + SequenceDefinition var2 = super.movementSequence != -1 && (super.movementSequence != super.readySequence || var1 == null) ? Widget.SequenceDefinition_get(super.movementSequence) : null; + Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); + if (var3 == null) { + return null; + } else { + var3.calculateBoundsCylinder(); + super.defaultHeight = var3.height; + if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { + Model var4 = HealthBarUpdate.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); + if (var4 != null) { + var4.offsetBy(0, -super.heightOffset, 0); + Model[] var5 = new Model[]{var3, var4}; + var3 = new Model(var5, 2); + } + } + + if (this.definition.size == 1) { + var3.isSingleTile = true; + } + + return var3; } } - - if (this.definition.size == 1) { - var3.isSingleTile = true; - } - - return var3; } - @ObfuscatedName("v") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-1461786701" + signature = "(B)Z", + garbageValue = "-110" ) @Export("isVisible") final boolean isVisible() { return this.definition != null; } - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(ILcx;ZI)I", - garbageValue = "-1435183788" + signature = "(ZI)V", + garbageValue = "-352307564" ) - static int method1977(int var0, Script var1, boolean var2) { - if (var0 < 1000) { - return Skeleton.method3064(var0, var1, var2); + public static void method1977(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; + } + } - if (var0 < 1100) { - return ModelData0.method3250(var0, var1, var2); + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)V", + garbageValue = "106013450" + ) + static final void method1976(String var0) { + StringBuilder var10000 = (new StringBuilder()).append(var0); + Object var10001 = null; + String var1 = var10000.append(" is already on your friend list").toString(); + DirectByteArrayCopier.addGameMessage(30, "", var1); + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(ILcr;ZI)I", + garbageValue = "594681676" + ) + static int method1968(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var3 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + } else { + var3 = var2 ? class286.field3623 : class297.field3693; } - if (var0 < 1200) { - return class83.method1994(var0, var1, var2); + + String var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + int[] var5 = null; + if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { + int var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var6 > 0) { + for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]) { + } + } + + var4 = var4.substring(0, var4.length() - 1); } - if (var0 < 1300) { - return WorldMapDecoration.method324(var0, var1, var2); + + 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[--Interpreter.Interpreter_stringStackSize]; + } else { + var8[var7] = new Integer(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + } } - if (var0 < 1400) { - return UserComparator9.method3389(var0, var1, var2); + + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var7 != -1) { + var8[0] = new Integer(var7); + } else { + var8 = null; } - if (var0 < 1500) { - return GraphicsObject.method1943(var0, var1, var2); + + 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.field2663 = var8; + } else { + if (var0 != ScriptOpcodes.CC_SETONRESIZE) { + return 2; + } + + var3.onResize = var8; } - if (var0 < 1600) { - return GrandExchangeOfferAgeComparator.method147(var0, var1, var2); + + var3.hasListener = true; + return 1; + } + + @ObfuscatedName("jl") + @ObfuscatedSignature( + signature = "(IIII)Lbq;", + garbageValue = "-1663571720" + ) + static final InterfaceParent method1967(int var0, int var1, int var2) { + InterfaceParent var3 = new InterfaceParent(); + var3.group = var1; + var3.type = var2; + Client.interfaceParents.put(var3, (long)var0); + WorldMapSectionType.Widget_resetModelFrames(var1); + Widget var4 = WorldMapElement.getWidget(var0); + FriendSystem.invalidateWidget(var4); + if (Client.meslayerContinueWidget != null) { + FriendSystem.invalidateWidget(Client.meslayerContinueWidget); + Client.meslayerContinueWidget = null; } - if (var0 < 1700) { - return MenuAction.method1992(var0, var1, var2); + + for (int var5 = 0; var5 < Client.menuOptionsCount; ++var5) { + if (PendingSpawn.isWidgetMenuOpcode(Client.menuOpcodes[var5])) { + if (var5 < Client.menuOptionsCount - 1) { + for (int var6 = var5; var6 < Client.menuOptionsCount - 1; ++var6) { + Client.menuActions[var6] = Client.menuActions[var6 + 1]; + Client.menuTargets[var6] = Client.menuTargets[var6 + 1]; + Client.menuOpcodes[var6] = Client.menuOpcodes[var6 + 1]; + Client.menuIdentifiers[var6] = Client.menuIdentifiers[var6 + 1]; + Client.menuArguments1[var6] = Client.menuArguments1[var6 + 1]; + Client.menuArguments2[var6] = Client.menuArguments2[var6 + 1]; + Client.menuShiftClick[var6] = Client.menuShiftClick[var6 + 1]; + } + } + + --var5; + --Client.menuOptionsCount; + } } - if (var0 < 1800) { - return FileSystem.method3501(var0, var1, var2); + + GrandExchangeOfferNameComparator.calculateMenuBounds(); + WorldMapAreaData.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var0 >> 16], var4, false); + class51.runWidgetOnLoadListener(var1); + if (Client.rootInterface != -1) { + UserComparator6.runIntfCloseListeners(Client.rootInterface, 1); } - if (var0 < 1900) { - return StudioGame.method4137(var0, var1, var2); - } - if (var0 < 2000) { - return ArchiveLoader.method1100(var0, var1, var2); - } - if (var0 < 2100) { - return ModelData0.method3250(var0, var1, var2); - } - if (var0 < 2200) { - return class83.method1994(var0, var1, var2); - } - if (var0 < 2300) { - return WorldMapDecoration.method324(var0, var1, var2); - } - if (var0 < 2400) { - return UserComparator9.method3389(var0, var1, var2); - } - if (var0 < 2500) { - return GraphicsObject.method1943(var0, var1, var2); - } - if (var0 < 2600) { - return ScriptEvent.method1127(var0, var1, var2); - } - if (var0 < 2700) { - return TextureProvider.method2743(var0, var1, var2); - } - if (var0 < 2800) { - return UrlRequester.method3306(var0, var1, var2); - } - if (var0 < 2900) { - return FloorUnderlayDefinition.method4433(var0, var1, var2); - } - if (var0 < 3000) { - return ArchiveLoader.method1100(var0, var1, var2); - } - if (var0 < 3200) { - return class30.method536(var0, var1, var2); - } - if (var0 < 3300) { - return AbstractArchive.method4172(var0, var1, var2); - } - if (var0 < 3400) { - return WorldMapID.method540(var0, var1, var2); - } - if (var0 < 3500) { - return class65.method1175(var0, var1, var2); - } - if (var0 < 3700) { - return class30.method535(var0, var1, var2); - } - if (var0 < 4000) { - return FriendSystem.method1817(var0, var1, var2); - } - if (var0 < 4100) { - return EnumDefinition.method4532(var0, var1, var2); - } - if (var0 < 4200) { - return class208.method3941(var0, var1, var2); - } - if (var0 < 4300) { - return FontName.method5316(var0, var1, var2); - } - if (var0 < 5100) { - return ClientPreferences.method1753(var0, var1, var2); - } - if (var0 < 5400) { - return UserComparator6.method3436(var0, var1, var2); - } - if (var0 < 5600) { - return WorldMapSectionType.method239(var0, var1, var2); - } - if (var0 < 5700) { - return WorldMapData_1.method696(var0, var1, var2); - } - if (var0 < 6300) { - return WorldMapSectionType.method242(var0, var1, var2); - } - if (var0 < 6600) { - return class197.method3703(var0, var1, var2); - } - return var0 < 6700 ? GrandExchangeOffer.method114(var0, var1, var2) : 2; + + return var3; } } diff --git a/runescape-client/src/main/java/NPCDefinition.java b/runescape-client/src/main/java/NPCDefinition.java index fb3cc5dbcd..7e1d1e667c 100644 --- a/runescape-client/src/main/java/NPCDefinition.java +++ b/runescape-client/src/main/java/NPCDefinition.java @@ -4,197 +4,185 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ij") +@ObfuscatedName("ii") @Implements("NPCDefinition") public class NPCDefinition extends DualNode { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("NpcDefinition_archive") static AbstractArchive NpcDefinition_archive; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("NpcDefinition_modelArchive") static AbstractArchive NpcDefinition_modelArchive; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lep;" ) @Export("NpcDefinition_cached") static EvictingDualNodeHashTable NpcDefinition_cached; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lep;" ) @Export("NpcDefinition_cachedModels") static EvictingDualNodeHashTable NpcDefinition_cachedModels; - @ObfuscatedName("bl") - @ObfuscatedSignature( - signature = "Llx;" - ) - @Export("worldSelectRightSprite") - static IndexedSprite worldSelectRightSprite; - @ObfuscatedName("do") - @ObfuscatedSignature( - signature = "Liu;" - ) - @Export("archive7") - static Archive archive7; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -2095411363 + intValue = 909788379 ) @Export("id") public int id; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("name") public String name; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 182085113 + intValue = 2025988457 ) @Export("size") public int size; - @ObfuscatedName("i") + @ObfuscatedName("q") @Export("models") int[] models; - @ObfuscatedName("c") - int[] field3463; - @ObfuscatedName("f") + @ObfuscatedName("x") + int[] field3448; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -530997781 + intValue = 993852285 ) @Export("readySequence") public int readySequence; - @ObfuscatedName("m") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1697646117 + intValue = -141085445 ) @Export("turnLeftSequence") public int turnLeftSequence; - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -225693269 + intValue = 1332043893 ) @Export("turnRightSequence") public int turnRightSequence; - @ObfuscatedName("x") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -480719565 + intValue = 827227809 ) @Export("walkSequence") public int walkSequence; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -527626491 + intValue = -367253213 ) @Export("walkBackSequence") public int walkBackSequence; - @ObfuscatedName("v") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1672595499 + intValue = -183779609 ) @Export("walkLeftSequence") public int walkLeftSequence; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -389638615 + intValue = 340140115 ) @Export("walkRightSequence") public int walkRightSequence; @ObfuscatedName("g") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("a") + @ObfuscatedName("e") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("j") + @ObfuscatedName("z") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("h") + @ObfuscatedName("w") @Export("actions") public String[] actions; - @ObfuscatedName("o") + @ObfuscatedName("l") @Export("drawMapDot") public boolean drawMapDot; - @ObfuscatedName("n") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -785647373 + intValue = 242918317 ) @Export("combatLevel") public int combatLevel; - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1029052063 + intValue = 1595385295 ) @Export("widthScale") int widthScale; - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 409024439 + intValue = -1524499683 ) @Export("heightScale") int heightScale; - @ObfuscatedName("z") + @ObfuscatedName("o") @Export("isVisible") public boolean isVisible; - @ObfuscatedName("al") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -1025761835 + intValue = 2030927353 ) @Export("ambient") int ambient; - @ObfuscatedName("av") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -704573687 + intValue = 332932319 ) @Export("contrast") int contrast; - @ObfuscatedName("as") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = -958294189 + intValue = -2075013729 ) @Export("headIconPrayer") public int headIconPrayer; - @ObfuscatedName("aw") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 648485331 + intValue = 429117763 ) @Export("rotation") public int rotation; - @ObfuscatedName("ad") + @ObfuscatedName("az") @Export("transforms") public int[] transforms; - @ObfuscatedName("ag") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 971935579 + intValue = 1155103799 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("ar") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -375353725 + intValue = 494584381 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("ax") + @ObfuscatedName("at") @Export("isInteractable") public boolean isInteractable; - @ObfuscatedName("az") + @ObfuscatedName("as") @Export("isClickable") public boolean isClickable; - @ObfuscatedName("ae") + @ObfuscatedName("ak") @Export("isFollower") public boolean isFollower; @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "Lla;" + signature = "Lln;" ) @Export("params") IterableNodeHashTable params; @@ -231,19 +219,19 @@ public class NPCDefinition extends DualNode { this.isFollower = false; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-169621084" + signature = "(B)V", + garbageValue = "-111" ) @Export("postDecode") void postDecode() { } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lkf;I)V", - garbageValue = "-1547887563" + signature = "(Lky;B)V", + garbageValue = "-127" ) @Export("decode") void decode(Buffer var1) { @@ -257,10 +245,10 @@ public class NPCDefinition extends DualNode { } } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Lkf;IB)V", - garbageValue = "-24" + signature = "(Lky;II)V", + garbageValue = "-760565224" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -315,10 +303,10 @@ public class NPCDefinition extends DualNode { } } else if (var2 == 60) { var3 = var1.readUnsignedByte(); - this.field3463 = new int[var3]; + this.field3448 = new int[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.field3463[var4] = var1.readUnsignedShort(); + this.field3448[var4] = var1.readUnsignedShort(); } } else if (var2 == 93) { this.drawMapDot = false; @@ -333,7 +321,7 @@ public class NPCDefinition extends DualNode { } else if (var2 == 100) { this.ambient = var1.readByte(); } else if (var2 == 101) { - this.contrast = var1.readByte() * 5; + this.contrast = var1.readByte(); } else if (var2 == 102) { this.headIconPrayer = var1.readUnsignedShort(); } else if (var2 == 103) { @@ -346,23 +334,23 @@ public class NPCDefinition extends DualNode { } else if (var2 == 111) { this.isFollower = true; } else if (var2 == 249) { - this.params = WorldMapArea.readStringIntParameters(var1, this.params); + this.params = DynamicObject.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); - if (this.transformVarbit == 0xffff) { + if (this.transformVarbit == 65535) { this.transformVarbit = -1; } this.transformVarp = var1.readUnsignedShort(); - if (this.transformVarp == 0xffff) { + if (this.transformVarp == 65535) { this.transformVarp = -1; } var3 = -1; if (var2 == 118) { var3 = var1.readUnsignedShort(); - if (var3 == 0xffff) { + if (var3 == 65535) { var3 = -1; } } @@ -372,7 +360,7 @@ public class NPCDefinition extends DualNode { for (int var5 = 0; var5 <= var4; ++var5) { this.transforms[var5] = var1.readUnsignedShort(); - if (this.transforms[var5] == 0xffff) { + if (this.transforms[var5] == 65535) { this.transforms[var5] = -1; } } @@ -382,143 +370,145 @@ public class NPCDefinition extends DualNode { } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Lis;ILis;IB)Ldm;", - garbageValue = "27" + signature = "(Lij;ILij;II)Ldo;", + garbageValue = "1604729882" ) @Export("getModel") public final Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { if (this.transforms != null) { NPCDefinition var12 = this.transform(); return var12 == null ? null : var12.getModel(var1, var2, var3, var4); - } - Model var5 = (Model)NpcDefinition_cachedModels.get((long)this.id); - if (var5 == null) { - boolean var6 = false; - - for (int var7 = 0; var7 < this.models.length; ++var7) { - if (!NpcDefinition_modelArchive.tryLoadFile(this.models[var7], 0)) { - var6 = true; - } - } - - if (var6) { - return null; - } - - ModelData[] var8 = new ModelData[this.models.length]; - - int var9; - for (var9 = 0; var9 < this.models.length; ++var9) { - var8[var9] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.models[var9], 0); - } - - ModelData var11; - if (var8.length == 1) { - var11 = var8[0]; - } else { - var11 = new ModelData(var8, var8.length); - } - - if (this.recolorFrom != null) { - for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { - var11.recolor(this.recolorFrom[var9], this.recolorTo[var9]); - } - } - - if (this.retextureFrom != null) { - for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { - var11.retexture(this.retextureFrom[var9], this.retextureTo[var9]); - } - } - - var5 = var11.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); - NpcDefinition_cachedModels.put(var5, (long)this.id); - } - - Model var10; - if (var1 != null && var3 != null) { - var10 = var1.applyTransformations(var5, var2, var3, var4); - } else if (var1 != null) { - var10 = var1.transformActorModel(var5, var2); - } else if (var3 != null) { - var10 = var3.transformActorModel(var5, var4); } else { - var10 = var5.toSharedSequenceModel(true); - } + Model var5 = (Model)NpcDefinition_cachedModels.get((long)this.id); + if (var5 == null) { + boolean var6 = false; - if (this.widthScale != 128 || this.heightScale != 128) { - var10.scale(this.widthScale, this.heightScale, this.widthScale); - } + for (int var7 = 0; var7 < this.models.length; ++var7) { + if (!NpcDefinition_modelArchive.tryLoadFile(this.models[var7], 0)) { + var6 = true; + } + } - return var10; + if (var6) { + return null; + } + + ModelData[] var8 = new ModelData[this.models.length]; + + int var9; + for (var9 = 0; var9 < this.models.length; ++var9) { + var8[var9] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.models[var9], 0); + } + + ModelData var11; + if (var8.length == 1) { + var11 = var8[0]; + } else { + var11 = new ModelData(var8, var8.length); + } + + if (this.recolorFrom != null) { + for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { + var11.recolor(this.recolorFrom[var9], this.recolorTo[var9]); + } + } + + if (this.retextureFrom != null) { + for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { + var11.retexture(this.retextureFrom[var9], this.retextureTo[var9]); + } + } + + var5 = var11.toModel(this.ambient + 64, this.contrast * 5 + 850, -30, -50, -30); + NpcDefinition_cachedModels.put(var5, (long)this.id); + } + + Model var10; + if (var1 != null && var3 != null) { + var10 = var1.applyTransformations(var5, var2, var3, var4); + } else if (var1 != null) { + var10 = var1.transformActorModel(var5, var2); + } else if (var3 != null) { + var10 = var3.transformActorModel(var5, var4); + } else { + var10 = var5.toSharedSequenceModel(true); + } + + if (this.widthScale != 128 || this.heightScale != 128) { + var10.scale(this.widthScale, this.heightScale, this.widthScale); + } + + return var10; + } } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(B)Lds;", - garbageValue = "87" + signature = "(I)Ldq;", + garbageValue = "-542363103" ) @Export("getModelData") public final ModelData getModelData() { if (this.transforms != null) { NPCDefinition var1 = this.transform(); return var1 == null ? null : var1.getModelData(); - } - if (this.field3463 == null) { + } else if (this.field3448 == null) { return null; - } - boolean var5 = false; - - for (int var2 = 0; var2 < this.field3463.length; ++var2) { - if (!NpcDefinition_modelArchive.tryLoadFile(this.field3463[var2], 0)) { - var5 = true; - } - } - - if (var5) { - return null; - } - ModelData[] var6 = new ModelData[this.field3463.length]; - - for (int var3 = 0; var3 < this.field3463.length; ++var3) { - var6[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field3463[var3], 0); - } - - ModelData var7; - if (var6.length == 1) { - var7 = var6[0]; } else { - var7 = new ModelData(var6, var6.length); - } + boolean var5 = false; - int var4; - if (this.recolorFrom != null) { - for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { - var7.recolor(this.recolorFrom[var4], this.recolorTo[var4]); + for (int var2 = 0; var2 < this.field3448.length; ++var2) { + if (!NpcDefinition_modelArchive.tryLoadFile(this.field3448[var2], 0)) { + var5 = true; + } + } + + if (var5) { + return null; + } else { + ModelData[] var6 = new ModelData[this.field3448.length]; + + for (int var3 = 0; var3 < this.field3448.length; ++var3) { + var6[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field3448[var3], 0); + } + + ModelData var7; + if (var6.length == 1) { + var7 = var6[0]; + } else { + var7 = new ModelData(var6, var6.length); + } + + int var4; + if (this.recolorFrom != null) { + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { + var7.recolor(this.recolorFrom[var4], this.recolorTo[var4]); + } + } + + if (this.retextureFrom != null) { + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { + var7.retexture(this.retextureFrom[var4], this.retextureTo[var4]); + } + } + + return var7; } } - - if (this.retextureFrom != null) { - for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { - var7.retexture(this.retextureFrom[var4], this.retextureTo[var4]); - } - } - - return var7; } - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)Lij;", - garbageValue = "942859640" + signature = "(B)Lii;", + garbageValue = "6" ) @Export("transform") public final NPCDefinition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = GrandExchangeOfferOwnWorldComparator.getVarbit(this.transformVarbit); + var1 = class208.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -530,57 +520,64 @@ public class NPCDefinition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? GameShell.getNpcDefinition(var2) : null; + return var2 != -1 ? ViewportMouse.getNpcDefinition(var2) : null; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "-119" + signature = "(S)Z", + garbageValue = "-10586" ) @Export("transformIsVisible") public boolean transformIsVisible() { if (this.transforms == null) { return true; - } - int var1 = -1; - if (this.transformVarbit != -1) { - var1 = GrandExchangeOfferOwnWorldComparator.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { - var1 = Varps.Varps_main[this.transformVarp]; - } + } else { + int var1 = -1; + if (this.transformVarbit != -1) { + var1 = class208.getVarbit(this.transformVarbit); + } else if (this.transformVarp != -1) { + var1 = Varps.Varps_main[this.transformVarp]; + } - if (var1 >= 0 && var1 < this.transforms.length) { - return this.transforms[var1] != -1; + if (var1 >= 0 && var1 < this.transforms.length) { + return this.transforms[var1] != -1; + } else { + return this.transforms[this.transforms.length - 1] != -1; + } } - return this.transforms[this.transforms.length - 1] != -1; } - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "-696362374" + garbageValue = "-2056976913" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { IterableNodeHashTable var4 = this.params; + int var3; if (var4 == null) { - return var2; + var3 = var2; + } else { + IntegerNode var5 = (IntegerNode)var4.get((long)var1); + if (var5 == null) { + var3 = var2; + } else { + var3 = var5.integer; + } } - IntegerNode var5 = (IntegerNode)var4.get((long)var1); - if (var5 == null) { - return var2; - } - return var5.integer; + + return var3; } - @ObfuscatedName("x") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1901190491" + signature = "(ILjava/lang/String;B)Ljava/lang/String;", + garbageValue = "-42" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return GrandExchangeOfferWorldComparator.method54(this.params, var1, var2); + return class227.method4041(this.params, var1, var2); } } diff --git a/runescape-client/src/main/java/NanoClock.java b/runescape-client/src/main/java/NanoClock.java index b669fadb82..5349641b0c 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("ft") +@ObfuscatedName("fy") @Implements("NanoClock") public class NanoClock extends Clock { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - longValue = 6745793608477696967L + longValue = -485242875267144609L ) @Export("lastTimeNano") long lastTimeNano; @@ -18,36 +18,35 @@ public class NanoClock extends Clock { this.lastTimeNano = System.nanoTime(); } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1402657312" + garbageValue = "-779324795" ) @Export("mark") public void mark() { this.lastTimeNano = System.nanoTime(); } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "-333181863" + garbageValue = "930751718" ) @Export("wait") - public int wait(int tickLength, int fiveOrOne) { - long var3 = 1000000L * (long)fiveOrOne; + public int wait(int var1, int var2) { + long var3 = (long)var2 * 1000000L; long var5 = this.lastTimeNano - System.nanoTime(); if (var5 < var3) { var5 = var3; } - EnumDefinition.sleepMillis(var5 / 1000000L); + UserList.sleepMillis(var5 / 1000000L); long var7 = System.nanoTime(); - int var9 = 0; - while (var9 < 10 && (var9 < 1 || this.lastTimeNano < var7)) { + int var9; + for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += 1000000L * (long)var1) { ++var9; - this.lastTimeNano += (long)tickLength * 1000000L; } if (this.lastTimeNano < var7) { diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java index 8f83790864..84ab1865f0 100644 --- a/runescape-client/src/main/java/NetCache.java +++ b/runescape-client/src/main/java/NetCache.java @@ -5,115 +5,131 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ii") +@ObfuscatedName("iy") @Implements("NetCache") public class NetCache { - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "Lky;" - ) - @Export("NetCache_socket") - public static AbstractSocket NetCache_socket; - @ObfuscatedName("w") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 351053657 + intValue = -824273879 ) @Export("NetCache_loadTime") static int NetCache_loadTime; - @ObfuscatedName("e") - @ObfuscatedGetter( - longValue = 906577835555410159L - ) - @Export("NetCache_timeMs") - static long NetCache_timeMs; - @ObfuscatedName("p") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Llc;" + signature = "Lkg;" + ) + @Export("NetCache_socket") + public static AbstractSocket NetCache_socket; + @ObfuscatedName("i") + @ObfuscatedGetter( + longValue = -8280419898275786329L + ) + static long field3145; + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Llm;" ) @Export("NetCache_pendingPriorityWrites") static NodeHashTable NetCache_pendingPriorityWrites; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -975999093 + intValue = -971608393 ) @Export("NetCache_pendingPriorityWritesCount") - public static int NetCache_pendingPriorityWritesCount; - @ObfuscatedName("l") + static int NetCache_pendingPriorityWritesCount; + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Llc;" + signature = "Llm;" ) @Export("NetCache_pendingPriorityResponses") static NodeHashTable NetCache_pendingPriorityResponses; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -2100347839 + intValue = -1662423267 ) @Export("NetCache_pendingPriorityResponsesCount") - public static int NetCache_pendingPriorityResponsesCount; - @ObfuscatedName("i") + static int NetCache_pendingPriorityResponsesCount; + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lix;" + signature = "Lih;" ) @Export("NetCache_pendingWritesQueue") static DualNodeDeque NetCache_pendingWritesQueue; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Llc;" + signature = "Llm;" ) @Export("NetCache_pendingWrites") static NodeHashTable NetCache_pendingWrites; - @ObfuscatedName("f") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -478006427 + intValue = -1308098009 ) @Export("NetCache_pendingWritesCount") - public static int NetCache_pendingWritesCount; - @ObfuscatedName("m") + static int NetCache_pendingWritesCount; + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Llc;" + signature = "Llm;" ) @Export("NetCache_pendingResponses") static NodeHashTable NetCache_pendingResponses; - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 302917267 + intValue = -1727306885 ) @Export("NetCache_pendingResponsesCount") - public static int NetCache_pendingResponsesCount; - @ObfuscatedName("v") + static int NetCache_pendingResponsesCount; + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lkf;" + signature = "Lhl;" + ) + @Export("NetCache_currentResponse") + static NetFileRequest NetCache_currentResponse; + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "Lky;" ) @Export("NetCache_responseHeaderBuffer") static Buffer NetCache_responseHeaderBuffer; + @ObfuscatedName("b") + @ObfuscatedSignature( + signature = "Lky;" + ) + @Export("NetCache_responseArchiveBuffer") + static Buffer NetCache_responseArchiveBuffer; @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 266827 + intValue = 788483417 ) - static int field3175; - @ObfuscatedName("j") + static int field3156; + @ObfuscatedName("z") @Export("NetCache_crc") static CRC32 NetCache_crc; - @ObfuscatedName("h") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "[Liu;" + signature = "[Lid;" ) @Export("NetCache_archives") static Archive[] NetCache_archives; - @ObfuscatedName("o") - static byte field3181; - @ObfuscatedName("n") + @ObfuscatedName("l") + static byte field3159; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 779627437 + intValue = 2084935355 ) @Export("NetCache_crcMismatches") public static int NetCache_crcMismatches; - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1542260379 + intValue = -117498157 ) @Export("NetCache_ioExceptions") public static int NetCache_ioExceptions; + @ObfuscatedName("lr") + @ObfuscatedGetter( + intValue = 1642839291 + ) + static int field3162; static { NetCache_loadTime = 0; @@ -127,54 +143,43 @@ public class NetCache { NetCache_pendingResponses = new NodeHashTable(4096); NetCache_pendingResponsesCount = 0; NetCache_responseHeaderBuffer = new Buffer(8); - field3175 = 0; + field3156 = 0; NetCache_crc = new CRC32(); NetCache_archives = new Archive[256]; - field3181 = 0; + field3159 = 0; NetCache_crcMismatches = 0; NetCache_ioExceptions = 0; } - @ObfuscatedName("hm") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "-1775821653" + signature = "(CI)Z", + garbageValue = "-1171318227" ) - @Export("calculateMenuBounds") - static void calculateMenuBounds(int x, int y) { - int var2 = WorldMapIcon_1.fontBold12.stringWidth("Choose Option"); + @Export("isDigit") + public static boolean isDigit(char var0) { + return var0 >= '0' && var0 <= '9'; + } - int var4; - for (int var3 = 0; var3 < Client.menuOptionsCount; ++var3) { - var4 = WorldMapIcon_1.fontBold12.stringWidth(WorldMapLabel.getMenuText(var3)); - if (var4 > var2) { - var2 = var4; + @ObfuscatedName("iz") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;Ljava/lang/String;IIIIZB)V", + garbageValue = "-34" + ) + @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; } - } - var2 += 8; - int var3 = Client.menuOptionsCount * 15 + 22; - var4 = x - var2 / 2; - if (var2 + var4 > GrandExchangeEvent.canvasWidth) { - var4 = GrandExchangeEvent.canvasWidth - var2; } - - if (var4 < 0) { - var4 = 0; - } - - int var5 = y; - if (var3 + y > ParamDefinition.canvasHeight) { - var5 = ParamDefinition.canvasHeight - var3; - } - - if (var5 < 0) { - var5 = 0; - } - - class247.menuX = var4; - class30.menuY = var5; - class42.menuWidth = var2; - ObjectSound.menuHeight = Client.menuOptionsCount * 15 + 22; } } diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java index 59931c7b29..f4ebc0fd62 100644 --- a/runescape-client/src/main/java/NetFileRequest.java +++ b/runescape-client/src/main/java/NetFileRequest.java @@ -1,67 +1,37 @@ -import java.awt.Image; 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("hq") +@ObfuscatedName("hl") @Implements("NetFileRequest") public class NetFileRequest extends DualNode { - @ObfuscatedName("az") - static Image field3125; - @ObfuscatedName("q") + @ObfuscatedName("by") @ObfuscatedSignature( - signature = "Liu;" + signature = "[Llq;" + ) + @Export("worldSelectStars") + static IndexedSprite[] worldSelectStars; + @ObfuscatedName("eh") + @Export("worldHost") + static String worldHost; + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "Lid;" ) @Export("archive") Archive archive; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1663016965 + intValue = 450253051 ) @Export("crc") int crc; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("padding") byte padding; NetFileRequest() { } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "616247304" - ) - static int method4140(int var0) { - return (int)((Math.log((double)var0) / Interpreter.field1110 - 7.0D) * 256.0D); - } - - @ObfuscatedName("ia") - @ObfuscatedSignature( - signature = "(IIIIIB)V", - garbageValue = "-20" - ) - @Export("drawScrollBar") - static final void drawScrollBar(int x, int y, int scrollY, int height, int scrollHeight) { - GrandExchangeOfferAgeComparator.scrollBarSprites[0].drawAt(x, y); - GrandExchangeOfferAgeComparator.scrollBarSprites[1].drawAt(x, height + y - 16); - Rasterizer2D.Rasterizer2D_fillRectangle(x, y + 16, 16, height - 32, Client.field715); - int var5 = height * (height - 32) / scrollHeight; - if (var5 < 8) { - var5 = 8; - } - - int var6 = (height - 32 - var5) * scrollY / (scrollHeight - height); - Rasterizer2D.Rasterizer2D_fillRectangle(x, var6 + y + 16, 16, var5, Client.field716); - Rasterizer2D.Rasterizer2D_drawVerticalLine(x, var6 + y + 16, var5, Client.field772); - Rasterizer2D.Rasterizer2D_drawVerticalLine(x + 1, var6 + y + 16, var5, Client.field772); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(x, var6 + y + 16, 16, Client.field772); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(x, var6 + y + 17, 16, Client.field772); - Rasterizer2D.Rasterizer2D_drawVerticalLine(x + 15, var6 + y + 16, var5, Client.field720); - Rasterizer2D.Rasterizer2D_drawVerticalLine(x + 14, var6 + y + 17, var5 - 1, Client.field720); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(x, var6 + var5 + y + 15, 16, Client.field720); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(x + 1, var5 + var6 + y + 14, 15, Client.field720); - } } diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index ebbe690ba8..9972cba618 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -12,63 +12,63 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("fp") @Implements("NetSocket") public final class NetSocket extends AbstractSocket implements Runnable { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("outputStream") OutputStream outputStream; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("socket") Socket socket; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("isClosed") boolean isClosed; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lfs;" + signature = "Lfu;" ) @Export("taskHandler") TaskHandler taskHandler; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lfa;" + signature = "Lft;" ) @Export("task") Task task; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("outBuffer") byte[] outBuffer; - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 2008977937 + intValue = -2034750073 ) @Export("outLength") int outLength; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1864141069 + intValue = 944271121 ) @Export("outOffset") int outOffset; - @ObfuscatedName("f") + @ObfuscatedName("d") @Export("exceptionWriting") boolean exceptionWriting; - @ObfuscatedName("m") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 772976519 + intValue = -1855971629 ) @Export("bufferLength") final int bufferLength; - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1242990043 + intValue = 234092539 ) @Export("maxPacketLength") final int maxPacketLength; @ObfuscatedSignature( - signature = "(Ljava/net/Socket;Lfs;I)V" + signature = "(Ljava/net/Socket;Lfu;I)V" ) public NetSocket(Socket var1, TaskHandler var2, int var3) throws IOException { this.isClosed = false; @@ -87,10 +87,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { this.outputStream = this.socket.getOutputStream(); } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1144636612" + garbageValue = "-1798752769" ) @Export("close") public void close() { @@ -102,7 +102,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { if (this.task != null) { while (this.task.status == 0) { - EnumDefinition.sleepMillis(1L); + UserList.sleepMillis(1L); } if (this.task.status == 1) { @@ -117,67 +117,69 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "2" + signature = "(I)I", + garbageValue = "547465689" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { return this.isClosed ? 0 : this.inputStream.read(); } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "55" + garbageValue = "83" ) @Export("available") public int available() throws IOException { return this.isClosed ? 0 : this.inputStream.available(); } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "1948150862" + garbageValue = "156087109" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { if (this.isClosed) { return false; + } else { + return this.inputStream.available() >= var1; } - return this.inputStream.available() >= var1; } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "([BIIB)I", - garbageValue = "26" + garbageValue = "100" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { if (this.isClosed) { return 0; - } - int var4; - int var5; - for (var4 = var3; var3 > 0; var3 -= var5) { - var5 = this.inputStream.read(var1, var2, var3); - if (var5 <= 0) { - throw new EOFException(); + } else { + int var4; + int var5; + for (var4 = var3; var3 > 0; var3 -= var5) { + var5 = this.inputStream.read(var1, var2, var3); + if (var5 <= 0) { + throw new EOFException(); + } + + var2 += var5; } - var2 += var5; + return var4; } - - return var4; } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "-338727961" + garbageValue = "-1945962644" ) @Export("write0") void write0(byte[] var1, int var2, int var3) throws IOException { @@ -185,33 +187,34 @@ public final class NetSocket extends AbstractSocket implements Runnable { if (this.exceptionWriting) { this.exceptionWriting = false; throw new IOException(); - } - if (this.outBuffer == null) { - this.outBuffer = new byte[this.bufferLength]; - } + } else { + if (this.outBuffer == null) { + this.outBuffer = new byte[this.bufferLength]; + } - synchronized(this) { - for (int var5 = 0; var5 < var3; ++var5) { - this.outBuffer[this.outOffset] = var1[var5 + var2]; - this.outOffset = (this.outOffset + 1) % this.bufferLength; - if ((this.outLength + this.maxPacketLength) % this.bufferLength == this.outOffset) { - throw new IOException(); + synchronized(this) { + for (int var5 = 0; var5 < var3; ++var5) { + this.outBuffer[this.outOffset] = var1[var5 + var2]; + this.outOffset = (this.outOffset + 1) % this.bufferLength; + if ((this.outLength + this.maxPacketLength) % this.bufferLength == this.outOffset) { + throw new IOException(); + } } - } - if (this.task == null) { - this.task = this.taskHandler.newThreadTask(this, 3); - } + if (this.task == null) { + this.task = this.taskHandler.newThreadTask(this, 3); + } - this.notifyAll(); + this.notifyAll(); + } } } } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "-1696227994" + garbageValue = "638463675" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { @@ -222,152 +225,148 @@ public final class NetSocket extends AbstractSocket implements Runnable { this.close(); } + protected void abt() { + this.close(); + } + public void run() { try { while (true) { - int var1; - int var2; - synchronized(this) { - if (this.outOffset == this.outLength) { - if (this.isClosed) { - break; + label84: { + int var1; + int var2; + synchronized(this) { + if (this.outOffset == this.outLength) { + if (this.isClosed) { + break label84; + } + + try { + this.wait(); + } catch (InterruptedException var10) { + } } - try { - this.wait(); - } catch (InterruptedException var10) { + + var2 = this.outLength; + if (this.outOffset >= this.outLength) { + var1 = this.outOffset - this.outLength; + } else { + var1 = this.bufferLength - this.outLength; } } - var2 = this.outLength; - if (this.outOffset >= this.outLength) { - var1 = this.outOffset - this.outLength; - } else { - var1 = this.bufferLength - this.outLength; + if (var1 <= 0) { + continue; } - } - if (var1 <= 0) { + try { + this.outputStream.write(this.outBuffer, var2, var1); + } catch (IOException var9) { + this.exceptionWriting = true; + } + + this.outLength = (var1 + this.outLength) % this.bufferLength; + + try { + if (this.outLength == this.outOffset) { + this.outputStream.flush(); + } + } catch (IOException var8) { + this.exceptionWriting = true; + } continue; } try { - this.outputStream.write(this.outBuffer, var2, var1); - } catch (IOException var9) { - this.exceptionWriting = true; - } - - this.outLength = (var1 + this.outLength) % this.bufferLength; - - try { - if (this.outOffset == this.outLength) { - this.outputStream.flush(); + if (this.inputStream != null) { + this.inputStream.close(); } - } catch (IOException var8) { - this.exceptionWriting = true; + + if (this.outputStream != null) { + this.outputStream.close(); + } + + if (this.socket != null) { + this.socket.close(); + } + } catch (IOException var7) { } + + this.outBuffer = null; + break; } } catch (Exception var12) { - HitSplatDefinition.RunException_sendStackTrace((String)null, var12); - } - try { - if (this.inputStream != null) { - this.inputStream.close(); - } - - if (this.outputStream != null) { - this.outputStream.close(); - } - - if (this.socket != null) { - this.socket.close(); - } - } catch (IOException var7) { + class3.RunException_sendStackTrace((String)null, var12); } - this.outBuffer = null; } - @ObfuscatedName("w") + protected void abi() { + this.close(); + } + + @ObfuscatedName("ii") @ObfuscatedSignature( - signature = "(II)Lkl;", - garbageValue = "939071894" + signature = "(Lhp;IIZB)V", + garbageValue = "-62" ) - @Export("ChatMode_find") - public static PrivateChatMode ChatMode_find(int var0) { - PrivateChatMode[] var1 = UserComparator9.ChatMode_values(); + @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.field2538 * var0.height / var0.field2612; + } + + if (var0.heightAlignment == 4) { + var0.height = var0.width * var0.field2612 / var0.field2538; + } + + 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("ln") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "549032388" + ) + static String method3489(String var0) { + PlayerType[] var1 = class191.PlayerType_values(); for (int var2 = 0; var2 < var1.length; ++var2) { - PrivateChatMode var3 = var1[var2]; - if (var0 == var3.field3815) { - return var3; + PlayerType var3 = var1[var2]; + if (var3.modIcon * 714577229 != -1 && var0.startsWith(AbstractWorldMapData.method278(var3.modIcon * 714577229))) { + var0 = var0.substring(6 + Integer.toString(var3.modIcon * 714577229).length()); + break; } } - return null; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "691418621" - ) - public static void method3554(int var0, int var1) { - VarbitDefinition var3 = (VarbitDefinition)VarbitDefinition.VarbitDefinition_cached.get((long)var0); - VarbitDefinition var2; - if (var3 != null) { - var2 = var3; - } else { - byte[] var8 = VarbitDefinition.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("w") - @ObfuscatedSignature( - signature = "(II)Lig;", - garbageValue = "-1252480817" - ) - @Export("getInvDefinition") - public static InvDefinition getInvDefinition(int var0) { - InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } - 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; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "2054009362" - ) - public static void method3553() { - Interpreter.midiPcmStream.clear(); - class197.field2402 = 1; - GrandExchangeOfferNameComparator.musicTrackArchive = null; + return var0; } } diff --git a/runescape-client/src/main/java/Node.java b/runescape-client/src/main/java/Node.java index 23ec0c6466..fbbd43e908 100644 --- a/runescape-client/src/main/java/Node.java +++ b/runescape-client/src/main/java/Node.java @@ -3,38 +3,37 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fw") +@ObfuscatedName("fb") @Implements("Node") public class Node { - @ObfuscatedName("cg") + @ObfuscatedName("cy") @Export("key") public long key; - @ObfuscatedName("cv") + @ObfuscatedName("cz") @ObfuscatedSignature( - signature = "Lfw;" + signature = "Lfb;" ) @Export("previous") public Node previous; - @ObfuscatedName("ce") + @ObfuscatedName("cv") @ObfuscatedSignature( - signature = "Lfw;" + signature = "Lfb;" ) @Export("next") public Node next; - @ObfuscatedName("fz") + @ObfuscatedName("fm") @Export("remove") public void remove() { - if (this.next == null) { - return; + if (this.next != null) { + this.next.previous = this.previous; + this.previous.next = this.next; + this.previous = null; + this.next = null; } - this.next.previous = this.previous; - this.previous.next = this.next; - this.previous = null; - this.next = null; } - @ObfuscatedName("fn") + @ObfuscatedName("fx") @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 6a11f1c7ba..f43a08df74 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("jh") +@ObfuscatedName("jc") @Implements("NodeDeque") public class NodeDeque { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lfw;" + signature = "Lfb;" ) @Export("sentinel") public Node sentinel; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lfw;" + signature = "Lfb;" ) @Export("current") Node current; @@ -25,7 +25,7 @@ public class NodeDeque { this.sentinel.next = this.sentinel; } - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("clear") public void clear() { while (true) { @@ -39,9 +39,9 @@ public class NodeDeque { } } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lfw;)V" + signature = "(Lfb;)V" ) @Export("addFirst") public void addFirst(Node var1) { @@ -55,9 +55,9 @@ public class NodeDeque { var1.previous.next = var1; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lfw;)V" + signature = "(Lfb;)V" ) @Export("addLast") public void addLast(Node var1) { @@ -71,37 +71,39 @@ public class NodeDeque { var1.previous.next = var1; } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "()Lfw;" + signature = "()Lfb;" ) @Export("removeLast") public Node removeLast() { Node var1 = this.sentinel.previous; if (var1 == this.sentinel) { return null; + } else { + var1.remove(); + return var1; } - var1.remove(); - return var1; } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "()Lfw;" + signature = "()Lfb;" ) @Export("removeFirst") public Node removeFirst() { Node var1 = this.sentinel.next; if (var1 == this.sentinel) { return null; + } else { + var1.remove(); + return var1; } - var1.remove(); - return var1; } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "()Lfw;" + signature = "()Lfb;" ) @Export("last") public Node last() { @@ -109,14 +111,15 @@ public class NodeDeque { if (var1 == this.sentinel) { this.current = null; return null; + } else { + this.current = var1.previous; + return var1; } - this.current = var1.previous; - return var1; } - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "()Lfw;" + signature = "()Lfb;" ) @Export("first") public Node first() { @@ -124,14 +127,15 @@ public class NodeDeque { if (var1 == this.sentinel) { this.current = null; return null; + } else { + this.current = var1.next; + return var1; } - this.current = var1.next; - return var1; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "()Lfw;" + signature = "()Lfb;" ) @Export("previous") public Node previous() { @@ -139,14 +143,15 @@ public class NodeDeque { if (var1 == this.sentinel) { this.current = null; return null; + } else { + this.current = var1.previous; + return var1; } - this.current = var1.previous; - return var1; } - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "()Lfw;" + signature = "()Lfb;" ) @Export("next") public Node next() { @@ -154,14 +159,15 @@ public class NodeDeque { if (var1 == this.sentinel) { this.current = null; return null; + } else { + this.current = var1.next; + return var1; } - this.current = var1.next; - return var1; } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lfw;Lfw;)V" + signature = "(Lfb;Lfb;)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 842092e808..ae24a60fcd 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("lc") +@ObfuscatedName("lm") @Implements("NodeHashTable") public final class NodeHashTable { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("size") int size; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "[Lfw;" + signature = "[Lfb;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lfw;" + signature = "Lfb;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lfw;" + signature = "Lfb;" ) @Export("current") Node current; - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("index") int index; @@ -44,9 +44,9 @@ public final class NodeHashTable { } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(J)Lfw;" + signature = "(J)Lfb;" ) @Export("get") public Node get(long var1) { @@ -64,9 +64,9 @@ public final class NodeHashTable { return null; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lfw;J)V" + signature = "(Lfb;J)V" ) @Export("put") public void put(Node var1, long var2) { @@ -82,9 +82,9 @@ public final class NodeHashTable { var1.key = var2; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "()Lfw;" + signature = "()Lfb;" ) @Export("first") public Node first() { @@ -92,27 +92,28 @@ public final class NodeHashTable { return this.next(); } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "()Lfw;" + signature = "()Lfb;" ) @Export("next") public Node next() { Node var1; if (this.index > 0 && this.buckets[this.index - 1] != this.current) { var1 = this.current; + this.current = var1.previous; + return var1; + } else { + do { + if (this.index >= this.size) { + return null; + } + + var1 = this.buckets[this.index++].previous; + } while(var1 == this.buckets[this.index - 1]); + this.current = var1.previous; return var1; } - do { - if (this.index >= this.size) { - return null; - } - - var1 = this.buckets[this.index++].previous; - } while(var1 == this.buckets[this.index - 1]); - - this.current = var1.previous; - return var1; } } diff --git a/runescape-client/src/main/java/ObjectDefinition.java b/runescape-client/src/main/java/ObjectDefinition.java index d6721ad0dd..ed85077340 100644 --- a/runescape-client/src/main/java/ObjectDefinition.java +++ b/runescape-client/src/main/java/ObjectDefinition.java @@ -4,257 +4,257 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iy") +@ObfuscatedName("ik") @Implements("ObjectDefinition") public class ObjectDefinition extends DualNode { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("ObjectDefinition_isLowDetail") public static boolean ObjectDefinition_isLowDetail; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("ObjectDefinition_archive") public static AbstractArchive ObjectDefinition_archive; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("ObjectDefinition_modelsArchive") public static AbstractArchive ObjectDefinition_modelsArchive; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lep;" ) @Export("ObjectDefinition_cached") static EvictingDualNodeHashTable ObjectDefinition_cached; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lep;" ) @Export("ObjectDefinition_cachedModelData") public static EvictingDualNodeHashTable ObjectDefinition_cachedModelData; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lep;" ) @Export("ObjectDefinition_cachedEntities") static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lep;" ) @Export("ObjectDefinition_cachedModels") static EvictingDualNodeHashTable ObjectDefinition_cachedModels; - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "[Lds;" + signature = "[Ldq;" ) - static ModelData[] field3398; - @ObfuscatedName("c") + static ModelData[] field3364; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -2068374329 + intValue = -1417245107 ) @Export("id") public int id; - @ObfuscatedName("f") + @ObfuscatedName("d") @Export("modelIds") int[] modelIds; - @ObfuscatedName("m") + @ObfuscatedName("f") @Export("models") int[] models; - @ObfuscatedName("u") + @ObfuscatedName("c") @Export("name") public String name; - @ObfuscatedName("x") + @ObfuscatedName("r") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("v") + @ObfuscatedName("p") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("retextureTo") short[] retextureTo; @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 212808303 + intValue = 950062565 ) @Export("sizeX") public int sizeX; - @ObfuscatedName("a") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 421587309 + intValue = 1522492745 ) @Export("sizeY") public int sizeY; - @ObfuscatedName("j") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 2015026185 + intValue = 1421419631 ) @Export("interactType") public int interactType; - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("boolean1") public boolean boolean1; - @ObfuscatedName("h") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -515360821 + intValue = -302869057 ) @Export("int1") public int int1; - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -708119296 + intValue = 56177517 ) @Export("clipType") int clipType; - @ObfuscatedName("n") + @ObfuscatedName("h") @Export("nonFlatShading") boolean nonFlatShading; - @ObfuscatedName("d") + @ObfuscatedName("v") @Export("modelClipped") public boolean modelClipped; - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -812430179 + intValue = -796877595 ) @Export("animationId") public int animationId; - @ObfuscatedName("z") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -424786087 + intValue = -1920170119 ) @Export("int2") public int int2; - @ObfuscatedName("al") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -521483261 + intValue = 1091050737 ) @Export("ambient") int ambient; - @ObfuscatedName("av") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -785836155 + intValue = 147368649 ) @Export("contrast") int contrast; - @ObfuscatedName("as") + @ObfuscatedName("ai") @Export("actions") public String[] actions; - @ObfuscatedName("aw") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 1327834339 + intValue = 2069147423 ) @Export("mapIconId") public int mapIconId; - @ObfuscatedName("ad") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -118615167 + intValue = -1917085051 ) @Export("mapSceneId") public int mapSceneId; - @ObfuscatedName("ag") + @ObfuscatedName("aj") @Export("isRotated") boolean isRotated; - @ObfuscatedName("ar") + @ObfuscatedName("an") @Export("clipped") public boolean clipped; - @ObfuscatedName("ax") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -106428285 + intValue = 260729967 ) @Export("modelSizeX") int modelSizeX; - @ObfuscatedName("az") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -535612109 + intValue = -1929825155 ) @Export("modelHeight") int modelHeight; - @ObfuscatedName("ae") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -1113005599 + intValue = 1921180203 ) @Export("modelSizeY") int modelSizeY; @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -1159375361 + intValue = -487926215 ) @Export("offsetX") int offsetX; - @ObfuscatedName("aj") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 744922465 + intValue = 2096022607 ) @Export("offsetHeight") int offsetHeight; - @ObfuscatedName("at") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -1695338293 + intValue = 531318875 ) @Export("offsetY") int offsetY; - @ObfuscatedName("ac") + @ObfuscatedName("au") @Export("boolean2") public boolean boolean2; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("isSolid") boolean isSolid; - @ObfuscatedName("aq") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -509602785 + intValue = 1688064541 ) @Export("int3") public int int3; @ObfuscatedName("aa") @Export("transforms") public int[] transforms; - @ObfuscatedName("an") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -1303757557 + intValue = -338512887 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("au") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 1417540859 + intValue = 1932503727 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("ai") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 2125356431 + intValue = -2074842335 ) @Export("ambientSoundId") public int ambientSoundId; - @ObfuscatedName("ak") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -1963280521 + intValue = -595012719 ) @Export("int4") public int int4; - @ObfuscatedName("ah") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 1234407491 + intValue = -1860442499 ) @Export("int5") public int int5; - @ObfuscatedName("am") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = 69509337 + intValue = -1597544155 ) @Export("int6") public int int6; - @ObfuscatedName("ay") + @ObfuscatedName("ab") @Export("soundEffectIds") public int[] soundEffectIds; - @ObfuscatedName("af") + @ObfuscatedName("aw") @ObfuscatedSignature( - signature = "Lla;" + signature = "Lln;" ) @Export("params") IterableNodeHashTable params; @@ -265,7 +265,7 @@ public class ObjectDefinition extends DualNode { ObjectDefinition_cachedModelData = new EvictingDualNodeHashTable(500); ObjectDefinition_cachedEntities = new EvictingDualNodeHashTable(30); ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30); - field3398 = new ModelData[4]; + field3364 = new ModelData[4]; } ObjectDefinition() { @@ -275,7 +275,7 @@ public class ObjectDefinition extends DualNode { this.interactType = 2; this.boolean1 = true; this.int1 = -1; - this.clipType = -256; + this.clipType = -1; this.nonFlatShading = false; this.modelClipped = false; this.animationId = -1; @@ -304,10 +304,10 @@ public class ObjectDefinition extends DualNode { this.int6 = 0; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-583792962" + garbageValue = "1177883713" ) @Export("postDecode") void postDecode() { @@ -330,10 +330,10 @@ public class ObjectDefinition extends DualNode { } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkf;B)V", - garbageValue = "82" + signature = "(Lky;I)V", + garbageValue = "1500766173" ) @Export("decode") void decode(Buffer var1) { @@ -347,10 +347,10 @@ public class ObjectDefinition extends DualNode { } } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lkf;II)V", - garbageValue = "2121034762" + signature = "(Lky;IB)V", + garbageValue = "0" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -358,36 +358,34 @@ public class ObjectDefinition extends DualNode { int var4; if (var2 == 1) { var3 = var1.readUnsignedByte(); - if (var3 <= 0) { - return; - } - if (this.modelIds == null || ObjectDefinition_isLowDetail) { - this.models = new int[var3]; - this.modelIds = new int[var3]; + if (var3 > 0) { + if (this.modelIds != null && !ObjectDefinition_isLowDetail) { + var1.offset += var3 * 3; + } else { + this.models = new int[var3]; + this.modelIds = new int[var3]; - for (var4 = 0; var4 < var3; ++var4) { - this.modelIds[var4] = var1.readUnsignedShort(); - this.models[var4] = var1.readUnsignedByte(); + for (var4 = 0; var4 < var3; ++var4) { + this.modelIds[var4] = var1.readUnsignedShort(); + this.models[var4] = var1.readUnsignedByte(); + } } - } else { - var1.offset += 3 * var3; } } else if (var2 == 2) { this.name = var1.readStringCp1252NullTerminated(); } else if (var2 == 5) { var3 = var1.readUnsignedByte(); - if (var3 <= 0) { - return; - } - if (this.modelIds == null || ObjectDefinition_isLowDetail) { - this.models = null; - this.modelIds = new int[var3]; + if (var3 > 0) { + if (this.modelIds != null && !ObjectDefinition_isLowDetail) { + var1.offset += var3 * 2; + } else { + this.models = null; + this.modelIds = new int[var3]; - for (var4 = 0; var4 < var3; ++var4) { - this.modelIds[var4] = var1.readUnsignedShort(); + for (var4 = 0; var4 < var3; ++var4) { + this.modelIds[var4] = var1.readUnsignedShort(); + } } - } else { - var1.offset += var3 * 2; } } else if (var2 == 14) { this.sizeX = var1.readUnsignedByte(); @@ -408,7 +406,7 @@ public class ObjectDefinition extends DualNode { this.modelClipped = true; } else if (var2 == 24) { this.animationId = var1.readUnsignedShort(); - if (this.animationId == 0xffff) { + if (this.animationId == 65535) { this.animationId = -1; } } else if (var2 == 27) { @@ -418,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")) { @@ -468,21 +466,42 @@ public class ObjectDefinition extends DualNode { this.isSolid = true; } else if (var2 == 75) { this.int3 = var1.readUnsignedByte(); - } else if (var2 == 77 || var2 == 92) { + } else if (var2 != 77 && var2 != 92) { + if (var2 == 78) { + this.ambientSoundId = var1.readUnsignedShort(); + this.int4 = var1.readUnsignedByte(); + } else if (var2 == 79) { + this.int5 = var1.readUnsignedShort(); + this.int6 = var1.readUnsignedShort(); + this.int4 = var1.readUnsignedByte(); + var3 = var1.readUnsignedByte(); + this.soundEffectIds = new int[var3]; + + for (var4 = 0; var4 < var3; ++var4) { + this.soundEffectIds[var4] = var1.readUnsignedShort(); + } + } else if (var2 == 81) { + this.clipType = var1.readUnsignedByte() * 256; + } else if (var2 == 82) { + this.mapIconId = var1.readUnsignedShort(); + } else if (var2 == 249) { + this.params = DynamicObject.readStringIntParameters(var1, this.params); + } + } else { this.transformVarbit = var1.readUnsignedShort(); - if (this.transformVarbit == 0xffff) { + if (this.transformVarbit == 65535) { this.transformVarbit = -1; } this.transformVarp = var1.readUnsignedShort(); - if (this.transformVarp == 0xffff) { + if (this.transformVarp == 65535) { this.transformVarp = -1; } var3 = -1; if (var2 == 92) { var3 = var1.readUnsignedShort(); - if (var3 == 0xffff) { + if (var3 == 65535) { var3 = -1; } } @@ -492,110 +511,91 @@ public class ObjectDefinition extends DualNode { for (int var5 = 0; var5 <= var4; ++var5) { this.transforms[var5] = var1.readUnsignedShort(); - if (this.transforms[var5] == 0xffff) { + if (this.transforms[var5] == 65535) { this.transforms[var5] = -1; } } this.transforms[var4 + 1] = var3; - } else if (var2 == 78) { - this.ambientSoundId = var1.readUnsignedShort(); - this.int4 = var1.readUnsignedByte(); - } else if (var2 == 79) { - this.int5 = var1.readUnsignedShort(); - this.int6 = var1.readUnsignedShort(); - this.int4 = var1.readUnsignedByte(); - var3 = var1.readUnsignedByte(); - this.soundEffectIds = new int[var3]; - - for (var4 = 0; var4 < var3; ++var4) - { - this.soundEffectIds[var4] = var1.readUnsignedShort(); - } - } else if (var2 == 81) { - this.clipType = var1.readUnsignedByte() * 65536; - } else if (var2 == 82) { - this.mapIconId = var1.readUnsignedShort(); - } else if (var2 == 249) { - this.params = WorldMapArea.readStringIntParameters(var1, this.params); } + } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "-672143890" + garbageValue = "-2065499599" ) - public final boolean method4589(int var1) { + public final boolean method4505(int var1) { if (this.models != null) { for (int var4 = 0; var4 < this.models.length; ++var4) { if (this.models[var4] == var1) { - return ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var4] & 0xffff, 0); + return ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var4] & 65535, 0); } } return true; - } - if (this.modelIds == null) { + } else if (this.modelIds == null) { return true; - } - if (var1 != 10) { + } else if (var1 != 10) { return true; - } - boolean var2 = true; + } else { + boolean var2 = true; - for (int var3 = 0; var3 < this.modelIds.length; ++var3) { - var2 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var3] & 0xffff, 0); - } + for (int var3 = 0; var3 < this.modelIds.length; ++var3) { + var2 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var3] & 65535, 0); + } - return var2; + return var2; + } } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-275510577" + garbageValue = "1513696522" ) @Export("needsModelFiles") public final boolean needsModelFiles() { if (this.modelIds == null) { return true; - } - boolean var1 = true; + } else { + boolean var1 = true; - for (int var2 = 0; var2 < this.modelIds.length; ++var2) { - var1 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var2] & 0xffff, 0); - } + for (int var2 = 0; var2 < this.modelIds.length; ++var2) { + var1 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var2] & 65535, 0); + } - return var1; + return var1; + } } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(II[[IIIIB)Leo;", - garbageValue = "-18" + signature = "(II[[IIIIB)Len;", + garbageValue = "-26" ) @Export("getEntity") - public final Entity getEntity(int type, int rotation, int[][] tileHeights, int xPacked, int avgHeight, int yPacked) { + public final Entity getEntity(int var1, int var2, int[][] var3, int var4, int var5, int var6) { long var7; if (this.models == null) { - var7 = (long)(rotation + (this.id << 10)); + var7 = (long)(var2 + (this.id << 10)); } else { - var7 = (long)(rotation + (type << 3) + (this.id << 10)); + var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); } Object var9 = (Entity)ObjectDefinition_cachedEntities.get(var7); if (var9 == null) { - ModelData var10 = this.getModelData(type, rotation); + ModelData var10 = this.getModelData(var1, var2); if (var10 == null) { return null; } 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; } @@ -604,56 +604,56 @@ public class ObjectDefinition extends DualNode { } if (this.nonFlatShading) { - var9 = ((ModelData)var9).method2775(); + var9 = ((ModelData)var9).method2708(); } - if (this.clipType * 256 >= 0) { + if (this.clipType * 65536 >= 0) { if (var9 instanceof Model) { - var9 = ((Model)var9).contourGround(tileHeights, xPacked, avgHeight, yPacked, true, this.clipType * 256); + var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType * 65536); } else if (var9 instanceof ModelData) { - var9 = ((ModelData)var9).method2776(tileHeights, xPacked, avgHeight, yPacked, true, this.clipType * 256); + var9 = ((ModelData)var9).method2709(var3, var4, var5, var6, true, this.clipType * 65536); } } return (Entity)var9; } - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(II[[IIIII)Ldm;", - garbageValue = "-1160623337" + signature = "(II[[IIIII)Ldo;", + garbageValue = "-1392170814" ) @Export("getModel") - public final Model getModel(int type, int rotation, int[][] tileHeights, int xPacked, int avgHeight, int yPacked) { + public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5, int var6) { long var7; if (this.models == null) { - var7 = (long)(rotation + (this.id << 10)); + var7 = (long)(var2 + (this.id << 10)); } else { - var7 = (long)(rotation + (type << 3) + (this.id << 10)); + var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); } Model var9 = (Model)ObjectDefinition_cachedModels.get(var7); if (var9 == null) { - ModelData var10 = this.getModelData(type, rotation); + ModelData var10 = this.getModelData(var1, var2); if (var10 == null) { 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 * 256 >= 0) { - var9 = var9.contourGround(tileHeights, xPacked, avgHeight, yPacked, true, this.clipType * 256); + if (this.clipType * 65536 >= 0) { + var9 = var9.contourGround(var3, var4, var5, var6, true, this.clipType * 65536); } return var9; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(II[[IIIILis;IB)Ldm;", - garbageValue = "5" + signature = "(II[[IIIILij;II)Ldo;", + garbageValue = "687830026" ) @Export("getModelDynamic") public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, int var5, int var6, SequenceDefinition var7, int var8) { @@ -671,39 +671,40 @@ 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 * 256 == -1) { + if (var7 == null && this.clipType * 65536 == -1) { + return var11; + } else { + if (var7 != null) { + var11 = var7.transformObjectModel(var11, var8, var2); + } else { + var11 = var11.toSharedSequenceModel(true); + } + + if (this.clipType * 65536 >= 0) { + var11 = var11.contourGround(var3, var4, var5, var6, false, this.clipType * 65536); + } + return var11; } - if (var7 != null) { - var11 = var7.transformObjectModel(var11, var8, var2); - } else { - var11 = var11.toSharedSequenceModel(true); - } - - if (this.clipType * 256 >= 0) { - var11 = var11.contourGround(var3, var4, var5, var6, false, this.clipType * 256); - } - - return var11; } - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(III)Lds;", - garbageValue = "828225621" + signature = "(III)Ldq;", + garbageValue = "976816708" ) @Export("getModelData") - final ModelData getModelData(int type, int rotation) { + final ModelData getModelData(int var1, int var2) { ModelData var3 = null; boolean var4; int var5; int var7; if (this.models == null) { - if (type != 10) { + if (var1 != 10) { return null; } @@ -712,7 +713,7 @@ public class ObjectDefinition extends DualNode { } var4 = this.isRotated; - if (type == 2 && rotation > 3) { + if (var1 == 2 && var2 > 3) { var4 = !var4; } @@ -726,31 +727,31 @@ public class ObjectDefinition extends DualNode { var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var7); if (var3 == null) { - var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var7 & 0xffff, 0); + var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var7 & 65535, 0); if (var3 == null) { return null; } if (var4) { - var3.method2785(); + var3.method2718(); } ObjectDefinition_cachedModelData.put(var3, (long)var7); } if (var5 > 1) { - field3398[var6] = var3; + field3364[var6] = var3; } } if (var5 > 1) { - var3 = new ModelData(field3398, var5); + var3 = new ModelData(field3364, var5); } } else { int var9 = -1; for (var5 = 0; var5 < this.models.length; ++var5) { - if (this.models[var5] == type) { + if (this.models[var5] == var1) { var9 = var5; break; } @@ -761,20 +762,20 @@ public class ObjectDefinition extends DualNode { } var5 = this.modelIds[var9]; - boolean var10 = this.isRotated ^ rotation > 3; + boolean var10 = this.isRotated ^ var2 > 3; if (var10) { var5 += 65536; } var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var5); if (var3 == null) { - var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var5 & 0xffff, 0); + var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var5 & 65535, 0); if (var3 == null) { return null; } if (var10) { - var3.method2785(); + var3.method2718(); } ObjectDefinition_cachedModelData.put(var3, (long)var5); @@ -794,19 +795,19 @@ public class ObjectDefinition extends DualNode { var11 = true; } - ModelData var8 = new ModelData(var3, rotation == 0 && !var4 && !var11, null == this.recolorFrom, this.retextureFrom == null, true); - if (type == 4 && rotation > 3) { - var8.method2781(256); + ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, this.recolorFrom == null, null == this.retextureFrom, true); + if (var1 == 4 && var2 > 3) { + var8.method2714(256); var8.changeOffset(45, 0, -45); } - rotation &= 3; - if (rotation == 1) { - var8.method2778(); - } else if (rotation == 2) { - var8.method2797(); - } else if (rotation == 3) { - var8.method2780(); + var2 &= 3; + if (var2 == 1) { + var8.method2769(); + } else if (var2 == 2) { + var8.method2712(); + } else if (var2 == 3) { + var8.method2713(); } if (this.recolorFrom != null) { @@ -832,16 +833,16 @@ public class ObjectDefinition extends DualNode { return var8; } - @ObfuscatedName("x") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(B)Liy;", - garbageValue = "45" + signature = "(I)Lik;", + garbageValue = "-1654967679" ) @Export("transform") public final ObjectDefinition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = GrandExchangeOfferOwnWorldComparator.getVarbit(this.transformVarbit); + var1 = class208.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -853,13 +854,13 @@ public class ObjectDefinition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? ViewportMouse.getObjectDefinition(var2) : null; + return var2 != -1 ? class215.getObjectDefinition(var2) : null; } - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "-291840142" + garbageValue = "-802928447" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { @@ -879,35 +880,49 @@ public class ObjectDefinition extends DualNode { return var3; } - @ObfuscatedName("v") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(ILjava/lang/String;B)Ljava/lang/String;", - garbageValue = "37" + signature = "(ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "-1652503760" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return GrandExchangeOfferWorldComparator.method54(this.params, var1, var2); + return class227.method4041(this.params, var1, var2); } - @ObfuscatedName("g") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-2033078684" + garbageValue = "-2084886497" ) @Export("hasSound") public boolean hasSound() { if (this.transforms == null) { return this.ambientSoundId != -1 || this.soundEffectIds != null; - } - for (int var1 = 0; var1 < this.transforms.length; ++var1) { - if (this.transforms[var1] != -1) { - ObjectDefinition var2 = ViewportMouse.getObjectDefinition(this.transforms[var1]); - if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { - return true; + } else { + for (int var1 = 0; var1 < this.transforms.length; ++var1) { + if (this.transforms[var1] != -1) { + ObjectDefinition var2 = class215.getObjectDefinition(this.transforms[var1]); + if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { + return true; + } } } - } - return false; + return false; + } + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(IIII)I", + garbageValue = "-669374888" + ) + static int method4545(int var0, int var1, int var2) { + if ((Tiles.Tiles_renderFlags[var0][var1][var2] & 8) != 0) { + return 0; + } else { + return var0 > 0 && (Tiles.Tiles_renderFlags[1][var1][var2] & 2) != 0 ? var0 - 1 : var0; + } } } diff --git a/runescape-client/src/main/java/ObjectNode.java b/runescape-client/src/main/java/ObjectNode.java index 9ac74b93a9..b20c226aff 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("fx") +@ObfuscatedName("fa") @Implements("ObjectNode") public class ObjectNode extends Node { - @ObfuscatedName("q") + @ObfuscatedName("s") @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 2c0d579751..7719865d77 100644 --- a/runescape-client/src/main/java/ObjectSound.java +++ b/runescape-client/src/main/java/ObjectSound.java @@ -1,96 +1,94 @@ +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("bv") +@ObfuscatedName("bg") @Implements("ObjectSound") public final class ObjectSound extends Node { - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Ljh;" + signature = "Ljc;" ) @Export("objectSounds") static NodeDeque objectSounds; - @ObfuscatedName("kt") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1438835767 + intValue = 100138419 ) - @Export("menuHeight") - static int menuHeight; - @ObfuscatedName("w") + int field1057; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 621824935 + intValue = -520446837 ) @Export("plane") int plane; - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1620734975 + intValue = -902080545 ) @Export("x") int x; - @ObfuscatedName("p") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1755977344 + intValue = -1320380601 ) @Export("y") int y; - @ObfuscatedName("k") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 75852160 + intValue = 1376822595 ) - int field1077; - @ObfuscatedName("l") + int field1052; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1222659712 + intValue = 925684059 ) - int field1082; - @ObfuscatedName("b") + int field1053; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 526073997 + intValue = -980426623 ) - int field1091; - @ObfuscatedName("i") + int field1054; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -675228961 + intValue = -752039095 ) @Export("soundEffectId") int soundEffectId; - @ObfuscatedName("c") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Ldh;" + signature = "Ldx;" ) @Export("stream1") RawPcmStream stream1; @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1323025429 + intValue = 708593769 ) - int field1086; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -1728328017 - ) - int field1081; - @ObfuscatedName("u") + int field1058; + @ObfuscatedName("c") @Export("soundEffectIds") int[] soundEffectIds; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 398204327 - ) - int field1089; @ObfuscatedName("r") @ObfuscatedSignature( - signature = "Liy;" + signature = "Lik;" ) @Export("obj") ObjectDefinition obj; - @ObfuscatedName("v") + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = -1871367873 + ) + int field1056; + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Ldh;" + signature = "Ldx;" ) @Export("stream2") RawPcmStream stream2; @@ -102,10 +100,10 @@ public final class ObjectSound extends Node { ObjectSound() { } - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-2146253621" + signature = "(B)V", + garbageValue = "-68" ) @Export("set") void set() { @@ -113,95 +111,839 @@ public final class ObjectSound extends Node { ObjectDefinition var2 = this.obj.transform(); if (var2 != null) { this.soundEffectId = var2.ambientSoundId; - this.field1091 = var2.int4 * 128; - this.field1086 = var2.int5; - this.field1081 = var2.int6; + this.field1054 = var2.int4 * 128; + this.field1057 = var2.int5; + this.field1058 = var2.int6; this.soundEffectIds = var2.soundEffectIds; } else { this.soundEffectId = -1; - this.field1091 = 0; - this.field1086 = 0; - this.field1081 = 0; + this.field1054 = 0; + this.field1057 = 0; + this.field1058 = 0; this.soundEffectIds = null; } if (var1 != this.soundEffectId && this.stream1 != null) { - SecureRandomCallable.pcmStreamMixer.removeSubStream(this.stream1); + IgnoreList.pcmStreamMixer.removeSubStream(this.stream1); this.stream1 = null; } } - @ObfuscatedName("w") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(IIIS)Lcx;", - garbageValue = "17061" + signature = "(B)J", + garbageValue = "14" ) - @Export("getWorldMapScript") - static Script getWorldMapScript(int var0, int var1, int var2) { - int var3 = (var1 << 8) + var0; - Script var5 = class49.getWorldMapScript(var3, var0); - if (var5 != null) { - return var5; + static long method1836() { + try { + URL var0 = new URL(RouteStrategy.method3534("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; } - int var4 = GraphicsDefaults.getWorldMapScriptIdCategory(var2, var0); - var5 = class49.getWorldMapScript(var4, var0); - return var5 != null ? var5 : null; } - @ObfuscatedName("ai") + @ObfuscatedName("gf") @ObfuscatedSignature( - signature = "(ILhv;ZB)V", - garbageValue = "22" + signature = "(Lbu;IIIIIB)V", + garbageValue = "7" ) - static void method1824(int var0, Coord var1, boolean var2) { - WorldMapArea var3 = WorldMapID.getWorldMap().getMapArea(var0); - int var4 = Client.localPlayer.plane; - int var5 = MusicPatchNode2.baseX * 64 + (Client.localPlayer.x >> 7); - int var6 = class1.baseY * 64 + (Client.localPlayer.y >> 7); - Coord var7 = new Coord(var4, var5, var6); - WorldMapID.getWorldMap().method6315(var3, var7, var1, var2); - } + @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(); + } - @ObfuscatedName("gu") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1435918510" - ) - static final void method1826() { - Client.field767 = 0; - int var0 = MusicPatchNode2.baseX * 64 + (Client.localPlayer.x >> 7); - int var1 = class1.baseY * 64 + (Client.localPlayer.y >> 7); - if (var0 >= 3053 && var0 <= 3156 && var1 >= 3056 && var1 <= 3136) { - Client.field767 = 1; - } - - if (var0 >= 3072 && var0 <= 3118 && var1 >= 9492 && var1 <= 9535) { - Client.field767 = 1; - } - - if (Client.field767 == 1 && var0 >= 3139 && var0 <= 3199 && var1 >= 3008 && var1 <= 3062) { - Client.field767 = 0; - } - - } - - @ObfuscatedName("kf") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-472154636" - ) - static void method1827() { - if (PendingSpawn.field944 != null) { - Client.field924 = Client.cycle; - PendingSpawn.field944.method4320(); - - for (int var0 = 0; var0 < Client.players.length; ++var0) { - if (Client.players[var0] != null) { - PendingSpawn.field944.method4316(MusicPatchNode2.baseX * 64 + (Client.players[var0].x >> 7), class1.baseY * 64 + (Client.players[var0].y >> 7)); + if (var6 == null) { + return; } } - } + int var75 = Players.Players_count; + int[] var7 = Players.Players_indices; + byte var8 = 0; + Player var10; + if (var1 < var75 && var0.playerCycle == Client.cycle) { + var10 = (Player)var0; + boolean var9; + if (Client.drawPlayerNames == 0) { + var9 = false; + } else { + boolean var76; + if (var10 == WorldMapIcon_1.localPlayer) { + var76 = (Client.drawPlayerNames & 8) != 0; + var9 = var76; + } else { + var76 = HitSplatDefinition.method4497() || GrandExchangeEvents.method81() && var10.isFriend(); + if (!var76) { + boolean var77 = (Client.drawPlayerNames & 2) != 0; + var76 = var77 && var10.isClanMember(); + } + + var9 = var76; + } + } + + if (var9) { + Player var11 = (Player)var0; + if (var1 < var75) { + Entity.getActorScreenLocation(var0, var0.defaultHeight + 15); + AbstractFont var12 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); + byte var13 = 9; + var12.drawCentered(var11.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var13, 16777215, 0); + var8 = 18; + } + } + } + + int var87 = -2; + int var15; + int var22; + int var23; + if (!var0.healthBars.method4729()) { + Entity.getActorScreenLocation(var0, var0.defaultHeight + 15); + + for (HealthBar var88 = (HealthBar)var0.healthBars.last(); var88 != null; var88 = (HealthBar)var0.healthBars.previous()) { + HealthBarUpdate var89 = var88.get(Client.cycle); + if (var89 == null) { + if (var88.isEmpty()) { + var88.remove(); + } + } else { + HealthBarDefinition var91 = var88.definition; + Sprite var78 = var91.getBackSprite(); + Sprite var14 = var91.getFrontSprite(); + int var16 = 0; + if (var78 != null && var14 != null) { + if (var91.widthPadding * 2 < var14.subWidth) { + var16 = var91.widthPadding; + } + + var15 = var14.subWidth - var16 * 2; + } else { + var15 = var91.width; + } + + int var17 = 255; + boolean var18 = true; + int var19 = Client.cycle - var89.cycle; + int var20 = var15 * var89.health2 / var91.width; + int var21; + int var92; + if (var89.cycleOffset > var19) { + var21 = var91.int4 == 0 ? 0 : var91.int4 * (var19 / var91.int4); + var22 = var15 * var89.health / var91.width; + var92 = var21 * (var20 - var22) / var89.cycleOffset + var22; + } else { + var92 = var20; + var21 = var89.cycleOffset + var91.int5 - var19; + if (var91.int3 >= 0) { + var17 = (var21 << 8) / (var91.int5 - var91.int3); + } + } + + if (var89.health2 > 0 && var92 < 1) { + var92 = 1; + } + + if (var78 != null && var14 != null) { + if (var92 == var15) { + var92 += var16 * 2; + } else { + var92 += var16; + } + + var21 = var78.subHeight; + var87 += var21; + var22 = var2 + Client.viewportTempX - (var15 >> 1); + var23 = var3 + Client.viewportTempY - var87; + var22 -= var16; + if (var17 >= 0 && var17 < 255) { + var78.drawTransAt(var22, var23, var17); + Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var92 + var22, var21 + var23); + var14.drawTransAt(var22, var23, var17); + } else { + var78.drawTransBgAt(var22, var23); + Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var92 + var22, var23 + var21); + var14.drawTransBgAt(var22, var23); + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); + var87 += 2; + } else { + var87 += 5; + if (Client.viewportTempX > -1) { + var21 = var2 + Client.viewportTempX - (var15 >> 1); + var22 = var3 + Client.viewportTempY - var87; + Rasterizer2D.Rasterizer2D_fillRectangle(var21, var22, var92, 5, 65280); + Rasterizer2D.Rasterizer2D_fillRectangle(var92 + var21, var22, var15 - var92, 5, 16711680); + } + + var87 += 2; + } + } + } + } + + if (var87 == -2) { + var87 += 7; + } + + var87 += var8; + if (var1 < var75) { + var10 = (Player)var0; + if (var10.isHidden) { + return; + } + + if (var10.headIconPk != -1 || var10.headIconPrayer != -1) { + Entity.getActorScreenLocation(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + if (var10.headIconPk != -1) { + var87 += 25; + UserComparator6.headIconPkSprites[var10.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); + } + + if (var10.headIconPrayer != -1) { + var87 += 25; + IntHashTable.headIconPrayerSprites[var10.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); + } + } + } + + if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { + Entity.getActorScreenLocation(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + var87 += WorldMapData_1.headIconHintSprites[1].subHeight; + WorldMapData_1.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); + } + } + } else { + NPCDefinition var90 = ((NPC)var0).definition; + if (var90.transforms != null) { + var90 = var90.transform(); + } + + if (var90.headIconPrayer >= 0 && var90.headIconPrayer < IntHashTable.headIconPrayerSprites.length) { + Entity.getActorScreenLocation(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + IntHashTable.headIconPrayerSprites[var90.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); + } + } + + if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { + Entity.getActorScreenLocation(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + WorldMapData_1.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); + } + } + } + + if (var0.overheadText != null && (var1 >= var75 || !var0.field926 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { + Entity.getActorScreenLocation(var0, var0.defaultHeight); + if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { + Client.overheadTextXOffsets[Client.overheadTextCount] = class43.fontBold12.stringWidth(var0.overheadText) / 2; + Client.overheadTextAscents[Client.overheadTextCount] = class43.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 var79 = 0; var79 < 4; ++var79) { + int var94 = var0.hitSplatCycles[var79]; + int var95 = var0.hitSplatTypes[var79]; + HitSplatDefinition var96 = null; + int var80 = 0; + if (var95 >= 0) { + if (var94 <= Client.cycle) { + continue; + } + + var96 = StructDefinition.HitSplatDefinition_get(var0.hitSplatTypes[var79]); + var80 = var96.field3314; + if (var96 != null && var96.transforms != null) { + var96 = var96.transform(); + if (var96 == null) { + var0.hitSplatCycles[var79] = -1; + continue; + } + } + } else if (var94 < 0) { + continue; + } + + var15 = var0.hitSplatTypes2[var79]; + HitSplatDefinition var81 = null; + if (var15 >= 0) { + var81 = StructDefinition.HitSplatDefinition_get(var15); + if (var81 != null && var81.transforms != null) { + var81 = var81.transform(); + } + } + + if (var94 - var80 <= Client.cycle) { + if (var96 == null) { + var0.hitSplatCycles[var79] = -1; + } else { + Entity.getActorScreenLocation(var0, var0.defaultHeight / 2); + if (Client.viewportTempX > -1) { + if (var79 == 1) { + Client.viewportTempY -= 20; + } + + if (var79 == 2) { + Client.viewportTempX -= 15; + Client.viewportTempY -= 10; + } + + if (var79 == 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 = var96.method4494(); + int var43; + if (var82 != null) { + var22 = var82.subWidth; + var43 = var82.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var26 = var82.xOffset; + } + + var83 = var96.method4468(); + if (var83 != null) { + var23 = var83.subWidth; + var43 = var83.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var27 = var83.xOffset; + } + + var84 = var96.method4472(); + if (var84 != null) { + var24 = var84.subWidth; + var43 = var84.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var28 = var84.xOffset; + } + + var85 = var96.method4470(); + if (var85 != null) { + var25 = var85.subWidth; + var43 = var85.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var29 = var85.xOffset; + } + + if (var81 != null) { + var30 = var81.method4494(); + if (var30 != null) { + var34 = var30.subWidth; + var43 = var30.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var38 = var30.xOffset; + } + + var31 = var81.method4468(); + if (var31 != null) { + var35 = var31.subWidth; + var43 = var31.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var39 = var31.xOffset; + } + + var32 = var81.method4472(); + if (var32 != null) { + var36 = var32.subWidth; + var43 = var32.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var40 = var32.xOffset; + } + + var33 = var81.method4470(); + if (var33 != null) { + var37 = var33.subWidth; + var43 = var33.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var41 = var33.xOffset; + } + } + + Font var86 = var96.getFont(); + if (var86 == null) { + var86 = class30.fontPlain11; + } + + Font var44; + if (var81 != null) { + var44 = var81.getFont(); + if (var44 == null) { + var44 = class30.fontPlain11; + } + } else { + var44 = class30.fontPlain11; + } + + String var45 = null; + String var46 = null; + boolean var47 = false; + int var48 = 0; + var45 = var96.getString(var0.hitSplatValues[var79]); + int var93 = var86.stringWidth(var45); + if (var81 != null) { + var46 = var81.getString(var0.hitSplatValues2[var79]); + 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 = var23 * var49; + 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[var79] - Client.cycle; + int var63 = var96.field3319 - var62 * var96.field3319 / var96.field3314; + int var64 = var62 * var96.field3307 / var96.field3314 + -var96.field3307; + 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 + var96.field3324 + 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.field3324 + 15; + var73 = var72 - var44.maxAscent; + var74 = var72 + var44.maxDescent; + if (var73 < var67) { + ; + } + + if (var74 > var68) { + ; + } + } + + var73 = 255; + if (var96.field3318 >= 0) { + var73 = (var62 << 8) / (var96.field3314 - var96.field3318); + } + + if (var73 >= 0 && var73 < 255) { + if (var82 != null) { + var82.drawTransAt(var65 + var52 - var26, var66, var73); + } + + if (var84 != null) { + var84.drawTransAt(var65 + var53 - var28, var66, var73); + } + + if (var83 != null) { + for (var74 = 0; var74 < var49; ++var74) { + var83.drawTransAt(var74 * var23 + (var65 + var54 - var27), var66, var73); + } + } + + if (var85 != null) { + var85.drawTransAt(var65 + var56 - var29, var66, var73); + } + + var86.drawAlpha(var45, var55 + var65, var69, var96.textColor, 0, var73); + if (var81 != null) { + if (var30 != null) { + var30.drawTransAt(var57 + var65 - var38, var66, var73); + } + + if (var32 != null) { + var32.drawTransAt(var58 + var65 - var40, var66, var73); + } + + if (var31 != null) { + for (var74 = 0; var74 < var50; ++var74) { + var31.drawTransAt(var35 * var74 + (var65 + var59 - var39), var66, var73); + } + } + + if (var33 != null) { + var33.drawTransAt(var65 + var60 - var41, var66, var73); + } + + var44.drawAlpha(var46, var61 + var65, var72, var81.textColor, 0, var73); + } + } else { + if (var82 != null) { + var82.drawTransBgAt(var65 + var52 - var26, var66); + } + + if (var84 != null) { + var84.drawTransBgAt(var65 + var53 - var28, var66); + } + + if (var83 != null) { + for (var74 = 0; var74 < var49; ++var74) { + var83.drawTransBgAt(var74 * var23 + (var54 + var65 - var27), var66); + } + } + + if (var85 != null) { + var85.drawTransBgAt(var65 + var56 - var29, var66); + } + + var86.draw(var45, var65 + var55, var69, var96.textColor | -16777216, 0); + if (var81 != null) { + if (var30 != null) { + var30.drawTransBgAt(var65 + var57 - var38, var66); + } + + if (var32 != null) { + var32.drawTransBgAt(var65 + var58 - var40, var66); + } + + if (var31 != null) { + for (var74 = 0; var74 < var50; ++var74) { + var31.drawTransBgAt(var35 * var74 + (var65 + var59 - var39), var66); + } + } + + if (var33 != null) { + var33.drawTransBgAt(var60 + var65 - var41, var66); + } + + var44.draw(var46, var65 + var61, var72, var81.textColor | -16777216, 0); + } + } + } + } + } + } + + } + } + + @ObfuscatedName("jo") + @ObfuscatedSignature( + signature = "(IB)V", + garbageValue = "-103" + ) + static final void method1837(int var0) { + WorldMapIcon_0.method207(); + class49.method810(); + int var1 = class16.method180(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); + } + + 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); + } + + class42.method753(); + } + + 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.field856) { + if (Client.field856 == 0 && Client.field857 != -1) { + PacketBufferNode.method3574(GrandExchangeEvent.archive6, Client.field857, 0, var3, false); + Client.field858 = false; + } else if (var3 == 0) { + class197.midiPcmStream.clear(); + class197.field2378 = 1; + WorldMapDecoration.musicTrackArchive = null; + Client.field858 = false; + } else { + ChatChannel.method2163(var3); + } + + Client.field856 = 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.field788 = var2; + } + + if (var1 == 10) { + if (var2 == 0) { + Client.field860 = 127; + } + + if (var2 == 1) { + Client.field860 = 96; + } + + if (var2 == 2) { + Client.field860 = 64; + } + + if (var2 == 3) { + Client.field860 = 32; + } + + if (var2 == 4) { + Client.field860 = 0; + } + } + + if (var1 == 17) { + Client.followerIndex = var2 & 65535; + } + + AttackOption[] var4; + if (var1 == 18) { + var4 = new AttackOption[]{AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_hidden, AttackOption.AttackOption_leftClickWhereAvailable}; + Client.playerAttackOption = (AttackOption)FriendSystem.findEnumerated(var4, 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) { + var4 = new AttackOption[]{AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_hidden, AttackOption.AttackOption_leftClickWhereAvailable}; + Client.npcAttackOption = (AttackOption)FriendSystem.findEnumerated(var4, var2); + if (Client.npcAttackOption == null) { + Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + } } } diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java index a73e52cb4e..33ed6c694b 100644 --- a/runescape-client/src/main/java/Occluder.java +++ b/runescape-client/src/main/java/Occluder.java @@ -4,117 +4,667 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eg") +@ObfuscatedName("eq") @Implements("Occluder") public final class Occluder { - @ObfuscatedName("gy") - @ObfuscatedSignature( - signature = "[Lly;" - ) - @Export("crossSprites") - static Sprite[] crossSprites; - @ObfuscatedName("q") + @ObfuscatedName("sy") @ObfuscatedGetter( - intValue = 62165825 + longValue = 8542381925418177619L + ) + static long field1890; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 969777385 ) @Export("minTileX") int minTileX; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -469210933 + intValue = -1553227311 ) @Export("maxTileX") int maxTileX; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1760688667 + intValue = -1059981865 ) @Export("minTileY") int minTileY; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 830025567 + intValue = -448814067 ) @Export("maxTileY") int maxTileY; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 414289255 + intValue = 234253745 ) @Export("type") int type; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1048961917 + intValue = 1608934267 ) @Export("minX") int minX; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 425957683 + intValue = -610653481 ) @Export("maxX") int maxX; - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -876693447 + intValue = 399594661 ) @Export("minZ") int minZ; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 2097243889 + intValue = 1267632165 ) @Export("maxZ") int maxZ; - @ObfuscatedName("f") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1445457591 + intValue = 912132207 ) @Export("minY") int minY; - @ObfuscatedName("m") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 2060107965 + intValue = -646575611 ) @Export("maxY") int maxY; - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1501659665 + intValue = 2144638079 ) - int field1910; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -816168961 - ) - int field1907; + int field1883; @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -861104415 + intValue = -1502602097 ) - int field1909; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 841128039 - ) - int field1900; + int field1882; @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 828344139 + intValue = -21293905 ) - int field1911; + int field1885; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -2138791857 + ) + int field1886; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 1127843117 + ) + int field1887; @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -596652187 + intValue = 1866279201 ) - int field1912; - @ObfuscatedName("a") + int field1872; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 566478077 + intValue = -650664545 ) - int field1913; + int field1888; Occluder() { } + + @ObfuscatedName("jy") + @ObfuscatedSignature( + signature = "([Lhp;IIIIIIII)V", + garbageValue = "-438614783" + ) + @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 || ParamDefinition.getWidgetClickMask(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { + if (var9.isIf3) { + if (WorldMapRectangle.isComponentHidden(var9)) { + continue; + } + } else if (var9.type == 0 && var9 != class65.mousedOverWidgetIf1 && WorldMapRectangle.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.field804 = true; + Client.field805 = var10; + Client.field806 = var11; + } + + boolean var32 = false; + if (var9.field2620) { + switch(Client.field638) { + case 0: + var32 = true; + case 1: + default: + break; + case 2: + if (Client.field786 == var9.id >>> 16) { + var32 = true; + } + break; + case 3: + if (var9.id == Client.field786) { + 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 (class60.widgetDragDuration == 0) { + Client.clickedWidget = null; + Client.clickedWidgetParent = null; + } + + if (!Client.isMenuOpen) { + LoginScreenAnimation.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) { + Calendar.addSceneMenuOptions(var17, var18, var12, var13); + } + } else if (var9.contentType == 1338) { + MidiPcmStream.checkIfMinimapClicked(var9, var10, var11); + } else { + if (var9.contentType == 1400) { + WorldMapCacheName.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var33, var10, var11, var9.width, var9.height); + } + + if (!Client.isMenuOpen && var33) { + if (var9.contentType == 1400) { + WorldMapCacheName.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); + } else { + ClientPacket.method3558(var9, var17 - var10, var18 - var11); + } + } + + boolean var21; + int var23; + if (var32) { + for (int var20 = 0; var20 < var9.field2631.length; ++var20) { + var21 = false; + boolean var22 = false; + if (!var21 && var9.field2631[var20] != null) { + for (var23 = 0; var23 < var9.field2631[var20].length; ++var23) { + boolean var24 = false; + if (var9.field2685 != null) { + var24 = KeyHandler.KeyHandler_pressedKeys[var9.field2631[var20][var23]]; + } + + if (class2.method40(var9.field2631[var20][var23]) || var24) { + var21 = true; + if (var9.field2685 != null && var9.field2685[var20] > Client.cycle) { + break; + } + + byte var25 = var9.field2622[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) { + InterfaceParent.method1127(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); + } else if (var20 == 10) { + WorldMapRegion.Widget_runOnTargetLeave(); + class223.method4036(var9.id, var9.childIndex, WorldMapRegion.method530(ParamDefinition.getWidgetClickMask(var9)), var9.itemId); + Client.selectedSpellActionName = class173.method3529(var9); + if (Client.selectedSpellActionName == null) { + Client.selectedSpellActionName = "null"; + } + + Client.selectedSpellName = var9.dataText + class16.colorStartTag(16777215); + } + + var23 = var9.field2623[var20]; + if (var9.field2685 == null) { + var9.field2685 = new int[var9.field2631.length]; + } + + if (var9.field2581 == null) { + var9.field2581 = new int[var9.field2631.length]; + } + + if (var23 != 0) { + if (var9.field2685[var20] == 0) { + var9.field2685[var20] = var23 + Client.cycle + var9.field2581[var20]; + } else { + var9.field2685[var20] = var23 + Client.cycle; + } + } else { + var9.field2685[var20] = Integer.MAX_VALUE; + } + } + + if (!var21 && var9.field2685 != null) { + var9.field2685[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 || !FriendSystem.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var33) { + var34 = true; + } + + var21 = false; + if ((MouseHandler.MouseHandler_lastButton == 1 || !FriendSystem.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) { + WorldMapRegion.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11); + } + + if (var9.contentType == 1400) { + WorldMapCacheName.worldMap.method6185(var17, var18, var33 & var34, var33 & var21); + } + + if (Client.clickedWidget != null && var9 != Client.clickedWidget && var33 && Message.method1173(ParamDefinition.getWidgetClickMask(var9))) { + Client.draggedOnWidget = var9; + } + + if (var9 == Client.clickedWidgetParent) { + Client.field641 = true; + Client.field802 = var10; + Client.field803 = 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 || class188.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.field824.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.field824.addFirst(var27); + } + } + + if (var9.onTimer != null) { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onTimer; + Client.field633.addFirst(var27); + } + + ScriptEvent var30; + int var35; + int var36; + if (var9.onVarTransmit != null && Client.field800 > var9.field2680) { + if (var9.varTransmitTriggers != null && Client.field800 - var9.field2680 <= 32) { + label899: + for (var35 = var9.field2680; var35 < Client.field800; ++var35) { + var23 = Client.field809[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 label899; + } + } + } + } else { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onVarTransmit; + Client.scriptEvents.addFirst(var27); + } + + var9.field2680 = Client.field800; + } + + if (var9.onInvTransmit != null && Client.field812 > var9.field2681) { + if (var9.invTransmitTriggers != null && Client.field812 - var9.field2681 <= 32) { + label875: + for (var35 = var9.field2681; var35 < Client.field812; ++var35) { + var23 = Client.field811[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 label875; + } + } + } + } else { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onInvTransmit; + Client.scriptEvents.addFirst(var27); + } + + var9.field2681 = Client.field812; + } + + if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field2591) { + if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field2591 <= 32) { + label851: + for (var35 = var9.field2591; 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 label851; + } + } + } + } else { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onStatTransmit; + Client.scriptEvents.addFirst(var27); + } + + var9.field2591 = Client.changedSkillsCount; + } + + if (Client.chatCycle > var9.field2679 && var9.onChatTransmit != null) { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onChatTransmit; + Client.scriptEvents.addFirst(var27); + } + + if (Client.field629 > var9.field2679 && var9.onFriendTransmit != null) { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onFriendTransmit; + Client.scriptEvents.addFirst(var27); + } + + if (Client.field817 > var9.field2679 && var9.onClanTransmit != null) { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onClanTransmit; + Client.scriptEvents.addFirst(var27); + } + + if (Client.field818 > var9.field2679 && var9.onStockTransmit != null) { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onStockTransmit; + Client.scriptEvents.addFirst(var27); + } + + if (Client.field819 > var9.field2679 && var9.field2663 != null) { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.field2663; + Client.scriptEvents.addFirst(var27); + } + + if (Client.field820 > var9.field2679 && var9.onMiscTransmit != null) { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onMiscTransmit; + Client.scriptEvents.addFirst(var27); + } + + var9.field2679 = Client.cycleCntr; + if (var9.onKey != null) { + for (var35 = 0; var35 < Client.field677; ++var35) { + ScriptEvent var31 = new ScriptEvent(); + var31.widget = var9; + var31.keyTyped = Client.field815[var35]; + var31.keyPressed = Client.field845[var35]; + var31.args = var9.onKey; + Client.scriptEvents.addFirst(var31); + } + } + } + } + + if (!var9.isIf3) { + if (Client.clickedWidget != null || class188.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) { + class65.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; + } else { + class65.mousedOverWidgetIf1 = var9; + } + } + + if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + WorldMapDecoration.field198 = var9; + } + + if (var9.scrollHeight > var9.height) { + WorldMapData_1.method682(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 (class60.widgetDragDuration == 0) { + Client.clickedWidget = null; + Client.clickedWidgetParent = null; + } + + if (!Client.isMenuOpen) { + LoginScreenAnimation.addCancelMenuEntry(); + } + } + + MouseRecorder.updateRootInterface(var28.group, var12, var13, var14, var15, var10, var11); + } + } + } + } + } + } + + } } diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java index 44ddf11350..b433c2065e 100644 --- a/runescape-client/src/main/java/PacketBuffer.java +++ b/runescape-client/src/main/java/PacketBuffer.java @@ -7,89 +7,83 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("kx") @Implements("PacketBuffer") public class PacketBuffer extends Buffer { - @ObfuscatedName("w") - static final int[] field3724; - @ObfuscatedName("hd") - @ObfuscatedGetter( - intValue = -1521348339 - ) - @Export("cameraX") - static int cameraX; - @ObfuscatedName("q") + @ObfuscatedName("j") + static final int[] field3697; + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Llv;" + signature = "Lle;" ) @Export("isaacCipher") IsaacCipher isaacCipher; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1484140069 + intValue = 298264099 ) @Export("bitIndex") int bitIndex; static { - field3724 = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 0x7fff, 0xffff, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 0xffffff, 33554431, 67108863, 134217727, 0xfffffff, 536870911, 1073741823, Integer.MAX_VALUE, -1}; + field3697 = 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("q") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "([II)V", - garbageValue = "-1645876260" + garbageValue = "742513625" ) @Export("newIsaacCipher") public void newIsaacCipher(int[] var1) { this.isaacCipher = new IsaacCipher(var1); } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Llv;B)V", - garbageValue = "102" + signature = "(Lle;B)V", + garbageValue = "-61" ) @Export("setIsaacCipher") public void setIsaacCipher(IsaacCipher var1) { this.isaacCipher = var1; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-624366105" + signature = "(IB)V", + garbageValue = "-88" ) @Export("writeByteIsaac") public void writeByteIsaac(int var1) { super.array[++super.offset - 1] = (byte)(var1 + this.isaacCipher.nextInt()); } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-1669588152" + signature = "(B)I", + garbageValue = "109" ) @Export("readByteIsaac") public int readByteIsaac() { return super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "1288814590" + signature = "(S)Z", + garbageValue = "-2758" ) - public boolean method5441() { - int var1 = super.array[super.offset] - this.isaacCipher.method6254() & 255; + public boolean method5353() { + int var1 = super.array[super.offset] - this.isaacCipher.method6134() & 255; return var1 >= 128; } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-588340710" + garbageValue = "-129464228" ) @Export("readSmartByteShortIsaac") public int readSmartByteShortIsaac() { @@ -97,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("b") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "2009256610" + garbageValue = "-1827240393" ) - public void method5443(byte[] var1, int var2, int var3) { + public void method5384(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("i") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1671880174" + garbageValue = "-340073235" ) @Export("importIndex") public void importIndex() { this.bitIndex = super.offset * 8; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(II)I", - garbageValue = "-1296046831" + garbageValue = "912146837" ) @Export("readBits") public int readBits(int var1) { @@ -131,59 +125,36 @@ public class PacketBuffer extends Buffer { int var4 = 0; for (this.bitIndex += var1; var1 > var3; var3 = 8) { - var4 += (super.array[var2++] & field3724[var3]) << var1 - var3; + var4 += (super.array[var2++] & field3697[var3]) << var1 - var3; var1 -= var3; } if (var3 == var1) { - var4 += super.array[var2] & field3724[var3]; + var4 += super.array[var2] & field3697[var3]; } else { - var4 += super.array[var2] >> var3 - var1 & field3724[var1]; + var4 += super.array[var2] >> var3 - var1 & field3697[var1]; } return var4; } - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-100" + signature = "(I)V", + garbageValue = "-1798172664" ) @Export("exportIndex") public void exportIndex() { super.offset = (this.bitIndex + 7) / 8; } - @ObfuscatedName("x") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(IS)I", - garbageValue = "4225" + garbageValue = "21689" ) @Export("bitsRemaining") public int bitsRemaining(int var1) { return var1 * 8 - this.bitIndex; } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(Lhp;III)Llx;", - garbageValue = "-1232611828" - ) - @Export("SpriteBuffer_getIndexedSprite") - static IndexedSprite SpriteBuffer_getIndexedSprite(AbstractArchive var0, int var1, int var2) { - if (!Friend.SpriteBuffer_bufferFile(var0, var1, var2)) { - return null; - } - IndexedSprite var4 = new IndexedSprite(); - var4.width = SpriteBuffer.SpriteBuffer_spriteWidth; - var4.height = SpriteBuffer.SpriteBuffer_spriteHeight; - var4.xOffset = Varps.SpriteBuffer_xOffsets[0]; - var4.yOffset = SpriteBuffer.SpriteBuffer_yOffsets[0]; - var4.subWidth = SpriteBuffer.SpriteBuffer_spriteWidths[0]; - var4.subHeight = class216.SpriteBuffer_spriteHeights[0]; - var4.palette = Frames.SpriteBuffer_spritePalette; - var4.pixels = SpriteBuffer.SpriteBuffer_pixels[0]; - class16.SpriteBuffer_clear(); - return var4; - } } diff --git a/runescape-client/src/main/java/PacketBufferNode.java b/runescape-client/src/main/java/PacketBufferNode.java index 462fe2e298..aa3c155b10 100644 --- a/runescape-client/src/main/java/PacketBufferNode.java +++ b/runescape-client/src/main/java/PacketBufferNode.java @@ -4,48 +4,48 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gb") +@ObfuscatedName("gq") @Implements("PacketBufferNode") public class PacketBufferNode extends Node { - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "[Lgb;" + signature = "[Lgq;" ) @Export("PacketBufferNode_packetBufferNodes") - public static PacketBufferNode[] PacketBufferNode_packetBufferNodes; - @ObfuscatedName("l") + static PacketBufferNode[] PacketBufferNode_packetBufferNodes; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 303821237 + intValue = -999589245 ) @Export("PacketBufferNode_packetBufferNodeCount") - public static int PacketBufferNode_packetBufferNodeCount; - @ObfuscatedName("bi") + static int PacketBufferNode_packetBufferNodeCount; + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lht;" + signature = "Lda;" ) - @Export("serverBuild") - static ServerBuild serverBuild; - @ObfuscatedName("q") + @Export("soundSystem") + static SoundSystem soundSystem; + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lgx;" + signature = "Lgv;" ) @Export("clientPacket") - public ClientPacket clientPacket; - @ObfuscatedName("w") + ClientPacket clientPacket; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1717799889 + intValue = 190922569 ) @Export("clientPacketLength") - public int clientPacketLength; - @ObfuscatedName("e") + int clientPacketLength; + @ObfuscatedName("i") @ObfuscatedSignature( signature = "Lkx;" ) @Export("packetBuffer") public PacketBuffer packetBuffer; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1405793597 + intValue = -2083817253 ) @Export("index") public int index; @@ -55,10 +55,13 @@ public class PacketBufferNode extends Node { PacketBufferNode_packetBufferNodeCount = 0; } - @ObfuscatedName("w") + PacketBufferNode() { + } + + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "-108" + garbageValue = "0" ) @Export("release") public void release() { @@ -67,539 +70,18 @@ public class PacketBufferNode extends Node { } } - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "729695552" + signature = "(Lhz;IIIZI)V", + garbageValue = "-1570089808" ) - @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; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(CLgu;I)C", - garbageValue = "1821592074" - ) - @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'; - } - if (var0 == 339) { - return 'o'; - } - if (var0 == 376) { - return 'Y'; - } - return var0; - } - - @ObfuscatedName("gi") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-13305757" - ) - static final void method3628() { - WorldMapElement.method4368(false); - Client.field705 = 0; - boolean var0 = true; - - int var1; - for (var1 = 0; var1 < class13.regionLandArchives.length; ++var1) { - if (SecureRandomFuture.regionMapArchiveIds[var1] != -1 && class13.regionLandArchives[var1] == null) { - class13.regionLandArchives[var1] = WorldMapCacheName.archive5.takeFile(SecureRandomFuture.regionMapArchiveIds[var1], 0); - if (class13.regionLandArchives[var1] == null) { - var0 = false; - ++Client.field705; - } - } - - if (WorldMapRectangle.regionLandArchiveIds[var1] != -1 && class80.regionMapArchives[var1] == null) { - class80.regionMapArchives[var1] = WorldMapCacheName.archive5.takeFileEncrypted(WorldMapRectangle.regionLandArchiveIds[var1], 0, WorldMapRegion.xteaKeys[var1]); - if (class80.regionMapArchives[var1] == null) { - var0 = false; - ++Client.field705; - } - } - } - - if (!var0) { - Client.field709 = 1; - return; - } - Client.field707 = 0; - var0 = true; - - int var3; - int var4; - for (var1 = 0; var1 < class13.regionLandArchives.length; ++var1) { - byte[] var2 = class80.regionMapArchives[var1]; - if (var2 != null) { - var3 = (DirectByteArrayCopier.regions[var1] >> 8) * 64 - MusicPatchNode2.baseX * 64; - var4 = (DirectByteArrayCopier.regions[var1] & 255) * 64 - class1.baseY * 64; - if (Client.isInInstance) { - var3 = 10; - var4 = 10; - } - - var0 &= Huffman.method3947(var2, var3, var4); - } - } - - if (!var0) { - Client.field709 = 2; - return; - } - if (Client.field709 != 0) { - TriBool.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); - } - - class186.playPcmPlayers(); - GrandExchangeOfferWorldComparator.scene.clear(); - - for (var1 = 0; var1 < 4; ++var1) { - Client.collisionMaps[var1].clear(); - } - - int var49; - for (var1 = 0; var1 < 4; ++var1) { - for (var49 = 0; var49 < 104; ++var49) { - for (var3 = 0; var3 < 104; ++var3) { - Tiles.Tiles_renderFlags[var1][var49][var3] = 0; - } - } - } - - class186.playPcmPlayers(); - Tiles.Tiles_minPlane = 99; - Tiles.field504 = new byte[4][104][104]; - Tiles.field505 = new byte[4][104][104]; - Tiles.field506 = new byte[4][104][104]; - class268.field3561 = new byte[4][104][104]; - FaceNormal.field1887 = new int[4][105][105]; - class32.field282 = new byte[4][105][105]; - Tiles.field515 = new int[105][105]; - ServerBuild.Tiles_hue = new int[104]; - Tiles.Tiles_saturation = new int[104]; - Tiles.Tiles_lightness = new int[104]; - DynamicObject.Tiles_hueMultiplier = new int[104]; - Fonts.field3689 = new int[104]; - var1 = class13.regionLandArchives.length; - - for (ObjectSound var55 = (ObjectSound)ObjectSound.objectSounds.last(); var55 != null; var55 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var55.stream1 != null) { - SecureRandomCallable.pcmStreamMixer.removeSubStream(var55.stream1); - var55.stream1 = null; - } - - if (var55.stream2 != null) { - SecureRandomCallable.pcmStreamMixer.removeSubStream(var55.stream2); - var55.stream2 = null; - } - } - - ObjectSound.objectSounds.clear(); - WorldMapElement.method4368(true); - int var6; - int var7; - int var9; - int var10; - int var11; - int var12; - int var51; - if (!Client.isInInstance) { - byte[] var5; - for (var49 = 0; var49 < var1; ++var49) { - var3 = (DirectByteArrayCopier.regions[var49] >> 8) * 64 - MusicPatchNode2.baseX * 64; - var4 = (DirectByteArrayCopier.regions[var49] & 255) * 64 - class1.baseY * 64; - var5 = class13.regionLandArchives[var49]; - if (var5 == null) { - continue; - } - class186.playPcmPlayers(); - var6 = Canvas.field418 * 8 - 48; - var7 = ViewportMouse.field1747 * 8 - 48; - CollisionMap[] var8 = Client.collisionMaps; - - for (var9 = 0; var9 < 4; ++var9) { - for (var10 = 0; var10 < 64; ++var10) { - for (var11 = 0; var11 < 64; ++var11) { - if (var3 + var10 > 0 && var10 + var3 < 103 && var11 + var4 > 0 && var11 + var4 < 103) { - var8[var9].flags[var3 + var10][var11 + var4] &= 0xfeffffff; - } - } - } - } - - Buffer var50 = new Buffer(var5); - - for (var10 = 0; var10 < 4; ++var10) { - for (var11 = 0; var11 < 64; ++var11) { - for (var12 = 0; var12 < 64; ++var12) { - WorldMapLabel.loadTerrain(var50, var10, var3 + var11, var4 + var12, var6, var7, 0); - } - } - } - } - - for (var49 = 0; var49 < var1; ++var49) { - var3 = (DirectByteArrayCopier.regions[var49] >> 8) * 64 - MusicPatchNode2.baseX * 64; - var4 = (DirectByteArrayCopier.regions[var49] & 255) * 64 - class1.baseY * 64; - var5 = class13.regionLandArchives[var49]; - if (var5 == null && ViewportMouse.field1747 < 800) { - class186.playPcmPlayers(); - Players.method2092(var3, var4, 64, 64); - } - } - - WorldMapElement.method4368(true); - - for (var49 = 0; var49 < var1; ++var49) { - byte[] var53 = class80.regionMapArchives[var49]; - if (var53 != null) { - var4 = (DirectByteArrayCopier.regions[var49] >> 8) * 64 - MusicPatchNode2.baseX * 64; - var51 = (DirectByteArrayCopier.regions[var49] & 255) * 64 - class1.baseY * 64; - class186.playPcmPlayers(); - AbstractByteArrayCopier.method3933(var53, var4, var51, GrandExchangeOfferWorldComparator.scene, Client.collisionMaps); - } - } - } - - int var52; - if (Client.isInInstance) { - for (var49 = 0; var49 < 4; ++var49) { - class186.playPcmPlayers(); - - for (var3 = 0; var3 < 13; ++var3) { - for (var4 = 0; var4 < 13; ++var4) { - boolean var56 = false; - var6 = Client.instanceChunkTemplates[var49][var3][var4]; - if (var6 != -1) { - var7 = var6 >> 24 & 3; - var52 = var6 >> 1 & 3; - var9 = var6 >> 14 & 1023; - var10 = var6 >> 3 & 2047; - var11 = (var9 / 8 << 8) + var10 / 8; - - for (var12 = 0; var12 < DirectByteArrayCopier.regions.length; ++var12) { - if (DirectByteArrayCopier.regions[var12] == var11 && class13.regionLandArchives[var12] != null) { - ScriptFrame.method1088(class13.regionLandArchives[var12], var49, var3 * 8, var4 * 8, var7, (var9 & 7) * 8, (var10 & 7) * 8, var52, Client.collisionMaps); - var56 = true; - break; - } - } - } - - if (var56) { - continue; - } - var7 = var49; - var52 = var3 * 8; - var9 = var4 * 8; - - for (var10 = 0; var10 < 8; ++var10) { - for (var11 = 0; var11 < 8; ++var11) { - Tiles.Tiles_heights[var7][var52 + var10][var11 + var9] = 0; - } - } - - if (var52 > 0) { - for (var10 = 1; var10 < 8; ++var10) { - Tiles.Tiles_heights[var7][var52][var9 + var10] = Tiles.Tiles_heights[var7][var52 - 1][var9 + var10]; - } - } - - if (var9 > 0) { - for (var10 = 1; var10 < 8; ++var10) { - Tiles.Tiles_heights[var7][var52 + var10][var9] = Tiles.Tiles_heights[var7][var52 + var10][var9 - 1]; - } - } - - if (var52 > 0 && Tiles.Tiles_heights[var7][var52 - 1][var9] != 0) { - Tiles.Tiles_heights[var7][var52][var9] = Tiles.Tiles_heights[var7][var52 - 1][var9]; - } else if (var9 > 0 && Tiles.Tiles_heights[var7][var52][var9 - 1] != 0) { - Tiles.Tiles_heights[var7][var52][var9] = Tiles.Tiles_heights[var7][var52][var9 - 1]; - } else if (var52 > 0 && var9 > 0 && Tiles.Tiles_heights[var7][var52 - 1][var9 - 1] != 0) { - Tiles.Tiles_heights[var7][var52][var9] = Tiles.Tiles_heights[var7][var52 - 1][var9 - 1]; - } - } - } - } - - for (var49 = 0; var49 < 13; ++var49) { - for (var3 = 0; var3 < 13; ++var3) { - var4 = Client.instanceChunkTemplates[0][var49][var3]; - if (var4 == -1) { - Players.method2092(var49 * 8, var3 * 8, 8, 8); - } - } - } - - WorldMapElement.method4368(true); - - for (var49 = 0; var49 < 4; ++var49) { - class186.playPcmPlayers(); - - for (var3 = 0; var3 < 13; ++var3) { - for (var4 = 0; var4 < 13; ++var4) { - var51 = Client.instanceChunkTemplates[var49][var3][var4]; - if (var51 == -1) { - continue; - } - var6 = var51 >> 24 & 3; - var7 = var51 >> 1 & 3; - var52 = var51 >> 14 & 1023; - var9 = var51 >> 3 & 2047; - var10 = (var52 / 8 << 8) + var9 / 8; - - for (var11 = 0; var11 < DirectByteArrayCopier.regions.length; ++var11) { - if (DirectByteArrayCopier.regions[var11] != var10 || class80.regionMapArchives[var11] == null) { - continue; - } - byte[] var54 = class80.regionMapArchives[var11]; - int var13 = var3 * 8; - int var14 = var4 * 8; - int var15 = (var52 & 7) * 8; - int var16 = (var9 & 7) * 8; - Scene var17 = GrandExchangeOfferWorldComparator.scene; - CollisionMap[] var18 = Client.collisionMaps; - Buffer var19 = new Buffer(var54); - int var20 = -1; - - while (true) { - int var21 = var19.method5509(); - if (var21 == 0) { - break; - } - - var20 += var21; - int var22 = 0; - - while (true) { - int var23 = var19.readUShortSmart(); - if (var23 == 0) { - break; - } - - var22 += var23 - 1; - int var24 = var22 & 63; - int var25 = var22 >> 6 & 63; - int var26 = var22 >> 12; - int var27 = var19.readUnsignedByte(); - int var28 = var27 >> 2; - int var29 = var27 & 3; - if (var6 != var26 || var25 < var15 || var25 >= var15 + 8 || var24 < var16 || var24 >= var16 + 8) { - continue; - } - ObjectDefinition var30 = ViewportMouse.getObjectDefinition(var20); - int var33 = var25 & 7; - int var34 = var24 & 7; - int var36 = var30.sizeX; - int var37 = var30.sizeY; - int var38; - if ((var29 & 1) == 1) { - var38 = var36; - var36 = var37; - var37 = var38; - } - - int var35 = var7 & 3; - int var32; - if (var35 == 0) { - var32 = var33; - } else if (var35 == 1) { - var32 = var34; - } else if (var35 == 2) { - var32 = 7 - var33 - (var36 - 1); - } else { - var32 = 7 - var34 - (var37 - 1); - } - - var38 = var32 + var13; - int var41 = var25 & 7; - int var42 = var24 & 7; - int var44 = var30.sizeX; - int var45 = var30.sizeY; - int var46; - if ((var29 & 1) == 1) { - var46 = var44; - var44 = var45; - var45 = var46; - } - - int var43 = var7 & 3; - int var40; - if (var43 == 0) { - var40 = var42; - } else if (var43 == 1) { - var40 = 7 - var41 - (var44 - 1); - } else if (var43 == 2) { - var40 = 7 - var42 - (var45 - 1); - } else { - var40 = var41; - } - - var46 = var40 + var14; - if (var38 <= 0 || var46 <= 0 || var38 >= 103 || var46 >= 103) { - continue; - } - int var47 = var49; - if ((Tiles.Tiles_renderFlags[1][var38][var46] & 2) == 2) { - var47 = var49 - 1; - } - - CollisionMap var48 = null; - if (var47 >= 0) { - var48 = var18[var47]; - } - - GrandExchangeOfferOwnWorldComparator.method1236(var49, var38, var46, var20, var29 + var7 & 3, var28, var17, var48); - } - } - break; - } - } - } - } - } - - WorldMapElement.method4368(true); - class186.playPcmPlayers(); - GrandExchangeEvents.method72(GrandExchangeOfferWorldComparator.scene, Client.collisionMaps); - WorldMapElement.method4368(true); - var49 = Tiles.Tiles_minPlane; - if (var49 > class42.plane) { - var49 = class42.plane; - } - - if (var49 < class42.plane - 1) { - var49 = class42.plane - 1; - } - - if (Client.isLowDetail) { - GrandExchangeOfferWorldComparator.scene.init(Tiles.Tiles_minPlane); - } else { - GrandExchangeOfferWorldComparator.scene.init(0); - } - - for (var3 = 0; var3 < 104; ++var3) { - for (var4 = 0; var4 < 104; ++var4) { - GrandExchangeOfferWorldComparator.updateItemPile(var3, var4); - } - } - - class186.playPcmPlayers(); - - for (PendingSpawn var57 = (PendingSpawn)Client.pendingSpawns.last(); var57 != null; var57 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (var57.hitpoints == -1) { - var57.delay = 0; - class294.method5327(var57); - } else { - var57.remove(); - } - } - - ObjectDefinition.ObjectDefinition_cachedModelData.clear(); - PacketBufferNode var58; - if (WorldMapSprite.client.hasFrame()) { - var58 = Archive.getPacketBufferNode(ClientPacket.field2212, Client.packetWriter.isaacCipher); - var58.packetBuffer.writeInt(1057001181); - Client.packetWriter.addNode(var58); - } - - if (!Client.isInInstance) { - var3 = (Canvas.field418 - 6) / 8; - var4 = (Canvas.field418 + 6) / 8; - var51 = (ViewportMouse.field1747 - 6) / 8; - var6 = (ViewportMouse.field1747 + 6) / 8; - - for (var7 = var3 - 1; var7 <= var4 + 1; ++var7) { - for (var52 = var51 - 1; var52 <= var6 + 1; ++var52) { - if (var7 < var3 || var7 > var4 || var52 < var51 || var52 > var6) { - WorldMapCacheName.archive5.loadRegionFromName("m" + var7 + "_" + var52); - WorldMapCacheName.archive5.loadRegionFromName("l" + var7 + "_" + var52); - } - } - } - } - - class96.updateGameState(30); - class186.playPcmPlayers(); - KeyHandler.method787(); - var58 = Archive.getPacketBufferNode(ClientPacket.field2279, Client.packetWriter.isaacCipher); - Client.packetWriter.addNode(var58); - WallDecoration.method3291(); + public static void method3574(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { + class197.field2378 = 1; + WorldMapDecoration.musicTrackArchive = var0; + class197.musicTrackGroupId = var1; + class197.musicTrackFileId = var2; + WorldMapSprite.field222 = var3; + Varcs.musicTrackBoolean = var4; + class16.field98 = 10000; } } diff --git a/runescape-client/src/main/java/PacketWriter.java b/runescape-client/src/main/java/PacketWriter.java index 0387ddadc9..f09b9c030c 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("cg") +@ObfuscatedName("cy") @Implements("PacketWriter") public class PacketWriter { - @ObfuscatedName("q") + @ObfuscatedName("fe") + @ObfuscatedGetter( + intValue = 1606787637 + ) + @Export("baseX") + static int baseX; + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lky;" + signature = "Lkg;" ) @Export("socket") AbstractSocket socket; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lju;" + signature = "Ljp;" ) @Export("packetBufferNodes") IterableNodeDeque packetBufferNodes; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1004294931 + intValue = 1205819381 ) @Export("bufferSize") int bufferSize; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lkf;" + signature = "Lky;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Llv;" + signature = "Lle;" ) @Export("isaacCipher") public IsaacCipher isaacCipher; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "Lkx;" ) @Export("packetBuffer") PacketBuffer packetBuffer; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lgc;" + signature = "Lgj;" ) @Export("serverPacket") ServerPacket serverPacket; - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1529475721 + intValue = -1032703307 ) @Export("serverPacketLength") int serverPacketLength; - @ObfuscatedName("c") - boolean field1322; + @ObfuscatedName("x") + boolean field1284; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -1284201635 + ) + int field1293; @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1922577877 - ) - int field1318; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 1793928125 + intValue = 421998979 ) @Export("pendingWrites") int pendingWrites; - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lgc;" + signature = "Lgj;" ) - ServerPacket field1309; - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lgc;" - ) - ServerPacket field1321; + ServerPacket field1295; @ObfuscatedName("r") @ObfuscatedSignature( - signature = "Lgc;" + signature = "Lgj;" ) - ServerPacket field1317; + ServerPacket field1296; + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "Lgj;" + ) + ServerPacket field1291; PacketWriter() { this.packetBufferNodes = new IterableNodeDeque(); @@ -92,51 +98,54 @@ public class PacketWriter { this.packetBuffer = new PacketBuffer(40000); this.serverPacket = null; this.serverPacketLength = 0; - this.field1322 = true; - this.field1318 = 0; + this.field1284 = true; + this.field1293 = 0; this.pendingWrites = 0; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "19166064" + garbageValue = "-194505357" ) @Export("clearBuffer") final void clearBuffer() { - this.packetBufferNodes.clear(); + this.packetBufferNodes.rsClear(); this.bufferSize = 0; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "294803591" + signature = "(S)V", + garbageValue = "10298" ) @Export("flush") final void flush() throws IOException { - if (this.socket == null || this.bufferSize <= 0) { - return; - } - this.buffer.offset = 0; + if (this.socket != null && this.bufferSize > 0) { + this.buffer.offset = 0; - PacketBufferNode var1; - while ((var1 = (PacketBufferNode)this.packetBufferNodes.last()) != null && var1.index <= this.buffer.array.length - this.buffer.offset) { - this.buffer.writeBytes(var1.packetBuffer.array, 0, var1.index); - this.bufferSize -= var1.index; - var1.remove(); - var1.packetBuffer.releaseArray(); - var1.release(); + while (true) { + PacketBufferNode var1 = (PacketBufferNode)this.packetBufferNodes.last(); + if (var1 == null || var1.index > this.buffer.array.length - this.buffer.offset) { + this.socket.write(this.buffer.array, 0, this.buffer.offset); + this.pendingWrites = 0; + break; + } + + this.buffer.writeBytes(var1.packetBuffer.array, 0, var1.index); + this.bufferSize -= var1.index; + var1.remove(); + var1.packetBuffer.releaseArray(); + var1.release(); + } } - this.socket.write(this.buffer.array, 0, this.buffer.offset); - this.pendingWrites = 0; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lgb;I)V", - garbageValue = "2067459847" + signature = "(Lgq;I)V", + garbageValue = "520216141" ) @Export("addNode") public final void addNode(PacketBufferNode var1) { @@ -146,20 +155,20 @@ public class PacketWriter { this.bufferSize += var1.index; } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lky;I)V", - garbageValue = "242555588" + signature = "(Lkg;I)V", + garbageValue = "-2033102393" ) @Export("setSocket") void setSocket(AbstractSocket var1) { this.socket = var1; } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "-14154" + signature = "(B)V", + garbageValue = "-104" ) @Export("close") void close() { @@ -170,80 +179,23 @@ public class PacketWriter { } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "94" + signature = "(I)V", + garbageValue = "-200145232" ) @Export("removeSocket") void removeSocket() { this.socket = null; } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(S)Lky;", - garbageValue = "-14430" + signature = "(S)Lkg;", + garbageValue = "140" ) @Export("getSocket") AbstractSocket getSocket() { return this.socket; } - - @ObfuscatedName("gs") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-107" - ) - @Export("drawProjectiles") - static final void drawProjectiles() { - for (Projectile var0 = (Projectile)Client.projectiles.last(); var0 != null; var0 = (Projectile)Client.projectiles.previous()) { - if (var0.plane != class42.plane || Client.cycle > var0.cycleEnd) { - var0.remove(); - continue; - } - if (Client.cycle < var0.cycleStart) { - continue; - } - if (var0.targetIndex > 0) { - NPC var1 = Client.npcs[var0.targetIndex - 1]; - if (var1 != null && var1.x >= 0 && var1.x < 13312 && var1.y >= 0 && var1.y < 13312) { - var0.setDestination(var1.x, var1.y, ScriptEvent.getTileHeight(var1.x, var1.y, var0.plane) - var0.endHeight, Client.cycle); - } - } - - if (var0.targetIndex < 0) { - int var2 = -var0.targetIndex - 1; - Player var3; - if (var2 == Client.localPlayerIndex) { - var3 = Client.localPlayer; - } else { - var3 = Client.players[var2]; - } - - if (var3 != null && var3.x >= 0 && var3.x < 13312 && var3.y >= 0 && var3.y < 13312) { - var0.setDestination(var3.x, var3.y, ScriptEvent.getTileHeight(var3.x, var3.y, var0.plane) - var0.endHeight, Client.cycle); - } - } - - var0.advance(Client.field718); - GrandExchangeOfferWorldComparator.scene.drawEntity(class42.plane, (int)var0.x, (int)var0.y, (int)var0.z, 60, var0, var0.yaw, -1L, false); - } - - } - - @ObfuscatedName("it") - @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "-1368328511" - ) - static boolean method2244(int var0) { - for (int var1 = 0; var1 < Client.field754; ++var1) { - if (Client.field921[var1] == var0) { - return true; - } - } - - return false; - } } diff --git a/runescape-client/src/main/java/ParamDefinition.java b/runescape-client/src/main/java/ParamDefinition.java index 93f417a73a..1b619af600 100644 --- a/runescape-client/src/main/java/ParamDefinition.java +++ b/runescape-client/src/main/java/ParamDefinition.java @@ -1,43 +1,38 @@ +import java.awt.Component; 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("ie") +@ObfuscatedName("is") @Implements("ParamDefinition") public class ParamDefinition extends DualNode { - @ObfuscatedName("q") + @ObfuscatedName("pk") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lls;" ) - @Export("ParamDefinition_archive") - static AbstractArchive ParamDefinition_archive; - @ObfuscatedName("w") + @Export("sceneMinimapSprite") + static Sprite sceneMinimapSprite; + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lep;" ) @Export("ParamDefinition_cached") static EvictingDualNodeHashTable ParamDefinition_cached; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 1398808155 - ) - @Export("canvasHeight") - public static int canvasHeight; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("type") char type; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -956924169 + intValue = -1184264069 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("autoDisable") boolean autoDisable; @@ -49,19 +44,19 @@ public class ParamDefinition extends DualNode { this.autoDisable = true; } - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-67" + signature = "(I)V", + garbageValue = "-549748029" ) @Export("postDecode") void postDecode() { } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkf;B)V", - garbageValue = "-1" + signature = "(Lky;I)V", + garbageValue = "207270503" ) @Export("decode") void decode(Buffer var1) { @@ -77,8 +72,8 @@ public class ParamDefinition extends DualNode { @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lkf;II)V", - garbageValue = "506424646" + signature = "(Lky;II)V", + garbageValue = "1082151718" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -90,7 +85,7 @@ public class ParamDefinition extends DualNode { } if (var5 >= 128 && var5 < 160) { - char var6 = class288.cp1252AsciiExtension[var5 - 128]; + char var6 = class287.cp1252AsciiExtension[var5 - 128]; if (var6 == 0) { var6 = '?'; } @@ -110,35 +105,57 @@ public class ParamDefinition extends DualNode { } - @ObfuscatedName("l") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "715128499" + signature = "(B)Z", + garbageValue = "38" ) @Export("isString") public boolean isString() { return this.type == 's'; } - @ObfuscatedName("w") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(II)Lin;", - garbageValue = "1544024361" + signature = "(Ljava/awt/Component;S)V", + garbageValue = "-10016" ) - @Export("StructDefinition_getStructDefinition") - public static StructDefinition StructDefinition_getStructDefinition(int var0) { - StructDefinition var1 = (StructDefinition)StructDefinition.StructDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } - byte[] var2 = StructDefinition.StructDefinition_archive.takeFile(34, var0); - var1 = new StructDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); + static void method4420(Component var0) { + var0.removeKeyListener(KeyHandler.KeyHandler_instance); + var0.removeFocusListener(KeyHandler.KeyHandler_instance); + KeyHandler.field378 = -1; + } + + @ObfuscatedName("ja") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1970542013" + ) + static final void method4424() { + PacketBufferNode var0 = MenuAction.getPacketBufferNode(ClientPacket.field2205, 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) { + VarpDefinition.closeInterface(var1, true); + } } - var1.postDecode(); - StructDefinition.StructDefinition_cached.put(var1, (long)var0); - return var1; + if (Client.meslayerContinueWidget != null) { + FriendSystem.invalidateWidget(Client.meslayerContinueWidget); + Client.meslayerContinueWidget = null; + } + + } + + @ObfuscatedName("kx") + @ObfuscatedSignature( + signature = "(Lhp;B)I", + garbageValue = "-97" + ) + @Export("getWidgetClickMask") + static int getWidgetClickMask(Widget var0) { + IntegerNode var1 = (IntegerNode)Client.widgetClickMasks.get(((long)var0.id << 32) + (long)var0.childIndex); + return var1 != null ? var1.integer : var0.clickMask; } } diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java index 92c96cc2bf..4f76816096 100644 --- a/runescape-client/src/main/java/PcmPlayer.java +++ b/runescape-client/src/main/java/PcmPlayer.java @@ -4,313 +4,316 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dn") +@ObfuscatedName("dd") @Implements("PcmPlayer") public class PcmPlayer { - @ObfuscatedName("c") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1278180609 + intValue = -2109466943 ) - @Export("PcmPlayer_count") - static int PcmPlayer_count; - @ObfuscatedName("r") + @Export("PcmPlayer_sampleRate") + public static int PcmPlayer_sampleRate; + @ObfuscatedName("n") + @Export("PcmPlayer_stereo") + protected static boolean PcmPlayer_stereo; + @ObfuscatedName("y") @Export("samples") protected int[] samples; - @ObfuscatedName("v") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Ldx;" + signature = "Ldz;" ) @Export("stream") PcmStream stream; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1475444063 + intValue = 2121528369 ) - int field1406; + int field1384; @ObfuscatedName("g") @ObfuscatedGetter( - longValue = -1948698164081779065L + longValue = 7651317449639431647L ) @Export("timeMs") long timeMs; - @ObfuscatedName("a") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1789796573 + intValue = 1742403687 ) @Export("capacity") int capacity; - @ObfuscatedName("j") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1737413085 + intValue = -2082148367 ) - int field1414; - @ObfuscatedName("t") + int field1399; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1691943703 + intValue = -1595984821 ) - int field1413; + int field1388; + @ObfuscatedName("w") + @ObfuscatedGetter( + longValue = -7364227675697791643L + ) + long field1389; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -772636771 + ) + int field1379; @ObfuscatedName("h") @ObfuscatedGetter( - longValue = -7968110108619228373L + intValue = -1968577703 ) - long field1416; + int field1391; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -289661183 + ) + int field1393; + @ObfuscatedName("m") + @ObfuscatedGetter( + longValue = 1958141991499651821L + ) + long field1386; @ObfuscatedName("o") + boolean field1394; + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 2131398703 + intValue = 168489489 ) - int field1417; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 586161719 - ) - int field1418; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = -1508308009 - ) - int field1419; - @ObfuscatedName("s") - @ObfuscatedGetter( - longValue = -2950449123303085351L - ) - long field1420; - @ObfuscatedName("z") - boolean field1421; - @ObfuscatedName("ag") - @ObfuscatedGetter( - intValue = 550758429 - ) - int field1423; - @ObfuscatedName("ar") + int field1395; + @ObfuscatedName("an") @ObfuscatedSignature( - signature = "[Ldx;" + signature = "[Ldz;" ) - PcmStream[] field1426; - @ObfuscatedName("ax") + PcmStream[] field1396; + @ObfuscatedName("at") @ObfuscatedSignature( - signature = "[Ldx;" + signature = "[Ldz;" ) - PcmStream[] field1425; + PcmStream[] field1397; protected PcmPlayer() { - this.field1406 = 32; - this.timeMs = DirectByteArrayCopier.currentTimeMs(); - this.field1416 = 0L; - this.field1417 = 0; - this.field1418 = 0; - this.field1419 = 0; - this.field1420 = 0L; - this.field1421 = true; - this.field1423 = 0; - this.field1426 = new PcmStream[8]; - this.field1425 = new PcmStream[8]; + this.field1384 = 32; + this.timeMs = SequenceDefinition.method4686(); + this.field1389 = 0L; + this.field1379 = 0; + this.field1391 = 0; + this.field1393 = 0; + this.field1386 = 0L; + this.field1394 = true; + this.field1395 = 0; + this.field1396 = new PcmStream[8]; + this.field1397 = new PcmStream[8]; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1518489339" + signature = "(B)V", + garbageValue = "1" ) @Export("init") protected void init() throws Exception { } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "2" + signature = "(II)V", + garbageValue = "1939802329" ) @Export("open") protected void open(int var1) throws Exception { } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "97" + signature = "(I)I", + garbageValue = "428413683" ) @Export("position") protected int position() throws Exception { return this.capacity; } - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("write") protected void write() throws Exception { } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "57" + signature = "(I)V", + garbageValue = "37766209" ) @Export("close") protected void close() { } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-313753219" + garbageValue = "645078569" ) @Export("discard") protected void discard() throws Exception { } - @ObfuscatedName("av") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ldx;I)V", - garbageValue = "750974673" + signature = "(Ldz;I)V", + garbageValue = "-414582995" ) @Export("setStream") public final synchronized void setStream(PcmStream var1) { this.stream = var1; } - @ObfuscatedName("as") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1453359051" + garbageValue = "-862737237" ) @Export("run") public final synchronized void run() { - if (this.samples == null) { - return; - } - long var1 = DirectByteArrayCopier.currentTimeMs(); + if (this.samples != null) { + long var1 = SequenceDefinition.method4686(); + + try { + if (this.field1389 != 0L) { + if (var1 < this.field1389) { + return; + } - try { - if (0L != this.field1416) { - if (var1 >= this.field1416) { this.open(this.capacity); - this.field1416 = 0L; - this.field1421 = true; - } else { - return; + this.field1389 = 0L; + this.field1394 = true; } - } - - int var3 = this.position(); - if (this.field1419 - var3 > this.field1417) { - this.field1417 = this.field1419 - var3; - } - - int var4 = this.field1413 + this.field1414; - if (var4 + 256 > 16384) { - var4 = 16128; - } - - if (var4 + 256 > this.capacity) { - this.capacity += 1024; - if (this.capacity > 16384) { - this.capacity = 16384; + int var3 = this.position(); + if (this.field1393 - var3 > this.field1379) { + this.field1379 = this.field1393 - var3; + } + + int var4 = this.field1388 + this.field1399; + if (var4 + 256 > 16384) { + var4 = 16128; } - this.close(); - this.open(this.capacity); - var3 = 0; - this.field1421 = true; if (var4 + 256 > this.capacity) { - var4 = this.capacity - 256; - this.field1413 = var4 - this.field1414; - } - } + this.capacity += 1024; + if (this.capacity > 16384) { + this.capacity = 16384; + } - while (var3 < var4) { - this.fill(this.samples, 256); - this.write(); - var3 += 256; - } - - if (var1 > this.field1420) { - if (this.field1421) { - this.field1421 = false; - } else if (this.field1417 != 0 || this.field1418 != 0) { - this.field1413 = Math.min(this.field1418, this.field1417); - this.field1418 = this.field1417; - } else { this.close(); - this.field1416 = 2000L + var1; - return; + this.open(this.capacity); + var3 = 0; + this.field1394 = true; + if (var4 + 256 > this.capacity) { + var4 = this.capacity - 256; + this.field1388 = var4 - this.field1399; + } } - this.field1417 = 0; - this.field1420 = 2000L + var1; + while (var3 < var4) { + this.fill(this.samples, 256); + this.write(); + var3 += 256; + } + + if (var1 > this.field1386) { + if (!this.field1394) { + if (this.field1379 == 0 && this.field1391 == 0) { + this.close(); + this.field1389 = 2000L + var1; + return; + } + + this.field1388 = Math.min(this.field1391, this.field1379); + this.field1391 = this.field1379; + } else { + this.field1394 = false; + } + + this.field1379 = 0; + this.field1386 = var1 + 2000L; + } + + this.field1393 = var3; + } catch (Exception var7) { + this.close(); + this.field1389 = var1 + 2000L; + } + + try { + if (var1 > this.timeMs + 500000L) { + var1 = this.timeMs; + } + + while (var1 > this.timeMs + 5000L) { + this.skip(256); + this.timeMs += (long)(256000 / PcmPlayer_sampleRate); + } + } catch (Exception var6) { + this.timeMs = var1; } - this.field1419 = var3; - } catch (Exception var7) { - this.close(); - this.field1416 = var1 + 2000L; } - - try { - if (var1 > 500000L + this.timeMs) { - var1 = this.timeMs; - } - - while (var1 > 5000L + this.timeMs) { - this.skip(256); - this.timeMs += (long)(256000 / CollisionMap.PcmPlayer_sampleRate); - } - } catch (Exception var6) { - this.timeMs = var1; - } - } - @ObfuscatedName("aw") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-42" - ) - public final void method2407() { - this.field1421 = true; - } - - @ObfuscatedName("ad") + @ObfuscatedName("av") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1267599868" + garbageValue = "-1124222572" + ) + public final void method2397() { + this.field1394 = true; + } + + @ObfuscatedName("am") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "-38" ) @Export("tryDiscard") public final synchronized void tryDiscard() { - this.field1421 = true; + this.field1394 = true; try { this.discard(); } catch (Exception var2) { this.close(); - this.field1416 = DirectByteArrayCopier.currentTimeMs() + 2000L; + this.field1389 = SequenceDefinition.method4686() + 2000L; } } - @ObfuscatedName("ag") + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "2" + signature = "(I)V", + garbageValue = "58159891" ) @Export("shutdown") public final synchronized void shutdown() { - if (SecureRandomFuture.soundSystem != null) { + if (PacketBufferNode.soundSystem != null) { boolean var1 = true; for (int var2 = 0; var2 < 2; ++var2) { - if (this == SecureRandomFuture.soundSystem.players[var2]) { - SecureRandomFuture.soundSystem.players[var2] = null; + if (this == PacketBufferNode.soundSystem.players[var2]) { + PacketBufferNode.soundSystem.players[var2] = null; } - if (SecureRandomFuture.soundSystem.players[var2] != null) { + if (PacketBufferNode.soundSystem.players[var2] != null) { var1 = false; } } if (var1) { - class14.soundSystemExecutor.shutdownNow(); - class14.soundSystemExecutor = null; - SecureRandomFuture.soundSystem = null; + GrandExchangeOfferWorldComparator.soundSystemExecutor.shutdownNow(); + GrandExchangeOfferWorldComparator.soundSystemExecutor = null; + PacketBufferNode.soundSystem = null; } } @@ -318,16 +321,16 @@ public class PcmPlayer { this.samples = null; } - @ObfuscatedName("ar") + @ObfuscatedName("af") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1268557925" + garbageValue = "-1085561099" ) @Export("skip") final void skip(int var1) { - this.field1423 -= var1; - if (this.field1423 < 0) { - this.field1423 = 0; + this.field1395 -= var1; + if (this.field1395 < 0) { + this.field1395 = 0; } if (this.stream != null) { @@ -336,25 +339,27 @@ public class PcmPlayer { } - @ObfuscatedName("ax") + @ObfuscatedName("az") @Export("fill") final void fill(int[] var1, int var2) { int var3 = var2; - if (FileSystem.PcmPlayer_stereo) { + if (PcmPlayer_stereo) { var3 = var2 << 1; } - class301.clearIntArray(var1, 0, var3); - this.field1423 -= var2; - if (this.stream != null && this.field1423 <= 0) { - this.field1423 += CollisionMap.PcmPlayer_sampleRate >> 4; - GraphicsObject.PcmStream_disable(this.stream); - this.method2456(this.stream, this.stream.vmethod2689()); + class300.clearIntArray(var1, 0, var3); + this.field1395 -= var2; + if (this.stream != null && this.field1395 <= 0) { + this.field1395 += PcmPlayer_sampleRate >> 4; + WorldMapArea.PcmStream_disable(this.stream); + this.method2347(this.stream, this.stream.vmethod2644()); int var4 = 0; int var5 = 255; + int var6; PcmStream var10; - for (int var6 = 7; var5 != 0; --var6) { + label104: + for (var6 = 7; var5 != 0; --var6) { int var7; int var8; if (var6 < 0) { @@ -365,62 +370,70 @@ public class PcmPlayer { var8 = 0; } - for (int var9 = var5 >>> var7 & 0x11111111; var9 != 0; var9 >>>= 4, var7 += 4, ++var8) { - if ((var9 & 1) == 0) { - continue; - } - var5 &= ~(1 << var7); - var10 = null; + for (int var9 = var5 >>> var7 & 286331153; var9 != 0; var9 >>>= 4) { + if ((var9 & 1) != 0) { + var5 &= ~(1 << var7); + var10 = null; + PcmStream var11 = this.field1396[var7]; + label98: + while (true) { + while (true) { + if (var11 == null) { + break label98; + } - for (PcmStream var11 = this.field1426[var7]; var11 != null;) { - AbstractSound var12 = var11.sound; - if (var12 != null && var12.position > var8) { - var5 |= 1 << var7; - var10 = var11; - var11 = var11.after; - continue; - } - var11.active = true; - int var13 = var11.vmethod3892(); - var4 += var13; - if (var12 != null) { - var12.position += var13; - } + AbstractSound var12 = var11.sound; + if (var12 != null && var12.position > var8) { + var5 |= 1 << var7; + var10 = var11; + var11 = var11.after; + } else { + var11.active = true; + int var13 = var11.vmethod3834(); + var4 += var13; + if (var12 != null) { + var12.position += var13; + } - if (var4 >= this.field1406) { - return; - } + if (var4 >= this.field1384) { + break label104; + } - PcmStream var14 = var11.firstSubStream(); - if (var14 != null) { - for (int var15 = var11.field1496; var14 != null; var14 = var11.nextSubStream()) { - this.method2456(var14, var15 * var14.vmethod2689() >> 8); + PcmStream var14 = var11.firstSubStream(); + if (var14 != null) { + for (int var15 = var11.field1478; var14 != null; var14 = var11.nextSubStream()) { + this.method2347(var14, var15 * var14.vmethod2644() >> 8); + } + } + + PcmStream var18 = var11.after; + var11.after = null; + if (var10 == null) { + this.field1396[var7] = var18; + } else { + var10.after = var18; + } + + if (var18 == null) { + this.field1397[var7] = var10; + } + + var11 = var18; + } } } - - PcmStream var18 = var11.after; - var11.after = null; - if (var10 == null) { - this.field1426[var7] = var18; - } - else { - var10.after = var18; - } - - if (var18 == null) { - this.field1425[var7] = var10; - } - - var11 = var18; } + + var7 += 4; + ++var8; } } - for (int var6 = 0; var6 < 8; ++var6) { - PcmStream var16 = this.field1426[var6]; - PcmStream[] var17 = this.field1426; - this.field1425[var6] = null; + for (var6 = 0; var6 < 8; ++var6) { + PcmStream var16 = this.field1396[var6]; + PcmStream[] var17 = this.field1396; + this.field1397[var6] = null; for (var17[var6] = null; var16 != null; var16 = var10) { var10 = var16.after; @@ -429,79 +442,53 @@ public class PcmPlayer { } } - if (this.field1423 < 0) { - this.field1423 = 0; + if (this.field1395 < 0) { + this.field1395 = 0; } if (this.stream != null) { this.stream.fill(var1, 0, var2); } - this.timeMs = DirectByteArrayCopier.currentTimeMs(); + this.timeMs = SequenceDefinition.method4686(); } - @ObfuscatedName("ae") + @ObfuscatedName("an") @ObfuscatedSignature( - signature = "(Ldx;II)V", - garbageValue = "2049205678" + signature = "(Ldz;II)V", + garbageValue = "-2059733660" ) - final void method2456(PcmStream var1, int var2) { + final void method2347(PcmStream var1, int var2) { int var3 = var2 >> 5; - PcmStream var4 = this.field1425[var3]; + PcmStream var4 = this.field1397[var3]; if (var4 == null) { - this.field1426[var3] = var1; + this.field1396[var3] = var1; } else { var4.after = var1; } - this.field1425[var3] = var1; - var1.field1496 = var2; + this.field1397[var3] = var1; + var1.field1478 = var2; } - @ObfuscatedName("q") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(B)[Lll;", - garbageValue = "69" + signature = "(IB)Z", + garbageValue = "0" ) - @Export("FillMode_values") - public static FillMode[] FillMode_values() { - return new FillMode[]{FillMode.GRADIENT, FillMode.SOLID, FillMode.GRADIENTALPHA}; + public static boolean method2396(int var0) { + return (var0 >> 21 & 1) != 0; } - @ObfuscatedName("ip") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lhj;IIB)V", - garbageValue = "-55" + signature = "(Lhz;Lhz;Ljava/lang/String;Ljava/lang/String;B)Lkb;", + garbageValue = "0" ) - @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); - } - + @Export("SpriteBuffer_getFontByName") + public static Font SpriteBuffer_getFontByName(AbstractArchive var0, AbstractArchive var1, String var2, String var3) { + int var4 = var0.getGroupId(var2); + int var5 = var0.getFileId(var4, var3); + return FileSystem.SpriteBuffer_getFont(var0, var1, var4, var5); } } diff --git a/runescape-client/src/main/java/PcmPlayerProvider.java b/runescape-client/src/main/java/PcmPlayerProvider.java index e196912e17..133e44e263 100644 --- a/runescape-client/src/main/java/PcmPlayerProvider.java +++ b/runescape-client/src/main/java/PcmPlayerProvider.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cm") +@ObfuscatedName("ct") @Implements("PcmPlayerProvider") public interface PcmPlayerProvider { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(B)Ldn;", - garbageValue = "1" + signature = "(S)Ldd;", + garbageValue = "-22145" ) @Export("player") PcmPlayer player(); diff --git a/runescape-client/src/main/java/PcmStream.java b/runescape-client/src/main/java/PcmStream.java index 447f42fa68..5da9f33eac 100644 --- a/runescape-client/src/main/java/PcmStream.java +++ b/runescape-client/src/main/java/PcmStream.java @@ -3,62 +3,62 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dx") +@ObfuscatedName("dz") @Implements("PcmStream") public abstract class PcmStream extends Node { - @ObfuscatedName("w") - @Export("active") - volatile boolean active; - @ObfuscatedName("g") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "Ldx;" + signature = "Ldz;" ) @Export("after") PcmStream after; - @ObfuscatedName("a") - int field1496; - @ObfuscatedName("j") + @ObfuscatedName("g") + int field1478; + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Ldu;" + signature = "Lds;" ) @Export("sound") AbstractSound sound; + @ObfuscatedName("z") + @Export("active") + volatile boolean active; protected PcmStream() { this.active = true; } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "()Ldx;" + signature = "()Ldz;" ) @Export("firstSubStream") protected abstract PcmStream firstSubStream(); - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "()Ldx;" + signature = "()Ldz;" ) @Export("nextSubStream") protected abstract PcmStream nextSubStream(); - @ObfuscatedName("i") - protected abstract int vmethod3892(); + @ObfuscatedName("q") + protected abstract int vmethod3834(); - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("fill") protected abstract void fill(int[] var1, int var2, int var3); - @ObfuscatedName("x") + @ObfuscatedName("f") @Export("skip") protected abstract void skip(int var1); - @ObfuscatedName("ay") - int vmethod2689() { + @ObfuscatedName("ak") + int vmethod2644() { return 255; } - @ObfuscatedName("ec") + @ObfuscatedName("fo") @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 b1ea96aae0..6f50c36481 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("cz") +@ObfuscatedName("cq") @Implements("PcmStreamMixer") public class PcmStreamMixer extends PcmStream { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Ljh;" + signature = "Ljc;" ) @Export("subStreams") NodeDeque subStreams; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Ljh;" + signature = "Ljc;" ) - NodeDeque field1342; - @ObfuscatedName("p") - int field1343; + NodeDeque field1317; + @ObfuscatedName("i") + int field1315; @ObfuscatedName("k") - int field1344; + int field1314; public PcmStreamMixer() { this.subStreams = new NodeDeque(); - this.field1342 = new NodeDeque(); - this.field1343 = 0; - this.field1344 = -1; + this.field1317 = new NodeDeque(); + this.field1315 = 0; + this.field1314 = -1; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ldx;)V" + signature = "(Ldz;)V" ) @Export("addSubStream") public final synchronized void addSubStream(PcmStream var1) { this.subStreams.addLast(var1); } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Ldx;)V" + signature = "(Ldz;)V" ) @Export("removeSubStream") public final synchronized void removeSubStream(PcmStream var1) { var1.remove(); } - @ObfuscatedName("e") - void method2283() { - if (this.field1343 > 0) { - for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field1342.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field1342.previous()) { - var1.field1452 -= this.field1343; + @ObfuscatedName("i") + void method2218() { + if (this.field1315 > 0) { + for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field1317.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field1317.previous()) { + var1.field1429 -= this.field1315; } - this.field1344 -= this.field1343; - this.field1343 = 0; + this.field1314 -= this.field1315; + this.field1315 = 0; } } - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(Lfw;Ldj;)V" - ) - void method2273(Node var1, PcmStreamMixerListener var2) { - while (this.field1342.sentinel != var1 && ((PcmStreamMixerListener)var1).field1452 <= var2.field1452) { - var1 = var1.previous; - } - - NodeDeque.NodeDeque_addBefore(var2, var1); - this.field1344 = ((PcmStreamMixerListener)this.field1342.sentinel.previous).field1452; - } - @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "(Lfb;Ldj;)V" + ) + void method2226(Node var1, PcmStreamMixerListener var2) { + while (this.field1317.sentinel != var1 && ((PcmStreamMixerListener)var1).field1429 <= var2.field1429) { + var1 = var1.previous; + } + + NodeDeque.NodeDeque_addBefore(var2, var1); + this.field1314 = ((PcmStreamMixerListener)this.field1317.sentinel.previous).field1429; + } + + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(Ldj;)V" ) - void method2274(PcmStreamMixerListener var1) { + void method2230(PcmStreamMixerListener var1) { var1.remove(); var1.remove2(); - Node var2 = this.field1342.sentinel.previous; - if (var2 == this.field1342.sentinel) { - this.field1344 = -1; + Node var2 = this.field1317.sentinel.previous; + if (var2 == this.field1317.sentinel) { + this.field1314 = -1; } else { - this.field1344 = ((PcmStreamMixerListener)var2).field1452; + this.field1314 = ((PcmStreamMixerListener)var2).field1429; } } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "()Ldx;" + signature = "()Ldz;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { return (PcmStream)this.subStreams.last(); } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "()Ldx;" + signature = "()Ldz;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { return (PcmStream)this.subStreams.previous(); } - @ObfuscatedName("i") - protected int vmethod3892() { + @ObfuscatedName("q") + protected int vmethod3834() { return 0; } - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("fill") public final synchronized void fill(int[] var1, int var2, int var3) { do { - if (this.field1344 < 0) { + if (this.field1314 < 0) { this.updateSubStreams(var1, var2, var3); return; } - if (var3 + this.field1343 < this.field1344) { - this.field1343 += var3; + if (var3 + this.field1315 < this.field1314) { + this.field1315 += var3; this.updateSubStreams(var1, var2, var3); return; } - int var4 = this.field1344 - this.field1343; + int var4 = this.field1314 - this.field1315; this.updateSubStreams(var1, var2, var4); var2 += var4; var3 -= var4; - this.field1343 += var4; - this.method2283(); - PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field1342.last(); + this.field1315 += var4; + this.method2218(); + PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field1317.last(); synchronized(var5) { int var7 = var5.update(); if (var7 < 0) { - var5.field1452 = 0; - this.method2274(var5); + var5.field1429 = 0; + this.method2230(var5); } else { - var5.field1452 = var7; - this.method2273(var5.previous, var5); + var5.field1429 = var7; + this.method2226(var5.previous, var5); } } } while(var3 != 0); } - @ObfuscatedName("u") + @ObfuscatedName("d") @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("x") + @ObfuscatedName("f") @Export("skip") public final synchronized void skip(int var1) { do { - if (this.field1344 < 0) { + if (this.field1314 < 0) { this.skipSubStreams(var1); return; } - if (this.field1343 + var1 < this.field1344) { - this.field1343 += var1; + if (this.field1315 + var1 < this.field1314) { + this.field1315 += var1; this.skipSubStreams(var1); return; } - int var2 = this.field1344 - this.field1343; + int var2 = this.field1314 - this.field1315; this.skipSubStreams(var2); var1 -= var2; - this.field1343 += var2; - this.method2283(); - PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field1342.last(); + this.field1315 += var2; + this.method2218(); + PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field1317.last(); synchronized(var3) { int var5 = var3.update(); if (var5 < 0) { - var3.field1452 = 0; - this.method2274(var3); + var3.field1429 = 0; + this.method2230(var3); } else { - var3.field1452 = var5; - this.method2273(var3.previous, var3); + var3.field1429 = var5; + this.method2226(var3.previous, var3); } } } while(var1 != 0); } - @ObfuscatedName("r") + @ObfuscatedName("c") @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 7959db7f2a..f1a4ac3045 100644 --- a/runescape-client/src/main/java/PcmStreamMixerListener.java +++ b/runescape-client/src/main/java/PcmStreamMixerListener.java @@ -6,16 +6,16 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("dj") @Implements("PcmStreamMixerListener") public abstract class PcmStreamMixerListener extends Node { - @ObfuscatedName("q") - int field1452; + @ObfuscatedName("s") + int field1429; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("remove2") abstract void remove2(); - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lcz;)I" + signature = "(Lcq;)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 277b9501c8..9191671d38 100644 --- a/runescape-client/src/main/java/PendingSpawn.java +++ b/runescape-client/src/main/java/PendingSpawn.java @@ -3,87 +3,77 @@ 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("bt") +@ObfuscatedName("bm") @Implements("PendingSpawn") public final class PendingSpawn extends Node { - @ObfuscatedName("sq") - @ObfuscatedSignature( - signature = "Lih;" - ) - public static class237 field944; - @ObfuscatedName("sw") - @ObfuscatedSignature( - signature = "Lb;" - ) - @Export("grandExchangeEvents") - static GrandExchangeEvents grandExchangeEvents; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1117563783 + intValue = 520550313 ) @Export("plane") int plane; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1026352463 + intValue = -1382168131 ) @Export("type") int type; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1124430139 + intValue = -1841764773 ) @Export("x") int x; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1248195559 + intValue = -677953367 ) @Export("y") int y; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 160620695 + intValue = -1218871691 ) @Export("objectId") int objectId; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1900923625 + intValue = -1853437901 ) - int field936; - @ObfuscatedName("b") + int field907; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1207440287 + intValue = -1490063309 ) - int field933; - @ObfuscatedName("i") + int field903; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1651150405 + intValue = 1310509737 ) @Export("id") int id; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1876574001 + intValue = -1509033293 ) @Export("orientation") int orientation; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -1964885807 + ) + int field911; @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -884568825 - ) - int field940; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -1567883817 + intValue = 679658845 ) @Export("delay") int delay; - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 783887651 + intValue = 2126284793 ) @Export("hitpoints") int hitpoints; @@ -95,61 +85,284 @@ public final class PendingSpawn extends Node { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "-1833847542" + signature = "(I)V", + garbageValue = "-1879382681" ) - static void method1653(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); - } + static void method1661() { + Login.loginIndex = 24; + GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "You were disconnected from the server.", ""); } - @ObfuscatedName("jr") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIIB)Lbo;", - garbageValue = "124" + signature = "(ILcr;ZI)I", + garbageValue = "1685357339" ) - static final InterfaceParent method1652(int var0, int var1, int var2) { - InterfaceParent var3 = new InterfaceParent(); - var3.group = var1; - var3.type = var2; - Client.interfaceParents.put(var3, (long)var0); - GrandExchangeOfferAgeComparator.Widget_resetModelFrames(var1); - Widget var4 = class80.getWidget(var0); - Strings.invalidateWidget(var4); - if (Client.meslayerContinueWidget != null) { - Strings.invalidateWidget(Client.meslayerContinueWidget); - Client.meslayerContinueWidget = null; - } - - for (int var5 = 0; var5 < Client.menuOptionsCount; ++var5) { - if (class1.isWidgetMenuOpcode(Client.menuOpcodes[var5])) { - if (var5 < Client.menuOptionsCount - 1) { - for (int var6 = var5; var6 < Client.menuOptionsCount - 1; ++var6) { - Client.menuActions[var6] = Client.menuActions[var6 + 1]; - Client.menuTargets[var6] = Client.menuTargets[var6 + 1]; - Client.menuOpcodes[var6] = Client.menuOpcodes[var6 + 1]; - Client.menuIdentifiers[var6] = Client.menuIdentifiers[var6 + 1]; - Client.menuArguments1[var6] = Client.menuArguments1[var6 + 1]; - Client.menuArguments2[var6] = Client.menuArguments2[var6 + 1]; - Client.menuShiftClick[var6] = Client.menuShiftClick[var6 + 1]; + static int method1660(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CLIENTCLOCK) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.cycle; + return 1; + } else { + int var3; + int var4; + if (var0 == ScriptOpcodes.INV_GETOBJ) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Language.method3605(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INV_GETNUM) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Decimator.ItemContainer_getCount(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INV_TOTAL) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class43.method761(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INV_SIZE) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Actor.getInvDefinition(var3).size; + return 1; + } else if (var0 == ScriptOpcodes.STAT) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; + return 1; + } else if (var0 == ScriptOpcodes.STAT_BASE) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.levels[var3]; + return 1; + } else if (var0 == ScriptOpcodes.STAT_XP) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.experience[var3]; + return 1; + } else { + int var5; + if (var0 == ScriptOpcodes.COORD) { + var3 = ItemContainer.plane; + var4 = PacketWriter.baseX * 64 + (WorldMapIcon_1.localPlayer.x >> 7); + var5 = RouteStrategy.baseY * 64 + (WorldMapIcon_1.localPlayer.y >> 7); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); + return 1; + } else if (var0 == ScriptOpcodes.COORDX) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; + return 1; + } else if (var0 == ScriptOpcodes.COORDZ) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 >> 28; + return 1; + } else if (var0 == ScriptOpcodes.COORDY) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & 16383; + return 1; + } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Language.method3605(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Decimator.ItemContainer_getCount(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class43.method761(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { + if (Client.staffModLevel >= 2) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.staffModLevel; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; } - } - --var5; - --Client.menuOptionsCount; + return 1; + } else if (var0 == ScriptOpcodes.REBOOTTIMER) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rebootTimer; + return 1; + } else if (var0 == ScriptOpcodes.MAP_WORLD) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.worldId; + return 1; + } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.runEnergy; + return 1; + } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.weight; + return 1; + } else if (var0 == ScriptOpcodes.PLAYERMOD) { + if (Client.playerMod) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDFLAGS) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.worldProperties; + return 1; + } else if (var0 == ScriptOpcodes.MOVECOORD) { + Interpreter.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + int var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; + var3 += var4 << 14; + var3 += var5 << 28; + var3 += var6; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; + return 1; + } else { + return 2; + } } } + } - GrandExchangeOfferAgeComparator.calculateMenuBounds(); - WorldMapSprite.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var0 >> 16], var4, false); - Canvas.runWidgetOnLoadListener(var1); - if (Client.rootInterface != -1) { - WorldMapLabelSize.runIntfCloseListeners(Client.rootInterface, 1); + @ObfuscatedName("gy") + @ObfuscatedSignature( + signature = "(ZLkx;B)V", + garbageValue = "4" + ) + @Export("loadRegions") + static final void loadRegions(boolean var0, PacketBuffer var1) { + Client.isInInstance = var0; + int var2; + int var3; + int var5; + int var6; + int var7; + int var8; + if (!Client.isInInstance) { + var2 = var1.method5447(); + var3 = var1.method5446(); + int var4 = var1.readUnsignedShort(); + ModelData0.xteaKeys = new int[var4][4]; + + for (var5 = 0; var5 < var4; ++var5) { + for (var6 = 0; var6 < 4; ++var6) { + ModelData0.xteaKeys[var5][var6] = var1.readInt(); + } + } + + class186.regions = new int[var4]; + MouseHandler.regionMapArchiveIds = new int[var4]; + ClanChat.regionLandArchiveIds = new int[var4]; + GraphicsObject.regionLandArchives = new byte[var4][]; + Messages.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)) { + class186.regions[var4] = var8; + MouseHandler.regionMapArchiveIds[var4] = WorldMapDecoration.archive5.getGroupId("m" + var6 + "_" + var7); + ClanChat.regionLandArchiveIds[var4] = WorldMapDecoration.archive5.getGroupId("l" + var6 + "_" + var7); + ++var4; + } + } + } + + ModelData0.method3198(var3, var2, true); + } else { + var2 = var1.method5446(); + var3 = var1.method5447(); + boolean var15 = var1.readUnsignedByte() == 1; + 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(); + ModelData0.xteaKeys = new int[var5][4]; + + for (var6 = 0; var6 < var5; ++var6) { + for (var7 = 0; var7 < 4; ++var7) { + ModelData0.xteaKeys[var6][var7] = var1.readInt(); + } + } + + class186.regions = new int[var5]; + MouseHandler.regionMapArchiveIds = new int[var5]; + ClanChat.regionLandArchiveIds = new int[var5]; + GraphicsObject.regionLandArchives = new byte[var5][]; + Messages.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 (class186.regions[var13] == var12) { + var12 = -1; + break; + } + } + + if (var12 != -1) { + class186.regions[var5] = var12; + var13 = var12 >> 8 & 255; + int var14 = var12 & 255; + MouseHandler.regionMapArchiveIds[var5] = WorldMapDecoration.archive5.getGroupId("m" + var13 + "_" + var14); + ClanChat.regionLandArchiveIds[var5] = WorldMapDecoration.archive5.getGroupId("l" + var13 + "_" + var14); + ++var5; + } + } + } + } + } + + ModelData0.method3198(var3, var2, !var15); } - return var3; + } + + @ObfuscatedName("iq") + @ObfuscatedSignature( + signature = "(II)Z", + garbageValue = "215444906" + ) + @Export("isWidgetMenuOpcode") + static boolean isWidgetMenuOpcode(int var0) { + return var0 == 57 || var0 == 58 || var0 == 1007 || var0 == 25 || var0 == 30; } } diff --git a/runescape-client/src/main/java/PlatformInfo.java b/runescape-client/src/main/java/PlatformInfo.java index ddae5142e5..ae4336686c 100644 --- a/runescape-client/src/main/java/PlatformInfo.java +++ b/runescape-client/src/main/java/PlatformInfo.java @@ -4,188 +4,190 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lo") +@ObfuscatedName("lx") @Implements("PlatformInfo") public class PlatformInfo extends Node { - @ObfuscatedName("ar") - @ObfuscatedGetter( - intValue = 1707055259 - ) - int field3938; - @ObfuscatedName("ax") - boolean field3939; - @ObfuscatedName("az") - @ObfuscatedGetter( - intValue = -2001152495 - ) - int field3953; - @ObfuscatedName("ae") - @ObfuscatedGetter( - intValue = -695975343 - ) - int field3941; - @ObfuscatedName("ao") - @ObfuscatedGetter( - intValue = -1607985897 - ) - int field3942; - @ObfuscatedName("aj") - @ObfuscatedGetter( - intValue = 2094714279 - ) - int field3961; - @ObfuscatedName("at") - @ObfuscatedGetter( - intValue = -861639539 - ) - int field3944; - @ObfuscatedName("ac") - boolean field3945; - @ObfuscatedName("ap") - @ObfuscatedGetter( - intValue = 2056129 - ) - int field3962; - @ObfuscatedName("aq") - @ObfuscatedGetter( - intValue = -1736431355 - ) - int field3943; @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -233301775 + intValue = 37588435 ) - int field3948; - @ObfuscatedName("au") + int field3915; + @ObfuscatedName("at") + boolean field3930; + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 847094315 + intValue = 1883484511 ) - int field3949; - @ObfuscatedName("ai") - String field3934; + int field3917; @ObfuscatedName("ak") - String field3951; - @ObfuscatedName("ah") - String field3952; - @ObfuscatedName("am") - String field3946; + @ObfuscatedGetter( + intValue = -2081208413 + ) + int field3918; + @ObfuscatedName("ao") + @ObfuscatedGetter( + intValue = 999773569 + ) + int field3913; + @ObfuscatedName("ac") + @ObfuscatedGetter( + intValue = 516607859 + ) + int field3919; + @ObfuscatedName("ar") + @ObfuscatedGetter( + intValue = -1900568439 + ) + int field3921; + @ObfuscatedName("au") + boolean field3922; + @ObfuscatedName("ax") + @ObfuscatedGetter( + intValue = -1778909967 + ) + int field3923; + @ObfuscatedName("ag") + @ObfuscatedGetter( + intValue = 1710231033 + ) + int field3924; + @ObfuscatedName("ap") + @ObfuscatedGetter( + intValue = -468207561 + ) + int field3925; + @ObfuscatedName("aq") + @ObfuscatedGetter( + intValue = -1974137013 + ) + int field3926; @ObfuscatedName("ay") - @ObfuscatedGetter( - intValue = -1073737943 - ) - int field3936; - @ObfuscatedName("af") - @ObfuscatedGetter( - intValue = 1191319899 - ) - int field3955; + String field3927; + @ObfuscatedName("ad") + String field3928; + @ObfuscatedName("al") + String field3938; + @ObfuscatedName("ah") + String field3932; @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 1715941693 + intValue = -144799921 ) - int field3956; + int field3931; + @ObfuscatedName("aw") + @ObfuscatedGetter( + intValue = 363262683 + ) + int field3936; + @ObfuscatedName("ae") + @ObfuscatedGetter( + intValue = 529470443 + ) + int field3933; + @ObfuscatedName("bk") + @ObfuscatedGetter( + intValue = -1264069707 + ) + int field3934; + @ObfuscatedName("bw") + String field3935; + @ObfuscatedName("bo") + String field3907; + @ObfuscatedName("bn") + int[] field3937; @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = 1742476945 + intValue = -1729489163 ) - int field3957; + int field3905; @ObfuscatedName("bz") - String field3947; - @ObfuscatedName("bi") - String field3959; - @ObfuscatedName("bg") - int[] field3960; - @ObfuscatedName("bh") - @ObfuscatedGetter( - intValue = -1399141483 - ) - int field3935; - @ObfuscatedName("bm") - String field3931; + String field3939; 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.field3960 = new int[3]; - this.field3938 = var1; - this.field3939 = var2; - this.field3953 = var3; - this.field3941 = var4; - this.field3942 = var5; - this.field3961 = var6; - this.field3944 = var7; - this.field3945 = var8; - this.field3962 = var9; - this.field3943 = var10; - this.field3948 = var11; - this.field3949 = var12; - this.field3934 = var13; - this.field3951 = var14; - this.field3952 = var15; - this.field3946 = var16; - this.field3936 = var17; - this.field3955 = var18; - this.field3956 = var19; - this.field3957 = var20; - this.field3947 = var21; - this.field3959 = var22; - this.field3960 = var23; - this.field3935 = var24; - this.field3931 = var25; + this.field3937 = new int[3]; + this.field3915 = var1; + this.field3930 = var2; + this.field3917 = var3; + this.field3918 = var4; + this.field3913 = var5; + this.field3919 = var6; + this.field3921 = var7; + this.field3922 = var8; + this.field3923 = var9; + this.field3924 = var10; + this.field3925 = var11; + this.field3926 = var12; + this.field3927 = var13; + this.field3928 = var14; + this.field3938 = var15; + this.field3932 = var16; + this.field3931 = var17; + this.field3936 = var18; + this.field3933 = var19; + this.field3934 = var20; + this.field3935 = var21; + this.field3907 = var22; + this.field3937 = var23; + this.field3905 = var24; + this.field3939 = var25; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lkf;I)V", - garbageValue = "-1667072289" + signature = "(Lky;I)V", + garbageValue = "-766634357" ) @Export("write") public void write(Buffer var1) { var1.writeByte(8); - var1.writeByte(this.field3938); - var1.writeByte(this.field3939 ? 1 : 0); - var1.writeShort(this.field3953); - var1.writeByte(this.field3941); - var1.writeByte(this.field3942); - var1.writeByte(this.field3961); - var1.writeByte(this.field3944); - var1.writeByte(this.field3945 ? 1 : 0); - var1.writeShort(this.field3962); - var1.writeByte(this.field3943); - var1.writeMedium(this.field3948); - var1.writeShort(this.field3949); - var1.writeStringCp1252NullCircumfixed(this.field3934); - var1.writeStringCp1252NullCircumfixed(this.field3951); - var1.writeStringCp1252NullCircumfixed(this.field3952); - var1.writeStringCp1252NullCircumfixed(this.field3946); - var1.writeByte(this.field3955); - var1.writeShort(this.field3936); - var1.writeStringCp1252NullCircumfixed(this.field3947); - var1.writeStringCp1252NullCircumfixed(this.field3959); - var1.writeByte(this.field3956); - var1.writeByte(this.field3957); + var1.writeByte(this.field3915); + var1.writeByte(this.field3930 ? 1 : 0); + var1.writeShort(this.field3917); + var1.writeByte(this.field3918); + var1.writeByte(this.field3913); + var1.writeByte(this.field3919); + var1.writeByte(this.field3921); + var1.writeByte(this.field3922 ? 1 : 0); + var1.writeShort(this.field3923); + var1.writeByte(this.field3924); + var1.writeMedium(this.field3925); + var1.writeShort(this.field3926); + var1.writeStringCp1252NullCircumfixed(this.field3927); + var1.writeStringCp1252NullCircumfixed(this.field3928); + var1.writeStringCp1252NullCircumfixed(this.field3938); + var1.writeStringCp1252NullCircumfixed(this.field3932); + var1.writeByte(this.field3936); + var1.writeShort(this.field3931); + var1.writeStringCp1252NullCircumfixed(this.field3935); + var1.writeStringCp1252NullCircumfixed(this.field3907); + var1.writeByte(this.field3933); + var1.writeByte(this.field3934); - for (int var2 = 0; var2 < this.field3960.length; ++var2) { - var1.writeInt(this.field3960[var2]); + for (int var2 = 0; var2 < this.field3937.length; ++var2) { + var1.writeInt(this.field3937[var2]); } - var1.writeInt(this.field3935); - var1.writeStringCp1252NullCircumfixed(this.field3931); + var1.writeInt(this.field3905); + var1.writeStringCp1252NullCircumfixed(this.field3939); } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-5" + signature = "(I)I", + garbageValue = "1869130367" ) @Export("size") public int size() { byte var1 = 39; - int var2 = var1 + class13.method152(this.field3934); - var2 += class13.method152(this.field3951); - var2 += class13.method152(this.field3952); - var2 += class13.method152(this.field3946); - var2 += class13.method152(this.field3947); - var2 += class13.method152(this.field3959); - var2 += class13.method152(this.field3931); - return var2; + int var5 = var1 + GrandExchangeOfferWorldComparator.method80(this.field3927); + var5 += GrandExchangeOfferWorldComparator.method80(this.field3928); + var5 += GrandExchangeOfferWorldComparator.method80(this.field3938); + var5 += GrandExchangeOfferWorldComparator.method80(this.field3932); + var5 += GrandExchangeOfferWorldComparator.method80(this.field3935); + String var4 = this.field3907; + int var3 = var4.length() + 2; + var5 += var3; + var5 += GrandExchangeOfferWorldComparator.method80(this.field3939); + return var5; } } diff --git a/runescape-client/src/main/java/PlatformInfoProvider.java b/runescape-client/src/main/java/PlatformInfoProvider.java index 9917b1e843..09a2861152 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("lu") +@ObfuscatedName("lw") @Implements("PlatformInfoProvider") public interface PlatformInfoProvider { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(I)Llo;", - garbageValue = "1619784372" + signature = "(I)Llx;", + garbageValue = "-1719381077" ) @Export("get") PlatformInfo get(); diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index 7290b790a1..f2a5c1aa9f 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -1,161 +1,171 @@ import java.applet.Applet; -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 netscape.javascript.JSObject; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("bd") @Implements("Player") public final class Player extends Actor { - @ObfuscatedName("q") + @ObfuscatedName("rm") + @ObfuscatedGetter( + intValue = -1071324325 + ) + static int field605; + @ObfuscatedName("gk") @ObfuscatedSignature( - signature = "Ljv;" + signature = "Lea;" + ) + @Export("scene") + static Scene scene; + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "Ljx;" ) @Export("username") Username username; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lhh;" + signature = "Lhy;" ) @Export("appearance") PlayerAppearance appearance; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1793171209 + intValue = 1192279175 ) @Export("headIconPk") int headIconPk; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -116528069 + intValue = 467804137 ) @Export("headIconPrayer") int headIconPrayer; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("actions") String[] actions; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1476185215 + intValue = 1678004971 ) @Export("combatLevel") int combatLevel; - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1080230181 + intValue = -111404567 ) @Export("skillLevel") int skillLevel; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -2135092057 + intValue = 339695519 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("f") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1201001853 + intValue = 1030156263 ) @Export("animationCycleStart") int animationCycleStart; - @ObfuscatedName("m") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -638825891 + intValue = 1574000409 ) @Export("animationCycleEnd") int animationCycleEnd; - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1264352661 + intValue = 1214691187 ) - int field633; - @ObfuscatedName("x") + int field599; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1920260179 + intValue = -880216621 ) @Export("tileHeight2") int tileHeight2; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -458476465 + intValue = -1144569719 ) - int field620; - @ObfuscatedName("v") + int field601; + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Ldm;" + signature = "Ldo;" ) @Export("model0") Model model0; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 122892619 + intValue = 368063167 ) - int field627; + int field603; @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 496730799 + intValue = 163934537 ) - int field625; + int field604; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -548421503 + ) + int field616; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -1361539533 + ) + int field606; @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = -1488894543 - ) - int field612; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -87750643 - ) - int field630; - @ObfuscatedName("t") @Export("isUnanimated") boolean isUnanimated; - @ObfuscatedName("h") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1859866113 + intValue = -670761469 ) @Export("team") int team; - @ObfuscatedName("o") + @ObfuscatedName("l") @Export("isHidden") boolean isHidden; - @ObfuscatedName("n") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1801151479 + intValue = -58712163 ) @Export("plane") int plane; - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1548494187 + intValue = 722380261 ) @Export("index") int index; - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Ljy;" + signature = "Ljj;" ) @Export("isFriendTriBool") TriBool isFriendTriBool; - @ObfuscatedName("z") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Ljy;" + signature = "Ljj;" ) @Export("isInClanChat") TriBool isInClanChat; - @ObfuscatedName("al") - boolean field638; @ObfuscatedName("av") + boolean field614; + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 811764289 + intValue = 147350869 ) @Export("tileX") int tileX; - @ObfuscatedName("as") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = -1120087893 + intValue = 1655455797 ) @Export("tileY") int tileY; @@ -178,13 +188,13 @@ public final class Player extends Actor { this.isHidden = false; this.isFriendTriBool = TriBool.TriBool_unknown; this.isInClanChat = TriBool.TriBool_unknown; - this.field638 = false; + this.field614 = false; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lkf;I)V", - garbageValue = "-641392846" + signature = "(Lky;B)V", + garbageValue = "15" ) @Export("read") final void read(Buffer var1) { @@ -205,13 +215,13 @@ public final class Player extends Actor { } else { var7 = var1.readUnsignedByte(); var4[var5] = var7 + (var6 << 8); - if (var5 == 0 && var4[0] == 0xffff) { + if (var5 == 0 && var4[0] == 65535) { var3 = var1.readUnsignedShort(); break; } if (var4[var5] >= 512) { - int var8 = WorldMapArea.ItemDefinition_get(var4[var5] - 512).team; + int var8 = WorldMapData_0.ItemDefinition_get(var4[var5] - 512).team; if (var8 != 0) { this.team = var8; } @@ -223,7 +233,7 @@ public final class Player extends Actor { for (var6 = 0; var6 < 5; ++var6) { var7 = var1.readUnsignedByte(); - if (var7 < 0 || var7 >= class247.field3291[var6].length) { + if (var7 < 0 || var7 >= FontName.field3651[var6].length) { var7 = 0; } @@ -231,46 +241,46 @@ public final class Player extends Actor { } super.readySequence = var1.readUnsignedShort(); - if (super.readySequence == 0xffff) { + if (super.readySequence == 65535) { super.readySequence = -1; } super.turnLeftSequence = var1.readUnsignedShort(); - if (super.turnLeftSequence == 0xffff) { + if (super.turnLeftSequence == 65535) { super.turnLeftSequence = -1; } super.turnRightSequence = super.turnLeftSequence; super.walkSequence = var1.readUnsignedShort(); - if (super.walkSequence == 0xffff) { + if (super.walkSequence == 65535) { super.walkSequence = -1; } super.walkBackSequence = var1.readUnsignedShort(); - if (super.walkBackSequence == 0xffff) { + if (super.walkBackSequence == 65535) { super.walkBackSequence = -1; } super.walkLeftSequence = var1.readUnsignedShort(); - if (super.walkLeftSequence == 0xffff) { + if (super.walkLeftSequence == 65535) { super.walkLeftSequence = -1; } super.walkRightSequence = var1.readUnsignedShort(); - if (super.walkRightSequence == 0xffff) { + if (super.walkRightSequence == 65535) { super.walkRightSequence = -1; } super.runSequence = var1.readUnsignedShort(); - if (super.runSequence == 0xffff) { + if (super.runSequence == 65535) { super.runSequence = -1; } - this.username = new Username(var1.readStringCp1252NullTerminated(), class40.loginType); + this.username = new Username(var1.readStringCp1252NullTerminated(), FontName.loginType); this.clearIsFriend(); this.clearIsInClanChat(); - if (this == Client.localPlayer) { - GrandExchangeOfferUnitPriceComparator.localPlayerName = this.username.getName(); + if (this == WorldMapIcon_1.localPlayer) { + RunException.localPlayerName = this.username.getName(); } this.combatLevel = var1.readUnsignedByte(); @@ -287,10 +297,10 @@ public final class Player extends Actor { this.appearance.update(var4, var9, var2 == 1, var3); } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-1900430541" + signature = "(B)Z", + garbageValue = "-83" ) @Export("isFriend") boolean isFriend() { @@ -301,30 +311,30 @@ public final class Player extends Actor { return this.isFriendTriBool == TriBool.TriBool_true; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-29" + signature = "(I)V", + garbageValue = "-1921612164" ) @Export("clearIsFriend") void clearIsFriend() { this.isFriendTriBool = TriBool.TriBool_unknown; } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1998050438" + garbageValue = "1245343177" ) @Export("checkIsFriend") void checkIsFriend() { - this.isFriendTriBool = ArchiveLoader.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isFriendTriBool = class32.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "12" + signature = "(I)Z", + garbageValue = "91374353" ) @Export("isClanMember") boolean isClanMember() { @@ -335,153 +345,726 @@ public final class Player extends Actor { return this.isInClanChat == TriBool.TriBool_true; } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-2115191954" + garbageValue = "-1756216558" ) @Export("clearIsInClanChat") void clearIsInClanChat() { this.isInClanChat = TriBool.TriBool_unknown; } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1972244682" + garbageValue = "923060512" ) @Export("updateIsInClanChat") void updateIsInClanChat() { - this.isInClanChat = DevicePcmPlayerProvider.clanChat != null && DevicePcmPlayerProvider.clanChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isInClanChat = Client.clanChat != null && Client.clanChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1116736107" + garbageValue = "910894704" ) @Export("transformedSize") int transformedSize() { - return this.appearance != null && this.appearance.npcTransformId != -1 ? GameShell.getNpcDefinition(this.appearance.npcTransformId).size : 1; + return this.appearance != null && this.appearance.npcTransformId != -1 ? ViewportMouse.getNpcDefinition(this.appearance.npcTransformId).size : 1; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)Ldm;", - garbageValue = "759381421" + signature = "(I)Ldo;", + garbageValue = "-419920513" ) @Export("getModel") protected final Model getModel() { if (this.appearance == null) { return null; - } - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? GrandExchangeEvent.SequenceDefinition_get(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence != -1 && !this.isUnanimated && (super.movementSequence != super.readySequence || var1 == null) ? GrandExchangeEvent.SequenceDefinition_get(super.movementSequence) : null; - Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); - if (var3 == null) { - return null; - } - var3.calculateBoundsCylinder(); - super.defaultHeight = var3.height; - Model var4; - Model[] var5; - if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { - var4 = MusicPatch.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); - if (var4 != null) { - var4.offsetBy(0, -super.heightOffset, 0); - var5 = new Model[]{var3, var4}; - var3 = new Model(var5, 2); - } - } - - if (!this.isUnanimated && this.model0 != null) { - if (Client.cycle >= this.animationCycleEnd) { - this.model0 = null; - } - - if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { - var4 = this.model0; - var4.offsetBy(this.field633 * 4096 - super.x, this.tileHeight2 - this.tileHeight, this.field620 * 4096 - super.y); - if (super.orientation == 512) { - var4.rotateY90Ccw(); - var4.rotateY90Ccw(); - var4.rotateY90Ccw(); - } else if (super.orientation == 1024) { - var4.rotateY90Ccw(); - var4.rotateY90Ccw(); - } else if (super.orientation == 1536) { - var4.rotateY90Ccw(); + } else { + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? Widget.SequenceDefinition_get(super.sequence) : null; + SequenceDefinition var2 = super.movementSequence != -1 && !this.isUnanimated && (super.readySequence != super.movementSequence || var1 == null) ? Widget.SequenceDefinition_get(super.movementSequence) : null; + Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); + if (var3 == null) { + return null; + } else { + var3.calculateBoundsCylinder(); + super.defaultHeight = var3.height; + Model var4; + Model[] var5; + if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { + var4 = HealthBarUpdate.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); + if (var4 != null) { + var4.offsetBy(0, -super.heightOffset, 0); + var5 = new Model[]{var3, var4}; + var3 = new Model(var5, 2); + } } - var5 = new Model[]{var3, var4}; - var3 = new Model(var5, 2); - if (super.orientation == 512) { - var4.rotateY90Ccw(); - } else if (super.orientation == 1024) { - var4.rotateY90Ccw(); - var4.rotateY90Ccw(); - } else if (super.orientation == 1536) { - var4.rotateY90Ccw(); - var4.rotateY90Ccw(); - var4.rotateY90Ccw(); + if (!this.isUnanimated && this.model0 != null) { + if (Client.cycle >= this.animationCycleEnd) { + this.model0 = null; + } + + if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { + var4 = this.model0; + var4.offsetBy(this.field599 * 4096 - super.x, this.tileHeight2 - this.tileHeight, this.field601 * 4096 - super.y); + if (super.orientation == 512) { + var4.rotateY90Ccw(); + var4.rotateY90Ccw(); + var4.rotateY90Ccw(); + } else if (super.orientation == 1024) { + var4.rotateY90Ccw(); + var4.rotateY90Ccw(); + } else if (super.orientation == 1536) { + var4.rotateY90Ccw(); + } + + var5 = new Model[]{var3, var4}; + var3 = new Model(var5, 2); + if (super.orientation == 512) { + var4.rotateY90Ccw(); + } else if (super.orientation == 1024) { + var4.rotateY90Ccw(); + var4.rotateY90Ccw(); + } else if (super.orientation == 1536) { + var4.rotateY90Ccw(); + var4.rotateY90Ccw(); + var4.rotateY90Ccw(); + } + + var4.offsetBy(super.x - this.field599 * 4096, this.tileHeight - this.tileHeight2, super.y - this.field601 * 4096); + } } - var4.offsetBy(super.x - this.field633 * 4096, this.tileHeight - this.tileHeight2, super.y - this.field620 * 4096); + var3.isSingleTile = true; + return var3; } } - - var3.isSingleTile = true; - return var3; } - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(IIBS)V", - garbageValue = "-30153" + signature = "(IIBI)V", + garbageValue = "-77453000" ) - final void method1189(int x, int y, byte var3) { - if (super.sequence != -1 && GrandExchangeEvent.SequenceDefinition_get(super.sequence).field3532 == 1) { + final void method1190(int var1, int var2, byte var3) { + if (super.sequence != -1 && Widget.SequenceDefinition_get(super.sequence).field3505 == 1) { super.sequence = -1; } - super.field976 = -1; - if (x < 0 || x >= 104 || y < 0 || y >= 104) { - this.resetPath(x, y); - return; + super.field946 = -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) { + Player var4 = this; + int var5 = super.pathX[0]; + int var6 = super.pathY[0]; + 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(); + RouteStrategy var10 = class30.method536(var1, var2); + CollisionMap var11 = Client.collisionMaps[this.plane]; + int[] var12 = Client.field697; + int[] var13 = Client.field898; + int var14 = 0; + + label970: + while (true) { + int var15; + if (var14 >= 128) { + int var16; + int var17; + byte var18; + byte var19; + int var20; + int var21; + byte var22; + int var23; + int[][] var24; + int var25; + int var26; + int var27; + int var28; + boolean var34; + boolean var35; + int var36; + int var37; + int var39; + if (var9 == 1) { + var16 = var5; + var17 = var6; + var18 = 64; + var19 = 64; + var20 = var5 - var18; + var21 = var6 - var19; + class173.directions[var18][var19] = 99; + class173.distances[var18][var19] = 0; + var22 = 0; + var23 = 0; + class173.bufferX[var22] = var5; + var39 = var22 + 1; + class173.bufferY[var22] = var6; + var24 = var11.flags; + + while (true) { + if (var39 == var23) { + class173.field2073 = var16; + class173.field2070 = var17; + var35 = false; + break; + } + + var16 = class173.bufferX[var23]; + var17 = class173.bufferY[var23]; + var23 = var23 + 1 & 4095; + var36 = var16 - var20; + var37 = var17 - var21; + var25 = var16 - var11.xInset; + var26 = var17 - var11.yInset; + if (var10.hasArrived(1, var16, var17, var11)) { + class173.field2073 = var16; + class173.field2070 = var17; + var35 = true; + break; + } + + var27 = class173.distances[var36][var37] + 1; + if (var36 > 0 && class173.directions[var36 - 1][var37] == 0 && (var24[var25 - 1][var26] & 19136776) == 0) { + class173.bufferX[var39] = var16 - 1; + class173.bufferY[var39] = var17; + var39 = var39 + 1 & 4095; + class173.directions[var36 - 1][var37] = 2; + class173.distances[var36 - 1][var37] = var27; + } + + if (var36 < 127 && class173.directions[var36 + 1][var37] == 0 && (var24[var25 + 1][var26] & 19136896) == 0) { + class173.bufferX[var39] = var16 + 1; + class173.bufferY[var39] = var17; + var39 = var39 + 1 & 4095; + class173.directions[var36 + 1][var37] = 8; + class173.distances[var36 + 1][var37] = var27; + } + + if (var37 > 0 && class173.directions[var36][var37 - 1] == 0 && (var24[var25][var26 - 1] & 19136770) == 0) { + class173.bufferX[var39] = var16; + class173.bufferY[var39] = var17 - 1; + var39 = var39 + 1 & 4095; + class173.directions[var36][var37 - 1] = 1; + class173.distances[var36][var37 - 1] = var27; + } + + if (var37 < 127 && class173.directions[var36][var37 + 1] == 0 && (var24[var25][var26 + 1] & 19136800) == 0) { + class173.bufferX[var39] = var16; + class173.bufferY[var39] = var17 + 1; + var39 = var39 + 1 & 4095; + class173.directions[var36][var37 + 1] = 4; + class173.distances[var36][var37 + 1] = var27; + } + + if (var36 > 0 && var37 > 0 && class173.directions[var36 - 1][var37 - 1] == 0 && (var24[var25 - 1][var26 - 1] & 19136782) == 0 && (var24[var25 - 1][var26] & 19136776) == 0 && (var24[var25][var26 - 1] & 19136770) == 0) { + class173.bufferX[var39] = var16 - 1; + class173.bufferY[var39] = var17 - 1; + var39 = var39 + 1 & 4095; + class173.directions[var36 - 1][var37 - 1] = 3; + class173.distances[var36 - 1][var37 - 1] = var27; + } + + if (var36 < 127 && var37 > 0 && class173.directions[var36 + 1][var37 - 1] == 0 && (var24[var25 + 1][var26 - 1] & 19136899) == 0 && (var24[var25 + 1][var26] & 19136896) == 0 && (var24[var25][var26 - 1] & 19136770) == 0) { + class173.bufferX[var39] = var16 + 1; + class173.bufferY[var39] = var17 - 1; + var39 = var39 + 1 & 4095; + class173.directions[var36 + 1][var37 - 1] = 9; + class173.distances[var36 + 1][var37 - 1] = var27; + } + + if (var36 > 0 && var37 < 127 && class173.directions[var36 - 1][var37 + 1] == 0 && (var24[var25 - 1][var26 + 1] & 19136824) == 0 && (var24[var25 - 1][var26] & 19136776) == 0 && (var24[var25][var26 + 1] & 19136800) == 0) { + class173.bufferX[var39] = var16 - 1; + class173.bufferY[var39] = var17 + 1; + var39 = var39 + 1 & 4095; + class173.directions[var36 - 1][var37 + 1] = 6; + class173.distances[var36 - 1][var37 + 1] = var27; + } + + if (var36 < 127 && var37 < 127 && class173.directions[var36 + 1][var37 + 1] == 0 && (var24[var25 + 1][var26 + 1] & 19136992) == 0 && (var24[var25 + 1][var26] & 19136896) == 0 && (var24[var25][var26 + 1] & 19136800) == 0) { + class173.bufferX[var39] = var16 + 1; + class173.bufferY[var39] = var17 + 1; + var39 = var39 + 1 & 4095; + class173.directions[var36 + 1][var37 + 1] = 12; + class173.distances[var36 + 1][var37 + 1] = var27; + } + } + + var34 = var35; + } else if (var9 == 2) { + var16 = var5; + var17 = var6; + var18 = 64; + var19 = 64; + var20 = var5 - var18; + var21 = var6 - var19; + class173.directions[var18][var19] = 99; + class173.distances[var18][var19] = 0; + var22 = 0; + var23 = 0; + class173.bufferX[var22] = var5; + var39 = var22 + 1; + class173.bufferY[var22] = var6; + var24 = var11.flags; + + while (true) { + if (var39 == var23) { + class173.field2073 = var16; + class173.field2070 = var17; + var35 = false; + break; + } + + var16 = class173.bufferX[var23]; + var17 = class173.bufferY[var23]; + var23 = var23 + 1 & 4095; + var36 = var16 - var20; + var37 = var17 - var21; + var25 = var16 - var11.xInset; + var26 = var17 - var11.yInset; + if (var10.hasArrived(2, var16, var17, var11)) { + class173.field2073 = var16; + class173.field2070 = var17; + var35 = true; + break; + } + + var27 = class173.distances[var36][var37] + 1; + if (var36 > 0 && class173.directions[var36 - 1][var37] == 0 && (var24[var25 - 1][var26] & 19136782) == 0 && (var24[var25 - 1][var26 + 1] & 19136824) == 0) { + class173.bufferX[var39] = var16 - 1; + class173.bufferY[var39] = var17; + var39 = var39 + 1 & 4095; + class173.directions[var36 - 1][var37] = 2; + class173.distances[var36 - 1][var37] = var27; + } + + if (var36 < 126 && class173.directions[var36 + 1][var37] == 0 && (var24[var25 + 2][var26] & 19136899) == 0 && (var24[var25 + 2][var26 + 1] & 19136992) == 0) { + class173.bufferX[var39] = var16 + 1; + class173.bufferY[var39] = var17; + var39 = var39 + 1 & 4095; + class173.directions[var36 + 1][var37] = 8; + class173.distances[var36 + 1][var37] = var27; + } + + if (var37 > 0 && class173.directions[var36][var37 - 1] == 0 && (var24[var25][var26 - 1] & 19136782) == 0 && (var24[var25 + 1][var26 - 1] & 19136899) == 0) { + class173.bufferX[var39] = var16; + class173.bufferY[var39] = var17 - 1; + var39 = var39 + 1 & 4095; + class173.directions[var36][var37 - 1] = 1; + class173.distances[var36][var37 - 1] = var27; + } + + if (var37 < 126 && class173.directions[var36][var37 + 1] == 0 && (var24[var25][var26 + 2] & 19136824) == 0 && (var24[var25 + 1][var26 + 2] & 19136992) == 0) { + class173.bufferX[var39] = var16; + class173.bufferY[var39] = var17 + 1; + var39 = var39 + 1 & 4095; + class173.directions[var36][var37 + 1] = 4; + class173.distances[var36][var37 + 1] = var27; + } + + if (var36 > 0 && var37 > 0 && class173.directions[var36 - 1][var37 - 1] == 0 && (var24[var25 - 1][var26] & 19136830) == 0 && (var24[var25 - 1][var26 - 1] & 19136782) == 0 && (var24[var25][var26 - 1] & 19136911) == 0) { + class173.bufferX[var39] = var16 - 1; + class173.bufferY[var39] = var17 - 1; + var39 = var39 + 1 & 4095; + class173.directions[var36 - 1][var37 - 1] = 3; + class173.distances[var36 - 1][var37 - 1] = var27; + } + + if (var36 < 126 && var37 > 0 && class173.directions[var36 + 1][var37 - 1] == 0 && (var24[var25 + 1][var26 - 1] & 19136911) == 0 && (var24[var25 + 2][var26 - 1] & 19136899) == 0 && (var24[var25 + 2][var26] & 19136995) == 0) { + class173.bufferX[var39] = var16 + 1; + class173.bufferY[var39] = var17 - 1; + var39 = var39 + 1 & 4095; + class173.directions[var36 + 1][var37 - 1] = 9; + class173.distances[var36 + 1][var37 - 1] = var27; + } + + if (var36 > 0 && var37 < 126 && class173.directions[var36 - 1][var37 + 1] == 0 && (var24[var25 - 1][var26 + 1] & 19136830) == 0 && (var24[var25 - 1][var26 + 2] & 19136824) == 0 && (var24[var25][var26 + 2] & 19137016) == 0) { + class173.bufferX[var39] = var16 - 1; + class173.bufferY[var39] = var17 + 1; + var39 = var39 + 1 & 4095; + class173.directions[var36 - 1][var37 + 1] = 6; + class173.distances[var36 - 1][var37 + 1] = var27; + } + + if (var36 < 126 && var37 < 126 && class173.directions[var36 + 1][var37 + 1] == 0 && (var24[var25 + 1][var26 + 2] & 19137016) == 0 && (var24[var25 + 2][var26 + 2] & 19136992) == 0 && (var24[var25 + 2][var26 + 1] & 19136995) == 0) { + class173.bufferX[var39] = var16 + 1; + class173.bufferY[var39] = var17 + 1; + var39 = var39 + 1 & 4095; + class173.directions[var36 + 1][var37 + 1] = 12; + class173.distances[var36 + 1][var37 + 1] = var27; + } + } + + var34 = var35; + } else { + var16 = var5; + var17 = var6; + var18 = 64; + var19 = 64; + var20 = var5 - var18; + var21 = var6 - var19; + class173.directions[var18][var19] = 99; + class173.distances[var18][var19] = 0; + var22 = 0; + var23 = 0; + class173.bufferX[var22] = var5; + var39 = var22 + 1; + class173.bufferY[var22] = var6; + var24 = var11.flags; + + label940: + while (true) { + label938: + while (true) { + do { + do { + do { + label915: + do { + if (var39 == var23) { + class173.field2073 = var16; + class173.field2070 = var17; + var35 = false; + break label940; + } + + var16 = class173.bufferX[var23]; + var17 = class173.bufferY[var23]; + var23 = var23 + 1 & 4095; + var36 = var16 - var20; + var37 = var17 - var21; + var25 = var16 - var11.xInset; + var26 = var17 - var11.yInset; + if (var10.hasArrived(var9, var16, var17, var11)) { + class173.field2073 = var16; + class173.field2070 = var17; + var35 = true; + break label940; + } + + var27 = class173.distances[var36][var37] + 1; + if (var36 > 0 && class173.directions[var36 - 1][var37] == 0 && (var24[var25 - 1][var26] & 19136782) == 0 && (var24[var25 - 1][var9 + var26 - 1] & 19136824) == 0) { + var28 = 1; + + while (true) { + if (var28 >= var9 - 1) { + class173.bufferX[var39] = var16 - 1; + class173.bufferY[var39] = var17; + var39 = var39 + 1 & 4095; + class173.directions[var36 - 1][var37] = 2; + class173.distances[var36 - 1][var37] = var27; + break; + } + + if ((var24[var25 - 1][var26 + var28] & 19136830) != 0) { + break; + } + + ++var28; + } + } + + if (var36 < 128 - var9 && class173.directions[var36 + 1][var37] == 0 && (var24[var9 + var25][var26] & 19136899) == 0 && (var24[var9 + var25][var9 + var26 - 1] & 19136992) == 0) { + var28 = 1; + + while (true) { + if (var28 >= var9 - 1) { + class173.bufferX[var39] = var16 + 1; + class173.bufferY[var39] = var17; + var39 = var39 + 1 & 4095; + class173.directions[var36 + 1][var37] = 8; + class173.distances[var36 + 1][var37] = var27; + break; + } + + if ((var24[var9 + var25][var28 + var26] & 19136995) != 0) { + break; + } + + ++var28; + } + } + + if (var37 > 0 && class173.directions[var36][var37 - 1] == 0 && (var24[var25][var26 - 1] & 19136782) == 0 && (var24[var25 + var9 - 1][var26 - 1] & 19136899) == 0) { + var28 = 1; + + while (true) { + if (var28 >= var9 - 1) { + class173.bufferX[var39] = var16; + class173.bufferY[var39] = var17 - 1; + var39 = var39 + 1 & 4095; + class173.directions[var36][var37 - 1] = 1; + class173.distances[var36][var37 - 1] = var27; + break; + } + + if ((var24[var25 + var28][var26 - 1] & 19136911) != 0) { + break; + } + + ++var28; + } + } + + if (var37 < 128 - var9 && class173.directions[var36][var37 + 1] == 0 && (var24[var25][var9 + var26] & 19136824) == 0 && (var24[var25 + var9 - 1][var9 + var26] & 19136992) == 0) { + var28 = 1; + + while (true) { + if (var28 >= var9 - 1) { + class173.bufferX[var39] = var16; + class173.bufferY[var39] = var17 + 1; + var39 = var39 + 1 & 4095; + class173.directions[var36][var37 + 1] = 4; + class173.distances[var36][var37 + 1] = var27; + break; + } + + if ((var24[var28 + var25][var9 + var26] & 19137016) != 0) { + break; + } + + ++var28; + } + } + + if (var36 > 0 && var37 > 0 && class173.directions[var36 - 1][var37 - 1] == 0 && (var24[var25 - 1][var26 - 1] & 19136782) == 0) { + var28 = 1; + + while (true) { + if (var28 >= var9) { + class173.bufferX[var39] = var16 - 1; + class173.bufferY[var39] = var17 - 1; + var39 = var39 + 1 & 4095; + class173.directions[var36 - 1][var37 - 1] = 3; + class173.distances[var36 - 1][var37 - 1] = var27; + break; + } + + if ((var24[var25 - 1][var28 + (var26 - 1)] & 19136830) != 0 || (var24[var28 + (var25 - 1)][var26 - 1] & 19136911) != 0) { + break; + } + + ++var28; + } + } + + if (var36 < 128 - var9 && var37 > 0 && class173.directions[var36 + 1][var37 - 1] == 0 && (var24[var25 + var9][var26 - 1] & 19136899) == 0) { + var28 = 1; + + while (true) { + if (var28 >= var9) { + class173.bufferX[var39] = var16 + 1; + class173.bufferY[var39] = var17 - 1; + var39 = var39 + 1 & 4095; + class173.directions[var36 + 1][var37 - 1] = 9; + class173.distances[var36 + 1][var37 - 1] = var27; + break; + } + + if ((var24[var9 + var25][var28 + (var26 - 1)] & 19136995) != 0 || (var24[var25 + var28][var26 - 1] & 19136911) != 0) { + break; + } + + ++var28; + } + } + + if (var36 > 0 && var37 < 128 - var9 && class173.directions[var36 - 1][var37 + 1] == 0 && (var24[var25 - 1][var26 + var9] & 19136824) == 0) { + for (var28 = 1; var28 < var9; ++var28) { + if ((var24[var25 - 1][var28 + var26] & 19136830) != 0 || (var24[var28 + (var25 - 1)][var26 + var9] & 19137016) != 0) { + continue label915; + } + } + + class173.bufferX[var39] = var16 - 1; + class173.bufferY[var39] = var17 + 1; + var39 = var39 + 1 & 4095; + class173.directions[var36 - 1][var37 + 1] = 6; + class173.distances[var36 - 1][var37 + 1] = var27; + } + } while(var36 >= 128 - var9); + } while(var37 >= 128 - var9); + } while(class173.directions[var36 + 1][var37 + 1] != 0); + } while((var24[var9 + var25][var9 + var26] & 19136992) != 0); + + for (var28 = 1; var28 < var9; ++var28) { + if ((var24[var25 + var28][var26 + var9] & 19137016) != 0 || (var24[var25 + var9][var26 + var28] & 19136995) != 0) { + continue label938; + } + } + + class173.bufferX[var39] = var16 + 1; + class173.bufferY[var39] = var17 + 1; + var39 = var39 + 1 & 4095; + class173.directions[var36 + 1][var37 + 1] = 12; + class173.distances[var36 + 1][var37 + 1] = var27; + } + } + + var34 = var35; + } + + int var8; + label1013: { + var15 = var5 - 64; + var16 = var6 - 64; + var17 = class173.field2073; + var36 = class173.field2070; + if (!var34) { + var37 = Integer.MAX_VALUE; + var20 = Integer.MAX_VALUE; + byte var38 = 10; + var39 = var10.approxDestinationX; + var23 = var10.approxDestinationY; + int var33 = var10.approxDestinationSizeX; + var25 = var10.approxDestinationSizeY; + + for (var26 = var39 - var38; var26 <= var39 + var38; ++var26) { + for (var27 = var23 - var38; var27 <= var38 + var23; ++var27) { + var28 = var26 - var15; + int var29 = var27 - var16; + if (var28 >= 0 && var29 >= 0 && var28 < 128 && var29 < 128 && class173.distances[var28][var29] < 100) { + int var30 = 0; + if (var26 < var39) { + var30 = var39 - var26; + } else if (var26 > var33 + var39 - 1) { + var30 = var26 - (var39 + var33 - 1); + } + + int var31 = 0; + if (var27 < var23) { + var31 = var23 - var27; + } else if (var27 > var23 + var25 - 1) { + var31 = var27 - (var25 + var23 - 1); + } + + int var32 = var30 * var30 + var31 * var31; + if (var32 < var37 || var32 == var37 && class173.distances[var28][var29] < var20) { + var37 = var32; + var20 = class173.distances[var28][var29]; + var17 = var26; + var36 = var27; + } + } + } + } + + if (var37 == Integer.MAX_VALUE) { + var8 = -1; + break label1013; + } + } + + if (var17 == var5 && var36 == var6) { + var8 = 0; + } else { + var19 = 0; + class173.bufferX[var19] = var17; + var37 = var19 + 1; + class173.bufferY[var19] = var36; + + for (var20 = var21 = class173.directions[var17 - var15][var36 - var16]; var5 != var17 || var6 != var36; var20 = class173.directions[var17 - var15][var36 - var16]) { + if (var21 != var20) { + var21 = var20; + class173.bufferX[var37] = var17; + class173.bufferY[var37++] = var36; + } + + if ((var20 & 2) != 0) { + ++var17; + } else if ((var20 & 8) != 0) { + --var17; + } + + if ((var20 & 1) != 0) { + ++var36; + } else if ((var20 & 4) != 0) { + --var36; + } + } + + var39 = 0; + + while (var37-- > 0) { + var12[var39] = class173.bufferX[var37]; + var13[var39++] = class173.bufferY[var37]; + if (var39 >= var12.length) { + break; + } + } + + var8 = var39; + } + } + + var14 = var8; + if (var8 < 1) { + break; + } + + var15 = 0; + + while (true) { + if (var15 >= var14 - 1) { + break label970; + } + + var4.method1195(Client.field697[var15], Client.field898[var15], (byte)2); + ++var15; + } + } + + for (var15 = 0; var15 < 128; ++var15) { + class173.directions[var14][var15] = 0; + class173.distances[var14][var15] = 99999999; + } + + ++var14; + } + } + } + + this.method1195(var1, var2, var3); + } else { + this.resetPath(var1, var2); + } + } else { + this.resetPath(var1, var2); } - if (super.pathX[0] < 0 || super.pathX[0] >= 104 || super.pathY[0] < 0 || super.pathY[0] >= 104) { - this.resetPath(x, y); - return; - } - if (var3 == 2) { - Widget.method4056(this, x, y, (byte) 2); - } - this.method1191(x, y, var3); + } - @ObfuscatedName("x") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "1369099765" + garbageValue = "-1849067298" ) @Export("resetPath") void resetPath(int var1, int var2) { super.pathLength = 0; - super.field1008 = 0; - super.field1007 = 0; + super.field947 = 0; + super.field976 = 0; super.pathX[0] = var1; super.pathY[0] = var2; int var3 = this.transformedSize(); super.x = super.pathX[0] * 128 + var3 * 64; - super.y = var3 * 64 + super.pathY[0] * 128; + super.y = super.pathY[0] * 128 + var3 * 64; } - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(IIBB)V", garbageValue = "1" ) - final void method1191(int var1, int var2, byte var3) { + final void method1195(int var1, int var2, byte var3) { if (super.pathLength < 9) { ++super.pathLength; } @@ -497,107 +1080,181 @@ public final class Player extends Actor { super.pathTraversed[0] = var3; } - @ObfuscatedName("v") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-1461786701" + signature = "(B)Z", + garbageValue = "-110" ) @Export("isVisible") final boolean isVisible() { return this.appearance != null; } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ljava/lang/String;ILjava/lang/String;I)Z", - garbageValue = "1838105426" + signature = "(Ljava/applet/Applet;Ljava/lang/String;I)V", + garbageValue = "-1361577662" ) - static boolean method1226(String var0, int var1, String var2) { - if (var1 == 0) { - try { - if (!class51.field434.startsWith("win")) { - throw new Exception(); - } - if (!var0.startsWith("http://") && !var0.startsWith("https://")) { - throw new Exception(); - } - String var11 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; + public static void method1223(Applet var0, String var1) { + class51.applet = var0; + if (var1 != null) { + class51.field404 = var1; + } - for (int var4 = 0; var4 < var0.length(); ++var4) { - if (var11.indexOf(var0.charAt(var4)) == -1) { - throw new Exception(); + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "([BS)V", + garbageValue = "-23424" + ) + @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]; + class325.SpriteBuffer_spriteWidths = new int[class325.SpriteBuffer_spriteCount]; + class225.SpriteBuffer_spriteHeights = new int[class325.SpriteBuffer_spriteCount]; + WorldMapSection1.SpriteBuffer_pixels = new byte[class325.SpriteBuffer_spriteCount][]; + var1.offset = var0.length - 7 - class325.SpriteBuffer_spriteCount * 8; + GrandExchangeOfferUnitPriceComparator.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) { + class325.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) { + class225.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); + } + + var1.offset = var0.length - 7 - class325.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; + class325.SpriteBuffer_spritePalette = new int[var2]; + + for (var3 = 1; var3 < var2; ++var3) { + class325.SpriteBuffer_spritePalette[var3] = var1.readMedium(); + if (class325.SpriteBuffer_spritePalette[var3] == 0) { + class325.SpriteBuffer_spritePalette[var3] = 1; + } + } + + var1.offset = 0; + + for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) { + int var4 = class325.SpriteBuffer_spriteWidths[var3]; + int var5 = class225.SpriteBuffer_spriteHeights[var3]; + int var6 = var5 * var4; + byte[] var7 = new byte[var6]; + WorldMapSection1.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(); } } + } + } - Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); - return true; - } catch (Throwable var5) { - return false; - } - } - if (var1 == 1) { - try { - Object var10 = class47.method806(class51.applet, var2, new Object[]{(new URL(class51.applet.getCodeBase(), var0)).toString()}); - return var10 != null; - } catch (Throwable var6) { - return false; - } - } - if (var1 == 2) { - try { - class51.applet.getAppletContext().showDocument(new URL(class51.applet.getCodeBase(), var0), "_blank"); - return true; - } catch (Exception var7) { - return false; - } - } - if (var1 == 3) { - try { - Applet var3 = class51.applet; - JSObject.getWindow(var3).call("loggedout", (Object[])null); - } catch (Throwable var9) { - } - - try { - class51.applet.getAppletContext().showDocument(new URL(class51.applet.getCodeBase(), var0), "_top"); - return true; - } catch (Exception var8) { - return false; - } - } - throw new IllegalArgumentException(); } - @ObfuscatedName("ff") + @ObfuscatedName("az") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1715272698" + signature = "([BB)[B", + garbageValue = "-68" ) - @Export("processOverheadText") - static final void processOverheadText() { - 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; + @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.field3120 != 0 && var3 > AbstractArchive.field3120) { + 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.field3120 == 0 || var6 <= AbstractArchive.field3120)) { + 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(); } } + } - 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; + @ObfuscatedName("at") + @ObfuscatedSignature( + signature = "(ILcr;ZI)I", + garbageValue = "-1511089704" + ) + static int method1224(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.GETWINDOWMODE) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = UserComparator7.getWindowedMode(); + return 1; + } else { + int var3; + if (var0 == ScriptOpcodes.SETWINDOWMODE) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var3 == 1 || var3 == 2) { + StudioGame.setWindowedMode(var3); } + + return 1; + } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOffer.clientPreferences.windowMode; + return 1; + } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { + if (var0 == 5310) { + --Interpreter.Interpreter_intStackSize; + return 1; + } else { + return 2; + } + } else { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var3 == 1 || var3 == 2) { + GrandExchangeOffer.clientPreferences.windowMode = var3; + GrandExchangeOfferAgeComparator.savePreferences(); + } + + return 1; } } + } + @ObfuscatedName("in") + @ObfuscatedSignature( + signature = "(B)I", + garbageValue = "43" + ) + @Export("getNewestMenuIdx") + static final int getNewestMenuIdx() { + return Client.menuOptionsCount - 1; } } diff --git a/runescape-client/src/main/java/PlayerAppearance.java b/runescape-client/src/main/java/PlayerAppearance.java index ae7ec19eb9..685eca3b7a 100644 --- a/runescape-client/src/main/java/PlayerAppearance.java +++ b/runescape-client/src/main/java/PlayerAppearance.java @@ -4,152 +4,145 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hh") +@ObfuscatedName("hy") @Implements("PlayerAppearance") public class PlayerAppearance { - @ObfuscatedName("m") + @ObfuscatedName("x") + public static short[] field2523; + @ObfuscatedName("f") @Export("equipmentIndices") static final int[] equipmentIndices; - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lep;" ) @Export("PlayerAppearance_cachedModels") public static EvictingDualNodeHashTable PlayerAppearance_cachedModels; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("equipment") int[] equipment; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("bodyColors") int[] bodyColors; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("isFemale") public boolean isFemale; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1885708295 + intValue = 1853482323 ) @Export("npcTransformId") public int npcTransformId; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - longValue = 7554937625342068879L + longValue = -7365242967522799729L ) - long field2539; - @ObfuscatedName("l") + long field2519; + @ObfuscatedName("n") @ObfuscatedGetter( - longValue = 8463042946937370987L + longValue = 2050546320493006419L ) - long field2537; + long field2522; static { equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10}; PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260); } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "([I[IZII)V", - garbageValue = "646936980" + signature = "([I[IZIB)V", + garbageValue = "-32" ) @Export("update") - public void update(int[] equipment, int[] bodyColors, boolean isFemale, int npcTransformId) { - if (equipment == null) { - equipment = new int[12]; + public void update(int[] var1, int[] var2, boolean var3, int var4) { + if (var1 == null) { + var1 = new int[12]; for (int var5 = 0; var5 < 7; ++var5) { for (int var6 = 0; var6 < KitDefinition.KitDefinition_fileCount; ++var6) { - KitDefinition var7 = ArchiveDiskAction.KitDefinition_get(var6); - if (var7 != null && !var7.nonSelectable && var7.bodypartID == var5 + (isFemale ? 7 : 0)) { - equipment[equipmentIndices[var5]] = var6 + 256; + KitDefinition var7 = GameShell.KitDefinition_get(var6); + if (var7 != null && !var7.nonSelectable && var7.bodypartID == var5 + (var3 ? 7 : 0)) { + var1[equipmentIndices[var5]] = var6 + 256; break; } } } } - this.equipment = equipment; - this.bodyColors = bodyColors; - this.isFemale = isFemale; - this.npcTransformId = npcTransformId; + this.equipment = var1; + this.bodyColors = var2; + this.isFemale = var3; + this.npcTransformId = var4; this.setHash(); } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IZS)V", - garbageValue = "7431" + signature = "(IZI)V", + garbageValue = "-420581266" ) @Export("changeAppearance") - public void changeAppearance(int slot, boolean forwards) { - if (slot == 1 && this.isFemale) { - return; - } - int var3 = this.equipment[equipmentIndices[slot]]; - if (var3 == 0) { - return; - } - var3 -= 256; + public void changeAppearance(int var1, boolean var2) { + if (var1 != 1 || !this.isFemale) { + int var3 = this.equipment[equipmentIndices[var1]]; + if (var3 != 0) { + var3 -= 256; - KitDefinition var4; - do { - if (!forwards) { - --var3; - if (var3 < 0) { - var3 = KitDefinition.KitDefinition_fileCount - 1; - } - } else { - ++var3; - if (var3 >= KitDefinition.KitDefinition_fileCount) { - var3 = 0; - } + KitDefinition var4; + do { + if (!var2) { + --var3; + if (var3 < 0) { + var3 = KitDefinition.KitDefinition_fileCount - 1; + } + } else { + ++var3; + if (var3 >= KitDefinition.KitDefinition_fileCount) { + var3 = 0; + } + } + + var4 = GameShell.KitDefinition_get(var3); + } while(var4 == null || var4.nonSelectable || var1 + (this.isFemale ? 7 : 0) != var4.bodypartID); + + this.equipment[equipmentIndices[var1]] = var3 + 256; + this.setHash(); } - - var4 = ArchiveDiskAction.KitDefinition_get(var3); - } while(var4 == null || var4.nonSelectable || var4.bodypartID != (this.isFemale ? 7 : 0) + slot); - - this.equipment[equipmentIndices[slot]] = var3 + 256; - this.setHash(); + } } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IZB)V", - garbageValue = "1" + signature = "(IZI)V", + garbageValue = "-2145641688" ) - public void method3993(int var1, boolean var2) { + public void method3930(int var1, boolean var2) { int var3 = this.bodyColors[var1]; - boolean var4; - do { - if (var2) { + if (!var2) { + do { --var3; - if (var3 < 0) - { - var3 = class247.field3291[var1].length - 1; + if (var3 < 0) { + var3 = FontName.field3651[var1].length - 1; } - } else { + } while(!DevicePcmPlayerProvider.method794(var1, var3)); + } else { + do { ++var3; - if (var3 >= class247.field3291[var1].length) { + if (var3 >= FontName.field3651[var1].length) { var3 = 0; } - } - - if (var1 == 4 && var3 >= 8) { - var4 = false; - } else { - var4 = true; - } - } while(!var4); - + } while(!DevicePcmPlayerProvider.method794(var1, var3)); + } this.bodyColors[var1] = var3; this.setHash(); } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(ZI)V", - garbageValue = "-1889308905" + garbageValue = "1539673752" ) @Export("changeSex") public void changeSex(boolean var1) { @@ -158,10 +151,10 @@ public class PlayerAppearance { } } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Lkf;I)V", - garbageValue = "318518244" + signature = "(Lky;I)V", + garbageValue = "-1403518523" ) @Export("write") public void write(Buffer var1) { @@ -183,249 +176,260 @@ public class PlayerAppearance { } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-642872346" + garbageValue = "1367510111" ) @Export("setHash") void setHash() { - long var1 = this.field2539; + long var1 = this.field2519; int var3 = this.equipment[5]; int var4 = this.equipment[9]; this.equipment[5] = var4; this.equipment[9] = var3; - this.field2539 = 0L; + this.field2519 = 0L; int var5; for (var5 = 0; var5 < 12; ++var5) { - this.field2539 <<= 4; + this.field2519 <<= 4; if (this.equipment[var5] >= 256) { - this.field2539 += (long)(this.equipment[var5] - 256); + this.field2519 += (long)(this.equipment[var5] - 256); } } if (this.equipment[0] >= 256) { - this.field2539 += (long)(this.equipment[0] - 256 >> 4); + this.field2519 += (long)(this.equipment[0] - 256 >> 4); } if (this.equipment[1] >= 256) { - this.field2539 += (long)(this.equipment[1] - 256 >> 8); + this.field2519 += (long)(this.equipment[1] - 256 >> 8); } for (var5 = 0; var5 < 5; ++var5) { - this.field2539 <<= 3; - this.field2539 += (long)this.bodyColors[var5]; + this.field2519 <<= 3; + this.field2519 += (long)this.bodyColors[var5]; } - this.field2539 <<= 1; - this.field2539 += (long)(this.isFemale ? 1 : 0); + this.field2519 <<= 1; + this.field2519 += (long)(this.isFemale ? 1 : 0); this.equipment[5] = var3; this.equipment[9] = var4; - if (0L != var1 && var1 != this.field2539) { + if (var1 != 0L && var1 != this.field2519) { PlayerAppearance_cachedModels.remove(var1); } } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lis;ILis;IB)Ldm;", - garbageValue = "-15" + signature = "(Lij;ILij;II)Ldo;", + garbageValue = "1074848537" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { if (this.npcTransformId != -1) { - return GameShell.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); - } - long var5 = this.field2539; - int[] var7 = this.equipment; - if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) { - var7 = new int[12]; + return ViewportMouse.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); + } else { + long var5 = this.field2519; + int[] var7 = this.equipment; + if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) { + var7 = new int[12]; - for (int var15 = 0; var15 < 12; ++var15) { - var7[var15] = this.equipment[var15]; - } - - if (var1.shield >= 0) { - var5 += (long)(var1.shield - this.equipment[5] << 40); - var7[5] = var1.shield; - } - - if (var1.weapon >= 0) { - var5 += (long)(var1.weapon - this.equipment[3] << 48); - var7[3] = var1.weapon; - } - } - - Model var8 = (Model)PlayerAppearance_cachedModels.get(var5); - if (var8 == null) { - boolean var9 = false; - - int var11; - for (int var10 = 0; var10 < 12; ++var10) { - var11 = var7[var10]; - if (var11 >= 256 && var11 < 512 && !ArchiveDiskAction.KitDefinition_get(var11 - 256).ready()) { - var9 = true; + for (int var15 = 0; var15 < 12; ++var15) { + var7[var15] = this.equipment[var15]; } - if (var11 >= 512 && !WorldMapArea.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { - var9 = true; + if (var1.shield >= 0) { + var5 += (long)(var1.shield - this.equipment[5] << 40); + var7[5] = var1.shield; + } + + if (var1.weapon >= 0) { + var5 += (long)(var1.weapon - this.equipment[3] << 48); + var7[3] = var1.weapon; } } - if (var9) { - if (-1L != this.field2537) { - var8 = (Model)PlayerAppearance_cachedModels.get(this.field2537); + Model var8 = (Model)PlayerAppearance_cachedModels.get(var5); + if (var8 == null) { + boolean var9 = false; + + int var11; + for (int var10 = 0; var10 < 12; ++var10) { + var11 = var7[var10]; + if (var11 >= 256 && var11 < 512 && !GameShell.KitDefinition_get(var11 - 256).ready()) { + var9 = true; + } + + if (var11 >= 512 && !WorldMapData_0.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { + var9 = true; + } + } + + if (var9) { + if (-1L != this.field2522) { + var8 = (Model)PlayerAppearance_cachedModels.get(this.field2522); + } + + if (var8 == null) { + return null; + } } if (var8 == null) { - return null; - } - } + ModelData[] var16 = new ModelData[12]; + var11 = 0; - if (var8 == null) { - ModelData[] var16 = new ModelData[12]; - var11 = 0; + int var13; + for (int var12 = 0; var12 < 12; ++var12) { + var13 = var7[var12]; + ModelData var14; + if (var13 >= 256 && var13 < 512) { + var14 = GameShell.KitDefinition_get(var13 - 256).getModelData(); + if (var14 != null) { + var16[var11++] = var14; + } + } - int var13; - for (int var12 = 0; var12 < 12; ++var12) { - var13 = var7[var12]; - ModelData var14; - if (var13 >= 256 && var13 < 512) { - var14 = ArchiveDiskAction.KitDefinition_get(var13 - 256).getModelData(); - if (var14 != null) { - var16[var11++] = var14; + if (var13 >= 512) { + var14 = WorldMapData_0.ItemDefinition_get(var13 - 512).method4557(this.isFemale); + if (var14 != null) { + var16[var11++] = var14; + } } } - if (var13 >= 512) { - var14 = WorldMapArea.ItemDefinition_get(var13 - 512).method4694(this.isFemale); - if (var14 != null) { - var16[var11++] = var14; + ModelData var18 = new ModelData(var16, var11); + + for (var13 = 0; var13 < 5; ++var13) { + if (this.bodyColors[var13] < FontName.field3651[var13].length) { + var18.recolor(KeyHandler.field387[var13], FontName.field3651[var13][this.bodyColors[var13]]); + } + + if (this.bodyColors[var13] < SoundCache.field1418[var13].length) { + var18.recolor(field2523[var13], SoundCache.field1418[var13][this.bodyColors[var13]]); } } + + var8 = var18.toModel(64, 850, -30, -50, -30); + PlayerAppearance_cachedModels.put(var8, var5); + this.field2522 = var5; + } + } + + if (var1 == null && var3 == null) { + return var8; + } else { + Model var17; + if (var1 != null && var3 != null) { + var17 = var1.applyTransformations(var8, var2, var3, var4); + } else if (var1 != null) { + var17 = var1.transformActorModel(var8, var2); + } else { + var17 = var3.transformActorModel(var8, var4); } - ModelData var17 = new ModelData(var16, var11); - - for (var13 = 0; var13 < 5; ++var13) { - if (this.bodyColors[var13] < class247.field3291[var13].length) { - var17.recolor(ModelData0.field1870[var13], class247.field3291[var13][this.bodyColors[var13]]); - } - - if (this.bodyColors[var13] < Message.field604[var13].length) { - var17.recolor(WorldMapCacheName.field309[var13], Message.field604[var13][this.bodyColors[var13]]); - } - } - - var8 = var17.toModel(64, 850, -30, -50, -30); - PlayerAppearance_cachedModels.put(var8, var5); - this.field2537 = var5; + return var17; } } - - if (var1 == null && var3 == null) { - return var8; - } - Model var18; - if (var1 != null && var3 != null) { - var18 = var1.applyTransformations(var8, var2, var3, var4); - } else if (var1 != null) { - var18 = var1.transformActorModel(var8, var2); - } else { - var18 = var3.transformActorModel(var8, var4); - } - - return var18; } - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)Lds;", - garbageValue = "-1659019882" + signature = "(I)Ldq;", + garbageValue = "-337646401" ) @Export("getModelData") ModelData getModelData() { if (this.npcTransformId != -1) { - return GameShell.getNpcDefinition(this.npcTransformId).getModelData(); - } - boolean var1 = false; + return ViewportMouse.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 && !ArchiveDiskAction.KitDefinition_get(var3 - 256).method4445()) { - var1 = true; - } + int var3; + for (int var2 = 0; var2 < 12; ++var2) { + var3 = this.equipment[var2]; + if (var3 >= 256 && var3 < 512 && !GameShell.KitDefinition_get(var3 - 256).method4360()) { + var1 = true; + } - if (var3 >= 512 && !WorldMapArea.ItemDefinition_get(var3 - 512).method4683(this.isFemale)) { - var1 = true; - } - } - - if (var1) { - return null; - } - ModelData[] var7 = new ModelData[12]; - var3 = 0; - - int var5; - for (int var4 = 0; var4 < 12; ++var4) { - var5 = this.equipment[var4]; - ModelData var6; - if (var5 >= 256 && var5 < 512) { - var6 = ArchiveDiskAction.KitDefinition_get(var5 - 256).getKitDefinitionModels(); - if (var6 != null) { - var7[var3++] = var6; + if (var3 >= 512 && !WorldMapData_0.ItemDefinition_get(var3 - 512).method4558(this.isFemale)) { + var1 = true; } } - if (var5 >= 512) { - var6 = WorldMapArea.ItemDefinition_get(var5 - 512).method4649(this.isFemale); - if (var6 != null) { - var7[var3++] = var6; + if (var1) { + return null; + } else { + ModelData[] var7 = new ModelData[12]; + var3 = 0; + + int var5; + for (int var4 = 0; var4 < 12; ++var4) { + var5 = this.equipment[var4]; + ModelData var6; + if (var5 >= 256 && var5 < 512) { + var6 = GameShell.KitDefinition_get(var5 - 256).getKitDefinitionModels(); + if (var6 != null) { + var7[var3++] = var6; + } + } + + if (var5 >= 512) { + var6 = WorldMapData_0.ItemDefinition_get(var5 - 512).method4559(this.isFemale); + if (var6 != null) { + var7[var3++] = var6; + } + } } + + ModelData var8 = new ModelData(var7, var3); + + for (var5 = 0; var5 < 5; ++var5) { + if (this.bodyColors[var5] < FontName.field3651[var5].length) { + var8.recolor(KeyHandler.field387[var5], FontName.field3651[var5][this.bodyColors[var5]]); + } + + if (this.bodyColors[var5] < SoundCache.field1418[var5].length) { + var8.recolor(field2523[var5], SoundCache.field1418[var5][this.bodyColors[var5]]); + } + } + + return var8; } } - - ModelData var8 = new ModelData(var7, var3); - - for (var5 = 0; var5 < 5; ++var5) { - if (this.bodyColors[var5] < class247.field3291[var5].length) { - var8.recolor(ModelData0.field1870[var5], class247.field3291[var5][this.bodyColors[var5]]); - } - - if (this.bodyColors[var5] < Message.field604[var5].length) { - var8.recolor(WorldMapCacheName.field309[var5], Message.field604[var5][this.bodyColors[var5]]); - } - } - - return var8; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1943102032" + garbageValue = "1490773548" ) @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 + GameShell.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 + ViewportMouse.getNpcDefinition(this.npcTransformId).id; } - @ObfuscatedName("u") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lhp;II)Z", - garbageValue = "-435811450" + signature = "(IIIIIII)I", + garbageValue = "-428872333" ) - @Export("SpriteBuffer_bufferFileFlat") - public static boolean SpriteBuffer_bufferFileFlat(AbstractArchive var0, int var1) { - byte[] var2 = var0.takeFileFlat(var1); - if (var2 == null) { - return false; + public static int method3944(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 var1; + } else if (var2 == 1) { + return 7 - var0 - (var3 - 1); + } else { + return var2 == 2 ? 7 - var1 - (var4 - 1) : var0; } - class185.SpriteBuffer_decode(var2); - return true; } } diff --git a/runescape-client/src/main/java/PlayerType.java b/runescape-client/src/main/java/PlayerType.java index 900a868f58..bed346aa54 100644 --- a/runescape-client/src/main/java/PlayerType.java +++ b/runescape-client/src/main/java/PlayerType.java @@ -4,92 +4,106 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hn") +@ObfuscatedName("hh") @Implements("PlayerType") public enum PlayerType implements Enumerated { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lhn;" + signature = "Lhh;" ) @Export("PlayerType_normal") PlayerType_normal(0, -1, true, false, true), - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lhn;" + signature = "Lhh;" ) @Export("PlayerType_playerModerator") PlayerType_playerModerator(1, 0, true, true, true), - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lhn;" + signature = "Lhh;" ) @Export("PlayerType_jagexModerator") PlayerType_jagexModerator(2, 1, true, true, false), - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lhn;" + signature = "Lhh;" ) @Export("PlayerType_ironman") PlayerType_ironman(3, 2, false, false, true), - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lhn;" + signature = "Lhh;" ) @Export("PlayerType_ultimateIronman") PlayerType_ultimateIronman(4, 3, false, false, true), - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lhn;" + signature = "Lhh;" ) @Export("PlayerType_hardcoreIronman") PlayerType_hardcoreIronman(5, 10, false, false, true); - @ObfuscatedName("n") - @Export("userHomeDirectory") - static String userHomeDirectory; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 942937123 + intValue = -226803421 ) @Export("id") final int id; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -477607547 - ) + @ObfuscatedName("q") @Export("modIcon") public final int modIcon; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("isPrivileged") public final boolean isPrivileged; - @ObfuscatedName("f") + @ObfuscatedName("d") @Export("isUser") public final boolean isUser; PlayerType(int var3, int var4, boolean var5, boolean var6, boolean var7) { this.id = var3; - this.modIcon = var4; + this.modIcon = var4 * 840543109; this.isPrivileged = var6; this.isUser = var7; } - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "320353268" + signature = "(B)I", + garbageValue = "-32" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("w") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(IIIS)Lly;", - garbageValue = "-4698" + signature = "(Lhz;Lhz;Lhz;Lgp;I)Z", + garbageValue = "1965364942" ) - @Export("getWorldMapRegionCachedSprite") - static Sprite getWorldMapRegionCachedSprite(int var0, int var1, int var2) { - return (Sprite)WorldMapRegion.WorldMapRegion_cachedSprites.get(Widget.getWorldMapSpriteHash(var0, var1, var2)); + @Export("setAudioArchives") + public static boolean setAudioArchives(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, MidiPcmStream var3) { + class197.musicPatchesArchive = var0; + class197.musicSamplesArchive = var1; + class197.soundEffectsArchive = var2; + class197.midiPcmStream = var3; + return true; + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + signature = "(IZII)V", + garbageValue = "912146837" + ) + @Export("PcmPlayer_configure") + public static final void PcmPlayer_configure(int var0, boolean var1, int var2) { + if (var0 >= 8000 && var0 <= 48000) { + PcmPlayer.PcmPlayer_sampleRate = var0; + PcmPlayer.PcmPlayer_stereo = var1; + FloorDecoration.PcmPlayer_count = var2; + } else { + throw new IllegalArgumentException(); + } } } diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java index 197335c6b0..a7b6603ca8 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("cw") +@ObfuscatedName("cb") @Implements("Players") public class Players { - @ObfuscatedName("e") - static byte[] field1252; - @ObfuscatedName("p") - static byte[] field1250; + @ObfuscatedName("i") + static byte[] field1221; @ObfuscatedName("k") + static byte[] field1230; + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "[Lkf;" + signature = "[Lky;" ) - static Buffer[] field1254; - @ObfuscatedName("l") + static Buffer[] field1219; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1230820149 + intValue = 1067165743 ) @Export("Players_count") static int Players_count; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("Players_indices") static int[] Players_indices; - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1347586957 + intValue = -2082496335 ) @Export("Players_emptyIdxCount") static int Players_emptyIdxCount; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("Players_emptyIndices") static int[] Players_emptyIndices; - @ObfuscatedName("f") + @ObfuscatedName("d") @Export("Players_regions") static int[] Players_regions; - @ObfuscatedName("m") + @ObfuscatedName("f") @Export("Players_orientations") static int[] Players_orientations; - @ObfuscatedName("u") + @ObfuscatedName("c") @Export("Players_targetIndices") static int[] Players_targetIndices; - @ObfuscatedName("x") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1998791081 + intValue = 504447411 ) @Export("Players_pendingUpdateCount") static int Players_pendingUpdateCount; - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("Players_pendingUpdateIndices") static int[] Players_pendingUpdateIndices; - @ObfuscatedName("v") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lkf;" + signature = "Lky;" ) - static Buffer field1264; + static Buffer field1233; static { - field1252 = new byte[2048]; - field1250 = new byte[2048]; - field1254 = new Buffer[2048]; + field1221 = new byte[2048]; + field1230 = new byte[2048]; + field1219 = new Buffer[2048]; Players_count = 0; Players_indices = new int[2048]; Players_emptyIdxCount = 0; @@ -71,75 +72,36 @@ public class Players { Players_targetIndices = new int[2048]; Players_pendingUpdateCount = 0; Players_pendingUpdateIndices = new int[2048]; - field1264 = new Buffer(new byte[5000]); + field1233 = new Buffer(new byte[5000]); } - @ObfuscatedName("w") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(IIIIB)V", - garbageValue = "-86" + signature = "(ILcr;ZI)I", + garbageValue = "578310351" ) - static final void method2092(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) { - continue; - } - class32.field282[0][var5][var4] = 127; - if (var0 == var5 && var5 > 0) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; - } - - 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]; - } - } + static int method2063(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? class286.field3623 : class297.field3693; + if (var0 == ScriptOpcodes.CC_GETX) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.x; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETY) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.y; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.width; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.height; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETHIDE) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETLAYER) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.parentId; + return 1; + } else { + return 2; } - - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "0" - ) - public static void method2093() { - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { - if (ArchiveDiskActionHandler.field3144 != 0) { - ArchiveDiskActionHandler.field3144 = 1; - - try { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); - } catch (InterruptedException var3) { - } - } - - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "(III)Z", - garbageValue = "2142202681" - ) - static final boolean method2091(int var0, int var1) { - ObjectDefinition var2 = ViewportMouse.getObjectDefinition(var0); - if (var1 == 11) { - var1 = 10; - } - - if (var1 >= 5 && var1 <= 8) { - var1 = 4; - } - - return var2.method4589(var1); } } diff --git a/runescape-client/src/main/java/PrivateChatMode.java b/runescape-client/src/main/java/PrivateChatMode.java index e2a06cb021..4e0bbadf9d 100644 --- a/runescape-client/src/main/java/PrivateChatMode.java +++ b/runescape-client/src/main/java/PrivateChatMode.java @@ -3,38 +3,37 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kl") +@ObfuscatedName("kk") @Implements("PrivateChatMode") -public class PrivateChatMode -{ - @ObfuscatedName("q") +public class PrivateChatMode { + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lkl;" + signature = "Lkk;" ) - static final PrivateChatMode field3818; - @ObfuscatedName("w") + static final PrivateChatMode field3793; + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lkl;" + signature = "Lkk;" ) - public static final PrivateChatMode field3816; - @ObfuscatedName("e") + public static final PrivateChatMode field3788; + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lkl;" + signature = "Lkk;" ) - static final PrivateChatMode field3817; - @ObfuscatedName("p") + static final PrivateChatMode field3790; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 721881779 + intValue = -2070508513 ) - public final int field3815; + public final int field3791; static { - field3818 = new PrivateChatMode(0); - field3816 = new PrivateChatMode(1); - field3817 = new PrivateChatMode(2); + field3793 = new PrivateChatMode(0); + field3788 = new PrivateChatMode(1); + field3790 = new PrivateChatMode(2); } PrivateChatMode(int var1) { - this.field3815 = var1; + this.field3791 = var1; } } diff --git a/runescape-client/src/main/java/Projectile.java b/runescape-client/src/main/java/Projectile.java index 8a558b271b..cb88af0023 100644 --- a/runescape-client/src/main/java/Projectile.java +++ b/runescape-client/src/main/java/Projectile.java @@ -7,126 +7,126 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("cp") @Implements("Projectile") public final class Projectile extends Entity { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -2096452169 + intValue = -951459675 ) @Export("id") int id; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 693683503 + intValue = 240131071 ) @Export("plane") int plane; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1526378075 + intValue = 1747500459 ) @Export("sourceX") int sourceX; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1758571809 + intValue = -190757363 ) @Export("sourceY") int sourceY; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1551078339 + intValue = 120274297 ) @Export("sourceZ") int sourceZ; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 520106141 + intValue = -545031319 ) @Export("endHeight") int endHeight; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1629309513 + intValue = -1504161017 ) @Export("cycleStart") int cycleStart; - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1697973671 + intValue = 1869679465 ) @Export("cycleEnd") int cycleEnd; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1762636667 + intValue = -905404739 ) @Export("slope") int slope; - @ObfuscatedName("f") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1172953683 + intValue = 703869729 ) @Export("startHeight") int startHeight; - @ObfuscatedName("m") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1892961843 + intValue = 1300497163 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("u") + @ObfuscatedName("c") @Export("isMoving") boolean isMoving; - @ObfuscatedName("x") + @ObfuscatedName("r") @Export("x") double x; - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("y") double y; - @ObfuscatedName("v") + @ObfuscatedName("p") @Export("z") double z; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("speedX") double speedX; @ObfuscatedName("g") @Export("speedY") double speedY; - @ObfuscatedName("a") + @ObfuscatedName("e") @Export("speed") double speed; - @ObfuscatedName("j") + @ObfuscatedName("z") @Export("speedZ") double speedZ; - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("accelerationZ") double accelerationZ; - @ObfuscatedName("h") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -2038512103 + intValue = 1352900335 ) @Export("yaw") int yaw; - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1827021613 + intValue = -1525474155 ) @Export("pitch") int pitch; - @ObfuscatedName("n") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Lis;" + signature = "Lij;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 2144836423 + intValue = 2057925261 ) @Export("frame") int frame; - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1364071235 + intValue = 1570641545 ) @Export("frameCycle") int frameCycle; @@ -147,19 +147,19 @@ public final class Projectile extends Entity { this.targetIndex = var10; this.endHeight = var11; this.isMoving = false; - int var12 = MusicPatch.SpotAnimationDefinition_get(this.id).sequence; + int var12 = HealthBarUpdate.SpotAnimationDefinition_get(this.id).sequence; if (var12 != -1) { - this.sequenceDefinition = GrandExchangeEvent.SequenceDefinition_get(var12); + this.sequenceDefinition = Widget.SequenceDefinition_get(var12); } else { this.sequenceDefinition = null; } } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(IIIII)V", - garbageValue = "-2118689642" + garbageValue = "-976791033" ) @Export("setDestination") final void setDestination(int var1, int var2, int var3, int var4) { @@ -169,14 +169,14 @@ public final class Projectile extends Entity { double var7 = (double)(var2 - this.sourceY); double var9 = Math.sqrt(var5 * var5 + var7 * var7); this.x = (double)this.sourceX + (double)this.startHeight * var5 / var9; - this.y = (double)this.startHeight * var7 / var9 + (double)this.sourceY; + this.y = var7 * (double)this.startHeight / 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.speedY * this.speedY + this.speedX * this.speedX); + this.speed = Math.sqrt(this.speedX * this.speedX + this.speedY * this.speedY); if (!this.isMoving) { this.speedZ = -this.speed * Math.tan(0.02454369D * (double)this.slope); } @@ -184,17 +184,17 @@ public final class Projectile extends Entity { this.accelerationZ = 2.0D * ((double)var3 - this.z - var5 * this.speedZ) / (var5 * var5); } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "-4" + signature = "(II)V", + garbageValue = "172847015" ) @Export("advance") final void advance(int var1) { this.isMoving = true; - this.x += (double)var1 * this.speedX; + this.x += this.speedX * (double)var1; this.y += (double)var1 * this.speedY; - this.z += (double)var1 * this.speedZ + 0.5D * this.accelerationZ * (double)var1 * (double)var1; + 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; @@ -220,40 +220,77 @@ public final class Projectile extends Entity { } } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)Ldm;", - garbageValue = "759381421" + signature = "(I)Ldo;", + garbageValue = "-419920513" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = MusicPatch.SpotAnimationDefinition_get(this.id); + SpotAnimationDefinition var1 = HealthBarUpdate.SpotAnimationDefinition_get(this.id); Model var2 = var1.getModel(this.frame); if (var2 == null) { return null; + } else { + var2.rotateZ(this.pitch); + return var2; } - var2.rotateZ(this.pitch); - return var2; } - @ObfuscatedName("q") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(IB)Lio;", - garbageValue = "0" + signature = "(II)Z", + garbageValue = "-1666857335" ) - @Export("HitSplatDefinition_get") - public static HitSplatDefinition HitSplatDefinition_get(int var0) { - HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } - byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); - var1 = new HitSplatDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } + @Export("loadInterface") + public static boolean loadInterface(int var0) { + if (WorldMapDecoration.Widget_loadedInterfaces[var0]) { + return true; + } else if (!Widget.Widget_archive.tryLoadGroup(var0)) { + return false; + } else { + int var1 = Widget.Widget_archive.getGroupFileCount(var0); + if (var1 == 0) { + WorldMapDecoration.Widget_loadedInterfaces[var0] = true; + return true; + } else { + if (Widget.Widget_interfaceComponents[var0] == null) { + Widget.Widget_interfaceComponents[var0] = new Widget[var1]; + } - HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); - return var1; + for (int var2 = 0; var2 < var1; ++var2) { + if (Widget.Widget_interfaceComponents[var0][var2] == null) { + byte[] var3 = Widget.Widget_archive.takeFile(var0, var2); + if (var3 != null) { + Widget.Widget_interfaceComponents[var0][var2] = new Widget(); + Widget.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); + if (var3[0] == -1) { + Widget.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); + } else { + Widget.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); + } + } + } + } + + WorldMapDecoration.Widget_loadedInterfaces[var0] = true; + return true; + } + } + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "(ILhz;IIIZI)V", + garbageValue = "771359751" + ) + public static void method2040(int var0, AbstractArchive var1, int var2, int var3, int var4, boolean var5) { + class197.field2378 = 1; + WorldMapDecoration.musicTrackArchive = var1; + class197.musicTrackGroupId = var2; + class197.musicTrackFileId = var3; + WorldMapSprite.field222 = var4; + Varcs.musicTrackBoolean = var5; + class16.field98 = var0; } } diff --git a/runescape-client/src/main/java/RasterProvider.java b/runescape-client/src/main/java/RasterProvider.java index 1860bc829b..671667104a 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("bp") +@ObfuscatedName("bk") @Implements("RasterProvider") public final class RasterProvider extends AbstractRasterProvider { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("component") Component component; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("image") Image image; @@ -29,47 +29,47 @@ public final class RasterProvider extends AbstractRasterProvider { super.height = var2; super.pixels = new int[var2 * var1 + 1]; DataBufferInt var4 = new DataBufferInt(super.pixels, super.pixels.length); - DirectColorModel var5 = new DirectColorModel(32, 0xff0000, 0xff00, 255); + DirectColorModel var5 = new DirectColorModel(32, 16711680, 65280, 255); WritableRaster var6 = Raster.createWritableRaster(var5.createCompatibleSampleModel(super.width, super.height), var4, (Point)null); this.image = new BufferedImage(var5, var6, false, new Hashtable()); this.setComponent(var3); this.apply(); } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(Ljava/awt/Component;B)V", - garbageValue = "0" + garbageValue = "-100" ) @Export("setComponent") final void setComponent(Component var1) { this.component = var1; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-1942972544" + garbageValue = "314023161" ) @Export("drawFull") public final void drawFull(int var1, int var2) { this.drawFull0(this.component.getGraphics(), var1, var2); } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(IIIII)V", - garbageValue = "1902391505" + garbageValue = "333545527" ) @Export("draw") public final void draw(int var1, int var2, int var3, int var4) { this.draw0(this.component.getGraphics(), var1, var2, var3, var4); } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(Ljava/awt/Graphics;III)V", - garbageValue = "689962734" + garbageValue = "-1562101424" ) @Export("drawFull0") final void drawFull0(Graphics var1, int var2, int var3) { @@ -81,10 +81,10 @@ public final class RasterProvider extends AbstractRasterProvider { } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(Ljava/awt/Graphics;IIIII)V", - garbageValue = "-143326584" + garbageValue = "399738450" ) @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 40d5998d8b..7219eaa32c 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("lb") +@ObfuscatedName("lj") @Implements("Rasterizer2D") public class Rasterizer2D extends DualNode { - @ObfuscatedName("av") + @ObfuscatedName("am") @Export("Rasterizer2D_pixels") public static int[] Rasterizer2D_pixels; - @ObfuscatedName("as") + @ObfuscatedName("ai") @Export("Rasterizer2D_width") public static int Rasterizer2D_width; - @ObfuscatedName("aw") + @ObfuscatedName("af") @Export("Rasterizer2D_height") public static int Rasterizer2D_height; - @ObfuscatedName("ad") + @ObfuscatedName("az") @Export("Rasterizer2D_yClipStart") public static int Rasterizer2D_yClipStart; - @ObfuscatedName("ag") + @ObfuscatedName("aj") @Export("Rasterizer2D_yClipEnd") public static int Rasterizer2D_yClipEnd; - @ObfuscatedName("ar") + @ObfuscatedName("an") @Export("Rasterizer2D_xClipStart") public static int Rasterizer2D_xClipStart; - @ObfuscatedName("ax") + @ObfuscatedName("at") @Export("Rasterizer2D_xClipEnd") public static int Rasterizer2D_xClipEnd; @@ -38,7 +38,7 @@ public class Rasterizer2D extends DualNode { protected Rasterizer2D() { } - @ObfuscatedName("cd") + @ObfuscatedName("cq") @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("dr") + @ObfuscatedName("ct") @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("dn") + @ObfuscatedName("cx") @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("dw") + @ObfuscatedName("ca") @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("dg") + @ObfuscatedName("cs") @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("df") + @ObfuscatedName("co") @Export("Rasterizer2D_setClipArray") public static void Rasterizer2D_setClipArray(int[] var0) { Rasterizer2D_xClipStart = var0[0]; @@ -120,7 +120,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_yClipEnd = var0[3]; } - @ObfuscatedName("dt") + @ObfuscatedName("dr") @Export("Rasterizer2D_clear") public static void Rasterizer2D_clear() { int var0 = 0; @@ -141,7 +141,7 @@ public class Rasterizer2D extends DualNode { } - @ObfuscatedName("dj") + @ObfuscatedName("dd") @Export("drawCircle") static void drawCircle(int var0, int var1, int var2, int var3) { if (var2 == 0) { @@ -236,7 +236,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("dl") + @ObfuscatedName("dv") @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("dz") + @ObfuscatedName("da") @Export("Rasterizer2D_fillRectangleAlpha") public static void Rasterizer2D_fillRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { if (var0 < Rasterizer2D_xClipStart) { @@ -370,7 +370,7 @@ public class Rasterizer2D extends DualNode { var3 = Rasterizer2D_yClipEnd - var1; } - var4 = (var5 * (var4 & 0xff00ff) >> 8 & 0xff00ff) + (var5 * (var4 & 0xff00) >> 8 & 0xff00); + var4 = (var5 * (var4 & 16711935) >> 8 & 16711935) + (var5 * (var4 & 65280) >> 8 & 65280); int var6 = 256 - var5; int var7 = Rasterizer2D_width - var2; int var8 = var0 + Rasterizer2D_width * var1; @@ -378,7 +378,7 @@ public class Rasterizer2D extends DualNode { for (int var9 = 0; var9 < var3; ++var9) { for (int var10 = -var2; var10 < 0; ++var10) { int var11 = Rasterizer2D_pixels[var8]; - var11 = ((var11 & 0xff00ff) * var6 >> 8 & 0xff00ff) + (var6 * (var11 & 0xff00) >> 8 & 0xff00); + var11 = ((var11 & 16711935) * var6 >> 8 & 16711935) + (var6 * (var11 & 65280) >> 8 & 65280); Rasterizer2D_pixels[var8++] = var11 + var4; } @@ -389,31 +389,31 @@ public class Rasterizer2D extends DualNode { @ObfuscatedName("dh") @Export("Rasterizer2D_fillRectangle") - public static void Rasterizer2D_fillRectangle(int x, int y, int w, int h, int c) { - if (x < Rasterizer2D_xClipStart) { - w -= Rasterizer2D_xClipStart - x; - x = Rasterizer2D_xClipStart; + public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int var3, int var4) { + if (var0 < Rasterizer2D_xClipStart) { + var2 -= Rasterizer2D_xClipStart - var0; + var0 = Rasterizer2D_xClipStart; } - if (y < Rasterizer2D_yClipStart) { - h -= Rasterizer2D_yClipStart - y; - y = Rasterizer2D_yClipStart; + if (var1 < Rasterizer2D_yClipStart) { + var3 -= Rasterizer2D_yClipStart - var1; + var1 = Rasterizer2D_yClipStart; } - if (x + w > Rasterizer2D_xClipEnd) { - w = Rasterizer2D_xClipEnd - x; + if (var0 + var2 > Rasterizer2D_xClipEnd) { + var2 = Rasterizer2D_xClipEnd - var0; } - if (h + y > Rasterizer2D_yClipEnd) { - h = Rasterizer2D_yClipEnd - y; + if (var3 + var1 > Rasterizer2D_yClipEnd) { + var3 = Rasterizer2D_yClipEnd - var1; } - int var5 = Rasterizer2D_width - w; - int var6 = x + Rasterizer2D_width * y; + int var5 = Rasterizer2D_width - var2; + int var6 = var0 + Rasterizer2D_width * var1; - for (int var7 = -h; var7 < 0; ++var7) { - for (int var8 = -w; var8 < 0; ++var8) { - Rasterizer2D_pixels[var6++] = c; + for (int var7 = -var3; var7 < 0; ++var7) { + for (int var8 = -var2; var8 < 0; ++var8) { + Rasterizer2D_pixels[var6++] = var4; } var6 += var5; @@ -421,7 +421,7 @@ public class Rasterizer2D extends DualNode { } - @ObfuscatedName("dy") + @ObfuscatedName("dm") @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) { @@ -452,7 +452,7 @@ public class Rasterizer2D extends DualNode { for (int var10 = -var3; var10 < 0; ++var10) { int var11 = 65536 - var6 >> 8; int var12 = var6 >> 8; - int var13 = (var12 * (var5 & 0xff00ff) + var11 * (var4 & 0xff00ff) & 0xff00ff00) + (var12 * (var5 & 0xff00) + var11 * (var4 & 0xff00) & 0xff0000) >>> 8; + int var13 = (var12 * (var5 & 16711935) + var11 * (var4 & 16711935) & -16711936) + (var12 * (var5 & 65280) + var11 * (var4 & 65280) & 16711680) >>> 8; for (int var14 = -var2; var14 < 0; ++var14) { Rasterizer2D_pixels[var9++] = var13; @@ -465,7 +465,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("dx") + @ObfuscatedName("dj") @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) { @@ -496,21 +496,21 @@ public class Rasterizer2D extends DualNode { for (int var12 = -var3; var12 < 0; ++var12) { int var13 = 65536 - var8 >> 8; int var14 = var8 >> 8; - int var15 = (var13 * var6 + var14 * var7 & 0xff00) >>> 8; + int var15 = (var13 * var6 + var14 * var7 & 65280) >>> 8; if (var15 == 0) { var11 += Rasterizer2D_width; var8 += var9; } else { - int var16 = (var14 * (var5 & 0xff00ff) + var13 * (var4 & 0xff00ff) & 0xff00ff00) + (var14 * (var5 & 0xff00) + var13 * (var4 & 0xff00) & 0xff0000) >>> 8; + int var16 = (var14 * (var5 & 16711935) + var13 * (var4 & 16711935) & -16711936) + (var14 * (var5 & 65280) + var13 * (var4 & 65280) & 16711680) >>> 8; int var17 = 255 - var15; - int var18 = ((var16 & 0xff00ff) * var15 >> 8 & 0xff00ff) + (var15 * (var16 & 0xff00) >> 8 & 0xff00); + int var18 = ((var16 & 16711935) * var15 >> 8 & 16711935) + (var15 * (var16 & 65280) >> 8 & 65280); for (int var19 = -var2; var19 < 0; ++var19) { int var20 = Rasterizer2D_pixels[var11]; if (var20 == 0) { Rasterizer2D_pixels[var11++] = var18; } else { - var20 = ((var20 & 0xff00ff) * var17 >> 8 & 0xff00ff) + (var17 * (var20 & 0xff00) >> 8 & 0xff00); + var20 = ((var20 & 16711935) * var17 >> 8 & 16711935) + (var17 * (var20 & 65280) >> 8 & 65280); Rasterizer2D_pixels[var11++] = var18 + var20; } } @@ -523,90 +523,88 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("dp") + @ObfuscatedName("dc") @ObfuscatedSignature( signature = "(IIIIII[BIZ)V", garbageValue = "1" ) @Export("Rasterizer2D_drawGradientPixels") - public static void Rasterizer2D_drawGradientPixels(int x, int y, int w, int h, int bgCol, int fgCol, byte[] pixels, int pxPerTile) { - if (x + w < 0 || h + y < 0) { - return; - } - if (x >= Rasterizer2D_width || y >= Rasterizer2D_height) { - return; - } - int var8 = 0; - int var9 = 0; - if (x < 0) { - var8 -= x; - w += x; - } + public static void Rasterizer2D_drawGradientPixels(int var0, int var1, int var2, int var3, int var4, int var5, byte[] var6, int var7) { + if (var0 + var2 >= 0 && var3 + var1 >= 0) { + if (var0 < Rasterizer2D_width && var1 < Rasterizer2D_height) { + int var8 = 0; + int var9 = 0; + if (var0 < 0) { + var8 -= var0; + var2 += var0; + } - if (y < 0) { - var9 -= y; - h += y; - } + if (var1 < 0) { + var9 -= var1; + var3 += var1; + } - if (x + w > Rasterizer2D_width) { - w = Rasterizer2D_width - x; - } + if (var0 + var2 > Rasterizer2D_width) { + var2 = Rasterizer2D_width - var0; + } - if (h + y > Rasterizer2D_height) { - h = Rasterizer2D_height - y; - } + if (var3 + var1 > Rasterizer2D_height) { + var3 = Rasterizer2D_height - var1; + } - int var10 = pixels.length / pxPerTile; - int var11 = Rasterizer2D_width - w; - int var12 = bgCol >>> 24; - int var13 = fgCol >>> 24; - int var14; - int var15; - int var16; - int var17; - int var18; - if (var12 == 255 && var13 == 255) { - var14 = x + var8 + (var9 + y) * Rasterizer2D_width; + int var10 = var6.length / var7; + int var11 = Rasterizer2D_width - var2; + int var12 = var4 >>> 24; + int var13 = var5 >>> 24; + int var14; + int var15; + int var16; + int var17; + int var18; + if (var12 == 255 && var13 == 255) { + var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width; - for (var15 = var9 + y; var15 < h + var9 + y; ++var15) { - for (var16 = x + var8; var16 < x + var8 + w; ++var16) { - var17 = (var15 - y) % var10; - var18 = (var16 - x) % pxPerTile; - if (pixels[var18 + var17 * pxPerTile] != 0) { - Rasterizer2D_pixels[var14++] = fgCol; - } else { - Rasterizer2D_pixels[var14++] = bgCol; + for (var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) { + for (var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) { + var17 = (var15 - var1) % var10; + var18 = (var16 - var0) % var7; + if (var6[var18 + var17 * var7] != 0) { + Rasterizer2D_pixels[var14++] = var5; + } else { + Rasterizer2D_pixels[var14++] = var4; + } + } + + var14 += var11; + } + } else { + var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width; + + for (var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) { + for (var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) { + var17 = (var15 - var1) % var10; + var18 = (var16 - var0) % var7; + int var19 = var4; + if (var6[var18 + var17 * var7] != 0) { + var19 = var5; + } + + int var20 = var19 >>> 24; + int var21 = 255 - var20; + int var22 = Rasterizer2D_pixels[var14]; + int var23 = ((var19 & 16711935) * var20 + (var22 & 16711935) * var21 & -16711936) + (var20 * (var19 & 65280) + var21 * (var22 & 65280) & 16711680) >> 8; + Rasterizer2D_pixels[var14++] = var23; + } + + var14 += var11; } } - var14 += var11; - } - } else { - var14 = x + var8 + (var9 + y) * Rasterizer2D_width; - - for (var15 = var9 + y; var15 < h + var9 + y; ++var15) { - for (var16 = x + var8; var16 < x + var8 + w; ++var16) { - var17 = (var15 - y) % var10; - var18 = (var16 - x) % pxPerTile; - int var19 = bgCol; - if (pixels[var18 + var17 * pxPerTile] != 0) { - var19 = fgCol; - } - - int var20 = var19 >>> 24; - int var21 = 255 - var20; - int var22 = Rasterizer2D_pixels[var14]; - int var23 = ((var19 & 0xff00ff) * var20 + (var22 & 0xff00ff) * var21 & 0xff00ff00) + (var20 * (var19 & 0xff00) + var21 * (var22 & 0xff00) & 0xff0000) >> 8; - Rasterizer2D_pixels[var14++] = var23; - } - - var14 += var11; } } - } - @ObfuscatedName("de") + @ObfuscatedName("db") @Export("Rasterizer2D_drawRectangle") public static void Rasterizer2D_drawRectangle(int var0, int var1, int var2, int var3, int var4) { Rasterizer2D_drawHorizontalLine(var0, var1, var2, var4); @@ -615,7 +613,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_drawVerticalLine(var0 + var2 - 1, var1, var3, var4); } - @ObfuscatedName("du") + @ObfuscatedName("dx") @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); @@ -627,7 +625,7 @@ public class Rasterizer2D extends DualNode { } - @ObfuscatedName("do") + @ObfuscatedName("dp") @Export("Rasterizer2D_drawHorizontalLine") public static void Rasterizer2D_drawHorizontalLine(int var0, int var1, int var2, int var3) { if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { @@ -649,7 +647,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("dc") + @ObfuscatedName("dz") @Export("Rasterizer2D_drawHorizontalLineAlpha") static void Rasterizer2D_drawHorizontalLineAlpha(int var0, int var1, int var2, int var3, int var4) { if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { @@ -679,7 +677,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("ds") + @ObfuscatedName("dw") @Export("Rasterizer2D_drawVerticalLine") public static void Rasterizer2D_drawVerticalLine(int var0, int var1, int var2, int var3) { if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { @@ -701,7 +699,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("dk") + @ObfuscatedName("dn") @Export("Rasterizer2D_drawVerticalLineAlpha") static void Rasterizer2D_drawVerticalLineAlpha(int var0, int var1, int var2, int var3, int var4) { if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { @@ -732,7 +730,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("dq") + @ObfuscatedName("ds") @Export("Rasterizer2D_drawLine") public static void Rasterizer2D_drawLine(int var0, int var1, int var2, int var3, int var4) { var2 -= var0; @@ -814,7 +812,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("db") + @ObfuscatedName("dt") @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) { @@ -822,7 +820,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("da") + @ObfuscatedName("du") @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 8a47a80c11..b292b3ae53 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("ev") +@ObfuscatedName("eo") @Implements("Rasterizer3D") public class Rasterizer3D extends Rasterizer2D { - @ObfuscatedName("q") - static boolean field1763; - @ObfuscatedName("w") - static boolean field1772; - @ObfuscatedName("e") + @ObfuscatedName("s") + static boolean field1760; + @ObfuscatedName("j") + static boolean field1742; + @ObfuscatedName("i") @Export("Rasterizer3D_isLowDetailTexture") static boolean Rasterizer3D_isLowDetailTexture; - @ObfuscatedName("p") - public static boolean field1768; @ObfuscatedName("k") + public static boolean field1744; + @ObfuscatedName("u") @Export("Rasterizer3D_alpha") static int Rasterizer3D_alpha; - @ObfuscatedName("u") + @ObfuscatedName("c") @Export("Rasterizer3D_zoom") public static int Rasterizer3D_zoom; - @ObfuscatedName("x") + @ObfuscatedName("r") @Export("Rasterizer3D_clipMidX") static int Rasterizer3D_clipMidX; - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("Rasterizer3D_clipMidY") static int Rasterizer3D_clipMidY; - @ObfuscatedName("v") + @ObfuscatedName("p") @Export("Rasterizer3D_clipWidth") static int Rasterizer3D_clipWidth; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("Rasterizer3D_clipHeight") static int Rasterizer3D_clipHeight; @ObfuscatedName("g") @Export("Rasterizer3D_clipNegativeMidX") static int Rasterizer3D_clipNegativeMidX; - @ObfuscatedName("a") + @ObfuscatedName("e") @Export("Rasterizer3D_clipMidX2") static int Rasterizer3D_clipMidX2; - @ObfuscatedName("j") + @ObfuscatedName("z") @Export("Rasterizer3D_clipNegativeMidY") static int Rasterizer3D_clipNegativeMidY; - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("Rasterizer3D_clipMidY2") static int Rasterizer3D_clipMidY2; - @ObfuscatedName("h") + @ObfuscatedName("w") @Export("Rasterizer3D_rowOffsets") static int[] Rasterizer3D_rowOffsets; - @ObfuscatedName("o") + @ObfuscatedName("l") @Export("Rasterizer3D_colorPalette") public static int[] Rasterizer3D_colorPalette; - @ObfuscatedName("n") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Lef;" + signature = "Leh;" ) @Export("Rasterizer3D_textureLoader") public static TextureLoader Rasterizer3D_textureLoader; - @ObfuscatedName("d") - static int[] field1785; - @ObfuscatedName("s") - static int[] field1786; - @ObfuscatedName("z") + @ObfuscatedName("v") + static int[] field1764; + @ObfuscatedName("m") + static int[] field1765; + @ObfuscatedName("o") @Export("Rasterizer3D_sine") public static int[] Rasterizer3D_sine; - @ObfuscatedName("al") + @ObfuscatedName("av") @Export("Rasterizer3D_cosine") public static int[] Rasterizer3D_cosine; static { - field1763 = false; - field1772 = false; + field1760 = false; + field1742 = false; Rasterizer3D_isLowDetailTexture = false; - field1768 = true; + field1744 = true; Rasterizer3D_alpha = 0; Rasterizer3D_zoom = 512; Rasterizer3D_rowOffsets = new int[1024]; Rasterizer3D_colorPalette = new int[65536]; - field1785 = new int[512]; - field1786 = new int[2048]; + field1764 = new int[512]; + field1765 = new int[2048]; Rasterizer3D_sine = new int[2048]; Rasterizer3D_cosine = new int[2048]; int var0; for (var0 = 1; var0 < 512; ++var0) { - field1785[var0] = 32768 / var0; + field1764[var0] = 32768 / var0; } for (var0 = 1; var0 < 2048; ++var0) { - field1786[var0] = 65536 / var0; + field1765[var0] = 65536 / var0; } for (var0 = 0; var0 < 2048; ++var0) { @@ -98,13 +98,13 @@ public class Rasterizer3D extends Rasterizer2D { } - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("Rasterizer3D_setClipFromRasterizer2D") public static final void Rasterizer3D_setClipFromRasterizer2D() { Rasterizer3D_setClip(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd); } - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("Rasterizer3D_setClip") static final void Rasterizer3D_setClip(int var0, int var1, int var2, int var3) { Rasterizer3D_clipWidth = var2 - var0; @@ -133,7 +133,7 @@ public class Rasterizer3D extends Rasterizer2D { } - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("Rasterizer3D_method3") public static final void Rasterizer3D_method3() { Rasterizer3D_clipMidX = Rasterizer3D_clipWidth / 2; @@ -144,8 +144,8 @@ public class Rasterizer3D extends Rasterizer2D { Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; } - @ObfuscatedName("p") - public static final void method2976(int var0, int var1) { + @ObfuscatedName("k") + public static final void method2929(int var0, int var1) { int var2 = Rasterizer3D_rowOffsets[0]; int var3 = var2 / Rasterizer2D.Rasterizer2D_width; int var4 = var2 - var3 * Rasterizer2D.Rasterizer2D_width; @@ -157,25 +157,27 @@ public class Rasterizer3D extends Rasterizer2D { Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Lef;)V" + signature = "(Leh;)V" ) @Export("Rasterizer3D_setTextureLoader") public static final void Rasterizer3D_setTextureLoader(TextureLoader var0) { Rasterizer3D_textureLoader = var0; } - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("Rasterizer3D_setBrightness") public static final void Rasterizer3D_setBrightness(double var0) { Rasterizer3D_buildPalette(var0, 0, 512); } - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("Rasterizer3D_buildPalette") - static final void Rasterizer3D_buildPalette(double brightness, int var2, int var3) { - for (int var4 = var2 * 128, var5 = var2; var5 < var3; ++var5) { + static final void Rasterizer3D_buildPalette(double var0, int var2, int var3) { + int var4 = var2 * 128; + + for (int var5 = var2; var5 < var3; ++var5) { double var6 = (double)(var5 >> 3) / 64.0D + 0.0078125D; double var8 = (double)(var5 & 7) / 8.0D + 0.0625D; @@ -238,7 +240,7 @@ public class Rasterizer3D extends Rasterizer2D { int var20 = (int)(var15 * 256.0D); int var30 = (int)(var17 * 256.0D); int var22 = var30 + (var20 << 8) + (var29 << 16); - var22 = Rasterizer3D_brighten(var22, brightness); + var22 = Rasterizer3D_brighten(var22, var0); if (var22 == 0) { var22 = 1; } @@ -249,28 +251,28 @@ public class Rasterizer3D extends Rasterizer2D { } - @ObfuscatedName("i") + @ObfuscatedName("q") @Export("Rasterizer3D_brighten") - static int Rasterizer3D_brighten(int colour, double brightness) { - double var3 = (double)(colour >> 16) / 256.0D; - double var5 = (double)(colour >> 8 & 255) / 256.0D; - double var7 = (double)(colour & 255) / 256.0D; - var3 = Math.pow(var3, brightness); - var5 = Math.pow(var5, brightness); - var7 = Math.pow(var7, brightness); + static int Rasterizer3D_brighten(int var0, double var1) { + double var3 = (double)(var0 >> 16) / 256.0D; + double var5 = (double)(var0 >> 8 & 255) / 256.0D; + double var7 = (double)(var0 & 255) / 256.0D; + var3 = Math.pow(var3, var1); + var5 = Math.pow(var5, var1); + var7 = Math.pow(var7, var1); int var9 = (int)(var3 * 256.0D); int var10 = (int)(var5 * 256.0D); int var11 = (int)(var7 * 256.0D); return var11 + (var10 << 8) + (var9 << 16); } - @ObfuscatedName("c") - public static void method2981(int var0, int var1, int var2) { - field1763 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; + @ObfuscatedName("x") + public static void method2933(int var0, int var1, int var2) { + field1760 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; } - @ObfuscatedName("u") - static final void method3020(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + @ObfuscatedName("d") + static final void method2934(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; @@ -356,104 +358,107 @@ public class Rasterizer3D extends Rasterizer2D { var6 += var20; var0 += Rasterizer2D.Rasterizer2D_width; } - } - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + } else { + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var4 >> 14, var6, var19); - var5 += var17; - var4 += var15; - var6 += var20; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); - var5 += var17; - var3 += var16; - var6 += var20; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } - var4 = var3 <<= 14; - if (var0 < 0) { - var4 -= var0 * var17; - var3 -= var0 * var16; - var6 -= var0 * var20; - var0 = 0; - } - - var5 <<= 14; - if (var2 < 0) { - var5 -= var15 * var2; - var2 = 0; - } - - if (var0 != var2 && var17 < var16 || var0 == var2 && var15 > var16) { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); - var5 += var15; - var3 += var16; - var6 += var20; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var3 >> 14, var6, var19); - var4 += var17; - var3 += var16; - var6 += var20; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while (true) { - --var2; - if (var2 < 0) { while (true) { --var1; if (var1 < 0) { - return; + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var4 >> 14, var6, var19); + var5 += var17; + var4 += var15; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; + } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); - var5 += var15; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); + var5 += var17; var3 += var16; var6 += var20; var0 += Rasterizer2D.Rasterizer2D_width; } } + } else { + var4 = var3 <<= 14; + if (var0 < 0) { + var4 -= var0 * var17; + var3 -= var0 * var16; + var6 -= var0 * var20; + var0 = 0; + } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var4 >> 14, var6, var19); - var4 += var17; - var3 += var16; - var6 += var20; - var0 += Rasterizer2D.Rasterizer2D_width; + var5 <<= 14; + if (var2 < 0) { + var5 -= var15 * var2; + var2 = 0; + } + + if (var0 != var2 && var17 < var16 || var0 == var2 && var15 > var16) { + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); + var5 += var15; + var3 += var16; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var3 >> 14, var6, var19); + var4 += var17; + var3 += var16; + var6 += var20; + 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_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); + var5 += var15; + var3 += var16; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var4 >> 14, var6, var19); + var4 += var17; + var3 += var16; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; + } + } } } } else if (var1 <= var2) { @@ -510,104 +515,107 @@ public class Rasterizer3D extends Rasterizer2D { var7 += var20; var1 += Rasterizer2D.Rasterizer2D_width; } - } - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + } 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, var3 >> 14, var5 >> 14, var7, var19); - var3 += var16; - var5 += var17; - var7 += var20; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); - var3 += var16; - var4 += var15; - var7 += var20; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } - var5 = var4 <<= 14; - if (var1 < 0) { - var5 -= var16 * var1; - var4 -= var15 * var1; - var7 -= var20 * var1; - var1 = 0; - } - - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var17; - var0 = 0; - } - - if (var16 < var15) { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while (true) { - --var0; - if (var0 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); - var3 += var17; - var4 += var15; - var7 += var20; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var7, var19); - var5 += var16; - var4 += var15; - var7 += var20; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while (true) { - --var0; - if (var0 < 0) { while (true) { --var2; if (var2 < 0) { - return; + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var5 >> 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 += var17; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); + var3 += var16; var4 += var15; var7 += var20; var1 += Rasterizer2D.Rasterizer2D_width; } } + } else { + var5 = var4 <<= 14; + if (var1 < 0) { + var5 -= var16 * var1; + var4 -= var15 * var1; + var7 -= var20 * var1; + var1 = 0; + } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var7, var19); - var5 += var16; - var4 += var15; - var7 += var20; - var1 += Rasterizer2D.Rasterizer2D_width; + var3 <<= 14; + if (var0 < 0) { + var3 -= var0 * var17; + var0 = 0; + } + + if (var16 < var15) { + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var0; + if (var0 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); + var3 += var17; + var4 += var15; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var7, var19); + var5 += var16; + var4 += var15; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; + } + } else { + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var0; + if (var0 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); + var3 += var17; + var4 += var15; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var7, var19); + var5 += var16; + var4 += var15; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; + } + } } } } else if (var2 < Rasterizer3D_clipHeight) { @@ -663,113 +671,116 @@ public class Rasterizer3D extends Rasterizer2D { var8 += var20; var2 += Rasterizer2D.Rasterizer2D_width; } - } - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + } else { + var1 -= var0; + var0 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; - while (true) { - --var0; - if (var0 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var4 >> 14, var8, var19); - var4 += var15; - var3 += var16; - var8 += var20; - var2 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); - var4 += var15; - var5 += var17; - var8 += var20; - var2 += Rasterizer2D.Rasterizer2D_width; - } - } - var3 = var5 <<= 14; - if (var2 < 0) { - var3 -= var15 * var2; - var5 -= var17 * var2; - var8 -= var20 * var2; - var2 = 0; - } - - var4 <<= 14; - if (var1 < 0) { - var4 -= var16 * var1; - var1 = 0; - } - - if (var15 < var17) { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var0; - if (var0 < 0) { - return; - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19); - var4 += var16; - var5 += var17; - var8 += var20; - var2 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var5 >> 14, var8, var19); - var3 += var15; - var5 += var17; - var8 += var20; - var2 += Rasterizer2D.Rasterizer2D_width; - } - } - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; - - while (true) { - --var1; - if (var1 < 0) { while (true) { --var0; if (var0 < 0) { - return; + while (true) { + --var1; + if (var1 < 0) { + return; + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var4 >> 14, var8, var19); + var4 += var15; + var3 += var16; + var8 += var20; + var2 += Rasterizer2D.Rasterizer2D_width; + } } Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); - var4 += var16; + var4 += var15; var5 += var17; var8 += var20; var2 += Rasterizer2D.Rasterizer2D_width; } } + } else { + var3 = var5 <<= 14; + if (var2 < 0) { + var3 -= var15 * var2; + var5 -= var17 * var2; + var8 -= var20 * var2; + var2 = 0; + } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var3 >> 14, var8, var19); - var3 += var15; - var5 += var17; - var8 += var20; - var2 += Rasterizer2D.Rasterizer2D_width; + var4 <<= 14; + if (var1 < 0) { + var4 -= var16 * var1; + var1 = 0; + } + + if (var15 < var17) { + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19); + var4 += var16; + var5 += var17; + var8 += var20; + var2 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var5 >> 14, var8, var19); + var3 += var15; + var5 += var17; + var8 += var20; + var2 += Rasterizer2D.Rasterizer2D_width; + } + } else { + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); + var4 += var16; + var5 += var17; + var8 += var20; + var2 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var3 >> 14, var8, var19); + var3 += var15; + var5 += var17; + var8 += var20; + var2 += Rasterizer2D.Rasterizer2D_width; + } + } } } } } - @ObfuscatedName("x") + @ObfuscatedName("f") @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 (field1763) { + if (field1760) { if (var5 > Rasterizer3D_clipWidth) { var5 = Rasterizer3D_clipWidth; } @@ -785,7 +796,7 @@ public class Rasterizer3D extends Rasterizer2D { int var8; int var9; int var10; - if (field1768) { + if (field1744) { var3 = var5 - var4 >> 2; var7 <<= 2; if (Rasterizer3D_alpha == 0) { @@ -817,15 +828,15 @@ public class Rasterizer3D extends Rasterizer2D { do { var2 = Rasterizer3D_colorPalette[var6 >> 8]; var6 += var7; - var2 = (var9 * (var2 & 0xff00) >> 8 & 0xff00) + (var9 * (var2 & 0xff00ff) >> 8 & 0xff00ff); + var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); var10 = var0[var1]; - var0[var1++] = ((var10 & 0xff00ff) * var8 >> 8 & 0xff00ff) + var2 + (var8 * (var10 & 0xff00) >> 8 & 0xff00); + var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); var10 = var0[var1]; - var0[var1++] = ((var10 & 0xff00ff) * var8 >> 8 & 0xff00ff) + var2 + (var8 * (var10 & 0xff00) >> 8 & 0xff00); + var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); var10 = var0[var1]; - var0[var1++] = ((var10 & 0xff00ff) * var8 >> 8 & 0xff00ff) + var2 + (var8 * (var10 & 0xff00) >> 8 & 0xff00); + var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); var10 = var0[var1]; - var0[var1++] = ((var10 & 0xff00ff) * var8 >> 8 & 0xff00ff) + var2 + (var8 * (var10 & 0xff00) >> 8 & 0xff00); + var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); --var3; } while(var3 > 0); } @@ -833,11 +844,11 @@ public class Rasterizer3D extends Rasterizer2D { var3 = var5 - var4 & 3; if (var3 > 0) { var2 = Rasterizer3D_colorPalette[var6 >> 8]; - var2 = (var9 * (var2 & 0xff00) >> 8 & 0xff00) + (var9 * (var2 & 0xff00ff) >> 8 & 0xff00ff); + var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); do { var10 = var0[var1]; - var0[var1++] = ((var10 & 0xff00ff) * var8 >> 8 & 0xff00ff) + var2 + (var8 * (var10 & 0xff00) >> 8 & 0xff00); + var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); --var3; } while(var3 > 0); } @@ -858,9 +869,9 @@ public class Rasterizer3D extends Rasterizer2D { do { var2 = Rasterizer3D_colorPalette[var6 >> 8]; var6 += var7; - var2 = (var9 * (var2 & 0xff00) >> 8 & 0xff00) + (var9 * (var2 & 0xff00ff) >> 8 & 0xff00ff); + var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); var10 = var0[var1]; - var0[var1++] = ((var10 & 0xff00ff) * var8 >> 8 & 0xff00ff) + var2 + (var8 * (var10 & 0xff00) >> 8 & 0xff00); + var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); --var3; } while(var3 > 0); } @@ -869,8 +880,8 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("r") - public static final void method3007(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("c") + public static final void method2936(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); @@ -936,97 +947,100 @@ public class Rasterizer3D extends Rasterizer2D { var3 += var7; var0 += Rasterizer2D.Rasterizer2D_width; } - } - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + } 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, var4 >> 14, var5 >> 14); - var5 += var9; - var4 += var8; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); - var5 += var9; - var3 += var7; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } - var4 = var3 <<= 14; - if (var0 < 0) { - var4 -= var0 * var9; - var3 -= var0 * var7; - var0 = 0; - } - - var5 <<= 14; - if (var2 < 0) { - var5 -= var8 * var2; - 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; - } - } - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while (true) { - --var2; - if (var2 < 0) { while (true) { --var1; if (var1 < 0) { - return; + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var5 >> 14); + var5 += var9; + var4 += var8; + var0 += Rasterizer2D.Rasterizer2D_width; + } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); - var5 += var8; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); + var5 += var9; var3 += var7; var0 += Rasterizer2D.Rasterizer2D_width; } } + } else { + var4 = var3 <<= 14; + if (var0 < 0) { + var4 -= var0 * var9; + var3 -= var0 * var7; + var0 = 0; + } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var3 >> 14); - var4 += var9; - var3 += var7; - var0 += Rasterizer2D.Rasterizer2D_width; + var5 <<= 14; + if (var2 < 0) { + var5 -= var8 * var2; + 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, var5 >> 14, var3 >> 14); + var5 += var8; + var3 += var7; + var0 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var3 >> 14); + var4 += var9; + 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; + } + } } } } else if (var1 <= var2) { @@ -1079,97 +1093,100 @@ public class Rasterizer3D extends Rasterizer2D { var4 += var8; var1 += Rasterizer2D.Rasterizer2D_width; } - } - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + } 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, var5 >> 14, var3 >> 14); - var3 += var7; - var5 += var9; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); - var3 += var7; - var4 += var8; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } - var5 = var4 <<= 14; - if (var1 < 0) { - var5 -= var7 * var1; - var4 -= var8 * var1; - var1 = 0; - } - - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var9; - var0 = 0; - } - - if (var7 < var8) { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while (true) { - --var0; - if (var0 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); - var3 += var9; - var4 += var8; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var4 >> 14); - var5 += var7; - var4 += var8; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while (true) { - --var0; - if (var0 < 0) { while (true) { --var2; if (var2 < 0) { - return; + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var3 >> 14); + var3 += var7; + var5 += var9; + var1 += Rasterizer2D.Rasterizer2D_width; + } } Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); - var3 += var9; + var3 += var7; var4 += var8; var1 += Rasterizer2D.Rasterizer2D_width; } } + } else { + var5 = var4 <<= 14; + if (var1 < 0) { + var5 -= var7 * var1; + var4 -= var8 * var1; + var1 = 0; + } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var5 >> 14); - var5 += var7; - var4 += var8; - var1 += Rasterizer2D.Rasterizer2D_width; + var3 <<= 14; + if (var0 < 0) { + var3 -= var0 * var9; + var0 = 0; + } + + if (var7 < var8) { + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var0; + if (var0 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); + var3 += var9; + var4 += var8; + var1 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var4 >> 14); + var5 += var7; + var4 += var8; + var1 += Rasterizer2D.Rasterizer2D_width; + } + } else { + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var0; + if (var0 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); + var3 += var9; + var4 += var8; + var1 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var5 >> 14); + var5 += var7; + var4 += var8; + var1 += Rasterizer2D.Rasterizer2D_width; + } + } } } } else if (var2 < Rasterizer3D_clipHeight) { @@ -1221,105 +1238,108 @@ public class Rasterizer3D extends Rasterizer2D { var5 += var9; var2 += Rasterizer2D.Rasterizer2D_width; } - } - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + } else { + var1 -= var0; + var0 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; - while (true) { - --var0; - if (var0 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var4 >> 14); - var4 += var8; - var3 += var7; - var2 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); - var4 += var8; - var5 += var9; - var2 += Rasterizer2D.Rasterizer2D_width; - } - } - var3 = var5 <<= 14; - if (var2 < 0) { - var3 -= var8 * var2; - var5 -= var9 * var2; - var2 = 0; - } - - var4 <<= 14; - if (var1 < 0) { - var4 -= var7 * var1; - var1 = 0; - } - - if (var8 < var9) { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var0; - if (var0 < 0) { - return; - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14); - var4 += var7; - var5 += var9; - var2 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var5 >> 14); - var3 += var8; - var5 += var9; - var2 += Rasterizer2D.Rasterizer2D_width; - } - } - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; - - while (true) { - --var1; - if (var1 < 0) { while (true) { --var0; if (var0 < 0) { - return; + while (true) { + --var1; + if (var1 < 0) { + return; + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var4 >> 14); + var4 += var8; + var3 += var7; + var2 += Rasterizer2D.Rasterizer2D_width; + } } Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); - var4 += var7; + var4 += var8; var5 += var9; var2 += Rasterizer2D.Rasterizer2D_width; } } + } else { + var3 = var5 <<= 14; + if (var2 < 0) { + var3 -= var8 * var2; + var5 -= var9 * var2; + var2 = 0; + } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var3 >> 14); - var3 += var8; - var5 += var9; - var2 += Rasterizer2D.Rasterizer2D_width; + var4 <<= 14; + if (var1 < 0) { + var4 -= var7 * var1; + var1 = 0; + } + + if (var8 < var9) { + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14); + var4 += var7; + var5 += var9; + var2 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var5 >> 14); + var3 += var8; + var5 += var9; + var2 += Rasterizer2D.Rasterizer2D_width; + } + } else { + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); + var4 += var7; + var5 += var9; + var2 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var3 >> 14); + var3 += var8; + var5 += var9; + var2 += Rasterizer2D.Rasterizer2D_width; + } + } } } } - @ObfuscatedName("v") + @ObfuscatedName("r") @Export("Rasterizer3D_horizAlpha") static final void Rasterizer3D_horizAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5) { - if (field1763) { + if (field1760) { if (var5 > Rasterizer3D_clipWidth) { var5 = Rasterizer3D_clipWidth; } @@ -1354,14 +1374,41 @@ public class Rasterizer3D extends Rasterizer2D { var0[var1++] = var0[var1]; var0[var1++] = var0[var1]; } - } - int var6 = Rasterizer3D_alpha; - int var7 = 256 - Rasterizer3D_alpha; - var2 = (var7 * (var2 & 0xff00) >> 8 & 0xff00) + (var7 * (var2 & 0xff00ff) >> 8 & 0xff00ff); + } else { + int var6 = Rasterizer3D_alpha; + int var7 = 256 - Rasterizer3D_alpha; + var2 = (var7 * (var2 & 65280) >> 8 & 65280) + (var7 * (var2 & 16711935) >> 8 & 16711935); + while (true) { + --var3; + int var8; + if (var3 < 0) { + var3 = var5 - var4 & 3; + + while (true) { + --var3; + if (var3 < 0) { + return; + } + + var8 = var0[var1]; + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); + } + } + + var8 = var0[var1]; + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); + var8 = var0[var1]; + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); + var8 = var0[var1]; + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); + var8 = var0[var1]; + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); + } + } + } else { while (true) { --var3; - int var8; if (var3 < 0) { var3 = var5 - var4 & 3; @@ -1371,562 +1418,644 @@ public class Rasterizer3D extends Rasterizer2D { return; } - var8 = var0[var1]; - var0[var1++] = ((var8 & 0xff00ff) * var6 >> 8 & 0xff00ff) + var2 + (var6 * (var8 & 0xff00) >> 8 & 0xff00); + var0[var1++] = var2; } } - var8 = var0[var1]; - var0[var1++] = ((var8 & 0xff00ff) * var6 >> 8 & 0xff00ff) + var2 + (var6 * (var8 & 0xff00) >> 8 & 0xff00); - var8 = var0[var1]; - var0[var1++] = ((var8 & 0xff00ff) * var6 >> 8 & 0xff00ff) + var2 + (var6 * (var8 & 0xff00) >> 8 & 0xff00); - var8 = var0[var1]; - var0[var1++] = ((var8 & 0xff00ff) * var6 >> 8 & 0xff00ff) + var2 + (var6 * (var8 & 0xff00) >> 8 & 0xff00); - var8 = var0[var1]; - var0[var1++] = ((var8 & 0xff00ff) * var6 >> 8 & 0xff00ff) + var2 + (var6 * (var8 & 0xff00) >> 8 & 0xff00); + var0[var1++] = var2; + var0[var1++] = var2; + var0[var1++] = var2; + var0[var1++] = var2; } } - while (true) { - --var3; - if (var3 < 0) { - var3 = var5 - var4 & 3; - - while (true) { - --var3; - if (var3 < 0) { - return; - } - - var0[var1++] = var2; - } - } - - var0[var1++] = var2; - var0[var1++] = var2; - var0[var1++] = var2; - var0[var1++] = var2; - } } } @ObfuscatedName("y") - static final void method2986(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) { + static final void method2938(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); - method3020(var0, var1, var2, var3, var4, var5, method3045(var20, var6), method3045(var20, var7), method3045(var20, var8)); - return; - } - Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); - field1772 = Rasterizer3D_textureLoader.vmethod3278(var18); - var20 = var4 - var3; - int var21 = var1 - var0; - int var22 = var5 - var3; - int var23 = var2 - var0; - int var24 = var7 - var6; - int var25 = var8 - var6; - int var26 = 0; - if (var0 != var1) { - var26 = (var4 - var3 << 14) / (var1 - var0); - } - - int var27 = 0; - if (var2 != var1) { - var27 = (var5 - var4 << 14) / (var2 - var1); - } - - int var28 = 0; - if (var0 != var2) { - var28 = (var3 - var5 << 14) / (var0 - var2); - } - - int var29 = var20 * var23 - var22 * var21; - if (var29 == 0) { - return; - } - int var30 = (var24 * var23 - var25 * var21 << 9) / var29; - int var31 = (var25 * var20 - var24 * var22 << 9) / var29; - var10 = var9 - var10; - var13 = var12 - var13; - var16 = var15 - var16; - var11 -= var9; - var14 -= var12; - var17 -= var15; - int var32 = var11 * var12 - var9 * var14 << 14; - int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 3 << 14) / (long)Rasterizer3D_zoom); - int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); - int var35 = var10 * var12 - var13 * var9 << 14; - int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 3 << 14) / (long)Rasterizer3D_zoom); - int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); - int var38 = var13 * var11 - var10 * var14 << 14; - int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 3 << 14) / (long)Rasterizer3D_zoom); - int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); - int var41; - if (var0 <= var1 && var0 <= var2) { - if (var0 >= Rasterizer3D_clipHeight) { - return; - } - if (var1 > Rasterizer3D_clipHeight) { - var1 = Rasterizer3D_clipHeight; + method2934(var0, var1, var2, var3, var4, var5, method2995(var20, var6), method2995(var20, var7), method2995(var20, var8)); + } else { + Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); + field1742 = Rasterizer3D_textureLoader.vmethod3229(var18); + var20 = var4 - var3; + int var21 = var1 - var0; + int var22 = var5 - var3; + int var23 = var2 - var0; + int var24 = var7 - var6; + int var25 = var8 - var6; + int var26 = 0; + if (var0 != var1) { + var26 = (var4 - var3 << 14) / (var1 - var0); } - if (var2 > Rasterizer3D_clipHeight) { - var2 = Rasterizer3D_clipHeight; + int var27 = 0; + if (var2 != var1) { + var27 = (var5 - var4 << 14) / (var2 - var1); } - var6 = var30 + ((var6 << 9) - var3 * var30); - if (var1 < var2) { - var5 = var3 <<= 14; - if (var0 < 0) { - var5 -= var0 * var28; - var3 -= var0 * var26; - var6 -= var0 * var31; - var0 = 0; - } + int var28 = 0; + if (var0 != var2) { + var28 = (var3 - var5 << 14) / (var0 - var2); + } - var4 <<= 14; - if (var1 < 0) { - var4 -= var27 * var1; - var1 = 0; - } + int var29 = var20 * var23 - var22 * var21; + if (var29 != 0) { + int var30 = (var24 * var23 - var25 * var21 << 9) / var29; + int var31 = (var25 * var20 - var24 * var22 << 9) / var29; + var10 = var9 - var10; + var13 = var12 - var13; + var16 = var15 - var16; + var11 -= var9; + var14 -= var12; + var17 -= var15; + int var32 = var11 * var12 - var9 * var14 << 14; + int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 3 << 14) / (long)Rasterizer3D_zoom); + int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); + int var35 = var10 * var12 - var13 * var9 << 14; + int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 3 << 14) / (long)Rasterizer3D_zoom); + int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); + int var38 = var13 * var11 - var10 * var14 << 14; + int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 3 << 14) / (long)Rasterizer3D_zoom); + int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); + int var41; + if (var0 <= var1 && var0 <= var2) { + if (var0 < Rasterizer3D_clipHeight) { + if (var1 > Rasterizer3D_clipHeight) { + var1 = Rasterizer3D_clipHeight; + } - var41 = var0 - Rasterizer3D_clipMidY; - 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 (--var1 >= 0) { - 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; + if (var2 > Rasterizer3D_clipHeight) { + var2 = Rasterizer3D_clipHeight; + } + + var6 = var30 + ((var6 << 9) - var3 * var30); + if (var1 < var2) { + var5 = var3 <<= 14; + if (var0 < 0) { + var5 -= var0 * var28; + var3 -= var0 * var26; + var6 -= var0 * var31; + var0 = 0; + } + + var4 <<= 14; + if (var1 < 0) { + var4 -= var27 * var1; + var1 = 0; + } + + var41 = var0 - Rasterizer3D_clipMidY; + 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, var5 >> 14, var4 >> 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, var5 >> 14, var3 >> 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 { + 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; + if (var0 < 0) { + var4 -= var0 * var28; + var3 -= var0 * var26; + var6 -= var0 * var31; + var0 = 0; + } + + var5 <<= 14; + if (var2 < 0) { + var5 -= var27 * var2; + var2 = 0; + } + + var41 = var0 - Rasterizer3D_clipMidY; + 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, var3 >> 14, var5 >> 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, var3 >> 14, var4 >> 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 { + 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; + } + } + } } - while (--var2 >= 0) { - 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; + } else if (var1 <= var2) { + if (var1 < Rasterizer3D_clipHeight) { + if (var2 > Rasterizer3D_clipHeight) { + var2 = Rasterizer3D_clipHeight; + } + + if (var0 > Rasterizer3D_clipHeight) { + var0 = Rasterizer3D_clipHeight; + } + + var7 = var30 + ((var7 << 9) - var30 * var4); + if (var2 < var0) { + var3 = var4 <<= 14; + if (var1 < 0) { + var3 -= var26 * var1; + var4 -= var27 * var1; + var7 -= var31 * var1; + var1 = 0; + } + + var5 <<= 14; + if (var2 < 0) { + var5 -= var28 * var2; + var2 = 0; + } + + var41 = var1 - Rasterizer3D_clipMidY; + 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, var3 >> 14, var5 >> 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, var3 >> 14, var4 >> 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 { + 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; + if (var1 < 0) { + var5 -= var26 * var1; + var4 -= var27 * var1; + var7 -= var31 * var1; + var1 = 0; + } + + var3 <<= 14; + if (var0 < 0) { + var3 -= var0 * var28; + var0 = 0; + } + + var41 = var1 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var26 < var27) { + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var0; + if (var0 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var28; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var5 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } else { + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var0; + if (var0 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var28; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var5 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + } } - return; - } - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - while (--var1 >= 0) { - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 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; - } - while (--var2 >= 0) { - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 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; - } - return; - } - var4 = var3 <<= 14; - if (var0 < 0) { - var4 -= var0 * var28; - var3 -= var0 * var26; - var6 -= var0 * var31; - var0 = 0; - } - - var5 <<= 14; - if (var2 < 0) { - var5 -= var27 * var2; - var2 = 0; - } - - var41 = var0 - Rasterizer3D_clipMidY; - 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 (--var2 >= 0) { - 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; - } - while (--var1 >= 0) { - 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; - } - return; - } - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while (--var2 >= 0) { - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 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; - } - while (--var1 >= 0) { - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 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; - } - return; - } - if (var1 <= var2) { - if (var1 >= Rasterizer3D_clipHeight) { - return; - } - if (var2 > Rasterizer3D_clipHeight) { - var2 = Rasterizer3D_clipHeight; - } - - if (var0 > Rasterizer3D_clipHeight) { - var0 = Rasterizer3D_clipHeight; - } - - var7 = var30 + ((var7 << 9) - var30 * var4); - if (var2 < var0) { - var3 = var4 <<= 14; - if (var1 < 0) { - var3 -= var26 * var1; - var4 -= var27 * var1; - var7 -= var31 * var1; - var1 = 0; - } - - var5 <<= 14; - if (var2 < 0) { - var5 -= var28 * var2; - var2 = 0; - } - - var41 = var1 - Rasterizer3D_clipMidY; - 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 (--var2 >= 0) { - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 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 < Rasterizer3D_clipHeight) { + if (var0 > Rasterizer3D_clipHeight) { + var0 = Rasterizer3D_clipHeight; } - while (--var0 >= 0) { - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 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; + + if (var1 > Rasterizer3D_clipHeight) { + var1 = Rasterizer3D_clipHeight; + } + + var8 = (var8 << 9) - var5 * var30 + var30; + if (var0 < var1) { + var4 = var5 <<= 14; + if (var2 < 0) { + var4 -= var27 * var2; + var5 -= var28 * var2; + var8 -= var31 * var2; + var2 = 0; + } + + var3 <<= 14; + if (var0 < 0) { + var3 -= var0 * var26; + var0 = 0; + } + + var41 = var2 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var27 < var28) { + var1 -= var0; + var0 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; + + while (true) { + --var0; + if (var0 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var27; + var3 += var26; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } else { + var1 -= var0; + var0 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; + + while (true) { + --var0; + if (var0 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var27; + var3 += var26; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + } else { + var3 = var5 <<= 14; + if (var2 < 0) { + var3 -= var27 * var2; + var5 -= var28 * var2; + var8 -= var31 * var2; + var2 = 0; + } + + var4 <<= 14; + if (var1 < 0) { + var4 -= var26 * var1; + var1 = 0; + } + + var41 = var2 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var27 < var28) { + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var26; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var3 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } else { + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var26; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var3 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } } - return; } - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - while (--var2 >= 0) { - 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; - } - - while (--var0 >= 0) { - 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; - } - return; } - var5 = var4 <<= 14; - if (var1 < 0) { - var5 -= var26 * var1; - var4 -= var27 * var1; - var7 -= var31 * var1; - var1 = 0; - } - - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var28; - var0 = 0; - } - - var41 = var1 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if (var26 < var27) { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - while (--var0 >= 0) { - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var5 += var26; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - while (--var2 >= 0) { - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var28; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - return; - } - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - while (--var0 >= 0) { - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var5 += var26; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - while (--var2 >= 0) { - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var28; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - return; - } - if (var2 >= Rasterizer3D_clipHeight) { - return; - } - if (var0 > Rasterizer3D_clipHeight) { - var0 = Rasterizer3D_clipHeight; - } - - if (var1 > Rasterizer3D_clipHeight) { - var1 = Rasterizer3D_clipHeight; - } - - var8 = (var8 << 9) - var5 * var30 + var30; - if (var0 < var1) { - var4 = var5 <<= 14; - if (var2 < 0) { - var4 -= var27 * var2; - var5 -= var28 * var2; - var8 -= var31 * var2; - var2 = 0; - } - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var26; - var0 = 0; - } - var41 = var2 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if (var27 < var28) { - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; - while (--var0 >= 0) { - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var27; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - while (--var1 >= 0) { - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var27; - var3 += var26; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - return; - } - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; - - while (--var0 >= 0) { - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var27; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - while (--var1 >= 0) { - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var27; - var3 += var26; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - return; - } - var3 = var5 <<= 14; - if (var2 < 0) { - var3 -= var27 * var2; - var5 -= var28 * var2; - var8 -= var31 * var2; - var2 = 0; - } - - var4 <<= 14; - if (var1 < 0) { - var4 -= var26 * var1; - var1 = 0; - } - - var41 = var2 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if (var27 < var28) { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; - - while (--var1 >= 0) { - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var3 += var27; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - - while (--var0 < 0) { - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var26; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - return; - } - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; - - while (--var1 >= 0) { - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var3 += var27; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - while (--var0 >= 0) { - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var26; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; } } - @ObfuscatedName("g") + @ObfuscatedName("p") @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 (field1763) { + if (field1760) { if (var6 > Rasterizer3D_clipWidth) { var6 = Rasterizer3D_clipWidth; } @@ -1990,32 +2119,32 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; var8 <<= 3; var15 = var7 >> 8; - if (field1772) { + if (field1742) { if (var17 > 0) { do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var10000 = var16 + var2; var18 = var20; var19 = var21; @@ -2048,7 +2177,7 @@ public class Rasterizer3D extends Rasterizer2D { if (var17 > 0) { do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; --var17; } while(var17 > 0); @@ -2057,49 +2186,49 @@ public class Rasterizer3D extends Rasterizer2D { if (var17 > 0) { do { if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; @@ -2135,7 +2264,7 @@ public class Rasterizer3D extends Rasterizer2D { if (var17 > 0) { do { if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; @@ -2185,32 +2314,32 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; var8 <<= 3; var15 = var7 >> 8; - if (field1772) { + if (field1742) { if (var17 > 0) { do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var10000 = var16 + var2; var18 = var20; var19 = var21; @@ -2243,7 +2372,7 @@ public class Rasterizer3D extends Rasterizer2D { if (var17 > 0) { do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; --var17; } while(var17 > 0); @@ -2252,49 +2381,49 @@ public class Rasterizer3D extends Rasterizer2D { if (var17 > 0) { do { if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; @@ -2330,7 +2459,7 @@ public class Rasterizer3D extends Rasterizer2D { if (var17 > 0) { do { if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; @@ -2344,192 +2473,149 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("a") + @ObfuscatedName("g") @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); - method3020(var0, var1, var2, var3, var4, var5, method3045(var20, var6), method3045(var20, var7), method3045(var20, var8)); - return; - } - Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); - field1772 = Rasterizer3D_textureLoader.vmethod3278(var18); - var20 = var4 - var3; - int var21 = var1 - var0; - int var22 = var5 - var3; - int var23 = var2 - var0; - int var24 = var7 - var6; - int var25 = var8 - var6; - int var26 = 0; - if (var0 != var1) { - var26 = (var4 - var3 << 14) / (var1 - var0); - } + method2934(var0, var1, var2, var3, var4, var5, method2995(var20, var6), method2995(var20, var7), method2995(var20, var8)); + } else { + Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); + field1742 = Rasterizer3D_textureLoader.vmethod3229(var18); + var20 = var4 - var3; + int var21 = var1 - var0; + int var22 = var5 - var3; + int var23 = var2 - var0; + int var24 = var7 - var6; + int var25 = var8 - var6; + int var26 = 0; + if (var0 != var1) { + var26 = (var4 - var3 << 14) / (var1 - var0); + } - int var27 = 0; - if (var2 != var1) { - var27 = (var5 - var4 << 14) / (var2 - var1); - } + int var27 = 0; + if (var2 != var1) { + var27 = (var5 - var4 << 14) / (var2 - var1); + } - int var28 = 0; - if (var0 != var2) { - var28 = (var3 - var5 << 14) / (var0 - var2); - } + int var28 = 0; + if (var0 != var2) { + var28 = (var3 - var5 << 14) / (var0 - var2); + } - int var29 = var20 * var23 - var22 * var21; - if (var29 != 0) { - int var30 = (var24 * var23 - var25 * var21 << 9) / var29; - int var31 = (var25 * var20 - var24 * var22 << 9) / var29; - var10 = var9 - var10; - var13 = var12 - var13; - var16 = var15 - var16; - var11 -= var9; - var14 -= var12; - var17 -= var15; - int var32 = var11 * var12 - var9 * var14 << 14; - int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 14) / (long)Rasterizer3D_zoom); - int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); - int var35 = var10 * var12 - var13 * var9 << 14; - int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 14) / (long)Rasterizer3D_zoom); - int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); - int var38 = var13 * var11 - var10 * var14 << 14; - int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 14) / (long)Rasterizer3D_zoom); - int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); - int var41; - if (var0 <= var1 && var0 <= var2) { - if (var0 < Rasterizer3D_clipHeight) { - if (var1 > Rasterizer3D_clipHeight) { - var1 = Rasterizer3D_clipHeight; - } - - if (var2 > Rasterizer3D_clipHeight) { - var2 = Rasterizer3D_clipHeight; - } - - var6 = var30 + ((var6 << 9) - var3 * var30); - if (var1 < var2) { - var5 = var3 <<= 14; - if (var0 < 0) { - var5 -= var0 * var28; - var3 -= var0 * var26; - var6 -= var0 * var31; - var0 = 0; + int var29 = var20 * var23 - var22 * var21; + if (var29 != 0) { + int var30 = (var24 * var23 - var25 * var21 << 9) / var29; + int var31 = (var25 * var20 - var24 * var22 << 9) / var29; + var10 = var9 - var10; + var13 = var12 - var13; + var16 = var15 - var16; + var11 -= var9; + var14 -= var12; + var17 -= var15; + int var32 = var11 * var12 - var9 * var14 << 14; + int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 14) / (long)Rasterizer3D_zoom); + int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); + int var35 = var10 * var12 - var13 * var9 << 14; + int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 14) / (long)Rasterizer3D_zoom); + int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); + int var38 = var13 * var11 - var10 * var14 << 14; + int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 14) / (long)Rasterizer3D_zoom); + int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); + int var41; + if (var0 <= var1 && var0 <= var2) { + if (var0 < Rasterizer3D_clipHeight) { + if (var1 > Rasterizer3D_clipHeight) { + var1 = Rasterizer3D_clipHeight; } - var4 <<= 14; - if (var1 < 0) { - var4 -= var27 * var1; - var1 = 0; + if (var2 > Rasterizer3D_clipHeight) { + var2 = Rasterizer3D_clipHeight; } - var41 = var0 - Rasterizer3D_clipMidY; - 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; + var6 = var30 + ((var6 << 9) - var3 * var30); + if (var1 < var2) { + var5 = var3 <<= 14; + if (var0 < 0) { + var5 -= var0 * var28; + var3 -= var0 * var26; + var6 -= var0 * var31; + var0 = 0; } - } - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - while (true) { - --var1; + var4 <<= 14; if (var1 < 0) { + var4 -= var27 * var1; + var1 = 0; + } + + var41 = var0 - Rasterizer3D_clipMidY; + 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) { - --var2; - if (var2 < 0) { - return; + --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, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); var5 += var28; - var4 += var27; + var3 += var26; var6 += var31; var0 += Rasterizer2D.Rasterizer2D_width; var32 += var34; var35 += var37; var38 += var40; } - } + } else { + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 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; - } - } - var4 = var3 <<= 14; - if (var0 < 0) { - var4 -= var0 * var28; - var3 -= var0 * var26; - var6 -= var0 * var31; - var0 = 0; - } - - var5 <<= 14; - if (var2 < 0) { - var5 -= var27 * var2; - var2 = 0; - } - - var41 = var0 - Rasterizer3D_clipMidY; - 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; + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 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, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var27; + var5 += var28; var3 += var26; var6 += var31; var0 += Rasterizer2D.Rasterizer2D_width; @@ -2538,369 +2624,463 @@ public class Rasterizer3D extends Rasterizer2D { var38 += var40; } } + } else { + var4 = var3 <<= 14; + if (var0 < 0) { + var4 -= var0 * var28; + var3 -= var0 * var26; + var6 -= var0 * var31; + var0 = 0; + } - Rasterizer3D_textureAlpha(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; + var5 <<= 14; + if (var2 < 0) { + var5 -= var27 * var2; + var2 = 0; + } + + var41 = var0 - Rasterizer3D_clipMidY; + 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_textureAlpha(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_textureAlpha(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 { + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 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_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 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; + } + } } } - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + } else if (var1 <= var2) { + if (var1 < Rasterizer3D_clipHeight) { + if (var2 > Rasterizer3D_clipHeight) { + var2 = Rasterizer3D_clipHeight; + } - while (true) { - --var2; + if (var0 > Rasterizer3D_clipHeight) { + var0 = Rasterizer3D_clipHeight; + } + + var7 = var30 + ((var7 << 9) - var30 * var4); + if (var2 < var0) { + var3 = var4 <<= 14; + if (var1 < 0) { + var3 -= var26 * var1; + var4 -= var27 * var1; + var7 -= var31 * var1; + var1 = 0; + } + + var5 <<= 14; + if (var2 < 0) { + var5 -= var28 * var2; + var2 = 0; + } + + var41 = var1 - Rasterizer3D_clipMidY; + 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 { + 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, var3 >> 14, var5 >> 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, var3 >> 14, var4 >> 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; + if (var1 < 0) { + var5 -= var26 * var1; + var4 -= var27 * var1; + var7 -= var31 * var1; + var1 = 0; + } + + var3 <<= 14; + if (var0 < 0) { + var3 -= var0 * var28; + var0 = 0; + } + + var41 = var1 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var26 < var27) { + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var0; + if (var0 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var28; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var5 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } else { + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var0; + if (var0 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var28; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var5 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + } + } + } else if (var2 < Rasterizer3D_clipHeight) { + if (var0 > Rasterizer3D_clipHeight) { + var0 = Rasterizer3D_clipHeight; + } + + if (var1 > Rasterizer3D_clipHeight) { + var1 = Rasterizer3D_clipHeight; + } + + var8 = (var8 << 9) - var5 * var30 + var30; + if (var0 < var1) { + var4 = var5 <<= 14; if (var2 < 0) { + var4 -= var27 * var2; + var5 -= var28 * var2; + var8 -= var31 * var2; + var2 = 0; + } + + var3 <<= 14; + if (var0 < 0) { + var3 -= var0 * var26; + var0 = 0; + } + + var41 = var2 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var27 < var28) { + var1 -= var0; + var0 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; + while (true) { - --var1; - if (var1 < 0) { - return; + --var0; + if (var0 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var27; + var3 += var26; + var8 += var31; + var2 += 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 += var27; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } else { + var1 -= var0; + var0 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; + + while (true) { + --var0; + if (var0 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var27; + var3 += var26; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; var32 += var34; var35 += var37; var38 += var40; } } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 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 (var1 <= var2) { - if (var1 < Rasterizer3D_clipHeight) { - if (var2 > Rasterizer3D_clipHeight) { - var2 = Rasterizer3D_clipHeight; - } - - if (var0 > Rasterizer3D_clipHeight) { - var0 = Rasterizer3D_clipHeight; - } - - var7 = var30 + ((var7 << 9) - var30 * var4); - if (var2 < var0) { - var3 = var4 <<= 14; - if (var1 < 0) { - var3 -= var26 * var1; - var4 -= var27 * var1; - var7 -= var31 * var1; - var1 = 0; - } - - var5 <<= 14; + } else { + var3 = var5 <<= 14; if (var2 < 0) { + var3 -= var27 * var2; var5 -= var28 * var2; + var8 -= var31 * var2; var2 = 0; } - var41 = var1 - Rasterizer3D_clipMidY; + var4 <<= 14; + if (var1 < 0) { + var4 -= var26 * var1; + var1 = 0; + } + + var41 = var2 - Rasterizer3D_clipMidY; 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]; + if (var27 < var28) { + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; while (true) { - --var2; - if (var2 < 0) { + --var1; + if (var1 < 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; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var26; var5 += var28; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; + var8 += var31; + var2 += 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; - } - } - 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, var3 >> 14, var5 >> 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, var3 >> 14, var4 >> 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; - } - } - var5 = var4 <<= 14; - if (var1 < 0) { - var5 -= var26 * var1; - var4 -= var27 * var1; - var7 -= var31 * var1; - var1 = 0; - } - - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var28; - var0 = 0; - } - - var41 = var1 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if (var26 < var27) { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while (true) { - --var0; - if (var0 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var28; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var5 += var26; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while (true) { - --var0; - if (var0 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var28; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var5 += var26; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - } else if (var2 < Rasterizer3D_clipHeight) { - if (var0 > Rasterizer3D_clipHeight) { - var0 = Rasterizer3D_clipHeight; - } - - if (var1 > Rasterizer3D_clipHeight) { - var1 = Rasterizer3D_clipHeight; - } - - var8 = (var8 << 9) - var5 * var30 + var30; - if (var0 < var1) { - var4 = var5 <<= 14; - if (var2 < 0) { - var4 -= var27 * var2; - var5 -= var28 * var2; - var8 -= var31 * var2; - var2 = 0; - } - - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var26; - var0 = 0; - } - - var41 = var2 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if (var27 < var28) { - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; - - while (true) { - --var0; - if (var0 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var27; - var3 += var26; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var27; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; - - while (true) { - --var0; - if (var0 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var27; - var3 += var26; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var3 += var27; + var5 += var28; var8 += var31; var2 += Rasterizer2D.Rasterizer2D_width; var32 += var34; var35 += var37; var38 += var40; } - } + } else { + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var27; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - var3 = var5 <<= 14; - if (var2 < 0) { - var3 -= var27 * var2; - var5 -= var28 * var2; - var8 -= var31 * var2; - var2 = 0; - } - - var4 <<= 14; - if (var1 < 0) { - var4 -= var26 * var1; - var1 = 0; - } - - var41 = var2 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if (var27 < var28) { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; - - while (true) { - --var1; - if (var1 < 0) { while (true) { - --var0; - if (var0 < 0) { - return; + --var1; + if (var1 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var26; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var26; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var3 += var27; var5 += var28; var8 += var31; var2 += Rasterizer2D.Rasterizer2D_width; @@ -2909,58 +3089,16 @@ public class Rasterizer3D extends Rasterizer2D { var38 += var40; } } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var3 += var27; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; } } - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var0; - if (var0 < 0) { - return; - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var26; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var3 += var27; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } } } } - @ObfuscatedName("j") + @ObfuscatedName("e") @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 (field1763) { + if (field1760) { if (var6 > Rasterizer3D_clipWidth) { var6 = Rasterizer3D_clipWidth; } @@ -3013,32 +3151,32 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; var8 <<= 3; var15 = var7 >> 8; - if (field1772) { + if (field1742) { if (var17 > 0) { do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; var7 += var8; var15 = var7 >> 8; @@ -3050,7 +3188,7 @@ public class Rasterizer3D extends Rasterizer2D { if (var17 > 0) { do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; --var17; } while(var17 > 0); @@ -3059,49 +3197,49 @@ public class Rasterizer3D extends Rasterizer2D { if (var17 > 0) { do { if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; @@ -3116,7 +3254,7 @@ public class Rasterizer3D extends Rasterizer2D { if (var17 > 0) { do { if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; @@ -3156,32 +3294,32 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; var8 <<= 3; var15 = var7 >> 8; - if (field1772) { + if (field1742) { if (var17 > 0) { do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; var7 += var8; var15 = var7 >> 8; @@ -3193,7 +3331,7 @@ public class Rasterizer3D extends Rasterizer2D { if (var17 > 0) { do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; var2 += var16; --var17; } while(var17 > 0); @@ -3202,49 +3340,49 @@ public class Rasterizer3D extends Rasterizer2D { if (var17 > 0) { do { if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; var2 += var16; if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; @@ -3259,7 +3397,7 @@ public class Rasterizer3D extends Rasterizer2D { if (var17 > 0) { do { if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 0xff00) & 0xff0000) + ((var3 & 0xff00ff) * var15 & 0xff00ff00) >> 8; + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; } ++var4; @@ -3273,8 +3411,8 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("o") - static final int method3045(int var0, int var1) { + @ObfuscatedName("z") + static final int method2995(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; if (var1 < 2) { var1 = 2; @@ -3285,37 +3423,33 @@ public class Rasterizer3D extends Rasterizer2D { return (var0 & 65408) + var1; } - @ObfuscatedName("d") - static final int method3040(int var0, int var1, int var2, int var3) { + @ObfuscatedName("w") + static final int method2943(int var0, int var1, int var2, int var3) { return var0 * var2 + var3 * var1 >> 16; } - @ObfuscatedName("s") - static final int method3061(int var0, int var1, int var2, int var3) { + @ObfuscatedName("l") + static final int method2944(int var0, int var1, int var2, int var3) { return var2 * var1 - var3 * var0 >> 16; } - @ObfuscatedName("z") - @Export("rot3") - static final int rot3(int var0, int var1, int var2, int var3) { + @ObfuscatedName("h") + static final int method2945(int var0, int var1, int var2, int var3) { return var0 * var2 - var3 * var1 >> 16; } - @ObfuscatedName("al") - @Export("rot4") - static final int rot4(int var0, int var1, int var2, int var3) { + @ObfuscatedName("v") + static final int method2963(int var0, int var1, int var2, int var3) { return var3 * var0 + var2 * var1 >> 16; } - @ObfuscatedName("av") - @Export("rot1") - static final int rot1(int var0, int var1, int var2, int var3) { + @ObfuscatedName("m") + static final int method2947(int var0, int var1, int var2, int var3) { return var0 * var2 + var3 * var1 >> 16; } - @ObfuscatedName("as") - @Export("rot2") - static final int rot2(int var0, int var1, int var2, int var3) { + @ObfuscatedName("o") + static final int method2946(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 3df49282ac..1e510644cd 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("dh") +@ObfuscatedName("dx") @Implements("RawPcmStream") public class RawPcmStream extends PcmStream { - @ObfuscatedName("q") - int field1471; - @ObfuscatedName("e") - int field1469; - @ObfuscatedName("p") - int field1470; - @ObfuscatedName("k") - int field1475; - @ObfuscatedName("l") - int field1472; - @ObfuscatedName("b") - int field1482; + @ObfuscatedName("s") + int field1452; + @ObfuscatedName("j") + int field1451; @ObfuscatedName("i") - int field1474; - @ObfuscatedName("c") + int field1454; + @ObfuscatedName("k") + int field1458; + @ObfuscatedName("u") + int field1456; + @ObfuscatedName("n") + int field1455; + @ObfuscatedName("t") + int field1461; + @ObfuscatedName("q") @Export("numLoops") int numLoops; - @ObfuscatedName("f") + @ObfuscatedName("x") @Export("start") int start; - @ObfuscatedName("m") + @ObfuscatedName("d") @Export("end") int end; - @ObfuscatedName("u") - boolean field1478; - @ObfuscatedName("x") - int field1479; + @ObfuscatedName("f") + boolean field1460; + @ObfuscatedName("c") + int field1453; @ObfuscatedName("r") - int field1480; - @ObfuscatedName("v") - int field1481; + int field1462; @ObfuscatedName("y") - int field1468; + int field1463; + @ObfuscatedName("p") + int field1464; @ObfuscatedSignature( - signature = "(Lcd;III)V" + signature = "(Lco;III)V" ) RawPcmStream(RawSound var1, int var2, int var3, int var4) { super.sound = var1; this.start = var1.start; this.end = var1.end; - this.field1478 = var1.field1393; - this.field1469 = var2; - this.field1470 = var3; - this.field1475 = var4; - this.field1471 = 0; - this.method2525(); + this.field1460 = var1.field1362; + this.field1451 = var2; + this.field1454 = var3; + this.field1458 = var4; + this.field1452 = 0; + this.method2609(); } @ObfuscatedSignature( - signature = "(Lcd;II)V" + signature = "(Lco;II)V" ) RawPcmStream(RawSound var1, int var2, int var3) { super.sound = var1; this.start = var1.start; this.end = var1.end; - this.field1478 = var1.field1393; - this.field1469 = var2; - this.field1470 = var3; - this.field1475 = 8192; - this.field1471 = 0; - this.method2525(); + this.field1460 = var1.field1362; + this.field1451 = var2; + this.field1454 = var3; + this.field1458 = 8192; + this.field1452 = 0; + this.method2609(); } - @ObfuscatedName("k") - void method2525() { - this.field1472 = this.field1470; - this.field1482 = method2526(this.field1470, this.field1475); - this.field1474 = method2519(this.field1470, this.field1475); + @ObfuscatedName("u") + void method2609() { + this.field1456 = this.field1454; + this.field1455 = method2558(this.field1454, this.field1458); + this.field1461 = method2456(this.field1454, this.field1458); } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "()Ldx;" + signature = "()Ldz;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { return null; } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "()Ldx;" + signature = "()Ldz;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { return null; } - @ObfuscatedName("i") - protected int vmethod3892() { - return this.field1470 == 0 && this.field1479 == 0 ? 0 : 1; + @ObfuscatedName("q") + protected int vmethod3834() { + return this.field1454 == 0 && this.field1453 == 0 ? 0 : 1; } - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("fill") public synchronized void fill(int[] var1, int var2, int var3) { - if (this.field1470 == 0 && this.field1479 == 0) { + if (this.field1454 == 0 && this.field1453 == 0) { this.skip(var3); } else { RawSound var4 = (RawSound)super.sound; @@ -117,197 +117,198 @@ public class RawPcmStream extends PcmStream { int var9 = var2; var3 += var2; - if (this.field1471 < 0) { - if (this.field1469 <= 0) { - this.method2647(); + if (this.field1452 < 0) { + if (this.field1451 <= 0) { + this.method2617(); this.remove(); return; } - this.field1471 = 0; + this.field1452 = 0; } - if (this.field1471 >= var7) { - if (this.field1469 >= 0) { - this.method2647(); + if (this.field1452 >= var7) { + if (this.field1451 >= 0) { + this.method2617(); this.remove(); return; } - this.field1471 = var7 - 1; + this.field1452 = var7 - 1; } if (this.numLoops < 0) { - if (this.field1478) { - if (this.field1469 < 0) { - var9 = this.method2641(var1, var2, var5, var3, var4.samples[this.start]); - if (this.field1471 >= var5) { + if (this.field1460) { + if (this.field1451 < 0) { + var9 = this.method2618(var1, var2, var5, var3, var4.samples[this.start]); + if (this.field1452 >= var5) { return; } - this.field1471 = var5 + var5 - 1 - this.field1471; - this.field1469 = -this.field1469; + this.field1452 = var5 + var5 - 1 - this.field1452; + this.field1451 = -this.field1451; } while (true) { - var9 = this.method2543(var1, var9, var6, var3, var4.samples[this.end - 1]); - if (this.field1471 < var6) { + var9 = this.method2477(var1, var9, var6, var3, var4.samples[this.end - 1]); + if (this.field1452 < var6) { return; } - this.field1471 = var6 + var6 - 1 - this.field1471; - this.field1469 = -this.field1469; - var9 = this.method2641(var1, var9, var5, var3, var4.samples[this.start]); - if (this.field1471 >= var5) { + this.field1452 = var6 + var6 - 1 - this.field1452; + this.field1451 = -this.field1451; + var9 = this.method2618(var1, var9, var5, var3, var4.samples[this.start]); + if (this.field1452 >= var5) { return; } - this.field1471 = var5 + var5 - 1 - this.field1471; - this.field1469 = -this.field1469; + this.field1452 = var5 + var5 - 1 - this.field1452; + this.field1451 = -this.field1451; } - } - if (this.field1469 < 0) { + } else if (this.field1451 < 0) { while (true) { - var9 = this.method2641(var1, var9, var5, var3, var4.samples[this.end - 1]); - if (this.field1471 >= var5) { + var9 = this.method2618(var1, var9, var5, var3, var4.samples[this.end - 1]); + if (this.field1452 >= var5) { return; } - this.field1471 = var6 - 1 - (var6 - 1 - this.field1471) % var8; - } - } - while (true) { - var9 = this.method2543(var1, var9, var6, var3, var4.samples[this.start]); - if (this.field1471 < var6) { - return; - } - - this.field1471 = var5 + (this.field1471 - var5) % var8; - } - } - if (this.numLoops > 0) { - if (this.field1478) { - label119: { - if (this.field1469 < 0) { - var9 = this.method2641(var1, var2, var5, var3, var4.samples[this.start]); - if (this.field1471 >= var5) { - return; - } - - this.field1471 = var5 + var5 - 1 - this.field1471; - this.field1469 = -this.field1469; - if (--this.numLoops == 0) { - break label119; - } - } - - do { - var9 = this.method2543(var1, var9, var6, var3, var4.samples[this.end - 1]); - if (this.field1471 < var6) { - return; - } - - this.field1471 = var6 + var6 - 1 - this.field1471; - this.field1469 = -this.field1469; - if (--this.numLoops == 0) { - break; - } - - var9 = this.method2641(var1, var9, var5, var3, var4.samples[this.start]); - if (this.field1471 >= var5) { - return; - } - - this.field1471 = var5 + var5 - 1 - this.field1471; - this.field1469 = -this.field1469; - } while(--this.numLoops != 0); + this.field1452 = var6 - 1 - (var6 - 1 - this.field1452) % var8; } } else { - int var10; - if (this.field1469 < 0) { - while (true) { - var9 = this.method2641(var1, var9, var5, var3, var4.samples[this.end - 1]); - if (this.field1471 >= var5) { - return; + while (true) { + var9 = this.method2477(var1, var9, var6, var3, var4.samples[this.start]); + if (this.field1452 < var6) { + return; + } + + this.field1452 = var5 + (this.field1452 - var5) % var8; + } + } + } else { + if (this.numLoops > 0) { + if (this.field1460) { + label130: { + if (this.field1451 < 0) { + var9 = this.method2618(var1, var2, var5, var3, var4.samples[this.start]); + if (this.field1452 >= var5) { + return; + } + + this.field1452 = var5 + var5 - 1 - this.field1452; + this.field1451 = -this.field1451; + if (--this.numLoops == 0) { + break label130; + } } - var10 = (var6 - 1 - this.field1471) / var8; - if (var10 >= this.numLoops) { - this.field1471 += var8 * this.numLoops; - this.numLoops = 0; - break; - } + do { + var9 = this.method2477(var1, var9, var6, var3, var4.samples[this.end - 1]); + if (this.field1452 < var6) { + return; + } - this.field1471 += var8 * var10; - this.numLoops -= var10; + this.field1452 = var6 + var6 - 1 - this.field1452; + this.field1451 = -this.field1451; + if (--this.numLoops == 0) { + break; + } + + var9 = this.method2618(var1, var9, var5, var3, var4.samples[this.start]); + if (this.field1452 >= var5) { + return; + } + + this.field1452 = var5 + var5 - 1 - this.field1452; + this.field1451 = -this.field1451; + } while(--this.numLoops != 0); } } else { - while (true) { - var9 = this.method2543(var1, var9, var6, var3, var4.samples[this.start]); - if (this.field1471 < var6) { - return; - } + int var10; + if (this.field1451 < 0) { + while (true) { + var9 = this.method2618(var1, var9, var5, var3, var4.samples[this.end - 1]); + if (this.field1452 >= var5) { + return; + } - var10 = (this.field1471 - var5) / var8; - if (var10 >= this.numLoops) { - this.field1471 -= var8 * this.numLoops; - this.numLoops = 0; - break; - } + var10 = (var6 - 1 - this.field1452) / var8; + if (var10 >= this.numLoops) { + this.field1452 += var8 * this.numLoops; + this.numLoops = 0; + break; + } - this.field1471 -= var8 * var10; - this.numLoops -= var10; + this.field1452 += var8 * var10; + this.numLoops -= var10; + } + } else { + while (true) { + var9 = this.method2477(var1, var9, var6, var3, var4.samples[this.start]); + if (this.field1452 < var6) { + return; + } + + var10 = (this.field1452 - var5) / var8; + if (var10 >= this.numLoops) { + this.field1452 -= var8 * this.numLoops; + this.numLoops = 0; + break; + } + + this.field1452 -= var8 * var10; + this.numLoops -= var10; + } } } } - } - if (this.field1469 < 0) { - this.method2641(var1, var9, 0, var3, 0); - if (this.field1471 < 0) { - this.field1471 = -1; - this.method2647(); - this.remove(); + if (this.field1451 < 0) { + this.method2618(var1, var9, 0, var3, 0); + if (this.field1452 < 0) { + this.field1452 = -1; + this.method2617(); + this.remove(); + } + } else { + this.method2477(var1, var9, var7, var3, 0); + if (this.field1452 >= var7) { + this.field1452 = var7; + this.method2617(); + this.remove(); + } } - } else { - this.method2543(var1, var9, var7, var3, 0); - if (this.field1471 >= var7) { - this.field1471 = var7; - this.method2647(); - this.remove(); - } - } + } } } - @ObfuscatedName("u") + @ObfuscatedName("d") @Export("setNumLoops") public synchronized void setNumLoops(int var1) { this.numLoops = var1; } - @ObfuscatedName("x") + @ObfuscatedName("f") @Export("skip") public synchronized void skip(int var1) { - if (this.field1479 > 0) { - if (var1 >= this.field1479) { - if (this.field1470 == Integer.MIN_VALUE) { - this.field1470 = 0; - this.field1474 = 0; - this.field1482 = 0; - this.field1472 = 0; + if (this.field1453 > 0) { + if (var1 >= this.field1453) { + if (this.field1454 == Integer.MIN_VALUE) { + this.field1454 = 0; + this.field1461 = 0; + this.field1455 = 0; + this.field1456 = 0; this.remove(); - var1 = this.field1479; + var1 = this.field1453; } - this.field1479 = 0; - this.method2525(); + this.field1453 = 0; + this.method2609(); } else { - this.field1472 += this.field1480 * var1; - this.field1482 += this.field1481 * var1; - this.field1474 += this.field1468 * var1; - this.field1479 -= var1; + this.field1456 += this.field1462 * var1; + this.field1455 += this.field1463 * var1; + this.field1461 += this.field1464 * var1; + this.field1453 -= var1; } } @@ -320,179 +321,183 @@ public class RawPcmStream extends PcmStream { this.numLoops = 0; } - if (this.field1471 < 0) { - if (this.field1469 <= 0) { - this.method2647(); + if (this.field1452 < 0) { + if (this.field1451 <= 0) { + this.method2617(); this.remove(); return; } - this.field1471 = 0; + this.field1452 = 0; } - if (this.field1471 >= var5) { - if (this.field1469 >= 0) { - this.method2647(); + if (this.field1452 >= var5) { + if (this.field1451 >= 0) { + this.method2617(); this.remove(); return; } - this.field1471 = var5 - 1; + this.field1452 = var5 - 1; } - this.field1471 += this.field1469 * var1; + this.field1452 += this.field1451 * var1; if (this.numLoops < 0) { - if (!this.field1478) { - if (this.field1469 < 0) { - if (this.field1471 >= var3) { + if (!this.field1460) { + if (this.field1451 < 0) { + if (this.field1452 >= var3) { return; } - this.field1471 = var4 - 1 - (var4 - 1 - this.field1471) % var6; + this.field1452 = var4 - 1 - (var4 - 1 - this.field1452) % var6; } else { - if (this.field1471 < var4) { + if (this.field1452 < var4) { return; } - this.field1471 = var3 + (this.field1471 - var3) % var6; + this.field1452 = var3 + (this.field1452 - var3) % var6; } } else { - if (this.field1469 < 0) { - if (this.field1471 >= var3) { + if (this.field1451 < 0) { + if (this.field1452 >= var3) { return; } - this.field1471 = var3 + var3 - 1 - this.field1471; - this.field1469 = -this.field1469; + this.field1452 = var3 + var3 - 1 - this.field1452; + this.field1451 = -this.field1451; } - while (this.field1471 >= var4) { - this.field1471 = var4 + var4 - 1 - this.field1471; - this.field1469 = -this.field1469; - if (this.field1471 >= var3) { + while (this.field1452 >= var4) { + this.field1452 = var4 + var4 - 1 - this.field1452; + this.field1451 = -this.field1451; + if (this.field1452 >= var3) { return; } - this.field1471 = var3 + var3 - 1 - this.field1471; - this.field1469 = -this.field1469; + this.field1452 = var3 + var3 - 1 - this.field1452; + this.field1451 = -this.field1451; } } } else { if (this.numLoops > 0) { - if (this.field1478) { - label127: { - if (this.field1469 < 0) { - if (this.field1471 >= var3) { + if (this.field1460) { + label120: { + if (this.field1451 < 0) { + if (this.field1452 >= var3) { return; } - this.field1471 = var3 + var3 - 1 - this.field1471; - this.field1469 = -this.field1469; + this.field1452 = var3 + var3 - 1 - this.field1452; + this.field1451 = -this.field1451; if (--this.numLoops == 0) { - break label127; + break label120; } } do { - if (this.field1471 < var4) { + if (this.field1452 < var4) { return; } - this.field1471 = var4 + var4 - 1 - this.field1471; - this.field1469 = -this.field1469; + this.field1452 = var4 + var4 - 1 - this.field1452; + this.field1451 = -this.field1451; if (--this.numLoops == 0) { break; } - if (this.field1471 >= var3) { + if (this.field1452 >= var3) { return; } - this.field1471 = var3 + var3 - 1 - this.field1471; - this.field1469 = -this.field1469; + this.field1452 = var3 + var3 - 1 - this.field1452; + this.field1451 = -this.field1451; } while(--this.numLoops != 0); } } else { - int var7; - if (this.field1469 < 0) { - if (this.field1471 >= var3) { - return; - } + label152: { + int var7; + if (this.field1451 < 0) { + if (this.field1452 >= var3) { + return; + } - var7 = (var4 - 1 - this.field1471) / var6; - if (var7 < this.numLoops) { - this.field1471 += var6 * var7; + var7 = (var4 - 1 - this.field1452) / var6; + if (var7 >= this.numLoops) { + this.field1452 += var6 * this.numLoops; + this.numLoops = 0; + break label152; + } + + this.field1452 += var6 * var7; this.numLoops -= var7; - return; - } + } else { + if (this.field1452 < var4) { + return; + } - this.field1471 += var6 * this.numLoops; - this.numLoops = 0; - } else { - if (this.field1471 < var4) { - return; - } + var7 = (this.field1452 - var3) / var6; + if (var7 >= this.numLoops) { + this.field1452 -= var6 * this.numLoops; + this.numLoops = 0; + break label152; + } - var7 = (this.field1471 - var3) / var6; - if (var7 < this.numLoops) { - this.field1471 -= var6 * var7; + this.field1452 -= var6 * var7; this.numLoops -= var7; - return; } - this.field1471 -= var6 * this.numLoops; - this.numLoops = 0; + return; } } } - if (this.field1469 < 0) { - if (this.field1471 < 0) { - this.field1471 = -1; - this.method2647(); + if (this.field1451 < 0) { + if (this.field1452 < 0) { + this.field1452 = -1; + this.method2617(); this.remove(); } - } else if (this.field1471 >= var5) { - this.field1471 = var5; - this.method2647(); + } else if (this.field1452 >= var5) { + this.field1452 = var5; + this.method2617(); this.remove(); } } } - @ObfuscatedName("r") - public synchronized void method2527(int var1) { - this.method2600(var1 << 6, this.method2541()); + @ObfuscatedName("c") + public synchronized void method2599(int var1) { + this.method2465(var1 << 6, this.method2467()); } - @ObfuscatedName("v") - synchronized void method2607(int var1) { - this.method2600(var1, this.method2541()); + @ObfuscatedName("r") + synchronized void method2554(int var1) { + this.method2465(var1, this.method2467()); } @ObfuscatedName("y") - synchronized void method2600(int var1, int var2) { - this.field1470 = var1; - this.field1475 = var2; - this.field1479 = 0; - this.method2525(); + synchronized void method2465(int var1, int var2) { + this.field1454 = var1; + this.field1458 = var2; + this.field1453 = 0; + this.method2609(); + } + + @ObfuscatedName("p") + public synchronized int method2455() { + return this.field1454 == Integer.MIN_VALUE ? 0 : this.field1454; } @ObfuscatedName("g") - public synchronized int method2531() { - return this.field1470 == Integer.MIN_VALUE ? 0 : this.field1470; + public synchronized int method2467() { + return this.field1458 < 0 ? -1 : this.field1458; } - @ObfuscatedName("a") - public synchronized int method2541() { - return this.field1475 < 0 ? -1 : this.field1475; - } - - @ObfuscatedName("j") - public synchronized void method2596(int var1) { + @ObfuscatedName("e") + public synchronized void method2468(int var1) { int var2 = ((RawSound)super.sound).samples.length << 8; if (var1 < -1) { var1 = -1; @@ -502,324 +507,142 @@ public class RawPcmStream extends PcmStream { var1 = var2; } - this.field1471 = var1; + this.field1452 = var1; } - @ObfuscatedName("o") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(Z)V", garbageValue = "1" ) - public synchronized void method2614() { - this.field1469 = (this.field1469 ^ this.field1469 >> 31) + (this.field1469 >>> 31); - this.field1469 = -this.field1469; + public synchronized void method2469() { + this.field1451 = (this.field1451 ^ this.field1451 >> 31) + (this.field1451 >>> 31); + this.field1451 = -this.field1451; } - @ObfuscatedName("d") - void method2647() { - if (this.field1479 != 0) { - if (this.field1470 == Integer.MIN_VALUE) { - this.field1470 = 0; + @ObfuscatedName("w") + void method2617() { + if (this.field1453 != 0) { + if (this.field1454 == Integer.MIN_VALUE) { + this.field1454 = 0; } - this.field1479 = 0; - this.method2525(); + this.field1453 = 0; + this.method2609(); } } - @ObfuscatedName("s") - public synchronized void method2535(int var1, int var2) { - this.method2536(var1, var2, this.method2541()); + @ObfuscatedName("l") + public synchronized void method2470(int var1, int var2) { + this.method2472(var1, var2, this.method2467()); } - @ObfuscatedName("z") - public synchronized void method2536(int var1, int var2, int var3) { + @ObfuscatedName("az") + public synchronized void method2472(int var1, int var2, int var3) { if (var1 == 0) { - this.method2600(var2, var3); + this.method2465(var2, var3); } else { - int var4 = method2526(var2, var3); - int var5 = method2519(var2, var3); - if (var4 == this.field1482 && var5 == this.field1474) { - this.field1479 = 0; + int var4 = method2558(var2, var3); + int var5 = method2456(var2, var3); + if (var4 == this.field1455 && var5 == this.field1461) { + this.field1453 = 0; } else { - int var6 = var2 - this.field1472; - if (this.field1472 - var2 > var6) { - var6 = this.field1472 - var2; + int var6 = var2 - this.field1456; + if (this.field1456 - var2 > var6) { + var6 = this.field1456 - var2; } - if (var4 - this.field1482 > var6) { - var6 = var4 - this.field1482; + if (var4 - this.field1455 > var6) { + var6 = var4 - this.field1455; } - if (this.field1482 - var4 > var6) { - var6 = this.field1482 - var4; + if (this.field1455 - var4 > var6) { + var6 = this.field1455 - var4; } - if (var5 - this.field1474 > var6) { - var6 = var5 - this.field1474; + if (var5 - this.field1461 > var6) { + var6 = var5 - this.field1461; } - if (this.field1474 - var5 > var6) { - var6 = this.field1474 - var5; + if (this.field1461 - var5 > var6) { + var6 = this.field1461 - var5; } if (var1 > var6) { var1 = var6; } - this.field1479 = var1; - this.field1470 = var2; - this.field1475 = var3; - this.field1480 = (var2 - this.field1472) / var1; - this.field1481 = (var4 - this.field1482) / var1; - this.field1468 = (var5 - this.field1474) / var1; + this.field1453 = var1; + this.field1454 = var2; + this.field1458 = var3; + this.field1462 = (var2 - this.field1456) / var1; + this.field1463 = (var4 - this.field1455) / var1; + this.field1464 = (var5 - this.field1461) / var1; } } } - @ObfuscatedName("al") - public synchronized void method2540(int var1) { + @ObfuscatedName("at") + public synchronized void method2473(int var1) { if (var1 == 0) { - this.method2607(0); + this.method2554(0); this.remove(); - } else if (this.field1482 == 0 && this.field1474 == 0) { - this.field1479 = 0; - this.field1470 = 0; - this.field1472 = 0; + } else if (this.field1455 == 0 && this.field1461 == 0) { + this.field1453 = 0; + this.field1454 = 0; + this.field1456 = 0; this.remove(); } else { - int var2 = -this.field1472; - if (this.field1472 > var2) { - var2 = this.field1472; + int var2 = -this.field1456; + if (this.field1456 > var2) { + var2 = this.field1456; } - if (-this.field1482 > var2) { - var2 = -this.field1482; + if (-this.field1455 > var2) { + var2 = -this.field1455; } - if (this.field1482 > var2) { - var2 = this.field1482; + if (this.field1455 > var2) { + var2 = this.field1455; } - if (-this.field1474 > var2) { - var2 = -this.field1474; + if (-this.field1461 > var2) { + var2 = -this.field1461; } - if (this.field1474 > var2) { - var2 = this.field1474; + if (this.field1461 > var2) { + var2 = this.field1461; } if (var1 > var2) { var1 = var2; } - this.field1479 = var1; - this.field1470 = Integer.MIN_VALUE; - this.field1480 = -this.field1472 / var1; - this.field1481 = -this.field1482 / var1; - this.field1468 = -this.field1474 / var1; + this.field1453 = var1; + this.field1454 = Integer.MIN_VALUE; + this.field1462 = -this.field1456 / var1; + this.field1463 = -this.field1455 / var1; + this.field1464 = -this.field1461 / var1; } } - @ObfuscatedName("av") - public synchronized void method2538(int var1) { - if (this.field1469 < 0) { - this.field1469 = -var1; - } else { - this.field1469 = var1; - } - - } - @ObfuscatedName("as") - public synchronized int method2539() { - return this.field1469 < 0 ? -this.field1469 : this.field1469; - } - - @ObfuscatedName("aw") - public boolean method2558() { - return this.field1471 < 0 || this.field1471 >= ((RawSound)super.sound).samples.length << 8; - } - - @ObfuscatedName("ad") - public boolean method2585() { - return this.field1479 != 0; - } - - @ObfuscatedName("ag") - int method2543(int[] var1, int var2, int var3, int var4, int var5) { - while (true) { - if (this.field1479 > 0) { - int var6 = var2 + this.field1479; - if (var6 > var4) { - var6 = var4; - } - - this.field1479 += var2; - if (this.field1469 == 256 && (this.field1471 & 255) == 0) { - if (FileSystem.PcmPlayer_stereo) { - var2 = method2559(0, ((RawSound)super.sound).samples, var1, this.field1471, var2, this.field1482, this.field1474, this.field1481, this.field1468, 0, var6, var3, this); - } else { - var2 = method2586(((RawSound)super.sound).samples, var1, this.field1471, var2, this.field1472, this.field1480, 0, var6, var3, this); - } - } else if (FileSystem.PcmPlayer_stereo) { - var2 = method2627(0, 0, ((RawSound)super.sound).samples, var1, this.field1471, var2, this.field1482, this.field1474, this.field1481, this.field1468, 0, var6, var3, this, this.field1469, var5); - } else { - var2 = method2633(0, 0, ((RawSound)super.sound).samples, var1, this.field1471, var2, this.field1472, this.field1480, 0, var6, var3, this, this.field1469, var5); - } - - this.field1479 -= var2; - if (this.field1479 != 0) { - return var2; - } - - if (!this.method2530()) { - continue; - } - - return var4; - } - - if (this.field1469 == 256 && (this.field1471 & 255) == 0) { - if (FileSystem.PcmPlayer_stereo) { - return method2551(0, ((RawSound)super.sound).samples, var1, this.field1471, var2, this.field1482, this.field1474, 0, var4, var3, this); - } - - return method2550(((RawSound)super.sound).samples, var1, this.field1471, var2, this.field1472, 0, var4, var3, this); - } - - if (FileSystem.PcmPlayer_stereo) { - return method2555(0, 0, ((RawSound)super.sound).samples, var1, this.field1471, var2, this.field1482, this.field1474, 0, var4, var3, this, this.field1469, var5); - } - - return method2554(0, 0, ((RawSound)super.sound).samples, var1, this.field1471, var2, this.field1472, 0, var4, var3, this, this.field1469, var5); - } - } - - @ObfuscatedName("ar") - int method2641(int[] var1, int var2, int var3, int var4, int var5) { - while (true) { - if (this.field1479 > 0) { - int var6 = var2 + this.field1479; - if (var6 > var4) { - var6 = var4; - } - - this.field1479 += var2; - if (this.field1469 == -256 && (this.field1471 & 255) == 0) { - if (FileSystem.PcmPlayer_stereo) { - var2 = method2561(0, ((RawSound)super.sound).samples, var1, this.field1471, var2, this.field1482, this.field1474, this.field1481, this.field1468, 0, var6, var3, this); - } else { - var2 = method2560(((RawSound)super.sound).samples, var1, this.field1471, var2, this.field1472, this.field1480, 0, var6, var3, this); - } - } else if (FileSystem.PcmPlayer_stereo) { - var2 = method2605(0, 0, ((RawSound)super.sound).samples, var1, this.field1471, var2, this.field1482, this.field1474, this.field1481, this.field1468, 0, var6, var3, this, this.field1469, var5); - } else { - var2 = method2569(0, 0, ((RawSound)super.sound).samples, var1, this.field1471, var2, this.field1472, this.field1480, 0, var6, var3, this, this.field1469, var5); - } - - this.field1479 -= var2; - if (this.field1479 != 0) { - return var2; - } - - if (!this.method2530()) { - continue; - } - - return var4; - } - - if (this.field1469 == -256 && (this.field1471 & 255) == 0) { - if (FileSystem.PcmPlayer_stereo) { - return method2553(0, ((RawSound)super.sound).samples, var1, this.field1471, var2, this.field1482, this.field1474, 0, var4, var3, this); - } - - return method2594(((RawSound)super.sound).samples, var1, this.field1471, var2, this.field1472, 0, var4, var3, this); - } - - if (FileSystem.PcmPlayer_stereo) { - return method2557(0, 0, ((RawSound)super.sound).samples, var1, this.field1471, var2, this.field1482, this.field1474, 0, var4, var3, this, this.field1469, var5); - } - - return method2556(0, 0, ((RawSound)super.sound).samples, var1, this.field1471, var2, this.field1472, 0, var4, var3, this, this.field1469, var5); - } - } - - @ObfuscatedName("ax") - boolean method2530() { - int var1 = this.field1470; - int var2; - int var3; - if (var1 == Integer.MIN_VALUE) { - var3 = 0; - var2 = 0; - var1 = 0; + public synchronized void method2474(int var1) { + if (this.field1451 < 0) { + this.field1451 = -var1; } else { - var2 = method2526(var1, this.field1475); - var3 = method2519(var1, this.field1475); + this.field1451 = var1; } - if (var1 == this.field1472 && var2 == this.field1482 && var3 == this.field1474) { - if (this.field1470 == Integer.MIN_VALUE) { - this.field1470 = 0; - this.field1474 = 0; - this.field1482 = 0; - this.field1472 = 0; - this.remove(); - return true; - } - this.method2525(); - return false; - } - if (this.field1472 < var1) { - this.field1480 = 1; - this.field1479 = var1 - this.field1472; - } else if (this.field1472 > var1) { - this.field1480 = -1; - this.field1479 = this.field1472 - var1; - } else { - this.field1480 = 0; - } - - if (this.field1482 < var2) { - this.field1481 = 1; - if (this.field1479 == 0 || this.field1479 > var2 - this.field1482) { - this.field1479 = var2 - this.field1482; - } - } else if (this.field1482 > var2) { - this.field1481 = -1; - if (this.field1479 == 0 || this.field1479 > this.field1482 - var2) { - this.field1479 = this.field1482 - var2; - } - } else { - this.field1481 = 0; - } - - if (this.field1474 < var3) { - this.field1468 = 1; - if (this.field1479 == 0 || this.field1479 > var3 - this.field1474) { - this.field1479 = var3 - this.field1474; - } - } else if (this.field1474 > var3) { - this.field1468 = -1; - if (this.field1479 == 0 || this.field1479 > this.field1474 - var3) { - this.field1479 = this.field1474 - var3; - } - } else { - this.field1468 = 0; - } - - return false; } - @ObfuscatedName("ay") - int vmethod2689() { - int var1 = this.field1472 * 3 >> 6; + @ObfuscatedName("ak") + int vmethod2644() { + int var1 = this.field1456 * 3 >> 6; var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); if (this.numLoops == 0) { - var1 -= var1 * this.field1471 / (((RawSound)super.sound).samples.length << 8); + var1 -= var1 * this.field1452 / (((RawSound)super.sound).samples.length << 8); } else if (this.numLoops >= 0) { var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; } @@ -827,38 +650,222 @@ public class RawPcmStream extends PcmStream { return var1 > 255 ? 255 : var1; } - @ObfuscatedName("q") - static int method2526(int var0, int var1) { + @ObfuscatedName("ao") + public synchronized int method2603() { + return this.field1451 < 0 ? -this.field1451 : this.field1451; + } + + @ObfuscatedName("ac") + public boolean method2476() { + return this.field1452 < 0 || this.field1452 >= ((RawSound)super.sound).samples.length << 8; + } + + @ObfuscatedName("ar") + public boolean method2457() { + return this.field1453 != 0; + } + + @ObfuscatedName("au") + int method2477(int[] var1, int var2, int var3, int var4, int var5) { + while (true) { + if (this.field1453 > 0) { + int var6 = var2 + this.field1453; + if (var6 > var4) { + var6 = var4; + } + + this.field1453 += var2; + if (this.field1451 == 256 && (this.field1452 & 255) == 0) { + if (PcmPlayer.PcmPlayer_stereo) { + var2 = method2495(0, ((RawSound)super.sound).samples, var1, this.field1452, var2, this.field1455, this.field1461, this.field1463, this.field1464, 0, var6, var3, this); + } else { + var2 = method2494(((RawSound)super.sound).samples, var1, this.field1452, var2, this.field1456, this.field1462, 0, var6, var3, this); + } + } else if (PcmPlayer.PcmPlayer_stereo) { + var2 = method2499(0, 0, ((RawSound)super.sound).samples, var1, this.field1452, var2, this.field1455, this.field1461, this.field1463, this.field1464, 0, var6, var3, this, this.field1451, var5); + } else { + var2 = method2498(0, 0, ((RawSound)super.sound).samples, var1, this.field1452, var2, this.field1456, this.field1462, 0, var6, var3, this, this.field1451, var5); + } + + this.field1453 -= var2; + if (this.field1453 != 0) { + return var2; + } + + if (!this.method2514()) { + continue; + } + + return var4; + } + + if (this.field1451 == 256 && (this.field1452 & 255) == 0) { + if (PcmPlayer.PcmPlayer_stereo) { + return method2551(0, ((RawSound)super.sound).samples, var1, this.field1452, var2, this.field1455, this.field1461, 0, var4, var3, this); + } + + return method2546(((RawSound)super.sound).samples, var1, this.field1452, var2, this.field1456, 0, var4, var3, this); + } + + if (PcmPlayer.PcmPlayer_stereo) { + return method2491(0, 0, ((RawSound)super.sound).samples, var1, this.field1452, var2, this.field1455, this.field1461, 0, var4, var3, this, this.field1451, var5); + } + + return method2490(0, 0, ((RawSound)super.sound).samples, var1, this.field1452, var2, this.field1456, 0, var4, var3, this, this.field1451, var5); + } + } + + @ObfuscatedName("ax") + int method2618(int[] var1, int var2, int var3, int var4, int var5) { + while (true) { + if (this.field1453 > 0) { + int var6 = var2 + this.field1453; + if (var6 > var4) { + var6 = var4; + } + + this.field1453 += var2; + if (this.field1451 == -256 && (this.field1452 & 255) == 0) { + if (PcmPlayer.PcmPlayer_stereo) { + var2 = method2590(0, ((RawSound)super.sound).samples, var1, this.field1452, var2, this.field1455, this.field1461, this.field1463, this.field1464, 0, var6, var3, this); + } else { + var2 = method2496(((RawSound)super.sound).samples, var1, this.field1452, var2, this.field1456, this.field1462, 0, var6, var3, this); + } + } else if (PcmPlayer.PcmPlayer_stereo) { + var2 = method2458(0, 0, ((RawSound)super.sound).samples, var1, this.field1452, var2, this.field1455, this.field1461, this.field1463, this.field1464, 0, var6, var3, this, this.field1451, var5); + } else { + var2 = method2500(0, 0, ((RawSound)super.sound).samples, var1, this.field1452, var2, this.field1456, this.field1462, 0, var6, var3, this, this.field1451, var5); + } + + this.field1453 -= var2; + if (this.field1453 != 0) { + return var2; + } + + if (!this.method2514()) { + continue; + } + + return var4; + } + + if (this.field1451 == -256 && (this.field1452 & 255) == 0) { + if (PcmPlayer.PcmPlayer_stereo) { + return method2489(0, ((RawSound)super.sound).samples, var1, this.field1452, var2, this.field1455, this.field1461, 0, var4, var3, this); + } + + return method2488(((RawSound)super.sound).samples, var1, this.field1452, var2, this.field1456, 0, var4, var3, this); + } + + if (PcmPlayer.PcmPlayer_stereo) { + return method2545(0, 0, ((RawSound)super.sound).samples, var1, this.field1452, var2, this.field1455, this.field1461, 0, var4, var3, this, this.field1451, var5); + } + + return method2492(0, 0, ((RawSound)super.sound).samples, var1, this.field1452, var2, this.field1456, 0, var4, var3, this, this.field1451, var5); + } + } + + @ObfuscatedName("ag") + boolean method2514() { + int var1 = this.field1454; + int var2; + int var3; + if (var1 == Integer.MIN_VALUE) { + var3 = 0; + var2 = 0; + var1 = 0; + } else { + var2 = method2558(var1, this.field1458); + var3 = method2456(var1, this.field1458); + } + + if (var1 == this.field1456 && var2 == this.field1455 && var3 == this.field1461) { + if (this.field1454 == Integer.MIN_VALUE) { + this.field1454 = 0; + this.field1461 = 0; + this.field1455 = 0; + this.field1456 = 0; + this.remove(); + return true; + } else { + this.method2609(); + return false; + } + } else { + if (this.field1456 < var1) { + this.field1462 = 1; + this.field1453 = var1 - this.field1456; + } else if (this.field1456 > var1) { + this.field1462 = -1; + this.field1453 = this.field1456 - var1; + } else { + this.field1462 = 0; + } + + if (this.field1455 < var2) { + this.field1463 = 1; + if (this.field1453 == 0 || this.field1453 > var2 - this.field1455) { + this.field1453 = var2 - this.field1455; + } + } else if (this.field1455 > var2) { + this.field1463 = -1; + if (this.field1453 == 0 || this.field1453 > this.field1455 - var2) { + this.field1453 = this.field1455 - var2; + } + } else { + this.field1463 = 0; + } + + if (this.field1461 < var3) { + this.field1464 = 1; + if (this.field1453 == 0 || this.field1453 > var3 - this.field1461) { + this.field1453 = var3 - this.field1461; + } + } else if (this.field1461 > var3) { + this.field1464 = -1; + if (this.field1453 == 0 || this.field1453 > this.field1461 - var3) { + this.field1453 = this.field1461 - var3; + } + } else { + this.field1464 = 0; + } + + return false; + } + } + + @ObfuscatedName("s") + static int method2558(int var0, int var1) { return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D); } - @ObfuscatedName("w") - static int method2519(int var0, int var1) { + @ObfuscatedName("j") + static int method2456(int var0, int var1) { return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D); } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lcd;II)Ldh;" + signature = "(Lco;II)Ldx;" ) @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)(CollisionMap.PcmPlayer_sampleRate * 100)), var2 << 6) : null; + return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(PcmPlayer.PcmPlayer_sampleRate * 100)), var2 << 6) : null; } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lcd;III)Ldh;" + signature = "(Lco;III)Ldx;" ) - public static RawPcmStream method2524(RawSound var0, int var1, int var2, int var3) { + public static RawPcmStream method2460(RawSound var0, int var1, int var2, int var3) { return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, var1, var2, var3) : null; } - @ObfuscatedName("ai") + @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "([B[IIIIIIILdh;)I" + signature = "([B[IIIIIIILdx;)I" ) - static int method2550(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method2546(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { var2 >>= 8; var7 >>= 8; var4 <<= 2; @@ -881,13 +888,13 @@ public class RawPcmStream extends PcmStream { var10001 = var3++; } - var8.field1471 = var2 << 8; + var8.field1452 = var2 << 8; return var3; } - @ObfuscatedName("ak") + @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "(I[B[IIIIIIIILdh;)I" + signature = "(I[B[IIIIIIIILdx;)I" ) static int method2551(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { var3 >>= 8; @@ -932,15 +939,15 @@ public class RawPcmStream extends PcmStream { var10001 = var4++; } - var10.field1471 = var3 << 8; + var10.field1452 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("ah") + @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "([B[IIIIIIILdh;)I" + signature = "([B[IIIIIIILdx;)I" ) - static int method2594(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method2488(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { var2 >>= 8; var7 >>= 8; var4 <<= 2; @@ -963,15 +970,15 @@ public class RawPcmStream extends PcmStream { var10001 = var3++; } - var8.field1471 = var2 << 8; + var8.field1452 = var2 << 8; return var3; } - @ObfuscatedName("am") + @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "(I[B[IIIIIIIILdh;)I" + signature = "(I[B[IIIIIIIILdx;)I" ) - static int method2553(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + static int method2489(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; @@ -1014,15 +1021,15 @@ public class RawPcmStream extends PcmStream { var10001 = var4++; } - var10.field1471 = var3 << 8; + var10.field1452 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("af") + @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "(II[B[IIIIIIILdh;II)I" + signature = "(II[B[IIIIIIILdx;II)I" ) - static int method2554(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 method2490(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; } @@ -1047,15 +1054,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; } - var10.field1471 = var4; + var10.field1452 = var4; return var5; } - @ObfuscatedName("ab") + @ObfuscatedName("al") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIILdh;II)I" + signature = "(II[B[IIIIIIIILdx;II)I" ) - static int method2555(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 method2491(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; } @@ -1089,15 +1096,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += var0 * var7 >> 6; } - var11.field1471 = var4; + var11.field1452 = var4; return var5 >> 1; } - @ObfuscatedName("bp") + @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(II[B[IIIIIIILdh;II)I" + signature = "(II[B[IIIIIIILdx;II)I" ) - static int method2556(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 method2492(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; } @@ -1122,15 +1129,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; } - var10.field1471 = var4; + var10.field1452 = var4; return var5; } - @ObfuscatedName("bz") + @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIILdh;II)I" + signature = "(II[B[IIIIIIIILdx;II)I" ) - static int method2557(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 method2545(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; } @@ -1162,15 +1169,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += var0 * var7 >> 6; } - var11.field1471 = var4; + var11.field1452 = var4; return var5 >> 1; } - @ObfuscatedName("bi") + @ObfuscatedName("aw") @ObfuscatedSignature( - signature = "([B[IIIIIIIILdh;)I" + signature = "([B[IIIIIIIILdx;)I" ) - static int method2586(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method2494(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; @@ -1179,8 +1186,8 @@ public class RawPcmStream extends PcmStream { var6 = var7; } - var9.field1482 += var9.field1481 * (var6 - var3); - var9.field1474 += var9.field1468 * (var6 - var3); + var9.field1455 += var9.field1463 * (var6 - var3); + var9.field1461 += var9.field1464 * (var6 - var3); int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { @@ -1202,16 +1209,16 @@ public class RawPcmStream extends PcmStream { var1[var10001] += var0[var2++] * var4; } - var9.field1472 = var4 >> 2; - var9.field1471 = var2 << 8; + var9.field1456 = var4 >> 2; + var9.field1452 = var2 << 8; return var3; } - @ObfuscatedName("bg") + @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "(I[B[IIIIIIIIIILdh;)I" + signature = "(I[B[IIIIIIIIIILdx;)I" ) - static int method2559(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 method2495(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; @@ -1222,7 +1229,7 @@ public class RawPcmStream extends PcmStream { var9 = var10; } - var12.field1472 += var12.field1480 * (var9 - var4); + var12.field1456 += var12.field1462 * (var9 - var4); var4 <<= 1; var9 <<= 1; @@ -1267,17 +1274,17 @@ public class RawPcmStream extends PcmStream { var2[var10001] += var13 * var6; } - var12.field1482 = var5 >> 2; - var12.field1474 = var6 >> 2; - var12.field1471 = var3 << 8; + var12.field1455 = var5 >> 2; + var12.field1461 = var6 >> 2; + var12.field1452 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("bh") + @ObfuscatedName("bk") @ObfuscatedSignature( - signature = "([B[IIIIIIIILdh;)I" + signature = "([B[IIIIIIIILdx;)I" ) - static int method2560(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method2496(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; @@ -1286,8 +1293,8 @@ public class RawPcmStream extends PcmStream { var6 = var7; } - var9.field1482 += var9.field1481 * (var6 - var3); - var9.field1474 += var9.field1468 * (var6 - var3); + var9.field1455 += var9.field1463 * (var6 - var3); + var9.field1461 += var9.field1464 * (var6 - var3); int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { @@ -1309,16 +1316,16 @@ public class RawPcmStream extends PcmStream { var1[var10001] += var0[var2--] * var4; } - var9.field1472 = var4 >> 2; - var9.field1471 = var2 << 8; + var9.field1456 = var4 >> 2; + var9.field1452 = var2 << 8; return var3; } - @ObfuscatedName("bm") + @ObfuscatedName("bw") @ObfuscatedSignature( - signature = "(I[B[IIIIIIIIIILdh;)I" + signature = "(I[B[IIIIIIIIIILdx;)I" ) - static int method2561(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 method2590(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; @@ -1329,7 +1336,7 @@ public class RawPcmStream extends PcmStream { var9 = var10; } - var12.field1472 += var12.field1480 * (var9 - var4); + var12.field1456 += var12.field1462 * (var9 - var4); var4 <<= 1; var9 <<= 1; @@ -1374,19 +1381,19 @@ public class RawPcmStream extends PcmStream { var2[var10001] += var13 * var6; } - var12.field1482 = var5 >> 2; - var12.field1474 = var6 >> 2; - var12.field1471 = var3 << 8; + var12.field1455 = var5 >> 2; + var12.field1461 = var6 >> 2; + var12.field1452 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("bn") + @ObfuscatedName("bo") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIILdh;II)I" + signature = "(II[B[IIIIIIIILdx;II)I" ) - static int method2633(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.field1482 -= var11.field1481 * var5; - var11.field1474 -= var11.field1468 * var5; + static int method2498(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.field1463 * var5; + var11.field1461 -= var11.field1464 * var5; if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { var8 = var9; } @@ -1413,19 +1420,19 @@ public class RawPcmStream extends PcmStream { var6 += var7; } - var11.field1482 += var11.field1481 * var5; - var11.field1474 += var11.field1468 * var5; - var11.field1472 = var6; - var11.field1471 = var4; + var11.field1455 += var11.field1463 * var5; + var11.field1461 += var11.field1464 * var5; + var11.field1456 = var6; + var11.field1452 = var4; return var5; } - @ObfuscatedName("bc") + @ObfuscatedName("bn") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIIIILdh;II)I" + signature = "(II[B[IIIIIIIIIILdx;II)I" ) - static int method2627(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.field1472 -= var5 * var13.field1480; + static int method2499(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.field1456 -= var5 * var13.field1462; if (var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) { var10 = var11; } @@ -1464,20 +1471,20 @@ public class RawPcmStream extends PcmStream { } var5 >>= 1; - var13.field1472 += var13.field1480 * var5; - var13.field1482 = var6; - var13.field1474 = var7; - var13.field1471 = var4; + var13.field1456 += var13.field1462 * var5; + var13.field1455 = var6; + var13.field1461 = var7; + var13.field1452 = var4; return var5; } - @ObfuscatedName("bx") + @ObfuscatedName("bp") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIILdh;II)I" + signature = "(II[B[IIIIIIIILdx;II)I" ) - static int method2569(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.field1482 -= var11.field1481 * var5; - var11.field1474 -= var11.field1468 * var5; + static int method2500(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.field1463 * var5; + var11.field1461 -= var11.field1464 * var5; if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { var8 = var9; } @@ -1504,19 +1511,19 @@ public class RawPcmStream extends PcmStream { var6 += var7; } - var11.field1482 += var11.field1481 * var5; - var11.field1474 += var11.field1468 * var5; - var11.field1472 = var6; - var11.field1471 = var4; + var11.field1455 += var11.field1463 * var5; + var11.field1461 += var11.field1464 * var5; + var11.field1456 = var6; + var11.field1452 = var4; return var5; } - @ObfuscatedName("bo") + @ObfuscatedName("bz") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIIIILdh;II)I" + signature = "(II[B[IIIIIIIIIILdx;II)I" ) - static int method2605(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.field1472 -= var5 * var13.field1480; + static int method2458(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.field1456 -= var5 * var13.field1462; if (var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) { var10 = var11; } @@ -1553,10 +1560,10 @@ public class RawPcmStream extends PcmStream { } var5 >>= 1; - var13.field1472 += var13.field1480 * var5; - var13.field1482 = var6; - var13.field1474 = var7; - var13.field1471 = var4; + var13.field1456 += var13.field1462 * var5; + var13.field1455 = var6; + var13.field1461 = var7; + var13.field1452 = var4; return var5; } } diff --git a/runescape-client/src/main/java/RawSound.java b/runescape-client/src/main/java/RawSound.java index e922159aba..8038dff76c 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("cd") +@ObfuscatedName("co") @Implements("RawSound") public class RawSound extends AbstractSound { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("sampleRate") public int sampleRate; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("samples") public byte[] samples; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("start") public int start; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("end") int end; - @ObfuscatedName("k") - public boolean field1393; + @ObfuscatedName("u") + public boolean field1362; 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.field1393 = var5; + this.field1362 = var5; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ldz;)Lcd;" + signature = "(Ldb;)Lco;" ) @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 bc0014de79..6bac54c47e 100644 --- a/runescape-client/src/main/java/ReflectionCheck.java +++ b/runescape-client/src/main/java/ReflectionCheck.java @@ -6,70 +6,87 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ce") +@ObfuscatedName("cv") @Implements("ReflectionCheck") public class ReflectionCheck extends Node { - @ObfuscatedName("co") + @ObfuscatedName("cm") @ObfuscatedGetter( - intValue = 749425319 + intValue = -391486769 ) - public static int field1338; - @ObfuscatedName("q") + public static int field1307; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1523966437 + intValue = 1136310453 ) @Export("id") int id; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 970491183 + intValue = 563211099 ) @Export("size") int size; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("operations") int[] operations; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("creationErrors") int[] creationErrors; - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("fields") Field[] fields; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("intReplaceValues") int[] intReplaceValues; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("methods") Method[] methods; - @ObfuscatedName("i") + @ObfuscatedName("q") @Export("arguments") byte[][][] arguments; ReflectionCheck() { } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "2118101811" + signature = "(IIIB)I", + garbageValue = "4" ) - @Export("savePreferences") - static void savePreferences() { - AccessFile var0 = null; + public static int method2213(int var0, int var1, int var2) { + var2 &= 3; + if (var2 == 0) { + return var0; + } else if (var2 == 1) { + return var1; + } else { + return var2 == 2 ? 7 - var0 : 7 - var1; + } + } - try { - var0 = WorldMapIcon_0.getPreferencesFile("", WorldMapRegion.studioGame.name, true); - Buffer var1 = WorldMapLabelSize.clientPreferences.toBuffer(); - var0.write(var1.array, 0, var1.offset); - } catch (Exception var3) { - } - - try { - if (var0 != null) { - var0.closeSync(true); - } - } catch (Exception var2) { + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(III)I", + garbageValue = "-125143607" + ) + public static int method2212(int var0, int var1) { + return (var0 << 8) + var1; + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(Ljava/lang/CharSequence;I)I", + garbageValue = "482373296" + ) + @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 + class14.charToByteCp1252(var0.charAt(var3)); } + return var2; } } diff --git a/runescape-client/src/main/java/RouteStrategy.java b/runescape-client/src/main/java/RouteStrategy.java index 2122ceb4c5..f26c6c491d 100644 --- a/runescape-client/src/main/java/RouteStrategy.java +++ b/runescape-client/src/main/java/RouteStrategy.java @@ -4,36 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fl") +@ObfuscatedName("fq") @Implements("RouteStrategy") public abstract class RouteStrategy { - @ObfuscatedName("pi") + @ObfuscatedName("da") @ObfuscatedSignature( - signature = "Lly;" + signature = "Lft;" ) - @Export("sceneMinimapSprite") - static Sprite sceneMinimapSprite; - @ObfuscatedName("q") + @Export("js5SocketTask") + static Task js5SocketTask; + @ObfuscatedName("fa") @ObfuscatedGetter( - intValue = 1876567169 + intValue = 207475119 + ) + @Export("baseY") + static int baseY; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 663574439 ) @Export("approxDestinationX") public int approxDestinationX; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1051805723 + intValue = -148289361 ) @Export("approxDestinationY") public int approxDestinationY; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1586804307 + intValue = 2029951319 ) @Export("approxDestinationSizeX") public int approxDestinationSizeX; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 775131021 + intValue = 2116488485 ) @Export("approxDestinationSizeY") public int approxDestinationSizeY; @@ -41,82 +47,77 @@ public abstract class RouteStrategy { protected RouteStrategy() { } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(IIILfv;I)Z", - garbageValue = "-1217489379" + signature = "(IIILfm;I)Z", + garbageValue = "1325675955" ) @Export("hasArrived") - public abstract boolean hasArrived(int size, int x, int y, CollisionMap var4); + public abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4); - @ObfuscatedName("ec") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1403573360" + signature = "(CB)Z", + garbageValue = "-117" ) - static final void method3593() { - Client.packetWriter.close(); - class197.FloorOverlayDefinition_clearCached(); - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); - KitDefinition.KitDefinition_cached.clear(); - TileItemPile.ObjectDefinition_clearCached(); - AbstractWorldMapIcon.NpcDefinition_clearCached(); - ItemDefinition.ItemDefinition_cached.clear(); - ItemDefinition.ItemDefinition_cachedModels.clear(); - ItemDefinition.ItemDefinition_cachedSprites.clear(); - SequenceDefinition.SequenceDefinition_cached.clear(); - SequenceDefinition.SequenceDefinition_cachedFrames.clear(); - SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); - SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); - MusicPatch.VarbitDefinition_clearCached(); - SecureRandomCallable.method1093(); - HitSplatDefinition.HitSplatDefinition_cached.clear(); - HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); - HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); - WorldMapIcon_1.HealthBarDefinition_clearCached(); - StructDefinition.StructDefinition_cached.clear(); - Coord.ParamDefinition_clearCached(); - MouseRecorder.WorldMapElement_clearCached(); - PlayerAppearance.PlayerAppearance_cachedModels.clear(); - Calendar.Widget_clearCached(); - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); - Script.Script_cached.clear(); - class197.archive0.clearFiles(); - JagexCache.archive1.clearFiles(); - class43.archive3.clearFiles(); - class13.archive4.clearFiles(); - WorldMapCacheName.archive5.clearFiles(); - WorldMapRegion.archive6.clearFiles(); - NPCDefinition.archive7.clearFiles(); - Client.archive8.clearFiles(); - class4.archive9.clearFiles(); - WorldMapLabelSize.archive10.clearFiles(); - class32.archive11.clearFiles(); - UserComparator4.archive12.clearFiles(); - GrandExchangeOfferWorldComparator.scene.clear(); + @Export("isAlphaNumeric") + public static boolean isAlphaNumeric(char var0) { + return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; + } - for (int var0 = 0; var0 < 4; ++var0) { - Client.collisionMaps[var0].clear(); - } - - System.gc(); - class40.method729(2); - Client.field889 = -1; - Client.field699 = false; - - for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var1.stream1 != null) { - SecureRandomCallable.pcmStreamMixer.removeSubStream(var1.stream1); - var1.stream1 = null; + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "(III)I", + garbageValue = "-1827304570" + ) + static final int method3533(int var0, int var1) { + if (var0 == -2) { + return 12345678; + } else if (var0 == -1) { + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; } - if (var1.stream2 != null) { - SecureRandomCallable.pcmStreamMixer.removeSubStream(var1.stream2); - var1.stream2 = null; + return var1; + } else { + var1 = (var0 & 127) * var1 / 128; + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; } + + return (var0 & 65408) + var1; + } + } + + @ObfuscatedName("ku") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;ZI)Ljava/lang/String;", + garbageValue = "1938958003" + ) + static String method3534(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"; } - ObjectSound.objectSounds.clear(); - class96.updateGameState(10); + String var3 = ""; + if (Clock.field2037 != null) { + var3 = "/p=" + Clock.field2037; + } + + String var4 = "runescape.com"; + return var2 + var0 + "." + var4 + "/l=" + class60.clientLanguage + "/a=" + SoundSystem.field1414 + var3 + "/"; } } diff --git a/runescape-client/src/main/java/RunException.java b/runescape-client/src/main/java/RunException.java index 45f2d0ff17..b1503e45f2 100644 --- a/runescape-client/src/main/java/RunException.java +++ b/runescape-client/src/main/java/RunException.java @@ -1,31 +1,21 @@ import java.applet.Applet; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ml") +@ObfuscatedName("mv") @Implements("RunException") public class RunException extends RuntimeException { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("RunException_applet") public static Applet RunException_applet; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -345454085 - ) - @Export("RunException_revision") - public static int RunException_revision; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 875770709 - ) - @Export("RunException_clientType") - public static int RunException_clientType; - @ObfuscatedName("k") + @ObfuscatedName("j") + @Export("localPlayerName") + public static String localPlayerName; + @ObfuscatedName("u") @Export("message") String message; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("throwable") Throwable throwable; diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java index 63a04ad595..c87eb6743b 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("er") +@ObfuscatedName("ea") @Implements("Scene") public class Scene { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("Scene_isLowDetail") public static boolean Scene_isLowDetail; - @ObfuscatedName("v") + @ObfuscatedName("p") @Export("tileUpdateCount") static int tileUpdateCount; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("Scene_plane") static int Scene_plane; @ObfuscatedName("g") @Export("Scene_drawnCount") static int Scene_drawnCount; - @ObfuscatedName("a") + @ObfuscatedName("e") @Export("Scene_cameraXTileMin") static int Scene_cameraXTileMin; - @ObfuscatedName("j") + @ObfuscatedName("z") @Export("Scene_cameraXTileMax") static int Scene_cameraXTileMax; - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("Scene_cameraYTileMin") static int Scene_cameraYTileMin; - @ObfuscatedName("h") + @ObfuscatedName("w") @Export("Scene_cameraYTileMax") static int Scene_cameraYTileMax; - @ObfuscatedName("o") + @ObfuscatedName("l") @Export("Scene_cameraXTile") static int Scene_cameraXTile; - @ObfuscatedName("n") + @ObfuscatedName("h") @Export("Scene_cameraYTile") static int Scene_cameraYTile; - @ObfuscatedName("d") + @ObfuscatedName("v") @Export("Scene_cameraX") static int Scene_cameraX; - @ObfuscatedName("s") + @ObfuscatedName("m") @Export("Scene_cameraY") static int Scene_cameraY; - @ObfuscatedName("z") + @ObfuscatedName("o") @Export("Scene_cameraZ") static int Scene_cameraZ; - @ObfuscatedName("al") + @ObfuscatedName("av") @Export("Scene_cameraPitchSine") static int Scene_cameraPitchSine; - @ObfuscatedName("av") + @ObfuscatedName("am") @Export("Scene_cameraPitchCosine") static int Scene_cameraPitchCosine; - @ObfuscatedName("as") + @ObfuscatedName("ai") @Export("Scene_cameraYawSine") static int Scene_cameraYawSine; - @ObfuscatedName("aw") + @ObfuscatedName("af") @Export("Scene_cameraYawCosine") static int Scene_cameraYawCosine; - @ObfuscatedName("ad") + @ObfuscatedName("az") @ObfuscatedSignature( - signature = "[Les;" + signature = "[Lej;" ) @Export("gameObjects") static GameObject[] gameObjects; - @ObfuscatedName("ag") + @ObfuscatedName("aj") @Export("checkClick") static boolean checkClick; - @ObfuscatedName("ar") + @ObfuscatedName("an") @Export("Scene_selectedPlane") static int Scene_selectedPlane; - @ObfuscatedName("ax") + @ObfuscatedName("at") @Export("Scene_selectedScreenX") static int Scene_selectedScreenX; - @ObfuscatedName("az") + @ObfuscatedName("as") @Export("Scene_selectedScreenY") static int Scene_selectedScreenY; - @ObfuscatedName("ae") + @ObfuscatedName("ak") @Export("Scene_selectedX") public static int Scene_selectedX; @ObfuscatedName("ao") @Export("Scene_selectedY") public static int Scene_selectedY; - @ObfuscatedName("aj") + @ObfuscatedName("ac") @Export("viewportWalking") static boolean viewportWalking; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @Export("Scene_planesCount") static int Scene_planesCount; - @ObfuscatedName("aq") + @ObfuscatedName("ag") @Export("Scene_planeOccluderCounts") static int[] Scene_planeOccluderCounts; @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "[[Leg;" + signature = "[[Leq;" ) @Export("Scene_planeOccluders") static Occluder[][] Scene_planeOccluders; - @ObfuscatedName("an") + @ObfuscatedName("ap") @Export("Scene_currentOccludersCount") static int Scene_currentOccludersCount; - @ObfuscatedName("au") + @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "[Leg;" + signature = "[Leq;" ) @Export("Scene_currentOccluders") static Occluder[] Scene_currentOccluders; - @ObfuscatedName("ai") + @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "Ljh;" + signature = "Ljc;" ) @Export("Scene_tilesDeque") static NodeDeque Scene_tilesDeque; - @ObfuscatedName("ak") - static final int[] field1847; + @ObfuscatedName("ad") + static final int[] field1826; + @ObfuscatedName("al") + static final int[] field1796; @ObfuscatedName("ah") - static final int[] field1815; - @ObfuscatedName("am") - static final int[] field1809; - @ObfuscatedName("ay") - static final int[] field1844; - @ObfuscatedName("af") - static final int[] field1828; + static final int[] field1799; @ObfuscatedName("ab") - static final int[] field1852; - @ObfuscatedName("bp") - static final int[] field1842; - @ObfuscatedName("bc") + static final int[] field1844; + @ObfuscatedName("aw") + static final int[] field1830; + @ObfuscatedName("ae") + static final int[] field1831; + @ObfuscatedName("bk") + static final int[] field1832; + @ObfuscatedName("bv") @Export("visibilityMap") static boolean[][][][] visibilityMap; - @ObfuscatedName("bx") + @ObfuscatedName("bj") @Export("visibleTiles") static boolean[][] visibleTiles; - @ObfuscatedName("bo") + @ObfuscatedName("bq") @Export("Scene_viewportXCenter") static int Scene_viewportXCenter; - @ObfuscatedName("bb") + @ObfuscatedName("by") @Export("Scene_viewportYCenter") static int Scene_viewportYCenter; @ObfuscatedName("bs") @Export("Scene_viewportXMin") static int Scene_viewportXMin; - @ObfuscatedName("bj") + @ObfuscatedName("bi") @Export("Scene_viewportYMin") static int Scene_viewportYMin; - @ObfuscatedName("bl") + @ObfuscatedName("bf") @Export("Scene_viewportXMax") static int Scene_viewportXMax; @ObfuscatedName("bd") @Export("Scene_viewportYMax") static int Scene_viewportYMax; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("planes") int planes; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("xSize") int xSize; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("ySize") int ySize; - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("tileHeights") int[][][] tileHeights; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "[[[Ldv;" + signature = "[[[Lde;" ) @Export("tiles") Tile[][][] tiles; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("minPlane") int minPlane; - @ObfuscatedName("i") + @ObfuscatedName("q") @Export("tempGameObjectsCount") int tempGameObjectsCount; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "[Les;" + signature = "[Lej;" ) @Export("tempGameObjects") GameObject[] tempGameObjects; - @ObfuscatedName("f") - int[][][] field1810; - @ObfuscatedName("bm") + @ObfuscatedName("d") + int[][][] field1789; + @ObfuscatedName("bz") @Export("tileShape2D") int[][] tileShape2D; - @ObfuscatedName("bn") + @ObfuscatedName("bh") @Export("tileRotation2D") int[][] tileRotation2D; @@ -206,13 +206,13 @@ public class Scene { Scene_currentOccludersCount = 0; Scene_currentOccluders = new Occluder[500]; Scene_tilesDeque = new NodeDeque(); - field1847 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; - field1815 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; - field1809 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; + field1826 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; + field1796 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; + field1799 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; field1844 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; - field1828 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; - field1852 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; - field1842 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; + field1830 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; + field1831 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; + field1832 = 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.field1810 = new int[var1][var2 + 1][var3 + 1]; + this.field1789 = new int[var1][var2 + 1][var3 + 1]; this.tileHeights = var4; this.clear(); } - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("clear") public void clear() { int var1; @@ -264,7 +264,7 @@ public class Scene { } - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("init") public void init(int var1) { this.minPlane = var1; @@ -279,24 +279,21 @@ public class Scene { } - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("setLinkBelow") public void setLinkBelow(int var1, int var2) { Tile var3 = this.tiles[0][var1][var2]; for (int var4 = 0; var4 < 3; ++var4) { Tile var5 = this.tiles[var4][var1][var2] = this.tiles[var4 + 1][var1][var2]; - if (var5 == null) { - continue; - } - --var5.plane; + if (var5 != null) { + --var5.plane; - for (int var6 = 0; var6 < var5.gameObjectsCount; ++var6) { - GameObject var7 = var5.gameObjects[var6]; - long var9 = var7.tag; - boolean var8 = WorldMapLabel.Entity_unpackType(var9) == 2; - if (var8 && var7.startX == var1 && var2 == var7.startY) { - --var7.plane; + for (int var6 = 0; var6 < var5.gameObjectsCount; ++var6) { + GameObject var7 = var5.gameObjects[var6]; + if (WorldMapEvent.method730(var7.tag) && var7.startX == var1 && var2 == var7.startY) { + --var7.plane; + } } } } @@ -309,7 +306,7 @@ public class Scene { this.tiles[3][var1][var2] = null; } - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("setTileMinPlane") public void setTileMinPlane(int var1, int var2, int var3, int var4) { Tile var5 = this.tiles[var1][var2][var3]; @@ -318,7 +315,7 @@ public class Scene { } } - @ObfuscatedName("l") + @ObfuscatedName("n") @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; @@ -356,9 +353,9 @@ public class Scene { } } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IIIILeo;JI)V" + signature = "(IIIILen;JI)V" ) @Export("newFloorDecoration") public void newFloorDecoration(int var1, int var2, int var3, int var4, Entity var5, long var6, int var8) { @@ -378,9 +375,9 @@ public class Scene { } } - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IIIILeo;JLeo;Leo;)V" + signature = "(IIIILen;JLen;Len;)V" ) @Export("newGroundItemPile") public void newGroundItemPile(int var1, int var2, int var3, int var4, Entity var5, long var6, Entity var8, Entity var9) { @@ -414,141 +411,141 @@ public class Scene { this.tiles[var1][var2][var3].tileItemPile = var10; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IIIILeo;Leo;IIJI)V" + signature = "(IIIILen;Len;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) { - if (var5 == null && var6 == null) { - return; - } - BoundaryObject var12 = new BoundaryObject(); - var12.tag = var9; - var12.flags = var11; - var12.x = var2 * 128 + 64; - var12.y = var3 * 128 + 64; - var12.tileHeight = var4; - var12.entity1 = var5; - var12.entity2 = var6; - var12.orientationA = var7; - var12.orientationB = var8; + if (var5 != null || var6 != null) { + BoundaryObject var12 = new BoundaryObject(); + var12.tag = var9; + var12.flags = var11; + var12.x = var2 * 128 + 64; + var12.y = var3 * 128 + 64; + var12.tileHeight = var4; + var12.entity1 = var5; + var12.entity2 = var6; + var12.orientationA = var7; + var12.orientationB = var8; - for (int var13 = var1; var13 >= 0; --var13) { - if (this.tiles[var13][var2][var3] == null) { - this.tiles[var13][var2][var3] = new Tile(var13, var2, var3); + for (int var13 = var1; var13 >= 0; --var13) { + if (this.tiles[var13][var2][var3] == null) { + this.tiles[var13][var2][var3] = new Tile(var13, var2, var3); + } } - } - this.tiles[var1][var2][var3].boundaryObject = var12; + this.tiles[var1][var2][var3].boundaryObject = var12; + } } - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(IIIILeo;Leo;IIIIJI)V" + signature = "(IIIILen;Len;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) { - if (var5 == null) { - return; - } - WallDecoration var14 = new WallDecoration(); - var14.tag = var11; - var14.flags = var13; - var14.x = var2 * 128 + 64; - var14.y = var3 * 128 + 64; - var14.tileHeight = var4; - var14.entity1 = var5; - var14.entity2 = var6; - var14.orientation = var7; - var14.orientation2 = var8; - var14.xOffset = var9; - var14.yOffset = var10; + if (var5 != null) { + WallDecoration var14 = new WallDecoration(); + var14.tag = var11; + var14.flags = var13; + var14.x = var2 * 128 + 64; + var14.y = var3 * 128 + 64; + var14.tileHeight = var4; + var14.entity1 = var5; + var14.entity2 = var6; + var14.orientation = var7; + var14.orientation2 = var8; + var14.xOffset = var9; + var14.yOffset = var10; - for (int var15 = var1; var15 >= 0; --var15) { - if (this.tiles[var15][var2][var3] == null) { - this.tiles[var15][var2][var3] = new Tile(var15, var2, var3); + for (int var15 = var1; var15 >= 0; --var15) { + if (this.tiles[var15][var2][var3] == null) { + this.tiles[var15][var2][var3] = new Tile(var15, var2, var3); + } } - } - this.tiles[var1][var2][var3].wallDecoration = var14; + this.tiles[var1][var2][var3].wallDecoration = var14; + } } - @ObfuscatedName("x") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(IIIIIILeo;IJI)Z" + signature = "(IIIIIILen;IJI)Z" ) - public boolean method3076(int plane, int x, int y, int var4, int width, int height, Entity var7, int var8, long var9, int var11) { + public boolean method3013(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 { + int var12 = var5 * 64 + var2 * 128; + int var13 = var6 * 64 + var3 * 128; + return this.newGameObject(var1, var2, var3, var5, var6, var12, var13, var4, var7, var8, false, var9, var11); } - int centerX = width * 64 + x * 128; - int centerY = height * 64 + y * 128; - return this.newGameObject(plane, x, y, width, height, centerX, centerY, var4, var7, var8, false, var9, var11); } - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IIIIILeo;IJZ)Z" + signature = "(IIIIILen;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) { if (var6 == null) { return true; + } else { + int var11 = var2 - var5; + int var12 = var3 - var5; + int var13 = var5 + var2; + int var14 = var3 + var5; + if (var10) { + if (var7 > 640 && var7 < 1408) { + var14 += 128; + } + + if (var7 > 1152 && var7 < 1920) { + var13 += 128; + } + + if (var7 > 1664 || var7 < 384) { + var12 -= 128; + } + + if (var7 > 128 && var7 < 896) { + var11 -= 128; + } + } + + var11 /= 128; + var12 /= 128; + var13 /= 128; + var14 /= 128; + return this.newGameObject(var1, var11, var12, var13 - var11 + 1, var14 - var12 + 1, var2, var3, var4, var6, var7, true, var8, 0); } - int var11 = var2 - var5; - int var12 = var3 - var5; - int var13 = var5 + var2; - int var14 = var3 + var5; - if (var10) { - if (var7 > 640 && var7 < 1408) { - var14 += 128; - } - - if (var7 > 1152 && var7 < 1920) { - var13 += 128; - } - - if (var7 > 1664 || var7 < 384) { - var12 -= 128; - } - - if (var7 > 128 && var7 < 896) { - var11 -= 128; - } - } - - var11 /= 128; - var12 /= 128; - var13 /= 128; - var14 /= 128; - return this.newGameObject(var1, var11, var12, var13 - var11 + 1, var14 - var12 + 1, var2, var3, var4, var6, var7, true, var8, 0); } - @ObfuscatedName("v") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(IIIIILeo;IJIIII)Z" + signature = "(IIIIILen;IJIIII)Z" ) @Export("addNullableObject") - public boolean addNullableObject(int plane, int centerX, int centerY, int height, int var5, Entity entity, int orientation, long packed, int x, int y, int var12, int var13) { - return entity == null ? true : this.newGameObject(plane, x, y, var12 - x + 1, var13 - y + 1, centerX, centerY, height, entity, orientation, true, packed, 0); + 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("y") @ObfuscatedSignature( - signature = "(IIIIIIIILeo;IZJI)Z" + signature = "(IIIIIIIILen;IZJI)Z" ) @Export("newGameObject") - boolean newGameObject(int plane, int x, int y, int w, int h, int centerX, int centerY, int height, Entity var9, int var10, boolean var11, long var12, int var14) { + 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) { int var16; - for (int var15 = x; var15 < x + w; ++var15) { - for (var16 = y; var16 < y + h; ++var16) { + for (int var15 = var2; var15 < var2 + var4; ++var15) { + for (var16 = var3; var16 < var3 + var5; ++var16) { if (var15 < 0 || var16 < 0 || var15 >= this.xSize || var16 >= this.ySize) { return false; } - Tile var22 = this.tiles[plane][var15][var16]; - if (var22 != null && var22.gameObjectsCount >= 5) { + Tile var23 = this.tiles[var1][var15][var16]; + if (var23 != null && var23.gameObjectsCount >= 5) { return false; } } @@ -557,47 +554,47 @@ public class Scene { GameObject var21 = new GameObject(); var21.tag = var12; var21.flags = var14; - var21.plane = plane; - var21.centerX = centerX; - var21.centerY = centerY; - var21.height = height; + var21.plane = var1; + var21.centerX = var6; + var21.centerY = var7; + var21.height = var8; var21.entity = var9; var21.orientation = var10; - var21.startX = x; - var21.startY = y; - var21.endX = x + w - 1; - var21.endY = y + h - 1; + var21.startX = var2; + var21.startY = var3; + var21.endX = var2 + var4 - 1; + var21.endY = var3 + var5 - 1; - for (var16 = x; var16 < x + w; ++var16) { - for (int var17 = y; var17 < y + h; ++var17) { + for (var16 = var2; var16 < var2 + var4; ++var16) { + for (int var17 = var3; var17 < var3 + var5; ++var17) { int var18 = 0; - if (var16 > x) { + if (var16 > var2) { ++var18; } - if (var16 < x + w - 1) { + if (var16 < var2 + var4 - 1) { var18 += 4; } - if (var17 > y) { + if (var17 > var3) { var18 += 8; } - if (var17 < y + h - 1) { + if (var17 < var3 + var5 - 1) { var18 += 2; } - for (int var19 = plane; var19 >= 0; --var19) { + for (int var19 = var1; var19 >= 0; --var19) { if (this.tiles[var19][var16][var17] == null) { this.tiles[var19][var16][var17] = new Tile(var19, var16, var17); } } - Tile var23 = this.tiles[plane][var16][var17]; - var23.gameObjects[var23.gameObjectsCount] = var21; - var23.gameObjectEdgeMasks[var23.gameObjectsCount] = var18; - var23.gameObjectsEdgeMask |= var18; - ++var23.gameObjectsCount; + Tile var22 = this.tiles[var1][var16][var17]; + var22.gameObjects[var22.gameObjectsCount] = var21; + var22.gameObjectEdgeMasks[var22.gameObjectsCount] = var18; + var22.gameObjectsEdgeMask |= var18; + ++var22.gameObjectsCount; } } @@ -608,7 +605,7 @@ public class Scene { return true; } - @ObfuscatedName("g") + @ObfuscatedName("p") @Export("clearTempGameObjects") public void clearTempGameObjects() { for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { @@ -620,59 +617,55 @@ public class Scene { this.tempGameObjectsCount = 0; } - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Les;)V" + signature = "(Lej;)V" ) @Export("removeGameObject") void removeGameObject(GameObject var1) { for (int var2 = var1.startX; var2 <= var1.endX; ++var2) { for (int var3 = var1.startY; var3 <= var1.endY; ++var3) { Tile var4 = this.tiles[var1.plane][var2][var3]; - if (var4 == null) { - continue; - } - int var5; - for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { - if (var4.gameObjects[var5] != var1) { - continue; - } - --var4.gameObjectsCount; + if (var4 != null) { + int var5; + for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { + if (var4.gameObjects[var5] == var1) { + --var4.gameObjectsCount; - for (int var6 = var5; var6 < var4.gameObjectsCount; ++var6) { - var4.gameObjects[var6] = var4.gameObjects[var6 + 1]; - var4.gameObjectEdgeMasks[var6] = var4.gameObjectEdgeMasks[var6 + 1]; + for (int var6 = var5; var6 < var4.gameObjectsCount; ++var6) { + var4.gameObjects[var6] = var4.gameObjects[var6 + 1]; + var4.gameObjectEdgeMasks[var6] = var4.gameObjectEdgeMasks[var6 + 1]; + } + + var4.gameObjects[var4.gameObjectsCount] = null; + break; + } } - var4.gameObjects[var4.gameObjectsCount] = null; - break; - } + var4.gameObjectsEdgeMask = 0; - var4.gameObjectsEdgeMask = 0; - - for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { - var4.gameObjectsEdgeMask |= var4.gameObjectEdgeMasks[var5]; + for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { + var4.gameObjectsEdgeMask |= var4.gameObjectEdgeMasks[var5]; + } } } } } - @ObfuscatedName("j") - public void method3082(int var1, int var2, int var3, int var4) { + @ObfuscatedName("e") + public void method3026(int var1, int var2, int var3, int var4) { Tile var5 = this.tiles[var1][var2][var3]; - if (var5 == null) { - return; + if (var5 != null) { + WallDecoration var6 = var5.wallDecoration; + if (var6 != null) { + var6.xOffset = var4 * var6.xOffset / 16; + var6.yOffset = var4 * var6.yOffset / 16; + } } - WallDecoration var6 = var5.wallDecoration; - if (var6 == null) { - return; - } - var6.xOffset = var4 * var6.xOffset / 16; - var6.yOffset = var4 * var6.yOffset / 16; } - @ObfuscatedName("o") + @ObfuscatedName("z") @Export("removeBoundaryObject") public void removeBoundaryObject(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -681,7 +674,7 @@ public class Scene { } } - @ObfuscatedName("d") + @ObfuscatedName("w") @Export("removeWallDecoration") public void removeWallDecoration(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -690,26 +683,23 @@ public class Scene { } } - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("removeGameObject") public void removeGameObject(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; - if (var4 == null) { - return; - } - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { - GameObject var6 = var4.gameObjects[var5]; - long var8 = var6.tag; - boolean var7 = WorldMapLabel.Entity_unpackType(var8) == 2; - if (var7 && var2 == var6.startX && var3 == var6.startY) { - this.removeGameObject(var6); - return; + if (var4 != null) { + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { + GameObject var6 = var4.gameObjects[var5]; + if (WorldMapEvent.method730(var6.tag) && var2 == var6.startX && var3 == var6.startY) { + this.removeGameObject(var6); + return; + } } - } + } } - @ObfuscatedName("z") + @ObfuscatedName("h") @Export("removeFloorDecoration") public void removeFloorDecoration(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -718,7 +708,7 @@ public class Scene { } } - @ObfuscatedName("al") + @ObfuscatedName("v") @Export("removeGroundItemPile") public void removeGroundItemPile(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -727,48 +717,47 @@ public class Scene { } } - @ObfuscatedName("av") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(III)Lem;" + signature = "(III)Ley;" ) - public BoundaryObject method3088(int var1, int var2, int var3) { + public BoundaryObject method3032(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 == null ? null : var4.boundaryObject; } - @ObfuscatedName("as") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(III)Lei;" + signature = "(III)Lec;" ) - public WallDecoration method3118(int var1, int var2, int var3) { + public WallDecoration method3033(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 == null ? null : var4.wallDecoration; } - @ObfuscatedName("aw") + @ObfuscatedName("av") @ObfuscatedSignature( - signature = "(III)Les;" + signature = "(III)Lej;" ) - public GameObject method3195(int var1, int var2, int var3) { + public GameObject method3034(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; if (var4 == null) { return null; - } - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { - GameObject var6 = var4.gameObjects[var5]; - long var8 = var6.tag; - boolean var7 = WorldMapLabel.Entity_unpackType(var8) == 2; - if (var7 && var2 == var6.startX && var3 == var6.startY) { - return var6; + } else { + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { + GameObject var6 = var4.gameObjects[var5]; + if (WorldMapEvent.method730(var6.tag) && var2 == var6.startX && var3 == var6.startY) { + return var6; + } } - } - return null; + return null; + } } - @ObfuscatedName("ad") + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(III)Ldq;" + signature = "(III)Ldy;" ) @Export("getFloorDecoration") public FloorDecoration getFloorDecoration(int var1, int var2, int var3) { @@ -776,109 +765,105 @@ public class Scene { return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; } - @ObfuscatedName("ag") + @ObfuscatedName("ai") @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("ar") + @ObfuscatedName("af") @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("ax") + @ObfuscatedName("az") @Export("getGameObjectTag") public long getGameObjectTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; if (var4 == null) { return 0L; - } - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { - GameObject var6 = var4.gameObjects[var5]; - long var8 = var6.tag; - boolean var7 = WorldMapLabel.Entity_unpackType(var8) == 2; - if (var7 && var2 == var6.startX && var3 == var6.startY) { - return var6.tag; + } else { + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { + GameObject var6 = var4.gameObjects[var5]; + if (WorldMapEvent.method730(var6.tag) && var2 == var6.startX && var3 == var6.startY) { + return var6.tag; + } } - } - return 0L; + return 0L; + } } - @ObfuscatedName("az") + @ObfuscatedName("aj") @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("ae") + @ObfuscatedName("an") @Export("getObjectFlags") public int getObjectFlags(int var1, int var2, int var3, long var4) { Tile var6 = this.tiles[var1][var2][var3]; if (var6 == null) { return -1; - } - if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { + } else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { return var6.boundaryObject.flags & 255; - } - if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { + } else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { return var6.wallDecoration.flags & 255; - } - if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { + } else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { return var6.floorDecoration.flags & 255; - } - for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) { - if (var6.gameObjects[var7].tag == var4) { - return var6.gameObjects[var7].flags & 255; + } else { + for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) { + if (var6.gameObjects[var7].tag == var4) { + return var6.gameObjects[var7].flags & 255; + } } - } - return -1; + return -1; + } } - @ObfuscatedName("ao") - public void method3097(int var1, int var2, int var3) { + @ObfuscatedName("at") + public void method3100(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) { Tile var7 = this.tiles[var4][var5][var6]; - if (var7 == null) { - continue; - } - BoundaryObject var8 = var7.boundaryObject; - ModelData var10; - if (var8 != null && var8.entity1 instanceof ModelData) { - ModelData var9 = (ModelData)var8.entity1; - this.method3099(var9, var4, var5, var6, 1, 1); - if (var8.entity2 instanceof ModelData) { - var10 = (ModelData)var8.entity2; - this.method3099(var10, var4, var5, var6, 1, 1); - ModelData.method2790(var9, var10, 0, 0, 0, false); - var8.entity2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); + if (var7 != null) { + BoundaryObject var8 = var7.boundaryObject; + ModelData var10; + if (var8 != null && var8.entity1 instanceof ModelData) { + ModelData var9 = (ModelData)var8.entity1; + this.method3043(var9, var4, var5, var6, 1, 1); + if (var8.entity2 instanceof ModelData) { + var10 = (ModelData)var8.entity2; + this.method3043(var10, var4, var5, var6, 1, 1); + ModelData.method2745(var9, var10, 0, 0, 0, false); + var8.entity2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); + } + + var8.entity1 = var9.toModel(var9.ambient, var9.contrast, var1, var2, var3); } - var8.entity1 = var9.toModel(var9.ambient, var9.contrast, var1, var2, var3); - } - - for (int var12 = 0; var12 < var7.gameObjectsCount; ++var12) { - GameObject var14 = var7.gameObjects[var12]; - if (var14 != null && var14.entity instanceof ModelData) { - ModelData var11 = (ModelData)var14.entity; - this.method3099(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); + for (int var12 = 0; var12 < var7.gameObjectsCount; ++var12) { + GameObject var14 = var7.gameObjects[var12]; + if (var14 != null && var14.entity instanceof ModelData) { + ModelData var11 = (ModelData)var14.entity; + this.method3043(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); + } } - } - FloorDecoration var13 = var7.floorDecoration; - if (var13 != null && var13.entity instanceof ModelData) { - var10 = (ModelData)var13.entity; - this.method3120(var10, var4, var5, var6); - var13.entity = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); + FloorDecoration var13 = var7.floorDecoration; + if (var13 != null && var13.entity instanceof ModelData) { + var10 = (ModelData)var13.entity; + this.method3042(var10, var4, var5, var6); + var13.entity = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); + } } } } @@ -886,18 +871,18 @@ public class Scene { } - @ObfuscatedName("aj") + @ObfuscatedName("as") @ObfuscatedSignature( - signature = "(Lds;III)V" + signature = "(Ldq;III)V" ) - void method3120(ModelData var1, int var2, int var3, int var4) { + void method3042(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.method2790(var1, var6, 128, 0, 0, true); + ModelData.method2745(var1, var6, 128, 0, 0, true); } } @@ -905,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.method2790(var1, var6, 0, 0, 128, true); + ModelData.method2745(var1, var6, 0, 0, 128, true); } } @@ -913,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.method2790(var1, var6, 128, 0, 128, true); + ModelData.method2745(var1, var6, 128, 0, 128, true); } } @@ -921,139 +906,137 @@ 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.method2790(var1, var6, 128, 0, -128, true); + ModelData.method2745(var1, var6, 128, 0, -128, true); } } } - @ObfuscatedName("at") + @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "(Lds;IIIII)V" + signature = "(Ldq;IIIII)V" ) - void method3099(ModelData var1, int var2, int var3, int var4, int var5, int var6) { + void method3043(ModelData var1, int var2, int var3, int var4, int var5, int var6) { boolean var7 = true; int var8 = var3; int var9 = var3 + var5; int var10 = var4 - 1; int var11 = var4 + var6; - for (int var12 = var2; var12 <= var2 + 1; ++var12, --var8, var7 = false) { - if (var12 == this.planes) { - continue; - } - for (int var13 = var8; var13 <= var9; ++var13) { - if (var13 < 0 || var13 >= this.xSize) { - continue; - } - for (int var14 = var10; var14 <= var11; ++var14) { - if (var14 < 0 || var14 >= this.ySize || (var7 && var13 < var9 && var14 < var11 && (var14 >= var4 || var3 == var13))) { - continue; - } - Tile var15 = this.tiles[var12][var13][var14]; - if (var15 == null) { - continue; - } - int var16 = (this.tileHeights[var12][var13 + 1][var14] + this.tileHeights[var12][var13 + 1][var14 + 1] + this.tileHeights[var12][var13][var14] + this.tileHeights[var12][var13][var14 + 1]) / 4 - (this.tileHeights[var2][var3 + 1][var4] + this.tileHeights[var2][var3][var4] + this.tileHeights[var2][var3 + 1][var4 + 1] + this.tileHeights[var2][var3][var4 + 1]) / 4; - BoundaryObject var17 = var15.boundaryObject; - if (var17 != null) { - ModelData var18; - if (var17.entity1 instanceof ModelData) { - var18 = (ModelData)var17.entity1; - ModelData.method2790(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); - } + for (int var12 = var2; var12 <= var2 + 1; ++var12) { + if (var12 != this.planes) { + for (int var13 = var8; var13 <= var9; ++var13) { + if (var13 >= 0 && var13 < this.xSize) { + for (int var14 = var10; var14 <= var11; ++var14) { + if (var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) { + Tile var15 = this.tiles[var12][var13][var14]; + if (var15 != null) { + int var16 = (this.tileHeights[var12][var13 + 1][var14] + this.tileHeights[var12][var13 + 1][var14 + 1] + this.tileHeights[var12][var13][var14] + this.tileHeights[var12][var13][var14 + 1]) / 4 - (this.tileHeights[var2][var3 + 1][var4] + this.tileHeights[var2][var3][var4] + this.tileHeights[var2][var3 + 1][var4 + 1] + this.tileHeights[var2][var3][var4 + 1]) / 4; + BoundaryObject var17 = var15.boundaryObject; + if (var17 != null) { + ModelData var18; + if (var17.entity1 instanceof ModelData) { + var18 = (ModelData)var17.entity1; + ModelData.method2745(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.method2790(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.method2745(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); + } + } - for (int var23 = 0; var23 < var15.gameObjectsCount; ++var23) { - GameObject var19 = var15.gameObjects[var23]; - if (var19 != null && var19.entity instanceof ModelData) { - ModelData var20 = (ModelData)var19.entity; - int var21 = var19.endX - var19.startX + 1; - int var22 = var19.endY - var19.startY + 1; - ModelData.method2790(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); + for (int var23 = 0; var23 < var15.gameObjectsCount; ++var23) { + GameObject var19 = var15.gameObjects[var23]; + if (var19 != null && var19.entity instanceof ModelData) { + ModelData var20 = (ModelData)var19.entity; + int var21 = var19.endX - var19.startX + 1; + int var22 = var19.endY - var19.startY + 1; + ModelData.method2745(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); + } + } + } + } } } } + + --var8; + var7 = false; } } + } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @Export("drawTileMinimap") public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, int var6) { Tile var7 = this.tiles[var4][var5][var6]; - if (var7 == null) { - return; - } - TilePaint var8 = var7.paint; - int var10; - if (var8 != null) { - int var9 = var8.rgb; - if (var9 == 0) { - return; - } - for (var10 = 0; var10 < 4; ++var10) { - var1[var2] = var9; - var1[var2 + 1] = var9; - var1[var2 + 2] = var9; - var1[var2 + 3] = var9; - var2 += var3; - } - return; - } - TileModel var18 = var7.model; - if (var18 == null) { - return; - } - var10 = var18.shape; - int var11 = var18.rotation; - int var12 = var18.underlayRgb; - int var13 = var18.overlayRgb; - int[] var14 = this.tileShape2D[var10]; - int[] var15 = this.tileRotation2D[var11]; - int var16 = 0; - int var17; - if (var12 != 0) { - for (var17 = 0; var17 < 4; ++var17) { - var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13; - var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13; - var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13; - var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13; - var2 += var3; - } - return; - } - for (var17 = 0; var17 < 4; ++var17) { - if (var14[var15[var16++]] != 0) { - var1[var2] = var13; - } + if (var7 != null) { + TilePaint var8 = var7.paint; + int var10; + if (var8 != null) { + int var9 = var8.rgb; + if (var9 != 0) { + for (var10 = 0; var10 < 4; ++var10) { + var1[var2] = var9; + var1[var2 + 1] = var9; + var1[var2 + 2] = var9; + var1[var2 + 3] = var9; + var2 += var3; + } - if (var14[var15[var16++]] != 0) { - var1[var2 + 1] = var13; - } + } + } else { + TileModel var18 = var7.model; + if (var18 != null) { + var10 = var18.shape; + int var11 = var18.rotation; + int var12 = var18.underlayRgb; + int var13 = var18.overlayRgb; + int[] var14 = this.tileShape2D[var10]; + int[] var15 = this.tileRotation2D[var11]; + int var16 = 0; + int var17; + if (var12 != 0) { + for (var17 = 0; var17 < 4; ++var17) { + var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13; + var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13; + var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13; + var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13; + var2 += var3; + } + } else { + for (var17 = 0; var17 < 4; ++var17) { + if (var14[var15[var16++]] != 0) { + var1[var2] = var13; + } - if (var14[var15[var16++]] != 0) { - var1[var2 + 2] = var13; - } + if (var14[var15[var16++]] != 0) { + var1[var2 + 1] = var13; + } - if (var14[var15[var16++]] != 0) { - var1[var2 + 3] = var13; - } + if (var14[var15[var16++]] != 0) { + var1[var2 + 2] = var13; + } - var2 += var3; + if (var14[var15[var16++]] != 0) { + var1[var2 + 3] = var13; + } + + var2 += var3; + } + } + + } + } } - } - @ObfuscatedName("aa") + @ObfuscatedName("au") @Export("menuOpen") public void menuOpen(int var1, int var2, int var3, boolean var4) { - if (!method3105() || var4) { + if (!method3049() || var4) { checkClick = true; viewportWalking = var4; Scene_selectedPlane = var1; @@ -1064,45 +1047,45 @@ public class Scene { } } - @ObfuscatedName("an") + @ObfuscatedName("ax") @Export("setViewportWalking") public void setViewportWalking() { viewportWalking = true; } - @ObfuscatedName("ak") + @ObfuscatedName("ap") @Export("draw") - public void draw(int camX, int camY, int camZ, int camPitch, int camYaw, int plane) { - if (camX < 0) { - camX = 0; - } else if (camX >= this.xSize * 128) { - camX = this.xSize * 128 - 1; + public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { + if (var1 < 0) { + var1 = 0; + } else if (var1 >= this.xSize * 128) { + var1 = this.xSize * 128 - 1; } - if (camZ < 0) { - camZ = 0; - } else if (camZ >= this.ySize * 128) { - camZ = this.ySize * 128 - 1; + if (var3 < 0) { + var3 = 0; + } else if (var3 >= this.ySize * 128) { + var3 = this.ySize * 128 - 1; } - if (camPitch < 128) { - camPitch = 128; - } else if (camPitch > 383) { - camPitch = 383; + if (var4 < 128) { + var4 = 128; + } else if (var4 > 383) { + var4 = 383; } ++Scene_drawnCount; - Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[camPitch]; - Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[camPitch]; - Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[camYaw]; - Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[camYaw]; - visibleTiles = visibilityMap[(camPitch - 128) / 32][camYaw / 64]; - Scene_cameraX = camX; - Scene_cameraY = camY; - Scene_cameraZ = camZ; - Scene_cameraXTile = camX / 128; - Scene_cameraYTile = camZ / 128; - Scene_plane = plane; + Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var4]; + Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var4]; + Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var5]; + Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var5]; + visibleTiles = visibilityMap[(var4 - 128) / 32][var5 / 64]; + Scene_cameraX = var1; + Scene_cameraY = var2; + Scene_cameraZ = var3; + Scene_cameraXTile = var1 / 128; + Scene_cameraYTile = var3 / 128; + Scene_plane = var6; Scene_cameraXTileMin = Scene_cameraXTile - 25; if (Scene_cameraXTileMin < 0) { Scene_cameraXTileMin = 0; @@ -1126,132 +1109,140 @@ public class Scene { this.occlude(); tileUpdateCount = 0; - for (int var7 = this.minPlane; var7 < this.planes; ++var7) { - Tile[][] var8 = this.tiles[var7]; - for (int var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) { - for (int var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { + int var7; + Tile[][] var8; + int var9; + int var10; + for (var7 = this.minPlane; var7 < this.planes; ++var7) { + var8 = this.tiles[var7]; + + for (var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) { + for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { Tile var11 = var8[var9][var10]; - if (var11 == null) { - continue; - } - if (var11.minPlane > plane || !visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] && this.tileHeights[var7][var9][var10] - camY < 2000) { - var11.drawPrimary = false; - var11.drawSecondary = false; - var11.drawGameObjectEdges = 0; - } else { - var11.drawPrimary = true; - var11.drawSecondary = true; - if (var11.gameObjectsCount > 0) { - var11.drawGameObjects = true; + if (var11 != null) { + if (var11.minPlane <= var6 && (visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] || this.tileHeights[var7][var9][var10] - var2 >= 2000)) { + var11.drawPrimary = true; + var11.drawSecondary = true; + if (var11.gameObjectsCount > 0) { + var11.drawGameObjects = true; + } else { + var11.drawGameObjects = false; + } + + ++tileUpdateCount; } else { - var11.drawGameObjects = false; + var11.drawPrimary = false; + var11.drawSecondary = false; + var11.drawGameObjectEdges = 0; } - - ++tileUpdateCount; } } } } - for (int var7 = this.minPlane; var7 < this.planes; ++var7) { - Tile[][] var8 = this.tiles[var7]; - for (int var9 = -25; var9 <= 0; ++var9) { - int var10 = var9 + Scene_cameraXTile; - int var16 = Scene_cameraXTile - var9; - if (var10 < Scene_cameraXTileMin && var16 >= Scene_cameraXTileMax) { - continue; - } - for (int var12 = -25; var12 <= 0; ++var12) { - int var13 = var12 + Scene_cameraYTile; - int var14 = Scene_cameraYTile - var12; - if (var10 >= Scene_cameraXTileMin) { - if (var13 >= Scene_cameraYTileMin) { - Tile var15 = var8[var10][var13]; - if (var15 != null && var15.drawPrimary) { - this.drawTile(var15, true); + int var12; + int var13; + int var14; + Tile var15; + int var16; + for (var7 = this.minPlane; var7 < this.planes; ++var7) { + var8 = this.tiles[var7]; + + for (var9 = -25; var9 <= 0; ++var9) { + var10 = var9 + Scene_cameraXTile; + var16 = Scene_cameraXTile - var9; + if (var10 >= Scene_cameraXTileMin || var16 < Scene_cameraXTileMax) { + for (var12 = -25; var12 <= 0; ++var12) { + var13 = var12 + Scene_cameraYTile; + var14 = Scene_cameraYTile - var12; + if (var10 >= Scene_cameraXTileMin) { + if (var13 >= Scene_cameraYTileMin) { + var15 = var8[var10][var13]; + if (var15 != null && var15.drawPrimary) { + this.drawTile(var15, true); + } + } + + if (var14 < Scene_cameraYTileMax) { + var15 = var8[var10][var14]; + if (var15 != null && var15.drawPrimary) { + this.drawTile(var15, true); + } } } - if (var14 < Scene_cameraYTileMax) { - Tile var15 = var8[var10][var14]; - if (var15 != null && var15.drawPrimary) { - this.drawTile(var15, true); + if (var16 < Scene_cameraXTileMax) { + if (var13 >= Scene_cameraYTileMin) { + var15 = var8[var16][var13]; + if (var15 != null && var15.drawPrimary) { + this.drawTile(var15, true); + } } - } - } - if (var16 < Scene_cameraXTileMax) { - if (var13 >= Scene_cameraYTileMin) { - Tile var15 = var8[var16][var13]; - if (var15 != null && var15.drawPrimary) { - this.drawTile(var15, true); + if (var14 < Scene_cameraYTileMax) { + var15 = var8[var16][var14]; + if (var15 != null && var15.drawPrimary) { + this.drawTile(var15, true); + } } } - if (var14 < Scene_cameraYTileMax) { - Tile var15 = var8[var16][var14]; - if (var15 != null && var15.drawPrimary) { - this.drawTile(var15, true); - } + if (tileUpdateCount == 0) { + checkClick = false; + return; } } - - if (tileUpdateCount == 0) { - checkClick = false; - return; - } } } } - for (int var7 = this.minPlane; var7 < this.planes; ++var7) { - Tile[][] var8 = this.tiles[var7]; + for (var7 = this.minPlane; var7 < this.planes; ++var7) { + var8 = this.tiles[var7]; - for (int var9 = -25; var9 <= 0; ++var9) { - int var10 = var9 + Scene_cameraXTile; - int var16 = Scene_cameraXTile - var9; - if (var10 < Scene_cameraXTileMin && var16 >= Scene_cameraXTileMax) { - continue; - } - for (int var12 = -25; var12 <= 0; ++var12) { - int var13 = var12 + Scene_cameraYTile; - int var14 = Scene_cameraYTile - var12; - if (var10 >= Scene_cameraXTileMin) { - if (var13 >= Scene_cameraYTileMin) { - Tile var15 = var8[var10][var13]; - if (var15 != null && var15.drawPrimary) { - this.drawTile(var15, false); + for (var9 = -25; var9 <= 0; ++var9) { + var10 = var9 + Scene_cameraXTile; + var16 = Scene_cameraXTile - var9; + if (var10 >= Scene_cameraXTileMin || var16 < Scene_cameraXTileMax) { + for (var12 = -25; var12 <= 0; ++var12) { + var13 = var12 + Scene_cameraYTile; + var14 = Scene_cameraYTile - var12; + if (var10 >= Scene_cameraXTileMin) { + if (var13 >= Scene_cameraYTileMin) { + var15 = var8[var10][var13]; + if (var15 != null && var15.drawPrimary) { + this.drawTile(var15, false); + } + } + + if (var14 < Scene_cameraYTileMax) { + var15 = var8[var10][var14]; + if (var15 != null && var15.drawPrimary) { + this.drawTile(var15, false); + } } } - if (var14 < Scene_cameraYTileMax) { - Tile var15 = var8[var10][var14]; - if (var15 != null && var15.drawPrimary) { - this.drawTile(var15, false); + if (var16 < Scene_cameraXTileMax) { + if (var13 >= Scene_cameraYTileMin) { + var15 = var8[var16][var13]; + if (var15 != null && var15.drawPrimary) { + this.drawTile(var15, false); + } } - } - } - if (var16 < Scene_cameraXTileMax) { - if (var13 >= Scene_cameraYTileMin) { - Tile var15 = var8[var16][var13]; - if (var15 != null && var15.drawPrimary) { - this.drawTile(var15, false); + if (var14 < Scene_cameraYTileMax) { + var15 = var8[var16][var14]; + if (var15 != null && var15.drawPrimary) { + this.drawTile(var15, false); + } } } - if (var14 < Scene_cameraYTileMax) { - Tile var15 = var8[var16][var14]; - if (var15 != null && var15.drawPrimary) { - this.drawTile(var15, false); - } + if (tileUpdateCount == 0) { + checkClick = false; + return; } } - - if (tileUpdateCount == 0) { - checkClick = false; - return; - } } } } @@ -1259,400 +1250,442 @@ public class Scene { checkClick = false; } - @ObfuscatedName("ah") + @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "(Ldv;Z)V" + signature = "(Lde;Z)V" ) @Export("drawTile") - void drawTile(Tile tile, boolean var2) { - Scene_tilesDeque.addFirst(tile); + void drawTile(Tile var1, boolean var2) { + Scene_tilesDeque.addFirst(var1); - while ((tile = (Tile) Scene_tilesDeque.removeLast()) != null) { - if (!tile.drawSecondary) { - continue; - } - int x = tile.x; - int y = tile.y; - int plane = tile.plane; - int originalPlane = tile.originalPlane; - Tile[][] var8 = this.tiles[plane]; - if (tile.drawPrimary) { - if (!var2) { - var2 = true; - } else { - if (plane > 0) { - Tile var9 = this.tiles[plane - 1][x][y]; - if (var9 != null && var9.drawSecondary) { - continue; - } - } - if (x <= Scene_cameraXTile && x > Scene_cameraXTileMin) { - Tile var9 = var8[x - 1][y]; - if (var9 != null && var9.drawSecondary) { - if (var9.drawPrimary || (tile.gameObjectsEdgeMask & 1) == 0) { - continue; - } - } - } - if (x >= Scene_cameraXTile && x < Scene_cameraXTileMax - 1) { - Tile var9 = var8[x + 1][y]; - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (tile.gameObjectsEdgeMask & 4) == 0)) { - continue; - } - } - if (y <= Scene_cameraYTile && y > Scene_cameraYTileMin) { - Tile var9 = var8[x][y - 1]; - if (var9 != null && var9.drawSecondary) { - if (var9.drawPrimary || (tile.gameObjectsEdgeMask & 8) == 0) { - continue; - } - } - } - if (y >= Scene_cameraYTile && y < Scene_cameraYTileMax - 1) { - Tile var9 = var8[x][y + 1]; - if (var9 != null && var9.drawSecondary) { - if (var9.drawPrimary || (tile.gameObjectsEdgeMask & 2) == 0) { - continue; - } - } - } - } + while (true) { + Tile var3; + int var4; + int var5; + int var6; + int var7; + Tile[][] var8; + Tile var9; + int var11; + int var14; + int var15; + int var16; + int var24; + int var25; + do { + do { + do { + do { + do { + do { + while (true) { + BoundaryObject var10; + GameObject var12; + int var17; + int var18; + boolean var20; + int var21; + Tile var36; + while (true) { + do { + var3 = (Tile)Scene_tilesDeque.removeLast(); + if (var3 == null) { + return; + } + } while(!var3.drawSecondary); - tile.drawPrimary = false; - if (tile.linkedBelowTile != null) { - Tile var9 = tile.linkedBelowTile; - if (var9.paint != null) { - if (!this.method3181(0, x, y)) { - this.drawTileUnderlay(var9.paint, 0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, x, y); - } - } else if (var9.model != null) { - if (!this.method3181(0, x, y)) { - this.drawTileOverlay(var9.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, x, y); - } - } - BoundaryObject 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); - } - for (int var11 = 0; var11 < var9.gameObjectsCount; ++var11) { - GameObject var12 = var9.gameObjects[var11]; - if (var12 != null) { - var12.entity.draw(var12.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var12.centerX - Scene_cameraX, var12.height - Scene_cameraY, var12.centerY - Scene_cameraZ, var12.tag); - } - } - } - boolean var20 = false; - if (tile.paint != null) { - if (!this.method3181(originalPlane, x, y)) { - var20 = true; - if (tile.paint.neColor != 12345678 || checkClick && plane <= Scene_selectedPlane) { - this.drawTileUnderlay(tile.paint, originalPlane, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, x, y); - } - } - } else if (tile.model != null) { - if (!this.method3181(originalPlane, x, y)) { - var20 = true; - this.drawTileOverlay(tile.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, x, y); - } - } - int var21 = 0; - int var11 = 0; - BoundaryObject wall = tile.boundaryObject; - WallDecoration wallDecoration = tile.wallDecoration; - if (wall != null || wallDecoration != null) { - if (x == Scene_cameraXTile) { - ++var21; - } else if (Scene_cameraXTile < x) { - var21 += 2; - } - if (y == Scene_cameraYTile) { - var21 += 3; - } else if (Scene_cameraYTile > y) { - var21 += 6; - } - var11 = field1847[var21]; - tile.field1666 = field1809[var21]; - } - if (wall != null) { - if ((wall.orientationA & field1815[var21]) != 0) { - if (wall.orientationA == 16) { - tile.drawGameObjectEdges = 3; - tile.field1651 = field1844[var21]; - tile.field1665 = 3 - tile.field1651; - } else if (wall.orientationA == 32) { - tile.drawGameObjectEdges = 6; - tile.field1651 = field1828[var21]; - tile.field1665 = 6 - tile.field1651; - } else if (wall.orientationA == 64) { - tile.drawGameObjectEdges = 12; - tile.field1651 = field1852[var21]; - tile.field1665 = 12 - tile.field1651; - } else { - tile.drawGameObjectEdges = 9; - tile.field1651 = field1842[var21]; - tile.field1665 = 9 - tile.field1651; - } - } else { - tile.drawGameObjectEdges = 0; - } - if ((wall.orientationA & var11) != 0) { - if (!this.method3194(originalPlane, x, y, wall.orientationA)) { - wall.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, wall.x * 4096 - Scene_cameraX, wall.tileHeight - Scene_cameraY, wall.y * 4096 - Scene_cameraZ, wall.tag); - } - } - if ((wall.orientationB & var11) != 0) { - if (!this.method3194(originalPlane, x, y, wall.orientationB)) { - wall.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, wall.x * 4096 - Scene_cameraX, wall.tileHeight - Scene_cameraY, wall.y * 4096 - Scene_cameraZ, wall.tag); - } - } - } - if (wallDecoration != null) { - if (!this.method3116(originalPlane, x, y, wallDecoration.entity1.height)) { - if ((wallDecoration.orientation & var11) != 0) { - wallDecoration.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, wallDecoration.xOffset + (wallDecoration.x * 4096 - Scene_cameraX), wallDecoration.tileHeight - Scene_cameraY, wallDecoration.yOffset + (wallDecoration.y * 4096 - Scene_cameraZ), wallDecoration.tag); - } else if (wallDecoration.orientation == 256) { - int var14 = wallDecoration.x * 4096 - Scene_cameraX; - int var15 = wallDecoration.tileHeight - Scene_cameraY; - int var16 = wallDecoration.y * 4096 - Scene_cameraZ; - int var17 = wallDecoration.orientation2; - int var18; - if (var17 != 1 && var17 != 2) { - var18 = var14; - } else { - var18 = -var14; - } - int var19; - if (var17 != 2 && var17 != 3) { - var19 = var16; - } else { - var19 = -var16; - } - if (var19 < var18) { - wallDecoration.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14 + wallDecoration.xOffset, var15, var16 + wallDecoration.yOffset, wallDecoration.tag); - } else if (wallDecoration.entity2 != null) { - wallDecoration.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14, var15, var16, wallDecoration.tag); - } - } - } - } - if (var20) { - FloorDecoration floorDecoration = tile.floorDecoration; - if (floorDecoration != null) { - floorDecoration.entity.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, floorDecoration.x * 4096 - Scene_cameraX, floorDecoration.tileHeight - Scene_cameraY, floorDecoration.y * 4096 - Scene_cameraZ, floorDecoration.tag); - } - TileItemPile lootPile = tile.tileItemPile; - if (lootPile != null && lootPile.height == 0) { - if (lootPile.second != null) { - lootPile.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, lootPile.x * 4096 - Scene_cameraX, lootPile.tileHeight - Scene_cameraY, lootPile.y * 4096 - Scene_cameraZ, lootPile.tag); - } - if (lootPile.third != null) { - lootPile.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, lootPile.x * 4096 - Scene_cameraX, lootPile.tileHeight - Scene_cameraY, lootPile.y * 4096 - Scene_cameraZ, lootPile.tag); - } - if (lootPile.first != null) { - lootPile.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, lootPile.x * 4096 - Scene_cameraX, lootPile.tileHeight - Scene_cameraY, lootPile.y * 4096 - Scene_cameraZ, lootPile.tag); - } - } - } - int objectsEdgeMask = tile.gameObjectsEdgeMask; - if (objectsEdgeMask != 0) { - if (x < Scene_cameraXTile && (objectsEdgeMask & 4) != 0) { - Tile var36 = var8[x + 1][y]; - if (var36 != null && var36.drawSecondary) { - Scene_tilesDeque.addFirst(var36); - } - } + var4 = var3.x; + var5 = var3.y; + var6 = var3.plane; + var7 = var3.originalPlane; + var8 = this.tiles[var6]; + if (!var3.drawPrimary) { + break; + } - if (y < Scene_cameraYTile && (objectsEdgeMask & 2) != 0) { - Tile var36 = var8[x][y + 1]; - if (var36 != null && var36.drawSecondary) { - Scene_tilesDeque.addFirst(var36); - } - } + if (var2) { + if (var6 > 0) { + var9 = this.tiles[var6 - 1][var4][var5]; + if (var9 != null && var9.drawSecondary) { + continue; + } + } - if (x > Scene_cameraXTile && (objectsEdgeMask & 1) != 0) { - Tile var36 = var8[x - 1][y]; - if (var36 != null && var36.drawSecondary) { - Scene_tilesDeque.addFirst(var36); - } - } + if (var4 <= Scene_cameraXTile && var4 > Scene_cameraXTileMin) { + var9 = var8[var4 - 1][var5]; + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 1) == 0)) { + continue; + } + } - if (y > Scene_cameraYTile && (objectsEdgeMask & 8) != 0) { - Tile var36 = var8[x][y - 1]; - if (var36 != null && var36.drawSecondary) { - Scene_tilesDeque.addFirst(var36); - } - } - } - } + if (var4 >= Scene_cameraXTile && var4 < Scene_cameraXTileMax - 1) { + var9 = var8[var4 + 1][var5]; + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 4) == 0)) { + continue; + } + } - if (tile.drawGameObjectEdges != 0) { - boolean var20 = true; + if (var5 <= Scene_cameraYTile && var5 > Scene_cameraYTileMin) { + var9 = var8[var4][var5 - 1]; + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 8) == 0)) { + continue; + } + } - for (int var21 = 0; var21 < tile.gameObjectsCount; ++var21) { - if (tile.gameObjects[var21].lastDrawn != Scene_drawnCount && (tile.gameObjectEdgeMasks[var21] & tile.drawGameObjectEdges) == tile.field1651) { - var20 = false; - break; - } - } + if (var5 >= Scene_cameraYTile && var5 < Scene_cameraYTileMax - 1) { + var9 = var8[var4][var5 + 1]; + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 2) == 0)) { + continue; + } + } + } else { + var2 = true; + } - if (var20) { - BoundaryObject var10 = tile.boundaryObject; - if (!this.method3194(originalPlane, x, y, 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); - } + var3.drawPrimary = false; + if (var3.linkedBelowTile != null) { + var9 = var3.linkedBelowTile; + if (var9.paint != null) { + if (!this.method3089(0, var4, var5)) { + this.drawTileUnderlay(var9.paint, 0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); + } + } else if (var9.model != null && !this.method3089(0, var4, var5)) { + this.drawTileOverlay(var9.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); + } - tile.drawGameObjectEdges = 0; - } - } - if (tile.drawGameObjects) { - try { - int var34 = tile.gameObjectsCount; - tile.drawGameObjects = false; - int var21 = 0; + 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); + } - label563: - for (int var11 = 0; var11 < var34; ++var11) { - GameObject var12 = tile.gameObjects[var11]; - if (var12.lastDrawn == Scene_drawnCount) { - continue; - } + for (var11 = 0; var11 < var9.gameObjectsCount; ++var11) { + var12 = var9.gameObjects[var11]; + if (var12 != null) { + var12.entity.draw(var12.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var12.centerX - Scene_cameraX, var12.height - Scene_cameraY, var12.centerY - Scene_cameraZ, var12.tag); + } + } + } - for (int var24 = var12.startX; var24 <= var12.endX; ++var24) { - for (int var14 = var12.startY; var14 <= var12.endY; ++var14) { - Tile var36 = var8[var24][var14]; - if (var36.drawPrimary) { - tile.drawGameObjects = true; - continue label563; - } + var20 = false; + if (var3.paint != null) { + if (!this.method3089(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.method3089(var7, var4, var5)) { + var20 = true; + this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); + } - if (var36.drawGameObjectEdges != 0) { - int var16 = 0; - if (var24 > var12.startX) { - ++var16; + var21 = 0; + var11 = 0; + BoundaryObject var31 = var3.boundaryObject; + WallDecoration var13 = var3.wallDecoration; + if (var31 != null || var13 != null) { + if (var4 == Scene_cameraXTile) { + ++var21; + } else if (Scene_cameraXTile < var4) { + var21 += 2; + } + + if (var5 == Scene_cameraYTile) { + var21 += 3; + } else if (Scene_cameraYTile > var5) { + var21 += 6; + } + + var11 = field1826[var21]; + var3.field1636 = field1799[var21]; + } + + if (var31 != null) { + if ((var31.orientationA & field1796[var21]) != 0) { + if (var31.orientationA == 16) { + var3.drawGameObjectEdges = 3; + var3.field1637 = field1844[var21]; + var3.field1645 = 3 - var3.field1637; + } else if (var31.orientationA == 32) { + var3.drawGameObjectEdges = 6; + var3.field1637 = field1830[var21]; + var3.field1645 = 6 - var3.field1637; + } else if (var31.orientationA == 64) { + var3.drawGameObjectEdges = 12; + var3.field1637 = field1831[var21]; + var3.field1645 = 12 - var3.field1637; + } else { + var3.drawGameObjectEdges = 9; + var3.field1637 = field1832[var21]; + var3.field1645 = 9 - var3.field1637; + } + } else { + var3.drawGameObjectEdges = 0; + } + + if ((var31.orientationA & var11) != 0 && !this.method3070(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.orientationB & var11) != 0 && !this.method3070(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 (var13 != null && !this.method3185(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); + } else if (var13.orientation == 256) { + var14 = var13.x * 4096 - Scene_cameraX; + var15 = var13.tileHeight - Scene_cameraY; + var16 = var13.y * 4096 - Scene_cameraZ; + var17 = var13.orientation2; + if (var17 != 1 && var17 != 2) { + var18 = var14; + } else { + var18 = -var14; + } + + int var19; + if (var17 != 2 && var17 != 3) { + var19 = var16; + } else { + var19 = -var16; + } + + if (var19 < var18) { + var13.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14 + var13.xOffset, var15, var16 + var13.yOffset, var13.tag); + } else if (var13.entity2 != null) { + var13.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14, var15, var16, var13.tag); + } + } + } + + if (var20) { + FloorDecoration var22 = var3.floorDecoration; + if (var22 != null) { + var22.entity.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var22.x * 4096 - Scene_cameraX, var22.tileHeight - Scene_cameraY, var22.y * 4096 - Scene_cameraZ, var22.tag); + } + + 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 * 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 * 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 * 4096 - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y * 4096 - Scene_cameraZ, var23.tag); + } + } + } + + var14 = var3.gameObjectsEdgeMask; + if (var14 != 0) { + if (var4 < Scene_cameraXTile && (var14 & 4) != 0) { + var36 = var8[var4 + 1][var5]; + if (var36 != null && var36.drawSecondary) { + Scene_tilesDeque.addFirst(var36); + } + } + + if (var5 < Scene_cameraYTile && (var14 & 2) != 0) { + var36 = var8[var4][var5 + 1]; + if (var36 != null && var36.drawSecondary) { + Scene_tilesDeque.addFirst(var36); + } + } + + if (var4 > Scene_cameraXTile && (var14 & 1) != 0) { + var36 = var8[var4 - 1][var5]; + if (var36 != null && var36.drawSecondary) { + Scene_tilesDeque.addFirst(var36); + } + } + + if (var5 > Scene_cameraYTile && (var14 & 8) != 0) { + var36 = var8[var4][var5 - 1]; + if (var36 != null && var36.drawSecondary) { + Scene_tilesDeque.addFirst(var36); + } + } + } + break; + } + + if (var3.drawGameObjectEdges != 0) { + var20 = true; + + for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { + if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field1637) { + var20 = false; + break; + } + } + + if (var20) { + var10 = var3.boundaryObject; + if (!this.method3070(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); + } + + var3.drawGameObjectEdges = 0; + } + } + + if (!var3.drawGameObjects) { + break; + } + + try { + int var34 = var3.gameObjectsCount; + var3.drawGameObjects = false; + var21 = 0; + + label563: + for (var11 = 0; var11 < var34; ++var11) { + var12 = var3.gameObjects[var11]; + if (var12.lastDrawn != Scene_drawnCount) { + for (var24 = var12.startX; var24 <= var12.endX; ++var24) { + for (var14 = var12.startY; var14 <= var12.endY; ++var14) { + var36 = var8[var24][var14]; + if (var36.drawPrimary) { + var3.drawGameObjects = true; + continue label563; + } + + if (var36.drawGameObjectEdges != 0) { + var16 = 0; + if (var24 > var12.startX) { + ++var16; + } + + if (var24 < var12.endX) { + var16 += 4; + } + + if (var14 > var12.startY) { + var16 += 8; + } + + if (var14 < var12.endY) { + var16 += 2; + } + + if ((var16 & var36.drawGameObjectEdges) == var3.field1645) { + var3.drawGameObjects = true; + continue label563; + } + } + } + } + + gameObjects[var21++] = var12; + var24 = Scene_cameraXTile - var12.startX; + var14 = var12.endX - Scene_cameraXTile; + if (var14 > var24) { + var24 = var14; + } + + var15 = Scene_cameraYTile - var12.startY; + var16 = var12.endY - Scene_cameraYTile; + if (var16 > var15) { + var12.field1916 = var24 + var16; + } else { + var12.field1916 = var24 + var15; + } + } + } + + while (var21 > 0) { + var11 = -50; + var25 = -1; + + for (var24 = 0; var24 < var21; ++var24) { + GameObject var35 = gameObjects[var24]; + if (var35.lastDrawn != Scene_drawnCount) { + if (var35.field1916 > var11) { + var11 = var35.field1916; + var25 = var24; + } else if (var11 == var35.field1916) { + var15 = var35.centerX - Scene_cameraX; + var16 = var35.centerY - Scene_cameraZ; + var17 = gameObjects[var25].centerX - Scene_cameraX; + var18 = gameObjects[var25].centerY - Scene_cameraZ; + if (var15 * var15 + var16 * var16 > var17 * var17 + var18 * var18) { + var25 = var24; + } + } + } + } + + if (var25 == -1) { + break; + } + + GameObject var33 = gameObjects[var25]; + var33.lastDrawn = Scene_drawnCount; + if (!this.method3061(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); + } + + for (var14 = var33.startX; var14 <= var33.endX; ++var14) { + for (var15 = var33.startY; var15 <= var33.endY; ++var15) { + Tile var26 = var8[var14][var15]; + if (var26.drawGameObjectEdges != 0) { + Scene_tilesDeque.addFirst(var26); + } else if ((var14 != var4 || var15 != var5) && var26.drawSecondary) { + Scene_tilesDeque.addFirst(var26); + } + } + } + } + + if (!var3.drawGameObjects) { + break; + } + } catch (Exception var28) { + var3.drawGameObjects = false; + break; + } } + } while(!var3.drawSecondary); + } while(var3.drawGameObjectEdges != 0); - if (var24 < var12.endX) { - var16 += 4; - } - - if (var14 > var12.startY) { - var16 += 8; - } - - if (var14 < var12.endY) { - var16 += 2; - } - - if ((var16 & var36.drawGameObjectEdges) == tile.field1665) { - tile.drawGameObjects = true; - continue label563; - } - } + if (var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) { + break; } - } - gameObjects[var21++] = var12; - int var24 = Scene_cameraXTile - var12.startX; - int var14 = var12.endX - Scene_cameraXTile; - if (var14 > var24) { - var24 = var14; - } + var9 = var8[var4 - 1][var5]; + } while(var9 != null && var9.drawSecondary); - int var15 = Scene_cameraYTile - var12.startY; - int var16 = var12.endY - Scene_cameraYTile; - if (var16 > var15) { - var12.field1939 = var24 + var16; - } else { - var12.field1939 = var24 + var15; - } - } - - while (var21 > 0) { - int var11 = -50; - int var25 = -1; - - for (int var24 = 0; var24 < var21; ++var24) { - GameObject var35 = gameObjects[var24]; - if (var35.lastDrawn == Scene_drawnCount) { - continue; - } - if (var35.field1939 > var11) { - var11 = var35.field1939; - var25 = var24; - } else if (var11 == var35.field1939) { - int var15 = var35.centerX - Scene_cameraX; - int var16 = var35.centerY - Scene_cameraZ; - int var17 = gameObjects[var25].centerX - Scene_cameraX; - int var18 = gameObjects[var25].centerY - Scene_cameraZ; - if (var15 * var15 + var16 * var16 > var17 * var17 + var18 * var18) { - var25 = var24; - } - } - } - - if (var25 == -1) { + if (var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) { break; } - GameObject var33 = gameObjects[var25]; - var33.lastDrawn = Scene_drawnCount; - if (!this.method3117(originalPlane, 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); - } + var9 = var8[var4 + 1][var5]; + } while(var9 != null && var9.drawSecondary); - for (int var14 = var33.startX; var14 <= var33.endX; ++var14) { - for (int var15 = var33.startY; var15 <= var33.endY; ++var15) { - Tile var26 = var8[var14][var15]; - if (var26.drawGameObjectEdges != 0) { - Scene_tilesDeque.addFirst(var26); - } else if ((var14 != x || var15 != y) && var26.drawSecondary) { - Scene_tilesDeque.addFirst(var26); - } - } - } + if (var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) { + break; } - if (tile.drawGameObjects) { - continue; - } - } catch (Exception var28) { - tile.drawGameObjects = false; - } - } - if (!tile.drawSecondary) { - continue; - } - if (tile.drawGameObjectEdges != 0) { - continue; - } - if (x <= Scene_cameraXTile && x > Scene_cameraXTileMin) { - Tile var9 = var8[x - 1][y]; - if (var9 != null && var9.drawSecondary) { - continue; - } - } - if (x >= Scene_cameraXTile && x < Scene_cameraXTileMax - 1) { - Tile var9 = var8[x + 1][y]; - if (var9 != null && var9.drawSecondary) { - continue; - } - } - if (y <= Scene_cameraYTile && y > Scene_cameraYTileMin) { - Tile var9 = var8[x][y - 1]; - if (var9 != null && var9.drawSecondary) { - continue; - } - } - if (y >= Scene_cameraYTile && y < Scene_cameraYTileMax - 1) { - Tile var9 = var8[x][y + 1]; - if (var9 != null && var9.drawSecondary) { - continue; - } - } + var9 = var8[var4][var5 - 1]; + } while(var9 != null && var9.drawSecondary); - tile.drawSecondary = false; + if (var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) { + break; + } + + var9 = var8[var4][var5 + 1]; + } while(var9 != null && var9.drawSecondary); + + var3.drawSecondary = false; --tileUpdateCount; - TileItemPile var32 = tile.tileItemPile; + 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 * 4096 - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y * 4096 - Scene_cameraZ, var32.tag); @@ -1667,24 +1700,22 @@ public class Scene { } } - if (tile.field1666 != 0) { - WallDecoration var29 = tile.wallDecoration; - if (var29 != null && !this.method3116(originalPlane, x, y, var29.entity1.height)) { - if ((var29.orientation & tile.field1666) != 0) { + if (var3.field1636 != 0) { + WallDecoration var29 = var3.wallDecoration; + if (var29 != null && !this.method3185(var7, var4, var5, var29.entity1.height)) { + if ((var29.orientation & var3.field1636) != 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); } else if (var29.orientation == 256) { - int var11 = var29.x * 4096 - Scene_cameraX; - int var25 = var29.tileHeight - Scene_cameraY; - int var24 = var29.y * 4096 - Scene_cameraZ; - int var14 = var29.orientation2; - int var15; + var11 = var29.x * 4096 - Scene_cameraX; + var25 = var29.tileHeight - Scene_cameraY; + var24 = var29.y * 4096 - Scene_cameraZ; + var14 = var29.orientation2; if (var14 != 1 && var14 != 2) { var15 = var11; } else { var15 = -var11; } - int var16; if (var14 != 2 && var14 != 3) { var16 = var24; } else { @@ -1699,48 +1730,49 @@ public class Scene { } } - BoundaryObject wall = tile.boundaryObject; - if (wall != null) { - if ((wall.orientationB & tile.field1666) != 0 && !this.method3194(originalPlane, x, y, wall.orientationB)) { - wall.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, wall.x * 4096 - Scene_cameraX, wall.tileHeight - Scene_cameraY, wall.y * 4096 - Scene_cameraZ, wall.tag); + BoundaryObject var27 = var3.boundaryObject; + if (var27 != null) { + if ((var27.orientationB & var3.field1636) != 0 && !this.method3070(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 ((wall.orientationA & tile.field1666) != 0 && !this.method3194(originalPlane, x, y, wall.orientationA)) { - wall.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, wall.x * 4096 - Scene_cameraX, wall.tileHeight - Scene_cameraY, wall.y * 4096 - Scene_cameraZ, wall.tag); + if ((var27.orientationA & var3.field1636) != 0 && !this.method3070(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 (plane < this.planes - 1) { - Tile var30 = this.tiles[plane + 1][x][y]; + Tile var30; + if (var6 < this.planes - 1) { + var30 = this.tiles[var6 + 1][var4][var5]; if (var30 != null && var30.drawSecondary) { Scene_tilesDeque.addFirst(var30); } } - if (x < Scene_cameraXTile) { - Tile var30 = var8[x + 1][y]; + if (var4 < Scene_cameraXTile) { + var30 = var8[var4 + 1][var5]; if (var30 != null && var30.drawSecondary) { Scene_tilesDeque.addFirst(var30); } } - if (y < Scene_cameraYTile) { - Tile var30 = var8[x][y + 1]; + if (var5 < Scene_cameraYTile) { + var30 = var8[var4][var5 + 1]; if (var30 != null && var30.drawSecondary) { Scene_tilesDeque.addFirst(var30); } } - if (x > Scene_cameraXTile) { - Tile var30 = var8[x - 1][y]; + if (var4 > Scene_cameraXTile) { + var30 = var8[var4 - 1][var5]; if (var30 != null && var30.drawSecondary) { Scene_tilesDeque.addFirst(var30); } } - if (y > Scene_cameraYTile) { - Tile var30 = var8[x][y - 1]; + if (var5 > Scene_cameraYTile) { + var30 = var8[var4][var5 - 1]; if (var30 != null && var30.drawSecondary) { Scene_tilesDeque.addFirst(var30); } @@ -1748,16 +1780,20 @@ public class Scene { } } - @ObfuscatedName("am") + @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "(Let;IIIIIII)V" + signature = "(Lef;IIIIIII)V" ) @Export("drawTileUnderlay") void drawTileUnderlay(TilePaint var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - int var9, var10 = var9 = (var7 << 7) - Scene_cameraX; - int var11, var12 = var11 = (var8 << 7) - Scene_cameraZ; - int var13, var14 = var13 = var10 + 128; - int var15, var16 = var15 = var12 + 128; + int var9; + int var10 = var9 = (var7 << 7) - Scene_cameraX; + int var11; + int var12 = var11 = (var8 << 7) - Scene_cameraZ; + int var13; + int var14 = var13 = var10 + 128; + int var15; + int var16 = var15 = var12 + 128; int var17 = this.tileHeights[var2][var7][var8] - Scene_cameraY; int var18 = this.tileHeights[var2][var7 + 1][var8] - Scene_cameraY; int var19 = this.tileHeights[var2][var7 + 1][var8 + 1] - Scene_cameraY; @@ -1768,97 +1804,96 @@ public class Scene { var21 = var17 * var4 - var3 * var12 >> 16; var12 = var3 * var17 + var12 * var4 >> 16; var17 = var21; - if (var12 < 50) { - return; - } - var21 = var14 * var6 + var5 * var11 >> 16; - var11 = var11 * var6 - var5 * var14 >> 16; - var14 = var21; - var21 = var18 * var4 - var3 * var11 >> 16; - var11 = var3 * var18 + var11 * var4 >> 16; - var18 = var21; - if (var11 < 50) { - return; - } - var21 = var13 * var6 + var5 * var16 >> 16; - var16 = var16 * var6 - var5 * var13 >> 16; - var13 = var21; - var21 = var19 * var4 - var3 * var16 >> 16; - var16 = var3 * var19 + var16 * var4 >> 16; - var19 = var21; - if (var16 < 50) { - return; - } - var21 = var9 * var6 + var5 * var15 >> 16; - var15 = var15 * var6 - var5 * var9 >> 16; - var9 = var21; - var21 = var20 * var4 - var3 * var15 >> 16; - var15 = var3 * var20 + var15 * var4 >> 16; - if (var15 < 50) { - return; - } - int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; - int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; - int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX; - int var25 = var18 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidY; - int var26 = var13 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidX; - int var27 = var19 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidY; - int var28 = var9 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidX; - int var29 = var21 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidY; - Rasterizer3D.Rasterizer3D_alpha = 0; - int var30; - if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { - Rasterizer3D.field1763 = false; - if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field1763 = true; - } + if (var12 >= 50) { + var21 = var14 * var6 + var5 * var11 >> 16; + var11 = var11 * var6 - var5 * var14 >> 16; + var14 = var21; + var21 = var18 * var4 - var3 * var11 >> 16; + var11 = var3 * var18 + var11 * var4 >> 16; + var18 = var21; + if (var11 >= 50) { + var21 = var13 * var6 + var5 * var16 >> 16; + var16 = var16 * var6 - var5 * var13 >> 16; + var13 = var21; + var21 = var19 * var4 - var3 * var16 >> 16; + var16 = var3 * var19 + var16 * var4 >> 16; + var19 = var21; + if (var16 >= 50) { + var21 = var9 * var6 + var5 * var15 >> 16; + var15 = var15 * var6 - var5 * var9 >> 16; + var9 = var21; + var21 = var20 * var4 - var3 * var15 >> 16; + var15 = var3 * var20 + var15 * var4 >> 16; + if (var15 >= 50) { + int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; + int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; + int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX; + int var25 = var18 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidY; + int var26 = var13 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidX; + int var27 = var19 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidY; + int var28 = var9 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidX; + int var29 = var21 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidY; + Rasterizer3D.Rasterizer3D_alpha = 0; + int var30; + if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { + Rasterizer3D.field1760 = false; + if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { + Rasterizer3D.field1760 = true; + } - if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { - Scene_selectedX = var7; - Scene_selectedY = var8; - } + if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { + Scene_selectedX = var7; + Scene_selectedY = var8; + } - if (var1.texture == -1) { - if (var1.neColor != 12345678) { - Rasterizer3D.method3020(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); + if (var1.texture == -1) { + if (var1.neColor != 12345678) { + Rasterizer3D.method2934(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); + } + } else if (!Scene_isLowDetail) { + if (var1.isFlat) { + Rasterizer3D.drawTexturedTile(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); + } else { + Rasterizer3D.drawTexturedTile(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture); + } + } else { + var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); + Rasterizer3D.method2934(var27, var29, var25, var26, var28, var24, method3055(var30, var1.neColor), method3055(var30, var1.nwColor), method3055(var30, var1.seColor)); + } + } + + if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { + Rasterizer3D.field1760 = false; + if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { + Rasterizer3D.field1760 = true; + } + + if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { + Scene_selectedX = var7; + Scene_selectedY = var8; + } + + if (var1.texture == -1) { + if (var1.swColor != 12345678) { + Rasterizer3D.method2934(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.method2934(var23, var25, var29, var22, var24, var28, method3055(var30, var1.swColor), method3055(var30, var1.seColor), method3055(var30, var1.nwColor)); + } + } + + } } - } else if (Scene_isLowDetail) { - var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); - Rasterizer3D.method3020(var27, var29, var25, var26, var28, var24, method3111(var30, var1.neColor), method3111(var30, var1.nwColor), method3111(var30, var1.seColor)); - } else if (var1.isFlat) { - Rasterizer3D.drawTexturedTile(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); - } else { - Rasterizer3D.drawTexturedTile(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture); - } - } - - if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { - Rasterizer3D.field1763 = false; - if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field1763 = true; - } - - if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { - Scene_selectedX = var7; - Scene_selectedY = var8; - } - - if (var1.texture == -1) { - if (var1.swColor != 12345678) { - Rasterizer3D.method3020(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.method3020(var23, var25, var29, var22, var24, var28, method3111(var30, var1.swColor), method3111(var30, var1.seColor), method3111(var30, var1.nwColor)); } } } - @ObfuscatedName("ay") + @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "(Ldk;IIIIII)V" + signature = "(Ldg;IIIIII)V" ) @Export("drawTileOverlay") void drawTileOverlay(TileModel var1, int var2, int var3, int var4, int var5, int var6, int var7) { @@ -1883,13 +1918,13 @@ public class Scene { } if (var1.triangleTextureId != null) { - TileModel.field1594[var9] = var10; - TileModel.field1607[var9] = var13; - TileModel.field1608[var9] = var12; + TileModel.field1585[var9] = var10; + TileModel.field1583[var9] = var13; + TileModel.field1587[var9] = var12; } - TileModel.field1606[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; - TileModel.field1605[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; + TileModel.field1569[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; + TileModel.field1584[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; } Rasterizer3D.Rasterizer3D_alpha = 0; @@ -1899,42 +1934,43 @@ public class Scene { var10 = var1.faceX[var9]; var11 = var1.faceY[var9]; var12 = var1.faceZ[var9]; - var13 = TileModel.field1606[var10]; - int var14 = TileModel.field1606[var11]; - int var15 = TileModel.field1606[var12]; - int var16 = TileModel.field1605[var10]; - int var17 = TileModel.field1605[var11]; - int var18 = TileModel.field1605[var12]; - if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) <= 0) { - continue; - } - Rasterizer3D.field1763 = false; - if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field1763 = true; - } - - if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { - Scene_selectedX = var6; - Scene_selectedY = var7; - } - - if (var1.triangleTextureId == null || var1.triangleTextureId[var9] == -1) { - if (var1.triangleColorA[var9] != 12345678) { - Rasterizer3D.method3020(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); + var13 = TileModel.field1569[var10]; + int var14 = TileModel.field1569[var11]; + int var15 = TileModel.field1569[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.field1760 = false; + if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { + Rasterizer3D.field1760 = true; + } + + if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { + Scene_selectedX = var6; + Scene_selectedY = var7; + } + + 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.field1585[0], TileModel.field1585[1], TileModel.field1585[3], TileModel.field1583[0], TileModel.field1583[1], TileModel.field1583[3], TileModel.field1587[0], TileModel.field1587[1], TileModel.field1587[3], var1.triangleTextureId[var9]); + } else { + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1585[var10], TileModel.field1585[var11], TileModel.field1585[var12], TileModel.field1583[var10], TileModel.field1583[var11], TileModel.field1583[var12], TileModel.field1587[var10], TileModel.field1587[var11], TileModel.field1587[var12], var1.triangleTextureId[var9]); + } + } else { + int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); + Rasterizer3D.method2934(var16, var17, var18, var13, var14, var15, method3055(var19, var1.triangleColorA[var9]), method3055(var19, var1.triangleColorB[var9]), method3055(var19, var1.triangleColorC[var9])); + } + } else if (var1.triangleColorA[var9] != 12345678) { + Rasterizer3D.method2934(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); } - } else if (Scene_isLowDetail) { - int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); - Rasterizer3D.method3020(var16, var17, var18, var13, var14, var15, method3111(var19, var1.triangleColorA[var9]), method3111(var19, var1.triangleColorB[var9]), method3111(var19, var1.triangleColorC[var9])); - } else if (var1.isFlat) { - Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1594[0], TileModel.field1594[1], TileModel.field1594[3], TileModel.field1607[0], TileModel.field1607[1], TileModel.field1607[3], TileModel.field1608[0], TileModel.field1608[1], TileModel.field1608[3], var1.triangleTextureId[var9]); - } else { - Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1594[var10], TileModel.field1594[var11], TileModel.field1594[var12], TileModel.field1607[var10], TileModel.field1607[var11], TileModel.field1607[var12], TileModel.field1608[var10], TileModel.field1608[var11], TileModel.field1608[var12], var1.triangleTextureId[var9]); } } } - @ObfuscatedName("bp") + @ObfuscatedName("ab") @Export("occlude") void occlude() { int var1 = Scene_planeOccluderCounts[Scene_plane]; @@ -1943,396 +1979,438 @@ public class Scene { for (int var3 = 0; var3 < var1; ++var3) { Occluder var4 = var2[var3]; + int var5; + int var6; + int var7; + int var9; boolean var13; if (var4.type == 1) { - int var5 = var4.minTileX - Scene_cameraXTile + 25; - if (var5 < 0 || var5 > 50) { - continue; - } - int var6 = var4.minTileY - Scene_cameraYTile + 25; - if (var6 < 0) { - var6 = 0; - } - - int var7 = var4.maxTileY - Scene_cameraYTile + 25; - if (var7 > 50) { - var7 = 50; - } - - var13 = false; - - while (var6 <= var7) { - if (visibleTiles[var5][var6++]) { - var13 = true; - break; - } - } - - if (!var13) { - continue; - } - int var9 = Scene_cameraX - var4.minX; - if (var9 > 32) { - var4.field1910 = 1; - } else { - if (var9 >= -32) { - continue; + var5 = var4.minTileX - Scene_cameraXTile + 25; + if (var5 >= 0 && var5 <= 50) { + var6 = var4.minTileY - Scene_cameraYTile + 25; + if (var6 < 0) { + var6 = 0; } - var4.field1910 = 2; - var9 = -var9; - } + var7 = var4.maxTileY - Scene_cameraYTile + 25; + if (var7 > 50) { + var7 = 50; + } - var4.field1900 = (var4.minZ - Scene_cameraZ << 8) / var9; - var4.field1911 = (var4.maxZ - Scene_cameraZ << 8) / var9; - var4.field1912 = (var4.minY - Scene_cameraY << 8) / var9; - var4.field1913 = (var4.maxY - Scene_cameraY << 8) / var9; - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; + var13 = false; + + while (var6 <= var7) { + if (visibleTiles[var5][var6++]) { + var13 = true; + break; + } + } + + if (var13) { + var9 = Scene_cameraX - var4.minX; + if (var9 > 32) { + var4.field1883 = 1; + } else { + if (var9 >= -32) { + continue; + } + + var4.field1883 = 2; + var9 = -var9; + } + + var4.field1886 = (var4.minZ - Scene_cameraZ << 8) / var9; + var4.field1887 = (var4.maxZ - Scene_cameraZ << 8) / var9; + var4.field1872 = (var4.minY - Scene_cameraY << 8) / var9; + var4.field1888 = (var4.maxY - Scene_cameraY << 8) / var9; + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; + } + } } else if (var4.type == 2) { - int var5 = var4.minTileY - Scene_cameraYTile + 25; - if (var5 < 0 || var5 > 50) { - continue; - } - int var6 = var4.minTileX - Scene_cameraXTile + 25; - if (var6 < 0) { - var6 = 0; - } - - int var7 = var4.maxTileX - Scene_cameraXTile + 25; - if (var7 > 50) { - var7 = 50; - } - - var13 = false; - - while (var6 <= var7) { - if (visibleTiles[var6++][var5]) { - var13 = true; - break; - } - } - - if (!var13) { - continue; - } - int var9 = Scene_cameraZ - var4.minZ; - if (var9 > 32) { - var4.field1910 = 3; - } else { - if (var9 >= -32) { - continue; + var5 = var4.minTileY - Scene_cameraYTile + 25; + if (var5 >= 0 && var5 <= 50) { + var6 = var4.minTileX - Scene_cameraXTile + 25; + if (var6 < 0) { + var6 = 0; } - var4.field1910 = 4; - var9 = -var9; - } + var7 = var4.maxTileX - Scene_cameraXTile + 25; + if (var7 > 50) { + var7 = 50; + } - var4.field1907 = (var4.minX - Scene_cameraX << 8) / var9; - var4.field1909 = (var4.maxX - Scene_cameraX << 8) / var9; - var4.field1912 = (var4.minY - Scene_cameraY << 8) / var9; - var4.field1913 = (var4.maxY - Scene_cameraY << 8) / var9; - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; + var13 = false; + + while (var6 <= var7) { + if (visibleTiles[var6++][var5]) { + var13 = true; + break; + } + } + + if (var13) { + var9 = Scene_cameraZ - var4.minZ; + if (var9 > 32) { + var4.field1883 = 3; + } else { + if (var9 >= -32) { + continue; + } + + var4.field1883 = 4; + var9 = -var9; + } + + var4.field1882 = (var4.minX - Scene_cameraX << 8) / var9; + var4.field1885 = (var4.maxX - Scene_cameraX << 8) / var9; + var4.field1872 = (var4.minY - Scene_cameraY << 8) / var9; + var4.field1888 = (var4.maxY - Scene_cameraY << 8) / var9; + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; + } + } } else if (var4.type == 4) { - int var5 = var4.minY - Scene_cameraY; - if (var5 <= 128) { - continue; - } - int var6 = var4.minTileY - Scene_cameraYTile + 25; - if (var6 < 0) { - var6 = 0; - } + var5 = var4.minY - Scene_cameraY; + if (var5 > 128) { + var6 = var4.minTileY - Scene_cameraYTile + 25; + if (var6 < 0) { + var6 = 0; + } - int var7 = var4.maxTileY - Scene_cameraYTile + 25; - if (var7 > 50) { - var7 = 50; - } + var7 = var4.maxTileY - Scene_cameraYTile + 25; + if (var7 > 50) { + var7 = 50; + } - if (var6 > var7) { - continue; - } - int var8 = var4.minTileX - Scene_cameraXTile + 25; - if (var8 < 0) { - var8 = 0; - } + if (var6 <= var7) { + int var8 = var4.minTileX - Scene_cameraXTile + 25; + if (var8 < 0) { + var8 = 0; + } - int var9 = var4.maxTileX - Scene_cameraXTile + 25; - if (var9 > 50) { - var9 = 50; - } + var9 = var4.maxTileX - Scene_cameraXTile + 25; + if (var9 > 50) { + var9 = 50; + } - boolean var10 = false; + boolean var10 = false; - label144: - for (int var11 = var8; var11 <= var9; ++var11) { - for (int var12 = var6; var12 <= var7; ++var12) { - if (visibleTiles[var11][var12]) { - var10 = true; - break label144; + label144: + for (int var11 = var8; var11 <= var9; ++var11) { + for (int var12 = var6; var12 <= var7; ++var12) { + if (visibleTiles[var11][var12]) { + var10 = true; + break label144; + } + } + } + + if (var10) { + var4.field1883 = 5; + var4.field1882 = (var4.minX - Scene_cameraX << 8) / var5; + var4.field1885 = (var4.maxX - Scene_cameraX << 8) / var5; + var4.field1886 = (var4.minZ - Scene_cameraZ << 8) / var5; + var4.field1887 = (var4.maxZ - Scene_cameraZ << 8) / var5; + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } } - - if (var10) { - var4.field1910 = 5; - var4.field1907 = (var4.minX - Scene_cameraX << 8) / var5; - var4.field1909 = (var4.maxX - Scene_cameraX << 8) / var5; - var4.field1900 = (var4.minZ - Scene_cameraZ << 8) / var5; - var4.field1911 = (var4.maxZ - Scene_cameraZ << 8) / var5; - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; - } } } } - @ObfuscatedName("bz") - boolean method3181(int plane, int x, int y) { - int var4 = this.field1810[plane][x][y]; + @ObfuscatedName("aw") + boolean method3089(int var1, int var2, int var3) { + int var4 = this.field1789[var1][var2][var3]; if (var4 == -Scene_drawnCount) { return false; - } - if (var4 == Scene_drawnCount) { + } else if (var4 == Scene_drawnCount) { return true; - } - int var5 = x << 7; - int var6 = y << 7; - if (this.method3102(var5 + 1, this.tileHeights[plane][x][y], var6 + 1) && this.method3102(var5 + 128 - 1, this.tileHeights[plane][x + 1][y], var6 + 1) && this.method3102(var5 + 128 - 1, this.tileHeights[plane][x + 1][y + 1], var6 + 128 - 1) && this.method3102(var5 + 1, this.tileHeights[plane][x][y + 1], var6 + 128 - 1)) { - this.field1810[plane][x][y] = Scene_drawnCount; - return true; - } - this.field1810[plane][x][y] = -Scene_drawnCount; - return false; - } - - @ObfuscatedName("bi") - boolean method3194(int var1, int var2, int var3, int var4) { - if (!this.method3181(var1, var2, var3)) { - return false; - } - int var5 = var2 << 7; - int var6 = var3 << 7; - int var7 = this.tileHeights[var1][var2][var3] - 1; - int var8 = var7 - 120; - int var9 = var7 - 230; - int var10 = var7 - 238; - if (var4 < 16) { - if (var4 == 1) { - if (var5 > Scene_cameraX) { - if (!this.method3102(var5, var7, var6)) { - return false; - } else if (!this.method3102(var5, var7, var6 + 128)) { - return false; - } - } - - if (var1 > 0) { - if (!this.method3102(var5, var8, var6)) { - return false; - } else if (!this.method3102(var5, var8, var6 + 128)) { - return false; - } - } - - if (!this.method3102(var5, var9, var6)) { - return false; - } else if (!this.method3102(var5, var9, var6 + 128)) { - return false; - } - - return true; - } else if (var4 == 2) { - if (var6 < Scene_cameraZ) { - if (!this.method3102(var5, var7, var6 + 128)) { - return false; - } else if (!this.method3102(var5 + 128, var7, var6 + 128)) { - return false; - } - } - - if (var1 > 0) { - if (!this.method3102(var5, var8, var6 + 128)) { - return false; - } else if (!this.method3102(var5 + 128, var8, var6 + 128)) { - return false; - } - } - - if (!this.method3102(var5, var9, var6 + 128)) { - return false; - } else if (!this.method3102(var5 + 128, var9, var6 + 128)) { - return false; - } else { - return true; - } - } else if (var4 == 4) { - if (var5 < Scene_cameraX) { - if (!this.method3102(var5 + 128, var7, var6)) { - return false; - } else if (!this.method3102(var5 + 128, var7, var6 + 128)) { - return false; - } - } - - if (var1 > 0) { - if (!this.method3102(var5 + 128, var8, var6)) { - return false; - } else if (!this.method3102(var5 + 128, var8, var6 + 128)) { - return false; - } - } - - if (!this.method3102(var5 + 128, var9, var6)) { - return false; - } else if (!this.method3102(var5 + 128, var9, var6 + 128)) { - return false; - } else { - return true; - } - } else if (var4 == 8) { - if (var6 > Scene_cameraZ) { - if (!this.method3102(var5, var7, var6)) { - return false; - } else if (!this.method3102(var5 + 128, var7, var6)) { - return false; - } - } - - if (var1 > 0) { - if (!this.method3102(var5, var8, var6)) { - return false; - } else if (!this.method3102(var5 + 128, var8, var6)) { - return false; - } - } - - if (!this.method3102(var5, var9, var6)) { - return false; - } else if (!this.method3102(var5 + 128, var9, var6)) { - return false; - } else { - return true; - } - } - } - - if (!this.method3102(var5 + 64, var10, var6 + 64)) { - return false; - } else if (var4 == 16) { - return this.method3102(var5, var9, var6 + 128); - } else if (var4 == 32) { - return this.method3102(var5 + 128, var9, var6 + 128); - } else if (var4 == 64) { - return this.method3102(var5 + 128, var9, var6); - } else if (var4 == 128) { - return this.method3102(var5, var9, var6); } else { - return true; - } - } - - @ObfuscatedName("bg") - boolean method3116(int var1, int var2, int var3, int var4) { - if (!this.method3181(var1, var2, var3)) { - return false; - } - int var5 = var2 << 7; - int var6 = var3 << 7; - return this.method3102(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method3102(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method3102(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method3102(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); - } - - @ObfuscatedName("bh") - boolean method3117(int plane, int startX, int endX, int startY, int endY, int height) { - if (endX == startX && endY == startY) { - if (this.method3181(plane, startX, startY)) { - int var7 = startX << 7; - int var8 = startY << 7; - return this.method3102(var7 + 1, this.tileHeights[plane][startX][startY] - height, var8 + 1) && this.method3102(var7 + 128 - 1, this.tileHeights[plane][startX + 1][startY] - height, var8 + 1) && this.method3102(var7 + 128 - 1, this.tileHeights[plane][startX + 1][startY + 1] - height, var8 + 128 - 1) && this.method3102(var7 + 1, this.tileHeights[plane][startX][startY + 1] - height, var8 + 128 - 1); + int var5 = var2 << 7; + int var6 = var3 << 7; + if (this.method3188(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method3188(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method3188(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method3188(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { + this.field1789[var1][var2][var3] = Scene_drawnCount; + return true; + } else { + this.field1789[var1][var2][var3] = -Scene_drawnCount; + return false; } - return false; } - for (int var7 = startX; var7 <= endX; ++var7) { - for (int var8 = startY; var8 <= endY; ++var8) { - if (this.field1810[plane][var7][var8] == -Scene_drawnCount) { + } + + @ObfuscatedName("ae") + boolean method3070(int var1, int var2, int var3, int var4) { + if (!this.method3089(var1, var2, var3)) { + return false; + } else { + int var5 = var2 << 7; + int var6 = var3 << 7; + int var7 = this.tileHeights[var1][var2][var3] - 1; + int var8 = var7 - 120; + int var9 = var7 - 230; + int var10 = var7 - 238; + if (var4 < 16) { + if (var4 == 1) { + if (var5 > Scene_cameraX) { + if (!this.method3188(var5, var7, var6)) { + return false; + } + + if (!this.method3188(var5, var7, var6 + 128)) { + return false; + } + } + + if (var1 > 0) { + if (!this.method3188(var5, var8, var6)) { + return false; + } + + if (!this.method3188(var5, var8, var6 + 128)) { + return false; + } + } + + if (!this.method3188(var5, var9, var6)) { + return false; + } + + if (!this.method3188(var5, var9, var6 + 128)) { + return false; + } + + return true; + } + + if (var4 == 2) { + if (var6 < Scene_cameraZ) { + if (!this.method3188(var5, var7, var6 + 128)) { + return false; + } + + if (!this.method3188(var5 + 128, var7, var6 + 128)) { + return false; + } + } + + if (var1 > 0) { + if (!this.method3188(var5, var8, var6 + 128)) { + return false; + } + + if (!this.method3188(var5 + 128, var8, var6 + 128)) { + return false; + } + } + + if (!this.method3188(var5, var9, var6 + 128)) { + return false; + } + + if (!this.method3188(var5 + 128, var9, var6 + 128)) { + return false; + } + + return true; + } + + if (var4 == 4) { + if (var5 < Scene_cameraX) { + if (!this.method3188(var5 + 128, var7, var6)) { + return false; + } + + if (!this.method3188(var5 + 128, var7, var6 + 128)) { + return false; + } + } + + if (var1 > 0) { + if (!this.method3188(var5 + 128, var8, var6)) { + return false; + } + + if (!this.method3188(var5 + 128, var8, var6 + 128)) { + return false; + } + } + + if (!this.method3188(var5 + 128, var9, var6)) { + return false; + } + + if (!this.method3188(var5 + 128, var9, var6 + 128)) { + return false; + } + + return true; + } + + if (var4 == 8) { + if (var6 > Scene_cameraZ) { + if (!this.method3188(var5, var7, var6)) { + return false; + } + + if (!this.method3188(var5 + 128, var7, var6)) { + return false; + } + } + + if (var1 > 0) { + if (!this.method3188(var5, var8, var6)) { + return false; + } + + if (!this.method3188(var5 + 128, var8, var6)) { + return false; + } + } + + if (!this.method3188(var5, var9, var6)) { + return false; + } + + if (!this.method3188(var5 + 128, var9, var6)) { + return false; + } + + return true; + } + } + + if (!this.method3188(var5 + 64, var10, var6 + 64)) { + return false; + } else if (var4 == 16) { + return this.method3188(var5, var9, var6 + 128); + } else if (var4 == 32) { + return this.method3188(var5 + 128, var9, var6 + 128); + } else if (var4 == 64) { + return this.method3188(var5 + 128, var9, var6); + } else if (var4 == 128) { + return this.method3188(var5, var9, var6); + } else { + return true; + } + } + } + + @ObfuscatedName("bk") + boolean method3185(int var1, int var2, int var3, int var4) { + if (!this.method3089(var1, var2, var3)) { + return false; + } else { + int var5 = var2 << 7; + int var6 = var3 << 7; + return this.method3188(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method3188(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method3188(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method3188(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); + } + } + + @ObfuscatedName("bw") + boolean method3061(int var1, int var2, int var3, int var4, int var5, int var6) { + int var7; + int var8; + if (var3 == var2 && var5 == var4) { + if (!this.method3089(var1, var2, var4)) { + return false; + } else { + var7 = var2 << 7; + var8 = var4 << 7; + return this.method3188(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method3188(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method3188(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method3188(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.field1789[var1][var7][var8] == -Scene_drawnCount) { + return false; + } + } + } + + var7 = (var2 << 7) + 1; + var8 = (var4 << 7) + 2; + int var9 = this.tileHeights[var1][var2][var4] - var6; + if (!this.method3188(var7, var9, var8)) { + return false; + } else { + int var10 = (var3 << 7) - 1; + if (!this.method3188(var10, var9, var8)) { return false; + } else { + int var11 = (var5 << 7) - 1; + if (!this.method3188(var7, var9, var11)) { + return false; + } else if (!this.method3188(var10, var9, var11)) { + return false; + } else { + return true; + } } } } - - int var7 = (startX << 7) + 1; - int var8 = (startY << 7) + 2; - int var9 = this.tileHeights[plane][startX][startY] - height; - if (!this.method3102(var7, var9, var8)) { - return false; - } - int var10 = (endX << 7) - 1; - if (!this.method3102(var10, var9, var8)) { - return false; - } - int var11 = (endY << 7) - 1; - if (!this.method3102(var7, var9, var11)) { - return false; - } - if (!this.method3102(var10, var9, var11)) { - return false; - } - return true; } - @ObfuscatedName("bm") - boolean method3102(int var1, int var2, int var3) { + @ObfuscatedName("bo") + boolean method3188(int var1, int var2, int var3) { for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { Occluder var5 = Scene_currentOccluders[var4]; - if (var5.field1910 == 1) { - int var6 = var5.minX - var1; + int var6; + int var7; + int var8; + int var9; + int var10; + if (var5.field1883 == 1) { + var6 = var5.minX - var1; if (var6 > 0) { - int var7 = (var6 * var5.field1900 >> 8) + var5.minZ; - int var8 = (var6 * var5.field1911 >> 8) + var5.maxZ; - int var9 = (var6 * var5.field1912 >> 8) + var5.minY; - int var10 = (var6 * var5.field1913 >> 8) + var5.maxY; + var7 = (var6 * var5.field1886 >> 8) + var5.minZ; + var8 = (var6 * var5.field1887 >> 8) + var5.maxZ; + var9 = (var6 * var5.field1872 >> 8) + var5.minY; + var10 = (var6 * var5.field1888 >> 8) + var5.maxY; if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field1910 == 2) { - int var6 = var1 - var5.minX; + } else if (var5.field1883 == 2) { + var6 = var1 - var5.minX; if (var6 > 0) { - int var7 = (var6 * var5.field1900 >> 8) + var5.minZ; - int var8 = (var6 * var5.field1911 >> 8) + var5.maxZ; - int var9 = (var6 * var5.field1912 >> 8) + var5.minY; - int var10 = (var6 * var5.field1913 >> 8) + var5.maxY; + var7 = (var6 * var5.field1886 >> 8) + var5.minZ; + var8 = (var6 * var5.field1887 >> 8) + var5.maxZ; + var9 = (var6 * var5.field1872 >> 8) + var5.minY; + var10 = (var6 * var5.field1888 >> 8) + var5.maxY; if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field1910 == 3) { - int var6 = var5.minZ - var3; + } else if (var5.field1883 == 3) { + var6 = var5.minZ - var3; if (var6 > 0) { - int var7 = (var6 * var5.field1907 >> 8) + var5.minX; - int var8 = (var6 * var5.field1909 >> 8) + var5.maxX; - int var9 = (var6 * var5.field1912 >> 8) + var5.minY; - int var10 = (var6 * var5.field1913 >> 8) + var5.maxY; + var7 = (var6 * var5.field1882 >> 8) + var5.minX; + var8 = (var6 * var5.field1885 >> 8) + var5.maxX; + var9 = (var6 * var5.field1872 >> 8) + var5.minY; + var10 = (var6 * var5.field1888 >> 8) + var5.maxY; if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field1910 == 4) { - int var6 = var3 - var5.minZ; + } else if (var5.field1883 == 4) { + var6 = var3 - var5.minZ; if (var6 > 0) { - int var7 = (var6 * var5.field1907 >> 8) + var5.minX; - int var8 = (var6 * var5.field1909 >> 8) + var5.maxX; - int var9 = (var6 * var5.field1912 >> 8) + var5.minY; - int var10 = (var6 * var5.field1913 >> 8) + var5.maxY; + var7 = (var6 * var5.field1882 >> 8) + var5.minX; + var8 = (var6 * var5.field1885 >> 8) + var5.maxX; + var9 = (var6 * var5.field1872 >> 8) + var5.minY; + var10 = (var6 * var5.field1888 >> 8) + var5.maxY; if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field1910 == 5) { - int var6 = var2 - var5.minY; + } else if (var5.field1883 == 5) { + var6 = var2 - var5.minY; if (var6 > 0) { - int var7 = (var6 * var5.field1907 >> 8) + var5.minX; - int var8 = (var6 * var5.field1909 >> 8) + var5.maxX; - int var9 = (var6 * var5.field1900 >> 8) + var5.minZ; - int var10 = (var6 * var5.field1911 >> 8) + var5.maxZ; + var7 = (var6 * var5.field1882 >> 8) + var5.minX; + var8 = (var6 * var5.field1885 >> 8) + var5.maxX; + var9 = (var6 * var5.field1886 >> 8) + var5.minZ; + var10 = (var6 * var5.field1887 >> 8) + var5.maxZ; if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { return true; } @@ -2343,7 +2421,7 @@ public class Scene { return false; } - @ObfuscatedName("p") + @ObfuscatedName("k") @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(); @@ -2361,7 +2439,7 @@ public class Scene { Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; } - @ObfuscatedName("ap") + @ObfuscatedName("ac") @Export("Scene_buildVisiblityMap") public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int var3, int var4) { Scene_viewportXMin = 0; @@ -2394,7 +2472,7 @@ public class Scene { boolean var14 = false; for (int var15 = -var1; var15 <= var2; var15 += 128) { - if (method3187(var12, var0[var8] + var15, var13)) { + if (method3037(var12, var0[var8] + var15, var13)) { var14 = true; break; } @@ -2445,33 +2523,34 @@ public class Scene { } - @ObfuscatedName("aq") - static boolean method3187(int var0, int var1, int var2) { + @ObfuscatedName("ar") + static boolean method3037(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; int var6 = Scene_cameraPitchCosine * var1 - var4 * Scene_cameraPitchSine >> 16; - if (var5 < 50 || var5 > 3500) { + if (var5 >= 50 && var5 <= 3500) { + int var7 = var3 * 128 / var5 + Scene_viewportXCenter; + int var8 = var6 * 128 / var5 + Scene_viewportYCenter; + return var7 >= Scene_viewportXMin && var7 <= Scene_viewportXMax && var8 >= Scene_viewportYMin && var8 <= Scene_viewportYMax; + } else { return false; } - int var7 = var3 * 128 / var5 + Scene_viewportXCenter; - int var8 = var6 * 128 / var5 + Scene_viewportYCenter; - return var7 >= Scene_viewportXMin && var7 <= Scene_viewportXMax && var8 >= Scene_viewportYMin && var8 <= Scene_viewportYMax; } - @ObfuscatedName("au") - public static boolean method3105() { + @ObfuscatedName("ag") + public static boolean method3049() { return viewportWalking && Scene_selectedX != -1; } - @ObfuscatedName("ai") - public static void method3222() { + @ObfuscatedName("aa") + public static void method3050() { Scene_selectedX = -1; viewportWalking = false; } - @ObfuscatedName("af") - static final int method3111(int var0, int var1) { + @ObfuscatedName("al") + static final int method3055(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; if (var1 < 2) { var1 = 2; @@ -2482,30 +2561,30 @@ public class Scene { return (var0 & 65408) + var1; } - @ObfuscatedName("ab") + @ObfuscatedName("ah") @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) { return false; - } - if (var1 > var2 && var1 > var3 && var1 > var4) { + } else if (var1 > var2 && var1 > var3 && var1 > var4) { return false; - } - if (var0 < var5 && var0 < var6 && var0 < var7) { + } else if (var0 < var5 && var0 < var6 && var0 < var7) { return false; - } - if (var0 > var5 && var0 > var6 && var0 > var7) { + } else if (var0 > var5 && var0 > var6 && var0 > var7) { return false; + } else { + int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2); + int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3); + int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7); + if (var8 == 0) { + if (var9 != 0) { + return var9 < 0 ? var10 <= 0 : var10 >= 0; + } else { + return true; + } + } else { + return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0; + } } - int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2); - int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3); - int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7); - if (var8 != 0) { - return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0; - } - if (var9 != 0) { - return var9 < 0 ? var10 <= 0 : var10 >= 0; - } - return true; } } diff --git a/runescape-client/src/main/java/Script.java b/runescape-client/src/main/java/Script.java index a4c9020884..4a6f01cd92 100644 --- a/runescape-client/src/main/java/Script.java +++ b/runescape-client/src/main/java/Script.java @@ -4,51 +4,57 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cx") +@ObfuscatedName("cr") @Implements("Script") public class Script extends DualNode { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lep;" ) @Export("Script_cached") static EvictingDualNodeHashTable Script_cached; - @ObfuscatedName("w") + @ObfuscatedName("eo") + @ObfuscatedSignature( + signature = "Lid;" + ) + @Export("archive20") + static Archive archive20; + @ObfuscatedName("j") @Export("opcodes") int[] opcodes; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("intOperands") int[] intOperands; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("stringOperands") String[] stringOperands; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1512547181 + intValue = 733828633 ) @Export("localIntCount") int localIntCount; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -461479353 + intValue = 433175323 ) @Export("localStringCount") int localStringCount; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1738324737 + intValue = -1193864261 ) @Export("intArgumentCount") int intArgumentCount; - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -826878645 + intValue = 1480737507 ) @Export("stringArgumentCount") int stringArgumentCount; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "[Lla;" + signature = "[Lln;" ) @Export("switches") IterableNodeHashTable[] switches; @@ -62,20 +68,95 @@ public class Script extends DualNode { @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(IB)[Lla;", - garbageValue = "45" + signature = "(II)[Lln;", + garbageValue = "-825369330" ) @Export("newIterableNodeHashTable") IterableNodeHashTable[] newIterableNodeHashTable(int var1) { return new IterableNodeHashTable[var1]; } - @ObfuscatedName("b") + @ObfuscatedName("hy") @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "-58" + signature = "(IIIIIIIB)V", + garbageValue = "1" ) - public static boolean method2185(int var0) { - return (var0 >> 30 & 1) != 0; + @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 != ItemContainer.plane) { + return; + } + + long var7 = 0L; + boolean var9 = true; + boolean var10 = false; + boolean var11 = false; + if (var1 == 0) { + var7 = Player.scene.getBoundaryObjectTag(var0, var2, var3); + } + + if (var1 == 1) { + var7 = Player.scene.getWallDecorationTag(var0, var2, var3); + } + + if (var1 == 2) { + var7 = Player.scene.getGameObjectTag(var0, var2, var3); + } + + if (var1 == 3) { + var7 = Player.scene.getFloorDecorationTag(var0, var2, var3); + } + + int var12; + if (0L != var7) { + var12 = Player.scene.getObjectFlags(var0, var2, var3, var7); + int var14 = BoundaryObject.Entity_unpackID(var7); + int var15 = var12 & 31; + int var16 = var12 >> 6 & 3; + ObjectDefinition var13; + if (var1 == 0) { + Player.scene.removeBoundaryObject(var0, var2, var3); + var13 = class215.getObjectDefinition(var14); + if (var13.interactType != 0) { + Client.collisionMaps[var0].method3497(var2, var3, var15, var16, var13.boolean1); + } + } + + if (var1 == 1) { + Player.scene.removeWallDecoration(var0, var2, var3); + } + + if (var1 == 2) { + Player.scene.removeGameObject(var0, var2, var3); + var13 = class215.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) { + Player.scene.removeFloorDecoration(var0, var2, var3); + var13 = class215.getObjectDefinition(var14); + if (var13.interactType == 1) { + Client.collisionMaps[var0].method3527(var2, var3); + } + } + } + + if (var4 >= 0) { + var12 = var0; + if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { + var12 = var0 + 1; + } + + Client.addPendingGameObject(var0, var12, var2, var3, var4, var5, var6, Player.scene, Client.collisionMaps[var0]); + } + } + } } diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java index 245b5043ac..25edbea89f 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -3,207 +3,105 @@ 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("bb") +@ObfuscatedName("by") @Implements("ScriptEvent") public class ScriptEvent extends Node { - @ObfuscatedName("sr") + @ObfuscatedName("fh") @ObfuscatedSignature( - signature = "Lkm;" + signature = "Leg;" ) - @Export("masterDisk") - static ArchiveDisk masterDisk; - @ObfuscatedName("h") + @Export("urlRequester") + static UrlRequester urlRequester; + @ObfuscatedName("hv") @ObfuscatedGetter( - intValue = 804778347 + intValue = 966526807 ) - @Export("loginBoxCenter") - static int loginBoxCenter; - @ObfuscatedName("o") - @Export("operatingSystem") - static String operatingSystem; - @ObfuscatedName("q") + static int field559; + @ObfuscatedName("s") @Export("args") Object[] args; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("isMouseInputEvent") boolean isMouseInputEvent; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lhj;" + signature = "Lhp;" ) @Export("widget") Widget widget; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 360702413 + intValue = -1722758415 ) @Export("mouseX") int mouseX; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -863206641 + intValue = -1522847743 ) @Export("mouseY") int mouseY; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1116555521 + intValue = 494348445 ) @Export("opIndex") int opIndex; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lhj;" + signature = "Lhp;" ) @Export("dragTarget") Widget dragTarget; - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1918711245 + intValue = 329318747 ) @Export("keyTyped") int keyTyped; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1718694615 + intValue = -1953283421 ) @Export("keyPressed") int keyPressed; - @ObfuscatedName("f") + @ObfuscatedName("d") @Export("targetName") String targetName; - @ObfuscatedName("m") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1456070935 + intValue = -1233738225 ) - int field583; - @ObfuscatedName("u") + int field555; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1715146039 + intValue = -998343503 ) @Export("type") int type; public ScriptEvent() { - this.type = 0x4c; + this.type = 76; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "([Ljava/lang/Object;B)V", - garbageValue = "27" + signature = "([Ljava/lang/Object;I)V", + garbageValue = "136665190" ) @Export("setArgs") public void setArgs(Object[] var1) { this.args = var1; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "141891736" + signature = "(IB)V", + garbageValue = "0" ) @Export("setType") public void setType(int var1) { this.type = var1; } - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "2123129182" - ) - static int method1121() { - return 11; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(ILjava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-2135238303" - ) - @Export("addGameMessage") - static void addGameMessage(int var0, String var1, String var2) { - class14.addChatMessage(var0, var1, var2, (String)null); - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "(ILcx;ZI)I", - garbageValue = "1342533566" - ) - static int method1127(int var0, Script var1, boolean var2) { - Widget var3 = class80.getWidget(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - if (var0 == ScriptOpcodes.IF_GETX) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.x; - return 1; - } - if (var0 == ScriptOpcodes.IF_GETY) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.y; - return 1; - } - if (var0 == ScriptOpcodes.IF_GETWIDTH) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.width; - return 1; - } - if (var0 == ScriptOpcodes.IF_GETHEIGHT) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.height; - return 1; - } - if (var0 == ScriptOpcodes.IF_GETHIDE) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; - return 1; - } - if (var0 == ScriptOpcodes.IF_GETLAYER) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.parentId; - return 1; - } - return 2; - } - - @ObfuscatedName("go") - @ObfuscatedSignature( - signature = "(IIIS)I", - garbageValue = "-366" - ) - @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] + Tiles.Tiles_heights[var5][var3 + 1][var4] * var6 >> 7; - int var9 = Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] * var6 + Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) >> 7; - return var7 * var9 + var8 * (128 - var7) >> 7; - } - return 0; - } - - @ObfuscatedName("iq") - @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "1493130068" - ) - @Export("getTapToDrop") - static boolean getTapToDrop() { - return Client.tapToDrop; - } - - @ObfuscatedName("kc") - @ObfuscatedSignature( - signature = "(Lhj;I)Z", - garbageValue = "2063123103" - ) - @Export("isComponentHidden") - static boolean isComponentHidden(Widget var0) { - return var0.isHidden; - } } diff --git a/runescape-client/src/main/java/ScriptFrame.java b/runescape-client/src/main/java/ScriptFrame.java index 1868286459..a10374bf5c 100644 --- a/runescape-client/src/main/java/ScriptFrame.java +++ b/runescape-client/src/main/java/ScriptFrame.java @@ -4,46 +4,25 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bh") +@ObfuscatedName("bp") @Implements("ScriptFrame") public class ScriptFrame { - @ObfuscatedName("rk") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1697937431 - ) - static int field526; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 1199234245 - ) - public static int field529; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 1541896355 - ) - static int field527; - @ObfuscatedName("bx") - @ObfuscatedSignature( - signature = "Lgu;" - ) - @Export("clientLanguage") - static Language clientLanguage; - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "Lcx;" - ) - @Export("script") - Script script; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 949224095 + intValue = 1672525423 ) @Export("pc") int pc; - @ObfuscatedName("e") + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "Lcr;" + ) + @Export("script") + Script script; + @ObfuscatedName("i") @Export("intLocals") int[] intLocals; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("stringLocals") String[] stringLocals; @@ -51,324 +30,60 @@ public class ScriptFrame { this.pc = -1; } - @ObfuscatedName("e") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "([BIIIIIII[Lfv;B)V", - garbageValue = "66" + signature = "(Lkx;I)V", + garbageValue = "923319519" ) - static final void method1088(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) { - var8[var1].flags[var9 + var2][var3 + var10] &= 0xfeffffff; - } - } - } - - 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) { - WorldMapLabel.loadTerrain(var13, var1, var2 + class197.method3702(var11 & 7, var12 & 7, var7), var3 + WorldMapManager.method625(var11 & 7, var12 & 7, var7), 0, 0, var7); - } else { - WorldMapLabel.loadTerrain(var13, 0, -1, -1, 0, 0, 0); - } - } + @Export("updatePlayer") + static final void updatePlayer(PacketBuffer var0) { + var0.importIndex(); + int var1 = Client.localPlayerIndex; + Player var2 = WorldMapIcon_1.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 - PacketWriter.baseX * 64; + var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); + var2.pathY[0] = var6 - RouteStrategy.baseY * 64; + var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); + ItemContainer.plane = var2.plane = var4; + if (Players.field1219[var1] != null) { + var2.read(Players.field1219[var1]); + } + + Players.Players_count = 0; + Players.Players_indices[++Players.Players_count - 1] = var1; + Players.field1221[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.field1221[var7] = 0; } } + var0.exportIndex(); } - @ObfuscatedName("fi") + @ObfuscatedName("je") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "204342367" + signature = "(IIB)V", + garbageValue = "53" ) - static final void method1090() { - if (Client.logoutTimer > 0) { - RouteStrategy.method3593(); - } else { - Client.timer.method4993(); - class96.updateGameState(40); - class269.field3563 = Client.packetWriter.getSocket(); - Client.packetWriter.removeSocket(); - } - } - - @ObfuscatedName("gx") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "975361183" - ) - @Export("checkLocalPlayerDestination") - static void checkLocalPlayerDestination() { - if (Client.localPlayer.x >> 7 == Client.destinationX && Client.localPlayer.y >> 7 == Client.destinationY) { - Client.destinationX = 0; - } - - } - - @ObfuscatedName("gv") - @ObfuscatedSignature( - signature = "(ZLkx;I)V", - garbageValue = "1426671502" - ) - @Export("updateNpcs") - static final void updateNpcs(boolean var0, PacketBuffer var1) { - Client.field775 = 0; - Client.field697 = 0; - StructDefinition.readNpcUpdates(); - - int var2; - NPC var4; - int var5; - int var6; - int var7; - int var8; - int var9; - while (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { - var2 = var1.readBits(15); - if (var2 == 0x7fff) { - break; - } - - boolean var3 = false; - if (Client.npcs[var2] == null) { - Client.npcs[var2] = new NPC(); - var3 = true; - } - - var4 = Client.npcs[var2]; - Client.npcIndices[++Client.npcCount - 1] = var2; - var4.npcCycle = Client.cycle; - if (var0) { - var5 = var1.readBits(8); - if (var5 > 127) { - var5 -= 256; - } - } else { - var5 = var1.readBits(5); - if (var5 > 15) { - var5 -= 32; - } - } - - var6 = var1.readBits(1); - var7 = Client.defaultRotations[var1.readBits(3)]; - if (var3) { - var4.orientation = var4.rotation = var7; - } - - var8 = var1.readBits(1); - if (var8 == 1) { - Client.field859[++Client.field697 - 1] = var2; - } - - if (var0) { - var9 = var1.readBits(8); - if (var9 > 127) { - var9 -= 256; - } - } else { - var9 = var1.readBits(5); - if (var9 > 15) { - var9 -= 32; - } - } - - var4.definition = GameShell.getNpcDefinition(var1.readBits(14)); - var4.size = var4.definition.size * 78073455; - var4.field948 = var4.definition.rotation; - if (var4.field948 == 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.method1963(Client.localPlayer.pathX[0] + var5, Client.localPlayer.pathY[0] + var9, var6 == 1); - } - - var1.exportIndex(); - - int var14; - for (var2 = 0; var2 < Client.field697; ++var2) { - var14 = Client.field859[var2]; - var4 = Client.npcs[var14]; - var5 = var1.readUnsignedByte(); - if ((var5 & 1) != 0) { - var4.targetIndex = var1.method5532(); - if (var4.targetIndex == 0xffff) { - var4.targetIndex = -1; - } - } - - if ((var5 & 64) != 0) { - var6 = var1.method5534(); - var7 = var1.method5534(); - var8 = var4.x - (var6 - MusicPatchNode2.baseX * 64 - MusicPatchNode2.baseX * 64) * 64; - var9 = var4.y - (var7 - class1.baseY * 64 - class1.baseY * 64) * 64; - if (var8 != 0 || var9 != 0) { - var4.field976 = (int)(Math.atan2((double)var8, (double)var9) * 325.949D) & 2047; - } - } - - if ((var5 & 32) != 0) { - var6 = var1.readUnsignedShort(); - if (var6 == 0xffff) { - var6 = -1; - } - - var7 = var1.method5525(); - if (var6 == var4.sequence && var6 != -1) { - var8 = GrandExchangeEvent.SequenceDefinition_get(var6).field3529; - if (var8 == 1) { - var4.sequenceFrame = 0; - var4.sequenceFrameCycle = 0; - var4.sequenceDelay = var7; - var4.field985 = 0; - } - - if (var8 == 2) { - var4.field985 = 0; - } - } else if (var6 == -1 || var4.sequence == -1 || GrandExchangeEvent.SequenceDefinition_get(var6).field3533 >= GrandExchangeEvent.SequenceDefinition_get(var4.sequence).field3533) { - var4.sequence = var6; - var4.sequenceFrame = 0; - var4.sequenceFrameCycle = 0; - var4.sequenceDelay = var7; - var4.field985 = 0; - var4.field1008 = var4.pathLength; - } - } - - if ((var5 & 4) != 0) { - var4.definition = GameShell.getNpcDefinition(var1.readUnsignedShort()); - var4.size = var4.definition.size * 78073455; - var4.field948 = var4.definition.rotation; - 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; - } - - if ((var5 & 16) != 0) { - var6 = var1.readUnsignedByteNegate(); - int var10; - int var11; - int var12; - if (var6 > 0) { - for (var7 = 0; var7 < var6; ++var7) { - var9 = -1; - var10 = -1; - var11 = -1; - var8 = var1.readUShortSmart(); - if (var8 == 0x7fff) { - var8 = var1.readUShortSmart(); - var10 = var1.readUShortSmart(); - var9 = var1.readUShortSmart(); - var11 = var1.readUShortSmart(); - } else if (var8 != 32766) { - var10 = var1.readUShortSmart(); - } else { - var8 = -1; - } - - var12 = var1.readUShortSmart(); - var4.addHitSplat(var8, var10, var9, var11, Client.cycle, var12); - } - } - - var7 = var1.method5722(); - if (var7 > 0) { - for (var8 = 0; var8 < var7; ++var8) { - var9 = var1.readUShortSmart(); - var10 = var1.readUShortSmart(); - if (var10 != 0x7fff) { - var11 = var1.readUShortSmart(); - var12 = var1.readUnsignedByte(); - int var13 = var10 > 0 ? var1.method5525() : var12; - var4.addHealthBar(var9, Client.cycle, var10, var11, var12, var13); - } else { - var4.removeHealthBar(var9); - } - } - } - } - - if ((var5 & 8) != 0) { - var4.spotAnimation = var1.method5532(); - var6 = var1.method5542(); - var4.heightOffset = var6 >> 16; - var4.field989 = (var6 & 0xffff) + Client.cycle; - var4.spotAnimationFrame = 0; - var4.spotAnimationFrameCycle = 0; - if (var4.field989 > Client.cycle) { - var4.spotAnimationFrame = -1; - } - - if (var4.spotAnimation == 0xffff) { - var4.spotAnimation = -1; - } - } - - if ((var5 & 2) != 0) { - var4.overheadText = var1.readStringCp1252NullTerminated(); - var4.overheadTextCyclesRemaining = 100; - } - } - - for (var2 = 0; var2 < Client.field775; ++var2) { - var14 = Client.field776[var2]; - if (Client.npcs[var14].npcCycle != Client.cycle) { - Client.npcs[var14].definition = null; - Client.npcs[var14] = null; - } - } - - if (var1.offset != Client.packetWriter.serverPacketLength) { - throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); - } - for (var2 = 0; var2 < Client.npcCount; ++var2) { - if (Client.npcs[Client.npcIndices[var2]] == null) { - throw new RuntimeException(var2 + "," + Client.npcCount); - } - } - - } - - @ObfuscatedName("hf") - @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "-881674814" - ) - @Export("resumePauseWidget") - static void resumePauseWidget(int parentID, int childID) { - PacketBufferNode var2 = Archive.getPacketBufferNode(ClientPacket.field2273, Client.packetWriter.isaacCipher); - var2.packetBuffer.writeIntLE16(parentID); - var2.packetBuffer.method5530(childID); - Client.packetWriter.addNode(var2); - } - - @ObfuscatedName("js") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-73" - ) - @Export("Clan_leaveChat") - static final void Clan_leaveChat() { - PacketBufferNode var0 = Archive.getPacketBufferNode(ClientPacket.field2286, Client.packetWriter.isaacCipher); - var0.packetBuffer.writeByte(0); - Client.packetWriter.addNode(var0); + static void method1092(int var0, int var1) { + MenuAction var2 = class1.tempMenuAction; + SecureRandomFuture.menuAction(var2.argument1, var2.argument2, var2.opcode, var2.argument0, var2.action, var2.action, var0, var1); + class1.tempMenuAction = null; } } diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index 72b7f7f789..598384a008 100644 --- a/runescape-client/src/main/java/SecureRandomCallable.java +++ b/runescape-client/src/main/java/SecureRandomCallable.java @@ -2,24 +2,33 @@ import java.security.SecureRandom; 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("bm") +@ObfuscatedName("bz") @Implements("SecureRandomCallable") public class SecureRandomCallable implements Callable { - @ObfuscatedName("qp") + @ObfuscatedName("su") + @Export("foundItemIds") + static short[] foundItemIds; + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "Lcz;" + signature = "Lct;" ) - @Export("pcmStreamMixer") - static PcmStreamMixer pcmStreamMixer; - @ObfuscatedName("bx") - @ObfuscatedSignature( - signature = "[Llx;" + @Export("pcmPlayerProvider") + static PcmPlayerProvider pcmPlayerProvider; + @ObfuscatedName("ae") + @ObfuscatedGetter( + intValue = 1643871529 ) - @Export("worldSelectFlagSprites") - static IndexedSprite[] worldSelectFlagSprites; + static int field500; + @ObfuscatedName("ej") + @ObfuscatedGetter( + intValue = 1838360693 + ) + @Export("port3") + static int port3; SecureRandomCallable() { } @@ -29,13 +38,4 @@ public class SecureRandomCallable implements Callable { var2.nextInt(); return var2; } - - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1843458331" - ) - public static void method1093() { - VarpDefinition.VarpDefinition_cached.clear(); - } } diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java index 782722092b..db2dcc11e1 100644 --- a/runescape-client/src/main/java/SecureRandomFuture.java +++ b/runescape-client/src/main/java/SecureRandomFuture.java @@ -1,3 +1,4 @@ +import java.awt.Component; import java.security.SecureRandom; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -6,23 +7,15 @@ 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("co") +@ObfuscatedName("cm") @Implements("SecureRandomFuture") public class SecureRandomFuture { - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Ldg;" - ) - @Export("soundSystem") - static SoundSystem soundSystem; - @ObfuscatedName("gw") - @Export("regionMapArchiveIds") - static int[] regionMapArchiveIds; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("executor") ExecutorService executor; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("future") Future future; @@ -31,10 +24,10 @@ public class SecureRandomFuture { this.future = this.executor.submit(new SecureRandomCallable()); } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1961789418" + garbageValue = "1323034679" ) @Export("shutdown") void shutdown() { @@ -42,20 +35,20 @@ public class SecureRandomFuture { this.executor = null; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-2036940847" + garbageValue = "-2137893013" ) @Export("isDone") boolean isDone() { return this.future.isDone(); } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(I)Ljava/security/SecureRandom;", - garbageValue = "1181780583" + garbageValue = "1958597886" ) @Export("get") SecureRandom get() { @@ -68,37 +61,929 @@ public class SecureRandomFuture { } } - @ObfuscatedName("w") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(ILkm;Liu;I)V", - garbageValue = "-1214592487" + signature = "(Ljava/awt/Component;B)V", + garbageValue = "4" ) - static void method2056(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; + static void method2061(Component var0) { + var0.addMouseListener(MouseHandler.MouseHandler_instance); + var0.addMouseMotionListener(MouseHandler.MouseHandler_instance); + var0.addFocusListener(MouseHandler.MouseHandler_instance); + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(ILcr;ZS)I", + garbageValue = "-27974" + ) + static int method2060(int var0, Script var1, boolean var2) { + boolean var3 = true; + Widget var4; + if (var0 >= 2000) { + var0 -= 1000; + var4 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + var3 = false; + } else { + var4 = var2 ? class286.field3623 : class297.field3693; + } + + int var11; + if (var0 == ScriptOpcodes.CC_SETOP) { + var11 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] - 1; + if (var11 >= 0 && var11 <= 9) { + var4.setAction(var11, Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); + return 1; + } else { + --Interpreter.Interpreter_stringStackSize; + return 1; + } + } else { + int var6; + if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { + Interpreter.Interpreter_intStackSize -= 2; + var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var4.parent = ModelData0.getWidgetChild(var11, var6); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { + var4.isScrollBar = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { + var4.dragZoneSize = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { + var4.dragThreshold = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { + var4.dataText = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { + var4.spellActionName = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { + var4.actions = null; + return 1; + } else if (var0 == 1308) { + var4.field2688 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else { + int var7; + byte[] var9; + if (var0 != ScriptOpcodes.CC_SETOPKEY) { + byte var5; + if (var0 == ScriptOpcodes.CC_SETOPTKEY) { + Interpreter.Interpreter_intStackSize -= 2; + var5 = 10; + var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]}; + byte[] var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]}; + class80.Widget_setKey(var4, var5, var9, var10); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { + Interpreter.Interpreter_intStackSize -= 3; + var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] - 1; + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + if (var11 >= 0 && var11 <= 9) { + FontName.Widget_setKeyRate(var4, var11, var6, var7); + return 1; + } else { + throw new RuntimeException(); + } + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { + var5 = 10; + var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + FontName.Widget_setKeyRate(var4, var5, var6, var7); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { + --Interpreter.Interpreter_intStackSize; + var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] - 1; + if (var11 >= 0 && var11 <= 9) { + class30.Widget_setKeyIgnoreHeld(var4, var11); + return 1; + } else { + throw new RuntimeException(); + } + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { + var5 = 10; + class30.Widget_setKeyIgnoreHeld(var4, var5); + return 1; + } else { + return 2; + } + } else { + byte[] var8 = null; + var9 = null; + if (var3) { + Interpreter.Interpreter_intStackSize -= 10; + + for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + Interpreter.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 + Interpreter.Interpreter_intStackSize]; + var9[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize + 1]; + } + } + } else { + Interpreter.Interpreter_intStackSize -= 2; + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]}; + var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]}; + } + + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] - 1; + if (var7 >= 0 && var7 <= 9) { + class80.Widget_setKey(var4, var7, var8, var9); + return 1; + } else { + throw new RuntimeException(); + } + } + } + } + } + + @ObfuscatedName("hn") + @ObfuscatedSignature( + signature = "(IIIILjava/lang/String;Ljava/lang/String;III)V", + garbageValue = "1546769014" + ) + @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 = MenuAction.getPacketBufferNode(ClientPacket.field2270, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5432(RouteStrategy.baseY * 64 + var1); + var8.packetBuffer.writeShortLE(class185.selectedItemSlot); + var8.packetBuffer.method5433(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeIntLE(FontName.selectedItemWidget); + var8.packetBuffer.method5432(PacketWriter.baseX * 64 + var0); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.writeShortLE(class1.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 = MenuAction.getPacketBufferNode(ClientPacket.field2277, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeShort(PacketWriter.baseX * 64 + var0); + var8.packetBuffer.method5443(var3); + var8.packetBuffer.writeIntLE16(NetCache.field3162); + var8.packetBuffer.writeShort(Client.field816); + var8.packetBuffer.writeShortLE(RouteStrategy.baseY * 64 + var1); + 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 = MenuAction.getPacketBufferNode(ClientPacket.field2212, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShort(RouteStrategy.baseY * 64 + var1); + var8.packetBuffer.method5435(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method5443(var3); + var8.packetBuffer.method5432(PacketWriter.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 = MenuAction.getPacketBufferNode(ClientPacket.field2264, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5433(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.writeShort(RouteStrategy.baseY * 64 + var1); + var8.packetBuffer.writeShort(PacketWriter.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 = MenuAction.getPacketBufferNode(ClientPacket.field2274, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5432(PacketWriter.baseX * 64 + var0); + var8.packetBuffer.method5443(var3); + var8.packetBuffer.method5432(RouteStrategy.baseY * 64 + var1); + var8.packetBuffer.method5433(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + 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 = MenuAction.getPacketBufferNode(ClientPacket.field2248, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5433(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method5443(RouteStrategy.baseY * 64 + var1); + var8.packetBuffer.method5443(PacketWriter.baseX * 64 + var0); + 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 = MenuAction.getPacketBufferNode(ClientPacket.field2208, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5432(class1.selectedItemId); + var9.packetBuffer.writeShort(class185.selectedItemSlot); + var9.packetBuffer.method5432(var3); + var9.packetBuffer.method5545(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.writeInt(FontName.selectedItemWidget); + 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 = MenuAction.getPacketBufferNode(ClientPacket.field2271, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5432(var3); + var9.packetBuffer.method5545(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.writeIntLE(NetCache.field3162); + var9.packetBuffer.method5443(Client.field816); + 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 = MenuAction.getPacketBufferNode(ClientPacket.field2256, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5545(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.writeShortLE(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 = MenuAction.getPacketBufferNode(ClientPacket.field2186, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5443(var3); + var9.packetBuffer.writeByte(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 = MenuAction.getPacketBufferNode(ClientPacket.field2218, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5432(var3); + var9.packetBuffer.writeByte(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 = MenuAction.getPacketBufferNode(ClientPacket.field2196, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShort(var3); + var9.packetBuffer.method5433(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + 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 = MenuAction.getPacketBufferNode(ClientPacket.field2216, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method5443(var3); + 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 = MenuAction.getPacketBufferNode(ClientPacket.field2242, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5432(class185.selectedItemSlot); + var9.packetBuffer.method5435(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.writeIntME(FontName.selectedItemWidget); + var9.packetBuffer.writeShort(var3); + var9.packetBuffer.writeShort(class1.selectedItemId); + 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 = MenuAction.getPacketBufferNode(ClientPacket.field2240, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeIntLE16(NetCache.field3162); + var9.packetBuffer.method5435(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method5443(Client.field816); + var9.packetBuffer.writeShort(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 = MenuAction.getPacketBufferNode(ClientPacket.field2251, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(FontName.selectedItemWidget); + var8.packetBuffer.method5432(class1.selectedItemId); + var8.packetBuffer.method5433(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeShortLE(class185.selectedItemSlot); + var8.packetBuffer.method5432(var3); + var8.packetBuffer.method5432(PacketWriter.baseX * 64 + var0); + var8.packetBuffer.writeShortLE(RouteStrategy.baseY * 64 + var1); + 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 = MenuAction.getPacketBufferNode(ClientPacket.field2217, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(NetCache.field3162); + var8.packetBuffer.writeShort(Client.field816); + var8.packetBuffer.method5443(RouteStrategy.baseY * 64 + var1); + var8.packetBuffer.method5443(PacketWriter.baseX * 64 + var0); + var8.packetBuffer.method5433(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeShortLE(var3); + 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 = MenuAction.getPacketBufferNode(ClientPacket.field2190, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5432(RouteStrategy.baseY * 64 + var1); + var8.packetBuffer.writeShortLE(var3); + var8.packetBuffer.writeShortLE(PacketWriter.baseX * 64 + var0); + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + 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 = MenuAction.getPacketBufferNode(ClientPacket.field2259, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5432(var3); + var8.packetBuffer.method5443(PacketWriter.baseX * 64 + var0); + var8.packetBuffer.writeShort(RouteStrategy.baseY * 64 + var1); + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + 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 = MenuAction.getPacketBufferNode(ClientPacket.field2191, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShortLE(RouteStrategy.baseY * 64 + var1); + var8.packetBuffer.method5435(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeShortLE(PacketWriter.baseX * 64 + var0); + var8.packetBuffer.writeShortLE(var3); + 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 = MenuAction.getPacketBufferNode(ClientPacket.field2214, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5443(RouteStrategy.baseY * 64 + var1); + var8.packetBuffer.writeShortLE(var3); + var8.packetBuffer.writeShort(PacketWriter.baseX * 64 + var0); + var8.packetBuffer.method5435(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 = MenuAction.getPacketBufferNode(ClientPacket.field2236, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method5432(var3); + var8.packetBuffer.method5443(RouteStrategy.baseY * 64 + var1); + var8.packetBuffer.writeShort(PacketWriter.baseX * 64 + var0); + Client.packetWriter.addNode(var8); + } else if (var2 == 23) { + if (Client.isMenuOpen) { + Player.scene.setViewportWalking(); + } else { + Player.scene.menuOpen(ItemContainer.plane, var0, var1, true); + } + } else { + PacketBufferNode var10; + Widget var16; + if (var2 == 24) { + var16 = WorldMapElement.getWidget(var1); + boolean var12 = true; + if (var16.contentType > 0) { + var12 = WorldMapSection1.method563(var16); + } + + if (var12) { + var10 = MenuAction.getPacketBufferNode(ClientPacket.field2254, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var10); + } + } else { + if (var2 == 25) { + var16 = ModelData0.getWidgetChild(var1, var0); + if (var16 != null) { + WorldMapRegion.Widget_runOnTargetLeave(); + class223.method4036(var1, var0, WorldMapRegion.method530(ParamDefinition.getWidgetClickMask(var16)), var16.itemId); + Client.isItemSelected = 0; + Client.selectedSpellActionName = class173.method3529(var16); + if (Client.selectedSpellActionName == null) { + Client.selectedSpellActionName = "null"; + } + + if (var16.isIf3) { + Client.selectedSpellName = var16.dataText + class16.colorStartTag(16777215); + } else { + Client.selectedSpellName = class16.colorStartTag(65280) + var16.spellName + class16.colorStartTag(16777215); + } + } + + return; + } + + if (var2 == 26) { + ParamDefinition.method4424(); + } else { + int var11; + Widget var14; + if (var2 == 28) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2254, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var8); + var14 = WorldMapElement.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]; + ObjectSound.method1837(var11); + } + } else if (var2 == 29) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2254, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var8); + var14 = WorldMapElement.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]; + ObjectSound.method1837(var11); + } + } + } else if (var2 == 30) { + if (Client.meslayerContinueWidget == null) { + GameShell.resumePauseWidget(var1, var0); + Client.meslayerContinueWidget = ModelData0.getWidgetChild(var1, var0); + FriendSystem.invalidateWidget(Client.meslayerContinueWidget); + } + } else if (var2 == 31) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2229, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(var1); + var8.packetBuffer.writeIntLE16(FontName.selectedItemWidget); + var8.packetBuffer.method5432(class185.selectedItemSlot); + var8.packetBuffer.writeShortLE(class1.selectedItemId); + var8.packetBuffer.writeShortLE(var0); + var8.packetBuffer.method5432(var3); + Client.packetWriter.addNode(var8); + Client.field729 = 0; + Actor.field978 = WorldMapElement.getWidget(var1); + Client.field730 = var0; + } else if (var2 == 32) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2187, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(NetCache.field3162); + var8.packetBuffer.writeInt(var1); + var8.packetBuffer.writeShort(var0); + var8.packetBuffer.writeShortLE(var3); + var8.packetBuffer.writeShortLE(Client.field816); + Client.packetWriter.addNode(var8); + Client.field729 = 0; + Actor.field978 = WorldMapElement.getWidget(var1); + Client.field730 = var0; + } else if (var2 == 33) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2235, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShortLE(var3); + var8.packetBuffer.writeIntME(var1); + var8.packetBuffer.writeShort(var0); + Client.packetWriter.addNode(var8); + Client.field729 = 0; + Actor.field978 = WorldMapElement.getWidget(var1); + Client.field730 = var0; + } else if (var2 == 34) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2283, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5443(var3); + var8.packetBuffer.writeIntLE16(var1); + var8.packetBuffer.method5432(var0); + Client.packetWriter.addNode(var8); + Client.field729 = 0; + Actor.field978 = WorldMapElement.getWidget(var1); + Client.field730 = var0; + } else if (var2 == 35) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2257, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntLE(var1); + var8.packetBuffer.method5432(var0); + var8.packetBuffer.method5432(var3); + Client.packetWriter.addNode(var8); + Client.field729 = 0; + Actor.field978 = WorldMapElement.getWidget(var1); + Client.field730 = var0; + } else if (var2 == 36) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2188, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5432(var3); + var8.packetBuffer.writeInt(var1); + var8.packetBuffer.method5432(var0); + Client.packetWriter.addNode(var8); + Client.field729 = 0; + Actor.field978 = WorldMapElement.getWidget(var1); + Client.field730 = var0; + } else if (var2 == 37) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2243, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeInt(var1); + var8.packetBuffer.writeShort(var0); + var8.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var8); + Client.field729 = 0; + Actor.field978 = WorldMapElement.getWidget(var1); + Client.field730 = var0; + } else { + if (var2 == 38) { + WorldMapRegion.Widget_runOnTargetLeave(); + var16 = WorldMapElement.getWidget(var1); + Client.isItemSelected = 1; + class185.selectedItemSlot = var0; + FontName.selectedItemWidget = var1; + class1.selectedItemId = var3; + FriendSystem.invalidateWidget(var16); + Client.selectedItemName = class16.colorStartTag(16748608) + WorldMapData_0.ItemDefinition_get(var3).name + class16.colorStartTag(16777215); + if (Client.selectedItemName == null) { + Client.selectedItemName = "null"; + } + + return; + } + + if (var2 == 39) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2231, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5432(var3); + var8.packetBuffer.writeIntLE16(var1); + var8.packetBuffer.writeShortLE(var0); + Client.packetWriter.addNode(var8); + Client.field729 = 0; + Actor.field978 = WorldMapElement.getWidget(var1); + Client.field730 = var0; + } else if (var2 == 40) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2211, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntLE16(var1); + var8.packetBuffer.writeShortLE(var0); + var8.packetBuffer.method5443(var3); + Client.packetWriter.addNode(var8); + Client.field729 = 0; + Actor.field978 = WorldMapElement.getWidget(var1); + Client.field730 = var0; + } else if (var2 == 41) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2250, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntLE(var1); + var8.packetBuffer.method5443(var0); + var8.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var8); + Client.field729 = 0; + Actor.field978 = WorldMapElement.getWidget(var1); + Client.field730 = var0; + } else if (var2 == 42) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2193, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeInt(var1); + var8.packetBuffer.method5443(var0); + var8.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var8); + Client.field729 = 0; + Actor.field978 = WorldMapElement.getWidget(var1); + Client.field730 = var0; + } else if (var2 == 43) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2268, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.writeIntME(var1); + var8.packetBuffer.writeShort(var0); + Client.packetWriter.addNode(var8); + Client.field729 = 0; + Actor.field978 = WorldMapElement.getWidget(var1); + Client.field730 = 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 = MenuAction.getPacketBufferNode(ClientPacket.field2272, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShort(var3); + var9.packetBuffer.method5545(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 = MenuAction.getPacketBufferNode(ClientPacket.field2241, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5433(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method5443(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 = MenuAction.getPacketBufferNode(ClientPacket.field2247, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5443(var3); + var9.packetBuffer.writeByte(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 = MenuAction.getPacketBufferNode(ClientPacket.field2279, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5432(var3); + var9.packetBuffer.method5545(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + 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 = MenuAction.getPacketBufferNode(ClientPacket.field2262, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5433(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method5443(var3); + 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 = MenuAction.getPacketBufferNode(ClientPacket.field2249, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5443(var3); + var9.packetBuffer.method5435(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 = MenuAction.getPacketBufferNode(ClientPacket.field2260, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5435(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.writeShortLE(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 = MenuAction.getPacketBufferNode(ClientPacket.field2273, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5545(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method5432(var3); + Client.packetWriter.addNode(var9); + } + } else { + label758: { + if (var2 != 57) { + if (var2 == 58) { + var16 = ModelData0.getWidgetChild(var1, var0); + if (var16 != null) { + var9 = MenuAction.getPacketBufferNode(ClientPacket.field2246, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShortLE(Client.field816); + var9.packetBuffer.writeIntLE16(var1); + var9.packetBuffer.writeShortLE(Client.field736); + var9.packetBuffer.method5432(var0); + var9.packetBuffer.writeInt(NetCache.field3162); + var9.packetBuffer.method5432(var16.itemId); + Client.packetWriter.addNode(var9); + } + break label758; + } + + if (var2 == 1001) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2287, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.method5433(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method5443(PacketWriter.baseX * 64 + var0); + var8.packetBuffer.method5432(RouteStrategy.baseY * 64 + var1); + Client.packetWriter.addNode(var8); + break label758; + } + + if (var2 == 1002) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2239, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5443(var3); + Client.packetWriter.addNode(var8); + break label758; + } + + 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 = MenuAction.getPacketBufferNode(ClientPacket.field2215, Client.packetWriter.isaacCipher); + var10.packetBuffer.method5443(var17.id); + Client.packetWriter.addNode(var10); + } + } + break label758; + } + + if (var2 == 1004) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2209, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShortLE(var3); + Client.packetWriter.addNode(var8); + break label758; + } + + if (var2 == 1005) { + var16 = WorldMapElement.getWidget(var1); + if (var16 != null && var16.itemQuantities[var0] >= 100000) { + DirectByteArrayCopier.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + WorldMapData_0.ItemDefinition_get(var3).name); + } else { + var9 = MenuAction.getPacketBufferNode(ClientPacket.field2209, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShortLE(var3); + Client.packetWriter.addNode(var9); + } + + Client.field729 = 0; + Actor.field978 = WorldMapElement.getWidget(var1); + Client.field730 = var0; + break label758; + } + + if (var2 != 1007) { + if (var2 == 1010 || var2 == 1011 || var2 == 1008 || var2 == 1009 || var2 == 1012) { + WorldMapCacheName.worldMap.menuAction(var2, var3, new Coord(var0), new Coord(var1)); + } + break label758; + } + } + + var16 = ModelData0.getWidgetChild(var1, var0); + if (var16 != null) { + InterfaceParent.method1127(var3, var1, var0, var16.itemId, var5); + } + } + } + } + } + } } } } - if (var3 != null) { - var2.load(var1, var0, var3, true); - } else { - byte[] var4 = var1.read(var0); - var2.load(var1, var0, var4, true); + if (Client.isItemSelected != 0) { + Client.isItemSelected = 0; + FriendSystem.invalidateWidget(WorldMapElement.getWidget(FontName.selectedItemWidget)); + } + + if (Client.isSpellSelected) { + WorldMapRegion.Widget_runOnTargetLeave(); + } + + if (Actor.field978 != null && Client.field729 == 0) { + FriendSystem.invalidateWidget(Actor.field978); } - } - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1709939450" - ) - @Export("WorldMapRegion_clearCachedSprites") - static void WorldMapRegion_clearCachedSprites() { - WorldMapRegion.WorldMapRegion_cachedSprites.clear(); } } diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index 2f831a5f77..604b7eb55e 100644 --- a/runescape-client/src/main/java/SequenceDefinition.java +++ b/runescape-client/src/main/java/SequenceDefinition.java @@ -4,104 +4,103 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("is") +@ObfuscatedName("ij") @Implements("SequenceDefinition") public class SequenceDefinition extends DualNode { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("SequenceDefinition_archive") - public static AbstractArchive SequenceDefinition_archive; - @ObfuscatedName("w") + static AbstractArchive SequenceDefinition_archive; + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("SequenceDefinition_animationsArchive") - public static AbstractArchive SequenceDefinition_animationsArchive; - @ObfuscatedName("e") + static AbstractArchive SequenceDefinition_animationsArchive; + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("SequenceDefinition_skeletonsArchive") - public static AbstractArchive SequenceDefinition_skeletonsArchive; - @ObfuscatedName("p") + static AbstractArchive SequenceDefinition_skeletonsArchive; + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lep;" ) @Export("SequenceDefinition_cached") public static EvictingDualNodeHashTable SequenceDefinition_cached; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lep;" ) @Export("SequenceDefinition_cachedFrames") public static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; - @ObfuscatedName("ff") + @ObfuscatedName("bo") @ObfuscatedSignature( - signature = "Lez;" + signature = "Lha;" ) - @Export("urlRequester") - static UrlRequester urlRequester; - @ObfuscatedName("l") + static ServerBuild field3507; + @ObfuscatedName("n") @Export("frameIds") public int[] frameIds; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("chatFrameIds") int[] chatFrameIds; - @ObfuscatedName("i") + @ObfuscatedName("q") @Export("frameLengths") public int[] frameLengths; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("soundEffects") public int[] soundEffects; - @ObfuscatedName("f") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -416695211 + intValue = -522121775 ) @Export("frameCount") public int frameCount; - @ObfuscatedName("m") - int[] field3518; - @ObfuscatedName("u") - public boolean field3526; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -655637591 - ) - public int field3533; + @ObfuscatedName("f") + int[] field3500; + @ObfuscatedName("c") + public boolean field3501; @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 975165597 + intValue = -1194078823 + ) + public int field3508; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = 1255780887 ) @Export("shield") public int shield; - @ObfuscatedName("v") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -608635427 + intValue = 1291874465 ) @Export("weapon") public int weapon; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -130744455 + intValue = -1987515665 ) - public int field3535; + public int field3502; @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1640931413 + intValue = -327317387 ) - public int field3525; - @ObfuscatedName("a") + public int field3506; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1353977843 + intValue = 1253996227 ) - public int field3532; - @ObfuscatedName("j") + public int field3505; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 553206065 + intValue = -41123277 ) - public int field3529; + public int field3492; static { SequenceDefinition_cached = new EvictingDualNodeHashTable(64); @@ -110,20 +109,20 @@ public class SequenceDefinition extends DualNode { SequenceDefinition() { this.frameCount = -1; - this.field3526 = false; - this.field3533 = 5; + this.field3501 = false; + this.field3508 = 5; this.shield = -1; this.weapon = -1; - this.field3535 = 99; - this.field3525 = -1; - this.field3532 = -1; - this.field3529 = 2; + this.field3502 = 99; + this.field3506 = -1; + this.field3505 = -1; + this.field3492 = 2; } - @ObfuscatedName("w") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkf;B)V", - garbageValue = "88" + signature = "(Lky;B)V", + garbageValue = "1" ) @Export("decode") void decode(Buffer var1) { @@ -137,10 +136,10 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lkf;II)V", - garbageValue = "-1384847796" + signature = "(Lky;II)V", + garbageValue = "20396859" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -167,29 +166,29 @@ public class SequenceDefinition extends DualNode { this.frameCount = var1.readUnsignedShort(); } else if (var2 == 3) { var3 = var1.readUnsignedByte(); - this.field3518 = new int[var3 + 1]; + this.field3500 = new int[var3 + 1]; for (var4 = 0; var4 < var3; ++var4) { - this.field3518[var4] = var1.readUnsignedByte(); + this.field3500[var4] = var1.readUnsignedByte(); } - this.field3518[var3] = 9999999; + this.field3500[var3] = 9999999; } else if (var2 == 4) { - this.field3526 = true; + this.field3501 = true; } else if (var2 == 5) { - this.field3533 = 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.field3535 = var1.readUnsignedByte(); + this.field3502 = var1.readUnsignedByte(); } else if (var2 == 9) { - this.field3525 = var1.readUnsignedByte(); + this.field3506 = var1.readUnsignedByte(); } else if (var2 == 10) { - this.field3532 = var1.readUnsignedByte(); + this.field3505 = var1.readUnsignedByte(); } else if (var2 == 11) { - this.field3529 = var1.readUnsignedByte(); + this.field3492 = var1.readUnsignedByte(); } else if (var2 == 12) { var3 = var1.readUnsignedByte(); this.chatFrameIds = new int[var3]; @@ -212,159 +211,191 @@ public class SequenceDefinition extends DualNode { } - @ObfuscatedName("p") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "806874502" + garbageValue = "1147971481" ) @Export("postDecode") void postDecode() { - if (this.field3525 == -1) { - if (this.field3518 != null) { - this.field3525 = 2; + if (this.field3506 == -1) { + if (this.field3500 != null) { + this.field3506 = 2; } else { - this.field3525 = 0; + this.field3506 = 0; } } - if (this.field3532 == -1) { - if (this.field3518 != null) { - this.field3532 = 2; + if (this.field3505 == -1) { + if (this.field3500 != null) { + this.field3505 = 2; } else { - this.field3532 = 0; + this.field3505 = 0; } } } - @ObfuscatedName("k") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Ldm;II)Ldm;", - garbageValue = "1904294443" + signature = "(Ldo;II)Ldo;", + garbageValue = "1625064611" ) @Export("transformActorModel") public Model transformActorModel(Model var1, int var2) { var2 = this.frameIds[var2]; - Frames var3 = class30.getFrames(var2 >> 16); - var2 &= 0xffff; + Frames var3 = WorldMapSprite.getFrames(var2 >> 16); + var2 &= 65535; if (var3 == null) { return var1.toSharedSequenceModel(true); + } else { + Model var4 = var1.toSharedSequenceModel(!var3.hasAlphaTransform(var2)); + var4.animate(var3, var2); + return var4; } - Model var4 = var1.toSharedSequenceModel(!var3.hasAlphaTransform(var2)); - var4.animate(var3, var2); - return var4; } - @ObfuscatedName("l") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Ldm;IIB)Ldm;", - garbageValue = "-68" + signature = "(Ldo;III)Ldo;", + garbageValue = "1397099935" ) @Export("transformObjectModel") Model transformObjectModel(Model var1, int var2, int var3) { var2 = this.frameIds[var2]; - Frames var4 = class30.getFrames(var2 >> 16); - var2 &= 0xffff; + Frames var4 = WorldMapSprite.getFrames(var2 >> 16); + var2 &= 65535; if (var4 == null) { return var1.toSharedSequenceModel(true); - } - Model var5 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var2)); - var3 &= 3; - if (var3 == 1) { - var5.rotateY270Ccw(); - } else if (var3 == 2) { - var5.rotateY180(); - } else if (var3 == 3) { - var5.rotateY90Ccw(); - } + } else { + Model var5 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var2)); + var3 &= 3; + if (var3 == 1) { + var5.rotateY270Ccw(); + } else if (var3 == 2) { + var5.rotateY180(); + } else if (var3 == 3) { + var5.rotateY90Ccw(); + } - var5.animate(var4, var2); - if (var3 == 1) { - var5.rotateY90Ccw(); - } else if (var3 == 2) { - var5.rotateY180(); - } else if (var3 == 3) { - var5.rotateY270Ccw(); - } + var5.animate(var4, var2); + if (var3 == 1) { + var5.rotateY90Ccw(); + } else if (var3 == 2) { + var5.rotateY180(); + } else if (var3 == 3) { + var5.rotateY270Ccw(); + } - return var5; + return var5; + } } - @ObfuscatedName("b") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Ldm;II)Ldm;", - garbageValue = "-1365798268" + signature = "(Ldo;IB)Ldo;", + garbageValue = "-37" ) @Export("transformSpotAnimationModel") Model transformSpotAnimationModel(Model var1, int var2) { var2 = this.frameIds[var2]; - Frames var3 = class30.getFrames(var2 >> 16); - var2 &= 0xffff; + Frames var3 = WorldMapSprite.getFrames(var2 >> 16); + var2 &= 65535; if (var3 == null) { return var1.toSharedSpotAnimationModel(true); + } else { + Model var4 = var1.toSharedSpotAnimationModel(!var3.hasAlphaTransform(var2)); + var4.animate(var3, var2); + return var4; } - Model var4 = var1.toSharedSpotAnimationModel(!var3.hasAlphaTransform(var2)); - var4.animate(var3, var2); - return var4; } - @ObfuscatedName("i") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ldm;ILis;II)Ldm;", - garbageValue = "743277610" + signature = "(Ldo;ILij;II)Ldo;", + garbageValue = "-111207649" ) @Export("applyTransformations") public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, int var4) { var2 = this.frameIds[var2]; - Frames var5 = class30.getFrames(var2 >> 16); - var2 &= 0xffff; + Frames var5 = WorldMapSprite.getFrames(var2 >> 16); + var2 &= 65535; if (var5 == null) { return var3.transformActorModel(var1, var4); + } else { + var4 = var3.frameIds[var4]; + Frames var6 = WorldMapSprite.getFrames(var4 >> 16); + var4 &= 65535; + Model var7; + if (var6 == null) { + var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); + var7.animate(var5, var2); + return var7; + } else { + var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); + var7.animate2(var5, var2, var6, var4, this.field3500); + return var7; + } } - var4 = var3.frameIds[var4]; - Frames var6 = class30.getFrames(var4 >> 16); - var4 &= 0xffff; - Model var7; - if (var6 == null) { - var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); - var7.animate(var5, var2); - return var7; - } - var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); - var7.animate2(var5, var2, var6, var4, this.field3518); - return var7; } - @ObfuscatedName("c") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Ldm;II)Ldm;", - garbageValue = "-1834936397" + signature = "(Ldo;II)Ldo;", + garbageValue = "793015931" ) @Export("transformWidgetModel") public Model transformWidgetModel(Model var1, int var2) { int var3 = this.frameIds[var2]; - Frames var4 = class30.getFrames(var3 >> 16); - var3 &= 0xffff; + Frames var4 = WorldMapSprite.getFrames(var3 >> 16); + var3 &= 65535; if (var4 == null) { return var1.toSharedSequenceModel(true); + } else { + Frames var5 = null; + int var6 = 0; + if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { + var6 = this.chatFrameIds[var2]; + var5 = WorldMapSprite.getFrames(var6 >> 16); + var6 &= 65535; + } + + Model var7; + if (var5 != null && var6 != 65535) { + var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3) & !var5.hasAlphaTransform(var6)); + var7.animate(var4, var3); + var7.animate(var5, var6); + return var7; + } else { + var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3)); + var7.animate(var4, var3); + return var7; + } } - Frames var5 = null; - int var6 = 0; - if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { - var6 = this.chatFrameIds[var2]; - var5 = class30.getFrames(var6 >> 16); - var6 &= 0xffff; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(I)J", + garbageValue = "1864654090" + ) + public static final synchronized long method4686() { + long var0 = System.currentTimeMillis(); + if (var0 < class296.field3688) { + class296.field3689 += class296.field3688 - var0; } - Model var7; - if (var5 != null && var6 != 0xffff) { - var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3) & !var5.hasAlphaTransform(var6)); - var7.animate(var4, var3); - var7.animate(var5, var6); - return var7; - } - var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3)); - var7.animate(var4, var3); - return var7; + class296.field3688 = var0; + return class296.field3689 + var0; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(B)[Llb;", + garbageValue = "43" + ) + @Export("FillMode_values") + public static FillMode[] FillMode_values() { + return new FillMode[]{FillMode.field3858, FillMode.field3860, FillMode.SOLID}; } } diff --git a/runescape-client/src/main/java/ServerBuild.java b/runescape-client/src/main/java/ServerBuild.java index bc980eddad..4682f7d29a 100644 --- a/runescape-client/src/main/java/ServerBuild.java +++ b/runescape-client/src/main/java/ServerBuild.java @@ -4,44 +4,41 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ht") +@ObfuscatedName("ha") @Implements("ServerBuild") public class ServerBuild { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lht;" + signature = "Lha;" ) @Export("LIVE") static final ServerBuild LIVE; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lht;" + signature = "Lha;" ) @Export("BUILDLIVE") static final ServerBuild BUILDLIVE; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lht;" + signature = "Lha;" ) @Export("RC") static final ServerBuild RC; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lht;" + signature = "Lha;" ) @Export("WIP") static final ServerBuild WIP; - @ObfuscatedName("f") - @Export("Tiles_hue") - static int[] Tiles_hue; - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("name") public final String name; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1706897489 + intValue = 1354780061 ) - final int field3097; + public final int field3080; static { LIVE = new ServerBuild("LIVE", 0); @@ -52,25 +49,6 @@ public class ServerBuild { ServerBuild(String var1, int var2) { this.name = var1; - this.field3097 = var2; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(II)Lht;", - garbageValue = "-1180809125" - ) - @Export("valueOf") - public static ServerBuild valueOf(int var0) { - ServerBuild[] var1 = IsaacCipher.ServerBuild_values(); - - for (int var2 = 0; var2 < var1.length; ++var2) { - ServerBuild var3 = var1[var2]; - if (var0 == var3.field3097) { - return var3; - } - } - - return null; + this.field3080 = var2; } } diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java index 12c3124dc4..23207f9c23 100644 --- a/runescape-client/src/main/java/ServerPacket.java +++ b/runescape-client/src/main/java/ServerPacket.java @@ -4,543 +4,580 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gc") +@ObfuscatedName("gj") @Implements("ServerPacket") public class ServerPacket { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lgc;" + signature = "Lgj;" ) - public static final ServerPacket field2160; - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2116; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2117; - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2152; - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2119; - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2165; - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2178; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2122; - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2190; - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2176; - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2141; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2126; - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2127; - @ObfuscatedName("r") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2128; - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2129; - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2130; - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2131; - @ObfuscatedName("a") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2120; + public static final ServerPacket field2102; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lgc;" + signature = "Lgj;" ) - public static final ServerPacket field2133; + public static final ServerPacket field2098; + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2099; + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2183; + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2101; + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2170; @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lgc;" + signature = "Lgj;" + ) + public static final ServerPacket field2100; + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2158; + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2105; + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2106; + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2107; + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2108; + @ObfuscatedName("r") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2161; + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2184; + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2178; + @ObfuscatedName("b") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2112; + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2137; + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2114; + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2104; + @ObfuscatedName("a") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2116; + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2115; + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "Lgj;" ) public static final ServerPacket field2134; @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Lgc;" + signature = "Lgj;" ) - public static final ServerPacket field2125; - @ObfuscatedName("o") + public static final ServerPacket field2119; + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lgc;" + signature = "Lgj;" ) - public static final ServerPacket field2136; - @ObfuscatedName("n") + public static final ServerPacket field2120; + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2191; - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2138; - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2139; - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2140; - @ObfuscatedName("al") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2137; - @ObfuscatedName("av") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2135; - @ObfuscatedName("as") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2143; - @ObfuscatedName("aw") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2144; - @ObfuscatedName("ad") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2181; - @ObfuscatedName("ag") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2175; - @ObfuscatedName("ar") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2147; - @ObfuscatedName("ax") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2148; - @ObfuscatedName("az") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2149; - @ObfuscatedName("ae") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2118; - @ObfuscatedName("ao") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2151; - @ObfuscatedName("aj") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2202; - @ObfuscatedName("at") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2180; - @ObfuscatedName("ac") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2154; - @ObfuscatedName("ap") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2155; - @ObfuscatedName("aq") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2156; - @ObfuscatedName("aa") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2157; - @ObfuscatedName("an") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2162; - @ObfuscatedName("au") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2159; - @ObfuscatedName("ai") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2189; - @ObfuscatedName("ak") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2161; - @ObfuscatedName("ah") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2150; - @ObfuscatedName("am") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2163; - @ObfuscatedName("ay") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2164; - @ObfuscatedName("af") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2123; - @ObfuscatedName("ab") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2166; - @ObfuscatedName("bp") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2167; - @ObfuscatedName("bz") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2153; - @ObfuscatedName("bi") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2142; - @ObfuscatedName("bg") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2170; - @ObfuscatedName("bh") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2171; - @ObfuscatedName("bm") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2172; - @ObfuscatedName("bn") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2132; - @ObfuscatedName("bc") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2174; - @ObfuscatedName("bx") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2169; - @ObfuscatedName("bo") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2124; - @ObfuscatedName("bb") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2177; - @ObfuscatedName("bs") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2168; - @ObfuscatedName("bj") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2179; - @ObfuscatedName("bl") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2158; - @ObfuscatedName("bd") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2173; - @ObfuscatedName("by") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2182; - @ObfuscatedName("bt") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2183; - @ObfuscatedName("bq") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2184; - @ObfuscatedName("bu") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2185; - @ObfuscatedName("bw") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2186; - @ObfuscatedName("br") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2187; - @ObfuscatedName("bk") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2188; - @ObfuscatedName("bf") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2115; - @ObfuscatedName("bv") - @ObfuscatedSignature( - signature = "Lgc;" + signature = "Lgj;" ) public static final ServerPacket field2121; - @ObfuscatedName("be") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgc;" + signature = "Lgj;" + ) + public static final ServerPacket field2122; + @ObfuscatedName("av") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2123; + @ObfuscatedName("am") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2124; + @ObfuscatedName("ai") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2159; + @ObfuscatedName("af") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2126; + @ObfuscatedName("az") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2136; + @ObfuscatedName("aj") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2128; + @ObfuscatedName("an") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2163; + @ObfuscatedName("at") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2117; + @ObfuscatedName("as") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2131; + @ObfuscatedName("ak") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2130; + @ObfuscatedName("ao") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2133; + @ObfuscatedName("ac") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2129; + @ObfuscatedName("ar") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2135; + @ObfuscatedName("au") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2148; + @ObfuscatedName("ax") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2175; + @ObfuscatedName("ag") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2138; + @ObfuscatedName("aa") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2139; + @ObfuscatedName("ap") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2140; + @ObfuscatedName("aq") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2141; + @ObfuscatedName("ay") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2142; + @ObfuscatedName("ad") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2143; + @ObfuscatedName("al") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2144; + @ObfuscatedName("ah") + @ObfuscatedSignature( + signature = "Lgj;" ) public static final ServerPacket field2145; + @ObfuscatedName("ab") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2146; + @ObfuscatedName("aw") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2147; + @ObfuscatedName("ae") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2125; + @ObfuscatedName("bk") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2149; + @ObfuscatedName("bw") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2150; + @ObfuscatedName("bo") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2151; + @ObfuscatedName("bn") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2152; + @ObfuscatedName("bp") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2162; + @ObfuscatedName("bz") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2097; + @ObfuscatedName("bh") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2155; + @ObfuscatedName("bv") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2156; + @ObfuscatedName("bj") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2118; + @ObfuscatedName("bq") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2132; + @ObfuscatedName("by") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2110; + @ObfuscatedName("bs") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2160; + @ObfuscatedName("bi") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2103; + @ObfuscatedName("bf") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2127; + @ObfuscatedName("bd") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2154; + @ObfuscatedName("br") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2164; + @ObfuscatedName("bm") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2165; + @ObfuscatedName("bu") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2179; + @ObfuscatedName("bb") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2167; + @ObfuscatedName("bl") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2168; + @ObfuscatedName("bt") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2169; + @ObfuscatedName("bx") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2166; @ObfuscatedName("ba") @ObfuscatedSignature( - signature = "Lgc;" + signature = "Lgj;" ) - public static final ServerPacket field2192; - @ObfuscatedName("cr") + public static final ServerPacket field2171; + @ObfuscatedName("bg") @ObfuscatedSignature( - signature = "Lgc;" + signature = "Lgj;" ) - public static final ServerPacket field2193; + public static final ServerPacket field2172; + @ObfuscatedName("be") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2173; + @ObfuscatedName("bc") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2174; + @ObfuscatedName("ce") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2153; + @ObfuscatedName("ci") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2176; + @ObfuscatedName("ck") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2177; + @ObfuscatedName("cc") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2113; + @ObfuscatedName("cd") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2157; @ObfuscatedName("cf") @ObfuscatedSignature( - signature = "Lgc;" + signature = "Lgj;" ) - public static final ServerPacket field2194; + public static final ServerPacket field2180; + @ObfuscatedName("cw") + @ObfuscatedSignature( + signature = "Lgj;" + ) + public static final ServerPacket field2181; @ObfuscatedName("cj") @ObfuscatedSignature( - signature = "Lgc;" + signature = "Lgj;" ) - public static final ServerPacket field2195; - @ObfuscatedName("cl") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2196; - @ObfuscatedName("cn") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2197; - @ObfuscatedName("cy") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2198; - @ObfuscatedName("ct") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2199; - @ObfuscatedName("cq") - @ObfuscatedSignature( - signature = "Lgc;" - ) - public static final ServerPacket field2200; + public static final ServerPacket field2182; @ObfuscatedName("cp") @ObfuscatedGetter( - intValue = 495376883 + intValue = -69273905 ) @Export("id") public final int id; - @ObfuscatedName("ch") + @ObfuscatedName("cu") @ObfuscatedGetter( - intValue = 1858347071 + intValue = -1621131225 ) @Export("length") public final int length; static { - field2160 = new ServerPacket(0, -2); - field2116 = new ServerPacket(1, 0); - field2117 = new ServerPacket(2, 0); - field2152 = new ServerPacket(3, -1); - field2119 = new ServerPacket(4, 6); - field2165 = new ServerPacket(5, 4); - field2178 = new ServerPacket(6, 4); - field2122 = new ServerPacket(7, 4); - field2190 = new ServerPacket(8, 6); - field2176 = new ServerPacket(9, 4); - field2141 = new ServerPacket(10, -2); - field2126 = new ServerPacket(11, 15); - field2127 = new ServerPacket(12, 5); - field2128 = new ServerPacket(13, 2); - field2129 = new ServerPacket(14, 3); - field2130 = new ServerPacket(15, 7); - field2131 = new ServerPacket(16, 1); - field2120 = new ServerPacket(17, -2); - field2133 = new ServerPacket(18, -2); - field2134 = new ServerPacket(19, -2); - field2125 = new ServerPacket(20, 10); - field2136 = new ServerPacket(21, 5); - field2191 = new ServerPacket(22, 6); - field2138 = new ServerPacket(23, 2); - field2139 = new ServerPacket(24, 6); - field2140 = new ServerPacket(25, 2); - field2137 = new ServerPacket(26, 5); - field2135 = new ServerPacket(27, -2); - field2143 = new ServerPacket(28, 0); - field2144 = new ServerPacket(29, 0); - field2181 = new ServerPacket(30, 4); - field2175 = new ServerPacket(31, 6); - field2147 = new ServerPacket(32, -2); - field2148 = new ServerPacket(33, -2); - field2149 = new ServerPacket(34, 1); - field2118 = new ServerPacket(35, 6); - field2151 = new ServerPacket(36, 6); - field2202 = new ServerPacket(37, -1); - field2180 = new ServerPacket(38, -2); - field2154 = new ServerPacket(39, 4); - field2155 = new ServerPacket(40, 5); - field2156 = new ServerPacket(41, 8); - field2157 = new ServerPacket(42, 14); - field2162 = new ServerPacket(43, -2); - field2159 = new ServerPacket(44, -2); - field2189 = new ServerPacket(45, -1); - field2161 = new ServerPacket(46, 2); - field2150 = new ServerPacket(47, -1); - field2163 = new ServerPacket(48, 12); - field2164 = new ServerPacket(49, 4); - field2123 = new ServerPacket(50, 10); - field2166 = new ServerPacket(51, -2); - field2167 = new ServerPacket(52, 0); - field2153 = new ServerPacket(53, -2); - field2142 = new ServerPacket(54, -1); - field2170 = new ServerPacket(55, 20); - field2171 = new ServerPacket(56, -2); - field2172 = new ServerPacket(57, 28); - field2132 = new ServerPacket(58, -2); - field2174 = new ServerPacket(59, 8); - field2169 = new ServerPacket(60, 1); - field2124 = new ServerPacket(61, 6); - field2177 = new ServerPacket(62, -2); - field2168 = new ServerPacket(63, 3); - field2179 = new ServerPacket(64, 2); - field2158 = new ServerPacket(65, 5); - field2173 = new ServerPacket(66, -1); - field2182 = new ServerPacket(67, 2); - field2183 = new ServerPacket(68, 1); - field2184 = new ServerPacket(69, 8); - field2185 = new ServerPacket(70, -2); - field2186 = new ServerPacket(71, 2); - field2187 = new ServerPacket(72, 2); - field2188 = new ServerPacket(73, 0); - field2115 = new ServerPacket(74, 1); - field2121 = new ServerPacket(75, 6); - field2145 = new ServerPacket(76, 6); - field2192 = new ServerPacket(77, 7); - field2193 = new ServerPacket(78, 0); - field2194 = new ServerPacket(79, -2); - field2195 = new ServerPacket(80, 2); - field2196 = new ServerPacket(81, -2); - field2197 = new ServerPacket(82, 8); - field2198 = new ServerPacket(83, 6); - field2199 = new ServerPacket(84, 2); - field2200 = new ServerPacket(85, 1); + field2102 = new ServerPacket(0, -2); + field2098 = new ServerPacket(1, 0); + field2099 = new ServerPacket(2, 0); + field2183 = new ServerPacket(3, -1); + field2101 = new ServerPacket(4, 6); + field2170 = new ServerPacket(5, 4); + field2100 = new ServerPacket(6, 4); + field2158 = new ServerPacket(7, 4); + field2105 = new ServerPacket(8, 6); + field2106 = new ServerPacket(9, 4); + field2107 = new ServerPacket(10, -2); + field2108 = new ServerPacket(11, 15); + field2161 = new ServerPacket(12, 5); + field2184 = new ServerPacket(13, 2); + field2178 = new ServerPacket(14, 3); + field2112 = new ServerPacket(15, 7); + field2137 = new ServerPacket(16, 1); + field2114 = new ServerPacket(17, -2); + field2104 = new ServerPacket(18, -2); + field2116 = new ServerPacket(19, -2); + field2115 = new ServerPacket(20, 10); + field2134 = new ServerPacket(21, 5); + field2119 = new ServerPacket(22, 6); + field2120 = new ServerPacket(23, 2); + field2121 = new ServerPacket(24, 6); + field2122 = new ServerPacket(25, 2); + field2123 = new ServerPacket(26, 5); + field2124 = new ServerPacket(27, -2); + field2159 = new ServerPacket(28, 0); + field2126 = new ServerPacket(29, 0); + field2136 = new ServerPacket(30, 4); + field2128 = new ServerPacket(31, 6); + field2163 = new ServerPacket(32, -2); + field2117 = new ServerPacket(33, -2); + field2131 = new ServerPacket(34, 1); + field2130 = new ServerPacket(35, 6); + field2133 = new ServerPacket(36, 6); + field2129 = new ServerPacket(37, -1); + field2135 = new ServerPacket(38, -2); + field2148 = new ServerPacket(39, 4); + field2175 = new ServerPacket(40, 5); + field2138 = new ServerPacket(41, 8); + field2139 = new ServerPacket(42, 14); + field2140 = new ServerPacket(43, -2); + field2141 = new ServerPacket(44, -2); + field2142 = new ServerPacket(45, -1); + field2143 = new ServerPacket(46, 2); + field2144 = new ServerPacket(47, -1); + field2145 = new ServerPacket(48, 12); + field2146 = new ServerPacket(49, 4); + field2147 = new ServerPacket(50, 10); + field2125 = new ServerPacket(51, -2); + field2149 = new ServerPacket(52, 0); + field2150 = new ServerPacket(53, -2); + field2151 = new ServerPacket(54, -1); + field2152 = new ServerPacket(55, 20); + field2162 = new ServerPacket(56, -2); + field2097 = new ServerPacket(57, 28); + field2155 = new ServerPacket(58, -2); + field2156 = new ServerPacket(59, 8); + field2118 = new ServerPacket(60, 1); + field2132 = new ServerPacket(61, 6); + field2110 = new ServerPacket(62, -2); + field2160 = new ServerPacket(63, 3); + field2103 = new ServerPacket(64, 2); + field2127 = new ServerPacket(65, 5); + field2154 = new ServerPacket(66, -1); + field2164 = new ServerPacket(67, 2); + field2165 = new ServerPacket(68, 1); + field2179 = new ServerPacket(69, 8); + field2167 = new ServerPacket(70, -2); + field2168 = new ServerPacket(71, 2); + field2169 = new ServerPacket(72, 2); + field2166 = new ServerPacket(73, 0); + field2171 = new ServerPacket(74, 1); + field2172 = new ServerPacket(75, 6); + field2173 = new ServerPacket(76, 6); + field2174 = new ServerPacket(77, 7); + field2153 = new ServerPacket(78, 0); + field2176 = new ServerPacket(79, -2); + field2177 = new ServerPacket(80, 2); + field2113 = new ServerPacket(81, -2); + field2157 = new ServerPacket(82, 8); + field2180 = new ServerPacket(83, 6); + field2181 = new ServerPacket(84, 2); + field2182 = new ServerPacket(85, 1); } ServerPacket(int var1, int var2) { this.id = var1; this.length = var2; } + + @ObfuscatedName("gm") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "-1" + ) + static final void method3555() { + for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { + if (var0.plane == ItemContainer.plane && !var0.isFinished) { + if (Client.cycle >= var0.cycleStart) { + var0.advance(Client.field879); + if (var0.isFinished) { + var0.remove(); + } else { + Player.scene.drawEntity(var0.plane, var0.x, var0.y, var0.height, 60, var0, 0, -1L, false); + } + } + } else { + var0.remove(); + } + } + + } + + @ObfuscatedName("jb") + @ObfuscatedSignature( + signature = "(Lhp;B)Lhp;", + garbageValue = "-118" + ) + static Widget method3552(Widget var0) { + Widget var1 = AbstractByteArrayCopier.method3871(var0); + if (var1 == null) { + var1 = var0.parent; + } + + return var1; + } } diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java index f4de471815..2c5f252561 100644 --- a/runescape-client/src/main/java/Skeleton.java +++ b/runescape-client/src/main/java/Skeleton.java @@ -3,33 +3,26 @@ 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("ej") +@ObfuscatedName("ex") @Implements("Skeleton") public class Skeleton extends Node { - @ObfuscatedName("ei") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 735653507 - ) - @Export("port2") - static int port2; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 722010211 + intValue = 1796359349 ) @Export("id") int id; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1628555535 + intValue = -911873839 ) @Export("count") int count; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("transformTypes") int[] transformTypes; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("labels") int[][] labels; @@ -57,180 +50,12 @@ public class Skeleton extends Node { } - @ObfuscatedName("q") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkf;Ljava/lang/String;I)I", - garbageValue = "-730620007" + signature = "(I)I", + garbageValue = "244690440" ) - public static int method3063(Buffer var0, String var1) { - int var2 = var0.offset; - int var4 = var1.length(); - byte[] var5 = new byte[var4]; - - for (int var6 = 0; var6 < var4; ++var6) { - char var7 = var1.charAt(var6); - if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { - var5[var6] = (byte)var7; - } else if (var7 == 8364) { - var5[var6] = -128; - } else if (var7 == 8218) { - var5[var6] = -126; - } else if (var7 == 402) { - var5[var6] = -125; - } else if (var7 == 8222) { - var5[var6] = -124; - } else if (var7 == 8230) { - var5[var6] = -123; - } else if (var7 == 8224) { - var5[var6] = -122; - } else if (var7 == 8225) { - var5[var6] = -121; - } else if (var7 == 710) { - var5[var6] = -120; - } else if (var7 == 8240) { - var5[var6] = -119; - } else if (var7 == 352) { - var5[var6] = -118; - } else if (var7 == 8249) { - var5[var6] = -117; - } else if (var7 == 338) { - var5[var6] = -116; - } else if (var7 == 381) { - var5[var6] = -114; - } else if (var7 == 8216) { - var5[var6] = -111; - } else if (var7 == 8217) { - var5[var6] = -110; - } else if (var7 == 8220) { - var5[var6] = -109; - } else if (var7 == 8221) { - var5[var6] = -108; - } else if (var7 == 8226) { - var5[var6] = -107; - } else if (var7 == 8211) { - var5[var6] = -106; - } else if (var7 == 8212) { - var5[var6] = -105; - } else if (var7 == 732) { - var5[var6] = -104; - } else if (var7 == 8482) { - var5[var6] = -103; - } else if (var7 == 353) { - var5[var6] = -102; - } else if (var7 == 8250) { - var5[var6] = -101; - } else if (var7 == 339) { - var5[var6] = -100; - } else if (var7 == 382) { - var5[var6] = -98; - } else if (var7 == 376) { - var5[var6] = -97; - } else { - var5[var6] = 63; - } - } - - var0.writeSmartByteShort(var5.length); - var0.offset += class210.huffman.compress(var5, 0, var5.length, var0.array, var0.offset); - return var0.offset - var2; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(ILcx;ZI)I", - garbageValue = "-107040601" - ) - static int method3064(int var0, Script var1, boolean var2) { - int var3; - int var4; - if (var0 == ScriptOpcodes.CC_CREATE) { - HealthBarUpdate.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - int var5 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2]; - if (var4 == 0) { - throw new RuntimeException(); - } - Widget var6 = class80.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)); - } - 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) { - Interpreter.field1111 = var12; - } else { - Calendar.field2507 = var12; - } - - Strings.invalidateWidget(var6); - return 1; - } - Widget var9; - if (var0 == ScriptOpcodes.CC_DELETE) { - var9 = var2 ? Interpreter.field1111 : Calendar.field2507; - Widget var10 = class80.getWidget(var9.id); - var10.children[var9.childIndex] = null; - Strings.invalidateWidget(var10); - return 1; - } - if (var0 == ScriptOpcodes.CC_DELETEALL) { - var9 = class80.getWidget(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - var9.children = null; - Strings.invalidateWidget(var9); - return 1; - } - if (var0 == ScriptOpcodes.CC_FIND) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Widget var11 = Client.getWidgetChild(var3, var4); - if (var11 != null && var4 != -1) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 1; - if (var2) { - Interpreter.field1111 = var11; - } else { - Calendar.field2507 = var11; - } - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } - if (var0 == ScriptOpcodes.IF_FIND) { - var9 = class80.getWidget(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - if (var9 != null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 1; - if (var2) { - Interpreter.field1111 = var9; - } else { - Calendar.field2507 = var9; - } - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } - return 2; + public static int method3008() { + return KeyHandler.KeyHandler_idleCycles; } } diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java index 93b4669ab4..ffc3ed2ca8 100644 --- a/runescape-client/src/main/java/Skills.java +++ b/runescape-client/src/main/java/Skills.java @@ -1,30 +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("hz") +@ObfuscatedName("hx") @Implements("Skills") public class Skills { - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("Skills_enabled") public static final boolean[] Skills_enabled; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("Skills_experienceTable") public static int[] Skills_experienceTable; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 1622531909 - ) - @Export("Interpreter_stringStackSize") - static int Interpreter_stringStackSize; - @ObfuscatedName("gz") - @ObfuscatedSignature( - signature = "[Lly;" - ) - @Export("mapDotSprites") - static Sprite[] mapDotSprites; static { Skills_enabled = new boolean[]{true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false}; @@ -40,15 +28,42 @@ public class Skills { } - @ObfuscatedName("iz") + @ObfuscatedName("as") @ObfuscatedSignature( - signature = "(IIIIIIII)V", - garbageValue = "-1917255225" + signature = "(ILcr;ZB)I", + garbageValue = "1" ) - @Export("updateRootInterface") - static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (class162.loadInterface(var0)) { - class2.updateInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); + static int method4031(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + int var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + if (!Client.isCameraLocked) { + Client.camAngleX = var3; + Client.camAngleY = var4; + } + + return 1; + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camAngleX; + return 1; + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camAngleY; + return 1; + } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var3 < 0) { + var3 = 0; + } + + Client.camFollowHeight = var3; + return 1; + } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camFollowHeight; + return 1; + } else { + return 2; } } } diff --git a/runescape-client/src/main/java/SoftWrapper.java b/runescape-client/src/main/java/SoftWrapper.java index 2276e111fb..c0ffaed3e0 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("ee") +@ObfuscatedName("ez") @Implements("SoftWrapper") public class SoftWrapper extends Wrapper { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("ref") SoftReference ref; @@ -15,13 +15,13 @@ public class SoftWrapper extends Wrapper { this.ref = new SoftReference(var1); } - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("get") Object get() { return this.ref.get(); } - @ObfuscatedName("w") + @ObfuscatedName("j") @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 c29657f3cb..0dcf95791f 100644 --- a/runescape-client/src/main/java/SoundCache.java +++ b/runescape-client/src/main/java/SoundCache.java @@ -1,44 +1,64 @@ 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("df") +@ObfuscatedName("dh") @Implements("SoundCache") public class SoundCache { - @ObfuscatedName("gg") + @ObfuscatedName("qo") @ObfuscatedSignature( - signature = "[Lly;" + signature = "Ldd;" ) - @Export("headIconPrayerSprites") - static Sprite[] headIconPrayerSprites; - @ObfuscatedName("q") + @Export("pcmPlayer1") + static PcmPlayer pcmPlayer1; + @ObfuscatedName("d") + public static short[][] field1418; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -1949899187 + ) + static int field1424; + @ObfuscatedName("bv") @ObfuscatedSignature( - signature = "Lhp;" + signature = "[Lls;" + ) + @Export("worldSelectBackSprites") + static Sprite[] worldSelectBackSprites; + @ObfuscatedName("df") + @ObfuscatedSignature( + signature = "Lid;" + ) + @Export("archive19") + static Archive archive19; + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "Lhz;" ) @Export("soundEffectIndex") AbstractArchive soundEffectIndex; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("musicSampleIndex") AbstractArchive musicSampleIndex; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Llc;" + signature = "Llm;" ) @Export("musicSamples") NodeHashTable musicSamples; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Llc;" + signature = "Llm;" ) @Export("rawSounds") NodeHashTable rawSounds; @ObfuscatedSignature( - signature = "(Lhp;Lhp;)V" + signature = "(Lhz;Lhz;)V" ) public SoundCache(AbstractArchive var1, AbstractArchive var2) { this.musicSamples = new NodeHashTable(256); @@ -47,118 +67,139 @@ public class SoundCache { this.musicSampleIndex = var2; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(II[IB)Lcd;", - garbageValue = "60" + signature = "(II[II)Lco;", + garbageValue = "2104823387" ) @Export("getSoundEffect0") RawSound getSoundEffect0(int var1, int var2, int[] var3) { - int var4 = var2 ^ (var1 << 4 & 0xffff | var1 >>> 12); + int var4 = var2 ^ (var1 << 4 & 65535 | var1 >>> 12); var4 |= var1 << 16; long var5 = (long)var4; RawSound var7 = (RawSound)this.rawSounds.get(var5); if (var7 != null) { return var7; - } - if (var3 != null && var3[0] <= 0) { + } else if (var3 != null && var3[0] <= 0) { return null; - } - SoundEffect var8 = SoundEffect.readSoundEffect(this.soundEffectIndex, var1, var2); - if (var8 == null) { - return null; - } - var7 = var8.toRawSound(); - this.rawSounds.put(var7, var5); - if (var3 != null) { - var3[0] -= var7.samples.length; - } + } else { + SoundEffect var8 = SoundEffect.readSoundEffect(this.soundEffectIndex, var1, var2); + if (var8 == null) { + return null; + } else { + var7 = var8.toRawSound(); + this.rawSounds.put(var7, var5); + if (var3 != null) { + var3[0] -= var7.samples.length; + } - return var7; + return var7; + } + } } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(II[II)Lcd;", - garbageValue = "1581933102" + signature = "(II[II)Lco;", + garbageValue = "-1528849608" ) @Export("getMusicSample0") RawSound getMusicSample0(int var1, int var2, int[] var3) { - int var4 = var2 ^ (var1 << 4 & 0xffff | var1 >>> 12); + int var4 = var2 ^ (var1 << 4 & 65535 | var1 >>> 12); var4 |= var1 << 16; long var5 = (long)var4 ^ 4294967296L; RawSound var7 = (RawSound)this.rawSounds.get(var5); if (var7 != null) { return var7; - } - if (var3 != null && var3[0] <= 0) { + } else if (var3 != null && var3[0] <= 0) { return null; - } - VorbisSample var8 = (VorbisSample)this.musicSamples.get(var5); - if (var8 == null) { - var8 = VorbisSample.readMusicSample(this.musicSampleIndex, var1, var2); + } else { + VorbisSample var8 = (VorbisSample)this.musicSamples.get(var5); if (var8 == null) { - return null; + var8 = VorbisSample.readMusicSample(this.musicSampleIndex, var1, var2); + if (var8 == null) { + return null; + } + + this.musicSamples.put(var8, var5); } - this.musicSamples.put(var8, var5); + var7 = var8.toRawSound(var3); + if (var7 == null) { + return null; + } else { + var8.remove(); + this.rawSounds.put(var7, var5); + return var7; + } } - - var7 = var8.toRawSound(var3); - if (var7 == null) { - return null; - } - var8.remove(); - this.rawSounds.put(var7, var5); - return var7; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(I[IB)Lcd;", - garbageValue = "127" + signature = "(I[II)Lco;", + garbageValue = "-743934209" ) @Export("getSoundEffect") public RawSound getSoundEffect(int var1, int[] var2) { if (this.soundEffectIndex.getGroupCount() == 1) { return this.getSoundEffect0(0, var1, var2); - } - if (this.soundEffectIndex.getGroupFileCount(var1) == 1) { + } else if (this.soundEffectIndex.getGroupFileCount(var1) == 1) { return this.getSoundEffect0(var1, 0, var2); + } else { + throw new RuntimeException(); } - throw new RuntimeException(); } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(I[II)Lcd;", - garbageValue = "724127180" + signature = "(I[IB)Lco;", + garbageValue = "-113" ) @Export("getMusicSample") public RawSound getMusicSample(int var1, int[] var2) { if (this.musicSampleIndex.getGroupCount() == 1) { return this.getMusicSample0(0, var1, var2); - } - if (this.musicSampleIndex.getGroupFileCount(var1) == 1) { + } else if (this.musicSampleIndex.getGroupFileCount(var1) == 1) { return this.getMusicSample0(var1, 0, var2); + } else { + throw new RuntimeException(); } - throw new RuntimeException(); } - @ObfuscatedName("eb") + @ObfuscatedName("ft") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1967203322" + garbageValue = "954967907" ) - static final void method2491(int var0) { - RouteStrategy.method3593(); - switch(var0) { - case 1: - Coord.method3990(); - break; - case 2: - MouseHandler.method1039(); + @Export("playSong") + static void playSong(int var0) { + if (var0 == -1 && !Client.field858) { + class197.midiPcmStream.clear(); + class197.field2378 = 1; + WorldMapDecoration.musicTrackArchive = null; + } else if (var0 != -1 && var0 != Client.field857 && Client.field856 != 0 && !Client.field858) { + Projectile.method2040(2, GrandExchangeEvent.archive6, var0, 0, Client.field856, false); } + Client.field857 = var0; + } + + @ObfuscatedName("kt") + @ObfuscatedSignature( + signature = "(Lhp;IIII)V", + garbageValue = "-1061413321" + ) + @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) { + class32.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/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java index 8f9145f59f..8fa202a6a2 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("cc") +@ObfuscatedName("ca") @Implements("SoundEffect") public class SoundEffect { - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "[Lde;" + signature = "[Ldn;" ) @Export("instruments") Instrument[] instruments; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("start") int start; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("end") int end; @ObfuscatedSignature( - signature = "(Lkf;)V" + signature = "(Lky;)V" ) SoundEffect(Buffer var1) { this.instruments = new Instrument[10]; @@ -38,9 +38,9 @@ public class SoundEffect { this.end = var1.readUnsignedShort(); } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "()Lcd;" + signature = "()Lco;" ) @Export("toRawSound") public RawSound toRawSound() { @@ -48,12 +48,13 @@ public class SoundEffect { return new RawSound(22050, var1, this.start * 22050 / 1000, this.end * 22050 / 1000); } - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("calculateDelay") public final int calculateDelay() { int var1 = 9999999; - for (int var2 = 0; var2 < 10; ++var2) { + int var2; + for (var2 = 0; var2 < 10; ++var2) { if (this.instruments[var2] != null && this.instruments[var2].offset / 20 < var1) { var1 = this.instruments[var2].offset / 20; } @@ -63,29 +64,32 @@ public class SoundEffect { var1 = this.start / 20; } - if (var1 == 9999999 || var1 == 0) { + if (var1 != 9999999 && var1 != 0) { + for (var2 = 0; var2 < 10; ++var2) { + if (this.instruments[var2] != null) { + Instrument var10000 = this.instruments[var2]; + var10000.offset -= var1 * 20; + } + } + + if (this.start < this.end) { + this.start -= var1 * 20; + this.end -= var1 * 20; + } + + return var1; + } else { return 0; } - for (int var2 = 0; var2 < 10; ++var2) { - if (this.instruments[var2] != null) { - this.instruments[var2].offset -= var1 * 20; - } - } - - if (this.start < this.end) { - this.start -= var1 * 20; - this.end -= var1 * 20; - } - - return var1; } - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("mix") final byte[] mix() { int var1 = 0; - for (int var2 = 0; var2 < 10; ++var2) { + int var2; + for (var2 = 0; var2 < 10; ++var2) { if (this.instruments[var2] != null && this.instruments[var2].duration + this.instruments[var2].offset > var1) { var1 = this.instruments[var2].duration + this.instruments[var2].offset; } @@ -93,34 +97,34 @@ public class SoundEffect { if (var1 == 0) { return new byte[0]; - } - int var2 = var1 * 22050 / 1000; - byte[] var3 = new byte[var2]; + } else { + var2 = var1 * 22050 / 1000; + byte[] var3 = new byte[var2]; - for (int var4 = 0; var4 < 10; ++var4) { - if (this.instruments[var4] == null) { - continue; - } - int var5 = this.instruments[var4].duration * 22050 / 1000; - int var6 = this.instruments[var4].offset * 22050 / 1000; - int[] var7 = this.instruments[var4].synthesize(var5, this.instruments[var4].duration); + for (int var4 = 0; var4 < 10; ++var4) { + if (this.instruments[var4] != null) { + int var5 = this.instruments[var4].duration * 22050 / 1000; + int var6 = this.instruments[var4].offset * 22050 / 1000; + int[] var7 = this.instruments[var4].synthesize(var5, this.instruments[var4].duration); - for (int var8 = 0; var8 < var5; ++var8) { - int var9 = (var7[var8] >> 8) + var3[var8 + var6]; - if ((var9 + 128 & -256) != 0) { - var9 = var9 >> 31 ^ 127; + for (int var8 = 0; var8 < var5; ++var8) { + int var9 = (var7[var8] >> 8) + var3[var8 + var6]; + if ((var9 + 128 & -256) != 0) { + var9 = var9 >> 31 ^ 127; + } + + var3[var8 + var6] = (byte)var9; + } } - - var3[var8 + var6] = (byte)var9; } - } - return var3; + return var3; + } } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lhp;II)Lcc;" + signature = "(Lhz;II)Lca;" ) @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 b6e2656eef..1c42234024 100644 --- a/runescape-client/src/main/java/SoundEnvelope.java +++ b/runescape-client/src/main/java/SoundEnvelope.java @@ -3,40 +3,40 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dw") +@ObfuscatedName("dv") @Implements("SoundEnvelope") public class SoundEnvelope { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("segments") int segments; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("durations") int[] durations; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("phases") int[] phases; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("start") int start; - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("end") int end; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("form") int form; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("ticks") int ticks; - @ObfuscatedName("i") + @ObfuscatedName("q") @Export("phaseIndex") int phaseIndex; - @ObfuscatedName("c") + @ObfuscatedName("d") @Export("step") int step; @ObfuscatedName("f") @Export("amplitude") int amplitude; - @ObfuscatedName("m") + @ObfuscatedName("c") @Export("max") int max; @@ -45,14 +45,14 @@ public class SoundEnvelope { this.durations = new int[2]; this.phases = new int[2]; this.durations[0] = 0; - this.durations[1] = 0xffff; + this.durations[1] = 65535; this.phases[0] = 0; - this.phases[1] = 0xffff; + this.phases[1] = 65535; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lkf;)V" + signature = "(Lky;)V" ) @Export("decode") final void decode(Buffer var1) { @@ -62,9 +62,9 @@ public class SoundEnvelope { this.decodeSegments(var1); } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkf;)V" + signature = "(Lky;)V" ) @Export("decodeSegments") final void decodeSegments(Buffer var1) { @@ -79,7 +79,7 @@ public class SoundEnvelope { } - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("reset") final void reset() { this.ticks = 0; @@ -89,7 +89,7 @@ public class SoundEnvelope { this.max = 0; } - @ObfuscatedName("p") + @ObfuscatedName("k") @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 130dd1e770..d47e59c034 100644 --- a/runescape-client/src/main/java/SoundSystem.java +++ b/runescape-client/src/main/java/SoundSystem.java @@ -1,17 +1,26 @@ -import java.lang.management.GarbageCollectorMXBean; -import java.lang.management.ManagementFactory; -import java.util.Iterator; +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; +import java.lang.reflect.Field; +import java.lang.reflect.Method; 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.Reflection; -@ObfuscatedName("dg") +@ObfuscatedName("da") @Implements("SoundSystem") public class SoundSystem implements Runnable { - @ObfuscatedName("q") + @ObfuscatedName("bs") + @ObfuscatedGetter( + intValue = -73516399 + ) + static int field1414; + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "[Ldn;" + signature = "[Ldd;" ) @Export("players") volatile PcmPlayer[] players; @@ -29,92 +38,209 @@ public class SoundSystem implements Runnable { } } } catch (Exception var4) { - HitSplatDefinition.RunException_sendStackTrace((String)null, var4); + class3.RunException_sendStackTrace((String)null, var4); } } - @ObfuscatedName("q") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "([Lgo;IB)Lgo;", - garbageValue = "0" + signature = "(Lky;II)V", + garbageValue = "-1145796075" ) - @Export("findEnumerated") - public static Enumerated findEnumerated(Enumerated[] var0, int var1) { - Enumerated[] var2 = var0; + @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.length; ++var3) { - Enumerated var4 = var2[var3]; - if (var1 == var4.rsOrdinal()) { - return var4; - } - } - - return null; - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "([BB)V", - garbageValue = "103" - ) - @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 (class189.ByteArrayPool_arrays != null) { - for (int var1 = 0; var1 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var1) { - if (var0.length == ByteArrayPool.ByteArrayPool_alternativeSizes[var1] && class43.ByteArrayPool_altSizeArrayCounts[var1] < class189.ByteArrayPool_arrays[var1].length) { - class189.ByteArrayPool_arrays[var1][class43.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; - break; - } - } - } - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-925078025" - ) - @Export("getGcDuration") - protected static int getGcDuration() { - int var0 = 0; - if (class43.garbageCollector == null || !class43.garbageCollector.isValid()) { + for (int var3 = 0; var3 < var2.size; ++var3) { try { - Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); + 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]; - while (var1.hasNext()) { - GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); - if (var2.isValid()) { - class43.garbageCollector = var2; - GameShell.garbageCollectorLastCheckTimeMs = -1L; - GameShell.garbageCollectorLastCollectionTime = -1L; + 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] = UserComparator4.loadClassFromDescriptor(var8[var12]); + } + + Class var22 = UserComparator4.loadClassFromDescriptor(var20); + if (UserComparator4.loadClassFromDescriptor(var5).getClassLoader() == null) { + throw new SecurityException(); + } + + Method[] var13 = UserComparator4.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 (UserComparator4.loadClassFromDescriptor(var5).getClassLoader() == null) { + throw new SecurityException(); + } + + var2.fields[var3] = Reflection.findField(UserComparator4.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; + } + } + + class96.reflectionChecks.addFirst(var2); + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "-27" + ) + public static void method2417() { + try { + File var0 = new File(FontName.userHomeDirectory, "random.dat"); + int var2; + if (var0.exists()) { + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); + } else { + label38: + for (int var1 = 0; var1 < Login.field1181.length; ++var1) { + for (var2 = 0; var2 < GrandExchangeEvent.field47.length; ++var2) { + File var3 = new File(GrandExchangeEvent.field47[var2] + Login.field1181[var1] + File.separatorChar + "random.dat"); + if (var3.exists()) { + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0); + break label38; + } } } - } catch (Throwable var11) { } + + 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) { } - if (class43.garbageCollector != null) { - long var9 = DirectByteArrayCopier.currentTimeMs(); - long var3 = class43.garbageCollector.getCollectionTime(); - if (-1L != GameShell.garbageCollectorLastCollectionTime) { - long var5 = var3 - GameShell.garbageCollectorLastCollectionTime; - long var7 = var9 - GameShell.garbageCollectorLastCheckTimeMs; - if (0L != var7) { - var0 = (int)(100L * var5 / var7); + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "(Lbl;Lbl;IZI)I", + garbageValue = "-295284349" + ) + @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; } } - GameShell.garbageCollectorLastCollectionTime = var3; - GameShell.garbageCollectorLastCheckTimeMs = var9; + 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.method1689() ? (var1.method1689() ? 0 : 1) : (var1.method1689() ? -1 : 0); + } else if (var2 == 5) { + return var0.method1687() ? (var1.method1687() ? 0 : 1) : (var1.method1687() ? -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; } - - return var0; } } diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index 5cd374cdf3..c71ec78603 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -4,89 +4,96 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ib") +@ObfuscatedName("il") @Implements("SpotAnimationDefinition") public class SpotAnimationDefinition extends DualNode { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("SpotAnimationDefinition_archive") public static AbstractArchive SpotAnimationDefinition_archive; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lhz;" + ) + @Export("SpotAnimationDefinition_modelArchive") + public static AbstractArchive SpotAnimationDefinition_modelArchive; + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "Lep;" ) @Export("SpotAnimationDefinition_cached") - public static EvictingDualNodeHashTable SpotAnimationDefinition_cached; - @ObfuscatedName("p") + static EvictingDualNodeHashTable SpotAnimationDefinition_cached; + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lep;" ) @Export("SpotAnimationDefinition_cachedModels") - public static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -1614568549 + static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; + @ObfuscatedName("ax") + @ObfuscatedSignature( + signature = "Llg;" ) - static int field3248; - @ObfuscatedName("k") + @Export("rasterProvider") + public static AbstractRasterProvider rasterProvider; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1856859661 + intValue = 320838719 ) @Export("id") int id; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1484335723 + intValue = 1719895913 ) @Export("archive") int archive; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 106564223 + intValue = -17026775 ) @Export("sequence") public int sequence; - @ObfuscatedName("i") + @ObfuscatedName("q") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("f") + @ObfuscatedName("d") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("m") + @ObfuscatedName("f") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 537215933 + intValue = 197223751 ) @Export("widthScale") int widthScale; - @ObfuscatedName("x") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1285947315 + intValue = 651694427 ) @Export("heightScale") int heightScale; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1550216449 + intValue = -1190331459 ) @Export("orientation") int orientation; - @ObfuscatedName("v") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1281395591 + intValue = -963659109 ) @Export("ambient") int ambient; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -499739553 + intValue = 140228823 ) @Export("contrast") int contrast; @@ -105,10 +112,10 @@ public class SpotAnimationDefinition extends DualNode { this.contrast = 0; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkf;I)V", - garbageValue = "65111702" + signature = "(Lky;I)V", + garbageValue = "-2093778900" ) @Export("decode") void decode(Buffer var1) { @@ -122,10 +129,10 @@ public class SpotAnimationDefinition extends DualNode { } } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkf;II)V", - garbageValue = "-1978905591" + signature = "(Lky;II)V", + garbageValue = "-565062969" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -143,37 +150,42 @@ public class SpotAnimationDefinition extends DualNode { this.ambient = var1.readUnsignedByte(); } else if (var2 == 8) { this.contrast = var1.readUnsignedByte(); - } else if (var2 == 40) { - int var3 = var1.readUnsignedByte(); - this.recolorFrom = new short[var3]; - this.recolorTo = new short[var3]; + } else { + int var3; + int var4; + if (var2 == 40) { + var3 = var1.readUnsignedByte(); + this.recolorFrom = new short[var3]; + this.recolorTo = new short[var3]; - for (int var4 = 0; var4 < var3; ++var4) { - this.recolorFrom[var4] = (short) var1.readUnsignedShort(); - this.recolorTo[var4] = (short) var1.readUnsignedShort(); - } - } else if (var2 == 41) { - int var3 = var1.readUnsignedByte(); - this.retextureFrom = new short[var3]; - this.retextureTo = new short[var3]; + for (var4 = 0; var4 < var3; ++var4) { + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); + this.recolorTo[var4] = (short)var1.readUnsignedShort(); + } + } else if (var2 == 41) { + var3 = var1.readUnsignedByte(); + this.retextureFrom = new short[var3]; + this.retextureTo = new short[var3]; - for (int var4 = 0; var4 < var3; ++var4) { - this.retextureFrom[var4] = (short) var1.readUnsignedShort(); - this.retextureTo[var4] = (short) var1.readUnsignedShort(); + for (var4 = 0; var4 < var3; ++var4) { + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); + this.retextureTo[var4] = (short)var1.readUnsignedShort(); + } } } + } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(II)Ldm;", - garbageValue = "1645713423" + signature = "(II)Ldo;", + garbageValue = "-1744649720" ) @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(class43.SpotAnimationDefinition_modelArchive, this.archive, 0); + ModelData var3 = ModelData.ModelData_get(SpotAnimationDefinition_modelArchive, this.archive, 0); if (var3 == null) { return null; } @@ -197,7 +209,7 @@ public class SpotAnimationDefinition extends DualNode { Model var5; if (this.sequence != -1 && var1 != -1) { - var5 = GrandExchangeEvent.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); + var5 = Widget.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); } else { var5 = var2.toSharedSpotAnimationModel(true); } @@ -206,37 +218,108 @@ public class SpotAnimationDefinition extends DualNode { var5.scale(this.widthScale, this.heightScale, this.widthScale); } - if (this.orientation == 0) { - return var5; - } - if (this.orientation == 90) { - var5.rotateY90Ccw(); - } + if (this.orientation != 0) { + if (this.orientation == 90) { + var5.rotateY90Ccw(); + } - if (this.orientation == 180) { - var5.rotateY90Ccw(); - var5.rotateY90Ccw(); - } + if (this.orientation == 180) { + var5.rotateY90Ccw(); + var5.rotateY90Ccw(); + } - if (this.orientation == 270) { - var5.rotateY90Ccw(); - var5.rotateY90Ccw(); - var5.rotateY90Ccw(); + if (this.orientation == 270) { + var5.rotateY90Ccw(); + var5.rotateY90Ccw(); + var5.rotateY90Ccw(); + } } return var5; } - @ObfuscatedName("fo") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1672246120" + signature = "(Lky;Ljava/lang/String;S)I", + garbageValue = "313" ) - static void method4415() { - if (BoundaryObject.worldMap != null) { - BoundaryObject.worldMap.method6309(class42.plane, MusicPatchNode2.baseX * 64 + (Client.localPlayer.x >> 7), class1.baseY * 64 + (Client.localPlayer.y >> 7), false); - BoundaryObject.worldMap.loadCache(); + public static int method4334(Buffer var0, String var1) { + int var2 = var0.offset; + int var4 = var1.length(); + byte[] var5 = new byte[var4]; + + for (int var6 = 0; var6 < var4; ++var6) { + char var7 = var1.charAt(var6); + if ((var7 <= 0 || var7 >= 128) && (var7 < 160 || var7 > 255)) { + if (var7 == 8364) { + var5[var6] = -128; + } else if (var7 == 8218) { + var5[var6] = -126; + } else if (var7 == 402) { + var5[var6] = -125; + } else if (var7 == 8222) { + var5[var6] = -124; + } else if (var7 == 8230) { + var5[var6] = -123; + } else if (var7 == 8224) { + var5[var6] = -122; + } else if (var7 == 8225) { + var5[var6] = -121; + } else if (var7 == 710) { + var5[var6] = -120; + } else if (var7 == 8240) { + var5[var6] = -119; + } else if (var7 == 352) { + var5[var6] = -118; + } else if (var7 == 8249) { + var5[var6] = -117; + } else if (var7 == 338) { + var5[var6] = -116; + } else if (var7 == 381) { + var5[var6] = -114; + } else if (var7 == 8216) { + var5[var6] = -111; + } else if (var7 == 8217) { + var5[var6] = -110; + } else if (var7 == 8220) { + var5[var6] = -109; + } else if (var7 == 8221) { + var5[var6] = -108; + } else if (var7 == 8226) { + var5[var6] = -107; + } else if (var7 == 8211) { + var5[var6] = -106; + } else if (var7 == 8212) { + var5[var6] = -105; + } else if (var7 == 732) { + var5[var6] = -104; + } else if (var7 == 8482) { + var5[var6] = -103; + } else if (var7 == 353) { + var5[var6] = -102; + } else if (var7 == 8250) { + var5[var6] = -101; + } else if (var7 == 339) { + var5[var6] = -100; + } else if (var7 == 382) { + var5[var6] = -98; + } else if (var7 == 376) { + var5[var6] = -97; + } else { + var5[var6] = 63; + } + } else { + var5[var6] = (byte)var7; + } } + var0.writeSmartByteShort(var5.length); + var0.offset += class210.huffman.compress(var5, 0, var5.length, var0.array, var0.offset); + return var0.offset - var2; + } + + @ObfuscatedName("j") + public static boolean method4333(long var0) { + return 0L != var0 && !WorldMapLabelSize.method186(var0); } } diff --git a/runescape-client/src/main/java/Sprite.java b/runescape-client/src/main/java/Sprite.java index 0e9b2acfbb..39182613aa 100644 --- a/runescape-client/src/main/java/Sprite.java +++ b/runescape-client/src/main/java/Sprite.java @@ -3,49 +3,49 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ly") +@ObfuscatedName("ls") @Implements("Sprite") public final class Sprite extends Rasterizer2D { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("pixels") public int[] pixels; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("subWidth") public int subWidth; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("subHeight") public int subHeight; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("xOffset") public int xOffset; - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("yOffset") int yOffset; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("width") public int width; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("height") public int height; - public Sprite(int[] px, int w, int h) { - this.pixels = px; - this.subWidth = this.width = w; - this.subHeight = this.height = h; + public Sprite(int[] var1, int var2, int var3) { + this.pixels = var1; + this.subWidth = this.width = var2; + this.subHeight = this.height = var3; this.yOffset = 0; this.xOffset = 0; } - public Sprite(int w, int h) { - this(new int[h * w], w, h); + public Sprite(int var1, int var2) { + this(new int[var2 * var1], var1, var2); } Sprite() { } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "()Lly;" + signature = "()Lls;" ) @Export("mirrorHorizontally") public Sprite mirrorHorizontally() { @@ -64,9 +64,9 @@ public final class Sprite extends Rasterizer2D { return var1; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "()Lly;" + signature = "()Lls;" ) @Export("copyNormalized") public Sprite copyNormalized() { @@ -81,77 +81,75 @@ public final class Sprite extends Rasterizer2D { return var1; } - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("setRaster") public void setRaster() { Rasterizer2D.Rasterizer2D_replace(this.pixels, this.subWidth, this.subHeight); } - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("normalize") public void normalize() { - if (this.subWidth == this.width && this.subHeight == this.height) { - return; - } - int[] var1 = new int[this.width * this.height]; + if (this.subWidth != this.width || this.subHeight != this.height) { + int[] var1 = new int[this.width * this.height]; - for (int var2 = 0; var2 < this.subHeight; ++var2) { - for (int var3 = 0; var3 < this.subWidth; ++var3) { - var1[var3 + (var2 + this.yOffset) * this.width + this.xOffset] = this.pixels[var3 + var2 * this.subWidth]; + for (int var2 = 0; var2 < this.subHeight; ++var2) { + for (int var3 = 0; var3 < this.subWidth; ++var3) { + var1[var3 + (var2 + this.yOffset) * this.width + this.xOffset] = this.pixels[var3 + var2 * this.subWidth]; + } } - } - this.pixels = var1; - this.subWidth = this.width; - this.subHeight = this.height; - this.xOffset = 0; - this.yOffset = 0; + this.pixels = var1; + this.subWidth = this.width; + this.subHeight = this.height; + this.xOffset = 0; + this.yOffset = 0; + } } - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("pad") - public void pad(int amount) { - if (this.subWidth == this.width && this.subHeight == this.height) { - return; - } - int var2 = amount; - if (amount > this.xOffset) { - var2 = this.xOffset; - } - - int var3 = amount; - if (amount + this.xOffset + this.subWidth > this.width) { - var3 = this.width - this.xOffset - this.subWidth; - } - - int var4 = amount; - if (amount > this.yOffset) { - var4 = this.yOffset; - } - - int var5 = amount; - if (amount + this.yOffset + this.subHeight > this.height) { - var5 = this.height - this.yOffset - this.subHeight; - } - - int var6 = var2 + var3 + this.subWidth; - int var7 = var4 + var5 + this.subHeight; - int[] var8 = new int[var6 * var7]; - - for (int var9 = 0; var9 < this.subHeight; ++var9) { - for (int var10 = 0; var10 < this.subWidth; ++var10) { - var8[var6 * (var9 + var4) + var10 + var2] = this.pixels[var10 + var9 * this.subWidth]; + public void pad(int var1) { + if (this.subWidth != this.width || this.subHeight != this.height) { + int var2 = var1; + if (var1 > this.xOffset) { + var2 = this.xOffset; } - } - this.pixels = var8; - this.subWidth = var6; - this.subHeight = var7; - this.xOffset -= var2; - this.yOffset -= var4; + int var3 = var1; + if (var1 + this.xOffset + this.subWidth > this.width) { + var3 = this.width - this.xOffset - this.subWidth; + } + + int var4 = var1; + if (var1 > this.yOffset) { + var4 = this.yOffset; + } + + int var5 = var1; + if (var1 + this.yOffset + this.subHeight > this.height) { + var5 = this.height - this.yOffset - this.subHeight; + } + + int var6 = var2 + var3 + this.subWidth; + int var7 = var4 + var5 + this.subHeight; + int[] var8 = new int[var6 * var7]; + + for (int var9 = 0; var9 < this.subHeight; ++var9) { + for (int var10 = 0; var10 < this.subWidth; ++var10) { + var8[var6 * (var9 + var4) + var10 + var2] = this.pixels[var10 + var9 * this.subWidth]; + } + } + + this.pixels = var8; + this.subWidth = var6; + this.subHeight = var7; + this.xOffset -= var2; + this.yOffset -= var4; + } } - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("flipHorizontally") public void flipHorizontally() { int[] var1 = new int[this.subWidth * this.subHeight]; @@ -167,7 +165,7 @@ public final class Sprite extends Rasterizer2D { this.xOffset = this.width - this.subWidth - this.xOffset; } - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("flipVertically") public void flipVertically() { int[] var1 = new int[this.subWidth * this.subHeight]; @@ -183,9 +181,9 @@ public final class Sprite extends Rasterizer2D { this.yOffset = this.height - this.subHeight - this.yOffset; } - @ObfuscatedName("i") + @ObfuscatedName("q") @Export("outline") - public void outline(int color) { + public void outline(int var1) { int[] var2 = new int[this.subWidth * this.subHeight]; int var3 = 0; @@ -194,13 +192,13 @@ public final class Sprite extends Rasterizer2D { int var6 = this.pixels[var3]; if (var6 == 0) { if (var5 > 0 && this.pixels[var3 - 1] != 0) { - var6 = color; + var6 = var1; } else if (var4 > 0 && this.pixels[var3 - this.subWidth] != 0) { - var6 = color; + var6 = var1; } else if (var5 < this.subWidth - 1 && this.pixels[var3 + 1] != 0) { - var6 = color; + var6 = var1; } else if (var4 < this.subHeight - 1 && this.pixels[var3 + this.subWidth] != 0) { - var6 = color; + var6 = var1; } } @@ -211,7 +209,7 @@ public final class Sprite extends Rasterizer2D { this.pixels = var2; } - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("shadow") public void shadow(int var1) { for (int var2 = this.subHeight - 1; var2 > 0; --var2) { @@ -226,42 +224,42 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("u") + @ObfuscatedName("d") @Export("drawAt") - public void drawAt(int x, int y) { - x += this.xOffset; - y += this.yOffset; - int var3 = x + y * Rasterizer2D.Rasterizer2D_width; + public void drawAt(int var1, int var2) { + var1 += this.xOffset; + var2 += this.yOffset; + int var3 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; int var4 = 0; int var5 = this.subHeight; int var6 = this.subWidth; int var7 = Rasterizer2D.Rasterizer2D_width - var6; int var8 = 0; int var9; - if (y < Rasterizer2D.Rasterizer2D_yClipStart) { - var9 = Rasterizer2D.Rasterizer2D_yClipStart - y; + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + var9 = Rasterizer2D.Rasterizer2D_yClipStart - var2; var5 -= var9; - y = Rasterizer2D.Rasterizer2D_yClipStart; + var2 = Rasterizer2D.Rasterizer2D_yClipStart; var4 += var9 * var6; var3 += var9 * Rasterizer2D.Rasterizer2D_width; } - if (var5 + y > Rasterizer2D.Rasterizer2D_yClipEnd) { - var5 -= var5 + y - Rasterizer2D.Rasterizer2D_yClipEnd; + if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { + var5 -= var5 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (x < Rasterizer2D.Rasterizer2D_xClipStart) { - var9 = Rasterizer2D.Rasterizer2D_xClipStart - x; + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + var9 = Rasterizer2D.Rasterizer2D_xClipStart - var1; var6 -= var9; - x = Rasterizer2D.Rasterizer2D_xClipStart; + var1 = Rasterizer2D.Rasterizer2D_xClipStart; var4 += var9; var3 += var9; var8 += var9; var7 += var9; } - if (var6 + x > Rasterizer2D.Rasterizer2D_xClipEnd) { - var9 = var6 + x - Rasterizer2D.Rasterizer2D_xClipEnd; + if (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; var6 -= var9; var8 += var9; var7 += var9; @@ -272,42 +270,42 @@ public final class Sprite extends Rasterizer2D { } } - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("drawTransBgAt") - public void drawTransBgAt(int x, int y) { - x += this.xOffset; - y += this.yOffset; - int var3 = x + y * Rasterizer2D.Rasterizer2D_width; + public void drawTransBgAt(int var1, int var2) { + var1 += this.xOffset; + var2 += this.yOffset; + int var3 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; int var4 = 0; int var5 = this.subHeight; int var6 = this.subWidth; int var7 = Rasterizer2D.Rasterizer2D_width - var6; int var8 = 0; int var9; - if (y < Rasterizer2D.Rasterizer2D_yClipStart) { - var9 = Rasterizer2D.Rasterizer2D_yClipStart - y; + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + var9 = Rasterizer2D.Rasterizer2D_yClipStart - var2; var5 -= var9; - y = Rasterizer2D.Rasterizer2D_yClipStart; + var2 = Rasterizer2D.Rasterizer2D_yClipStart; var4 += var9 * var6; var3 += var9 * Rasterizer2D.Rasterizer2D_width; } - if (var5 + y > Rasterizer2D.Rasterizer2D_yClipEnd) { - var5 -= var5 + y - Rasterizer2D.Rasterizer2D_yClipEnd; + if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { + var5 -= var5 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (x < Rasterizer2D.Rasterizer2D_xClipStart) { - var9 = Rasterizer2D.Rasterizer2D_xClipStart - x; + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + var9 = Rasterizer2D.Rasterizer2D_xClipStart - var1; var6 -= var9; - x = Rasterizer2D.Rasterizer2D_xClipStart; + var1 = Rasterizer2D.Rasterizer2D_xClipStart; var4 += var9; var3 += var9; var8 += var9; var7 += var9; } - if (var6 + x > Rasterizer2D.Rasterizer2D_xClipEnd) { - var9 = var6 + x - Rasterizer2D.Rasterizer2D_xClipEnd; + if (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; var6 -= var9; var8 += var9; var7 += var9; @@ -320,284 +318,282 @@ public final class Sprite extends Rasterizer2D { @ObfuscatedName("y") @Export("drawScaledAt") - public void drawScaledAt(int x, int y, int width, int height) { - if (width <= 0 || height <= 0) { - return; - } - int var5 = this.subWidth; - int var6 = this.subHeight; - int var7 = 0; - int var8 = 0; - int var9 = this.width; - int var10 = this.height; - int var11 = (var9 << 16) / width; - int var12 = (var10 << 16) / height; - int var13; - if (this.xOffset > 0) { - var13 = (var11 + (this.xOffset << 16) - 1) / var11; - x += var13; - var7 += var13 * var11 - (this.xOffset << 16); - } + public void drawScaledAt(int var1, int var2, int var3, int var4) { + if (var3 > 0 && var4 > 0) { + int var5 = this.subWidth; + int var6 = this.subHeight; + int var7 = 0; + int var8 = 0; + int var9 = this.width; + int var10 = this.height; + int var11 = (var9 << 16) / var3; + int var12 = (var10 << 16) / var4; + int var13; + if (this.xOffset > 0) { + var13 = (var11 + (this.xOffset << 16) - 1) / var11; + var1 += var13; + var7 += var13 * var11 - (this.xOffset << 16); + } - if (this.yOffset > 0) { - var13 = (var12 + (this.yOffset << 16) - 1) / var12; - y += var13; - var8 += var13 * var12 - (this.yOffset << 16); - } + if (this.yOffset > 0) { + var13 = (var12 + (this.yOffset << 16) - 1) / var12; + var2 += var13; + var8 += var13 * var12 - (this.yOffset << 16); + } - if (var5 < var9) { - width = (var11 + ((var5 << 16) - var7) - 1) / var11; - } + if (var5 < var9) { + var3 = (var11 + ((var5 << 16) - var7) - 1) / var11; + } - if (var6 < var10) { - height = (var12 + ((var6 << 16) - var8) - 1) / var12; - } + if (var6 < var10) { + var4 = (var12 + ((var6 << 16) - var8) - 1) / var12; + } - var13 = x + y * Rasterizer2D.Rasterizer2D_width; - int var14 = Rasterizer2D.Rasterizer2D_width - width; - if (y + height > Rasterizer2D.Rasterizer2D_yClipEnd) { - height -= y + height - Rasterizer2D.Rasterizer2D_yClipEnd; - } + var13 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; + int var14 = Rasterizer2D.Rasterizer2D_width - var3; + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { + var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; + } - int var15; - if (y < Rasterizer2D.Rasterizer2D_yClipStart) { - var15 = Rasterizer2D.Rasterizer2D_yClipStart - y; - height -= var15; - var13 += var15 * Rasterizer2D.Rasterizer2D_width; - var8 += var12 * var15; - } + int var15; + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + var15 = Rasterizer2D.Rasterizer2D_yClipStart - var2; + var4 -= var15; + var13 += var15 * Rasterizer2D.Rasterizer2D_width; + var8 += var12 * var15; + } - if (width + x > Rasterizer2D.Rasterizer2D_xClipEnd) { - var15 = width + x - Rasterizer2D.Rasterizer2D_xClipEnd; - width -= var15; - var14 += var15; - } + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var15 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; + var3 -= var15; + var14 += var15; + } - if (x < Rasterizer2D.Rasterizer2D_xClipStart) { - var15 = Rasterizer2D.Rasterizer2D_xClipStart - x; - width -= var15; - var13 += var15; - var7 += var11 * var15; - var14 += var15; - } + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + var15 = Rasterizer2D.Rasterizer2D_xClipStart - var1; + var3 -= var15; + var13 += var15; + var7 += var11 * var15; + var14 += var15; + } - Sprite_drawScaled(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var7, var8, var13, var14, width, height, var11, var12, var5); + Sprite_drawScaled(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var7, var8, var13, var14, var3, var4, var11, var12, var5); + } } - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("drawTransOverlayAt") - public void drawTransOverlayAt(int x, int y, int overlayOpacity, int overlayColor) { - if (overlayOpacity == 256) { - this.drawTransBgAt(x, y); - return; - } - x += this.xOffset; - y += this.yOffset; - int var5 = x + y * Rasterizer2D.Rasterizer2D_width; - int var6 = 0; - int var7 = this.subHeight; - int var8 = this.subWidth; - int var9 = Rasterizer2D.Rasterizer2D_width - var8; - int var10 = 0; - int var11; - if (y < Rasterizer2D.Rasterizer2D_yClipStart) { - var11 = Rasterizer2D.Rasterizer2D_yClipStart - y; - var7 -= var11; - y = Rasterizer2D.Rasterizer2D_yClipStart; - var6 += var11 * var8; - var5 += var11 * Rasterizer2D.Rasterizer2D_width; - } + public void drawTransOverlayAt(int var1, int var2, int var3, int var4) { + if (var3 == 256) { + this.drawTransBgAt(var1, var2); + } else { + var1 += this.xOffset; + var2 += this.yOffset; + int var5 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; + int var6 = 0; + int var7 = this.subHeight; + int var8 = this.subWidth; + int var9 = Rasterizer2D.Rasterizer2D_width - var8; + int var10 = 0; + int var11; + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2; + var7 -= var11; + var2 = Rasterizer2D.Rasterizer2D_yClipStart; + var6 += var11 * var8; + var5 += var11 * Rasterizer2D.Rasterizer2D_width; + } - if (var7 + y > Rasterizer2D.Rasterizer2D_yClipEnd) { - var7 -= var7 + y - Rasterizer2D.Rasterizer2D_yClipEnd; - } + if (var7 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { + var7 -= var7 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; + } - if (x < Rasterizer2D.Rasterizer2D_xClipStart) { - var11 = Rasterizer2D.Rasterizer2D_xClipStart - x; - var8 -= var11; - x = Rasterizer2D.Rasterizer2D_xClipStart; - var6 += var11; - var5 += var11; - var10 += var11; - var9 += var11; - } + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1; + var8 -= var11; + var1 = Rasterizer2D.Rasterizer2D_xClipStart; + var6 += var11; + var5 += var11; + var10 += var11; + var9 += var11; + } - if (var8 + x > Rasterizer2D.Rasterizer2D_xClipEnd) { - var11 = var8 + x - Rasterizer2D.Rasterizer2D_xClipEnd; - var8 -= var11; - var10 += var11; - var9 += var11; - } + if (var8 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var11 = var8 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; + var8 -= var11; + var10 += var11; + var9 += var11; + } - if (var8 > 0 && var7 > 0) { - Sprite_drawTransOverlay(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var6, var5, var8, var7, var9, var10, overlayOpacity, overlayColor); + if (var8 > 0 && var7 > 0) { + Sprite_drawTransOverlay(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var6, var5, var8, var7, var9, var10, var3, var4); + } } } - @ObfuscatedName("o") + @ObfuscatedName("z") @Export("drawTransAt") - public void drawTransAt(int x, int y, int opacity) { - x += this.xOffset; - y += this.yOffset; - int var4 = x + y * Rasterizer2D.Rasterizer2D_width; + public void drawTransAt(int var1, int var2, int var3) { + var1 += this.xOffset; + var2 += this.yOffset; + int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; int var5 = 0; int var6 = this.subHeight; int var7 = this.subWidth; int var8 = Rasterizer2D.Rasterizer2D_width - var7; int var9 = 0; int var10; - if (y < Rasterizer2D.Rasterizer2D_yClipStart) { - var10 = Rasterizer2D.Rasterizer2D_yClipStart - y; + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; var6 -= var10; - y = Rasterizer2D.Rasterizer2D_yClipStart; + var2 = Rasterizer2D.Rasterizer2D_yClipStart; var5 += var10 * var7; var4 += var10 * Rasterizer2D.Rasterizer2D_width; } - if (var6 + y > Rasterizer2D.Rasterizer2D_yClipEnd) { - var6 -= var6 + y - Rasterizer2D.Rasterizer2D_yClipEnd; + if (var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { + var6 -= var6 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (x < Rasterizer2D.Rasterizer2D_xClipStart) { - var10 = Rasterizer2D.Rasterizer2D_xClipStart - x; + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; var7 -= var10; - x = Rasterizer2D.Rasterizer2D_xClipStart; + var1 = Rasterizer2D.Rasterizer2D_xClipStart; var5 += var10; var4 += var10; var9 += var10; var8 += var10; } - if (var7 + x > Rasterizer2D.Rasterizer2D_xClipEnd) { - var10 = var7 + x - Rasterizer2D.Rasterizer2D_xClipEnd; + if (var7 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var10 = var7 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; var7 -= var10; var9 += var10; var8 += var10; } if (var7 > 0 && var6 > 0) { - Sprite_drawTransparent(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var5, var4, var7, var6, var8, var9, opacity); + Sprite_drawTransparent(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var5, var4, var7, var6, var8, var9, var3); } } - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("drawTransScaledAt") - public void drawTransScaledAt(int x, int y, int width, int height, int opacity) { - if (width <= 0 || height <= 0) { - return; - } - int var6 = this.subWidth; - int var7 = this.subHeight; - int var8 = 0; - int var9 = 0; - int var10 = this.width; - int var11 = this.height; - int var12 = (var10 << 16) / width; - int var13 = (var11 << 16) / height; - int var14; - if (this.xOffset > 0) { - var14 = (var12 + (this.xOffset << 16) - 1) / var12; - x += var14; - var8 += var14 * var12 - (this.xOffset << 16); - } + public void drawTransScaledAt(int var1, int var2, int var3, int var4, int var5) { + if (var3 > 0 && var4 > 0) { + int var6 = this.subWidth; + int var7 = this.subHeight; + int var8 = 0; + int var9 = 0; + int var10 = this.width; + int var11 = this.height; + int var12 = (var10 << 16) / var3; + int var13 = (var11 << 16) / var4; + int var14; + if (this.xOffset > 0) { + var14 = (var12 + (this.xOffset << 16) - 1) / var12; + var1 += var14; + var8 += var14 * var12 - (this.xOffset << 16); + } - if (this.yOffset > 0) { - var14 = (var13 + (this.yOffset << 16) - 1) / var13; - y += var14; - var9 += var14 * var13 - (this.yOffset << 16); - } + if (this.yOffset > 0) { + var14 = (var13 + (this.yOffset << 16) - 1) / var13; + var2 += var14; + var9 += var14 * var13 - (this.yOffset << 16); + } - if (var6 < var10) { - width = (var12 + ((var6 << 16) - var8) - 1) / var12; - } + if (var6 < var10) { + var3 = (var12 + ((var6 << 16) - var8) - 1) / var12; + } - if (var7 < var11) { - height = (var13 + ((var7 << 16) - var9) - 1) / var13; - } + if (var7 < var11) { + var4 = (var13 + ((var7 << 16) - var9) - 1) / var13; + } - var14 = x + y * Rasterizer2D.Rasterizer2D_width; - int var15 = Rasterizer2D.Rasterizer2D_width - width; - if (y + height > Rasterizer2D.Rasterizer2D_yClipEnd) { - height -= y + height - Rasterizer2D.Rasterizer2D_yClipEnd; - } + var14 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; + int var15 = Rasterizer2D.Rasterizer2D_width - var3; + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { + var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; + } - int var16; - if (y < Rasterizer2D.Rasterizer2D_yClipStart) { - var16 = Rasterizer2D.Rasterizer2D_yClipStart - y; - height -= var16; - var14 += var16 * Rasterizer2D.Rasterizer2D_width; - var9 += var13 * var16; - } + int var16; + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + var16 = Rasterizer2D.Rasterizer2D_yClipStart - var2; + var4 -= var16; + var14 += var16 * Rasterizer2D.Rasterizer2D_width; + var9 += var13 * var16; + } - if (width + x > Rasterizer2D.Rasterizer2D_xClipEnd) { - var16 = width + x - Rasterizer2D.Rasterizer2D_xClipEnd; - width -= var16; - var15 += var16; - } + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var16 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; + var3 -= var16; + var15 += var16; + } - if (x < Rasterizer2D.Rasterizer2D_xClipStart) { - var16 = Rasterizer2D.Rasterizer2D_xClipStart - x; - width -= var16; - var14 += var16; - var8 += var12 * var16; - var15 += var16; - } + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + var16 = Rasterizer2D.Rasterizer2D_xClipStart - var1; + var3 -= var16; + var14 += var16; + var8 += var12 * var16; + var15 += var16; + } - Sprite_drawTransScaled(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var8, var9, var14, var15, width, height, var12, var13, var6, opacity); + Sprite_drawTransScaled(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var8, var9, var14, var15, var3, var4, var12, var13, var6, var5); + } } - @ObfuscatedName("al") - public void method6135(int x, int y, int opacity) { - x += this.xOffset; - y += this.yOffset; - int var4 = x + y * Rasterizer2D.Rasterizer2D_width; + @ObfuscatedName("v") + public void method6014(int var1, int var2, int var3) { + var1 += this.xOffset; + var2 += this.yOffset; + int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; int var5 = 0; int var6 = this.subHeight; int var7 = this.subWidth; int var8 = Rasterizer2D.Rasterizer2D_width - var7; int var9 = 0; int var10; - if (y < Rasterizer2D.Rasterizer2D_yClipStart) { - var10 = Rasterizer2D.Rasterizer2D_yClipStart - y; + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { + var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; var6 -= var10; - y = Rasterizer2D.Rasterizer2D_yClipStart; + var2 = Rasterizer2D.Rasterizer2D_yClipStart; var5 += var10 * var7; var4 += var10 * Rasterizer2D.Rasterizer2D_width; } - if (var6 + y > Rasterizer2D.Rasterizer2D_yClipEnd) { - var6 -= var6 + y - Rasterizer2D.Rasterizer2D_yClipEnd; + if (var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { + var6 -= var6 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (x < Rasterizer2D.Rasterizer2D_xClipStart) { - var10 = Rasterizer2D.Rasterizer2D_xClipStart - x; + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { + var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; var7 -= var10; - x = Rasterizer2D.Rasterizer2D_xClipStart; + var1 = Rasterizer2D.Rasterizer2D_xClipStart; var5 += var10; var4 += var10; var9 += var10; var8 += var10; } - if (var7 + x > Rasterizer2D.Rasterizer2D_xClipEnd) { - var10 = var7 + x - Rasterizer2D.Rasterizer2D_xClipEnd; + if (var7 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var10 = var7 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; var7 -= var10; var9 += var10; var8 += var10; } if (var7 > 0 && var6 > 0) { - if (opacity == 256) { - method6134(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); + if (var3 == 256) { + method6067(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); } else { - method6119(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, opacity); + method6016(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); } } } - @ObfuscatedName("aw") - public void method6217(int var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("av") + public void method6017(int var1, int var2, int var3, int var4, int var5) { if (var3 > 0 && var4 > 0) { int var6 = this.subWidth; int var7 = this.subHeight; @@ -657,16 +653,16 @@ public final class Sprite extends Rasterizer2D { } if (var5 == 256) { - method6111(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); + method6088(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); } else { - method6138(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); + method6019(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); } } } - @ObfuscatedName("ar") - public void method6146(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { + @ObfuscatedName("af") + public void method6020(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; @@ -713,7 +709,7 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("ax") + @ObfuscatedName("az") @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 { @@ -748,8 +744,8 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("az") - public void method6193(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { + @ObfuscatedName("aj") + public void method6022(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; @@ -787,818 +783,789 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("ae") - public void method6186(int var1, int var2, int var3, int var4) { - this.method6143(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); + @ObfuscatedName("an") + public void method6023(int var1, int var2, int var3, int var4) { + this.method6024(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); } - @ObfuscatedName("ao") - void method6143(int var1, int var2, int var3, int var4, int var5, int var6) { - if (var6 == 0) { - return; - } - var1 -= this.xOffset << 4; - var2 -= this.yOffset << 4; - double var7 = (double)(var5 & 0xffff) * 9.587379924285257E-5D; - int var9 = (int)Math.floor(Math.sin(var7) * (double)var6 + 0.5D); - int var10 = (int)Math.floor(Math.cos(var7) * (double)var6 + 0.5D); - int var11 = var10 * -var1 + -var2 * var9; - int var12 = -var2 * var10 + var9 * -(-var1); - int var13 = var10 * ((this.subWidth << 4) - var1) + -var2 * var9; - int var14 = var9 * -((this.subWidth << 4) - var1) + -var2 * var10; - int var15 = ((this.subHeight << 4) - var2) * var9 + var10 * -var1; - int var16 = ((this.subHeight << 4) - var2) * var10 + var9 * -(-var1); - int var17 = ((this.subHeight << 4) - var2) * var9 + var10 * ((this.subWidth << 4) - var1); - int var18 = ((this.subHeight << 4) - var2) * var10 + var9 * -((this.subWidth << 4) - var1); - int var19; - int var20; - if (var11 < var13) { - var19 = var11; - var20 = var13; - } else { - var19 = var13; - var20 = var11; - } - - if (var15 < var19) { - var19 = var15; - } - - if (var17 < var19) { - var19 = var17; - } - - if (var15 > var20) { - var20 = var15; - } - - if (var17 > var20) { - var20 = var17; - } - - int var21; - int var22; - if (var12 < var14) { - var21 = var12; - var22 = var14; - } else { - var21 = var14; - var22 = var12; - } - - if (var16 < var21) { - var21 = var16; - } - - if (var18 < var21) { - var21 = var18; - } - - if (var16 > var22) { - var22 = var16; - } - - if (var18 > var22) { - var22 = var18; - } - - var19 >>= 12; - var20 = var20 + 4095 >> 12; - var21 >>= 12; - var22 = var22 + 4095 >> 12; - var19 += var3; - var20 += var3; - var21 += var4; - var22 += var4; - var19 >>= 4; - var20 = var20 + 15 >> 4; - var21 >>= 4; - var22 = var22 + 15 >> 4; - if (var19 < Rasterizer2D.Rasterizer2D_xClipStart) { - var19 = Rasterizer2D.Rasterizer2D_xClipStart; - } - - if (var20 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var20 = Rasterizer2D.Rasterizer2D_xClipEnd; - } - - if (var21 < Rasterizer2D.Rasterizer2D_yClipStart) { - var21 = Rasterizer2D.Rasterizer2D_yClipStart; - } - - if (var22 > Rasterizer2D.Rasterizer2D_yClipEnd) { - var22 = Rasterizer2D.Rasterizer2D_yClipEnd; - } - - var20 = var19 - var20; - if (var20 >= 0) { - return; - } - var22 = var21 - var22; - if (var22 >= 0) { - return; - } - int var23 = var19 + var21 * Rasterizer2D.Rasterizer2D_width; - double var24 = 1.6777216E7D / (double)var6; - int var26 = (int)Math.floor(Math.sin(var7) * var24 + 0.5D); - int var27 = (int)Math.floor(Math.cos(var7) * var24 + 0.5D); - int var28 = (var19 << 4) + 8 - var3; - int var29 = (var21 << 4) + 8 - var4; - int var30 = (var1 << 8) - (var29 * var26 >> 4); - int var31 = (var29 * var27 >> 4) + (var2 << 8); - int var32; - int var33; - int var34; - int var35; - int var36; - int var37; - int var38; - if (var27 == 0) { - if (var26 == 0) { - for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; - var35 = var30; - var36 = var31; - var37 = var20; - if (var30 >= 0 && var31 >= 0 && var30 - (this.subWidth << 12) < 0 && var31 - (this.subHeight << 12) < 0) { - for (; var37 < 0; ++var37) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if (var38 != 0) { - Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; - } else { - ++var34; - } - } - } - - ++var33; - } - } else if (var26 < 0) { - for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; - var35 = var30; - var36 = (var28 * var26 >> 4) + var31; - var37 = var20; - if (var30 >= 0 && var30 - (this.subWidth << 12) < 0) { - if ((var32 = var36 - (this.subHeight << 12)) >= 0) { - var32 = (var26 - var32) / var26; - var37 = var20 + var32; - var36 += var26 * var32; - var34 = var23 + var32; - } - - if ((var32 = (var36 - var26) / var26) > var37) { - var37 = var32; - } - - while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if (var38 != 0) { - Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; - } else { - ++var34; - } - - var36 += var26; - ++var37; - } - } - - ++var33; - var30 -= var26; - } + @ObfuscatedName("at") + void method6024(int var1, int var2, int var3, int var4, int var5, int var6) { + if (var6 != 0) { + var1 -= this.xOffset << 4; + var2 -= this.yOffset << 4; + double var7 = (double)(var5 & 65535) * 9.587379924285257E-5D; + int var9 = (int)Math.floor(Math.sin(var7) * (double)var6 + 0.5D); + int var10 = (int)Math.floor(Math.cos(var7) * (double)var6 + 0.5D); + int var11 = var10 * -var1 + -var2 * var9; + int var12 = -var2 * var10 + var9 * -(-var1); + int var13 = var10 * ((this.subWidth << 4) - var1) + -var2 * var9; + int var14 = var9 * -((this.subWidth << 4) - var1) + -var2 * var10; + int var15 = ((this.subHeight << 4) - var2) * var9 + var10 * -var1; + int var16 = ((this.subHeight << 4) - var2) * var10 + var9 * -(-var1); + int var17 = ((this.subHeight << 4) - var2) * var9 + var10 * ((this.subWidth << 4) - var1); + int var18 = ((this.subHeight << 4) - var2) * var10 + var9 * -((this.subWidth << 4) - var1); + int var19; + int var20; + if (var11 < var13) { + var19 = var11; + var20 = var13; } else { - for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; - var35 = var30; - var36 = (var28 * var26 >> 4) + var31; - var37 = var20; - if (var30 >= 0 && var30 - (this.subWidth << 12) < 0) { - if (var36 < 0) { - var32 = (var26 - 1 - var36) / var26; - var37 = var20 + var32; - var36 += var26 * var32; - var34 = var23 + var32; - } - - if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { - var37 = var32; - } - - while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if (var38 != 0) { - Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; - } else { - ++var34; - } - - var36 += var26; - ++var37; - } - } - - ++var33; - var30 -= var26; - } + var19 = var13; + var20 = var11; } - } else if (var27 < 0) { - if (var26 == 0) { - for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; - var35 = (var28 * var27 >> 4) + var30; - var36 = var31; - var37 = var20; - if (var31 >= 0 && var31 - (this.subHeight << 12) < 0) { - if ((var32 = var35 - (this.subWidth << 12)) >= 0) { - var32 = (var27 - var32) / var27; - var37 = var20 + var32; - var35 += var27 * var32; - var34 = var23 + var32; - } - if ((var32 = (var35 - var27) / var27) > var37) { - var37 = var32; - } + if (var15 < var19) { + var19 = var15; + } - while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if (var38 != 0) { - Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; - } else { - ++var34; - } + if (var17 < var19) { + var19 = var17; + } - var35 += var27; - ++var37; - } - } + if (var15 > var20) { + var20 = var15; + } - ++var33; - var31 += var27; - } - } else if (var26 < 0) { - for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; - var35 = (var28 * var27 >> 4) + var30; - var36 = (var28 * var26 >> 4) + var31; - var37 = var20; - if ((var32 = var35 - (this.subWidth << 12)) >= 0) { - var32 = (var27 - var32) / var27; - var37 = var20 + var32; - var35 += var27 * var32; - var36 += var26 * var32; - var34 = var23 + var32; - } + if (var17 > var20) { + var20 = var17; + } - if ((var32 = (var35 - var27) / var27) > var37) { - var37 = var32; - } - - if ((var32 = var36 - (this.subHeight << 12)) >= 0) { - var32 = (var26 - var32) / var26; - var37 += var32; - var35 += var27 * var32; - var36 += var26 * var32; - var34 += var32; - } - - if ((var32 = (var36 - var26) / var26) > var37) { - var37 = var32; - } - - while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if (var38 != 0) { - Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; - } else { - ++var34; - } - - var35 += var27; - var36 += var26; - ++var37; - } - - ++var33; - var30 -= var26; - var31 += var27; - } + int var21; + int var22; + if (var12 < var14) { + var21 = var12; + var22 = var14; } else { - for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; - var35 = (var28 * var27 >> 4) + var30; - var36 = (var28 * var26 >> 4) + var31; - var37 = var20; - if ((var32 = var35 - (this.subWidth << 12)) >= 0) { - var32 = (var27 - var32) / var27; - var37 = var20 + var32; - var35 += var27 * var32; - var36 += var26 * var32; - var34 = var23 + var32; - } - - if ((var32 = (var35 - var27) / var27) > var37) { - var37 = var32; - } - - if (var36 < 0) { - var32 = (var26 - 1 - var36) / var26; - var37 += var32; - var35 += var27 * var32; - var36 += var26 * var32; - var34 += var32; - } - - if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { - var37 = var32; - } - - while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if (var38 != 0) { - Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; - } else { - ++var34; - } - - var35 += var27; - var36 += var26; - ++var37; - } - - ++var33; - var30 -= var26; - var31 += var27; - } + var21 = var14; + var22 = var12; } - } else if (var26 == 0) { - for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; - var35 = (var28 * var27 >> 4) + var30; - var36 = var31; - var37 = var20; - if (var31 >= 0 && var31 - (this.subHeight << 12) < 0) { - if (var35 < 0) { - var32 = (var27 - 1 - var35) / var27; - var37 = var20 + var32; - var35 += var27 * var32; - var34 = var23 + var32; - } - if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { - var37 = var32; - } - - while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if (var38 != 0) { - Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; - } else { - ++var34; - } - - var35 += var27; - ++var37; - } - } - - ++var33; - var31 += var27; + if (var16 < var21) { + var21 = var16; } - } else if (var26 < 0) { - for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; - var35 = (var28 * var27 >> 4) + var30; - var36 = (var28 * var26 >> 4) + var31; - var37 = var20; - if (var35 < 0) { - var32 = (var27 - 1 - var35) / var27; - var37 = var20 + var32; - var35 += var27 * var32; - var36 += var26 * var32; - var34 = var23 + var32; - } - if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { - var37 = var32; - } + if (var18 < var21) { + var21 = var18; + } - if ((var32 = var36 - (this.subHeight << 12)) >= 0) { - var32 = (var26 - var32) / var26; - var37 += var32; - var35 += var27 * var32; - var36 += var26 * var32; - var34 += var32; - } + if (var16 > var22) { + var22 = var16; + } - if ((var32 = (var36 - var26) / var26) > var37) { - var37 = var32; - } + if (var18 > var22) { + var22 = var18; + } - while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if (var38 != 0) { - Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; + var19 >>= 12; + var20 = var20 + 4095 >> 12; + var21 >>= 12; + var22 = var22 + 4095 >> 12; + var19 += var3; + var20 += var3; + var21 += var4; + var22 += var4; + var19 >>= 4; + var20 = var20 + 15 >> 4; + var21 >>= 4; + var22 = var22 + 15 >> 4; + if (var19 < Rasterizer2D.Rasterizer2D_xClipStart) { + var19 = Rasterizer2D.Rasterizer2D_xClipStart; + } + + if (var20 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var20 = Rasterizer2D.Rasterizer2D_xClipEnd; + } + + if (var21 < Rasterizer2D.Rasterizer2D_yClipStart) { + var21 = Rasterizer2D.Rasterizer2D_yClipStart; + } + + if (var22 > Rasterizer2D.Rasterizer2D_yClipEnd) { + var22 = Rasterizer2D.Rasterizer2D_yClipEnd; + } + + var20 = var19 - var20; + if (var20 < 0) { + var22 = var21 - var22; + if (var22 < 0) { + int var23 = var19 + var21 * Rasterizer2D.Rasterizer2D_width; + double var24 = 1.6777216E7D / (double)var6; + int var26 = (int)Math.floor(Math.sin(var7) * var24 + 0.5D); + int var27 = (int)Math.floor(Math.cos(var7) * var24 + 0.5D); + int var28 = (var19 << 4) + 8 - var3; + int var29 = (var21 << 4) + 8 - var4; + int var30 = (var1 << 8) - (var29 * var26 >> 4); + int var31 = (var29 * var27 >> 4) + (var2 << 8); + int var32; + int var33; + int var34; + int var35; + int var36; + int var37; + int var38; + if (var27 == 0) { + if (var26 == 0) { + for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { + var34 = var23; + var35 = var30; + var36 = var31; + var37 = var20; + if (var30 >= 0 && var31 >= 0 && var30 - (this.subWidth << 12) < 0 && var31 - (this.subHeight << 12) < 0) { + for (; var37 < 0; ++var37) { + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; + if (var38 != 0) { + Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; + } else { + ++var34; + } + } + } + + ++var33; + } + } else if (var26 < 0) { + for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { + var34 = var23; + var35 = var30; + var36 = (var28 * var26 >> 4) + var31; + var37 = var20; + if (var30 >= 0 && var30 - (this.subWidth << 12) < 0) { + if ((var32 = var36 - (this.subHeight << 12)) >= 0) { + var32 = (var26 - var32) / var26; + var37 = var20 + var32; + var36 += var26 * var32; + var34 = var23 + var32; + } + + if ((var32 = (var36 - var26) / var26) > var37) { + var37 = var32; + } + + while (var37 < 0) { + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; + if (var38 != 0) { + Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; + } else { + ++var34; + } + + var36 += var26; + ++var37; + } + } + + ++var33; + var30 -= var26; + } + } else { + for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { + var34 = var23; + var35 = var30; + var36 = (var28 * var26 >> 4) + var31; + var37 = var20; + if (var30 >= 0 && var30 - (this.subWidth << 12) < 0) { + if (var36 < 0) { + var32 = (var26 - 1 - var36) / var26; + var37 = var20 + var32; + var36 += var26 * var32; + var34 = var23 + var32; + } + + if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { + var37 = var32; + } + + while (var37 < 0) { + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; + if (var38 != 0) { + Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; + } else { + ++var34; + } + + var36 += var26; + ++var37; + } + } + + ++var33; + var30 -= var26; + } + } + } else if (var27 < 0) { + if (var26 == 0) { + for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { + var34 = var23; + var35 = (var28 * var27 >> 4) + var30; + var36 = var31; + var37 = var20; + if (var31 >= 0 && var31 - (this.subHeight << 12) < 0) { + if ((var32 = var35 - (this.subWidth << 12)) >= 0) { + var32 = (var27 - var32) / var27; + var37 = var20 + var32; + var35 += var27 * var32; + var34 = var23 + var32; + } + + if ((var32 = (var35 - var27) / var27) > var37) { + var37 = var32; + } + + while (var37 < 0) { + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; + if (var38 != 0) { + Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; + } else { + ++var34; + } + + var35 += var27; + ++var37; + } + } + + ++var33; + var31 += var27; + } + } else if (var26 < 0) { + for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { + var34 = var23; + var35 = (var28 * var27 >> 4) + var30; + var36 = (var28 * var26 >> 4) + var31; + var37 = var20; + if ((var32 = var35 - (this.subWidth << 12)) >= 0) { + var32 = (var27 - var32) / var27; + var37 = var20 + var32; + var35 += var27 * var32; + var36 += var26 * var32; + var34 = var23 + var32; + } + + if ((var32 = (var35 - var27) / var27) > var37) { + var37 = var32; + } + + if ((var32 = var36 - (this.subHeight << 12)) >= 0) { + var32 = (var26 - var32) / var26; + var37 += var32; + var35 += var27 * var32; + var36 += var26 * var32; + var34 += var32; + } + + if ((var32 = (var36 - var26) / var26) > var37) { + var37 = var32; + } + + while (var37 < 0) { + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; + if (var38 != 0) { + Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; + } else { + ++var34; + } + + var35 += var27; + var36 += var26; + ++var37; + } + + ++var33; + var30 -= var26; + var31 += var27; + } + } else { + for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { + var34 = var23; + var35 = (var28 * var27 >> 4) + var30; + var36 = (var28 * var26 >> 4) + var31; + var37 = var20; + if ((var32 = var35 - (this.subWidth << 12)) >= 0) { + var32 = (var27 - var32) / var27; + var37 = var20 + var32; + var35 += var27 * var32; + var36 += var26 * var32; + var34 = var23 + var32; + } + + if ((var32 = (var35 - var27) / var27) > var37) { + var37 = var32; + } + + if (var36 < 0) { + var32 = (var26 - 1 - var36) / var26; + var37 += var32; + var35 += var27 * var32; + var36 += var26 * var32; + var34 += var32; + } + + if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { + var37 = var32; + } + + while (var37 < 0) { + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; + if (var38 != 0) { + Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; + } else { + ++var34; + } + + var35 += var27; + var36 += var26; + ++var37; + } + + ++var33; + var30 -= var26; + var31 += var27; + } + } + } else if (var26 == 0) { + for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { + var34 = var23; + var35 = (var28 * var27 >> 4) + var30; + var36 = var31; + var37 = var20; + if (var31 >= 0 && var31 - (this.subHeight << 12) < 0) { + if (var35 < 0) { + var32 = (var27 - 1 - var35) / var27; + var37 = var20 + var32; + var35 += var27 * var32; + var34 = var23 + var32; + } + + if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { + var37 = var32; + } + + while (var37 < 0) { + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; + if (var38 != 0) { + Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; + } else { + ++var34; + } + + var35 += var27; + ++var37; + } + } + + ++var33; + var31 += var27; + } + } else if (var26 < 0) { + for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { + var34 = var23; + var35 = (var28 * var27 >> 4) + var30; + var36 = (var28 * var26 >> 4) + var31; + var37 = var20; + if (var35 < 0) { + var32 = (var27 - 1 - var35) / var27; + var37 = var20 + var32; + var35 += var27 * var32; + var36 += var26 * var32; + var34 = var23 + var32; + } + + if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { + var37 = var32; + } + + if ((var32 = var36 - (this.subHeight << 12)) >= 0) { + var32 = (var26 - var32) / var26; + var37 += var32; + var35 += var27 * var32; + var36 += var26 * var32; + var34 += var32; + } + + if ((var32 = (var36 - var26) / var26) > var37) { + var37 = var32; + } + + while (var37 < 0) { + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; + if (var38 != 0) { + Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; + } else { + ++var34; + } + + var35 += var27; + var36 += var26; + ++var37; + } + + ++var33; + var30 -= var26; + var31 += var27; + } } else { - ++var34; - } + for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { + var34 = var23; + var35 = (var28 * var27 >> 4) + var30; + var36 = (var28 * var26 >> 4) + var31; + var37 = var20; + if (var35 < 0) { + var32 = (var27 - 1 - var35) / var27; + var37 = var20 + var32; + var35 += var27 * var32; + var36 += var26 * var32; + var34 = var23 + var32; + } - var35 += var27; - var36 += var26; - ++var37; - } + if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { + var37 = var32; + } - ++var33; - var30 -= var26; - var31 += var27; - } - } else { - for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; - var35 = (var28 * var27 >> 4) + var30; - var36 = (var28 * var26 >> 4) + var31; - var37 = var20; - if (var35 < 0) { - var32 = (var27 - 1 - var35) / var27; - var37 = var20 + var32; - var35 += var27 * var32; - var36 += var26 * var32; - var34 = var23 + var32; - } + if (var36 < 0) { + var32 = (var26 - 1 - var36) / var26; + var37 += var32; + var35 += var27 * var32; + var36 += var26 * var32; + var34 += var32; + } - if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { - var37 = var32; - } + if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { + var37 = var32; + } - if (var36 < 0) { - var32 = (var26 - 1 - var36) / var26; - var37 += var32; - var35 += var27 * var32; - var36 += var26 * var32; - var34 += var32; - } + while (var37 < 0) { + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; + if (var38 != 0) { + Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; + } else { + ++var34; + } - if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { - var37 = var32; - } + var35 += var27; + var36 += var26; + ++var37; + } - while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if (var38 != 0) { - Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; - } else { - ++var34; - } - - var35 += var27; - var36 += var26; - ++var37; - } - - ++var33; - var30 -= var26; - var31 += var27; - } - } - - } - - @ObfuscatedName("aj") - @Export("drawScaledWorldmap") - public void drawScaledWorldmap(int x, int y, int width, int height) { - if (width > this.width || height > this.height) { - throw new IllegalArgumentException(); - } - int var5 = width * this.xOffset / this.width + x; - int var6 = (width * (this.xOffset + this.subWidth) + this.width - 1) / this.width + x; - int var7 = y + height * this.yOffset / this.height; - int var8 = y + (this.height + (this.yOffset + this.subHeight) * height - 1) / this.height; - if (var5 < Rasterizer2D.Rasterizer2D_xClipStart) { - var5 = Rasterizer2D.Rasterizer2D_xClipStart; - } - - if (var6 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var6 = Rasterizer2D.Rasterizer2D_xClipEnd; - } - - if (var7 < Rasterizer2D.Rasterizer2D_yClipStart) { - var7 = Rasterizer2D.Rasterizer2D_yClipStart; - } - - if (var8 > Rasterizer2D.Rasterizer2D_yClipEnd) { - var8 = Rasterizer2D.Rasterizer2D_yClipEnd; - } - - if (var5 >= var6 || var7 >= var8) { - return; - } - int var9 = var5 + var7 * Rasterizer2D.Rasterizer2D_width; - int var10 = Rasterizer2D.Rasterizer2D_width - (var6 - var5); - if (var9 >= Rasterizer2D.Rasterizer2D_pixels.length) { - return; - } - for (int var11 = var7; var11 < var8; ++var11) { - for (int var12 = var5; var12 < var6; ++var12) { - int var13 = var12 - x << 4; - int var14 = var11 - y << 4; - int var15 = var13 * this.width / width - (this.xOffset << 4); - int var16 = (var13 + 16) * this.width / width - (this.xOffset << 4); - int var17 = var14 * this.height / height - (this.yOffset << 4); - int var18 = (var14 + 16) * this.height / height - (this.yOffset << 4); - int var19 = (var16 - var15) * (var18 - var17) >> 1; - if (var19 == 0) { - continue; - } - if (var15 < 0) { - var15 = 0; - } - - if (var16 >= this.subWidth << 4) { - var16 = this.subWidth << 4; - } - - if (var17 < 0) { - var17 = 0; - } - - if (var18 >= this.subHeight << 4) { - var18 = this.subHeight << 4; - } - - --var16; - --var18; - int var20 = 16 - (var15 & 15); - int var21 = (var16 & 15) + 1; - int var22 = 16 - (var17 & 15); - int var23 = (var18 & 15) + 1; - var15 >>= 4; - var16 >>= 4; - var17 >>= 4; - var18 >>= 4; - int var24 = 0; - int var25 = 0; - int var26 = 0; - int var27 = 0; - - int var28; - for (var28 = var17; var28 <= var18; ++var28) { - int var29 = 16; - if (var28 == var17) { - var29 = var22; - } - - if (var28 == var18) { - var29 = var23; - } - - for (int var30 = var15; var30 <= var16; ++var30) { - int var31 = this.pixels[var30 + var28 * this.subWidth]; - if (var31 == 0) { - continue; + ++var33; + var30 -= var26; + var31 += var27; } - int var32; - if (var30 == var15) { - var32 = var29 * var20; - } else if (var30 == var16) { - var32 = var29 * var21; - } else { - var32 = var29 << 4; - } - - var27 += var32; - var24 += var32 * (var31 >> 16 & 255); - var25 += var32 * (var31 >> 8 & 255); - var26 += (var31 & 255) * var32; - } - } - - if (var27 >= var19) { - var28 = var26 / var27 + (var24 / var27 << 16) + (var25 / var27 << 8); - if (var28 == 0) { - var28 = 1; } - Rasterizer2D.Rasterizer2D_pixels[var9] = var28; } - - ++var9; } - - var9 += var10; } - - } - - @ObfuscatedName("x") - @Export("Sprite_draw") - static void Sprite_draw(int[] rasterPx, int[] spritePx, int spritePxIdx, int rasterPxIdx, int width, int height, int rasterStartOffset, int spriteStartOffset) { - for (int var8 = -height; var8 < 0; ++var8) { - int var9; - for (var9 = rasterPxIdx + width - 3; rasterPxIdx < var9; rasterPx[rasterPxIdx++] = spritePx[spritePxIdx++]) { - rasterPx[rasterPxIdx++] = spritePx[spritePxIdx++]; - rasterPx[rasterPxIdx++] = spritePx[spritePxIdx++]; - rasterPx[rasterPxIdx++] = spritePx[spritePxIdx++]; - } - - for (var9 += 3; rasterPxIdx < var9; rasterPx[rasterPxIdx++] = spritePx[spritePxIdx++]) { - } - - rasterPxIdx += rasterStartOffset; - spritePxIdx += spriteStartOffset; - } - - } - - @ObfuscatedName("v") - @Export("Sprite_drawTransBg") - static void Sprite_drawTransBg(int[] rasterPx, int[] spritePx, int currentPx, int spritePxIdx, int rasterPxIdx, int width, int height, int rasterStartOffset, int spriteStartOffset) { - int var9 = -(width >> 2); - width = -(width & 3); - - for (int var10 = -height; var10 < 0; ++var10) { - for (int var11 = var9; var11 < 0; ++var11) { - currentPx = spritePx[spritePxIdx++]; - if (currentPx != 0) { - rasterPx[rasterPxIdx++] = currentPx; - } else { - ++rasterPxIdx; - } - - currentPx = spritePx[spritePxIdx++]; - if (currentPx != 0) { - rasterPx[rasterPxIdx++] = currentPx; - } else { - ++rasterPxIdx; - } - - currentPx = spritePx[spritePxIdx++]; - if (currentPx != 0) { - rasterPx[rasterPxIdx++] = currentPx; - } else { - ++rasterPxIdx; - } - - currentPx = spritePx[spritePxIdx++]; - if (currentPx != 0) { - rasterPx[rasterPxIdx++] = currentPx; - } else { - ++rasterPxIdx; - } - } - - for (int var11 = width; var11 < 0; ++var11) { - currentPx = spritePx[spritePxIdx++]; - if (currentPx != 0) { - rasterPx[rasterPxIdx++] = currentPx; - } else { - ++rasterPxIdx; - } - } - - rasterPxIdx += rasterStartOffset; - spritePxIdx += spriteStartOffset; - } - - } - - @ObfuscatedName("g") - @Export("Sprite_drawScaled") - static void Sprite_drawScaled(int[] rasterPx, int[] spritePx, int currentPx, int xIdx, int yIdx, int rasterPxIdx, int rasterPxOffset, int width, int height, int pixelWidth, int pixelHeight, int subWidth) { - int var12 = xIdx; - - for (int var13 = -height; var13 < 0; ++var13) { - int var14 = subWidth * (yIdx >> 16); - - for (int var15 = -width; var15 < 0; ++var15) { - currentPx = spritePx[(xIdx >> 16) + var14]; - if (currentPx != 0) { - rasterPx[rasterPxIdx++] = currentPx; - } else { - ++rasterPxIdx; - } - - xIdx += pixelWidth; - } - - yIdx += pixelHeight; - xIdx = var12; - rasterPxIdx += rasterPxOffset; - } - - } - - @ObfuscatedName("j") - @Export("Sprite_drawTransOverlay") - static void Sprite_drawTransOverlay(int[] rasterPx, int[] spritePx, int currentPx, int spritePxIdx, int rasterPxIdx, int width, int height, int rasterStartOffset, int spriteStartOffset, int overlayOpacity, int overlayColor) { - int var11 = 256 - overlayOpacity; - int var12 = (overlayColor & 0xff00ff) * var11 & 0xff00ff00; - int var13 = (overlayColor & 0xff00) * var11 & 0xff0000; - overlayColor = (var12 | var13) >>> 8; - - for (int var14 = -height; var14 < 0; ++var14) { - for (int var15 = -width; var15 < 0; ++var15) { - currentPx = spritePx[spritePxIdx++]; - if (currentPx != 0) { - var12 = overlayOpacity * (currentPx & 0xff00ff) & 0xff00ff00; - var13 = (currentPx & 0xff00) * overlayOpacity & 0xff0000; - rasterPx[rasterPxIdx++] = overlayColor + ((var12 | var13) >>> 8); - } else { - ++rasterPxIdx; - } - } - - rasterPxIdx += rasterStartOffset; - spritePxIdx += spriteStartOffset; - } - - } - - @ObfuscatedName("d") - @Export("Sprite_drawTransparent") - static void Sprite_drawTransparent(int[] rasterPx, int[] spritePx, int currentPx, int spritePxIdx, int rasterPxIdx, int width, int height, int rasterStartOffset, int spriteStartOffset, int opacity) { - int var10 = 256 - opacity; - - for (int var11 = -height; var11 < 0; ++var11) { - for (int var12 = -width; var12 < 0; ++var12) { - currentPx = spritePx[spritePxIdx++]; - if (currentPx != 0) { - int var13 = rasterPx[rasterPxIdx]; - rasterPx[rasterPxIdx++] = ((var13 & 0xff00ff) * var10 + opacity * (currentPx & 0xff00ff) & 0xff00ff00) + ((currentPx & 0xff00) * opacity + var10 * (var13 & 0xff00) & 0xff0000) >> 8; - } else { - ++rasterPxIdx; - } - } - - rasterPxIdx += rasterStartOffset; - spritePxIdx += spriteStartOffset; - } - - } - - @ObfuscatedName("z") - @Export("Sprite_drawTransScaled") - static void Sprite_drawTransScaled(int[] rasterPx, int[] spritePx, int currentPx, int xIdx, int yIdx, int rasterPxIdx, int rasterPxOffset, int width, int height, int pxWidth, int pxHeight, int subWidth, int opacity) { - int var13 = 256 - opacity; - int var14 = xIdx; - - for (int var15 = -height; var15 < 0; ++var15) { - int var16 = subWidth * (yIdx >> 16); - - for (int var17 = -width; var17 < 0; ++var17) { - currentPx = spritePx[(xIdx >> 16) + var16]; - if (currentPx != 0) { - int var18 = rasterPx[rasterPxIdx]; - rasterPx[rasterPxIdx++] = ((currentPx & 0xff00) * opacity + var13 * (var18 & 0xff00) & 0xff0000) + ((var18 & 0xff00ff) * var13 + opacity * (currentPx & 0xff00ff) & 0xff00ff00) >> 8; - } else { - ++rasterPxIdx; - } - - xIdx += pxWidth; - } - - yIdx += pxHeight; - xIdx = var14; - rasterPxIdx += rasterPxOffset; - } - - } - - @ObfuscatedName("av") - static void method6134(int curSpritePx, int curRasterPx, int var2, int[] rasterPx, int[] spritePx, int spritePxIdx, int var6, int rasterPxIdx, int var8, int width, int height, int rasterPxOffset, int spritePxOffset) { - for (var8 = -height; var8 < 0; ++var8) { - for (var6 = -width; var6 < 0; ++var6) { - curSpritePx = spritePx[spritePxIdx++]; - if (curSpritePx != 0) { - curRasterPx = rasterPx[rasterPxIdx]; - var2 = curSpritePx + curRasterPx; - curSpritePx = (curSpritePx & 0xff00ff) + (curRasterPx & 0xff00ff); - curRasterPx = (curSpritePx & 0x1000100) + (var2 - curSpritePx & 0x10000); - rasterPx[rasterPxIdx++] = var2 - curRasterPx | curRasterPx - (curRasterPx >>> 8); - } else { - ++rasterPxIdx; - } - } - - rasterPxIdx += rasterPxOffset; - spritePxIdx += spritePxOffset; - } - } @ObfuscatedName("as") - static void method6119(int var0, int var1, int var2, int[] rasterPx, int[] spritePx, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int opacity) { + @Export("drawScaledWorldmap") + public void drawScaledWorldmap(int var1, int var2, int var3, int var4) { + if (var3 <= this.width && var4 <= this.height) { + int var5 = var3 * this.xOffset / this.width + var1; + int var6 = (var3 * (this.xOffset + this.subWidth) + this.width - 1) / this.width + var1; + int var7 = var2 + var4 * this.yOffset / this.height; + int var8 = var2 + (this.height + (this.yOffset + this.subHeight) * var4 - 1) / this.height; + if (var5 < Rasterizer2D.Rasterizer2D_xClipStart) { + var5 = Rasterizer2D.Rasterizer2D_xClipStart; + } + + if (var6 > Rasterizer2D.Rasterizer2D_xClipEnd) { + var6 = Rasterizer2D.Rasterizer2D_xClipEnd; + } + + if (var7 < Rasterizer2D.Rasterizer2D_yClipStart) { + var7 = Rasterizer2D.Rasterizer2D_yClipStart; + } + + if (var8 > Rasterizer2D.Rasterizer2D_yClipEnd) { + var8 = Rasterizer2D.Rasterizer2D_yClipEnd; + } + + if (var5 < var6 && var7 < var8) { + int var9 = var5 + var7 * Rasterizer2D.Rasterizer2D_width; + int var10 = Rasterizer2D.Rasterizer2D_width - (var6 - var5); + if (var9 < Rasterizer2D.Rasterizer2D_pixels.length) { + for (int var11 = var7; var11 < var8; ++var11) { + for (int var12 = var5; var12 < var6; ++var12) { + int var13 = var12 - var1 << 4; + int var14 = var11 - var2 << 4; + int var15 = var13 * this.width / var3 - (this.xOffset << 4); + int var16 = (var13 + 16) * this.width / var3 - (this.xOffset << 4); + int var17 = var14 * this.height / var4 - (this.yOffset << 4); + int var18 = (var14 + 16) * this.height / var4 - (this.yOffset << 4); + int var19 = (var16 - var15) * (var18 - var17) >> 1; + if (var19 != 0) { + if (var15 < 0) { + var15 = 0; + } + + if (var16 >= this.subWidth << 4) { + var16 = this.subWidth << 4; + } + + if (var17 < 0) { + var17 = 0; + } + + if (var18 >= this.subHeight << 4) { + var18 = this.subHeight << 4; + } + + --var16; + --var18; + int var20 = 16 - (var15 & 15); + int var21 = (var16 & 15) + 1; + int var22 = 16 - (var17 & 15); + int var23 = (var18 & 15) + 1; + var15 >>= 4; + var16 >>= 4; + var17 >>= 4; + var18 >>= 4; + int var24 = 0; + int var25 = 0; + int var26 = 0; + int var27 = 0; + + int var28; + for (var28 = var17; var28 <= var18; ++var28) { + int var29 = 16; + if (var28 == var17) { + var29 = var22; + } + + if (var28 == var18) { + var29 = var23; + } + + for (int var30 = var15; var30 <= var16; ++var30) { + int var31 = this.pixels[var30 + var28 * this.subWidth]; + if (var31 != 0) { + int var32; + if (var30 == var15) { + var32 = var29 * var20; + } else if (var30 == var16) { + var32 = var29 * var21; + } else { + var32 = var29 << 4; + } + + var27 += var32; + var24 += var32 * (var31 >> 16 & 255); + var25 += var32 * (var31 >> 8 & 255); + var26 += (var31 & 255) * var32; + } + } + } + + if (var27 >= var19) { + var28 = var26 / var27 + (var24 / var27 << 16) + (var25 / var27 << 8); + if (var28 == 0) { + var28 = 1; + } + + Rasterizer2D.Rasterizer2D_pixels[var9] = var28; + } + + ++var9; + } + } + + var9 += var10; + } + + } + } + } else { + throw new IllegalArgumentException(); + } + } + + @ObfuscatedName("f") + @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) { + int var9; + for (var9 = var3 + var4 - 3; var3 < var9; var0[var3++] = var1[var2++]) { + var0[var3++] = var1[var2++]; + var0[var3++] = var1[var2++]; + var0[var3++] = var1[var2++]; + } + + for (var9 += 3; var3 < var9; var0[var3++] = var1[var2++]) { + } + + var3 += var6; + var2 += var7; + } + + } + + @ObfuscatedName("r") + @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); + var5 = -(var5 & 3); + + for (int var10 = -var6; var10 < 0; ++var10) { + int var11; + for (var11 = var9; var11 < 0; ++var11) { + var2 = var1[var3++]; + if (var2 != 0) { + var0[var4++] = var2; + } else { + ++var4; + } + + var2 = var1[var3++]; + if (var2 != 0) { + var0[var4++] = var2; + } else { + ++var4; + } + + var2 = var1[var3++]; + if (var2 != 0) { + var0[var4++] = var2; + } else { + ++var4; + } + + var2 = var1[var3++]; + if (var2 != 0) { + var0[var4++] = var2; + } else { + ++var4; + } + } + + for (var11 = var5; var11 < 0; ++var11) { + var2 = var1[var3++]; + if (var2 != 0) { + var0[var4++] = var2; + } else { + ++var4; + } + } + + var4 += var7; + var3 += var8; + } + + } + + @ObfuscatedName("p") + @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; + + for (int var13 = -var8; var13 < 0; ++var13) { + int var14 = var11 * (var4 >> 16); + + for (int var15 = -var7; var15 < 0; ++var15) { + var2 = var1[(var3 >> 16) + var14]; + if (var2 != 0) { + var0[var5++] = var2; + } else { + ++var5; + } + + var3 += var9; + } + + var4 += var10; + var3 = var12; + var5 += var6; + } + + } + + @ObfuscatedName("e") + @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; + int var12 = (var10 & 16711935) * var11 & -16711936; + int var13 = (var10 & 65280) * var11 & 16711680; + var10 = (var12 | var13) >>> 8; + + for (int var14 = -var6; var14 < 0; ++var14) { + for (int var15 = -var5; var15 < 0; ++var15) { + var2 = var1[var3++]; + if (var2 != 0) { + var12 = var9 * (var2 & 16711935) & -16711936; + var13 = (var2 & 65280) * var9 & 16711680; + var0[var4++] = var10 + ((var12 | var13) >>> 8); + } else { + ++var4; + } + } + + var4 += var7; + var3 += var8; + } + + } + + @ObfuscatedName("w") + @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; + + for (int var11 = -var6; var11 < 0; ++var11) { + for (int var12 = -var5; var12 < 0; ++var12) { + var2 = var1[var3++]; + if (var2 != 0) { + int var13 = var0[var4]; + var0[var4++] = ((var13 & 16711935) * var10 + var9 * (var2 & 16711935) & -16711936) + ((var2 & 65280) * var9 + var10 * (var13 & 65280) & 16711680) >> 8; + } else { + ++var4; + } + } + + var4 += var7; + var3 += var8; + } + + } + + @ObfuscatedName("h") + @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; + int var14 = var3; + + for (int var15 = -var8; var15 < 0; ++var15) { + int var16 = var11 * (var4 >> 16); + + for (int var17 = -var7; var17 < 0; ++var17) { + var2 = var1[(var3 >> 16) + var16]; + if (var2 != 0) { + int var18 = var0[var5]; + var0[var5++] = ((var2 & 65280) * var12 + var13 * (var18 & 65280) & 16711680) + ((var18 & 16711935) * var13 + var12 * (var2 & 16711935) & -16711936) >> 8; + } else { + ++var5; + } + + var3 += var9; + } + + var4 += var10; + var3 = var14; + var5 += var6; + } + + } + + @ObfuscatedName("m") + static void method6067(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 = spritePx[var5++]; + var0 = var4[var5++]; if (var0 != 0) { - var1 = opacity * (var0 & 0xff00ff); - var0 = (var1 & 0xff00ff00) + (opacity * var0 - var1 & 0xff0000) >>> 8; - var1 = rasterPx[var7]; + var1 = var3[var7]; var2 = var0 + var1; - var0 = (var0 & 0xff00ff) + (var1 & 0xff00ff); + var0 = (var0 & 16711935) + (var1 & 16711935); var1 = (var0 & 16777472) + (var2 - var0 & 65536); - rasterPx[var7++] = var2 - var1 | var1 - (var1 >>> 8); + var3[var7++] = var2 - var1 | var1 - (var1 >>> 8); } else { ++var7; } @@ -1610,8 +1577,32 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("ad") - static void method6111(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("o") + static void method6016(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++]; + if (var0 != 0) { + var1 = var13 * (var0 & 16711935); + var0 = (var1 & -16711936) + (var13 * var0 - var1 & 16711680) >>> 8; + var1 = var3[var7]; + var2 = var0 + var1; + var0 = (var0 & 16711935) + (var1 & 16711935); + var1 = (var0 & 16777472) + (var2 - var0 & 65536); + var3[var7++] = var2 - var1 | var1 - (var1 >>> 8); + } else { + ++var7; + } + } + + var7 += var11; + var5 += var12; + } + + } + + @ObfuscatedName("am") + static void method6088(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); @@ -1620,7 +1611,7 @@ public final class Sprite extends Rasterizer2D { if (var0 != 0) { var1 = var5[var10]; var2 = var0 + var1; - var0 = (var0 & 0xff00ff) + (var1 & 0xff00ff); + var0 = (var0 & 16711935) + (var1 & 16711935); var1 = (var0 & 16777472) + (var2 - var0 & 65536); var5[var10++] = var2 - var1 | var1 - (var1 >>> 8); } else { @@ -1637,19 +1628,19 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("ag") - static void method6138(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("ai") + static void method6019(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); for (var6 = -var12; var6 < 0; ++var6) { var0 = var4[(var3 >> 16) + var7]; if (var0 != 0) { - var1 = (var0 & 0xff00ff) * var16; - var0 = (var1 & 0xff00ff00) + (var0 * var16 - var1 & 0xff0000) >>> 8; + var1 = (var0 & 16711935) * var16; + var0 = (var1 & -16711936) + (var0 * var16 - var1 & 16711680) >>> 8; var1 = var5[var10]; var2 = var0 + var1; - var0 = (var0 & 0xff00ff) + (var1 & 0xff00ff); + var0 = (var0 & 16711935) + (var1 & 16711935); var1 = (var0 & 16777472) + (var2 - var0 & 65536); var5[var10++] = var2 - var1 | var1 - (var1 >>> 8); } else { diff --git a/runescape-client/src/main/java/SpriteBuffer.java b/runescape-client/src/main/java/SpriteBuffer.java deleted file mode 100644 index 0c2c1a29c3..0000000000 --- a/runescape-client/src/main/java/SpriteBuffer.java +++ /dev/null @@ -1,72 +0,0 @@ -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("lm") -@Implements("SpriteBuffer") -public class SpriteBuffer { - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -180195353 - ) - @Export("SpriteBuffer_spriteCount") - static int SpriteBuffer_spriteCount; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 513029385 - ) - @Export("SpriteBuffer_spriteWidth") - public static int SpriteBuffer_spriteWidth; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -758911013 - ) - @Export("SpriteBuffer_spriteHeight") - public static int SpriteBuffer_spriteHeight; - @ObfuscatedName("k") - @Export("SpriteBuffer_yOffsets") - public static int[] SpriteBuffer_yOffsets; - @ObfuscatedName("l") - @Export("SpriteBuffer_spriteWidths") - public static int[] SpriteBuffer_spriteWidths; - @ObfuscatedName("c") - @Export("SpriteBuffer_pixels") - public static byte[][] SpriteBuffer_pixels; - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZLjava/lang/String;ZB)V", - garbageValue = "38" - ) - static void method6243(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.field434.startsWith("win") && !var3) { - Player.method1226(var0, 0, "openjs"); - return; - } - - if (class51.field434.startsWith("mac")) { - Player.method1226(var0, 1, var2); - return; - } - - Player.method1226(var0, 2, "openjs"); - } else { - Player.method1226(var0, 3, "openjs"); - } - - } -} diff --git a/runescape-client/src/main/java/SpriteMask.java b/runescape-client/src/main/java/SpriteMask.java index d8624039d1..91e089396d 100644 --- a/runescape-client/src/main/java/SpriteMask.java +++ b/runescape-client/src/main/java/SpriteMask.java @@ -7,22 +7,24 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("hg") @Implements("SpriteMask") public class SpriteMask extends DualNode { - @ObfuscatedName("q") + @ObfuscatedName("cu") + public static char field2499; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 874767191 + intValue = 1889581331 ) @Export("width") public final int width; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -918185267 + intValue = -300799133 ) @Export("height") public final int height; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("xWidths") public final int[] xWidths; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("xStarts") public final int[] xStarts; @@ -33,10 +35,10 @@ public class SpriteMask extends DualNode { this.xStarts = var4; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(IIS)Z", - garbageValue = "25393" + signature = "(III)Z", + garbageValue = "-1169016407" ) @Export("contains") public boolean contains(int var1, int var2) { @@ -49,4 +51,14 @@ public class SpriteMask extends DualNode { return false; } + + @ObfuscatedName("jm") + @ObfuscatedSignature( + signature = "(ZB)V", + garbageValue = "57" + ) + @Export("setTapToDrop") + static void setTapToDrop(boolean var0) { + Client.tapToDrop = var0; + } } diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java index ea4c05deb4..3d646397cb 100644 --- a/runescape-client/src/main/java/Strings.java +++ b/runescape-client/src/main/java/Strings.java @@ -1,51 +1,25 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hx") +@ObfuscatedName("ht") @Implements("Strings") public class Strings { - @ObfuscatedName("bg") - public static String field2811; - @ObfuscatedName("cs") - public static String field2961; - @ObfuscatedName("jm") - public static String field2942; - @ObfuscatedName("jj") - public static String field3027; + @ObfuscatedName("bn") + public static String field2992; + @ObfuscatedName("cg") + public static String field2831; + @ObfuscatedName("ji") + public static String field3007; + @ObfuscatedName("jd") + public static String field3008; @ObfuscatedName("jr") - public static String field2768; + public static String field3009; static { - field2811 = "Please visit the support page for assistance."; - field2961 = "Please visit the support page for assistance."; - field2942 = ""; - field3027 = "Page has opened in a new window."; - field2768 = "(Please check your popup blocker.)"; - } - - @ObfuscatedName("hg") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-495158745" - ) - @Export("resetMenuEntries") - static void resetMenuEntries() { - Client.menuOptionsCount = 0; - Client.isMenuOpen = false; - } - - @ObfuscatedName("jl") - @ObfuscatedSignature( - signature = "(Lhj;I)V", - garbageValue = "-2041903885" - ) - @Export("invalidateWidget") - static void invalidateWidget(Widget var0) { - if (var0.cycle == Client.field741) { - Client.field843[var0.rootIndex] = true; - } - + field2992 = "Please visit the support page for assistance."; + field2831 = "Please visit the support page for assistance."; + field3007 = ""; + field3008 = "Page has opened in a new window."; + field3009 = "(Please check your popup blocker.)"; } } diff --git a/runescape-client/src/main/java/StructDefinition.java b/runescape-client/src/main/java/StructDefinition.java index e5fa03c291..bc853f115d 100644 --- a/runescape-client/src/main/java/StructDefinition.java +++ b/runescape-client/src/main/java/StructDefinition.java @@ -3,24 +3,24 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("in") +@ObfuscatedName("ix") @Implements("StructDefinition") public class StructDefinition extends DualNode { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("StructDefinition_archive") - static AbstractArchive StructDefinition_archive; - @ObfuscatedName("w") + public static AbstractArchive StructDefinition_archive; + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lep;" ) @Export("StructDefinition_cached") public static EvictingDualNodeHashTable StructDefinition_cached; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lla;" + signature = "Lln;" ) @Export("params") IterableNodeHashTable params; @@ -32,19 +32,19 @@ public class StructDefinition extends DualNode { StructDefinition() { } - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "9298" + signature = "(I)V", + garbageValue = "658327081" ) @Export("postDecode") void postDecode() { } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkf;I)V", - garbageValue = "1347797517" + signature = "(Lky;I)V", + garbageValue = "1747756287" ) @Export("decode") void decode(Buffer var1) { @@ -60,21 +60,21 @@ public class StructDefinition extends DualNode { @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lkf;II)V", - garbageValue = "-629371367" + signature = "(Lky;II)V", + garbageValue = "120190923" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 249) { - this.params = WorldMapArea.readStringIntParameters(var1, this.params); + this.params = DynamicObject.readStringIntParameters(var1, this.params); } } - @ObfuscatedName("l") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "-1469740156" + garbageValue = "1830789518" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { @@ -94,375 +94,114 @@ public class StructDefinition extends DualNode { return var3; } - @ObfuscatedName("b") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1883536215" + signature = "(ILjava/lang/String;B)Ljava/lang/String;", + garbageValue = "50" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return GrandExchangeOfferWorldComparator.method54(this.params, var1, var2); + return class227.method4041(this.params, var1, var2); } - @ObfuscatedName("fp") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lbq;IB)V", - garbageValue = "16" + signature = "(II)Lio;", + garbageValue = "-431406721" ) - @Export("calculateActorPosition") - static final void calculateActorPosition(Actor var0, int var1) { - int var2; - int var3; - int var4; - SequenceDefinition var11; - if (var0.field995 > Client.cycle) { - var2 = var0.field995 - Client.cycle; - var3 = var0.size * -1342954560 + var0.field991 * 128; - var4 = var0.size * -1342954560 + var0.field993 * 128; - var0.x += (var3 - var0.x) / var2; - var0.y += (var4 - var0.y) / var2; - var0.field1007 = 0; - var0.orientation = var0.field997; - } else if (var0.field996 >= Client.cycle) { - if (var0.field996 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > GrandExchangeEvent.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { - var2 = var0.field996 - var0.field995; - var3 = Client.cycle - var0.field995; - var4 = var0.size * -1342954560 + var0.field991 * 128; - int var5 = var0.field993 * 128 + var0.size * -1342954560; - int var6 = var0.size * -1342954560 + var0.field992 * 128; - int var7 = var0.size * -1342954560 + var0.field983 * 128; - var0.x = (var6 * var3 + var4 * (var2 - var3)) / var2; - var0.y = (var7 * var3 + var5 * (var2 - var3)) / var2; - } - - var0.field1007 = 0; - var0.orientation = var0.field997; - var0.rotation = var0.orientation; - } else if (var0.pathLength == 0) { - var0.movementSequence = var0.readySequence; - var0.field1007 = 0; + @Export("HitSplatDefinition_get") + public static HitSplatDefinition HitSplatDefinition_get(int var0) { + HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; } else { - var0.movementSequence = var0.readySequence; - label434: { - if (var0.sequence != -1 && var0.sequenceDelay == 0) { - var11 = GrandExchangeEvent.SequenceDefinition_get(var0.sequence); - if (var0.field1008 > 0 && var11.field3525 == 0) { - ++var0.field1007; - break label434; - } - - if (var0.field1008 <= 0 && var11.field3532 == 0) { - ++var0.field1007; - break label434; - } - } - - var2 = var0.x; - var3 = var0.y; - var4 = var0.size * -1342954560 + var0.pathX[var0.pathLength - 1] * 128; - int var5 = var0.size * -1342954560 + var0.pathY[var0.pathLength - 1] * 128; - if (var2 < var4) { - if (var3 < var5) { - var0.orientation = 1280; - } else if (var3 > var5) { - var0.orientation = 1792; - } else { - var0.orientation = 1536; - } - } else if (var2 > var4) { - if (var3 < var5) { - var0.orientation = 768; - } else if (var3 > var5) { - var0.orientation = 256; - } else { - var0.orientation = 512; - } - } else if (var3 < var5) { - var0.orientation = 1024; - } else if (var3 > var5) { - var0.orientation = 0; - } - - byte var13 = var0.pathTraversed[var0.pathLength - 1]; - if (var4 - var2 > 256 || var4 - var2 < -256 || var5 - var3 > 256 || var5 - var3 < -256) { - var0.x = var4; - var0.y = var5; - --var0.pathLength; - if (var0.field1008 > 0) { - --var0.field1008; - } - } else { - 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.orientation != var0.rotation && var0.targetIndex == -1 && var0.field948 != 0) { - var9 = 2; - } - - if (var0.pathLength > 2) { - var9 = 6; - } - - if (var0.pathLength > 3) { - var9 = 8; - } - - if (var0.field1007 > 0 && var0.pathLength > 1) { - var9 = 8; - --var0.field1007; - } - } else { - if (var0.pathLength > 1) { - var9 = 6; - } - - if (var0.pathLength > 2) { - var9 = 8; - } - - if (var0.field1007 > 0 && var0.pathLength > 1) { - var9 = 8; - --var0.field1007; - } - } - - if (var13 == 2) { - var9 <<= 1; - } - - if (var9 >= 8 && var0.walkSequence == var0.movementSequence && var0.runSequence != -1) { - var0.movementSequence = var0.runSequence; - } - - if (var2 != var4 || var3 != var5) { - if (var2 < var4) { - var0.x += var9; - if (var0.x > var4) { - var0.x = var4; - } - } else if (var2 > var4) { - var0.x -= var9; - if (var0.x < var4) { - var0.x = var4; - } - } - - if (var3 < var5) { - var0.y += var9; - if (var0.y > var5) { - var0.y = var5; - } - } else if (var3 > var5) { - var0.y -= var9; - if (var0.y < var5) { - var0.y = var5; - } - } - } - - if (var4 == var0.x && var5 == var0.y) { - --var0.pathLength; - if (var0.field1008 > 0) { - --var0.field1008; - } - } - } - } - } - - if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { - var0.sequence = -1; - var0.spotAnimation = -1; - var0.field995 = 0; - var0.field996 = 0; - var0.x = var0.pathX[0] * 128 + var0.size * -1342954560; - var0.y = var0.pathY[0] * 128 + var0.size * -1342954560; - var0.method1658(); - } - - if (Client.localPlayer == var0 && (var0.x < 0x600 || var0.y < 0x600 || var0.x >= 0x2e00 || var0.y >= 0x2e00)) { - var0.sequence = -1; - var0.spotAnimation = -1; - var0.field995 = 0; - var0.field996 = 0; - var0.x = var0.size * -1342954560 + var0.pathX[0] * 128; - var0.y = var0.pathY[0] * 128 + var0.size * -1342954560; - var0.method1658(); - } - - Friend.method5226(var0); - var0.isWalking = false; - if (var0.movementSequence != -1) { - var11 = GrandExchangeEvent.SequenceDefinition_get(var0.movementSequence); - if (var11 == null || var11.frameIds == null) { - var0.movementSequence = -1; - } else { - if (++var0.movementFrame < var11.frameIds.length && var0.movementFrameCycle > var11.frameLengths[var0.movementFrame]) { - var0.movementFrameCycle = 1; - ++var0.movementFrame; - WorldMapSection0.addSequenceSoundEffect(var11, var0.movementFrame, var0.x, var0.y); - } - - if (var0.movementFrame >= var11.frameIds.length) { - var0.movementFrameCycle = 0; - var0.movementFrame = 0; - WorldMapSection0.addSequenceSoundEffect(var11, var0.movementFrame, var0.x, var0.y); - } - } - } - - if (var0.spotAnimation != -1 && Client.cycle >= var0.field989) { - if (var0.spotAnimationFrame < 0) { - var0.spotAnimationFrame = 0; + byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); + var1 = new HitSplatDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); } - var2 = MusicPatch.SpotAnimationDefinition_get(var0.spotAnimation).sequence; - if (var2 == -1) { - var0.spotAnimation = -1; - } else { - SequenceDefinition var12 = GrandExchangeEvent.SequenceDefinition_get(var2); - if (var12 == null || var12.frameIds == null) { - var0.spotAnimation = -1; - } else { - ++var0.spotAnimationFrameCycle; - if (var0.spotAnimationFrame < var12.frameIds.length && var0.spotAnimationFrameCycle > var12.frameLengths[var0.spotAnimationFrame]) { - var0.spotAnimationFrameCycle = 1; - ++var0.spotAnimationFrame; - WorldMapSection0.addSequenceSoundEffect(var12, var0.spotAnimationFrame, var0.x, var0.y); - } - - if (var0.spotAnimationFrame >= var12.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var12.frameIds.length)) { - var0.spotAnimation = -1; - } - } - } + HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); + return var1; } - - if (var0.sequence != -1 && var0.sequenceDelay <= 1) { - var11 = GrandExchangeEvent.SequenceDefinition_get(var0.sequence); - if (var11.field3525 == 1 && var0.field1008 > 0 && var0.field995 <= Client.cycle && var0.field996 < Client.cycle) { - var0.sequenceDelay = 1; - return; - } - } - - if (var0.sequence != -1 && var0.sequenceDelay == 0) { - var11 = GrandExchangeEvent.SequenceDefinition_get(var0.sequence); - if (var11 == null || var11.frameIds == null) { - var0.sequence = -1; - } else { - ++var0.sequenceFrameCycle; - if (var0.sequenceFrame < var11.frameIds.length && var0.sequenceFrameCycle > var11.frameLengths[var0.sequenceFrame]) { - var0.sequenceFrameCycle = 1; - ++var0.sequenceFrame; - WorldMapSection0.addSequenceSoundEffect(var11, var0.sequenceFrame, var0.x, var0.y); - } - - if (var0.sequenceFrame >= var11.frameIds.length) { - var0.sequenceFrame -= var11.frameCount; - ++var0.field985; - if (var0.field985 >= var11.field3535) { - var0.sequence = -1; - } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var11.frameIds.length) { - WorldMapSection0.addSequenceSoundEffect(var11, var0.sequenceFrame, var0.x, var0.y); - } else { - var0.sequence = -1; - } - } - - var0.isWalking = var11.field3526; - } - } - - if (var0.sequenceDelay > 0) { - --var0.sequenceDelay; - } - } - @ObfuscatedName("ha") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1674693758" + signature = "(CI)C", + garbageValue = "-2066919022" ) - @Export("readNpcUpdates") - static final void readNpcUpdates() { - 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.field776[++Client.field775 - 1] = Client.npcIndices[var2]; - } + static char method4449(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); } - - if (var1 > Client.npcCount) { - throw new RuntimeException(""); - } - 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; - continue; - } - int var6 = var0.readBits(2); - if (var6 == 0) { - Client.npcIndices[++Client.npcCount - 1] = var3; - var4.npcCycle = Client.cycle; - Client.field859[++Client.field697 - 1] = var3; - } else if (var6 == 1) { - Client.npcIndices[++Client.npcCount - 1] = var3; - var4.npcCycle = Client.cycle; - int var7 = var0.readBits(3); - var4.method1974(var7, (byte) 1); - int var8 = var0.readBits(1); - if (var8 == 1) { - Client.field859[++Client.field697 - 1] = var3; - } - } else if (var6 == 2) { - Client.npcIndices[++Client.npcCount - 1] = var3; - var4.npcCycle = Client.cycle; - int var7 = var0.readBits(3); - var4.method1974(var7, (byte) 2); - int var8 = var0.readBits(3); - var4.method1974(var8, (byte) 2); - int var9 = var0.readBits(1); - if (var9 == 1) { - Client.field859[++Client.field697 - 1] = var3; - } - } else if (var6 == 3) { - Client.field776[++Client.field775 - 1] = var3; - } - } - } } diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java index e3a5ab44ac..6b1d76fb60 100644 --- a/runescape-client/src/main/java/StudioGame.java +++ b/runescape-client/src/main/java/StudioGame.java @@ -1,56 +1,58 @@ +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; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("hl") +@ObfuscatedName("hv") @Implements("StudioGame") public enum StudioGame implements Enumerated { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lhl;" + signature = "Lhv;" ) @Export("runescape") runescape("runescape", "RuneScape", 0), - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lhl;" + signature = "Lhv;" ) @Export("stellardawn") stellardawn("stellardawn", "Stellar Dawn", 1), - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lhl;" + signature = "Lhv;" ) @Export("game3") game3("game3", "Game 3", 2), - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lhl;" + signature = "Lhv;" ) @Export("game4") game4("game4", "Game 4", 3), - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lhl;" + signature = "Lhv;" ) @Export("game5") game5("game5", "Game 5", 4), - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lhl;" + signature = "Lhv;" ) @Export("oldscape") oldscape("oldscape", "RuneScape 2007", 5); - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("name") public final String name; - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1180818879 + intValue = 1258776417 ) @Export("id") final int id; @@ -60,48 +62,338 @@ public enum StudioGame implements Enumerated { this.id = var5; } - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "320353268" + signature = "(B)I", + garbageValue = "-32" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(ILcx;ZI)I", - garbageValue = "-1636258729" + signature = "(II)Lie;", + garbageValue = "1021508128" ) - static int method4137(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? Interpreter.field1111 : Calendar.field2507; - if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = HealthBar.method1957(class268.getWidgetClickMask(var3)); - return 1; - } - if (var0 == ScriptOpcodes.CC_GETOP) { - int var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - --var4; - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.actions[var4]; - } else { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; + @Export("FloorUnderlayDefinition_get") + public static FloorUnderlayDefinition FloorUnderlayDefinition_get(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); } - return 1; + var1.postDecode(); + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); + return var1; } - if (var0 == ScriptOpcodes.CC_GETOPBASE) { - if (var3.dataText == null) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.dataText; + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;ZLjava/lang/String;ZB)V", + garbageValue = "4" + ) + static void method4056(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) { + } } - return 1; + if (class51.field404.startsWith("win") && !var3) { + GrandExchangeOffer.method109(var0, 0); + return; + } + + if (class51.field404.startsWith("mac")) { + WorldMapSection0.method232(var0, 1, var2); + return; + } + + WorldMapSection0.method232(var0, 2, "openjs"); + } else { + GrandExchangeOffer.method109(var0, 3); } - return 2; + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "(Lkx;II)V", + garbageValue = "-990783681" + ) + @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.field614 = false; + } else if (Client.localPlayerIndex == var1) { + throw new RuntimeException(); + } else { + Players.Players_regions[var1] = (var4.plane << 28) + (PacketWriter.baseX * 64 + var4.pathX[0] >> 13 << 14) + (RouteStrategy.baseY * 64 + var4.pathY[0] >> 13); + if (var4.field946 != -1) { + Players.Players_orientations[var1] = var4.field946; + } else { + Players.Players_orientations[var1] = var4.orientation; + } + + Players.Players_targetIndices[var1] = var4.targetIndex; + Client.players[var1] = null; + if (var0.readBits(1) != 0) { + WorldMapLabelSize.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) { + if (var2) { + var4.field614 = true; + var4.tileX = var6; + var4.tileY = var7; + } else { + var4.field614 = false; + var4.method1190(var6, var7, Players.field1230[var1]); + } + } else { + var4.resetPath(var6, var7); + var4.field614 = false; + } + + } 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.field614 = false; + } else if (var2) { + var4.field614 = true; + var4.tileX = var6; + var4.tileY = var7; + } else { + var4.field614 = false; + var4.method1190(var6, var7, Players.field1230[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) { + if (var2) { + var4.field614 = true; + var4.tileX = var10; + var4.tileY = var11; + } else { + var4.field614 = false; + var4.method1190(var10, var11, Players.field1230[var1]); + } + } else { + var4.resetPath(var10, var11); + var4.field614 = false; + } + + var4.plane = (byte)(var7 + var4.plane & 3); + if (Client.localPlayerIndex == var1) { + ItemContainer.plane = var4.plane; + } + + } else { + var6 = var0.readBits(30); + var7 = var6 >> 28; + var8 = var6 >> 14 & 16383; + var9 = var6 & 16383; + var10 = (PacketWriter.baseX * 64 + var8 + var4.pathX[0] & 16383) - PacketWriter.baseX * 64; + var11 = (RouteStrategy.baseY * 64 + var9 + var4.pathY[0] & 16383) - RouteStrategy.baseY * 64; + if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { + if (var2) { + var4.field614 = true; + var4.tileX = var10; + var4.tileY = var11; + } else { + var4.field614 = false; + var4.method1190(var10, var11, Players.field1230[var1]); + } + } else { + var4.resetPath(var10, var11); + var4.field614 = false; + } + + var4.plane = (byte)(var7 + var4.plane & 3); + if (Client.localPlayerIndex == var1) { + ItemContainer.plane = var4.plane; + } + + } + } + } + } + + @ObfuscatedName("fb") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "-674863226" + ) + @Export("setWindowedMode") + static void setWindowedMode(int var0) { + Client.field836 = 0L; + if (var0 >= 2) { + Client.isResizable = true; + } else { + Client.isResizable = false; + } + + if (UserComparator7.getWindowedMode() == 1) { + WorldMapID.client.setMaxCanvasSize(765, 503); + } else { + WorldMapID.client.setMaxCanvasSize(7680, 2160); + } + + if (Client.gameState >= 25) { + WorldMapCacheName.method593(); + } + + } + + @ObfuscatedName("he") + @ObfuscatedSignature( + signature = "(IIIIIIIIIB)V", + garbageValue = "-114" + ) + @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; + } + } + + if (var9 == null) { + var9 = new PendingSpawn(); + var9.plane = var0; + var9.type = var3; + var9.x = var1; + var9.y = var2; + WorldMapManager.method607(var9); + Client.pendingSpawns.addFirst(var9); + } + + var9.id = var4; + var9.field911 = var5; + var9.orientation = var6; + var9.delay = var7; + var9.hitpoints = var8; } } diff --git a/runescape-client/src/main/java/Task.java b/runescape-client/src/main/java/Task.java index f9c539a695..3a101d684d 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("fa") +@ObfuscatedName("ft") @Implements("Task") public class Task { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lfa;" + signature = "Lft;" ) @Export("next") Task next; - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("status") public volatile int status; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -819233797 + intValue = 693617751 ) @Export("type") int type; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("intArgument") public int intArgument; - @ObfuscatedName("i") + @ObfuscatedName("q") @Export("objectArgument") Object objectArgument; - @ObfuscatedName("c") + @ObfuscatedName("x") @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 4aeae5fc49..f9e72a608b 100644 --- a/runescape-client/src/main/java/TaskHandler.java +++ b/runescape-client/src/main/java/TaskHandler.java @@ -1,4 +1,6 @@ import java.io.DataInputStream; +import java.io.File; +import java.io.IOException; import java.net.InetAddress; import java.net.Socket; import java.net.URL; @@ -7,31 +9,31 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fs") +@ObfuscatedName("fu") @Implements("TaskHandler") public class TaskHandler implements Runnable { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("javaVendor") public static String javaVendor; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("javaVersion") public static String javaVersion; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lfa;" + signature = "Lft;" ) @Export("current") Task current; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lfa;" + signature = "Lft;" ) @Export("task") Task task; - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("thread") Thread thread; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("isClosed") boolean isClosed; @@ -55,10 +57,10 @@ public class TaskHandler implements Runnable { this.thread.start(); } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "876535177" + garbageValue = "1887947364" ) @Export("close") public final void close() { @@ -74,10 +76,10 @@ public class TaskHandler implements Runnable { } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IIILjava/lang/Object;B)Lfa;", - garbageValue = "115" + signature = "(IIILjava/lang/Object;I)Lft;", + garbageValue = "1177256583" ) @Export("newTask") final Task newTask(int var1, int var2, int var3, Object var4) { @@ -98,20 +100,20 @@ public class TaskHandler implements Runnable { } } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Ljava/lang/String;II)Lfa;", - garbageValue = "313449224" + signature = "(Ljava/lang/String;IB)Lft;", + garbageValue = "-49" ) @Export("newSocketTask") public final Task newSocketTask(String var1, int var2) { return this.newTask(1, var2, 0, var1); } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Ljava/lang/Runnable;II)Lfa;", - garbageValue = "193419386" + signature = "(Ljava/lang/Runnable;IB)Lft;", + garbageValue = "1" ) @Export("newThreadTask") public final Task newThreadTask(Runnable var1, int var2) { @@ -165,4 +167,65 @@ public class TaskHandler implements Runnable { } } } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(Ljava/lang/CharSequence;I)Z", + garbageValue = "-641292083" + ) + @Export("isNumber") + public static boolean isNumber(CharSequence var0) { + return class219.method4022(var0, 10, true); + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;Ljava/lang/String;ZI)Lmm;", + garbageValue = "929231118" + ) + @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 (InterfaceParent.cacheGamebuild == 33) { + var4 = "_rc"; + } else if (InterfaceParent.cacheGamebuild == 34) { + var4 = "_wip"; + } + + File var5 = new File(FontName.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("k") + @ObfuscatedSignature( + signature = "(IIB)I", + garbageValue = "-6" + ) + public static int method3411(int var0, int var1) { + int var2 = var0 >>> 31; + return (var0 + var2) / var1 - var2; + } } diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java index 64d490ef89..95688d138b 100644 --- a/runescape-client/src/main/java/Texture.java +++ b/runescape-client/src/main/java/Texture.java @@ -3,171 +3,182 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("db") +@ObfuscatedName("dk") @Implements("Texture") public class Texture extends Node { - @ObfuscatedName("v") + @ObfuscatedName("p") @Export("Texture_animatedPixels") static int[] Texture_animatedPixels; - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("averageRGB") int averageRGB; - @ObfuscatedName("l") - boolean field1624; - @ObfuscatedName("b") + @ObfuscatedName("n") + boolean field1604; + @ObfuscatedName("t") @Export("fileIds") int[] fileIds; - @ObfuscatedName("i") - int[] field1626; - @ObfuscatedName("c") - int[] field1627; + @ObfuscatedName("q") + int[] field1607; + @ObfuscatedName("x") + int[] field1610; + @ObfuscatedName("d") + int[] field1599; @ObfuscatedName("f") - int[] field1619; - @ObfuscatedName("m") @Export("animationDirection") int animationDirection; - @ObfuscatedName("u") + @ObfuscatedName("c") @Export("animationSpeed") int animationSpeed; - @ObfuscatedName("x") + @ObfuscatedName("r") @Export("pixels") int[] pixels; - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("isLoaded") boolean isLoaded; @ObfuscatedSignature( - signature = "(Lkf;)V" + signature = "(Lky;)V" ) Texture(Buffer var1) { this.isLoaded = false; this.averageRGB = var1.readUnsignedShort(); - this.field1624 = var1.readUnsignedByte() == 1; + this.field1604 = var1.readUnsignedByte() == 1; int var2 = var1.readUnsignedByte(); - if (var2 < 1 || var2 > 4) { + if (var2 >= 1 && var2 <= 4) { + this.fileIds = new int[var2]; + + int var3; + for (var3 = 0; var3 < var2; ++var3) { + this.fileIds[var3] = var1.readUnsignedShort(); + } + + if (var2 > 1) { + this.field1607 = new int[var2 - 1]; + + for (var3 = 0; var3 < var2 - 1; ++var3) { + this.field1607[var3] = var1.readUnsignedByte(); + } + } + + if (var2 > 1) { + this.field1610 = new int[var2 - 1]; + + for (var3 = 0; var3 < var2 - 1; ++var3) { + this.field1610[var3] = var1.readUnsignedByte(); + } + } + + this.field1599 = new int[var2]; + + for (var3 = 0; var3 < var2; ++var3) { + this.field1599[var3] = var1.readInt(); + } + + this.animationDirection = var1.readUnsignedByte(); + this.animationSpeed = var1.readUnsignedByte(); + this.pixels = null; + } else { throw new RuntimeException(); } - this.fileIds = new int[var2]; - - int var3; - for (var3 = 0; var3 < var2; ++var3) { - this.fileIds[var3] = var1.readUnsignedShort(); - } - - if (var2 > 1) { - this.field1626 = new int[var2 - 1]; - - for (var3 = 0; var3 < var2 - 1; ++var3) { - this.field1626[var3] = var1.readUnsignedByte(); - } - - this.field1627 = new int[var2 - 1]; - - for (var3 = 0; var3 < var2 - 1; ++var3) { - this.field1627[var3] = var1.readUnsignedByte(); - } - } - - this.field1619 = new int[var2]; - - for (var3 = 0; var3 < var2; ++var3) { - this.field1619[var3] = var1.readInt(); - } - - this.animationDirection = var1.readUnsignedByte(); - this.animationSpeed = var1.readUnsignedByte(); - this.pixels = null; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(DILhp;)Z" + signature = "(DILhz;)Z" ) @Export("load") - boolean load(double brightness, int size, AbstractArchive var4) { - for (int var5 = 0; var5 < this.fileIds.length; ++var5) { + boolean load(double var1, int var3, AbstractArchive var4) { + int var5; + for (var5 = 0; var5 < this.fileIds.length; ++var5) { if (var4.getFileFlat(this.fileIds[var5]) == null) { return false; } } - int var5 = size * size; + var5 = var3 * var3; this.pixels = new int[var5]; for (int var6 = 0; var6 < this.fileIds.length; ++var6) { int var8 = this.fileIds[var6]; IndexedSprite var7; - if (!PlayerAppearance.SpriteBuffer_bufferFileFlat(var4, var8)) { + if (!class290.SpriteBuffer_bufferFileFlat(var4, var8)) { var7 = null; } else { IndexedSprite var10 = new IndexedSprite(); - var10.width = SpriteBuffer.SpriteBuffer_spriteWidth; - var10.height = SpriteBuffer.SpriteBuffer_spriteHeight; - var10.xOffset = Varps.SpriteBuffer_xOffsets[0]; - var10.yOffset = SpriteBuffer.SpriteBuffer_yOffsets[0]; - var10.subWidth = SpriteBuffer.SpriteBuffer_spriteWidths[0]; - var10.subHeight = class216.SpriteBuffer_spriteHeights[0]; - var10.palette = Frames.SpriteBuffer_spritePalette; - var10.pixels = SpriteBuffer.SpriteBuffer_pixels[0]; - class16.SpriteBuffer_clear(); + var10.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth; + var10.height = class325.SpriteBuffer_spriteHeight; + var10.xOffset = class325.SpriteBuffer_xOffsets[0]; + var10.yOffset = class325.SpriteBuffer_yOffsets[0]; + var10.subWidth = class325.SpriteBuffer_spriteWidths[0]; + var10.subHeight = class225.SpriteBuffer_spriteHeights[0]; + var10.palette = class325.SpriteBuffer_spritePalette; + var10.pixels = WorldMapSection1.SpriteBuffer_pixels[0]; + UserComparator7.SpriteBuffer_clear(); var7 = var10; } var7.normalize(); byte[] var17 = var7.pixels; int[] var11 = var7.palette; - int var12 = this.field1619[var6]; - if ((var12 & 0xff000000) == 0x1000000) { + int var12 = this.field1599[var6]; + if ((var12 & -16777216) == 16777216) { } - if ((var12 & 0xff000000) == 0x2000000) { + if ((var12 & -16777216) == 33554432) { } - if ((var12 & 0xff000000) == 0x3000000) { - int var13 = var12 & 0xff00ff; - int var14 = var12 >> 8 & 255; + int var13; + int var14; + int var15; + int var16; + if ((var12 & -16777216) == 50331648) { + var13 = var12 & 16711935; + var14 = var12 >> 8 & 255; - for (int var15 = 0; var15 < var11.length; ++var15) { - int var16 = var11[var15]; - if (var16 >> 8 == (var16 & 0xffff)) { + for (var15 = 0; var15 < var11.length; ++var15) { + var16 = var11[var15]; + if (var16 >> 8 == (var16 & 65535)) { var16 &= 255; - var11[var15] = var13 * var16 >> 8 & 0xff00ff | var14 * var16 & 0xff00; + var11[var15] = var13 * var16 >> 8 & 16711935 | var14 * var16 & 65280; } } } - for (int var13 = 0; var13 < var11.length; ++var13) { - var11[var13] = Rasterizer3D.Rasterizer3D_brighten(var11[var13], brightness); + for (var13 = 0; var13 < var11.length; ++var13) { + var11[var13] = Rasterizer3D.Rasterizer3D_brighten(var11[var13], var1); } - int var13 = 0; - if (var6 != 0) { - var13 = this.field1626[var6 - 1]; + if (var6 == 0) { + var13 = 0; + } else { + var13 = this.field1607[var6 - 1]; } if (var13 == 0) { - if (size == var7.subWidth) { - for (int var14 = 0; var14 < var5; ++var14) { + if (var3 == var7.subWidth) { + for (var14 = 0; var14 < var5; ++var14) { this.pixels[var14] = var11[var17[var14] & 255]; } - } else if (var7.subWidth == 64 && size == 128) { - int var14 = 0; + } else if (var7.subWidth == 64 && var3 == 128) { + var14 = 0; - for (int var15 = 0; var15 < size; ++var15) { - for (int var16 = 0; var16 < size; ++var16) { + for (var15 = 0; var15 < var3; ++var15) { + for (var16 = 0; var16 < var3; ++var16) { this.pixels[var14++] = var11[var17[(var15 >> 1 << 6) + (var16 >> 1)] & 255]; } } - } else if (var7.subWidth == 128 && size == 64) { - int var14 = 0; + } else { + if (var7.subWidth != 128 || var3 != 64) { + throw new RuntimeException(); + } - for (int var15 = 0; var15 < size; ++var15) { - for (int var16 = 0; var16 < size; ++var16) { + var14 = 0; + + for (var15 = 0; var15 < var3; ++var15) { + for (var16 = 0; var16 < var3; ++var16) { this.pixels[var14++] = var11[var17[(var16 << 1) + (var15 << 1 << 7)] & 255]; } } - } else { - throw new RuntimeException(); } } @@ -184,83 +195,82 @@ public class Texture extends Node { return true; } - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("reset") void reset() { this.pixels = null; } - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("animate") void animate(int var1) { - if (this.pixels == null) { - return; - } - short var2; - int var3; - int var4; - int var5; - int var6; - int var7; - int[] var10; - if (this.animationDirection == 1 || this.animationDirection == 3) { - if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { - Texture_animatedPixels = new int[this.pixels.length]; - } - - if (this.pixels.length == 4096) { - var2 = 64; - } else { - var2 = 128; - } - - var3 = this.pixels.length; - var4 = var2 * this.animationSpeed * var1; - var5 = var3 - 1; - if (this.animationDirection == 1) { - var4 = -var4; - } - - for (var6 = 0; var6 < var3; ++var6) { - var7 = var6 + var4 & var5; - Texture_animatedPixels[var6] = this.pixels[var7]; - } - - var10 = this.pixels; - this.pixels = Texture_animatedPixels; - Texture_animatedPixels = var10; - } - - if (this.animationDirection == 2 || this.animationDirection == 4) { - if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { - Texture_animatedPixels = new int[this.pixels.length]; - } - - if (this.pixels.length == 4096) { - var2 = 64; - } else { - var2 = 128; - } - - var3 = this.pixels.length; - var4 = this.animationSpeed * var1; - var5 = var2 - 1; - if (this.animationDirection == 2) { - var4 = -var4; - } - - for (var6 = 0; var6 < var3; var6 += var2) { - for (var7 = 0; var7 < var2; ++var7) { - int var8 = var6 + var7; - int var9 = var6 + (var7 + var4 & var5); - Texture_animatedPixels[var8] = this.pixels[var9]; + if (this.pixels != null) { + short var2; + int var3; + int var4; + int var5; + int var6; + int var7; + int[] var10; + if (this.animationDirection == 1 || this.animationDirection == 3) { + if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { + Texture_animatedPixels = new int[this.pixels.length]; } + + if (this.pixels.length == 4096) { + var2 = 64; + } else { + var2 = 128; + } + + var3 = this.pixels.length; + var4 = var2 * this.animationSpeed * var1; + var5 = var3 - 1; + if (this.animationDirection == 1) { + var4 = -var4; + } + + for (var6 = 0; var6 < var3; ++var6) { + var7 = var6 + var4 & var5; + Texture_animatedPixels[var6] = this.pixels[var7]; + } + + var10 = this.pixels; + this.pixels = Texture_animatedPixels; + Texture_animatedPixels = var10; } - var10 = this.pixels; - this.pixels = Texture_animatedPixels; - Texture_animatedPixels = var10; - } + if (this.animationDirection == 2 || this.animationDirection == 4) { + if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { + Texture_animatedPixels = new int[this.pixels.length]; + } + if (this.pixels.length == 4096) { + var2 = 64; + } else { + var2 = 128; + } + + var3 = this.pixels.length; + var4 = this.animationSpeed * var1; + var5 = var2 - 1; + if (this.animationDirection == 2) { + var4 = -var4; + } + + for (var6 = 0; var6 < var3; var6 += var2) { + for (var7 = 0; var7 < var2; ++var7) { + int var8 = var6 + var7; + int var9 = var6 + (var7 + var4 & var5); + Texture_animatedPixels[var8] = this.pixels[var9]; + } + } + + var10 = this.pixels; + this.pixels = Texture_animatedPixels; + Texture_animatedPixels = var10; + } + + } } } diff --git a/runescape-client/src/main/java/TextureLoader.java b/runescape-client/src/main/java/TextureLoader.java index c5857da083..90a2593c38 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("ef") +@ObfuscatedName("eh") @Implements("TextureLoader") public interface TextureLoader { - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(II)[I", - garbageValue = "726289343" + garbageValue = "-414302740" ) @Export("getTexturePixels") int[] getTexturePixels(int var1); - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "1833085397" + signature = "(IB)I", + garbageValue = "87" ) @Export("getAverageTextureRGB") int getAverageTextureRGB(int var1); - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "100" + signature = "(II)Z", + garbageValue = "-39304153" ) - boolean vmethod3278(int var1); + boolean vmethod3229(int var1); - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "0" + signature = "(IS)Z", + garbageValue = "17414" ) @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 54affdc6ee..7e0abef495 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -1,63 +1,54 @@ -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("do") +@ObfuscatedName("dt") @Implements("TextureProvider") public class TextureProvider implements TextureLoader { - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = -95819679 - ) - @Export("cacheGamebuild") - static int cacheGamebuild; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "[Ldb;" + signature = "[Ldk;" ) @Export("textures") Texture[] textures; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Ljh;" + signature = "Ljc;" ) @Export("deque") NodeDeque deque; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1484225311 + intValue = -428424459 ) @Export("capacity") int capacity; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1374200931 + intValue = 280831487 ) @Export("remaining") int remaining; - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("brightness") double brightness; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -907088153 + intValue = 97407855 ) @Export("textureSize") int textureSize; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("archive") AbstractArchive archive; @ObfuscatedSignature( - signature = "(Lhp;Lhp;IDI)V" + signature = "(Lhz;Lhz;IDI)V" ) public TextureProvider(AbstractArchive var1, AbstractArchive var2, int var3, double var4, int var6) { this.deque = new NodeDeque(); @@ -80,10 +71,10 @@ public class TextureProvider implements TextureLoader { } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "2052170496" + garbageValue = "-1619815981" ) @Export("getLoadedPercentage") public int getLoadedPercentage() { @@ -99,7 +90,7 @@ public class TextureProvider implements TextureLoader { for (int var7 = 0; var7 < var6.length; ++var7) { int var8 = var6[var7]; - if (this.archive.method4147(var8)) { + if (this.archive.method4066(var8)) { ++var2; } } @@ -108,84 +99,84 @@ public class TextureProvider implements TextureLoader { if (var1 == 0) { return 0; + } else { + return var2 * 100 / var1; } - return var2 * 100 / var1; } - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("setBrightness") public void setBrightness(double var1) { this.brightness = var1; this.clear(); } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(II)[I", - garbageValue = "726289343" + garbageValue = "-414302740" ) @Export("getTexturePixels") public int[] getTexturePixels(int var1) { Texture var2 = this.textures[var1]; - if (var2 == null) { - return null; - } - if (var2.pixels != null) { - this.deque.addLast(var2); - var2.isLoaded = true; - return var2.pixels; - } - - boolean var3 = var2.load(this.brightness, this.textureSize, this.archive); - if (var3) { - if (this.remaining == 0) { - Texture var4 = (Texture)this.deque.removeFirst(); - var4.reset(); - } else { - --this.remaining; + if (var2 != null) { + if (var2.pixels != null) { + this.deque.addLast(var2); + var2.isLoaded = true; + return var2.pixels; } - this.deque.addLast(var2); - var2.isLoaded = true; - return var2.pixels; + boolean var3 = var2.load(this.brightness, this.textureSize, this.archive); + if (var3) { + if (this.remaining == 0) { + Texture var4 = (Texture)this.deque.removeFirst(); + var4.reset(); + } else { + --this.remaining; + } + + this.deque.addLast(var2); + var2.isLoaded = true; + return var2.pixels; + } } return null; } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "1833085397" + signature = "(IB)I", + garbageValue = "87" ) @Export("getAverageTextureRGB") public int getAverageTextureRGB(int var1) { return this.textures[var1] != null ? this.textures[var1].averageRGB : 0; } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "100" + signature = "(II)Z", + garbageValue = "-39304153" ) - public boolean vmethod3278(int var1) { - return this.textures[var1].field1624; + public boolean vmethod3229(int var1) { + return this.textures[var1].field1604; } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "0" + signature = "(IS)Z", + garbageValue = "17414" ) @Export("isLowDetail") public boolean isLowDetail(int var1) { return this.textureSize == 64; } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1945022462" + garbageValue = "222022788" ) @Export("clear") public void clear() { @@ -199,10 +190,10 @@ public class TextureProvider implements TextureLoader { this.remaining = this.capacity; } - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1054980439" + garbageValue = "162917811" ) @Export("animate") public void animate(int var1) { @@ -215,231 +206,4 @@ public class TextureProvider implements TextureLoader { } } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(II)[B", - garbageValue = "506694111" - ) - @Export("ByteArrayPool_getArray") - public static synchronized byte[] ByteArrayPool_getArray(int var0) { - return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;II)Ljava/io/File;", - garbageValue = "-1682877008" - ) - @Export("getCacheDir") - static File getCacheDir(String var0, String var1, int var2) { - String var3 = var2 == 0 ? "" : "" + var2; - JagexCache.JagexCache_locationFile = new File(PlayerType.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var3 + ".dat"); - String var4 = null; - String var5 = null; - boolean var6 = false; - Buffer var8; - File var23; - 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 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 (!class186.testReadWritePermissions(var23, true)) { - var4 = null; - } - } - } - - if (var4 == null && var2 == 0) { - label139: - for (int var15 = 0; var15 < LoginPacket.validCacheNames.length; ++var15) { - for (int var16 = 0; var16 < JagexCache.JagexCache_validCacheLocations.length; ++var16) { - File var17 = new File(JagexCache.JagexCache_validCacheLocations[var16] + LoginPacket.validCacheNames[var15] + File.separatorChar + var0 + File.separatorChar); - if (var17.exists() && class186.testReadWritePermissions(new File(var17, "test.dat"), true)) { - var4 = var17.toString(); - var6 = true; - break label139; - } - } - } - } - - if (var4 == null) { - var4 = PlayerType.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(JagexCache.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("w") - @ObfuscatedSignature( - signature = "(Lhp;Ljava/lang/String;Ljava/lang/String;IZB)V", - garbageValue = "-92" - ) - public static void method2761(AbstractArchive var0, String group, String file, int var3, boolean var4) { - int var5 = var0.getGroupId(group); - int var6 = var0.getFileId(var5, file); - FileSystem.method3503(var0, var5, var6, var3, var4); - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "(ILcx;ZI)I", - garbageValue = "465921756" - ) - static int method2743(int var0, Script var1, boolean var2) { - Widget var3 = class80.getWidget(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - if (var0 == ScriptOpcodes.IF_GETSCROLLX) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.scrollX; - return 1; - } - if (var0 == ScriptOpcodes.IF_GETSCROLLY) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.scrollY; - return 1; - } - if (var0 == ScriptOpcodes.IF_GETTEXT) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.text; - return 1; - } - if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.scrollWidth; - return 1; - } - if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.scrollHeight; - return 1; - } - if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.modelZoom; - return 1; - } - if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.modelAngleX; - return 1; - } - if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.modelAngleZ; - return 1; - } - if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.modelAngleY; - return 1; - } - if (var0 == ScriptOpcodes.IF_GETTRANSTOP) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.transparencyTop; - return 1; - } - if (var0 == ScriptOpcodes.IF_GETTRANSBOT) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.transparencyBot; - return 1; - } - if (var0 == ScriptOpcodes.IF_GETCOLOUR) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.color; - return 1; - } - if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.color2; - return 1; - } - if (var0 == ScriptOpcodes.IF_GETFILLMODE) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); - return 1; - } - if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; - return 1; - } - return 2; - } } diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java index 7fbb0ad868..280589a51a 100644 --- a/runescape-client/src/main/java/Tile.java +++ b/runescape-client/src/main/java/Tile.java @@ -4,135 +4,134 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dv") +@ObfuscatedName("de") @Implements("Tile") public final class Tile extends Node { - @ObfuscatedName("dv") - @ObfuscatedSignature( - signature = "Liu;" - ) - @Export("archive14") - static Archive archive14; - @ObfuscatedName("q") + @ObfuscatedName("nn") @ObfuscatedGetter( - intValue = 1749719213 + intValue = -590587583 + ) + static int field1648; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 1576668311 ) @Export("plane") int plane; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1393298715 + intValue = -2142283815 ) @Export("x") int x; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1385365023 + intValue = 22720331 ) @Export("y") int y; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 529885461 + intValue = 322819535 ) @Export("originalPlane") int originalPlane; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Let;" + signature = "Lef;" ) @Export("paint") TilePaint paint; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Ldk;" + signature = "Ldg;" ) @Export("model") TileModel model; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lem;" + signature = "Ley;" ) @Export("boundaryObject") BoundaryObject boundaryObject; - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lei;" + signature = "Lec;" ) @Export("wallDecoration") WallDecoration wallDecoration; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Ldq;" + signature = "Ldy;" ) @Export("floorDecoration") FloorDecoration floorDecoration; - @ObfuscatedName("f") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Ldc;" + signature = "Ldu;" ) @Export("tileItemPile") TileItemPile tileItemPile; - @ObfuscatedName("m") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 52989903 + intValue = -76351175 ) @Export("gameObjectsCount") int gameObjectsCount; - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "[Les;" + signature = "[Lej;" ) @Export("gameObjects") GameObject[] gameObjects; - @ObfuscatedName("x") + @ObfuscatedName("r") @Export("gameObjectEdgeMasks") int[] gameObjectEdgeMasks; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1372984003 + intValue = 832836189 ) @Export("gameObjectsEdgeMask") int gameObjectsEdgeMask; - @ObfuscatedName("v") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1827111931 + intValue = 1717986561 ) @Export("minPlane") int minPlane; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("drawPrimary") boolean drawPrimary; @ObfuscatedName("g") @Export("drawSecondary") boolean drawSecondary; - @ObfuscatedName("a") + @ObfuscatedName("e") @Export("drawGameObjects") boolean drawGameObjects; - @ObfuscatedName("j") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -342353329 + intValue = -1859538339 ) @Export("drawGameObjectEdges") int drawGameObjectEdges; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1148018233 + intValue = -652671997 ) - int field1651; + int field1637; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -1052800923 + ) + int field1645; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 837010603 + ) + int field1636; @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -474591227 - ) - int field1665; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -357197323 - ) - int field1666; - @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Ldv;" + signature = "Lde;" ) @Export("linkedBelowTile") Tile linkedBelowTile; @@ -146,73 +145,182 @@ public final class Tile extends Node { this.y = var3; } - @ObfuscatedName("q") - public static String method2855(long var0) { - if (var0 > 0L && var0 < 6582952005840035281L) { - if (0L == var0 % 37L) { - return null; - } - int var2 = 0; + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "([Lbl;II[I[IB)V", + garbageValue = "-18" + ) + @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; - for (long var3 = var0; var3 != 0L; var3 /= 37L) { - ++var2; + 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 (var11 != var12) { + 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; + } } - StringBuilder var5 = new StringBuilder(var2); + sortWorlds(var0, var1, var6, var3, var4); + sortWorlds(var0, var6 + 1, var2, var3, var4); + } - while (var0 != 0L) { - long var6 = var0; - var0 /= 37L; - var5.append(class289.base37Table[(int)(var6 - var0 * 37L)]); + } + + @ObfuscatedName("jj") + @ObfuscatedSignature( + signature = "([Lhp;II)V", + garbageValue = "1415111680" + ) + @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 || !WorldMapRectangle.isComponentHidden(var3))) { + if (var3.type == 0) { + if (!var3.isIf3 && WorldMapRectangle.isComponentHidden(var3) && var3 != class65.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) { + CollisionMap.drawInterfaceModelComponents(var4.group); + } + } + + if (var3.type == 6) { + int var5; + if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { + boolean var7 = UserComparator10.runCs1(var3); + if (var7) { + var5 = var3.sequenceId2; + } else { + var5 = var3.sequenceId; + } + + if (var5 != -1) { + SequenceDefinition var6 = Widget.SequenceDefinition_get(var5); + + for (var3.modelFrameCycle += Client.field879; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; FriendSystem.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.field2602 != 0 && !var3.isIf3) { + int var8 = var3.field2602 >> 16; + var5 = var3.field2602 << 16 >> 16; + var8 *= Client.field879; + var5 *= Client.field879; + var3.modelAngleX = var8 + var3.modelAngleX & 2047; + var3.modelAngleY = var5 + var3.modelAngleY & 2047; + FriendSystem.invalidateWidget(var3); + } + } } - - return var5.reverse().toString(); - } - return null; - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(IIIZII)J", - garbageValue = "-1948443569" - ) - @Export("calculateTag") - public static long calculateTag(int x, int y, int type, boolean notInteractable, int id) { - long var5 = (long)((x & 127) << 0 | (y & 127) << 7 | (type & 3) << 14) | ((long)id & 4294967295L) << 17; - if (notInteractable) { - var5 |= 65536L; } - return var5; - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "(IZII)V", - garbageValue = "-1363278802" - ) - @Export("PcmPlayer_configure") - public static final void PcmPlayer_configure(int var0, boolean var1, int var2) { - if (var0 < 8000 || var0 > 48000) { - throw new IllegalArgumentException(); - } - CollisionMap.PcmPlayer_sampleRate = var0; - FileSystem.PcmPlayer_stereo = var1; - PcmPlayer.PcmPlayer_count = var2; - } - - @ObfuscatedName("jc") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "-1430853825" - ) - @Export("clanKickUser") - static final void clanKickUser(String var0) { - if (DevicePcmPlayerProvider.clanChat != null) { - PacketBufferNode var1 = Archive.getPacketBufferNode(ClientPacket.field2216, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(Huffman.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); - } } } diff --git a/runescape-client/src/main/java/TileItem.java b/runescape-client/src/main/java/TileItem.java index f16070cbc6..712ca0a158 100644 --- a/runescape-client/src/main/java/TileItem.java +++ b/runescape-client/src/main/java/TileItem.java @@ -4,29 +4,18 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ch") +@ObfuscatedName("cu") @Implements("TileItem") public final class TileItem extends Entity { - @ObfuscatedName("i") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1900937269 - ) - static int field1242; - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Llx;" - ) - @Export("logoSprite") - static IndexedSprite logoSprite; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 1946972179 + intValue = -431370449 ) @Export("id") int id; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1304382567 + intValue = -143029991 ) @Export("quantity") int quantity; @@ -34,56 +23,23 @@ public final class TileItem extends Entity { TileItem() { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)Ldm;", - garbageValue = "759381421" + signature = "(I)Ldo;", + garbageValue = "-419920513" ) @Export("getModel") protected final Model getModel() { - return WorldMapArea.ItemDefinition_get(this.id).getModel(this.quantity); + return WorldMapData_0.ItemDefinition_get(this.id).getModel(this.quantity); } - @ObfuscatedName("q") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Lhp;B)V", - garbageValue = "97" + signature = "(B)V", + garbageValue = "-10" ) - @Export("StructDefinition_setArchives") - public static void StructDefinition_setArchives(AbstractArchive var0) { - StructDefinition.StructDefinition_archive = var0; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(III)Lbj;", - garbageValue = "308740376" - ) - @Export("Messages_getByChannelAndID") - static Message Messages_getByChannelAndID(int var0, int var1) { - ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); - return var2.getMessage(var1); - } - - @ObfuscatedName("hs") - @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "96373324" - ) - static void method2053(int var0, int var1, int var2, int var3) { - Widget var4 = Client.getWidgetChild(var0, var1); - if (var4 != null && var4.onTargetEnter != null) { - ScriptEvent var5 = new ScriptEvent(); - var5.widget = var4; - var5.args = var4.onTargetEnter; - LoginPacket.runScriptEvent(var5); - } - - Client.field812 = var3; - Client.isSpellSelected = true; - WorldMapEvent.field359 = var0; - Client.field848 = var1; - WorldMapCacheName.selectedSpellFlags = var2; - Strings.invalidateWidget(var4); + public static void method2048() { + SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); + SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); } } diff --git a/runescape-client/src/main/java/TileItemPile.java b/runescape-client/src/main/java/TileItemPile.java index a22205f385..33284eb040 100644 --- a/runescape-client/src/main/java/TileItemPile.java +++ b/runescape-client/src/main/java/TileItemPile.java @@ -4,55 +4,54 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dc") +@ObfuscatedName("du") @Implements("TileItemPile") -public final class TileItemPile -{ - @ObfuscatedName("q") +public final class TileItemPile { + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -706647707 + intValue = -1479767219 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1749434399 + intValue = 1786599841 ) @Export("x") int x; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1687183849 + intValue = 2004816783 ) @Export("y") int y; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Leo;" + signature = "Len;" ) @Export("first") Entity first; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Leo;" + signature = "Len;" ) @Export("second") Entity second; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Leo;" + signature = "Len;" ) @Export("third") Entity third; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - longValue = -6836359089398778317L + longValue = 8397822487422638179L ) @Export("tag") long tag; - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1167512637 + intValue = 299840789 ) @Export("height") int height; @@ -60,50 +59,220 @@ public final class TileItemPile TileItemPile() { } - @ObfuscatedName("k") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-989207473" + signature = "(ILcr;ZI)I", + garbageValue = "-1592164881" ) - public static int method2767(int var0, int var1) { - int var2 = var0 >>> 31; - return (var0 + var2) / var1 - var2; - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "-23" - ) - static void method2764(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var1 != null) { - var1.remove(); + static int method2701(int var0, Script var1, boolean var2) { + if (var0 < 1000) { + return FriendSystem.method1831(var0, var1, var2); + } else if (var0 < 1100) { + return UserComparator10.method3345(var0, var1, var2); + } else if (var0 < 1200) { + return Canvas.method806(var0, var1, var2); + } else if (var0 < 1300) { + return GrandExchangeOffer.method123(var0, var1, var2); + } else if (var0 < 1400) { + return SecureRandomFuture.method2060(var0, var1, var2); + } else if (var0 < 1500) { + return NPC.method1968(var0, var1, var2); + } else if (var0 < 1600) { + return Players.method2063(var0, var1, var2); + } else if (var0 < 1700) { + return class312.method5788(var0, var1, var2); + } else if (var0 < 1800) { + return GraphicsObject.method1939(var0, var1, var2); + } else if (var0 < 1900) { + return class40.method728(var0, var1, var2); + } else if (var0 < 2000) { + return GrandExchangeOfferWorldComparator.method79(var0, var1, var2); + } else if (var0 < 2100) { + return UserComparator10.method3345(var0, var1, var2); + } else if (var0 < 2200) { + return Canvas.method806(var0, var1, var2); + } else if (var0 < 2300) { + return GrandExchangeOffer.method123(var0, var1, var2); + } else if (var0 < 2400) { + return SecureRandomFuture.method2060(var0, var1, var2); + } else if (var0 < 2500) { + return NPC.method1968(var0, var1, var2); + } else if (var0 < 2600) { + return GameShell.method1003(var0, var1, var2); + } else if (var0 < 2700) { + return class268.method4893(var0, var1, var2); + } else if (var0 < 2800) { + return GrandExchangeEvents.method84(var0, var1, var2); + } else if (var0 < 2900) { + return WorldMapSectionType.method240(var0, var1, var2); + } else if (var0 < 3000) { + return GrandExchangeOfferWorldComparator.method79(var0, var1, var2); + } else if (var0 < 3200) { + return WorldMapRegion.method464(var0, var1, var2); + } else if (var0 < 3300) { + return WorldMapIcon_0.method206(var0, var1, var2); + } else if (var0 < 3400) { + return PendingSpawn.method1660(var0, var1, var2); + } else if (var0 < 3500) { + return class286.method5166(var0, var1, var2); + } else if (var0 < 3700) { + return class192.method3616(var0, var1, var2); + } else if (var0 < 4000) { + return Message.method1172(var0, var1, var2); + } else if (var0 < 4100) { + return GrandExchangeOfferUnitPriceComparator.method136(var0, var1, var2); + } else if (var0 < 4200) { + return Message.method1174(var0, var1, var2); + } else if (var0 < 4300) { + return MouseHandler.method1043(var0, var1, var2); + } else if (var0 < 5100) { + return GrandExchangeOfferNameComparator.method150(var0, var1, var2); + } else if (var0 < 5400) { + return Player.method1224(var0, var1, var2); + } else if (var0 < 5600) { + return Skills.method4031(var0, var1, var2); + } else if (var0 < 5700) { + return Entity.method3210(var0, var1, var2); + } else if (var0 < 6300) { + return class49.method811(var0, var1, var2); + } else if (var0 < 6600) { + return WallDecoration.method3243(var0, var1, var2); + } else { + return var0 < 6700 ? InterfaceParent.method1126(var0, var1, var2) : 2; } } - @ObfuscatedName("v") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "1314012151" + signature = "(I)V", + garbageValue = "-508815789" ) - static final int method2765(int var0, int var1) { - int var2 = MouseHandler.method1021(var0 - 1, var1 - 1) + MouseHandler.method1021(1 + var0, var1 - 1) + MouseHandler.method1021(var0 - 1, 1 + var1) + MouseHandler.method1021(1 + var0, 1 + var1); - int var3 = MouseHandler.method1021(var0 - 1, var1) + MouseHandler.method1021(var0 + 1, var1) + MouseHandler.method1021(var0, var1 - 1) + MouseHandler.method1021(var0, var1 + 1); - int var4 = MouseHandler.method1021(var0, var1); - return var2 / 16 + var3 / 8 + var4 / 4; + public static void method2700() { + ItemDefinition.ItemDefinition_cached.clear(); + ItemDefinition.ItemDefinition_cachedModels.clear(); + ItemDefinition.ItemDefinition_cachedSprites.clear(); } - @ObfuscatedName("y") + @ObfuscatedName("kj") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "76" + signature = "(Lhp;IIII)V", + garbageValue = "912146837" ) - @Export("ObjectDefinition_clearCached") - public static void ObjectDefinition_clearCached() { - ObjectDefinition.ObjectDefinition_cached.clear(); - ObjectDefinition.ObjectDefinition_cachedModelData.clear(); - ObjectDefinition.ObjectDefinition_cachedEntities.clear(); - ObjectDefinition.ObjectDefinition_cachedModels.clear(); + @Export("drawMinimap") + static final void drawMinimap(Widget var0, int var1, int var2, int var3) { + WorldMapSectionType.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 = WorldMapIcon_1.localPlayer.x / 32 + 48; + int var7 = 464 - WorldMapIcon_1.localPlayer.y / 32; + ParamDefinition.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 - WorldMapIcon_1.localPlayer.x / 32; + var10 = Client.mapIconYs[var8] * 4 + 2 - WorldMapIcon_1.localPlayer.y / 32; + class191.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[ItemContainer.plane][var8][var9]; + if (var15 != null) { + var11 = var8 * 4 + 2 - WorldMapIcon_1.localPlayer.x / 32; + var12 = var9 * 4 + 2 - WorldMapIcon_1.localPlayer.y / 32; + class191.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 - WorldMapIcon_1.localPlayer.x / 32; + var12 = var16.y / 32 - WorldMapIcon_1.localPlayer.y / 32; + class191.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 != WorldMapIcon_1.localPlayer) { + var12 = var17.x / 32 - WorldMapIcon_1.localPlayer.x / 32; + int var13 = var17.y / 32 - WorldMapIcon_1.localPlayer.y / 32; + boolean var14 = false; + if (WorldMapIcon_1.localPlayer.team != 0 && var17.team != 0 && var17.team == WorldMapIcon_1.localPlayer.team) { + var14 = true; + } + + if (var17.isFriend()) { + class191.drawSpriteOnMinimap(var1, var2, var12, var13, WorldMapLabel.mapDotSprites[3], var4); + } else if (var14) { + class191.drawSpriteOnMinimap(var1, var2, var12, var13, WorldMapLabel.mapDotSprites[4], var4); + } else if (var17.isClanMember()) { + class191.drawSpriteOnMinimap(var1, var2, var12, var13, WorldMapLabel.mapDotSprites[5], var4); + } else { + class191.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 - WorldMapIcon_1.localPlayer.x / 32; + var12 = var20.y / 32 - WorldMapIcon_1.localPlayer.y / 32; + GrandExchangeOfferNameComparator.worldToMinimap(var1, var2, var11, var12, WorldMapSection1.mapMarkerSprites[1], var4); + } + } + + if (Client.hintArrowType == 2) { + var10 = Client.hintArrowX * 4 - PacketWriter.baseX * 256 + 2 - WorldMapIcon_1.localPlayer.x / 32; + var11 = Client.hintArrowY * 4 - RouteStrategy.baseY * 256 + 2 - WorldMapIcon_1.localPlayer.y / 32; + GrandExchangeOfferNameComparator.worldToMinimap(var1, var2, var10, var11, WorldMapSection1.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 - WorldMapIcon_1.localPlayer.x / 32; + var12 = var21.y / 32 - WorldMapIcon_1.localPlayer.y / 32; + GrandExchangeOfferNameComparator.worldToMinimap(var1, var2, var11, var12, WorldMapSection1.mapMarkerSprites[1], var4); + } + } + } + + if (Client.destinationX != 0) { + var10 = Client.destinationX * 4 + 2 - WorldMapIcon_1.localPlayer.x / 32; + var11 = Client.destinationY * 4 + 2 - WorldMapIcon_1.localPlayer.y / 32; + class191.drawSpriteOnMinimap(var1, var2, var10, var11, WorldMapSection1.mapMarkerSprites[0], var4); + } + + if (!WorldMapIcon_1.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.field829[var3] = true; + } } } diff --git a/runescape-client/src/main/java/TileModel.java b/runescape-client/src/main/java/TileModel.java index cc8b309c4a..81571764bb 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("dk") +@ObfuscatedName("dg") @Implements("TileModel") public final class TileModel { - @ObfuscatedName("y") - static int[] field1606; + @ObfuscatedName("b") + static int[] field1569; @ObfuscatedName("g") - static int[] field1605; + static int[] field1584; + @ObfuscatedName("e") + static int[] field1585; + @ObfuscatedName("z") + static int[] field1583; @ObfuscatedName("a") - static int[] field1594; - @ObfuscatedName("j") - static int[] field1607; - @ObfuscatedName("t") - static int[] field1608; - @ObfuscatedName("h") - static final int[][] field1592; - @ObfuscatedName("o") - static final int[][] field1589; - @ObfuscatedName("q") + static int[] field1587; + @ObfuscatedName("w") + static final int[][] field1588; + @ObfuscatedName("l") + static final int[][] field1581; + @ObfuscatedName("s") @Export("vertexX") int[] vertexX; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("vertexY") int[] vertexY; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("vertexZ") int[] vertexZ; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("triangleColorA") int[] triangleColorA; - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("triangleColorB") int[] triangleColorB; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("triangleColorC") int[] triangleColorC; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("faceX") int[] faceX; - @ObfuscatedName("i") + @ObfuscatedName("q") @Export("faceY") int[] faceY; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("faceZ") int[] faceZ; - @ObfuscatedName("f") + @ObfuscatedName("d") @Export("triangleTextureId") int[] triangleTextureId; - @ObfuscatedName("m") + @ObfuscatedName("f") @Export("isFlat") boolean isFlat; - @ObfuscatedName("u") + @ObfuscatedName("c") @Export("shape") int shape; - @ObfuscatedName("x") + @ObfuscatedName("r") @Export("rotation") int rotation; - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("underlayRgb") int underlayRgb; - @ObfuscatedName("v") + @ObfuscatedName("p") @Export("overlayRgb") int overlayRgb; static { - field1606 = new int[6]; - field1605 = new int[6]; - field1594 = new int[6]; - field1607 = new int[6]; - field1608 = new int[6]; - field1592 = 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}}; - field1589 = 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}}; + field1569 = new int[6]; + field1584 = new int[6]; + field1585 = new int[6]; + field1583 = new int[6]; + field1587 = new int[6]; + field1588 = 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}}; + field1581 = 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 = field1592[var1]; + int[] var24 = field1588[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 = field1589[var1]; + int[] var38 = field1581[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 6de75c248d..88120ce330 100644 --- a/runescape-client/src/main/java/TilePaint.java +++ b/runescape-client/src/main/java/TilePaint.java @@ -1,48 +1,49 @@ +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("et") +@ObfuscatedName("ef") @Implements("TilePaint") public final class TilePaint { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1202729845 + intValue = -1005153033 ) @Export("swColor") int swColor; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1835963633 + intValue = -62371409 ) @Export("seColor") int seColor; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 2057235411 + intValue = 732641473 ) @Export("neColor") int neColor; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1305916277 + intValue = 1434155121 ) @Export("nwColor") int nwColor; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -647321713 + intValue = 974605461 ) @Export("texture") int texture; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("isFlat") boolean isFlat; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 205236161 + intValue = 1074682835 ) @Export("rgb") int rgb; @@ -58,36 +59,271 @@ public final class TilePaint { this.isFlat = var7; } - @ObfuscatedName("e") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lhp;III)[Lly;", - garbageValue = "1591290793" + signature = "(I)Z", + garbageValue = "-2050253727" ) - @Export("SpriteBuffer_getSpriteArray") - public static Sprite[] SpriteBuffer_getSpriteArray(AbstractArchive var0, int var1, int var2) { - if (!Friend.SpriteBuffer_bufferFile(var0, var1, var2)) { - return null; + public static boolean method3007() { + long var0 = SequenceDefinition.method4686(); + int var2 = (int)(var0 - NetCache.field3145); + NetCache.field3145 = var0; + if (var2 > 200) { + var2 = 200; } - Sprite[] var4 = new Sprite[SpriteBuffer.SpriteBuffer_spriteCount]; - for (int var5 = 0; var5 < SpriteBuffer.SpriteBuffer_spriteCount; ++var5) { - Sprite var6 = var4[var5] = new Sprite(); - var6.width = SpriteBuffer.SpriteBuffer_spriteWidth; - var6.height = SpriteBuffer.SpriteBuffer_spriteHeight; - var6.xOffset = Varps.SpriteBuffer_xOffsets[var5]; - var6.yOffset = SpriteBuffer.SpriteBuffer_yOffsets[var5]; - var6.subWidth = SpriteBuffer.SpriteBuffer_spriteWidths[var5]; - var6.subHeight = class216.SpriteBuffer_spriteHeights[var5]; - int var7 = var6.subHeight * var6.subWidth; - byte[] var8 = SpriteBuffer.SpriteBuffer_pixels[var5]; - var6.pixels = new int[var7]; + 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 { + 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; + } - for (int var9 = 0; var9 < var7; ++var9) { - var6.pixels[var9] = Frames.SpriteBuffer_spritePalette[var8[var9] & 255]; + 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 (NetCache.NetCache_currentResponse == null) { + var5 = 8; + } else if (NetCache.field3156 == 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.field3159 != 0) { + for (var7 = 0; var7 < var6; ++var7) { + var10000 = NetCache.NetCache_responseHeaderBuffer.array; + var10001 = var7 + NetCache.NetCache_responseHeaderBuffer.offset; + var10000[var10001] ^= NetCache.field3159; + } + } + + var22 = NetCache.NetCache_responseHeaderBuffer; + var22.offset += var6; + if (NetCache.NetCache_responseHeaderBuffer.offset < var5) { + break; + } + + if (NetCache.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); + Huffman.field2486 = true; + if (var13 == null) { + var13 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var11); + Huffman.field2486 = false; + } + + if (var13 == null) { + throw new IOException(); + } + + int var14 = var9 == 0 ? 5 : 9; + NetCache.NetCache_currentResponse = var13; + NetCache.NetCache_responseArchiveBuffer = new Buffer(var14 + var10 + NetCache.NetCache_currentResponse.padding); + NetCache.NetCache_responseArchiveBuffer.writeByte(var9); + NetCache.NetCache_responseArchiveBuffer.writeInt(var10); + NetCache.field3156 = 8; + NetCache.NetCache_responseHeaderBuffer.offset = 0; + } else if (NetCache.field3156 == 0) { + if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { + NetCache.field3156 = 1; + NetCache.NetCache_responseHeaderBuffer.offset = 0; + } else { + NetCache.NetCache_currentResponse = null; + } + } + } else { + var6 = NetCache.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding; + var7 = 512 - NetCache.field3156; + if (var7 > var6 - NetCache.NetCache_responseArchiveBuffer.offset) { + var7 = var6 - NetCache.NetCache_responseArchiveBuffer.offset; + } + + if (var7 > var16) { + var7 = var16; + } + + NetCache.NetCache_socket.read(NetCache.NetCache_responseArchiveBuffer.array, NetCache.NetCache_responseArchiveBuffer.offset, var7); + if (NetCache.field3159 != 0) { + for (var8 = 0; var8 < var7; ++var8) { + var10000 = NetCache.NetCache_responseArchiveBuffer.array; + var10001 = NetCache.NetCache_responseArchiveBuffer.offset + var8; + var10000[var10001] ^= NetCache.field3159; + } + } + + var22 = NetCache.NetCache_responseArchiveBuffer; + var22.offset += var7; + NetCache.field3156 += var7; + if (var6 == NetCache.NetCache_responseArchiveBuffer.offset) { + if (NetCache.NetCache_currentResponse.key == 16711935L) { + Decimator.NetCache_reference = NetCache.NetCache_responseArchiveBuffer; + + for (var8 = 0; var8 < 256; ++var8) { + Archive var17 = NetCache.NetCache_archives[var8]; + if (var17 != null) { + Decimator.NetCache_reference.offset = var8 * 8 + 5; + var10 = Decimator.NetCache_reference.readInt(); + int var18 = Decimator.NetCache_reference.readInt(); + var17.loadIndex(var10, var18); + } + } + } else { + NetCache.NetCache_crc.reset(); + NetCache.NetCache_crc.update(NetCache.NetCache_responseArchiveBuffer.array, 0, var6); + var8 = (int)NetCache.NetCache_crc.getValue(); + if (var8 != NetCache.NetCache_currentResponse.crc) { + try { + NetCache.NetCache_socket.close(); + } catch (Exception var20) { + } + + ++NetCache.NetCache_crcMismatches; + NetCache.NetCache_socket = null; + NetCache.field3159 = (byte)((int)(Math.random() * 255.0D + 1.0D)); + return false; + } + + NetCache.NetCache_crcMismatches = 0; + NetCache.NetCache_ioExceptions = 0; + NetCache.NetCache_currentResponse.archive.write((int)(NetCache.NetCache_currentResponse.key & 65535L), NetCache.NetCache_responseArchiveBuffer.array, (NetCache.NetCache_currentResponse.key & 16711680L) == 16711680L, Huffman.field2486); + } + + NetCache.NetCache_currentResponse.remove(); + if (Huffman.field2486) { + --NetCache.NetCache_pendingPriorityResponsesCount; + } else { + --NetCache.NetCache_pendingResponsesCount; + } + + NetCache.field3156 = 0; + NetCache.NetCache_currentResponse = null; + NetCache.NetCache_responseArchiveBuffer = null; + } else { + if (NetCache.field3156 != 512) { + break; + } + + NetCache.field3156 = 0; + } + } + } + + return true; + } + } catch (IOException var21) { + try { + NetCache.NetCache_socket.close(); + } catch (Exception var19) { + } + + ++NetCache.NetCache_ioExceptions; + NetCache.NetCache_socket = null; + return false; } } + } - class16.SpriteBuffer_clear(); - return var4; + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(Lhz;III)Lls;", + garbageValue = "869538043" + ) + @Export("SpriteBuffer_getSprite") + public static Sprite SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { + if (!World.SpriteBuffer_bufferFile(var0, var1, var2)) { + return null; + } else { + Sprite var4 = new Sprite(); + var4.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth; + var4.height = class325.SpriteBuffer_spriteHeight; + var4.xOffset = class325.SpriteBuffer_xOffsets[0]; + var4.yOffset = class325.SpriteBuffer_yOffsets[0]; + var4.subWidth = class325.SpriteBuffer_spriteWidths[0]; + var4.subHeight = class225.SpriteBuffer_spriteHeights[0]; + int var5 = var4.subHeight * var4.subWidth; + byte[] var6 = WorldMapSection1.SpriteBuffer_pixels[0]; + var4.pixels = new int[var5]; + + for (int var7 = 0; var7 < var5; ++var7) { + var4.pixels[var7] = class325.SpriteBuffer_spritePalette[var6[var7] & 255]; + } + + UserComparator7.SpriteBuffer_clear(); + return var4; + } + } + + @ObfuscatedName("ez") + @ObfuscatedSignature( + signature = "(III)V", + garbageValue = "812603626" + ) + static void method3005(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 = ArchiveLoader.method1100(var5, var1); + var2[var3] = var6 * var7 >> 16; + } + + Scene.Scene_buildVisiblityMap(var2, 500, 800, var0 * 334 / var1, 334); } } diff --git a/runescape-client/src/main/java/Tiles.java b/runescape-client/src/main/java/Tiles.java index ad6dc50c9b..0b3dbf7d66 100644 --- a/runescape-client/src/main/java/Tiles.java +++ b/runescape-client/src/main/java/Tiles.java @@ -4,201 +4,204 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bg") +@ObfuscatedName("bn") @Implements("Tiles") public final class Tiles { - @ObfuscatedName("rr") - @ObfuscatedGetter( - intValue = 1255791215 - ) - static int field501; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("Tiles_heights") static int[][][] Tiles_heights; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("Tiles_renderFlags") static byte[][][] Tiles_renderFlags; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1687687411 + intValue = 210861461 ) @Export("Tiles_minPlane") static int Tiles_minPlane; - @ObfuscatedName("p") - static byte[][][] field504; @ObfuscatedName("k") - static byte[][][] field505; - @ObfuscatedName("l") - static byte[][][] field506; - @ObfuscatedName("c") - static int[][] field515; - @ObfuscatedName("m") - @Export("Tiles_saturation") - static int[] Tiles_saturation; - @ObfuscatedName("u") - @Export("Tiles_lightness") - static int[] Tiles_lightness; - @ObfuscatedName("j") - static final int[] field512; + static byte[][][] field485; @ObfuscatedName("t") - static final int[] field513; - @ObfuscatedName("h") - static final int[] field514; - @ObfuscatedName("o") - static final int[] field520; - @ObfuscatedName("n") - static final int[] field509; + static byte[][][] field475; @ObfuscatedName("d") - static final int[] field517; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 2138239411 - ) - static int field519; + @Export("Tiles_hue") + static int[] Tiles_hue; + @ObfuscatedName("p") + static int[][][] field483; @ObfuscatedName("z") + static final int[] field479; + @ObfuscatedName("a") + static final int[] field480; + @ObfuscatedName("w") + static final int[] field481; + @ObfuscatedName("l") + static final int[] field482; + @ObfuscatedName("h") + static final int[] field478; + @ObfuscatedName("v") + static final int[] field484; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -217342215 + intValue = 1482528019 ) - static int field510; + static int field477; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1522928569 + ) + static int field486; static { Tiles_heights = new int[4][105][105]; Tiles_renderFlags = new byte[4][104][104]; Tiles_minPlane = 99; - field512 = new int[]{1, 2, 4, 8}; - field513 = new int[]{16, 32, 64, 128}; - field514 = new int[]{1, 0, -1, 0}; - field520 = new int[]{0, -1, 0, 1}; - field509 = new int[]{1, -1, -1, 1}; - field517 = new int[]{-1, -1, 1, 1}; - field519 = (int)(Math.random() * 17.0D) - 8; - field510 = (int)(Math.random() * 33.0D) - 16; + field479 = new int[]{1, 2, 4, 8}; + field480 = new int[]{16, 32, 64, 128}; + field481 = new int[]{1, 0, -1, 0}; + field482 = new int[]{0, -1, 0, 1}; + field478 = new int[]{1, -1, -1, 1}; + field484 = new int[]{-1, -1, 1, 1}; + field477 = (int)(Math.random() * 17.0D) - 8; + field486 = (int)(Math.random() * 33.0D) - 16; } - @ObfuscatedName("gk") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(ZLkx;I)V", - garbageValue = "-1936823520" + signature = "(III)I", + garbageValue = "-739357854" ) - @Export("loadRegions") - static final void loadRegions(boolean var0, PacketBuffer var1) { - Client.isInInstance = var0; - int var2; - int var3; - int var5; - int var6; - int var7; - int var8; - if (!Client.isInInstance) { - var2 = var1.method5534(); - var3 = var1.method5518(); - int var4 = var1.readUnsignedShort(); - WorldMapRegion.xteaKeys = new int[var4][4]; - - for (var5 = 0; var5 < var4; ++var5) { - for (var6 = 0; var6 < 4; ++var6) { - WorldMapRegion.xteaKeys[var5][var6] = var1.readInt(); - } - } - - DirectByteArrayCopier.regions = new int[var4]; - SecureRandomFuture.regionMapArchiveIds = new int[var4]; - WorldMapRectangle.regionLandArchiveIds = new int[var4]; - class13.regionLandArchives = new byte[var4][]; - class80.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)) { - DirectByteArrayCopier.regions[var4] = var8; - SecureRandomFuture.regionMapArchiveIds[var4] = WorldMapCacheName.archive5.getGroupId("m" + var6 + "_" + var7); - WorldMapRectangle.regionLandArchiveIds[var4] = WorldMapCacheName.archive5.getGroupId("l" + var6 + "_" + var7); - ++var4; - } - } - } - - UserComparator8.method3399(var3, var2, true); + static int method1060(int var0, int var1) { + FloorOverlayDefinition var3 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); + FloorOverlayDefinition var2; + if (var3 != null) { + var2 = var3; } else { - var2 = var1.method5518(); - var3 = var1.method5534(); - boolean var15 = var1.readUnsignedByte() == 1; - 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; - } - } - } + byte[] var4 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var0); + var3 = new FloorOverlayDefinition(); + if (var4 != null) { + var3.decode(new Buffer(var4), var0); } - var1.exportIndex(); - WorldMapRegion.xteaKeys = new int[var5][4]; - - for (var6 = 0; var6 < var5; ++var6) { - for (var7 = 0; var7 < 4; ++var7) { - WorldMapRegion.xteaKeys[var6][var7] = var1.readInt(); - } - } - - DirectByteArrayCopier.regions = new int[var5]; - SecureRandomFuture.regionMapArchiveIds = new int[var5]; - WorldMapRectangle.regionLandArchiveIds = new int[var5]; - class13.regionLandArchives = new byte[var5][]; - class80.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 (DirectByteArrayCopier.regions[var13] == var12) { - var12 = -1; - break; - } - } - - if (var12 != -1) { - DirectByteArrayCopier.regions[var5] = var12; - var13 = var12 >> 8 & 255; - int var14 = var12 & 255; - SecureRandomFuture.regionMapArchiveIds[var5] = WorldMapCacheName.archive5.getGroupId("m" + var13 + "_" + var14); - WorldMapRectangle.regionLandArchiveIds[var5] = WorldMapCacheName.archive5.getGroupId("l" + var13 + "_" + var14); - ++var5; - } - } - } - } - } - - UserComparator8.method3399(var3, var2, !var15); + var3.postDecode(); + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var3, (long)var0); + var2 = var3; } + if (var2 == null) { + return var1; + } else if (var2.secondaryRgb >= 0) { + return var2.secondaryRgb | -16777216; + } else { + int var5; + byte var6; + int var8; + int var9; + if (var2.texture >= 0) { + var5 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var2.texture); + var6 = 96; + if (var5 == -2) { + var8 = 12345678; + } else if (var5 == -1) { + if (var6 < 0) { + var6 = 0; + } else if (var6 > 127) { + var6 = 127; + } + + var9 = 127 - var6; + var8 = var9; + } else { + var9 = var6 * (var5 & 127) / 128; + if (var9 < 2) { + var9 = 2; + } else if (var9 > 126) { + var9 = 126; + } + + var8 = var9 + (var5 & 65408); + } + + return Rasterizer3D.Rasterizer3D_colorPalette[var8] | -16777216; + } else if (var2.primaryRgb == 16711935) { + return var1; + } else { + var8 = WorldMapIcon_0.WorldMap_hslToRgb(var2.hue, var2.saturation, var2.lightness); + var6 = 96; + if (var8 == -2) { + var5 = 12345678; + } else if (var8 == -1) { + if (var6 < 0) { + var6 = 0; + } else if (var6 > 127) { + var6 = 127; + } + + var9 = 127 - var6; + var5 = var9; + } else { + var9 = var6 * (var8 & 127) / 128; + if (var9 < 2) { + var9 = 2; + } else if (var9 > 126) { + var9 = 126; + } + + var5 = var9 + (var8 & 65408); + } + + return Rasterizer3D.Rasterizer3D_colorPalette[var5] | -16777216; + } + } + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(Lhz;B)V", + garbageValue = "-34" + ) + @Export("VarpDefinition_setArchives") + public static void VarpDefinition_setArchives(AbstractArchive var0) { + VarpDefinition.VarpDefinition_archive = var0; + VarpDefinition.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); + } + + @ObfuscatedName("fe") + @ObfuscatedSignature( + signature = "(Lbu;I)V", + garbageValue = "-1027985377" + ) + static final void method1075(Actor var0) { + int var1 = var0.field941 - Client.cycle; + int var2 = var0.field960 * 128 + var0.size * -178253824; + int var3 = var0.field954 * 128 + var0.size * -178253824; + var0.x += (var2 - var0.x) / var1; + var0.y += (var3 - var0.y) / var1; + var0.field976 = 0; + var0.orientation = var0.field966; + } + + @ObfuscatedName("ke") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "-63" + ) + @Export("Clan_leaveChat") + static final void Clan_leaveChat() { + PacketBufferNode var0 = MenuAction.getPacketBufferNode(ClientPacket.field2263, Client.packetWriter.isaacCipher); + var0.packetBuffer.writeByte(0); + Client.packetWriter.addNode(var0); + } + + @ObfuscatedName("ki") + @ObfuscatedSignature( + signature = "([BII)V", + garbageValue = "912146837" + ) + static void method1088(byte[] var0, int var1) { + if (Client.randomDatData == null) { + Client.randomDatData = new byte[24]; + } + + class300.writeRandomDat(var0, var1, Client.randomDatData, 0, 24); } } diff --git a/runescape-client/src/main/java/Timer.java b/runescape-client/src/main/java/Timer.java index d9b4cae9c7..b4f4b1b897 100644 --- a/runescape-client/src/main/java/Timer.java +++ b/runescape-client/src/main/java/Timer.java @@ -4,648 +4,173 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jr") +@ObfuscatedName("jd") @Implements("Timer") public class Timer { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - longValue = 6201267541958518593L + longValue = 7514932896341092199L ) - long field3603; - @ObfuscatedName("w") + long field3566; + @ObfuscatedName("j") @ObfuscatedGetter( - longValue = 756856931797943717L + longValue = -7624772815997057519L ) - long field3602; - @ObfuscatedName("e") - public boolean field3605; - @ObfuscatedName("p") - @ObfuscatedGetter( - longValue = -8529689668980349377L - ) - long field3607; + long field3558; + @ObfuscatedName("i") + public boolean field3560; @ObfuscatedName("k") @ObfuscatedGetter( - longValue = 7000623641176783585L + longValue = -6215548007371773365L ) - long field3604; - @ObfuscatedName("l") + long field3561; + @ObfuscatedName("u") @ObfuscatedGetter( - longValue = -3948903949639907735L + longValue = 1342387343954855195L ) - long field3606; - @ObfuscatedName("b") + long field3562; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 886214165 + longValue = 5626875843226124193L ) - int field3608; - @ObfuscatedName("i") + long field3559; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -380369403 + intValue = 1819950625 ) - int field3609; - @ObfuscatedName("c") + int field3564; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 2035223733 + intValue = -100578869 ) - int field3601; - @ObfuscatedName("f") + int field3565; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1448804345 + intValue = -762061045 ) - int field3610; + int field3563; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -528915323 + ) + int field3567; public Timer() { - this.field3603 = -1L; - this.field3602 = -1L; - this.field3605 = false; - this.field3607 = 0L; - this.field3604 = 0L; - this.field3606 = 0L; - this.field3608 = 0; - this.field3609 = 0; - this.field3601 = 0; - this.field3610 = 0; + this.field3566 = -1L; + this.field3558 = -1L; + this.field3560 = false; + this.field3561 = 0L; + this.field3562 = 0L; + this.field3559 = 0L; + this.field3564 = 0; + this.field3565 = 0; + this.field3563 = 0; + this.field3567 = 0; } - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1547117629" - ) - public void method5005() { - this.field3603 = DirectByteArrayCopier.currentTimeMs(); - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-602398430" - ) - public void method4993() { - if (this.field3603 != -1L) { - this.field3604 = DirectByteArrayCopier.currentTimeMs() - this.field3603; - this.field3603 = -1L; - } - - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1668948707" - ) - public void method4996(int var1) { - this.field3602 = DirectByteArrayCopier.currentTimeMs(); - this.field3608 = var1; - } - - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "-20" + garbageValue = "0" ) - public void method5014() { - if (-1L != this.field3602) { - this.field3607 = DirectByteArrayCopier.currentTimeMs() - this.field3602; - this.field3602 = -1L; + public void method4897() { + this.field3566 = SequenceDefinition.method4686(); + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1627555881" + ) + public void method4898() { + if (-1L != this.field3566) { + this.field3562 = SequenceDefinition.method4686() - this.field3566; + this.field3566 = -1L; } - ++this.field3601; - this.field3605 = true; + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(IB)V", + garbageValue = "1" + ) + public void method4899(int var1) { + this.field3558 = SequenceDefinition.method4686(); + this.field3564 = var1; } @ObfuscatedName("k") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-481288218" + garbageValue = "1290905083" ) - public void method4998() { - this.field3605 = false; - this.field3609 = 0; + public void method4900() { + if (this.field3558 != -1L) { + this.field3561 = SequenceDefinition.method4686() - this.field3558; + this.field3558 = -1L; + } + + ++this.field3563; + this.field3560 = true; } - @ObfuscatedName("l") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "2054543133" + garbageValue = "-769614616" ) - public void method5000() { - this.method5014(); + public void method4925() { + this.field3560 = false; + this.field3565 = 0; } - @ObfuscatedName("b") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Lkf;I)V", - garbageValue = "1450575552" + signature = "(B)V", + garbageValue = "15" + ) + public void method4901() { + this.method4900(); + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(Lky;I)V", + garbageValue = "-1786942411" ) @Export("write") public void write(Buffer var1) { - long var2 = this.field3604; + long var2 = this.field3562; var2 /= 10L; if (var2 < 0L) { var2 = 0L; - } else if (var2 > 0xffffL) { - var2 = 0xffffL; + } else if (var2 > 65535L) { + var2 = 65535L; } var1.writeShort((int)var2); - long var4 = this.field3607; + long var4 = this.field3561; var4 /= 10L; if (var4 < 0L) { var4 = 0L; - } else if (var4 > 0xffffL) { - var4 = 0xffffL; + } else if (var4 > 65535L) { + var4 = 65535L; } var1.writeShort((int)var4); - long var6 = this.field3606; + long var6 = this.field3559; var6 /= 10L; if (var6 < 0L) { var6 = 0L; - } else if (var6 > 0xffffL) { - var6 = 0xffffL; + } else if (var6 > 65535L) { + var6 = 65535L; } var1.writeShort((int)var6); - var1.writeShort(this.field3608); - var1.writeShort(this.field3609); - var1.writeShort(this.field3601); - var1.writeShort(this.field3610); - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", - garbageValue = "-1350169073" - ) - public static String method5015(CharSequence[] var0, int var1, int var2) { - if (var2 == 0) { - return ""; - } - if (var2 == 1) { - CharSequence var3 = var0[var1]; - return var3 == null ? "null" : var3.toString(); - } - 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("ed") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1204156569" - ) - @Export("load") - static void load() { - int var0; - if (Client.titleLoadingStage == 0) { - GrandExchangeOfferWorldComparator.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); - - for (var0 = 0; var0 < 4; ++var0) { - Client.collisionMaps[var0] = new CollisionMap(104, 104); - } - - RouteStrategy.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) { - class197.archive0 = class65.newArchive(0, false, true, true); - JagexCache.archive1 = class65.newArchive(1, false, true, true); - class215.archive2 = class65.newArchive(2, true, false, true); - class43.archive3 = class65.newArchive(3, false, true, true); - class13.archive4 = class65.newArchive(4, false, true, true); - WorldMapCacheName.archive5 = class65.newArchive(5, true, true, true); - WorldMapRegion.archive6 = class65.newArchive(6, true, true, true); - NPCDefinition.archive7 = class65.newArchive(7, false, true, true); - Client.archive8 = class65.newArchive(8, false, true, true); - class4.archive9 = class65.newArchive(9, false, true, true); - WorldMapLabelSize.archive10 = class65.newArchive(10, false, true, true); - class32.archive11 = class65.newArchive(11, false, true, true); - UserComparator4.archive12 = class65.newArchive(12, false, true, true); - class2.archive13 = class65.newArchive(13, true, false, true); - Tile.archive14 = class65.newArchive(14, false, true, true); - GrandExchangeOfferOwnWorldComparator.archive15 = class65.newArchive(15, false, true, true); - WorldMapSprite.archive17 = class65.newArchive(17, true, true, true); - Client.archive18 = class65.newArchive(18, false, true, true); - ItemDefinition.archive19 = class65.newArchive(19, false, true, true); - Entity.archive20 = class65.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 var30 = 0; - var0 = var30 + class197.archive0.percentage() * 4 / 100; - var0 += JagexCache.archive1.percentage() * 4 / 100; - var0 += class215.archive2.percentage() * 2 / 100; - var0 += class43.archive3.percentage() * 2 / 100; - var0 += class13.archive4.percentage() * 6 / 100; - var0 += WorldMapCacheName.archive5.percentage() * 4 / 100; - var0 += WorldMapRegion.archive6.percentage() * 2 / 100; - var0 += NPCDefinition.archive7.percentage() * 56 / 100; - var0 += Client.archive8.percentage() * 2 / 100; - var0 += class4.archive9.percentage() * 2 / 100; - var0 += WorldMapLabelSize.archive10.percentage() * 2 / 100; - var0 += class32.archive11.percentage() * 2 / 100; - var0 += UserComparator4.archive12.percentage() * 2 / 100; - var0 += class2.archive13.percentage() * 2 / 100; - var0 += Tile.archive14.percentage() * 2 / 100; - var0 += GrandExchangeOfferOwnWorldComparator.archive15.percentage() * 2 / 100; - var0 += ItemDefinition.archive19.percentage() / 100; - var0 += Client.archive18.percentage() / 100; - var0 += Entity.archive20.percentage() / 100; - var0 += WorldMapSprite.archive17.method4258() && WorldMapSprite.archive17.isFullyLoaded() ? 1 : 0; - if (var0 == 100) { - class42.method763(class197.archive0, "Animations"); - class42.method763(JagexCache.archive1, "Skeletons"); - class42.method763(class13.archive4, "Sound FX"); - class42.method763(WorldMapCacheName.archive5, "Maps"); - class42.method763(WorldMapRegion.archive6, "Music Tracks"); - class42.method763(NPCDefinition.archive7, "Models"); - class42.method763(Client.archive8, "Sprites"); - class42.method763(class32.archive11, "Music Jingles"); - class42.method763(Tile.archive14, "Music Samples"); - class42.method763(GrandExchangeOfferOwnWorldComparator.archive15, "Music Patches"); - class42.method763(ItemDefinition.archive19, "World Map"); - class42.method763(Client.archive18, "World Map Geography"); - class42.method763(Entity.archive20, "World Map Ground"); - UserComparator6.spriteIds = new GraphicsDefaults(); - UserComparator6.spriteIds.decode(WorldMapSprite.archive17); - Login.Login_loadingText = "Loaded update list"; - Login.Login_loadingPercent = 30; - Client.titleLoadingStage = 45; - } else { - if (var0 != 0) { - Login.Login_loadingText = "Checking for updates - " + var0 + "%"; - } - - Login.Login_loadingPercent = 30; - } - } else if (Client.titleLoadingStage == 45) { - Tile.PcmPlayer_configure(22050, !Client.isLowDetail, 2); - MidiPcmStream var33 = new MidiPcmStream(); - var33.method3720(9, 128); - class80.pcmPlayer0 = ArchiveDiskActionHandler.method4256(GameShell.taskHandler, 0, 22050); - class80.pcmPlayer0.setStream(var33); - ArchiveLoader.setAudioArchives(GrandExchangeOfferOwnWorldComparator.archive15, Tile.archive14, class13.archive4, var33); - Language.pcmPlayer1 = ArchiveDiskActionHandler.method4256(GameShell.taskHandler, 1, 2048); - SecureRandomCallable.pcmStreamMixer = new PcmStreamMixer(); - Language.pcmPlayer1.setStream(SecureRandomCallable.pcmStreamMixer); - AttackOption.decimator = new Decimator(22050, CollisionMap.PcmPlayer_sampleRate); - Login.Login_loadingText = "Prepared sound engine"; - Login.Login_loadingPercent = 35; - Client.titleLoadingStage = 50; - FileSystem.WorldMapElement_fonts = new Fonts(Client.archive8, class2.archive13); - } else if (Client.titleLoadingStage == 50) { - FontName[] var32 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_plain12, FontName.FontName_plain11, FontName.FontName_verdana11, FontName.FontName_verdana13, FontName.FontName_bold12}; - int var1 = var32.length; - Fonts var29 = FileSystem.WorldMapElement_fonts; - FontName[] var3 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_plain12, FontName.FontName_plain11, FontName.FontName_verdana11, FontName.FontName_verdana13, FontName.FontName_bold12}; - Client.fontsMap = var29.createMap(var3); - if (Client.fontsMap.size() < var1) { - Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var1 + "%"; - Login.Login_loadingPercent = 40; - } else { - Coord.fontPlain11 = (Font) Client.fontsMap.get(FontName.FontName_plain11); - FileSystem.fontPlain12 = (Font) Client.fontsMap.get(FontName.FontName_plain12); - WorldMapIcon_1.fontBold12 = (Font) Client.fontsMap.get(FontName.FontName_bold12); - WorldMapRectangle.platformInfo = Client.platformInfoProvider.get(); - Login.Login_loadingText = "Loaded fonts"; - Login.Login_loadingPercent = 40; - Client.titleLoadingStage = 60; - } - } else if (Client.titleLoadingStage == 60) { - Archive var25 = WorldMapLabelSize.archive10; - Archive var2 = Client.archive8; - int var26 = 0; - if (var25.tryLoadFileByNames("title.jpg", "")) { - ++var26; - } - - if (var2.tryLoadFileByNames("logo", "")) { - ++var26; - } - - if (var2.tryLoadFileByNames("logo_deadman_mode", "")) { - ++var26; - } - - if (var2.tryLoadFileByNames("titlebox", "")) { - ++var26; - } - - if (var2.tryLoadFileByNames("titlebutton", "")) { - ++var26; - } - - if (var2.tryLoadFileByNames("runes", "")) { - ++var26; - } - - if (var2.tryLoadFileByNames("title_mute", "")) { - ++var26; - } - - if (var2.tryLoadFileByNames("options_radio_buttons,0", "")) { - ++var26; - } - - if (var2.tryLoadFileByNames("options_radio_buttons,2", "")) { - ++var26; - } - - if (var2.tryLoadFileByNames("options_radio_buttons,4", "")) { - ++var26; - } - - if (var2.tryLoadFileByNames("options_radio_buttons,6", "")) { - ++var26; - } - - var2.tryLoadFileByNames("sl_back", ""); - var2.tryLoadFileByNames("sl_flags", ""); - var2.tryLoadFileByNames("sl_arrows", ""); - var2.tryLoadFileByNames("sl_stars", ""); - var2.tryLoadFileByNames("sl_button", ""); - int var4 = ScriptEvent.method1121(); - if (var26 < var4) { - Login.Login_loadingText = "Loading title screen - " + var26 * 100 / var4 + "%"; - Login.Login_loadingPercent = 50; - } else { - Login.Login_loadingText = "Loaded title screen"; - Login.Login_loadingPercent = 50; - class96.updateGameState(5); - Client.titleLoadingStage = 70; - } - } else if (Client.titleLoadingStage == 70) { - if (!class215.archive2.isFullyLoaded()) { - Login.Login_loadingText = "Loading config - " + class215.archive2.loadPercent() + "%"; - Login.Login_loadingPercent = 60; - } else { - // floorovl def inlined - Archive var31 = class215.archive2; - FloorOverlayDefinition.FloorOverlayDefinition_archive = var31; - // --- - WorldMapSprite.FloorUnderlayDefinition_setArchives(class215.archive2); - GrandExchangeEvents.KitDefinition_setArchives(class215.archive2, NPCDefinition.archive7); - // object def inlined - Archive var25 = class215.archive2; - Archive var2 = NPCDefinition.archive7; - boolean var34 = Client.isLowDetail; - ObjectDefinition.ObjectDefinition_archive = var25; - ObjectDefinition.ObjectDefinition_modelsArchive = var2; - ObjectDefinition.ObjectDefinition_isLowDetail = var34; - // --- - FaceNormal.NpcDefinition_setArchives(class215.archive2, NPCDefinition.archive7); - TileItem.StructDefinition_setArchives(class215.archive2); - // item def inlined - Archive var27 = class215.archive2; - Archive var5 = NPCDefinition.archive7; - boolean var6 = Client.isMembersWorld; - Font var7 = Coord.fontPlain11; - Messages.ItemDefinition_archive = var27; - ItemDefinition.ItemDefinition_modelArchive = var5; - ModelData0.ItemDefinition_inMembersWorld = var6; - ItemDefinition.ItemDefinition_fileCount = Messages.ItemDefinition_archive.getGroupFileCount(10); - HealthBar.ItemDefinition_fontPlain11 = var7; - // sequence def inlined - Archive var8 = class215.archive2; - Archive var9 = class197.archive0; - Archive var10 = JagexCache.archive1; - SequenceDefinition.SequenceDefinition_archive = var8; - SequenceDefinition.SequenceDefinition_animationsArchive = var9; - SequenceDefinition.SequenceDefinition_skeletonsArchive = var10; - // spotanim def inlined - Archive var11 = class215.archive2; - Archive var12 = NPCDefinition.archive7; - SpotAnimationDefinition.SpotAnimationDefinition_archive = var11; - class43.SpotAnimationDefinition_modelArchive = var12; - // varbit def inlined - Archive var13 = class215.archive2; - VarbitDefinition.VarbitDefinition_archive = var13; - // --- - GrandExchangeEvents.VarpDefinition_setArchives(class215.archive2); - UrlRequest.Widget_setArchives(class43.archive3, NPCDefinition.archive7, Client.archive8, class2.archive13); - WorldMapData_0.InvDefinition_setArchives(class215.archive2); - // enum def inlined - Archive var14 = class215.archive2; - EnumDefinition.EnumDefinition_archive = var14; - // --- - GrandExchangeOfferWorldComparator.VarcInt_setArchives(class215.archive2); - KeyHandler.ParamDefinition_setArchives(class215.archive2); - Clock.varcs = new Varcs(); - // hitsplat def inlined - Archive var15 = class215.archive2; - Archive var16 = Client.archive8; - Archive var17 = class2.archive13; - HitSplatDefinition.HitSplatDefinition_archive = var15; - HitSplatDefinition.HitSplatDefinition_spritesArchive = var16; - HitSplatDefinition.HitSplatDefinition_fontsArchive = var17; - // healthbar def inlined - Archive var18 = class215.archive2; - Archive var19 = Client.archive8; - HealthBarDefinition.HealthBarDefinition_archive = var18; - HealthBarDefinition.HealthBarDefinition_spritesArchive = var19; - // worldmap element inlined - Archive var20 = class215.archive2; - Archive var21 = Client.archive8; - WorldMapElement.WorldMapElement_archive = var21; - if (var20.isFullyLoaded()) { - UserComparator1.WorldMapElement_count = var20.getGroupFileCount(35); - WorldMapElement.WorldMapElement_cached = new WorldMapElement[UserComparator1.WorldMapElement_count]; - - for (int var22 = 0; var22 < UserComparator1.WorldMapElement_count; ++var22) { - byte[] var23 = var20.takeFile(35, var22); - WorldMapElement.WorldMapElement_cached[var22] = new WorldMapElement(var22); - if (var23 != null) { - WorldMapElement.WorldMapElement_cached[var22].decode(new Buffer(var23)); - WorldMapElement.WorldMapElement_cached[var22].method4370(); - } - } - } - // --- - - Login.Login_loadingText = "Loaded config"; - Login.Login_loadingPercent = 60; - Client.titleLoadingStage = 80; - } - } else if (Client.titleLoadingStage == 80) { - var0 = 0; - if (Message.compass == null) { - Message.compass = class65.SpriteBuffer_getSprite(Client.archive8, UserComparator6.spriteIds.compass, 0); - } else { - ++var0; - } - - if (UserComparator4.redHintArrowSprite == null) { - UserComparator4.redHintArrowSprite = class65.SpriteBuffer_getSprite(Client.archive8, UserComparator6.spriteIds.field3823, 0); - } else { - ++var0; - } - - if (ClanChat.mapSceneSprites == null) { - ClanChat.mapSceneSprites = class289.SpriteBuffer_getIndexedSpriteArray(Client.archive8, UserComparator6.spriteIds.mapScenes, 0); - } else { - ++var0; - } - - if (UserComparator3.headIconPkSprites == null) { - UserComparator3.headIconPkSprites = TilePaint.SpriteBuffer_getSpriteArray(Client.archive8, UserComparator6.spriteIds.headIconsPk, 0); - } else { - ++var0; - } - - if (SoundCache.headIconPrayerSprites == null) { - SoundCache.headIconPrayerSprites = TilePaint.SpriteBuffer_getSpriteArray(Client.archive8, UserComparator6.spriteIds.field3830, 0); - } else { - ++var0; - } - - if (class173.headIconHintSprites == null) { - class173.headIconHintSprites = TilePaint.SpriteBuffer_getSpriteArray(Client.archive8, UserComparator6.spriteIds.field3827, 0); - } else { - ++var0; - } - - if (WorldMapData_1.mapMarkerSprites == null) { - WorldMapData_1.mapMarkerSprites = TilePaint.SpriteBuffer_getSpriteArray(Client.archive8, UserComparator6.spriteIds.field3828, 0); - } else { - ++var0; - } - - if (Occluder.crossSprites == null) { - Occluder.crossSprites = TilePaint.SpriteBuffer_getSpriteArray(Client.archive8, UserComparator6.spriteIds.field3829, 0); - } else { - ++var0; - } - - if (Skills.mapDotSprites == null) { - Skills.mapDotSprites = TilePaint.SpriteBuffer_getSpriteArray(Client.archive8, UserComparator6.spriteIds.field3832, 0); - } else { - ++var0; - } - - if (GrandExchangeOfferAgeComparator.scrollBarSprites == null) { - GrandExchangeOfferAgeComparator.scrollBarSprites = class289.SpriteBuffer_getIndexedSpriteArray(Client.archive8, UserComparator6.spriteIds.field3831, 0); - } else { - ++var0; - } - - if (GrandExchangeOfferNameComparator.modIconSprites == null) { - GrandExchangeOfferNameComparator.modIconSprites = class289.SpriteBuffer_getIndexedSpriteArray(Client.archive8, UserComparator6.spriteIds.field3822, 0); - } else { - ++var0; - } - - if (var0 < 11) { - Login.Login_loadingText = "Loading sprites - " + var0 * 100 / 12 + "%"; - Login.Login_loadingPercent = 70; - } else { - AbstractFont.AbstractFont_modIconSprites = GrandExchangeOfferNameComparator.modIconSprites; - UserComparator4.redHintArrowSprite.normalize(); - int var1 = (int) (Math.random() * 21.0D) - 10; - int var28 = (int) (Math.random() * 21.0D) - 10; - int var26 = (int) (Math.random() * 21.0D) - 10; - int var4 = (int) (Math.random() * 41.0D) - 20; - ClanChat.mapSceneSprites[0].shiftColors(var1 + var4, var4 + var28, var4 + var26); - Login.Login_loadingText = "Loaded sprites"; - Login.Login_loadingPercent = 70; - Client.titleLoadingStage = 90; - } - } else if (Client.titleLoadingStage == 90) { - if (!class4.archive9.isFullyLoaded()) { - Login.Login_loadingText = "Loading textures - " + "0%"; - Login.Login_loadingPercent = 90; - } else { - GrandExchangeEvents.textureProvider = new TextureProvider(class4.archive9, Client.archive8, 20, 0.8D, Client.isLowDetail ? 64 : 128); - Rasterizer3D.Rasterizer3D_setTextureLoader(GrandExchangeEvents.textureProvider); - Rasterizer3D.Rasterizer3D_setBrightness(0.8D); - Client.titleLoadingStage = 100; - } - } else if (Client.titleLoadingStage == 100) { - var0 = GrandExchangeEvents.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) { - class40.mouseRecorder = new MouseRecorder(); - GameShell.taskHandler.newThreadTask(class40.mouseRecorder, 10); - Login.Login_loadingText = "Loaded input handler"; - Login.Login_loadingPercent = 92; - Client.titleLoadingStage = 120; - } else if (Client.titleLoadingStage == 120) { - if (!WorldMapLabelSize.archive10.tryLoadFileByNames("huffman", "")) { - Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; - Login.Login_loadingPercent = 94; - } else { - Huffman var24 = new Huffman(WorldMapLabelSize.archive10.takeFileByNames("huffman", "")); - class210.huffman = var24; - Login.Login_loadingText = "Loaded wordpack"; - Login.Login_loadingPercent = 94; - Client.titleLoadingStage = 130; - } - } else if (Client.titleLoadingStage == 130) { - if (!class43.archive3.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + class43.archive3.loadPercent() * 4 / 5 + "%"; - Login.Login_loadingPercent = 96; - } else if (!UserComparator4.archive12.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + (80 + UserComparator4.archive12.loadPercent() / 6) + "%"; - Login.Login_loadingPercent = 96; - } else if (!class2.archive13.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + (96 + class2.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 (!ItemDefinition.archive19.tryLoadGroupByName(WorldMapCacheName.DETAILS.name)) { - Login.Login_loadingText = "Loading world map - " + ItemDefinition.archive19.groupLoadPercentByName(WorldMapCacheName.DETAILS.name) / 10 + "%"; - } else { - if (BoundaryObject.worldMap == null) { - BoundaryObject.worldMap = new WorldMap(); - BoundaryObject.worldMap.init(ItemDefinition.archive19, Client.archive18, Entity.archive20, WorldMapIcon_1.fontBold12, Client.fontsMap, ClanChat.mapSceneSprites); - } - - Login.Login_loadingText = "Loaded world map"; - Client.titleLoadingStage = 150; - } - } else if (Client.titleLoadingStage == 150) { - class96.updateGameState(10); - } + var1.writeShort(this.field3564); + var1.writeShort(this.field3565); + var1.writeShort(this.field3563); + var1.writeShort(this.field3567); } } diff --git a/runescape-client/src/main/java/TriBool.java b/runescape-client/src/main/java/TriBool.java index 21702d0141..986ee711c9 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("jy") +@ObfuscatedName("jj") @Implements("TriBool") public class TriBool { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Ljy;" + signature = "Ljj;" ) @Export("TriBool_unknown") public static final TriBool TriBool_unknown; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Ljy;" + signature = "Ljj;" ) @Export("TriBool_true") public static final TriBool TriBool_true; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Ljy;" + signature = "Ljj;" ) @Export("TriBool_false") public static final TriBool TriBool_false; @@ -34,39 +34,125 @@ public class TriBool { TriBool() { } - @ObfuscatedName("fw") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZI)V", - garbageValue = "397686194" + signature = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lgk;I)I", + garbageValue = "-1496221651" ) - @Export("drawLoadingMessage") - static final void drawLoadingMessage(String var0, boolean var1) { - if (!Client.showLoadingMessages) { - return; - } - byte var2 = 4; - int var3 = var2 + 6; - int var4 = var2 + 6; - int var5 = FileSystem.fontPlain12.lineWidth(var0, 250); - int var6 = FileSystem.fontPlain12.lineCount(var0, 250) * 13; - Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var6 + var2 + var2, 0); - Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var6 + var2 + var2, 0xffffff); - FileSystem.fontPlain12.drawLines(var0, var3, var4, var5, var6, 0xffffff, -1, 1, 1, 0); - ChatChannel.method2215(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var6 + var2); - if (var1) { - MusicPatchPcmStream.rasterProvider.drawFull(0, 0); - } else { - int var7 = var3; - int var8 = var4; - int var9 = var5; - int var10 = var6; + @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; - for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { - if (Client.rootWidgetXs[var11] + Client.rootWidgetWidths[var11] > var7 && Client.rootWidgetXs[var11] < var7 + var9 && Client.rootWidgetYs[var11] + Client.rootWidgetHeights[var11] > var8 && Client.rootWidgetYs[var11] < var10 + var8) { - Client.field861[var11] = true; + 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 = FriendLoginUpdate.standardizeChar(var9, var2); + var10 = FriendLoginUpdate.standardizeChar(var10, var2); + if (var10 != var9 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { + var9 = Character.toLowerCase(var9); + var10 = Character.toLowerCase(var10); + if (var9 != var10) { + return JagexCache.lowercaseChar(var9, var2) - JagexCache.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 JagexCache.lowercaseChar(var18, var2) - JagexCache.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 JagexCache.lowercaseChar(var20, var2) - JagexCache.lowercaseChar(var13, var2); + } + } + + return 0; + } } } diff --git a/runescape-client/src/main/java/UrlRequest.java b/runescape-client/src/main/java/UrlRequest.java index a492854652..1fc25ce178 100644 --- a/runescape-client/src/main/java/UrlRequest.java +++ b/runescape-client/src/main/java/UrlRequest.java @@ -1,19 +1,25 @@ 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("ex") +@ObfuscatedName("er") @Implements("UrlRequest") public class UrlRequest { - @ObfuscatedName("q") + @ObfuscatedName("rb") + @ObfuscatedGetter( + intValue = 1189036032 + ) + static int field1932; + @ObfuscatedName("s") @Export("url") final URL url; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("isDone0") volatile boolean isDone0; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("response0") volatile byte[] response0; @@ -21,166 +27,143 @@ public class UrlRequest { this.url = var1; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "1792198908" + signature = "(B)Z", + garbageValue = "76" ) @Export("isDone") public boolean isDone() { return this.isDone0; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)[B", - garbageValue = "-338757002" + signature = "(B)[B", + garbageValue = "0" ) @Export("getResponse") public byte[] getResponse() { return this.response0; } - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lhp;Lhp;Lhp;Lhp;I)V", - garbageValue = "-354587299" + signature = "(Ljava/lang/CharSequence;Llu;I)Ljava/lang/String;", + garbageValue = "238475307" ) - @Export("Widget_setArchives") - public static void Widget_setArchives(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) { - Widget.Widget_archive = var0; - ViewportMouse.Widget_modelsArchive = var1; - class216.Widget_spritesArchive = var2; - DirectByteArrayCopier.Widget_fontsArchive = var3; - Widget.Widget_interfaceComponents = new Widget[Widget.Widget_archive.getGroupCount()][]; - ViewportMouse.Widget_loadedInterfaces = new boolean[Widget.Widget_archive.getGroupCount()]; - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-1541949649" - ) - @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("gc") - @ObfuscatedSignature( - signature = "(IIIIZB)V", - garbageValue = "-69" - ) - @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.field782; - } else if (var5 >= 100) { - var6 = Client.field651; + public static String method3264(CharSequence var0, LoginType var1) { + if (var0 == null) { + return null; } else { - var6 = (Client.field651 - Client.field782) * var5 / 100 + Client.field782; - } + int var2 = 0; - int var7 = var3 * var6 * 512 / (var2 * 334); - int var8; - int var9; - short var17; - if (var7 < Client.field732) { - var17 = Client.field732; - var6 = var17 * var2 * 334 / (var3 * 512); - if (var6 > Client.field790) { - var6 = Client.field790; - var8 = var3 * var6 * 512 / (var17 * 334); - var9 = (var2 - var8) / 2; - if (var4) { - Rasterizer2D.Rasterizer2D_resetClip(); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, 0xff000000); - Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, 0xff000000); - } - - var0 += var9; - var2 -= var9 * 2; - } - } else if (var7 > Client.field659) { - var17 = Client.field659; - var6 = var17 * var2 * 334 / (var3 * 512); - if (var6 < Client.field820) { - var6 = Client.field820; - var8 = var17 * var2 * 334 / (var6 * 512); - var9 = (var3 - var8) / 2; - if (var4) { - Rasterizer2D.Rasterizer2D_resetClip(); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, 0xff000000); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, 0xff000000); - } - - var1 += var9; - var3 -= var9 * 2; - } - } - - Client.viewportZoom = var3 * var6 / 334; - if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { - int[] var16 = new int[9]; - - for (var9 = 0; var9 < var16.length; ++var9) { - int var10 = var9 * 32 + 15 + 128; - int var11 = class40.method700(var10); - int var12 = Rasterizer3D.Rasterizer3D_sine[var10]; - int var14 = var3 - 334; - if (var14 < 0) { - var14 = 0; - } else if (var14 > 100) { - var14 = 100; - } - - int var15 = (Client.zoomWidth - Client.zoomHeight) * var14 / 100 + Client.zoomHeight; - int var13 = var15 * var11 / 256; - var16[var9] = var12 * var13 >> 16; + int var3; + for (var3 = var0.length(); var2 < var3 && FaceNormal.method3222(var0.charAt(var2)); ++var2) { } - Scene.Scene_buildVisiblityMap(var16, 500, 800, var2 * 334 / var3, 334); + while (var3 > var2 && FaceNormal.method3222(var0.charAt(var3 - 1))) { + --var3; + } + + int var4 = var3 - var2; + if (var4 >= 1) { + byte var6; + if (var1 == null) { + var6 = 12; + } else { + switch(var1.field4033) { + case 1: + var6 = 20; + break; + default: + var6 = 12; + } + } + + if (var4 <= var6) { + StringBuilder var12 = new StringBuilder(var4); + + for (int var14 = var2; var14 < var3; ++var14) { + char var7 = var0.charAt(var14); + boolean var8; + if (Character.isISOControl(var7)) { + var8 = false; + } else if (RouteStrategy.isAlphaNumeric(var7)) { + var8 = true; + } else { + char[] var13 = class338.field4038; + int var10 = 0; + + label83: + while (true) { + char var11; + if (var10 >= var13.length) { + var13 = class338.field4035; + + for (var10 = 0; var10 < var13.length; ++var10) { + var11 = var13[var10]; + if (var7 == var11) { + var8 = true; + break label83; + } + } + + var8 = false; + break; + } + + var11 = var13[var10]; + if (var11 == var7) { + var8 = true; + break; + } + + ++var10; + } + } + + if (var8) { + char var9 = StructDefinition.method4449(var7); + if (var9 != 0) { + var12.append(var9); + } + } + } + + if (var12.length() == 0) { + return null; + } + + return var12.toString(); + } + } + + return null; + } + } + + @ObfuscatedName("kg") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)V", + garbageValue = "1388025296" + ) + static void method3258(String var0) { + Clock.field2037 = var0; + + try { + String var1 = WorldMapID.client.getParameter(Integer.toString(18)); + String var2 = WorldMapID.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=" + MusicPatchPcmStream.method3831(SequenceDefinition.method4686() + 94608000000L) + "; Max-Age=" + 94608000L; + } + + class47.method796(WorldMapID.client, "document.cookie=\"" + var3 + "\""); + } catch (Throwable var4) { } - Client.viewportOffsetX = var0; - Client.viewportOffsetY = var1; - Client.viewportWidth = var2; - Client.viewportHeight = var3; } } diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java index 9fa3c3a894..31c9425c20 100644 --- a/runescape-client/src/main/java/UrlRequester.java +++ b/runescape-client/src/main/java/UrlRequester.java @@ -3,25 +3,26 @@ import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; import java.net.URLConnection; -import java.util.Iterator; import java.util.LinkedList; import java.util.Queue; 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("ez") +@ObfuscatedName("eg") @Implements("UrlRequester") public class UrlRequester implements Runnable { @ObfuscatedName("q") + @Export("ItemDefinition_inMembersWorld") + public static boolean ItemDefinition_inMembersWorld; + @ObfuscatedName("s") @Export("thread") final Thread thread; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("isClosed") volatile boolean isClosed; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("requests") Queue requests; @@ -32,10 +33,10 @@ public class UrlRequester implements Runnable { this.thread.start(); } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ljava/net/URL;B)Lex;", - garbageValue = "78" + signature = "(Ljava/net/URL;I)Ler;", + garbageValue = "-2144304938" ) @Export("request") public UrlRequest request(URL var1) { @@ -47,10 +48,10 @@ public class UrlRequester implements Runnable { } } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "78" + signature = "(I)V", + garbageValue = "-1101438490" ) @Export("close") public void close() { @@ -113,7 +114,7 @@ public class UrlRequester implements Runnable { } } catch (Exception var17) { - HitSplatDefinition.RunException_sendStackTrace((String)null, var17); + class3.RunException_sendStackTrace((String)null, var17); } } @@ -121,58 +122,33 @@ public class UrlRequester implements Runnable { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", - garbageValue = "1670821408" + signature = "(IB)V", + garbageValue = "-75" ) - @Export("getChatMessagesAsString") - static String getChatMessagesAsString() { - String var0 = ""; + public static void method3250(int var0) { + if (var0 != -1) { + if (WorldMapDecoration.Widget_loadedInterfaces[var0]) { + Widget.Widget_archive.clearFilesGroup(var0); + if (Widget.Widget_interfaceComponents[var0] != null) { + boolean var1 = true; - Message var2; - for (Iterator var1 = Messages.Messages_hashTable.iterator(); var1.hasNext(); var0 = var0 + var2.sender + ':' + var2.text + '\n') { - var2 = (Message)var1.next(); - } + for (int var2 = 0; var2 < Widget.Widget_interfaceComponents[var0].length; ++var2) { + if (Widget.Widget_interfaceComponents[var0][var2] != null) { + if (Widget.Widget_interfaceComponents[var0][var2].type != 2) { + Widget.Widget_interfaceComponents[var0][var2] = null; + } else { + var1 = false; + } + } + } - return var0; - } + if (var1) { + Widget.Widget_interfaceComponents[var0] = null; + } - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "(ILcx;ZI)I", - garbageValue = "337474973" - ) - static int method3306(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { - var3 = class80.getWidget(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.itemId; - return 1; - } - if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { - var3 = class80.getWidget(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - if (var3.itemId != -1) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.itemQuantity; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + WorldMapDecoration.Widget_loadedInterfaces[var0] = false; + } } - - return 1; } - if (var0 == ScriptOpcodes.IF_HASSUB) { - int var5 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var5); - if (var4 != null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } - if (var0 == ScriptOpcodes.IF_GETTOP) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.rootInterface; - return 1; - } - return 2; } } diff --git a/runescape-client/src/main/java/User.java b/runescape-client/src/main/java/User.java index 18012e99d4..58843dafae 100644 --- a/runescape-client/src/main/java/User.java +++ b/runescape-client/src/main/java/User.java @@ -2,20 +2,19 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -@ObfuscatedName("jd") +@ObfuscatedName("ju") @Implements("User") public class User implements Comparable { - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Ljv;" + signature = "Ljx;" ) @Export("username") Username username; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Ljv;" + signature = "Ljx;" ) @Export("previousUsername") Username previousUsername; @@ -23,54 +22,55 @@ public class User implements Comparable { User() { } - @ObfuscatedName("aw") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)Ljv;", - garbageValue = "-156755920" + signature = "(B)Ljx;", + garbageValue = "32" ) @Export("getUsername") public Username getUsername() { return this.username; } - @ObfuscatedName("ad") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)Ljava/lang/String;", - garbageValue = "92130807" + garbageValue = "-1978694168" ) @Export("getName") public String getName() { return this.username == null ? "" : this.username.getName(); } - @ObfuscatedName("ag") + @ObfuscatedName("av") @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", - garbageValue = "1677107583" + signature = "(B)Ljava/lang/String;", + garbageValue = "1" ) @Export("getPreviousName") public String getPreviousName() { return this.previousUsername == null ? "" : this.previousUsername.getName(); } - @ObfuscatedName("ar") + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(Ljv;Ljv;B)V", - garbageValue = "46" + signature = "(Ljx;Ljx;I)V", + garbageValue = "-906454666" ) @Export("set") void set(Username var1, Username var2) { if (var1 == null) { throw new NullPointerException(); + } else { + this.username = var1; + this.previousUsername = var2; } - this.username = var1; - this.previousUsername = var2; } - @ObfuscatedName("ax") + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(Ljd;I)I", - garbageValue = "-1938562722" + signature = "(Lju;B)I", + garbageValue = "1" ) @Export("compareTo_user") public int compareTo_user(User var1) { @@ -81,37 +81,26 @@ public class User implements Comparable { return this.compareTo_user((User)var1); } - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)Ljava/lang/Class;", - garbageValue = "-811282980" + signature = "(IIII)I", + garbageValue = "-117811845" ) - @Export("loadClassFromDescriptor") - static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { - if (var0.equals("B")) { - return Byte.TYPE; - } - if (var0.equals("I")) { - return Integer.TYPE; - } - if (var0.equals("S")) { - return Short.TYPE; - } - if (var0.equals("J")) { - return Long.TYPE; - } - if (var0.equals("Z")) { - return Boolean.TYPE; - } - if (var0.equals("F")) { - return Float.TYPE; - } - if (var0.equals("D")) { - return Double.TYPE; - } - if (var0.equals("C")) { - return Character.TYPE; - } - return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); + static final int method4969(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 = class13.method162(var3, var5); + int var8 = class13.method162(var3 + 1, var5); + int var9 = class13.method162(var3, var5 + 1); + int var10 = class13.method162(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) + (var14 * var10 >> 16); + int var16 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var6 * 1024 / var2] >> 1; + int var15 = ((65536 - var16) * var11 >> 16) + (var13 * var16 >> 16); + return var15; } } diff --git a/runescape-client/src/main/java/UserComparator1.java b/runescape-client/src/main/java/UserComparator1.java index 31a5624962..9a3389a161 100644 --- a/runescape-client/src/main/java/UserComparator1.java +++ b/runescape-client/src/main/java/UserComparator1.java @@ -1,20 +1,19 @@ 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("lq") +@ObfuscatedName("lf") @Implements("UserComparator1") public class UserComparator1 implements Comparator { - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -485356277 - ) - @Export("WorldMapElement_count") - public static int WorldMapElement_count; - @ObfuscatedName("q") + @ObfuscatedName("i") + @Export("Interpreter_intLocals") + static int[] Interpreter_intLocals; + @ObfuscatedName("k") + @Export("Interpreter_stringLocals") + static String[] Interpreter_stringLocals; + @ObfuscatedName("s") @Export("reversed") final boolean reversed; @@ -22,82 +21,21 @@ public class UserComparator1 implements Comparator { this.reversed = var1; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ljd;Ljd;I)I", - garbageValue = "1081318416" + signature = "(Lju;Lju;I)I", + garbageValue = "-414427589" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { return this.reversed ? var1.compareTo_user(var2) : var2.compareTo_user(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); } - @ObfuscatedName("fj") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "199301274" - ) - @Export("doCheat") - static final void doCheat(String var0) { - if (var0.equalsIgnoreCase("toggleroof")) { - WorldMapLabelSize.clientPreferences.roofsHidden = !WorldMapLabelSize.clientPreferences.roofsHidden; - ReflectionCheck.savePreferences(); - if (WorldMapLabelSize.clientPreferences.roofsHidden) { - ScriptEvent.addGameMessage(99, "", "Roofs are now all hidden"); - } else { - ScriptEvent.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")) { - BoundaryObject.worldMap.showCoord = !BoundaryObject.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")) { - ScriptFrame.method1090(); - } - } - - PacketBufferNode var1 = Archive.getPacketBufferNode(ClientPacket.field2263, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(var0.length() + 1); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); + public int compare(Object var1, Object var2) { + return this.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 324029cdbf..5bebd44680 100644 --- a/runescape-client/src/main/java/UserComparator10.java +++ b/runescape-client/src/main/java/UserComparator10.java @@ -1,25 +1,13 @@ -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.net.URL; -import java.net.URLConnection; -import java.util.Iterator; -import java.util.Random; 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("ec") +@ObfuscatedName("ew") @Implements("UserComparator10") public class UserComparator10 extends AbstractUserComparator { - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lgl;" - ) - @Export("musicTrack") - public static MusicTrack musicTrack; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("reversed") final boolean reversed; @@ -27,259 +15,418 @@ public class UserComparator10 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ljz;Ljz;I)I", - garbageValue = "1029227971" + signature = "(Ljt;Ljt;B)I", + garbageValue = "-47" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { if (Client.worldId == var1.world && var2.world == Client.worldId) { return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; + } else { + return this.compareUser(var1, var2); } - return this.compareUser(var1, var2); } public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "8742" + signature = "(Lhz;Lhz;Lhz;Lhz;I)V", + garbageValue = "34424485" ) - static void method3406() { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - class268.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); - return; - } - long var1; - try { - URL var3 = new URL(Language.method3666("services", false) + "m=accountappeal/login.ws"); - URLConnection var4 = var3.openConnection(); - var4.setRequestProperty("connection", "close"); - var4.setDoInput(true); - var4.setDoOutput(true); - var4.setConnectTimeout(5000); - OutputStreamWriter var5 = new OutputStreamWriter(var4.getOutputStream()); - var5.write("data1=req"); - var5.flush(); - InputStream var6 = var4.getInputStream(); - Buffer var7 = new Buffer(new byte[1000]); + @Export("Widget_setArchives") + public static void Widget_setArchives(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) { + Widget.Widget_archive = var0; + Huffman.Widget_modelsArchive = var1; + WorldMapSprite.Widget_spritesArchive = var2; + Widget.Widget_fontsArchive = var3; + Widget.Widget_interfaceComponents = new Widget[Widget.Widget_archive.getGroupCount()][]; + WorldMapDecoration.Widget_loadedInterfaces = new boolean[Widget.Widget_archive.getGroupCount()]; + } - while (true) { - int var8 = var6.read(var7.array, var7.offset, 1000 - var7.offset); - if (var8 != -1) { - var7.offset += var8; - if (var7.offset >= 1000) { - var1 = 0L; - break; - } - } else { - var7.offset = 0; - long var22 = var7.readLong(); - var1 = var22; - break; - } - - } - } catch (Exception var34) { - var1 = 0L; - } - - byte var0; - if (0L == var1) { - var0 = 5; + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "(ILcr;ZS)I", + garbageValue = "180" + ) + static int method3345(int var0, Script var1, boolean var2) { + int var3 = -1; + Widget var4; + if (var0 >= 2000) { + var0 -= 1000; + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var4 = WorldMapElement.getWidget(var3); } else { - String var35 = Login.Login_username; - Random var36 = new Random(); - Buffer var26 = new Buffer(128); - Buffer var9 = new Buffer(128); - int[] var10 = new int[]{var36.nextInt(), var36.nextInt(), (int)(var1 >> 32), (int)var1}; - var26.writeByte(10); - - int var11; - for (var11 = 0; var11 < 4; ++var11) { - var26.writeInt(var36.nextInt()); - } - - var26.writeInt(var10[0]); - var26.writeInt(var10[1]); - var26.writeLong(var1); - var26.writeLong(0L); - - for (var11 = 0; var11 < 4; ++var11) { - var26.writeInt(var36.nextInt()); - } - - var26.encryptRsa(class80.field1140, class80.field1141); - var9.writeByte(10); - - for (var11 = 0; var11 < 3; ++var11) { - var9.writeInt(var36.nextInt()); - } - - var9.writeLong(var36.nextLong()); - var9.writeLongMedium(var36.nextLong()); - if (Client.randomDatData != null) { - var9.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); - } else { - byte[] var12 = new byte[24]; - - try { - JagexCache.JagexCache_randomDat.seek(0L); - JagexCache.JagexCache_randomDat.readFully(var12); - - int var13; - for (var13 = 0; var13 < 24 && var12[var13] == 0; ++var13) { - } - - if (var13 >= 24) { - throw new IOException(); - } - } catch (Exception var33) { - for (int var14 = 0; var14 < 24; ++var14) { - var12[var14] = -1; - } - } - - var9.writeBytes(var12, 0, var12.length); - } - - var9.writeLong(var36.nextLong()); - var9.encryptRsa(class80.field1140, class80.field1141); - var11 = Huffman.stringCp1252NullTerminatedByteSize(var35); - if (var11 % 8 != 0) { - var11 += 8 - var11 % 8; - } - - Buffer var37 = new Buffer(var11); - var37.writeStringCp1252NullTerminated(var35); - var37.offset = var11; - var37.xteaEncryptAll(var10); - Buffer var27 = new Buffer(var9.offset + var26.offset + var37.offset + 5); - var27.writeByte(2); - var27.writeByte(var26.offset); - var27.writeBytes(var26.array, 0, var26.offset); - var27.writeByte(var9.offset); - var27.writeBytes(var9.array, 0, var9.offset); - var27.writeShort(var37.offset); - var27.writeBytes(var37.array, 0, var37.offset); - byte[] var15 = var27.array; - String var29 = Widget.method4092(var15, 0, var15.length); - String var16 = var29; - - byte var30; - try { - URL var17 = new URL(Language.method3666("services", false) + "m=accountappeal/login.ws"); - URLConnection var18 = var17.openConnection(); - var18.setDoInput(true); - var18.setDoOutput(true); - var18.setConnectTimeout(5000); - OutputStreamWriter var19 = new OutputStreamWriter(var18.getOutputStream()); - var19.write("data2=" + GrandExchangeOfferWorldComparator.method63(var16) + "&dest=" + GrandExchangeOfferWorldComparator.method63("passwordchoice.ws")); - var19.flush(); - InputStream var20 = var18.getInputStream(); - var27 = new Buffer(new byte[1000]); - - while (true) { - int var21 = var20.read(var27.array, var27.offset, 1000 - var27.offset); - if (var21 == -1) { - var19.close(); - var20.close(); - String var31 = new String(var27.array); - if (var31.startsWith("OFFLINE")) { - var30 = 4; - } else if (var31.startsWith("WRONG")) { - var30 = 7; - } else if (var31.startsWith("RELOAD")) { - var30 = 3; - } else if (var31.startsWith("Not permitted for social network accounts.")) { - var30 = 6; - } else { - var27.xteaDecryptAll(var10); - - while (var27.offset > 0 && var27.array[var27.offset - 1] == 0) { - --var27.offset; - } - - var31 = new String(var27.array, 0, var27.offset); - if (HealthBarUpdate.isValidURL(var31)) { - GrandExchangeOfferWorldComparator.openURL(var31, true, false); - var30 = 2; - } else { - var30 = 5; - } - } - break; - } - - var27.offset += var21; - if (var27.offset >= 1000) { - var30 = 5; - break; - } - } - } catch (Throwable var32) { - var32.printStackTrace(); - var30 = 5; - } - - var0 = var30; + var4 = var2 ? class286.field3623 : class297.field3693; } - switch(var0) { - case 2: - class268.setLoginResponseString(Strings.field2942, Strings.field3027, Strings.field2768); - Login.loginIndex = 6; - break; - case 3: - class268.setLoginResponseString("", "Error connecting to server.", ""); - break; - case 4: - class268.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); - break; - case 5: - class268.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); - break; - case 6: - class268.setLoginResponseString("", "Error connecting to server.", ""); - break; - case 7: - class268.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."); - } + if (var0 == ScriptOpcodes.CC_SETPOSITION) { + Interpreter.Interpreter_intStackSize -= 4; + var4.rawX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4.rawY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var4.xAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + var4.yAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; + FriendSystem.invalidateWidget(var4); + WorldMapID.client.alignWidget(var4); + if (var3 != -1 && var4.type == 0) { + WorldMapAreaData.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); + } + return 1; + } else if (var0 == ScriptOpcodes.CC_SETSIZE) { + Interpreter.Interpreter_intStackSize -= 4; + var4.rawWidth = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4.rawHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var4.widthAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + var4.heightAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; + FriendSystem.invalidateWidget(var4); + WorldMapID.client.alignWidget(var4); + if (var3 != -1 && var4.type == 0) { + WorldMapAreaData.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETHIDE) { + boolean var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (var5 != var4.isHidden) { + var4.isHidden = var5; + FriendSystem.invalidateWidget(var4); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { + var4.noClickThrough = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { + var4.noScrollThrough = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else { + return 2; + } } - @ObfuscatedName("b") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1807078732" + signature = "(IIIIIZI)Lls;", + garbageValue = "92039087" ) - @Export("Messages_invalidateIgnoreds") - static void Messages_invalidateIgnoreds() { - Iterator var0 = Messages.Messages_hashTable.iterator(); - - while (var0.hasNext()) { - Message var1 = (Message)var0.next(); - var1.clearIsFromIgnored(); + @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)var3 << 42) + ((long)var4 << 40) + ((long)var2 << 38) + (long)var0 + ((long)var1 << 16); + Sprite var8; + if (!var5) { + var8 = (Sprite)ItemDefinition.ItemDefinition_cachedSprites.get(var6); + if (var8 != null) { + return var8; + } + } - @ObfuscatedName("kj") - @ObfuscatedSignature( - signature = "(Lhj;IS)Ljava/lang/String;", - garbageValue = "255" - ) - static String method3407(Widget var0, int var1) { - int var3 = class268.getWidgetClickMask(var0); - boolean var2 = (var3 >> var1 + 1 & 1) != 0; - if (!var2 && var0.onOp == null) { + ItemDefinition var9 = WorldMapData_0.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 = WorldMapData_0.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.method2929(16, 16); + Rasterizer3D.field1744 = 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)(1.04D * (double)var16); + } + + int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; + int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; + var19.calculateBoundsCylinder(); + var19.method2874(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) { + ArchiveLoader.ItemDefinition_fontPlain11.draw(class96.method2201(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.field1744 = true; + return var8; + } + } + + @ObfuscatedName("eu") + @ObfuscatedSignature( + signature = "(IZZZI)Lid;", + garbageValue = "-1576468201" + ) + @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, WorldMapSection1.JagexCache_idxFiles[var0], 1000000); + } + + return new Archive(var4, class293.masterDisk, var0, var1, var2, var3); + } + + @ObfuscatedName("gz") + @ObfuscatedSignature( + signature = "(IIIIII)V", + garbageValue = "-1531773798" + ) + @Export("drawObject") + static final void drawObject(int var0, int var1, int var2, int var3, int var4) { + long var5 = Player.scene.getBoundaryObjectTag(var0, var1, var2); + int var7; + int var8; + int var9; + int var10; + int var12; + int var13; + if (0L != var5) { + var7 = Player.scene.getObjectFlags(var0, var1, var2, var5); + var8 = var7 >> 6 & 3; + var9 = var7 & 31; + var10 = var3; + if (SpotAnimationDefinition.method4333(var5)) { + var10 = var4; + } + + int[] var11 = ParamDefinition.sceneMinimapSprite.pixels; + var12 = var1 * 4 + (103 - var2) * 2048 + 24624; + var13 = BoundaryObject.Entity_unpackID(var5); + ObjectDefinition var14 = class215.getObjectDefinition(var13); + if (var14.mapSceneId != -1) { + IndexedSprite var15 = GrandExchangeOfferOwnWorldComparator.mapSceneSprites[var14.mapSceneId]; + if (var15 != null) { + int var16 = (var14.sizeX * 4 - var15.subWidth) / 2; + int var17 = (var14.sizeY * 4 - var15.subHeight) / 2; + var15.drawAt(var1 * 4 + var16 + 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 (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 = Player.scene.getGameObjectTag(var0, var1, var2); + if (0L != var5) { + var7 = Player.scene.getObjectFlags(var0, var1, var2, var5); + var8 = var7 >> 6 & 3; + var9 = var7 & 31; + var10 = BoundaryObject.Entity_unpackID(var5); + ObjectDefinition var24 = class215.getObjectDefinition(var10); + int var19; + if (var24.mapSceneId != -1) { + IndexedSprite var18 = GrandExchangeOfferOwnWorldComparator.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, var19 + (104 - var2 - var24.sizeY) * 4 + 48); + } + } else if (var9 == 9) { + var12 = 15658734; + if (SpotAnimationDefinition.method4333(var5)) { + var12 = 15597568; + } + + int[] var23 = ParamDefinition.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 = Player.scene.getFloorDecorationTag(var0, var1, var2); + if (0L != var5) { + var7 = BoundaryObject.Entity_unpackID(var5); + ObjectDefinition var20 = class215.getObjectDefinition(var7); + if (var20.mapSceneId != -1) { + IndexedSprite var21 = GrandExchangeOfferOwnWorldComparator.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); + } + } + } + + } + + @ObfuscatedName("jc") + @ObfuscatedSignature( + signature = "(Lhp;I)Z", + garbageValue = "-1592710646" + ) + @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 = AbstractByteArrayCopier.method3868(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 (var2 == var3) { + return false; + } + } else if (var2 != var3) { + return false; + } + } + + return true; } - return var0.actions != null && var0.actions.length > var1 && var0.actions[var1] != null && var0.actions[var1].trim().length() != 0 ? var0.actions[var1] : null; } } diff --git a/runescape-client/src/main/java/UserComparator2.java b/runescape-client/src/main/java/UserComparator2.java index 0bb8517367..06de303441 100644 --- a/runescape-client/src/main/java/UserComparator2.java +++ b/runescape-client/src/main/java/UserComparator2.java @@ -4,10 +4,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("le") +@ObfuscatedName("li") @Implements("UserComparator2") public class UserComparator2 implements Comparator { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("reversed") final boolean reversed; @@ -15,21 +15,21 @@ public class UserComparator2 implements Comparator { this.reversed = var1; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ljd;Ljd;B)I", - garbageValue = "-66" + signature = "(Lju;Lju;I)I", + garbageValue = "1525984860" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); } - public int compare(Object var1, Object var2) { - return this.compare_bridged((User)var1, (User)var2); - } - public boolean equals(Object var1) { return super.equals(var1); } + + public int compare(Object var1, Object var2) { + return this.compare_bridged((User)var1, (User)var2); + } } diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java index d1cc4e6131..ce76f1b8e3 100644 --- a/runescape-client/src/main/java/UserComparator3.java +++ b/runescape-client/src/main/java/UserComparator3.java @@ -1,19 +1,18 @@ -import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fk") +@ObfuscatedName("fd") @Implements("UserComparator3") public class UserComparator3 extends AbstractUserComparator { - @ObfuscatedName("gm") + @ObfuscatedName("gp") @ObfuscatedSignature( - signature = "[Lly;" + signature = "Lls;" ) - @Export("headIconPkSprites") - static Sprite[] headIconPkSprites; - @ObfuscatedName("q") + @Export("redHintArrowSprite") + static Sprite redHintArrowSprite; + @ObfuscatedName("s") @Export("reversed") final boolean reversed; @@ -21,60 +20,63 @@ public class UserComparator3 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ljz;Ljz;I)I", - garbageValue = "2060416979" + signature = "(Ljt;Ljt;I)I", + garbageValue = "-1087585771" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { if (var2.world != var1.world) { return this.reversed ? var1.world - var2.world : var2.world - var1.world; + } else { + return this.compareUser(var1, var2); } - return this.compareUser(var1, var2); } public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("q") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "1010038987" + signature = "(I)I", + garbageValue = "1811114805" ) - @Export("loadWorlds") - static boolean loadWorlds() { - try { - if (World.World_request == null) { - World.World_request = SequenceDefinition.urlRequester.request(new URL(WorldMapArea.field213)); - } else if (World.World_request.isDone()) { - byte[] var0 = World.World_request.getResponse(); - Buffer var1 = new Buffer(var0); - var1.readInt(); - World.World_count = var1.readUnsignedShort(); - World.World_worlds = new World[World.World_count]; + public static int method3371() { + return ++MouseHandler.MouseHandler_idleCycles - 1; + } - World var3; - for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { - var3 = World.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(); + @ObfuscatedName("fj") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "35" + ) + @Export("processOverheadText") + static final void processOverheadText() { + 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; } - - Client.sortWorlds(World.World_worlds, 0, World.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); - World.World_request = null; - return true; } - } catch (Exception var4) { - var4.printStackTrace(); - World.World_request = null; } - return false; } } diff --git a/runescape-client/src/main/java/UserComparator4.java b/runescape-client/src/main/java/UserComparator4.java index 8421e74b66..9ec23a56e4 100644 --- a/runescape-client/src/main/java/UserComparator4.java +++ b/runescape-client/src/main/java/UserComparator4.java @@ -3,23 +3,15 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; -@ObfuscatedName("ea") +@ObfuscatedName("eb") @Implements("UserComparator4") public class UserComparator4 implements Comparator { - @ObfuscatedName("db") - @ObfuscatedSignature( - signature = "Liu;" - ) - @Export("archive12") - static Archive archive12; - @ObfuscatedName("ga") - @ObfuscatedSignature( - signature = "Lly;" - ) - @Export("redHintArrowSprite") - static Sprite redHintArrowSprite; - @ObfuscatedName("q") + @ObfuscatedName("t") + @Export("ByteArrayPool_alternativeSizes") + public static int[] ByteArrayPool_alternativeSizes; + @ObfuscatedName("s") @Export("reversed") final boolean reversed; @@ -27,30 +19,49 @@ public class UserComparator4 implements Comparator { this.reversed = var1; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ljz;Ljz;I)I", - garbageValue = "2005097552" + signature = "(Ljt;Ljt;B)I", + garbageValue = "-7" ) @Export("compare_bridged") int compare_bridged(Buddy var1, Buddy var2) { return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; } - 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("l") + public int compare(Object var1, Object var2) { + return this.compare_bridged((Buddy)var1, (Buddy)var2); + } + + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "1492423821" + signature = "(Ljava/lang/String;I)Ljava/lang/Class;", + garbageValue = "500061320" ) - public static boolean method3382(int var0) { - return (var0 >> 29 & 1) != 0; + @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); + } } } diff --git a/runescape-client/src/main/java/UserComparator5.java b/runescape-client/src/main/java/UserComparator5.java index 032b32d4ac..50b85e49e6 100644 --- a/runescape-client/src/main/java/UserComparator5.java +++ b/runescape-client/src/main/java/UserComparator5.java @@ -3,12 +3,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fi") +@ObfuscatedName("fz") @Implements("UserComparator5") public class UserComparator5 extends AbstractUserComparator { - @ObfuscatedName("ax") - static String field1986; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("reversed") final boolean reversed; @@ -16,10 +14,10 @@ public class UserComparator5 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ljz;Ljz;I)I", - garbageValue = "-604876330" + signature = "(Ljt;Ljt;I)I", + garbageValue = "1721818690" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -38,23 +36,25 @@ public class UserComparator5 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)[Lhn;", - garbageValue = "-1282154756" + signature = "(IIIIIII)I", + garbageValue = "-130960812" ) - @Export("PlayerType_values") - public static PlayerType[] PlayerType_values() { - return new PlayerType[]{PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_ironman, PlayerType.PlayerType_ultimateIronman, PlayerType.PlayerType_normal, PlayerType.PlayerType_hardcoreIronman}; - } + public static int method3366(int var0, int var1, int var2, int var3, int var4, int var5) { + if ((var5 & 1) == 1) { + int var6 = var3; + var3 = var4; + var4 = var6; + } - @ObfuscatedName("iy") - @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "1669969690" - ) - @Export("setTapToDrop") - static void setTapToDrop(boolean var0) { - Client.tapToDrop = var0; + 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); + } } } diff --git a/runescape-client/src/main/java/UserComparator6.java b/runescape-client/src/main/java/UserComparator6.java index 5ee53e5381..eea44f9f86 100644 --- a/runescape-client/src/main/java/UserComparator6.java +++ b/runescape-client/src/main/java/UserComparator6.java @@ -1,22 +1,18 @@ -import java.io.File; -import java.io.IOException; -import java.io.RandomAccessFile; 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("fz") +@ObfuscatedName("ff") @Implements("UserComparator6") public class UserComparator6 extends AbstractUserComparator { - @ObfuscatedName("er") + @ObfuscatedName("ga") @ObfuscatedSignature( - signature = "Llp;" + signature = "[Lls;" ) - @Export("spriteIds") - static GraphicsDefaults spriteIds; - @ObfuscatedName("q") + @Export("headIconPkSprites") + static Sprite[] headIconPkSprites; + @ObfuscatedName("s") @Export("reversed") final boolean reversed; @@ -24,179 +20,33 @@ public class UserComparator6 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ljz;Ljz;I)I", - garbageValue = "660153035" + signature = "(Ljt;Ljt;B)I", + garbageValue = "11" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { if (var1.world != 0 && var2.world != 0) { return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); + } else { + return this.compareUser(var1, var2); } - return this.compareUser(var1, var2); } public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("q") + @ObfuscatedName("ji") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;III)V", - garbageValue = "491873255" + signature = "(III)V", + garbageValue = "-1763118149" ) - @Export("JagexCache_init") - public static void JagexCache_init(String game, String serverBuild, int zero, int idxCount) throws IOException { - class40.idxCount = idxCount; - TextureProvider.cacheGamebuild = zero; - - try { - ScriptEvent.operatingSystem = System.getProperty("os.name"); - } catch (Exception var14) { - ScriptEvent.operatingSystem = "Unknown"; + @Export("runIntfCloseListeners") + static final void runIntfCloseListeners(int var0, int var1) { + if (Projectile.loadInterface(var0)) { + class189.runComponentCloseListeners(Widget.Widget_interfaceComponents[var0], var1); } - - GrandExchangeOfferOwnWorldComparator.operatingSystemLC = ScriptEvent.operatingSystem.toLowerCase(); - - try { - PlayerType.userHomeDirectory = System.getProperty("user.home"); - if (PlayerType.userHomeDirectory != null) { - PlayerType.userHomeDirectory = PlayerType.userHomeDirectory + "/"; - } - } catch (Exception var13) { - } - - try { - if (GrandExchangeOfferOwnWorldComparator.operatingSystemLC.startsWith("win")) { - if (PlayerType.userHomeDirectory == null) { - PlayerType.userHomeDirectory = System.getenv("USERPROFILE"); - } - } else if (PlayerType.userHomeDirectory == null) { - PlayerType.userHomeDirectory = System.getenv("HOME"); - } - - if (PlayerType.userHomeDirectory != null) { - PlayerType.userHomeDirectory = PlayerType.userHomeDirectory + "/"; - } - } catch (Exception var12) { - } - - if (PlayerType.userHomeDirectory == null) { - PlayerType.userHomeDirectory = "~/"; - } - - JagexCache.JagexCache_validCacheLocations = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", PlayerType.userHomeDirectory, "/tmp/", ""}; - LoginPacket.validCacheNames = new String[]{".jagex_cache_" + TextureProvider.cacheGamebuild, ".file_store_" + TextureProvider.cacheGamebuild}; - - int var7; - File var8; - label135: - for (int var9 = 0; var9 < 4; var9++) { - class1.cacheDir = TextureProvider.getCacheDir(game, serverBuild, var9); - if (!class1.cacheDir.exists()) { - class1.cacheDir.mkdirs(); - } - - File[] var5 = class1.cacheDir.listFiles(); - if (var5 == null) { - break; - } - - File[] var6 = var5; - - for (var7 = 0; var7 < var6.length; var7++) { - var8 = var6[var7]; - if (!class186.testReadWritePermissions(var8, false)) { - continue label135; - } - } - break; - } - - - File var4 = class1.cacheDir; - FileSystem.FileSystem_cacheDir = var4; - if (!FileSystem.FileSystem_cacheDir.exists()) { - throw new RuntimeException(""); - } - FileSystem.FileSystem_hasPermissions = true; - - try { - File var16 = new File(PlayerType.userHomeDirectory, "random.dat"); - if (var16.exists()) { - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var16, "rw", 25L), 24, 0); - } else { - label115: - for (int var10 = 0; var10 < LoginPacket.validCacheNames.length; ++var10) { - for (var7 = 0; var7 < JagexCache.JagexCache_validCacheLocations.length; ++var7) { - var8 = new File(JagexCache.JagexCache_validCacheLocations[var7] + LoginPacket.validCacheNames[var10] + File.separatorChar + "random.dat"); - if (var8.exists()) { - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var8, "rw", 25L), 24, 0); - break label115; - } - } - } - } - - 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(class65.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); - JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(class65.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); - JagexCache.JagexCache_idxFiles = new BufferedFile[class40.idxCount]; - - for (int var11 = 0; var11 < class40.idxCount; ++var11) { - JagexCache.JagexCache_idxFiles[var11] = new BufferedFile(new AccessFile(class65.getFile("main_file_cache.idx" + var11), "rw", 1048576L), 6000, 0); - } - - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - signature = "(ILcx;ZI)I", - garbageValue = "1163617683" - ) - static int method3436(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.GETWINDOWMODE) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = AbstractWorldMapIcon.getWindowedMode(); - return 1; - } - int var3; - if (var0 == ScriptOpcodes.SETWINDOWMODE) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - if (var3 == 1 || var3 == 2) { - Clock.setWindowedMode(var3); - } - - return 1; - } - if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapLabelSize.clientPreferences.windowMode; - return 1; - } - if (var0 == ScriptOpcodes.SETDEFAULTWINDOWMODE) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - if (var3 == 1 || var3 == 2) { - WorldMapLabelSize.clientPreferences.windowMode = var3; - ReflectionCheck.savePreferences(); - } - - return 1; - } - if (var0 == 5310) { - --HealthBarUpdate.Interpreter_intStackSize; - return 1; - } - return 2; } } diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java index fbb2ef21b4..88e96a99ff 100644 --- a/runescape-client/src/main/java/UserComparator7.java +++ b/runescape-client/src/main/java/UserComparator7.java @@ -1,12 +1,25 @@ 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("eb") +@ObfuscatedName("ev") @Implements("UserComparator7") public class UserComparator7 extends AbstractUserComparator { - @ObfuscatedName("q") + @ObfuscatedName("fo") + @ObfuscatedSignature( + signature = "Lkr;" + ) + @Export("WorldMapElement_fonts") + static Fonts WorldMapElement_fonts; + @ObfuscatedName("hk") + @ObfuscatedGetter( + intValue = -246677649 + ) + @Export("cameraZ") + static int cameraZ; + @ObfuscatedName("s") @Export("reversed") final boolean reversed; @@ -14,20 +27,61 @@ public class UserComparator7 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ljz;Ljz;S)I", - garbageValue = "10090" + signature = "(Ljt;Ljt;I)I", + garbageValue = "-601545219" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { if (var1.world != 0 && var2.world != 0) { return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; + } else { + return this.compareUser(var1, var2); } - return this.compareUser(var1, var2); } public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "2" + ) + @Export("SpriteBuffer_clear") + public static void SpriteBuffer_clear() { + class325.SpriteBuffer_xOffsets = null; + class325.SpriteBuffer_yOffsets = null; + class325.SpriteBuffer_spriteWidths = null; + class225.SpriteBuffer_spriteHeights = null; + class325.SpriteBuffer_spritePalette = null; + WorldMapSection1.SpriteBuffer_pixels = null; + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "0" + ) + @Export("openWorldSelect") + static void openWorldSelect() { + if (class173.loadWorlds()) { + Login.worldSelectOpen = true; + Login.worldSelectPage = 0; + Login.worldSelectPagesCount = 0; + } + + } + + @ObfuscatedName("fr") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "1359476152" + ) + @Export("getWindowedMode") + static int getWindowedMode() { + return Client.isResizable ? 2 : 1; + } } diff --git a/runescape-client/src/main/java/UserComparator8.java b/runescape-client/src/main/java/UserComparator8.java index 9b5cdf3569..679d5b213f 100644 --- a/runescape-client/src/main/java/UserComparator8.java +++ b/runescape-client/src/main/java/UserComparator8.java @@ -1,12 +1,24 @@ 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("ey") +@ObfuscatedName("el") @Implements("UserComparator8") public class UserComparator8 extends AbstractUserComparator { - @ObfuscatedName("q") + @ObfuscatedName("al") + @ObfuscatedGetter( + intValue = 1658128897 + ) + static int field1957; + @ObfuscatedName("dz") + @ObfuscatedSignature( + signature = "Lid;" + ) + @Export("archive3") + static Archive archive3; + @ObfuscatedName("s") @Export("reversed") final boolean reversed; @@ -14,10 +26,10 @@ public class UserComparator8 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ljz;Ljz;I)I", - garbageValue = "16711935" + signature = "(Ljt;Ljt;S)I", + garbageValue = "-29933" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -36,115 +48,12 @@ public class UserComparator8 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("gf") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IIZI)V", - garbageValue = "240895507" + signature = "(CS)C", + garbageValue = "8860" ) - static final void method3399(int var0, int var1, boolean var2) { - if (!var2 || var0 != Canvas.field418 || ViewportMouse.field1747 != var1) { - Canvas.field418 = var0; - ViewportMouse.field1747 = var1; - class96.updateGameState(25); - TriBool.drawLoadingMessage("Loading - please wait.", true); - int var3 = MusicPatchNode2.baseX * 64; - int var4 = class1.baseY * 64; - MusicPatchNode2.baseX = (var0 - 6) * 8; - class1.baseY = (var1 - 6) * 8; - int var5 = MusicPatchNode2.baseX * 64 - var3; - int var6 = class1.baseY * 64 - var4; - var3 = MusicPatchNode2.baseX * 64; - var4 = class1.baseY * 64; - - int var7; - int var9; - for (var7 = 0; var7 < 32768; ++var7) { - NPC var8 = Client.npcs[var7]; - if (var8 != null) { - for (var9 = 0; var9 < 10; ++var9) { - var8.pathX[var9] -= var5; - var8.pathY[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) { - var21.pathX[var9] -= var5; - var21.pathY[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; var13 != var18; 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; - PacketBuffer.cameraX -= var5 << 7; - class1.cameraZ -= var6 << 7; - MouseHandler.oculusOrbFocalPointX -= var5 << 7; - WorldMapArea.oculusOrbFocalPointY -= var6 << 7; - Client.field747 = -1; - Client.graphicsObjects.clear(); - Client.projectiles.clear(); - - for (var14 = 0; var14 < 4; ++var14) { - Client.collisionMaps[var14].clear(); - } - - } + static char method3342(char var0) { + return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; } } diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java index 4962418f86..eaded6cf31 100644 --- a/runescape-client/src/main/java/UserComparator9.java +++ b/runescape-client/src/main/java/UserComparator9.java @@ -2,12 +2,11 @@ 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("eh") +@ObfuscatedName("eu") @Implements("UserComparator9") public class UserComparator9 extends AbstractUserComparator { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("reversed") final boolean reversed; @@ -15,185 +14,43 @@ public class UserComparator9 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ljz;Ljz;I)I", - garbageValue = "1918476759" + signature = "(Ljt;Ljt;B)I", + garbageValue = "-36" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { if (Client.worldId == var1.world && var2.world == Client.worldId) { return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); + } else { + return this.compareUser(var1, var2); } - return this.compareUser(var1, var2); } public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("q") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(I)[Lkl;", - garbageValue = "-445895559" + signature = "(Lkx;I)I", + garbageValue = "555200658" ) - @Export("ChatMode_values") - static PrivateChatMode[] ChatMode_values() { - return new PrivateChatMode[]{PrivateChatMode.field3817, PrivateChatMode.field3816, PrivateChatMode.field3818}; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(Ljava/lang/Throwable;Ljava/lang/String;)Lml;" - ) - @Export("newRunException") - public static RunException newRunException(Throwable var0, String var1) { - RunException var2; - if (var0 instanceof RunException) { - var2 = (RunException)var0; - var2.message = var2.message + ' ' + var1; + @Export("decode") + static int decode(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 { - var2 = new RunException(var0, var1); + var2 = var0.readBits(11); } return var2; } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(ILcx;ZS)I", - garbageValue = "-7813" - ) - static int method3389(int var0, Script var1, boolean var2) { - boolean var3 = true; - Widget var4; - if (var0 >= 2000) { - var0 -= 1000; - var4 = class80.getWidget(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - var3 = false; - } else { - var4 = var2 ? Interpreter.field1111 : Calendar.field2507; - } - - if (var0 == ScriptOpcodes.CC_SETOP) { - int var11 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] - 1; - if (var11 >= 0 && var11 <= 9) { - var4.setAction(var11, Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]); - return 1; - } - --Skills.Interpreter_stringStackSize; - return 1; - } - if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - int var11 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - int var6 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - var4.parent = Client.getWidgetChild(var11, var6); - return 1; - } - if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { - var4.isScrollBar = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - return 1; - } - if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { - var4.dragZoneSize = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - return 1; - } - if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { - var4.dragThreshold = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - return 1; - } - if (var0 == ScriptOpcodes.CC_SETOPBASE) { - var4.dataText = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - return 1; - } - if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { - var4.spellActionName = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - return 1; - } - if (var0 == ScriptOpcodes.CC_CLEAROPS) { - var4.actions = null; - return 1; - } - if (var0 == 1308) { - var4.field2691 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - return 1; - } - if (var0 == ScriptOpcodes.CC_SETOPKEY) { - byte[] var8 = null; - byte[] var9 = null; - if (!var3) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var8 = new byte[]{(byte) Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]}; - var9 = new byte[]{(byte) Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]}; - } else { - HealthBarUpdate.Interpreter_intStackSize -= 10; - int var7 = 0; - while (var7 < 10 && Interpreter.Interpreter_intStack[var7 + HealthBarUpdate.Interpreter_intStackSize] >= 0) { - var7 += 2; - } - - if (var7 > 0) { - var8 = new byte[var7 / 2]; - var9 = new byte[var7 / 2]; - - while ((var7 -= 2) >= 0) { - var8[var7 / 2] = (byte) Interpreter.Interpreter_intStack[var7 + HealthBarUpdate.Interpreter_intStackSize]; - var9[var7 / 2] = (byte) Interpreter.Interpreter_intStack[var7 + HealthBarUpdate.Interpreter_intStackSize + 1]; - } - } - } - - int var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] - 1; - if (var7 < 0 || var7 > 9) { - throw new RuntimeException(); - } - - FloorOverlayDefinition.Widget_setKey(var4, var7, var8, var9); - return 1; - } - if (var0 == ScriptOpcodes.CC_SETOPTKEY) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - byte var5 = 10; - byte[] var9 = new byte[]{(byte) Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]}; - byte[] var10 = new byte[]{(byte) Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]}; - FloorOverlayDefinition.Widget_setKey(var4, var5, var9, var10); - return 1; - } - if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { - HealthBarUpdate.Interpreter_intStackSize -= 3; - int var11 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] - 1; - int var6 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - int var7 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2]; - if (var11 < 0 || var11 > 9) { - throw new RuntimeException(); - } - class14.Widget_setKeyRate(var4, var11, var6, var7); - return 1; - } - if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { - byte var5 = 10; - int var6 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - int var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - class14.Widget_setKeyRate(var4, var5, var6, var7); - return 1; - } - if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { - --HealthBarUpdate.Interpreter_intStackSize; - int var11 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] - 1; - if (var11 < 0 || var11 > 9) { - throw new RuntimeException(); - } - - WorldMapCacheName.Widget_setKeyIgnoreHeld(var4, var11); - return 1; - } - if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { - byte var5 = 10; - WorldMapCacheName.Widget_setKeyIgnoreHeld(var4, var5); - return 1; - } - - return 2; - } } diff --git a/runescape-client/src/main/java/UserList.java b/runescape-client/src/main/java/UserList.java index 1be4d52243..4094a0a060 100644 --- a/runescape-client/src/main/java/UserList.java +++ b/runescape-client/src/main/java/UserList.java @@ -7,34 +7,34 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jb") +@ObfuscatedName("jw") @Implements("UserList") public abstract class UserList { - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1922167721 + intValue = -800073163 ) @Export("capacity") final int capacity; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1078735745 + intValue = 894292329 ) @Export("size") int size; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "[Ljd;" + signature = "[Lju;" ) @Export("array") User[] array; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("usernamesMap") HashMap usernamesMap; - @ObfuscatedName("i") + @ObfuscatedName("q") @Export("previousUsernamesMap") HashMap previousUsernamesMap; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("comparator") Comparator comparator; @@ -47,18 +47,18 @@ public abstract class UserList { this.previousUsernamesMap = new HashMap(var1 / 8); } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(I)Ljd;", - garbageValue = "2016619159" + signature = "(I)Lju;", + garbageValue = "-192021045" ) @Export("newInstance") abstract User newInstance(); - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(II)[Ljd;", - garbageValue = "2126056206" + signature = "(II)[Lju;", + garbageValue = "518998026" ) @Export("newTypedArray") abstract User[] newTypedArray(int var1); @@ -66,7 +66,7 @@ public abstract class UserList { @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1361883918" + garbageValue = "-1494312128" ) @Export("clear") public void clear() { @@ -76,43 +76,44 @@ public abstract class UserList { this.previousUsernamesMap.clear(); } - @ObfuscatedName("r") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1502557341" + garbageValue = "-1766865148" ) @Export("getSize") public int getSize() { return this.size; } - @ObfuscatedName("v") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-1711155206" + signature = "(B)Z", + garbageValue = "-128" ) @Export("isFull") public boolean isFull() { - return this.capacity == this.size; + return this.size == this.capacity; } - @ObfuscatedName("y") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljv;I)Z", - garbageValue = "-416985799" + signature = "(Ljx;S)Z", + garbageValue = "22737" ) @Export("contains") public boolean contains(Username var1) { if (!var1.hasCleanName()) { return false; + } else { + return this.usernamesMap.containsKey(var1) ? true : this.previousUsernamesMap.containsKey(var1); } - return this.usernamesMap.containsKey(var1) ? true : this.previousUsernamesMap.containsKey(var1); } - @ObfuscatedName("g") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(Ljv;B)Ljd;", - garbageValue = "-108" + signature = "(Ljx;I)Lju;", + garbageValue = "1058289920" ) @Export("getByUsername") public User getByUsername(Username var1) { @@ -120,45 +121,46 @@ public abstract class UserList { return var2 != null ? var2 : this.getByPreviousUsername(var1); } - @ObfuscatedName("a") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Ljv;I)Ljd;", - garbageValue = "2083171527" + signature = "(Ljx;I)Lju;", + garbageValue = "558762699" ) @Export("getByCurrentUsername") User getByCurrentUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); } - @ObfuscatedName("j") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Ljv;B)Ljd;", - garbageValue = "9" + signature = "(Ljx;I)Lju;", + garbageValue = "1368217697" ) @Export("getByPreviousUsername") User getByPreviousUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); } - @ObfuscatedName("o") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Ljv;B)Z", - garbageValue = "38" + signature = "(Ljx;B)Z", + garbageValue = "-8" ) @Export("removeByUsername") public final boolean removeByUsername(Username var1) { User var2 = this.getByCurrentUsername(var1); if (var2 == null) { return false; + } else { + this.remove(var2); + return true; } - this.remove(var2); - return true; } - @ObfuscatedName("d") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Ljd;I)V", - garbageValue = "951866693" + signature = "(Lju;I)V", + garbageValue = "1902139593" ) @Export("remove") final void remove(User var1) { @@ -169,50 +171,52 @@ public abstract class UserList { } } - @ObfuscatedName("s") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(Ljv;B)Ljd;", - garbageValue = "-19" + signature = "(Ljx;B)Lju;", + garbageValue = "118" ) @Export("addLastNoPreviousUsername") User addLastNoPreviousUsername(Username var1) { return this.addLast(var1, (Username)null); } - @ObfuscatedName("z") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Ljv;Ljv;B)Ljd;", - garbageValue = "-19" + signature = "(Ljx;Ljx;I)Lju;", + garbageValue = "-1015341374" ) @Export("addLast") User addLast(Username var1, Username var2) { if (this.getByCurrentUsername(var1) != null) { throw new IllegalStateException(); + } else { + User var3 = this.newInstance(); + var3.set(var1, var2); + this.arrayAddLast(var3); + this.mapPut(var3); + return var3; } - User var3 = this.newInstance(); - var3.set(var1, var2); - this.arrayAddLast(var3); - this.mapPut(var3); - return var3; } - @ObfuscatedName("al") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(II)Ljd;", - garbageValue = "-1818852723" + signature = "(II)Lju;", + garbageValue = "2118428404" ) @Export("get") public final User get(int var1) { if (var1 >= 0 && var1 < this.size) { return this.array[var1]; + } else { + throw new ArrayIndexOutOfBoundsException(var1); } - throw new ArrayIndexOutOfBoundsException(var1); } - @ObfuscatedName("av") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "128" + signature = "(I)V", + garbageValue = "-1838331070" ) @Export("sort") public final void sort() { @@ -224,10 +228,10 @@ public abstract class UserList { } - @ObfuscatedName("as") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(Ljd;Ljv;Ljv;I)V", - garbageValue = "-1615811470" + signature = "(Lju;Ljx;Ljx;I)V", + garbageValue = "2089175603" ) @Export("changeName") final void changeName(User var1, Username var2, Username var3) { @@ -236,10 +240,10 @@ public abstract class UserList { this.mapPut(var1); } - @ObfuscatedName("aw") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljd;I)I", - garbageValue = "403420808" + signature = "(Lju;I)I", + garbageValue = "-2041490811" ) @Export("indexOf") final int indexOf(User var1) { @@ -252,36 +256,37 @@ public abstract class UserList { return -1; } - @ObfuscatedName("ad") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ljd;I)V", - garbageValue = "-1244348671" + signature = "(Lju;B)V", + garbageValue = "97" ) @Export("mapRemove") final void mapRemove(User var1) { if (this.usernamesMap.remove(var1.username) == null) { throw new IllegalStateException(); - } - if (var1.previousUsername != null) { - this.previousUsernamesMap.remove(var1.previousUsername); - } + } else { + if (var1.previousUsername != null) { + this.previousUsernamesMap.remove(var1.previousUsername); + } + } } - @ObfuscatedName("ag") + @ObfuscatedName("av") @ObfuscatedSignature( - signature = "(Ljd;B)V", - garbageValue = "3" + signature = "(Lju;I)V", + garbageValue = "1221836772" ) @Export("arrayAddLast") final void arrayAddLast(User var1) { this.array[++this.size - 1] = var1; } - @ObfuscatedName("ar") + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(Ljd;B)V", - garbageValue = "1" + signature = "(Lju;I)V", + garbageValue = "-1095094859" ) @Export("mapPut") final void mapPut(User var1) { @@ -295,10 +300,10 @@ public abstract class UserList { } - @ObfuscatedName("ax") + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "57" + signature = "(II)V", + garbageValue = "1995849592" ) @Export("arrayRemove") final void arrayRemove(int var1) { @@ -309,20 +314,20 @@ public abstract class UserList { } - @ObfuscatedName("az") + @ObfuscatedName("af") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-960225827" + signature = "(B)V", + garbageValue = "0" ) @Export("removeComparator") public final void removeComparator() { this.comparator = null; } - @ObfuscatedName("ae") + @ObfuscatedName("az") @ObfuscatedSignature( signature = "(Ljava/util/Comparator;I)V", - garbageValue = "-1720687591" + garbageValue = "-1472739906" ) @Export("addComparator") public final void addComparator(Comparator var1) { @@ -333,4 +338,30 @@ public abstract class UserList { } } + + @ObfuscatedName("s") + @Export("sleepMillis") + public static final void sleepMillis(long var0) { + if (var0 > 0L) { + if (0L == var0 % 10L) { + long var2 = var0 - 1L; + + try { + Thread.sleep(var2); + } catch (InterruptedException var8) { + } + + try { + Thread.sleep(1L); + } catch (InterruptedException var7) { + } + } else { + try { + Thread.sleep(var0); + } catch (InterruptedException var6) { + } + } + + } + } } diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java index c4bd4ef988..d213ad859e 100644 --- a/runescape-client/src/main/java/Username.java +++ b/runescape-client/src/main/java/Username.java @@ -3,55 +3,56 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jv") +@ObfuscatedName("jx") @Implements("Username") public class Username implements Comparable { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("name") String name; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("cleanName") String cleanName; @ObfuscatedSignature( - signature = "(Ljava/lang/String;Lmu;)V" + signature = "(Ljava/lang/String;Llu;)V" ) public Username(String var1, LoginType var2) { this.name = var1; - this.cleanName = class291.method5315(var1, var2); + this.cleanName = UrlRequest.method3264(var1, var2); } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(B)Ljava/lang/String;", - garbageValue = "118" + garbageValue = "-126" ) @Export("getName") public String getName() { return this.name; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(B)Z", - garbageValue = "-76" + garbageValue = "85" ) @Export("hasCleanName") public boolean hasCleanName() { return this.cleanName != null; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Ljv;B)I", - garbageValue = "-67" + signature = "(Ljx;I)I", + garbageValue = "2007819578" ) @Export("compareToTyped") public int compareToTyped(Username var1) { if (this.cleanName == null) { return var1.cleanName == null ? 0 : 1; + } else { + return var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName); } - return var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName); } public boolean equals(Object var1) { @@ -59,86 +60,33 @@ public class Username implements Comparable { Username var2 = (Username)var1; if (this.cleanName == null) { return var2.cleanName == null; - } - if (var2.cleanName == null) { + } else if (var2.cleanName == null) { return false; + } else { + return this.hashCode() != var2.hashCode() ? false : this.cleanName.equals(var2.cleanName); } - return this.hashCode() != var2.hashCode() ? false : this.cleanName.equals(var2.cleanName); + } else { + return false; } - return false; } public int hashCode() { return this.cleanName == null ? 0 : this.cleanName.hashCode(); } + public String abb() { + return this.getName(); + } + public int compareTo(Object var1) { return this.compareToTyped((Username)var1); } + public String abd() { + return this.getName(); + } + public String toString() { return this.getName(); } - - @ObfuscatedName("q") - public static final int method5217(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 = var4 + var2 - 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 = 6.0D * (var12 - var14) * var16 + var14; - } 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 (6.0D * var0 < 1.0D) { - var8 = (var12 - var14) * 6.0D * var0 + var14; - } else if (2.0D * var0 < 1.0D) { - var8 = var12; - } else if (var0 * 3.0D < 2.0D) { - var8 = var14 + 6.0D * (var12 - var14) * (0.6666666666666666D - var0); - } else { - var8 = var14; - } - - if (var20 * 6.0D < 1.0D) { - var10 = var20 * (var12 - var14) * 6.0D + var14; - } else if (2.0D * var20 < 1.0D) { - var10 = var12; - } else if (3.0D * var20 < 2.0D) { - var10 = 6.0D * (0.6666666666666666D - var20) * (var12 - var14) + var14; - } else { - var10 = var14; - } - } - - int var22 = (int)(var6 * 256.0D); - int var13 = (int)(256.0D * var8); - int var23 = (int)(var10 * 256.0D); - int var15 = var23 + (var13 << 8) + (var22 << 16); - return var15; - } } diff --git a/runescape-client/src/main/java/Usernamed.java b/runescape-client/src/main/java/Usernamed.java index 250e051050..7dd95727ab 100644 --- a/runescape-client/src/main/java/Usernamed.java +++ b/runescape-client/src/main/java/Usernamed.java @@ -3,13 +3,33 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jg") +@ObfuscatedName("js") @Implements("Usernamed") public interface Usernamed { - @ObfuscatedName("ku") @ObfuscatedSignature( - signature = "(B)Ljv;", - garbageValue = "-19" + signature = "()Ljx;" + ) + Username aba(); + + @ObfuscatedSignature( + signature = "()Ljx;" + ) + Username aaj(); + + @ObfuscatedSignature( + signature = "()Ljx;" + ) + Username aag(); + + @ObfuscatedSignature( + signature = "()Ljx;" + ) + Username abc(); + + @ObfuscatedName("kk") + @ObfuscatedSignature( + signature = "(I)Ljx;", + garbageValue = "962934553" ) @Export("username") Username username(); diff --git a/runescape-client/src/main/java/VarbitDefinition.java b/runescape-client/src/main/java/VarbitDefinition.java index 7bedb6b126..a0163d53a2 100644 --- a/runescape-client/src/main/java/VarbitDefinition.java +++ b/runescape-client/src/main/java/VarbitDefinition.java @@ -4,39 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ia") +@ObfuscatedName("im") @Implements("VarbitDefinition") public class VarbitDefinition extends DualNode { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("VarbitDefinition_archive") public static AbstractArchive VarbitDefinition_archive; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lep;" ) @Export("VarbitDefinition_cached") public static EvictingDualNodeHashTable VarbitDefinition_cached; - @ObfuscatedName("s") - @Export("BZip2Decompressor_block") - static int[] BZip2Decompressor_block; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 30212683 + intValue = 343295379 ) @Export("baseVar") public int baseVar; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1456133489 + intValue = -213865641 ) @Export("startBit") public int startBit; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1287867035 + intValue = 1172808511 ) @Export("endBit") public int endBit; @@ -45,10 +42,10 @@ public class VarbitDefinition extends DualNode { VarbitDefinition_cached = new EvictingDualNodeHashTable(64); } - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkf;I)V", - garbageValue = "-1936267259" + signature = "(Lky;I)V", + garbageValue = "-404678806" ) @Export("decode") public void decode(Buffer var1) { @@ -62,10 +59,10 @@ public class VarbitDefinition extends DualNode { } } - @ObfuscatedName("w") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkf;II)V", - garbageValue = "611768322" + signature = "(Lky;IB)V", + garbageValue = "40" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -76,646 +73,4 @@ public class VarbitDefinition extends DualNode { } } - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;II)I", - garbageValue = "508851632" - ) - @Export("parseIntCustomRadix") - public static int parseIntCustomRadix(CharSequence var0, int var1) { - return WorldMapSection1.parseIntCustomRadix(var0, var1, true); - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(Lbz;I)V", - garbageValue = "-442455221" - ) - static void method4484(GameShell var0) { - int var3; - int var15; - if (Login.worldSelectOpen) { - while (true) { - if (!class218.isKeyDown()) { - if (MouseHandler.MouseHandler_lastButton != 1 && (DevicePcmPlayerProvider.mouseCam || MouseHandler.MouseHandler_lastButton != 4)) { - return; - } - - int var1 = Login.xPadding + 280; - if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class192.changeWorldSelectSorting(0, 0); - return; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class192.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) { - class192.changeWorldSelectSorting(1, 0); - return; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class192.changeWorldSelectSorting(1, 1); - return; - } - - var3 = Login.xPadding + 500; - if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class192.changeWorldSelectSorting(2, 0); - return; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class192.changeWorldSelectSorting(2, 1); - return; - } - - var15 = Login.xPadding + 610; - if (MouseHandler.MouseHandler_lastPressedX >= var15 && MouseHandler.MouseHandler_lastPressedX <= var15 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class192.changeWorldSelectSorting(3, 0); - return; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var15 + 15 && MouseHandler.MouseHandler_lastPressedX <= var15 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class192.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; - GrandExchangeOfferWorldComparator.leftTitleSprite.drawAt(Login.xPadding, 0); - NPC.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - TileItem.logoSprite.drawAt(Login.xPadding + 382 - TileItem.logoSprite.subWidth / 2, 18); - return; - } - - if (Login.hoveredWorldIndex != -1) { - World var13 = World.World_worlds[Login.hoveredWorldIndex]; - MusicPatchPcmStream.changeWorld(var13); - Login.worldSelectOpen = false; - GrandExchangeOfferWorldComparator.leftTitleSprite.drawAt(Login.xPadding, 0); - NPC.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - TileItem.logoSprite.drawAt(Login.xPadding + 382 - TileItem.logoSprite.subWidth / 2, 18); - return; - } - - if (Login.worldSelectPage > 0 && Login.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= Login.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= ParamDefinition.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= ParamDefinition.canvasHeight / 2 + 50) { - --Login.worldSelectPage; - } - - if (Login.worldSelectPage < Login.worldSelectPagesCount && NPCDefinition.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= GrandExchangeEvent.canvasWidth - NPCDefinition.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= GrandExchangeEvent.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= ParamDefinition.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= ParamDefinition.canvasHeight / 2 + 50) { - ++Login.worldSelectPage; - } - return; - } - - if (ReflectionCheck.field1338 == 13) { - Login.worldSelectOpen = false; - GrandExchangeOfferWorldComparator.leftTitleSprite.drawAt(Login.xPadding, 0); - NPC.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - TileItem.logoSprite.drawAt(Login.xPadding + 382 - TileItem.logoSprite.subWidth / 2, 18); - return; - } - - if (ReflectionCheck.field1338 == 96) { - if (Login.worldSelectPage > 0 && Login.worldSelectLeftSprite != null) { - --Login.worldSelectPage; - } - } else if (ReflectionCheck.field1338 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && NPCDefinition.worldSelectRightSprite != null) { - ++Login.worldSelectPage; - } - } - } - if ((MouseHandler.MouseHandler_lastButton == 1 || !DevicePcmPlayerProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { - WorldMapLabelSize.clientPreferences.titleMusicDisabled = !WorldMapLabelSize.clientPreferences.titleMusicDisabled; - ReflectionCheck.savePreferences(); - if (!WorldMapLabelSize.clientPreferences.titleMusicDisabled) { - TextureProvider.method2761(WorldMapRegion.archive6, "scape main", "", 255, false); - } else { - NetSocket.method3553(); - } - } - - if (Client.gameState == 5) { - return; - } - if (Login.field1193 == -1L) { - Login.field1193 = DirectByteArrayCopier.currentTimeMs() + 1000L; - } - - long var11 = DirectByteArrayCopier.currentTimeMs(); - if (Language.method3667() && -1L == Login.field1211) { - Login.field1211 = var11; - if (Login.field1211 > Login.field1193) { - Login.field1193 = Login.field1211; - } - } - - if (Client.gameState != 10 && Client.gameState != 11) { - return; - } - if (Language.Language_EN == ScriptFrame.clientLanguage) { - if (MouseHandler.MouseHandler_lastButton == 1 || (!DevicePcmPlayerProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { - var3 = Login.xPadding + 5; - if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 100 && MouseHandler.MouseHandler_lastPressedY >= 463 && MouseHandler.MouseHandler_lastPressedY <= 35 + 463) { - ChatChannel.openWorldSelect(); - return; - } - } - - if (World.World_request != null) { - ChatChannel.openWorldSelect(); - } - } - - var3 = MouseHandler.MouseHandler_lastButton; - var15 = MouseHandler.MouseHandler_lastPressedX; - int var16 = MouseHandler.MouseHandler_lastPressedY; - if (var3 == 0) { - var15 = MouseHandler.MouseHandler_x; - var16 = MouseHandler.MouseHandler_y; - } - - if (!DevicePcmPlayerProvider.mouseCam && var3 == 4) { - var3 = 1; - } - - int var7; - short var8; - if (Login.loginIndex == 0) { - boolean var17 = false; - - while (class218.isKeyDown()) { - if (ReflectionCheck.field1338 == 84) { - var17 = true; - } - } - - var7 = ScriptEvent.loginBoxCenter - 80; - var8 = 291; - if (var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20) { - GrandExchangeOfferWorldComparator.openURL(Language.method3666("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); - } - - var7 = ScriptEvent.loginBoxCenter + 80; - if (var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20 || var17) { - if ((Client.worldProperties & 0x2000000) != 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; - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { - Login.currentLoginField = 1; - } else { - Login.currentLoginField = 0; - } - } 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; - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { - Login.currentLoginField = 1; - } else { - Login.currentLoginField = 0; - } - } 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; - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { - Login.currentLoginField = 1; - } else { - Login.currentLoginField = 0; - } - } else { - FaceNormal.method3266(false); - } - } - return; - } - int var18; - short var20; - if (Login.loginIndex == 1) { - while (class218.isKeyDown()) { - if (ReflectionCheck.field1338 == 84) { - FaceNormal.method3266(false); - } else if (ReflectionCheck.field1338 == 13) { - Login.loginIndex = 0; - } - } - - var18 = ScriptEvent.loginBoxCenter - 80; - var20 = 321; - if (var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { - FaceNormal.method3266(false); - } - - var18 = ScriptEvent.loginBoxCenter + 80; - if (var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { - Login.loginIndex = 0; - } - return; - } - boolean var9; - int var10; - short var19; - if (Login.loginIndex == 2) { - var19 = 201; - var18 = var19 + 52; - if (var3 == 1 && var16 >= var18 - 12 && var16 < var18 + 2) { - Login.currentLoginField = 0; - } - - var18 += 15; - if (var3 == 1 && var16 >= var18 - 12 && var16 < var18 + 2) { - Login.currentLoginField = 1; - } - - var18 += 15; - var19 = 361; - if (class96.field1325 != null) { - var7 = class96.field1325.highX / 2; - if (var3 == 1 && var15 >= class96.field1325.lowX - var7 && var15 <= var7 + class96.field1325.lowX && var16 >= var19 - 15 && var16 < var19) { - switch(Login.field1212) { - case 1: - class268.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: - GrandExchangeOfferWorldComparator.openURL("https://support.runescape.com/hc/en-gb", true, false); - } - } - } - - var7 = ScriptEvent.loginBoxCenter - 80; - var8 = 321; - if (var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20) { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - class268.setLoginResponseString("", "Please enter your username/email address.", ""); - return; - } - - if (Login.Login_password.length() == 0) { - class268.setLoginResponseString("", "Please enter your password.", ""); - return; - } - - class268.setLoginResponseString("", "Connecting to server...", ""); - GrandExchangeOffer.method99(false); - class96.updateGameState(20); - return; - } - - var7 = Login.loginBoxX + 180 + 80; - if (var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20) { - Login.loginIndex = 0; - Login.Login_username = ""; - Login.Login_password = ""; - GrandExchangeOffer.field65 = 0; - WorldMapManager.otp = ""; - Login.field1201 = true; - } - - var7 = ScriptEvent.loginBoxCenter + -117; - var8 = 277; - Login.field1199 = var15 >= var7 && var15 < var7 + class237.field3191 && var16 >= var8 && var16 < var8 + WorldMapDecoration.field212; - if (var3 == 1 && Login.field1199) { - Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; - if (!Client.Login_isUsernameRemembered && WorldMapLabelSize.clientPreferences.rememberedUsername != null) { - WorldMapLabelSize.clientPreferences.rememberedUsername = null; - ReflectionCheck.savePreferences(); - } - } - - var7 = ScriptEvent.loginBoxCenter + 24; - var8 = 277; - Login.field1184 = var15 >= var7 && var15 < var7 + class237.field3191 && var16 >= var8 && var16 < var8 + WorldMapDecoration.field212; - if (var3 == 1 && Login.field1184) { - WorldMapLabelSize.clientPreferences.hideUsername = !WorldMapLabelSize.clientPreferences.hideUsername; - if (!WorldMapLabelSize.clientPreferences.hideUsername) { - Login.Login_username = ""; - WorldMapLabelSize.clientPreferences.rememberedUsername = null; - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { - Login.currentLoginField = 1; - } else { - Login.currentLoginField = 0; - } - } - - ReflectionCheck.savePreferences(); - } - - while (true) { - while (class218.isKeyDown()) { - var9 = false; - - for (var10 = 0; var10 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var10) { - if (Calendar.field2508 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var10)) { - var9 = true; - break; - } - } - - if (ReflectionCheck.field1338 == 13) { - Login.loginIndex = 0; - Login.Login_username = ""; - Login.Login_password = ""; - GrandExchangeOffer.field65 = 0; - WorldMapManager.otp = ""; - Login.field1201 = true; - } else if (Login.currentLoginField == 0) { - if (ReflectionCheck.field1338 == 85 && Login.Login_username.length() > 0) { - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (ReflectionCheck.field1338 == 84 || ReflectionCheck.field1338 == 80) { - Login.currentLoginField = 1; - } - - if (var9 && Login.Login_username.length() < 320) { - Login.Login_username = Login.Login_username + Calendar.field2508; - } - } else if (Login.currentLoginField == 1) { - if (ReflectionCheck.field1338 == 85 && Login.Login_password.length() > 0) { - Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); - } - - if (ReflectionCheck.field1338 == 84 || ReflectionCheck.field1338 == 80) { - Login.currentLoginField = 0; - } - - if (ReflectionCheck.field1338 == 84) { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - class268.setLoginResponseString("", "Please enter your username/email address.", ""); - return; - } - - if (Login.Login_password.length() == 0) { - class268.setLoginResponseString("", "Please enter your password.", ""); - return; - } - - class268.setLoginResponseString("", "Connecting to server...", ""); - GrandExchangeOffer.method99(false); - class96.updateGameState(20); - return; - } - - if (var9 && Login.Login_password.length() < 20) { - Login.Login_password = Login.Login_password + Calendar.field2508; - } - } - } - - return; - } - } - if (Login.loginIndex == 3) { - var18 = Login.loginBoxX + 180; - var20 = 276; - if (var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { - FaceNormal.method3266(false); - } - - var18 = Login.loginBoxX + 180; - var20 = 326; - if (var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { - class268.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); - Login.loginIndex = 5; - } - return; - } - int var22; - if (Login.loginIndex == 4) { - var18 = Login.loginBoxX + 180 - 80; - var20 = 321; - if (var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { - WorldMapManager.otp.trim(); - if (WorldMapManager.otp.length() != 6) { - class268.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); - return; - } - - GrandExchangeOffer.field65 = Integer.parseInt(WorldMapManager.otp); - WorldMapManager.otp = ""; - GrandExchangeOffer.method99(true); - class268.setLoginResponseString("", "Connecting to server...", ""); - class96.updateGameState(20); - return; - } - - if (var3 == 1 && var15 >= Login.loginBoxX + 180 - 9 && var15 <= Login.loginBoxX + 180 + 130 && var16 >= 263 && var16 <= 296) { - Login.field1201 = !Login.field1201; - } - - if (var3 == 1 && var15 >= Login.loginBoxX + 180 - 34 && var15 <= Login.loginBoxX + 34 + 180 && var16 >= 351 && var16 <= 363) { - GrandExchangeOfferWorldComparator.openURL(Language.method3666("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); - } - - var18 = Login.loginBoxX + 180 + 80; - if (var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { - Login.loginIndex = 0; - Login.Login_username = ""; - Login.Login_password = ""; - GrandExchangeOffer.field65 = 0; - WorldMapManager.otp = ""; - } - - while (class218.isKeyDown()) { - boolean var21 = false; - - for (var22 = 0; var22 < "1234567890".length(); ++var22) { - if (Calendar.field2508 == "1234567890".charAt(var22)) { - var21 = true; - break; - } - } - - if (ReflectionCheck.field1338 == 13) { - Login.loginIndex = 0; - Login.Login_username = ""; - Login.Login_password = ""; - GrandExchangeOffer.field65 = 0; - WorldMapManager.otp = ""; - } else { - if (ReflectionCheck.field1338 == 85 && WorldMapManager.otp.length() > 0) { - WorldMapManager.otp = WorldMapManager.otp.substring(0, WorldMapManager.otp.length() - 1); - } - - if (ReflectionCheck.field1338 == 84) { - WorldMapManager.otp.trim(); - if (WorldMapManager.otp.length() != 6) { - class268.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); - return; - } - - GrandExchangeOffer.field65 = Integer.parseInt(WorldMapManager.otp); - WorldMapManager.otp = ""; - GrandExchangeOffer.method99(true); - class268.setLoginResponseString("", "Connecting to server...", ""); - class96.updateGameState(20); - return; - } - - if (var21 && WorldMapManager.otp.length() < 6) { - WorldMapManager.otp = WorldMapManager.otp + Calendar.field2508; - } - } - } - return; - } - if (Login.loginIndex == 5) { - var18 = Login.loginBoxX + 180 - 80; - var20 = 321; - if (var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { - UserComparator10.method3406(); - return; - } - - var18 = Login.loginBoxX + 180 + 80; - if (var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { - FaceNormal.method3266(true); - } - - var8 = 361; - if (WorldMapAreaData.field332 != null) { - var22 = WorldMapAreaData.field332.highX / 2; - if (var3 == 1 && var15 >= WorldMapAreaData.field332.lowX - var22 && var15 <= var22 + WorldMapAreaData.field332.lowX && var16 >= var8 - 15 && var16 < var8) { - GrandExchangeOfferWorldComparator.openURL(Language.method3666("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); - } - } - - while (class218.isKeyDown()) { - var9 = false; - - for (var10 = 0; var10 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var10) { - if (Calendar.field2508 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var10)) { - var9 = true; - break; - } - } - - if (ReflectionCheck.field1338 == 13) { - FaceNormal.method3266(true); - } else { - if (ReflectionCheck.field1338 == 85 && Login.Login_username.length() > 0) { - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (ReflectionCheck.field1338 == 84) { - UserComparator10.method3406(); - return; - } - - if (var9 && Login.Login_username.length() < 320) { - Login.Login_username = Login.Login_username + Calendar.field2508; - } - } - } - return; - } - if (Login.loginIndex == 6) { - while (true) { - do { - if (!class218.isKeyDown()) { - var19 = 321; - if (var3 == 1 && var16 >= var19 - 20 && var16 <= var19 + 20) { - FaceNormal.method3266(true); - } - - return; - } - } while(ReflectionCheck.field1338 != 84 && ReflectionCheck.field1338 != 13); - - FaceNormal.method3266(true); - } - } - if (Login.loginIndex == 7) { - var18 = Login.loginBoxX + 180 - 80; - var20 = 321; - if (var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { - GrandExchangeOfferWorldComparator.openURL(Language.method3666("secure", true) + "m=dob/set_dob.ws", true, false); - class268.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - Login.loginIndex = 6; - return; - } - - var18 = Login.loginBoxX + 180 + 80; - if (var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { - FaceNormal.method3266(true); - } - return; - } - if (Login.loginIndex == 8) { - var18 = Login.loginBoxX + 180 - 80; - var20 = 321; - if (var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { - GrandExchangeOfferWorldComparator.openURL("https://www.jagex.com/terms/privacy/#eight", true, false); - class268.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - Login.loginIndex = 6; - return; - } - - var18 = Login.loginBoxX + 180 + 80; - if (var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { - FaceNormal.method3266(true); - } - return; - } - if (Login.loginIndex == 12) { - String var14 = ""; - switch(Login.field1182) { - case 0: - var14 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; - break; - case 1: - var14 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; - break; - default: - FaceNormal.method3266(false); - } - - var7 = Login.loginBoxX + 180; - var8 = 276; - if (var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20) { - GrandExchangeOfferWorldComparator.openURL(var14, true, false); - class268.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - Login.loginIndex = 6; - return; - } - - var7 = Login.loginBoxX + 180; - var8 = 326; - if (var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20) { - FaceNormal.method3266(false); - } - return; - } - if (Login.loginIndex == 24) { - var18 = Login.loginBoxX + 180; - var20 = 301; - if (var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { - FaceNormal.method3266(false); - } - } - } } diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java index 2d47a1015f..d9445817b0 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("id") +@ObfuscatedName("ip") @Implements("VarcInt") public class VarcInt extends DualNode { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("VarcInt_archive") public static AbstractArchive VarcInt_archive; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lep;" ) @Export("VarcInt_cached") - public static EvictingDualNodeHashTable VarcInt_cached; - @ObfuscatedName("e") + static EvictingDualNodeHashTable VarcInt_cached; + @ObfuscatedName("i") @Export("persist") public boolean persist; @@ -26,73 +26,58 @@ public class VarcInt extends DualNode { VarcInt_cached = new EvictingDualNodeHashTable(64); } - public VarcInt() { + VarcInt() { this.persist = false; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkf;B)V", - garbageValue = "22" + signature = "(Lky;I)V", + garbageValue = "-1564347413" ) - public void method4401(Buffer var1) { + void method4314(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.method4396(var1, var2); + this.method4315(var1, var2); } } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkf;II)V", - garbageValue = "958337922" + signature = "(Lky;II)V", + garbageValue = "-1760139411" ) - void method4396(Buffer var1, int var2) { + void method4315(Buffer var1, int var2) { if (var2 == 2) { this.persist = true; } } - @ObfuscatedName("e") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;S)Ljava/lang/String;", - garbageValue = "-32757" + signature = "(II)Lis;", + garbageValue = "-1763982471" ) - @Export("base37Decode") - public static String base37Decode(CharSequence var0) { - long var3 = 0L; - int var5 = var0.length(); - - for (int var6 = 0; var6 < var5; ++var6) { - var3 *= 37L; - char var7 = var0.charAt(var6); - if (var7 >= 'A' && var7 <= 'Z') { - var3 += (long)(var7 + 1 - 65); - } else if (var7 >= 'a' && var7 <= 'z') { - var3 += (long)(var7 + 1 - 97); - } else if (var7 >= '0' && var7 <= '9') { - var3 += (long)(var7 + 27 - 48); + @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 = class339.ParamDefinition_archive.takeFile(11, var0); + var1 = new ParamDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); } - if (var3 >= 177917621779460413L) { - break; - } + var1.postDecode(); + ParamDefinition.ParamDefinition_cached.put(var1, (long)var0); + return var1; } - - while (var3 % 37L == 0L && 0L != var3) { - var3 /= 37L; - } - - String var8 = class215.base37DecodeLong(var3); - if (var8 == null) { - var8 = ""; - } - - return var8; } } diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index 2f8a66b460..d2943eb760 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -9,73 +9,55 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ca") +@ObfuscatedName("ch") @Implements("Varcs") public class Varcs { - @ObfuscatedName("es") - @ObfuscatedGetter( - intValue = 610571431 - ) - @Export("port3") - static int port3; - @ObfuscatedName("e") + @ObfuscatedName("f") + @Export("musicTrackBoolean") + public static boolean musicTrackBoolean; + @ObfuscatedName("i") @Export("intsPersistence") boolean[] intsPersistence; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("map") Map map; - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("strings") String[] strings; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("unwrittenChanges") boolean unwrittenChanges; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - longValue = -277979548816975331L + longValue = -3102782666800977811L ) - @Export("lastWrittenMs") - long lastWrittenMs; + long field1243; Varcs() { this.unwrittenChanges = false; - int var1 = class215.archive2.getGroupFileCount(19); + int var1 = HealthBarUpdate.archive2.getGroupFileCount(19); this.map = new HashMap(); this.intsPersistence = new boolean[var1]; int var2; for (var2 = 0; var2 < var1; ++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.method4401(new Buffer(var5)); - } - - VarcInt.VarcInt_cached.put(var4, (long)var2); - var3 = var4; - } - + VarcInt var3 = FileSystem.method3447(var2); this.intsPersistence[var2] = var3.persist; } var2 = 0; - if (class215.archive2.method4268(15)) { - var2 = class215.archive2.getGroupFileCount(15); + if (HealthBarUpdate.archive2.method4199(15)) { + var2 = HealthBarUpdate.archive2.getGroupFileCount(15); } this.strings = new String[var2]; this.read(); } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-1875619216" + garbageValue = "-1411494049" ) @Export("setInt") void setInt(int var1, int var2) { @@ -86,10 +68,10 @@ public class Varcs { } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(IB)I", - garbageValue = "-17" + garbageValue = "-102" ) @Export("getInt") int getInt(int var1) { @@ -97,20 +79,20 @@ public class Varcs { return var2 instanceof Integer ? (Integer)var2 : -1; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(ILjava/lang/String;I)V", - garbageValue = "-1079389061" + garbageValue = "-461145893" ) @Export("setString") void setString(int var1, String var2) { this.map.put(var1, var2); } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(II)Ljava/lang/String;", - garbageValue = "-1328754518" + signature = "(IB)Ljava/lang/String;", + garbageValue = "-6" ) @Export("getString") String getString(int var1) { @@ -118,30 +100,30 @@ public class Varcs { return var2 instanceof String ? (String)var2 : ""; } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(ILjava/lang/String;I)V", - garbageValue = "-267938278" + garbageValue = "1336031066" ) @Export("setStringOld") void setStringOld(int var1, String var2) { this.strings[var1] = var2; } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(II)Ljava/lang/String;", - garbageValue = "1859485923" + signature = "(IB)Ljava/lang/String;", + garbageValue = "-122" ) @Export("getStringOld") String getStringOld(int var1) { return this.strings[var1]; } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1717605874" + signature = "(B)V", + garbageValue = "30" ) @Export("clearTransient") void clearTransient() { @@ -158,20 +140,20 @@ public class Varcs { } - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(ZI)Lma;", - garbageValue = "195746057" + signature = "(ZI)Lmm;", + garbageValue = "1411517965" ) @Export("getPreferencesFile") AccessFile getPreferencesFile(boolean var1) { - return WorldMapIcon_0.getPreferencesFile("2", WorldMapRegion.studioGame.name, var1); + return TaskHandler.getPreferencesFile("2", WorldMapRectangle.field166.name, var1); } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "2043030213" + garbageValue = "1634973674" ) @Export("write") void write() { @@ -191,81 +173,105 @@ public class Varcs { if (var7 instanceof Integer) { var2 += 4; } else if (var7 instanceof String) { - var2 += Huffman.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 var32 = new Buffer(var2); + var32.writeByte(2); + var32.writeShort(var3); + Iterator var33 = this.map.entrySet().iterator(); - label147: + label185: while (true) { - Entry var17; - int var18; + Entry var20; + int var21; do { - if (!var29.hasNext()) { - var1.write(var28.array, 0, var28.offset); - break label147; + if (!var33.hasNext()) { + var1.write(var32.array, 0, var32.offset); + break label185; } - var17 = (Entry)var29.next(); - var18 = (Integer)var17.getKey(); - } while(!this.intsPersistence[var18]); + var20 = (Entry)var33.next(); + var21 = (Integer)var20.getKey(); + } while(!this.intsPersistence[var21]); - var28.writeShort(var18); - Object var8 = var17.getValue(); + var32.writeShort(var21); + Object var8 = var20.getValue(); Class var10 = var8.getClass(); - class3[] var11 = new class3[]{class3.field9, class3.field14, class3.field7}; - class3[] var12 = var11; - int var13 = 0; + class3[] var11 = class3.method44(); + int var12 = 0; class3 var9; while (true) { - if (var13 >= var12.length) { + if (var12 >= var11.length) { var9 = null; break; } - class3 var14 = var12[var13]; - if (var10 == var14.field12) { - var9 = var14; + class3 var13 = var11[var12]; + if (var10 == var13.field29) { + var9 = var13; break; } - ++var13; + ++var12; } - var28.writeByte(var9.field11); - class3.method30(var8, var28); + var32.writeByte(var9.field18); + Class var34 = var8.getClass(); + class3[] var15 = class3.method44(); + int var16 = 0; + + class3 var14; + while (true) { + if (var16 >= var15.length) { + var14 = null; + break; + } + + class3 var17 = var15[var16]; + if (var34 == var17.field29) { + var14 = var17; + break; + } + + ++var16; + } + + if (var14 == null) { + throw new IllegalArgumentException(); + } + + class0 var22 = var14.field13; + var22.vmethod58(var8, var32); } - } catch (Exception var26) { + } catch (Exception var30) { } finally { try { var1.close(); - } catch (Exception var25) { + } catch (Exception var29) { } } this.unwrittenChanges = false; - this.lastWrittenMs = DirectByteArrayCopier.currentTimeMs(); + this.field1243 = SequenceDefinition.method4686(); } - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "-5" + garbageValue = "-85" ) @Export("read") void read() { AccessFile var1 = this.getPreferencesFile(false); - label226: { + label229: { try { byte[] var2 = new byte[(int)var1.length()]; @@ -277,67 +283,67 @@ public class Varcs { } } - Buffer var15 = new Buffer(var2); - if (var15.array.length - var15.offset >= 1) { - int var16 = var15.readUnsignedByte(); - if (var16 >= 0 && var16 <= 2) { + Buffer var14 = new Buffer(var2); + if (var14.array.length - var14.offset >= 1) { + int var15 = var14.readUnsignedByte(); + if (var15 >= 0 && var15 <= 2) { int var7; int var8; int var9; - int var17; - if (var16 >= 2) { - var17 = var15.readUnsignedShort(); + int var16; + if (var15 >= 2) { + var16 = var14.readUnsignedShort(); var7 = 0; while (true) { - if (var7 >= var17) { - break label226; + if (var7 >= var16) { + break label229; } - var8 = var15.readUnsignedShort(); - var9 = var15.readUnsignedByte(); - class3[] var10 = new class3[]{class3.field9, class3.field14, class3.field7}; - class3 var11 = (class3)SoundSystem.findEnumerated(var10, var9); - Object var12 = var11.method34(var15); + var8 = var14.readUnsignedShort(); + var9 = var14.readUnsignedByte(); + class3 var10 = (class3)FriendSystem.findEnumerated(class3.method44(), var9); + Object var11 = var10.method43(var14); if (this.intsPersistence[var8]) { - this.map.put(var8, var12); + this.map.put(var8, var11); } ++var7; } - } - var17 = var15.readUnsignedShort(); + } else { + var16 = var14.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; + for (var7 = 0; var7 < var16; ++var7) { + var8 = var14.readUnsignedShort(); + var9 = var14.readInt(); + if (this.intsPersistence[var8]) { + this.map.put(var8, var9); + } } - var15.readUnsignedShort(); - var15.readStringCp1252NullTerminated(); - ++var8; + var7 = var14.readUnsignedShort(); + var8 = 0; + + while (true) { + if (var8 >= var7) { + break label229; + } + + var14.readUnsignedShort(); + var14.readStringCp1252NullTerminated(); + ++var8; + } } } return; } - } catch (Exception var26) { - break label226; + } catch (Exception var25) { + break label229; } finally { try { var1.close(); - } catch (Exception var25) { + } catch (Exception var24) { } } @@ -348,23 +354,23 @@ public class Varcs { this.unwrittenChanges = false; } - @ObfuscatedName("x") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-2136969712" + garbageValue = "573629327" ) @Export("tryWrite") void tryWrite() { - if (this.unwrittenChanges && this.lastWrittenMs < DirectByteArrayCopier.currentTimeMs() - 60000L) { + if (this.unwrittenChanges && this.field1243 < SequenceDefinition.method4686() - 60000L) { this.write(); } } - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1650912685" + garbageValue = "702857669" ) @Export("hasUnwrittenChanges") boolean hasUnwrittenChanges() { diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java index f6ed28b8e9..47fe90d68b 100644 --- a/runescape-client/src/main/java/VarpDefinition.java +++ b/runescape-client/src/main/java/VarpDefinition.java @@ -4,42 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ik") +@ObfuscatedName("in") @Implements("VarpDefinition") public class VarpDefinition extends DualNode { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("VarpDefinition_archive") static AbstractArchive VarpDefinition_archive; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -2051999343 + intValue = -1812370505 ) @Export("VarpDefinition_fileCount") public static int VarpDefinition_fileCount; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lep;" ) @Export("VarpDefinition_cached") static EvictingDualNodeHashTable VarpDefinition_cached; - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "Llx;" - ) - @Export("titlebuttonSprite") - static IndexedSprite titlebuttonSprite; - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "Lkf;" - ) - @Export("NetCache_responseArchiveBuffer") - static Buffer NetCache_responseArchiveBuffer; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1809591211 + intValue = -559924911 ) @Export("type") public int type; @@ -52,10 +40,10 @@ public class VarpDefinition extends DualNode { this.type = 0; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkf;I)V", - garbageValue = "-927981442" + signature = "(Lky;B)V", + garbageValue = "-60" ) @Export("decode") void decode(Buffer var1) { @@ -69,10 +57,10 @@ public class VarpDefinition extends DualNode { } } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lkf;II)V", - garbageValue = "-1780799047" + signature = "(Lky;IB)V", + garbageValue = "-93" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -82,27 +70,54 @@ public class VarpDefinition extends DualNode { } - @ObfuscatedName("w") + @ObfuscatedName("jv") @ObfuscatedSignature( - signature = "(CI)Z", - garbageValue = "-17259877" + signature = "(Lbq;ZI)V", + garbageValue = "50109421" ) - public static boolean method4366(char var0) { - if ((var0 > 0 && var0 < 128) || (var0 >= 160 && var0 <= 255)) { - return true; + @Export("closeInterface") + static final void closeInterface(InterfaceParent var0, boolean var1) { + int var2 = var0.group; + int var3 = (int)var0.key; + var0.remove(); + if (var1) { + UrlRequester.method3250(var2); } - if (var0 == 0) { - return false; - } - char[] var1 = class288.cp1252AsciiExtension; - for (int var2 = 0; var2 < var1.length; ++var2) { - char var3 = var1[var2]; - if (var0 == var3) { - return true; + for (IntegerNode var4 = (IntegerNode)Client.widgetClickMasks.first(); var4 != null; var4 = (IntegerNode)Client.widgetClickMasks.next()) { + if ((long)var2 == (var4.key >> 48 & 65535L)) { + var4.remove(); } } - return false; + Widget var7 = WorldMapElement.getWidget(var3); + if (var7 != null) { + FriendSystem.invalidateWidget(var7); + } + + for (int var5 = 0; var5 < Client.menuOptionsCount; ++var5) { + if (PendingSpawn.isWidgetMenuOpcode(Client.menuOpcodes[var5])) { + if (var5 < Client.menuOptionsCount - 1) { + for (int var6 = var5; var6 < Client.menuOptionsCount - 1; ++var6) { + Client.menuActions[var6] = Client.menuActions[var6 + 1]; + Client.menuTargets[var6] = Client.menuTargets[var6 + 1]; + Client.menuOpcodes[var6] = Client.menuOpcodes[var6 + 1]; + Client.menuIdentifiers[var6] = Client.menuIdentifiers[var6 + 1]; + Client.menuArguments1[var6] = Client.menuArguments1[var6 + 1]; + Client.menuArguments2[var6] = Client.menuArguments2[var6 + 1]; + Client.menuShiftClick[var6] = Client.menuShiftClick[var6 + 1]; + } + } + + --var5; + --Client.menuOptionsCount; + } + } + + GrandExchangeOfferNameComparator.calculateMenuBounds(); + if (Client.rootInterface != -1) { + UserComparator6.runIntfCloseListeners(Client.rootInterface, 1); + } + } } diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java index a0df20e0c5..f205b5913a 100644 --- a/runescape-client/src/main/java/Varps.java +++ b/runescape-client/src/main/java/Varps.java @@ -1,23 +1,25 @@ 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("hi") @Implements("Varps") public class Varps { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("Varps_masks") static int[] Varps_masks; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("Varps_temp") public static int[] Varps_temp; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("Varps_main") public static int[] Varps_main; - @ObfuscatedName("p") - @Export("SpriteBuffer_xOffsets") - public static int[] SpriteBuffer_xOffsets; + @ObfuscatedName("gc") + @ObfuscatedGetter( + intValue = 1888640319 + ) + static int field2507; static { Varps_masks = new int[32]; @@ -31,162 +33,4 @@ public class Varps { Varps_temp = new int[4000]; Varps_main = new int[4000]; } - - @ObfuscatedName("in") - @ObfuscatedSignature( - signature = "(Lhj;II)I", - garbageValue = "1546167720" - ) - static final int method3969(Widget var0, int var1) { - if (var0.cs1Instructions == null || var1 >= var0.cs1Instructions.length) { - return -2; - } - 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++]]; - } - - if (var6 == 4) { - int var9 = var2[var4++] << 16; - var9 += var2[var4++]; - Widget var10 = class80.getWidget(var9); - int var11 = var2[var4++]; - if (var11 != -1 && (!WorldMapArea.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { - for (int var12 = 0; var12 < var10.itemIds.length; ++var12) { - if (var11 + 1 == var10.itemIds[var12]) { - var7 += var10.itemQuantities[var12]; - } - } - } - } - - if (var6 == 5) { - var7 = Varps_main[var2[var4++]]; - } - - if (var6 == 6) { - var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; - } - - if (var6 == 7) { - var7 = Varps_main[var2[var4++]] * 0x64 / 46875; - } - - if (var6 == 8) { - var7 = Client.localPlayer.combatLevel; - } - - if (var6 == 9) { - for (int var9 = 0; var9 < 25; ++var9) { - if (Skills.Skills_enabled[var9]) { - var7 += Client.levels[var9]; - } - } - } - - if (var6 == 10) { - int var9 = var2[var4++] << 16; - var9 += var2[var4++]; - Widget var10 = class80.getWidget(var9); - int var11 = var2[var4++]; - if (var11 != -1 && (!WorldMapArea.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { - for (int 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) { - int var9 = Varps_main[var2[var4++]]; - int var13 = var2[var4++]; - var7 = (var9 & 1 << var13) != 0 ? 1 : 0; - } - - if (var6 == 14) { - int var9 = var2[var4++]; - var7 = GrandExchangeOfferOwnWorldComparator.getVarbit(var9); - } - - if (var6 == 15) { - var8 = 1; - } - - if (var6 == 16) { - var8 = 2; - } - - if (var6 == 17) { - var8 = 3; - } - - if (var6 == 18) { - var7 = MusicPatchNode2.baseX * 64 + (Client.localPlayer.x >> 7); - } - - if (var6 == 19) { - var7 = class1.baseY * 64 + (Client.localPlayer.y >> 7); - } - - if (var6 == 20) { - var7 = var2[var4++]; - } - - if (var8 != 0) { - var5 = var8; - continue; - } - if (var5 == 0) { - var3 += var7; - } - - if (var5 == 1) { - var3 -= var7; - } - - if (var5 == 2 && var7 != 0) { - var3 /= var7; - } - - if (var5 == 3) { - var3 *= var7; - } - - var5 = 0; - } - } catch (Exception var14) { - return -1; - } - } } diff --git a/runescape-client/src/main/java/VertexNormal.java b/runescape-client/src/main/java/VertexNormal.java index 91a43b8d13..905337f70c 100644 --- a/runescape-client/src/main/java/VertexNormal.java +++ b/runescape-client/src/main/java/VertexNormal.java @@ -1,34 +1,33 @@ -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("dd") +@ObfuscatedName("dl") @Implements("VertexNormal") public class VertexNormal { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 741962059 + intValue = 1795200651 ) @Export("x") int x; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1828551341 + intValue = -1592235953 ) @Export("y") int y; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1911535461 + intValue = 221616325 ) @Export("z") int z; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -171249661 + intValue = -1908751547 ) @Export("magnitude") int magnitude; @@ -37,7 +36,7 @@ public class VertexNormal { } @ObfuscatedSignature( - signature = "(Ldd;)V" + signature = "(Ldl;)V" ) VertexNormal(VertexNormal var1) { this.x = var1.x; @@ -46,28 +45,15 @@ public class VertexNormal { this.magnitude = var1.magnitude; } - @ObfuscatedName("jz") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "6" + signature = "(Lhz;Ljava/lang/String;Ljava/lang/String;S)Llq;", + garbageValue = "3108" ) - @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(); - } - - Iterator var2 = Messages.Messages_hashTable.iterator(); - - while (var2.hasNext()) { - Message var3 = (Message)var2.next(); - var3.clearIsFromFriend(); - } - - if (DevicePcmPlayerProvider.clanChat != null) { - DevicePcmPlayerProvider.clanChat.clearFriends(); - } - + @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); + return Clock.SpriteBuffer_getIndexedSprite(var0, var3, var4); } } diff --git a/runescape-client/src/main/java/VerticalAlignment.java b/runescape-client/src/main/java/VerticalAlignment.java index e9c5477f79..d24017a980 100644 --- a/runescape-client/src/main/java/VerticalAlignment.java +++ b/runescape-client/src/main/java/VerticalAlignment.java @@ -4,40 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("if") +@ObfuscatedName("ia") @Implements("VerticalAlignment") public enum VerticalAlignment implements Enumerated { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lif;" + signature = "Lia;" ) - field3195(1, 0), - @ObfuscatedName("w") + field3172(1, 0), + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lif;" + signature = "Lia;" ) @Export("VerticalAlignment_centered") VerticalAlignment_centered(0, 1), - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lif;" + signature = "Lia;" ) - field3194(2, 2); + field3174(2, 2); - @ObfuscatedName("g") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -899877695 - ) - static int field3192; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -513284045 + intValue = -1694558565 ) @Export("value") public final int value; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -404264531 + intValue = 817798203 ) @Export("id") final int id; @@ -47,10 +42,10 @@ public enum VerticalAlignment implements Enumerated { this.id = var4; } - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "320353268" + signature = "(B)I", + garbageValue = "-32" ) @Export("rsOrdinal") public int rsOrdinal() { diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java index fa6627bc6f..00a8326345 100644 --- a/runescape-client/src/main/java/ViewportMouse.java +++ b/runescape-client/src/main/java/ViewportMouse.java @@ -4,65 +4,61 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("di") +@ObfuscatedName("df") @Implements("ViewportMouse") public class ViewportMouse { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("ViewportMouse_isInViewport") public static boolean ViewportMouse_isInViewport; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 284050525 + intValue = 1673614765 ) @Export("ViewportMouse_x") - public static int ViewportMouse_x; - @ObfuscatedName("e") + static int ViewportMouse_x; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -245246371 + intValue = 97939103 ) @Export("ViewportMouse_y") - public static int ViewportMouse_y; - @ObfuscatedName("p") + static int ViewportMouse_y; + @ObfuscatedName("k") @Export("ViewportMouse_false0") - public static boolean ViewportMouse_false0; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -933115495 - ) - static int field1745; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -401508143 - ) - static int field1746; - @ObfuscatedName("i") - @Export("Widget_loadedInterfaces") - public static boolean[] Widget_loadedInterfaces; - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Lhp;" - ) - @Export("Widget_modelsArchive") - static AbstractArchive Widget_modelsArchive; + static boolean ViewportMouse_false0; @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -900084985 + intValue = 214371075 ) - static int field1741; + static int field1723; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -228881629 + ) + static int field1724; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 1565231911 + ) + static int field1725; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -942869669 + ) + static int field1726; @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1866489791 + intValue = 155548297 + ) + static int field1727; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = 1633088205 ) @Export("ViewportMouse_entityCount") public static int ViewportMouse_entityCount; - @ObfuscatedName("v") + @ObfuscatedName("p") @Export("ViewportMouse_entityTags") public static long[] ViewportMouse_entityTags; - @ObfuscatedName("fq") - @ObfuscatedGetter( - intValue = -572146471 - ) - static int field1747; static { ViewportMouse_isInViewport = false; @@ -73,116 +69,74 @@ public class ViewportMouse { ViewportMouse_entityTags = new long[1000]; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(IS)Liy;", - garbageValue = "4095" + signature = "([BI)Ljava/lang/String;", + garbageValue = "1521597342" ) - @Export("getObjectDefinition") - public static ObjectDefinition getObjectDefinition(int var0) { - ObjectDefinition var1 = (ObjectDefinition)ObjectDefinition.ObjectDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } - 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; + public static String method2902(byte[] var0) { + return WorldMapSection0.method211(var0, 0, var0.length); } - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IB)Lcx;", - garbageValue = "1" + signature = "(II)Lii;", + garbageValue = "-1840851483" ) - @Export("getScript") - static Script getScript(int var0) { - Script var1 = (Script)Script.Script_cached.get((long)var0); + @Export("getNpcDefinition") + public static NPCDefinition getNpcDefinition(int var0) { + NPCDefinition var1 = (NPCDefinition)NPCDefinition.NpcDefinition_cached.get((long)var0); if (var1 != null) { return var1; - } - byte[] var2 = UserComparator4.archive12.takeFile(var0, 0); - if (var2 == null) { - return null; - } - var1 = World.newScript(var2); - Script.Script_cached.put(var1, (long)var0); - return var1; - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(Liu;IIIBZI)V", - garbageValue = "-913325342" - ) - @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) { - return; - } - var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); - if (var8 != null) { - return; - } - 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; + 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("i") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)I", - garbageValue = "-1418597327" + signature = "([BIII)Ljava/lang/String;", + garbageValue = "810099755" ) - public static int method2971(CharSequence var0) { - int var1 = var0.length(); - int var2 = 0; + @Export("decodeStringCp1252") + public static String decodeStringCp1252(byte[] var0, int var1, int var2) { + char[] var3 = new char[var2]; + int var4 = 0; - for (int var3 = 0; var3 < var1; ++var3) { - var2 = (var2 << 5) - var2 + var0.charAt(var3); + 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; + } + + var3[var4++] = (char)var6; + } } - return var2; + return new String(var3, 0, var4); + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "(Lct;B)V", + garbageValue = "16" + ) + public static final void method2891(PcmPlayerProvider var0) { + SecureRandomCallable.pcmPlayerProvider = var0; } } diff --git a/runescape-client/src/main/java/VorbisCodebook.java b/runescape-client/src/main/java/VorbisCodebook.java index e3e1a4ef0f..9631c13ffc 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("ck") +@ObfuscatedName("cx") @Implements("VorbisCodebook") public class VorbisCodebook { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("dimensions") int dimensions; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("entries") int entries; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("lengthMap") int[] lengthMap; - @ObfuscatedName("p") - int[] field1346; @ObfuscatedName("k") - float[][] field1345; - @ObfuscatedName("l") + int[] field1321; + @ObfuscatedName("u") + float[][] field1320; + @ObfuscatedName("n") @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(UrlRequest.iLog(this.entries - var2)); + int var4 = VorbisSample.readBits(class160.iLog(this.entries - var2)); for (var5 = 0; var5 < var4; ++var5) { this.lengthMap[var2++] = var3; @@ -53,7 +53,7 @@ public class VorbisCodebook { } } - this.method2317(); + this.method2252(); 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.field1346 = new int[var7]; + this.field1321 = new int[var7]; int var8; for (var8 = 0; var8 < var7; ++var8) { - this.field1346[var8] = VorbisSample.readBits(var5); + this.field1321[var8] = VorbisSample.readBits(var5); } - this.field1345 = new float[this.entries][this.dimensions]; + this.field1320 = 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.field1346[var12] * var16 + var15 + var9; - this.field1345[var8][var11] = var13; + float var13 = (float)this.field1321[var12] * var16 + var15 + var9; + this.field1320[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.field1346[var10] * var16 + var15 + var9; - this.field1345[var8][var11] = var17; + float var17 = (float)this.field1321[var10] * var16 + var15 + var9; + this.field1320[var8][var11] = var17; if (var6) { var9 = var17; } @@ -114,8 +114,8 @@ public class VorbisCodebook { } - @ObfuscatedName("w") - void method2317() { + @ObfuscatedName("j") + void method2252() { int[] var1 = new int[this.entries]; int[] var2 = new int[33]; @@ -208,8 +208,8 @@ public class VorbisCodebook { } - @ObfuscatedName("e") - int method2325() { + @ObfuscatedName("i") + int method2254() { 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("p") - float[] method2318() { - return this.field1345[this.method2325()]; + @ObfuscatedName("k") + float[] method2255() { + return this.field1320[this.method2254()]; } - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("mapType1QuantValues") static int mapType1QuantValues(int var0, int var1) { - int var2; - for (var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; MouseHandler.method1009(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 0f19930986..d60b5b522f 100644 --- a/runescape-client/src/main/java/VorbisFloor.java +++ b/runescape-client/src/main/java/VorbisFloor.java @@ -5,40 +5,40 @@ import net.runelite.mapping.ObfuscatedName; @ObfuscatedName("dr") @Implements("VorbisFloor") public class VorbisFloor { - @ObfuscatedName("q") - static final int[] field1402; - @ObfuscatedName("w") + @ObfuscatedName("s") + static final int[] field1372; + @ObfuscatedName("j") @Export("VorbisFloor_decibelStatics") static final float[] VorbisFloor_decibelStatics; + @ObfuscatedName("d") + static int[] field1368; @ObfuscatedName("f") - static int[] field1403; - @ObfuscatedName("m") - static int[] field1404; - @ObfuscatedName("u") - static boolean[] field1405; - @ObfuscatedName("e") - int[] field1396; - @ObfuscatedName("p") + static int[] field1376; + @ObfuscatedName("c") + static boolean[] field1378; + @ObfuscatedName("i") + int[] field1367; + @ObfuscatedName("k") @Export("multiplier") int multiplier; - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("partitionClassList") int[] partitionClassList; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("classDimensions") int[] classDimensions; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("classSubClasses") int[] classSubClasses; - @ObfuscatedName("i") + @ObfuscatedName("q") @Export("classMasterbooks") int[] classMasterbooks; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("subclassBooks") int[][] subclassBooks; static { - field1402 = new int[]{256, 128, 86, 64}; + field1372 = 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}; } @@ -46,75 +46,76 @@ public class VorbisFloor { int var1 = VorbisSample.readBits(16); if (var1 != 1) { throw new RuntimeException(); - } - int var2 = VorbisSample.readBits(5); - int var3 = 0; - this.partitionClassList = new int[var2]; + } else { + int var2 = VorbisSample.readBits(5); + int var3 = 0; + this.partitionClassList = new int[var2]; - int var4; - int var5; - for (var4 = 0; var4 < var2; ++var4) { - var5 = VorbisSample.readBits(4); - this.partitionClassList[var4] = var5; - if (var5 >= var3) { - var3 = var5 + 1; - } - } - - this.classDimensions = new int[var3]; - this.classSubClasses = new int[var3]; - this.classMasterbooks = new int[var3]; - this.subclassBooks = new int[var3][]; - - int var7; - for (var4 = 0; var4 < var3; ++var4) { - this.classDimensions[var4] = VorbisSample.readBits(3) + 1; - var5 = this.classSubClasses[var4] = VorbisSample.readBits(2); - if (var5 != 0) { - this.classMasterbooks[var4] = VorbisSample.readBits(8); + int var4; + int var5; + for (var4 = 0; var4 < var2; ++var4) { + var5 = VorbisSample.readBits(4); + this.partitionClassList[var4] = var5; + if (var5 >= var3) { + var3 = var5 + 1; + } } - var5 = 1 << var5; - int[] var6 = new int[var5]; - this.subclassBooks[var4] = var6; + this.classDimensions = new int[var3]; + this.classSubClasses = new int[var3]; + this.classMasterbooks = new int[var3]; + this.subclassBooks = new int[var3][]; - for (var7 = 0; var7 < var5; ++var7) { - var6[var7] = VorbisSample.readBits(8) - 1; + int var7; + for (var4 = 0; var4 < var3; ++var4) { + this.classDimensions[var4] = VorbisSample.readBits(3) + 1; + var5 = this.classSubClasses[var4] = VorbisSample.readBits(2); + if (var5 != 0) { + this.classMasterbooks[var4] = VorbisSample.readBits(8); + } + + var5 = 1 << var5; + int[] var6 = new int[var5]; + this.subclassBooks[var4] = var6; + + for (var7 = 0; var7 < var5; ++var7) { + var6[var7] = VorbisSample.readBits(8) - 1; + } } - } - this.multiplier = VorbisSample.readBits(2) + 1; - var4 = VorbisSample.readBits(4); - var5 = 2; + this.multiplier = VorbisSample.readBits(2) + 1; + var4 = VorbisSample.readBits(4); + var5 = 2; - int var9; - for (var9 = 0; var9 < var2; ++var9) { - var5 += this.classDimensions[this.partitionClassList[var9]]; - } - - this.field1396 = new int[var5]; - this.field1396[0] = 0; - this.field1396[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.field1396[var5++] = VorbisSample.readBits(var4); + int var9; + for (var9 = 0; var9 < var2; ++var9) { + var5 += this.classDimensions[this.partitionClassList[var9]]; } - } - if (field1403 == null || field1403.length < var5) { - field1403 = new int[var5]; - field1404 = new int[var5]; - field1405 = new boolean[var5]; - } + this.field1367 = new int[var5]; + this.field1367[0] = 0; + this.field1367[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.field1367[var5++] = VorbisSample.readBits(var4); + } + } + + if (field1368 == null || field1368.length < var5) { + field1368 = new int[var5]; + field1376 = new int[var5]; + field1378 = new boolean[var5]; + } + + } } - @ObfuscatedName("e") - int method2379(int var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("i") + int method2315(int var1, int var2, int var3, int var4, int var5) { int var6 = var4 - var2; int var7 = var3 - var1; int var8 = var6 < 0 ? -var6 : var6; @@ -123,8 +124,8 @@ public class VorbisFloor { return var6 < 0 ? var2 - var10 : var10 + var2; } - @ObfuscatedName("p") - void method2380(int var1, int var2, int var3, int var4, float[] var5, int var6) { + @ObfuscatedName("k") + void method2317(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; @@ -152,82 +153,83 @@ public class VorbisFloor { } - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("VarbisFloor_sort") void VarbisFloor_sort(int var1, int var2) { if (var1 < var2) { int var3 = var1; - int var4 = field1403[var1]; - int var5 = field1404[var1]; - boolean var6 = field1405[var1]; + int var4 = field1368[var1]; + int var5 = field1376[var1]; + boolean var6 = field1378[var1]; for (int var7 = var1 + 1; var7 <= var2; ++var7) { - int var8 = field1403[var7]; + int var8 = field1368[var7]; if (var8 < var4) { - field1403[var3] = var8; - field1404[var3] = field1404[var7]; - field1405[var3] = field1405[var7]; + field1368[var3] = var8; + field1376[var3] = field1376[var7]; + field1378[var3] = field1378[var7]; ++var3; - field1403[var7] = field1403[var3]; - field1404[var7] = field1404[var3]; - field1405[var7] = field1405[var3]; + field1368[var7] = field1368[var3]; + field1376[var7] = field1376[var3]; + field1378[var7] = field1378[var3]; } } - field1403[var3] = var4; - field1404[var3] = var5; - field1405[var3] = var6; + field1368[var3] = var4; + field1376[var3] = var5; + field1378[var3] = var6; this.VarbisFloor_sort(var1, var3 - 1); this.VarbisFloor_sort(var3 + 1, var2); } } - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("readSubmapFloor") boolean readSubmapFloor() { boolean var1 = VorbisSample.readBit() != 0; if (!var1) { return false; - } - int var2 = this.field1396.length; + } else { + int var2 = this.field1367.length; - int var3; - for (var3 = 0; var3 < var2; ++var3) { - field1403[var3] = this.field1396[var3]; - } - - var3 = field1402[this.multiplier - 1]; - int var4 = UrlRequest.iLog(var3 - 1); - field1404[0] = VorbisSample.readBits(var4); - field1404[1] = VorbisSample.readBits(var4); - int var5 = 2; - - for (int var6 = 0; var6 < this.partitionClassList.length; ++var6) { - int var7 = this.partitionClassList[var6]; - int var8 = this.classDimensions[var7]; - int var9 = this.classSubClasses[var7]; - int var10 = (1 << var9) - 1; - int var11 = 0; - if (var9 > 0) { - var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method2325(); + int var3; + for (var3 = 0; var3 < var2; ++var3) { + field1368[var3] = this.field1367[var3]; } - for (int var12 = 0; var12 < var8; ++var12) { - int var13 = this.subclassBooks[var7][var11 & var10]; - var11 >>>= var9; - field1404[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method2325() : 0; - } - } + var3 = field1372[this.multiplier - 1]; + int var4 = class160.iLog(var3 - 1); + field1376[0] = VorbisSample.readBits(var4); + field1376[1] = VorbisSample.readBits(var4); + int var5 = 2; - return true; + for (int var6 = 0; var6 < this.partitionClassList.length; ++var6) { + int var7 = this.partitionClassList[var6]; + int var8 = this.classDimensions[var7]; + int var9 = this.classSubClasses[var7]; + int var10 = (1 << var9) - 1; + int var11 = 0; + if (var9 > 0) { + var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method2254(); + } + + for (int var12 = 0; var12 < var8; ++var12) { + int var13 = this.subclassBooks[var7][var11 & var10]; + var11 >>>= var9; + field1376[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method2254() : 0; + } + } + + return true; + } } - @ObfuscatedName("b") - void method2389(float[] var1, int var2) { - int var3 = this.field1396.length; - int var4 = field1402[this.multiplier - 1]; - boolean[] var5 = field1405; - field1405[1] = true; + @ObfuscatedName("t") + void method2321(float[] var1, int var2) { + int var3 = this.field1367.length; + int var4 = field1372[this.multiplier - 1]; + boolean[] var5 = field1378; + field1378[1] = true; var5[0] = true; int var6; @@ -236,37 +238,37 @@ public class VorbisFloor { int var9; int var10; for (var6 = 2; var6 < var3; ++var6) { - var7 = method2383(field1403, var6); - var8 = method2402(field1403, var6); - var9 = this.method2379(field1403[var7], field1404[var7], field1403[var8], field1404[var8], field1403[var6]); - var10 = field1404[var6]; + var7 = method2336(field1368, var6); + var8 = method2316(field1368, var6); + var9 = this.method2315(field1368[var7], field1376[var7], field1368[var8], field1376[var8], field1368[var6]); + var10 = field1376[var6]; int var11 = var4 - var9; int var13 = (var11 < var9 ? var11 : var9) << 1; if (var10 != 0) { - boolean[] var14 = field1405; - field1405[var8] = true; + boolean[] var14 = field1378; + field1378[var8] = true; var14[var7] = true; - field1405[var6] = true; + field1378[var6] = true; if (var10 >= var13) { - field1404[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; + field1376[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; } else { - field1404[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; + field1376[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; } } else { - field1405[var6] = false; - field1404[var6] = var9; + field1378[var6] = false; + field1376[var6] = var9; } } this.VarbisFloor_sort(0, var3 - 1); var6 = 0; - var7 = field1404[0] * this.multiplier; + var7 = field1376[0] * this.multiplier; for (var8 = 1; var8 < var3; ++var8) { - if (field1405[var8]) { - var9 = field1403[var8]; - var10 = field1404[var8] * this.multiplier; - this.method2380(var6, var7, var9, var10, var1, var2); + if (field1378[var8]) { + var9 = field1368[var8]; + var10 = field1376[var8] * this.multiplier; + this.method2317(var6, var7, var9, var10, var1, var2); if (var9 >= var2) { return; } @@ -284,8 +286,8 @@ public class VorbisFloor { } - @ObfuscatedName("q") - static int method2383(int[] var0, int var1) { + @ObfuscatedName("s") + static int method2336(int[] var0, int var1) { int var2 = var0[var1]; int var3 = -1; int var4 = Integer.MIN_VALUE; @@ -301,8 +303,8 @@ public class VorbisFloor { return var3; } - @ObfuscatedName("w") - static int method2402(int[] var0, int var1) { + @ObfuscatedName("j") + static int method2316(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 f15a7c0dc7..e6be152a9c 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("dp") +@ObfuscatedName("dw") @Implements("VorbisMapping") public class VorbisMapping { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("submaps") int submaps; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("mappingMux") int mappingMux; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("submapFloor") int[] submapFloor; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("submapResidue") int[] submapResidue; diff --git a/runescape-client/src/main/java/VorbisResidue.java b/runescape-client/src/main/java/VorbisResidue.java index aad2b87b3f..8c7313c5de 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("dl") +@ObfuscatedName("dc") @Implements("VorbisResidue") public class VorbisResidue { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("residueType") int residueType; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("begin") int begin; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("end") int end; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("partitionSize") int partitionSize; - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("classifications") int classifications; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("classbook") int classbook; - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("cascade") int[] cascade; @@ -56,8 +56,8 @@ public class VorbisResidue { } - @ObfuscatedName("q") - void method2499(float[] var1, int var2, boolean var3) { + @ObfuscatedName("s") + void method2444(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].method2325(); + var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method2254(); 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.method2318(); + float[] var17 = var14.method2255(); 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.method2318(); + float[] var19 = var14.method2255(); 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 bdbac439f9..816a4027c6 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("cs") @Implements("VorbisSample") public class VorbisSample extends Node { - @ObfuscatedName("b") + @ObfuscatedName("t") @Export("VorbisSample_bytes") static byte[] VorbisSample_bytes; - @ObfuscatedName("i") + @ObfuscatedName("q") @Export("VorbisSample_byteOffset") static int VorbisSample_byteOffset; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("VorbisSample_bitOffset") static int VorbisSample_bitOffset; - @ObfuscatedName("f") + @ObfuscatedName("d") @Export("VorbisSample_blockSize0") static int VorbisSample_blockSize0; - @ObfuscatedName("m") + @ObfuscatedName("f") @Export("VorbisSample_blockSize1") static int VorbisSample_blockSize1; - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "[Lck;" + signature = "[Lcx;" ) @Export("VorbisSample_codebooks") static VorbisCodebook[] VorbisSample_codebooks; - @ObfuscatedName("x") + @ObfuscatedName("r") @ObfuscatedSignature( signature = "[Ldr;" ) @Export("VorbisSample_floors") static VorbisFloor[] VorbisSample_floors; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "[Ldl;" + signature = "[Ldc;" ) @Export("VorbisSample_residues") static VorbisResidue[] VorbisSample_residues; - @ObfuscatedName("v") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "[Ldp;" + signature = "[Ldw;" ) @Export("VorbisSample_mappings") static VorbisMapping[] VorbisSample_mappings; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("VorbisSample_blockFlags") static boolean[] VorbisSample_blockFlags; @ObfuscatedName("g") @Export("VorbisSample_mapping") static int[] VorbisSample_mapping; - @ObfuscatedName("a") - static boolean field1372; - @ObfuscatedName("n") - static float[] field1378; - @ObfuscatedName("d") - static float[] field1355; - @ObfuscatedName("s") - static float[] field1379; - @ObfuscatedName("z") - static float[] field1380; - @ObfuscatedName("al") - static float[] field1377; + @ObfuscatedName("e") + static boolean field1345; + @ObfuscatedName("h") + static float[] field1329; + @ObfuscatedName("v") + static float[] field1330; + @ObfuscatedName("m") + static float[] field1343; + @ObfuscatedName("o") + static float[] field1353; @ObfuscatedName("av") - static float[] field1373; - @ObfuscatedName("as") - static float[] field1383; - @ObfuscatedName("aw") - static int[] field1384; - @ObfuscatedName("ad") - static int[] field1385; - @ObfuscatedName("q") - byte[][] field1366; - @ObfuscatedName("w") + static float[] field1354; + @ObfuscatedName("am") + static float[] field1355; + @ObfuscatedName("ai") + static float[] field1356; + @ObfuscatedName("af") + static int[] field1357; + @ObfuscatedName("az") + static int[] field1341; + @ObfuscatedName("s") + byte[][] field1348; + @ObfuscatedName("j") @Export("sampleRate") int sampleRate; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("sampleCount") int sampleCount; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("start") int start; - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("end") int end; + @ObfuscatedName("n") + boolean field1342; + @ObfuscatedName("z") + float[] field1346; + @ObfuscatedName("a") + int field1347; + @ObfuscatedName("w") + int field1335; @ObfuscatedName("l") - boolean field1364; - @ObfuscatedName("j") - float[] field1382; - @ObfuscatedName("t") - int field1374; - @ObfuscatedName("h") - int field1388; - @ObfuscatedName("o") - boolean field1370; - @ObfuscatedName("ag") + boolean field1349; + @ObfuscatedName("aj") @Export("samples") byte[] samples; - @ObfuscatedName("ar") - int field1387; - @ObfuscatedName("ax") - int field1381; + @ObfuscatedName("an") + int field1360; + @ObfuscatedName("at") + int field1361; static { - field1372 = false; + field1345 = false; } VorbisSample(byte[] var1) { this.read(var1); } - @ObfuscatedName("k") + @ObfuscatedName("u") @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.field1364 = true; + this.field1342 = true; } int var3 = var2.readInt(); - this.field1366 = new byte[var3][]; + this.field1348 = 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.field1366[var4] = var7; + this.field1348[var4] = var7; } } - @ObfuscatedName("b") - float[] method2348(int var1) { - VorbisSample_setData(this.field1366[var1], 0); + @ObfuscatedName("t") + float[] method2282(int var1) { + VorbisSample_setData(this.field1348[var1], 0); readBit(); - int var2 = readBits(UrlRequest.iLog(VorbisSample_mapping.length - 1)); + int var2 = readBits(class160.iLog(VorbisSample_mapping.length - 1)); boolean var3 = VorbisSample_blockFlags[var2]; int var4 = var3 ? VorbisSample_blockSize1 : VorbisSample_blockSize0; boolean var5 = false; @@ -192,27 +192,27 @@ public class VorbisSample extends Node { for (var17 = 0; var17 < var14.submaps; ++var17) { VorbisResidue var18 = VorbisSample_residues[var14.submapResidue[var17]]; - float[] var19 = field1378; - var18.method2499(var19, var4 >> 1, var45); + float[] var19 = field1329; + var18.method2444(var19, var4 >> 1, var45); } int var40; if (!var15) { var17 = var14.mappingMux; var40 = var14.submapFloor[var17]; - VorbisSample_floors[var40].method2389(field1378, var4 >> 1); + VorbisSample_floors[var40].method2321(field1329, var4 >> 1); } int var42; if (var15) { for (var17 = var4 >> 1; var17 < var4; ++var17) { - field1378[var17] = 0.0F; + field1329[var17] = 0.0F; } } else { var17 = var4 >> 1; var40 = var4 >> 2; var42 = var4 >> 3; - float[] var43 = field1378; + float[] var43 = field1329; int var21; for (var21 = 0; var21 < var17; ++var21) { @@ -223,10 +223,10 @@ public class VorbisSample extends Node { var43[var21] = -var43[var4 - var21 - 1]; } - float[] var44 = var3 ? field1377 : field1355; - float[] var22 = var3 ? field1373 : field1379; - float[] var23 = var3 ? field1383 : field1380; - int[] var24 = var3 ? field1385 : field1384; + float[] var44 = var3 ? field1354 : field1330; + float[] var22 = var3 ? field1355 : field1343; + float[] var23 = var3 ? field1356 : field1353; + int[] var24 = var3 ? field1341 : field1357; int var25; float var26; @@ -257,7 +257,7 @@ public class VorbisSample extends Node { var43[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; } - var25 = UrlRequest.iLog(var4 - 1); + var25 = class160.iLog(var4 - 1); int var47; int var48; @@ -354,113 +354,117 @@ public class VorbisSample extends Node { var43[var17 + var47] = var43[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); - field1378[var47] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); + var10000 = field1329; + 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); - field1378[var47] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); + var10000 = field1329; + var10000[var47] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } } float[] var41 = null; - if (this.field1374 > 0) { - var40 = var4 + this.field1374 >> 2; + if (this.field1347 > 0) { + var40 = var4 + this.field1347 >> 2; var41 = new float[var40]; int var20; - if (!this.field1370) { - for (var42 = 0; var42 < this.field1388; ++var42) { - var20 = var42 + (this.field1374 >> 1); - var41[var42] += this.field1382[var20]; + if (!this.field1349) { + for (var42 = 0; var42 < this.field1335; ++var42) { + var20 = var42 + (this.field1347 >> 1); + var41[var42] += this.field1346[var20]; } } if (!var15) { for (var42 = var8; var42 < var4 >> 1; ++var42) { var20 = var41.length - (var4 >> 1) + var42; - var41[var20] += field1378[var42]; + var41[var20] += field1329[var42]; } } } - float[] var46 = this.field1382; - this.field1382 = field1378; - field1378 = var46; - this.field1374 = var4; - this.field1388 = var12 - (var4 >> 1); - this.field1370 = var15; + float[] var46 = this.field1346; + this.field1346 = field1329; + field1329 = var46; + this.field1347 = var4; + this.field1335 = var12 - (var4 >> 1); + this.field1349 = var15; return var41; } - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "([I)Lcd;" + signature = "([I)Lco;" ) @Export("toRawSound") RawSound toRawSound(int[] var1) { if (var1 != null && var1[0] <= 0) { return null; - } - if (this.samples == null) { - this.field1374 = 0; - this.field1382 = new float[VorbisSample_blockSize1]; - this.samples = new byte[this.sampleCount]; - this.field1387 = 0; - this.field1381 = 0; - } - - for (; this.field1381 < this.field1366.length; ++this.field1381) { - if (var1 != null && var1[0] <= 0) { - return null; + } else { + if (this.samples == null) { + this.field1347 = 0; + this.field1346 = new float[VorbisSample_blockSize1]; + this.samples = new byte[this.sampleCount]; + this.field1360 = 0; + this.field1361 = 0; } - float[] var2 = this.method2348(this.field1381); - if (var2 != null) { - int var3 = this.field1387; - int var4 = var2.length; - if (var4 > this.sampleCount - var3) { - var4 = this.sampleCount - var3; + for (; this.field1361 < this.field1348.length; ++this.field1361) { + if (var1 != null && var1[0] <= 0) { + return null; } - for (int var5 = 0; var5 < var4; ++var5) { - int var6 = (int)(128.0F + var2[var5] * 128.0F); - if ((var6 & -256) != 0) { - var6 = ~var6 >> 31; + float[] var2 = this.method2282(this.field1361); + if (var2 != null) { + int var3 = this.field1360; + int var4 = var2.length; + if (var4 > this.sampleCount - var3) { + var4 = this.sampleCount - var3; } - this.samples[var3++] = (byte)(var6 - 128); - } + for (int var5 = 0; var5 < var4; ++var5) { + int var6 = (int)(128.0F + var2[var5] * 128.0F); + if ((var6 & -256) != 0) { + var6 = ~var6 >> 31; + } - if (var1 != null) { - var1[0] -= var3 - this.field1387; - } + this.samples[var3++] = (byte)(var6 - 128); + } - this.field1387 = var3; + if (var1 != null) { + var1[0] -= var3 - this.field1360; + } + + this.field1360 = var3; + } } - } - this.field1382 = null; - byte[] var7 = this.samples; - this.samples = null; - return new RawSound(this.sampleRate, var7, this.start, this.end, this.field1364); + this.field1346 = null; + byte[] var7 = this.samples; + this.samples = null; + return new RawSound(this.sampleRate, var7, this.start, this.end, this.field1342); + } } - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("float32Unpack") static float float32Unpack(int var0) { - int var1 = var0 & 0x1fffff; + int var1 = var0 & 2097151; int var2 = var0 & Integer.MIN_VALUE; - int var3 = (var0 & 0x7fe00000) >> 21; + int var3 = (var0 & 2145386496) >> 21; if (var2 != 0) { var1 = -var1; } - return (float)((double)var1 * Math.pow(2.0D, (double)(var3 - 0x314))); + return (float)((double)var1 * Math.pow(2.0D, (double)(var3 - 788))); } - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("VorbisSample_setData") static void VorbisSample_setData(byte[] var0, int var1) { VorbisSample_bytes = var0; @@ -468,7 +472,7 @@ public class VorbisSample extends Node { VorbisSample_bitOffset = 0; } - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("readBit") static int readBit() { int var0 = VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & 1; @@ -478,7 +482,7 @@ public class VorbisSample extends Node { return var0; } - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("readBits") static int readBits(int var0) { int var1 = 0; @@ -503,12 +507,12 @@ public class VorbisSample extends Node { return var1; } - @ObfuscatedName("l") - static void method2351(byte[] var0) { + @ObfuscatedName("n") + static void method2294(byte[] var0) { VorbisSample_setData(var0, 0); VorbisSample_blockSize0 = 1 << readBits(4); VorbisSample_blockSize1 = 1 << readBits(4); - field1378 = new float[VorbisSample_blockSize1]; + field1329 = new float[VorbisSample_blockSize1]; int var1; int var2; @@ -542,22 +546,22 @@ public class VorbisSample extends Node { } int[] var14 = new int[var5]; - int var10 = UrlRequest.iLog(var5 - 1); + int var10 = class160.iLog(var5 - 1); for (int var11 = 0; var11 < var5; ++var11) { - var14[var11] = ClientPreferences.method1757(var11, var10); + var14[var11] = WorldMapSection0.method215(var11, var10); } if (var1 != 0) { - field1377 = var6; - field1373 = var12; - field1383 = var13; - field1385 = var14; + field1354 = var6; + field1355 = var12; + field1356 = var13; + field1341 = var14; } else { - field1355 = var6; - field1379 = var12; - field1380 = var13; - field1384 = var14; + field1330 = var6; + field1343 = var12; + field1353 = var13; + field1357 = var14; } } @@ -608,35 +612,36 @@ public class VorbisSample extends Node { } - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lhp;)Z" + signature = "(Lhz;)Z" ) - static boolean method2349(AbstractArchive var0) { - if (!field1372) { + static boolean method2289(AbstractArchive var0) { + if (!field1345) { byte[] var1 = var0.takeFile(0, 0); if (var1 == null) { return false; } - method2351(var1); - field1372 = true; + method2294(var1); + field1345 = true; } return true; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lhp;II)Lci;" + signature = "(Lhz;II)Lcs;" ) @Export("readMusicSample") static VorbisSample readMusicSample(AbstractArchive var0, int var1, int var2) { - if (!method2349(var0)) { + if (!method2289(var0)) { var0.tryLoadFile(var1, var2); return null; + } else { + byte[] var3 = var0.takeFile(var1, var2); + return var3 == null ? null : new VorbisSample(var3); } - byte[] var3 = var0.takeFile(var1, var2); - return var3 == null ? null : new VorbisSample(var3); } } diff --git a/runescape-client/src/main/java/WallDecoration.java b/runescape-client/src/main/java/WallDecoration.java index bca75ad42e..2e0af4c129 100644 --- a/runescape-client/src/main/java/WallDecoration.java +++ b/runescape-client/src/main/java/WallDecoration.java @@ -1,75 +1,87 @@ +import java.io.BufferedReader; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringReader; +import java.io.StringWriter; 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("ei") +@ObfuscatedName("ec") @Implements("WallDecoration") public final class WallDecoration { - @ObfuscatedName("q") + @ObfuscatedName("hs") @ObfuscatedGetter( - intValue = 1872492475 + intValue = 1884490031 + ) + @Export("cameraX") + static int cameraX; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -1455468639 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -185034131 + intValue = -1625268339 ) @Export("x") int x; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1951564087 + intValue = -1008616069 ) @Export("y") int y; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1472564709 + intValue = 1888618101 ) @Export("orientation") int orientation; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 909597607 + intValue = -1426689619 ) @Export("orientation2") int orientation2; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1726678055 + intValue = 1112566739 ) @Export("xOffset") int xOffset; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1895972445 + intValue = 1176154873 ) @Export("yOffset") int yOffset; - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Leo;" + signature = "Len;" ) @Export("entity1") public Entity entity1; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Leo;" + signature = "Len;" ) @Export("entity2") public Entity entity2; - @ObfuscatedName("f") + @ObfuscatedName("d") @ObfuscatedGetter( - longValue = -3118431343692928767L + longValue = -7342954740036986227L ) @Export("tag") public long tag; - @ObfuscatedName("m") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -359663539 + intValue = 798817733 ) @Export("flags") int flags; @@ -81,48 +93,278 @@ public final class WallDecoration { @ObfuscatedName("i") @ObfuscatedSignature( - signature = "([BI)Lke;", - garbageValue = "107452813" + signature = "(Ljava/lang/Throwable;I)Ljava/lang/String;", + garbageValue = "-147056838" ) - @Export("SpriteBuffer_createFont") - public static Font SpriteBuffer_createFont(byte[] var0) { - if (var0 == null) { - return null; + @Export("shortenStackTrace") + static String shortenStackTrace(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 + ' '; + } } - Font var1 = new Font(var0, Varps.SpriteBuffer_xOffsets, SpriteBuffer.SpriteBuffer_yOffsets, SpriteBuffer.SpriteBuffer_spriteWidths, class216.SpriteBuffer_spriteHeights, Frames.SpriteBuffer_spritePalette, SpriteBuffer.SpriteBuffer_pixels); - class16.SpriteBuffer_clear(); - return var1; } - @ObfuscatedName("g") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-2066331179" + signature = "(Ljava/lang/CharSequence;B)I", + garbageValue = "42" ) - public static int method3292(int var0) { + @Export("parseInt") + public static int parseInt(CharSequence var0) { + return Ignored.parseIntCustomRadix(var0, 10, true); + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "(IB)I", + garbageValue = "1" + ) + public static int method3245(int var0) { if (var0 > 0) { return 1; + } else { + return var0 < 0 ? -1 : 0; } - return var0 < 0 ? -1 : 0; } - @ObfuscatedName("as") + @ObfuscatedName("au") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "2093071208" + signature = "(ILcr;ZI)I", + garbageValue = "234217690" ) - protected static final void method3291() { - GameShell.clock.mark(); + static int method3243(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class173.loadWorlds() ? 1 : 0; + return 1; + } else { + World var3; + if (var0 == ScriptOpcodes.WORLDLIST_START) { + var3 = DevicePcmPlayerProvider.worldListStart(); + if (var3 != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.id; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.properties; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.activity; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.location; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.population; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.host; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } - int var0; - for (var0 = 0; var0 < 32; ++var0) { - GameShell.field452[var0] = 0L; + return 1; + } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { + var3 = GrandExchangeOfferAgeComparator.getNextWorldListWorld(); + if (var3 != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.id; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.properties; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.activity; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.location; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.population; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.host; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else { + World var4; + int var5; + int var7; + if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var4 = null; + + for (var5 = 0; var5 < World.World_count; ++var5) { + if (var7 == ChatChannel.World_worlds[var5].id) { + var4 = ChatChannel.World_worlds[var5]; + break; + } + } + + if (var4 != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.id; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.properties; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.activity; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.location; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.population; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.host; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { + Interpreter.Interpreter_intStackSize -= 4; + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + boolean var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + boolean var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3] == 1; + MouseHandler.sortWorldList(var7, var10, var5, var6); + return 1; + } else if (var0 != ScriptOpcodes.GETWORLDINFO) { + if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { + Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else { + int var8; + ParamDefinition var9; + if (var0 == ScriptOpcodes.NC_PARAM) { + Interpreter.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var9 = VarcInt.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ViewportMouse.getNpcDefinition(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ViewportMouse.getNpcDefinition(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } else if (var0 == ScriptOpcodes.LC_PARAM) { + Interpreter.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var9 = VarcInt.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class215.getObjectDefinition(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class215.getObjectDefinition(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_PARAM) { + Interpreter.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var9 = VarcInt.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = WorldMapData_0.ItemDefinition_get(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapData_0.ItemDefinition_get(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { + Interpreter.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + var9 = VarcInt.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class43.StructDefinition_getStructDefinition(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class43.StructDefinition_getStructDefinition(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } else if (var0 == ScriptOpcodes.ON_MOBILE) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLIENTTYPE) { + Interpreter.Interpreter_intStack[++Interpreter.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) { + --Interpreter.Interpreter_stringStackSize; + --Interpreter.Interpreter_intStackSize; + return 1; + } else if (var0 == 6523) { + --Interpreter.Interpreter_stringStackSize; + --Interpreter.Interpreter_intStackSize; + return 1; + } else if (var0 == ScriptOpcodes.BATTERYLEVEL) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + return 1; + } else if (var0 == ScriptOpcodes.BATTERYCHARGING) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + return 1; + } else if (var0 == ScriptOpcodes.WIFIAVAILABLE) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + return 1; + } else { + return 2; + } + } + } else { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (var7 >= 0 && var7 < World.World_count) { + var4 = ChatChannel.World_worlds[var7]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.id; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.properties; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.activity; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.location; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.population; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.host; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } + } } - - for (var0 = 0; var0 < 32; ++var0) { - GameShell.field453[var0] = 0L; - } - - GameShell.field449 = 0; } } diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index 22ed4b89a0..9f4e9fba42 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -4,691 +4,697 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hj") +@ObfuscatedName("hp") @Implements("Widget") public class Widget extends Node { - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "[[Lhj;" + signature = "[[Lhp;" ) @Export("Widget_interfaceComponents") public static Widget[][] Widget_interfaceComponents; - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Lhp;" - ) - @Export("Widget_archive") - public static AbstractArchive Widget_archive; @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lhz;" + ) + @Export("Widget_archive") + static AbstractArchive Widget_archive; + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "Lhz;" + ) + @Export("Widget_fontsArchive") + static AbstractArchive Widget_fontsArchive; + @ObfuscatedName("r") + @ObfuscatedSignature( + signature = "Lep;" ) @Export("Widget_cachedSprites") static EvictingDualNodeHashTable Widget_cachedSprites; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lep;" ) @Export("Widget_cachedModels") static EvictingDualNodeHashTable Widget_cachedModels; - @ObfuscatedName("v") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lep;" ) @Export("Widget_cachedFonts") static EvictingDualNodeHashTable Widget_cachedFonts; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lep;" ) @Export("Widget_cachedSpriteMasks") static EvictingDualNodeHashTable Widget_cachedSpriteMasks; @ObfuscatedName("g") - public static boolean field2562; - @ObfuscatedName("a") + public static boolean field2579; + @ObfuscatedName("e") @Export("isIf3") public boolean isIf3; - @ObfuscatedName("j") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 158584387 + intValue = 1708719923 ) @Export("id") public int id; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1544000877 + intValue = 467661249 ) @Export("childIndex") public int childIndex; - @ObfuscatedName("h") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -864720251 + intValue = -1925555435 ) @Export("type") public int type; - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -880099821 + intValue = -275504647 ) @Export("buttonType") public int buttonType; - @ObfuscatedName("n") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1944932789 + intValue = 939098119 ) @Export("contentType") public int contentType; - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 987746495 + intValue = -672675163 ) @Export("xAlignment") public int xAlignment; - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 717061483 + intValue = -2007868025 ) @Export("yAlignment") public int yAlignment; - @ObfuscatedName("z") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 997023099 + intValue = 341778039 ) @Export("widthAlignment") public int widthAlignment; - @ObfuscatedName("al") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -498004417 + intValue = 1959652011 ) @Export("heightAlignment") public int heightAlignment; - @ObfuscatedName("av") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -1285685435 + intValue = 2096231869 ) @Export("rawX") public int rawX; - @ObfuscatedName("as") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = 601625019 + intValue = 1182032235 ) @Export("rawY") public int rawY; - @ObfuscatedName("aw") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 1455891423 + intValue = 2138399125 ) @Export("rawWidth") public int rawWidth; - @ObfuscatedName("ad") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -1245544493 + intValue = -1680813471 ) @Export("rawHeight") public int rawHeight; - @ObfuscatedName("ag") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 468921479 + intValue = 1019695869 ) @Export("x") public int x; - @ObfuscatedName("ar") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -1717840937 + intValue = -1173334909 ) @Export("y") public int y; - @ObfuscatedName("ax") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -207604811 + intValue = -330046731 ) @Export("width") public int width; - @ObfuscatedName("az") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 652469727 + intValue = -1817487801 ) @Export("height") public int height; - @ObfuscatedName("ae") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -1037362729 + intValue = -959032847 ) - public int field2636; + public int field2538; @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 282635247 + intValue = -275378447 ) - public int field2582; - @ObfuscatedName("aj") + public int field2612; + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -1620194855 + intValue = 1923401589 ) @Export("parentId") public int parentId; - @ObfuscatedName("at") + @ObfuscatedName("ar") @Export("isHidden") public boolean isHidden; - @ObfuscatedName("ac") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -481429601 + intValue = 1482452977 ) @Export("scrollX") public int scrollX; - @ObfuscatedName("ap") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 910134597 + intValue = -2016289711 ) @Export("scrollY") public int scrollY; - @ObfuscatedName("aq") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 1233349313 + intValue = 260494285 ) @Export("scrollWidth") public int scrollWidth; @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -794847893 + intValue = -2146218681 ) @Export("scrollHeight") public int scrollHeight; - @ObfuscatedName("an") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 900294255 + intValue = -510289111 ) @Export("color") public int color; - @ObfuscatedName("au") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 105989459 + intValue = 69172767 ) @Export("color2") public int color2; - @ObfuscatedName("ai") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 1301053947 + intValue = -1460620473 ) @Export("mouseOverColor") public int mouseOverColor; - @ObfuscatedName("ak") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -345653957 + intValue = -1672372405 ) @Export("mouseOverColor2") public int mouseOverColor2; - @ObfuscatedName("ah") + @ObfuscatedName("al") @Export("fill") public boolean fill; - @ObfuscatedName("am") + @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "Lll;" + signature = "Llb;" ) @Export("fillMode") public FillMode fillMode; - @ObfuscatedName("ay") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -1372029575 + intValue = -1495392275 ) @Export("transparencyTop") public int transparencyTop; - @ObfuscatedName("af") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -575464839 + intValue = -1571027933 ) @Export("transparencyBot") public int transparencyBot; - @ObfuscatedName("ab") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -319407573 + intValue = -1813251577 ) @Export("lineWid") public int lineWid; - @ObfuscatedName("bp") - public boolean field2598; - @ObfuscatedName("bz") + @ObfuscatedName("bk") + public boolean field2601; + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = -876595051 + intValue = 1520736473 ) @Export("spriteId2") public int spriteId2; - @ObfuscatedName("bi") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = 1580941445 + intValue = 1571387993 ) @Export("spriteId") public int spriteId; - @ObfuscatedName("bg") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = 683998235 + intValue = -332735913 ) @Export("spriteAngle") public int spriteAngle; - @ObfuscatedName("bh") + @ObfuscatedName("bp") @Export("spriteTiling") public boolean spriteTiling; - @ObfuscatedName("bm") + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = -321597231 + intValue = 1938856491 ) @Export("outline") public int outline; - @ObfuscatedName("bn") + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = 75735867 + intValue = 854730489 ) @Export("spriteShadow") public int spriteShadow; - @ObfuscatedName("bc") + @ObfuscatedName("bv") @Export("spriteFlipV") public boolean spriteFlipV; - @ObfuscatedName("bx") + @ObfuscatedName("bj") @Export("spriteFlipH") public boolean spriteFlipH; - @ObfuscatedName("bo") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = 846816051 + intValue = 20966337 ) @Export("modelType") public int modelType; - @ObfuscatedName("bb") + @ObfuscatedName("by") @ObfuscatedGetter( - intValue = 1563127453 + intValue = 1167866435 ) @Export("modelId") public int modelId; @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = -283106593 + intValue = 1287087547 ) @Export("modelType2") int modelType2; - @ObfuscatedName("bj") + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = -1633810101 + intValue = -1636240977 ) @Export("modelId2") int modelId2; - @ObfuscatedName("bl") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = -234048173 + intValue = -1464893801 ) @Export("sequenceId") public int sequenceId; @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = -141585849 + intValue = 102645467 ) @Export("sequenceId2") public int sequenceId2; - @ObfuscatedName("by") + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = 1696056233 + intValue = 1360150457 ) @Export("modelOffsetX") public int modelOffsetX; - @ObfuscatedName("bt") + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = 908250059 + intValue = -453431795 ) @Export("modelOffsetY") public int modelOffsetY; - @ObfuscatedName("bq") + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = 1607699645 + intValue = 787059755 ) @Export("modelAngleX") public int modelAngleX; - @ObfuscatedName("bu") + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = 696166099 + intValue = -1741571787 ) @Export("modelAngleY") public int modelAngleY; - @ObfuscatedName("bw") + @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = -2033298185 + intValue = 1967716375 ) @Export("modelAngleZ") public int modelAngleZ; - @ObfuscatedName("br") + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = -321826555 + intValue = 1984472705 ) @Export("modelZoom") public int modelZoom; - @ObfuscatedName("bk") + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = 1070193225 + intValue = -1968433305 ) - public int field2619; - @ObfuscatedName("bf") + public int field2638; + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = -1940340785 + intValue = 1213259299 ) - public int field2575; - @ObfuscatedName("bv") + public int field2602; + @ObfuscatedName("bg") @Export("modelOrthog") public boolean modelOrthog; @ObfuscatedName("be") @Export("modelTransparency") public boolean modelTransparency; - @ObfuscatedName("ba") + @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = -2132117517 + intValue = 1215332137 ) @Export("itemQuantityMode") public int itemQuantityMode; - @ObfuscatedName("cr") + @ObfuscatedName("ce") @ObfuscatedGetter( - intValue = 1233826431 + intValue = 1192242139 ) @Export("fontId") public int fontId; - @ObfuscatedName("cf") + @ObfuscatedName("ci") @Export("text") public String text; - @ObfuscatedName("cj") + @ObfuscatedName("ck") @Export("text2") public String text2; - @ObfuscatedName("cl") + @ObfuscatedName("cc") @ObfuscatedGetter( - intValue = 1697523401 + intValue = 1510391685 ) @Export("textLineHeight") public int textLineHeight; - @ObfuscatedName("cn") + @ObfuscatedName("cd") @ObfuscatedGetter( - intValue = -1511938645 + intValue = -1557971945 ) @Export("textXAlignment") public int textXAlignment; - @ObfuscatedName("cy") + @ObfuscatedName("cf") @ObfuscatedGetter( - intValue = 1416587481 + intValue = -1274290249 ) @Export("textYAlignment") public int textYAlignment; - @ObfuscatedName("ct") + @ObfuscatedName("cw") @Export("textShadowed") public boolean textShadowed; - @ObfuscatedName("cq") + @ObfuscatedName("cj") @ObfuscatedGetter( - intValue = 1258193639 + intValue = -705081305 ) @Export("paddingX") public int paddingX; @ObfuscatedName("cp") @ObfuscatedGetter( - intValue = -722730749 + intValue = 1539639069 ) @Export("paddingY") public int paddingY; - @ObfuscatedName("ch") + @ObfuscatedName("cu") @Export("inventoryXOffsets") public int[] inventoryXOffsets; - @ObfuscatedName("co") + @ObfuscatedName("cm") @Export("inventoryYOffsets") public int[] inventoryYOffsets; - @ObfuscatedName("cw") + @ObfuscatedName("cb") @Export("inventorySprites") public int[] inventorySprites; - @ObfuscatedName("ca") + @ObfuscatedName("ch") @Export("itemActions") public String[] itemActions; - @ObfuscatedName("cb") + @ObfuscatedName("cn") @ObfuscatedGetter( - intValue = 1890187799 + intValue = -518716407 ) @Export("clickMask") public int clickMask; - @ObfuscatedName("cx") - public boolean field2704; - @ObfuscatedName("cu") - public byte[][] field2650; - @ObfuscatedName("cs") - public byte[][] field2625; - @ObfuscatedName("cz") - public int[] field2641; - @ObfuscatedName("cm") - public int[] field2588; + @ObfuscatedName("cr") + public boolean field2620; + @ObfuscatedName("cl") + public byte[][] field2631; + @ObfuscatedName("cg") + public byte[][] field2622; + @ObfuscatedName("cq") + public int[] field2623; + @ObfuscatedName("ct") + public int[] field2581; @ObfuscatedName("dr") @Export("dataText") public String dataText; - @ObfuscatedName("dn") + @ObfuscatedName("dd") @Export("actions") public String[] actions; - @ObfuscatedName("dw") + @ObfuscatedName("dv") @ObfuscatedSignature( - signature = "Lhj;" + signature = "Lhp;" ) @Export("parent") public Widget parent; - @ObfuscatedName("dg") + @ObfuscatedName("da") @ObfuscatedGetter( - intValue = 377025817 + intValue = -288578645 ) @Export("dragZoneSize") public int dragZoneSize; - @ObfuscatedName("df") + @ObfuscatedName("dh") @ObfuscatedGetter( - intValue = -600496525 + intValue = 340622083 ) @Export("dragThreshold") public int dragThreshold; - @ObfuscatedName("dt") + @ObfuscatedName("dm") @Export("isScrollBar") public boolean isScrollBar; @ObfuscatedName("dj") @Export("spellActionName") public String spellActionName; - @ObfuscatedName("dl") + @ObfuscatedName("dc") @Export("hasListener") public boolean hasListener; - @ObfuscatedName("dz") + @ObfuscatedName("db") @Export("onLoad") public Object[] onLoad; - @ObfuscatedName("dh") + @ObfuscatedName("dx") @Export("onClick") public Object[] onClick; - @ObfuscatedName("dy") + @ObfuscatedName("dp") @Export("onClickRepeat") public Object[] onClickRepeat; - @ObfuscatedName("dx") + @ObfuscatedName("dz") @Export("onRelease") public Object[] onRelease; - @ObfuscatedName("dp") + @ObfuscatedName("dw") @Export("onHold") public Object[] onHold; - @ObfuscatedName("de") + @ObfuscatedName("dn") @Export("onMouseOver") public Object[] onMouseOver; - @ObfuscatedName("du") + @ObfuscatedName("ds") @Export("onMouseRepeat") public Object[] onMouseRepeat; - @ObfuscatedName("do") + @ObfuscatedName("dt") @Export("onMouseLeave") public Object[] onMouseLeave; - @ObfuscatedName("dc") + @ObfuscatedName("du") @Export("onDrag") public Object[] onDrag; - @ObfuscatedName("ds") + @ObfuscatedName("dq") @Export("onDragComplete") public Object[] onDragComplete; - @ObfuscatedName("dk") + @ObfuscatedName("dg") @Export("onTargetEnter") public Object[] onTargetEnter; - @ObfuscatedName("dq") + @ObfuscatedName("dy") @Export("onTargetLeave") public Object[] onTargetLeave; - @ObfuscatedName("db") + @ObfuscatedName("dk") @Export("onVarTransmit") public Object[] onVarTransmit; - @ObfuscatedName("da") + @ObfuscatedName("di") @Export("varTransmitTriggers") public int[] varTransmitTriggers; - @ObfuscatedName("dv") + @ObfuscatedName("de") @Export("onInvTransmit") public Object[] onInvTransmit; - @ObfuscatedName("dm") + @ObfuscatedName("do") @Export("invTransmitTriggers") public int[] invTransmitTriggers; - @ObfuscatedName("di") + @ObfuscatedName("df") @Export("onStatTransmit") public Object[] onStatTransmit; - @ObfuscatedName("dd") + @ObfuscatedName("dl") @Export("statTransmitTriggers") public int[] statTransmitTriggers; - @ObfuscatedName("ev") + @ObfuscatedName("eo") @Export("onTimer") public Object[] onTimer; - @ObfuscatedName("et") + @ObfuscatedName("ef") @Export("onOp") public Object[] onOp; - @ObfuscatedName("ej") + @ObfuscatedName("ex") @Export("onScroll") public Object[] onScroll; - @ObfuscatedName("er") + @ObfuscatedName("ea") @Export("onChatTransmit") public Object[] onChatTransmit; - @ObfuscatedName("eu") + @ObfuscatedName("em") @Export("onKey") public Object[] onKey; - @ObfuscatedName("eo") + @ObfuscatedName("en") @Export("onFriendTransmit") public Object[] onFriendTransmit; - @ObfuscatedName("em") + @ObfuscatedName("ey") @Export("onClanTransmit") public Object[] onClanTransmit; - @ObfuscatedName("en") + @ObfuscatedName("ei") @Export("onMiscTransmit") public Object[] onMiscTransmit; - @ObfuscatedName("ek") + @ObfuscatedName("ee") @Export("onDialogAbort") public Object[] onDialogAbort; - @ObfuscatedName("ef") + @ObfuscatedName("eh") @Export("onSubChange") public Object[] onSubChange; - @ObfuscatedName("eg") + @ObfuscatedName("eq") @Export("onResize") public Object[] onResize; - @ObfuscatedName("ei") + @ObfuscatedName("ec") @Export("onStockTransmit") public Object[] onStockTransmit; - @ObfuscatedName("es") - public Object[] field2681; - @ObfuscatedName("ez") + @ObfuscatedName("ej") + public Object[] field2663; + @ObfuscatedName("eg") @Export("cs1Instructions") public int[][] cs1Instructions; - @ObfuscatedName("ex") + @ObfuscatedName("er") @Export("cs1Comparisons") public int[] cs1Comparisons; - @ObfuscatedName("el") + @ObfuscatedName("ep") @Export("cs1ComparisonValues") public int[] cs1ComparisonValues; - @ObfuscatedName("ep") + @ObfuscatedName("ek") @ObfuscatedGetter( - intValue = -1660027401 + intValue = 43324545 ) @Export("mouseOverRedirect") public int mouseOverRedirect; - @ObfuscatedName("eq") + @ObfuscatedName("et") @Export("spellName") public String spellName; - @ObfuscatedName("ew") + @ObfuscatedName("ed") @Export("buttonText") public String buttonText; - @ObfuscatedName("ed") + @ObfuscatedName("es") @Export("itemIds") public int[] itemIds; - @ObfuscatedName("ee") + @ObfuscatedName("ez") @Export("itemQuantities") public int[] itemQuantities; - @ObfuscatedName("ea") + @ObfuscatedName("eb") @ObfuscatedGetter( - intValue = -1747969251 + intValue = 516422107 ) @Export("itemId") public int itemId; - @ObfuscatedName("eh") + @ObfuscatedName("eu") @ObfuscatedGetter( - intValue = 123297545 + intValue = -46773205 ) @Export("itemQuantity") public int itemQuantity; - @ObfuscatedName("ey") + @ObfuscatedName("el") @ObfuscatedGetter( - intValue = -496948185 + intValue = 311105125 ) @Export("modelFrame") public int modelFrame; - @ObfuscatedName("ec") + @ObfuscatedName("ew") @ObfuscatedGetter( - intValue = -471723099 + intValue = -1489750537 ) @Export("modelFrameCycle") public int modelFrameCycle; - @ObfuscatedName("eb") + @ObfuscatedName("ev") @ObfuscatedSignature( - signature = "[Lhj;" + signature = "[Lhp;" ) @Export("children") public Widget[] children; - @ObfuscatedName("fi") + @ObfuscatedName("fz") @Export("containsMouse") public boolean containsMouse; - @ObfuscatedName("fk") + @ObfuscatedName("fd") @Export("isClicked") public boolean isClicked; - @ObfuscatedName("fg") + @ObfuscatedName("fi") @ObfuscatedGetter( - intValue = -1473790409 + intValue = -1141206537 ) - public int field2689; - @ObfuscatedName("fz") + public int field2679; + @ObfuscatedName("ff") @ObfuscatedGetter( - intValue = 938926237 + intValue = -1086259501 ) - public int field2592; + public int field2680; @ObfuscatedName("fn") @ObfuscatedGetter( - intValue = 1322548605 + intValue = -1915688435 ) - public int field2603; - @ObfuscatedName("fr") + public int field2681; + @ObfuscatedName("fc") @ObfuscatedGetter( - intValue = -1647708895 + intValue = -1456076353 ) - public int field2700; - @ObfuscatedName("fm") + public int field2591; + @ObfuscatedName("fv") @ObfuscatedGetter( - intValue = 437901973 + intValue = 1549084931 ) @Export("rootIndex") public int rootIndex; - @ObfuscatedName("ft") + @ObfuscatedName("fy") @ObfuscatedGetter( - intValue = -1179996371 + intValue = -139544989 ) @Export("cycle") public int cycle; - @ObfuscatedName("fe") - public int[] field2578; - @ObfuscatedName("fa") + @ObfuscatedName("fg") + public int[] field2685; + @ObfuscatedName("ft") @Export("noClickThrough") public boolean noClickThrough; - @ObfuscatedName("fs") + @ObfuscatedName("fu") @Export("noScrollThrough") public boolean noScrollThrough; - @ObfuscatedName("ff") - public boolean field2691; + @ObfuscatedName("fh") + public boolean field2688; static { Widget_cachedSprites = new EvictingDualNodeHashTable(200); Widget_cachedModels = new EvictingDualNodeHashTable(50); Widget_cachedFonts = new EvictingDualNodeHashTable(20); Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(8); - field2562 = false; + field2579 = false; } public Widget() { @@ -709,8 +715,8 @@ public class Widget extends Node { this.y = 0; this.width = 0; this.height = 0; - this.field2636 = 1; - this.field2582 = 1; + this.field2538 = 1; + this.field2612 = 1; this.parentId = -1; this.isHidden = false; this.scrollX = 0; @@ -726,7 +732,7 @@ public class Widget extends Node { this.transparencyTop = 0; this.transparencyBot = 0; this.lineWid = 1; - this.field2598 = false; + this.field2601 = false; this.spriteId2 = -1; this.spriteId = -1; this.spriteAngle = 0; @@ -745,8 +751,8 @@ public class Widget extends Node { this.modelAngleY = 0; this.modelAngleZ = 0; this.modelZoom = 100; - this.field2619 = 0; - this.field2575 = 0; + this.field2638 = 0; + this.field2602 = 0; this.modelOrthog = false; this.modelTransparency = false; this.itemQuantityMode = 2; @@ -760,7 +766,7 @@ public class Widget extends Node { this.paddingX = 0; this.paddingY = 0; this.clickMask = 0; - this.field2704 = false; + this.field2620 = false; this.dataText = ""; this.parent = null; this.dragZoneSize = 0; @@ -777,21 +783,21 @@ public class Widget extends Node { this.modelFrameCycle = 0; this.containsMouse = false; this.isClicked = false; - this.field2689 = -1; - this.field2592 = 0; - this.field2603 = 0; - this.field2700 = 0; + this.field2679 = -1; + this.field2680 = 0; + this.field2681 = 0; + this.field2591 = 0; this.rootIndex = -1; this.cycle = -1; this.noClickThrough = false; this.noScrollThrough = false; - this.field2691 = false; + this.field2688 = false; } - @ObfuscatedName("k") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Lkf;B)V", - garbageValue = "9" + signature = "(Lky;I)V", + garbageValue = "-1799471265" ) @Export("decodeLegacy") void decodeLegacy(Buffer var1) { @@ -805,14 +811,14 @@ public class Widget extends Node { this.rawHeight = var1.readUnsignedShort(); this.transparencyTop = var1.readUnsignedByte(); this.parentId = var1.readUnsignedShort(); - if (this.parentId == 0xffff) { + if (this.parentId == 65535) { this.parentId = -1; } else { - this.parentId += this.id & 0xffff0000; + this.parentId += this.id & -65536; } this.mouseOverRedirect = var1.readUnsignedShort(); - if (this.mouseOverRedirect == 0xffff) { + if (this.mouseOverRedirect == 65535) { this.mouseOverRedirect = -1; } @@ -841,7 +847,7 @@ public class Widget extends Node { for (var6 = 0; var6 < var5; ++var6) { this.cs1Instructions[var4][var6] = var1.readUnsignedShort(); - if (this.cs1Instructions[var4][var6] == 0xffff) { + if (this.cs1Instructions[var4][var6] == 65535) { this.cs1Instructions[var4][var6] = -1; } } @@ -859,16 +865,16 @@ public class Widget extends Node { } if (this.type == 2) { - this.itemIds = new int[this.rawHeight * this.rawWidth]; - this.itemQuantities = new int[this.rawHeight * this.rawWidth]; + this.itemIds = new int[this.rawWidth * this.rawHeight]; + this.itemQuantities = new int[this.rawWidth * this.rawHeight]; var4 = var1.readUnsignedByte(); if (var4 == 1) { - this.clickMask |= 0x10000000; + this.clickMask |= 268435456; } var5 = var1.readUnsignedByte(); if (var5 == 1) { - this.clickMask |= 0x40000000; + this.clickMask |= 1073741824; } var6 = var1.readUnsignedByte(); @@ -878,7 +884,7 @@ public class Widget extends Node { int var7 = var1.readUnsignedByte(); if (var7 == 1) { - this.clickMask |= 0x20000000; + this.clickMask |= 536870912; } this.paddingX = var1.readUnsignedByte(); @@ -902,9 +908,9 @@ public class Widget extends Node { this.itemActions = new String[5]; for (var8 = 0; var8 < 5; ++var8) { - String var11 = var1.readStringCp1252NullTerminated(); - if (var11.length() > 0) { - this.itemActions[var8] = var11; + String var10 = var1.readStringCp1252NullTerminated(); + if (var10.length() > 0) { + this.itemActions[var8] = var10; this.clickMask |= 1 << var8 + 23; } } @@ -919,7 +925,7 @@ public class Widget extends Node { this.textYAlignment = var1.readUnsignedByte(); this.textLineHeight = var1.readUnsignedByte(); this.fontId = var1.readUnsignedShort(); - if (this.fontId == 0xffff) { + if (this.fontId == 65535) { this.fontId = -1; } @@ -949,23 +955,23 @@ public class Widget extends Node { if (this.type == 6) { this.modelType = 1; this.modelId = var1.readUnsignedShort(); - if (this.modelId == 0xffff) { + if (this.modelId == 65535) { this.modelId = -1; } this.modelType2 = 1; this.modelId2 = var1.readUnsignedShort(); - if (this.modelId2 == 0xffff) { + if (this.modelId2 == 65535) { this.modelId2 = -1; } this.sequenceId = var1.readUnsignedShort(); - if (this.sequenceId == 0xffff) { + if (this.sequenceId == 65535) { this.sequenceId = -1; } this.sequenceId2 = var1.readUnsignedShort(); - if (this.sequenceId2 == 0xffff) { + if (this.sequenceId2 == 65535) { this.sequenceId2 = -1; } @@ -976,10 +982,10 @@ public class Widget extends Node { if (this.type == 7) { this.itemIds = new int[this.rawWidth * this.rawHeight]; - this.itemQuantities = new int[this.rawHeight * this.rawWidth]; + this.itemQuantities = new int[this.rawWidth * this.rawHeight]; this.textXAlignment = var1.readUnsignedByte(); this.fontId = var1.readUnsignedShort(); - if (this.fontId == 0xffff) { + if (this.fontId == 65535) { this.fontId = -1; } @@ -995,9 +1001,9 @@ public class Widget extends Node { this.itemActions = new String[5]; for (var5 = 0; var5 < 5; ++var5) { - String var10 = var1.readStringCp1252NullTerminated(); - if (var10.length() > 0) { - this.itemActions[var5] = var10; + String var11 = var1.readStringCp1252NullTerminated(); + if (var11.length() > 0) { + this.itemActions[var5] = var11; this.clickMask |= 1 << var5 + 23; } } @@ -1036,7 +1042,7 @@ public class Widget extends Node { } if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) { - this.clickMask |= 0x400000; + this.clickMask |= 4194304; } if (this.buttonType == 6) { @@ -1045,10 +1051,10 @@ public class Widget extends Node { } - @ObfuscatedName("l") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lkf;B)V", - garbageValue = "30" + signature = "(Lky;B)V", + garbageValue = "-52" ) @Export("decode") void decode(Buffer var1) { @@ -1070,10 +1076,10 @@ public class Widget extends Node { this.xAlignment = var1.readByte(); this.yAlignment = var1.readByte(); this.parentId = var1.readUnsignedShort(); - if (this.parentId == 0xffff) { + if (this.parentId == 65535) { this.parentId = -1; } else { - this.parentId += this.id & 0xffff0000; + this.parentId += this.id & -65536; } this.isHidden = var1.readUnsignedByte() == 1; @@ -1097,7 +1103,7 @@ public class Widget extends Node { if (this.type == 6) { this.modelType = 1; this.modelId = var1.readUnsignedShort(); - if (this.modelId == 0xffff) { + if (this.modelId == 65535) { this.modelId = -1; } @@ -1108,14 +1114,14 @@ public class Widget extends Node { this.modelAngleZ = var1.readUnsignedShort(); this.modelZoom = var1.readUnsignedShort(); this.sequenceId = var1.readUnsignedShort(); - if (this.sequenceId == 0xffff) { + if (this.sequenceId == 65535) { this.sequenceId = -1; } this.modelOrthog = var1.readUnsignedByte() == 1; var1.readUnsignedShort(); if (this.widthAlignment != 0) { - this.field2619 = var1.readUnsignedShort(); + this.field2638 = var1.readUnsignedShort(); } if (this.heightAlignment != 0) { @@ -1125,7 +1131,7 @@ public class Widget extends Node { if (this.type == 4) { this.fontId = var1.readUnsignedShort(); - if (this.fontId == 0xffff) { + if (this.fontId == 65535) { this.fontId = -1; } @@ -1146,7 +1152,7 @@ public class Widget extends Node { if (this.type == 9) { this.lineWid = var1.readUnsignedByte(); this.color = var1.readInt(); - this.field2598 = var1.readUnsignedByte() == 1; + this.field2601 = var1.readUnsignedByte() == 1; } this.clickMask = var1.readMedium(); @@ -1187,56 +1193,58 @@ public class Widget extends Node { this.statTransmitTriggers = this.readListenerTriggers(var1); } - @ObfuscatedName("b") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkf;B)[Ljava/lang/Object;", - garbageValue = "-58" + signature = "(Lky;B)[Ljava/lang/Object;", + garbageValue = "0" ) @Export("readListener") Object[] readListener(Buffer var1) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return null; - } - Object[] var3 = new Object[var2]; + } else { + Object[] var3 = new Object[var2]; - for (int var4 = 0; var4 < var2; ++var4) { - int var5 = var1.readUnsignedByte(); - if (var5 == 0) { - var3[var4] = new Integer(var1.readInt()); - } else if (var5 == 1) { - var3[var4] = var1.readStringCp1252NullTerminated(); + for (int var4 = 0; var4 < var2; ++var4) { + int var5 = var1.readUnsignedByte(); + if (var5 == 0) { + var3[var4] = new Integer(var1.readInt()); + } else if (var5 == 1) { + var3[var4] = var1.readStringCp1252NullTerminated(); + } } - } - this.hasListener = true; - return var3; + this.hasListener = true; + return var3; + } } - @ObfuscatedName("i") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lkf;B)[I", - garbageValue = "104" + signature = "(Lky;I)[I", + garbageValue = "1234207038" ) @Export("readListenerTriggers") int[] readListenerTriggers(Buffer var1) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return null; - } - int[] var3 = new int[var2]; + } else { + int[] var3 = new int[var2]; - for (int var4 = 0; var4 < var2; ++var4) { - var3[var4] = var1.readInt(); - } + for (int var4 = 0; var4 < var2; ++var4) { + var3[var4] = var1.readInt(); + } - return var3; + return var3; + } } - @ObfuscatedName("c") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "2142727340" + garbageValue = "-311647147" ) @Export("swapItems") public void swapItems(int var1, int var2) { @@ -1248,14 +1256,14 @@ public class Widget extends Node { this.itemQuantities[var1] = var3; } - @ObfuscatedName("u") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(ZI)Lly;", - garbageValue = "1738149818" + signature = "(ZI)Lls;", + garbageValue = "1931893864" ) @Export("getSprite") public Sprite getSprite(boolean var1) { - field2562 = false; + field2579 = false; int var2; if (var1) { var2 = this.spriteId; @@ -1265,107 +1273,115 @@ public class Widget extends Node { if (var2 == -1) { return null; - } - long var3 = ((this.spriteFlipV ? 1L : 0L) << 38) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.spriteShadow << 40); - Sprite var5 = (Sprite)Widget_cachedSprites.get(var3); - if (var5 != null) { - return var5; - } - var5 = class65.SpriteBuffer_getSprite(class216.Widget_spritesArchive, var2, 0); - if (var5 == null) { - field2562 = true; - return null; - } - if (this.spriteFlipV) { - var5.flipVertically(); - } + } else { + long var3 = ((this.spriteFlipH ? 1L : 0L) << 39) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((long)this.outline << 36) + (long)var2 + ((long)this.spriteShadow << 40); + Sprite var5 = (Sprite)Widget_cachedSprites.get(var3); + if (var5 != null) { + return var5; + } else { + var5 = TilePaint.SpriteBuffer_getSprite(WorldMapSprite.Widget_spritesArchive, var2, 0); + if (var5 == null) { + field2579 = true; + return null; + } else { + if (this.spriteFlipV) { + var5.flipVertically(); + } - if (this.spriteFlipH) { - var5.flipHorizontally(); - } + if (this.spriteFlipH) { + var5.flipHorizontally(); + } - if (this.outline > 0) { - var5.pad(this.outline); - } + if (this.outline > 0) { + var5.pad(this.outline); + } - if (this.outline >= 1) { - var5.outline(1); - } + if (this.outline >= 1) { + var5.outline(1); + } - if (this.outline >= 2) { - var5.outline(0xffffff); - } + if (this.outline >= 2) { + var5.outline(16777215); + } - if (this.spriteShadow != 0) { - var5.shadow(this.spriteShadow); - } + if (this.spriteShadow != 0) { + var5.shadow(this.spriteShadow); + } - Widget_cachedSprites.put(var5, var3); - return var5; + Widget_cachedSprites.put(var5, var3); + return var5; + } + } + } } - @ObfuscatedName("x") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)Lke;", - garbageValue = "-121271997" + signature = "(B)Lkb;", + garbageValue = "114" ) @Export("getFont") public Font getFont() { - field2562 = false; + field2579 = false; if (this.fontId == -1) { return null; - } - Font var1 = (Font)Widget_cachedFonts.get((long)this.fontId); - if (var1 != null) { - return var1; - } - var1 = GameObject.SpriteBuffer_getFont(class216.Widget_spritesArchive, DirectByteArrayCopier.Widget_fontsArchive, this.fontId, 0); - if (var1 != null) { - Widget_cachedFonts.put(var1, (long)this.fontId); } else { - field2562 = true; - } + Font var1 = (Font)Widget_cachedFonts.get((long)this.fontId); + if (var1 != null) { + return var1; + } else { + var1 = FileSystem.SpriteBuffer_getFont(WorldMapSprite.Widget_spritesArchive, Widget_fontsArchive, this.fontId, 0); + if (var1 != null) { + Widget_cachedFonts.put(var1, (long)this.fontId); + } else { + field2579 = true; + } - return var1; + return var1; + } + } } @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(II)Lly;", - garbageValue = "-1022923411" + signature = "(II)Lls;", + garbageValue = "1971687026" ) @Export("getInventorySprite") public Sprite getInventorySprite(int var1) { - field2562 = false; - if (var1 < 0 || var1 >= this.inventorySprites.length) { - return null; - } - int var2 = this.inventorySprites[var1]; - if (var2 == -1) { - return null; - } - Sprite var3 = (Sprite)Widget_cachedSprites.get((long)var2); - if (var3 != null) { - return var3; - } - var3 = class65.SpriteBuffer_getSprite(class216.Widget_spritesArchive, var2, 0); - if (var3 != null) { - Widget_cachedSprites.put(var3, (long)var2); - } else { - field2562 = true; - } + field2579 = false; + if (var1 >= 0 && var1 < this.inventorySprites.length) { + int var2 = this.inventorySprites[var1]; + if (var2 == -1) { + return null; + } else { + Sprite var3 = (Sprite)Widget_cachedSprites.get((long)var2); + if (var3 != null) { + return var3; + } else { + var3 = TilePaint.SpriteBuffer_getSprite(WorldMapSprite.Widget_spritesArchive, var2, 0); + if (var3 != null) { + Widget_cachedSprites.put(var3, (long)var2); + } else { + field2579 = true; + } - return var3; + return var3; + } + } + } else { + return null; + } } - @ObfuscatedName("v") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lis;IZLhh;I)Ldm;", - garbageValue = "482898105" + signature = "(Lij;IZLhy;I)Ldo;", + garbageValue = "1039139865" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerAppearance var4) { - field2562 = false; + field2579 = false; int var5; int var6; if (var3) { @@ -1378,72 +1394,72 @@ public class Widget extends Node { if (var5 == 0) { return null; - } - if (var5 == 1 && var6 == -1) { + } else if (var5 == 1 && var6 == -1) { return null; + } else { + Model var7 = (Model)Widget_cachedModels.get((long)(var6 + (var5 << 16))); + if (var7 == null) { + ModelData var8; + if (var5 == 1) { + var8 = ModelData.ModelData_get(Huffman.Widget_modelsArchive, var6, 0); + if (var8 == null) { + field2579 = true; + return null; + } + + var7 = var8.toModel(64, 768, -50, -10, -50); + } + + if (var5 == 2) { + var8 = ViewportMouse.getNpcDefinition(var6).getModelData(); + if (var8 == null) { + field2579 = true; + return null; + } + + var7 = var8.toModel(64, 768, -50, -10, -50); + } + + if (var5 == 3) { + if (var4 == null) { + return null; + } + + var8 = var4.getModelData(); + if (var8 == null) { + field2579 = true; + return null; + } + + var7 = var8.toModel(64, 768, -50, -10, -50); + } + + if (var5 == 4) { + ItemDefinition var9 = WorldMapData_0.ItemDefinition_get(var6); + var8 = var9.getModelData(10); + if (var8 == null) { + field2579 = true; + return null; + } + + var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50); + } + + Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); + } + + if (var1 != null) { + var7 = var1.transformWidgetModel(var7, var2); + } + + return var7; } - Model var7 = (Model)Widget_cachedModels.get((long)(var6 + (var5 << 16))); - if (var7 == null) { - ModelData var8; - if (var5 == 1) { - var8 = ModelData.ModelData_get(ViewportMouse.Widget_modelsArchive, var6, 0); - if (var8 == null) { - field2562 = true; - return null; - } - - var7 = var8.toModel(64, 768, -50, -10, -50); - } - - if (var5 == 2) { - var8 = GameShell.getNpcDefinition(var6).getModelData(); - if (var8 == null) { - field2562 = true; - return null; - } - - var7 = var8.toModel(64, 768, -50, -10, -50); - } - - if (var5 == 3) { - if (var4 == null) { - return null; - } - - var8 = var4.getModelData(); - if (var8 == null) { - field2562 = true; - return null; - } - - var7 = var8.toModel(64, 768, -50, -10, -50); - } - - if (var5 == 4) { - ItemDefinition var9 = WorldMapArea.ItemDefinition_get(var6); - var8 = var9.getModelData(10); - if (var8 == null) { - field2562 = true; - return null; - } - - var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50); - } - - Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); - } - - if (var1 != null) { - var7 = var1.transformWidgetModel(var7, var2); - } - - return var7; } - @ObfuscatedName("y") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(ZB)Lhg;", - garbageValue = "0" + garbageValue = "-6" ) @Export("getSpriteMask") public SpriteMask getSpriteMask(boolean var1) { @@ -1454,52 +1470,55 @@ public class Widget extends Node { int var2 = var1 ? this.spriteId : this.spriteId2; if (var2 == -1) { return null; - } - long var3 = ((this.spriteFlipV ? 1L : 0L) << 38) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.spriteShadow << 40); - SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); - if (var5 != null) { - return var5; - } - Sprite var6 = this.getSprite(var1); - if (var6 == null) { - return null; - } - Sprite var7 = var6.copyNormalized(); - int[] var8 = new int[var7.subHeight]; - int[] var9 = new int[var7.subHeight]; + } else { + long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipV ? 1L : 0L) << 38) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipH ? 1L : 0L) << 39); + SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); + if (var5 != null) { + return var5; + } else { + Sprite var6 = this.getSprite(var1); + if (var6 == null) { + return null; + } else { + Sprite var7 = var6.copyNormalized(); + int[] var8 = new int[var7.subHeight]; + int[] var9 = new int[var7.subHeight]; - for (int var10 = 0; var10 < var7.subHeight; ++var10) { - int var11 = 0; - int var12 = var7.subWidth; + for (int var10 = 0; var10 < var7.subHeight; ++var10) { + int var11 = 0; + int var12 = var7.subWidth; - int var13; - for (var13 = 0; var13 < var7.subWidth; ++var13) { - if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { - var11 = var13; - break; + int var13; + for (var13 = 0; var13 < var7.subWidth; ++var13) { + if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { + var11 = var13; + break; + } + } + + for (var13 = var7.subWidth - 1; var13 >= var11; --var13) { + if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { + var12 = var13 + 1; + break; + } + } + + var8[var10] = var11; + var9[var10] = var12 - var11; + } + + var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2); + Widget_cachedSpriteMasks.put(var5, var3); + return var5; } } - - for (var13 = var7.subWidth - 1; var13 >= var11; --var13) { - if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { - var12 = var13 + 1; - break; - } - } - - var8[var10] = var11; - var9[var10] = var12 - var11; } - - var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2); - Widget_cachedSpriteMasks.put(var5, var3); - return var5; } - @ObfuscatedName("a") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(ILjava/lang/String;S)V", - garbageValue = "-20428" + signature = "(ILjava/lang/String;I)V", + garbageValue = "425838029" ) @Export("setAction") public void setAction(int var1, String var2) { @@ -1517,553 +1536,26 @@ public class Widget extends Node { this.actions[var1] = var2; } - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IIII)J", - garbageValue = "1098126812" + signature = "(II)Lij;", + garbageValue = "981086484" ) - @Export("getWorldMapSpriteHash") - static long getWorldMapSpriteHash(int var0, int var1, int var2) { - return (long)(var2 << 16 | var0 << 8 | var1); - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "([BIII)Ljava/lang/String;", - garbageValue = "1305438411" - ) - public static String method4092(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(class290.field3673[var5 >>> 2]); - - if (var4 >= var2 - 1) { - var3.append(class290.field3673[(var5 & 3) << 4]).append("=="); - continue; - } - - int var6 = var0[var4 + 1] & 255; - var3.append(class290.field3673[(var5 & 3) << 4 | var6 >>> 4]); - - if (var4 >= var2 - 2) { - var3.append(class290.field3673[(var6 & 15) << 2]).append("="); - continue; - } - - int var7 = var0[var4 + 2] & 255; - var3.append(class290.field3673[(var6 & 15) << 2 | var7 >>> 6]).append(class290.field3673[var7 & 63]); - } - - return var3.toString(); - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "0" - ) - public static void method4091() { - if (MouseHandler.MouseHandler_instance != null) { - synchronized(MouseHandler.MouseHandler_instance) { - MouseHandler.MouseHandler_instance = null; - } - } - - } - - @ObfuscatedName("hk") - @ObfuscatedSignature( - signature = "(Lbd;IIBI)V", - garbageValue = "310839135" - ) - static final void method4056(Player var0, int x, int y, byte var3) { - int var4 = var0.pathX[0]; - int var5 = var0.pathY[0]; - int var6 = var0.transformedSize(); - if (var4 < var6 || var4 >= 104 - var6 || var5 < var6 || var5 >= 104 - var6) { - return; - } - if (x < var6 || x >= 104 - var6 || y < var6 || y >= 104 - var6) { - return; - } - int var8 = var0.transformedSize(); - RouteStrategy var9 = WorldMapAreaData.method667(x, y); - CollisionMap var10 = Client.collisionMaps[var0.plane]; - int[] var11 = Client.field929; - int[] var12 = Client.field930; - - int var13; - int var14; - for (var13 = 0; var13 < 128; ++var13) { - for (var14 = 0; var14 < 128; ++var14) { - class173.directions[var13][var14] = 0; - class173.distances[var13][var14] = 99999999; - } - } - - int var15; - int var16; - byte var17; - byte var18; - int var19; - int var20; - byte var21; - int var22; - int[][] var23; - int var24; - int var25; - int var26; - int var27; - boolean var33; - boolean var34; - int var35; - int var36; - int var38; - if (var8 == 1) { - var15 = var4; - var16 = var5; - var17 = 64; - var18 = 64; - var19 = var4 - var17; - var20 = var5 - var18; - class173.directions[var17][var18] = 99; - class173.distances[var17][var18] = 0; - var21 = 0; - var22 = 0; - class173.bufferX[var21] = var4; - var38 = var21 + 1; - class173.bufferY[var21] = var5; - var23 = var10.flags; - - while (true) { - if (var38 != var22) { - var15 = class173.bufferX[var22]; - var16 = class173.bufferY[var22]; - var22 = var22 + 1 & 4095; - var35 = var15 - var19; - var36 = var16 - var20; - var24 = var15 - var10.xInset; - var25 = var16 - var10.yInset; - if (var9.hasArrived(1, var15, var16, var10)) { - class173.field2088 = var15; - class218.field2707 = var16; - var34 = true; - break; - } - - var26 = class173.distances[var35][var36] + 1; - if (var35 > 0 && class173.directions[var35 - 1][var36] == 0 && (var23[var24 - 1][var25] & 19136776) == 0) { - class173.bufferX[var38] = var15 - 1; - class173.bufferY[var38] = var16; - var38 = var38 + 1 & 4095; - class173.directions[var35 - 1][var36] = 2; - class173.distances[var35 - 1][var36] = var26; - } - - if (var35 < 127 && class173.directions[var35 + 1][var36] == 0 && (var23[var24 + 1][var25] & 19136896) == 0) { - class173.bufferX[var38] = var15 + 1; - class173.bufferY[var38] = var16; - var38 = var38 + 1 & 4095; - class173.directions[var35 + 1][var36] = 8; - class173.distances[var35 + 1][var36] = var26; - } - - if (var36 > 0 && class173.directions[var35][var36 - 1] == 0 && (var23[var24][var25 - 1] & 19136770) == 0) { - class173.bufferX[var38] = var15; - class173.bufferY[var38] = var16 - 1; - var38 = var38 + 1 & 4095; - class173.directions[var35][var36 - 1] = 1; - class173.distances[var35][var36 - 1] = var26; - } - - if (var36 < 127 && class173.directions[var35][var36 + 1] == 0 && (var23[var24][var25 + 1] & 19136800) == 0) { - class173.bufferX[var38] = var15; - class173.bufferY[var38] = var16 + 1; - var38 = var38 + 1 & 4095; - class173.directions[var35][var36 + 1] = 4; - class173.distances[var35][var36 + 1] = var26; - } - - if (var35 > 0 && var36 > 0 && class173.directions[var35 - 1][var36 - 1] == 0 && (var23[var24 - 1][var25 - 1] & 19136782) == 0 && (var23[var24 - 1][var25] & 19136776) == 0 && (var23[var24][var25 - 1] & 19136770) == 0) { - class173.bufferX[var38] = var15 - 1; - class173.bufferY[var38] = var16 - 1; - var38 = var38 + 1 & 4095; - class173.directions[var35 - 1][var36 - 1] = 3; - class173.distances[var35 - 1][var36 - 1] = var26; - } - - if (var35 < 127 && var36 > 0 && class173.directions[var35 + 1][var36 - 1] == 0 && (var23[var24 + 1][var25 - 1] & 19136899) == 0 && (var23[var24 + 1][var25] & 19136896) == 0 && (var23[var24][var25 - 1] & 19136770) == 0) { - class173.bufferX[var38] = var15 + 1; - class173.bufferY[var38] = var16 - 1; - var38 = var38 + 1 & 4095; - class173.directions[var35 + 1][var36 - 1] = 9; - class173.distances[var35 + 1][var36 - 1] = var26; - } - - if (var35 > 0 && var36 < 127 && class173.directions[var35 - 1][var36 + 1] == 0 && (var23[var24 - 1][var25 + 1] & 19136824) == 0 && (var23[var24 - 1][var25] & 19136776) == 0 && (var23[var24][var25 + 1] & 19136800) == 0) { - class173.bufferX[var38] = var15 - 1; - class173.bufferY[var38] = var16 + 1; - var38 = var38 + 1 & 4095; - class173.directions[var35 - 1][var36 + 1] = 6; - class173.distances[var35 - 1][var36 + 1] = var26; - } - - if (var35 < 127 && var36 < 127 && class173.directions[var35 + 1][var36 + 1] == 0 && (var23[var24 + 1][var25 + 1] & 19136992) == 0 && (var23[var24 + 1][var25] & 19136896) == 0 && (var23[var24][var25 + 1] & 19136800) == 0) { - class173.bufferX[var38] = var15 + 1; - class173.bufferY[var38] = var16 + 1; - var38 = var38 + 1 & 4095; - class173.directions[var35 + 1][var36 + 1] = 12; - class173.distances[var35 + 1][var36 + 1] = var26; - } - } - else { - class173.field2088 = var15; - class218.field2707 = var16; - var34 = false; - break; - } - - } - - var33 = var34; - } else if (var8 == 2) { - var33 = Frames.method3267(var4, var5, var9, var10); + @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 { - var15 = var4; - var16 = var5; - var17 = 64; - var18 = 64; - var19 = var4 - var17; - var20 = var5 - var18; - class173.directions[var17][var18] = 99; - class173.distances[var17][var18] = 0; - var21 = 0; - var22 = 0; - class173.bufferX[var21] = var4; - var38 = var21 + 1; - class173.bufferY[var21] = var5; - var23 = var10.flags; - - label640: - while (true) { - label638: - while (true) { - do { - do { - do { - label615: - do { - if (var22 == var38) { - class173.field2088 = var15; - class218.field2707 = var16; - var34 = false; - break label640; - } - - var15 = class173.bufferX[var22]; - var16 = class173.bufferY[var22]; - var22 = var22 + 1 & 4095; - var35 = var15 - var19; - var36 = var16 - var20; - var24 = var15 - var10.xInset; - var25 = var16 - var10.yInset; - if (var9.hasArrived(var8, var15, var16, var10)) { - class173.field2088 = var15; - class218.field2707 = var16; - var34 = true; - break label640; - } - - var26 = class173.distances[var35][var36] + 1; - if (var35 > 0 && class173.directions[var35 - 1][var36] == 0 && (var23[var24 - 1][var25] & 19136782) == 0 && (var23[var24 - 1][var8 + var25 - 1] & 19136824) == 0) { - var27 = 1; - - while (true) { - if (var27 >= var8 - 1) { - class173.bufferX[var38] = var15 - 1; - class173.bufferY[var38] = var16; - var38 = var38 + 1 & 4095; - class173.directions[var35 - 1][var36] = 2; - class173.distances[var35 - 1][var36] = var26; - break; - } - - if ((var23[var24 - 1][var27 + var25] & 19136830) != 0) { - break; - } - - ++var27; - } - } - - if (var35 < 128 - var8 && class173.directions[var35 + 1][var36] == 0 && (var23[var24 + var8][var25] & 19136899) == 0 && (var23[var24 + var8][var25 + var8 - 1] & 19136992) == 0) { - var27 = 1; - - while (true) { - if (var27 >= var8 - 1) { - class173.bufferX[var38] = var15 + 1; - class173.bufferY[var38] = var16; - var38 = var38 + 1 & 4095; - class173.directions[var35 + 1][var36] = 8; - class173.distances[var35 + 1][var36] = var26; - break; - } - - if ((var23[var8 + var24][var27 + var25] & 19136995) != 0) { - break; - } - - ++var27; - } - } - - if (var36 > 0 && class173.directions[var35][var36 - 1] == 0 && (var23[var24][var25 - 1] & 19136782) == 0 && (var23[var24 + var8 - 1][var25 - 1] & 19136899) == 0) { - var27 = 1; - - while (true) { - if (var27 >= var8 - 1) { - class173.bufferX[var38] = var15; - class173.bufferY[var38] = var16 - 1; - var38 = var38 + 1 & 4095; - class173.directions[var35][var36 - 1] = 1; - class173.distances[var35][var36 - 1] = var26; - break; - } - - if ((var23[var27 + var24][var25 - 1] & 19136911) != 0) { - break; - } - - ++var27; - } - } - - if (var36 < 128 - var8 && class173.directions[var35][var36 + 1] == 0 && (var23[var24][var8 + var25] & 19136824) == 0 && (var23[var8 + var24 - 1][var8 + var25] & 19136992) == 0) { - var27 = 1; - - while (true) { - if (var27 >= var8 - 1) { - class173.bufferX[var38] = var15; - class173.bufferY[var38] = var16 + 1; - var38 = var38 + 1 & 4095; - class173.directions[var35][var36 + 1] = 4; - class173.distances[var35][var36 + 1] = var26; - break; - } - - if ((var23[var27 + var24][var8 + var25] & 19137016) != 0) { - break; - } - - ++var27; - } - } - - if (var35 > 0 && var36 > 0 && class173.directions[var35 - 1][var36 - 1] == 0 && (var23[var24 - 1][var25 - 1] & 19136782) == 0) { - var27 = 1; - - while (true) { - if (var27 >= var8) { - class173.bufferX[var38] = var15 - 1; - class173.bufferY[var38] = var16 - 1; - var38 = var38 + 1 & 4095; - class173.directions[var35 - 1][var36 - 1] = 3; - class173.distances[var35 - 1][var36 - 1] = var26; - break; - } - - if ((var23[var24 - 1][var27 + (var25 - 1)] & 19136830) != 0 || (var23[var27 + (var24 - 1)][var25 - 1] & 19136911) != 0) { - break; - } - - ++var27; - } - } - - if (var35 < 128 - var8 && var36 > 0 && class173.directions[var35 + 1][var36 - 1] == 0 && (var23[var24 + var8][var25 - 1] & 19136899) == 0) { - var27 = 1; - - while (true) { - if (var27 >= var8) { - class173.bufferX[var38] = var15 + 1; - class173.bufferY[var38] = var16 - 1; - var38 = var38 + 1 & 4095; - class173.directions[var35 + 1][var36 - 1] = 9; - class173.distances[var35 + 1][var36 - 1] = var26; - break; - } - - if ((var23[var8 + var24][var27 + (var25 - 1)] & 19136995) != 0 || (var23[var24 + var27][var25 - 1] & 19136911) != 0) { - break; - } - - ++var27; - } - } - - if (var35 > 0 && var36 < 128 - var8 && class173.directions[var35 - 1][var36 + 1] == 0 && (var23[var24 - 1][var8 + var25] & 19136824) == 0) { - for (var27 = 1; var27 < var8; ++var27) { - if ((var23[var24 - 1][var25 + var27] & 19136830) != 0 || (var23[var27 + (var24 - 1)][var25 + var8] & 19137016) != 0) { - continue label615; - } - } - - class173.bufferX[var38] = var15 - 1; - class173.bufferY[var38] = var16 + 1; - var38 = var38 + 1 & 4095; - class173.directions[var35 - 1][var36 + 1] = 6; - class173.distances[var35 - 1][var36 + 1] = var26; - } - } while(var35 >= 128 - var8); - } while(var36 >= 128 - var8); - } while(class173.directions[var35 + 1][var36 + 1] != 0); - } while((var23[var24 + var8][var25 + var8] & 19136992) != 0); - - for (var27 = 1; var27 < var8; ++var27) { - if ((var23[var24 + var27][var8 + var25] & 19137016) != 0 || (var23[var8 + var24][var27 + var25] & 19136995) != 0) { - continue label638; - } - } - - class173.bufferX[var38] = var15 + 1; - class173.bufferY[var38] = var16 + 1; - var38 = var38 + 1 & 4095; - class173.directions[var35 + 1][var36 + 1] = 12; - class173.distances[var35 + 1][var36 + 1] = var26; - } + byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0); + var1 = new SequenceDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); } - var33 = var34; + var1.postDecode(); + SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); + return var1; } - - int var7; - label696: { - var14 = var4 - 64; - var15 = var5 - 64; - var16 = class173.field2088; - var35 = class218.field2707; - if (!var33) { - var36 = Integer.MAX_VALUE; - var19 = Integer.MAX_VALUE; - byte var37 = 10; - var38 = var9.approxDestinationX; - var22 = var9.approxDestinationY; - int var32 = var9.approxDestinationSizeX; - var24 = var9.approxDestinationSizeY; - - for (var25 = var38 - var37; var25 <= var37 + var38; ++var25) { - for (var26 = var22 - var37; var26 <= var37 + var22; ++var26) { - var27 = var25 - var14; - int var28 = var26 - var15; - if (var27 < 0 || var28 < 0 || var27 >= 128 || var28 >= 128 || class173.distances[var27][var28] >= 100) { - continue; - } - int var29 = 0; - if (var25 < var38) { - var29 = var38 - var25; - } else if (var25 > var38 + var32 - 1) { - var29 = var25 - (var32 + var38 - 1); - } - - int var30 = 0; - if (var26 < var22) { - var30 = var22 - var26; - } else if (var26 > var24 + var22 - 1) { - var30 = var26 - (var24 + var22 - 1); - } - - int var31 = var29 * var29 + var30 * var30; - if (var31 < var36 || var31 == var36 && class173.distances[var27][var28] < var19) { - var36 = var31; - var19 = class173.distances[var27][var28]; - var16 = var25; - var35 = var26; - } - } - } - - if (var36 == Integer.MAX_VALUE) { - var7 = -1; - break label696; - } - } - - if (var4 == var16 && var5 == var35) { - var7 = 0; - } else { - var18 = 0; - class173.bufferX[var18] = var16; - var36 = var18 + 1; - class173.bufferY[var18] = var35; - - for (var19 = var20 = class173.directions[var16 - var14][var35 - var15]; var16 != var4 || var5 != var35; var19 = class173.directions[var16 - var14][var35 - var15]) { - if (var19 != var20) { - var20 = var19; - class173.bufferX[var36] = var16; - class173.bufferY[var36++] = var35; - } - - if ((var19 & 2) != 0) { - ++var16; - } else if ((var19 & 8) != 0) { - --var16; - } - - if ((var19 & 1) != 0) { - ++var35; - } else if ((var19 & 4) != 0) { - --var35; - } - } - - var38 = 0; - - while (var36-- > 0) { - var11[var38] = class173.bufferX[var36]; - var12[var38++] = class173.bufferY[var36]; - if (var38 >= var11.length) { - break; - } - } - - var7 = var38; - } - } - - var13 = var7; - if (var7 >= 1) { - for (var14 = 0; var14 < var13 - 1; ++var14) { - var0.method1191(Client.field929[var14], Client.field930[var14], var3); - } - - } - } - - @ObfuscatedName("kq") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-174761515" - ) - static void method4090() { - if (!Client.field736 || Client.localPlayer == null) { - return; - } - int var0 = Client.localPlayer.pathX[0]; - int var1 = Client.localPlayer.pathY[0]; - if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) { - return; - } - - MouseHandler.oculusOrbFocalPointX = Client.localPlayer.x; - int var2 = ScriptEvent.getTileHeight(Client.localPlayer.x, Client.localPlayer.y, class42.plane) - Client.camFollowHeight; - if (var2 < Client.field729) { - Client.field729 = var2; - } - - WorldMapArea.oculusOrbFocalPointY = Client.localPlayer.y; - Client.field736 = false; - } } diff --git a/runescape-client/src/main/java/World.java b/runescape-client/src/main/java/World.java index 7cf6a822b4..e620836264 100644 --- a/runescape-client/src/main/java/World.java +++ b/runescape-client/src/main/java/World.java @@ -4,72 +4,72 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bw") +@ObfuscatedName("bl") @Implements("World") public class World { - @ObfuscatedName("k") + @ObfuscatedName("sd") @ObfuscatedSignature( - signature = "[Lbw;" + signature = "Llx;" ) - @Export("World_worlds") - static World[] World_worlds; - @ObfuscatedName("l") + @Export("platformInfo") + static PlatformInfo platformInfo; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 774267173 + intValue = -1559226187 ) @Export("World_count") static int World_count; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -2084454035 + intValue = 315503089 ) @Export("World_listCount") static int World_listCount; - @ObfuscatedName("i") + @ObfuscatedName("q") @Export("World_sortOption2") static int[] World_sortOption2; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("World_sortOption1") static int[] World_sortOption1; - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Lex;" - ) - @Export("World_request") - static UrlRequest World_request; - @ObfuscatedName("m") + @ObfuscatedName("ka") @ObfuscatedGetter( - intValue = 790181133 + intValue = 1149397885 + ) + @Export("menuWidth") + static int menuWidth; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 1230812985 ) @Export("id") int id; - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 630491985 + intValue = -1926875123 ) @Export("properties") int properties; - @ObfuscatedName("x") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -432731733 + intValue = -999023629 ) @Export("population") int population; - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("host") String host; - @ObfuscatedName("v") + @ObfuscatedName("p") @Export("activity") String activity; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 657222747 + intValue = -307094013 ) @Export("location") int location; @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1014616139 + intValue = 392698997 ) @Export("index") int index; @@ -84,155 +84,77 @@ public class World { World() { } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "0" + signature = "(I)Z", + garbageValue = "1463155043" ) @Export("isMembersOnly") boolean isMembersOnly() { return (1 & this.properties) != 0; } - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "2029214211" + garbageValue = "1651148983" ) - boolean method1682() { + boolean method1687() { return (2 & this.properties) != 0; } - @ObfuscatedName("x") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1353649797" + garbageValue = "-2074539917" ) @Export("isPvp") boolean isPvp() { - return (0x4 & this.properties) != 0; + return (4 & this.properties) != 0; + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(S)Z", + garbageValue = "128" + ) + boolean method1689() { + return (8 & this.properties) != 0; } @ObfuscatedName("r") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "1749102436" - ) - boolean method1698() { - return (0x8 & this.properties) != 0; - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-2068007512" + garbageValue = "-1238207705" ) @Export("isDeadman") boolean isDeadman() { - return (0x20000000 & this.properties) != 0; + return (536870912 & this.properties) != 0; } @ObfuscatedName("y") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "1648546006" + garbageValue = "877895545" ) @Export("isBeta") boolean isBeta() { - return (0x2000000 & this.properties) != 0; + return (33554432 & this.properties) != 0; } - @ObfuscatedName("p") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lkx;B)I", - garbageValue = "80" + signature = "(Lhz;IIB)Z", + garbageValue = "-20" ) - @Export("decode") - static int decode(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); + @Export("SpriteBuffer_bufferFile") + public static boolean SpriteBuffer_bufferFile(AbstractArchive var0, int var1, int var2) { + byte[] var3 = var0.takeFile(var1, var2); + if (var3 == null) { + return false; } else { - var2 = var0.readBits(11); + Player.SpriteBuffer_decode(var3); + return true; } - - return var2; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "([BI)Lcx;", - garbageValue = "-75241458" - ) - @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); - - 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(); - } else { - var1.intOperands[var7] = var2.readUnsignedByte(); - } - } - - return var1; } } diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index dff4935462..6570b24d1a 100644 --- a/runescape-client/src/main/java/WorldMap.java +++ b/runescape-client/src/main/java/WorldMap.java @@ -10,280 +10,280 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lw") +@ObfuscatedName("lv") @Implements("WorldMap") public class WorldMap { - @ObfuscatedName("f") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lkd;" + signature = "Lkz;" ) @Export("fontNameVerdana11") static final FontName fontNameVerdana11; - @ObfuscatedName("m") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lkd;" + signature = "Lkz;" ) @Export("fontNameVerdana13") static final FontName fontNameVerdana13; - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lkd;" + signature = "Lkz;" ) @Export("fontNameVerdana15") static final FontName fontNameVerdana15; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("WorldMap_archive") AbstractArchive WorldMap_archive; - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("WorldMap_geographyArchive") AbstractArchive WorldMap_geographyArchive; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("WorldMap_groundArchive") AbstractArchive WorldMap_groundArchive; - @ObfuscatedName("x") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "Lke;" + signature = "Lkb;" ) @Export("font") Font font; - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("fonts") HashMap fonts; - @ObfuscatedName("v") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "[Llx;" + signature = "[Llq;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("details") HashMap details; @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lal;" + signature = "Lav;" ) @Export("mainMapArea") WorldMapArea mainMapArea; - @ObfuscatedName("a") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lal;" + signature = "Lav;" ) @Export("currentMapArea") WorldMapArea currentMapArea; - @ObfuscatedName("j") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Lal;" + signature = "Lav;" ) - WorldMapArea field3987; - @ObfuscatedName("t") + WorldMapArea field3948; + @ObfuscatedName("a") @ObfuscatedSignature( signature = "Lao;" ) @Export("worldMapManager") WorldMapManager worldMapManager; - @ObfuscatedName("h") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Llh;" + signature = "Lla;" ) @Export("cacheLoader") WorldMapArchiveLoader cacheLoader; - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1418781423 + intValue = 1709631313 ) @Export("centerTileX") int centerTileX; - @ObfuscatedName("n") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1871898529 + intValue = -148565401 ) @Export("centerTileY") int centerTileY; - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -992718151 + intValue = -1426592379 ) @Export("worldMapTargetX") int worldMapTargetX; - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1071222737 + intValue = -131532783 ) @Export("worldMapTargetY") int worldMapTargetY; - @ObfuscatedName("z") + @ObfuscatedName("o") @Export("zoom") float zoom; - @ObfuscatedName("al") + @ObfuscatedName("av") @Export("zoomTarget") float zoomTarget; - @ObfuscatedName("av") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -802390977 + intValue = -940091853 ) @Export("worldMapDisplayWidth") int worldMapDisplayWidth; - @ObfuscatedName("as") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = -856953133 + intValue = -99260469 ) @Export("worldMapDisplayHeight") int worldMapDisplayHeight; - @ObfuscatedName("aw") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 1183613303 + intValue = -137724383 ) @Export("worldMapDisplayX") int worldMapDisplayX; - @ObfuscatedName("ad") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 696817529 + intValue = -128088417 ) @Export("worldMapDisplayY") int worldMapDisplayY; - @ObfuscatedName("ag") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -1595018925 + intValue = -226377957 ) @Export("maxFlashCount") int maxFlashCount; - @ObfuscatedName("ar") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -2142682359 + intValue = -1119044333 ) @Export("cyclesPerFlash") int cyclesPerFlash; - @ObfuscatedName("ax") + @ObfuscatedName("at") @Export("perpetualFlash") boolean perpetualFlash; - @ObfuscatedName("az") + @ObfuscatedName("as") @Export("flashingElements") HashSet flashingElements; - @ObfuscatedName("ae") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -11969815 + intValue = 1909795063 ) @Export("flashCount") int flashCount; @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -616472333 + intValue = 277662661 ) @Export("flashCycle") int flashCycle; - @ObfuscatedName("aj") - @ObfuscatedGetter( - intValue = 1572567943 - ) - int field4006; - @ObfuscatedName("at") - @ObfuscatedGetter( - intValue = -1183921933 - ) - int field4007; @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -62799705 + intValue = 982159619 ) - int field4001; - @ObfuscatedName("ap") + int field3947; + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -1700345793 + intValue = -1274299191 ) - int field3989; - @ObfuscatedName("aq") + int field3970; + @ObfuscatedName("au") @ObfuscatedGetter( - longValue = 3331576765951850875L + intValue = -271346277 ) - long field3982; + int field3984; + @ObfuscatedName("ax") + @ObfuscatedGetter( + intValue = -1131249789 + ) + int field3985; + @ObfuscatedName("ag") + @ObfuscatedGetter( + longValue = 2241719861447572733L + ) + long field3986; @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -1084825883 + intValue = -2045594623 ) - int field4000; - @ObfuscatedName("an") + int field3987; + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 1928093953 + intValue = 1831517127 ) - int field4012; - @ObfuscatedName("au") - boolean field4013; - @ObfuscatedName("ah") + int field3988; + @ObfuscatedName("aq") + boolean field3989; + @ObfuscatedName("al") @Export("enabledElements") HashSet enabledElements; - @ObfuscatedName("am") + @ObfuscatedName("ah") @Export("enabledCategories") HashSet enabledCategories; - @ObfuscatedName("ay") + @ObfuscatedName("ab") @Export("enabledElementIds") HashSet enabledElementIds; - @ObfuscatedName("af") - HashSet field3988; - @ObfuscatedName("ab") + @ObfuscatedName("aw") + HashSet field3993; + @ObfuscatedName("ae") @Export("elementsDisabled") boolean elementsDisabled; - @ObfuscatedName("bp") + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = 1122489777 + intValue = 6416933 ) - int field4011; - @ObfuscatedName("bi") + int field3995; + @ObfuscatedName("bo") @Export("menuOpcodes") final int[] menuOpcodes; - @ObfuscatedName("bg") - List field3972; - @ObfuscatedName("bh") + @ObfuscatedName("bn") + List field3980; + @ObfuscatedName("bp") @Export("iconIterator") Iterator iconIterator; - @ObfuscatedName("bm") - HashSet field4005; - @ObfuscatedName("bn") + @ObfuscatedName("bz") + HashSet field4001; + @ObfuscatedName("bh") @ObfuscatedSignature( - signature = "Lhv;" + signature = "Lhd;" ) @Export("mouseCoord") Coord mouseCoord; - @ObfuscatedName("bc") + @ObfuscatedName("bv") @Export("showCoord") public boolean showCoord; - @ObfuscatedName("bx") + @ObfuscatedName("bj") @ObfuscatedSignature( - signature = "Lly;" + signature = "Lls;" ) @Export("sprite") Sprite sprite; - @ObfuscatedName("bo") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = -1411548561 + intValue = -1765997917 ) @Export("cachedPixelsPerTile") int cachedPixelsPerTile; - @ObfuscatedName("bb") + @ObfuscatedName("by") @ObfuscatedGetter( - intValue = 573003381 + intValue = 366025991 ) @Export("minCachedTileX") int minCachedTileX; @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = -2083065465 + intValue = 1657101787 ) @Export("minCachedTileY") int minCachedTileY; - @ObfuscatedName("bj") + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = -1463258673 + intValue = 1737203703 ) - int field4030; + int field4006; static { fontNameVerdana11 = FontName.FontName_verdana11; @@ -304,30 +304,30 @@ public class WorldMap { this.flashingElements = null; this.flashCount = -1; this.flashCycle = -1; - this.field4006 = -1; - this.field4007 = -1; - this.field4001 = -1; - this.field3989 = -1; - this.field4013 = true; + this.field3947 = -1; + this.field3970 = -1; + this.field3984 = -1; + this.field3985 = -1; + this.field3989 = true; this.enabledElements = new HashSet(); this.enabledCategories = new HashSet(); this.enabledElementIds = new HashSet(); - this.field3988 = new HashSet(); + this.field3993 = new HashSet(); this.elementsDisabled = false; - this.field4011 = 0; + this.field3995 = 0; this.menuOpcodes = new int[]{1008, 1009, 1010, 1011, 1012}; - this.field4005 = new HashSet(); + this.field4001 = new HashSet(); this.mouseCoord = null; this.showCoord = false; this.minCachedTileX = -1; this.minCachedTileY = -1; - this.field4030 = -1; + this.field4006 = -1; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lhp;Lhp;Lhp;Lke;Ljava/util/HashMap;[Llx;I)V", - garbageValue = "269789148" + signature = "(Lhz;Lhz;Lhz;Lkb;Ljava/util/HashMap;[Llq;I)V", + garbageValue = "-1501971523" ) @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.DETAILS.name); + int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field295.name); int[] var8 = this.WorldMap_archive.getGroupFileIds(var7); this.details = new HashMap(var8.length); @@ -356,147 +356,144 @@ public class WorldMap { } this.setCurrentMapArea(this.mainMapArea); - this.field3987 = null; + this.field3948 = null; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1654811924" + garbageValue = "1074851156" ) - public void method6299() { + public void method6187() { WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IIZIIIII)V", - garbageValue = "-2047217979" + signature = "(IIZIIIIB)V", + garbageValue = "21" ) @Export("onCycle") - public void onCycle(int mouseX, int mouseY, boolean mouseOver, int xOffset, int yOffset, int width, int height) { - if (!this.cacheLoader.isLoaded()) { - return; - } - this.smoothZoom(); - this.scrollToTarget(); - if (!mouseOver) { - return; - } - int var8 = (int)Math.ceil((double)((float)width / this.zoom)); - int var9 = (int)Math.ceil((double)((float)height / this.zoom)); - List var10 = this.worldMapManager.method607(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, xOffset, yOffset, width, height, mouseX, mouseY); - HashSet var11 = new HashSet(); + public void onCycle(int var1, int var2, boolean var3, int var4, int var5, int var6, int var7) { + if (this.cacheLoader.isLoaded()) { + this.smoothZoom(); + this.scrollToTarget(); + 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.method629(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(); LoginPacket.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, mouseX, mouseY}); - if (this.field4005.contains(var13)) { - var14.setType(17); - } else { - var14.setType(15); + Iterator var12; + AbstractWorldMapIcon var13; + ScriptEvent var14; + WorldMapEvent var15; + for (var12 = var10.iterator(); var12.hasNext(); class81.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.field4001.contains(var13)) { + var14.setType(17); + } else { + var14.setType(15); + } + } + + var12 = this.field4001.iterator(); + + while (var12.hasNext()) { + var13 = (AbstractWorldMapIcon)var12.next(); + if (!var11.contains(var13)) { + var14 = new ScriptEvent(); + var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); + var14.setArgs(new Object[]{var15, var1, var2}); + var14.setType(16); + class81.runScriptEvent(var14); + } + } + + this.field4001 = var11; } } - - var12 = this.field4005.iterator(); - - while (var12.hasNext()) { - var13 = (AbstractWorldMapIcon)var12.next(); - if (!var11.contains(var13)) { - var14 = new ScriptEvent(); - var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); - var14.setArgs(new Object[]{var15, mouseX, mouseY}); - var14.setType(16); - LoginPacket.runScriptEvent(var14); - } - } - - this.field4005 = var11; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(IIZZB)V", - garbageValue = "24" - ) - public void method6301(int var1, int var2, boolean isClicked, boolean wasClicked) { - long var5 = DirectByteArrayCopier.currentTimeMs(); - this.method6302(var1, var2, wasClicked, var5); - if (!this.hasTarget() && (wasClicked || isClicked)) { - if (wasClicked) { - this.field4001 = var1; - this.field3989 = var2; - this.field4006 = this.centerTileX; - this.field4007 = this.centerTileY; - } - - if (this.field4006 != -1) { - int var7 = var1 - this.field4001; - int var8 = var2 - this.field3989; - this.setWorldMapPosition(this.field4006 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field4007, false); - } - } else { - this.method6306(); - } - - if (wasClicked) { - this.field3982 = var5; - this.field4000 = var1; - this.field4012 = var2; - } - } @ObfuscatedName("k") - void method6302(int var1, int var2, boolean var3, long var4) { - if (this.currentMapArea == null) { - this.mouseCoord = null; - return; - } - 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) { - return; - } - boolean var8 = Client.staffModLevel >= 2; - if (var8 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { - WorldMapLabel.changePlane(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); - return; - } - boolean var9 = true; - if (this.field4013) { - int var10 = var1 - this.field4000; - int var11 = var2 - this.field4012; - if (var4 - this.field3982 > 500L || var10 < -25 || var10 > 25 || var11 < -25 || var11 > 25) { - var9 = false; + @ObfuscatedSignature( + signature = "(IIZZI)V", + garbageValue = "929867253" + ) + public void method6185(int var1, int var2, boolean var3, boolean var4) { + long var5 = SequenceDefinition.method4686(); + this.method6186(var1, var2, var4, var5); + if (!this.hasTarget() && (var4 || var3)) { + if (var4) { + this.field3984 = var1; + this.field3985 = var2; + this.field3947 = this.centerTileX; + this.field3970 = this.centerTileY; } + + if (this.field3947 != -1) { + int var7 = var1 - this.field3984; + int var8 = var2 - this.field3985; + this.setWorldMapPosition(this.field3947 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field3970, false); + } + } else { + this.method6330(); } - if (var9) { - PacketBufferNode var12 = Archive.getPacketBufferNode(ClientPacket.field2248, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeIntME(this.mouseCoord.packed()); - Client.packetWriter.addNode(var12); - this.field3982 = 0L; + if (var4) { + this.field3986 = var5; + this.field3987 = var1; + this.field3988 = var2; } } - @ObfuscatedName("l") + @ObfuscatedName("u") + void method6186(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; + if (var8 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { + BoundaryObject.method3215(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); + } else { + boolean var9 = true; + if (this.field3989) { + int var10 = var1 - this.field3987; + int var11 = var2 - this.field3988; + if (var4 - this.field3986 > 500L || var10 < -25 || var10 > 25 || var11 < -25 || var11 > 25) { + var9 = false; + } + } + + if (var9) { + PacketBufferNode var12 = MenuAction.getPacketBufferNode(ClientPacket.field2230, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeIntME(this.mouseCoord.packed()); + Client.packetWriter.addNode(var12); + this.field3986 = 0L; + } + } + } + } else { + this.mouseCoord = null; + } + + } + + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "-59" + garbageValue = "-70" ) @Export("smoothZoom") void smoothZoom() { - if (PendingSpawn.field944 != null) { + if (GameObject.field1921 != null) { this.zoom = this.zoomTarget; } else { if (this.zoom < this.zoomTarget) { @@ -510,98 +507,98 @@ public class WorldMap { } } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1342245212" + garbageValue = "-1338341298" ) @Export("scrollToTarget") void scrollToTarget() { - if (!this.hasTarget()) { - return; - } - int var1 = this.worldMapTargetX - this.centerTileX; - int var2 = this.worldMapTargetY - this.centerTileY; - if (var1 != 0) { - var1 /= Math.min(8, Math.abs(var1)); - } + if (this.hasTarget()) { + int var1 = this.worldMapTargetX - this.centerTileX; + int var2 = this.worldMapTargetY - this.centerTileY; + if (var1 != 0) { + var1 /= Math.min(8, Math.abs(var1)); + } - if (var2 != 0) { - var2 /= Math.min(8, Math.abs(var2)); - } + if (var2 != 0) { + var2 /= Math.min(8, Math.abs(var2)); + } - this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); - if (this.worldMapTargetX == this.centerTileX && this.centerTileY == this.worldMapTargetY) { - this.worldMapTargetX = -1; - this.worldMapTargetY = -1; - } + this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); + if (this.centerTileX == this.worldMapTargetX && this.centerTileY == this.worldMapTargetY) { + this.worldMapTargetX = -1; + this.worldMapTargetY = -1; + } + } } - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(IIZI)V", - garbageValue = "997010308" + garbageValue = "1410268107" ) @Export("setWorldMapPosition") final void setWorldMapPosition(int var1, int var2, boolean var3) { this.centerTileX = var1; this.centerTileY = var2; - DirectByteArrayCopier.currentTimeMs(); + SequenceDefinition.method4686(); if (var3) { - this.method6306(); + this.method6330(); } } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "1" + signature = "(I)V", + garbageValue = "-616749103" ) - final void method6306() { - this.field3989 = -1; - this.field4001 = -1; - this.field4007 = -1; - this.field4006 = -1; + final void method6330() { + this.field3985 = -1; + this.field3984 = -1; + this.field3970 = -1; + this.field3947 = -1; } - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-1798677301" + signature = "(B)Z", + garbageValue = "-26" ) @Export("hasTarget") boolean hasTarget() { return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; } - @ObfuscatedName("x") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(IIIB)Lal;", - garbageValue = "30" + signature = "(IIIB)Lav;", + garbageValue = "1" ) @Export("mapAreaAtCoord") public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) { Iterator var4 = this.details.values().iterator(); WorldMapArea var5; - while (var4.hasNext()) { - var5 = (WorldMapArea) var4.next(); - if (var5.containsCoord(var1, var2, var3)) { - return var5; + do { + if (!var4.hasNext()) { + return null; } - } - return null; + var5 = (WorldMapArea)var4.next(); + } while(!var5.containsCoord(var1, var2, var3)); + + return var5; } - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IIIZB)V", - garbageValue = "-128" + signature = "(IIIZI)V", + garbageValue = "-1201377679" ) - public void method6309(int var1, int var2, int var3, boolean var4) { + public void method6193(int var1, int var2, int var3, boolean var4) { WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); if (var5 == null) { if (!var4) { @@ -612,8 +609,8 @@ public class WorldMap { } boolean var6 = false; - if (var5 != this.field3987 || var4) { - this.field3987 = var5; + if (var5 != this.field3948 || var4) { + this.field3948 = var5; this.setCurrentMapArea(var5); var6 = true; } @@ -624,10 +621,10 @@ public class WorldMap { } - @ObfuscatedName("v") + @ObfuscatedName("r") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-2081966255" + garbageValue = "552511282" ) @Export("setCurrentMapAreaId") public void setCurrentMapAreaId(int var1) { @@ -641,27 +638,27 @@ public class WorldMap { @ObfuscatedName("y") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "89" + garbageValue = "2" ) @Export("currentMapAreaId") public int currentMapAreaId() { return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); } - @ObfuscatedName("g") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(B)Lal;", - garbageValue = "-121" + signature = "(I)Lav;", + garbageValue = "-1424371982" ) @Export("getCurrentMapArea") public WorldMapArea getCurrentMapArea() { return this.currentMapArea; } - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lal;I)V", - garbageValue = "812407126" + signature = "(Lav;I)V", + garbageValue = "2090991872" ) @Export("setCurrentMapArea") void setCurrentMapArea(WorldMapArea var1) { @@ -671,10 +668,10 @@ public class WorldMap { } } - @ObfuscatedName("j") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Lal;I)V", - garbageValue = "-1813483224" + signature = "(Lav;B)V", + garbageValue = "14" ) @Export("initializeWorldMapManager") void initializeWorldMapManager(WorldMapArea var1) { @@ -683,31 +680,30 @@ public class WorldMap { this.cacheLoader.reset(this.currentMapArea.getInternalName()); } - @ObfuscatedName("o") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(Lal;Lhv;Lhv;ZI)V", - garbageValue = "1469825217" + signature = "(Lav;Lhd;Lhd;ZB)V", + garbageValue = "120" ) - public void method6315(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { - if (var1 == null) { - return; - } - if (this.currentMapArea == null || var1 != this.currentMapArea) { - this.initializeWorldMapManager(var1); - } + public void method6199(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { + if (var1 != null) { + if (this.currentMapArea == null || var1 != this.currentMapArea) { + this.initializeWorldMapManager(var1); + } - if (!var4 && this.currentMapArea.containsCoord(var2.plane, var2.x, var2.y)) { - this.jump(var2.plane, var2.x, var2.y); - } else { - this.jump(var3.plane, var3.x, var3.y); - } + if (!var4 && this.currentMapArea.containsCoord(var2.plane, var2.x, var2.y)) { + this.jump(var2.plane, var2.x, var2.y); + } else { + this.jump(var3.plane, var3.x, var3.y); + } + } } - @ObfuscatedName("d") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(IIII)V", - garbageValue = "1348080831" + garbageValue = "1231444564" ) @Export("jump") void jump(int var1, int var2, int var3) { @@ -722,276 +718,270 @@ public class WorldMap { this.worldMapTargetY = -1; this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); this.zoomTarget = this.zoom; - this.field3972 = null; + this.field3980 = null; this.iconIterator = null; this.worldMapManager.clearIcons(); } } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(IIIIII)V", - garbageValue = "-365948534" + garbageValue = "-2106180683" ) @Export("draw") - public void draw(int x, int y, int width, int height, int cycle) { + public void draw(int var1, int var2, int var3, int var4, int var5) { int[] var6 = new int[4]; Rasterizer2D.Rasterizer2D_getClipArray(var6); - Rasterizer2D.Rasterizer2D_setClip(x, y, width + x, y + height); - Rasterizer2D.Rasterizer2D_fillRectangle(x, y, width, height, 0xff000000); + Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4); + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); int var7 = this.cacheLoader.getPercentLoaded(); if (var7 < 100) { - this.drawLoading(x, y, width, height, var7); - return; - } - if (!this.worldMapManager.isLoaded()) { - this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); + this.drawLoading(var1, var2, var3, var4, var7); + } else { if (!this.worldMapManager.isLoaded()) { - return; - } - } - - if (this.flashingElements != null) { - ++this.flashCycle; - if (this.flashCycle % this.cyclesPerFlash == 0) { - this.flashCycle = 0; - ++this.flashCount; + this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); + if (!this.worldMapManager.isLoaded()) { + return; + } } - if (this.flashCount >= this.maxFlashCount && !this.perpetualFlash) { - this.flashingElements = null; - } - } + if (this.flashingElements != null) { + ++this.flashCycle; + if (this.flashCycle % this.cyclesPerFlash == 0) { + this.flashCycle = 0; + ++this.flashCount; + } - int var8 = (int)Math.ceil((double)((float)width / this.zoom)); - int var9 = (int)Math.ceil((double)((float)height / this.zoom)); - this.worldMapManager.drawTiles(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, x, y, width + x, y + height); - boolean var10; - if (!this.elementsDisabled) { - var10 = false; - if (cycle - this.field4011 > 100) { - this.field4011 = cycle; - var10 = true; + if (this.flashCount >= this.maxFlashCount && !this.perpetualFlash) { + this.flashingElements = null; + } } - this.worldMapManager.drawElements(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, x, y, width + x, y + height, this.field3988, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); - } + 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.field3995 > 100) { + this.field3995 = var5; + var10 = true; + } - this.method6319(x, y, width, height, var8, var9); - var10 = Client.staffModLevel >= 2; - if (var10 && this.showCoord && this.mouseCoord != null) { - this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 0xffff00, -1); - } + 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.field3993, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); + } - this.worldMapDisplayWidth = var8; - this.worldMapDisplayHeight = var9; - this.worldMapDisplayX = x; - this.worldMapDisplayY = y; - Rasterizer2D.Rasterizer2D_setClipArray(var6); + this.method6203(var1, var2, var3, var4, var8, var9); + var10 = Client.staffModLevel >= 2; + if (var10 && this.showCoord && this.mouseCoord != null) { + this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1); + } + + this.worldMapDisplayWidth = var8; + this.worldMapDisplayHeight = var9; + this.worldMapDisplayX = var1; + this.worldMapDisplayY = var2; + Rasterizer2D.Rasterizer2D_setClipArray(var6); + } } - @ObfuscatedName("z") + @ObfuscatedName("h") @ObfuscatedSignature( signature = "(IIIIIII)Z", - garbageValue = "-1863961695" + garbageValue = "-163932423" ) - boolean method6318(int var1, int var2, int var3, int var4, int var5, int var6) { + boolean method6296(int var1, int var2, int var3, int var4, int var5, int var6) { if (this.sprite == null) { return true; - } - if (this.sprite.subWidth != var1 || this.sprite.subHeight != var2) { + } else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { + if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { + return true; + } else if (this.field4006 != Client.field892) { + return true; + } else if (var3 <= 0 && var4 <= 0) { + return var3 + var1 < var5 || var2 + var4 < var6; + } else { + return true; + } + } else { return true; } - if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { - return true; - } - if (this.field4030 != Client.field924) { - return true; - } - if (var3 <= 0 && var4 <= 0) { - return var3 + var1 < var5 || var2 + var4 < var6; - } - return true; } - @ObfuscatedName("al") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(IIIIIIB)V", - garbageValue = "-125" + signature = "(IIIIIIS)V", + garbageValue = "32313" ) - void method6319(int var1, int var2, int var3, int var4, int var5, int var6) { - if (PendingSpawn.field944 == null) { - return; - } - int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); - int var8 = var3 + 512; - int var9 = var4 + 512; - float var10 = 1.0F; - var8 = (int)((float)var8 / var10); - var9 = (int)((float)var9 / var10); - int var11 = this.getDisplayX() - var5 / 2 - var7; - int var12 = this.getDisplayY() - var6 / 2 - var7; - int var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; - int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); - if (this.method6318(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 { - this.sprite = new Sprite(var8, var9); + void method6203(int var1, int var2, int var3, int var4, int var5, int var6) { + if (GameObject.field1921 != null) { + int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); + int var8 = var3 + 512; + int var9 = var4 + 512; + float var10 = 1.0F; + var8 = (int)((float)var8 / var10); + var9 = (int)((float)var9 / var10); + int var11 = this.getDisplayX() - var5 / 2 - var7; + int var12 = this.getDisplayY() - var6 / 2 - var7; + int var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; + int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); + if (this.method6296(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 { + this.sprite = new Sprite(var8, var9); + } + + this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; + this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; + this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; + GameObject.field1921.method4242(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); + this.field4006 = Client.field892; + var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; + var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); } - this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; - this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; - this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; - PendingSpawn.field944.method4321(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); - this.field4030 = Client.field924; - var13 = var1 - (var11 + var7 - 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.method6135(var13, var14, 192); - } else { - this.sprite.method6217(var13, var14, (int)(var10 * (float)var8), (int)((float)var9 * var10), 192); + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); + if (1.0F == var10) { + this.sprite.method6014(var13, var14, 192); + } else { + this.sprite.method6017(var13, var14, (int)((float)var8 * var10), (int)((float)var9 * var10), 192); + } } } - @ObfuscatedName("av") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "-1774436451" + signature = "(IIIIB)V", + garbageValue = "81" ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4) { - if (!this.cacheLoader.isLoaded()) { - return; - } - if (!this.worldMapManager.isLoaded()) { - this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); + if (this.cacheLoader.isLoaded()) { if (!this.worldMapManager.isLoaded()) { - return; + this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); + if (!this.worldMapManager.isLoaded()) { + return; + } } - } - this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.flashCycle, this.cyclesPerFlash); + this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.flashCycle, this.cyclesPerFlash); + } } - @ObfuscatedName("as") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1089841292" + garbageValue = "-178698826" ) @Export("setZoomPercentage") public void setZoomPercentage(int var1) { this.zoomTarget = this.getZoomFromPercentage(var1); } - @ObfuscatedName("aw") + @ObfuscatedName("av") @ObfuscatedSignature( - signature = "(IIIIII)V", - garbageValue = "1955930802" + signature = "(IIIIIS)V", + garbageValue = "510" ) @Export("drawLoading") - void drawLoading(int x, int y, int width, int height, int percentLoaded) { + void drawLoading(int var1, int var2, int var3, int var4, int var5) { byte var6 = 20; - int var7 = width / 2 + x; - int var8 = height / 2 + y - 18 - var6; - Rasterizer2D.Rasterizer2D_fillRectangle(x, y, width, height, 0xff000000); - Rasterizer2D.Rasterizer2D_drawRectangle(var7 - 152, var8, 304, 34, 0xffff0000); - Rasterizer2D.Rasterizer2D_fillRectangle(var7 - 150, var8 + 2, percentLoaded * 3, 30, 0xffff0000); + int var7 = var3 / 2 + var1; + int var8 = var4 / 2 + var2 - 18 - var6; + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); + Rasterizer2D.Rasterizer2D_drawRectangle(var7 - 152, var8, 304, 34, -65536); + Rasterizer2D.Rasterizer2D_fillRectangle(var7 - 150, var8 + 2, var5 * 3, 30, -65536); this.font.drawCentered("Loading...", var7, var6 + var8, -1, -1); } - @ObfuscatedName("ad") + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(II)F", - garbageValue = "-1360526836" + signature = "(IB)F", + garbageValue = "71" ) @Export("getZoomFromPercentage") float getZoomFromPercentage(int var1) { if (var1 == 25) { return 1.0F; - } - if (var1 == 37) { + } else if (var1 == 37) { return 1.5F; - } - if (var1 == 50) { + } else if (var1 == 50) { return 2.0F; - } - if (var1 == 75) { + } else if (var1 == 75) { return 3.0F; + } else { + return var1 == 100 ? 4.0F : 8.0F; } - return var1 == 100 ? 4.0F : 8.0F; } - @ObfuscatedName("ag") + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "58" + signature = "(I)I", + garbageValue = "666427478" ) @Export("getZoomLevel") public int getZoomLevel() { if ((double)this.zoomTarget == 1.0D) { return 25; - } - if (1.5D == (double)this.zoomTarget) { + } else if (1.5D == (double)this.zoomTarget) { return 37; - } - if (2.0D == (double)this.zoomTarget) { + } else if (2.0D == (double)this.zoomTarget) { return 50; - } - if ((double)this.zoomTarget == 3.0D) { + } else if ((double)this.zoomTarget == 3.0D) { return 75; + } else { + return 4.0D == (double)this.zoomTarget ? 100 : 200; } - return 4.0D == (double)this.zoomTarget ? 100 : 200; } - @ObfuscatedName("ar") + @ObfuscatedName("af") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1903923036" + garbageValue = "301674641" ) @Export("loadCache") public void loadCache() { this.cacheLoader.load(); } - @ObfuscatedName("ax") + @ObfuscatedName("az") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "1852688720" + signature = "(B)Z", + garbageValue = "-80" ) @Export("isCacheLoaded") public boolean isCacheLoaded() { return this.cacheLoader.isLoaded(); } - @ObfuscatedName("az") + @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "(II)Lal;", - garbageValue = "-733609439" + signature = "(IB)Lav;", + garbageValue = "97" ) @Export("getMapArea") public WorldMapArea getMapArea(int var1) { Iterator var2 = this.details.values().iterator(); WorldMapArea var3; - while (var2.hasNext()) { - var3 = (WorldMapArea) var2.next(); - if (var3.getId() == var1) { - return var3; + do { + if (!var2.hasNext()) { + return null; } - } - return null; + var3 = (WorldMapArea)var2.next(); + } while(var3.getId() != var1); + + return var3; } - @ObfuscatedName("ae") + @ObfuscatedName("an") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-1604144136" + garbageValue = "938749797" ) @Export("setWorldMapPositionTarget") public void setWorldMapPositionTarget(int var1, int var2) { @@ -1001,10 +991,10 @@ public class WorldMap { } } - @ObfuscatedName("ao") + @ObfuscatedName("at") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "2147035195" + signature = "(IIB)V", + garbageValue = "-30" ) @Export("setWorldMapPositionTargetInstant") public void setWorldMapPositionTargetInstant(int var1, int var2) { @@ -1015,10 +1005,10 @@ public class WorldMap { } } - @ObfuscatedName("aj") + @ObfuscatedName("as") @ObfuscatedSignature( - signature = "(IIII)V", - garbageValue = "-1252480817" + signature = "(IIIB)V", + garbageValue = "1" ) @Export("jumpToSourceCoord") public void jumpToSourceCoord(int var1, int var2, int var3) { @@ -1031,10 +1021,10 @@ public class WorldMap { } } - @ObfuscatedName("at") + @ObfuscatedName("ak") @ObfuscatedSignature( signature = "(IIII)V", - garbageValue = "-1225675746" + garbageValue = "-183605322" ) @Export("jumpToSourceCoordInstant") public void jumpToSourceCoordInstant(int var1, int var2, int var3) { @@ -1047,60 +1037,60 @@ public class WorldMap { } } - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-786263367" + garbageValue = "418458900" ) @Export("getDisplayX") public int getDisplayX() { return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; } - @ObfuscatedName("ap") + @ObfuscatedName("ac") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-2026899768" + signature = "(B)I", + garbageValue = "8" ) @Export("getDisplayY") public int getDisplayY() { return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; } - @ObfuscatedName("aq") + @ObfuscatedName("ar") @ObfuscatedSignature( - signature = "(B)Lhv;", - garbageValue = "19" + signature = "(B)Lhd;", + garbageValue = "122" ) @Export("getDisplayCoord") public Coord getDisplayCoord() { return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); } - @ObfuscatedName("aa") + @ObfuscatedName("au") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1200687327" + garbageValue = "1924193012" ) @Export("getDisplayWith") public int getDisplayWith() { return this.worldMapDisplayWidth; } - @ObfuscatedName("an") + @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "127" + signature = "(I)I", + garbageValue = "2076966029" ) @Export("getDisplayHeight") public int getDisplayHeight() { return this.worldMapDisplayHeight; } - @ObfuscatedName("au") + @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1678064633" + signature = "(IB)V", + garbageValue = "-106" ) @Export("setMaxFlashCount") public void setMaxFlashCount(int var1) { @@ -1110,20 +1100,20 @@ public class WorldMap { } - @ObfuscatedName("ai") + @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "18" + signature = "(I)V", + garbageValue = "499272419" ) @Export("resetMaxFlashCount") public void resetMaxFlashCount() { this.maxFlashCount = 3; } - @ObfuscatedName("ak") + @ObfuscatedName("ap") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "127822739" + garbageValue = "1568353274" ) @Export("setCyclesPerFlash") public void setCyclesPerFlash(int var1) { @@ -1133,30 +1123,30 @@ public class WorldMap { } - @ObfuscatedName("ah") + @ObfuscatedName("aq") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-244117630" + garbageValue = "-1817487801" ) @Export("resetCyclesPerFlash") public void resetCyclesPerFlash() { this.cyclesPerFlash = 50; } - @ObfuscatedName("am") + @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "1836786082" + signature = "(ZB)V", + garbageValue = "14" ) @Export("setPerpetualFlash") public void setPerpetualFlash(boolean var1) { this.perpetualFlash = var1; } - @ObfuscatedName("ay") + @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1761276065" + signature = "(IB)V", + garbageValue = "-91" ) @Export("flashElement") public void flashElement(int var1) { @@ -1166,10 +1156,10 @@ public class WorldMap { this.flashCycle = 0; } - @ObfuscatedName("af") + @ObfuscatedName("al") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-685614117" + garbageValue = "-1948560443" ) @Export("flashCategory") public void flashCategory(int var1) { @@ -1177,38 +1167,38 @@ public class WorldMap { this.flashCount = 0; this.flashCycle = 0; - for (int var2 = 0; var2 < UserComparator1.WorldMapElement_count; ++var2) { - if (class222.WorldMapElement_get(var2) != null && class222.WorldMapElement_get(var2).category == var1) { - this.flashingElements.add(class222.WorldMapElement_get(var2).objectId); + for (int var2 = 0; var2 < WorldMapElement.WorldMapElement_count; ++var2) { + if (WorldMapData_0.WorldMapElement_get(var2) != null && WorldMapData_0.WorldMapElement_get(var2).category == var1) { + this.flashingElements.add(WorldMapData_0.WorldMapElement_get(var2).objectId); } } } - @ObfuscatedName("ab") + @ObfuscatedName("ah") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1910993188" + garbageValue = "-290125378" ) @Export("stopCurrentFlashes") public void stopCurrentFlashes() { this.flashingElements = null; } - @ObfuscatedName("bp") + @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "(ZB)V", - garbageValue = "35" + signature = "(ZS)V", + garbageValue = "12874" ) @Export("setElementsDisabled") public void setElementsDisabled(boolean var1) { this.elementsDisabled = !var1; } - @ObfuscatedName("bz") + @ObfuscatedName("aw") @ObfuscatedSignature( - signature = "(IZB)V", - garbageValue = "-69" + signature = "(IZS)V", + garbageValue = "256" ) @Export("disableElement") public void disableElement(int var1, boolean var2) { @@ -1218,13 +1208,13 @@ public class WorldMap { this.enabledElements.remove(var1); } - this.method6350(); + this.method6235(); } - @ObfuscatedName("bi") + @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "(IZI)V", - garbageValue = "-1036879778" + signature = "(IZB)V", + garbageValue = "24" ) @Export("setCategoryDisabled") public void setCategoryDisabled(int var1, boolean var2) { @@ -1234,9 +1224,9 @@ public class WorldMap { this.enabledCategories.remove(var1); } - for (int var3 = 0; var3 < UserComparator1.WorldMapElement_count; ++var3) { - if (class222.WorldMapElement_get(var3) != null && class222.WorldMapElement_get(var3).category == var1) { - int var4 = class222.WorldMapElement_get(var3).objectId; + for (int var3 = 0; var3 < WorldMapElement.WorldMapElement_count; ++var3) { + if (WorldMapData_0.WorldMapElement_get(var3) != null && WorldMapData_0.WorldMapElement_get(var3).category == var1) { + int var4 = WorldMapData_0.WorldMapElement_get(var3).objectId; if (!var2) { this.enabledElementIds.add(var4); } else { @@ -1245,33 +1235,33 @@ public class WorldMap { } } - this.method6350(); + this.method6235(); } - @ObfuscatedName("bg") + @ObfuscatedName("bk") @ObfuscatedSignature( - signature = "(S)Z", - garbageValue = "-27155" + signature = "(I)Z", + garbageValue = "-1573190720" ) @Export("getElementsDisabled") public boolean getElementsDisabled() { return !this.elementsDisabled; } - @ObfuscatedName("bh") + @ObfuscatedName("bw") @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "-85" + signature = "(II)Z", + garbageValue = "245562250" ) @Export("isElementDisabled") public boolean isElementDisabled(int var1) { return !this.enabledElements.contains(var1); } - @ObfuscatedName("bm") + @ObfuscatedName("bo") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "-120988361" + garbageValue = "2145379299" ) @Export("isCategoryDisabled") public boolean isCategoryDisabled(int var1) { @@ -1280,103 +1270,101 @@ public class WorldMap { @ObfuscatedName("bn") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "27" + signature = "(I)V", + garbageValue = "2006376266" ) - void method6350() { - this.field3988.clear(); - this.field3988.addAll(this.enabledElements); - this.field3988.addAll(this.enabledElementIds); + void method6235() { + this.field3993.clear(); + this.field3993.addAll(this.enabledElements); + this.field3993.addAll(this.enabledElementIds); } - @ObfuscatedName("bc") + @ObfuscatedName("bp") @ObfuscatedSignature( signature = "(IIIIIII)V", - garbageValue = "90618974" + garbageValue = "2038457926" ) @Export("addElementMenuOptions") - public void addElementMenuOptions(int xOffset, int yOffset, int width, int height, int mouseX, int mouseY) { - if (!this.cacheLoader.isLoaded()) { - return; - } - int var7 = (int)Math.ceil((double)((float)width / this.zoom)); - int var8 = (int)Math.ceil((double)((float)height / this.zoom)); - List var9 = this.worldMapManager.method607(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, xOffset, yOffset, width, height, mouseX, mouseY); - if (var9.isEmpty()) { - return; - } - Iterator var10 = var9.iterator(); + 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.method629(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(); - boolean var13; - do { - if (!var10.hasNext()) { - return; - } - - AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); - WorldMapElement var12 = class222.WorldMapElement_get(var11.getElement()); - var13 = false; - - for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { - if (var12.menuActions[var14] != null) { - class188.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); - var13 = true; - } - } - } while(!var13); - - } - - @ObfuscatedName("bx") - @ObfuscatedSignature( - signature = "(ILhv;I)Lhv;", - garbageValue = "719601861" - ) - public Coord method6352(int var1, Coord var2) { - if (!this.cacheLoader.isLoaded()) { - return null; - } - if (!this.worldMapManager.isLoaded()) { - return null; - } - if (!this.currentMapArea.containsPosition(var2.x, var2.y)) { - return null; - } - HashMap var3 = this.worldMapManager.buildIcons(); - List var4 = (List)var3.get(var1); - if (var4 != null && !var4.isEmpty()) { - AbstractWorldMapIcon var5 = null; - int var6 = -1; - Iterator var7 = var4.iterator(); - - while (true) { - AbstractWorldMapIcon var8; - int var11; + boolean var13; do { - if (!var7.hasNext()) { - return var5.coord2; + if (!var10.hasNext()) { + return; } - var8 = (AbstractWorldMapIcon)var7.next(); - int var9 = var8.coord2.x - var2.x; - int var10 = var8.coord2.y - var2.y; - var11 = var9 * var9 + var10 * var10; - if (var11 == 0) { - return var8.coord2; - } - } while(var11 >= var6 && var5 != null); + AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); + WorldMapElement var12 = WorldMapData_0.WorldMapElement_get(var11.getElement()); + var13 = false; + + for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { + if (var12.menuActions[var14] != null) { + WorldMapData_0.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); + var13 = true; + } + } + } while(!var13); - var5 = var8; - var6 = var11; } } - return null; } - @ObfuscatedName("bo") + @ObfuscatedName("bz") @ObfuscatedSignature( - signature = "(IILhv;Lhv;B)V", - garbageValue = "8" + signature = "(ILhd;I)Lhd;", + garbageValue = "-440389364" + ) + public Coord method6237(int var1, Coord var2) { + if (!this.cacheLoader.isLoaded()) { + return null; + } else if (!this.worldMapManager.isLoaded()) { + return null; + } else if (!this.currentMapArea.containsPosition(var2.x, var2.y)) { + return null; + } else { + HashMap var3 = this.worldMapManager.buildIcons(); + List var4 = (List)var3.get(var1); + if (var4 != null && !var4.isEmpty()) { + AbstractWorldMapIcon var5 = null; + int var6 = -1; + Iterator var7 = var4.iterator(); + + while (true) { + AbstractWorldMapIcon var8; + int var11; + do { + if (!var7.hasNext()) { + return var5.coord2; + } + + var8 = (AbstractWorldMapIcon)var7.next(); + int var9 = var8.coord2.x - var2.x; + int var10 = var8.coord2.y - var2.y; + var11 = var10 * var10 + var9 * var9; + if (var11 == 0) { + return var8.coord2; + } + } while(var11 >= var6 && var5 != null); + + var5 = var8; + var6 = var11; + } + } else { + return null; + } + } + } + + @ObfuscatedName("bh") + @ObfuscatedSignature( + signature = "(IILhd;Lhd;B)V", + garbageValue = "-119" ) @Export("menuAction") public void menuAction(int var1, int var2, Coord var3, Coord var4) { @@ -1400,54 +1388,55 @@ public class WorldMap { var5.setType(14); } - LoginPacket.runScriptEvent(var5); + class81.runScriptEvent(var5); } - @ObfuscatedName("bb") + @ObfuscatedName("bv") @ObfuscatedSignature( - signature = "(I)Laz;", - garbageValue = "1843313611" + signature = "(I)Las;", + garbageValue = "-1599933443" ) @Export("iconStart") public AbstractWorldMapIcon iconStart() { if (!this.cacheLoader.isLoaded()) { return null; - } - if (!this.worldMapManager.isLoaded()) { + } else if (!this.worldMapManager.isLoaded()) { return null; - } - HashMap var1 = this.worldMapManager.buildIcons(); - this.field3972 = new LinkedList(); - Iterator var2 = var1.values().iterator(); + } else { + HashMap var1 = this.worldMapManager.buildIcons(); + this.field3980 = new LinkedList(); + Iterator var2 = var1.values().iterator(); - while (var2.hasNext()) { - List var3 = (List)var2.next(); - this.field3972.addAll(var3); - } + while (var2.hasNext()) { + List var3 = (List)var2.next(); + this.field3980.addAll(var3); + } - this.iconIterator = this.field3972.iterator(); - return this.iconNext(); + this.iconIterator = this.field3980.iterator(); + return this.iconNext(); + } } - @ObfuscatedName("bs") + @ObfuscatedName("bj") @ObfuscatedSignature( - signature = "(B)Laz;", - garbageValue = "64" + signature = "(I)Las;", + garbageValue = "-1237024182" ) @Export("iconNext") public AbstractWorldMapIcon iconNext() { if (this.iconIterator == null) { return null; + } else { + AbstractWorldMapIcon var1; + do { + if (!this.iconIterator.hasNext()) { + return null; + } + + var1 = (AbstractWorldMapIcon)this.iconIterator.next(); + } while(var1.getElement() == -1); + + return var1; } - AbstractWorldMapIcon var1; - do { - if (!this.iconIterator.hasNext()) { - return null; - } - - var1 = (AbstractWorldMapIcon)this.iconIterator.next(); - } while(var1.getElement() == -1); - - return var1; } } diff --git a/runescape-client/src/main/java/WorldMapArchiveLoader.java b/runescape-client/src/main/java/WorldMapArchiveLoader.java index 087232a0e1..4102743218 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("lh") +@ObfuscatedName("la") @Implements("WorldMapArchiveLoader") public class WorldMapArchiveLoader { - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("cacheName") String cacheName; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("archive") AbstractArchive archive; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 431285519 + intValue = -726522089 ) @Export("percentLoaded") int percentLoaded; - @ObfuscatedName("i") + @ObfuscatedName("q") @Export("loaded") boolean loaded; @ObfuscatedSignature( - signature = "(Lhp;)V" + signature = "(Lhz;)V" ) WorldMapArchiveLoader(AbstractArchive var1) { this.percentLoaded = 0; @@ -35,10 +35,10 @@ public class WorldMapArchiveLoader { this.archive = var1; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(Ljava/lang/String;B)V", - garbageValue = "124" + garbageValue = "-7" ) @Export("reset") void reset(String var1) { @@ -52,15 +52,15 @@ public class WorldMapArchiveLoader { } } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "52307485" + garbageValue = "1496070348" ) @Export("load") int load() { if (this.percentLoaded < 33) { - if (!this.archive.tryLoadFileByNames(WorldMapCacheName.COMPOSITEMAP.name, this.cacheName)) { + if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field290.name, this.cacheName)) { return this.percentLoaded; } @@ -68,7 +68,7 @@ public class WorldMapArchiveLoader { } if (this.percentLoaded == 33) { - if (this.archive.isValidFileName(WorldMapCacheName.COMPOSITETEXTURE.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.COMPOSITETEXTURE.name, this.cacheName)) { + if (this.archive.isValidFileName(WorldMapCacheName.field291.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field291.name, this.cacheName)) { return this.percentLoaded; } @@ -76,7 +76,7 @@ public class WorldMapArchiveLoader { } if (this.percentLoaded == 66) { - if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.LABELS.name)) { + if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field293.name)) { return this.percentLoaded; } @@ -87,20 +87,20 @@ public class WorldMapArchiveLoader { return this.percentLoaded; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "1906092832" + signature = "(B)Z", + garbageValue = "30" ) @Export("isLoaded") boolean isLoaded() { return this.loaded; } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-805069530" + signature = "(B)I", + garbageValue = "-94" ) @Export("getPercentLoaded") int getPercentLoaded() { diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java index 9560979113..334c5dfc97 100644 --- a/runescape-client/src/main/java/WorldMapArea.java +++ b/runescape-client/src/main/java/WorldMapArea.java @@ -1,5 +1,5 @@ -import java.io.IOException; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.LinkedList; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; @@ -7,75 +7,67 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("al") +@ObfuscatedName("av") @Implements("WorldMapArea") public class WorldMapArea { - @ObfuscatedName("bo") - static String field213; - @ObfuscatedName("hc") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 143213649 - ) - @Export("oculusOrbFocalPointY") - static int oculusOrbFocalPointY; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -1977211607 + intValue = 1092118655 ) @Export("id") int id; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("internalName") String internalName; - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("externalName") String externalName; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -162659739 + intValue = -254766629 ) @Export("backGroundColor") int backGroundColor; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 19158817 + intValue = -1599697543 ) @Export("zoom") int zoom; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lhv;" + signature = "Lhd;" ) @Export("origin") Coord origin; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1024999231 + intValue = -798691043 ) @Export("regionLowX") int regionLowX; - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1660950761 + intValue = -415983949 ) @Export("regionHighX") int regionHighX; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1294876503 + intValue = -103515401 ) @Export("regionLowY") int regionLowY; - @ObfuscatedName("f") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -341254141 + intValue = 1136743993 ) @Export("regionHighY") int regionHighY; - @ObfuscatedName("m") + @ObfuscatedName("f") @Export("isMain") boolean isMain; - @ObfuscatedName("u") + @ObfuscatedName("c") @Export("sections") LinkedList sections; @@ -91,10 +83,10 @@ public class WorldMapArea { this.isMain = false; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lkf;IB)V", - garbageValue = "0" + signature = "(Lky;IB)V", + garbageValue = "25" ) @Export("read") public void read(Buffer var1, int var2) { @@ -116,30 +108,30 @@ public class WorldMapArea { this.setBounds(); } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkf;I)Laj;", - garbageValue = "-1426808810" + signature = "(Lky;I)Lac;", + garbageValue = "1253292592" ) @Export("readWorldMapSection") WorldMapSection readWorldMapSection(Buffer var1) { int var2 = var1.readUnsignedByte(); - WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.WORLDMAPSECTIONTYPE3, WorldMapSectionType.WORLDMAPSECTIONTYPE1, WorldMapSectionType.WORLDMAPSECTIONTYPE0, WorldMapSectionType.WORLDMAPSECTIONTYPE2}; - WorldMapSectionType var4 = (WorldMapSectionType)SoundSystem.findEnumerated(var3, var2); + WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.WORLDMAPSECTIONTYPE2, WorldMapSectionType.WORLDMAPSECTIONTYPE3, WorldMapSectionType.WORLDMAPSECTIONTYPE0, WorldMapSectionType.WORLDMAPSECTIONTYPE1}; + WorldMapSectionType var4 = (WorldMapSectionType)FriendSystem.findEnumerated(var3, var2); Object var5 = null; switch(var4.type) { case 0: var5 = new WorldMapSection0(); break; case 1: - var5 = new WorldMapSection2(); - break; - case 2: var5 = new WorldMapSection1(); break; - case 3: + case 2: var5 = new class42(); break; + case 3: + var5 = new WorldMapSection2(); + break; default: throw new IllegalStateException(""); } @@ -148,10 +140,10 @@ public class WorldMapArea { return (WorldMapSection)var5; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IIII)Z", - garbageValue = "772882794" + signature = "(IIIB)Z", + garbageValue = "-80" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -169,39 +161,41 @@ public class WorldMapArea { return true; } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(III)Z", - garbageValue = "431640899" + garbageValue = "1925873214" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { int var3 = var1 / 64; int var4 = var2 / 64; - if (var3 < this.regionLowX || var3 > this.regionHighX) { - return false; - } - if (var4 < this.regionLowY || var4 > this.regionHighY) { - return false; - } - Iterator var5 = this.sections.iterator(); + if (var3 >= this.regionLowX && var3 <= this.regionHighX) { + if (var4 >= this.regionLowY && var4 <= this.regionHighY) { + Iterator var5 = this.sections.iterator(); - WorldMapSection var6; - do { - if (!var5.hasNext()) { + WorldMapSection var6; + do { + if (!var5.hasNext()) { + return false; + } + + var6 = (WorldMapSection)var5.next(); + } while(!var6.containsPosition(var1, var2)); + + return true; + } else { return false; } - - var6 = (WorldMapSection)var5.next(); - } while(!var6.containsPosition(var1, var2)); - - return true; + } else { + return false; + } } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(IIII)[I", - garbageValue = "1197175712" + garbageValue = "1386977444" ) @Export("position") public int[] position(int var1, int var2, int var3) { @@ -219,10 +213,10 @@ public class WorldMapArea { return var5.getBorderTileLengths(var1, var2, var3); } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(III)Lhv;", - garbageValue = "1177032245" + signature = "(III)Lhd;", + garbageValue = "-1952348656" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -240,10 +234,10 @@ public class WorldMapArea { return var4.coord(var1, var2); } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1983561837" + garbageValue = "-205538232" ) @Export("setBounds") void setBounds() { @@ -256,60 +250,60 @@ public class WorldMapArea { } - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "11" + signature = "(I)I", + garbageValue = "-848943890" ) @Export("getId") public int getId() { return this.id; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1524903705" + garbageValue = "-731208789" ) @Export("getIsMain") public boolean getIsMain() { return this.isMain; } - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", - garbageValue = "-229522962" + signature = "(B)Ljava/lang/String;", + garbageValue = "5" ) @Export("getInternalName") public String getInternalName() { return this.internalName; } - @ObfuscatedName("x") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(I)Ljava/lang/String;", - garbageValue = "-1054173331" + garbageValue = "-10827335" ) @Export("getExternalName") public String getExternalName() { return this.externalName; } - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-26" + signature = "(I)I", + garbageValue = "-1129400396" ) @Export("getBackGroundColor") int getBackGroundColor() { return this.backGroundColor; } - @ObfuscatedName("v") + @ObfuscatedName("r") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "459716843" + garbageValue = "-1627458520" ) @Export("getZoom") public int getZoom() { @@ -319,411 +313,132 @@ public class WorldMapArea { @ObfuscatedName("y") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1607087713" + garbageValue = "-1112975954" ) @Export("getRegionLowX") public int getRegionLowX() { return this.regionLowX; } - @ObfuscatedName("g") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1992426641" + garbageValue = "-1527013006" ) @Export("getRegionHighX") public int getRegionHighX() { return this.regionHighX; } - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "426909580" + garbageValue = "-492028203" ) @Export("getRegionLowY") public int getRegionLowY() { return this.regionLowY; } - @ObfuscatedName("j") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-308162102" + garbageValue = "789236832" ) @Export("getRegionHighY") public int getRegionHighY() { return this.regionHighY; } - @ObfuscatedName("o") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-30" + signature = "(I)I", + garbageValue = "1012366175" ) @Export("getOriginX") public int getOriginX() { return this.origin.x; } - @ObfuscatedName("d") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-1111611912" + signature = "(B)I", + garbageValue = "50" ) @Export("getOriginPlane") public int getOriginPlane() { return this.origin.plane; } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-16" + signature = "(I)I", + garbageValue = "840568751" ) @Export("getOriginY") public int getOriginY() { return this.origin.y; } - @ObfuscatedName("z") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(I)Lhv;", - garbageValue = "1084515082" + signature = "(B)Lhd;", + garbageValue = "63" ) @Export("getOrigin") public Coord getOrigin() { return new Coord(this.origin); } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(II)Liq;", - garbageValue = "44972047" + signature = "(Lhz;Lhz;I)V", + garbageValue = "-1168462803" ) - @Export("ItemDefinition_get") - public static ItemDefinition ItemDefinition_get(int var0) { - ItemDefinition var1 = (ItemDefinition)ItemDefinition.ItemDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } - byte[] var2 = Messages.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 (!ModelData0.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_0.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; + @Export("NpcDefinition_setArchives") + public static void NpcDefinition_setArchives(AbstractArchive var0, AbstractArchive var1) { + NPCDefinition.NpcDefinition_archive = var0; + NPCDefinition.NpcDefinition_modelArchive = var1; } - @ObfuscatedName("q") + @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-296796650" + signature = "(Ldz;S)V", + garbageValue = "7503" ) - public static boolean method365() { - long var0 = DirectByteArrayCopier.currentTimeMs(); - int var2 = (int)(var0 - NetCache.NetCache_timeMs); - NetCache.NetCache_timeMs = var0; - if (var2 > 200) { - var2 = 200; + @Export("PcmStream_disable") + static final void PcmStream_disable(PcmStream var0) { + var0.active = false; + if (var0.sound != null) { + var0.sound.position = 0; } - NetCache.NetCache_loadTime += var2; - if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { - return true; + for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { + PcmStream_disable(var1); } - if (NetCache.NetCache_socket == null) { - return false; - } - try { - if (NetCache.NetCache_loadTime > 30000) { - throw new IOException(); - } - 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 (class226.NetCache_currentResponse == null) { - var5 = 8; - } else if (NetCache.field3175 == 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.field3181 != 0) { - for (var7 = 0; var7 < var6; ++var7) { - NetCache.NetCache_responseHeaderBuffer.array[var7 + NetCache.NetCache_responseHeaderBuffer.offset] ^= NetCache.field3181; - } - } - - var22 = NetCache.NetCache_responseHeaderBuffer; - var22.offset += var6; - if (NetCache.NetCache_responseHeaderBuffer.offset < var5) { - break; - } - - if (class226.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); - class215.NetCache_hasPendingPriorityResponses = true; - if (var13 == null) { - var13 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var11); - class215.NetCache_hasPendingPriorityResponses = false; - } - - if (var13 == null) { - throw new IOException(); - } - - int var14 = var9 == 0 ? 5 : 9; - class226.NetCache_currentResponse = var13; - VarpDefinition.NetCache_responseArchiveBuffer = new Buffer(var14 + var10 + class226.NetCache_currentResponse.padding); - VarpDefinition.NetCache_responseArchiveBuffer.writeByte(var9); - VarpDefinition.NetCache_responseArchiveBuffer.writeInt(var10); - NetCache.field3175 = 8; - NetCache.NetCache_responseHeaderBuffer.offset = 0; - } else if (NetCache.field3175 == 0) { - if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { - NetCache.field3175 = 1; - NetCache.NetCache_responseHeaderBuffer.offset = 0; - } else { - class226.NetCache_currentResponse = null; - } - } - continue; - } - var6 = VarpDefinition.NetCache_responseArchiveBuffer.array.length - class226.NetCache_currentResponse.padding; - var7 = 512 - NetCache.field3175; - if (var7 > var6 - VarpDefinition.NetCache_responseArchiveBuffer.offset) { - var7 = var6 - VarpDefinition.NetCache_responseArchiveBuffer.offset; - } - - if (var7 > var16) { - var7 = var16; - } - - NetCache.NetCache_socket.read(VarpDefinition.NetCache_responseArchiveBuffer.array, VarpDefinition.NetCache_responseArchiveBuffer.offset, var7); - if (NetCache.field3181 != 0) { - for (var8 = 0; var8 < var7; ++var8) { - var10000 = VarpDefinition.NetCache_responseArchiveBuffer.array; - var10001 = VarpDefinition.NetCache_responseArchiveBuffer.offset + var8; - var10000[var10001] ^= NetCache.field3181; - } - } - - var22 = VarpDefinition.NetCache_responseArchiveBuffer; - var22.offset += var7; - NetCache.field3175 += var7; - if (var6 != VarpDefinition.NetCache_responseArchiveBuffer.offset) { - if (NetCache.field3175 != 512) { - break; - } - - NetCache.field3175 = 0; - continue; - } - if (0xff00ffL == class226.NetCache_currentResponse.key) { - AbstractRasterProvider.NetCache_reference = VarpDefinition.NetCache_responseArchiveBuffer; - - for (var8 = 0; var8 < 256; ++var8) { - Archive var17 = NetCache.NetCache_archives[var8]; - if (var17 != null) { - AbstractRasterProvider.NetCache_reference.offset = var8 * 8 + 5; - var10 = AbstractRasterProvider.NetCache_reference.readInt(); - int var18 = AbstractRasterProvider.NetCache_reference.readInt(); - var17.loadIndex(var10, var18); - } - } - } else { - NetCache.NetCache_crc.reset(); - NetCache.NetCache_crc.update(VarpDefinition.NetCache_responseArchiveBuffer.array, 0, var6); - var8 = (int)NetCache.NetCache_crc.getValue(); - if (var8 != class226.NetCache_currentResponse.crc) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var20) { - } - - ++NetCache.NetCache_crcMismatches; - NetCache.NetCache_socket = null; - NetCache.field3181 = (byte) ((int) (Math.random() * 255.0D + 1.0D)); - return false; - } - NetCache.NetCache_crcMismatches = 0; - NetCache.NetCache_ioExceptions = 0; - class226.NetCache_currentResponse.archive.write((int) (class226.NetCache_currentResponse.key & 0xffffL), VarpDefinition.NetCache_responseArchiveBuffer.array, (class226.NetCache_currentResponse.key & 0xff0000L) == 0xff0000L, class215.NetCache_hasPendingPriorityResponses); - } - - class226.NetCache_currentResponse.remove(); - if (class215.NetCache_hasPendingPriorityResponses) { - --NetCache.NetCache_pendingPriorityResponsesCount; - } else { - --NetCache.NetCache_pendingResponsesCount; - } - - NetCache.field3175 = 0; - class226.NetCache_currentResponse = null; - VarpDefinition.NetCache_responseArchiveBuffer = null; - } - - return true; - } catch (IOException var21) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var19) { - } - - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; - return false; - } } - @ObfuscatedName("q") + @ObfuscatedName("fn") @ObfuscatedSignature( - signature = "(Lkf;Lla;I)Lla;", - garbageValue = "-2066495425" + signature = "(ZI)V", + garbageValue = "-1974361592" ) - @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); - } + static final void method358(boolean var0) { + if (var0) { + Client.field870 = Login.field1171 ? class160.field1982 : class160.field1983; + } else { + LinkedHashMap var1 = GrandExchangeOffer.clientPreferences.parameters; + String var3 = Login.Login_username; + int var4 = var3.length(); + int var5 = 0; - 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()); + for (int var6 = 0; var6 < var4; ++var6) { + var5 = (var5 << 5) - var5 + var3.charAt(var6); } - var1.put((Node)var6, (long)var5); + Client.field870 = var1.containsKey(var5) ? class160.field1988 : class160.field1984; } - return var1; - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(CLgu;I)I", - garbageValue = "-2081105774" - ) - @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; } } diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index 8e3a152be1..f65b67e126 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -6,31 +6,26 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("at") +@ObfuscatedName("ar") @Implements("WorldMapAreaData") public class WorldMapAreaData extends WorldMapArea { - @ObfuscatedName("ae") - @ObfuscatedSignature( - signature = "Lls;" - ) - static Bounds field332; - @ObfuscatedName("x") + @ObfuscatedName("r") @Export("worldMapData0Set") HashSet worldMapData0Set; - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("worldMapData1Set") HashSet worldMapData1Set; - @ObfuscatedName("v") + @ObfuscatedName("p") @Export("iconList") List iconList; WorldMapAreaData() { } - @ObfuscatedName("cy") + @ObfuscatedName("bx") @ObfuscatedSignature( - signature = "(Lkf;Lkf;IZB)V", - garbageValue = "-52" + signature = "(Lky;Lky;IZI)V", + garbageValue = "543700314" ) @Export("init") void init(Buffer var1, Buffer var2, int var3, boolean var4) { @@ -69,10 +64,10 @@ public class WorldMapAreaData extends WorldMapArea { this.initIconsList(var2, var4); } - @ObfuscatedName("ct") + @ObfuscatedName("ba") @ObfuscatedSignature( - signature = "(Lkf;ZI)V", - garbageValue = "2146657354" + signature = "(Lky;ZB)V", + garbageValue = "23" ) @Export("initIconsList") void initIconsList(Buffer var1, boolean var2) { @@ -80,7 +75,7 @@ public class WorldMapAreaData extends WorldMapArea { int var3 = var1.readUnsignedShort(); for (int var4 = 0; var4 < var3; ++var4) { - int var5 = var1.method5511(); + int var5 = var1.method5602(); Coord var6 = new Coord(var1.readInt()); boolean var7 = var1.readUnsignedByte() == 1; if (var2 || !var7) { @@ -90,16 +85,158 @@ public class WorldMapAreaData extends WorldMapArea { } - @ObfuscatedName("hu") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(III)Lfl;", - garbageValue = "2134464513" + signature = "(Ljava/lang/CharSequence;B)Ljava/lang/String;", + garbageValue = "-101" ) - static RouteStrategy method667(int var0, int var1) { - Client.field735.approxDestinationX = var0; - Client.field735.approxDestinationY = var1; - Client.field735.approxDestinationSizeX = 1; - Client.field735.approxDestinationSizeY = 1; - return Client.field735; + public static String method658(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 = class14.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("r") + @ObfuscatedSignature( + signature = "(III)I", + garbageValue = "-1956472070" + ) + static final int method650(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; + } + + @ObfuscatedName("ew") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "2080251380" + ) + static void method654() { + Client.packetWriter.clearBuffer(); + Client.packetWriter.packetBuffer.offset = 0; + Client.packetWriter.serverPacket = null; + Client.packetWriter.field1295 = null; + Client.packetWriter.field1296 = null; + Client.packetWriter.field1291 = null; + Client.packetWriter.serverPacketLength = 0; + Client.packetWriter.field1293 = 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; + } + + WorldMapIcon_1.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); + FloorDecoration.updateGameState(30); + + for (var0 = 0; var0 < 100; ++var0) { + Client.field703[var0] = true; + } + + WorldMapCacheName.method593(); + } + + @ObfuscatedName("ga") + @ObfuscatedSignature( + signature = "(IIIB)V", + garbageValue = "-124" + ) + @Export("worldToScreen") + static final void worldToScreen(int var0, int var1, int var2) { + if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { + int var3 = GrandExchangeOfferTotalQuantityComparator.getTileHeight(var0, var1, ItemContainer.plane) - var2; + var0 -= WallDecoration.cameraX; + var3 -= Coord.cameraY; + var1 -= UserComparator7.cameraZ; + int var4 = Rasterizer3D.Rasterizer3D_sine[class43.cameraPitch]; + int var5 = Rasterizer3D.Rasterizer3D_cosine[class43.cameraPitch]; + int var6 = Rasterizer3D.Rasterizer3D_sine[class40.cameraYaw]; + int var7 = Rasterizer3D.Rasterizer3D_cosine[class40.cameraYaw]; + int var8 = var6 * var1 + var0 * var7 >> 16; + var1 = var7 * var1 - var0 * var6 >> 16; + var0 = var8; + var8 = var5 * var3 - var4 * var1 >> 16; + var1 = var4 * var3 + 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("ik") + @ObfuscatedSignature( + signature = "([Lhp;Lhp;ZB)V", + garbageValue = "84" + ) + @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; + ItemContainer.resizeInterface(var0, var1.id, var3, var4, var2); + if (var1.children != null) { + ItemContainer.resizeInterface(var1.children, var1.id, var3, var4, var2); + } + + InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); + if (var5 != null) { + GrandExchangeOfferNameComparator.resizeComponents(var5.group, var3, var4, var2); + } + + if (var1.contentType == 1337) { + } + } } diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java index 65f8e2543d..00756740cb 100644 --- a/runescape-client/src/main/java/WorldMapCacheName.java +++ b/runescape-client/src/main/java/WorldMapCacheName.java @@ -1,86 +1,83 @@ 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("ae") +@ObfuscatedName("ak") @Implements("WorldMapCacheName") public class WorldMapCacheName { - @ObfuscatedName("q") + @ObfuscatedName("sr") @ObfuscatedSignature( - signature = "Lae;" + signature = "Llv;" ) - @Export("DETAILS") - public static final WorldMapCacheName DETAILS; - @ObfuscatedName("w") + @Export("worldMap") + static WorldMap worldMap; + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lae;" + signature = "Lak;" ) - @Export("COMPOSITEMAP") - public static final WorldMapCacheName COMPOSITEMAP; - @ObfuscatedName("e") + public static final WorldMapCacheName field295; + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lae;" + signature = "Lak;" ) - @Export("COMPOSITETEXTURE") - public static final WorldMapCacheName COMPOSITETEXTURE; - @ObfuscatedName("p") + public static final WorldMapCacheName field290; + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lae;" + signature = "Lak;" ) - @Export("AREA") - static final WorldMapCacheName AREA; + public static final WorldMapCacheName field291; @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lae;" + signature = "Lak;" ) - @Export("LABELS") - public static final WorldMapCacheName LABELS; - @ObfuscatedName("c") - public static short[] field309; - @ObfuscatedName("de") + static final WorldMapCacheName field292; + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Liu;" + signature = "Lak;" ) - @Export("archive5") - static Archive archive5; - @ObfuscatedName("mj") - @ObfuscatedGetter( - intValue = -380277113 - ) - @Export("selectedSpellFlags") - static int selectedSpellFlags; - @ObfuscatedName("l") + public static final WorldMapCacheName field293; + @ObfuscatedName("n") @Export("name") public final String name; static { - DETAILS = new WorldMapCacheName("details"); - COMPOSITEMAP = new WorldMapCacheName("compositemap"); - COMPOSITETEXTURE = new WorldMapCacheName("compositetexture"); - AREA = new WorldMapCacheName("area"); - LABELS = new WorldMapCacheName("labels"); + field295 = new WorldMapCacheName("details"); + field290 = new WorldMapCacheName("compositemap"); + field291 = new WorldMapCacheName("compositetexture"); + field292 = new WorldMapCacheName("area"); + field293 = new WorldMapCacheName("labels"); } WorldMapCacheName(String var1) { this.name = var1; } - @ObfuscatedName("x") + @ObfuscatedName("fw") @ObfuscatedSignature( - signature = "(Lhj;IB)V", - garbageValue = "67" + signature = "(B)V", + garbageValue = "40" ) - @Export("Widget_setKeyIgnoreHeld") - static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { - if (var0.field2650 == null) { - throw new RuntimeException(); - } - if (var0.field2578 == null) { - var0.field2578 = new int[var0.field2650.length]; - } + static void method593() { + PacketBufferNode var0 = MenuAction.getPacketBufferNode(ClientPacket.field2220, Client.packetWriter.isaacCipher); + var0.packetBuffer.writeByte(UserComparator7.getWindowedMode()); + var0.packetBuffer.writeShort(KitDefinition.canvasWidth); + var0.packetBuffer.writeShort(class30.canvasHeight); + Client.packetWriter.addNode(var0); + } - var0.field2578[var1] = Integer.MAX_VALUE; + @ObfuscatedName("kl") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)V", + garbageValue = "350490543" + ) + @Export("clanKickUser") + static final void clanKickUser(String var0) { + if (Client.clanChat != null) { + PacketBufferNode var1 = MenuAction.getPacketBufferNode(ClientPacket.field2198, 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/WorldMapData_0.java b/runescape-client/src/main/java/WorldMapData_0.java index 86bf6ae9bc..5576f41a22 100644 --- a/runescape-client/src/main/java/WorldMapData_0.java +++ b/runescape-client/src/main/java/WorldMapData_0.java @@ -3,83 +3,224 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("y") +@ObfuscatedName("b") @Implements("WorldMapData_0") public class WorldMapData_0 extends AbstractWorldMapData { WorldMapData_0() { } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lkf;I)V", - garbageValue = "1977594384" + signature = "(Lky;I)V", + garbageValue = "1629688583" ) @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); - if (var2 != WorldMapID.field272.value) { + if (var2 != WorldMapID.field260.value) { throw new IllegalStateException(""); + } else { + super.minPlane = var1.readUnsignedByte(); + super.planes = var1.readUnsignedByte(); + super.regionXLow = var1.readUnsignedShort() * 4096; + super.regionYLow = var1.readUnsignedShort() * 4096; + super.regionX = var1.readUnsignedShort(); + super.regionY = var1.readUnsignedShort(); + super.groupId = var1.method5602(); + super.fileId = var1.method5602(); } - super.minPlane = var1.readUnsignedByte(); - super.planes = var1.readUnsignedByte(); - super.regionXLow = var1.readUnsignedShort() * 4096; - super.regionYLow = var1.readUnsignedShort() * 4096; - super.regionX = var1.readUnsignedShort(); - super.regionY = var1.readUnsignedShort(); - super.groupId = var1.method5511(); - super.fileId = var1.method5511(); } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkf;I)V", - garbageValue = "-1951934103" + signature = "(Lky;B)V", + garbageValue = "120" ) @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.field165 = new byte[super.planes][64][64]; - super.field166 = new byte[super.planes][64][64]; + super.field145 = new byte[super.planes][64][64]; + super.field156 = new byte[super.planes][64][64]; super.decorations = new WorldMapDecoration[super.planes][64][64][]; int var2 = var1.readUnsignedByte(); - if (var2 != class30.field262.value) { + if (var2 != class30.field251.value) { throw new IllegalStateException(""); - } - int var3 = var1.readUnsignedByte(); - int var4 = var1.readUnsignedByte(); - if (var3 == super.regionX && var4 == super.regionY) { - for (int var5 = 0; var5 < 64; ++var5) { - for (int var6 = 0; var6 < 64; ++var6) { - this.readTile(var5, var6, var1); - } - } - } else { - throw new IllegalStateException(""); + int var3 = var1.readUnsignedByte(); + int var4 = var1.readUnsignedByte(); + if (var3 == super.regionX && var4 == super.regionY) { + for (int var5 = 0; var5 < 64; ++var5) { + for (int var6 = 0; var6 < 64; ++var6) { + this.readTile(var5, var6, var1); + } + } + + } else { + throw new IllegalStateException(""); + } } } public boolean equals(Object var1) { if (!(var1 instanceof WorldMapData_0)) { return false; + } else { + WorldMapData_0 var2 = (WorldMapData_0)var1; + return var2.regionX == super.regionX && var2.regionY == super.regionY; } - WorldMapData_0 var2 = (WorldMapData_0)var1; - return var2.regionX == super.regionX && super.regionY == var2.regionY; } public int hashCode() { return super.regionX | super.regionY << 8; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lhp;I)V", - garbageValue = "-1590503408" + signature = "(IS)Liq;", + garbageValue = "-23193" ) - @Export("InvDefinition_setArchives") - public static void InvDefinition_setArchives(AbstractArchive var0) { - InvDefinition.InvDefinition_archive = var0; + @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("j") + @ObfuscatedSignature( + signature = "(II)Liu;", + garbageValue = "-1815953126" + ) + @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 = class65.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 (!UrlRequester.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 = VarcInt.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; + } + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "2096168309" + ) + public static void method177() { + HitSplatDefinition.HitSplatDefinition_cached.clear(); + HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); + HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); + } + + @ObfuscatedName("gu") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "-503004443" + ) + @Export("getHighestVisiblePlane") + static final int getHighestVisiblePlane() { + if (GrandExchangeOffer.clientPreferences.roofsHidden) { + return ItemContainer.plane; + } else { + int var0 = GrandExchangeOfferTotalQuantityComparator.getTileHeight(WallDecoration.cameraX, UserComparator7.cameraZ, ItemContainer.plane); + return var0 - Coord.cameraY < 800 && (Tiles.Tiles_renderFlags[ItemContainer.plane][WallDecoration.cameraX >> 7][UserComparator7.cameraZ >> 7] & 4) != 0 ? ItemContainer.plane : 3; + } + } + + @ObfuscatedName("hm") + @ObfuscatedSignature( + signature = "(S)V", + garbageValue = "-28266" + ) + static final void method176() { + int var0 = MilliClock.menuX; + int var1 = class96.menuY; + int var2 = World.menuWidth; + int var3 = class1.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); + class43.fontBold12.draw("Choose Option", var0 + 3, var1 + 14, var4, -1); + int var5 = MouseHandler.MouseHandler_x; + int var6 = MouseHandler.MouseHandler_y; + + for (int var7 = 0; var7 < Client.menuOptionsCount; ++var7) { + int var8 = var1 + (Client.menuOptionsCount - 1 - var7) * 15 + 31; + int var9 = 16777215; + if (var5 > var0 && var5 < var2 + var0 && var6 > var8 - 13 && var6 < var8 + 3) { + var9 = 16776960; + } + + Font var10 = class43.fontBold12; + String var11; + if (var7 < 0) { + var11 = ""; + } else if (Client.menuTargets[var7].length() > 0) { + var11 = Client.menuActions[var7] + " " + Client.menuTargets[var7]; + } else { + var11 = Client.menuActions[var7]; + } + + var10.draw(var11, var0 + 3, var8, var9, 0); + } + + FriendsList.method5102(MilliClock.menuX, class96.menuY, World.menuWidth, class1.menuHeight); + } + + @ObfuscatedName("ia") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;Ljava/lang/String;IIIII)V", + garbageValue = "400023400" + ) + @Export("insertMenuItemNoShift") + public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { + NetCache.insertMenuItem(var0, var1, var2, var3, var4, var5, false); } } diff --git a/runescape-client/src/main/java/WorldMapData_1.java b/runescape-client/src/main/java/WorldMapData_1.java index 273ca6b6fe..25edfbddbb 100644 --- a/runescape-client/src/main/java/WorldMapData_1.java +++ b/runescape-client/src/main/java/WorldMapData_1.java @@ -3,41 +3,40 @@ 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("ac") +@ObfuscatedName("au") @Implements("WorldMapData_1") public class WorldMapData_1 extends AbstractWorldMapData { - @ObfuscatedName("sk") - @Export("foundItemIds") - static short[] foundItemIds; - @ObfuscatedName("gl") + @ObfuscatedName("af") + @Export("fontHelvetica13") + static java.awt.Font fontHelvetica13; + @ObfuscatedName("gh") @ObfuscatedSignature( - signature = "[Lly;" + signature = "[Lls;" ) - @Export("mapMarkerSprites") - static Sprite[] mapMarkerSprites; - @ObfuscatedName("y") + @Export("headIconHintSprites") + static Sprite[] headIconHintSprites; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 234280421 + intValue = 481404885 ) @Export("chunkXLow") int chunkXLow; @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1310278341 + intValue = 1912285693 ) @Export("chunkYLow") int chunkYLow; - @ObfuscatedName("a") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1872036801 + intValue = -1552157643 ) @Export("chunkX") int chunkX; - @ObfuscatedName("j") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1949711027 + intValue = 730581483 ) @Export("chunkY") int chunkY; @@ -45,98 +44,100 @@ public class WorldMapData_1 extends AbstractWorldMapData { WorldMapData_1() { } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lkf;I)V", - garbageValue = "1442686433" + signature = "(Lky;I)V", + garbageValue = "-1265892747" ) @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); - if (var2 != WorldMapID.field269.value) { + if (var2 != WorldMapID.field257.value) { throw new IllegalStateException(""); + } else { + super.minPlane = var1.readUnsignedByte(); + super.planes = var1.readUnsignedByte(); + super.regionXLow = var1.readUnsignedShort() * 4096; + super.regionYLow = var1.readUnsignedShort() * 4096; + 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.method5602(); + super.fileId = var1.method5602(); } - super.minPlane = var1.readUnsignedByte(); - super.planes = var1.readUnsignedByte(); - super.regionXLow = var1.readUnsignedShort() * 4096; - super.regionYLow = var1.readUnsignedShort() * 4096; - 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.method5511(); - super.fileId = var1.method5511(); } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkf;I)V", - garbageValue = "-1951934103" + signature = "(Lky;B)V", + garbageValue = "120" ) @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.field165 = new byte[super.planes][64][64]; - super.field166 = new byte[super.planes][64][64]; + super.field145 = new byte[super.planes][64][64]; + super.field156 = new byte[super.planes][64][64]; super.decorations = new WorldMapDecoration[super.planes][64][64][]; int var2 = var1.readUnsignedByte(); - if (var2 != class30.field258.value) { + if (var2 != class30.field250.value) { throw new IllegalStateException(""); - } - int var3 = var1.readUnsignedByte(); - int var4 = var1.readUnsignedByte(); - int var5 = var1.readUnsignedByte(); - int var6 = var1.readUnsignedByte(); - if (var3 == super.regionX && var4 == super.regionY && var5 == this.chunkX && var6 == this.chunkY) { - for (int var7 = 0; var7 < 8; ++var7) { - for (int var8 = 0; var8 < 8; ++var8) { - this.readTile(var7 + this.chunkX * 8, var8 + this.chunkY * 8, var1); - } - } - } else { - throw new IllegalStateException(""); + int var3 = var1.readUnsignedByte(); + int var4 = var1.readUnsignedByte(); + int var5 = var1.readUnsignedByte(); + int var6 = var1.readUnsignedByte(); + if (var3 == super.regionX && var4 == super.regionY && var5 == this.chunkX && var6 == this.chunkY) { + for (int var7 = 0; var7 < 8; ++var7) { + for (int var8 = 0; var8 < 8; ++var8) { + this.readTile(var7 + this.chunkX * 8, var8 + this.chunkY * 8, var1); + } + } + + } else { + throw new IllegalStateException(""); + } } } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "2082336179" + signature = "(B)I", + garbageValue = "18" ) @Export("getChunkXLow") int getChunkXLow() { return this.chunkXLow; } - @ObfuscatedName("p") + @ObfuscatedName("au") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-521684078" + garbageValue = "1399552642" ) @Export("getChunkYLow") int getChunkYLow() { return this.chunkYLow; } - @ObfuscatedName("k") + @ObfuscatedName("ax") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1825008967" + garbageValue = "234574049" ) @Export("getChunkX") int getChunkX() { return this.chunkX; } - @ObfuscatedName("at") + @ObfuscatedName("ag") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1471448055" + garbageValue = "2005972449" ) @Export("getChunkY") int getChunkY() { @@ -146,28 +147,115 @@ public class WorldMapData_1 extends AbstractWorldMapData { public boolean equals(Object var1) { if (!(var1 instanceof WorldMapData_1)) { return false; + } else { + WorldMapData_1 var2 = (WorldMapData_1)var1; + if (var2.regionX == super.regionX && var2.regionY == super.regionY) { + return this.chunkX == var2.chunkX && this.chunkY == var2.chunkY; + } else { + return false; + } } - WorldMapData_1 var2 = (WorldMapData_1)var1; - if (var2.regionX == super.regionX && super.regionY == var2.regionY) { - return var2.chunkX == this.chunkX && var2.chunkY == this.chunkY; - } - return false; } public int hashCode() { return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; } - @ObfuscatedName("at") + @ObfuscatedName("ha") @ObfuscatedSignature( - signature = "(ILcx;ZI)I", - garbageValue = "-878316811" + signature = "(III)V", + garbageValue = "129676953" ) - static int method696(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.LOGOUT) { - Client.logoutTimer = 250; - return 1; + @Export("calculateMenuBounds") + static void calculateMenuBounds(int var0, int var1) { + int var2 = class43.fontBold12.stringWidth("Choose Option"); + + int var3; + for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { + Font var4 = class43.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]; + } + + int var6 = var4.stringWidth(var5); + if (var6 > var2) { + var2 = var6; + } } - return 2; + + var2 += 8; + var3 = Client.menuOptionsCount * 15 + 22; + int var7 = var0 - var2 / 2; + if (var7 + var2 > KitDefinition.canvasWidth) { + var7 = KitDefinition.canvasWidth - var2; + } + + if (var7 < 0) { + var7 = 0; + } + + int var8 = var1; + if (var3 + var1 > class30.canvasHeight) { + var8 = class30.canvasHeight - var3; + } + + if (var8 < 0) { + var8 = 0; + } + + MilliClock.menuX = var7; + class96.menuY = var8; + World.menuWidth = var2; + class1.menuHeight = Client.menuOptionsCount * 15 + 22; + } + + @ObfuscatedName("ij") + @ObfuscatedSignature( + signature = "(Lhp;IIIIIII)V", + garbageValue = "-599054515" + ) + static final void method682(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (Client.field725) { + Client.alternativeScrollbarWidth = 32; + } else { + Client.alternativeScrollbarWidth = 0; + } + + Client.field725 = false; + int var7; + if (MouseHandler.MouseHandler_currentButton == 1 || !FriendSystem.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { + if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { + var0.scrollY -= 4; + FriendSystem.invalidateWidget(var0); + } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { + var0.scrollY += 4; + FriendSystem.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; + FriendSystem.invalidateWidget(var0); + Client.field725 = 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; + FriendSystem.invalidateWidget(var0); + } + } + } } diff --git a/runescape-client/src/main/java/WorldMapDecoration.java b/runescape-client/src/main/java/WorldMapDecoration.java index a5365934de..407deb0eae 100644 --- a/runescape-client/src/main/java/WorldMapDecoration.java +++ b/runescape-client/src/main/java/WorldMapDecoration.java @@ -3,31 +3,51 @@ 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("o") @Implements("WorldMapDecoration") public class WorldMapDecoration { - @ObfuscatedName("am") - @ObfuscatedGetter( - intValue = -1778683289 + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "Lhz;" ) - static int field212; + @Export("musicTrackArchive") + public static AbstractArchive musicTrackArchive; @ObfuscatedName("q") + @Export("Widget_loadedInterfaces") + static boolean[] Widget_loadedInterfaces; + @ObfuscatedName("dn") + @ObfuscatedSignature( + signature = "Lid;" + ) + @Export("archive5") + static Archive archive5; + @ObfuscatedName("dq") + @ObfuscatedSignature( + signature = "Lid;" + ) + @Export("archive9") + static Archive archive9; + @ObfuscatedName("lx") + @ObfuscatedSignature( + signature = "Lhp;" + ) + static Widget field198; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1500590687 + intValue = -1098374609 ) @Export("objectDefinitionId") final int objectDefinitionId; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1614020575 + intValue = -1500543801 ) @Export("decoration") final int decoration; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1580531439 + intValue = 1821120363 ) @Export("rotation") final int rotation; @@ -38,107 +58,567 @@ public class WorldMapDecoration { this.rotation = var3; } - @ObfuscatedName("b") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(ILcx;ZB)I", - garbageValue = "-119" + signature = "(B)[Lgt;", + garbageValue = "17" ) - static int method324(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var3 = class80.getWidget(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - } else { - var3 = var2 ? Interpreter.field1111 : Calendar.field2507; - } - - Strings.invalidateWidget(var3); - if (var0 == ScriptOpcodes.CC_SETOBJECT || var0 == ScriptOpcodes.CC_SETOBJECT_NONUM || var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - int var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - int var5 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - var3.itemId = var4; - var3.itemQuantity = var5; - ItemDefinition var6 = WorldMapArea.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 | var6.isStackable == 1) { - var3.itemQuantityMode = 1; - } else { - var3.itemQuantityMode = 2; - } - - if (var3.field2619 > 0) { - var3.modelZoom = var3.modelZoom * 32 / var3.field2619; - } else if (var3.rawWidth > 0) { - var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; - } - - return 1; - } - if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { - var3.modelType = 2; - var3.modelId = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - return 1; - } - if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { - var3.modelType = 3; - var3.modelId = Client.localPlayer.appearance.getChatHeadId(); - return 1; - } - return 2; + public static class185[] method327() { + return new class185[]{class185.field2301, class185.field2306, class185.field2298, class185.field2299, class185.field2300, class185.field2304, class185.field2302, class185.field2297, class185.field2303, class185.field2305}; } - @ObfuscatedName("kv") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZB)V", - garbageValue = "-125" + signature = "(Lbw;B)V", + garbageValue = "2" ) - @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 = WorldMapArea.ItemDefinition_get(var4); - if ((var1 && !var5.isTradable) || var5.noteTemplate != -1 || var5.name.toLowerCase().indexOf(var0) == -1) { - continue; - } - if (var3 >= 250) { - FloorOverlayDefinition.foundItemIdCount = -1; - WorldMapData_1.foundItemIds = null; - return; + static void method326(GameShell var0) { + if (Login.worldSelectOpen) { + MusicPatchNode.method3772(var0); + } else { + if ((MouseHandler.MouseHandler_lastButton == 1 || !FriendSystem.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { + GrandExchangeOffer.clientPreferences.titleMusicDisabled = !GrandExchangeOffer.clientPreferences.titleMusicDisabled; + GrandExchangeOfferAgeComparator.savePreferences(); + if (!GrandExchangeOffer.clientPreferences.titleMusicDisabled) { + Archive var1 = GrandExchangeEvent.archive6; + int var2 = var1.getGroupId("scape main"); + int var3 = var1.getFileId(var2, ""); + PacketBufferNode.method3574(var1, var2, var3, 255, false); + } else { + class197.midiPcmStream.clear(); + class197.field2378 = 1; + musicTrackArchive = null; + } } - if (var3 >= var2.length) { - short[] var6 = new short[var2.length * 2]; - - for (int var7 = 0; var7 < var3; ++var7) { - var6[var7] = var2[var7]; + if (Client.gameState != 5) { + if (Login.field1179 == -1L) { + Login.field1179 = SequenceDefinition.method4686() + 1000L; } - var2 = var6; + long var12 = SequenceDefinition.method4686(); + boolean var16; + if (Client.archiveLoaders != null && Client.archiveLoaderArchive < Client.archiveLoaders.size()) { + while (true) { + if (Client.archiveLoaderArchive >= Client.archiveLoaders.size()) { + var16 = true; + break; + } + + ArchiveLoader var4 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoaderArchive); + if (!var4.isLoaded()) { + var16 = false; + break; + } + + ++Client.archiveLoaderArchive; + } + } else { + var16 = true; + } + + if (var16 && Login.field1150 == -1L) { + Login.field1150 = var12; + if (Login.field1150 > Login.field1179) { + Login.field1179 = Login.field1150; + } + } + + if (Client.gameState == 10 || Client.gameState == 11) { + int var14; + if (class60.clientLanguage == Language.Language_EN) { + if (MouseHandler.MouseHandler_lastButton == 1 || !FriendSystem.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { + var14 = Login.xPadding + 5; + short var5 = 463; + byte var6 = 100; + byte var7 = 35; + if (MouseHandler.MouseHandler_lastPressedX >= var14 && MouseHandler.MouseHandler_lastPressedX <= var14 + var6 && MouseHandler.MouseHandler_lastPressedY >= var5 && MouseHandler.MouseHandler_lastPressedY <= var5 + var7) { + UserComparator7.openWorldSelect(); + return; + } + } + + if (IgnoreList.World_request != null) { + UserComparator7.openWorldSelect(); + } + } + + var14 = MouseHandler.MouseHandler_lastButton; + int var17 = MouseHandler.MouseHandler_lastPressedX; + int var18 = MouseHandler.MouseHandler_lastPressedY; + if (var14 == 0) { + var17 = MouseHandler.MouseHandler_x; + var18 = MouseHandler.MouseHandler_y; + } + + if (!FriendSystem.mouseCam && var14 == 4) { + var14 = 1; + } + + int var8; + short var9; + if (Login.loginIndex == 0) { + boolean var19 = false; + + while (FontName.isKeyDown()) { + if (ReflectionCheck.field1307 == 84) { + var19 = true; + } + } + + var8 = Login.loginBoxCenter - 80; + var9 = 291; + if (var14 == 1 && var17 >= var8 - 75 && var17 <= var8 + 75 && var18 >= var9 - 20 && var18 <= var9 + 20) { + GameObject.openURL(RouteStrategy.method3534("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); + } + + var8 = Login.loginBoxCenter + 80; + if (var14 == 1 && var17 >= var8 - 75 && var17 <= var8 + 75 && var18 >= var9 - 20 && var18 <= var9 + 20 || var19) { + 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; + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { + Login.currentLoginField = 1; + } else { + Login.currentLoginField = 0; + } + } 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; + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { + Login.currentLoginField = 1; + } else { + Login.currentLoginField = 0; + } + } 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; + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { + Login.currentLoginField = 1; + } else { + Login.currentLoginField = 0; + } + } else { + GZipDecompressor.method6390(false); + } + } + } else { + int var20; + short var22; + if (Login.loginIndex != 1) { + boolean var10; + int var11; + short var21; + if (Login.loginIndex == 2) { + var21 = 201; + var20 = var21 + 52; + if (var14 == 1 && var18 >= var20 - 12 && var18 < var20 + 2) { + Login.currentLoginField = 0; + } + + var20 += 15; + if (var14 == 1 && var18 >= var20 - 12 && var18 < var20 + 2) { + Login.currentLoginField = 1; + } + + var20 += 15; + var21 = 361; + if (Decimator.field1443 != null) { + var8 = Decimator.field1443.highX / 2; + if (var14 == 1 && var17 >= Decimator.field1443.lowX - var8 && var17 <= var8 + Decimator.field1443.lowX && var18 >= var21 - 15 && var18 < var21) { + switch(Login.field1161) { + case 1: + GrandExchangeOfferOwnWorldComparator.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: + GameObject.openURL("https://support.runescape.com/hc/en-gb", true, false); + } + } + } + + var8 = Login.loginBoxCenter - 80; + var9 = 321; + if (var14 == 1 && var17 >= var8 - 75 && var17 <= var8 + 75 && var18 >= var9 - 20 && var18 <= var9 + 20) { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "Please enter your username/email address.", ""); + return; + } + + if (Login.Login_password.length() == 0) { + GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "Please enter your password.", ""); + return; + } + + GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "Connecting to server...", ""); + WorldMapArea.method358(false); + FloorDecoration.updateGameState(20); + return; + } + + var8 = Login.loginBoxX + 180 + 80; + if (var14 == 1 && var17 >= var8 - 75 && var17 <= var8 + 75 && var18 >= var9 - 20 && var18 <= var9 + 20) { + Login.loginIndex = 0; + Login.Login_username = ""; + Login.Login_password = ""; + SecureRandomCallable.field500 = 0; + WorldMapSection1.otp = ""; + Login.field1171 = true; + } + + var8 = Login.loginBoxCenter + -117; + var9 = 277; + Login.field1169 = var17 >= var8 && var17 < var8 + UserComparator8.field1957 && var18 >= var9 && var18 < var9 + class173.field2079; + if (var14 == 1 && Login.field1169) { + Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; + if (!Client.Login_isUsernameRemembered && GrandExchangeOffer.clientPreferences.rememberedUsername != null) { + GrandExchangeOffer.clientPreferences.rememberedUsername = null; + GrandExchangeOfferAgeComparator.savePreferences(); + } + } + + var8 = Login.loginBoxCenter + 24; + var9 = 277; + Login.field1170 = var17 >= var8 && var17 < var8 + UserComparator8.field1957 && var18 >= var9 && var18 < var9 + class173.field2079; + if (var14 == 1 && Login.field1170) { + GrandExchangeOffer.clientPreferences.hideUsername = !GrandExchangeOffer.clientPreferences.hideUsername; + if (!GrandExchangeOffer.clientPreferences.hideUsername) { + Login.Login_username = ""; + GrandExchangeOffer.clientPreferences.rememberedUsername = null; + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { + Login.currentLoginField = 1; + } else { + Login.currentLoginField = 0; + } + } + + GrandExchangeOfferAgeComparator.savePreferences(); + } + + while (true) { + while (FontName.isKeyDown()) { + var10 = false; + + for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var11) { + if (SpriteMask.field2499 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11)) { + var10 = true; + break; + } + } + + if (ReflectionCheck.field1307 == 13) { + Login.loginIndex = 0; + Login.Login_username = ""; + Login.Login_password = ""; + SecureRandomCallable.field500 = 0; + WorldMapSection1.otp = ""; + Login.field1171 = true; + } else if (Login.currentLoginField == 0) { + if (ReflectionCheck.field1307 == 85 && Login.Login_username.length() > 0) { + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (ReflectionCheck.field1307 == 84 || ReflectionCheck.field1307 == 80) { + Login.currentLoginField = 1; + } + + if (var10 && Login.Login_username.length() < 320) { + Login.Login_username = Login.Login_username + SpriteMask.field2499; + } + } else if (Login.currentLoginField == 1) { + if (ReflectionCheck.field1307 == 85 && Login.Login_password.length() > 0) { + Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); + } + + if (ReflectionCheck.field1307 == 84 || ReflectionCheck.field1307 == 80) { + Login.currentLoginField = 0; + } + + if (ReflectionCheck.field1307 == 84) { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "Please enter your username/email address.", ""); + return; + } + + if (Login.Login_password.length() == 0) { + GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "Please enter your password.", ""); + return; + } + + GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "Connecting to server...", ""); + WorldMapArea.method358(false); + FloorDecoration.updateGameState(20); + return; + } + + if (var10 && Login.Login_password.length() < 20) { + Login.Login_password = Login.Login_password + SpriteMask.field2499; + } + } + } + + return; + } + } else if (Login.loginIndex == 3) { + var20 = Login.loginBoxX + 180; + var22 = 276; + if (var14 == 1 && var17 >= var20 - 75 && var17 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { + GZipDecompressor.method6390(false); + } + + var20 = Login.loginBoxX + 180; + var22 = 326; + if (var14 == 1 && var17 >= var20 - 75 && var17 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { + GrandExchangeOfferOwnWorldComparator.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 var24; + if (Login.loginIndex == 4) { + var20 = Login.loginBoxX + 180 - 80; + var22 = 321; + if (var14 == 1 && var17 >= var20 - 75 && var17 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { + WorldMapSection1.otp.trim(); + if (WorldMapSection1.otp.length() != 6) { + GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); + return; + } + + SecureRandomCallable.field500 = Integer.parseInt(WorldMapSection1.otp); + WorldMapSection1.otp = ""; + WorldMapArea.method358(true); + GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "Connecting to server...", ""); + FloorDecoration.updateGameState(20); + return; + } + + if (var14 == 1 && var17 >= Login.loginBoxX + 180 - 9 && var17 <= Login.loginBoxX + 180 + 130 && var18 >= 263 && var18 <= 296) { + Login.field1171 = !Login.field1171; + } + + if (var14 == 1 && var17 >= Login.loginBoxX + 180 - 34 && var17 <= Login.loginBoxX + 34 + 180 && var18 >= 351 && var18 <= 363) { + GameObject.openURL(RouteStrategy.method3534("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); + } + + var20 = Login.loginBoxX + 180 + 80; + if (var14 == 1 && var17 >= var20 - 75 && var17 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { + Login.loginIndex = 0; + Login.Login_username = ""; + Login.Login_password = ""; + SecureRandomCallable.field500 = 0; + WorldMapSection1.otp = ""; + } + + while (FontName.isKeyDown()) { + boolean var23 = false; + + for (var24 = 0; var24 < "1234567890".length(); ++var24) { + if (SpriteMask.field2499 == "1234567890".charAt(var24)) { + var23 = true; + break; + } + } + + if (ReflectionCheck.field1307 == 13) { + Login.loginIndex = 0; + Login.Login_username = ""; + Login.Login_password = ""; + SecureRandomCallable.field500 = 0; + WorldMapSection1.otp = ""; + } else { + if (ReflectionCheck.field1307 == 85 && WorldMapSection1.otp.length() > 0) { + WorldMapSection1.otp = WorldMapSection1.otp.substring(0, WorldMapSection1.otp.length() - 1); + } + + if (ReflectionCheck.field1307 == 84) { + WorldMapSection1.otp.trim(); + if (WorldMapSection1.otp.length() != 6) { + GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); + return; + } + + SecureRandomCallable.field500 = Integer.parseInt(WorldMapSection1.otp); + WorldMapSection1.otp = ""; + WorldMapArea.method358(true); + GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "Connecting to server...", ""); + FloorDecoration.updateGameState(20); + return; + } + + if (var23 && WorldMapSection1.otp.length() < 6) { + WorldMapSection1.otp = WorldMapSection1.otp + SpriteMask.field2499; + } + } + } + } else if (Login.loginIndex == 5) { + var20 = Login.loginBoxX + 180 - 80; + var22 = 321; + if (var14 == 1 && var17 >= var20 - 75 && var17 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { + ItemContainer.method1118(); + return; + } + + var20 = Login.loginBoxX + 180 + 80; + if (var14 == 1 && var17 >= var20 - 75 && var17 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { + GZipDecompressor.method6390(true); + } + + var9 = 361; + if (MusicPatchPcmStream.field2466 != null) { + var24 = MusicPatchPcmStream.field2466.highX / 2; + if (var14 == 1 && var17 >= MusicPatchPcmStream.field2466.lowX - var24 && var17 <= var24 + MusicPatchPcmStream.field2466.lowX && var18 >= var9 - 15 && var18 < var9) { + GameObject.openURL(RouteStrategy.method3534("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); + } + } + + while (FontName.isKeyDown()) { + var10 = false; + + for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var11) { + if (SpriteMask.field2499 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11)) { + var10 = true; + break; + } + } + + if (ReflectionCheck.field1307 == 13) { + GZipDecompressor.method6390(true); + } else { + if (ReflectionCheck.field1307 == 85 && Login.Login_username.length() > 0) { + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (ReflectionCheck.field1307 == 84) { + ItemContainer.method1118(); + return; + } + + if (var10 && Login.Login_username.length() < 320) { + Login.Login_username = Login.Login_username + SpriteMask.field2499; + } + } + } + } else if (Login.loginIndex == 6) { + while (true) { + do { + if (!FontName.isKeyDown()) { + var21 = 321; + if (var14 == 1 && var18 >= var21 - 20 && var18 <= var21 + 20) { + GZipDecompressor.method6390(true); + } + + return; + } + } while(ReflectionCheck.field1307 != 84 && ReflectionCheck.field1307 != 13); + + GZipDecompressor.method6390(true); + } + } else if (Login.loginIndex == 7) { + var20 = Login.loginBoxX + 180 - 80; + var22 = 321; + if (var14 == 1 && var17 >= var20 - 75 && var17 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { + GameObject.openURL(RouteStrategy.method3534("secure", true) + "m=dob/set_dob.ws", true, false); + GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); + Login.loginIndex = 6; + return; + } + + var20 = Login.loginBoxX + 180 + 80; + if (var14 == 1 && var17 >= var20 - 75 && var17 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { + GZipDecompressor.method6390(true); + } + } else if (Login.loginIndex == 8) { + var20 = Login.loginBoxX + 180 - 80; + var22 = 321; + if (var14 == 1 && var17 >= var20 - 75 && var17 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { + GameObject.openURL("https://www.jagex.com/terms/privacy/#eight", true, false); + GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); + Login.loginIndex = 6; + return; + } + + var20 = Login.loginBoxX + 180 + 80; + if (var14 == 1 && var17 >= var20 - 75 && var17 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { + GZipDecompressor.method6390(true); + } + } else if (Login.loginIndex == 12) { + String var15 = ""; + switch(Login.field1160) { + case 0: + var15 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; + break; + case 1: + var15 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; + break; + default: + GZipDecompressor.method6390(false); + } + + var8 = Login.loginBoxX + 180; + var9 = 276; + if (var14 == 1 && var17 >= var8 - 75 && var17 <= var8 + 75 && var18 >= var9 - 20 && var18 <= var9 + 20) { + GameObject.openURL(var15, true, false); + GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); + Login.loginIndex = 6; + return; + } + + var8 = Login.loginBoxX + 180; + var9 = 326; + if (var14 == 1 && var17 >= var8 - 75 && var17 <= var8 + 75 && var18 >= var9 - 20 && var18 <= var9 + 20) { + GZipDecompressor.method6390(false); + } + } else if (Login.loginIndex == 24) { + var20 = Login.loginBoxX + 180; + var22 = 301; + if (var14 == 1 && var17 >= var20 - 75 && var17 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { + GZipDecompressor.method6390(false); + } + } + } + } else { + while (FontName.isKeyDown()) { + if (ReflectionCheck.field1307 == 84) { + GZipDecompressor.method6390(false); + } else if (ReflectionCheck.field1307 == 13) { + Login.loginIndex = 0; + } + } + + var20 = Login.loginBoxCenter - 80; + var22 = 321; + if (var14 == 1 && var17 >= var20 - 75 && var17 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { + GZipDecompressor.method6390(false); + } + + var20 = Login.loginBoxCenter + 80; + if (var14 == 1 && var17 >= var20 - 75 && var17 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { + Login.loginIndex = 0; + } + } + } + + } } - - var2[var3++] = (short)var4; } - - WorldMapData_1.foundItemIds = var2; - class32.foundItemIndex = 0; - FloorOverlayDefinition.foundItemIdCount = var3; - String[] var8 = new String[FloorOverlayDefinition.foundItemIdCount]; - - for (int var9 = 0; var9 < FloorOverlayDefinition.foundItemIdCount; ++var9) { - var8[var9] = WorldMapArea.ItemDefinition_get(var2[var9]).name; - } - - MenuAction.startSortingItemsByName(var8, WorldMapData_1.foundItemIds); } } diff --git a/runescape-client/src/main/java/WorldMapDecorationType.java b/runescape-client/src/main/java/WorldMapDecorationType.java index 4700c59985..f8d5412fe9 100644 --- a/runescape-client/src/main/java/WorldMapDecorationType.java +++ b/runescape-client/src/main/java/WorldMapDecorationType.java @@ -4,133 +4,128 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hr") +@ObfuscatedName("hb") @Implements("WorldMapDecorationType") public enum WorldMapDecorationType implements Enumerated { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lhr;" + signature = "Lhb;" ) - field2725(0, 0), - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lhr;" - ) - field2719(1, 0), - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lhr;" - ) - field2720(2, 0), - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lhr;" - ) - field2721(3, 0), - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Lhr;" - ) - field2739(9, 2), - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "Lhr;" - ) - field2738(4, 1), - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Lhr;" - ) - field2724(5, 1), - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lhr;" - ) - field2729(6, 1), - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Lhr;" - ) - field2726(7, 1), - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Lhr;" - ) - field2727(8, 1), - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "Lhr;" - ) - field2728(12, 2), - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lhr;" - ) - field2718(13, 2), - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lhr;" - ) - field2730(14, 2), - @ObfuscatedName("r") - @ObfuscatedSignature( - signature = "Lhr;" - ) - field2731(15, 2), - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "Lhr;" - ) - field2732(16, 2), - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "Lhr;" - ) - field2740(17, 2), - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "Lhr;" - ) - field2734(18, 2), - @ObfuscatedName("a") - @ObfuscatedSignature( - signature = "Lhr;" - ) - field2735(19, 2), + field2701(0, 0), @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lhr;" + signature = "Lhb;" ) - field2736(20, 2), - @ObfuscatedName("t") + field2703(1, 0), + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lhr;" + signature = "Lhb;" ) - field2737(21, 2), - @ObfuscatedName("h") + field2702(2, 0), + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lhr;" + signature = "Lhb;" ) - field2733(10, 2), - @ObfuscatedName("o") + field2704(3, 0), + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lhr;" + signature = "Lhb;" ) - field2722(11, 2), + field2721(9, 2), @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lhr;" + signature = "Lhb;" ) - field2741(22, 3); - - @ObfuscatedName("ne") - @ObfuscatedGetter( - intValue = -797405515 + field2718(4, 1), + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "Lhb;" ) - static int field2742; + field2706(5, 1), + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "Lhb;" + ) + field2707(6, 1), + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "Lhb;" + ) + field2708(7, 1), @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "Lhb;" + ) + field2709(8, 1), + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "Lhb;" + ) + field2710(12, 2), + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "Lhb;" + ) + field2700(13, 2), + @ObfuscatedName("r") + @ObfuscatedSignature( + signature = "Lhb;" + ) + field2712(14, 2), + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "Lhb;" + ) + field2713(15, 2), + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "Lhb;" + ) + field2714(16, 2), + @ObfuscatedName("b") + @ObfuscatedSignature( + signature = "Lhb;" + ) + field2715(17, 2), + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "Lhb;" + ) + field2716(18, 2), + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "Lhb;" + ) + field2717(19, 2), + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "Lhb;" + ) + field2720(20, 2), + @ObfuscatedName("a") + @ObfuscatedSignature( + signature = "Lhb;" + ) + field2719(21, 2), + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "Lhb;" + ) + field2711(10, 2), + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "Lhb;" + ) + field2705(11, 2), + @ObfuscatedName("h") + @ObfuscatedSignature( + signature = "Lhb;" + ) + field2722(22, 3); + + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1119244565 + intValue = -1508062065 ) @Export("id") public final int id; @@ -143,13 +138,57 @@ public enum WorldMapDecorationType implements Enumerated { this.id = var3; } - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "320353268" + signature = "(B)I", + garbageValue = "-32" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } + + @ObfuscatedName("jx") + @ObfuscatedSignature( + signature = "(Lhp;B)V", + garbageValue = "10" + ) + static final void method4030(Widget var0) { + int var1 = var0.contentType; + if (var1 == 324) { + if (Client.field733 == -1) { + Client.field733 = var0.spriteId2; + Client.field888 = var0.spriteId; + } + + if (Client.playerAppearance.isFemale) { + var0.spriteId2 = Client.field733; + } else { + var0.spriteId2 = Client.field888; + } + + } else if (var1 == 325) { + if (Client.field733 == -1) { + Client.field733 = var0.spriteId2; + Client.field888 = var0.spriteId; + } + + if (Client.playerAppearance.isFemale) { + var0.spriteId2 = Client.field888; + } else { + var0.spriteId2 = Client.field733; + } + + } 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/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index d50ed65db2..ff479c4e84 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -1,110 +1,115 @@ -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("iw") +@ObfuscatedName("iq") @Implements("WorldMapElement") public class WorldMapElement extends DualNode { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("WorldMapElement_archive") public static AbstractArchive WorldMapElement_archive; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "[Liw;" + signature = "[Liq;" ) @Export("WorldMapElement_cached") public static WorldMapElement[] WorldMapElement_cached; - @ObfuscatedName("p") + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -855102923 + ) + @Export("WorldMapElement_count") + public static int WorldMapElement_count; + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lep;" ) @Export("WorldMapElement_cachedSprites") static EvictingDualNodeHashTable WorldMapElement_cachedSprites; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -846582449 + intValue = 1739070481 ) @Export("objectId") public final int objectId; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 248724911 + intValue = 1614113825 ) @Export("sprite1") public int sprite1; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 473638347 + intValue = -1422179555 ) @Export("sprite2") int sprite2; - @ObfuscatedName("i") + @ObfuscatedName("q") @Export("name") public String name; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1731213053 + intValue = -662975939 ) - public int field3217; - @ObfuscatedName("f") + public int field3200; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1939800195 + intValue = -885213857 ) @Export("textSize") public int textSize; - @ObfuscatedName("u") + @ObfuscatedName("c") @Export("menuActions") public String[] menuActions; - @ObfuscatedName("x") + @ObfuscatedName("r") @Export("menuTargetName") public String menuTargetName; - @ObfuscatedName("r") - int[] field3221; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 584750185 - ) - int field3222; @ObfuscatedName("y") + int[] field3201; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 908052841 + intValue = -614594231 ) - int field3223; + int field3204; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -1806876145 + ) + int field3206; @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -310968273 + intValue = -1042672469 ) - int field3224; - @ObfuscatedName("a") + int field3207; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 961137775 + intValue = -566631507 ) - int field3231; - @ObfuscatedName("j") + int field3208; + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Liz;" + signature = "Lib;" ) @Export("horizontalAlignment") public HorizontalAlignment horizontalAlignment; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Lif;" + signature = "Lia;" ) @Export("verticalAlignment") public VerticalAlignment verticalAlignment; + @ObfuscatedName("w") + int[] field3211; + @ObfuscatedName("l") + byte[] field3192; @ObfuscatedName("h") - int[] field3228; - @ObfuscatedName("o") - byte[] field3214; - @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -880485155 + intValue = -481850779 ) @Export("category") public int category; @@ -118,20 +123,20 @@ public class WorldMapElement extends DualNode { this.sprite2 = -1; this.textSize = 0; this.menuActions = new String[5]; - this.field3222 = Integer.MAX_VALUE; - this.field3223 = Integer.MAX_VALUE; - this.field3224 = Integer.MIN_VALUE; - this.field3231 = Integer.MIN_VALUE; + this.field3204 = Integer.MAX_VALUE; + this.field3206 = Integer.MAX_VALUE; + this.field3207 = Integer.MIN_VALUE; + this.field3208 = Integer.MIN_VALUE; this.horizontalAlignment = HorizontalAlignment.HorizontalAlignment_centered; this.verticalAlignment = VerticalAlignment.VerticalAlignment_centered; this.category = -1; this.objectId = var1; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkf;I)V", - garbageValue = "-2108629289" + signature = "(Lky;I)V", + garbageValue = "-46357468" ) @Export("decode") public void decode(Buffer var1) { @@ -145,115 +150,89 @@ public class WorldMapElement extends DualNode { } } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkf;II)V", - garbageValue = "-1385963725" + signature = "(Lky;II)V", + garbageValue = "-1426592379" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - this.sprite1 = var1.method5511(); + this.sprite1 = var1.method5602(); } else if (var2 == 2) { - this.sprite2 = var1.method5511(); + this.sprite2 = var1.method5602(); } else if (var2 == 3) { this.name = var1.readStringCp1252NullTerminated(); } else if (var2 == 4) { - this.field3217 = var1.readMedium(); + this.field3200 = var1.readMedium(); } else if (var2 == 5) { var1.readMedium(); } else if (var2 == 6) { this.textSize = var1.readUnsignedByte(); - } else if (var2 == 7) { - int var3 = var1.readUnsignedByte(); - if ((var3 & 1) == 0) - { - } + } else { + int var3; + if (var2 == 7) { + var3 = var1.readUnsignedByte(); + if ((var3 & 1) == 0) { + } - if ((var3 & 2) == 2) - { - } - } else if (var2 == 8) { - var1.readUnsignedByte(); - } else if (var2 >= 10 && var2 <= 14) { - this.menuActions[var2 - 10] = var1.readStringCp1252NullTerminated(); - } else if (var2 == 15) { - int var3 = var1.readUnsignedByte(); - this.field3221 = new int[var3 * 2]; + if ((var3 & 2) == 2) { + } + } else if (var2 == 8) { + var1.readUnsignedByte(); + } else if (var2 >= 10 && var2 <= 14) { + this.menuActions[var2 - 10] = var1.readStringCp1252NullTerminated(); + } else if (var2 == 15) { + var3 = var1.readUnsignedByte(); + this.field3201 = new int[var3 * 2]; - int var4; - for (var4 = 0; var4 < var3 * 2; ++var4) { - this.field3221[var4] = var1.readShort(); - } + int var4; + for (var4 = 0; var4 < var3 * 2; ++var4) { + this.field3201[var4] = var1.readShort(); + } - var1.readInt(); - var4 = var1.readUnsignedByte(); - this.field3228 = new int[var4]; + var1.readInt(); + var4 = var1.readUnsignedByte(); + this.field3211 = new int[var4]; - int var5; - for (var5 = 0; var5 < this.field3228.length; ++var5) { - this.field3228[var5] = var1.readInt(); - } + int var5; + for (var5 = 0; var5 < this.field3211.length; ++var5) { + this.field3211[var5] = var1.readInt(); + } - this.field3214 = new byte[var3]; + this.field3192 = new byte[var3]; - for (var5 = 0; var5 < var3; ++var5) { - this.field3214[var5] = var1.readByte(); - } - } else if (var2 == 16) { - return; - } - if (var2 == 17) { - this.menuTargetName = var1.readStringCp1252NullTerminated(); - } else if (var2 == 18) { - var1.method5511(); - } else if (var2 == 19) { - this.category = var1.readUnsignedShort(); - } else if (var2 == 21) { - var1.readInt(); - } else if (var2 == 22) { - var1.readInt(); - } else if (var2 == 23) { - var1.readUnsignedByte(); - var1.readUnsignedByte(); - var1.readUnsignedByte(); - } else if (var2 == 24) { - var1.readShort(); - var1.readShort(); - } else if (var2 == 25) { - var1.method5511(); - } else if (var2 == 28) { - var1.readUnsignedByte(); - } else if (var2 == 29) { - HorizontalAlignment[] var6 = new HorizontalAlignment[]{HorizontalAlignment.field3461, HorizontalAlignment.field3460, HorizontalAlignment.HorizontalAlignment_centered}; - this.horizontalAlignment = (HorizontalAlignment) SoundSystem.findEnumerated(var6, var1.readUnsignedByte()); - } else if (var2 == 30) { - VerticalAlignment[] var7 = new VerticalAlignment[]{VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field3195, VerticalAlignment.field3194}; - this.verticalAlignment = (VerticalAlignment) SoundSystem.findEnumerated(var7, var1.readUnsignedByte()); - } - - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "2017602837" - ) - public void method4370() { - if (this.field3221 == null) { - return; - } - for (int var1 = 0; var1 < this.field3221.length; var1 += 2) { - if (this.field3221[var1] < this.field3222) { - this.field3222 = this.field3221[var1]; - } else if (this.field3221[var1] > this.field3224) { - this.field3224 = this.field3221[var1]; - } - - if (this.field3221[var1 + 1] < this.field3223) { - this.field3223 = this.field3221[var1 + 1]; - } else if (this.field3221[var1 + 1] > this.field3231) { - this.field3231 = this.field3221[var1 + 1]; + for (var5 = 0; var5 < var3; ++var5) { + this.field3192[var5] = var1.readByte(); + } + } else if (var2 != 16) { + if (var2 == 17) { + this.menuTargetName = var1.readStringCp1252NullTerminated(); + } else if (var2 == 18) { + var1.method5602(); + } else if (var2 == 19) { + this.category = var1.readUnsignedShort(); + } else if (var2 == 21) { + var1.readInt(); + } else if (var2 == 22) { + var1.readInt(); + } else if (var2 == 23) { + var1.readUnsignedByte(); + var1.readUnsignedByte(); + var1.readUnsignedByte(); + } else if (var2 == 24) { + var1.readShort(); + var1.readShort(); + } else if (var2 == 25) { + var1.method5602(); + } else if (var2 == 28) { + var1.readUnsignedByte(); + } else if (var2 == 29) { + HorizontalAlignment[] var6 = new HorizontalAlignment[]{HorizontalAlignment.field3435, HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field3436}; + this.horizontalAlignment = (HorizontalAlignment)FriendSystem.findEnumerated(var6, var1.readUnsignedByte()); + } else if (var2 == 30) { + this.verticalAlignment = (VerticalAlignment)FriendSystem.findEnumerated(FriendSystem.method1830(), var1.readUnsignedByte()); + } } } @@ -261,8 +240,32 @@ public class WorldMapElement extends DualNode { @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(ZI)Lly;", - garbageValue = "1310169716" + signature = "(B)V", + garbageValue = "89" + ) + public void method4290() { + if (this.field3201 != null) { + for (int var1 = 0; var1 < this.field3201.length; var1 += 2) { + if (this.field3201[var1] < this.field3204) { + this.field3204 = this.field3201[var1]; + } else if (this.field3201[var1] > this.field3207) { + this.field3207 = this.field3201[var1]; + } + + if (this.field3201[var1 + 1] < this.field3206) { + this.field3206 = this.field3201[var1 + 1]; + } else if (this.field3201[var1 + 1] > this.field3208) { + this.field3208 = this.field3201[var1 + 1]; + } + } + } + + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "(ZI)Lls;", + garbageValue = "-944749033" ) @Export("getSpriteBool") public Sprite getSpriteBool(boolean var1) { @@ -270,60 +273,391 @@ public class WorldMapElement extends DualNode { return this.getSprite(var2); } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(II)Lly;", - garbageValue = "-517237521" + signature = "(II)Lls;", + garbageValue = "-995868610" ) @Export("getSprite") Sprite getSprite(int var1) { if (var1 < 0) { return null; - } - Sprite var2 = (Sprite)WorldMapElement_cachedSprites.get((long)var1); - if (var2 != null) { - return var2; - } - var2 = class65.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); - if (var2 != null) { - WorldMapElement_cachedSprites.put(var2, (long)var1); - } + } else { + Sprite var2 = (Sprite)WorldMapElement_cachedSprites.get((long)var1); + if (var2 != null) { + return var2; + } else { + var2 = TilePaint.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); + if (var2 != null) { + WorldMapElement_cachedSprites.put(var2, (long)var1); + } - return var2; + return var2; + } + } } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "95" + signature = "(I)I", + garbageValue = "-2089637637" ) @Export("getObjectId") public int getObjectId() { return this.objectId; } - @ObfuscatedName("ga") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "426729441" + signature = "(IB)Lhp;", + garbageValue = "-72" ) - static final void method4368(boolean var0) { - class186.playPcmPlayers(); - ++Client.packetWriter.pendingWrites; - if (Client.packetWriter.pendingWrites < 50 && !var0) { - return; + @Export("getWidget") + public static Widget getWidget(int var0) { + int var1 = var0 >> 16; + int var2 = var0 & 65535; + if (Widget.Widget_interfaceComponents[var1] == null || Widget.Widget_interfaceComponents[var1][var2] == null) { + boolean var3 = Projectile.loadInterface(var1); + if (!var3) { + return null; + } } - Client.packetWriter.pendingWrites = 0; - if (Client.field701 || Client.packetWriter.getSocket() == null) { - return; - } - PacketBufferNode var1 = Archive.getPacketBufferNode(ClientPacket.field2225, Client.packetWriter.isaacCipher); - Client.packetWriter.addNode(var1); - try { - Client.packetWriter.flush(); - } catch (IOException var3) { - Client.field701 = true; + return Widget.Widget_interfaceComponents[var1][var2]; + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "([BB)V", + garbageValue = "41" + ) + @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 (FaceNormal.ByteArrayPool_arrays != null) { + for (int var1 = 0; var1 < UserComparator4.ByteArrayPool_alternativeSizes.length; ++var1) { + if (var0.length == UserComparator4.ByteArrayPool_alternativeSizes[var1] && ByteArrayPool.ByteArrayPool_altSizeArrayCounts[var1] < FaceNormal.ByteArrayPool_arrays[var1].length) { + FaceNormal.ByteArrayPool_arrays[var1][ByteArrayPool.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; + return; + } + } + } + + } + } + + @ObfuscatedName("gt") + @ObfuscatedSignature( + signature = "(IIIII)V", + garbageValue = "-1612596971" + ) + @Export("drawEntities") + static final void drawEntities(int var0, int var1, int var2, int var3) { + ++Client.viewportDrawCount; + if (WorldMapIcon_1.localPlayer.x >> 7 == Client.destinationX && WorldMapIcon_1.localPlayer.y >> 7 == Client.destinationY) { + Client.destinationX = 0; + } + + if (Client.renderSelf) { + class80.addPlayerToScene(WorldMapIcon_1.localPlayer, false); + } + + AbstractByteArrayCopier.method3878(); + KeyHandler.addNpcsToScene(true); + InvDefinition.method4273(); + KeyHandler.addNpcsToScene(false); + ModelData0.drawProjectiles(); + ServerPacket.method3555(); + LoginScreenAnimation.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 var4; + int var5; + int var6; + int var7; + int var8; + int var9; + int var10; + int var11; + int var12; + int var13; + int var14; + if (!Client.isCameraLocked) { + var4 = Client.camAngleX; + if (Client.field635 / 256 > var4) { + var4 = Client.field635 / 256; + } + + if (Client.field897[4] && Client.field694[4] + 128 > var4) { + var4 = Client.field694[4] + 128; + } + + var5 = Client.camAngleY & 2047; + var6 = DynamicObject.oculusOrbFocalPointX; + var7 = ScriptEvent.field559; + var8 = FriendSystem.oculusOrbFocalPointY; + var9 = var4 * 3 + 600; + var10 = ArchiveLoader.method1100(var9, var3); + var11 = 2048 - var4 & 2047; + var12 = 2048 - var5 & 2047; + 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 = var17 * var10 + var16 * var14 >> 16; + var14 = var18; + } + + if (var12 != 0) { + var16 = Rasterizer3D.Rasterizer3D_sine[var12]; + var17 = Rasterizer3D.Rasterizer3D_cosine[var12]; + var18 = var15 * var16 + var17 * var13 >> 16; + var15 = var17 * var15 - var13 * var16 >> 16; + var13 = var18; + } + + WallDecoration.cameraX = var6 - var13; + Coord.cameraY = var7 - var14; + UserComparator7.cameraZ = var8 - var15; + class43.cameraPitch = var4; + class40.cameraYaw = var5; + if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (DynamicObject.oculusOrbFocalPointX >> 7 != WorldMapIcon_1.localPlayer.x >> 7 || FriendSystem.oculusOrbFocalPointY >> 7 != WorldMapIcon_1.localPlayer.y >> 7)) { + var16 = WorldMapIcon_1.localPlayer.plane; + var17 = PacketWriter.baseX * 64 + (DynamicObject.oculusOrbFocalPointX >> 7); + var18 = RouteStrategy.baseY * 64 + (FriendSystem.oculusOrbFocalPointY >> 7); + BoundaryObject.method3215(var17, var18, var16, true); + } + } + + if (!Client.isCameraLocked) { + if (GrandExchangeOffer.clientPreferences.roofsHidden) { + var5 = ItemContainer.plane; + } else { + label391: { + var6 = 3; + if (class43.cameraPitch < 310) { + label389: { + if (Client.oculusOrbState == 1) { + var7 = DynamicObject.oculusOrbFocalPointX >> 7; + var8 = FriendSystem.oculusOrbFocalPointY >> 7; + } else { + var7 = WorldMapIcon_1.localPlayer.x >> 7; + var8 = WorldMapIcon_1.localPlayer.y >> 7; + } + + var9 = WallDecoration.cameraX >> 7; + var10 = UserComparator7.cameraZ >> 7; + if (var9 >= 0 && var10 >= 0 && var9 < 104 && var10 < 104) { + if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { + if ((Tiles.Tiles_renderFlags[ItemContainer.plane][var9][var10] & 4) != 0) { + var6 = ItemContainer.plane; + } + + if (var7 > var9) { + var11 = var7 - var9; + } else { + var11 = var9 - var7; + } + + if (var8 > var10) { + var12 = var8 - var10; + } else { + var12 = var10 - var8; + } + + if (var11 > var12) { + var13 = var12 * 65536 / var11; + var14 = 32768; + + while (true) { + if (var9 == var7) { + break label389; + } + + if (var9 < var7) { + ++var9; + } else if (var9 > var7) { + --var9; + } + + if ((Tiles.Tiles_renderFlags[ItemContainer.plane][var9][var10] & 4) != 0) { + var6 = ItemContainer.plane; + } + + var14 += var13; + if (var14 >= 65536) { + var14 -= 65536; + if (var10 < var8) { + ++var10; + } else if (var10 > var8) { + --var10; + } + + if ((Tiles.Tiles_renderFlags[ItemContainer.plane][var9][var10] & 4) != 0) { + var6 = ItemContainer.plane; + } + } + } + } else { + if (var12 > 0) { + var13 = var11 * 65536 / var12; + var14 = 32768; + + while (var10 != var8) { + if (var10 < var8) { + ++var10; + } else if (var10 > var8) { + --var10; + } + + if ((Tiles.Tiles_renderFlags[ItemContainer.plane][var9][var10] & 4) != 0) { + var6 = ItemContainer.plane; + } + + var14 += var13; + if (var14 >= 65536) { + var14 -= 65536; + if (var9 < var7) { + ++var9; + } else if (var9 > var7) { + --var9; + } + + if ((Tiles.Tiles_renderFlags[ItemContainer.plane][var9][var10] & 4) != 0) { + var6 = ItemContainer.plane; + } + } + } + } + break label389; + } + } + + var5 = ItemContainer.plane; + break label391; + } + + var5 = ItemContainer.plane; + break label391; + } + } + + if (WorldMapIcon_1.localPlayer.x >= 0 && WorldMapIcon_1.localPlayer.y >= 0 && WorldMapIcon_1.localPlayer.x < 13312 && WorldMapIcon_1.localPlayer.y < 13312) { + if ((Tiles.Tiles_renderFlags[ItemContainer.plane][WorldMapIcon_1.localPlayer.x >> 7][WorldMapIcon_1.localPlayer.y >> 7] & 4) != 0) { + var6 = ItemContainer.plane; + } + + var5 = var6; + } else { + var5 = ItemContainer.plane; + } + } + } + + var4 = var5; + } else { + var4 = WorldMapData_0.getHighestVisiblePlane(); + } + + var5 = WallDecoration.cameraX; + var6 = Coord.cameraY; + var7 = UserComparator7.cameraZ; + var8 = class43.cameraPitch; + var9 = class40.cameraYaw; + + for (var10 = 0; var10 < 5; ++var10) { + if (Client.field897[var10]) { + var11 = (int)(Math.random() * (double)(Client.field869[var10] * 2 + 1) - (double)Client.field869[var10] + Math.sin((double)Client.field872[var10] * ((double)Client.field758[var10] / 100.0D)) * (double)Client.field694[var10]); + if (var10 == 0) { + WallDecoration.cameraX += var11; + } + + if (var10 == 1) { + Coord.cameraY += var11; + } + + if (var10 == 2) { + UserComparator7.cameraZ += var11; + } + + if (var10 == 3) { + class40.cameraYaw = var11 + class40.cameraYaw & 2047; + } + + if (var10 == 4) { + class43.cameraPitch += var11; + if (class43.cameraPitch < 128) { + class43.cameraPitch = 128; + } + + if (class43.cameraPitch > 383) { + class43.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) { + ItemDefinition.method4629(var10 - var0, var11 - var1); + } else { + ViewportMouse.ViewportMouse_isInViewport = false; + ViewportMouse.ViewportMouse_entityCount = 0; + } + + WorldMapSectionType.playPcmPlayers(); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); + WorldMapSectionType.playPcmPlayers(); + var12 = Rasterizer3D.Rasterizer3D_zoom; + Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; + Player.scene.draw(WallDecoration.cameraX, Coord.cameraY, UserComparator7.cameraZ, class43.cameraPitch, class40.cameraYaw, var4); + Rasterizer3D.Rasterizer3D_zoom = var12; + WorldMapSectionType.playPcmPlayers(); + Player.scene.clearTempGameObjects(); + ItemContainer.method1119(var0, var1, var2, var3); + if (Client.hintArrowType == 2) { + WorldMapAreaData.worldToScreen(Client.hintArrowSubX * 64 + (Client.hintArrowX - PacketWriter.baseX * 64 << 7), (Client.hintArrowY - RouteStrategy.baseY * 64 << 7) + Client.hintArrowSubY * 4096, Client.hintArrowHeight * 2); + if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { + WorldMapData_1.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); + } + } + + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field879); + MusicPatchNode.method3771(var0, var1, var2, var3); + WallDecoration.cameraX = var5; + Coord.cameraY = var6; + UserComparator7.cameraZ = var7; + class43.cameraPitch = var8; + class40.cameraYaw = var9; + if (Client.isLoading && class222.method4035(true, false) == 0) { + Client.isLoading = false; + } + + if (Client.isLoading) { + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); + MusicPatch.drawLoadingMessage("Loading - please wait.", false); } } diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java index 7ae5960c24..61e33379cc 100644 --- a/runescape-client/src/main/java/WorldMapEvent.java +++ b/runescape-client/src/main/java/WorldMapEvent.java @@ -4,35 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aq") +@ObfuscatedName("ag") @Implements("WorldMapEvent") public class WorldMapEvent { - @ObfuscatedName("lr") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 272938977 - ) - static int field359; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 303553599 + intValue = 79767661 ) @Export("mapElement") public int mapElement; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lhv;" + signature = "Lhd;" ) @Export("coord1") public Coord coord1; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lhv;" + signature = "Lhd;" ) @Export("coord2") public Coord coord2; @ObfuscatedSignature( - signature = "(ILhv;Lhv;)V" + signature = "(ILhd;Lhd;)V" ) public WorldMapEvent(int var1, Coord var2, Coord var3) { this.mapElement = var1; @@ -40,232 +35,8 @@ public class WorldMapEvent { this.coord2 = var3; } - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(Lkx;ILbd;II)V", - garbageValue = "158563963" - ) - static final void method736(PacketBuffer var0, int var1, Player var2, int var3) { - byte var4 = -1; - int var5; - int var6; - int var8; - int var9; - int var12; - if ((var3 & 0x40) != 0) { - var5 = var0.method5722(); - 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 == 0x7fff) { - 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(); - var2.addHitSplat(var7, var9, var8, var10, Client.cycle, var11); - } - } - - var6 = var0.readUnsignedByteNegate(); - if (var6 > 0) { - for (var7 = 0; var7 < var6; ++var7) { - var8 = var0.readUShortSmart(); - var9 = var0.readUShortSmart(); - if (var9 == 0x7fff) { - var2.removeHealthBar(var8); - } else { - var10 = var0.readUShortSmart(); - var11 = var0.method5722(); - var12 = var9 > 0 ? var0.readUnsignedByte() : var11; - var2.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); - } - } - } - } - - if ((var3 & 512) != 0) { - var2.spotAnimation = var0.method5534(); - var5 = var0.method5542(); - var2.heightOffset = var5 >> 16; - var2.field989 = (var5 & 0xffff) + Client.cycle; - var2.spotAnimationFrame = 0; - var2.spotAnimationFrameCycle = 0; - if (var2.field989 > Client.cycle) { - var2.spotAnimationFrame = -1; - } - - if (var2.spotAnimation == 0xffff) { - var2.spotAnimation = -1; - } - } - - if ((var3 & 4096) != 0) { - var4 = var0.method5694(); - } - - if ((var3 & 1024) != 0) { - var2.field991 = var0.method5528(); - var2.field993 = var0.method5694(); - var2.field992 = var0.method5694(); - var2.field983 = var0.method5528(); - var2.field995 = var0.method5518() + Client.cycle; - var2.field996 = var0.method5532() + Client.cycle; - var2.field997 = var0.readUnsignedShort(); - if (var2.field638) { - var2.field991 += var2.tileX; - var2.field993 += var2.tileY; - var2.field992 += var2.tileX; - var2.field983 += var2.tileY; - var2.pathLength = 0; - } else { - var2.field991 += var2.pathX[0]; - var2.field993 += var2.pathY[0]; - var2.field992 += var2.pathX[0]; - var2.field983 += var2.pathY[0]; - var2.pathLength = 1; - } - - var2.field1008 = 0; - } - - if ((var3 & 32) != 0) { - var2.overheadText = var0.readStringCp1252NullTerminated(); - if (var2.overheadText.charAt(0) == '~') { - var2.overheadText = var2.overheadText.substring(1); - ScriptEvent.addGameMessage(2, var2.username.getName(), var2.overheadText); - } else if (var2 == Client.localPlayer) { - ScriptEvent.addGameMessage(2, var2.username.getName(), var2.overheadText); - } - - var2.isAutoChatting = false; - var2.overheadTextColor = 0; - var2.overheadTextEffect = 0; - var2.overheadTextCyclesRemaining = 150; - } - - if ((var3 & 4) != 0) { - var2.field976 = var0.method5532(); - if (var2.pathLength == 0) { - var2.orientation = var2.field976; - var2.field976 = -1; - } - } - - if ((var3 & 1) != 0) { - var5 = var0.method5525(); - byte[] var13 = new byte[var5]; - Buffer var14 = new Buffer(var13); - var0.method5544(var13, 0, var5); - Players.field1254[var1] = var14; - var2.read(var14); - } - - if ((var3 & 2) != 0) { - var2.targetIndex = var0.method5518(); - if (var2.targetIndex == 0xffff) { - var2.targetIndex = -1; - } - } - - if ((var3 & 2048) != 0) { - Players.field1250[var1] = var0.method5694(); - } - - if ((var3 & 16) != 0) { - var5 = var0.method5518(); - PlayerType var19 = (PlayerType)SoundSystem.findEnumerated(UserComparator5.PlayerType_values(), var0.readUnsignedByte()); - boolean var17 = var0.readUnsignedByteNegate() == 1; - var8 = var0.readUnsignedByte(); - var9 = var0.offset; - if (var2.username != null && var2.appearance != null) { - boolean var18 = false; - if (var19.isUser && ArchiveLoader.friendSystem.isIgnored(var2.username)) { - var18 = true; - } - - if (!var18 && Client.field767 == 0 && !var2.isHidden) { - Players.field1264.offset = 0; - var0.readBytes(Players.field1264.array, 0, var8); - Players.field1264.offset = 0; - String var15 = AbstractFont.escapeBrackets(class1.method17(DefaultsGroup.method5898(Players.field1264))); - var2.overheadText = var15.trim(); - var2.overheadTextColor = var5 >> 8; - var2.overheadTextEffect = var5 & 255; - var2.overheadTextCyclesRemaining = 150; - var2.isAutoChatting = var17; - var2.field998 = var2 != Client.localPlayer && var19.isUser && "" != Client.field762 && var15.toLowerCase().indexOf(Client.field762) == -1; - if (var19.isPrivileged) { - var12 = var17 ? 91 : 1; - } else { - var12 = var17 ? 90 : 2; - } - - if (var19.modIcon != -1) { - ScriptEvent.addGameMessage(var12, WorldMapSection1.getModIconString(var19.modIcon) + var2.username.getName(), var15); - } else { - ScriptEvent.addGameMessage(var12, var2.username.getName(), var15); - } - } - } - - var0.offset = var9 + var8; - } - - if ((var3 & 256) != 0) { - for (var5 = 0; var5 < 3; ++var5) { - var2.actions[var5] = var0.readStringCp1252NullTerminated(); - } - } - - if ((var3 & 128) != 0) { - var5 = var0.readUnsignedShort(); - if (var5 == 0xffff) { - var5 = -1; - } - - var6 = var0.readUnsignedByte(); - MouseRecorder.performPlayerAnimation(var2, var5, var6); - } - - if (var2.field638) { - if (var4 == 127) { - var2.resetPath(var2.tileX, var2.tileY); - } else { - byte var16; - if (var4 != -1) { - var16 = var4; - } else { - var16 = Players.field1250[var1]; - } - - var2.method1189(var2.tileX, var2.tileY, var16); - } - } - - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1659690111" - ) - @Export("FriendSystem_cantIgnoreSelfMes") - static final void FriendSystem_cantIgnoreSelfMes() { - Object var10000 = null; - String var0 = "You can't add yourself to your own ignore list"; - ScriptEvent.addGameMessage(30, "", var0); + @ObfuscatedName("s") + static boolean method730(long var0) { + return class40.method729(var0) == 2; } } diff --git a/runescape-client/src/main/java/WorldMapID.java b/runescape-client/src/main/java/WorldMapID.java index b07741500b..15fa97bfb9 100644 --- a/runescape-client/src/main/java/WorldMapID.java +++ b/runescape-client/src/main/java/WorldMapID.java @@ -3,292 +3,94 @@ 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("ag") +@ObfuscatedName("aj") @Implements("WorldMapID") public class WorldMapID { - @ObfuscatedName("rx") + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "Laj;" + ) + static final WorldMapID field260; + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "Laj;" + ) + static final WorldMapID field257; + @ObfuscatedName("aw") + @Export("client") + @ObfuscatedSignature( + signature = "Lclient;" + ) + static Client client; + @ObfuscatedName("di") + @ObfuscatedSignature( + signature = "Lid;" + ) + @Export("archive13") + static Archive archive13; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1345253721 - ) - static int field268; - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "Lag;" - ) - static final WorldMapID field272; - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lag;" - ) - static final WorldMapID field269; - @ObfuscatedName("bc") - @ObfuscatedSignature( - signature = "[Lly;" - ) - @Export("worldSelectBackSprites") - static Sprite[] worldSelectBackSprites; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -976208545 + intValue = -2063866403 ) @Export("value") final int value; static { - field272 = new WorldMapID(0); - field269 = new WorldMapID(1); + field260 = new WorldMapID(0); + field257 = new WorldMapID(1); } WorldMapID(int var1) { this.value = var1; } - @ObfuscatedName("y") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "-37" + signature = "(Lhz;IIB)[Lls;", + garbageValue = "32" ) - @Export("FriendSystem_cantIgnoreFriendMes") - static final void FriendSystem_cantIgnoreFriendMes(String var0) { - StringBuilder var10000 = new StringBuilder(); - Object var10001 = null; - var10000 = var10000.append("Please remove ").append(var0); - var10001 = null; - String var1 = var10000.append(" from your friend list first").toString(); - ScriptEvent.addGameMessage(30, "", var1); + @Export("SpriteBuffer_getSpriteArray") + public static Sprite[] SpriteBuffer_getSpriteArray(AbstractArchive var0, int var1, int var2) { + return !World.SpriteBuffer_bufferFile(var0, var1, var2) ? null : GameShell.method897(); } - @ObfuscatedName("as") + @ObfuscatedName("ic") @ObfuscatedSignature( - signature = "(ILcx;ZI)I", - garbageValue = "-216787124" + signature = "(S)V", + garbageValue = "-6260" ) - static int method540(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.CLIENTCLOCK) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.cycle; - return 1; - } - int var3; - int var4; - if (var0 == ScriptOpcodes.INV_GETOBJ) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = AbstractWorldMapData.method274(var3, var4); - return 1; - } - if (var0 == ScriptOpcodes.INV_GETNUM) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = class2.ItemContainer_getCount(var3, var4); - return 1; - } - if (var0 == ScriptOpcodes.INV_TOTAL) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = BufferedFile.method6528(var3, var4); - return 1; - } - if (var0 == ScriptOpcodes.INV_SIZE) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = NetSocket.getInvDefinition(var3).size; - return 1; - } - if (var0 == ScriptOpcodes.STAT) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; - return 1; - } - if (var0 == ScriptOpcodes.STAT_BASE) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.levels[var3]; - return 1; - } - if (var0 == ScriptOpcodes.STAT_XP) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.experience[var3]; - return 1; - } - int var5; - if (var0 == ScriptOpcodes.COORD) { - var3 = class42.plane; - var4 = MusicPatchNode2.baseX * 64 + (Client.localPlayer.x >> 7); - var5 = class1.baseY * 64 + (Client.localPlayer.y >> 7); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); - return 1; - } - if (var0 == ScriptOpcodes.COORDX) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; - return 1; - } - if (var0 == ScriptOpcodes.COORDZ) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 >> 28; - return 1; - } - if (var0 == ScriptOpcodes.COORDY) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 & 16383; - return 1; - } - if (var0 == ScriptOpcodes.MAP_MEMBERS) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; - return 1; - } - if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = AbstractWorldMapData.method274(var3, var4); - return 1; - } - if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = class2.ItemContainer_getCount(var3, var4); - return 1; - } - if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = BufferedFile.method6528(var3, var4); - return 1; - } - if (var0 == ScriptOpcodes.STAFFMODLEVEL) { - if (Client.staffModLevel >= 2) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.staffModLevel; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } + static final void method537() { + boolean var0 = false; - return 1; - } - if (var0 == ScriptOpcodes.REBOOTTIMER) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.rebootTimer; - return 1; - } - if (var0 == ScriptOpcodes.MAP_WORLD) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.worldId; - return 1; - } - if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.runEnergy; - return 1; - } - if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.weight; - return 1; - } - if (var0 == ScriptOpcodes.PLAYERMOD) { - if (Client.playerMod) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } + while (!var0) { + var0 = true; - return 1; - } - if (var0 == ScriptOpcodes.WORLDFLAGS) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.worldProperties; - return 1; - } - if (var0 == ScriptOpcodes.MOVECOORD) { - HealthBarUpdate.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2]; - int var6 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 3]; - var3 += var4 << 14; - var3 += var5 << 28; - var3 += var6; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3; - return 1; - } - return 2; - } - - @ObfuscatedName("ek") - @ObfuscatedSignature( - signature = "(I)Llw;", - garbageValue = "-1838562089" - ) - @Export("getWorldMap") - static WorldMap getWorldMap() { - return BoundaryObject.worldMap; - } - - @ObfuscatedName("hx") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-456020317" - ) - @Export("Widget_runOnTargetLeave") - static void Widget_runOnTargetLeave() { - if (!Client.isSpellSelected) { - return; - } - Widget var0 = Client.getWidgetChild(WorldMapEvent.field359, Client.field848); - if (var0 != null && var0.onTargetLeave != null) { - ScriptEvent var1 = new ScriptEvent(); - var1.widget = var0; - var1.args = var0.onTargetLeave; - LoginPacket.runScriptEvent(var1); - } - - Client.isSpellSelected = false; - Strings.invalidateWidget(var0); - } - - @ObfuscatedName("ix") - @ObfuscatedSignature( - signature = "([Lhj;IS)V", - garbageValue = "28886" - ) - @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) { - continue; - } - if (var3.type == 0) { - if (var3.children != null) { - runComponentCloseListeners(var3.children, var1); + 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; } - - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); - if (var4 != null) { - WorldMapLabelSize.runIntfCloseListeners(var4.group, var1); - } - } - - ScriptEvent var5; - if (var1 == 0 && var3.onDialogAbort != null) { - var5 = new ScriptEvent(); - var5.widget = var3; - var5.args = var3.onDialogAbort; - LoginPacket.runScriptEvent(var5); - } - - if (var1 == 1 && var3.onSubChange != null) { - if (var3.childIndex >= 0) { - Widget var6 = class80.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; - LoginPacket.runScriptEvent(var5); } } diff --git a/runescape-client/src/main/java/WorldMapIcon_0.java b/runescape-client/src/main/java/WorldMapIcon_0.java index 43ab2a3da6..dc0d5a4a11 100644 --- a/runescape-client/src/main/java/WorldMapIcon_0.java +++ b/runescape-client/src/main/java/WorldMapIcon_0.java @@ -1,60 +1,63 @@ -import java.awt.Component; -import java.io.File; +import java.awt.image.BufferedImage; +import java.awt.image.PixelGrabber; +import java.io.ByteArrayInputStream; import java.io.IOException; +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; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("j") +@ObfuscatedName("z") @Implements("WorldMapIcon_0") public class WorldMapIcon_0 extends AbstractWorldMapIcon { - @ObfuscatedName("g") + @ObfuscatedName("pw") @ObfuscatedSignature( - signature = "Laq;" + signature = "Lkk;" ) - @Export("worldMapEvent") - static WorldMapEvent worldMapEvent; - @ObfuscatedName("ji") + @Export("privateChatMode") + static PrivateChatMode privateChatMode; + @ObfuscatedName("fn") @ObfuscatedSignature( - signature = "Lhj;" + signature = "Lft;" ) - @Export("dragInventoryWidget") - static Widget dragInventoryWidget; - @ObfuscatedName("q") + @Export("socketTask") + static Task socketTask; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -548504739 + intValue = -845470175 ) @Export("element") final int element; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Las;" + signature = "Lai;" ) @Export("label") final WorldMapLabel label; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1510393047 + intValue = -890681173 ) @Export("subWidth") final int subWidth; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -861778951 + intValue = -1039826219 ) @Export("subHeight") final int subHeight; @ObfuscatedSignature( - signature = "(Lhv;Lhv;ILas;)V" + signature = "(Lhd;Lhd;ILai;)V" ) WorldMapIcon_0(Coord var1, Coord var2, int var3, WorldMapLabel var4) { super(var1, var2); this.element = var3; this.label = var4; - WorldMapElement var5 = class222.WorldMapElement_get(this.getElement()); + WorldMapElement var5 = WorldMapData_0.WorldMapElement_get(this.getElement()); Sprite var6 = var5.getSpriteBool(false); if (var6 != null) { this.subWidth = var6.subWidth; @@ -66,399 +69,221 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-229566020" + signature = "(B)I", + garbageValue = "78" ) @Export("getElement") public int getElement() { return this.element; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)Las;", - garbageValue = "1426074195" + signature = "(B)Lai;", + garbageValue = "1" ) @Export("getLabel") WorldMapLabel getLabel() { return this.label; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "14" + signature = "(I)I", + garbageValue = "1930584854" ) @Export("getSubWidth") int getSubWidth() { return this.subWidth; } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "1" + garbageValue = "-56" ) @Export("getSubHeight") int getSubHeight() { return this.subHeight; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ljava/awt/Component;B)V", - garbageValue = "103" + signature = "([BB)Lls;", + garbageValue = "-64" ) - static void method200(Component var0) { - var0.addMouseListener(MouseHandler.MouseHandler_instance); - var0.addMouseMotionListener(MouseHandler.MouseHandler_instance); - var0.addFocusListener(MouseHandler.MouseHandler_instance); - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(IB)Lie;", - garbageValue = "4" - ) - @Export("getParamDefinition") - public static ParamDefinition getParamDefinition(int var0) { - ParamDefinition var1 = (ParamDefinition)ParamDefinition.ParamDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } - byte[] var2 = ParamDefinition.ParamDefinition_archive.takeFile(11, var0); - var1 = new ParamDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - ParamDefinition.ParamDefinition_cached.put(var1, (long)var0); - return var1; - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(Lkf;II)Ljava/lang/String;", - garbageValue = "-1883574782" - ) - static String method194(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 = FriendSystem.decodeStringCp1252(var3, 0, var2); - return var4; - } catch (Exception var6) { - return "Cabbage"; - } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;ZI)Lma;", - garbageValue = "403925175" - ) - @Export("getPreferencesFile") - public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { - File var3 = new File(class1.cacheDir, "preferences" + var0 + ".dat"); - if (var3.exists()) { - try { - AccessFile var10 = new AccessFile(var3, "rw", 10000L); - return var10; - } catch (IOException var9) { - } - } - - String var4 = ""; - if (TextureProvider.cacheGamebuild == 33) { - var4 = "_rc"; - } else if (TextureProvider.cacheGamebuild == 34) { - var4 = "_wip"; - } - - File var5 = new File(PlayerType.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) { - } - } + @Export("convertJpgToSprite") + public static final Sprite convertJpgToSprite(byte[] var0) { + BufferedImage var1 = null; try { - var6 = new AccessFile(var3, "rw", 10000L); - return var6; + 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) { - throw new RuntimeException(); + } catch (InterruptedException var8) { } + + return new Sprite(0, 0); } - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkx;II)V", - garbageValue = "164873785" + signature = "(IIII)I", + garbageValue = "1576824193" ) - @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; + @Export("WorldMap_hslToRgb") + static int WorldMap_hslToRgb(int var0, int var1, int var2) { + if (var2 > 179) { + var1 /= 2; } - int var3 = var0.readBits(2); - Player var4 = Client.players[var1]; - if (var3 == 0) { - if (var2) { - var4.field638 = false; - } else if (Client.localPlayerIndex == var1) { - throw new RuntimeException(); - } else { - Players.Players_regions[var1] = (var4.plane << 28) + ((((MusicPatchNode2.baseX * 64) + var4.pathX[0]) >> 13) << 14) + (((class1.baseY * 64) + var4.pathY[0]) >> 13); - if (var4.field976 != -1) { - Players.Players_orientations[var1] = var4.field976; - } else { - Players.Players_orientations[var1] = var4.orientation; - } + if (var2 > 192) { + var1 /= 2; + } - Players.Players_targetIndices[var1] = var4.targetIndex; - Client.players[var1] = null; - if (var0.readBits(1) != 0) { - class226.updateExternalPlayer(var0, var1); + if (var2 > 217) { + var1 /= 2; + } + + if (var2 > 243) { + var1 /= 2; + } + + int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; + return var3; + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(ILkv;Lid;I)V", + garbageValue = "-1841388138" + ) + static void method191(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; } } - } else if (var3 == 1) { - int var5 = var0.readBits(3); - int var6 = var4.pathX[0]; - int 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.field638 = false; - } else if (var2) { - var4.field638 = true; - var4.tileX = var6; - var4.tileY = var7; - } else { - var4.field638 = false; - var4.method1189(var6, var7, Players.field1250[var1]); - } - } else if (var3 == 2) { - int var5 = var0.readBits(4); - int var6 = var4.pathX[0]; - int 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.field638 = false; - } else if (var2) { - var4.field638 = true; - var4.tileX = var6; - var4.tileY = var7; - } else { - var4.field638 = false; - var4.method1189(var6, var7, Players.field1250[var1]); - } - - } else if (var0.readBits(1) == 0) { - int var6 = var0.readBits(12); - int var7 = var6 >> 10; - int var8 = var6 >> 5 & 31; - if (var8 > 15) { - var8 -= 32; - } - - int var9 = var6 & 31; - if (var9 > 15) { - var9 -= 32; - } - - int var10 = var8 + var4.pathX[0]; - int 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.field638 = false; - } else if (var2) { - var4.field638 = true; - var4.tileX = var10; - var4.tileY = var11; - } else { - var4.field638 = false; - var4.method1189(var10, var11, Players.field1250[var1]); - } - - var4.plane = (byte) (var7 + var4.plane & 3); - if (Client.localPlayerIndex == var1) { - class42.plane = var4.plane; - } + if (var3 != null) { + var2.load(var1, var0, var3, true); } else { - int var6 = var0.readBits(30); - int var7 = var6 >> 28; - int var8 = var6 >> 14 & 16383; - int var9 = var6 & 16383; - int var10 = (MusicPatchNode2.baseX * 64 + var8 + var4.pathX[0] & 16383) - MusicPatchNode2.baseX * 64; - int var11 = (class1.baseY * 64 + var9 + var4.pathY[0] & 16383) - class1.baseY * 64; - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { - var4.resetPath(var10, var11); - var4.field638 = false; - } else if (var2) { - var4.field638 = true; - var4.tileX = var10; - var4.tileY = var11; - } else { - var4.field638 = false; - var4.method1189(var10, var11, Players.field1250[var1]); - } - - var4.plane = (byte) (var7 + var4.plane & 3); - if (Client.localPlayerIndex == var1) { - class42.plane = var4.plane; - } - + byte[] var4 = var1.read(var0); + var2.load(var1, var0, var4, true); } } - @ObfuscatedName("fs") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Lhj;III)V", - garbageValue = "1919867373" + signature = "([BIILea;[Lfm;I)V", + garbageValue = "-144892898" ) - @Export("checkIfMinimapClicked") - static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { - if (Client.minimapState != 0 && Client.minimapState != 3) { - return; - } - if (Client.isMenuOpen || (MouseHandler.MouseHandler_lastButton != 1 && (DevicePcmPlayerProvider.mouseCam || MouseHandler.MouseHandler_lastButton != 4))) { - return; - } - SpriteMask var3 = var0.getSpriteMask(true); - if (var3 == null) { - return; - } + static final void method203(byte[] var0, int var1, int var2, Scene var3, CollisionMap[] var4) { + Buffer var5 = new Buffer(var0); + int var6 = -1; - int var4 = MouseHandler.MouseHandler_lastPressedX - var1; - int var5 = MouseHandler.MouseHandler_lastPressedY - var2; - if (!var3.contains(var4, var5)) { - return; - } - 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 = var4 * var8 + var5 * var7 >> 11; - int var10 = var5 * var8 - var7 * var4 >> 11; - int var11 = var9 + Client.localPlayer.x >> 7; - int var12 = Client.localPlayer.y - var10 >> 7; - PacketBufferNode var13 = Archive.getPacketBufferNode(ClientPacket.field2262, Client.packetWriter.isaacCipher); - var13.packetBuffer.writeByte(18); - var13.packetBuffer.method5530(class1.baseY * 64 + var12); - var13.packetBuffer.method5530(MusicPatchNode2.baseX * 64 + var11); - var13.packetBuffer.method5520(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(Client.localPlayer.x); - var13.packetBuffer.writeShort(Client.localPlayer.y); - var13.packetBuffer.writeByte(63); - Client.packetWriter.addNode(var13); - Client.destinationX = var11; - Client.destinationY = var12; + while (true) { + int var7 = var5.method5565(); + 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]; + } + + class32.method544(var12, var16, var17, var6, var15, var14, var3, var19); + } + } + } } - @ObfuscatedName("jf") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lhj;IIIB)V", - garbageValue = "61" + signature = "(ILcr;ZB)I", + garbageValue = "92" ) - @Export("drawCompass") - static final void drawCompass(Widget var0, int var1, int var2, int var3) { - SpriteMask var4 = var0.getSpriteMask(false); - if (var4 == null) { - return; - } - if (Client.minimapState < 3) { - Message.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths); + static int method206(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.SOUND_SYNTH) { + Interpreter.Interpreter_intStackSize -= 3; + GrandExchangeOfferUnitPriceComparator.queueSoundEffect(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]); + return 1; + } else if (var0 == ScriptOpcodes.SOUND_SONG) { + SoundCache.playSong(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + return 1; + } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { + Interpreter.Interpreter_intStackSize -= 2; + MouseRecorder.playSoundJingle(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); + return 1; } else { - Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); + return 2; + } + } + + @ObfuscatedName("jw") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1558558130" + ) + static void method207() { + for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { + int var1 = var0.group; + if (Projectile.loadInterface(var1)) { + boolean var2 = true; + Widget[] var3 = Widget.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 = WorldMapElement.getWidget(var4); + if (var5 != null) { + FriendSystem.invalidateWidget(var5); + } + } + } } } diff --git a/runescape-client/src/main/java/WorldMapIcon_1.java b/runescape-client/src/main/java/WorldMapIcon_1.java index 07673aa31a..deedbef9cd 100644 --- a/runescape-client/src/main/java/WorldMapIcon_1.java +++ b/runescape-client/src/main/java/WorldMapIcon_1.java @@ -1,72 +1,69 @@ -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; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("d") +@ObfuscatedName("v") @Implements("WorldMapIcon_1") public class WorldMapIcon_1 extends AbstractWorldMapIcon { - @ObfuscatedName("nc") + @ObfuscatedName("nj") @ObfuscatedSignature( - signature = "[Lhj;" + signature = "[Lhp;" ) - static Widget[] field188; - @ObfuscatedName("ew") - @Export("secureRandom") - static SecureRandom secureRandom; - @ObfuscatedName("fp") + static Widget[] field174; + @ObfuscatedName("ef") @ObfuscatedSignature( - signature = "Lke;" + signature = "Lid;" ) - @Export("fontBold12") - static Font fontBold12; - @ObfuscatedName("ld") - @ObfuscatedGetter( - intValue = 1201486385 + @Export("archive17") + static Archive archive17; + @ObfuscatedName("jl") + @ObfuscatedSignature( + signature = "Lbd;" ) - @Export("selectedItemSlot") - static int selectedItemSlot; - @ObfuscatedName("q") + @Export("localPlayer") + static Player localPlayer; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -2025919285 + intValue = -1136778235 ) @Export("objectDefId") final int objectDefId; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Law;" + signature = "Laf;" ) @Export("region") final WorldMapRegion region; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1988411639 + intValue = 1028371623 ) @Export("element") int element; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Las;" + signature = "Lai;" ) @Export("label") WorldMapLabel label; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -727022115 + intValue = -1027796521 ) @Export("subWidth") int subWidth; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -119069051 + intValue = 1822952027 ) @Export("subHeight") int subHeight; @ObfuscatedSignature( - signature = "(Lhv;Lhv;ILaw;)V" + signature = "(Lhd;Lhd;ILaf;)V" ) WorldMapIcon_1(Coord var1, Coord var2, int var3, WorldMapRegion var4) { super(var1, var2); @@ -75,56 +72,56 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { this.init(); } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-229566020" + signature = "(B)I", + garbageValue = "78" ) @Export("getElement") public int getElement() { return this.element; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)Las;", - garbageValue = "1426074195" + signature = "(B)Lai;", + garbageValue = "1" ) @Export("getLabel") WorldMapLabel getLabel() { return this.label; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "14" + signature = "(I)I", + garbageValue = "1930584854" ) @Export("getSubWidth") int getSubWidth() { return this.subWidth; } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "1" + garbageValue = "-56" ) @Export("getSubHeight") int getSubHeight() { return this.subHeight; } - @ObfuscatedName("a") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "1" + signature = "(I)V", + garbageValue = "-1614216514" ) @Export("init") void init() { - this.element = ViewportMouse.getObjectDefinition(this.objectDefId).transform().mapIconId; - this.label = this.region.createMapLabel(class222.WorldMapElement_get(this.element)); - WorldMapElement var1 = class222.WorldMapElement_get(this.getElement()); + this.element = class215.getObjectDefinition(this.objectDefId).transform().mapIconId; + this.label = this.region.createMapLabel(WorldMapData_0.WorldMapElement_get(this.element)); + WorldMapElement var1 = WorldMapData_0.WorldMapElement_get(this.getElement()); Sprite var2 = var1.getSpriteBool(false); if (var2 != null) { this.subWidth = var2.subWidth; @@ -136,121 +133,474 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { } - @ObfuscatedName("p") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "1515733926" + signature = "(III)I", + garbageValue = "-1744841172" ) - public static boolean method295(int var0) { - return (var0 >> 20 & 1) != 0; - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(II)Lbj;", - garbageValue = "377219115" - ) - @Export("Messages_getMessage") - static Message Messages_getMessage(int var0) { - return (Message)Messages.Messages_hashTable.get((long)var0); - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "536238322" - ) - @Export("HealthBarDefinition_clearCached") - public static void HealthBarDefinition_clearCached() { - HealthBarDefinition.HealthBarDefinition_cached.clear(); - HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); - } - - @ObfuscatedName("ey") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "-42" - ) - @Export("getLoginError") - static void getLoginError(int var0) { - if (var0 == -3) { - class268.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); - } else if (var0 == -2) { - class268.setLoginResponseString("", "Error connecting to server.", ""); - } else if (var0 == -1) { - class268.setLoginResponseString("No response from server.", "Please try using a different world.", ""); - } else if (var0 == 3) { - Login.loginIndex = 3; - Login.field1212 = 1; - } else if (var0 == 4) { - MouseRecorder.method1137(0); - } else if (var0 == 5) { - Login.field1212 = 2; - class268.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) { - class268.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); - } else if (var0 == 7) { - class268.setLoginResponseString("This world is full.", "Please use a different world.", ""); - } else if (var0 == 8) { - class268.setLoginResponseString("Unable to connect.", "Login server offline.", ""); - } else if (var0 == 9) { - class268.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); - } else if (var0 == 10) { - class268.setLoginResponseString("Unable to connect.", "Bad session id.", ""); - } else if (var0 == 11) { - class268.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); - } else if (var0 == 12) { - class268.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); - } else if (var0 == 13) { - class268.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); - } else if (var0 == 14) { - class268.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 16) { - class268.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); - } else if (var0 == 17) { - class268.setLoginResponseString("You are standing in a members-only area.", "To play on this world move to a free area first", ""); - } else if (var0 == 18) { - MouseRecorder.method1137(1); - } else if (var0 == 19) { - class268.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); - } else if (var0 == 20) { - class268.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); - } else if (var0 == 22) { - class268.setLoginResponseString("Malformed login packet.", "Please try again.", ""); - } else if (var0 == 23) { - class268.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 24) { - class268.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); - } else if (var0 == 25) { - class268.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); - } else if (var0 == 26) { - class268.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); - } else if (var0 == 27) { - class268.setLoginResponseString("", "Service unavailable.", ""); - } else if (var0 == 31) { - class268.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) { - class268.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) { - class268.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); - } else if (var0 == 38) { - class268.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) { - class268.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); - class96.updateGameState(11); - return; - } else if (var0 == 57) { - class268.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); - class96.updateGameState(11); - return; - } else if (var0 == 61) { - Login.loginIndex = 7; - } else { - class268.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); + public static int method301(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("j") + @ObfuscatedSignature( + signature = "(Lby;IB)V", + garbageValue = "-74" + ) + @Export("runScript") + static void runScript(ScriptEvent var0, int var1) { + Object[] var2 = var0.args; + Script var3; + int var17; + if (DirectByteArrayCopier.isWorldMapEvent(var0.type)) { + class162.worldMapEvent = (WorldMapEvent)var2[0]; + WorldMapElement var4 = WorldMapData_0.WorldMapElement_get(class162.worldMapEvent.mapElement); + var3 = class30.getWorldMapScript(var0.type, var4.objectId, var4.category); + } else { + var17 = (Integer)var2[0]; + var3 = ArchiveLoader.getScript(var17); + } + + if (var3 != null) { + Interpreter.Interpreter_intStackSize = 0; + Interpreter.Interpreter_stringStackSize = 0; + var17 = -1; + int[] var5 = var3.opcodes; + int[] var6 = var3.intOperands; + byte var7 = -1; + Interpreter.Interpreter_frameDepth = 0; + Interpreter.field1074 = false; + + try { + int var10; + try { + UserComparator1.Interpreter_intLocals = new int[var3.localIntCount]; + int var8 = 0; + UserComparator1.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; + } + + UserComparator1.Interpreter_intLocals[var8++] = var11; + } else if (var2[var10] instanceof String) { + var18 = (String)var2[var10]; + if (var18.equals("event_opbase")) { + var18 = var0.targetName; + } + + UserComparator1.Interpreter_stringLocals[var9++] = var18; + } + } + + var10 = 0; + Interpreter.field1064 = var0.field555; + + 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 = TileItemPile.method2701(var29, var3, var32); + switch(var20) { + case 0: + return; + case 1: + default: + break; + case 2: + throw new IllegalStateException(); + } + } else if (var29 == 0) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6[var17]; + } else if (var29 == ScriptOpcodes.GET_VARP) { + var11 = var6[var17]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Varps.Varps_main[var11]; + } else if (var29 == ScriptOpcodes.SET_VARP) { + var11 = var6[var17]; + Varps.Varps_main[var11] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + ObjectSound.method1837(var11); + } else if (var29 == ScriptOpcodes.SCONST) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.stringOperands[var17]; + } else if (var29 == ScriptOpcodes.JUMP) { + var17 += var6[var17]; + } else if (var29 == ScriptOpcodes.IF_ICMPNE) { + Interpreter.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.IF_ICMPEQ) { + Interpreter.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.IF_ICMPLT) { + Interpreter.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.IF_ICMPGT) { + Interpreter.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[Interpreter.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; + UserComparator1.Interpreter_intLocals = var34.intLocals; + UserComparator1.Interpreter_stringLocals = var34.stringLocals; + } else if (var29 == ScriptOpcodes.GET_VARBIT) { + var11 = var6[var17]; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class208.getVarbit(var11); + } else if (var29 == ScriptOpcodes.SET_VARBIT) { + var11 = var6[var17]; + MouseHandler.method1040(var11, Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + } else if (var29 == ScriptOpcodes.IF_ICMPLE) { + Interpreter.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.IF_ICMPGE) { + Interpreter.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.ILOAD) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = UserComparator1.Interpreter_intLocals[var6[var17]]; + } else if (var29 == ScriptOpcodes.ISTORE) { + UserComparator1.Interpreter_intLocals[var6[var17]] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + } else if (var29 == ScriptOpcodes.SLOAD) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = UserComparator1.Interpreter_stringLocals[var6[var17]]; + } else if (var29 == ScriptOpcodes.SSTORE) { + UserComparator1.Interpreter_stringLocals[var6[var17]] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + } else if (var29 == ScriptOpcodes.JOIN_STRING) { + var11 = var6[var17]; + Interpreter.Interpreter_stringStackSize -= var11; + String var31 = GrandExchangeOfferWorldComparator.method74(Interpreter.Interpreter_stringStack, Interpreter.Interpreter_stringStackSize, var11); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var31; + } else if (var29 == ScriptOpcodes.POP_INT) { + --Interpreter.Interpreter_intStackSize; + } else if (var29 == ScriptOpcodes.POP_STRING) { + --Interpreter.Interpreter_stringStackSize; + } else { + int var15; + if (var29 != ScriptOpcodes.INVOKE) { + if (var29 == ScriptOpcodes.GET_VARC_INT) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = KeyHandler.varcs.getInt(var6[var17]); + } else if (var29 == ScriptOpcodes.SET_VARC_INT) { + KeyHandler.varcs.setInt(var6[var17], Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + } else if (var29 == ScriptOpcodes.DEFINE_ARRAY) { + var11 = var6[var17] >> 16; + var20 = var6[var17] & 65535; + int var21 = Interpreter.Interpreter_intStack[--Interpreter.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[--Interpreter.Interpreter_intStackSize]; + if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { + throw new RuntimeException(); + } + + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var11][var20]; + } else if (var29 == ScriptOpcodes.SET_ARRAY_INT) { + var11 = var6[var17]; + Interpreter.Interpreter_intStackSize -= 2; + var20 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { + throw new RuntimeException(); + } + + Interpreter.Interpreter_arrays[var11][var20] = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + } else if (var29 == ScriptOpcodes.GET_VARC_STRING_OLD) { + var18 = KeyHandler.varcs.getStringOld(var6[var17]); + if (var18 == null) { + var18 = "null"; + } + + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var18; + } else if (var29 == ScriptOpcodes.SET_VARC_STRING_OLD) { + KeyHandler.varcs.setStringOld(var6[var17], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); + } else if (var29 == ScriptOpcodes.GET_VARC_STRING) { + var18 = KeyHandler.varcs.getString(var6[var17]); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var18; + } else if (var29 == ScriptOpcodes.SET_VARC_STRING) { + KeyHandler.varcs.setString(var6[var17], Interpreter.Interpreter_stringStack[--Interpreter.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[--Interpreter.Interpreter_intStackSize]); + if (var30 != null) { + var17 += var30.integer; + } + } + } else { + var11 = var6[var17]; + Script var12 = ArchiveLoader.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 + (Interpreter.Interpreter_intStackSize - var12.intArgumentCount)]; + } + + for (var15 = 0; var15 < var12.stringArgumentCount; ++var15) { + var14[var15] = Interpreter.Interpreter_stringStack[var15 + (Interpreter.Interpreter_stringStackSize - var12.stringArgumentCount)]; + } + + Interpreter.Interpreter_intStackSize -= var12.intArgumentCount; + Interpreter.Interpreter_stringStackSize -= var12.stringArgumentCount; + ScriptFrame var19 = new ScriptFrame(); + var19.script = var3; + var19.pc = var17; + var19.intLocals = UserComparator1.Interpreter_intLocals; + var19.stringLocals = UserComparator1.Interpreter_stringLocals; + Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var19; + var3 = var12; + var5 = var12.opcodes; + var6 = var12.intOperands; + var17 = -1; + UserComparator1.Interpreter_intLocals = var13; + UserComparator1.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); + class3.RunException_sendStackTrace(var24.toString(), var27); + } + } finally { + if (Interpreter.field1074) { + Interpreter.field1072 = true; + ParamDefinition.method4424(); + Interpreter.field1072 = false; + Interpreter.field1074 = false; + } + + } + } + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "(Lky;IB)V", + garbageValue = "-54" + ) + public static void method295(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) { + } + } + + } + + @ObfuscatedName("fp") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "-60" + ) + static final void method294() { + int var0 = GraphicsObject.field1079 * 128 + 64; + int var1 = class3.field24 * 128 + 64; + int var2 = GrandExchangeOfferTotalQuantityComparator.getTileHeight(var0, var1, ItemContainer.plane) - WorldMapSection0.field129; + if (WallDecoration.cameraX < var0) { + WallDecoration.cameraX = (var0 - WallDecoration.cameraX) * WorldMapSection2.field191 / 1000 + WallDecoration.cameraX + WorldMapSectionType.field142; + if (WallDecoration.cameraX > var0) { + WallDecoration.cameraX = var0; + } + } + + if (WallDecoration.cameraX > var0) { + WallDecoration.cameraX -= WorldMapSection2.field191 * (WallDecoration.cameraX - var0) / 1000 + WorldMapSectionType.field142; + if (WallDecoration.cameraX < var0) { + WallDecoration.cameraX = var0; + } + } + + if (Coord.cameraY < var2) { + Coord.cameraY = (var2 - Coord.cameraY) * WorldMapSection2.field191 / 1000 + Coord.cameraY + WorldMapSectionType.field142; + if (Coord.cameraY > var2) { + Coord.cameraY = var2; + } + } + + if (Coord.cameraY > var2) { + Coord.cameraY -= WorldMapSection2.field191 * (Coord.cameraY - var2) / 1000 + WorldMapSectionType.field142; + if (Coord.cameraY < var2) { + Coord.cameraY = var2; + } + } + + if (UserComparator7.cameraZ < var1) { + UserComparator7.cameraZ = (var1 - UserComparator7.cameraZ) * WorldMapSection2.field191 / 1000 + UserComparator7.cameraZ + WorldMapSectionType.field142; + if (UserComparator7.cameraZ > var1) { + UserComparator7.cameraZ = var1; + } + } + + if (UserComparator7.cameraZ > var1) { + UserComparator7.cameraZ -= WorldMapSection2.field191 * (UserComparator7.cameraZ - var1) / 1000 + WorldMapSectionType.field142; + if (UserComparator7.cameraZ < var1) { + UserComparator7.cameraZ = var1; + } + } + + var0 = WorldMapSection2.field190 * 16384 + 64; + var1 = UrlRequest.field1932 * 128 + 64; + var2 = GrandExchangeOfferTotalQuantityComparator.getTileHeight(var0, var1, ItemContainer.plane) - GameShell.field446; + int var3 = var0 - WallDecoration.cameraX; + int var4 = var2 - Coord.cameraY; + int var5 = var1 - UserComparator7.cameraZ; + int var6 = (int)Math.sqrt((double)(var3 * var3 + var5 * var5)); + 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 (class43.cameraPitch < var7) { + class43.cameraPitch = (var7 - class43.cameraPitch) * Player.field605 / 1000 + class43.cameraPitch + GrandExchangeOfferWorldComparator.field34; + if (class43.cameraPitch > var7) { + class43.cameraPitch = var7; + } + } + + if (class43.cameraPitch > var7) { + class43.cameraPitch -= Player.field605 * (class43.cameraPitch - var7) / 1000 + GrandExchangeOfferWorldComparator.field34; + if (class43.cameraPitch < var7) { + class43.cameraPitch = var7; + } + } + + int var9 = var8 - class40.cameraYaw; + if (var9 > 1024) { + var9 -= 2048; + } + + if (var9 < -1024) { + var9 += 2048; + } + + if (var9 > 0) { + class40.cameraYaw = var9 * Player.field605 / 1000 + class40.cameraYaw + GrandExchangeOfferWorldComparator.field34; + class40.cameraYaw &= 2047; + } + + if (var9 < 0) { + class40.cameraYaw -= GrandExchangeOfferWorldComparator.field34 + -var9 * Player.field605 / 1000; + class40.cameraYaw &= 2047; + } + + int var10 = var8 - class40.cameraYaw; + if (var10 > 1024) { + var10 -= 2048; + } + + if (var10 < -1024) { + var10 += 2048; + } + + if (var10 < 0 && var9 > 0 || var10 > 0 && var9 < 0) { + class40.cameraYaw = var8; } - class96.updateGameState(10); } } diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java index 6e4f98f4f6..253bcf6f4f 100644 --- a/runescape-client/src/main/java/WorldMapLabel.java +++ b/runescape-client/src/main/java/WorldMapLabel.java @@ -4,33 +4,39 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("as") +@ObfuscatedName("ai") @Implements("WorldMapLabel") public class WorldMapLabel { - @ObfuscatedName("q") + @ObfuscatedName("gl") + @ObfuscatedSignature( + signature = "[Lls;" + ) + @Export("mapDotSprites") + static Sprite[] mapDotSprites; + @ObfuscatedName("s") @Export("text") String text; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 839300469 + intValue = -100160843 ) @Export("width") int width; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 128259131 + intValue = 1360429455 ) @Export("height") int height; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "La;" + signature = "Le;" ) @Export("size") WorldMapLabelSize size; @ObfuscatedSignature( - signature = "(Ljava/lang/String;IILa;)V" + signature = "(Ljava/lang/String;IILe;)V" ) WorldMapLabel(String var1, int var2, int var3, WorldMapLabelSize var4) { this.text = var1; @@ -38,100 +44,4 @@ public class WorldMapLabel { this.height = var3; this.size = var4; } - - @ObfuscatedName("p") - @Export("Entity_unpackType") - static int Entity_unpackType(long var0) { - return (int)(var0 >>> 14 & 3L); - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(Lkf;IIIIIII)V", - garbageValue = "-1566017890" - ) - @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) { - while (true) { - var7 = var0.readUnsignedByte(); - if (var7 == 0) { - break; - } - if (var7 == 1) { - var0.readUnsignedByte(); - break; - } - if (var7 < 49) { - var0.readUnsignedByte(); - } - } - return; - } - Tiles.Tiles_renderFlags[var1][var2][var3] = 0; - - while ((var7 = var0.readUnsignedByte()) != 0) { - if (var7 == 1) { - int var8 = var0.readUnsignedByte(); - if (var8 == 1) { - var8 = 0; - } - - if (var1 == 0) { - Tiles.Tiles_heights[0][var2][var3] = -var8 * 8; - } - else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8; - } - break; - } - else if (var7 <= 49) { - Tiles.field505[var1][var2][var3] = var0.readByte(); - Tiles.field506[var1][var2][var3] = (byte) ((var7 - 2) / 4); - class268.field3561[var1][var2][var3] = (byte) (var7 - 2 + var6 & 3); - } - else if (var7 <= 81) { - Tiles.Tiles_renderFlags[var1][var2][var3] = (byte) (var7 - 49); - } - else { - Tiles.field504[var1][var2][var3] = (byte) (var7 - 81); - } - } - if (var1 == 0) { - Tiles.Tiles_heights[0][var2][var3] = -class1.method14(var4 + 0xe3b7b + var2, var3 + 0x87cce + var5) * 8; - } - else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; - } - return; - } - - @ObfuscatedName("hc") - @ObfuscatedSignature( - signature = "(IB)Ljava/lang/String;", - garbageValue = "108" - ) - @Export("getMenuText") - static String getMenuText(int var0) { - if (var0 < 0) { - return ""; - } - return Client.menuTargets[var0].length() > 0 ? Client.menuActions[var0] + " " + Client.menuTargets[var0] : Client.menuActions[var0]; - } - - @ObfuscatedName("kz") - @ObfuscatedSignature( - signature = "(IIIZI)V", - garbageValue = "-1379117889" - ) - @Export("changePlane") - public static void changePlane(int var0, int var1, int var2, boolean var3) { - PacketBufferNode var4 = Archive.getPacketBufferNode(ClientPacket.field2296, Client.packetWriter.isaacCipher); - var4.packetBuffer.writeIntME(var3 ? Client.field855 : 0); - var4.packetBuffer.writeShortLE(var1); - var4.packetBuffer.method5521(var2); - var4.packetBuffer.writeShort(var0); - Client.packetWriter.addNode(var4); - } } diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java index d2e2fffcf3..1d40a25e5a 100644 --- a/runescape-client/src/main/java/WorldMapLabelSize.java +++ b/runescape-client/src/main/java/WorldMapLabelSize.java @@ -4,145 +4,191 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("a") +@ObfuscatedName("e") @Implements("WorldMapLabelSize") public class WorldMapLabelSize { - @ObfuscatedName("sy") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lbk;" - ) - @Export("clientPreferences") - static ClientPreferences clientPreferences; - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "La;" + signature = "Le;" ) @Export("WorldMapLabelSize_small") public static final WorldMapLabelSize WorldMapLabelSize_small; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "La;" + signature = "Le;" ) @Export("WorldMapLabelSize_medium") public static final WorldMapLabelSize WorldMapLabelSize_medium; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "La;" + signature = "Le;" ) @Export("WorldMapLabelSize_large") public static final WorldMapLabelSize WorldMapLabelSize_large; - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Ldf;" - ) - @Export("soundCache") - public static SoundCache soundCache; - @ObfuscatedName("dk") - @ObfuscatedSignature( - signature = "Liu;" - ) - @Export("archive10") - static Archive archive10; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -1999419383 - ) - final int field112; @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1876270567 + intValue = 658824929 ) - final int field114; - @ObfuscatedName("l") + final int field108; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 798925557 + intValue = -84893291 ) - final int field115; + final int field105; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 1954115307 + ) + final int field110; static { - WorldMapLabelSize_small = new WorldMapLabelSize(0, 0, 4); - WorldMapLabelSize_medium = new WorldMapLabelSize(2, 1, 2); - WorldMapLabelSize_large = new WorldMapLabelSize(1, 2, 0); + WorldMapLabelSize_small = new WorldMapLabelSize(1, 0, 4); + WorldMapLabelSize_medium = new WorldMapLabelSize(0, 1, 2); + WorldMapLabelSize_large = new WorldMapLabelSize(2, 2, 0); } WorldMapLabelSize(int var1, int var2, int var3) { - this.field112 = var1; - this.field114 = var2; - this.field115 = var3; + this.field108 = var1; + this.field105 = var2; + this.field110 = var3; } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(FI)Z", - garbageValue = "-927816948" + garbageValue = "-1981348285" ) - boolean method184(float var1) { - return var1 >= (float)this.field115; + boolean method185(float var1) { + return var1 >= (float)this.field110; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(B)[La;", - garbageValue = "31" + signature = "(I)[Le;", + garbageValue = "-1460468047" ) - static WorldMapLabelSize[] method178() { - return new WorldMapLabelSize[]{WorldMapLabelSize_small, WorldMapLabelSize_medium, WorldMapLabelSize_large}; + static WorldMapLabelSize[] method190() { + return new WorldMapLabelSize[]{WorldMapLabelSize_small, WorldMapLabelSize_large, WorldMapLabelSize_medium}; } - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(II)La;", - garbageValue = "1320537825" - ) - static WorldMapLabelSize method177(int var0) { - WorldMapLabelSize[] var1 = method178(); + @ObfuscatedName("n") + static boolean method186(long var0) { + return (int)(var0 >>> 16 & 1L) == 1; + } - for (int var2 = 0; var2 < var1.length; ++var2) { - WorldMapLabelSize var3 = var1[var2]; - if (var0 == var3.field114) { - return var3; + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "(Lkx;II)Z", + garbageValue = "751514225" + ) + @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); } - } - return null; - } + var3 = var0.readBits(13); + var4 = var0.readBits(13); + boolean var12 = var0.readBits(1) == 1; + if (var12) { + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; + } - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(IZIZI)V", - garbageValue = "-176379221" - ) - @Export("sortWorldList") - static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { - if (World.World_worlds != null) { - GrandExchangeOffer.doWorldSorting(0, World.World_worlds.length - 1, var0, var1, var2, var3); - } + if (Client.players[var1] != null) { + throw new RuntimeException(); + } else { + Player var6 = Client.players[var1] = new Player(); + var6.index = var1; + if (Players.field1219[var1] != null) { + var6.read(Players.field1219[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.field1230[var1]; + var6.plane = (byte)var8; + var6.resetPath((var9 << 13) + var3 - PacketWriter.baseX * 64, (var10 << 13) + var4 - RouteStrategy.baseY * 64); + var6.field614 = 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; + } - @ObfuscatedName("fe") - @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "131988648" - ) - @Export("playSoundJingle") - static void playSoundJingle(int var0, int var1) { - if (Client.field911 != 0 && var0 != -1) { - FileSystem.method3503(class32.archive11, var0, 0, Client.field911, false); - Client.field699 = true; - } + if (var5 == 1) { + --var9; + } - } + if (var5 == 2) { + ++var8; + --var9; + } - @ObfuscatedName("is") - @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "-1199742641" - ) - @Export("runIntfCloseListeners") - static final void runIntfCloseListeners(int var0, int var1) { - if (class162.loadInterface(var0)) { - WorldMapID.runComponentCloseListeners(Widget.Widget_interfaceComponents[var0], var1); + 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); + return false; + } } } } diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java index 42d7273d01..9cfacbc381 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -12,103 +12,94 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ao") @Implements("WorldMapManager") public final class WorldMapManager { - @ObfuscatedName("oe") - @ObfuscatedSignature( - signature = "Lfj;" - ) - @Export("mouseWheel") - static MouseWheel mouseWheel; - @ObfuscatedName("bp") - @Export("otp") - static String otp; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("loaded") boolean loaded; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("loadStarted") boolean loadStarted; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lat;" + signature = "Lar;" ) @Export("mapAreaData") WorldMapAreaData mapAreaData; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lly;" + signature = "Lls;" ) @Export("compositeTextureSprite") Sprite compositeTextureSprite; - @ObfuscatedName("k") + @ObfuscatedName("u") @Export("icons") HashMap icons; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "[[Law;" + signature = "[[Laf;" ) @Export("regions") WorldMapRegion[][] regions; - @ObfuscatedName("b") - HashMap field317; - @ObfuscatedName("i") + @ObfuscatedName("t") + HashMap field302; + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "[Llx;" + signature = "[Llq;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("geographyArchive") final AbstractArchive geographyArchive; - @ObfuscatedName("f") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("groundArchive") final AbstractArchive groundArchive; - @ObfuscatedName("m") + @ObfuscatedName("f") @Export("fonts") final HashMap fonts; - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1940287293 + intValue = 1743305305 ) @Export("tileX") int tileX; - @ObfuscatedName("x") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 947949829 + intValue = -1546792937 ) @Export("tileY") int tileY; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 595788608 + intValue = -1288809152 ) @Export("tileWidth") int tileWidth; - @ObfuscatedName("v") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 2144676672 + intValue = -1862567616 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1989621743 + intValue = 1246718237 ) @Export("pixelsPerTile") public int pixelsPerTile; @ObfuscatedSignature( - signature = "([Llx;Ljava/util/HashMap;Lhp;Lhp;)V" + signature = "([Llq;Ljava/util/HashMap;Lhz;Lhz;)V" ) public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) { this.loaded = false; this.loadStarted = false; - this.field317 = new HashMap(); + this.field302 = new HashMap(); this.pixelsPerTile = 0; this.mapSceneSprites = var1; this.fonts = var2; @@ -116,10 +107,10 @@ public final class WorldMapManager { this.groundArchive = var4; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lhp;Ljava/lang/String;ZB)V", - garbageValue = "1" + signature = "(Lhz;Ljava/lang/String;ZI)V", + garbageValue = "763570790" ) @Export("load") public void load(AbstractArchive var1, String var2, boolean var3) { @@ -127,10 +118,10 @@ public final class WorldMapManager { this.loaded = false; this.loadStarted = true; System.nanoTime(); - int var4 = var1.getGroupId(WorldMapCacheName.DETAILS.name); + int var4 = var1.getGroupId(WorldMapCacheName.field295.name); int var5 = var1.getFileId(var4, var2); - Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.DETAILS.name, var2)); - Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.COMPOSITEMAP.name, var2)); + Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field295.name, var2)); + Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field290.name, var2)); System.nanoTime(); System.nanoTime(); this.mapAreaData = new WorldMapAreaData(); @@ -152,7 +143,7 @@ public final class WorldMapManager { int var9 = this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1; System.nanoTime(); System.nanoTime(); - SecureRandomFuture.WorldMapRegion_clearCachedSprites(); + class247.WorldMapRegion_clearCachedSprites(); this.regions = new WorldMapRegion[var16][var9]; Iterator var10 = this.mapAreaData.worldMapData0Set.iterator(); @@ -177,9 +168,9 @@ public final class WorldMapManager { System.nanoTime(); System.nanoTime(); - if (var1.isValidFileName(WorldMapCacheName.COMPOSITETEXTURE.name, var2)) { - byte[] var20 = var1.takeFileByNames(WorldMapCacheName.COMPOSITETEXTURE.name, var2); - this.compositeTextureSprite = BuddyRankComparator.convertJpgToSprite(var20); + if (var1.isValidFileName(WorldMapCacheName.field291.name, var2)) { + byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field291.name, var2); + this.compositeTextureSprite = WorldMapIcon_0.convertJpgToSprite(var20); } System.nanoTime(); @@ -189,20 +180,20 @@ public final class WorldMapManager { } } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-715602432" + garbageValue = "-1852285013" ) @Export("clearIcons") public final void clearIcons() { this.icons = null; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IIIIIIIIB)V", - garbageValue = "36" + signature = "(IIIIIIIII)V", + garbageValue = "-77241448" ) @Export("drawTiles") public final void drawTiles(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { @@ -215,10 +206,10 @@ public final class WorldMapManager { float var14 = this.getPixelsPerTile(var7 - var5, var3 - var1); int var15 = (int)Math.ceil((double)var14); this.pixelsPerTile = var15; - if (!this.field317.containsKey(var15)) { + if (!this.field302.containsKey(var15)) { class40 var16 = new class40(var15); var16.init(); - this.field317.put(var15, var16); + this.field302.put(var15, var16); } int var23 = var13.width + var13.x - 1; @@ -228,7 +219,7 @@ public final class WorldMapManager { int var19; for (var18 = var13.x; var18 <= var23; ++var18) { for (var19 = var13.y; var19 <= var17; ++var19) { - this.regions[var18][var19].drawTile(var15, (class40)this.field317.get(var15), this.mapSceneSprites, this.geographyArchive, this.groundArchive); + this.regions[var18][var19].drawTile(var15, (class40)this.field302.get(var15), this.mapSceneSprites, this.geographyArchive, this.groundArchive); } } @@ -239,52 +230,52 @@ public final class WorldMapManager { int var20 = this.tileY * 4096 + var2; for (int var21 = var13.x; var21 < var13.x + var13.width; ++var21) { - for (int var22 = var13.y; var22 < var13.y + var13.height; ++var22) { - this.regions[var21][var22].method506(var5 + var18 * (this.regions[var21][var22].regionX * 64 - var19) / 64, var8 - var18 * (this.regions[var21][var22].regionY * 64 - var20 + 64) / 64, var18); - } - } - - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZI)V", - garbageValue = "-855095363" - ) - @Export("drawElements") - public final void drawElements(int minTileX, int minTileY, int maxTileX, int maxTileY, int x, int y, int endX, int endY, HashSet var9, HashSet flashingElements, int flashCycle, int cyclesPerFlash, boolean var13) { - WorldMapRectangle var14 = this.createWorldMapRectangle(minTileX, minTileY, maxTileX, maxTileY); - float var15 = this.getPixelsPerTile(endX - x, maxTileX - minTileX); - int var16 = (int)(var15 * 64.0F); - int var17 = this.tileX * 4096 + minTileX; - int var18 = this.tileY * 4096 + minTileY; - - int var19; - int var20; - for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { - for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { - if (var13) { - this.regions[var19][var20].initWorldMapIcon1s(); - } - - this.regions[var19][var20].method432(x + var16 * (this.regions[var19][var20].regionX * 64 - var17) / 64, endY - var16 * (this.regions[var19][var20].regionY * 64 - var18 + 64) / 64, var16, var9); - } - } - - if (flashingElements != null && flashCycle > 0) { - for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { - for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { - this.regions[var19][var20].flashElements(flashingElements, flashCycle, cyclesPerFlash); - } + for (int var22 = var13.y; var22 < var13.height + var13.y; ++var22) { + this.regions[var21][var22].method476(var5 + var18 * (this.regions[var21][var22].regionX * 64 - var19) / 64, var8 - var18 * (this.regions[var21][var22].regionY * 64 - var20 + 64) / 64, var18); } } } @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZB)V", + garbageValue = "-63" + ) + @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 * 4096 + var1; + int var18 = this.tileY * 4096 + var2; + + int var19; + int var20; + for (var19 = var14.x; var19 < var14.x + var14.width; ++var19) { + for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { + if (var13) { + this.regions[var19][var20].initWorldMapIcon1s(); + } + + this.regions[var19][var20].method408(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.x + var14.width; ++var19) { + for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { + this.regions[var19][var20].flashElements(var10, var11, var12); + } + } + } + + } + + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(IIIILjava/util/HashSet;III)V", - garbageValue = "-1827079020" + garbageValue = "-394950327" ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4, HashSet var5, int var6, int var7) { @@ -314,45 +305,46 @@ public final class WorldMapManager { AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var11.next(); int var13 = var3 * (var12.coord2.x - this.tileX * 4096) / (this.tileWidth * 64); int var14 = var4 - (var12.coord2.y - this.tileY * 4096) * var4 / (this.tileHeight * 64); - Rasterizer2D.Rasterizer2D_drawCircleAlpha(var13 + var1, var14 + var2, 2, 0xffff00, 256); + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var13 + var1, var14 + var2, 2, 16776960, 256); } } } } } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(IIIIIIIIIII)Ljava/util/List;", - garbageValue = "286331893" + garbageValue = "458020889" ) - public List method607(int minTileX, int minTileY, int maxTileX, int maxTileY, int xOffset, int yOffset, int width, int height, int mouseX, int mouseY) { + public List method629(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; - } - WorldMapRectangle var12 = this.createWorldMapRectangle(minTileX, minTileY, maxTileX, maxTileY); - float var13 = this.getPixelsPerTile(width, maxTileX - minTileX); - int var14 = (int)(64.0F * var13); - int var15 = this.tileX * 4096 + minTileX; - int var16 = this.tileY * 4096 + minTileY; + } 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 * 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.y + var12.height; ++var18) { - List var19 = this.regions[var17][var18].method440(xOffset + var14 * (this.regions[var17][var18].regionX * 64 - var15) / 64, height + yOffset - var14 * (this.regions[var17][var18].regionY * 64 - var16 + 64) / 64, var14, mouseX, mouseY); - if (!var19.isEmpty()) { - var11.addAll(var19); + for (int var17 = var12.x; var17 < var12.x + var12.width; ++var17) { + for (int var18 = var12.y; var18 < var12.y + var12.height; ++var18) { + List var19 = this.regions[var17][var18].method439(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); + } } } - } - return var11; + return var11; + } } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IIIII)Ln;", - garbageValue = "-849608506" + signature = "(IIIII)Lh;", + garbageValue = "11285133" ) @Export("createWorldMapRectangle") WorldMapRectangle createWorldMapRectangle(int var1, int var2, int var3, int var4) { @@ -392,20 +384,20 @@ public final class WorldMapManager { return var5; } - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "1588270336" + garbageValue = "-238758713" ) @Export("isLoaded") public boolean isLoaded() { return this.loaded; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)Ljava/util/HashMap;", - garbageValue = "1662606206" + garbageValue = "2030529445" ) @Export("buildIcons") public HashMap buildIcons() { @@ -413,10 +405,10 @@ public final class WorldMapManager { return this.icons; } - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1110146603" + garbageValue = "65536" ) @Export("buildIcons0") void buildIcons0() { @@ -450,144 +442,59 @@ public final class WorldMapManager { } - @ObfuscatedName("x") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "(III)F", - garbageValue = "-131172900" + garbageValue = "610428928" ) @Export("getPixelsPerTile") float getPixelsPerTile(int var1, int var2) { float var3 = (float)var1 / (float)var2; if (var3 > 8.0F) { return 8.0F; - } - if (var3 < 1.0F) { + } else if (var3 < 1.0F) { return 1.0F; - } - int var4 = Math.round(var3); - return Math.abs((float)var4 - var3) < 0.05F ? (float)var4 : var3; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(IIII)I", - garbageValue = "1091225216" - ) - public static int method625(int var0, int var1, int var2) { - var2 &= 3; - if (var2 == 0) { - return var1; - } - if (var2 == 1) { - return 7 - var0; - } - return var2 == 2 ? 7 - var1 : var0; - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "-1454512266" - ) - @Export("FriendSystem_alreadyFriendMes") - static final void FriendSystem_alreadyFriendMes(String var0) { - StringBuilder var10000 = (new StringBuilder()).append(var0); - Object var10001 = null; - String var1 = var10000.append(" is already on your friend list").toString(); - ScriptEvent.addGameMessage(30, "", var1); - } - - @ObfuscatedName("ir") - @ObfuscatedSignature( - signature = "(Lbd;IIIB)V", - garbageValue = "-54" - ) - @Export("addPlayerToMenu") - static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { - if (Client.localPlayer == var0) { - return; - } - if (Client.menuOptionsCount >= 400) { - return; - } - String var4; - int var7; - if (var0.skillLevel != 0) { - var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; } else { - String var5 = var0.actions[0] + var0.username + var0.actions[1]; - var7 = var0.combatLevel; - int var8 = Client.localPlayer.combatLevel; - int var9 = var8 - var7; - String var6; - if (var9 < -9) { - var6 = ClientPreferences.colorStartTag(0xff0000); - } else if (var9 < -6) { - var6 = ClientPreferences.colorStartTag(0xff3000); - } else if (var9 < -3) { - var6 = ClientPreferences.colorStartTag(0xff7000); - } else if (var9 < 0) { - var6 = ClientPreferences.colorStartTag(0xffb000); - } else if (var9 > 9) { - var6 = ClientPreferences.colorStartTag(0xff00); - } else if (var9 > 6) { - var6 = ClientPreferences.colorStartTag(0x40ff00); - } else if (var9 > 3) { - var6 = ClientPreferences.colorStartTag(0x80ff00); - } else if (var9 > 0) { - var6 = ClientPreferences.colorStartTag(0xc0ff00); - } else { - var6 = ClientPreferences.colorStartTag(0xffff00); - } + int var4 = Math.round(var3); + return Math.abs((float)var4 - var3) < 0.05F ? (float)var4 : var3; + } + } - var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; + @ObfuscatedName("hi") + @ObfuscatedSignature( + signature = "(Lbm;I)V", + garbageValue = "-798263374" + ) + static final void method607(PendingSpawn var0) { + long var1 = 0L; + int var3 = -1; + int var4 = 0; + int var5 = 0; + if (var0.type == 0) { + var1 = Player.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); } - int var10; - if (Client.isItemSelected == 1) { - class188.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ClientPreferences.colorStartTag(0xffffff) + var4, 14, var1, var2, var3); - } else if (Client.isSpellSelected) { - if ((WorldMapCacheName.selectedSpellFlags & 8) == 8) { - class188.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ClientPreferences.colorStartTag(0xffffff) + var4, 15, var1, var2, var3); - } - } else { - for (var10 = 7; var10 >= 0; --var10) { - if (Client.playerMenuActions[var10] == null) { - continue; - } - short var11 = 0; - if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { - if (Client.playerAttackOption == AttackOption.AttackOption_hidden) { - continue; - } - - if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || AttackOption.AttackOption_dependsOnCombatLevels == Client.playerAttackOption && var0.combatLevel > Client.localPlayer.combatLevel) { - var11 = 2000; - } - - if (Client.localPlayer.team != 0 && var0.team != 0) { - if (var0.team == Client.localPlayer.team) { - var11 = 2000; - } else { - var11 = 0; - } - } - } else if (Client.playerOptionsPriorities[var10]) { - var11 = 2000; - } - - boolean var12 = false; - var7 = Client.playerMenuOpcodes[var10] + var11; - class188.insertMenuItemNoShift(Client.playerMenuActions[var10], ClientPreferences.colorStartTag(0xffffff) + var4, var7, var1, var2, var3); - } + if (var0.type == 1) { + var1 = Player.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); } - for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { - if (Client.menuOpcodes[var10] == 23) { - Client.menuTargets[var10] = ClientPreferences.colorStartTag(0xffffff) + var4; - break; - } + if (var0.type == 2) { + var1 = Player.scene.getGameObjectTag(var0.plane, var0.x, var0.y); } + if (var0.type == 3) { + var1 = Player.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); + } + + if (var1 != 0L) { + int var6 = Player.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); + var3 = BoundaryObject.Entity_unpackID(var1); + var4 = var6 & 31; + var5 = var6 >> 6 & 3; + } + + var0.objectId = var3; + var0.field903 = var4; + var0.field907 = var5; } } diff --git a/runescape-client/src/main/java/WorldMapRectangle.java b/runescape-client/src/main/java/WorldMapRectangle.java index 3cf5eb9160..eaf5fa93f4 100644 --- a/runescape-client/src/main/java/WorldMapRectangle.java +++ b/runescape-client/src/main/java/WorldMapRectangle.java @@ -4,39 +4,47 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("n") +@ObfuscatedName("h") @Implements("WorldMapRectangle") public final class WorldMapRectangle { - @ObfuscatedName("sd") + @ObfuscatedName("bp") @ObfuscatedSignature( - signature = "Llo;" + signature = "Lhv;" ) - @Export("platformInfo") - static PlatformInfo platformInfo; - @ObfuscatedName("gs") - @Export("regionLandArchiveIds") - static int[] regionLandArchiveIds; - @ObfuscatedName("q") + static StudioGame field166; + @ObfuscatedName("dy") + @ObfuscatedSignature( + signature = "Lid;" + ) + @Export("archive11") + static Archive archive11; + @ObfuscatedName("eq") @ObfuscatedGetter( - intValue = 1996817297 + intValue = 161269475 + ) + @Export("port1") + static int port1; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -35093497 ) @Export("width") int width; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 625891879 + intValue = -975025893 ) @Export("height") int height; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1380746691 + intValue = -1556626299 ) @Export("x") int x; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1337066781 + intValue = 1692274853 ) @Export("y") int y; @@ -53,61 +61,42 @@ public final class WorldMapRectangle { this.this$0 = var1; } - @ObfuscatedName("gb") + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;IB)V", + garbageValue = "87" + ) + static final void method281(String var0, int var1) { + PacketBufferNode var2 = MenuAction.getPacketBufferNode(ClientPacket.field2269, Client.packetWriter.isaacCipher); + var2.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var0) + 1); + var2.packetBuffer.writeStringCp1252NullTerminated(var0); + var2.packetBuffer.writeByte(var1); + Client.packetWriter.addNode(var2); + } + + @ObfuscatedName("fx") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "205706610" + garbageValue = "-1711181474" ) - static final void method275() { - for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { - if (var0.plane == class42.plane && !var0.isFinished) { - if (Client.cycle >= var0.cycleStart) { - var0.advance(Client.field718); - if (var0.isFinished) { - var0.remove(); - } else { - GrandExchangeOfferWorldComparator.scene.drawEntity(var0.plane, var0.x, var0.y, var0.height, 60, var0, 0, -1L, false); - } - } - } else { - var0.remove(); + static final void method280() { + for (int var0 = 0; var0 < Client.npcCount; ++var0) { + int var1 = Client.npcIndices[var0]; + NPC var2 = Client.npcs[var1]; + if (var2 != null) { + class1.calculateActorPosition(var2, var2.definition.size); } } } - @ObfuscatedName("iv") + @ObfuscatedName("kd") @ObfuscatedSignature( - signature = "(Lhj;Liq;IIZI)V", - garbageValue = "106659698" + signature = "(Lhp;B)Z", + garbageValue = "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) { - 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) { - Entity.insertMenuItem(var7, ClientPreferences.colorStartTag(0xff9040) + var1.name, var6, var1.id, var2, var0.id, var4); - } - + @Export("isComponentHidden") + static boolean isComponentHidden(Widget var0) { + return var0.isHidden; } } diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index eda3f32b29..dff2786ea3 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -9,71 +9,57 @@ 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("aw") +@ObfuscatedName("af") @Implements("WorldMapRegion") public class WorldMapRegion { - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Led;" + signature = "Les;" ) @Export("WorldMapRegion_cachedSprites") public static DemotingHashTable WorldMapRegion_cachedSprites; - @ObfuscatedName("bh") - @ObfuscatedSignature( - signature = "Lhl;" - ) - @Export("studioGame") - static StudioGame studioGame; - @ObfuscatedName("du") - @ObfuscatedSignature( - signature = "Liu;" - ) - @Export("archive6") - static Archive archive6; - @ObfuscatedName("gb") - @Export("xteaKeys") - static int[][] xteaKeys; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -862345975 + intValue = -2122468343 ) @Export("regionX") int regionX; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -908569217 + intValue = 1416092147 ) @Export("regionY") int regionY; - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Ly;" + signature = "Lb;" ) @Export("worldMapData_0") WorldMapData_0 worldMapData_0; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("worldMapData1List") LinkedList worldMapData1List; - @ObfuscatedName("f") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1971368251 + intValue = 1536391847 ) @Export("backgroundColor") int backgroundColor; - @ObfuscatedName("m") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 2110263181 + intValue = 1012366175 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("u") + @ObfuscatedName("c") @Export("icon0List") List icon0List; - @ObfuscatedName("x") + @ObfuscatedName("r") @Export("iconMap") HashMap iconMap; - @ObfuscatedName("r") + @ObfuscatedName("y") @Export("fonts") final HashMap fonts; @@ -87,32 +73,34 @@ public class WorldMapRegion { this.worldMapData1List = new LinkedList(); this.icon0List = new LinkedList(); this.iconMap = new HashMap(); - this.backgroundColor = var3 | 0xff000000; + this.backgroundColor = var3 | -16777216; this.fonts = var4; } - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(IIII)V", - garbageValue = "1947241845" - ) - void method506(int x, int y, int size) { - Sprite var4 = PlayerType.getWorldMapRegionCachedSprite(this.regionX, this.regionY, this.pixelsPerTile); - if (var4 == null) { - return; - } - if (size == this.pixelsPerTile * 64) { - var4.drawAt(x, y); - } else { - var4.drawScaledWorldmap(x, y, size, size); - } - - } - @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Ly;Ljava/util/List;I)V", - garbageValue = "1340237556" + signature = "(IIII)V", + garbageValue = "1799679643" + ) + void method476(int var1, int var2, int var3) { + int var5 = this.regionX; + int var6 = this.regionY; + int var7 = this.pixelsPerTile; + Sprite var4 = (Sprite)WorldMapRegion_cachedSprites.get(ClientPacket.getWorldMapSpriteHash(var5, var6, var7)); + if (var4 != null) { + if (var3 == this.pixelsPerTile * 64) { + var4.drawAt(var1, var2); + } else { + var4.drawScaledWorldmap(var1, var2, var3, var3); + } + + } + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "(Lb;Ljava/util/List;I)V", + garbageValue = "-1364217193" ) @Export("initWorldMapData0") void initWorldMapData0(WorldMapData_0 var1, List var2) { @@ -121,10 +109,10 @@ public class WorldMapRegion { this.addAllToIconList(var2); } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(Ljava/util/HashSet;Ljava/util/List;I)V", - garbageValue = "-523355957" + garbageValue = "1227010449" ) @Export("initWorldMapData1") void initWorldMapData1(HashSet var1, List var2) { @@ -141,15 +129,15 @@ public class WorldMapRegion { this.addAllToIconList(var2); } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IIIILo;I)V", - garbageValue = "585564692" + signature = "(IIIILl;I)V", + garbageValue = "661255427" ) @Export("getIconsForTiles") void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapData var5) { for (int var6 = var1; var6 < var3 + var1; ++var6) { - label72: + label74: for (int var7 = var2; var7 < var2 + var4; ++var7) { for (int var8 = 0; var8 < var5.planes; ++var8) { WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; @@ -159,23 +147,23 @@ public class WorldMapRegion { for (int var11 = 0; var11 < var10.length; ++var11) { ObjectDefinition var13; boolean var14; - label63: { + label65: { WorldMapDecoration var12 = var10[var11]; - var13 = ViewportMouse.getObjectDefinition(var12.objectDefinitionId); + var13 = class215.getObjectDefinition(var12.objectDefinitionId); if (var13.transforms != null) { int[] var15 = var13.transforms; for (int var16 = 0; var16 < var15.length; ++var16) { int var17 = var15[var16]; - ObjectDefinition var18 = ViewportMouse.getObjectDefinition(var17); + ObjectDefinition var18 = class215.getObjectDefinition(var17); if (var18.mapIconId != -1) { var14 = true; - break label63; + break label65; } } } else if (var13.mapIconId != -1) { var14 = true; - break label63; + break label65; } var14 = false; @@ -183,7 +171,7 @@ public class WorldMapRegion { if (var14) { this.getIcon(var13, var8, var6, var7, var5); - continue label72; + continue label74; } } } @@ -193,10 +181,10 @@ public class WorldMapRegion { } - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Liy;IIILo;I)V", - garbageValue = "-1363155739" + signature = "(Lik;IIILl;I)V", + garbageValue = "-1125061375" ) @Export("getIcon") void getIcon(ObjectDefinition var1, int var2, int var3, int var4, AbstractWorldMapData var5) { @@ -206,24 +194,24 @@ public class WorldMapRegion { var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, var4 + this.worldMapData_0.regionYLow * 64); } else { WorldMapData_1 var8 = (WorldMapData_1)var5; - var7 = new Coord(var2 + var8.minPlane, var3 + var8.regionXLow * 64 + var8.getChunkXLow() * 8, var4 + var8.regionYLow * 64 + var8.getChunkYLow() * 8); + var7 = new Coord(var2 + var8.minPlane, var3 + var8.regionXLow * 64 + var8.getChunkXLow() * 8, var8.regionYLow * 64 + var4 + var8.getChunkYLow() * 8); } Object var10; if (var1.transforms != null) { var10 = new WorldMapIcon_1(var7, var6, var1.id, this); } else { - WorldMapElement var9 = class222.WorldMapElement_get(var1.mapIconId); + WorldMapElement var9 = WorldMapData_0.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("c") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "106" + garbageValue = "-13" ) @Export("initWorldMapIcon1s") void initWorldMapIcon1s() { @@ -238,10 +226,10 @@ public class WorldMapRegion { } - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(Ljava/util/List;I)V", - garbageValue = "-1298217436" + garbageValue = "-232716755" ) @Export("addAllToIconList") void addAllToIconList(List var1) { @@ -250,19 +238,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.method502(var3.element)); + WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method437(var3.element)); this.icon0List.add(var4); } } } - @ObfuscatedName("x") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "30233" + signature = "(B)V", + garbageValue = "-12" ) - void method429() { + void method415() { if (this.worldMapData_0 != null) { this.worldMapData_0.reset(); } else { @@ -276,10 +264,10 @@ public class WorldMapRegion { } - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lhp;B)Z", - garbageValue = "96" + signature = "(Lhz;I)Z", + garbageValue = "-1549952231" ) @Export("loadGeography") boolean loadGeography(AbstractArchive var1) { @@ -289,72 +277,74 @@ public class WorldMapRegion { if (this.worldMapData_0.isFullyLoaded()) { this.getIconsForTiles(0, 0, 64, 64, this.worldMapData_0); return true; + } else { + return false; } - return false; - } - boolean var2 = true; + } else { + boolean var2 = true; - Iterator var3; - WorldMapData_1 var4; - for (var3 = this.worldMapData1List.iterator(); var3.hasNext(); var2 &= var4.isFullyLoaded()) { - var4 = (WorldMapData_1)var3.next(); - var4.loadGeography(var1); - } - - if (var2) { - var3 = this.worldMapData1List.iterator(); - - while (var3.hasNext()) { + Iterator var3; + WorldMapData_1 var4; + for (var3 = this.worldMapData1List.iterator(); var3.hasNext(); var2 &= var4.isFullyLoaded()) { var4 = (WorldMapData_1)var3.next(); - this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); + var4.loadGeography(var1); } - } - return var2; + if (var2) { + var3 = this.worldMapData1List.iterator(); + + while (var3.hasNext()) { + var4 = (WorldMapData_1)var3.next(); + this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); + } + } + + return var2; + } } - @ObfuscatedName("v") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(ILap;[Llx;Lhp;Lhp;I)V", - garbageValue = "-1781579709" + signature = "(ILax;[Llq;Lhz;Lhz;I)V", + garbageValue = "733361193" ) @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 (PlayerType.getWorldMapRegionCachedSprite(this.regionX, this.regionY, var1) == null) { - boolean var6 = true; - var6 &= this.loadGeography(var4); - int var8; + int var7 = this.regionX; + int var8 = this.regionY; + Sprite var6 = (Sprite)WorldMapRegion_cachedSprites.get(ClientPacket.getWorldMapSpriteHash(var7, var8, var1)); + if (var6 == null) { + boolean var9 = true; + var9 &= this.loadGeography(var4); + int var11; if (this.worldMapData_0 != null) { - var8 = this.worldMapData_0.groupId; + var11 = this.worldMapData_0.groupId; } else { - var8 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; + var11 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; } - var6 &= var5.tryLoadGroup(var8); - if (var6) { - byte[] var7 = var5.takeFileFlat(var8); - WorldMapSprite var9; - if (var7 == null) { - var9 = new WorldMapSprite(); + var9 &= var5.tryLoadGroup(var11); + if (var9) { + byte[] var10 = var5.takeFileFlat(var11); + WorldMapSprite var12; + if (var10 == null) { + var12 = new WorldMapSprite(); } else { - var9 = new WorldMapSprite(BuddyRankComparator.convertJpgToSprite(var7).pixels); + var12 = new WorldMapSprite(WorldMapIcon_0.convertJpgToSprite(var10).pixels); } - Sprite var11 = new Sprite(this.pixelsPerTile * 64, this.pixelsPerTile * 64); - var11.setRaster(); + Sprite var14 = new Sprite(this.pixelsPerTile * 64, this.pixelsPerTile * 64); + var14.setRaster(); if (this.worldMapData_0 != null) { - this.method434(var2, var3, var9); + this.method420(var2, var3, var12); } else { - this.method435(var2, var3, var9); + this.method421(var2, var3, var12); } - int var12 = this.regionX; - int var13 = this.regionY; - int var14 = this.pixelsPerTile; - WorldMapRegion_cachedSprites.put(var11, Widget.getWorldMapSpriteHash(var12, var13, var14), var11.pixels.length * 4); - this.method429(); + class16.method181(var14, this.regionX, this.regionY, this.pixelsPerTile); + this.method415(); } } } @@ -362,10 +352,10 @@ public class WorldMapRegion { @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(IIILjava/util/HashSet;B)V", - garbageValue = "67" + signature = "(IIILjava/util/HashSet;I)V", + garbageValue = "-1247984556" ) - void method432(int var1, int var2, int var3, HashSet var4) { + void method408(int var1, int var2, int var3, HashSet var4) { if (var4 == null) { var4 = new HashSet(); } @@ -374,59 +364,58 @@ public class WorldMapRegion { this.drawMapLinks(var1, var2, var4, var3); } - @ObfuscatedName("g") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Ljava/util/HashSet;IIB)V", - garbageValue = "82" + signature = "(Ljava/util/HashSet;III)V", + garbageValue = "475052278" ) @Export("flashElements") - void flashElements(HashSet flashingElements, int flashCycle, int cyclesPerFlash) { + void flashElements(HashSet var1, int var2, int var3) { Iterator var4 = this.iconMap.values().iterator(); while (var4.hasNext()) { AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); - if (!var5.hasValidElement()) { - continue; - } - int var6 = var5.getElement(); - if (flashingElements.contains(var6)) { - WorldMapElement var7 = class222.WorldMapElement_get(var6); - this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, flashCycle, cyclesPerFlash); + if (var5.hasValidElement()) { + int var6 = var5.getElement(); + if (var1.contains(var6)) { + WorldMapElement var7 = WorldMapData_0.WorldMapElement_get(var6); + this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); + } } } - this.method443(flashingElements, flashCycle, cyclesPerFlash); + this.method515(var1, var2, var3); } - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lap;[Llx;Lav;I)V", - garbageValue = "-5287364" + signature = "(Lax;[Llq;Lam;I)V", + garbageValue = "-1525649588" ) - void method434(class40 var1, IndexedSprite[] var2, WorldMapSprite var3) { + void method420(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.method520(var4, var5, this.worldMapData_0, var1); + this.method447(var4, var5, this.worldMapData_0, var1); } } for (var4 = 0; var4 < 64; ++var4) { for (var5 = 0; var5 < 64; ++var5) { - this.method436(var4, var5, this.worldMapData_0, var1, var2); + this.method422(var4, var5, this.worldMapData_0, var1, var2); } } } - @ObfuscatedName("j") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Lap;[Llx;Lav;I)V", - garbageValue = "1494661478" + signature = "(Lax;[Llq;Lam;I)V", + garbageValue = "-1865495003" ) - void method435(class40 var1, IndexedSprite[] var2, WorldMapSprite var3) { + void method421(class40 var1, IndexedSprite[] var2, WorldMapSprite var3) { Iterator var4 = this.worldMapData1List.iterator(); WorldMapData_1 var5; @@ -438,7 +427,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.method520(var6, var7, var5, var1); + this.method447(var6, var7, var5, var1); } } } @@ -450,27 +439,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.method436(var6, var7, var5, var1, var2); + this.method422(var6, var7, var5, var1, var2); } } } } - @ObfuscatedName("o") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(IILo;Lap;[Llx;I)V", - garbageValue = "1019894341" + signature = "(IILl;Lax;[Llq;I)V", + garbageValue = "36824632" ) - void method436(int var1, int var2, AbstractWorldMapData var3, class40 var4, IndexedSprite[] var5) { - this.method472(var1, var2, var3); - this.method463(var1, var2, var3, var5); + void method422(int var1, int var2, AbstractWorldMapData var3, class40 var4, IndexedSprite[] var5) { + this.method427(var1, var2, var3); + this.method413(var1, var2, var3, var5); } - @ObfuscatedName("d") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(IILo;Lap;Lav;I)V", - garbageValue = "-1409851959" + signature = "(IILl;Lax;Lam;I)V", + garbageValue = "-472169420" ) @Export("drawTileGround") void drawTileGround(int var1, int var2, AbstractWorldMapData var3, class40 var4, WorldMapSprite var5) { @@ -480,226 +469,58 @@ public class WorldMapRegion { Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, this.backgroundColor); } - int var8 = 0xff00ff; - int var9; + int var8 = 16711935; if (var7 != -1) { - int var10 = this.backgroundColor; - FloorOverlayDefinition var12 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var7); - FloorOverlayDefinition var11; - if (var12 != null) { - var11 = var12; - } else { - byte[] var13 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var7); - var12 = new FloorOverlayDefinition(); - if (var13 != null) { - var12.decode(new Buffer(var13), var7); - } - - var12.postDecode(); - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var12, (long)var7); - var11 = var12; - } - - if (var11 == null) { - var9 = var10; - } else if (var11.secondaryRgb >= 0) { - var9 = var11.secondaryRgb | 0xff000000; - } else { - int var14; - byte var15; - int var17; - int var18; - if (var11.texture >= 0) { - var14 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var11.texture); - var15 = 96; - if (var14 == -2) { - var17 = 12345678; - } else if (var14 == -1) { - if (var15 < 0) { - var15 = 0; - } else if (var15 > 127) { - var15 = 127; - } - - var18 = 127 - var15; - var17 = var18; - } else { - var18 = var15 * (var14 & 127) / 128; - if (var18 < 2) { - var18 = 2; - } else if (var18 > 126) { - var18 = 126; - } - - var17 = var18 + (var14 & 65408); - } - - var9 = Rasterizer3D.Rasterizer3D_colorPalette[var17] | 0xff000000; - } else if (var11.primaryRgb == 0xff00ff) { - var9 = var10; - } else { - var17 = class192.WorldMap_hslToRgb(var11.hue, var11.saturation, var11.lightness); - var15 = 96; - if (var17 == -2) { - var14 = 12345678; - } else if (var17 == -1) { - if (var15 < 0) { - var15 = 0; - } else if (var15 > 127) { - var15 = 127; - } - - var18 = 127 - var15; - var14 = var18; - } else { - var18 = var15 * (var17 & 127) / 128; - if (var18 < 2) { - var18 = 2; - } else if (var18 > 126) { - var18 = 126; - } - - var14 = var18 + (var17 & 65408); - } - - var9 = Rasterizer3D.Rasterizer3D_colorPalette[var14] | 0xff000000; - } - } - - var8 = var9; + var8 = Tiles.method1060(var7, this.backgroundColor); } - if (var7 > -1 && var3.field165[0][var1][var2] == 0) { + if (var7 > -1 && var3.field145[0][var1][var2] == 0) { Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); } else { - var9 = this.method439(var1, var2, var3, var5); + int var9 = this.method425(var1, var2, var3, var5); if (var7 == -1) { Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); } else { - var4.method698(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field165[0][var1][var2], var3.field166[0][var1][var2]); + var4.method698(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field145[0][var1][var2], var3.field156[0][var1][var2]); } } } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(IILo;Lap;I)V", - garbageValue = "-272085910" + signature = "(IILl;Lax;B)V", + garbageValue = "44" ) - void method520(int var1, int var2, AbstractWorldMapData var3, class40 var4) { + void method447(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) { - continue; - } - int var8 = this.backgroundColor; - FloorOverlayDefinition var10 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var6); - FloorOverlayDefinition var9; - if (var10 != null) { - var9 = var10; - } else { - byte[] var11 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var6); - var10 = new FloorOverlayDefinition(); - if (var11 != null) { - var10.decode(new Buffer(var11), var6); - } - - var10.postDecode(); - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var10, (long)var6); - var9 = var10; - } - - int var7; - if (var9 == null) { - var7 = var8; - } else if (var9.secondaryRgb >= 0) { - var7 = var9.secondaryRgb | 0xff000000; - } else { - int var12; - byte var13; - int var16; - int var17; - if (var9.texture >= 0) { - var12 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var9.texture); - var13 = 96; - if (var12 == -2) { - var16 = 12345678; - } else if (var12 == -1) { - if (var13 < 0) { - var13 = 0; - } else if (var13 > 127) { - var13 = 127; - } - - var17 = 127 - var13; - var16 = var17; - } else { - var17 = var13 * (var12 & 127) / 128; - if (var17 < 2) { - var17 = 2; - } else if (var17 > 126) { - var17 = 126; - } - - var16 = var17 + (var12 & 65408); - } - - var7 = Rasterizer3D.Rasterizer3D_colorPalette[var16] | 0xff000000; - } else if (var9.primaryRgb == 0xff00ff) { - var7 = var8; + if (var6 > -1) { + int var7 = Tiles.method1060(var6, this.backgroundColor); + if (var3.field145[var5][var1][var2] == 0) { + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); } else { - var16 = class192.WorldMap_hslToRgb(var9.hue, var9.saturation, var9.lightness); - var13 = 96; - if (var16 == -2) { - var12 = 12345678; - } else if (var16 == -1) { - if (var13 < 0) { - var13 = 0; - } else if (var13 > 127) { - var13 = 127; - } - - var17 = 127 - var13; - var12 = var17; - } else { - var17 = var13 * (var16 & 127) / 128; - if (var17 < 2) { - var17 = 2; - } else if (var17 > 126) { - var17 = 126; - } - - var12 = var17 + (var16 & 65408); - } - - var7 = Rasterizer3D.Rasterizer3D_colorPalette[var12] | 0xff000000; + var4.method698(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field145[var5][var1][var2], var3.field156[var5][var1][var2]); } } - - if (var3.field165[var5][var1][var2] == 0) { - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); - } else { - var4.method698(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field165[var5][var1][var2], var3.field166[var5][var1][var2]); - } } } - @ObfuscatedName("z") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(IILo;Lav;I)I", - garbageValue = "23103860" + signature = "(IILl;Lam;I)I", + garbageValue = "-1958397304" ) - int method439(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { + int method425(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); } - @ObfuscatedName("al") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(IILo;[Llx;I)V", - garbageValue = "111952884" + signature = "(IILl;[Llq;S)V", + garbageValue = "800" ) - void method463(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { + void method413(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) { @@ -708,21 +529,15 @@ public class WorldMapRegion { for (int var8 = 0; var8 < var7.length; ++var8) { WorldMapDecoration var9 = var7[var8]; int var11 = var9.decoration; - boolean var10 = var11 >= WorldMapDecorationType.field2733.id && var11 <= WorldMapDecorationType.field2722.id; - if (!var10) { - int var13 = var9.decoration; - boolean var12 = var13 == WorldMapDecorationType.field2741.id; - if (!var12) { - continue; - } - } - - ObjectDefinition var14 = ViewportMouse.getObjectDefinition(var9.objectDefinitionId); - if (var14.mapSceneId != -1) { - if (var14.mapSceneId != 46 && var14.mapSceneId != 52) { - var4[var14.mapSceneId].method6093(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); - } else { - var4[var14.mapSceneId].method6093(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); + boolean var10 = var11 >= WorldMapDecorationType.field2711.id && var11 <= WorldMapDecorationType.field2705.id; + if (var10 || GraphicsObject.method1946(var9.decoration)) { + ObjectDefinition var12 = class215.getObjectDefinition(var9.objectDefinitionId); + if (var12.mapSceneId != -1) { + if (var12.mapSceneId != 46 && var12.mapSceneId != 52) { + var4[var12.mapSceneId].method5979(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); + } else { + var4[var12.mapSceneId].method5979(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); + } } } } @@ -731,12 +546,12 @@ public class WorldMapRegion { } - @ObfuscatedName("av") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IILo;S)V", - garbageValue = "4754" + signature = "(IILl;B)V", + garbageValue = "100" ) - void method472(int var1, int var2, AbstractWorldMapData var3) { + void method427(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) { @@ -745,20 +560,20 @@ public class WorldMapRegion { for (int var7 = 0; var7 < var6.length; ++var7) { WorldMapDecoration var8 = var6[var7]; int var10 = var8.decoration; - boolean var9 = var10 >= WorldMapDecorationType.field2725.id && var10 <= WorldMapDecorationType.field2721.id || var10 == WorldMapDecorationType.field2739.id; + boolean var9 = var10 >= WorldMapDecorationType.field2701.id && var10 <= WorldMapDecorationType.field2704.id || var10 == WorldMapDecorationType.field2721.id; if (var9) { - ObjectDefinition var11 = ViewportMouse.getObjectDefinition(var8.objectDefinitionId); + ObjectDefinition var11 = class215.getObjectDefinition(var8.objectDefinitionId); int var12 = var11.int1 != 0 ? -3407872 : -3355444; - if (var8.decoration == WorldMapDecorationType.field2725.id) { - this.method454(var1, var2, var8.rotation, var12); + if (var8.decoration == WorldMapDecorationType.field2701.id) { + this.method441(var1, var2, var8.rotation, var12); } - if (var8.decoration == WorldMapDecorationType.field2720.id) { - this.method454(var1, var2, var8.rotation, -3355444); - this.method454(var1, var2, var8.rotation + 1, var12); + if (var8.decoration == WorldMapDecorationType.field2702.id) { + this.method441(var1, var2, var8.rotation, -3355444); + this.method441(var1, var2, var8.rotation + 1, var12); } - if (var8.decoration == WorldMapDecorationType.field2721.id) { + if (var8.decoration == WorldMapDecorationType.field2704.id) { if (var8.rotation == 0) { Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var12); } @@ -776,7 +591,7 @@ public class WorldMapRegion { } } - if (var8.decoration == WorldMapDecorationType.field2739.id) { + if (var8.decoration == WorldMapDecorationType.field2721.id) { int var13 = var8.rotation % 2; int var14; if (var13 == 0) { @@ -796,10 +611,10 @@ public class WorldMapRegion { } - @ObfuscatedName("as") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(IILjava/util/HashSet;II)V", - garbageValue = "-1887424608" + garbageValue = "-1405499271" ) @Export("drawNonLinkMapIcons") void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { @@ -810,13 +625,13 @@ public class WorldMapRegion { while (var7.hasNext()) { Entry var8 = (Entry)var7.next(); Coord var9 = (Coord)var8.getKey(); - int var10 = (int)((float)var1 + var5 * (float)var9.x - var6); - int var11 = (int)((float)(var2 + var4) - (float)var9.y * var5 - var6); + int var10 = (int)((float)var1 + (float)var9.x * var5 - 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 = class222.WorldMapElement_get(var12.getElement()); + WorldMapElement var13 = WorldMapData_0.WorldMapElement_get(var12.getElement()); if (!var3.contains(var13.getObjectId())) { this.method445(var12, var10, var11, var5); } @@ -825,18 +640,18 @@ public class WorldMapRegion { } - @ObfuscatedName("aw") + @ObfuscatedName("av") @ObfuscatedSignature( - signature = "(Ljava/util/HashSet;IIB)V", - garbageValue = "-45" + signature = "(Ljava/util/HashSet;III)V", + garbageValue = "75297543" ) - void method443(HashSet var1, int var2, int var3) { + void method515(HashSet var1, int var2, int var3) { Iterator var4 = this.icon0List.iterator(); while (var4.hasNext()) { AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); if (var5.hasValidElement()) { - WorldMapElement var6 = class222.WorldMapElement_get(var5.getElement()); + WorldMapElement var6 = WorldMapData_0.WorldMapElement_get(var5.getElement()); if (var6 != null && var1.contains(var6.getObjectId())) { this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); } @@ -845,71 +660,69 @@ public class WorldMapRegion { } - @ObfuscatedName("ad") + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(Liw;IIIIB)V", - garbageValue = "14" + signature = "(Liq;IIIIB)V", + garbageValue = "-101" ) @Export("drawBackgroundCircle") void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) { Sprite var6 = var1.getSpriteBool(false); - if (var6 == null) { - return; - } - var6.drawTransBgAt(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); - if (var4 % var5 < var5 / 2) { - Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 0xffff00, 128); - Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 0xffffff, 256); - } + if (var6 != null) { + var6.drawTransBgAt(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); + if (var4 % var5 < var5 / 2) { + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128); + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256); + } + } } - @ObfuscatedName("ag") + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(Laz;IIFB)V", - garbageValue = "-89" + signature = "(Las;IIFI)V", + garbageValue = "-1135746308" ) void method445(AbstractWorldMapIcon var1, int var2, int var3, float var4) { - WorldMapElement var5 = class222.WorldMapElement_get(var1.getElement()); - this.method446(var5, var2, var3); - this.method447(var1, var5, var2, var3, var4); + WorldMapElement var5 = WorldMapData_0.WorldMapElement_get(var1.getElement()); + this.method432(var5, var2, var3); + this.method433(var1, var5, var2, var3, var4); } - @ObfuscatedName("ar") + @ObfuscatedName("af") @ObfuscatedSignature( - signature = "(Liw;III)V", - garbageValue = "1065739105" + signature = "(Liq;III)V", + garbageValue = "86636677" ) - void method446(WorldMapElement var1, int var2, int var3) { + void method432(WorldMapElement var1, int var2, int var3) { Sprite var4 = var1.getSpriteBool(false); if (var4 != null) { - int var5 = this.method455(var4, var1.horizontalAlignment); - int var6 = this.method450(var4, var1.verticalAlignment); + int var5 = this.method435(var4, var1.horizontalAlignment); + int var6 = this.method477(var4, var1.verticalAlignment); var4.drawTransBgAt(var5 + var2, var3 + var6); } } - @ObfuscatedName("ax") + @ObfuscatedName("az") @ObfuscatedSignature( - signature = "(Laz;Liw;IIFI)V", - garbageValue = "-1918014118" + signature = "(Las;Liq;IIFI)V", + garbageValue = "-1657066614" ) - void method447(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { + void method433(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { WorldMapLabel var6 = var1.getLabel(); - if (var6 == null) { - return; - } - if (var6.size.method184(var5)) { - Font var7 = (Font)this.fonts.get(var6.size); - var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, 0xff000000 | var2.field3217, 0, 1, 0, var7.ascent / 2); + if (var6 != null) { + if (var6.size.method185(var5)) { + Font var7 = (Font)this.fonts.get(var6.size); + var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field3200, 0, 1, 0, var7.ascent / 2); + } } } - @ObfuscatedName("az") + @ObfuscatedName("aj") @ObfuscatedSignature( signature = "(IILjava/util/HashSet;II)V", - garbageValue = "1861626297" + garbageValue = "944833799" ) @Export("drawMapLinks") void drawMapLinks(int var1, int var2, HashSet var3, int var4) { @@ -921,8 +734,8 @@ 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 + (float)var8 * var5); + var7.screenY = (int)((float)(63 - var9) * var5 + (float)var2); if (!var3.contains(var7.getElement())) { this.method445(var7, var7.screenX, var7.screenY, var5); } @@ -931,28 +744,28 @@ public class WorldMapRegion { } - @ObfuscatedName("ae") + @ObfuscatedName("an") @ObfuscatedSignature( - signature = "(Lly;Liz;I)I", - garbageValue = "406251697" + signature = "(Lls;Lib;B)I", + garbageValue = "-105" ) - int method455(Sprite var1, HorizontalAlignment var2) { + int method435(Sprite var1, HorizontalAlignment var2) { switch(var2.value) { - case 0: - return 0; - case 2: + case 1: return -var1.subWidth / 2; + case 2: + return 0; default: return -var1.subWidth; } } - @ObfuscatedName("ao") + @ObfuscatedName("at") @ObfuscatedSignature( - signature = "(Lly;Lif;B)I", - garbageValue = "36" + signature = "(Lls;Lia;I)I", + garbageValue = "2126912618" ) - int method450(Sprite var1, VerticalAlignment var2) { + int method477(Sprite var1, VerticalAlignment var2) { switch(var2.value) { case 0: return -var1.subHeight / 2; @@ -963,91 +776,115 @@ public class WorldMapRegion { } } - @ObfuscatedName("aj") + @ObfuscatedName("as") @ObfuscatedSignature( - signature = "(II)Las;", - garbageValue = "1732767815" + signature = "(II)Lai;", + garbageValue = "140578044" ) - WorldMapLabel method502(int var1) { - WorldMapElement var2 = class222.WorldMapElement_get(var1); + WorldMapLabel method437(int var1) { + WorldMapElement var2 = WorldMapData_0.WorldMapElement_get(var1); return this.createMapLabel(var2); } - @ObfuscatedName("at") + @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "(Liw;I)Las;", - garbageValue = "1686665284" + signature = "(Liq;B)Lai;", + garbageValue = "-114" ) @Export("createMapLabel") WorldMapLabel createMapLabel(WorldMapElement var1) { - if (var1.name == null || this.fonts == null || this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) == null) { - return null; - } - WorldMapLabelSize var2 = WorldMapLabelSize.method177(var1.textSize); - if (var2 == null) { - return null; - } - Font var3 = (Font)this.fonts.get(var2); - if (var3 == null) { - return null; - } - 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; + if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { + int var3 = var1.textSize; + WorldMapLabelSize[] var4 = WorldMapLabelSize.method190(); + int var5 = 0; - for (int var9 = 0; var9 < var8.length; ++var9) { - String var10 = var8[var9]; - int var11 = var3.stringWidth(var10); - if (var11 > var7) { - var7 = var11; + WorldMapLabelSize var2; + while (true) { + if (var5 >= var4.length) { + var2 = null; + break; + } + + WorldMapLabelSize var6 = var4[var5]; + if (var3 == var6.field105) { + var2 = var6; + break; + } + + ++var5; } - } - return new WorldMapLabel(var1.name, var7, var6, var2); + if (var2 == null) { + return null; + } else { + Font var14 = (Font)this.fonts.get(var2); + if (var14 == null) { + return null; + } else { + int var15 = var14.lineCount(var1.name, 1000000); + String[] var7 = new String[var15]; + var14.breakLines(var1.name, (int[])null, var7); + int var8 = var7.length * var14.ascent / 2; + int var9 = 0; + String[] var10 = var7; + + 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, var9, var8, var2); + } + } + } else { + return null; + } + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + signature = "(IIIIII)Ljava/util/List;", + garbageValue = "-1473050198" + ) + List method439(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) { + Iterator var7 = this.iconMap.values().iterator(); + + AbstractWorldMapIcon var8; + while (var7.hasNext()) { + var8 = (AbstractWorldMapIcon)var7.next(); + if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { + var6.add(var8); + } + } + + var7 = this.icon0List.iterator(); + + while (var7.hasNext()) { + var8 = (AbstractWorldMapIcon)var7.next(); + if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { + var6.add(var8); + } + } + + return var6; + } else { + return var6; + } + } else { + return var6; + } } @ObfuscatedName("ac") @ObfuscatedSignature( - signature = "(IIIIII)Ljava/util/List;", - garbageValue = "-1946741699" - ) - List method440(int var1, int var2, int var3, int var4, int var5) { - LinkedList var6 = new LinkedList(); - if (var4 < var1 || var5 < var2) { - return var6; - } - if (var4 >= var3 + var1 || var5 >= var3 + var2) { - return var6; - } - Iterator var7 = this.iconMap.values().iterator(); - - AbstractWorldMapIcon var8; - while (var7.hasNext()) { - var8 = (AbstractWorldMapIcon)var7.next(); - if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { - var6.add(var8); - } - } - - var7 = this.icon0List.iterator(); - - while (var7.hasNext()) { - var8 = (AbstractWorldMapIcon)var7.next(); - if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { - var6.add(var8); - } - } - - return var6; - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - signature = "(B)Ljava/util/List;", - garbageValue = "37" + signature = "(I)Ljava/util/List;", + garbageValue = "1996494275" ) @Export("icons") List icons() { @@ -1057,12 +894,12 @@ public class WorldMapRegion { return var1; } - @ObfuscatedName("aq") + @ObfuscatedName("ar") @ObfuscatedSignature( signature = "(IIIII)V", - garbageValue = "-255594504" + garbageValue = "-1284201635" ) - void method454(int var1, int var2, int var3, int var4) { + void method441(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); @@ -1082,53 +919,413 @@ public class WorldMapRegion { } - @ObfuscatedName("k") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(ILhp;Ljava/lang/String;Ljava/lang/String;IZI)V", - garbageValue = "-2137956496" + signature = "(II)I", + garbageValue = "723122560" ) - @Export("playMusicTrackByName") - public static void playMusicTrackByName(int var0, AbstractArchive var1, String var2, String var3, int var4, boolean var5) { - int var6 = var1.getGroupId(var2); - int var7 = var1.getFileId(var6, var3); - class197.field2402 = 1; - GrandExchangeOfferNameComparator.musicTrackArchive = var1; - class197.musicTrackGroupId = var6; - class197.musicTrackFileId = var7; - ScriptFrame.field529 = var4; - BuddyRankComparator.musicTrackBoolean = var5; - class197.field2404 = var0; + public static int method530(int var0) { + return var0 >> 11 & 63; } - @ObfuscatedName("gw") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "878790252" + signature = "(ILcr;ZB)I", + garbageValue = "79" ) - @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()) { - continue; + static int method464(int var0, Script var1, boolean var2) { + String var3; + if (var0 == ScriptOpcodes.MES) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + DirectByteArrayCopier.addGameMessage(0, "", var3); + return 1; + } else if (var0 == ScriptOpcodes.ANIM) { + Interpreter.Interpreter_intStackSize -= 2; + FriendsList.performPlayerAnimation(WorldMapIcon_1.localPlayer, Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); + return 1; + } else if (var0 == ScriptOpcodes.IF_CLOSE) { + if (!Interpreter.field1072) { + Interpreter.field1074 = true; } - int var3 = var2.x >> 7; - int var4 = var2.y >> 7; - if (var3 < 0 || var3 >= 104 || var4 < 0 || var4 >= 104) { - continue; - } - if (var2.size * 784322703 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { - if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { - continue; + + return 1; + } else { + int var10; + if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + var10 = 0; + if (TaskHandler.isNumber(var3)) { + var10 = WallDecoration.parseInt(var3); } - Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; + PacketBufferNode var12 = MenuAction.getPacketBufferNode(ClientPacket.field2202, 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[--Interpreter.Interpreter_stringStackSize]; + var14 = MenuAction.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[--Interpreter.Interpreter_stringStackSize]; + var14 = MenuAction.getPacketBufferNode(ClientPacket.field2194, 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[--Interpreter.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + ModelData0.method3201(var15, var7); + return 1; + } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { + Interpreter.Interpreter_intStackSize -= 3; + var15 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + int var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + Widget var13 = WorldMapElement.getWidget(var9); + clickWidget(var13, var15, var10); + return 1; + } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { + Interpreter.Interpreter_intStackSize -= 2; + var15 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + Widget var11 = var2 ? class286.field3623 : class297.field3693; + clickWidget(var11, var15, var10); + return 1; + } else if (var0 == ScriptOpcodes.MOUSECAM) { + FriendSystem.mouseCam = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOffer.clientPreferences.roofsHidden ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { + GrandExchangeOffer.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + GrandExchangeOfferAgeComparator.savePreferences(); + return 1; + } else if (var0 == ScriptOpcodes.OPENURL) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + boolean var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + GameObject.openURL(var3, var4, false); + return 1; + } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { + var15 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + var14 = MenuAction.getPacketBufferNode(ClientPacket.field2227, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeShort(var15); + Client.packetWriter.addNode(var14); + return 1; + } else if (var0 == ScriptOpcodes.BUG_REPORT) { + var15 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStackSize -= 2; + var7 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; + String var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; + if (var7.length() > 500) { + return 1; + } else if (var5.length() > 500) { + return 1; + } else { + PacketBufferNode var6 = MenuAction.getPacketBufferNode(ClientPacket.field2232, Client.packetWriter.isaacCipher); + var6.packetBuffer.writeShort(1 + Buddy.stringCp1252NullTerminatedByteSize(var7) + Buddy.stringCp1252NullTerminatedByteSize(var5)); + var6.packetBuffer.writeStringCp1252NullTerminated(var7); + var6.packetBuffer.writeByte(var15); + var6.packetBuffer.writeStringCp1252NullTerminated(var5); + Client.packetWriter.addNode(var6); + return 1; + } + } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { + Client.shiftClickDrop = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { + Client.showMouseOverText = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.RENDERSELF) { + Client.renderSelf = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 3120) { + if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 1; + } else { + Client.drawPlayerNames &= -2; + } + + return 1; + } else if (var0 == 3121) { + if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 2; + } else { + Client.drawPlayerNames &= -3; + } + + return 1; + } else if (var0 == 3122) { + if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 4; + } else { + Client.drawPlayerNames &= -5; + } + + return 1; + } else if (var0 == 3123) { + if (Interpreter.Interpreter_intStack[--Interpreter.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[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { + Client.showLoadingMessages = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.SETTAPTODROP) { + SpriteMask.setTapToDrop(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1); + return 1; + } else if (var0 == ScriptOpcodes.GETTAPTODROP) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MouseHandler.getTapToDrop() ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.SETOCULUSORBSPEED) { + Interpreter.Interpreter_intStackSize -= 2; + Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + return 1; + } else if (var0 == 3130) { + Interpreter.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 3131) { + --Interpreter.Interpreter_intStackSize; + return 1; + } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = KitDefinition.canvasWidth; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class30.canvasHeight; + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { + --Interpreter.Interpreter_intStackSize; + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { + Interpreter.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 3136) { + Client.field638 = 3; + Client.field786 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + return 1; + } else if (var0 == 3137) { + Client.field638 = 2; + Client.field786 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + return 1; + } else if (var0 == 3138) { + Client.field638 = 0; + return 1; + } else if (var0 == 3139) { + Client.field638 = 1; + return 1; + } else if (var0 == 3140) { + Client.field638 = 3; + Client.field786 = var2 ? class286.field3623.id : class297.field3693.id; + return 1; + } else { + boolean var8; + if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { + var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + GrandExchangeOffer.clientPreferences.hideUsername = var8; + GrandExchangeOfferAgeComparator.savePreferences(); + return 1; + } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOffer.clientPreferences.hideUsername ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { + var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + Client.Login_isUsernameRemembered = var8; + if (!var8) { + GrandExchangeOffer.clientPreferences.rememberedUsername = ""; + GrandExchangeOfferAgeComparator.savePreferences(); + } + + return 1; + } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { + Interpreter.Interpreter_intStack[++Interpreter.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[--Interpreter.Interpreter_intStackSize] == 1; + if (var8 == GrandExchangeOffer.clientPreferences.titleMusicDisabled) { + GrandExchangeOffer.clientPreferences.titleMusicDisabled = !var8; + GrandExchangeOfferAgeComparator.savePreferences(); + } + + return 1; + } else if (var0 == ScriptOpcodes.GETTITLEMUSICENABLED) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOffer.clientPreferences.titleMusicDisabled ? 0 : 1; + return 1; + } else if (var0 == 3148) { + return 1; + } else if (var0 == 3149) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3150) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3151) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3152) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3153) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; + return 1; + } else if (var0 == 3154) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class43.method758(); + return 1; + } else if (var0 == 3155) { + --Interpreter.Interpreter_stringStackSize; + return 1; + } else if (var0 == 3156) { + return 1; + } else if (var0 == 3157) { + Interpreter.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 3158) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3159) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3160) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3161) { + --Interpreter.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3162) { + --Interpreter.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3163) { + --Interpreter.Interpreter_stringStackSize; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3164) { + --Interpreter.Interpreter_intStackSize; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 == 3165) { + --Interpreter.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3166) { + Interpreter.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3167) { + Interpreter.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3168) { + Interpreter.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 == 3169) { + return 1; + } else if (var0 == 3170) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3171) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3172) { + --Interpreter.Interpreter_intStackSize; + return 1; + } else if (var0 == 3173) { + --Interpreter.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3174) { + --Interpreter.Interpreter_intStackSize; + return 1; + } else if (var0 == 3175) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else { + return var0 == 3176 ? 1 : 2; + } + } + } + } + } + } + + @ObfuscatedName("iw") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "34219574" + ) + @Export("Widget_runOnTargetLeave") + static void Widget_runOnTargetLeave() { + if (Client.isSpellSelected) { + Widget var0 = ModelData0.getWidgetChild(NetCache.field3162, Client.field816); + if (var0 != null && var0.onTargetLeave != null) { + ScriptEvent var1 = new ScriptEvent(); + var1.widget = var0; + var1.args = var0.onTargetLeave; + class81.runScriptEvent(var1); } - long var5 = Tile.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); - var2.playerCycle = Client.cycle; - GrandExchangeOfferWorldComparator.scene.drawEntity(class42.plane, var2.x, var2.y, ScriptEvent.getTileHeight(var2.size * -1342954560 - 64 + var2.x, var2.size * -1342954560 - 64 + var2.y, class42.plane), var2.size * -1342954560 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); + Client.isSpellSelected = false; + FriendSystem.invalidateWidget(var0); } + } + @ObfuscatedName("jr") + @ObfuscatedSignature( + signature = "(Lhp;III)V", + garbageValue = "404592030" + ) + @Export("clickWidget") + static final void clickWidget(Widget var0, int var1, int var2) { + if (Client.clickedWidget == null && !Client.isMenuOpen) { + if (var0 != null && ServerPacket.method3552(var0) != null) { + Client.clickedWidget = var0; + Client.clickedWidgetParent = ServerPacket.method3552(var0); + Client.widgetClickX = var1; + Client.widgetClickY = var2; + class60.widgetDragDuration = 0; + Client.isDraggingWidget = false; + int var3 = Client.menuOptionsCount - 1; + if (var3 != -1) { + class1.tempMenuAction = new MenuAction(); + class1.tempMenuAction.argument1 = Client.menuArguments1[var3]; + class1.tempMenuAction.argument2 = Client.menuArguments2[var3]; + class1.tempMenuAction.opcode = Client.menuOpcodes[var3]; + class1.tempMenuAction.argument0 = Client.menuIdentifiers[var3]; + class1.tempMenuAction.action = Client.menuActions[var3]; + } + + } + } } } diff --git a/runescape-client/src/main/java/WorldMapSection.java b/runescape-client/src/main/java/WorldMapSection.java index fe6e31a383..5c41d3c424 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("aj") +@ObfuscatedName("ac") @Implements("WorldMapSection") public interface WorldMapSection { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lal;B)V", - garbageValue = "-53" + signature = "(Lav;I)V", + garbageValue = "-1068467910" ) @Export("expandBounds") void expandBounds(WorldMapArea var1); - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(IIII)Z", - garbageValue = "59484528" + garbageValue = "1014871771" ) @Export("containsCoord") boolean containsCoord(int var1, int var2, int var3); - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IIB)Z", - garbageValue = "56" + signature = "(III)Z", + garbageValue = "694688168" ) @Export("containsPosition") boolean containsPosition(int var1, int var2); - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(IIIB)[I", - garbageValue = "12" + signature = "(IIII)[I", + garbageValue = "-45443461" ) @Export("getBorderTileLengths") int[] getBorderTileLengths(int var1, int var2, int var3); - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(IIB)Lhv;", - garbageValue = "-13" + signature = "(III)Lhd;", + garbageValue = "1267204541" ) @Export("coord") Coord coord(int var1, int var2); - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Lkf;I)V", - garbageValue = "1767519038" + signature = "(Lky;I)V", + garbageValue = "1072299144" ) @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 acc8c73e92..c3f040cd12 100644 --- a/runescape-client/src/main/java/WorldMapSection0.java +++ b/runescape-client/src/main/java/WorldMapSection0.java @@ -1,93 +1,101 @@ +import java.applet.Applet; +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 netscape.javascript.JSObject; -@ObfuscatedName("t") +@ObfuscatedName("a") @Implements("WorldMapSection0") public class WorldMapSection0 implements WorldMapSection { - @ObfuscatedName("q") + @ObfuscatedName("qc") @ObfuscatedGetter( - intValue = 1946278093 + intValue = 2121568877 + ) + static int field129; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 1843368435 ) @Export("oldZ") int oldZ; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1083711829 + intValue = -1967867601 ) @Export("newZ") int newZ; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 82104029 + intValue = 59619681 ) @Export("oldX") int oldX; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 335674559 + intValue = -1129571555 ) @Export("oldY") int oldY; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 12964727 + intValue = 1545521373 ) @Export("newX") int newX; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1819983063 + intValue = 1178438045 ) @Export("newY") int newY; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1938235291 + intValue = -1044467109 ) @Export("oldChunkXLow") int oldChunkXLow; - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 844709239 + intValue = 2073431393 ) @Export("oldChunkYLow") int oldChunkYLow; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -263178467 + intValue = 1873956173 ) @Export("oldChunkXHigh") int oldChunkXHigh; - @ObfuscatedName("f") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1648311941 + intValue = -263670183 ) @Export("oldChunkYHigh") int oldChunkYHigh; - @ObfuscatedName("m") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1777261923 + intValue = -631680795 ) @Export("newChunkXLow") int newChunkXLow; - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 681009167 + intValue = 1516769831 ) @Export("newChunkYLow") int newChunkYLow; - @ObfuscatedName("x") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -790633005 + intValue = -1418040295 ) @Export("newChunkXHigh") int newChunkXHigh; - @ObfuscatedName("r") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1595362875 + intValue = -779321503 ) @Export("newChunkYHigh") int newChunkYHigh; @@ -95,10 +103,10 @@ public class WorldMapSection0 implements WorldMapSection { WorldMapSection0() { } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lal;B)V", - garbageValue = "-53" + signature = "(Lav;I)V", + garbageValue = "-1068467910" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { @@ -120,62 +128,65 @@ public class WorldMapSection0 implements WorldMapSection { } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(IIII)Z", - garbageValue = "59484528" + garbageValue = "1014871771" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.oldZ && var1 < this.oldZ + this.newZ) { + if (var1 >= this.oldZ && var1 < this.newZ + this.oldZ) { return var2 >= (this.oldX << 6) + (this.oldChunkXLow << 3) && var2 <= (this.oldX << 6) + (this.oldChunkXHigh << 3) + 7 && var3 >= (this.oldY << 6) + (this.oldChunkYLow << 3) && var3 <= (this.oldY << 6) + (this.oldChunkYHigh << 3) + 7; + } else { + return false; } - return false; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IIB)Z", - garbageValue = "56" + signature = "(III)Z", + garbageValue = "694688168" ) @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("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(IIIB)[I", - garbageValue = "12" + signature = "(IIII)[I", + garbageValue = "-45443461" ) @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.newX * 64 - this.oldX * 64 + var2 + (this.newChunkXLow * 8 - this.oldChunkXLow * 8), var3 + (this.newY * 64 - this.oldY * 64) + (this.newChunkYLow * 8 - this.oldChunkYLow * 8)}; + return var4; } - int[] var4 = new int[]{this.newX * 64 - this.oldX * 64 + var2 + (this.newChunkXLow * 8 - this.oldChunkXLow * 8), var3 + (this.newY * 64 - this.oldY * 64) + (this.newChunkYLow * 8 - this.oldChunkYLow * 8)}; - return var4; } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(IIB)Lhv;", - garbageValue = "-13" + signature = "(III)Lhd;", + garbageValue = "1267204541" ) @Export("coord") public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { return null; + } else { + int var3 = this.oldX * 64 - this.newX * 64 + (this.oldChunkXLow * 8 - this.newChunkXLow * 8) + var1; + int var4 = this.oldY * 64 - this.newY * 64 + var2 + (this.oldChunkYLow * 8 - this.newChunkYLow * 8); + return new Coord(this.oldZ, var3, var4); } - int var3 = this.oldX * 64 - this.newX * 64 + (this.oldChunkXLow * 8 - this.newChunkXLow * 8) + var1; - int var4 = this.oldY * 64 - this.newY * 64 + var2 + (this.oldChunkYLow * 8 - this.newChunkYLow * 8); - return new Coord(this.oldZ, var3, var4); } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Lkf;I)V", - garbageValue = "1767519038" + signature = "(Lky;I)V", + garbageValue = "1072299144" ) @Export("read") public void read(Buffer var1) { @@ -196,248 +207,143 @@ public class WorldMapSection0 implements WorldMapSection { this.postRead(); } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "35507364" + signature = "(B)V", + garbageValue = "105" ) @Export("postRead") void postRead() { } - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;II[BIB)I", + signature = "([BIII)Ljava/lang/String;", + garbageValue = "44636829" + ) + static String method211(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.field3631[var5 >>> 2]); + if (var4 < var2 - 1) { + int var6 = var0[var4 + 1] & 255; + var3.append(class289.field3631[(var5 & 3) << 4 | var6 >>> 4]); + if (var4 < var2 - 2) { + int var7 = var0[var4 + 2] & 255; + var3.append(class289.field3631[(var6 & 15) << 2 | var7 >>> 6]).append(class289.field3631[var7 & 63]); + } else { + var3.append(class289.field3631[(var6 & 15) << 2]).append("="); + } + } else { + var3.append(class289.field3631[(var5 & 3) << 4]).append("=="); + } + } + + return var3.toString(); + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(III)I", + garbageValue = "956806000" + ) + public static int method215(int var0, int var1) { + int var2; + for (var2 = 0; var1 > 0; --var1) { + var2 = var2 << 1 | var0 & 1; + var0 >>>= 1; + } + + return var2; + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;ILjava/lang/String;B)Z", + garbageValue = "44" + ) + static boolean method232(String var0, int var1, String var2) { + if (var1 == 0) { + try { + if (!class51.field404.startsWith("win")) { + throw new Exception(); + } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { + throw new Exception(); + } else { + String var11 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; + + for (int var4 = 0; var4 < var0.length(); ++var4) { + if (var11.indexOf(var0.charAt(var4)) == -1) { + throw new Exception(); + } + } + + Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); + return true; + } + } catch (Throwable var5) { + return false; + } + } else if (var1 == 1) { + try { + Object var10 = class47.method795(class51.applet, var2, new Object[]{(new URL(class51.applet.getCodeBase(), var0)).toString()}); + return var10 != null; + } catch (Throwable var6) { + return false; + } + } else if (var1 == 2) { + try { + class51.applet.getAppletContext().showDocument(new URL(class51.applet.getCodeBase(), var0), "_blank"); + return true; + } catch (Exception var7) { + return false; + } + } else if (var1 == 3) { + try { + Applet var3 = class51.applet; + JSObject.getWindow(var3).call("loggedout", (Object[])null); + } catch (Throwable var9) { + } + + try { + class51.applet.getAppletContext().showDocument(new URL(class51.applet.getCodeBase(), var0), "_top"); + return true; + } catch (Exception var8) { + return false; + } + } else { + throw new IllegalArgumentException(); + } + } + + @ObfuscatedName("lz") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "905677752" + ) + static void method221() { + Client.packetWriter.addNode(MenuAction.getPacketBufferNode(ClientPacket.field2222, Client.packetWriter.isaacCipher)); + Client.oculusOrbState = 0; + } + + @ObfuscatedName("lo") + @ObfuscatedSignature( + signature = "(B)V", garbageValue = "1" ) - @Export("encodeStringCp1252") - public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { - int var5 = var2 - var1; + static void method230() { + if (GameObject.field1921 != null) { + Client.field892 = Client.cycle; + GameObject.field1921.method4241(); - 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("x") - @ObfuscatedSignature( - signature = "(IIIIIZI)Lly;", - garbageValue = "2024001124" - ) - @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)var3 << 42) + ((long)var4 << 40) + ((long)var2 << 38) + ((long)var1 << 16) + (long)var0; - Sprite var8; - if (!var5) { - var8 = (Sprite)ItemDefinition.ItemDefinition_cachedSprites.get(var6); - if (var8 != null) { - return var8; - } - } - - ItemDefinition var9 = WorldMapArea.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]; + for (int var0 = 0; var0 < Client.players.length; ++var0) { + if (Client.players[var0] != null) { + GameObject.field1921.method4237(PacketWriter.baseX * 64 + (Client.players[var0].x >> 7), RouteStrategy.baseY * 64 + (Client.players[var0].y >> 7)); } } - - if (var10 != -1) { - var9 = WorldMapArea.ItemDefinition_get(var10); - } } - Model var21 = var9.getModel(1); - if (var21 == null) { - return null; - } - 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.method2976(16, 16); - Rasterizer3D.field1768 = false; - if (var9.placeholderTemplate != -1) { - var22.drawTransBgAt(0, 0); - } - - int var16 = var9.zoom2d; - if (var5) { - var16 = (int)((double)var16 * 1.5D); - } 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.method2866(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(0xffffff); - } - - 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 = HealthBar.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, 0xffff00, 1); - } - - if (!var5) { - ItemDefinition.ItemDefinition_cachedSprites.put(var8, var6); - } - - Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); - Rasterizer2D.Rasterizer2D_setClipArray(var15); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - Rasterizer3D.field1768 = true; - return var8; - } - - @ObfuscatedName("fr") - @ObfuscatedSignature( - signature = "(Lis;IIII)V", - garbageValue = "282707669" - ) - @Export("addSequenceSoundEffect") - static void addSequenceSoundEffect(SequenceDefinition var0, int var1, int var2, int var3) { - if (Client.soundEffectCount >= 50 || Client.field892 == 0) { - return; - } - if (var0.soundEffects == null || var1 >= var0.soundEffects.length) { - return; - } - int var4 = var0.soundEffects[var1]; - if (var4 == 0) { - return; - } - 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; } } diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index d7a44f4029..4926964134 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -4,42 +4,71 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ax") +@ObfuscatedName("at") @Implements("WorldMapSection1") public class WorldMapSection1 implements WorldMapSection { - @ObfuscatedName("q") + @ObfuscatedName("x") + @Export("SpriteBuffer_pixels") + public static byte[][] SpriteBuffer_pixels; + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "[Lmw;" + ) + @Export("JagexCache_idxFiles") + public static BufferedFile[] JagexCache_idxFiles; + @ObfuscatedName("bk") + @Export("otp") + static String otp; + @ObfuscatedName("de") + @ObfuscatedSignature( + signature = "Lid;" + ) + @Export("archive14") + static Archive archive14; + @ObfuscatedName("gn") @ObfuscatedGetter( - intValue = -309142761 + intValue = 1628860217 + ) + static int field283; + @ObfuscatedName("gy") + @ObfuscatedSignature( + signature = "[Lls;" + ) + @Export("mapMarkerSprites") + static Sprite[] mapMarkerSprites; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -164716821 ) @Export("minPlane") int minPlane; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 993590079 + intValue = 1156476113 ) @Export("planes") int planes; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1911619349 + intValue = -1419031029 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1414952525 + intValue = 797218073 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 586024271 + intValue = -1475121161 ) @Export("regionEndX") int regionEndX; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 875825551 + intValue = -1969567489 ) @Export("regionEndY") int regionEndY; @@ -47,10 +76,10 @@ public class WorldMapSection1 implements WorldMapSection { WorldMapSection1() { } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lal;B)V", - garbageValue = "-53" + signature = "(Lav;I)V", + garbageValue = "-1068467910" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { @@ -72,62 +101,65 @@ public class WorldMapSection1 implements WorldMapSection { } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(IIII)Z", - garbageValue = "59484528" + garbageValue = "1014871771" ) @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 && var3 >> 6 == this.regionStartY; + } else { + return false; } - return false; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IIB)Z", - garbageValue = "56" + signature = "(III)Z", + garbageValue = "694688168" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(IIIB)[I", - garbageValue = "12" + signature = "(IIII)[I", + garbageValue = "-45443461" ) @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.regionEndX * 64 - this.regionStartX * 64 + var2, var3 + (this.regionEndY * 64 - this.regionStartY * 64)}; + return var4; } - int[] var4 = new int[]{this.regionEndX * 64 - this.regionStartX * 64 + var2, var3 + (this.regionEndY * 64 - this.regionStartY * 64)}; - return var4; } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(IIB)Lhv;", - garbageValue = "-13" + signature = "(III)Lhd;", + garbageValue = "1267204541" ) @Export("coord") public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { return null; + } else { + int var3 = this.regionStartX * 64 - this.regionEndX * 64 + var1; + int var4 = this.regionStartY * 64 - this.regionEndY * 64 + var2; + return new Coord(this.minPlane, var3, var4); } - int var3 = this.regionStartX * 64 - this.regionEndX * 64 + var1; - int var4 = this.regionStartY * 64 - this.regionEndY * 64 + var2; - return new Coord(this.minPlane, var3, var4); } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Lkf;I)V", - garbageValue = "1767519038" + signature = "(Lky;I)V", + garbageValue = "1072299144" ) @Export("read") public void read(Buffer var1) { @@ -140,84 +172,56 @@ public class WorldMapSection1 implements WorldMapSection { this.postRead(); } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-209894164" + signature = "(B)V", + garbageValue = "24" ) @Export("postRead") void postRead() { } - @ObfuscatedName("q") + @ObfuscatedName("ks") @ObfuscatedSignature( - signature = "(IB)Ljava/lang/String;", - garbageValue = "-57" + signature = "(Lhp;B)Z", + garbageValue = "39" ) - @Export("getModIconString") - static String getModIconString(int var0) { - return ""; - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;IZI)I", - garbageValue = "-2067134672" - ) - @Export("parseIntCustomRadix") - static int parseIntCustomRadix(CharSequence var0, int var1, boolean var2) { - if (var1 < 2 || var1 > 36) { - throw new IllegalArgumentException("" + var1); - } - 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; - } + static final boolean method563(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); } - 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') { - var10 = var8 - 'W'; + if (var1 >= 314 && var1 <= 323) { + var2 = (var1 - 314) / 2; + var3 = var1 & 1; + Client.playerAppearance.method3930(var2, var3 == 1); + } + + if (var1 == 324) { + Client.playerAppearance.changeSex(false); + } + + if (var1 == 325) { + Client.playerAppearance.changeSex(true); + } + + if (var1 == 326) { + PacketBufferNode var4 = MenuAction.getPacketBufferNode(ClientPacket.field2197, Client.packetWriter.isaacCipher); + Client.playerAppearance.write(var4.packetBuffer); + Client.packetWriter.addNode(var4); + return true; } else { - throw new NumberFormatException(); + return false; } - - 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; } - - if (!var4) { - throw new NumberFormatException(); - } - return var5; } } diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index df21f1cb30..d84a69fd4d 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -4,150 +4,168 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("s") +@ObfuscatedName("m") @Implements("WorldMapSection2") public class WorldMapSection2 implements WorldMapSection { - @ObfuscatedName("q") + @ObfuscatedName("rj") @ObfuscatedGetter( - intValue = -1951013555 + intValue = 148255872 + ) + static int field190; + @ObfuscatedName("qy") + @ObfuscatedGetter( + intValue = -808409095 + ) + static int field191; + @ObfuscatedName("er") + @ObfuscatedGetter( + intValue = 1175996651 + ) + static int field183; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -15494621 ) @Export("minPlane") int minPlane; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -927462805 + intValue = -608895039 ) @Export("planes") int planes; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1508174563 + intValue = -1639169875 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -290088343 + intValue = 360739097 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -2013070877 + intValue = 212769379 ) @Export("regionEndX") int regionEndX; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 204062243 + intValue = 221192809 ) @Export("regionEndY") int regionEndY; - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1982766605 + intValue = 852884703 ) - int field202; - @ObfuscatedName("i") + int field185; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1874865145 + intValue = -1572504287 ) - int field203; - @ObfuscatedName("c") + int field186; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1506169835 + intValue = 1285923191 ) - int field204; - @ObfuscatedName("f") + int field187; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1738066987 + intValue = -1597902097 ) - int field205; + int field179; WorldMapSection2() { } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lal;B)V", - garbageValue = "-53" + signature = "(Lav;I)V", + garbageValue = "-1068467910" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field202) { - var1.regionLowX = this.field202; + if (var1.regionLowX > this.field185) { + var1.regionLowX = this.field185; } - if (var1.regionHighX < this.field204) { - var1.regionHighX = this.field204; + if (var1.regionHighX < this.field187) { + var1.regionHighX = this.field187; } - if (var1.regionLowY > this.field203) { - var1.regionLowY = this.field203; + if (var1.regionLowY > this.field186) { + var1.regionLowY = this.field186; } - if (var1.regionHighY < this.field205) { - var1.regionHighY = this.field205; + if (var1.regionHighY < this.field179) { + var1.regionHighY = this.field179; } } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(IIII)Z", - garbageValue = "59484528" + garbageValue = "1014871771" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { if (var1 >= this.minPlane && var1 < this.planes + this.minPlane) { return var2 >> 6 >= this.regionStartX && var2 >> 6 <= this.regionEndX && var3 >> 6 >= this.regionStartY && var3 >> 6 <= this.regionEndY; + } else { + return false; } - return false; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IIB)Z", - garbageValue = "56" + signature = "(III)Z", + garbageValue = "694688168" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >> 6 >= this.field202 && var1 >> 6 <= this.field204 && var2 >> 6 >= this.field203 && var2 >> 6 <= this.field205; + return var1 >> 6 >= this.field185 && var1 >> 6 <= this.field187 && var2 >> 6 >= this.field186 && var2 >> 6 <= this.field179; } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(IIIB)[I", - garbageValue = "12" + signature = "(IIII)[I", + garbageValue = "-45443461" ) @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.field185 * 64 - this.regionStartX * 64 + var2, var3 + (this.field186 * 64 - this.regionStartY * 64)}; + return var4; } - int[] var4 = new int[]{this.field202 * 64 - this.regionStartX * 64 + var2, var3 + (this.field203 * 64 - this.regionStartY * 64)}; - return var4; } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(IIB)Lhv;", - garbageValue = "-13" + signature = "(III)Lhd;", + garbageValue = "1267204541" ) @Export("coord") public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { return null; + } else { + int var3 = this.regionStartX * 64 - this.field185 * 64 + var1; + int var4 = this.regionStartY * 64 - this.field186 * 64 + var2; + return new Coord(this.minPlane, var3, var4); } - int var3 = this.regionStartX * 64 - this.field202 * 64 + var1; - int var4 = this.regionStartY * 64 - this.field203 * 64 + var2; - return new Coord(this.minPlane, var3, var4); } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Lkf;I)V", - garbageValue = "1767519038" + signature = "(Lky;I)V", + garbageValue = "1072299144" ) @Export("read") public void read(Buffer var1) { @@ -157,19 +175,87 @@ public class WorldMapSection2 implements WorldMapSection { this.regionStartY = var1.readUnsignedShort(); this.regionEndX = var1.readUnsignedShort(); this.regionEndY = var1.readUnsignedShort(); - this.field202 = var1.readUnsignedShort(); - this.field203 = var1.readUnsignedShort(); - this.field204 = var1.readUnsignedShort(); - this.field205 = var1.readUnsignedShort(); + this.field185 = var1.readUnsignedShort(); + this.field186 = var1.readUnsignedShort(); + this.field187 = var1.readUnsignedShort(); + this.field179 = var1.readUnsignedShort(); this.postRead(); } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-39" + signature = "(I)V", + garbageValue = "1597340274" ) @Export("postRead") void postRead() { } + + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "([BIII)Z", + garbageValue = "1296086556" + ) + static final boolean method325(byte[] var0, int var1, int var2) { + boolean var3 = true; + Buffer var4 = new Buffer(var0); + int var5 = -1; + + label70: + while (true) { + int var6 = var4.method5565(); + if (var6 == 0) { + return var3; + } + + var5 += var6; + int var7 = 0; + boolean var8 = false; + + while (true) { + int var9; + while (!var8) { + var9 = var4.readUShortSmart(); + if (var9 == 0) { + continue label70; + } + + 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 = class215.getObjectDefinition(var5); + if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { + if (!var15.needsModelFiles()) { + ++Client.field678; + var3 = false; + } + + var8 = true; + } + } + } + + var9 = var4.readUShortSmart(); + if (var9 == 0) { + break; + } + + var4.readUnsignedByte(); + } + } + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1052050737" + ) + @Export("WorldMapElement_clearCached") + public static void WorldMapElement_clearCached() { + WorldMapElement.WorldMapElement_cachedSprites.clear(); + } } diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java index 05fe03ac78..ee560e4b2a 100644 --- a/runescape-client/src/main/java/WorldMapSectionType.java +++ b/runescape-client/src/main/java/WorldMapSectionType.java @@ -5,41 +5,52 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("h") +@ObfuscatedName("w") @Implements("WorldMapSectionType") public enum WorldMapSectionType implements Enumerated { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lh;" + signature = "Lw;" ) @Export("WORLDMAPSECTIONTYPE0") - WORLDMAPSECTIONTYPE0(1, (byte)0), - @ObfuscatedName("w") + WORLDMAPSECTIONTYPE0(3, (byte)0), + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lh;" + signature = "Lw;" ) @Export("WORLDMAPSECTIONTYPE1") - WORLDMAPSECTIONTYPE1(2, (byte)1), - @ObfuscatedName("e") + WORLDMAPSECTIONTYPE1(1, (byte)1), + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lh;" + signature = "Lw;" ) @Export("WORLDMAPSECTIONTYPE2") WORLDMAPSECTIONTYPE2(0, (byte)2), - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lh;" + signature = "Lw;" ) @Export("WORLDMAPSECTIONTYPE3") - WORLDMAPSECTIONTYPE3(3, (byte)3); + WORLDMAPSECTIONTYPE3(2, (byte)3); - @ObfuscatedName("k") + @ObfuscatedName("qp") @ObfuscatedGetter( - intValue = 1941114483 + intValue = 1927510419 + ) + static int field142; + @ObfuscatedName("md") + @ObfuscatedGetter( + intValue = 1020141795 + ) + @Export("selectedSpellFlags") + static int selectedSpellFlags; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -891662365 ) @Export("type") final int type; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("id") final byte id; @@ -48,188 +59,717 @@ public enum WorldMapSectionType implements Enumerated { this.id = var4; } - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "320353268" + signature = "(B)I", + garbageValue = "-32" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(Lkx;B)V", - garbageValue = "-61" + signature = "(ILcr;ZI)I", + garbageValue = "1866050314" ) - @Export("updatePlayer") - static final void updatePlayer(PacketBuffer var0) { - var0.importIndex(); - int var1 = Client.localPlayerIndex; - Player var2 = Client.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 - MusicPatchNode2.baseX * 64; - var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); - var2.pathY[0] = var6 - class1.baseY * 64; - var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); - class42.plane = var2.plane = var4; - if (Players.field1254[var1] != null) { - var2.read(Players.field1254[var1]); - } - - Players.Players_count = 0; - Players.Players_indices[++Players.Players_count - 1] = var1; - Players.field1252[var1] = 0; - Players.Players_emptyIdxCount = 0; - - for (int var7 = 1; var7 < 2048; ++var7) { - if (var7 != var1) { - 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.field1252[var7] = 0; - } - } - - var0.exportIndex(); - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - signature = "(ILcx;ZB)I", - garbageValue = "1" - ) - static int method239(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - int var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - if (!Client.isCameraLocked) { - Client.camAngleX = var3; - Client.camAngleY = var4; - } - + static int method240(int var0, Script var1, boolean var2) { + Widget var3 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapRegion.method530(ParamDefinition.getWidgetClickMask(var3)); return 1; - } - if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.camAngleX; - return 1; - } - if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.camAngleY; - return 1; - } - if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - if (var3 < 0) { - var3 = 0; - } + } else if (var0 != ScriptOpcodes.IF_GETOP) { + if (var0 == ScriptOpcodes.IF_GETOPBASE) { + if (var3.dataText == null) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.dataText; + } - Client.camFollowHeight = var3; - return 1; - } - if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.camFollowHeight; - return 1; - } - return 2; - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - signature = "(ILcx;ZI)I", - garbageValue = "-292172071" - ) - static int method242(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - Client.field782 = (short)ItemContainer.method1116(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]); - if (Client.field782 <= 0) { - Client.field782 = 256; - } - - Client.field651 = (short)ItemContainer.method1116(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]); - if (Client.field651 <= 0) { - Client.field651 = 256; - } - - return 1; - } - if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - Client.zoomHeight = (short)Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - if (Client.zoomHeight <= 0) { - Client.zoomHeight = 256; - } - - Client.zoomWidth = (short)Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - if (Client.zoomWidth <= 0) { - Client.zoomWidth = 320; - } - - return 1; - } - if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { - HealthBarUpdate.Interpreter_intStackSize -= 4; - Client.field820 = (short)Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - if (Client.field820 <= 0) { - Client.field820 = 1; - } - - Client.field790 = (short)Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - if (Client.field790 <= 0) { - Client.field790 = 0x7fff; - } else if (Client.field790 < Client.field820) { - Client.field790 = Client.field820; - } - - Client.field732 = (short)Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2]; - if (Client.field732 <= 0) { - Client.field732 = 1; - } - - Client.field659 = (short)Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 3]; - if (Client.field659 <= 0) { - Client.field659 = 0x7fff; - } else if (Client.field659 < Client.field732) { - Client.field659 = Client.field732; - } - - return 1; - } - if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { - if (Client.viewportWidget != null) { - UrlRequest.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.viewportWidth; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.viewportHeight; + return 1; } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; + return 2; + } + } else { + int var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + --var4; + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.actions[var4]; + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; } return 1; } - if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.zoomHeight; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.zoomWidth; - return 1; + } + + @ObfuscatedName("fv") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "78" + ) + @Export("playPcmPlayers") + static final void playPcmPlayers() { + if (SoundCache.pcmPlayer1 != null) { + SoundCache.pcmPlayer1.run(); } - if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = NetFileRequest.method4140(Client.field782); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = NetFileRequest.method4140(Client.field651); - return 1; + + if (MouseRecorder.pcmPlayer0 != null) { + MouseRecorder.pcmPlayer0.run(); + } + + } + + @ObfuscatedName("it") + @ObfuscatedSignature( + signature = "([Lhp;IIIIIIIII)V", + garbageValue = "-67536058" + ) + @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 || !WorldMapRectangle.isComponentHidden(var10)) { + if (var10.contentType > 0) { + WorldMapDecorationType.method4030(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) { + WorldMapIcon_1.field174 = var0; + HealthBarUpdate.field986 = var6; + Tile.field1648 = var7; + continue; + } + + if (Client.isDraggingWidget && Client.field641) { + var15 = MouseHandler.MouseHandler_x; + var16 = MouseHandler.MouseHandler_y; + var15 -= Client.widgetClickX; + var16 -= Client.widgetClickY; + if (var15 < Client.field802) { + var15 = Client.field802; + } + + if (var15 + var10.width > Client.field802 + Client.clickedWidgetParent.width) { + var15 = Client.field802 + Client.clickedWidgetParent.width - var10.width; + } + + if (var16 < Client.field803) { + var16 = Client.field803; + } + + if (var16 + var10.height > Client.field803 + Client.clickedWidgetParent.height) { + var16 = Client.field803 + Client.clickedWidgetParent.height - var10.height; + } + + var12 = var15; + var13 = var16; + } + + if (!var10.isScrollBar) { + var14 = 128; + } + } + + int var17; + int var18; + int var19; + int var20; + int var21; + int var22; + if (var10.type == 2) { + var15 = var2; + var16 = var3; + var17 = var4; + var18 = var5; + } else if (var10.type == 9) { + var19 = var12; + var20 = var13; + var21 = var12 + var10.width; + var22 = var13 + var10.height; + if (var21 < var12) { + var19 = var21; + var21 = var12; + } + + if (var22 < var13) { + var20 = var22; + var22 = var13; + } + + ++var21; + ++var22; + var15 = var19 > var2 ? var19 : var2; + var16 = var20 > var3 ? var20 : var3; + var17 = var21 < var4 ? var21 : var4; + var18 = var22 < var5 ? var22 : var5; + } else { + var19 = var12 + var10.width; + var20 = var13 + var10.height; + var15 = var12 > var2 ? var12 : var2; + var16 = var13 > var3 ? var13 : var3; + var17 = var19 < var4 ? var19 : 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; + ClientPacket.fontPlain12.drawRightAligned("Fps:" + GameShell.fps, var12 + var10.width, var13, 16776960, -1); + var13 += 15; + Runtime var41 = Runtime.getRuntime(); + var20 = (int)((var41.totalMemory() - var41.freeMemory()) / 1024L); + var21 = 16776960; + if (var20 > 327680 && !Client.isLowDetail) { + var21 = 16711680; + } + + ClientPacket.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); + var13 += 15; + } + continue; + } + + if (var10.contentType == 1337) { + Client.viewportX = var12; + Client.viewportY = var13; + WorldMapElement.drawEntities(var12, var13, var10.width, var10.height); + Client.field703[var10.rootIndex] = true; + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; + } + + if (var10.contentType == 1338) { + TileItemPile.drawMinimap(var10, var12, var13, var11); + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; + } + + if (var10.contentType == 1339) { + SoundCache.drawCompass(var10, var12, var13, var11); + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; + } + + if (var10.contentType == 1400) { + WorldMapCacheName.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); + } + + if (var10.contentType == 1401) { + WorldMapCacheName.worldMap.drawOverview(var12, var13, var10.width, var10.height); + } + + if (var10.contentType == 1402) { + Bounds.loginScreenRunesAnimation.draw(var12, Client.cycle); + } + } + + if (var10.type == 0) { + if (!var10.isIf3 && WorldMapRectangle.isComponentHidden(var10) && var10 != class65.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 var30 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); + if (var30 != null) { + class2.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); + } + + if (Client.isResizable || Client.field830[var11] || Client.gameDrawingMode > 1) { + if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { + HitSplatDefinition.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) { + var19 = 0; + + for (var20 = 0; var20 < var10.rawHeight; ++var20) { + for (var21 = 0; var21 < var10.rawWidth; ++var21) { + var22 = var12 + var21 * (var10.paddingX + 32); + var23 = var20 * (var10.paddingY + 32) + var13; + if (var19 < 20) { + var22 += var10.inventoryXOffsets[var19]; + var23 += var10.inventoryYOffsets[var19]; + } + + if (var10.itemIds[var19] <= 0) { + if (var10.inventorySprites != null && var19 < 20) { + Sprite var43 = var10.getInventorySprite(var19); + if (var43 != null) { + var43.drawTransBgAt(var22, var23); + } else if (Widget.field2579) { + FriendSystem.invalidateWidget(var10); + } + } + } else { + boolean var37 = false; + boolean var38 = false; + var26 = var10.itemIds[var19] - 1; + if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == class188.dragInventoryWidget && var19 == Client.dragItemSlotSource) { + Sprite var27; + if (Client.isItemSelected == 1 && var19 == class185.selectedItemSlot && var10.id == FontName.selectedItemWidget) { + var27 = UserComparator10.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false); + } else { + var27 = UserComparator10.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); + } + + if (var27 != null) { + if (var10 == class188.dragInventoryWidget && var19 == Client.dragItemSlotSource) { + var24 = MouseHandler.MouseHandler_x - Client.field732; + var25 = MouseHandler.MouseHandler_y - Client.field744; + if (var24 < 5 && var24 > -5) { + var24 = 0; + } + + if (var25 < 5 && var25 > -5) { + var25 = 0; + } + + if (Client.itemDragDuration < 5) { + var24 = 0; + var25 = 0; + } + + var27.drawTransAt(var22 + var24, var23 + var25, 128); + if (var1 != -1) { + Widget var28 = var0[var1 & 65535]; + int var29; + if (var23 + var25 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { + var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field879 / 3; + if (var29 > Client.field879 * 10) { + var29 = Client.field879 * 10; + } + + if (var29 > var28.scrollY) { + var29 = var28.scrollY; + } + + var28.scrollY -= var29; + Client.field744 += var29; + FriendSystem.invalidateWidget(var28); + } + + if (var23 + var25 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { + var29 = (var23 + var25 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field879 / 3; + if (var29 > Client.field879 * 10) { + var29 = Client.field879 * 10; + } + + if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { + var29 = var28.scrollHeight - var28.height - var28.scrollY; + } + + var28.scrollY += var29; + Client.field744 -= var29; + FriendSystem.invalidateWidget(var28); + } + } + } else if (var10 == Actor.field978 && var19 == Client.field730) { + var27.drawTransAt(var22, var23, 128); + } else { + var27.drawTransBgAt(var22, var23); + } + } else { + FriendSystem.invalidateWidget(var10); + } + } + } + + ++var19; + } + } + } else if (var10.type == 3) { + if (UserComparator10.runCs1(var10)) { + var19 = var10.color2; + if (var10 == class65.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { + var19 = var10.mouseOverColor2; + } + } else { + var19 = var10.color; + if (var10 == class65.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { + var19 = 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, var19); + } else { + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); + } + } + } else if (var14 == 0) { + Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var19); + } else { + Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); + } + } else { + Font var39; + if (var10.type == 4) { + var39 = var10.getFont(); + if (var39 == null) { + if (Widget.field2579) { + FriendSystem.invalidateWidget(var10); + } + } else { + String var45 = var10.text; + if (UserComparator10.runCs1(var10)) { + var20 = var10.color2; + if (var10 == class65.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { + var20 = var10.mouseOverColor2; + } + + if (var10.text2.length() > 0) { + var45 = var10.text2; + } + } else { + var20 = var10.color; + if (var10 == class65.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { + var20 = var10.mouseOverColor; + } + } + + if (var10.isIf3 && var10.itemId != -1) { + ItemDefinition var47 = WorldMapData_0.ItemDefinition_get(var10.itemId); + var45 = var47.name; + if (var45 == null) { + var45 = "null"; + } + + if ((var47.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { + var45 = class16.colorStartTag(16748608) + var45 + "" + " " + 'x' + Frames.formatItemStacks(var10.itemQuantity); + } + } + + if (var10 == Client.meslayerContinueWidget) { + var45 = "Please wait..."; + var20 = var10.color; + } + + if (!var10.isIf3) { + var45 = class189.method3597(var45, var10); + } + + var39.drawLines(var45, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); + } + } else if (var10.type == 5) { + Sprite var40; + if (!var10.isIf3) { + var40 = var10.getSprite(UserComparator10.runCs1(var10)); + if (var40 != null) { + var40.drawTransBgAt(var12, var13); + } else if (Widget.field2579) { + FriendSystem.invalidateWidget(var10); + } + } else { + if (var10.itemId != -1) { + var40 = UserComparator10.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); + } else { + var40 = var10.getSprite(false); + } + + if (var40 == null) { + if (Widget.field2579) { + FriendSystem.invalidateWidget(var10); + } + } else { + var20 = var40.width; + var21 = var40.height; + if (!var10.spriteTiling) { + var22 = var10.width * 4096 / var20; + if (var10.spriteAngle != 0) { + var40.method6023(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); + } else if (var14 != 0) { + var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); + } else if (var20 == var10.width && var21 == var10.height) { + var40.drawTransBgAt(var12, var13); + } else { + var40.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) { + var40.method6023(var20 / 2 + var12 + var20 * var24, var21 / 2 + var13 + var25 * var21, var10.spriteAngle, 4096); + } else if (var14 != 0) { + var40.drawTransAt(var12 + var20 * var24, var13 + var25 * var21, 256 - (var14 & 255)); + } else { + var40.drawTransBgAt(var12 + var20 * var24, var13 + var21 * var25); + } + } + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + } + } + } + } else { + ItemDefinition var33; + if (var10.type == 6) { + boolean var36 = UserComparator10.runCs1(var10); + if (var36) { + var20 = var10.sequenceId2; + } else { + var20 = var10.sequenceId; + } + + Model var42 = null; + var22 = 0; + if (var10.itemId != -1) { + var33 = WorldMapData_0.ItemDefinition_get(var10.itemId); + if (var33 != null) { + var33 = var33.getCountObj(var10.itemQuantity); + var42 = var33.getModel(1); + if (var42 != null) { + var42.calculateBoundsCylinder(); + var22 = var42.height / 2; + } else { + FriendSystem.invalidateWidget(var10); + } + } + } else if (var10.modelType == 5) { + if (var10.modelId == 0) { + var42 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); + } else { + var42 = WorldMapIcon_1.localPlayer.getModel(); + } + } else if (var20 == -1) { + var42 = var10.getModel((SequenceDefinition)null, -1, var36, WorldMapIcon_1.localPlayer.appearance); + if (var42 == null && Widget.field2579) { + FriendSystem.invalidateWidget(var10); + } + } else { + SequenceDefinition var46 = Widget.SequenceDefinition_get(var20); + var42 = var10.getModel(var46, var10.modelFrame, var36, WorldMapIcon_1.localPlayer.appearance); + if (var42 == null && Widget.field2579) { + FriendSystem.invalidateWidget(var10); + } + } + + Rasterizer3D.method2929(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 (var42 != null) { + if (!var10.isIf3) { + var42.method2874(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); + } else { + var42.calculateBoundsCylinder(); + if (var10.modelOrthog) { + var42.method2810(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); + } else { + var42.method2874(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY); + } + } + } + + Rasterizer3D.Rasterizer3D_method3(); + } else { + if (var10.type == 7) { + var39 = var10.getFont(); + if (var39 == null) { + if (Widget.field2579) { + FriendSystem.invalidateWidget(var10); + } + continue; + } + + var20 = 0; + + for (var21 = 0; var21 < var10.rawHeight; ++var21) { + for (var22 = 0; var22 < var10.rawWidth; ++var22) { + if (var10.itemIds[var20] > 0) { + var33 = WorldMapData_0.ItemDefinition_get(var10.itemIds[var20] - 1); + String var31; + if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { + var31 = class16.colorStartTag(16748608) + var33.name + ""; + } else { + var31 = class16.colorStartTag(16748608) + var33.name + "" + " " + 'x' + Frames.formatItemStacks(var10.itemQuantities[var20]); + } + + var25 = var12 + var22 * (var10.paddingX + 115); + var26 = var21 * (var10.paddingY + 12) + var13; + if (var10.textXAlignment == 0) { + var39.draw(var31, var25, var26, var10.color, var10.textShadowed ? 0 : -1); + } else if (var10.textXAlignment == 1) { + var39.drawCentered(var31, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1); + } else { + var39.drawRightAligned(var31, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); + } + } + + ++var20; + } + } + } + + if (var10.type == 8 && var10 == WorldMapDecoration.field198 && Client.field774 == Client.field848) { + var19 = 0; + var20 = 0; + Font var32 = ClientPacket.fontPlain12; + String var34 = var10.text; + + String var44; + for (var34 = class189.method3597(var34, var10); var34.length() > 0; var20 = var20 + var32.ascent + 1) { + var24 = var34.indexOf("
"); + if (var24 != -1) { + var44 = var34.substring(0, var24); + var34 = var34.substring(var24 + 4); + } else { + var44 = var34; + var34 = ""; + } + + var25 = var32.stringWidth(var44); + if (var25 > var19) { + var19 = var25; + } + } + + var19 += 6; + var20 += 7; + var24 = var12 + var10.width - 5 - var19; + var25 = var13 + var10.height + 5; + if (var24 < var12 + 5) { + var24 = var12 + 5; + } + + if (var19 + var24 > var4) { + var24 = var4 - var19; + } + + if (var20 + var25 > var5) { + var25 = var5 - var20; + } + + Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); + Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); + var34 = var10.text; + var26 = var25 + var32.ascent + 2; + + for (var34 = class189.method3597(var34, var10); var34.length() > 0; var26 = var26 + var32.ascent + 1) { + int var35 = var34.indexOf("
"); + if (var35 != -1) { + var44 = var34.substring(0, var35); + var34 = var34.substring(var35 + 4); + } else { + var44 = var34; + var34 = ""; + } + + var32.draw(var44, var24 + 3, var26, 0, -1); + } + } + + if (var10.type == 9) { + if (var10.field2601) { + var19 = var12; + var20 = var13 + var10.height; + var21 = var12 + var10.width; + var22 = var13; + } else { + var19 = var12; + var20 = var13; + var21 = var12 + var10.width; + var22 = var13 + var10.height; + } + + if (var10.lineWid == 1) { + Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); + } else { + class195.method3628(var19, var20, var21, var22, var10.color, var10.lineWid); + } + } + } + } + } + } + } + } + } + } + } + + } + + @ObfuscatedName("jt") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "1367903694" + ) + @Export("Widget_resetModelFrames") + static final void Widget_resetModelFrames(int var0) { + if (Projectile.loadInterface(var0)) { + Widget[] var1 = Widget.Widget_interfaceComponents[var0]; + + for (int var2 = 0; var2 < var1.length; ++var2) { + Widget var3 = var1[var2]; + if (var3 != null) { + var3.modelFrame = 0; + var3.modelFrameCycle = 0; + } + } + } - return 2; } } diff --git a/runescape-client/src/main/java/WorldMapSprite.java b/runescape-client/src/main/java/WorldMapSprite.java index 3dd80be2aa..fa98fb930d 100644 --- a/runescape-client/src/main/java/WorldMapSprite.java +++ b/runescape-client/src/main/java/WorldMapSprite.java @@ -1,24 +1,30 @@ 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("am") @Implements("WorldMapSprite") public final class WorldMapSprite { - @ObfuscatedName("af") - @Export("client") - @ObfuscatedSignature( - signature = "Lclient;" + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 877299001 ) - static Client client; - @ObfuscatedName("et") + public static int field222; + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Liu;" + signature = "Lhz;" ) - @Export("archive17") - static Archive archive17; - @ObfuscatedName("w") + @Export("Widget_spritesArchive") + static AbstractArchive Widget_spritesArchive; + @ObfuscatedName("dw") + @ObfuscatedSignature( + signature = "Lid;" + ) + @Export("archive4") + static Archive archive4; + @ObfuscatedName("j") @Export("tileColors") final int[] tileColors; @@ -30,113 +36,103 @@ public final class WorldMapSprite { this.tileColors = var1; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "-97" + signature = "(III)I", + garbageValue = "557817784" ) @Export("getTileColor") final int getTileColor(int var1, int var2) { return this.tileColors[var2 * 64 + var1]; } + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(I)[Lhv;", + garbageValue = "20035292" + ) + public static StudioGame[] method402() { + return new StudioGame[]{StudioGame.game3, StudioGame.stellardawn, StudioGame.runescape, StudioGame.game5, StudioGame.game4, StudioGame.oldscape}; + } + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lhp;I)V", - garbageValue = "-2096884458" + signature = "(IIIZII)J", + garbageValue = "-519528973" ) - @Export("FloorUnderlayDefinition_setArchives") - public static void FloorUnderlayDefinition_setArchives(AbstractArchive var0) { - FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0; + @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("hv") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "1522656478" + signature = "(II)Lee;", + garbageValue = "836090120" ) - @Export("drawMenuActionTextAt") - static final void drawMenuActionTextAt(int var0, int var1) { - if (Client.menuOptionsCount < 2 && Client.isItemSelected == 0 && !Client.isSpellSelected) { - return; - } - if (!Client.showMouseOverText) { - return; - } - int var2 = class13.getNewestMenuIdx(); - String var3; - if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) { - var3 = "Use" + " " + Client.selectedItemName + " " + "->"; - } else if (Client.isSpellSelected && Client.menuOptionsCount < 2) { - var3 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " " + "->"; + @Export("getFrames") + static Frames getFrames(int var0) { + Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); + if (var1 != null) { + return var1; } else { - var3 = WorldMapLabel.getMenuText(var2); - } + AbstractArchive var3 = SequenceDefinition.SequenceDefinition_animationsArchive; + AbstractArchive var4 = SequenceDefinition.SequenceDefinition_skeletonsArchive; + boolean var5 = true; + int[] var6 = var3.getGroupFileIds(var0); - if (Client.menuOptionsCount > 2) { - var3 = var3 + ClientPreferences.colorStartTag(0xffffff) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options"; - } + 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; + } + } + } - WorldMapIcon_1.fontBold12.drawRandomAlphaAndSpacing(var3, var0 + 4, var1 + 15, 0xffffff, 0, Client.cycle / 1000); - } + Frames var2; + if (!var5) { + var2 = null; + } else { + try { + var2 = new Frames(var3, var4, var0, false); + } catch (Exception var12) { + var2 = null; + } + } - @ObfuscatedName("id") - @ObfuscatedSignature( - signature = "([Lhj;Lhj;ZI)V", - garbageValue = "280712117" - ) - @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; - class13.resizeInterface(var0, var1.id, var3, var4, var2); - if (var1.children != null) { - class13.resizeInterface(var1.children, var1.id, var3, var4, var2); - } + if (var2 != null) { + SequenceDefinition.SequenceDefinition_cachedFrames.put(var2, (long)var0); + } - InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); - if (var5 != null) { - resizeComponents(var5.group, var3, var4, var2); - } - - if (var1.contentType == 1337) { - } - - } - - @ObfuscatedName("ib") - @ObfuscatedSignature( - signature = "(IIIZI)V", - garbageValue = "-2115353122" - ) - @Export("resizeComponents") - static final void resizeComponents(int var0, int var1, int var2, boolean var3) { - if (class162.loadInterface(var0)) { - class13.resizeInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3); + return var2; } } - @ObfuscatedName("kd") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Lkf;II)V", - garbageValue = "291436994" + signature = "(III)Z", + garbageValue = "-1767054771" ) - @Export("writeNewRandomDat") - static void writeNewRandomDat(Buffer var0, int var1) { - byte[] var2 = var0.array; - if (Client.randomDatData == null) { - Client.randomDatData = new byte[24]; + static final boolean method404(int var0, int var1) { + ObjectDefinition var2 = class215.getObjectDefinition(var0); + if (var1 == 11) { + var1 = 10; } - class301.writeRandomDat(var2, var1, Client.randomDatData, 0, 24); - if (JagexCache.JagexCache_randomDat == null) { - return; - } - try { - JagexCache.JagexCache_randomDat.seek(0L); - JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); - } catch (Exception var4) { + if (var1 >= 5 && var1 <= 8) { + var1 = 4; } + return var2.method4505(var1); } } diff --git a/runescape-client/src/main/java/Wrapper.java b/runescape-client/src/main/java/Wrapper.java index 8f60620906..8516b42526 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("ew") +@ObfuscatedName("ed") @Implements("Wrapper") public abstract class Wrapper extends DualNode { - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("size") final int size; @@ -13,11 +13,11 @@ public abstract class Wrapper extends DualNode { this.size = var1; } - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("get") abstract Object get(); - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("isSoft") abstract boolean isSoft(); } diff --git a/runescape-client/src/main/java/class0.java b/runescape-client/src/main/java/class0.java index 2d15b348a6..24ae1c9e95 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("q") +@ObfuscatedName("s") public interface class0 { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ljava/lang/Object;Lkf;I)V", - garbageValue = "1977897097" + signature = "(Ljava/lang/Object;Lky;I)V", + garbageValue = "254789492" ) - void vmethod43(Object var1, Buffer var2); + void vmethod58(Object var1, Buffer var2); - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkf;I)Ljava/lang/Object;", - garbageValue = "-408972538" + signature = "(Lky;I)Ljava/lang/Object;", + garbageValue = "1267204541" ) - Object vmethod42(Buffer var1); + Object vmethod70(Buffer var1); } diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index 7cc0b66ad7..1d60d2bf5f 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -1,424 +1,324 @@ -import java.io.File; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("w") +@ObfuscatedName("j") final class class1 implements class0 { - @ObfuscatedName("k") - @Export("cacheDir") - static File cacheDir; - @ObfuscatedName("fx") - @ObfuscatedGetter( - intValue = 768104753 - ) - @Export("baseY") - static int baseY; - @ObfuscatedName("hb") - @ObfuscatedGetter( - intValue = 1283296175 - ) - @Export("cameraZ") - static int cameraZ; - - @ObfuscatedName("q") + @ObfuscatedName("bj") @ObfuscatedSignature( - signature = "(Ljava/lang/Object;Lkf;I)V", - garbageValue = "1977897097" + signature = "[Llq;" ) - public void vmethod43(Object var1, Buffer var2) { - this.method6((Integer)var1, var2); + @Export("worldSelectFlagSprites") + static IndexedSprite[] worldSelectFlagSprites; + @ObfuscatedName("bq") + static String field6; + @ObfuscatedName("iz") + @ObfuscatedGetter( + intValue = 517474423 + ) + @Export("selectedItemId") + static int selectedItemId; + @ObfuscatedName("kp") + @ObfuscatedGetter( + intValue = -333767243 + ) + @Export("menuHeight") + static int menuHeight; + @ObfuscatedName("lk") + @ObfuscatedSignature( + signature = "Lcd;" + ) + @Export("tempMenuAction") + static MenuAction tempMenuAction; + + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(Ljava/lang/Object;Lky;I)V", + garbageValue = "254789492" + ) + public void vmethod58(Object var1, Buffer var2) { + this.method9((Integer)var1, var2); } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkf;I)Ljava/lang/Object;", - garbageValue = "-408972538" + signature = "(Lky;I)Ljava/lang/Object;", + garbageValue = "1267204541" ) - public Object vmethod42(Buffer var1) { + public Object vmethod70(Buffer var1) { return var1.readInt(); } - @ObfuscatedName("l") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ljava/lang/Integer;Lkf;I)V", - garbageValue = "982248566" + signature = "(Ljava/lang/Integer;Lky;I)V", + garbageValue = "-1964979998" ) - void method6(Integer var1, Buffer var2) { + void method9(Integer var1, Buffer var2) { var2.writeInt(var1); } - @ObfuscatedName("u") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "84" + signature = "(II)V", + garbageValue = "1888870541" ) - static final int method14(int var0, int var1) { - int var2 = FloorOverlayDefinition.method4757(45365 + var0, 91923 + var1, 4) - 128 + (FloorOverlayDefinition.method4757(var0 + 10294, var1 + 37821, 2) - 128 >> 1) + (FloorOverlayDefinition.method4757(var0, var1, 1) - 128 >> 2); - var2 = (int)((double)var2 * 0.3D) + 35; - if (var2 < 10) { - var2 = 10; - } else if (var2 > 60) { - var2 = 60; + static void method21(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var1 != null) { + var1.remove(); } - - return var2; } - @ObfuscatedName("r") + @ObfuscatedName("fi") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)Ljava/lang/String;", - garbageValue = "-89" + signature = "(B)V", + garbageValue = "1" ) - public static String method17(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 = var5; - } else { - var6 = Character.toTitleCase(var5); - } - - var5 = var6; - } - - if (Character.isLetter(var5)) { - var3 = 0; - } else if (var5 == '.' || var5 == '?' || var5 == '!') { - var3 = 2; - } else if (!Character.isSpaceChar(var5)) { - var3 = 1; - } else if (var3 != 2) { - var3 = 1; - } - - var2[var4] = var5; - } - - return new String(var2); + static final void method18() { + FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); + KitDefinition.KitDefinition_cached.clear(); + FontName.ObjectDefinition_clearCached(); + ArchiveLoader.NpcDefinition_clearCached(); + TileItemPile.method2700(); + SequenceDefinition.SequenceDefinition_cached.clear(); + SequenceDefinition.SequenceDefinition_cachedFrames.clear(); + TileItem.method2048(); + GrandExchangeOfferUnitPriceComparator.VarbitDefinition_clearCached(); + class51.method846(); + WorldMapData_0.method177(); + InvDefinition.HealthBarDefinition_clearCached(); + StructDefinition.StructDefinition_cached.clear(); + class13.ParamDefinition_clearCached(); + WorldMapSection2.WorldMapElement_clearCached(); + PlayerAppearance.PlayerAppearance_cachedModels.clear(); + GrandExchangeOfferAgeComparator.Widget_clearCached(); + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); + Script.Script_cached.clear(); + Client.archive0.clearFiles(); + class269.archive1.clearFiles(); + UserComparator8.archive3.clearFiles(); + WorldMapSprite.archive4.clearFiles(); + WorldMapDecoration.archive5.clearFiles(); + GrandExchangeEvent.archive6.clearFiles(); + class51.archive7.clearFiles(); + class2.archive8.clearFiles(); + WorldMapDecoration.archive9.clearFiles(); + GameObject.archive10.clearFiles(); + WorldMapRectangle.archive11.clearFiles(); + GameShell.archive12.clearFiles(); } - @ObfuscatedName("gq") + @ObfuscatedName("fq") @ObfuscatedSignature( - signature = "(Lgw;I)V", - garbageValue = "-472781511" + signature = "(Lbu;II)V", + garbageValue = "504714765" ) - static final void method10(class185 var0) { - PacketBuffer var1 = Client.packetWriter.packetBuffer; - - if (class185.field2320 == var0) { - int var2 = var1.method5525(); - int var3 = var2 >> 2; - int var4 = var2 & 3; - int var5 = Client.field713[var3]; - int var6 = var1.method5525(); - int var7 = (var6 >> 4 & 7) + DefaultsGroup.field3819; - int var8 = (var6 & 7) + ChatChannel.field1306; - if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { - MusicPatch.updatePendingSpawn(class42.plane, var7, var8, var5, -1, var3, var4, 0, -1); - } - return; - } - if (class185.field2321 == var0) { - int var2 = var1.method5722(); - int var3 = (var2 >> 4 & 7) + DefaultsGroup.field3819; - int var4 = (var2 & 7) + ChatChannel.field1306; - int var5 = var1.method5534(); - if (var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) { - return; - } - NodeDeque var31 = Client.groundItems[class42.plane][var3][var4]; - if (var31 == null) { - return; - } - for (TileItem var32 = (TileItem)var31.last(); var32 != null; var32 = (TileItem)var31.previous()) { - if ((var5 & 0x7fff) == var32.id) { - var32.remove(); - break; + @Export("calculateActorPosition") + static final void calculateActorPosition(Actor var0, int var1) { + if (var0.field941 > Client.cycle) { + Tiles.method1075(var0); + } else { + int var2; + int var3; + int var4; + int var5; + int var7; + if (var0.field965 >= Client.cycle) { + if (var0.field965 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > Widget.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { + var2 = var0.field965 - var0.field941; + var3 = Client.cycle - var0.field941; + var4 = var0.field960 * 128 + var0.size * -178253824; + var5 = var0.field954 * 128 + var0.size * -178253824; + int var6 = var0.field961 * 128 + var0.size * -178253824; + var7 = var0.field963 * 128 + var0.size * -178253824; + var0.x = (var6 * var3 + var4 * (var2 - var3)) / var2; + var0.y = (var3 * var7 + var5 * (var2 - var3)) / var2; } - } - if (var31.last() == null) { - Client.groundItems[class42.plane][var3][var4] = null; - } - - GrandExchangeOfferWorldComparator.updateItemPile(var3, var4); - return; - } - if (class185.field2316 == var0) { - int var2 = var1.method5525() * 4; - int var3 = var1.readUnsignedShort(); - int var4 = var1.method5518(); - int var5 = var1.method5525() * 4; - int var6 = var1.method5535(); - int var7 = var1.readUnsignedByte(); - int var8 = var1.method5525(); - int var9 = var1.method5532(); - int var10 = var1.method5722(); - int var39 = (var10 >> 4 & 7) + DefaultsGroup.field3819; - int var12 = (var10 & 7) + ChatChannel.field1306; - byte var13 = var1.method5694(); - byte var40 = var1.method5527(); - int var14 = var40 + var39; - int var41 = var13 + var12; - if (var39 < 0 || var12 < 0 || var39 >= 104 || var12 >= 104 || var14 < 0 || var41 < 0 || var14 >= 104 || var41 >= 104 || var4 == 0xffff) { - return; - } - var39 = var39 * 128 + 64; - var12 = var12 * 128 + 64; - var14 = var14 * 128 + 64; - var41 = var41 * 128 + 64; - Projectile var15 = new Projectile(var4, class42.plane, var39, var12, ScriptEvent.getTileHeight(var39, var12, class42.plane) - var5, var9 + Client.cycle, var3 + Client.cycle, var7, var8, var6, var2); - var15.setDestination(var14, var41, ScriptEvent.getTileHeight(var14, var41, class42.plane) - var2, var9 + Client.cycle); - Client.projectiles.addFirst(var15); - return; - } - if (class185.field2322 == var0) { - int var2 = var1.method5532(); - int var3 = var1.method5534(); - int var4 = var1.method5532(); - int var5 = var1.method5722(); - int var6 = (var5 >> 4 & 7) + DefaultsGroup.field3819; - int var7 = (var5 & 7) + ChatChannel.field1306; - if (var6 < 0 || var7 < 0 || var6 >= 104 || var7 >= 104) { - return; - } - NodeDeque var42 = Client.groundItems[class42.plane][var6][var7]; - if (var42 == null) { - return; - } - for (TileItem var34 = (TileItem)var42.last(); var34 != null; var34 = (TileItem)var42.previous()) { - if ((var2 & 0x7fff) == var34.id && var4 == var34.quantity) { - var34.quantity = var3; - break; - } - } - - GrandExchangeOfferWorldComparator.updateItemPile(var6, var7); - return; - } - if (class185.field2315 == var0) { - int var2 = var1.method5518(); - int var3 = var1.method5534(); - int var4 = var1.method5722(); - int var5 = (var4 >> 4 & 7) + DefaultsGroup.field3819; - int var6 = (var4 & 7) + ChatChannel.field1306; - if (var5 < 0 || var6 < 0 || var5 >= 104 || var6 >= 104) { - return; - } - TileItem var32 = new TileItem(); - var32.id = var3; - var32.quantity = var2; - if (Client.groundItems[class42.plane][var5][var6] == null) { - Client.groundItems[class42.plane][var5][var6] = new NodeDeque(); - } - - Client.groundItems[class42.plane][var5][var6].addFirst(var32); - GrandExchangeOfferWorldComparator.updateItemPile(var5, var6); - return; - } - if (class185.field2319 == var0) { - int var2 = var1.readUnsignedByte(); - int var3 = (var2 >> 4 & 7) + DefaultsGroup.field3819; - int var4 = (var2 & 7) + ChatChannel.field1306; - int var5 = var1.method5525(); - int var6 = var1.method5722(); - int var7 = var6 >> 4 & 15; - int var8 = var6 & 7; - int var9 = var1.method5534(); - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { - int var10 = var7 + 1; - if (Client.localPlayer.pathX[0] >= var3 - var10 && Client.localPlayer.pathX[0] <= var3 + var10 && Client.localPlayer.pathY[0] >= var4 - var10 && Client.localPlayer.pathY[0] <= var4 + var10 && Client.field892 != 0 && var8 > 0 && Client.soundEffectCount < 50) { - Client.soundEffectIds[Client.soundEffectCount] = var9; - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var8; - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var5; - Client.soundEffects[Client.soundEffectCount] = null; - Client.soundLocations[Client.soundEffectCount] = var7 + (var4 << 8) + (var3 << 16); - ++Client.soundEffectCount; - } - } - } - - if (class185.field2318 == var0) { - byte var37 = var1.method5527(); - int var3 = var1.method5534(); - byte var38 = var1.method5527(); - int var5 = var1.method5518(); - int var6 = var1.readUnsignedShort(); - int var7 = var1.method5722(); - int var8 = var7 >> 2; - int var9 = var7 & 3; - int var10 = Client.field713[var8]; - byte var11 = var1.method5694(); - int var12 = var1.method5532(); - byte var13 = var1.method5527(); - int var14 = var1.readUnsignedByteNegate(); - int var35 = (var14 >> 4 & 7) + DefaultsGroup.field3819; - int var16 = (var14 & 7) + ChatChannel.field1306; - Player var17; - if (var12 == Client.localPlayerIndex) { - var17 = Client.localPlayer; + var0.field976 = 0; + var0.orientation = var0.field966; + var0.rotation = var0.orientation; } else { - var17 = Client.players[var12]; - } - - if (var17 != null) { - ObjectDefinition var18 = ViewportMouse.getObjectDefinition(var5); - int var19; - int var20; - if (var9 != 1 && var9 != 3) { - var19 = var18.sizeX; - var20 = var18.sizeY; + var0.movementSequence = var0.readySequence; + if (var0.pathLength == 0) { + var0.field976 = 0; } else { - var19 = var18.sizeY; - var20 = var18.sizeX; - } + label301: { + if (var0.sequence != -1 && var0.sequenceDelay == 0) { + SequenceDefinition var11 = Widget.SequenceDefinition_get(var0.sequence); + if (var0.field947 > 0 && var11.field3506 == 0) { + ++var0.field976; + break label301; + } - int var21 = var35 + (var19 >> 1); - int var22 = var35 + (var19 + 1 >> 1); - int var23 = var16 + (var20 >> 1); - int var24 = var16 + (var20 + 1 >> 1); - int[][] var25 = Tiles.Tiles_heights[class42.plane]; - int var26 = var25[var22][var23] + var25[var21][var23] + var25[var21][var24] + var25[var22][var24] >> 2; - int var27 = (var35 << 7) + (var19 << 6); - int var28 = (var16 << 7) + (var20 << 6); - Model var29 = var18.getModel(var8, var9, var25, var27, var26, var28); - if (var29 != null) { - MusicPatch.updatePendingSpawn(class42.plane, var35, var16, var10, -1, 0, 0, var6 + 1, var3 + 1); - var17.animationCycleStart = var6 + Client.cycle; - var17.animationCycleEnd = var3 + Client.cycle; - var17.model0 = var29; - var17.field633 = var35 * 128 + var19 * 64; - var17.field620 = var16 * 128 + var20 * 64; - var17.tileHeight2 = var26; - byte var30; - if (var37 > var13) { - var30 = var37; - var37 = var13; - var13 = var30; + if (var0.field947 <= 0 && var11.field3505 == 0) { + ++var0.field976; + break label301; + } + } + + var2 = var0.x; + var3 = var0.y; + var4 = var0.pathX[var0.pathLength - 1] * 128 + var0.size * -178253824; + var5 = var0.pathY[var0.pathLength - 1] * 128 + var0.size * -178253824; + if (var2 < var4) { + if (var3 < var5) { + var0.orientation = 1280; + } else if (var3 > var5) { + var0.orientation = 1792; + } else { + var0.orientation = 1536; + } + } else if (var2 > var4) { + if (var3 < var5) { + var0.orientation = 768; + } else if (var3 > var5) { + var0.orientation = 256; + } else { + var0.orientation = 512; + } + } else if (var3 < var5) { + var0.orientation = 1024; + } else if (var3 > var5) { + var0.orientation = 0; + } + + byte var12 = var0.pathTraversed[var0.pathLength - 1]; + if (var4 - var2 <= 256 && var4 - var2 >= -256 && var5 - var3 <= 256 && var5 - var3 >= -256) { + 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.field971 != 0) { + var9 = 2; + } + + if (var0.pathLength > 2) { + var9 = 6; + } + + if (var0.pathLength > 3) { + var9 = 8; + } + + if (var0.field976 > 0 && var0.pathLength > 1) { + var9 = 8; + --var0.field976; + } + } else { + if (var0.pathLength > 1) { + var9 = 6; + } + + if (var0.pathLength > 2) { + var9 = 8; + } + + if (var0.field976 > 0 && var0.pathLength > 1) { + var9 = 8; + --var0.field976; + } + } + + if (var12 == 2) { + var9 <<= 1; + } + + if (var9 >= 8 && var0.movementSequence == var0.walkSequence && var0.runSequence != -1) { + var0.movementSequence = var0.runSequence; + } + + if (var4 != var2 || var5 != var3) { + if (var2 < var4) { + var0.x += var9; + if (var0.x > var4) { + var0.x = var4; + } + } else if (var2 > var4) { + var0.x -= var9; + if (var0.x < var4) { + var0.x = var4; + } + } + + if (var3 < var5) { + var0.y += var9; + if (var0.y > var5) { + var0.y = var5; + } + } else if (var3 > var5) { + var0.y -= var9; + if (var0.y < var5) { + var0.y = var5; + } + } + } + + if (var4 == var0.x && var5 == var0.y) { + --var0.pathLength; + if (var0.field947 > 0) { + --var0.field947; + } + } + } else { + var0.x = var4; + var0.y = var5; + --var0.pathLength; + if (var0.field947 > 0) { + --var0.field947; + } + } } - - if (var11 > var38) { - var30 = var11; - var11 = var38; - var38 = var30; - } - - var17.field627 = var35 + var37; - var17.field612 = var35 + var13; - var17.field625 = var11 + var16; - var17.field630 = var16 + var38; } } } - if (class185.field2323 == var0) { - int var2 = var1.method5722(); - int var3 = (var2 >> 4 & 7) + DefaultsGroup.field3819; - int var4 = (var2 & 7) + ChatChannel.field1306; - int var5 = var1.method5525(); - int var6 = var5 >> 2; - int var7 = var5 & 3; - int var8 = Client.field713[var6]; - int var9 = var1.method5518(); - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { - MusicPatch.updatePendingSpawn(class42.plane, var3, var4, var8, var9, var6, var7, 0, -1); - } - return; + if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { + var0.sequence = -1; + var0.spotAnimation = -1; + var0.field941 = 0; + var0.field965 = 0; + var0.x = var0.pathX[0] * 128 + var0.size * -178253824; + var0.y = var0.size * -178253824 + var0.pathY[0] * 128; + var0.method1671(); } - if (class185.field2317 == var0) { - int var2 = var1.readUnsignedShort(); - int var3 = var1.method5722(); - int var4 = var1.method5518(); - int var5 = var1.readUnsignedByte(); - int var6 = (var5 >> 4 & 7) + DefaultsGroup.field3819; - int var7 = (var5 & 7) + ChatChannel.field1306; - if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { - var6 = var6 * 128 + 64; - var7 = var7 * 128 + 64; - GraphicsObject var33 = new GraphicsObject(var2, class42.plane, var6, var7, ScriptEvent.getTileHeight(var6, var7, class42.plane) - var3, var4, Client.cycle); - Client.graphicsObjects.addFirst(var33); - } - return; + + if (WorldMapIcon_1.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { + var0.sequence = -1; + var0.spotAnimation = -1; + var0.field941 = 0; + var0.field965 = 0; + var0.x = var0.size * -178253824 + var0.pathX[0] * 128; + var0.y = var0.size * -178253824 + var0.pathY[0] * 128; + var0.method1671(); } - if (class185.field2324 == var0) { - int var2 = var1.method5525(); - int var3 = var2 >> 2; - int var4 = var2 & 3; - int var5 = Client.field713[var3]; - int var6 = var1.readUnsignedByteNegate(); - int var7 = (var6 >> 4 & 7) + DefaultsGroup.field3819; - int var8 = (var6 & 7) + ChatChannel.field1306; - int var9 = var1.readUnsignedShort(); - if (var7 < 0 || var8 < 0 || var7 >= 103 || var8 >= 103) { - return; - } - if (var5 == 0) { - BoundaryObject var36 = GrandExchangeOfferWorldComparator.scene.method3088(class42.plane, var7, var8); - if (var36 != null) { - int var39 = class43.Entity_unpackID(var36.tag); - if (var3 == 2) { - var36.entity1 = new DynamicObject(var39, 2, var4 + 4, class42.plane, var7, var8, var9, false, var36.entity1); - var36.entity2 = new DynamicObject(var39, 2, var4 + 1 & 3, class42.plane, var7, var8, var9, false, var36.entity2); - } else { - var36.entity1 = new DynamicObject(var39, var3, var4, class42.plane, var7, var8, var9, false, var36.entity1); - } - } - } - if (var5 == 1) { - WallDecoration var43 = GrandExchangeOfferWorldComparator.scene.method3118(class42.plane, var7, var8); - if (var43 != null) { - int var39 = class43.Entity_unpackID(var43.tag); - if (var3 == 4 || var3 == 5) { - var43.entity1 = new DynamicObject(var39, 4, var4, class42.plane, var7, var8, var9, false, var43.entity1); - } else if (var3 == 6) { - var43.entity1 = new DynamicObject(var39, 4, var4 + 4, class42.plane, var7, var8, var9, false, var43.entity1); - } else if (var3 == 7) { - var43.entity1 = new DynamicObject(var39, 4, (var4 + 2 & 3) + 4, class42.plane, var7, var8, var9, false, var43.entity1); - } else if (var3 == 8) { - var43.entity1 = new DynamicObject(var39, 4, var4 + 4, class42.plane, var7, var8, var9, false, var43.entity1); - var43.entity2 = new DynamicObject(var39, 4, (var4 + 2 & 3) + 4, class42.plane, var7, var8, var9, false, var43.entity2); - } - } - } - - if (var5 == 2) { - GameObject var44 = GrandExchangeOfferWorldComparator.scene.method3195(class42.plane, var7, var8); - if (var3 == 11) { - var3 = 10; - } - - if (var44 != null) { - var44.entity = new DynamicObject(class43.Entity_unpackID(var44.tag), var3, var4, class42.plane, var7, var8, var9, false, var44.entity); - } - } - - if (var5 == 3) { - FloorDecoration var45 = GrandExchangeOfferWorldComparator.scene.getFloorDecoration(class42.plane, var7, var8); - if (var45 != null) { - var45.entity = new DynamicObject(class43.Entity_unpackID(var45.tag), 22, var4, class42.plane, var7, var8, var9, false, var45.entity); - } - } - } - } - - @ObfuscatedName("hl") - @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "1662351965" - ) - @Export("isWidgetMenuOpcode") - static boolean isWidgetMenuOpcode(int var0) { - return var0 == 57 || var0 == 58 || var0 == 1007 || var0 == 25 || var0 == 30; + class65.method1178(var0); + GrandExchangeOfferNameComparator.method149(var0); } } diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java index 3c35fcf90e..0508eee623 100644 --- a/runescape-client/src/main/java/class13.java +++ b/runescape-client/src/main/java/class13.java @@ -1,71 +1,70 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("r") +@ObfuscatedName("y") public class class13 { - @ObfuscatedName("dp") - @ObfuscatedSignature( - signature = "Liu;" + @ObfuscatedName("ph") + @Export("ClanChat_inClanChat") + static boolean ClanChat_inClanChat; + @ObfuscatedName("u") + @Export("ArchiveDiskActionHandler_thread") + static Thread ArchiveDiskActionHandler_thread; + @ObfuscatedName("fl") + @ObfuscatedGetter( + intValue = 251089855 ) - @Export("archive4") - static Archive archive4; - @ObfuscatedName("gp") - @Export("regionLandArchives") - static byte[][] regionLandArchives; + static int field86; - @ObfuscatedName("bi") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)I", - garbageValue = "-1481103738" + signature = "(II)V", + garbageValue = "-2019445380" ) - public static int method152(String var0) { - return var0.length() + 2; - } - - @ObfuscatedName("ht") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "246973533" - ) - @Export("getNewestMenuIdx") - static final int getNewestMenuIdx() { - return Client.menuOptionsCount - 1; - } - - @ObfuscatedName("ic") - @ObfuscatedSignature( - signature = "([Lhj;IIIZI)V", - garbageValue = "1879036172" - ) - @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) { - class219.alignWidgetSize(var6, var2, var3, var4); - PcmPlayer.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) { - WorldMapSprite.revalidateWidgetScroll(var0, var6, var4); - } + @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("n") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1076455788" + ) + @Export("ParamDefinition_clearCached") + public static void ParamDefinition_clearCached() { + ParamDefinition.ParamDefinition_cached.clear(); + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(III)I", + garbageValue = "1012366175" + ) + static final int method162(int var0, int var1) { + int var2 = WorldMapAreaData.method650(var0 - 1, var1 - 1) + WorldMapAreaData.method650(1 + var0, var1 - 1) + WorldMapAreaData.method650(var0 - 1, var1 + 1) + WorldMapAreaData.method650(var0 + 1, var1 + 1); + int var3 = WorldMapAreaData.method650(var0 - 1, var1) + WorldMapAreaData.method650(var0 + 1, var1) + WorldMapAreaData.method650(var0, var1 - 1) + WorldMapAreaData.method650(var0, 1 + var1); + int var4 = WorldMapAreaData.method650(var0, var1); + return var2 / 16 + var3 / 8 + var4 / 4; + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1410119824" + ) + static void method163() { + Login.worldSelectOpen = false; + Login.leftTitleSprite.drawAt(Login.xPadding, 0); + Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + class51.logoSprite.drawAt(Login.xPadding + 382 - class51.logoSprite.subWidth / 2, 18); } } diff --git a/runescape-client/src/main/java/class14.java b/runescape-client/src/main/java/class14.java index 2cf5ddb304..5756754d01 100644 --- a/runescape-client/src/main/java/class14.java +++ b/runescape-client/src/main/java/class14.java @@ -1,97 +1,77 @@ -import java.util.Date; -import java.util.concurrent.ScheduledExecutorService; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import netscape.javascript.JSObject; -@ObfuscatedName("v") +@ObfuscatedName("p") public class class14 { - @ObfuscatedName("i") - @Export("soundSystemExecutor") - static ScheduledExecutorService soundSystemExecutor; - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "2056666863" - ) - @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; - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(Lhj;IIII)V", - garbageValue = "-2006801653" - ) - @Export("Widget_setKeyRate") - static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { - if (var0.field2641 == null) { - throw new RuntimeException(); - } - var0.field2641[var1] = var2; - var0.field2588[var1] = var3; - } - @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ljava/lang/String;II)V", - garbageValue = "1053602258" + signature = "(CI)B", + garbageValue = "-1488757001" ) - static final void method159(String var0, int var1) { - PacketBufferNode var2 = Archive.getPacketBufferNode(ClientPacket.field2280, Client.packetWriter.isaacCipher); - var2.packetBuffer.writeByte(Huffman.stringCp1252NullTerminatedByteSize(var0) + 1); - var2.packetBuffer.writeStringCp1252NullTerminated(var0); - var2.packetBuffer.writeByte(var1); - Client.packetWriter.addNode(var2); - } - - @ObfuscatedName("kk") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "-27" - ) - static void method155(String var0) { - class294.field3695 = var0; - - try { - String var1 = WorldMapSprite.client.getParameter(ClientParameter.field3587.id); - String var2 = WorldMapSprite.client.getParameter(ClientParameter.field3594.id); - String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; - String var5; - if (var0.length() == 0) { - var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; - } else { - String var4 = var3 + "; Expires="; - long var6 = DirectByteArrayCopier.currentTimeMs() + 94608000000L; - Calendar.Calendar_calendar.setTime(new Date(var6)); - int var8 = Calendar.Calendar_calendar.get(7); - int var9 = Calendar.Calendar_calendar.get(5); - int var10 = Calendar.Calendar_calendar.get(2); - int var11 = Calendar.Calendar_calendar.get(1); - int var12 = Calendar.Calendar_calendar.get(11); - int var13 = Calendar.Calendar_calendar.get(12); - int var14 = Calendar.Calendar_calendar.get(13); - var5 = Calendar.DAYS_OF_THE_WEEK[var8 - 1] + ", " + var9 / 10 + var9 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var10] + "-" + var11 + " " + var12 / 10 + var12 % 10 + ":" + var13 / 10 + var13 % 10 + ":" + var14 / 10 + var14 % 10 + " GMT"; - var3 = var4 + var5 + "; Max-Age=" + 94608000L; - } - - Client var16 = WorldMapSprite.client; - var5 = "document.cookie=\"" + var3 + "\""; - JSObject.getWindow(var16).eval(var5); - } catch (Throwable var15) { + @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; } + return var1; } } diff --git a/runescape-client/src/main/java/class146.java b/runescape-client/src/main/java/class146.java index bc1f274e98..e5ef595047 100644 --- a/runescape-client/src/main/java/class146.java +++ b/runescape-client/src/main/java/class146.java @@ -1,7 +1,7 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ep") +@ObfuscatedName("ek") public interface class146 { - @ObfuscatedName("q") - void method3338(Object var1); + @ObfuscatedName("s") + void method3280(Object var1); } diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java index ddccf5eb22..cc1b1d96e2 100644 --- a/runescape-client/src/main/java/class16.java +++ b/runescape-client/src/main/java/class16.java @@ -1,21 +1,67 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("g") public class class16 { - @ObfuscatedName("r") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "572816821" + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -2115324593 ) - @Export("SpriteBuffer_clear") - public static void SpriteBuffer_clear() { - Varps.SpriteBuffer_xOffsets = null; - SpriteBuffer.SpriteBuffer_yOffsets = null; - SpriteBuffer.SpriteBuffer_spriteWidths = null; - class216.SpriteBuffer_spriteHeights = null; - Frames.SpriteBuffer_spritePalette = null; - SpriteBuffer.SpriteBuffer_pixels = null; + public static int field98; + @ObfuscatedName("fk") + @ObfuscatedGetter( + intValue = -713701469 + ) + static int field101; + + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(I)[Lge;", + garbageValue = "1297368600" + ) + static LoginPacket[] method183() { + return new LoginPacket[]{LoginPacket.field2291, LoginPacket.field2292, LoginPacket.field2289, LoginPacket.field2295, LoginPacket.field2293}; + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(Lls;IIII)V", + garbageValue = "-1463584611" + ) + static void method181(Sprite var0, int var1, int var2, int var3) { + WorldMapRegion.WorldMapRegion_cachedSprites.put(var0, ClientPacket.getWorldMapSpriteHash(var1, var2, var3), var0.pixels.length * 4); + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(II)Ljava/lang/String;", + garbageValue = "-1438659033" + ) + @Export("colorStartTag") + static String colorStartTag(int var0) { + return ""; + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(IB)Lin;", + garbageValue = "91" + ) + public static VarpDefinition method180(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)); + } + + VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); + return var1; + } } } diff --git a/runescape-client/src/main/java/class160.java b/runescape-client/src/main/java/class160.java index 518801257f..acaf038fa0 100644 --- a/runescape-client/src/main/java/class160.java +++ b/runescape-client/src/main/java/class160.java @@ -5,51 +5,97 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("fn") public enum class160 implements Enumerated { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "Lfn;" ) - field2005(0, 0), - @ObfuscatedName("w") + field1988(2, 0), + @ObfuscatedName("j") @ObfuscatedSignature( signature = "Lfn;" ) - field2004(1, 1), - @ObfuscatedName("e") + field1982(1, 1), + @ObfuscatedName("i") @ObfuscatedSignature( signature = "Lfn;" ) - field2001(3, 2), - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lfn;" - ) - field2002(2, 3); - + field1984(3, 2), @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 1749572197 + @ObfuscatedSignature( + signature = "Lfn;" ) - public final int field2003; - @ObfuscatedName("l") + field1983(0, 3); + + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 962065171 + intValue = -1967639255 + ) + public final int field1986; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -2042694255 ) @Export("id") final int id; class160(int var3, int var4) { - this.field2003 = var3; + this.field1986 = var3; this.id = var4; } - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "320353268" + signature = "(B)I", + garbageValue = "-32" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(IB)I", + garbageValue = "1" + ) + @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("u") + @ObfuscatedSignature( + signature = "(IIS)I", + garbageValue = "338" + ) + static int method3383(int var0, int var1) { + long var2 = (long)((var0 << 16) + var1); + return NetCache.NetCache_currentResponse != null && NetCache.NetCache_currentResponse.key == var2 ? NetCache.NetCache_responseArchiveBuffer.offset * 99 / (NetCache.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding) + 1 : 0; + } } diff --git a/runescape-client/src/main/java/class161.java b/runescape-client/src/main/java/class161.java index 9fb2ce188e..a608255fcb 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("fr") +@ObfuscatedName("fc") public interface class161 { } diff --git a/runescape-client/src/main/java/class162.java b/runescape-client/src/main/java/class162.java index df025d4947..e57b42347f 100644 --- a/runescape-client/src/main/java/class162.java +++ b/runescape-client/src/main/java/class162.java @@ -2,48 +2,12 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fm") +@ObfuscatedName("fv") public class class162 implements class161 { - @ObfuscatedName("p") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "1772418873" + signature = "Lag;" ) - @Export("loadInterface") - public static boolean loadInterface(int var0) { - if (ViewportMouse.Widget_loadedInterfaces[var0]) { - return true; - } - if (!Widget.Widget_archive.tryLoadGroup(var0)) { - return false; - } - int var1 = Widget.Widget_archive.getGroupFileCount(var0); - if (var1 == 0) { - ViewportMouse.Widget_loadedInterfaces[var0] = true; - return true; - } - if (Widget.Widget_interfaceComponents[var0] == null) { - Widget.Widget_interfaceComponents[var0] = new Widget[var1]; - } - - for (int var2 = 0; var2 < var1; ++var2) { - if (Widget.Widget_interfaceComponents[var0][var2] != null) { - continue; - } - byte[] var3 = Widget.Widget_archive.takeFile(var0, var2); - if (var3 == null) { - continue; - } - Widget.Widget_interfaceComponents[var0][var2] = new Widget(); - Widget.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); - if (var3[0] == -1) { - Widget.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); - } else { - Widget.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); - } - } - - ViewportMouse.Widget_loadedInterfaces[var0] = true; - return true; - } + @Export("worldMapEvent") + static WorldMapEvent worldMapEvent; } diff --git a/runescape-client/src/main/java/class173.java b/runescape-client/src/main/java/class173.java index 35cc23181e..37ace3a2d5 100644 --- a/runescape-client/src/main/java/class173.java +++ b/runescape-client/src/main/java/class173.java @@ -1,33 +1,38 @@ +import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fo") +@ObfuscatedName("fx") public class class173 { - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("directions") public static int[][] directions; - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("distances") public static int[][] distances; - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1613442925 + intValue = -1891183659 ) - public static int field2088; - @ObfuscatedName("i") + public static int field2073; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 783444493 + ) + public static int field2070; + @ObfuscatedName("q") @Export("bufferX") public static int[] bufferX; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("bufferY") public static int[] bufferY; - @ObfuscatedName("gq") - @ObfuscatedSignature( - signature = "[Lly;" + @ObfuscatedName("ah") + @ObfuscatedGetter( + intValue = -1559987227 ) - @Export("headIconHintSprites") - static Sprite[] headIconHintSprites; + static int field2079; static { directions = new int[128][128]; @@ -36,17 +41,56 @@ public class class173 { bufferY = new int[4096]; } - @ObfuscatedName("r") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(I)Lfu;", - garbageValue = "-1483717574" + signature = "(I)Z", + garbageValue = "-146894719" ) - @Export("newClock") - public static Clock newClock() { + @Export("loadWorlds") + static boolean loadWorlds() { try { - return new NanoClock(); - } catch (Throwable var1) { - return new MilliClock(); + if (IgnoreList.World_request == null) { + IgnoreList.World_request = ScriptEvent.urlRequester.request(new URL(class1.field6)); + } else if (IgnoreList.World_request.isDone()) { + byte[] var0 = IgnoreList.World_request.getResponse(); + Buffer var1 = new Buffer(var0); + var1.readInt(); + World.World_count = var1.readUnsignedShort(); + ChatChannel.World_worlds = new World[World.World_count]; + + World var3; + for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { + var3 = ChatChannel.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(); + } + + Tile.sortWorlds(ChatChannel.World_worlds, 0, ChatChannel.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); + IgnoreList.World_request = null; + return true; + } + } catch (Exception var4) { + var4.printStackTrace(); + IgnoreList.World_request = null; + } + + return false; + } + + @ObfuscatedName("kw") + @ObfuscatedSignature( + signature = "(Lhp;I)Ljava/lang/String;", + garbageValue = "1595503156" + ) + static String method3529(Widget var0) { + if (WorldMapRegion.method530(ParamDefinition.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/class181.java b/runescape-client/src/main/java/class181.java new file mode 100644 index 0000000000..91a32c4bed --- /dev/null +++ b/runescape-client/src/main/java/class181.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("fw") +public interface class181 { +} diff --git a/runescape-client/src/main/java/class185.java b/runescape-client/src/main/java/class185.java index ec4975c67a..8a4583c041 100644 --- a/runescape-client/src/main/java/class185.java +++ b/runescape-client/src/main/java/class185.java @@ -1,71 +1,78 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gw") +@ObfuscatedName("gt") public class class185 { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lgw;" + signature = "Lgt;" ) - public static final class185 field2322; - @ObfuscatedName("w") + public static final class185 field2301; + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lgw;" + signature = "Lgt;" ) - public static final class185 field2316; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lgw;" - ) - public static final class185 field2318; - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lgw;" - ) - public static final class185 field2317; - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Lgw;" - ) - public static final class185 field2324; - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "Lgw;" - ) - public static final class185 field2319; - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Lgw;" - ) - public static final class185 field2320; + public static final class185 field2306; @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lgw;" + signature = "Lgt;" ) - public static final class185 field2321; - @ObfuscatedName("c") + public static final class185 field2298; + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lgw;" + signature = "Lgt;" ) - public static final class185 field2315; - @ObfuscatedName("f") + public static final class185 field2299; + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lgw;" + signature = "Lgt;" ) - public static final class185 field2323; + public static final class185 field2300; + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "Lgt;" + ) + public static final class185 field2304; + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "Lgt;" + ) + public static final class185 field2302; + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "Lgt;" + ) + public static final class185 field2297; + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "Lgt;" + ) + public static final class185 field2303; + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "Lgt;" + ) + public static final class185 field2305; + @ObfuscatedName("ly") + @ObfuscatedGetter( + intValue = -586438853 + ) + @Export("selectedItemSlot") + static int selectedItemSlot; static { - field2322 = new class185(7); - field2316 = new class185(15); - field2318 = new class185(14); - field2317 = new class185(6); - field2324 = new class185(4); - field2319 = new class185(5); - field2320 = new class185(2); - field2321 = new class185(3); - field2315 = new class185(5); - field2323 = new class185(4); + field2301 = new class185(7); + field2306 = new class185(15); + field2298 = new class185(14); + field2299 = new class185(6); + field2300 = new class185(4); + field2304 = new class185(5); + field2302 = new class185(2); + field2297 = new class185(3); + field2303 = new class185(5); + field2305 = new class185(4); } @ObfuscatedSignature( @@ -74,86 +81,4 @@ public class class185 { ) class185(int var1) { } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(CI)Z", - garbageValue = "2012637233" - ) - @Export("isCharAlphabetic") - public static boolean isCharAlphabetic(char var0) { - return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "([BB)V", - garbageValue = "-41" - ) - @Export("SpriteBuffer_decode") - static void SpriteBuffer_decode(byte[] var0) { - Buffer var1 = new Buffer(var0); - var1.offset = var0.length - 2; - SpriteBuffer.SpriteBuffer_spriteCount = var1.readUnsignedShort(); - Varps.SpriteBuffer_xOffsets = new int[SpriteBuffer.SpriteBuffer_spriteCount]; - SpriteBuffer.SpriteBuffer_yOffsets = new int[SpriteBuffer.SpriteBuffer_spriteCount]; - SpriteBuffer.SpriteBuffer_spriteWidths = new int[SpriteBuffer.SpriteBuffer_spriteCount]; - class216.SpriteBuffer_spriteHeights = new int[SpriteBuffer.SpriteBuffer_spriteCount]; - SpriteBuffer.SpriteBuffer_pixels = new byte[SpriteBuffer.SpriteBuffer_spriteCount][]; - var1.offset = var0.length - 7 - SpriteBuffer.SpriteBuffer_spriteCount * 8; - SpriteBuffer.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); - SpriteBuffer.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); - int var2 = (var1.readUnsignedByte() & 255) + 1; - - int var3; - for (var3 = 0; var3 < SpriteBuffer.SpriteBuffer_spriteCount; ++var3) { - Varps.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < SpriteBuffer.SpriteBuffer_spriteCount; ++var3) { - SpriteBuffer.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < SpriteBuffer.SpriteBuffer_spriteCount; ++var3) { - SpriteBuffer.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < SpriteBuffer.SpriteBuffer_spriteCount; ++var3) { - class216.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); - } - - var1.offset = var0.length - 7 - SpriteBuffer.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; - Frames.SpriteBuffer_spritePalette = new int[var2]; - - for (var3 = 1; var3 < var2; ++var3) { - Frames.SpriteBuffer_spritePalette[var3] = var1.readMedium(); - if (Frames.SpriteBuffer_spritePalette[var3] == 0) { - Frames.SpriteBuffer_spritePalette[var3] = 1; - } - } - - var1.offset = 0; - - for (var3 = 0; var3 < SpriteBuffer.SpriteBuffer_spriteCount; ++var3) { - int var4 = SpriteBuffer.SpriteBuffer_spriteWidths[var3]; - int var5 = class216.SpriteBuffer_spriteHeights[var3]; - int var6 = var5 * var4; - byte[] var7 = new byte[var6]; - SpriteBuffer.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/class186.java b/runescape-client/src/main/java/class186.java index 07dd646560..0b5854e3ab 100644 --- a/runescape-client/src/main/java/class186.java +++ b/runescape-client/src/main/java/class186.java @@ -1,49 +1,9 @@ -import java.io.File; -import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gs") +@ObfuscatedName("go") public class class186 { - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(Ljava/io/File;ZS)Z", - garbageValue = "25650" - ) - @Export("testReadWritePermissions") - static boolean testReadWritePermissions(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; - } - } - - @ObfuscatedName("fz") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "33" - ) - @Export("playPcmPlayers") - static final void playPcmPlayers() { - if (Language.pcmPlayer1 != null) { - Language.pcmPlayer1.run(); - } - - if (class80.pcmPlayer0 != null) { - class80.pcmPlayer0.run(); - } - - } + @ObfuscatedName("ge") + @Export("regions") + static int[] regions; } diff --git a/runescape-client/src/main/java/class188.java b/runescape-client/src/main/java/class188.java index 45ec7f2754..135fbf1b3f 100644 --- a/runescape-client/src/main/java/class188.java +++ b/runescape-client/src/main/java/class188.java @@ -2,309 +2,51 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gp") +@ObfuscatedName("gx") public class class188 { + @ObfuscatedName("s") + static int[] field2326; @ObfuscatedName("q") - static int[] field2339; + static byte[][][] field2321; + @ObfuscatedName("jy") + @ObfuscatedSignature( + signature = "Lhp;" + ) + @Export("dragInventoryWidget") + static Widget dragInventoryWidget; static { new Object(); - field2339 = new int[33]; - field2339[0] = 0; + field2326 = new int[33]; + field2326[0] = 0; int var0 = 2; for (int var1 = 1; var1 < 33; ++var1) { - field2339[var1] = var0 - 1; + field2326[var1] = var0 - 1; var0 += var0; } } - @ObfuscatedName("c") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lke;Lke;B)V", - garbageValue = "11" + signature = "(Lhz;Lhz;ZLkb;I)V", + garbageValue = "639342200" ) - @Export("drawWorldSelect") - static void drawWorldSelect(Font var0, Font var1) { - Archive var3; - int var4; - int var5; - if (WorldMapID.worldSelectBackSprites == null) { - var3 = Client.archive8; - var4 = var3.getGroupId("sl_back"); - var5 = var3.getFileId(var4, ""); - Sprite[] var2 = TilePaint.SpriteBuffer_getSpriteArray(var3, var4, var5); - WorldMapID.worldSelectBackSprites = var2; - } - - IndexedSprite[] var25; - if (SecureRandomCallable.worldSelectFlagSprites == null) { - var3 = Client.archive8; - var4 = var3.getGroupId("sl_flags"); - var5 = var3.getFileId(var4, ""); - var25 = class289.SpriteBuffer_getIndexedSpriteArray(var3, var4, var5); - SecureRandomCallable.worldSelectFlagSprites = var25; - } - - if (class225.worldSelectArrows == null) { - var3 = Client.archive8; - var4 = var3.getGroupId("sl_arrows"); - var5 = var3.getFileId(var4, ""); - var25 = class289.SpriteBuffer_getIndexedSpriteArray(var3, var4, var5); - class225.worldSelectArrows = var25; - } - - if (FriendSystem.worldSelectStars == null) { - var3 = Client.archive8; - var4 = var3.getGroupId("sl_stars"); - var5 = var3.getFileId(var4, ""); - var25 = class289.SpriteBuffer_getIndexedSpriteArray(var3, var4, var5); - FriendSystem.worldSelectStars = var25; - } - - if (Login.worldSelectLeftSprite == null) { - Login.worldSelectLeftSprite = class215.SpriteBuffer_getIndexedSpriteByName(Client.archive8, "leftarrow", ""); - } - - if (NPCDefinition.worldSelectRightSprite == null) { - NPCDefinition.worldSelectRightSprite = class215.SpriteBuffer_getIndexedSpriteByName(Client.archive8, "rightarrow", ""); - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); - Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 0xbd9839, 0x8b6608); - Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 0x4f4f4f, 0x292929); - var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); - if (FriendSystem.worldSelectStars != null) { - FriendSystem.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); - var1.draw("Members only world", Login.xPadding + 152, 10, 0xffffff, -1); - FriendSystem.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); - var1.draw("Free world", Login.xPadding + 152, 21, 0xffffff, -1); - } - - if (class225.worldSelectArrows != null) { - int var22 = Login.xPadding + 280; - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { - class225.worldSelectArrows[2].drawAt(var22, 4); - } else { - class225.worldSelectArrows[0].drawAt(var22, 4); - } - - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { - class225.worldSelectArrows[3].drawAt(var22 + 15, 4); - } else { - class225.worldSelectArrows[1].drawAt(var22 + 15, 4); - } - - var0.draw("World", var22 + 32, 17, 0xffffff, -1); - int var23 = Login.xPadding + 390; - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { - class225.worldSelectArrows[2].drawAt(var23, 4); - } else { - class225.worldSelectArrows[0].drawAt(var23, 4); - } - - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { - class225.worldSelectArrows[3].drawAt(var23 + 15, 4); - } else { - class225.worldSelectArrows[1].drawAt(var23 + 15, 4); - } - - var0.draw("Players", var23 + 32, 17, 0xffffff, -1); - var4 = Login.xPadding + 500; - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { - class225.worldSelectArrows[2].drawAt(var4, 4); - } else { - class225.worldSelectArrows[0].drawAt(var4, 4); - } - - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { - class225.worldSelectArrows[3].drawAt(var4 + 15, 4); - } else { - class225.worldSelectArrows[1].drawAt(var4 + 15, 4); - } - - var0.draw("Location", var4 + 32, 17, 0xffffff, -1); - var5 = Login.xPadding + 610; - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { - class225.worldSelectArrows[2].drawAt(var5, 4); - } else { - class225.worldSelectArrows[0].drawAt(var5, 4); - } - - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { - class225.worldSelectArrows[3].drawAt(var5 + 15, 4); - } else { - class225.worldSelectArrows[1].drawAt(var5 + 15, 4); - } - - var0.draw("Type", var5 + 32, 17, 0xffffff, -1); - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); - var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 0xffffff, -1); - Login.hoveredWorldIndex = -1; - if (WorldMapID.worldSelectBackSprites == null) { - MusicPatchPcmStream.rasterProvider.drawFull(0, 0); - return; - } - byte var27 = 88; - byte var28 = 19; - var4 = 765 / (var27 + 1) - 1; - var5 = 480 / (var28 + 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 - var4 * var27) / (var4 + 1); - if (var6 > 5) { - var6 = 5; - } - - var7 = (480 - var5 * var28) / (var5 + 1); - if (var7 > 5) { - var7 = 5; - } - - int var8 = (765 - var4 * var27 - var6 * (var4 - 1)) / 2; - int var9 = (480 - var28 * var5 - var7 * (var5 - 1)) / 2; - int var10 = (var5 + World.World_count - 1) / var5; - Login.worldSelectPagesCount = var10 - var4; - if (Login.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { - Login.worldSelectLeftSprite.drawAt(8, ParamDefinition.canvasHeight / 2 - Login.worldSelectLeftSprite.subHeight / 2); - } - - if (NPCDefinition.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { - NPCDefinition.worldSelectRightSprite.drawAt(GrandExchangeEvent.canvasWidth - NPCDefinition.worldSelectRightSprite.subWidth - 8, ParamDefinition.canvasHeight / 2 - NPCDefinition.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 var24 = World.World_worlds[var16]; - boolean var18 = true; - String var19 = Integer.toString(var24.population); - if (var24.population == -1) { - var19 = "OFF"; - var18 = false; - } else if (var24.population > 1980) { - var19 = "FULL"; - var18 = false; - } - - int var21 = 0; - byte var20; - if (var24.isBeta()) { - if (var24.isMembersOnly()) { - var20 = 7; - } else { - var20 = 6; - } - } else if (var24.isDeadman()) { - var21 = 0xff0000; - if (var24.isMembersOnly()) { - var20 = 5; - } else { - var20 = 4; - } - } else if (var24.isPvp()) { - if (var24.isMembersOnly()) { - var20 = 3; - } else { - var20 = 2; - } - } else if (var24.isMembersOnly()) { - var20 = 1; - } else { - var20 = 0; - } - - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var11 && MouseHandler.MouseHandler_x < var27 + var12 && MouseHandler.MouseHandler_y < var11 + var28 && var18) { - Login.hoveredWorldIndex = var16; - WorldMapID.worldSelectBackSprites[var20].drawTransOverlayAt(var12, var11, 128, 0xffffff); - var14 = true; - } else { - WorldMapID.worldSelectBackSprites[var20].drawAt(var12, var11); - } - - if (SecureRandomCallable.worldSelectFlagSprites != null) { - SecureRandomCallable.worldSelectFlagSprites[(var24.isMembersOnly() ? 8 : 0) + var24.location].drawAt(var12 + 29, var11); - } - - var0.drawCentered(Integer.toString(var24.id), var12 + 15, var28 / 2 + var11 + 5, var21, -1); - var1.drawCentered(var19, var12 + 60, var28 / 2 + var11 + 5, 0xfffffff, -1); - var11 = var11 + var7 + var28; - ++var13; - if (var13 >= var5) { - var11 = var9 + 23; - var12 = var12 + var6 + var27; - var13 = 0; - ++var15; - } - } - - if (var14) { - var16 = var1.stringWidth(World.World_worlds[Login.hoveredWorldIndex].activity) + 6; - int var17 = var1.ascent + 8; - int var26 = MouseHandler.MouseHandler_y + 25; - if (var17 + var26 > 480) { - var26 = MouseHandler.MouseHandler_y - 25 - var17; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var16 / 2, var26, var16, var17, 0xffffa0); - Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var16 / 2, var26, var16, var17, 0); - var1.drawCentered(World.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var26 + var1.ascent + 4, 0, -1); - } - - MusicPatchPcmStream.rasterProvider.drawFull(0, 0); + public static void method3589(AbstractArchive var0, AbstractArchive var1, boolean var2, Font var3) { + class65.ItemDefinition_archive = var0; + Frames.ItemDefinition_modelArchive = var1; + UrlRequester.ItemDefinition_inMembersWorld = var2; + MouseRecorder.ItemDefinition_fileCount = class65.ItemDefinition_archive.getGroupFileCount(10); + ArchiveLoader.ItemDefinition_fontPlain11 = var3; } - @ObfuscatedName("hi") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;IIIII)V", - garbageValue = "730328145" + signature = "(B)Z", + garbageValue = "0" ) - @Export("insertMenuItemNoShift") - public static final void insertMenuItemNoShift(String var0, String var1, int var2, int itemid, int var4, int widshit) { - Entity.insertMenuItem(var0, var1, var2, itemid, var4, widshit, false); - } - - @ObfuscatedName("ig") - @ObfuscatedSignature( - signature = "(II)Ljava/lang/String;", - garbageValue = "434520276" - ) - @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 " " + ClientPreferences.colorStartTag(0xff80) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; - } - return var1.length() > 6 ? " " + ClientPreferences.colorStartTag(0xffffff) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + ClientPreferences.colorStartTag(0xffff00) + var1 + ""; + static final boolean method3588() { + return ViewportMouse.ViewportMouse_isInViewport; } } diff --git a/runescape-client/src/main/java/class189.java b/runescape-client/src/main/java/class189.java index 50ff238fee..706571176e 100644 --- a/runescape-client/src/main/java/class189.java +++ b/runescape-client/src/main/java/class189.java @@ -1,358 +1,316 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ge") +@ObfuscatedName("gw") public class class189 { - @ObfuscatedName("c") - @Export("ByteArrayPool_arrays") - public static byte[][][] ByteArrayPool_arrays; - - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(Lke;Lke;Lke;B)V", - garbageValue = "49" + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 1476121683 ) - @Export("drawTitle") - static void drawTitle(Font var0, Font var1, Font var2) { - Login.xPadding = (GrandExchangeEvent.canvasWidth - 765) / 2; - Login.loginBoxX = Login.xPadding + 202; - ScriptEvent.loginBoxCenter = Login.loginBoxX + 180; - if (Login.worldSelectOpen) { - class188.drawWorldSelect(var0, var1); + static int field2328; + @ObfuscatedName("r") + @ObfuscatedSignature( + signature = "Ldh;" + ) + @Export("soundCache") + public static SoundCache soundCache; + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(Lkx;I)V", + garbageValue = "1395104322" + ) + static final void method3594(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.field1221[var3] & 1) == 0) { + if (var1 > 0) { + --var1; + var10000 = Players.field1221; + var10000[var3] = (byte)(var10000[var3] | 2); + } else { + var4 = var0.readBits(1); + if (var4 == 0) { + var1 = UserComparator9.decode(var0); + var10000 = Players.field1221; + var10000[var3] = (byte)(var10000[var3] | 2); + } else { + StudioGame.readPlayerUpdate(var0, var3); + } + } + } + } + + var0.exportIndex(); + if (var1 != 0) { + throw new RuntimeException(); } else { - GrandExchangeOfferWorldComparator.leftTitleSprite.drawAt(Login.xPadding, 0); - NPC.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - TileItem.logoSprite.drawAt(Login.xPadding + 382 - TileItem.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, 0xffffff, -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.Login_loadingPercent * 3 + (Login.loginBoxX + 180 - 150), var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); - var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 0xffffff, -1); - } + var0.importIndex(); - String var5; - String var6; - short var22; - int var23; - short var24; - if (Client.gameState == 20) { - Login.titleboxSprite.drawAt(Login.loginBoxX + 180 - Login.titleboxSprite.subWidth / 2, 271 - Login.titleboxSprite.subHeight / 2); - var22 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 0xffff00, 0); - var23 = var22 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 0xffff00, 0); - var23 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 0xffff00, 0); - var23 += 15; - var23 += 7; - if (Login.loginIndex != 4) { - var0.draw("Login: ", Login.loginBoxX + 180 - 110, var23, 0xffffff, 0); - var24 = 200; - var5 = WorldMapLabelSize.clientPreferences.hideUsername ? ClientPacket.passwordStarChars(Login.Login_username) : Login.Login_username; - - for (var6 = var5; var0.stringWidth(var6) > var24; var6 = var6.substring(0, var6.length() - 1)) { + for (var2 = 0; var2 < Players.Players_count; ++var2) { + var3 = Players.Players_indices[var2]; + if ((Players.field1221[var3] & 1) != 0) { + if (var1 > 0) { + --var1; + var10000 = Players.field1221; + var10000[var3] = (byte)(var10000[var3] | 2); + } else { + var4 = var0.readBits(1); + if (var4 == 0) { + var1 = UserComparator9.decode(var0); + var10000 = Players.field1221; + var10000[var3] = (byte)(var10000[var3] | 2); + } else { + StudioGame.readPlayerUpdate(var0, var3); + } } - - var0.draw(AbstractFont.escapeBrackets(var6), Login.loginBoxX + 180 - 70, var23, 0xffffff, 0); - var23 += 15; - var0.draw("Password: " + ClientPacket.passwordStarChars(Login.Login_password), Login.loginBoxX + 180 - 108, var23, 0xffffff, 0); - var23 += 15; } } - if (Client.gameState == 10 || Client.gameState == 11) { - Login.titleboxSprite.drawAt(Login.loginBoxX, 171); - short var17; - if (Login.loginIndex == 0) { - var22 = 251; - var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var22, 0xffff00, 0); - var23 = var22 + 30; - var4 = Login.loginBoxX + 180 - 80; - var17 = 291; - VarpDefinition.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); - var0.drawLines("New User", var4 - 73, var17 - 20, 144, 40, 0xffffff, 0, 1, 1, 0); - var4 = Login.loginBoxX + 180 + 80; - VarpDefinition.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); - var0.drawLines("Existing User", var4 - 73, var17 - 20, 144, 40, 0xffffff, 0, 1, 1, 0); - } else if (Login.loginIndex == 1) { - var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 0xffff00, 0); - var22 = 236; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 0xffffff, 0); - var23 = var22 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 0xffffff, 0); - var23 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 0xffffff, 0); - var23 += 15; - var4 = Login.loginBoxX + 180 - 80; - var17 = 321; - VarpDefinition.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); - var0.drawCentered("Continue", var4, var17 + 5, 0xffffff, 0); - var4 = Login.loginBoxX + 180 + 80; - VarpDefinition.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); - var0.drawCentered("Cancel", var4, var17 + 5, 0xffffff, 0); + 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.field1221[var3] & 1) != 0) { + if (var1 > 0) { + --var1; + var10000 = Players.field1221; + var10000[var3] = (byte)(var10000[var3] | 2); + } else { + var4 = var0.readBits(1); + if (var4 == 0) { + var1 = UserComparator9.decode(var0); + var10000 = Players.field1221; + var10000[var3] = (byte)(var10000[var3] | 2); + } else if (WorldMapLabelSize.updateExternalPlayer(var0, var3)) { + var10000 = Players.field1221; + var10000[var3] = (byte)(var10000[var3] | 2); + } + } + } + } + + var0.exportIndex(); + if (var1 != 0) { + throw new RuntimeException(); } else { - int var7; - if (Login.loginIndex == 2) { - var22 = 201; - var0.drawCentered(Login.Login_response1, ScriptEvent.loginBoxCenter, var22, 0xffff00, 0); - var23 = var22 + 15; - var0.drawCentered(Login.Login_response2, ScriptEvent.loginBoxCenter, var23, 0xffff00, 0); - var23 += 15; - var0.drawCentered(Login.Login_response3, ScriptEvent.loginBoxCenter, var23, 0xffff00, 0); - var23 += 15; - var23 += 7; - var0.draw("Login: ", ScriptEvent.loginBoxCenter - 110, var23, 0xffffff, 0); - var24 = 200; - var5 = WorldMapLabelSize.clientPreferences.hideUsername ? ClientPacket.passwordStarChars(Login.Login_username) : Login.Login_username; + var0.importIndex(); - for (var6 = var5; var0.stringWidth(var6) > var24; var6 = var6.substring(1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var6) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? ClientPreferences.colorStartTag(0xffff00) + "|" : ""), ScriptEvent.loginBoxCenter - 70, var23, 0xffffff, 0); - var23 += 15; - var0.draw("Password: " + ClientPacket.passwordStarChars(Login.Login_password) + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? ClientPreferences.colorStartTag(0xffff00) + "|" : ""), ScriptEvent.loginBoxCenter - 108, var23, 0xffffff, 0); - var23 += 15; - var22 = 277; - var7 = ScriptEvent.loginBoxCenter + -117; - boolean var9 = Client.Login_isUsernameRemembered; - boolean var10 = Login.field1199; - IndexedSprite var8 = var9 ? (var10 ? Login.field1185 : Decimator.options_buttons_2Sprite) : (var10 ? Message.field606 : Login.options_buttons_0Sprite); - var8.drawAt(var7, var22); - var7 = var7 + var8.subWidth + 5; - var1.draw("Remember username", var7, var22 + 13, 0xffff00, 0); - var7 = ScriptEvent.loginBoxCenter + 24; - boolean var13 = WorldMapLabelSize.clientPreferences.hideUsername; - boolean var14 = Login.field1184; - IndexedSprite var12 = var13 ? (var14 ? Login.field1185 : Decimator.options_buttons_2Sprite) : (var14 ? Message.field606 : Login.options_buttons_0Sprite); - var12.drawAt(var7, var22); - var7 = var7 + var12.subWidth + 5; - var1.draw("Hide username", var7, var22 + 13, 0xffff00, 0); - var23 = var22 + 15; - int var15 = ScriptEvent.loginBoxCenter - 80; - short var16 = 321; - VarpDefinition.titlebuttonSprite.drawAt(var15 - 73, var16 - 20); - var0.drawCentered("Login", var15, var16 + 5, 0xffffff, 0); - var15 = ScriptEvent.loginBoxCenter + 80; - VarpDefinition.titlebuttonSprite.drawAt(var15 - 73, var16 - 20); - var0.drawCentered("Cancel", var15, var16 + 5, 0xffffff, 0); - var22 = 357; - switch(Login.field1212) { - case 2: - UserComparator5.field1986 = "Having trouble logging in?"; - break; - default: - UserComparator5.field1986 = "Can't login? Click here."; - } - - class96.field1325 = new Bounds(ScriptEvent.loginBoxCenter, var22, var1.stringWidth(UserComparator5.field1986), 11); - WorldMapAreaData.field332 = new Bounds(ScriptEvent.loginBoxCenter, var22, var1.stringWidth("Still having trouble logging in?"), 11); - var1.drawCentered(UserComparator5.field1986, ScriptEvent.loginBoxCenter, var22, 0xffffff, 0); - } else if (Login.loginIndex == 3) { - var22 = 201; - var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var22, 0xffff00, 0); - var23 = var22 + 20; - var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var23, 0xffff00, 0); - var23 += 15; - var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var23, 0xffff00, 0); - var23 += 15; - var4 = Login.loginBoxX + 180; - var17 = 276; - VarpDefinition.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); - var2.drawCentered("Try again", var4, var17 + 5, 0xffffff, 0); - var4 = Login.loginBoxX + 180; - var17 = 326; - VarpDefinition.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); - var2.drawCentered("Forgotten password?", var4, var17 + 5, 0xffffff, 0); - } else { - short var20; - if (Login.loginIndex == 4) { - var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 0xffff00, 0); - var22 = 236; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 0xffffff, 0); - var23 = var22 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 0xffffff, 0); - var23 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 0xffffff, 0); - var23 += 15; - var0.draw("PIN: " + ClientPacket.passwordStarChars(WorldMapManager.otp) + (Client.cycle % 40 < 20 ? ClientPreferences.colorStartTag(0xffff00) + "|" : ""), Login.loginBoxX + 180 - 108, var23, 0xffffff, 0); - var23 -= 8; - var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var23, 0xffff00, 0); - var23 += 15; - var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var23, 0xffff00, 0); - var4 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; - int var26 = var23 - var0.ascent; - IndexedSprite var25; - if (Login.field1201) { - var25 = Decimator.options_buttons_2Sprite; + for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { + var3 = Players.Players_emptyIndices[var2]; + if ((Players.field1221[var3] & 1) == 0) { + if (var1 > 0) { + --var1; + var10000 = Players.field1221; + var10000[var3] = (byte)(var10000[var3] | 2); } else { - var25 = Login.options_buttons_0Sprite; + var4 = var0.readBits(1); + if (var4 == 0) { + var1 = UserComparator9.decode(var0); + var10000 = Players.field1221; + var10000[var3] = (byte)(var10000[var3] | 2); + } else if (WorldMapLabelSize.updateExternalPlayer(var0, var3)) { + var10000 = Players.field1221; + var10000[var3] = (byte)(var10000[var3] | 2); + } } - - var25.drawAt(var4, var26); - var23 += 15; - var7 = Login.loginBoxX + 180 - 80; - var20 = 321; - VarpDefinition.titlebuttonSprite.drawAt(var7 - 73, var20 - 20); - var0.drawCentered("Continue", var7, var20 + 5, 0xffffff, 0); - var7 = Login.loginBoxX + 180 + 80; - VarpDefinition.titlebuttonSprite.drawAt(var7 - 73, var20 - 20); - var0.drawCentered("Cancel", var7, var20 + 5, 0xffffff, 0); - var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var20 + 36, 255, 0); - } else if (Login.loginIndex == 5) { - var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 0xffff00, 0); - var22 = 221; - var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 0xffff00, 0); - var23 = var22 + 15; - var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 0xffff00, 0); - var23 += 15; - var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 0xffff00, 0); - var23 += 15; - var23 += 14; - var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var23, 0xffffff, 0); - var24 = 174; - var5 = WorldMapLabelSize.clientPreferences.hideUsername ? ClientPacket.passwordStarChars(Login.Login_username) : Login.Login_username; - - for (var6 = var5; var0.stringWidth(var6) > var24; var6 = var6.substring(1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var6) + (Client.cycle % 40 < 20 ? ClientPreferences.colorStartTag(0xffff00) + "|" : ""), Login.loginBoxX + 180 - 34, var23, 0xffffff, 0); - var23 += 15; - var7 = Login.loginBoxX + 180 - 80; - var20 = 321; - VarpDefinition.titlebuttonSprite.drawAt(var7 - 73, var20 - 20); - var0.drawCentered("Recover", var7, var20 + 5, 0xffffff, 0); - var7 = Login.loginBoxX + 180 + 80; - VarpDefinition.titlebuttonSprite.drawAt(var7 - 73, var20 - 20); - var0.drawCentered("Back", var7, var20 + 5, 0xffffff, 0); - var20 = 356; - var1.drawCentered("Still having trouble logging in?", ScriptEvent.loginBoxCenter, var20, 0xfffffff, 0); - } else if (Login.loginIndex == 6) { - var22 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 0xffff00, 0); - var23 = var22 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 0xffff00, 0); - var23 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 0xffff00, 0); - var23 += 15; - var4 = Login.loginBoxX + 180; - var17 = 321; - VarpDefinition.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); - var0.drawCentered("Back", var4, var17 + 5, 0xffffff, 0); - } else if (Login.loginIndex == 7) { - var22 = 216; - var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var22, 0xffff00, 0); - var23 = var22 + 15; - var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var23, 0xffff00, 0); - var23 += 15; - var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var23, 0xffff00, 0); - var23 += 15; - var4 = Login.loginBoxX + 180 - 80; - var17 = 321; - VarpDefinition.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); - var0.drawCentered("Set Date of Birth", var4, var17 + 5, 0xffffff, 0); - var4 = Login.loginBoxX + 180 + 80; - VarpDefinition.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); - var0.drawCentered("Back", var4, var17 + 5, 0xffffff, 0); - } else if (Login.loginIndex == 8) { - var22 = 216; - var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var22, 0xffff00, 0); - var23 = var22 + 15; - var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var23, 0xffff00, 0); - var23 += 15; - var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var23, 0xffff00, 0); - var23 += 15; - var4 = Login.loginBoxX + 180 - 80; - var17 = 321; - VarpDefinition.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); - var0.drawCentered("Privacy Policy", var4, var17 + 5, 0xffffff, 0); - var4 = Login.loginBoxX + 180 + 80; - VarpDefinition.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); - var0.drawCentered("Back", var4, var17 + 5, 0xffffff, 0); - } else if (Login.loginIndex == 12) { - var22 = 201; - String var21 = ""; - var5 = ""; - var6 = ""; - switch(Login.field1182) { - case 0: - var21 = "Your account has been disabled."; - var5 = Strings.field2811; - var6 = ""; - break; - case 1: - var21 = "Account locked as we suspect it has been stolen."; - var5 = Strings.field2961; - var6 = ""; - break; - default: - FaceNormal.method3266(false); - } - - var0.drawCentered(var21, Login.loginBoxX + 180, var22, 0xffff00, 0); - var23 = var22 + 15; - var2.drawCentered(var5, Login.loginBoxX + 180, var23, 0xffff00, 0); - var23 += 15; - var2.drawCentered(var6, Login.loginBoxX + 180, var23, 0xffff00, 0); - var23 += 15; - var7 = Login.loginBoxX + 180; - var20 = 276; - VarpDefinition.titlebuttonSprite.drawAt(var7 - 73, var20 - 20); - var0.drawCentered("Support Page", var7, var20 + 5, 0xffffff, 0); - var7 = Login.loginBoxX + 180; - var20 = 326; - VarpDefinition.titlebuttonSprite.drawAt(var7 - 73, var20 - 20); - var0.drawCentered("Back", var7, var20 + 5, 0xffffff, 0); - } else if (Login.loginIndex == 24) { - var22 = 221; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 0xffffff, 0); - var23 = var22 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 0xffffff, 0); - var23 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 0xffffff, 0); - var23 += 15; - var4 = Login.loginBoxX + 180; - var17 = 301; - VarpDefinition.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); - var0.drawCentered("Ok", var4, var17 + 5, 0xffffff, 0); } } - } - } - if (Client.gameState >= 10) { - int[] var18 = new int[4]; - Rasterizer2D.Rasterizer2D_getClipArray(var18); - Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, ParamDefinition.canvasHeight); - Ignored.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); - Ignored.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); - Rasterizer2D.Rasterizer2D_setClipArray(var18); - } - - Login.title_muteSprite[WorldMapLabelSize.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); - if (Client.gameState > 5 && ScriptFrame.clientLanguage == Language.Language_EN) { - if (class30.field264 != null) { - var23 = Login.xPadding + 5; - var24 = 463; - byte var27 = 100; - byte var19 = 35; - class30.field264.drawAt(var23, var24); - var0.drawCentered("World" + " " + Client.worldId, var27 / 2 + var23, var19 / 2 + var24 - 2, 0xffffff, 0); - if (World.World_request != null) { - var1.drawCentered("Loading...", var27 / 2 + var23, var19 / 2 + var24 + 12, 0xffffff, 0); + var0.exportIndex(); + if (var1 != 0) { + throw new RuntimeException(); } else { - var1.drawCentered("Click to switch", var27 / 2 + var23, var19 / 2 + var24 + 12, 0xffffff, 0); + Players.Players_count = 0; + Players.Players_emptyIdxCount = 0; + + for (var2 = 1; var2 < 2048; ++var2) { + var10000 = Players.field1221; + 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; + } + } + } - } else { - class30.field264 = class215.SpriteBuffer_getIndexedSpriteByName(Client.archive8, "sl_button", ""); } } - } } + + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "1903618093" + ) + public static String method3596(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)) { + var5 = UserComparator8.method3342(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; + } + + return new String(var2); + } + + @ObfuscatedName("hw") + @ObfuscatedSignature( + signature = "(III)V", + garbageValue = "638834022" + ) + @Export("updateItemPile") + static final void updateItemPile(int var0, int var1) { + NodeDeque var2 = Client.groundItems[ItemContainer.plane][var0][var1]; + if (var2 == null) { + Player.scene.removeGroundItemPile(ItemContainer.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 = WorldMapData_0.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) { + Player.scene.removeGroundItemPile(ItemContainer.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 (var6.id != var5.id) { + if (var12 == null) { + var12 = var6; + } + + if (var12.id != var6.id && var11 == null) { + var11 = var6; + } + } + } + + long var9 = WorldMapSprite.calculateTag(var0, var1, 3, false, 0); + Player.scene.newGroundItemPile(ItemContainer.plane, var0, var1, GrandExchangeOfferTotalQuantityComparator.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, ItemContainer.plane), var5, var9, var12, var11); + } + } + } + + @ObfuscatedName("is") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;Lhp;B)Ljava/lang/String;", + garbageValue = "0" + ) + static String method3597(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; + } + + var0 = var0.substring(0, var3) + GrandExchangeOfferUnitPriceComparator.method127(AbstractByteArrayCopier.method3868(var1, var2 - 1)) + var0.substring(var3 + 2); + } + } + } + + return var0; + } + + @ObfuscatedName("jd") + @ObfuscatedSignature( + signature = "([Lhp;II)V", + garbageValue = "2135074914" + ) + @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) { + UserComparator6.runIntfCloseListeners(var4.group, var1); + } + } + + ScriptEvent var5; + if (var1 == 0 && var3.onDialogAbort != null) { + var5 = new ScriptEvent(); + var5.widget = var3; + var5.args = var3.onDialogAbort; + class81.runScriptEvent(var5); + } + + if (var1 == 1 && var3.onSubChange != null) { + if (var3.childIndex >= 0) { + Widget var6 = WorldMapElement.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; + class81.runScriptEvent(var5); + } + } + } + + } } diff --git a/runescape-client/src/main/java/class191.java b/runescape-client/src/main/java/class191.java index 53a083f556..2b55b00cc2 100644 --- a/runescape-client/src/main/java/class191.java +++ b/runescape-client/src/main/java/class191.java @@ -2,63 +2,65 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gj") +@ObfuscatedName("gr") public class class191 { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lgr;" ) - static final class191 field2365; - @ObfuscatedName("w") + static final class191 field2347; + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lgr;" ) - static final class191 field2362; - @ObfuscatedName("e") + static final class191 field2345; + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lgr;" ) - static final class191 field2364; - @ObfuscatedName("dg") - @ObfuscatedSignature( - signature = "Lfa;" - ) - @Export("js5SocketTask") - static Task js5SocketTask; + static final class191 field2346; static { - field2365 = new class191(); - field2362 = new class191(); - field2364 = new class191(); + field2347 = new class191(); + field2345 = new class191(); + field2346 = new class191(); } class191() { } - @ObfuscatedName("iu") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(IIIIIIIII)V", - garbageValue = "-474414027" + signature = "(I)[Lhh;", + garbageValue = "-1783232348" ) - @Export("drawWidgets") - static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (class162.loadInterface(var0)) { - WorldMapIcon_1.field188 = null; - FontName.drawInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); - if (WorldMapIcon_1.field188 != null) { - FontName.drawInterface(WorldMapIcon_1.field188, 0xabcdabcd, var1, var2, var3, var4, WorldMapDecorationType.field2742, ClientPacket.field2305, var7); - WorldMapIcon_1.field188 = null; - } + @Export("PlayerType_values") + public static PlayerType[] PlayerType_values() { + return new PlayerType[]{PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_ultimateIronman, PlayerType.PlayerType_normal, PlayerType.PlayerType_ironman, PlayerType.PlayerType_playerModerator}; + } - } else { - if (var7 != -1) { - Client.field843[var7] = true; - } else { - for (int var8 = 0; var8 < 100; ++var8) { - Client.field843[var8] = true; + @ObfuscatedName("kq") + @ObfuscatedSignature( + signature = "(IIIILls;Lhg;B)V", + garbageValue = "34" + ) + @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.method6020(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); } - } + } } } } diff --git a/runescape-client/src/main/java/class192.java b/runescape-client/src/main/java/class192.java index 431fb4956b..959829aa85 100644 --- a/runescape-client/src/main/java/class192.java +++ b/runescape-client/src/main/java/class192.java @@ -4,282 +4,503 @@ 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("gd") +@ObfuscatedName("gm") public enum class192 implements Enumerated { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lgd;" + signature = "Lgm;" ) - field2375("", 0, new class191[]{class191.field2364}), - @ObfuscatedName("w") + field2360("", 0, new class191[]{class191.field2346}), + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lgd;" + signature = "Lgm;" ) - field2367("", 1, new class191[]{class191.field2362, class191.field2364}), - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lgd;" - ) - field2368("", 2, new class191[]{class191.field2362, class191.field2365, class191.field2364}), - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lgd;" - ) - field2381("", 3, new class191[]{class191.field2362}), - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Lgd;" - ) - field2370("", 4), - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "Lgd;" - ) - field2373("", 5, new class191[]{class191.field2362, class191.field2364}), - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Lgd;" - ) - field2372("", 6, new class191[]{class191.field2364}), + field2350("", 1, new class191[]{class191.field2345, class191.field2346}), @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lgd;" + signature = "Lgm;" ) - field2376("", 8, new class191[]{class191.field2362, class191.field2364}), - @ObfuscatedName("c") + field2363("", 2, new class191[]{class191.field2345, class191.field2347, class191.field2346}), + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lgd;" + signature = "Lgm;" ) - field2374("", 9, new class191[]{class191.field2362, class191.field2365}), - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Lgd;" - ) - field2369("", 10, new class191[]{class191.field2362}), - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "Lgd;" - ) - field2371("", 11, new class191[]{class191.field2362}), + field2361("", 3, new class191[]{class191.field2345}), @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lgd;" + signature = "Lgm;" ) - field2377("", 12, new class191[]{class191.field2362, class191.field2364}), + field2367("", 4), + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "Lgm;" + ) + field2351("", 5, new class191[]{class191.field2345, class191.field2346}), + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "Lgm;" + ) + field2355("", 6, new class191[]{class191.field2346}), + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "Lgm;" + ) + field2356("", 8, new class191[]{class191.field2345, class191.field2346}), @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lgd;" + signature = "Lgm;" ) - field2378("", 13, new class191[]{class191.field2362}); - - @ObfuscatedName("dl") - @ObfuscatedGetter( - longValue = -5559382654824697645L + field2357("", 9, new class191[]{class191.field2345, class191.field2347}), + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "Lgm;" ) - @Export("js5ConnectionMs") - static long js5ConnectionMs; + field2358("", 10, new class191[]{class191.field2345}), + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "Lgm;" + ) + field2359("", 11, new class191[]{class191.field2345}), + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "Lgm;" + ) + field2354("", 12, new class191[]{class191.field2345, class191.field2346}), @ObfuscatedName("r") + @ObfuscatedSignature( + signature = "Lgm;" + ) + field2366("", 13, new class191[]{class191.field2345}); + + @ObfuscatedName("es") + static int[] field2365; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -646625045 + intValue = 100373977 ) @Export("id") final int id; - @ObfuscatedName("v") - final Set field2380; - - static { - method3674(); - } + @ObfuscatedName("p") + final Set field2352; @ObfuscatedSignature( - signature = "(Ljava/lang/String;I[Lgj;)V" + signature = "(Ljava/lang/String;I[Lgr;)V" ) class192(String var3, int var4, class191[] var5) { - this.field2380 = new HashSet(); + this.field2352 = new HashSet(); this.id = var4; class191[] var6 = var5; for (int var7 = 0; var7 < var6.length; ++var7) { class191 var8 = var6[var7]; - this.field2380.add(var8); + this.field2352.add(var8); } } class192(String var3, int var4) { - this.field2380 = new HashSet(); + this.field2352 = new HashSet(); this.id = var4; } - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "320353268" + signature = "(B)I", + garbageValue = "-32" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(IIIB)I", - garbageValue = "69" + signature = "(Lhz;I)V", + garbageValue = "-2116157785" ) - @Export("WorldMap_hslToRgb") - static int WorldMap_hslToRgb(int var0, int var1, int var2) { - if (var2 > 179) { - var1 /= 2; - } - - 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("q") - @ObfuscatedSignature( - signature = "(I)[Lgd;", - garbageValue = "858782431" - ) - static class192[] method3674() { - return new class192[]{field2377, field2374, field2369, field2378, field2372, field2373, field2381, field2367, field2371, field2370, field2376, field2368, field2375}; - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "46" - ) - @Export("initReflectionChecksDeque") - public static void initReflectionChecksDeque() { - class96.reflectionChecks = new IterableNodeDeque(); - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;B)Z", - garbageValue = "-31" - ) - @Export("isNumber") - public static boolean isNumber(CharSequence var0) { - boolean var2 = false; - boolean var3 = false; - int var4 = 0; - int var5 = var0.length(); - int var6 = 0; - - boolean var1; - for (; ; var6++) { - if (var6 < var5) { - char var7 = var0.charAt(var6); - if (var6 == 0) { - if (var7 == '-') { - var2 = true; - continue; - } else if (var7 == '+') { - continue; - } - } - - int var9; - if (var7 >= '0' && var7 <= '9') { - var9 = var7 - '0'; - } else if (var7 >= 'A' && var7 <= 'Z') { - var9 = var7 - '7'; - } else if (var7 < 'a' || var7 > 'z') { - var1 = false; - break; - } else { - var9 = var7 - 'W'; - } - - if (var9 >= 10) { - var1 = false; - break; - } - - if (var2) { - var9 = -var9; - } - - int var8 = var9 + var4 * 10; - if (var4 != var8 / 10) { - var1 = false; - break; - } - - var4 = var8; - var3 = true; - } else { - var1 = var3; - break; - } - - } - - return var1; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "-881071999" - ) - @Export("changeWorldSelectSorting") - static void changeWorldSelectSorting(int var0, int var1) { - int[] var2 = new int[4]; - int[] var3 = new int[4]; - var2[0] = var0; - var3[0] = var1; - int var4 = 1; - - for (int var5 = 0; var5 < 4; ++var5) { - if (World.World_sortOption1[var5] != var0) { - var2[var4] = World.World_sortOption1[var5]; - var3[var4] = World.World_sortOption2[var5]; - ++var4; - } - } - - World.World_sortOption1 = var2; - World.World_sortOption2 = var3; - Client.sortWorlds(World.World_worlds, 0, World.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); + public static void method3614(AbstractArchive var0) { + VarbitDefinition.VarbitDefinition_archive = var0; } @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-72629118" + signature = "(I)V", + garbageValue = "-140231108" ) - @Export("Messages_getLastChatID") - static int Messages_getLastChatID(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); - if (var1 == null) { - return -1; + public static void method3617() { + 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; } - return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; } - @ObfuscatedName("ke") + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "2005954129" + signature = "(ILcr;ZI)I", + garbageValue = "-2145329463" ) - @Export("setOculusOrbState") - static void setOculusOrbState(int var0) { - Client.oculusOrbState = var0; + static int method3616(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.FRIEND_COUNT) { + if (class32.friendSystem.field1045 == 0) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -2; + } else if (class32.friendSystem.field1045 == 1) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class32.friendSystem.friendsList.getSize(); + } + + return 1; + } else { + int var3; + if (var0 == ScriptOpcodes.FRIEND_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (class32.friendSystem.method1773() && var3 >= 0 && var3 < class32.friendSystem.friendsList.getSize()) { + Friend var8 = (Friend)class32.friendSystem.friendsList.get(var3); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.getName(); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.getPreviousName(); + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (class32.friendSystem.method1773() && var3 >= 0 && var3 < class32.friendSystem.friendsList.getSize()) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)class32.friendSystem.friendsList.get(var3)).world; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (class32.friendSystem.method1773() && var3 >= 0 && var3 < class32.friendSystem.friendsList.getSize()) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)class32.friendSystem.friendsList.get(var3)).rank; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else { + String var5; + if (var0 == ScriptOpcodes.FRIEND_SETRANK) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + int var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + WorldMapRectangle.method281(var5, var6); + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_ADD) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + class32.friendSystem.addFriend(var5); + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_DEL) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + class32.friendSystem.removeFriend(var5); + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_ADD) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + class32.friendSystem.addIgnore(var5); + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_DEL) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + class32.friendSystem.removeIgnore(var5); + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_TEST) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + var5 = NetSocket.method3489(var5); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class32.friendSystem.isFriended(new Username(var5, FontName.loginType), false) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { + if (Client.clanChat != null) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.clanChat.name; + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { + if (Client.clanChat != null) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.clanChat.getSize(); + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (Client.clanChat != null && var3 < Client.clanChat.getSize()) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.clanChat.get(var3).getUsername().getName(); + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (Client.clanChat != null && var3 < Client.clanChat.getSize()) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Client.clanChat.get(var3)).getWorld(); + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (Client.clanChat != null && var3 < Client.clanChat.getSize()) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Client.clanChat.get(var3)).rank; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.clanChat != null ? Client.clanChat.minKick : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + WorldMapCacheName.clanKickUser(var5); + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.clanChat != null ? Client.clanChat.rank : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + class227.Clan_joinChat(var5); + return 1; + } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { + Tiles.Clan_leaveChat(); + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { + if (!class32.friendSystem.method1773()) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class32.friendSystem.ignoreList.getSize(); + } + + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (class32.friendSystem.method1773() && var3 >= 0 && var3 < class32.friendSystem.ignoreList.getSize()) { + Ignored var4 = (Ignored)class32.friendSystem.ignoreList.get(var3); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getName(); + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getPreviousName(); + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_TEST) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + var5 = NetSocket.method3489(var5); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class32.friendSystem.isIgnored(new Username(var5, FontName.loginType)) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (Client.clanChat != null && var3 < Client.clanChat.getSize() && Client.clanChat.get(var3).getUsername().equals(WorldMapIcon_1.localPlayer.username)) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { + if (Client.clanChat != null && Client.clanChat.owner != null) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.clanChat.owner; + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (Client.clanChat != null && var3 < Client.clanChat.getSize() && ((ClanMate)Client.clanChat.get(var3)).isFriend()) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { + if (var0 == 3628) { + class32.friendSystem.friendsList.removeComparator(); + return 1; + } else { + boolean var7; + if (var0 == 3629) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + class32.friendSystem.friendsList.addComparator(new UserComparator1(var7)); + return 1; + } else if (var0 == 3630) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + class32.friendSystem.friendsList.addComparator(new UserComparator2(var7)); + return 1; + } else if (var0 == 3631) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + class32.friendSystem.friendsList.addComparator(new UserComparator3(var7)); + return 1; + } else if (var0 == 3632) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + class32.friendSystem.friendsList.addComparator(new UserComparator4(var7)); + return 1; + } else if (var0 == 3633) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + class32.friendSystem.friendsList.addComparator(new UserComparator5(var7)); + return 1; + } else if (var0 == 3634) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + class32.friendSystem.friendsList.addComparator(new UserComparator6(var7)); + return 1; + } else if (var0 == 3635) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + class32.friendSystem.friendsList.addComparator(new UserComparator7(var7)); + return 1; + } else if (var0 == 3636) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + class32.friendSystem.friendsList.addComparator(new UserComparator8(var7)); + return 1; + } else if (var0 == 3637) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + class32.friendSystem.friendsList.addComparator(new UserComparator9(var7)); + return 1; + } else if (var0 == 3638) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + class32.friendSystem.friendsList.addComparator(new UserComparator10(var7)); + return 1; + } else if (var0 == 3639) { + class32.friendSystem.friendsList.sort(); + return 1; + } else if (var0 == 3640) { + class32.friendSystem.ignoreList.removeComparator(); + return 1; + } else if (var0 == 3641) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + class32.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); + return 1; + } else if (var0 == 3642) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + class32.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); + return 1; + } else if (var0 == 3643) { + class32.friendSystem.ignoreList.sort(); + return 1; + } else if (var0 == 3644) { + if (Client.clanChat != null) { + Client.clanChat.removeComparator(); + } + + return 1; + } else if (var0 == 3645) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (Client.clanChat != null) { + Client.clanChat.addComparator(new UserComparator1(var7)); + } + + return 1; + } else if (var0 == 3646) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (Client.clanChat != null) { + Client.clanChat.addComparator(new UserComparator2(var7)); + } + + return 1; + } else if (var0 == 3647) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (Client.clanChat != null) { + Client.clanChat.addComparator(new UserComparator3(var7)); + } + + return 1; + } else if (var0 == 3648) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (Client.clanChat != null) { + Client.clanChat.addComparator(new UserComparator4(var7)); + } + + return 1; + } else if (var0 == 3649) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (Client.clanChat != null) { + Client.clanChat.addComparator(new UserComparator5(var7)); + } + + return 1; + } else if (var0 == 3650) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (Client.clanChat != null) { + Client.clanChat.addComparator(new UserComparator6(var7)); + } + + return 1; + } else if (var0 == 3651) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (Client.clanChat != null) { + Client.clanChat.addComparator(new UserComparator7(var7)); + } + + return 1; + } else if (var0 == 3652) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (Client.clanChat != null) { + Client.clanChat.addComparator(new UserComparator8(var7)); + } + + return 1; + } else if (var0 == 3653) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (Client.clanChat != null) { + Client.clanChat.addComparator(new UserComparator9(var7)); + } + + return 1; + } else if (var0 == 3654) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (Client.clanChat != null) { + Client.clanChat.addComparator(new UserComparator10(var7)); + } + + return 1; + } else if (var0 == 3655) { + if (Client.clanChat != null) { + Client.clanChat.sort(); + } + + return 1; + } else if (var0 == 3656) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + class32.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); + return 1; + } else if (var0 == 3657) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + if (Client.clanChat != null) { + Client.clanChat.addComparator(new BuddyRankComparator(var7)); + } + + return 1; + } else { + return 2; + } + } + } else { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + if (Client.clanChat != null && var3 < Client.clanChat.getSize() && ((ClanMate)Client.clanChat.get(var3)).isIgnored()) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + } + } } } diff --git a/runescape-client/src/main/java/class195.java b/runescape-client/src/main/java/class195.java index ffebe8f8c8..945675d8d2 100644 --- a/runescape-client/src/main/java/class195.java +++ b/runescape-client/src/main/java/class195.java @@ -1,61 +1,130 @@ +import java.awt.Component; import java.util.HashMap; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gr") +@ObfuscatedName("gc") public class class195 { + @ObfuscatedName("bs") + @ObfuscatedSignature( + signature = "Llq;" + ) + static IndexedSprite field2368; + static { new HashMap(); } - @ObfuscatedName("l") + @ObfuscatedName("s") + static double method3623(double var0, double var2, double var4) { + double var8 = (var0 - var2) / var4; + double var6 = Math.exp(-var8 * var8 / 2.0D) / Math.sqrt(6.283185307179586D); + return var6 / var4; + } + + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(IZI)Ljava/lang/String;", - garbageValue = "-808579598" + signature = "(IIIII)V", + garbageValue = "-1990458984" ) - @Export("intToString") - public static String intToString(int var0, boolean var1) { - if (var1 && var0 >= 0) { - int var3 = var0; - String var2; - if (var1 && var0 >= 0) { - int var4 = 2; + static final void method3627(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) { + class188.field2321[0][var5][var4] = 127; + if (var0 == var5 && var5 > 0) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; + } - for (int var5 = var0 / 10; var5 != 0; ++var4) { - var5 /= 10; - } + if (var5 == var0 + var2 && var5 < 103) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; + } - char[] var6 = new char[var4]; - var6[0] = '+'; + if (var4 == var1 && var4 > 0) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; + } - for (int var7 = var4 - 1; var7 > 0; --var7) { - int var8 = var3; - var3 /= 10; - int var9 = var8 - var3 * 10; - if (var9 >= 10) { - var6[var7] = (char)(var9 + 87); - } else { - var6[var7] = (char)(var9 + 48); + if (var4 == var3 + var1 && var4 < 103) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; } } + } + } - var2 = new String(var6); + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(Ljava/lang/Throwable;Ljava/lang/String;)Lmv;" + ) + @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("j") + @ObfuscatedSignature( + signature = "(Ljava/awt/Component;S)V", + garbageValue = "24303" + ) + static void method3629(Component var0) { + var0.removeMouseListener(MouseHandler.MouseHandler_instance); + var0.removeMouseMotionListener(MouseHandler.MouseHandler_instance); + var0.removeFocusListener(MouseHandler.MouseHandler_instance); + MouseHandler.MouseHandler_currentButtonVolatile = 0; + } + + @ObfuscatedName("im") + @ObfuscatedSignature( + signature = "(IIIIIII)V", + garbageValue = "-963502803" + ) + static final void method3628(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 { - var2 = Integer.toString(var0, 10); + var12 = -var12; } - return var2; + 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 = var7 + var15 + var1; + Rasterizer3D.method2933(var17, var18, var19); + Rasterizer3D.method2936(var21, var22, var23, var17, var18, var19, var4); + Rasterizer3D.method2933(var17, var19, var20); + Rasterizer3D.method2936(var21, var23, var24, var17, var19, var20, var4); } - return Integer.toString(var0); - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "-18" - ) - public static boolean method3685(int var0) { - return (var0 >> 31 & 1) != 0; } } diff --git a/runescape-client/src/main/java/class197.java b/runescape-client/src/main/java/class197.java index 89c07016de..a1edbca037 100644 --- a/runescape-client/src/main/java/class197.java +++ b/runescape-client/src/main/java/class197.java @@ -2,365 +2,78 @@ 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("gf") +@ObfuscatedName("gi") public class class197 { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("musicPatchesArchive") public static AbstractArchive musicPatchesArchive; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("musicSamplesArchive") public static AbstractArchive musicSamplesArchive; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhz;" ) @Export("soundEffectsArchive") public static AbstractArchive soundEffectsArchive; @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -865740165 + @ObfuscatedSignature( + signature = "Lgp;" ) - public static int field2402; - @ObfuscatedName("b") + @Export("midiPcmStream") + public static MidiPcmStream midiPcmStream; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 713445849 + intValue = 1319916027 + ) + public static int field2378; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -2004813651 ) @Export("musicTrackGroupId") public static int musicTrackGroupId; - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 924642041 + intValue = 1949584783 ) @Export("musicTrackFileId") public static int musicTrackFileId; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -1197525527 - ) - public static int field2404; - @ObfuscatedName("dz") + @ObfuscatedName("ea") @ObfuscatedSignature( - signature = "Liu;" + signature = "Lkp;" ) - @Export("archive0") - static Archive archive0; + @Export("spriteIds") + static GraphicsDefaults spriteIds; static { - field2402 = 0; + field2378 = 0; } - @ObfuscatedName("q") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(IIIB)I", - garbageValue = "-75" + signature = "(III)I", + garbageValue = "2056468523" ) - public static int method3702(int var0, int var1, int var2) { - var2 &= 3; - if (var2 == 0) { - return var0; - } - if (var2 == 1) { - return var1; - } - return var2 == 2 ? 7 - var0 : 7 - var1; - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-1" - ) - @Export("FloorOverlayDefinition_clearCached") - public static void FloorOverlayDefinition_clearCached() { - FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - signature = "(ILcx;ZI)I", - garbageValue = "-1023115268" - ) - static int method3703(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = UserComparator3.loadWorlds() ? 1 : 0; - return 1; - } - World var3; - if (var0 == ScriptOpcodes.WORLDLIST_START) { - var3 = DynamicObject.worldListStart(); - if (var3 != null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.id; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.properties; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.activity; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.location; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.population; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.host; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; + static final int method3645(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 1; + return (var0 & 65408) + var1; } - if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { - var3 = Canvas.getNextWorldListWorld(); - if (var3 != null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.id; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.properties; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.activity; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.location; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.population; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.host; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } - World var4; - int var5; - int var7; - if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var4 = null; - - for (var5 = 0; var5 < World.World_count; ++var5) { - if (var7 == World.World_worlds[var5].id) { - var4 = World.World_worlds[var5]; - break; - } - } - - if (var4 != null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var4.id; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var4.properties; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var4.activity; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var4.location; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var4.population; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var4.host; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } - if (var0 == ScriptOpcodes.WORLDLIST_SORT) { - HealthBarUpdate.Interpreter_intStackSize -= 4; - var7 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - boolean var10 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1] == 1; - var5 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2]; - boolean var6 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 3] == 1; - WorldMapLabelSize.sortWorldList(var7, var10, var5, var6); - return 1; - } - if (var0 == ScriptOpcodes.GETWORLDINFO) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - if (var7 >= 0 && var7 < World.World_count) { - var4 = World.World_worlds[var7]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var4.id; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var4.properties; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var4.activity; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var4.location; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var4.population; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var4.host; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } - if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { - Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - return 1; - } - int var8; - ParamDefinition var9; - if (var0 == ScriptOpcodes.NC_PARAM) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - var9 = WorldMapIcon_0.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = GameShell.getNpcDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = GameShell.getNpcDefinition(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } - if (var0 == ScriptOpcodes.LC_PARAM) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - var9 = WorldMapIcon_0.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ViewportMouse.getObjectDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ViewportMouse.getObjectDefinition(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } - if (var0 == ScriptOpcodes.OC_PARAM) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - var9 = WorldMapIcon_0.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = WorldMapArea.ItemDefinition_get(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapArea.ItemDefinition_get(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } - if (var0 == ScriptOpcodes.STRUCT_PARAM) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - var9 = WorldMapIcon_0.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ParamDefinition.StructDefinition_getStructDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ParamDefinition.StructDefinition_getStructDefinition(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } - if (var0 == ScriptOpcodes.ON_MOBILE) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; - return 1; - } - if (var0 == ScriptOpcodes.CLIENTTYPE) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.clientType & 3; - return 1; - } - if (var0 == 6520) { - return 1; - } - if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { - return 1; - } - if (var0 == 6522) { - --Skills.Interpreter_stringStackSize; - --HealthBarUpdate.Interpreter_intStackSize; - return 1; - } - if (var0 == 6523) { - --Skills.Interpreter_stringStackSize; - --HealthBarUpdate.Interpreter_intStackSize; - return 1; - } - if (var0 == ScriptOpcodes.BATTERYLEVEL) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - return 1; - } - if (var0 == ScriptOpcodes.BATTERYCHARGING) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 1; - return 1; - } - if (var0 == ScriptOpcodes.WIFIAVAILABLE) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 1; - return 1; - } - return 2; - } - - @ObfuscatedName("jw") - @ObfuscatedSignature( - signature = "(Lbo;ZI)V", - garbageValue = "391006565" - ) - @Export("closeInterface") - static final void closeInterface(InterfaceParent var0, boolean var1) { - int var2 = var0.group; - int var3 = (int)var0.key; - var0.remove(); - int var5; - if (var1 && var2 != -1 && ViewportMouse.Widget_loadedInterfaces[var2]) { - Widget.Widget_archive.clearFilesGroup(var2); - if (Widget.Widget_interfaceComponents[var2] != null) { - boolean var7 = true; - - for (var5 = 0; var5 < Widget.Widget_interfaceComponents[var2].length; ++var5) { - if (Widget.Widget_interfaceComponents[var2][var5] != null) { - if (Widget.Widget_interfaceComponents[var2][var5].type != 2) { - Widget.Widget_interfaceComponents[var2][var5] = null; - } else { - var7 = false; - } - } - } - - if (var7) { - Widget.Widget_interfaceComponents[var2] = null; - } - - ViewportMouse.Widget_loadedInterfaces[var2] = false; - } - } - - for (IntegerNode var4 = (IntegerNode)Client.widgetClickMasks.first(); var4 != null; var4 = (IntegerNode)Client.widgetClickMasks.next()) { - if ((var4.key >> 48 & 0xffffL) == (long)var2) { - var4.remove(); - } - } - - Widget var8 = class80.getWidget(var3); - if (var8 != null) { - Strings.invalidateWidget(var8); - } - - for (var5 = 0; var5 < Client.menuOptionsCount; ++var5) { - if (class1.isWidgetMenuOpcode(Client.menuOpcodes[var5])) { - if (var5 < Client.menuOptionsCount - 1) { - for (int var6 = var5; var6 < Client.menuOptionsCount - 1; ++var6) { - Client.menuActions[var6] = Client.menuActions[var6 + 1]; - Client.menuTargets[var6] = Client.menuTargets[var6 + 1]; - Client.menuOpcodes[var6] = Client.menuOpcodes[var6 + 1]; - Client.menuIdentifiers[var6] = Client.menuIdentifiers[var6 + 1]; - Client.menuArguments1[var6] = Client.menuArguments1[var6 + 1]; - Client.menuArguments2[var6] = Client.menuArguments2[var6 + 1]; - Client.menuShiftClick[var6] = Client.menuShiftClick[var6 + 1]; - } - } - - --var5; - --Client.menuOptionsCount; - } - } - - GrandExchangeOfferAgeComparator.calculateMenuBounds(); - if (Client.rootInterface != -1) { - WorldMapLabelSize.runIntfCloseListeners(Client.rootInterface, 1); - } - } } diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java index c71c01b400..538ca2c5dd 100644 --- a/runescape-client/src/main/java/class2.java +++ b/runescape-client/src/main/java/class2.java @@ -1,633 +1,121 @@ +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("e") +@ObfuscatedName("i") final class class2 implements class0 { - @ObfuscatedName("w") - @ObfuscatedGetter( - longValue = -8967154126905967921L - ) - static long field4; - @ObfuscatedName("da") + @ObfuscatedName("sl") @ObfuscatedSignature( - signature = "Liu;" + signature = "Lt;" ) - @Export("archive13") - static Archive archive13; + @Export("grandExchangeEvents") + static GrandExchangeEvents grandExchangeEvents; + @ObfuscatedName("du") + @ObfuscatedSignature( + signature = "Lid;" + ) + @Export("archive8") + static Archive archive8; + @ObfuscatedName("ed") + @Export("secureRandom") + static SecureRandom secureRandom; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ljava/lang/Object;Lkf;I)V", - garbageValue = "1977897097" + signature = "(Ljava/lang/Object;Lky;I)V", + garbageValue = "254789492" ) - public void vmethod43(Object var1, Buffer var2) { - this.method19((Long)var1, var2); + public void vmethod58(Object var1, Buffer var2) { + this.method38((Long)var1, var2); } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkf;I)Ljava/lang/Object;", - garbageValue = "-408972538" + signature = "(Lky;I)Ljava/lang/Object;", + garbageValue = "1267204541" ) - public Object vmethod42(Buffer var1) { + public Object vmethod70(Buffer var1) { return var1.readLong(); } - @ObfuscatedName("l") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ljava/lang/Long;Lkf;I)V", - garbageValue = "-338982282" + signature = "(Ljava/lang/Long;Lky;B)V", + garbageValue = "6" ) - void method19(Long var1, Buffer var2) { + void method38(Long var1, Buffer var2) { var2.writeLong(var1); } - @ObfuscatedName("w") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-1315693887" + signature = "(I)Lgq;", + garbageValue = "-764914873" ) - @Export("ItemContainer_getCount") - static int ItemContainer_getCount(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var2 == null) { - return 0; - } - return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; + public static PacketBufferNode method29() { + PacketBufferNode var0 = Buffer.method5567(); + var0.clientPacket = null; + var0.clientPacketLength = 0; + var0.packetBuffer = new PacketBuffer(5000); + return var0; } - @ObfuscatedName("an") + @ObfuscatedName("ff") @ObfuscatedSignature( - signature = "([BIII)I", - garbageValue = "1766587749" + signature = "(I)V", + garbageValue = "1255572967" ) - public static int method18(byte[] var0, int var1, int var2) { - int var3 = -1; - - for (int var4 = var1; var4 < var2; ++var4) { - var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; + static final void method31() { + if (Client.logoutTimer > 0) { + class65.method1182(); + } else { + Client.timer.method4898(); + FloorDecoration.updateGameState(40); + Bounds.field3845 = Client.packetWriter.getSocket(); + Client.packetWriter.removeSocket(); } - - var3 = ~var3; - return var3; } - @ObfuscatedName("ij") + @ObfuscatedName("ig") @ObfuscatedSignature( - signature = "([Lhj;IIIIIIIS)V", - garbageValue = "29276" + signature = "(IIIIIIIII)V", + garbageValue = "742937665" ) - @Export("updateInterface") - static final void updateInterface(Widget[] components, int parentId, int var2, int var3, int var4, int var5, int width, int height) { - for (int var8 = 0; var8 < components.length; ++var8) { - Widget var9 = components[var8]; - if (var9 == null || var9.parentId != parentId || (var9.isIf3 && var9.type != 0 && !var9.hasListener && class268.getWidgetClickMask(var9) == 0 && var9 != Client.clickedWidgetParent && var9.contentType != 1338)) { - continue; - } - if (var9.isIf3) { - if (ScriptEvent.isComponentHidden(var9)) { - continue; - } - } else if (var9.type == 0 && var9 != LoginScreenAnimation.mousedOverWidgetIf1 && ScriptEvent.isComponentHidden(var9)) { - continue; + @Export("drawWidgets") + static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + if (Projectile.loadInterface(var0)) { + WorldMapIcon_1.field174 = null; + WorldMapSectionType.drawInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); + if (WorldMapIcon_1.field174 != null) { + WorldMapSectionType.drawInterface(WorldMapIcon_1.field174, -1412584499, var1, var2, var3, var4, HealthBarUpdate.field986, Tile.field1648, var7); + WorldMapIcon_1.field174 = null; } - int var10 = var9.x + width; - int var11 = height + var9.y; - int var12; - int var13; - int var14; - int var15; - if (var9.type == 2) { - var12 = var2; - var13 = var3; - var14 = var4; - var15 = var5; - } else if (var9.type == 9) { - int var16 = var10; - int var17 = var11; - int var18 = var10 + var9.width; - int var19 = var11 + var9.height; - if (var18++ < var10) { - var16 = var18; - var18 = var10; - } - - if (var19++ < var11) { - var17 = var19; - var19 = var11; - } - - var12 = var16 > var2 ? var16 : var2; - var13 = var17 > var3 ? var17 : var3; - var14 = var18 < var4 ? var18 : var4; - var15 = var19 < var5 ? var19 : var5; + } else { + if (var7 != -1) { + Client.field703[var7] = true; } else { - int var16 = var10 + var9.width; - int 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.field745 = true; - Client.field837 = var10; - Client.field838 = var11; - } - - boolean var32 = false; - if (var9.field2704) { - switch(Client.field817) { - case 0: - var32 = true; - case 1: - default: - break; - case 2: - if (Client.field818 == var9.id >>> 16) { - var32 = true; - } - break; - case 3: - if (var9.id == Client.field818) { - var32 = true; - } + for (int var8 = 0; var8 < 100; ++var8) { + Client.field703[var8] = true; } } - if (!var32 && var9.isIf3 && (var12 >= var14 || var13 >= var15)) { - continue; - } - if (var9.isIf3) { - if (var9.noClickThrough) { - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - for (ScriptEvent var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { - if (var26.isMouseInputEvent) { - var26.remove(); - var26.widget.containsMouse = false; - } - } - - if (class80.widgetDragDuration == 0) { - Client.clickedWidget = null; - Client.clickedWidgetParent = null; - } - - if (!Client.isMenuOpen) { - GraphicsObject.addCancelMenuEntry(); - } - } - } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - for (ScriptEvent var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { - if (var26.isMouseInputEvent && var26.widget.onScroll == var26.args) { - var26.remove(); - } - } - } - } - - int var17 = MouseHandler.MouseHandler_x; - int 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) { - class65.addSceneMenuOptions(var17, var18, var12, var13); - } - continue; - } - if (var9.contentType == 1338) { - WorldMapIcon_0.checkIfMinimapClicked(var9, var10, var11); - continue; - } - if (var9.contentType == 1400) { - BoundaryObject.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var33, var10, var11, var9.width, var9.height); - } - - if (!Client.isMenuOpen && var33) { - if (var9.contentType == 1400) { - BoundaryObject.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); - } else { - class40.method703(var9, var17 - var10, var18 - var11); - } - } - - if (var32) { - for (int var20 = 0; var20 < var9.field2650.length; ++var20) { - boolean var21 = false; - boolean var22 = false; - if (!var21 && var9.field2650[var20] != null) { - for (int var23 = 0; var23 < var9.field2650[var20].length; ++var23) { - boolean var24 = false; - if (var9.field2578 != null) { - var24 = KeyHandler.KeyHandler_pressedKeys[var9.field2650[var20][var23]]; - } - - if (PacketWriter.method2244(var9.field2650[var20][var23]) || var24) { - var21 = true; - if (var9.field2578 != null && var9.field2578[var20] > Client.cycle) { - break; - } - - byte var25 = var9.field2625[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) { - Messages.method2163(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); - } else if (var20 == 10) { - WorldMapID.Widget_runOnTargetLeave(); - TileItem.method2053(var9.id, var9.childIndex, HealthBar.method1957(class268.getWidgetClickMask(var9)), var9.itemId); - Client.selectedSpellActionName = FontName.method5318(var9); - if (Client.selectedSpellActionName == null) { - Client.selectedSpellActionName = "null"; - } - - Client.selectedSpellName = var9.dataText + ClientPreferences.colorStartTag(0xffffff); - } - - int var23 = var9.field2641[var20]; - if (var9.field2578 == null) { - var9.field2578 = new int[var9.field2650.length]; - } - - if (var9.field2588 == null) { - var9.field2588 = new int[var9.field2650.length]; - } - - if (var23 != 0) { - if (var9.field2578[var20] == 0) { - var9.field2578[var20] = var23 + Client.cycle + var9.field2588[var20]; - } else { - var9.field2578[var20] = var23 + Client.cycle; - } - } else { - var9.field2578[var20] = Integer.MAX_VALUE; - } - } - - if (!var21 && var9.field2578 != null) { - var9.field2578[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 || !DevicePcmPlayerProvider.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var33) { - var34 = true; - } - - boolean var21 = false; - if ((MouseHandler.MouseHandler_lastButton == 1 || !DevicePcmPlayerProvider.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) { - class60.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11); - } - - if (var9.contentType == 1400) { - BoundaryObject.worldMap.method6301(var17, var18, var33 & var34, var33 & var21); - } - - if (Client.clickedWidget != null && var9 != Client.clickedWidget && var33 && WorldMapIcon_1.method295(class268.getWidgetClickMask(var9))) { - Client.draggedOnWidget = var9; - } - - if (var9 == Client.clickedWidgetParent) { - Client.field873 = true; - Client.field834 = var10; - Client.field835 = var11; - } - - if (var9.hasListener) { - if (var33 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { - ScriptEvent var29 = new ScriptEvent(); - var29.isMouseInputEvent = true; - var29.widget = var9; - var29.mouseY = Client.mouseWheelRotation; - var29.args = var9.onScroll; - Client.scriptEvents.addFirst(var29); - } - - if (Client.clickedWidget != null || WorldMapIcon_0.dragInventoryWidget != null || Client.isMenuOpen) { - var21 = false; - var34 = false; - var33 = false; - } - - if (!var9.isClicked && var21) { - var9.isClicked = true; - if (var9.onClick != null) { - ScriptEvent var29 = new ScriptEvent(); - var29.isMouseInputEvent = true; - var29.widget = var9; - var29.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; - var29.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; - var29.args = var9.onClick; - Client.scriptEvents.addFirst(var29); - } - } - - if (var9.isClicked && var34 && var9.onClickRepeat != null) { - ScriptEvent var29 = new ScriptEvent(); - var29.isMouseInputEvent = true; - var29.widget = var9; - var29.mouseX = MouseHandler.MouseHandler_x - var10; - var29.mouseY = MouseHandler.MouseHandler_y - var11; - var29.args = var9.onClickRepeat; - Client.scriptEvents.addFirst(var29); - } - - if (var9.isClicked && !var34) { - var9.isClicked = false; - if (var9.onRelease != null) { - ScriptEvent var29 = new ScriptEvent(); - var29.isMouseInputEvent = true; - var29.widget = var9; - var29.mouseX = MouseHandler.MouseHandler_x - var10; - var29.mouseY = MouseHandler.MouseHandler_y - var11; - var29.args = var9.onRelease; - Client.field856.addFirst(var29); - } - } - - if (var34 && var9.onHold != null) { - ScriptEvent var29 = new ScriptEvent(); - var29.isMouseInputEvent = true; - var29.widget = var9; - var29.mouseX = MouseHandler.MouseHandler_x - var10; - var29.mouseY = MouseHandler.MouseHandler_y - var11; - var29.args = var9.onHold; - Client.scriptEvents.addFirst(var29); - } - - if (!var9.containsMouse && var33) { - var9.containsMouse = true; - if (var9.onMouseOver != null) { - ScriptEvent var29 = new ScriptEvent(); - var29.isMouseInputEvent = true; - var29.widget = var9; - var29.mouseX = MouseHandler.MouseHandler_x - var10; - var29.mouseY = MouseHandler.MouseHandler_y - var11; - var29.args = var9.onMouseOver; - Client.scriptEvents.addFirst(var29); - } - } - - if (var9.containsMouse && var33 && var9.onMouseRepeat != null) { - ScriptEvent var29 = new ScriptEvent(); - var29.isMouseInputEvent = true; - var29.widget = var9; - var29.mouseX = MouseHandler.MouseHandler_x - var10; - var29.mouseY = MouseHandler.MouseHandler_y - var11; - var29.args = var9.onMouseRepeat; - Client.scriptEvents.addFirst(var29); - } - - if (var9.containsMouse && !var33) { - var9.containsMouse = false; - if (var9.onMouseLeave != null) { - ScriptEvent var29 = new ScriptEvent(); - var29.isMouseInputEvent = true; - var29.widget = var9; - var29.mouseX = MouseHandler.MouseHandler_x - var10; - var29.mouseY = MouseHandler.MouseHandler_y - var11; - var29.args = var9.onMouseLeave; - Client.field856.addFirst(var29); - } - } - - if (var9.onTimer != null) { - ScriptEvent var29 = new ScriptEvent(); - var29.widget = var9; - var29.args = var9.onTimer; - Client.field852.addFirst(var29); - } - - if (var9.onVarTransmit != null && Client.field806 > var9.field2592) { - if (var9.varTransmitTriggers != null && Client.field806 - var9.field2592 <= 32) { - label865: - for (int var35 = var9.field2592; var35 < Client.field806; ++var35) { - int var23 = Client.field863[var35 & 31]; - - for (int var36 = 0; var36 < var9.varTransmitTriggers.length; ++var36) { - if (var23 == var9.varTransmitTriggers[var36]) { - ScriptEvent var31 = new ScriptEvent(); - var31.widget = var9; - var31.args = var9.onVarTransmit; - Client.scriptEvents.addFirst(var31); - break label865; - } - } - } - } else { - ScriptEvent var29 = new ScriptEvent(); - var29.widget = var9; - var29.args = var9.onVarTransmit; - Client.scriptEvents.addFirst(var29); - } - - var9.field2592 = Client.field806; - } - - if (var9.onInvTransmit != null && Client.field671 > var9.field2603) { - if (var9.invTransmitTriggers != null && Client.field671 - var9.field2603 <= 32) { - label841: - for (int var35 = var9.field2603; var35 < Client.field671; ++var35) { - int var23 = Client.field888[var35 & 31]; - - for (int var36 = 0; var36 < var9.invTransmitTriggers.length; ++var36) { - if (var23 == var9.invTransmitTriggers[var36]) { - ScriptEvent var31 = new ScriptEvent(); - var31.widget = var9; - var31.args = var9.onInvTransmit; - Client.scriptEvents.addFirst(var31); - break label841; - } - } - } - } else { - ScriptEvent var29 = new ScriptEvent(); - var29.widget = var9; - var29.args = var9.onInvTransmit; - Client.scriptEvents.addFirst(var29); - } - - var9.field2603 = Client.field671; - } - - if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field2700) { - if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field2700 <= 32) { - label817: - for (int var35 = var9.field2700; var35 < Client.changedSkillsCount; ++var35) { - int var23 = Client.changedSkills[var35 & 31]; - - for (int var36 = 0; var36 < var9.statTransmitTriggers.length; ++var36) { - if (var23 == var9.statTransmitTriggers[var36]) { - ScriptEvent var31 = new ScriptEvent(); - var31.widget = var9; - var31.args = var9.onStatTransmit; - Client.scriptEvents.addFirst(var31); - break label817; - } - } - } - } else { - ScriptEvent var29 = new ScriptEvent(); - var29.widget = var9; - var29.args = var9.onStatTransmit; - Client.scriptEvents.addFirst(var29); - } - - var9.field2700 = Client.changedSkillsCount; - } - - if (Client.chatCycle > var9.field2689 && var9.onChatTransmit != null) { - ScriptEvent var29 = new ScriptEvent(); - var29.widget = var9; - var29.args = var9.onChatTransmit; - Client.scriptEvents.addFirst(var29); - } - - if (Client.field672 > var9.field2689 && var9.onFriendTransmit != null) { - ScriptEvent var29 = new ScriptEvent(); - var29.widget = var9; - var29.args = var9.onFriendTransmit; - Client.scriptEvents.addFirst(var29); - } - - if (Client.field849 > var9.field2689 && var9.onClanTransmit != null) { - ScriptEvent var29 = new ScriptEvent(); - var29.widget = var9; - var29.args = var9.onClanTransmit; - Client.scriptEvents.addFirst(var29); - } - - if (Client.field915 > var9.field2689 && var9.onStockTransmit != null) { - ScriptEvent var29 = new ScriptEvent(); - var29.widget = var9; - var29.args = var9.onStockTransmit; - Client.scriptEvents.addFirst(var29); - } - - if (Client.field851 > var9.field2689 && var9.field2681 != null) { - ScriptEvent var29 = new ScriptEvent(); - var29.widget = var9; - var29.args = var9.field2681; - Client.scriptEvents.addFirst(var29); - } - - if (Client.field844 > var9.field2689 && var9.onMiscTransmit != null) { - ScriptEvent var29 = new ScriptEvent(); - var29.widget = var9; - var29.args = var9.onMiscTransmit; - Client.scriptEvents.addFirst(var29); - } - - var9.field2689 = Client.cycleCntr; - if (var9.onKey != null) { - for (int var35 = 0; var35 < Client.field754; ++var35) { - ScriptEvent var30 = new ScriptEvent(); - var30.widget = var9; - var30.keyTyped = Client.field921[var35]; - var30.keyPressed = Client.field877[var35]; - var30.args = var9.onKey; - Client.scriptEvents.addFirst(var30); - } - } - } - } - - if (!var9.isIf3) { - if (Client.clickedWidget != null || WorldMapIcon_0.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) { - LoginScreenAnimation.mousedOverWidgetIf1 = components[var9.mouseOverRedirect]; - } else { - LoginScreenAnimation.mousedOverWidgetIf1 = var9; - } - } - - if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - class32.field284 = var9; - } - - if (var9.scrollHeight > var9.height) { - GrandExchangeEvents.method71(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); - } - } - - if (var9.type != 0) { - continue; - } - updateInterface(components, 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 var27 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); - if (var27 == null) { - continue; - } - if (var27.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { - for (ScriptEvent var28 = (ScriptEvent)Client.scriptEvents.last(); var28 != null; var28 = (ScriptEvent)Client.scriptEvents.previous()) { - if (var28.isMouseInputEvent) { - var28.remove(); - var28.widget.containsMouse = false; - } - } - - if (class80.widgetDragDuration == 0) { - Client.clickedWidget = null; - Client.clickedWidgetParent = null; - } - - if (!Client.isMenuOpen) { - GraphicsObject.addCancelMenuEntry(); - } - } - - Skills.updateRootInterface(var27.group, var12, var13, var14, var15, var10, var11); } - } @ObfuscatedName("jg") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-949997341" + signature = "(II)Z", + garbageValue = "361090625" ) - @Export("FriendSystem_invalidateIgnoreds") - static final void FriendSystem_invalidateIgnoreds() { - UserComparator10.Messages_invalidateIgnoreds(); - if (DevicePcmPlayerProvider.clanChat != null) { - DevicePcmPlayerProvider.clanChat.invalidateIgnoreds(); + static boolean method40(int var0) { + for (int var1 = 0; var1 < Client.field677; ++var1) { + if (Client.field815[var1] == var0) { + return true; + } } + return false; } } diff --git a/runescape-client/src/main/java/class208.java b/runescape-client/src/main/java/class208.java index 6265405277..3ee8d0d59e 100644 --- a/runescape-client/src/main/java/class208.java +++ b/runescape-client/src/main/java/class208.java @@ -1,199 +1,57 @@ -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.ScriptOpcodes; -@ObfuscatedName("ha") +@ObfuscatedName("hc") public class class208 { - @ObfuscatedName("ax") - @ObfuscatedSignature( - signature = "(ILcx;ZB)I", - garbageValue = "17" + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -1981461029 ) - static int method3941(int var0, Script var1, boolean var2) { - String var3; - int var4; - if (var0 == ScriptOpcodes.APPEND_NUM) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3 + var4; - return 1; - } - String var9; - if (var0 == ScriptOpcodes.APPEND) { - Skills.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize + 1]; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3 + var9; - return 1; - } - if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3 + class195.intToString(var4, true); - return 1; - } - if (var0 == ScriptOpcodes.LOWERCASE) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.toLowerCase(); - return 1; - } - int var6; - int var10; - if (var0 == ScriptOpcodes.FROMDATE) { - var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - long var11 = (11745L + (long)var10) * 86400000L; - 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[++Skills.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var16] + "-" + var8; - return 1; - } - if (var0 == ScriptOpcodes.TEXT_GENDER) { - Skills.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize + 1]; - if (Client.localPlayer.appearance != null && Client.localPlayer.appearance.isFemale) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var9; - } else { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3; + @Export("RunException_revision") + public static int RunException_revision; + + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(IS)I", + garbageValue = "10000" + ) + @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 { + byte[] var7 = VarbitDefinition.VarbitDefinition_archive.takeFile(14, var0); + var2 = new VarbitDefinition(); + if (var7 != null) { + var2.decode(new Buffer(var7)); } - return 1; + VarbitDefinition.VarbitDefinition_cached.put(var2, (long)var0); + var1 = var2; } - if (var0 == ScriptOpcodes.TOSTRING) { - var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = Integer.toString(var10); - return 1; - } - if (var0 == ScriptOpcodes.COMPARE) { - Skills.Interpreter_stringStackSize -= 2; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WallDecoration.method3292(MenuAction.compareStrings(Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize + 1], ScriptFrame.clientLanguage)); - return 1; - } - int var5; - byte[] var13; - Font var14; - if (var0 == ScriptOpcodes.PARAHEIGHT) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - HealthBarUpdate.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - var13 = class2.archive13.takeFile(var5, 0); - var14 = new Font(var13); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var14.lineCount(var3, var4); - return 1; - } - if (var0 == ScriptOpcodes.PARAWIDTH) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - HealthBarUpdate.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - var13 = class2.archive13.takeFile(var5, 0); - var14 = new Font(var13); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var14.lineWidth(var3, var4); - return 1; - } - if (var0 == ScriptOpcodes.TEXT_SWITCH) { - Skills.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize + 1]; - if (Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3; - } else { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var9; - } - return 1; - } - if (var0 == ScriptOpcodes.ESCAPE) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); - return 1; - } - if (var0 == ScriptOpcodes.APPEND_CHAR) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3 + (char) var4; - return 1; - } - if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { - var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Ignored.isCharPrintable((char) var10) ? 1 : 0; - return 1; - } - if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { - var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = GrandExchangeOfferOwnWorldComparator.isAlphaNumeric((char) var10) ? 1 : 0; - return 1; - } - if (var0 == ScriptOpcodes.CHAR_ISALPHA) { - var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = class185.isCharAlphabetic((char) var10) ? 1 : 0; - return 1; - } - if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { - var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = class49.isDigit((char) var10) ? 1 : 0; - return 1; - } - if (var0 == ScriptOpcodes.STRING_LENGTH) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - if (var3 != null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.length(); - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } + 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; + } - return 1; - } - if (var0 == ScriptOpcodes.SUBSTRING) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - HealthBarUpdate.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.substring(var4, var5); - return 1; - } - if (var0 == ScriptOpcodes.REMOVETAGS) { - var3 = Interpreter.Interpreter_stringStack[--Skills.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[++Skills.Interpreter_stringStackSize - 1] = var17.toString(); - return 1; - } - if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.indexOf(var4); - return 1; - } - if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { - Skills.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.indexOf(var9, var5); - return 1; - } - if (var0 == ScriptOpcodes.UPPERCASE) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.toUpperCase(); - return 1; - } - return 2; + @ObfuscatedName("aa") + @ObfuscatedSignature( + signature = "(ILhd;ZI)V", + garbageValue = "-1500859521" + ) + static void method3893(int var0, Coord var1, boolean var2) { + WorldMapArea var3 = LoginScreenAnimation.getWorldMap().getMapArea(var0); + int var4 = WorldMapIcon_1.localPlayer.plane; + int var5 = PacketWriter.baseX * 64 + (WorldMapIcon_1.localPlayer.x >> 7); + int var6 = RouteStrategy.baseY * 64 + (WorldMapIcon_1.localPlayer.y >> 7); + Coord var7 = new Coord(var4, var5, var6); + LoginScreenAnimation.getWorldMap().method6199(var3, var7, var1, var2); } } diff --git a/runescape-client/src/main/java/class210.java b/runescape-client/src/main/java/class210.java index 22b493fd6b..20a7b5b9ce 100644 --- a/runescape-client/src/main/java/class210.java +++ b/runescape-client/src/main/java/class210.java @@ -1,19 +1,15 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hu") +@ObfuscatedName("he") public class class210 { - @ObfuscatedName("qw") - @ObfuscatedGetter( - intValue = 705612672 - ) - static int field2516; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lhk;" + signature = "Lhr;" ) @Export("huffman") public static Huffman huffman; + @ObfuscatedName("n") + static byte[][][] field2492; } diff --git a/runescape-client/src/main/java/class215.java b/runescape-client/src/main/java/class215.java index 4729b47737..f00c27b530 100644 --- a/runescape-client/src/main/java/class215.java +++ b/runescape-client/src/main/java/class215.java @@ -2,86 +2,50 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hy") +@ObfuscatedName("hw") public class class215 { - @ObfuscatedName("q") - public static final short[] field2540; - @ObfuscatedName("w") - public static final short[][] field2541; - @ObfuscatedName("e") - public static final short[] field2542; - @ObfuscatedName("p") - public static final short[][] field2546; - @ObfuscatedName("x") - @Export("NetCache_hasPendingPriorityResponses") - static boolean NetCache_hasPendingPriorityResponses; - @ObfuscatedName("dy") - @ObfuscatedSignature( - signature = "Liu;" - ) - @Export("archive2") - static Archive archive2; + @ObfuscatedName("s") + public static final short[] field2529; + @ObfuscatedName("j") + public static final short[][] field2531; + @ObfuscatedName("i") + public static final short[] field2528; + @ObfuscatedName("k") + public static final short[][] field2527; static { - field2540 = new short[]{6798, 8741, 25238, 4626, 4550}; - field2541 = 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}}; - field2542 = new short[]{-10304, 9104, -1, -1, -1}; - field2546 = 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]}; + field2529 = new short[]{6798, 8741, 25238, 4626, 4550}; + field2531 = 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}}; + field2528 = new short[]{-10304, 9104, -1, -1, -1}; + field2527 = 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("w") - @Export("base37DecodeLong") - public static String base37DecodeLong(long var0) { - if (var0 <= 0L || var0 >= 0x5b5b57f8a98a5dd1L) { - return null; - } - if (var0 % 37L == 0L) { - return null; - } - int var2 = 0; - - for (long var3 = var0; 0L != var3; var3 /= 37L) { - ++var2; - } - - StringBuilder var5; - char var8; - for (var5 = new StringBuilder(var2); var0 != 0L; var5.append(var8)) { - long var6 = var0; - var0 /= 37L; - var8 = class289.base37Table[(int)(var6 - var0 * 37L)]; - if (var8 == '_') { - int var9 = var5.length() - 1; - var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); - var8 = 160; + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(II)Lik;", + garbageValue = "-850772358" + ) + @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; } - - var5.reverse(); - var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); - return var5.toString(); - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "(Lhp;Ljava/lang/String;Ljava/lang/String;I)Llx;", - garbageValue = "-1167154349" - ) - @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); - return PacketBuffer.SpriteBuffer_getIndexedSprite(var0, var3, var4); - } - - @ObfuscatedName("eg") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1461227743" - ) - @Export("setLowDetailOff") - static final void setLowDetailOff() { - Scene.Scene_isLowDetail = false; - Client.isLowDetail = false; } } diff --git a/runescape-client/src/main/java/class216.java b/runescape-client/src/main/java/class216.java deleted file mode 100644 index e1c31271a7..0000000000 --- a/runescape-client/src/main/java/class216.java +++ /dev/null @@ -1,16 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("hd") -public class class216 { - @ObfuscatedName("b") - @Export("SpriteBuffer_spriteHeights") - public static int[] SpriteBuffer_spriteHeights; - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "Lhp;" - ) - @Export("Widget_spritesArchive") - static AbstractArchive Widget_spritesArchive; -} diff --git a/runescape-client/src/main/java/class218.java b/runescape-client/src/main/java/class218.java index 62c4e2e130..886092c601 100644 --- a/runescape-client/src/main/java/class218.java +++ b/runescape-client/src/main/java/class218.java @@ -1,45 +1,42 @@ -import java.applet.Applet; import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hb") +@ObfuscatedName("hk") public class class218 { - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 1717114817 - ) - public static int field2707; - - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Ljava/applet/Applet;Ljava/lang/String;I)V", - garbageValue = "-1987450780" + signature = "(CB)Z", + garbageValue = "0" ) - public static void method4110(Applet var0, String var1) { - class51.applet = var0; - if (var1 != null) { - class51.field434 = var1; - } + public static boolean method4019(char var0) { + if ((var0 <= 0 || var0 >= 128) && (var0 < 160 || var0 > 255)) { + if (var0 != 0) { + char[] var1 = class287.cp1252AsciiExtension; - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-205887653" - ) - @Export("isKeyDown") - public static final boolean isKeyDown() { - synchronized(KeyHandler.KeyHandler_instance) { - if (KeyHandler.field385 == KeyHandler.field396) { - return false; + for (int var2 = 0; var2 < var1.length; ++var2) { + char var3 = var1[var2]; + if (var0 == var3) { + return true; + } + } } - ReflectionCheck.field1338 = KeyHandler.field400[KeyHandler.field396]; - Calendar.field2508 = KeyHandler.field399[KeyHandler.field396]; - KeyHandler.field396 = KeyHandler.field396 + 1 & 127; + + return false; + } else { return true; } } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(II)I", + garbageValue = "-617749686" + ) + @Export("ViewportMouse_unpackX") + public static int ViewportMouse_unpackX(int var0) { + long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; + int var1 = (int)(var2 >>> 0 & 127L); + return var1; + } } diff --git a/runescape-client/src/main/java/class219.java b/runescape-client/src/main/java/class219.java index 85686a0cb3..98b78c1573 100644 --- a/runescape-client/src/main/java/class219.java +++ b/runescape-client/src/main/java/class219.java @@ -1,74 +1,78 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hm") +@ObfuscatedName("hj") public class class219 { - @ObfuscatedName("a") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "-444030041" + signature = "(Ljava/lang/CharSequence;IZI)Z", + garbageValue = "418860931" ) - static final void method4111(String var0) { - PacketBufferNode var1 = Archive.getPacketBufferNode(ClientPacket.field2210, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(Huffman.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); + static boolean method4022(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') { + return false; + } + + var10 = var8 - 'W'; + } + + if (var10 >= var1) { + return false; + } + + if (var3) { + var10 = -var10; + } + + int var9 = var10 + var5 * var1; + if (var9 / var1 != var5) { + return false; + } + + var5 = var9; + var4 = true; + } + + return var4; + } else { + throw new IllegalArgumentException("" + var1); + } } - @ObfuscatedName("gd") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Lbq;II)V", - garbageValue = "1386416846" + signature = "(B)V", + garbageValue = "-62" ) - @Export("getActorScreenLocation") - static final void getActorScreenLocation(Actor var0, int var1) { - class32.worldToScreen(var0.x, var0.y, var1); - } - - @ObfuscatedName("im") - @ObfuscatedSignature( - signature = "(Lhj;IIZI)V", - garbageValue = "-2103568814" - ) - @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.field2636 * var0.height / var0.field2582; - } - - if (var0.heightAlignment == 4) { - var0.height = var0.field2582 * var0.width / var0.field2636; - } - - 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); - } - + static void method4021() { + Messages.Messages_channels.clear(); + Messages.Messages_hashTable.clear(); + Messages.Messages_queue.clear(); + Messages.Messages_count = 0; } } diff --git a/runescape-client/src/main/java/class222.java b/runescape-client/src/main/java/class222.java index 147c04cba4..3a8c22d3f8 100644 --- a/runescape-client/src/main/java/class222.java +++ b/runescape-client/src/main/java/class222.java @@ -1,16 +1,22 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ho") +@ObfuscatedName("hm") public class class222 { - @ObfuscatedName("q") + @ObfuscatedName("jg") @ObfuscatedSignature( - signature = "(II)Liw;", - garbageValue = "-673469339" + signature = "Lhp;" ) - @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); + static Widget field2730; + + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "(ZZI)I", + garbageValue = "49519186" + ) + public static int method4035(boolean var0, boolean var1) { + byte var2 = 0; + int var3 = var2 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount; + return var3; } } diff --git a/runescape-client/src/main/java/class223.java b/runescape-client/src/main/java/class223.java new file mode 100644 index 0000000000..6d5fe85f7a --- /dev/null +++ b/runescape-client/src/main/java/class223.java @@ -0,0 +1,27 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("hq") +public class class223 { + @ObfuscatedName("hz") + @ObfuscatedSignature( + signature = "(IIIIB)V", + garbageValue = "4" + ) + static void method4036(int var0, int var1, int var2, int var3) { + Widget var4 = ModelData0.getWidgetChild(var0, var1); + if (var4 != null && var4.onTargetEnter != null) { + ScriptEvent var5 = new ScriptEvent(); + var5.widget = var4; + var5.args = var4.onTargetEnter; + class81.runScriptEvent(var5); + } + + Client.field736 = var3; + Client.isSpellSelected = true; + NetCache.field3162 = var0; + Client.field816 = var1; + WorldMapSectionType.selectedSpellFlags = var2; + FriendSystem.invalidateWidget(var4); + } +} diff --git a/runescape-client/src/main/java/class225.java b/runescape-client/src/main/java/class225.java index d6a43e227a..18f202aacb 100644 --- a/runescape-client/src/main/java/class225.java +++ b/runescape-client/src/main/java/class225.java @@ -1,85 +1,81 @@ +import java.lang.management.GarbageCollectorMXBean; +import java.lang.management.ManagementFactory; +import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hf") +@ObfuscatedName("ho") public class class225 { - @ObfuscatedName("bo") + @ObfuscatedName("t") + @Export("SpriteBuffer_spriteHeights") + public static int[] SpriteBuffer_spriteHeights; + + @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "[Llx;" + signature = "(I)I", + garbageValue = "793886120" ) - @Export("worldSelectArrows") - static IndexedSprite[] worldSelectArrows; + @Export("getGcDuration") + protected static int getGcDuration() { + int var0 = 0; + if (GrandExchangeEvent.garbageCollector == null || !GrandExchangeEvent.garbageCollector.isValid()) { + try { + Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); - @ObfuscatedName("ji") - @ObfuscatedSignature( - signature = "([Lhj;II)V", - garbageValue = "-1666853879" - ) - @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 && ScriptEvent.isComponentHidden(var3))) { - continue; - } - if (var3.type == 0) { - if (!var3.isIf3 && ScriptEvent.isComponentHidden(var3) && var3 != LoginScreenAnimation.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) { - Archive.drawInterfaceModelComponents(var4.group); - } - } - - if (var3.type != 6) { - continue; - } - int var5; - if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { - boolean var7 = ChatChannel.runCs1(var3); - if (var7) { - var5 = var3.sequenceId2; - } else { - var5 = var3.sequenceId; - } - - if (var5 != -1) { - SequenceDefinition var6 = GrandExchangeEvent.SequenceDefinition_get(var5); - - for (var3.modelFrameCycle += Client.field718; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; Strings.invalidateWidget(var3)) { - var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; - ++var3.modelFrame; - if (var3.modelFrame < var6.frameIds.length) { - continue; - } - var3.modelFrame -= var6.frameCount; - if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { - var3.modelFrame = 0; - } + while (var1.hasNext()) { + GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); + if (var2.isValid()) { + GrandExchangeEvent.garbageCollector = var2; + GameShell.garbageCollectorLastCheckTimeMs = -1L; + GameShell.garbageCollectorLastCollectionTime = -1L; } } + } catch (Throwable var11) { } - - if (var3.field2575 == 0 || var3.isIf3) { - continue; - } - - int var8 = var3.field2575 >> 16; - var5 = var3.field2575 << 16 >> 16; - var8 *= Client.field718; - var5 *= Client.field718; - var3.modelAngleX = var8 + var3.modelAngleX & 2047; - var3.modelAngleY = var5 + var3.modelAngleY & 2047; - Strings.invalidateWidget(var3); } + if (GrandExchangeEvent.garbageCollector != null) { + long var9 = SequenceDefinition.method4686(); + long var3 = GrandExchangeEvent.garbageCollector.getCollectionTime(); + if (GameShell.garbageCollectorLastCollectionTime != -1L) { + long var5 = var3 - GameShell.garbageCollectorLastCollectionTime; + long var7 = var9 - GameShell.garbageCollectorLastCheckTimeMs; + if (var7 != 0L) { + var0 = (int)(100L * var5 / var7); + } + } + + GameShell.garbageCollectorLastCollectionTime = var3; + GameShell.garbageCollectorLastCheckTimeMs = var9; + } + + return var0; + } + + @ObfuscatedName("if") + @ObfuscatedSignature( + signature = "(III)Ljava/lang/String;", + garbageValue = "1269667837" + ) + static final String method4037(int var0, int var1) { + int var2 = var1 - var0; + if (var2 < -9) { + return class16.colorStartTag(16711680); + } else if (var2 < -6) { + return class16.colorStartTag(16723968); + } else if (var2 < -3) { + return class16.colorStartTag(16740352); + } else if (var2 < 0) { + return class16.colorStartTag(16756736); + } else if (var2 > 9) { + return class16.colorStartTag(65280); + } else if (var2 > 6) { + return class16.colorStartTag(4259584); + } else if (var2 > 3) { + return class16.colorStartTag(8453888); + } else { + return var2 > 0 ? class16.colorStartTag(12648192) : class16.colorStartTag(16776960); + } } } diff --git a/runescape-client/src/main/java/class226.java b/runescape-client/src/main/java/class226.java deleted file mode 100644 index daef08f1d7..0000000000 --- a/runescape-client/src/main/java/class226.java +++ /dev/null @@ -1,133 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("hw") -public class class226 { - @ObfuscatedName("pr") - @ObfuscatedSignature( - signature = "Lkl;" - ) - @Export("privateChatMode") - static PrivateChatMode privateChatMode; - @ObfuscatedName("r") - @ObfuscatedSignature( - signature = "Lhq;" - ) - @Export("NetCache_currentResponse") - static NetFileRequest NetCache_currentResponse; - - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "(Lkx;II)Z", - garbageValue = "-352047926" - ) - @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(); - } - Player var6 = Client.players[var1] = new Player(); - var6.index = var1; - if (Players.field1254[var1] != null) { - var6.read(Players.field1254[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.field1250[var1]; - var6.plane = (byte)var8; - var6.resetPath((var9 << 13) + var3 - MusicPatchNode2.baseX * 64, (var10 << 13) + var4 - class1.baseY * 64); - var6.field638 = false; - return true; - } - if (var2 == 1) { - var3 = var0.readBits(2); - var4 = Players.Players_regions[var1]; - Players.Players_regions[var1] = (((var4 >> 28) + var3 & 3) << 28) + (var4 & 0xfffffff); - return false; - } - 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; - } - 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; - } -} diff --git a/runescape-client/src/main/java/class227.java b/runescape-client/src/main/java/class227.java index 29aae46498..36d714de6a 100644 --- a/runescape-client/src/main/java/class227.java +++ b/runescape-client/src/main/java/class227.java @@ -2,47 +2,44 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hi") +@ObfuscatedName("hu") public final class class227 { - @ObfuscatedName("gh") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lbd;ZB)V", - garbageValue = "22" + signature = "(Lln;ILjava/lang/String;B)Ljava/lang/String;", + garbageValue = "-102" ) - @Export("addPlayerToScene") - static void addPlayerToScene(Player var0, boolean var1) { - if (var0 == null || !var0.isVisible() || var0.isHidden) { - return; - } - var0.isUnanimated = false; - if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.movementSequence == var0.readySequence) { - var0.isUnanimated = true; + static String method4041(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; } + } - int var2 = var0.x >> 7; - int var3 = var0.y >> 7; - if (var2 < 0 || var2 >= 104 || var3 < 0 || var3 >= 104) { - return; - } - long var4 = Tile.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, class42.plane); - var0.playerCycle = Client.cycle; - GrandExchangeOfferWorldComparator.scene.addNullableObject(class42.plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.field627, var0.field625, var0.field612, var0.field630); - return; - } - if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { - if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { - return; - } + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "(II)Lbi;", + garbageValue = "-93383433" + ) + @Export("Messages_getMessage") + static Message Messages_getMessage(int var0) { + return (Message)Messages.Messages_hashTable.get((long)var0); + } - Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; + @ObfuscatedName("kn") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)V", + garbageValue = "1725811836" + ) + @Export("Clan_joinChat") + static final void Clan_joinChat(String var0) { + if (!var0.equals("")) { + PacketBufferNode var1 = MenuAction.getPacketBufferNode(ClientPacket.field2263, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var0)); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); } - - var0.tileHeight = ScriptEvent.getTileHeight(var0.x, var0.y, class42.plane); - var0.playerCycle = Client.cycle; - GrandExchangeOfferWorldComparator.scene.drawEntity(class42.plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); - } } diff --git a/runescape-client/src/main/java/class237.java b/runescape-client/src/main/java/class237.java index 5d95976799..8fbaf986c0 100644 --- a/runescape-client/src/main/java/class237.java +++ b/runescape-client/src/main/java/class237.java @@ -4,78 +4,73 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ih") +@ObfuscatedName("ic") public class class237 { - @ObfuscatedName("c") - static int[] field3189; - @ObfuscatedName("ah") - @ObfuscatedGetter( - intValue = 1134867961 - ) - static int field3191; - @ObfuscatedName("q") + @ObfuscatedName("x") + static int[] field3171; + @ObfuscatedName("s") @Export("spriteMap") final HashMap spriteMap; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lls;" + signature = "Llh;" ) @Export("bounds") Bounds bounds; - @ObfuscatedName("e") - int[] field3184; - @ObfuscatedName("p") - int[] field3182; + @ObfuscatedName("i") + int[] field3168; @ObfuscatedName("k") + int[] field3170; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1881453341 + intValue = -719138889 ) - int field3190; + int field3169; public class237() { this.spriteMap = new HashMap(); this.bounds = new Bounds(0, 0); - this.field3184 = new int[2048]; - this.field3182 = new int[2048]; - this.field3190 = 0; - field3189 = new int[2000]; + this.field3168 = new int[2048]; + this.field3170 = new int[2048]; + this.field3169 = 0; + field3171 = new int[2000]; int var1 = 0; int var2 = 240; int var4; for (byte var3 = 12; var1 < 16; var2 -= var3) { - var4 = Username.method5217((double)((float)var2 / 360.0F), 0.9998999834060669D, (double)(0.425F * (float)var1 / 16.0F + 0.075F)); - field3189[var1] = var4; + var4 = Decimator.method2452((double)((float)var2 / 360.0F), 0.9998999834060669D, (double)(0.425F * (float)var1 / 16.0F + 0.075F)); + field3171[var1] = var4; ++var1; } var2 = 48; - for (int var6 = var2 / 6; var1 < field3189.length; var2 -= var6) { + for (int var6 = var2 / 6; var1 < field3171.length; var2 -= var6) { var4 = var1 * 2; - for (int var5 = Username.method5217((double)((float)var2 / 360.0F), 0.9998999834060669D, 0.5D); var1 < var4 && var1 < field3189.length; ++var1) { - field3189[var1] = var5; + for (int var5 = Decimator.method2452((double)((float)var2 / 360.0F), 0.9998999834060669D, 0.5D); var1 < var4 && var1 < field3171.length; ++var1) { + field3171[var1] = var5; } } } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1241140434" + signature = "(IB)V", + garbageValue = "62" ) - void method4317(int var1) { + void method4238(int var1) { int var2 = var1 * 2 + 1; - double[] var3 = ClientParameter.method4992(0.0D, (double)((float)var1 / 3.0F), var1); + double[] var3 = Entity.method3211(0.0D, (double)((float)var1 / 3.0F), var1); double var4 = var3[var1] * var3[var1]; int[] var6 = new int[var2 * var2]; boolean var7 = false; for (int var8 = 0; var8 < var2; ++var8) { for (int var9 = 0; var9 < var2; ++var9) { - int var10 = var6[var9 + var8 * var2] = (int)(256.0D * (var3[var9] * var3[var8] / var4)); + int var10 = var6[var9 + var8 * var2] = (int)(var3[var9] * var3[var8] / var4 * 256.0D); if (!var7 && var10 > 0) { var7 = true; } @@ -86,49 +81,49 @@ public class class237 { this.spriteMap.put(var1, var11); } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(II)Lly;", - garbageValue = "314101713" + signature = "(II)Lls;", + garbageValue = "-588854887" ) - Sprite method4318(int var1) { + Sprite method4240(int var1) { if (!this.spriteMap.containsKey(var1)) { - this.method4317(var1); + this.method4238(var1); } return (Sprite)this.spriteMap.get(var1); } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(IIB)V", - garbageValue = "-97" + garbageValue = "64" ) - public final void method4316(int var1, int var2) { - if (this.field3190 < this.field3184.length) { - this.field3184[this.field3190] = var1; - this.field3182[this.field3190] = var2; - ++this.field3190; + public final void method4237(int var1, int var2) { + if (this.field3169 < this.field3168.length) { + this.field3168[this.field3169] = var1; + this.field3170[this.field3169] = var2; + ++this.field3169; } } - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "25" - ) - public final void method4320() { - this.field3190 = 0; - } - @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(IILly;FI)V", - garbageValue = "-690333183" + signature = "(I)V", + garbageValue = "-516549049" ) - public final void method4321(int var1, int var2, Sprite var3, float var4) { - int var5 = (int)(18.0F * var4); - Sprite var6 = this.method4318(var5); + public final void method4241() { + this.field3169 = 0; + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "(IILls;FB)V", + garbageValue = "20" + ) + public final void method4242(int var1, int var2, Sprite var3, float var4) { + int var5 = (int)(var4 * 18.0F); + Sprite var6 = this.method4240(var5); int var7 = var5 * 2 + 1; Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); Bounds var9 = new Bounds(0, 0); @@ -138,14 +133,14 @@ public class class237 { int var10; int var11; int var12; - for (var10 = 0; var10 < this.field3190; ++var10) { - var11 = this.field3184[var10]; - var12 = this.field3182[var10]; + for (var10 = 0; var10 < this.field3169; ++var10) { + var11 = this.field3168[var10]; + var12 = this.field3170[var10]; int var13 = (int)(var4 * (float)(var11 - var1)) - var5; int var14 = (int)((float)var3.subHeight - (float)(var12 - var2) * var4) - var5; this.bounds.setLow(var13, var14); - this.bounds.method5980(var8, var9); - this.method4322(var6, var3, var9); + this.bounds.method5846(var8, var9); + this.method4243(var6, var3, var9); } System.nanoTime(); @@ -153,18 +148,18 @@ public class class237 { for (var10 = 0; var10 < var3.pixels.length; ++var10) { if (var3.pixels[var10] == 0) { - var3.pixels[var10] = 0xff000000; + var3.pixels[var10] = -16777216; } else { var11 = (var3.pixels[var10] + 64 - 1) / 256; if (var11 <= 0) { - var3.pixels[var10] = 0xff000000; + var3.pixels[var10] = -16777216; } else { - if (var11 > field3189.length) { - var11 = field3189.length; + if (var11 > field3171.length) { + var11 = field3171.length; } - var12 = field3189[var11 - 1]; - var3.pixels[var10] = 0xff000000 | var12; + var12 = field3171[var11 - 1]; + var3.pixels[var10] = -16777216 | var12; } } } @@ -172,12 +167,12 @@ public class class237 { System.nanoTime(); } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Lly;Lly;Lls;I)V", - garbageValue = "1272955038" + signature = "(Lls;Lls;Llh;I)V", + garbageValue = "2027026702" ) - void method4322(Sprite var1, Sprite var2, Bounds var3) { + void method4243(Sprite var1, Sprite var2, Bounds var3) { if (var3.highX != 0 && var3.highY != 0) { int var4 = 0; int var5 = 0; @@ -194,7 +189,9 @@ public class class237 { for (int var8 = 0; var8 < var3.highY; ++var8) { for (int var9 = 0; var9 < var3.highX; ++var9) { - var2.pixels[++var7] += var1.pixels[var6++]; + int[] var10000 = var2.pixels; + int var10001 = var7++; + var10000[var10001] += var1.pixels[var6++]; } var6 += var1.subWidth - var3.highX; diff --git a/runescape-client/src/main/java/class247.java b/runescape-client/src/main/java/class247.java index e24a705ba3..373e772166 100644 --- a/runescape-client/src/main/java/class247.java +++ b/runescape-client/src/main/java/class247.java @@ -1,15 +1,23 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("il") +@ObfuscatedName("it") public class class247 { - @ObfuscatedName("i") - public static short[][] field3291; - @ObfuscatedName("km") - @ObfuscatedGetter( - intValue = -940566551 + @ObfuscatedName("qw") + @ObfuscatedSignature( + signature = "Ldb;" ) - @Export("menuX") - static int menuX; + @Export("decimator") + static Decimator decimator; + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1267026427" + ) + @Export("WorldMapRegion_clearCachedSprites") + static void WorldMapRegion_clearCachedSprites() { + WorldMapRegion.WorldMapRegion_cachedSprites.clear(); + } } diff --git a/runescape-client/src/main/java/class266.java b/runescape-client/src/main/java/class266.java new file mode 100644 index 0000000000..1e05ea6f31 --- /dev/null +++ b/runescape-client/src/main/java/class266.java @@ -0,0 +1,40 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("jh") +public class class266 { + @ObfuscatedName("s") + @Export("base37DecodeLong") + public static String base37DecodeLong(long var0) { + if (var0 > 0L && var0 < 6582952005840035281L) { + if (0L == var0 % 37L) { + return null; + } else { + int var2 = 0; + + 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 = 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; + } + } +} diff --git a/runescape-client/src/main/java/class267.java b/runescape-client/src/main/java/class267.java deleted file mode 100644 index f05f63c16d..0000000000 --- a/runescape-client/src/main/java/class267.java +++ /dev/null @@ -1,20 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("jn") -public class class267 { - @ObfuscatedName("ai") - @Export("hasFocus") - protected static boolean hasFocus; - - @ObfuscatedName("jy") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1804556356" - ) - static final void method4986() { - Client.field849 = Client.cycleCntr; - GrandExchangeEvent.ClanChat_inClanChat = true; - } -} diff --git a/runescape-client/src/main/java/class268.java b/runescape-client/src/main/java/class268.java index 3404e19bb6..4b0d0e5ece 100644 --- a/runescape-client/src/main/java/class268.java +++ b/runescape-client/src/main/java/class268.java @@ -1,32 +1,63 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ji") +@ObfuscatedName("jy") public class class268 { - @ObfuscatedName("b") - static byte[][][] field3561; - - @ObfuscatedName("i") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "2090622198" + signature = "(ILcr;ZI)I", + garbageValue = "1046379510" ) - @Export("setLoginResponseString") - static void setLoginResponseString(String var0, String var1, String var2) { - Login.Login_response1 = var0; - Login.Login_response2 = var1; - Login.Login_response3 = var2; - } - - @ObfuscatedName("jx") - @ObfuscatedSignature( - signature = "(Lhj;I)I", - garbageValue = "2029030318" - ) - @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; + static int method4893(int var0, Script var1, boolean var2) { + Widget var3 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + if (var0 == ScriptOpcodes.IF_GETSCROLLX) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollX; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollY; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETTEXT) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.text; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollWidth; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollHeight; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelZoom; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleX; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleZ; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleY; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETTRANSTOP) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyTop; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETTRANSBOT) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyBot; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color2; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETFILLMODE) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; + return 1; + } else { + return 2; + } } } diff --git a/runescape-client/src/main/java/class269.java b/runescape-client/src/main/java/class269.java index 4f9ed62307..b35ec954fc 100644 --- a/runescape-client/src/main/java/class269.java +++ b/runescape-client/src/main/java/class269.java @@ -1,11 +1,60 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jp") +@ObfuscatedName("jg") public class class269 { - @ObfuscatedName("fm") + @ObfuscatedName("dx") @ObfuscatedSignature( - signature = "Lky;" + signature = "Lid;" ) - static AbstractSocket field3563; + @Export("archive1") + static Archive archive1; + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "([BIIIIIII[Lfm;I)V", + garbageValue = "-1620940742" + ) + static final void method4894(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[var3 + var10] &= -16777217; + } + } + } + + Buffer var21 = 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 var15 = var2 + ReflectionCheck.method2213(var11 & 7, var12 & 7, var7); + int var18 = var11 & 7; + int var19 = var12 & 7; + int var20 = var7 & 3; + int var17; + if (var20 == 0) { + var17 = var19; + } else if (var20 == 1) { + var17 = 7 - var18; + } else if (var20 == 2) { + var17 = 7 - var19; + } else { + var17 = var18; + } + + class30.loadTerrain(var21, var1, var15, var3 + var17, 0, 0, var7); + } else { + class30.loadTerrain(var21, 0, -1, -1, 0, 0, 0); + } + } + } + } + + } } diff --git a/runescape-client/src/main/java/class270.java b/runescape-client/src/main/java/class270.java new file mode 100644 index 0000000000..2ee2ef9e84 --- /dev/null +++ b/runescape-client/src/main/java/class270.java @@ -0,0 +1,23 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ji") +public class class270 { + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(II)Lkk;", + garbageValue = "-1980425423" + ) + public static PrivateChatMode method4895(int var0) { + PrivateChatMode[] var1 = AbstractSocket.ChatMode_values(); + + for (int var2 = 0; var2 < var1.length; ++var2) { + PrivateChatMode var3 = var1[var2]; + if (var0 == var3.field3791) { + return var3; + } + } + + return null; + } +} diff --git a/runescape-client/src/main/java/class286.java b/runescape-client/src/main/java/class286.java new file mode 100644 index 0000000000..a08a0e4cc4 --- /dev/null +++ b/runescape-client/src/main/java/class286.java @@ -0,0 +1,93 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; + +@ObfuscatedName("ks") +public class class286 { + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "Lhp;" + ) + static Widget field3623; + + @ObfuscatedName("av") + @ObfuscatedSignature( + signature = "(ILcr;ZI)I", + garbageValue = "-2004076029" + ) + static int method5166(int var0, Script var1, boolean var2) { + int var3; + int var4; + int var6; + if (var0 == ScriptOpcodes.ENUM_STRING) { + Interpreter.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + EnumDefinition var5 = MenuAction.getEnum(var3); + if (var5.outputType != 's') { + } + + for (var6 = 0; var6 < var5.outputCount; ++var6) { + if (var4 == var5.keys[var6]) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.strVals[var6]; + var5 = null; + break; + } + } + + if (var5 != null) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.defaultStr; + } + + return 1; + } else if (var0 != ScriptOpcodes.ENUM) { + if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + EnumDefinition var10 = MenuAction.getEnum(var3); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var10.size(); + return 1; + } else { + return 2; + } + } else { + Interpreter.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + int var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; + EnumDefinition var7 = MenuAction.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[++Interpreter.Interpreter_stringStackSize - 1] = var7.strVals[var8]; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.intVals[var8]; + } + + var7 = null; + break; + } + } + + if (var7 != null) { + if (var4 == 115) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.defaultStr; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.defaultInt; + } + } + + return 1; + } else { + if (var4 == 115) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "null"; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + } + } +} diff --git a/runescape-client/src/main/java/class287.java b/runescape-client/src/main/java/class287.java index 28abfd715d..91228b6ebe 100644 --- a/runescape-client/src/main/java/class287.java +++ b/runescape-client/src/main/java/class287.java @@ -1,25 +1,13 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("kj") public class class287 { - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "(Lhp;Lhp;Ljava/lang/String;Ljava/lang/String;I)Lke;", - garbageValue = "-2097439358" - ) - @Export("SpriteBuffer_getFontByName") - public static Font SpriteBuffer_getFontByName(AbstractArchive spriteArchive, AbstractArchive fontArchive, String groupName, String fileName) { - int var4 = spriteArchive.getGroupId(groupName); - int var5 = spriteArchive.getFileId(var4, fileName); - Font var6; - if (!Friend.SpriteBuffer_bufferFile(spriteArchive, var4, var5)) { - var6 = null; - } else { - var6 = WallDecoration.SpriteBuffer_createFont(fontArchive.takeFile(var4, var5)); - } + @ObfuscatedName("s") + @Export("cp1252AsciiExtension") + public static final char[] cp1252AsciiExtension; - return var6; + static { + cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; } } diff --git a/runescape-client/src/main/java/class288.java b/runescape-client/src/main/java/class288.java index 5b014f52be..0001c7ca37 100644 --- a/runescape-client/src/main/java/class288.java +++ b/runescape-client/src/main/java/class288.java @@ -1,20 +1,21 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ka") -public class class288 { - @ObfuscatedName("q") - @Export("cp1252AsciiExtension") - public static final char[] cp1252AsciiExtension; - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lhp;" - ) - @Export("KitDefinition_modelsArchive") - static AbstractArchive KitDefinition_modelsArchive; +@ObfuscatedName("kt") +public final class class288 { + @ObfuscatedName("s") + @Export("base37Table") + public static final char[] base37Table; + @ObfuscatedName("j") + static long[] field3629; static { - cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; + 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'}; + field3629 = new long[12]; + + for (int var0 = 0; var0 < field3629.length; ++var0) { + field3629[var0] = (long)Math.pow(37.0D, (double)var0); + } + } } diff --git a/runescape-client/src/main/java/class289.java b/runescape-client/src/main/java/class289.java index 940497a96c..bbc7f03ba4 100644 --- a/runescape-client/src/main/java/class289.java +++ b/runescape-client/src/main/java/class289.java @@ -1,50 +1,89 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ko") -public final class class289 { - @ObfuscatedName("q") - @Export("base37Table") - static final char[] base37Table; - @ObfuscatedName("w") - static long[] field3669; +@ObfuscatedName("kc") +public class class289 { + @ObfuscatedName("s") + static char[] field3631; + @ObfuscatedName("j") + static char[] field3630; + @ObfuscatedName("i") + static char[] field3632; + @ObfuscatedName("k") + static int[] field3633; 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'}; - field3669 = new long[12]; + field3631 = new char[64]; - for (int var0 = 0; var0 < field3669.length; ++var0) { - field3669[var0] = (long)Math.pow(37.0D, (double)var0); + int var0; + for (var0 = 0; var0 < 26; ++var0) { + field3631[var0] = (char)(var0 + 65); } - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(Lhp;III)[Llx;", - garbageValue = "1777014825" - ) - @Export("SpriteBuffer_getIndexedSpriteArray") - public static IndexedSprite[] SpriteBuffer_getIndexedSpriteArray(AbstractArchive var0, int var1, int var2) { - if (!Friend.SpriteBuffer_bufferFile(var0, var1, var2)) { - return null; - } - IndexedSprite[] var4 = new IndexedSprite[SpriteBuffer.SpriteBuffer_spriteCount]; - - for (int var5 = 0; var5 < SpriteBuffer.SpriteBuffer_spriteCount; ++var5) { - IndexedSprite var6 = var4[var5] = new IndexedSprite(); - var6.width = SpriteBuffer.SpriteBuffer_spriteWidth; - var6.height = SpriteBuffer.SpriteBuffer_spriteHeight; - var6.xOffset = Varps.SpriteBuffer_xOffsets[var5]; - var6.yOffset = SpriteBuffer.SpriteBuffer_yOffsets[var5]; - var6.subWidth = SpriteBuffer.SpriteBuffer_spriteWidths[var5]; - var6.subHeight = class216.SpriteBuffer_spriteHeights[var5]; - var6.palette = Frames.SpriteBuffer_spritePalette; - var6.pixels = SpriteBuffer.SpriteBuffer_pixels[var5]; + for (var0 = 26; var0 < 52; ++var0) { + field3631[var0] = (char)(var0 + 97 - 26); } - class16.SpriteBuffer_clear(); - return var4; + for (var0 = 52; var0 < 62; ++var0) { + field3631[var0] = (char)(var0 + 48 - 52); + } + + field3631[62] = '+'; + field3631[63] = '/'; + field3630 = new char[64]; + + for (var0 = 0; var0 < 26; ++var0) { + field3630[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { + field3630[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { + field3630[var0] = (char)(var0 + 48 - 52); + } + + field3630[62] = '*'; + field3630[63] = '-'; + field3632 = new char[64]; + + for (var0 = 0; var0 < 26; ++var0) { + field3632[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { + field3632[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { + field3632[var0] = (char)(var0 + 48 - 52); + } + + field3632[62] = '-'; + field3632[63] = '_'; + field3633 = new int[128]; + + for (var0 = 0; var0 < field3633.length; ++var0) { + field3633[var0] = -1; + } + + for (var0 = 65; var0 <= 90; ++var0) { + field3633[var0] = var0 - 65; + } + + for (var0 = 97; var0 <= 122; ++var0) { + field3633[var0] = var0 - 97 + 26; + } + + for (var0 = 48; var0 <= 57; ++var0) { + field3633[var0] = var0 - 48 + 52; + } + + int[] var2 = field3633; + field3633[43] = 62; + var2[42] = 62; + int[] var1 = field3633; + field3633[47] = 63; + var1[45] = 63; } } diff --git a/runescape-client/src/main/java/class290.java b/runescape-client/src/main/java/class290.java index 32533dbc6d..86e968ecff 100644 --- a/runescape-client/src/main/java/class290.java +++ b/runescape-client/src/main/java/class290.java @@ -1,89 +1,27 @@ +import java.io.File; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kk") -public class class290 { - @ObfuscatedName("q") - static char[] field3673; - @ObfuscatedName("w") - static char[] field3672; - @ObfuscatedName("e") - static char[] field3674; - @ObfuscatedName("p") - static int[] field3671; +@ObfuscatedName("kq") +public final class class290 { + @ObfuscatedName("k") + @Export("JagexCache_locationFile") + static File JagexCache_locationFile; - static { - field3673 = new char[64]; - - int var0; - for (var0 = 0; var0 < 26; ++var0) { - field3673[var0] = (char)(var0 + 65); + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "(Lhz;II)Z", + garbageValue = "-691629841" + ) + @Export("SpriteBuffer_bufferFileFlat") + public static boolean SpriteBuffer_bufferFileFlat(AbstractArchive var0, int var1) { + byte[] var2 = var0.takeFileFlat(var1); + if (var2 == null) { + return false; + } else { + Player.SpriteBuffer_decode(var2); + return true; } - - for (var0 = 26; var0 < 52; ++var0) { - field3673[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { - field3673[var0] = (char)(var0 + 48 - 52); - } - - field3673[62] = '+'; - field3673[63] = '/'; - field3672 = new char[64]; - - for (var0 = 0; var0 < 26; ++var0) { - field3672[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { - field3672[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { - field3672[var0] = (char)(var0 + 48 - 52); - } - - field3672[62] = '*'; - field3672[63] = '-'; - field3674 = new char[64]; - - for (var0 = 0; var0 < 26; ++var0) { - field3674[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { - field3674[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { - field3674[var0] = (char)(var0 + 48 - 52); - } - - field3674[62] = '-'; - field3674[63] = '_'; - field3671 = new int[128]; - - for (var0 = 0; var0 < field3671.length; ++var0) { - field3671[var0] = -1; - } - - for (var0 = 65; var0 <= 90; ++var0) { - field3671[var0] = var0 - 65; - } - - for (var0 = 97; var0 <= 122; ++var0) { - field3671[var0] = var0 - 97 + 26; - } - - for (var0 = 48; var0 <= 57; ++var0) { - field3671[var0] = var0 - 48 + 52; - } - - int[] var2 = field3671; - field3671[43] = 62; - var2[42] = 62; - int[] var1 = field3671; - field3671[47] = 63; - var1[45] = 63; } } diff --git a/runescape-client/src/main/java/class291.java b/runescape-client/src/main/java/class291.java deleted file mode 100644 index 118815e4ac..0000000000 --- a/runescape-client/src/main/java/class291.java +++ /dev/null @@ -1,186 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("kv") -public final class class291 { - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;Lmu;I)Ljava/lang/String;", - garbageValue = "-1894833715" - ) - public static String method5315(CharSequence var0, LoginType var1) { - if (var0 == null) { - return null; - } - int var2 = 0; - - int var3; - boolean var4; - char var5; - for (var3 = var0.length(); var2 < var3; ++var2) { - var5 = var0.charAt(var2); - var4 = var5 == 160 || var5 == ' ' || var5 == '_' || var5 == '-'; - if (!var4) { - break; - } - } - - while (var3 > var2) { - var5 = var0.charAt(var3 - 1); - var4 = var5 == 160 || var5 == ' ' || var5 == '_' || var5 == '-'; - if (!var4) { - break; - } - - --var3; - } - - int var14 = var3 - var2; - if (var14 < 1) { - return null; - } - byte var6; - if (var1 == null) { - var6 = 12; - } else { - switch(var1.field4057) { - case 8: - var6 = 20; - break; - default: - var6 = 12; - } - } - - if (var14 <= var6) { - StringBuilder var12 = new StringBuilder(var14); - - for (int var15 = var2; var15 < var3; ++var15) { - char var7 = var0.charAt(var15); - boolean var8; - if (Character.isISOControl(var7)) { - var8 = false; - } else if (GrandExchangeOfferOwnWorldComparator.isAlphaNumeric(var7)) { - var8 = true; - } else { - char[] var13 = class339.field4061; - int var10; - for (var10 = 0, var8 = false; var10 < var13.length; var10++) { - char var11 = var13[var10]; - if (var11 == var7) { - var8 = true; - break; - } - } - - var13 = class339.field4062; - for (var10 = 0; var10 < var13.length; ++var10) { - char var11 = var13[var10]; - if (var11 == var7) { - var8 = true; - break; - } - } - } - - if (var8) { - char var9; - switch(var7) { - case ' ': - case '-': - case '_': - case ' ': - var9 = '_'; - break; - case '#': - case '[': - case ']': - var9 = var7; - break; - case 'À': - case 'Á': - case 'Â': - case 'Ã': - case 'Ä': - case 'à': - case 'á': - case 'â': - case 'ã': - case 'ä': - var9 = 'a'; - break; - case 'Ç': - case 'ç': - var9 = 'c'; - break; - case 'È': - case 'É': - case 'Ê': - case 'Ë': - case 'è': - case 'é': - case 'ê': - case 'ë': - var9 = 'e'; - break; - case 'Í': - case 'Î': - case 'Ï': - case 'í': - case 'î': - case 'ï': - var9 = 'i'; - break; - case 'Ñ': - case 'ñ': - var9 = 'n'; - break; - case 'Ò': - case 'Ó': - case 'Ô': - case 'Õ': - case 'Ö': - case 'ò': - case 'ó': - case 'ô': - case 'õ': - case 'ö': - var9 = 'o'; - break; - case 'Ù': - case 'Ú': - case 'Û': - case 'Ü': - case 'ù': - case 'ú': - case 'û': - case 'ü': - var9 = 'u'; - break; - case 'ß': - var9 = 'b'; - break; - case 'ÿ': - case 'Ÿ': - var9 = 'y'; - break; - default: - var9 = Character.toLowerCase(var7); - } - - if (var9 != 0) { - var12.append(var9); - } - } - } - - if (var12.length() == 0) { - return null; - } - - return var12.toString(); - } - - return null; - } -} diff --git a/runescape-client/src/main/java/class293.java b/runescape-client/src/main/java/class293.java new file mode 100644 index 0000000000..c5682ebdb3 --- /dev/null +++ b/runescape-client/src/main/java/class293.java @@ -0,0 +1,13 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("kf") +public class class293 { + @ObfuscatedName("sx") + @ObfuscatedSignature( + signature = "Lkv;" + ) + @Export("masterDisk") + static ArchiveDisk masterDisk; +} diff --git a/runescape-client/src/main/java/class294.java b/runescape-client/src/main/java/class294.java deleted file mode 100644 index 32518768a3..0000000000 --- a/runescape-client/src/main/java/class294.java +++ /dev/null @@ -1,78 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("kz") -public class class294 { - @ObfuscatedName("bb") - static String field3695; - @ObfuscatedName("jp") - @ObfuscatedSignature( - signature = "Lhj;" - ) - static Widget field3697; - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(I[BLkm;I)V", - garbageValue = "-966151502" - ) - static void method5328(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.field3144 == 0) { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); - } - - ArchiveDiskActionHandler.field3144 = 600; - } - } - - @ObfuscatedName("gy") - @ObfuscatedSignature( - signature = "(Lbt;I)V", - garbageValue = "-938277055" - ) - static final void method5327(PendingSpawn var0) { - long var1 = 0L; - int var3 = -1; - int var4 = 0; - int var5 = 0; - if (var0.type == 0) { - var1 = GrandExchangeOfferWorldComparator.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 1) { - var1 = GrandExchangeOfferWorldComparator.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 2) { - var1 = GrandExchangeOfferWorldComparator.scene.getGameObjectTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 3) { - var1 = GrandExchangeOfferWorldComparator.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); - } - - if (0L != var1) { - int var6 = GrandExchangeOfferWorldComparator.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); - var3 = class43.Entity_unpackID(var1); - var4 = var6 & 31; - var5 = var6 >> 6 & 3; - } - - var0.objectId = var3; - var0.field933 = var4; - var0.field936 = var5; - } -} diff --git a/runescape-client/src/main/java/class296.java b/runescape-client/src/main/java/class296.java new file mode 100644 index 0000000000..ba9318a03e --- /dev/null +++ b/runescape-client/src/main/java/class296.java @@ -0,0 +1,16 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("kn") +public final class class296 { + @ObfuscatedName("s") + @ObfuscatedGetter( + longValue = 6466484190389842591L + ) + static long field3688; + @ObfuscatedName("j") + @ObfuscatedGetter( + longValue = -5796014573830238981L + ) + static long field3689; +} diff --git a/runescape-client/src/main/java/class297.java b/runescape-client/src/main/java/class297.java new file mode 100644 index 0000000000..55f8487e1a --- /dev/null +++ b/runescape-client/src/main/java/class297.java @@ -0,0 +1,18 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ke") +public class class297 { + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "Lhz;" + ) + @Export("KitDefinition_archive") + public static AbstractArchive KitDefinition_archive; + @ObfuscatedName("r") + @ObfuscatedSignature( + signature = "Lhp;" + ) + static Widget field3693; +} diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java index 9560495281..0080b2a895 100644 --- a/runescape-client/src/main/java/class3.java +++ b/runescape-client/src/main/java/class3.java @@ -1,297 +1,189 @@ +import java.io.DataInputStream; +import java.net.MalformedURLException; +import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("p") +@ObfuscatedName("k") public class class3 implements Enumerated { - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "Lp;" - ) - public static final class3 field7; - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lp;" - ) - public static final class3 field9; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lp;" - ) - public static final class3 field14; - @ObfuscatedName("p") + @ObfuscatedName("qt") @ObfuscatedGetter( - intValue = 1932767747 + intValue = 112869376 ) - final int field10; + static int field24; + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "Lk;" + ) + static final class3 field19; + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "Lk;" + ) + static final class3 field14; + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "Lk;" + ) + static final class3 field15; + @ObfuscatedName("f") + @Export("Tiles_saturation") + static int[] Tiles_saturation; + @ObfuscatedName("ay") + @Export("hasFocus") + protected static boolean hasFocus; @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -498462899 + intValue = 244177539 ) - public final int field11; - @ObfuscatedName("l") - public final Class field12; - @ObfuscatedName("b") + final int field16; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 950508435 + ) + public final int field18; + @ObfuscatedName("n") + public final Class field29; + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lq;" + signature = "Ls;" ) - final class0 field13; + public final class0 field13; static { - field7 = new class3(2, 0, Integer.class, new class1()); - field9 = new class3(1, 1, Long.class, new class2()); - field14 = new class3(0, 2, String.class, new class4()); + field19 = new class3(2, 0, Integer.class, new class1()); + field14 = new class3(0, 1, Long.class, new class2()); + field15 = new class3(1, 2, String.class, new class4()); } @ObfuscatedSignature( - signature = "(IILjava/lang/Class;Lq;)V" + signature = "(IILjava/lang/Class;Ls;)V" ) class3(int var1, int var2, Class var3, class0 var4) { - this.field10 = var1; - this.field11 = var2; - this.field12 = var3; + this.field16 = var1; + this.field18 = var2; + this.field29 = var3; this.field13 = var4; } - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "320353268" + signature = "(B)I", + garbageValue = "-32" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field11; + return this.field18; } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lkf;I)Ljava/lang/Object;", - garbageValue = "-25501823" + signature = "(Lky;I)Ljava/lang/Object;", + garbageValue = "982910801" ) - public Object method34(Buffer var1) { - return this.field13.vmethod42(var1); + public Object method43(Buffer var1) { + return this.field13.vmethod70(var1); } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ljava/lang/Object;Lkf;B)V", - garbageValue = "1" + signature = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", + garbageValue = "1743466142" ) - public static void method30(Object var0, Buffer var1) { - class0 var2 = method31(var0.getClass()); - var2.vmethod43(var0, var1); - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(Ljava/lang/Class;I)Lq;", - garbageValue = "-961366401" - ) - static class0 method31(Class var0) { - class3[] var2 = new class3[]{field9, field14, field7}; - class3[] var3 = var2; - int var4 = 0; - - class3 var1; - while (true) { - if (var4 >= var3.length) { - var1 = null; - break; - } - - class3 var5 = var3[var4]; - if (var5.field12 == var0) { - var1 = var5; - break; - } - - ++var4; - } - - if (var1 == null) { - throw new IllegalArgumentException(); - } - return var1.field13; - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;B)I", - garbageValue = "0" - ) - @Export("parseInt") - public static int parseInt(CharSequence var0) { - return WorldMapSection1.parseIntCustomRadix(var0, 10, true); - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "-12" - ) - @Export("ViewportMouse_unpackType") - public static int ViewportMouse_unpackType(int var0) { - return WorldMapLabel.Entity_unpackType(ViewportMouse.ViewportMouse_entityTags[var0]); - } - - @ObfuscatedName("gm") - @ObfuscatedSignature( - signature = "(IIIIII)V", - garbageValue = "-890922875" - ) - @Export("drawObject") - static final void drawObject(int var0, int var1, int var2, int var3, int var4) { - long var5 = GrandExchangeOfferWorldComparator.scene.getBoundaryObjectTag(var0, var1, var2); - int var7; - int var8; - int var9; - int var10; - int var14; - int var26; - if (0L != var5) { - var7 = GrandExchangeOfferWorldComparator.scene.getObjectFlags(var0, var1, var2, var5); - var8 = var7 >> 6 & 3; - var9 = var7 & 31; - var10 = var3; - boolean var12 = 0L != var5; - if (var12) { - boolean var13 = (int)(var5 >>> 16 & 1L) == 1; - var12 = !var13; - } - - if (var12) { - var10 = var4; - } - - int[] var19 = RouteStrategy.sceneMinimapSprite.pixels; - var26 = var1 * 4 + (103 - var2) * 2048 + 24624; - var14 = class43.Entity_unpackID(var5); - ObjectDefinition var15 = ViewportMouse.getObjectDefinition(var14); - if (var15.mapSceneId != -1) { - IndexedSprite var16 = ClanChat.mapSceneSprites[var15.mapSceneId]; - if (var16 != null) { - int var17 = (var15.sizeX * 4 - var16.subWidth) / 2; - int var18 = (var15.sizeY * 4 - var16.subHeight) / 2; - var16.drawAt(var17 + var1 * 4 + 48, (104 - var2 - var15.sizeY) * 4 + var18 + 48); + @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 = WallDecoration.shortenStackTrace(var1); } - } else { - if (var9 == 0 || var9 == 2) { - if (var8 == 0) { - var19[var26] = var10; - var19[var26 + 512] = var10; - var19[var26 + 1024] = var10; - var19[var26 + 1536] = var10; - } else if (var8 == 1) { - var19[var26] = var10; - var19[var26 + 1] = var10; - var19[var26 + 2] = var10; - var19[var26 + 3] = var10; - } else if (var8 == 2) { - var19[var26 + 3] = var10; - var19[var26 + 512 + 3] = var10; - var19[var26 + 1024 + 3] = var10; - var19[var26 + 1536 + 3] = var10; - } else if (var8 == 3) { - var19[var26 + 1536] = var10; - var19[var26 + 1536 + 1] = var10; - var19[var26 + 1536 + 2] = var10; - var19[var26 + 1536 + 3] = var10; + + if (var0 != null) { + if (var1 != null) { + var2 = var2 + " | "; } + + var2 = var2 + var0; } - if (var9 == 3) { - if (var8 == 0) { - var19[var26] = var10; - } else if (var8 == 1) { - var19[var26 + 3] = var10; - } else if (var8 == 2) { - var19[var26 + 1536 + 3] = var10; - } else if (var8 == 3) { - var19[var26 + 1536] = var10; - } + System.out.println("Error: " + var2); + var2 = var2.replace(':', '.'); + var2 = var2.replace('@', '_'); + var2 = var2.replace('&', '_'); + var2 = var2.replace('#', '_'); + if (RunException.RunException_applet == null) { + return; } - if (var9 == 2) { - if (var8 == 3) { - var19[var26] = var10; - var19[var26 + 512] = var10; - var19[var26 + 1024] = var10; - var19[var26 + 1536] = var10; - } else if (var8 == 0) { - var19[var26] = var10; - var19[var26 + 1] = var10; - var19[var26 + 2] = var10; - var19[var26 + 3] = var10; - } else if (var8 == 1) { - var19[var26 + 3] = var10; - var19[var26 + 512 + 3] = var10; - var19[var26 + 1024 + 3] = var10; - var19[var26 + 1536 + 3] = var10; - } else if (var8 == 2) { - var19[var26 + 1536] = var10; - var19[var26 + 1536 + 1] = var10; - var19[var26 + 1536 + 2] = var10; - var19[var26 + 1536 + 3] = var10; - } - } + URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + class208.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + GZipDecompressor.field4007 + "&e=" + var2); + DataInputStream var4 = new DataInputStream(var3.openStream()); + var4.read(); + var4.close(); + } catch (Exception var5) { + } + + } + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(B)[Lk;", + garbageValue = "-69" + ) + public static class3[] method44() { + return new class3[]{field15, field19, field14}; + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)Z", + garbageValue = "-1165508811" + ) + @Export("isValidURL") + static boolean isValidURL(String var0) { + if (var0 == null) { + return false; + } else { + try { + new URL(var0); + return true; + } catch (MalformedURLException var2) { + return false; } } + } - var5 = GrandExchangeOfferWorldComparator.scene.getGameObjectTag(var0, var1, var2); - if (var5 != 0L) { - var7 = GrandExchangeOfferWorldComparator.scene.getObjectFlags(var0, var1, var2, var5); - var8 = var7 >> 6 & 3; - var9 = var7 & 31; - var10 = class43.Entity_unpackID(var5); - ObjectDefinition var20 = ViewportMouse.getObjectDefinition(var10); - if (var20.mapSceneId != -1) { - IndexedSprite var28 = ClanChat.mapSceneSprites[var20.mapSceneId]; - if (var28 != null) { - var26 = (var20.sizeX * 4 - var28.subWidth) / 2; - var14 = (var20.sizeY * 4 - var28.subHeight) / 2; - var28.drawAt(var26 + var1 * 4 + 48, var14 + (104 - var2 - var20.sizeY) * 4 + 48); - } - } else if (var9 == 9) { - int var25 = 15658734; - boolean var27 = var5 != 0L; - if (var27) { - boolean var23 = (int)(var5 >>> 16 & 1L) == 1; - var27 = !var23; - } + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "68" + ) + static final void method53() { + Object var10000 = null; + String var0 = "Your friend list is full. Max of 200 for free users, and 400 for members"; + DirectByteArrayCopier.addGameMessage(30, "", var0); + } - if (var27) { - var25 = 15597568; - } - - int[] var24 = RouteStrategy.sceneMinimapSprite.pixels; - int var29 = var1 * 4 + (103 - var2) * 2048 + 24624; - if (var8 != 0 && var8 != 2) { - var24[var29] = var25; - var24[var29 + 1 + 512] = var25; - var24[var29 + 1024 + 2] = var25; - var24[var29 + 1536 + 3] = var25; - } else { - var24[var29 + 1536] = var25; - var24[var29 + 1 + 1024] = var25; - var24[var29 + 512 + 2] = var25; - var24[var29 + 3] = var25; - } - } + @ObfuscatedName("kz") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1569353890" + ) + @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(); } - var5 = GrandExchangeOfferWorldComparator.scene.getFloorDecorationTag(var0, var1, var2); - if (var5 != 0L) { - var7 = class43.Entity_unpackID(var5); - ObjectDefinition var21 = ViewportMouse.getObjectDefinition(var7); - if (var21.mapSceneId != -1) { - IndexedSprite var22 = ClanChat.mapSceneSprites[var21.mapSceneId]; - if (var22 != null) { - var10 = (var21.sizeX * 4 - var22.subWidth) / 2; - int var11 = (var21.sizeY * 4 - var22.subHeight) / 2; - var22.drawAt(var10 + var1 * 4 + 48, var11 + (104 - var2 - var21.sizeY) * 4 + 48); - } - } + LoginScreenAnimation.method1758(); + if (Client.clanChat != null) { + Client.clanChat.clearFriends(); } } diff --git a/runescape-client/src/main/java/class30.java b/runescape-client/src/main/java/class30.java index 26b403ed02..1290b21fde 100644 --- a/runescape-client/src/main/java/class30.java +++ b/runescape-client/src/main/java/class30.java @@ -2,800 +2,462 @@ 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("ad") +@ObfuscatedName("az") public class class30 { - @ObfuscatedName("rj") - @ObfuscatedGetter( - intValue = -1360749952 - ) - static int field259; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lad;" + signature = "Laz;" ) - static final class30 field262; - @ObfuscatedName("w") + static final class30 field251; + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lad;" + signature = "Laz;" ) - static final class30 field258; - @ObfuscatedName("bs") + static final class30 field250; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -2137893013 + ) + @Export("canvasHeight") + public static int canvasHeight; + @ObfuscatedName("fj") @ObfuscatedSignature( - signature = "Llx;" + signature = "Lkb;" ) - static IndexedSprite field264; - @ObfuscatedName("ks") + @Export("fontPlain11") + static Font fontPlain11; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 148643729 - ) - @Export("menuY") - static int menuY; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -613032617 + intValue = -1891025063 ) @Export("value") final int value; static { - field262 = new class30(0); - field258 = new class30(1); + field251 = new class30(0); + field250 = new class30(1); } class30(int var1) { this.value = var1; } - @ObfuscatedName("u") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IS)Lek;", - garbageValue = "-15133" + signature = "(IIII)Lcr;", + garbageValue = "-1455468639" ) - @Export("getFrames") - static Frames getFrames(int var0) { - Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); - if (var1 != null) { - return var1; - } - var1 = BoundaryObject.method3262(SequenceDefinition.SequenceDefinition_animationsArchive, SequenceDefinition.SequenceDefinition_skeletonsArchive, var0, false); - if (var1 != null) { - SequenceDefinition.SequenceDefinition_cachedFrames.put(var1, (long)var0); + @Export("getWorldMapScript") + static Script getWorldMapScript(int var0, int var1, int var2) { + int var3 = ReflectionCheck.method2212(var1, var0); + Script var5 = (Script)Script.Script_cached.get((long)(var3 << 16)); + Script var4; + if (var5 != null) { + var4 = var5; + } else { + String var6 = String.valueOf(var3); + int var7 = GameShell.archive12.getGroupId(var6); + if (var7 == -1) { + var4 = null; + } else { + label55: { + byte[] var8 = GameShell.archive12.takeFileFlat(var7); + if (var8 != null) { + if (var8.length <= 1) { + var4 = null; + break label55; + } + + var5 = DesktopPlatformInfoProvider.newScript(var8); + if (var5 != null) { + Script.Script_cached.put(var5, (long)(var3 << 16)); + var4 = var5; + break label55; + } + } + + var4 = null; + } + } } - return var1; + 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 = GameShell.archive12.getGroupId(var9); + if (var10 == -1) { + var13 = null; + } else { + byte[] var11 = GameShell.archive12.takeFileFlat(var10); + if (var11 != null) { + if (var11.length <= 1) { + var13 = null; + return var13 != null ? var13 : null; + } + + var14 = DesktopPlatformInfoProvider.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("al") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(ILcx;ZB)I", - garbageValue = "69" + signature = "(Lkx;II)V", + garbageValue = "1722384398" ) - static int method536(int var0, Script var1, boolean var2) { - String var3; - if (var0 == ScriptOpcodes.MES) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - ScriptEvent.addGameMessage(0, "", var3); - return 1; - } - if (var0 == ScriptOpcodes.ANIM) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - MouseRecorder.performPlayerAnimation(Client.localPlayer, Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize], Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]); - return 1; - } - if (var0 == ScriptOpcodes.IF_CLOSE) { - if (!Interpreter.field1105) { - Interpreter.field1104 = true; + @Export("updatePlayers") + static final void updatePlayers(PacketBuffer var0, int var1) { + int var2 = var0.offset; + Players.Players_pendingUpdateCount = 0; + class189.method3594(var0); + + for (int var3 = 0; var3 < Players.Players_pendingUpdateCount; ++var3) { + int var4 = Players.Players_pendingUpdateIndices[var3]; + Player var5 = Client.players[var4]; + int var6 = var0.readUnsignedByte(); + if ((var6 & 8) != 0) { + var6 += var0.readUnsignedByte() << 8; } - return 1; - } - int var10; - if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - var10 = 0; - if (class192.isNumber(var3)) { - var10 = class3.parseInt(var3); + byte var7 = -1; + int var8; + int var9; + int var11; + int var12; + int var15; + if ((var6 & 64) != 0) { + var8 = var0.method5436(); + 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(); + var5.addHitSplat(var10, var12, var11, var13, Client.cycle, var14); + } + } + + var9 = var0.readUnsignedByteNegate(); + if (var9 > 0) { + for (var10 = 0; var10 < var9; ++var10) { + var11 = var0.readUShortSmart(); + var12 = var0.readUShortSmart(); + if (var12 != 32767) { + var13 = var0.readUShortSmart(); + var14 = var0.method5436(); + var15 = var12 > 0 ? var0.readUnsignedByte() : var14; + var5.addHealthBar(var11, Client.cycle, var12, var13, var14, var15); + } else { + var5.removeHealthBar(var11); + } + } + } } - PacketBufferNode var12 = Archive.getPacketBufferNode(ClientPacket.field2220, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeInt(var10); - Client.packetWriter.addNode(var12); - return 1; - } - PacketBufferNode var14; - if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - var14 = Archive.getPacketBufferNode(ClientPacket.field2298, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeByte(var3.length() + 1); - var14.packetBuffer.writeStringCp1252NullTerminated(var3); - Client.packetWriter.addNode(var14); - return 1; - } - if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - var14 = Archive.getPacketBufferNode(ClientPacket.field2211, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeByte(var3.length() + 1); - var14.packetBuffer.writeStringCp1252NullTerminated(var3); - Client.packetWriter.addNode(var14); - return 1; - } - String var7; - int var15; - if (var0 == ScriptOpcodes.OPPLAYER) { - var15 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - class81.method1988(var15, var7); - return 1; - } - if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { - HealthBarUpdate.Interpreter_intStackSize -= 3; - var15 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var10 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - int var9 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2]; - Widget var13 = class80.getWidget(var9); - class60.clickWidget(var13, var15, var10); - return 1; - } - if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var15 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var10 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Widget var11 = var2 ? Interpreter.field1111 : Calendar.field2507; - class60.clickWidget(var11, var15, var10); - return 1; - } - if (var0 == ScriptOpcodes.MOUSECAM) { - DevicePcmPlayerProvider.mouseCam = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - return 1; - } - if (var0 == ScriptOpcodes.GETREMOVEROOFS) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapLabelSize.clientPreferences.roofsHidden ? 1 : 0; - return 1; - } - if (var0 == ScriptOpcodes.SETREMOVEROOFS) { - WorldMapLabelSize.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - ReflectionCheck.savePreferences(); - return 1; - } - if (var0 == ScriptOpcodes.OPENURL) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - boolean var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - GrandExchangeOfferWorldComparator.openURL(var3, var4, false); - return 1; - } - if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { - var15 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var14 = Archive.getPacketBufferNode(ClientPacket.field2245, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeShort(var15); - Client.packetWriter.addNode(var14); - return 1; - } - if (var0 == ScriptOpcodes.BUG_REPORT) { - var15 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Skills.Interpreter_stringStackSize -= 2; - var7 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize]; - String var5 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize + 1]; - if (var7.length() > 500) { - return 1; - } - if (var5.length() > 500) { - return 1; - } - PacketBufferNode var6 = Archive.getPacketBufferNode(ClientPacket.field2219, Client.packetWriter.isaacCipher); - var6.packetBuffer.writeShort(1 + Huffman.stringCp1252NullTerminatedByteSize(var7) + Huffman.stringCp1252NullTerminatedByteSize(var5)); - var6.packetBuffer.writeStringCp1252NullTerminated(var7); - var6.packetBuffer.writeByte(var15); - var6.packetBuffer.writeStringCp1252NullTerminated(var5); - Client.packetWriter.addNode(var6); - return 1; - } - if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { - Client.shiftClickDrop = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - return 1; - } - if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { - Client.showMouseOverText = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - return 1; - } - if (var0 == ScriptOpcodes.RENDERSELF) { - Client.renderSelf = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - return 1; - } - if (var0 == 3120) { - if (Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 1; - } else { - Client.drawPlayerNames &= -2; + if ((var6 & 512) != 0) { + var5.spotAnimation = var0.method5447(); + var8 = var0.method5455(); + var5.heightOffset = var8 >> 16; + var5.field958 = (var8 & 65535) + Client.cycle; + var5.spotAnimationFrame = 0; + var5.spotAnimationFrameCycle = 0; + if (var5.field958 > Client.cycle) { + var5.spotAnimationFrame = -1; + } + + if (var5.spotAnimation == 65535) { + var5.spotAnimation = -1; + } } - return 1; - } - if (var0 == 3121) { - if (Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 2; - } else { - Client.drawPlayerNames &= -3; + if ((var6 & 4096) != 0) { + var7 = var0.method5616(); } - return 1; - } - if (var0 == 3122) { - if (Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 4; - } else { - Client.drawPlayerNames &= -5; + if ((var6 & 1024) != 0) { + var5.field960 = var0.method5441(); + var5.field954 = var0.method5616(); + var5.field961 = var0.method5616(); + var5.field963 = var0.method5441(); + var5.field941 = var0.method5446() + Client.cycle; + var5.field965 = var0.method5445() + Client.cycle; + var5.field966 = var0.readUnsignedShort(); + if (var5.field614) { + var5.field960 += var5.tileX; + var5.field954 += var5.tileY; + var5.field961 += var5.tileX; + var5.field963 += var5.tileY; + var5.pathLength = 0; + } else { + var5.field960 += var5.pathX[0]; + var5.field954 += var5.pathY[0]; + var5.field961 += var5.pathX[0]; + var5.field963 += var5.pathY[0]; + var5.pathLength = 1; + } + + var5.field947 = 0; } - return 1; - } - if (var0 == 3123) { - if (Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 8; - } else { - Client.drawPlayerNames &= -9; + if ((var6 & 32) != 0) { + var5.overheadText = var0.readStringCp1252NullTerminated(); + if (var5.overheadText.charAt(0) == '~') { + var5.overheadText = var5.overheadText.substring(1); + DirectByteArrayCopier.addGameMessage(2, var5.username.getName(), var5.overheadText); + } else if (var5 == WorldMapIcon_1.localPlayer) { + DirectByteArrayCopier.addGameMessage(2, var5.username.getName(), var5.overheadText); + } + + var5.isAutoChatting = false; + var5.overheadTextColor = 0; + var5.overheadTextEffect = 0; + var5.overheadTextCyclesRemaining = 150; } - return 1; - } - if (var0 == 3124) { - Client.drawPlayerNames = 0; - return 1; - } - if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) { - Client.showMouseCross = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - return 1; - } - if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { - Client.showLoadingMessages = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - return 1; - } - if (var0 == ScriptOpcodes.SETTAPTODROP) { - UserComparator5.setTapToDrop(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1); - return 1; - } - if (var0 == ScriptOpcodes.GETTAPTODROP) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ScriptEvent.getTapToDrop() ? 1 : 0; - return 1; - } - if (var0 == ScriptOpcodes.SETOCULUSORBSPEED) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - return 1; - } - if (var0 == 3130) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - return 1; - } - if (var0 == 3131) { - --HealthBarUpdate.Interpreter_intStackSize; - return 1; - } - if (var0 == ScriptOpcodes.GETCANVASSIZE) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = GrandExchangeEvent.canvasWidth; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ParamDefinition.canvasHeight; - return 1; - } - if (var0 == ScriptOpcodes.MOBILE_SETFPS) { - --HealthBarUpdate.Interpreter_intStackSize; - return 1; - } - if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { - return 1; - } - if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - return 1; - } - if (var0 == 3136) { - Client.field817 = 3; - Client.field818 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - return 1; - } - if (var0 == 3137) { - Client.field817 = 2; - Client.field818 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - return 1; - } - if (var0 == 3138) { - Client.field817 = 0; - return 1; - } - if (var0 == 3139) { - Client.field817 = 1; - return 1; - } - if (var0 == 3140) { - Client.field817 = 3; - Client.field818 = var2 ? Interpreter.field1111.id : Calendar.field2507.id; - return 1; - } - boolean var8; - if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { - var8 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - WorldMapLabelSize.clientPreferences.hideUsername = var8; - ReflectionCheck.savePreferences(); - return 1; - } - if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapLabelSize.clientPreferences.hideUsername ? 1 : 0; - return 1; - } - if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { - var8 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - Client.Login_isUsernameRemembered = var8; - if (!var8) { - WorldMapLabelSize.clientPreferences.rememberedUsername = ""; - ReflectionCheck.savePreferences(); + if ((var6 & 4) != 0) { + var5.field946 = var0.method5445(); + if (var5.pathLength == 0) { + var5.orientation = var5.field946; + var5.field946 = -1; + } } - return 1; - } - if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; - return 1; - } - if (var0 == 3145) { - return 1; - } - if (var0 == ScriptOpcodes.SETTITLEMUSICENABLED) { - var8 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (var8 == WorldMapLabelSize.clientPreferences.titleMusicDisabled) { - WorldMapLabelSize.clientPreferences.titleMusicDisabled = !var8; - ReflectionCheck.savePreferences(); + if ((var6 & 1) != 0) { + var8 = var0.method5438(); + byte[] var16 = new byte[var8]; + Buffer var17 = new Buffer(var16); + var0.method5457(var16, 0, var8); + Players.field1219[var4] = var17; + var5.read(var17); } - return 1; + if ((var6 & 2) != 0) { + var5.targetIndex = var0.method5446(); + if (var5.targetIndex == 65535) { + var5.targetIndex = -1; + } + } + + if ((var6 & 2048) != 0) { + Players.field1230[var4] = var0.method5616(); + } + + if ((var6 & 16) != 0) { + var8 = var0.method5446(); + PlayerType var22 = (PlayerType)FriendSystem.findEnumerated(class191.PlayerType_values(), var0.readUnsignedByte()); + boolean var20 = var0.readUnsignedByteNegate() == 1; + var11 = var0.readUnsignedByte(); + var12 = var0.offset; + if (var5.username != null && var5.appearance != null) { + boolean var21 = false; + if (var22.isUser && class32.friendSystem.isIgnored(var5.username)) { + var21 = true; + } + + if (!var21 && Client.field737 == 0 && !var5.isHidden) { + Players.field1233.offset = 0; + var0.readBytes(Players.field1233.array, 0, var11); + Players.field1233.offset = 0; + String var18 = AbstractFont.escapeBrackets(class189.method3596(class51.method845(Players.field1233))); + var5.overheadText = var18.trim(); + var5.overheadTextColor = var8 >> 8; + var5.overheadTextEffect = var8 & 255; + var5.overheadTextCyclesRemaining = 150; + var5.isAutoChatting = var20; + var5.field926 = var5 != WorldMapIcon_1.localPlayer && var22.isUser && "" != Client.field668 && var18.toLowerCase().indexOf(Client.field668) == -1; + if (var22.isPrivileged) { + var15 = var20 ? 91 : 1; + } else { + var15 = var20 ? 90 : 2; + } + + if (var22.modIcon * 714577229 != -1) { + DirectByteArrayCopier.addGameMessage(var15, AbstractWorldMapData.method278(var22.modIcon * 714577229) + var5.username.getName(), var18); + } else { + DirectByteArrayCopier.addGameMessage(var15, var5.username.getName(), var18); + } + } + } + + var0.offset = var12 + var11; + } + + if ((var6 & 256) != 0) { + for (var8 = 0; var8 < 3; ++var8) { + var5.actions[var8] = var0.readStringCp1252NullTerminated(); + } + } + + if ((var6 & 128) != 0) { + var8 = var0.readUnsignedShort(); + if (var8 == 65535) { + var8 = -1; + } + + var9 = var0.readUnsignedByte(); + FriendsList.performPlayerAnimation(var5, var8, var9); + } + + if (var5.field614) { + if (var7 == 127) { + var5.resetPath(var5.tileX, var5.tileY); + } else { + byte var19; + if (var7 != -1) { + var19 = var7; + } else { + var19 = Players.field1230[var4]; + } + + var5.method1190(var5.tileX, var5.tileY, var19); + } + } } - if (var0 == ScriptOpcodes.GETTITLEMUSICENABLED) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapLabelSize.clientPreferences.titleMusicDisabled ? 0 : 1; - return 1; + + if (var0.offset - var2 != var1) { + throw new RuntimeException(var0.offset - var2 + " " + var1); } - if (var0 == 3148) { - return 1; - } - if (var0 == 3149) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - return 1; - } - if (var0 == 3150) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - return 1; - } - if (var0 == 3151) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - return 1; - } - if (var0 == 3152) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - return 1; - } - if (var0 == 3153) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; - return 1; - } - if (var0 == 3154) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Buddy.method5176(); - return 1; - } - if (var0 == 3155) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - return 1; - } - if (var0 == 3156) { - return 1; - } - - return 2; } - @ObfuscatedName("ad") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(ILcx;ZI)I", - garbageValue = "1145147367" + signature = "(Lky;IIIIIII)V", + garbageValue = "-260324496" ) - static int method535(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.FRIEND_COUNT) { - if (ArchiveLoader.friendSystem.field1076 == 0) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -2; - } else if (ArchiveLoader.friendSystem.field1076 == 1) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ArchiveLoader.friendSystem.friendsList.getSize(); + @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) { + Tiles.Tiles_heights[0][var2][var3] = -GrandExchangeOfferTotalQuantityComparator.method101(var2 + 932731 + var4, 556238 + var3 + var5) * 8; + } else { + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; + } + break; + } + + if (var7 == 1) { + int var8 = var0.readUnsignedByte(); + if (var8 == 1) { + var8 = 0; + } + + if (var1 == 0) { + Tiles.Tiles_heights[0][var2][var3] = -var8 * 8; + } else { + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8; + } + break; + } + + if (var7 <= 49) { + AccessFile.field4061[var1][var2][var3] = var0.readByte(); + class210.field2492[var1][var2][var3] = (byte)((var7 - 2) / 4); + Tiles.field475[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); + } else if (var7 <= 81) { + Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); + } else { + Tiles.field485[var1][var2][var3] = (byte)(var7 - 81); + } + } + } else { + while (true) { + var7 = var0.readUnsignedByte(); + if (var7 == 0) { + break; + } + + if (var7 == 1) { + var0.readUnsignedByte(); + break; + } + + if (var7 <= 49) { + var0.readUnsignedByte(); + } + } + } + + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "(Lhz;Ljava/lang/String;Ljava/lang/String;B)[Lls;", + garbageValue = "0" + ) + public static Sprite[] method535(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); + int var4 = var0.getFileId(var3, var2); + return WorldMapID.SpriteBuffer_getSpriteArray(var0, var3, var4); + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "(Lhp;II)V", + garbageValue = "543273081" + ) + @Export("Widget_setKeyIgnoreHeld") + static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { + if (var0.field2631 == null) { + throw new RuntimeException(); + } else { + if (var0.field2685 == null) { + var0.field2685 = new int[var0.field2631.length]; } - return 1; + var0.field2685[var1] = Integer.MAX_VALUE; } - int var3; - if (var0 == ScriptOpcodes.FRIEND_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - if (ArchiveLoader.friendSystem.method1791() && var3 >= 0 && var3 < ArchiveLoader.friendSystem.friendsList.getSize()) { - Friend var8 = (Friend)ArchiveLoader.friendSystem.friendsList.get(var3); - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var8.getName(); - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var8.getPreviousName(); - } else { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - } + } - return 1; - } - if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - if (ArchiveLoader.friendSystem.method1791() && var3 >= 0 && var3 < ArchiveLoader.friendSystem.friendsList.getSize()) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ((Buddy)ArchiveLoader.friendSystem.friendsList.get(var3)).world; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } - if (var0 == ScriptOpcodes.FRIEND_GETRANK) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - if (ArchiveLoader.friendSystem.method1791() && var3 >= 0 && var3 < ArchiveLoader.friendSystem.friendsList.getSize()) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ((Buddy)ArchiveLoader.friendSystem.friendsList.get(var3)).rank; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } - String var5; - if (var0 == ScriptOpcodes.FRIEND_SETRANK) { - var5 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - int var6 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - class14.method159(var5, var6); - return 1; - } - if (var0 == ScriptOpcodes.FRIEND_ADD) { - var5 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - ArchiveLoader.friendSystem.addFriend(var5); - return 1; - } - if (var0 == ScriptOpcodes.FRIEND_DEL) { - var5 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - ArchiveLoader.friendSystem.removeFriend(var5); - return 1; - } - if (var0 == ScriptOpcodes.IGNORE_ADD) { - var5 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - ArchiveLoader.friendSystem.addIgnore(var5); - return 1; - } - if (var0 == ScriptOpcodes.IGNORE_DEL) { - var5 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - ArchiveLoader.friendSystem.removeIgnore(var5); - return 1; - } - if (var0 == ScriptOpcodes.FRIEND_TEST) { - var5 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - var5 = GrandExchangeOfferTotalQuantityComparator.removeImageTag(var5); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ArchiveLoader.friendSystem.isFriended(new Username(var5, class40.loginType), false) ? 1 : 0; - return 1; - } - if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { - if (DevicePcmPlayerProvider.clanChat != null) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = DevicePcmPlayerProvider.clanChat.name; - } else { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } - if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { - if (DevicePcmPlayerProvider.clanChat != null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = DevicePcmPlayerProvider.clanChat.getSize(); - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } - if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - if (DevicePcmPlayerProvider.clanChat != null && var3 < DevicePcmPlayerProvider.clanChat.getSize()) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = DevicePcmPlayerProvider.clanChat.get(var3).getUsername().getName(); - } else { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } - if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - if (DevicePcmPlayerProvider.clanChat != null && var3 < DevicePcmPlayerProvider.clanChat.getSize()) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ((Buddy)DevicePcmPlayerProvider.clanChat.get(var3)).getWorld(); - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } - if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - if (DevicePcmPlayerProvider.clanChat != null && var3 < DevicePcmPlayerProvider.clanChat.getSize()) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ((Buddy)DevicePcmPlayerProvider.clanChat.get(var3)).rank; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } - if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = DevicePcmPlayerProvider.clanChat != null ? DevicePcmPlayerProvider.clanChat.minKick : 0; - return 1; - } - if (var0 == ScriptOpcodes.CLAN_KICKUSER) { - var5 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - Tile.clanKickUser(var5); - return 1; - } - if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = DevicePcmPlayerProvider.clanChat != null ? DevicePcmPlayerProvider.clanChat.rank : 0; - return 1; - } - if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { - var5 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - class65.Clan_joinChat(var5); - return 1; - } - if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { - ScriptFrame.Clan_leaveChat(); - return 1; - } - if (var0 == ScriptOpcodes.IGNORE_COUNT) { - if (!ArchiveLoader.friendSystem.method1791()) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ArchiveLoader.friendSystem.ignoreList.getSize(); - } - - return 1; - } - if (var0 == ScriptOpcodes.IGNORE_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - if (ArchiveLoader.friendSystem.method1791() && var3 >= 0 && var3 < ArchiveLoader.friendSystem.ignoreList.getSize()) { - Ignored var4 = (Ignored)ArchiveLoader.friendSystem.ignoreList.get(var3); - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var4.getName(); - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var4.getPreviousName(); - } else { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } - if (var0 == ScriptOpcodes.IGNORE_TEST) { - var5 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - var5 = GrandExchangeOfferTotalQuantityComparator.removeImageTag(var5); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ArchiveLoader.friendSystem.isIgnored(new Username(var5, class40.loginType)) ? 1 : 0; - return 1; - } - if (var0 == ScriptOpcodes.CLAN_ISSELF) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - if (DevicePcmPlayerProvider.clanChat != null && var3 < DevicePcmPlayerProvider.clanChat.getSize() && DevicePcmPlayerProvider.clanChat.get(var3).getUsername().equals(Client.localPlayer.username)) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } - if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { - if (DevicePcmPlayerProvider.clanChat != null && DevicePcmPlayerProvider.clanChat.owner != null) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = DevicePcmPlayerProvider.clanChat.owner; - } else { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } - if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - if (DevicePcmPlayerProvider.clanChat != null && var3 < DevicePcmPlayerProvider.clanChat.getSize() && ((ClanMate)DevicePcmPlayerProvider.clanChat.get(var3)).isFriend()) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } - if (var0 == ScriptOpcodes.CLAN_ISIGNORE) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - if (DevicePcmPlayerProvider.clanChat != null && var3 < DevicePcmPlayerProvider.clanChat.getSize() && ((ClanMate) DevicePcmPlayerProvider.clanChat.get(var3)).isIgnored()) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } - if (var0 == 3628) { - ArchiveLoader.friendSystem.friendsList.removeComparator(); - return 1; - } - boolean var7; - if (var0 == 3629) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - ArchiveLoader.friendSystem.friendsList.addComparator(new UserComparator1(var7)); - return 1; - } - if (var0 == 3630) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - ArchiveLoader.friendSystem.friendsList.addComparator(new UserComparator2(var7)); - return 1; - } - if (var0 == 3631) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - ArchiveLoader.friendSystem.friendsList.addComparator(new UserComparator3(var7)); - return 1; - } - if (var0 == 3632) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - ArchiveLoader.friendSystem.friendsList.addComparator(new UserComparator4(var7)); - return 1; - } - if (var0 == 3633) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - ArchiveLoader.friendSystem.friendsList.addComparator(new UserComparator5(var7)); - return 1; - } - if (var0 == 3634) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - ArchiveLoader.friendSystem.friendsList.addComparator(new UserComparator6(var7)); - return 1; - } - if (var0 == 3635) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - ArchiveLoader.friendSystem.friendsList.addComparator(new UserComparator7(var7)); - return 1; - } - if (var0 == 3636) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - ArchiveLoader.friendSystem.friendsList.addComparator(new UserComparator8(var7)); - return 1; - } - if (var0 == 3637) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - ArchiveLoader.friendSystem.friendsList.addComparator(new UserComparator9(var7)); - return 1; - } - if (var0 == 3638) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - ArchiveLoader.friendSystem.friendsList.addComparator(new UserComparator10(var7)); - return 1; - } - if (var0 == 3639) { - ArchiveLoader.friendSystem.friendsList.sort(); - return 1; - } - if (var0 == 3640) { - ArchiveLoader.friendSystem.ignoreList.removeComparator(); - return 1; - } - if (var0 == 3641) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - ArchiveLoader.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); - return 1; - } - if (var0 == 3642) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - ArchiveLoader.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); - return 1; - } - if (var0 == 3643) { - ArchiveLoader.friendSystem.ignoreList.sort(); - return 1; - } - if (var0 == 3644) { - if (DevicePcmPlayerProvider.clanChat != null) { - DevicePcmPlayerProvider.clanChat.removeComparator(); - } - - return 1; - } - if (var0 == 3645) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (DevicePcmPlayerProvider.clanChat != null) { - DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator1(var7)); - } - - return 1; - } - if (var0 == 3646) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (DevicePcmPlayerProvider.clanChat != null) { - DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator2(var7)); - } - - return 1; - } - if (var0 == 3647) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (DevicePcmPlayerProvider.clanChat != null) { - DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator3(var7)); - } - - return 1; - } - if (var0 == 3648) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (DevicePcmPlayerProvider.clanChat != null) { - DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator4(var7)); - } - - return 1; - } - if (var0 == 3649) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (DevicePcmPlayerProvider.clanChat != null) { - DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator5(var7)); - } - - return 1; - } - if (var0 == 3650) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (DevicePcmPlayerProvider.clanChat != null) { - DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator6(var7)); - } - - return 1; - } - if (var0 == 3651) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (DevicePcmPlayerProvider.clanChat != null) { - DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator7(var7)); - } - - return 1; - } - if (var0 == 3652) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (DevicePcmPlayerProvider.clanChat != null) { - DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator8(var7)); - } - - return 1; - } - if (var0 == 3653) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (DevicePcmPlayerProvider.clanChat != null) { - DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator9(var7)); - } - - return 1; - } - if (var0 == 3654) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (DevicePcmPlayerProvider.clanChat != null) { - DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator10(var7)); - } - - return 1; - } - if (var0 == 3655) { - if (DevicePcmPlayerProvider.clanChat != null) { - DevicePcmPlayerProvider.clanChat.sort(); - } - - return 1; - } - if (var0 == 3656) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - ArchiveLoader.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); - return 1; - } - if (var0 == 3657) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (DevicePcmPlayerProvider.clanChat != null) { - DevicePcmPlayerProvider.clanChat.addComparator(new BuddyRankComparator(var7)); - } - - return 1; - } - return 2; + @ObfuscatedName("hb") + @ObfuscatedSignature( + signature = "(III)Lfq;", + garbageValue = "1874659122" + ) + static RouteStrategy method536(int var0, int var1) { + Client.field684.approxDestinationX = var0; + Client.field684.approxDestinationY = var1; + Client.field684.approxDestinationSizeX = 1; + Client.field684.approxDestinationSizeY = 1; + return Client.field684; } } diff --git a/runescape-client/src/main/java/class301.java b/runescape-client/src/main/java/class300.java similarity index 94% rename from runescape-client/src/main/java/class301.java rename to runescape-client/src/main/java/class300.java index 20d4ce87e9..2436676727 100644 --- a/runescape-client/src/main/java/class301.java +++ b/runescape-client/src/main/java/class300.java @@ -1,9 +1,9 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("kw") -public class class301 { - @ObfuscatedName("q") +@ObfuscatedName("kd") +public class class300 { + @ObfuscatedName("s") @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 class301 { } - @ObfuscatedName("u") + @ObfuscatedName("d") @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 new file mode 100644 index 0000000000..9efe7092ae --- /dev/null +++ b/runescape-client/src/main/java/class312.java @@ -0,0 +1,173 @@ +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("lz") +public enum class312 implements Enumerated { + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "Llz;" + ) + field3810(5, 0), + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "Llz;" + ) + field3811(1, 1), + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "Llz;" + ) + field3813(3, 2), + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Llz;" + ) + field3812(7, 3), + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Llz;" + ) + field3816(4, 4), + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "Llz;" + ) + field3814(2, 5), + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "Llz;" + ) + field3815(0, 6), + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "Llz;" + ) + field3809(8, 7), + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "Llz;" + ) + field3817(6, 8); + + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 956871945 + ) + final int field3818; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 424280785 + ) + @Export("id") + final int id; + + class312(int var3, int var4) { + this.field3818 = var3; + this.id = var4; + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(B)I", + garbageValue = "-32" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.id; + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(IIII)V", + garbageValue = "-204174785" + ) + static final void method5787(int var0, int var1, int var2) { + int var3; + for (var3 = 0; var3 < 8; ++var3) { + for (int var4 = 0; var4 < 8; ++var4) { + Tiles.Tiles_heights[var0][var3 + var1][var4 + var2] = 0; + } + } + + if (var1 > 0) { + for (var3 = 1; var3 < 8; ++var3) { + Tiles.Tiles_heights[var0][var1][var3 + var2] = Tiles.Tiles_heights[var0][var1 - 1][var3 + var2]; + } + } + + if (var2 > 0) { + for (var3 = 1; var3 < 8; ++var3) { + Tiles.Tiles_heights[var0][var3 + var1][var2] = Tiles.Tiles_heights[var0][var3 + var1][var2 - 1]; + } + } + + if (var1 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2] != 0) { + Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2]; + } else if (var2 > 0 && Tiles.Tiles_heights[var0][var1][var2 - 1] != 0) { + Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1][var2 - 1]; + } else if (var1 > 0 && var2 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2 - 1] != 0) { + Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2 - 1]; + } + + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "(ILcr;ZI)I", + garbageValue = "808433154" + ) + static int method5788(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? class286.field3623 : class297.field3693; + if (var0 == ScriptOpcodes.CC_GETSCROLLX) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollX; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollY; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETTEXT) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.text; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollWidth; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollHeight; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelZoom; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleX; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleZ; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleY; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETTRANSTOP) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyTop; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETTRANSBOT) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyBot; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color2; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETFILLMODE) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; + return 1; + } else { + return 2; + } + } +} diff --git a/runescape-client/src/main/java/class313.java b/runescape-client/src/main/java/class313.java deleted file mode 100644 index 92e26336f9..0000000000 --- a/runescape-client/src/main/java/class313.java +++ /dev/null @@ -1,83 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ln") -public enum class313 implements Enumerated { - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "Lln;" - ) - field3837(3, 0), - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lln;" - ) - field3833(4, 1), - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lln;" - ) - field3834(8, 2), - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lln;" - ) - field3843(5, 3), - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Lln;" - ) - field3835(7, 4), - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "Lln;" - ) - field3838(2, 5), - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Lln;" - ) - field3839(6, 6), - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lln;" - ) - field3840(0, 7), - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Lln;" - ) - field3841(1, 8); - - @ObfuscatedName("aw") - @Export("fontHelvetica13") - static java.awt.Font fontHelvetica13; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -1731817037 - ) - final int field3842; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 1422970915 - ) - @Export("id") - final int id; - - class313(int var3, int var4) { - this.field3842 = var3; - this.id = var4; - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "320353268" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.id; - } -} diff --git a/runescape-client/src/main/java/class319.java b/runescape-client/src/main/java/class319.java new file mode 100644 index 0000000000..3e78a3e42d --- /dev/null +++ b/runescape-client/src/main/java/class319.java @@ -0,0 +1,11 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("lp") +public class class319 { + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -2101643419 + ) + static int field3846; +} diff --git a/runescape-client/src/main/java/class32.java b/runescape-client/src/main/java/class32.java index 8df5beee2d..d9a4ee52a9 100644 --- a/runescape-client/src/main/java/class32.java +++ b/runescape-client/src/main/java/class32.java @@ -1,76 +1,428 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ar") +@ObfuscatedName("an") public class class32 { - @ObfuscatedName("sz") - @ObfuscatedGetter( - intValue = -1121998199 - ) - @Export("foundItemIndex") - static int foundItemIndex; - @ObfuscatedName("i") - static byte[][][] field282; - @ObfuscatedName("x") + @ObfuscatedName("rh") @ObfuscatedSignature( - signature = "Lcm;" + signature = "Lba;" ) - @Export("pcmPlayerProvider") - public static PcmPlayerProvider pcmPlayerProvider; - @ObfuscatedName("dq") + @Export("friendSystem") + public static FriendSystem friendSystem; + @ObfuscatedName("gi") @ObfuscatedSignature( - signature = "Liu;" + signature = "Lls;" ) - @Export("archive11") - static Archive archive11; - @ObfuscatedName("lu") - @ObfuscatedSignature( - signature = "Lhj;" - ) - static Widget field284; + @Export("compass") + static Sprite compass; - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-914576641" + signature = "(B)V", + garbageValue = "64" ) - public static int method545(int var0) { - return var0 >> 17 & 7; + public static void method543() { + 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("gt") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IIII)V", - garbageValue = "994421183" + signature = "(IIIIIILea;Lfm;I)V", + garbageValue = "-1690999410" ) - @Export("worldToScreen") - static final void worldToScreen(int var0, int var1, int var2) { - if (var0 < 128 || var1 < 128 || var0 > 13056 || var1 > 13056) { - Client.viewportTempX = -1; - Client.viewportTempY = -1; - return; - } - int var3 = ScriptEvent.getTileHeight(var0, var1, class42.plane) - var2; - var0 -= PacketBuffer.cameraX; - var3 -= class43.cameraY; - var1 -= class1.cameraZ; - int var4 = Rasterizer3D.Rasterizer3D_sine[GrandExchangeOfferNameComparator.cameraPitch]; - int var5 = Rasterizer3D.Rasterizer3D_cosine[GrandExchangeOfferNameComparator.cameraPitch]; - int var6 = Rasterizer3D.Rasterizer3D_sine[Interpreter.cameraYaw]; - int var7 = Rasterizer3D.Rasterizer3D_cosine[Interpreter.cameraYaw]; - int var8 = var6 * var1 + var0 * var7 >> 16; - var1 = var7 * var1 - var0 * var6 >> 16; - var0 = var8; - var8 = var3 * var5 - var4 * var1 >> 16; - var1 = var5 * var1 + var4 * var3 >> 16; - if (var1 >= 50) { - Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; - Client.viewportTempY = Client.viewportHeight / 2 + var8 * Client.viewportZoom / var1; - } else { - Client.viewportTempX = -1; - Client.viewportTempY = -1; + static final void method544(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 = class215.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 = WorldMapSprite.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 * 128; + var22.y = var2 * 128; + var23 = var8.sizeX; + var24 = var8.sizeY; + if (var4 == 1 || var4 == 3) { + var23 = var8.sizeY; + var24 = var8.sizeX; + } + + var22.field1052 = (var23 + var1) * 128; + var22.field1053 = (var24 + var2) * 128; + var22.soundEffectId = var8.ambientSoundId; + var22.field1054 = var8.int4 * 128; + var22.field1057 = var8.int5; + var22.field1058 = var8.int6; + var22.soundEffectIds = var8.soundEffectIds; + if (var8.transforms != null) { + var22.obj = var8; + var22.set(); + } + + ObjectSound.objectSounds.addFirst(var22); + if (var22.soundEffectIds != null) { + var22.field1056 = var22.field1057 + (int)(Math.random() * (double)(var22.field1058 - var22.field1057)); + } + } + + 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.method3013(var0, var1, var2, var16, 1, 1, (Entity)var34, 0, var19, var21); + if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { + var10000 = Tiles.field483[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.field479[var4], 0, var19, var21); + if (var4 == 0) { + if (var8.clipped) { + class188.field2321[var0][var1][var2] = 50; + class188.field2321[var0][var1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = Tiles.field483[var0][var1]; + var10000[var2] |= 585; + } + } else if (var4 == 1) { + if (var8.clipped) { + class188.field2321[var0][var1][var2 + 1] = 50; + class188.field2321[var0][var1 + 1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = Tiles.field483[var0][var1]; + var10000[1 + var2] |= 1170; + } + } else if (var4 == 2) { + if (var8.clipped) { + class188.field2321[var0][var1 + 1][var2] = 50; + class188.field2321[var0][var1 + 1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = Tiles.field483[var0][var1 + 1]; + var10000[var2] |= 585; + } + } else if (var4 == 3) { + if (var8.clipped) { + class188.field2321[var0][var1][var2] = 50; + class188.field2321[var0][var1 + 1][var2] = 50; + } + + if (var8.modelClipped) { + var10000 = Tiles.field483[var0][var1]; + var10000[var2] |= 1170; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method3495(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method3026(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.field480[var4], 0, var19, var21); + if (var8.clipped) { + if (var4 == 0) { + class188.field2321[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { + class188.field2321[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { + class188.field2321[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { + class188.field2321[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method3495(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.field479[var4], Tiles.field479[var28], var19, var21); + if (var8.modelClipped) { + if (var4 == 0) { + var10000 = Tiles.field483[var0][var1]; + var10000[var2] |= 585; + var10000 = Tiles.field483[var0][var1]; + var10000[1 + var2] |= 1170; + } else if (var4 == 1) { + var10000 = Tiles.field483[var0][var1]; + var10000[var2 + 1] |= 1170; + var10000 = Tiles.field483[var0][var1 + 1]; + var10000[var2] |= 585; + } else if (var4 == 2) { + var10000 = Tiles.field483[var0][var1 + 1]; + var10000[var2] |= 585; + var10000 = Tiles.field483[var0][var1]; + var10000[var2] |= 1170; + } else if (var4 == 3) { + var10000 = Tiles.field483[var0][var1]; + var10000[var2] |= 1170; + var10000 = Tiles.field483[var0][var1]; + var10000[var2] |= 585; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method3495(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method3026(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.field480[var4], 0, var19, var21); + if (var8.clipped) { + if (var4 == 0) { + class188.field2321[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { + class188.field2321[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { + class188.field2321[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { + class188.field2321[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method3495(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.method3013(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.method3026(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.field479[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 = class215.getObjectDefinition(BoundaryObject.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.field479[var4], 0, var28 * Tiles.field481[var4], var28 * Tiles.field482[var4], var19, var21); + } else if (var5 == 6) { + var28 = 8; + var31 = var6.getBoundaryObjectTag(var0, var1, var2); + if (var31 != 0L) { + var28 = class215.getObjectDefinition(BoundaryObject.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.field478[var4], var28 * Tiles.field484[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 = class215.getObjectDefinition(BoundaryObject.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.field478[var4], var28 * Tiles.field484[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.method3013(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).method2839() / 4; + if (var23 > 30) { + var23 = 30; + } + } + + for (var24 = 0; var24 <= var9; ++var24) { + for (int var25 = 0; var25 <= var10; ++var25) { + if (var23 > class188.field2321[var0][var24 + var1][var25 + var2]) { + class188.field2321[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/class325.java b/runescape-client/src/main/java/class325.java new file mode 100644 index 0000000000..49a0edb9cf --- /dev/null +++ b/runescape-client/src/main/java/class325.java @@ -0,0 +1,59 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ld") +public class class325 { + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 262273775 + ) + @Export("SpriteBuffer_spriteCount") + public static int SpriteBuffer_spriteCount; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 5051811 + ) + @Export("SpriteBuffer_spriteHeight") + public static int SpriteBuffer_spriteHeight; + @ObfuscatedName("k") + @Export("SpriteBuffer_xOffsets") + public static int[] SpriteBuffer_xOffsets; + @ObfuscatedName("u") + @Export("SpriteBuffer_yOffsets") + public static int[] SpriteBuffer_yOffsets; + @ObfuscatedName("n") + @Export("SpriteBuffer_spriteWidths") + public static int[] SpriteBuffer_spriteWidths; + @ObfuscatedName("q") + @Export("SpriteBuffer_spritePalette") + public static int[] SpriteBuffer_spritePalette; + + @ObfuscatedName("fy") + @ObfuscatedSignature( + signature = "(Lij;IIII)V", + garbageValue = "1165848534" + ) + @Export("addSequenceSoundEffect") + static void addSequenceSoundEffect(SequenceDefinition var0, int var1, int var2, int var3) { + if (Client.soundEffectCount < 50 && Client.field860 != 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; + } + } + } + } +} diff --git a/runescape-client/src/main/java/class327.java b/runescape-client/src/main/java/class327.java deleted file mode 100644 index 1d50be2c3c..0000000000 --- a/runescape-client/src/main/java/class327.java +++ /dev/null @@ -1,33 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("lz") -public class class327 { - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(IIII)I", - garbageValue = "590825496" - ) - @Export("hslToRgb") - static final int hslToRgb(int var0, int var1, int var2) { - if (var2 > 179) { - var1 /= 2; - } - - 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; - } -} diff --git a/runescape-client/src/main/java/class336.java b/runescape-client/src/main/java/class336.java new file mode 100644 index 0000000000..7e976a2bb4 --- /dev/null +++ b/runescape-client/src/main/java/class336.java @@ -0,0 +1,21 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("lr") +public class class336 { + @ObfuscatedName("d") + static final int[] field4022; + @ObfuscatedName("f") + static final int[] field4015; + + static { + field4022 = new int[2048]; + field4015 = new int[2048]; + double var0 = 0.0030679615757712823D; + + for (int var2 = 0; var2 < 2048; ++var2) { + field4022[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2)); + field4015[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2)); + } + + } +} diff --git a/runescape-client/src/main/java/class337.java b/runescape-client/src/main/java/class337.java deleted file mode 100644 index 335ed8c37a..0000000000 --- a/runescape-client/src/main/java/class337.java +++ /dev/null @@ -1,21 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("li") -public class class337 { - @ObfuscatedName("f") - static final int[] field4046; - @ObfuscatedName("m") - static final int[] field4047; - - static { - field4046 = new int[2048]; - field4047 = new int[2048]; - double var0 = 0.0030679615757712823D; - - for (int var2 = 0; var2 < 2048; ++var2) { - field4046[var2] = (int)(65536.0D * Math.sin((double)var2 * var0)); - field4047[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2)); - } - - } -} diff --git a/runescape-client/src/main/java/class338.java b/runescape-client/src/main/java/class338.java new file mode 100644 index 0000000000..22839c8d05 --- /dev/null +++ b/runescape-client/src/main/java/class338.java @@ -0,0 +1,14 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("mj") +public class class338 { + @ObfuscatedName("i") + static final char[] field4038; + @ObfuscatedName("k") + static final char[] field4035; + + static { + field4038 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; + field4035 = new char[]{'[', ']', '#'}; + } +} diff --git a/runescape-client/src/main/java/class339.java b/runescape-client/src/main/java/class339.java index af6c9501bc..8c7795c4a2 100644 --- a/runescape-client/src/main/java/class339.java +++ b/runescape-client/src/main/java/class339.java @@ -1,14 +1,13 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mj") +@ObfuscatedName("md") public class class339 { - @ObfuscatedName("e") - static final char[] field4061; - @ObfuscatedName("p") - static final char[] field4062; - - static { - field4061 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; - field4062 = new char[]{'[', ']', '#'}; - } + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "Lhz;" + ) + @Export("ParamDefinition_archive") + public static AbstractArchive ParamDefinition_archive; } diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index 7d1616f8e9..b92cbb5059 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -1,482 +1,159 @@ +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("k") +@ObfuscatedName("u") final class class4 implements class0 { - @ObfuscatedName("ds") - @ObfuscatedSignature( - signature = "Liu;" - ) - @Export("archive9") - static Archive archive9; - @ObfuscatedName("iz") - @ObfuscatedGetter( - intValue = -904263063 - ) - @Export("selectedItemId") - static int selectedItemId; + @ObfuscatedName("x") + static int[][] field31; + @ObfuscatedName("au") + @Export("null_string") + protected static String null_string; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ljava/lang/Object;Lkf;I)V", - garbageValue = "1977897097" + signature = "(Ljava/lang/Object;Lky;I)V", + garbageValue = "254789492" ) - public void vmethod43(Object var1, Buffer var2) { - this.method40((String)var1, var2); + public void vmethod58(Object var1, Buffer var2) { + this.method57((String)var1, var2); } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkf;I)Ljava/lang/Object;", - garbageValue = "-408972538" + signature = "(Lky;I)Ljava/lang/Object;", + garbageValue = "1267204541" ) - public Object vmethod42(Buffer var1) { + public Object vmethod70(Buffer var1) { return var1.readStringCp1252NullTerminated(); } - @ObfuscatedName("l") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Lkf;B)V", - garbageValue = "0" + signature = "(Ljava/lang/String;Lky;I)V", + garbageValue = "779729893" ) - void method40(String var1, Buffer var2) { + void method57(String var1, Buffer var2) { var2.writeStringCp1252NullTerminated(var1); } - @ObfuscatedName("r") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(IIIII)I", - garbageValue = "16711935" + signature = "(Ljava/lang/String;Ljava/lang/String;IB)Ljava/io/File;", + garbageValue = "-122" ) - static final int method49(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); - } + @Export("getCacheDir") + public static File getCacheDir(String var0, String var1, int var2) { + String var3 = var2 == 0 ? "" : "" + var2; + class290.JagexCache_locationFile = new File(FontName.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var3 + ".dat"); + String var4 = null; + String var5 = null; + boolean var6 = false; + File var22; + if (class290.JagexCache_locationFile.exists()) { + try { + AccessFile var7 = new AccessFile(class290.JagexCache_locationFile, "rw", 10000L); - @ObfuscatedName("fh") - @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "1991855037" - ) - @Export("drawEntities") - static final void drawEntities(int var0, int var1, int var2, int var3) { - ++Client.viewportDrawCount; - ScriptFrame.checkLocalPlayerDestination(); - if (Client.renderSelf) { - class227.addPlayerToScene(Client.localPlayer, false); - } - - if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { - class227.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); - } - - WorldMapRegion.addNpcsToScene(true); - int var4 = Players.Players_count; - int[] var5 = Players.Players_indices; - - int var6; - for (var6 = 0; var6 < var4; ++var6) { - if (var5[var6] != Client.combatTargetPlayerIndex && var5[var6] != Client.localPlayerIndex) { - class227.addPlayerToScene(Client.players[var5[var6]], true); - } - } - - WorldMapRegion.addNpcsToScene(false); - PacketWriter.drawProjectiles(); - WorldMapRectangle.method275(); - UrlRequest.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 var28; - if (!Client.isCameraLocked) { - var4 = Client.camAngleX; - if (Client.field739 / 256 > var4) { - var4 = Client.field739 / 256; - } - - if (Client.field886[4] && Client.field902[4] + 128 > var4) { - var4 = Client.field902[4] + 128; - } - - var28 = Client.camAngleY & 2047; - LoginScreenAnimation.method1724(MouseHandler.oculusOrbFocalPointX, Client.field729, WorldMapArea.oculusOrbFocalPointY, var4, var28, class40.method700(var4), var3); - } - - int var7; - int var8; - int var9; - int var10; - int var11; - int var12; - int var13; - int var14; - if (Client.isCameraLocked) { - var4 = class83.getHighestVisiblePlane(); - } else { - if (WorldMapLabelSize.clientPreferences.roofsHidden) { - var28 = class42.plane; - } else { - label567: { - var6 = 3; - if (GrandExchangeOfferNameComparator.cameraPitch < 310) { - if (Client.oculusOrbState == 1) { - var7 = MouseHandler.oculusOrbFocalPointX >> 7; - var8 = WorldMapArea.oculusOrbFocalPointY >> 7; - } else { - var7 = Client.localPlayer.x >> 7; - var8 = Client.localPlayer.y >> 7; - } - - var9 = PacketBuffer.cameraX >> 7; - var10 = class1.cameraZ >> 7; - if (var9 < 0 || var10 < 0 || var9 >= 104 || var10 >= 104 || var7 < 0 || var8 < 0 || var7 >= 104 || var8 >= 104) { - var28 = class42.plane; - break label567; - } - if ((Tiles.Tiles_renderFlags[class42.plane][var9][var10] & 4) != 0) { - var6 = class42.plane; - } - - if (var7 > var9) { - var11 = var7 - var9; - } else { - var11 = var9 - var7; - } - - if (var8 > var10) { - var12 = var8 - var10; - } else { - var12 = var10 - var8; - } - - if (var11 > var12) { - var13 = var12 * 65536 / var11; - var14 = 32768; - - while (var7 != var9) { - if (var9 < var7) { - ++var9; - } else if (var9 > var7) { - --var9; - } - - if ((Tiles.Tiles_renderFlags[class42.plane][var9][var10] & 4) != 0) { - var6 = class42.plane; - } - - var14 += var13; - if (var14 < 65536) { - continue; - } - var14 -= 65536; - if (var10 < var8) { - ++var10; - } else if (var10 > var8) { - --var10; - } - - if ((Tiles.Tiles_renderFlags[class42.plane][var9][var10] & 4) != 0) { - var6 = class42.plane; - } - } - } else if (var12 > 0) { - var13 = var11 * 65536 / var12; - var14 = 32768; - - while (var10 != var8) { - if (var10 < var8) { - ++var10; - } else if (var10 > var8) { - --var10; - } - - if ((Tiles.Tiles_renderFlags[class42.plane][var9][var10] & 4) != 0) { - var6 = class42.plane; - } - - var14 += var13; - if (var14 < 65536) { - continue; - } - var14 -= 65536; - if (var9 < var7) { - ++var9; - } else if (var9 > var7) { - --var9; - } - - if ((Tiles.Tiles_renderFlags[class42.plane][var9][var10] & 4) != 0) { - var6 = class42.plane; - } - } - } + Buffer var8; + 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(); } + } - if (Client.localPlayer.x >= 0 && Client.localPlayer.y >= 0 && Client.localPlayer.x < 13312 && Client.localPlayer.y < 13312) { - if ((Tiles.Tiles_renderFlags[class42.plane][Client.localPlayer.x >> 7][Client.localPlayer.y >> 7] & 4) != 0) { - var6 = class42.plane; - } + var8.offset = 0; + var9 = var8.readUnsignedByte(); + if (var9 < 1 || var9 > 3) { + throw new IOException("" + var9); + } - var28 = var6; - } else { - var28 = class42.plane; + 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 var20) { + var20.printStackTrace(); + } + + if (var4 != null) { + var22 = new File(var4); + if (!var22.exists()) { + var4 = null; + } + } + + if (var4 != null) { + var22 = new File(var4, "test.dat"); + if (!GameShell.testReadWritePermissions(var22, true)) { + var4 = null; + } + } + } + + if (var4 == null && var2 == 0) { + label123: + for (int var15 = 0; var15 < Login.field1181.length; ++var15) { + for (int var16 = 0; var16 < GrandExchangeEvent.field47.length; ++var16) { + File var17 = new File(GrandExchangeEvent.field47[var16] + Login.field1181[var15] + File.separatorChar + var0 + File.separatorChar); + if (var17.exists() && GameShell.testReadWritePermissions(new File(var17, "test.dat"), true)) { + var4 = var17.toString(); + var6 = true; + break label123; } } } - - var4 = var28; } - var28 = PacketBuffer.cameraX; - var6 = class43.cameraY; - var7 = class1.cameraZ; - var8 = GrandExchangeOfferNameComparator.cameraPitch; - var9 = Interpreter.cameraYaw; - - for (var10 = 0; var10 < 5; ++var10) { - if (!Client.field886[var10]) { - continue; - } - var11 = (int)(Math.random() * (double)(Client.field901[var10] * 2 + 1) - (double)Client.field901[var10] + Math.sin((double)Client.field903[var10] / 100.0D * (double)Client.field904[var10]) * (double)Client.field902[var10]); - if (var10 == 0) { - PacketBuffer.cameraX += var11; - } - - if (var10 == 1) { - class43.cameraY += var11; - } - - if (var10 == 2) { - class1.cameraZ += var11; - } - - if (var10 == 3) { - Interpreter.cameraYaw = var11 + Interpreter.cameraYaw & 2047; - } - - if (var10 == 4) { - GrandExchangeOfferNameComparator.cameraPitch += var11; - if (GrandExchangeOfferNameComparator.cameraPitch < 128) { - GrandExchangeOfferNameComparator.cameraPitch = 128; - } - - if (GrandExchangeOfferNameComparator.cameraPitch > 383) { - GrandExchangeOfferNameComparator.cameraPitch = 383; - } - } + if (var4 == null) { + var4 = FontName.userHomeDirectory + File.separatorChar + "jagexcache" + var3 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; + var6 = true; } - var10 = MouseHandler.MouseHandler_x; - var11 = MouseHandler.MouseHandler_y; - if (MouseHandler.MouseHandler_lastButton != 0) { - var10 = MouseHandler.MouseHandler_lastPressedX; - var11 = MouseHandler.MouseHandler_lastPressedY; - } + if (var5 != null) { + File var21 = new File(var5); + var22 = new File(var4); - 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 { - Language.ViewportMouse_clear(); - } + try { + File[] var23 = var21.listFiles(); + File[] var18 = var23; - class186.playPcmPlayers(); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); - class186.playPcmPlayers(); - var12 = Rasterizer3D.Rasterizer3D_zoom; - Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; - GrandExchangeOfferWorldComparator.scene.draw(PacketBuffer.cameraX, class43.cameraY, class1.cameraZ, GrandExchangeOfferNameComparator.cameraPitch, Interpreter.cameraYaw, var4); - Rasterizer3D.Rasterizer3D_zoom = var12; - class186.playPcmPlayers(); - GrandExchangeOfferWorldComparator.scene.clearTempGameObjects(); - Client.overheadTextCount = 0; - boolean var31 = false; - var14 = -1; - int var15 = -1; - int var16 = Players.Players_count; - int[] var17 = Players.Players_indices; - - int var18; - for (var18 = 0; var18 < var16 + Client.npcCount; ++var18) { - Object var19; - if (var18 < var16) { - var19 = Client.players[var17[var18]]; - if (var17[var18] == Client.combatTargetPlayerIndex) { - var31 = true; - var14 = var18; - continue; - } - - if (var19 == Client.localPlayer) { - var15 = var18; - continue; - } - } else { - var19 = Client.npcs[Client.npcIndices[var18 - var16]]; - } - - Decimator.drawActor2d((Actor)var19, var18, var0, var1, var2, var3); - } - - if (Client.renderSelf && var15 != -1) { - Decimator.drawActor2d(Client.localPlayer, var15, var0, var1, var2, var3); - } - - if (var31) { - Decimator.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var14, var0, var1, var2, var3); - } - - for (var18 = 0; var18 < Client.overheadTextCount; ++var18) { - int var29 = 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 && var29 - var21 < Client.overheadTextXOffsets[var24] + Client.overheadTextXs[var24] && var21 + var29 > Client.overheadTextXs[var24] - Client.overheadTextXOffsets[var24] && Client.overheadTextYs[var24] - Client.overheadTextAscents[var24] < var20) { - var20 = Client.overheadTextYs[var24] - Client.overheadTextAscents[var24]; - var23 = true; + for (int var11 = 0; var11 < var18.length; ++var11) { + File var12 = var18[var11]; + File var13 = new File(var22, var12.getName()); + boolean var14 = var12.renameTo(var13); + if (!var14) { + throw new IOException(); } } + } catch (Exception var19) { + var19.printStackTrace(); } - Client.viewportTempX = Client.overheadTextXs[var18]; - Client.viewportTempY = Client.overheadTextYs[var18] = var20; - String var30 = Client.overheadText[var18]; - if (Client.chatEffects != 0) { - WorldMapIcon_1.fontBold12.drawCentered(var30, var0 + Client.viewportTempX, Client.viewportTempY + var1, 0xffff00, 0); - continue; - } - int var25 = 0xffff00; - if (Client.overheadTextColors[var18] < 6) { - var25 = Client.field870[Client.overheadTextColors[var18]]; - } - - if (Client.overheadTextColors[var18] == 6) { - var25 = Client.viewportDrawCount % 20 < 10 ? 0xff0000 : 0xffff00; - } - - if (Client.overheadTextColors[var18] == 7) { - var25 = Client.viewportDrawCount % 20 < 10 ? 0xff : 0xffff; - } - - if (Client.overheadTextColors[var18] == 8) { - var25 = Client.viewportDrawCount % 20 < 10 ? 0xb000 : 0x80ff80; - } - - int var26; - if (Client.overheadTextColors[var18] == 9) { - var26 = 150 - Client.overheadTextCyclesRemaining[var18]; - if (var26 < 50) { - var25 = var26 * 0x500 + 0xff0000; - } else if (var26 < 0x64) { - var25 = 0xffff00 - (var26 - 0x32) * 0x50000; - } else if (var26 < 0x96) { - var25 = (var26 - 0x64) * 0x5 + 0xff00; - } - } - - if (Client.overheadTextColors[var18] == 10) { - var26 = 150 - Client.overheadTextCyclesRemaining[var18]; - if (var26 < 50) { - var25 = var26 * 5 + 0xff0000; - } else if (var26 < 100) { - var25 = 0xff00ff - (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 = 0xffffff - var26 * 0x50005; - } else if (var26 < 100) { - var25 = (var26 - 50) * 0x50005 + 0xff00; - } else if (var26 < 150) { - var25 = 0xffffff - (var26 - 100) * 0x50000; - } - } - - if (Client.overheadTextEffects[var18] == 0) { - WorldMapIcon_1.fontBold12.drawCentered(var30, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0); - } - - if (Client.overheadTextEffects[var18] == 1) { - WorldMapIcon_1.fontBold12.drawCenteredWave(var30, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var18] == 2) { - WorldMapIcon_1.fontBold12.drawCenteredWave2(var30, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var18] == 3) { - WorldMapIcon_1.fontBold12.drawCenteredShake(var30, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var18]); - } - - if (Client.overheadTextEffects[var18] == 4) { - var26 = (150 - Client.overheadTextCyclesRemaining[var18]) * (WorldMapIcon_1.fontBold12.stringWidth(var30) + 100) / 150; - Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); - WorldMapIcon_1.fontBold12.draw(var30, 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 - WorldMapIcon_1.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); - WorldMapIcon_1.fontBold12.drawCentered(var30, var0 + Client.viewportTempX, var27 + Client.viewportTempY + var1, var25, 0); - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); - } + var6 = true; } - if (Client.hintArrowType == 2) { - class32.worldToScreen(Client.hintArrowSubX * 64 + (Client.hintArrowX - MusicPatchNode2.baseX * 64 << 7), (Client.hintArrowY - class1.baseY * 64 << 7) + Client.hintArrowSubY * 4096, Client.hintArrowHeight * 4); - if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { - class173.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); - } - } - - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field718); - AbstractWorldMapData.method273(var0, var1, var2, var3); - PacketBuffer.cameraX = var28; - class43.cameraY = var6; - class1.cameraZ = var7; - GrandExchangeOfferNameComparator.cameraPitch = var8; - Interpreter.cameraYaw = var9; - if (Client.isLoading) { - byte var32 = 0; - var14 = var32 + NetCache.NetCache_pendingPriorityResponsesCount + NetCache.NetCache_pendingPriorityWritesCount; - if (var14 == 0) { - Client.isLoading = false; - } - } - - if (Client.isLoading) { - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); - TriBool.drawLoadingMessage("Loading - please wait.", false); + if (var6) { + MouseHandler.method1041(new File(var4), (File)null); } + return new File(var4); } } diff --git a/runescape-client/src/main/java/class40.java b/runescape-client/src/main/java/class40.java index 5ee145a105..47a78da4da 100644 --- a/runescape-client/src/main/java/class40.java +++ b/runescape-client/src/main/java/class40.java @@ -2,34 +2,34 @@ 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("ap") +@ObfuscatedName("ax") public class class40 { - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 813115417 + intValue = -1461963795 ) - @Export("idxCount") - public static int idxCount; - @ObfuscatedName("bm") + static int field330; + @ObfuscatedName("dl") @ObfuscatedSignature( - signature = "Lmu;" + signature = "Lid;" ) - @Export("loginType") - static LoginType loginType; - @ObfuscatedName("ch") - @ObfuscatedSignature( - signature = "Lbs;" - ) - @Export("mouseRecorder") - static MouseRecorder mouseRecorder; - @ObfuscatedName("q") + @Export("archive18") + static Archive archive18; + @ObfuscatedName("hb") @ObfuscatedGetter( - intValue = 1740646861 + intValue = -2115409067 + ) + @Export("cameraYaw") + static int cameraYaw; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 1389839029 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("tileTemplates") byte[][][] tileTemplates; @@ -37,25 +37,25 @@ public class class40 { this.pixelsPerTile = var1; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(IIIIIIIII)V", - garbageValue = "1804465340" + garbageValue = "-1961040387" ) - void method698(int x, int y, int var3, int col, int w, int h, int var7, int var8) { + void method698(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.method699(var8, var7); - var7 = this.method712(var7); - Rasterizer2D.Rasterizer2D_drawGradientPixels(x, y, w, h, var3, col, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); + var8 = this.method686(var8, var7); + var7 = this.method699(var7); + Rasterizer2D.Rasterizer2D_drawGradientPixels(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); } } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-500571874" + signature = "(IIB)I", + garbageValue = "61" ) - int method699(int var1, int var2) { + int method686(int var1, int var2) { if (var2 == 9) { var1 = var1 + 1 & 3; } @@ -71,22 +71,23 @@ public class class40 { return var1; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "-128" + signature = "(II)I", + garbageValue = "-1503564944" ) - int method712(int var1) { + int method699(int var1) { if (var1 != 9 && var1 != 10) { return var1 == 11 ? 8 : var1; + } else { + return 1; } - return 1; } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "4" + signature = "(I)V", + garbageValue = "1489798244" ) @Export("init") void init() { @@ -103,10 +104,10 @@ public class class40 { } } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-21" + signature = "(I)V", + garbageValue = "1799961229" ) @Export("init0") void init0() { @@ -170,10 +171,10 @@ public class class40 { this.tileTemplates[0][3] = var1; } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-566933569" + signature = "(B)V", + garbageValue = "20" ) @Export("init1") void init1() { @@ -241,10 +242,10 @@ public class class40 { this.tileTemplates[1][3] = var1; } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1948794690" + garbageValue = "1663362252" ) @Export("init2") void init2() { @@ -308,10 +309,10 @@ public class class40 { this.tileTemplates[2][3] = var1; } - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "501834296" + signature = "(B)V", + garbageValue = "17" ) @Export("init3") void init3() { @@ -375,10 +376,10 @@ public class class40 { this.tileTemplates[3][3] = var1; } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-413902072" + signature = "(B)V", + garbageValue = "20" ) @Export("init4") void init4() { @@ -442,10 +443,10 @@ public class class40 { this.tileTemplates[4][3] = var1; } - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "448498588" + garbageValue = "-781295717" ) @Export("init5") void init5() { @@ -511,10 +512,10 @@ public class class40 { this.tileTemplates[5][3] = var1; } - @ObfuscatedName("x") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1961864087" + signature = "(S)V", + garbageValue = "-13800" ) @Export("init6") void init6() { @@ -580,10 +581,10 @@ public class class40 { this.tileTemplates[6][3] = var1; } - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "0" + signature = "(I)V", + garbageValue = "1592731249" ) @Export("init7") void init7() { @@ -649,198 +650,43 @@ public class class40 { this.tileTemplates[7][3] = var1; } - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "14" - ) - public static void method729(int var0) { - class197.field2402 = 1; - GrandExchangeOfferNameComparator.musicTrackArchive = null; - class197.musicTrackGroupId = -1; - class197.musicTrackFileId = -1; - ScriptFrame.field529 = 0; - BuddyRankComparator.musicTrackBoolean = false; - class197.field2404 = var0; + @ObfuscatedName("u") + public static int method729(long var0) { + return (int)(var0 >>> 14 & 3L); } - @ObfuscatedName("ew") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "-68" + signature = "(ILcr;ZI)I", + garbageValue = "-1563998621" ) - static int method700(int var0) { - return var0 * 3 + 600; - } - - @ObfuscatedName("io") - @ObfuscatedSignature( - signature = "(Lhj;III)V", - garbageValue = "-641953545" - ) - static final void method703(Widget var0, int var1, int var2) { - if (var0.buttonType == 1) { - class188.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); - } - - String var3; - if (var0.buttonType == 2 && !Client.isSpellSelected) { - var3 = FontName.method5318(var0); - if (var3 != null) { - class188.insertMenuItemNoShift(var3, ClientPreferences.colorStartTag(0xff00) + var0.spellName, 25, 0, -1, var0.id); - } - } - - if (var0.buttonType == 3) { - class188.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); - } - - if (var0.buttonType == 4) { - class188.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); - } - - if (var0.buttonType == 5) { - class188.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); - } - - if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { - class188.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); - } - - - if (var0.type == 2) { - int var13 = 0; - - for (int var4 = 0; var4 < var0.height; ++var4) { - for (int var5 = 0; var5 < var0.width; ++var5, ++var13) { - 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) { - continue; - } - Client.dragItemSlotDestination = var13; - class294.field3697 = var0; - if (var0.itemIds[var13] <= 0) { - continue; - } - ItemDefinition var8 = WorldMapArea.ItemDefinition_get(var0.itemIds[var13] - 1); - if (Client.isItemSelected == 1 && Script.method2185(class268.getWidgetClickMask(var0))) { - if (var0.id != MouseRecorder.selectedItemWidget || var13 != WorldMapIcon_1.selectedItemSlot) { - class188.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ClientPreferences.colorStartTag(0xff9040) + var8.name, 31, var8.id, var13, var0.id); - } - continue; - } - if (Client.isSpellSelected && Script.method2185(class268.getWidgetClickMask(var0))) { - if ((WorldMapCacheName.selectedSpellFlags & 16) == 16) { - class188.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ClientPreferences.colorStartTag(0xff9040) + var8.name, 32, var8.id, var13, var0.id); - } - continue; - } - String[] var9 = var8.inventoryActions; - int var10 = -1; - if (Client.shiftClickDrop) { - boolean var11 = Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; - if (var11) { - var10 = var8.getShiftClickIndex(); - } - } - - int var16; - if (Script.method2185(class268.getWidgetClickMask(var0))) { - for (var16 = 4; var16 >= 3; --var16) { - if (var16 != var10) { - WorldMapRectangle.addWidgetItemMenuItem(var0, var8, var13, var16, false); - } - } - } - - if (class195.method3685(class268.getWidgetClickMask(var0))) { - class188.insertMenuItemNoShift("Use", ClientPreferences.colorStartTag(0xff9040) + var8.name, 38, var8.id, var13, var0.id); - } - - if (Script.method2185(class268.getWidgetClickMask(var0))) { - for (var16 = 2; var16 >= 0; --var16) { - if (var10 != var16) { - WorldMapRectangle.addWidgetItemMenuItem(var0, var8, var13, var16, false); - } - } - - if (var10 >= 0) { - WorldMapRectangle.addWidgetItemMenuItem(var0, var8, var13, var10, true); - } - } - - var9 = var0.itemActions; - if (var9 != null) { - for (var16 = 4; var16 >= 0; --var16) { - if (var9[var16] == null) { - continue; - } - byte var12 = 0; - if (var16 == 0) { - var12 = 39; - } - - if (var16 == 1) { - var12 = 40; - } - - if (var16 == 2) { - var12 = 41; - } - - if (var16 == 3) { - var12 = 42; - } - - if (var16 == 4) { - var12 = 43; - } - - class188.insertMenuItemNoShift(var9[var16], ClientPreferences.colorStartTag(0xff9040) + var8.name, var12, var8.id, var13, var0.id); - } - } - - class188.insertMenuItemNoShift("Examine", ClientPreferences.colorStartTag(0xff9040) + var8.name, 1005, var8.id, var13, var0.id); + static int method728(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? class286.field3623 : class297.field3693; + if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapRegion.method530(ParamDefinition.getWidgetClickMask(var3)); + return 1; + } else if (var0 != ScriptOpcodes.CC_GETOP) { + if (var0 == ScriptOpcodes.CC_GETOPBASE) { + if (var3.dataText == null) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.dataText; } - } - } - if (!var0.isIf3) { - return; - } - if (Client.isSpellSelected) { - if (class96.method2266(class268.getWidgetClickMask(var0)) && (WorldMapCacheName.selectedSpellFlags & 32) == 32) { - class188.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); + return 1; + } else { + return 2; } - return; - } - for (int var13 = 9; var13 >= 5; --var13) { - String var14 = UserComparator10.method3407(var0, var13); - if (var14 != null) { - class188.insertMenuItemNoShift(var14, var0.dataText, 1007, var13 + 1, var0.childIndex, var0.id); + } else { + int var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; + --var4; + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.actions[var4]; + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; } - } - var3 = FontName.method5318(var0); - if (var3 != null) { - class188.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); - } - - for (int var4 = 4; var4 >= 0; --var4) { - String var15 = UserComparator10.method3407(var0, var4); - if (var15 != null) { - Entity.insertMenuItem(var15, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.field2691); - } - } - - if (InterfaceParent.method1119(class268.getWidgetClickMask(var0))) { - class188.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); + return 1; } } } diff --git a/runescape-client/src/main/java/class42.java b/runescape-client/src/main/java/class42.java index d87f339b6b..6f67d109b2 100644 --- a/runescape-client/src/main/java/class42.java +++ b/runescape-client/src/main/java/class42.java @@ -1,3 +1,5 @@ +import java.io.File; +import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -5,185 +7,225 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("aa") public class class42 implements WorldMapSection { - @ObfuscatedName("jy") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 729343295 + intValue = 1666489589 ) - @Export("plane") - static int plane; - @ObfuscatedName("kl") + int field339; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 656519429 + intValue = 1652591349 ) - @Export("menuWidth") - static int menuWidth; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 916978053 - ) - int field368; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 1762560759 - ) - int field363; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -342146011 - ) - int field364; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 1042956217 - ) - int field365; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 769033825 - ) - int field366; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -1279110919 - ) - int field375; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 1202415387 - ) - int field376; + int field347; @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 171955233 + intValue = -1779565127 ) - int field369; - @ObfuscatedName("c") + int field340; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -432723917 + intValue = -1405698939 ) - int field370; - @ObfuscatedName("f") + int field341; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 149120555 + intValue = -141873597 ) - int field371; + int field342; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 1429308519 + ) + int field343; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -1809931073 + ) + int field338; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 267647381 + ) + int field345; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -1741854477 + ) + int field346; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -1323811143 + ) + int field344; class42() { } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lal;B)V", - garbageValue = "-53" + signature = "(Lav;I)V", + garbageValue = "-1068467910" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field366) { - var1.regionLowX = this.field366; + if (var1.regionLowX > this.field342) { + var1.regionLowX = this.field342; } - if (var1.regionHighX < this.field366) { - var1.regionHighX = this.field366; + if (var1.regionHighX < this.field342) { + var1.regionHighX = this.field342; } - if (var1.regionLowY > this.field375) { - var1.regionLowY = this.field375; + if (var1.regionLowY > this.field343) { + var1.regionLowY = this.field343; } - if (var1.regionHighY < this.field375) { - var1.regionHighY = this.field375; + if (var1.regionHighY < this.field343) { + var1.regionHighY = this.field343; } } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(IIII)Z", - garbageValue = "59484528" + garbageValue = "1014871771" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.field368 && var1 < this.field368 + this.field363) { - return var2 >= (this.field364 << 6) + (this.field376 << 3) && var2 <= (this.field364 << 6) + (this.field376 << 3) + 7 && var3 >= (this.field365 << 6) + (this.field369 << 3) && var3 <= (this.field365 << 6) + (this.field369 << 3) + 7; + if (var1 >= this.field339 && var1 < this.field339 + this.field347) { + return var2 >= (this.field340 << 6) + (this.field338 << 3) && var2 <= (this.field340 << 6) + (this.field338 << 3) + 7 && var3 >= (this.field341 << 6) + (this.field345 << 3) && var3 <= (this.field341 << 6) + (this.field345 << 3) + 7; + } else { + return false; } - return false; } - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IIB)Z", - garbageValue = "56" + signature = "(III)Z", + garbageValue = "694688168" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >= (this.field366 << 6) + (this.field370 << 3) && var1 <= (this.field366 << 6) + (this.field370 << 3) + 7 && var2 >= (this.field375 << 6) + (this.field371 << 3) && var2 <= (this.field375 << 6) + (this.field371 << 3) + 7; + return var1 >= (this.field342 << 6) + (this.field346 << 3) && var1 <= (this.field342 << 6) + (this.field346 << 3) + 7 && var2 >= (this.field343 << 6) + (this.field344 << 3) && var2 <= (this.field343 << 6) + (this.field344 << 3) + 7; } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(IIIB)[I", - garbageValue = "12" + signature = "(IIII)[I", + garbageValue = "-45443461" ) @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.field342 * 64 - this.field340 * 64 + var2 + (this.field346 * 8 - this.field338 * 8), var3 + (this.field343 * 64 - this.field341 * 64) + (this.field344 * 8 - this.field345 * 8)}; + return var4; } - int[] var4 = new int[]{this.field366 * 64 - this.field364 * 64 + var2 + (this.field370 * 8 - this.field376 * 8), var3 + (this.field375 * 64 - this.field365 * 64) + (this.field371 * 8 - this.field369 * 8)}; - return var4; } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(IIB)Lhv;", - garbageValue = "-13" + signature = "(III)Lhd;", + garbageValue = "1267204541" ) @Export("coord") public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { return null; + } else { + int var3 = this.field340 * 64 - this.field342 * 64 + (this.field338 * 8 - this.field346 * 8) + var1; + int var4 = this.field341 * 64 - this.field343 * 64 + var2 + (this.field345 * 8 - this.field344 * 8); + return new Coord(this.field339, var3, var4); } - int var3 = this.field364 * 64 - this.field366 * 64 + (this.field376 * 8 - this.field370 * 8) + var1; - int var4 = this.field365 * 64 - this.field375 * 64 + var2 + (this.field369 * 8 - this.field371 * 8); - return new Coord(this.field368, var3, var4); } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Lkf;I)V", - garbageValue = "1767519038" + signature = "(Lky;I)V", + garbageValue = "1072299144" ) @Export("read") public void read(Buffer var1) { - this.field368 = var1.readUnsignedByte(); - this.field363 = var1.readUnsignedByte(); - this.field364 = var1.readUnsignedShort(); - this.field376 = var1.readUnsignedByte(); - this.field365 = var1.readUnsignedShort(); - this.field369 = var1.readUnsignedByte(); - this.field366 = var1.readUnsignedShort(); - this.field370 = var1.readUnsignedByte(); - this.field375 = var1.readUnsignedShort(); - this.field371 = var1.readUnsignedByte(); - this.method744(); + this.field339 = var1.readUnsignedByte(); + this.field347 = var1.readUnsignedByte(); + this.field340 = var1.readUnsignedShort(); + this.field338 = var1.readUnsignedByte(); + this.field341 = var1.readUnsignedShort(); + this.field345 = var1.readUnsignedByte(); + this.field342 = var1.readUnsignedShort(); + this.field346 = var1.readUnsignedByte(); + this.field343 = var1.readUnsignedShort(); + this.field344 = var1.readUnsignedByte(); + this.method738(); } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "33671142" + garbageValue = "1792228112" ) - void method744() { + void method738() { } - @ObfuscatedName("el") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Liu;Ljava/lang/String;I)V", - garbageValue = "446000898" + signature = "(Ljava/lang/String;B)Ljava/io/File;", + garbageValue = "-44" ) - static void method763(Archive var0, String var1) { - ArchiveLoader var2 = new ArchiveLoader(var0, var1); - Client.archiveLoaders.add(var2); - Client.field927 += var2.groupCount; + @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("d") + static final void method752(long var0) { + ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var0; + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "1" + ) + public static void method753() { + ItemDefinition.ItemDefinition_cachedSprites.clear(); } } diff --git a/runescape-client/src/main/java/class43.java b/runescape-client/src/main/java/class43.java index a10660bd7e..884e2ebafe 100644 --- a/runescape-client/src/main/java/class43.java +++ b/runescape-client/src/main/java/class43.java @@ -1,39 +1,128 @@ -import java.lang.management.GarbageCollectorMXBean; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("an") +@ObfuscatedName("ap") public final class class43 { - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lhp;" - ) - @Export("SpotAnimationDefinition_modelArchive") - public static AbstractArchive SpotAnimationDefinition_modelArchive; @ObfuscatedName("i") - @Export("ByteArrayPool_altSizeArrayCounts") - public static int[] ByteArrayPool_altSizeArrayCounts; - @ObfuscatedName("ak") - @Export("garbageCollector") - static GarbageCollectorMXBean garbageCollector; - @ObfuscatedName("dx") @ObfuscatedSignature( - signature = "Liu;" + signature = "Lhz;" ) - @Export("archive3") - static Archive archive3; + @Export("HitSplatDefinition_fontsArchive") + public static AbstractArchive HitSplatDefinition_fontsArchive; + @ObfuscatedName("fp") + @ObfuscatedSignature( + signature = "Lkb;" + ) + @Export("fontBold12") + static Font fontBold12; @ObfuscatedName("hj") @ObfuscatedGetter( - intValue = 2040004627 + intValue = -340073235 ) - @Export("cameraY") - static int cameraY; + @Export("cameraPitch") + static int cameraPitch; - @ObfuscatedName("l") - @Export("Entity_unpackID") - public static int Entity_unpackID(long var0) { - return (int)(var0 >>> 17 & 0xffffffffL); + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(IB)Lix;", + garbageValue = "-106" + ) + @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; + } + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(Ljava/lang/Object;ZI)[B", + garbageValue = "1018664493" + ) + @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); + if (var1) { + int var4 = var6.length; + byte[] var5 = new byte[var4]; + System.arraycopy(var6, 0, var5, 0, var4); + return var5; + } else { + return var6; + } + } else if (var0 instanceof AbstractByteArrayCopier) { + AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; + return var2.get(); + } else { + throw new IllegalArgumentException(); + } + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(III)I", + garbageValue = "1698401174" + ) + static int method761(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("es") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "-1409120987" + ) + static int method758() { + if (Client.archiveLoaders != null && Client.archiveLoaderArchive < Client.archiveLoaders.size()) { + int var0 = 0; + + for (int var1 = 0; var1 <= Client.archiveLoaderArchive; ++var1) { + var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; + } + + return var0 * 10000 / Client.field895; + } else { + return 10000; + } + } + + @ObfuscatedName("kf") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "16" + ) + static final void method759() { + Client.field629 = Client.cycleCntr; } } diff --git a/runescape-client/src/main/java/class47.java b/runescape-client/src/main/java/class47.java index f4e9d62de9..e03efdc354 100644 --- a/runescape-client/src/main/java/class47.java +++ b/runescape-client/src/main/java/class47.java @@ -3,14 +3,23 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import netscape.javascript.JSObject; -@ObfuscatedName("ah") +@ObfuscatedName("al") public class class47 { - @ObfuscatedName("q") + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(Ljava/applet/Applet;Ljava/lang/String;B)V", + garbageValue = "16" + ) + public static void method796(Applet var0, String var1) throws Throwable { + JSObject.getWindow(var0).eval(var1); + } + + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(Ljava/applet/Applet;Ljava/lang/String;[Ljava/lang/Object;I)Ljava/lang/Object;", - garbageValue = "1272858085" + garbageValue = "-2054466950" ) - public static Object method806(Applet var0, String var1, Object[] var2) throws Throwable { + public static Object method795(Applet var0, String var1, Object[] var2) throws Throwable { return JSObject.getWindow(var0).call(var1, var2); } } diff --git a/runescape-client/src/main/java/class49.java b/runescape-client/src/main/java/class49.java index f8ddf38816..196abf1d2f 100644 --- a/runescape-client/src/main/java/class49.java +++ b/runescape-client/src/main/java/class49.java @@ -2,71 +2,124 @@ import javax.imageio.ImageIO; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ay") +@ObfuscatedName("ab") public class class49 { + @ObfuscatedName("r") + @Export("Tiles_hueMultiplier") + static int[] Tiles_hueMultiplier; + static { ImageIO.setUseCache(false); } - @ObfuscatedName("e") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "135" + signature = "(I)V", + garbageValue = "-1821509751" ) - static void method815() { - if (Login.Login_username != null && Login.Login_username.length() > 0) { - return; + static void method810() { + for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var0.obj != null) { + var0.set(); + } } - if (WorldMapLabelSize.clientPreferences.rememberedUsername != null) { - Login.Login_username = WorldMapLabelSize.clientPreferences.rememberedUsername; - Client.Login_isUsernameRemembered = true; + + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + signature = "(ILcr;ZI)I", + garbageValue = "1937427319" + ) + static int method811(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { + Interpreter.Interpreter_intStackSize -= 2; + Client.field873 = (short)BZip2State.method5664(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]); + if (Client.field873 <= 0) { + Client.field873 = 256; + } + + Client.field822 = (short)BZip2State.method5664(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); + if (Client.field822 <= 0) { + Client.field822 = 256; + } + + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { + Interpreter.Interpreter_intStackSize -= 2; + Client.zoomHeight = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + if (Client.zoomHeight <= 0) { + Client.zoomHeight = 256; + } + + Client.zoomWidth = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + if (Client.zoomWidth <= 0) { + Client.zoomWidth = 320; + } + + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { + Interpreter.Interpreter_intStackSize -= 4; + Client.field795 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; + if (Client.field795 <= 0) { + Client.field795 = 1; + } + + Client.field661 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; + if (Client.field661 <= 0) { + Client.field661 = 32767; + } else if (Client.field661 < Client.field795) { + Client.field661 = Client.field795; + } + + Client.field652 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; + if (Client.field652 <= 0) { + Client.field652 = 1; + } + + Client.field791 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; + if (Client.field791 <= 0) { + Client.field791 = 32767; + } else if (Client.field791 < Client.field652) { + Client.field791 = Client.field652; + } + + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { + if (Client.viewportWidget != null) { + LoginScreenAnimation.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.viewportWidth; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.viewportHeight; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } + + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.zoomHeight; + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.zoomWidth; + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ChatChannel.method2165(Client.field873); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ChatChannel.method2165(Client.field822); + return 1; + } else if (var0 == 6220) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 6221) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 6222) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = KitDefinition.canvasWidth; + return 1; + } else if (var0 == 6223) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class30.canvasHeight; + return 1; } else { - Client.Login_isUsernameRemembered = false; + return 2; } - - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(IIB)Lcx;", - garbageValue = "3" - ) - @Export("getWorldMapScript") - static Script getWorldMapScript(int var0, int var1) { - Script var2 = (Script)Script.Script_cached.get((long)(var0 << 16)); - if (var2 != null) { - return var2; - } - String var3 = String.valueOf(var0); - int var4 = UserComparator4.archive12.getGroupId(var3); - if (var4 == -1) { - return null; - } - byte[] var5 = UserComparator4.archive12.takeFileFlat(var4); - if (var5 == null) { - return null; - } - if (var5.length <= 1) { - return null; - } - - var2 = World.newScript(var5); - if (var2 != null) { - Script.Script_cached.put(var2, (long)(var0 << 16)); - return var2; - } - - return null; - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(CS)Z", - garbageValue = "8230" - ) - @Export("isDigit") - public static boolean isDigit(char var0) { - return var0 >= '0' && var0 <= '9'; } } diff --git a/runescape-client/src/main/java/class51.java b/runescape-client/src/main/java/class51.java index d08655e35e..2079d70dc6 100644 --- a/runescape-client/src/main/java/class51.java +++ b/runescape-client/src/main/java/class51.java @@ -3,37 +3,151 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ab") +@ObfuscatedName("ae") public class class51 { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("applet") static Applet applet; - @ObfuscatedName("w") - static String field434; + @ObfuscatedName("j") + static String field404; + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "Llq;" + ) + @Export("logoSprite") + static IndexedSprite logoSprite; + @ObfuscatedName("dt") + @ObfuscatedSignature( + signature = "Lid;" + ) + @Export("archive7") + static Archive archive7; static { applet = null; - field434 = ""; + field404 = ""; } - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(II)Lip;", - garbageValue = "1884870915" + signature = "(Lky;I)Ljava/lang/String;", + garbageValue = "700500119" ) - @Export("HealthBarDefinition_get") - public static HealthBarDefinition HealthBarDefinition_get(int var0) { - HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } - byte[] var2 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var0); - var1 = new HealthBarDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); + public static String method845(Buffer var0) { + String var1; + try { + int var2 = var0.readUShortSmart(); + if (var2 > 32767) { + var2 = 32767; + } + + byte[] var3 = new byte[var2]; + var0.offset += class210.huffman.decompress(var0.array, var0.offset, var3, 0, var2); + String var4 = ViewportMouse.decodeStringCp1252(var3, 0, var2); + var1 = var4; + } catch (Exception var6) { + var1 = "Cabbage"; } - HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0); return var1; } + + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1490418351" + ) + public static void method846() { + VarpDefinition.VarpDefinition_cached.clear(); + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "949644202" + ) + @Export("runWidgetOnLoadListener") + static void runWidgetOnLoadListener(int var0) { + if (var0 != -1) { + if (Projectile.loadInterface(var0)) { + Widget[] var1 = Widget.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; + WorldMapIcon_1.runScript(var4, 5000000); + } + } + + } + } + } + + @ObfuscatedName("ie") + @ObfuscatedSignature( + signature = "(Lbd;IIII)V", + garbageValue = "-500711697" + ) + @Export("addPlayerToMenu") + static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { + if (WorldMapIcon_1.localPlayer != var0) { + if (Client.menuOptionsCount < 400) { + String var4; + if (var0.skillLevel == 0) { + var4 = var0.actions[0] + var0.username + var0.actions[1] + class225.method4037(var0.combatLevel, WorldMapIcon_1.localPlayer.combatLevel) + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; + } else { + var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; + } + + int var5; + if (Client.isItemSelected == 1) { + WorldMapData_0.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class16.colorStartTag(16777215) + var4, 14, var1, var2, var3); + } else if (Client.isSpellSelected) { + if ((WorldMapSectionType.selectedSpellFlags & 8) == 8) { + WorldMapData_0.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class16.colorStartTag(16777215) + var4, 15, var1, var2, var3); + } + } else { + for (var5 = 7; var5 >= 0; --var5) { + if (Client.playerMenuActions[var5] != null) { + short var6 = 0; + if (Client.playerMenuActions[var5].equalsIgnoreCase("Attack")) { + if (AttackOption.AttackOption_hidden == Client.playerAttackOption) { + continue; + } + + if (Client.playerAttackOption == AttackOption.AttackOption_alwaysRightClick || AttackOption.AttackOption_dependsOnCombatLevels == Client.playerAttackOption && var0.combatLevel > WorldMapIcon_1.localPlayer.combatLevel) { + var6 = 2000; + } + + if (WorldMapIcon_1.localPlayer.team != 0 && var0.team != 0) { + if (var0.team == WorldMapIcon_1.localPlayer.team) { + var6 = 2000; + } else { + var6 = 0; + } + } + } else if (Client.playerOptionsPriorities[var5]) { + var6 = 2000; + } + + boolean var7 = false; + int var8 = Client.playerMenuOpcodes[var5] + var6; + WorldMapData_0.insertMenuItemNoShift(Client.playerMenuActions[var5], class16.colorStartTag(16777215) + var4, var8, var1, var2, var3); + } + } + } + + for (var5 = 0; var5 < Client.menuOptionsCount; ++var5) { + if (Client.menuOpcodes[var5] == 23) { + Client.menuTargets[var5] = class16.colorStartTag(16777215) + var4; + break; + } + } + + } + } + } } diff --git a/runescape-client/src/main/java/class60.java b/runescape-client/src/main/java/class60.java index 0aeb9b4ba2..f0e8a64a3e 100644 --- a/runescape-client/src/main/java/class60.java +++ b/runescape-client/src/main/java/class60.java @@ -1,36 +1,49 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bx") +@ObfuscatedName("bj") public class class60 { - @ObfuscatedName("ac") - @Export("null_string") - protected static String null_string; - - @ObfuscatedName("ju") - @ObfuscatedSignature( - signature = "(Lhj;III)V", - garbageValue = "1446112965" + @ObfuscatedName("ng") + @ObfuscatedGetter( + intValue = -2116581745 ) - @Export("clickWidget") - static final void clickWidget(Widget var0, int var1, int var2) { - if (Client.clickedWidget != null || Client.isMenuOpen) { - return; - } - if (var0 == null || ArchiveLoader.method1099(var0) == null) { - return; - } - Client.clickedWidget = var0; - Client.clickedWidgetParent = ArchiveLoader.method1099(var0); - Client.widgetClickX = var1; - Client.widgetClickY = var2; - class80.widgetDragDuration = 0; - Client.isDraggingWidget = false; - int var3 = class13.getNewestMenuIdx(); - if (var3 != -1) { - Decimator.saveTempMenuAction(var3); - } + @Export("widgetDragDuration") + static int widgetDragDuration; + @ObfuscatedName("bj") + @ObfuscatedSignature( + signature = "Lgk;" + ) + @Export("clientLanguage") + static Language clientLanguage; + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(IB)[B", + garbageValue = "73" + ) + @Export("ByteArrayPool_getArray") + public static synchronized byte[] ByteArrayPool_getArray(int var0) { + return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "2044529336" + ) + public static void method1122() { + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { + if (ArchiveDiskActionHandler.field3124 != 0) { + ArchiveDiskActionHandler.field3124 = 1; + + try { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); + } catch (InterruptedException var3) { + } + } + + } } } diff --git a/runescape-client/src/main/java/class65.java b/runescape-client/src/main/java/class65.java index 9d88a6e279..7ff555561e 100644 --- a/runescape-client/src/main/java/class65.java +++ b/runescape-client/src/main/java/class65.java @@ -1,428 +1,324 @@ -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; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bl") +@ObfuscatedName("bf") public class class65 extends RouteStrategy { + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "Lhz;" + ) + @Export("ItemDefinition_archive") + static AbstractArchive ItemDefinition_archive; + @ObfuscatedName("ff") + @ObfuscatedGetter( + longValue = 1031701328747955581L + ) + static long field586; + @ObfuscatedName("lw") + @ObfuscatedSignature( + signature = "Lhp;" + ) + @Export("mousedOverWidgetIf1") + static Widget mousedOverWidgetIf1; + class65() { } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(IIILfv;I)Z", - garbageValue = "-1217489379" + signature = "(IIILfm;I)Z", + garbageValue = "1325675955" ) @Export("hasArrived") - public boolean hasArrived(int size, int x, int y, CollisionMap var4) { - return x == super.approxDestinationX && y == super.approxDestinationY; + public boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) { + return var2 == super.approxDestinationX && var3 == super.approxDestinationY; } - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)Ljava/io/File;", - garbageValue = "-46052492" + signature = "(III)V", + garbageValue = "1096051399" ) - @Export("getFile") - static File getFile(String var0) { - if (!FileSystem.FileSystem_hasPermissions) { - throw new RuntimeException(""); - } - File var1 = (File) FileSystem.FileSystem_cacheFiles.get(var0); - if (var1 != null) { - return var1; - } - File var2 = new File(FileSystem.FileSystem_cacheDir, var0); - RandomAccessFile var3 = null; + @Export("changeWorldSelectSorting") + static void changeWorldSelectSorting(int var0, int var1) { + int[] var2 = new int[4]; + int[] var3 = new int[4]; + var2[0] = var0; + var3[0] = var1; + int var4 = 1; - try { - File var4 = new File(var2.getParent()); - if (!var4.exists()) { - throw new RuntimeException(""); + for (int var5 = 0; var5 < 4; ++var5) { + if (World.World_sortOption1[var5] != var0) { + var2[var4] = World.World_sortOption1[var5]; + var3[var4] = World.World_sortOption2[var5]; + ++var4; } - 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(); } + + World.World_sortOption1 = var2; + World.World_sortOption2 = var3; + Tile.sortWorlds(ChatChannel.World_worlds, 0, ChatChannel.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); } - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lhp;III)Lly;", - garbageValue = "300652258" + signature = "(B)I", + garbageValue = "29" ) - @Export("SpriteBuffer_getSprite") - public static Sprite SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { - if (!Friend.SpriteBuffer_bufferFile(var0, var1, var2)) { - return null; - } - Sprite var4 = new Sprite(); - var4.width = SpriteBuffer.SpriteBuffer_spriteWidth; - var4.height = SpriteBuffer.SpriteBuffer_spriteHeight; - var4.xOffset = Varps.SpriteBuffer_xOffsets[0]; - var4.yOffset = SpriteBuffer.SpriteBuffer_yOffsets[0]; - var4.subWidth = SpriteBuffer.SpriteBuffer_spriteWidths[0]; - var4.subHeight = class216.SpriteBuffer_spriteHeights[0]; - int var5 = var4.subHeight * var4.subWidth; - byte[] var6 = SpriteBuffer.SpriteBuffer_pixels[0]; - var4.pixels = new int[var5]; - - for (int var7 = 0; var7 < var5; ++var7) { - var4.pixels[var7] = Frames.SpriteBuffer_spritePalette[var6[var7] & 255]; - } - - class16.SpriteBuffer_clear(); - return var4; + static final int method1180() { + return ViewportMouse.ViewportMouse_x; } - @ObfuscatedName("aw") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(ILcx;ZI)I", - garbageValue = "-953201371" + signature = "(Lbl;I)V", + garbageValue = "-138729150" ) - static int method1175(int var0, Script var1, boolean var2) { - int var3; - int var4; - int var6; - if (var0 == ScriptOpcodes.ENUM_STRING) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - EnumDefinition var5 = BoundaryObject.getEnum(var3); - if (var5.outputType != 's') { + @Export("changeWorld") + static void changeWorld(World var0) { + if (var0.isMembersOnly() != Client.isMembersWorld) { + Client.isMembersWorld = var0.isMembersOnly(); + boolean var1 = var0.isMembersOnly(); + if (var1 != UrlRequester.ItemDefinition_inMembersWorld) { + TileItemPile.method2700(); + UrlRequester.ItemDefinition_inMembersWorld = var1; } - - for (var6 = 0; var6 < var5.outputCount; ++var6) { - if (var4 == var5.keys[var6]) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var5.strVals[var6]; - var5 = null; - break; - } - } - - if (var5 != null) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var5.defaultStr; - } - - return 1; } - if (var0 == ScriptOpcodes.ENUM) { - HealthBarUpdate.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - int var9 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 3]; - EnumDefinition var7 = BoundaryObject.getEnum(var9); - if (var3 != var7.inputType || var4 != var7.outputType) { - if (var4 == 115) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "null"; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } - return 1; - } - - for (int var8 = 0; var8 < var7.outputCount; ++var8) { - if (var6 == var7.keys[var8]) { - if (var4 == 115) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var7.strVals[var8]; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var7.intVals[var8]; - } - - var7 = null; - break; - } - } - - if (var7 == null) { - return 1; - } - if (var4 == 115) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var7.defaultStr; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var7.defaultInt; - } - - return 1; - } - if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - EnumDefinition var10 = BoundaryObject.getEnum(var3); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var10.size(); - return 1; - } - return 2; + NetFileRequest.worldHost = var0.host; + Client.worldId = var0.id; + Client.worldProperties = var0.properties; + WorldMapRectangle.port1 = Client.gameBuild == 0 ? 43594 : var0.id + 40000; + FloorDecoration.port2 = Client.gameBuild == 0 ? 443 : var0.id + 50000; + SecureRandomCallable.port3 = WorldMapRectangle.port1; } - @ObfuscatedName("ee") - @ObfuscatedSignature( - signature = "(IZZZB)Liu;", - garbageValue = "6" - ) - @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, JagexCache.JagexCache_idxFiles[var0], 1000000); - } - - return new Archive(var4, ScriptEvent.masterDisk, var0, var1, var2, var3); - } - - @ObfuscatedName("hq") - @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "-1548212436" - ) - @Export("addSceneMenuOptions") - static final void addSceneMenuOptions(int mouseX, int mouseY, int xOffset, int yOffset) { - if (Client.isItemSelected == 0 && !Client.isSpellSelected) { - class188.insertMenuItemNoShift("Walk here", "", 23, 0, mouseX - xOffset, mouseY - yOffset); - } - - long var4 = -1L; - long var6 = -1L; - for (int var8 = 0, var10 = ViewportMouse.ViewportMouse_entityCount; var8 < var10; var8++) { - long var25 = ViewportMouse.ViewportMouse_entityTags[var8]; - if (var6 == var25) { - continue; - } - var6 = var25; - int var15 = Buddy.ViewportMouse_unpackX(var8); - int var16 = Messages.ViewportMouse_unpackY(var8); - int var17 = class3.ViewportMouse_unpackType(var8); - int var18 = FriendSystem.ViewportMouse_unpackID(var8); - if (var17 == 2 && GrandExchangeOfferWorldComparator.scene.getObjectFlags(class42.plane, var15, var16, var25) >= 0) { - ObjectDefinition var19 = ViewportMouse.getObjectDefinition(var18); - if (var19.transforms != null) { - var19 = var19.transform(); - } - - if (var19 == null) { - continue; - } - - if (Client.isItemSelected == 1) { - class188.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ClientPreferences.colorStartTag(0xffff) + var19.name, 1, var18, var15, var16); - } else if (Client.isSpellSelected) { - if ((WorldMapCacheName.selectedSpellFlags & 4) == 4) { - class188.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ClientPreferences.colorStartTag(0xffff) + var19.name, 2, var18, var15, var16); - } - } else { - String[] var27 = var19.actions; - if (var27 != null) { - for (int var30 = 4; var30 >= 0; --var30) { - if (var27[var30] == null) { - continue; - } - short var22 = 0; - if (var30 == 0) { - var22 = 3; - } else if (var30 == 1) { - var22 = 4; - } else if (var30 == 2) { - var22 = 5; - } else if (var30 == 3) { - var22 = 6; - } else if (var30 == 4) { - var22 = 1001; - } - - class188.insertMenuItemNoShift(var27[var30], ClientPreferences.colorStartTag(0xffff) + var19.name, var22, var18, var15, var16); - } - } - - class188.insertMenuItemNoShift("Examine", ClientPreferences.colorStartTag(0xffff) + var19.name, 1002, var19.id, var15, var16); - } - } - - int var20; - NPC var21; - Player var23; - int[] var34; - int var36; - if (var17 == 1) { - NPC var31 = Client.npcs[var18]; - if (var31 == null) { - continue; - } - - if (var31.definition.size == 1 && (var31.x & 127) == 64 && (var31.y & 127) == 64) { - for (var20 = 0; var20 < Client.npcCount; ++var20) { - var21 = Client.npcs[Client.npcIndices[var20]]; - if (var21 != null && var21 != var31 && var21.definition.size == 1 && var31.x == var21.x && var31.y == var21.y) { - AbstractWorldMapData.addNpcToMenu(var21.definition, Client.npcIndices[var20], var15, var16); - } - } - - var20 = Players.Players_count; - var34 = Players.Players_indices; - - for (var36 = 0; var36 < var20; ++var36) { - var23 = Client.players[var34[var36]]; - if (var23 != null && var31.x == var23.x && var23.y == var31.y) { - WorldMapManager.addPlayerToMenu(var23, var34[var36], var15, var16); - } - } - } - - AbstractWorldMapData.addNpcToMenu(var31.definition, var18, var15, var16); - } - - if (var17 == 0) { - Player var32 = Client.players[var18]; - if (var32 == null) { - continue; - } - - if ((var32.x & 127) == 64 && (var32.y & 127) == 64) { - for (var20 = 0; var20 < Client.npcCount; ++var20) { - var21 = Client.npcs[Client.npcIndices[var20]]; - if (var21 != null && var21.definition.size == 1 && var32.x == var21.x && var21.y == var32.y) { - AbstractWorldMapData.addNpcToMenu(var21.definition, Client.npcIndices[var20], var15, var16); - } - } - - var20 = Players.Players_count; - var34 = Players.Players_indices; - - for (var36 = 0; var36 < var20; ++var36) { - var23 = Client.players[var34[var36]]; - if (var23 != null && var32 != var23 && var23.x == var32.x && var32.y == var23.y) { - WorldMapManager.addPlayerToMenu(var23, var34[var36], var15, var16); - } - } - } - - if (var18 != Client.combatTargetPlayerIndex) { - WorldMapManager.addPlayerToMenu(var32, var18, var15, var16); - } else { - var4 = var25; - } - } - - if (var17 != 3) { - continue; - } - NodeDeque var33 = Client.groundItems[class42.plane][var15][var16]; - if (var33 == null) { - continue; - } - for (TileItem var37 = (TileItem) var33.first(); var37 != null; var37 = (TileItem) var33.next()) { - ItemDefinition var35 = WorldMapArea.ItemDefinition_get(var37.id); - if (Client.isItemSelected == 1) { - class188.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ClientPreferences.colorStartTag(0xff9040) + var35.name, 16, var37.id, var15, var16); - continue; - } - if (Client.isSpellSelected) { - if ((WorldMapCacheName.selectedSpellFlags & 1) == 1) { - class188.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ClientPreferences.colorStartTag(0xff9040) + var35.name, 17, var37.id, var15, var16); - } - continue; - } - String[] var28 = var35.groundActions; - - for (int var29 = 4; var29 >= 0; --var29) { - if (var28 == null || var28[var29] == null) { - if (var29 == 2) { - class188.insertMenuItemNoShift("Take", ClientPreferences.colorStartTag(0xff9040) + var35.name, 20, var37.id, var15, var16); - } - continue; - } - byte var24 = 0; - if (var29 == 0) { - var24 = 18; - } else if (var29 == 1) { - var24 = 19; - } else if (var29 == 2) { - var24 = 20; - } else if (var29 == 3) { - var24 = 21; - } else if (var29 == 4) { - var24 = 22; - } - - class188.insertMenuItemNoShift(var28[var29], ClientPreferences.colorStartTag(0xff9040) + var35.name, var24, var37.id, var15, var16); - } - - class188.insertMenuItemNoShift("Examine", ClientPreferences.colorStartTag(0xff9040) + var35.name, 1004, var37.id, var15, var16); - } - } - - if (-1L != var4) { - int var8 = (int) (var4 >>> 0 & 127L); - int var10 = (int) (var4 >>> 7 & 127L); - Player var12 = Client.players[Client.combatTargetPlayerIndex]; - WorldMapManager.addPlayerToMenu(var12, Client.combatTargetPlayerIndex, var8, var10); - } - } - - @ObfuscatedName("jq") + @ObfuscatedName("fz") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "65" + garbageValue = "-87" ) - static void method1176() { - for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { - int var1 = var0.group; - if (!class162.loadInterface(var1)) { - continue; - } - boolean var2 = true; - Widget[] var3 = Widget.Widget_interfaceComponents[var1]; + static final void method1182() { + Client.packetWriter.close(); + class1.method18(); + Player.scene.clear(); - int var4; - for (var4 = 0; var4 < var3.length; ++var4) { - if (var3[var4] != null) { - var2 = var3[var4].isIf3; - break; + for (int var0 = 0; var0 < 4; ++var0) { + Client.collisionMaps[var0].clear(); + } + + System.gc(); + DevicePcmPlayerProvider.method793(2); + Client.field857 = -1; + Client.field858 = false; + + for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var1.stream1 != null) { + IgnoreList.pcmStreamMixer.removeSubStream(var1.stream1); + var1.stream1 = null; + } + + if (var1.stream2 != null) { + IgnoreList.pcmStreamMixer.removeSubStream(var1.stream2); + var1.stream2 = null; + } + } + + ObjectSound.objectSounds.clear(); + FloorDecoration.updateGameState(10); + } + + @ObfuscatedName("fa") + @ObfuscatedSignature( + signature = "(Lbu;I)V", + garbageValue = "-554160740" + ) + static final void method1178(Actor var0) { + if (var0.field971 != 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 (var2) { - continue; + if (var0.field946 != -1 && (var0.pathLength == 0 || var0.field976 > 0)) { + var0.orientation = var0.field946; + var0.field946 = -1; } - var4 = (int)var0.key; - Widget var5 = class80.getWidget(var4); - if (var5 != null) { - Strings.invalidateWidget(var5); - } - } + int var4 = var0.orientation - var0.rotation & 2047; + if (var4 == 0 && var0.false0) { + var0.targetIndex = -1; + var0.false0 = false; + } + + if (var4 != 0) { + ++var0.field970; + boolean var6; + if (var4 > 1024) { + var0.rotation -= var0.field971; + var6 = true; + if (var4 < var0.field971 || var4 > 2048 - var0.field971) { + var0.rotation = var0.orientation; + var6 = false; + } + + if (var0.movementSequence == var0.readySequence && (var0.field970 > 25 || var6)) { + if (var0.turnLeftSequence != -1) { + var0.movementSequence = var0.turnLeftSequence; + } else { + var0.movementSequence = var0.walkSequence; + } + } + } else { + var0.rotation += var0.field971; + var6 = true; + if (var4 < var0.field971 || var4 > 2048 - var0.field971) { + var0.rotation = var0.orientation; + var6 = false; + } + + if (var0.readySequence == var0.movementSequence && (var0.field970 > 25 || var6)) { + if (var0.turnRightSequence != -1) { + var0.movementSequence = var0.turnRightSequence; + } else { + var0.movementSequence = var0.walkSequence; + } + } + } + + var0.rotation &= 2047; + } else { + var0.field970 = 0; + } + + } } - @ObfuscatedName("jv") + @ObfuscatedName("il") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "-1765839836" + signature = "(Lii;IIII)V", + garbageValue = "-973844145" ) - @Export("Clan_joinChat") - static final void Clan_joinChat(String var0) { - if (var0.equals("")) { - return; + @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(); + } + + if (var0 != null) { + if (var0.isInteractable) { + if (!var0.isFollower || Client.followerIndex == var1) { + String var4 = var0.name; + if (var0.combatLevel != 0) { + var4 = var4 + class225.method4037(var0.combatLevel, WorldMapIcon_1.localPlayer.combatLevel) + " " + " (" + "level-" + var0.combatLevel + ")"; + } + + if (var0.isFollower && Client.followerOpsLowPriority) { + WorldMapData_0.insertMenuItemNoShift("Examine", class16.colorStartTag(16776960) + var4, 1003, var1, var2, var3); + } + + if (Client.isItemSelected == 1) { + WorldMapData_0.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class16.colorStartTag(16776960) + var4, 7, var1, var2, var3); + } else if (Client.isSpellSelected) { + if ((WorldMapSectionType.selectedSpellFlags & 2) == 2) { + WorldMapData_0.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class16.colorStartTag(16776960) + var4, 8, var1, var2, var3); + } + } else { + int var5 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0; + String[] var6 = var0.actions; + int var7; + int var8; + if (var6 != null) { + for (var7 = 4; var7 >= 0; --var7) { + if (var6[var7] != null && !var6[var7].equalsIgnoreCase("Attack")) { + var8 = 0; + if (var7 == 0) { + var8 = var5 + 9; + } + + if (var7 == 1) { + var8 = var5 + 10; + } + + if (var7 == 2) { + var8 = var5 + 11; + } + + if (var7 == 3) { + var8 = var5 + 12; + } + + if (var7 == 4) { + var8 = var5 + 13; + } + + WorldMapData_0.insertMenuItemNoShift(var6[var7], class16.colorStartTag(16776960) + var4, var8, var1, var2, var3); + } + } + } + + if (var6 != null) { + for (var7 = 4; var7 >= 0; --var7) { + if (var6[var7] != null && var6[var7].equalsIgnoreCase("Attack")) { + short var9 = 0; + if (AttackOption.AttackOption_hidden != Client.npcAttackOption) { + if (AttackOption.AttackOption_alwaysRightClick == Client.npcAttackOption || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > WorldMapIcon_1.localPlayer.combatLevel) { + var9 = 2000; + } + + var8 = 0; + if (var7 == 0) { + var8 = var9 + 9; + } + + if (var7 == 1) { + var8 = var9 + 10; + } + + if (var7 == 2) { + var8 = var9 + 11; + } + + if (var7 == 3) { + var8 = var9 + 12; + } + + if (var7 == 4) { + var8 = var9 + 13; + } + + WorldMapData_0.insertMenuItemNoShift(var6[var7], class16.colorStartTag(16776960) + var4, var8, var1, var2, var3); + } + } + } + } + + if (!var0.isFollower || !Client.followerOpsLowPriority) { + WorldMapData_0.insertMenuItemNoShift("Examine", class16.colorStartTag(16776960) + var4, 1003, var1, var2, var3); + } + } + + } + } + } } - PacketBufferNode var1 = Archive.getPacketBufferNode(ClientPacket.field2286, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(Huffman.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); } } diff --git a/runescape-client/src/main/java/class80.java b/runescape-client/src/main/java/class80.java index f6f93d32b4..940d5a0735 100644 --- a/runescape-client/src/main/java/class80.java +++ b/runescape-client/src/main/java/class80.java @@ -1,253 +1,91 @@ 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("cj") +@ObfuscatedName("ck") public class class80 { - @ObfuscatedName("nd") - @ObfuscatedGetter( - intValue = -1004570869 - ) - @Export("widgetDragDuration") - static int widgetDragDuration; - @ObfuscatedName("ql") - @ObfuscatedSignature( - signature = "Ldn;" - ) - @Export("pcmPlayer0") - static PcmPlayer pcmPlayer0; - @ObfuscatedName("k") - static final BigInteger field1140; - @ObfuscatedName("l") - static final BigInteger field1141; - @ObfuscatedName("ge") - @Export("regionMapArchives") - static byte[][] regionMapArchives; + @ObfuscatedName("u") + static final BigInteger field1108; + @ObfuscatedName("n") + static final BigInteger field1110; static { - field1140 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); - field1141 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); + field1108 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); + field1110 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); } - @ObfuscatedName("q") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "([BILjava/lang/CharSequence;B)I", - garbageValue = "0" + signature = "(Lhp;I[B[BI)V", + garbageValue = "-1438393709" ) - public static int method1979(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 & '?'); + @Export("Widget_setKey") + static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { + if (var0.field2631 == null) { + if (var2 == null) { + return; } + + var0.field2631 = new byte[11][]; + var0.field2622 = new byte[11][]; + var0.field2623 = new int[11]; + var0.field2581 = new int[11]; } - return var4 - var1; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(II)Lhj;", - garbageValue = "-1951654524" - ) - @Export("getWidget") - public static Widget getWidget(int var0) { - int var1 = var0 >> 16; - int var2 = var0 & 0xffff; - if (Widget.Widget_interfaceComponents[var1] == null || Widget.Widget_interfaceComponents[var1][var2] == null) { - boolean var3 = class162.loadInterface(var1); - if (!var3) { - return null; - } - } - - return Widget.Widget_interfaceComponents[var1][var2]; - } - - @ObfuscatedName("fy") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-817904551" - ) - static final void method1982() { - if (Client.oculusOrbState == 0) { - int var0 = Client.localPlayer.x; - int var1 = Client.localPlayer.y; - if (MouseHandler.oculusOrbFocalPointX - var0 < -500 || MouseHandler.oculusOrbFocalPointX - var0 > 500 || WorldMapArea.oculusOrbFocalPointY - var1 < -500 || WorldMapArea.oculusOrbFocalPointY - var1 > 500) { - MouseHandler.oculusOrbFocalPointX = var0; - WorldMapArea.oculusOrbFocalPointY = var1; - } - - if (var0 != MouseHandler.oculusOrbFocalPointX) { - MouseHandler.oculusOrbFocalPointX += (var0 - MouseHandler.oculusOrbFocalPointX) / 16; - } - - if (var1 != WorldMapArea.oculusOrbFocalPointY) { - WorldMapArea.oculusOrbFocalPointY += (var1 - WorldMapArea.oculusOrbFocalPointY) / 16; - } - - int var2 = MouseHandler.oculusOrbFocalPointX >> 7; - int var3 = WorldMapArea.oculusOrbFocalPointY >> 7; - int var4 = ScriptEvent.getTileHeight(MouseHandler.oculusOrbFocalPointX, WorldMapArea.oculusOrbFocalPointY, class42.plane); - int var5 = 0; - int var6; - if (var2 > 3 && var3 > 3 && var2 < 100 && var3 < 100) { - for (var6 = var2 - 4; var6 <= var2 + 4; ++var6) { - for (int var7 = var3 - 4; var7 <= var3 + 4; ++var7) { - int var8 = class42.plane; - if (var8 < 3 && (Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) { - ++var8; - } - - int var9 = var4 - Tiles.Tiles_heights[var8][var6][var7]; - if (var9 > var5) { - var5 = var9; - } - } - } - } - - var6 = var5 * 192; - if (var6 > 98048) { - var6 = 98048; - } - - if (var6 < 32768) { - var6 = 32768; - } - - if (var6 > Client.field739) { - Client.field739 += (var6 - Client.field739) / 24; - } else if (var6 < Client.field739) { - Client.field739 += (var6 - Client.field739) / 80; - } - - Client.field729 = ScriptEvent.getTileHeight(Client.localPlayer.x, Client.localPlayer.y, class42.plane) - Client.camFollowHeight; - } else if (Client.oculusOrbState == 1) { - Widget.method4090(); - short var10 = -1; - if (KeyHandler.KeyHandler_pressedKeys[33]) { - var10 = 0; - } else if (KeyHandler.KeyHandler_pressedKeys[49]) { - var10 = 1024; - } - - if (KeyHandler.KeyHandler_pressedKeys[48]) { - if (var10 == 0) { - var10 = 1792; - } else if (var10 == 1024) { - var10 = 1280; - } else { - var10 = 1536; - } - } else if (KeyHandler.KeyHandler_pressedKeys[50]) { - if (var10 == 0) { - var10 = 256; - } else if (var10 == 1024) { - var10 = 768; - } else { - var10 = 512; - } - } - - byte var11 = 0; - if (KeyHandler.KeyHandler_pressedKeys[35]) { - var11 = -1; - } else if (KeyHandler.KeyHandler_pressedKeys[51]) { - var11 = 1; - } - - int var2 = 0; - if (var10 >= 0 || var11 != 0) { - var2 = KeyHandler.KeyHandler_pressedKeys[81] ? Client.oculusOrbSlowedSpeed : Client.oculusOrbNormalSpeed; - var2 *= 16; - Client.field731 = var10; - Client.field871 = var11; - } - - if (Client.field928 < var2) { - Client.field928 += var2 / 8; - if (Client.field928 > var2) { - Client.field928 = var2; - } - } else if (Client.field928 > var2) { - Client.field928 = Client.field928 * 9 / 10; - } - - if (Client.field928 <= 0) { - Client.field731 = -1; - Client.field871 = -1; - } else { - int var3 = Client.field928 / 16; - if (Client.field731 >= 0) { - int var0 = Client.field731 - Interpreter.cameraYaw & 2047; - int var4 = Rasterizer3D.Rasterizer3D_sine[var0]; - int var5 = Rasterizer3D.Rasterizer3D_cosine[var0]; - MouseHandler.oculusOrbFocalPointX += var3 * var4 / 65536; - WorldMapArea.oculusOrbFocalPointY += var5 * var3 / 65536; - } - - if (Client.field871 != 0) { - Client.field729 += var3 * Client.field871; - if (Client.field729 > 0) { - Client.field729 = 0; - } - } - } - - if (KeyHandler.KeyHandler_pressedKeys[13]) { - DevicePcmPlayerProvider.method805(); - } - } - - if (MouseHandler.MouseHandler_currentButton == 4 && DevicePcmPlayerProvider.mouseCam) { - int var0 = MouseHandler.MouseHandler_y - Client.mouseCamClickedY; - Client.camAngleDX = var0 * 2; - Client.mouseCamClickedY = var0 != -1 && var0 != 1 ? (MouseHandler.MouseHandler_y + Client.mouseCamClickedY) / 2 : MouseHandler.MouseHandler_y; - int var1 = Client.mouseCamClickedX - MouseHandler.MouseHandler_x; - Client.camAngleDY = var1 * 2; - Client.mouseCamClickedX = var1 != -1 && var1 != 1 ? (Client.mouseCamClickedX + MouseHandler.MouseHandler_x) / 2 : MouseHandler.MouseHandler_x; + var0.field2631[var1] = var2; + if (var2 != null) { + var0.field2620 = true; } else { - if (KeyHandler.KeyHandler_pressedKeys[96]) { - Client.camAngleDY += (-24 - Client.camAngleDY) / 2; - } else if (KeyHandler.KeyHandler_pressedKeys[97]) { - Client.camAngleDY += (24 - Client.camAngleDY) / 2; - } else { - Client.camAngleDY /= 2; - } + var0.field2620 = false; - if (KeyHandler.KeyHandler_pressedKeys[98]) { - Client.camAngleDX += (12 - Client.camAngleDX) / 2; - } else if (KeyHandler.KeyHandler_pressedKeys[99]) { - Client.camAngleDX += (-12 - Client.camAngleDX) / 2; - } else { - Client.camAngleDX /= 2; + for (int var4 = 0; var4 < var0.field2631.length; ++var4) { + if (var0.field2631[var4] != null) { + var0.field2620 = true; + break; + } } - - Client.mouseCamClickedY = MouseHandler.MouseHandler_y; - Client.mouseCamClickedX = MouseHandler.MouseHandler_x; } - Client.camAngleY = Client.camAngleDY / 2 + Client.camAngleY & 2047; - Client.camAngleX += Client.camAngleDX / 2; - if (Client.camAngleX < 128) { - Client.camAngleX = 128; - } + var0.field2622[var1] = var3; + } - if (Client.camAngleX > 383) { - Client.camAngleX = 383; + @ObfuscatedName("gw") + @ObfuscatedSignature( + signature = "(Lbd;ZB)V", + 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; + } + + int var2 = var0.x >> 7; + int var3 = var0.y >> 7; + if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { + long var4 = WorldMapSprite.calculateTag(0, 0, 0, false, var0.index); + if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { + var0.isUnanimated = false; + var0.tileHeight = GrandExchangeOfferTotalQuantityComparator.getTileHeight(var0.x, var0.y, ItemContainer.plane); + var0.playerCycle = Client.cycle; + Player.scene.addNullableObject(ItemContainer.plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.field603, var0.field604, var0.field616, var0.field606); + } 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 = GrandExchangeOfferTotalQuantityComparator.getTileHeight(var0.x, var0.y, ItemContainer.plane); + var0.playerCycle = Client.cycle; + Player.scene.drawEntity(ItemContainer.plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); + } + } } } diff --git a/runescape-client/src/main/java/class81.java b/runescape-client/src/main/java/class81.java index 6dd106fcd9..b48b10ccdf 100644 --- a/runescape-client/src/main/java/class81.java +++ b/runescape-client/src/main/java/class81.java @@ -1,84 +1,16 @@ -import java.awt.Component; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cl") +@ObfuscatedName("cc") public class class81 { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Ljava/awt/Component;I)V", - garbageValue = "481246027" + signature = "(Lby;I)V", + garbageValue = "1766301676" ) - static void method1990(Component var0) { - var0.setFocusTraversalKeysEnabled(false); - var0.addKeyListener(KeyHandler.KeyHandler_instance); - var0.addFocusListener(KeyHandler.KeyHandler_instance); - } - - @ObfuscatedName("fm") - @ObfuscatedSignature( - signature = "(IIII)V", - garbageValue = "1510929763" - ) - @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("ho") - @ObfuscatedSignature( - signature = "(ILjava/lang/String;I)V", - garbageValue = "-1296265536" - ) - static void method1988(int var0, String var1) { - int var2 = Players.Players_count; - int[] var3 = Players.Players_indices; - boolean var4 = false; - Username var5 = new Username(var1, class40.loginType); - - for (int var6 = 0; var6 < var2; ++var6) { - Player var7 = Client.players[var3[var6]]; - if (var7 != null && var7 != Client.localPlayer && var7.username != null && var7.username.equals(var5)) { - PacketBufferNode var8; - if (var0 == 1) { - var8 = Archive.getPacketBufferNode(ClientPacket.field2250, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var3[var6]); - var8.packetBuffer.method5521(0); - Client.packetWriter.addNode(var8); - } else if (var0 == 4) { - var8 = Archive.getPacketBufferNode(ClientPacket.field2230, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5475(var3[var6]); - var8.packetBuffer.method5521(0); - Client.packetWriter.addNode(var8); - } else if (var0 == 6) { - var8 = Archive.getPacketBufferNode(ClientPacket.field2257, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5530(var3[var6]); - var8.packetBuffer.method5502(0); - Client.packetWriter.addNode(var8); - } else if (var0 == 7) { - var8 = Archive.getPacketBufferNode(ClientPacket.field2278, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5502(0); - var8.packetBuffer.writeShortLE(var3[var6]); - Client.packetWriter.addNode(var8); - } - - var4 = true; - break; - } - } - - if (!var4) { - ScriptEvent.addGameMessage(4, "", "Unable to find " + var1); - } - + @Export("runScriptEvent") + public static void runScriptEvent(ScriptEvent var0) { + WorldMapIcon_1.runScript(var0, 500000); } } diff --git a/runescape-client/src/main/java/class83.java b/runescape-client/src/main/java/class83.java index 9cb4bbbfaa..82840dc188 100644 --- a/runescape-client/src/main/java/class83.java +++ b/runescape-client/src/main/java/class83.java @@ -1,286 +1,106 @@ +import java.io.IOException; import java.math.BigInteger; 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("cy") +@ObfuscatedName("cf") public class class83 { - @ObfuscatedName("qj") - @ObfuscatedGetter( - intValue = -297282221 + @ObfuscatedName("s") + static final BigInteger field1138; + @ObfuscatedName("j") + static final BigInteger field1137; + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "Llq;" ) - static int field1166; - @ObfuscatedName("q") - static final BigInteger field1165; - @ObfuscatedName("w") - static final BigInteger field1162; + static IndexedSprite field1136; static { - field1165 = new BigInteger("10001", 16); - field1162 = new BigInteger("83ff79a3e258b99ead1a70e1049883e78e513c4cdec538d8da9483879a9f81689c0c7d146d7b82b52d05cf26132b1cda5930eeef894e4ccf3d41eebc3aabe54598c4ca48eb5a31d736bfeea17875a35558b9e3fcd4aebe2a9cc970312a477771b36e173dc2ece6001ab895c553e2770de40073ea278026f36961c94428d8d7db", 16); + field1138 = new BigInteger("10001", 16); + field1137 = new BigInteger("83ff79a3e258b99ead1a70e1049883e78e513c4cdec538d8da9483879a9f81689c0c7d146d7b82b52d05cf26132b1cda5930eeef894e4ccf3d41eebc3aabe54598c4ca48eb5a31d736bfeea17875a35558b9e3fcd4aebe2a9cc970312a477771b36e173dc2ece6001ab895c553e2770de40073ea278026f36961c94428d8d7db", 16); } - @ObfuscatedName("w") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IIILiy;II)V", - garbageValue = "1789870821" + signature = "(Lkg;ZI)V", + garbageValue = "-1903041730" ) - @Export("newObjectSound") - static void newObjectSound(int plane, int x, int y, ObjectDefinition object, int rotation) { - ObjectSound var5 = new ObjectSound(); - var5.plane = plane; - var5.x = x * 128; - var5.y = y * 16384; - int var6 = object.sizeX; - int var7 = object.sizeY; - if (rotation == 1 || rotation == 3) { - var6 = object.sizeY; - var7 = object.sizeX; + @Export("NetCache_connect") + public static void NetCache_connect(AbstractSocket var0, boolean var1) { + if (NetCache.NetCache_socket != null) { + try { + NetCache.NetCache_socket.close(); + } catch (Exception var6) { + } + + NetCache.NetCache_socket = null; } - var5.field1077 = (var6 + x) * 16384; - var5.field1082 = (var7 + y) * 16384; - var5.soundEffectId = object.ambientSoundId; - var5.field1091 = object.int4 * 128; - var5.field1086 = object.int5; - var5.field1081 = object.int6; - var5.soundEffectIds = object.soundEffectIds; - if (object.transforms != null) { - var5.obj = object; - var5.set(); - } + NetCache.NetCache_socket = var0; + NPC.method1977(var1); + NetCache.NetCache_responseHeaderBuffer.offset = 0; + NetCache.NetCache_currentResponse = null; + NetCache.NetCache_responseArchiveBuffer = null; + NetCache.field3156 = 0; - ObjectSound.objectSounds.addFirst(var5); - if (var5.soundEffectIds != null) { - var5.field1089 = var5.field1086 + (int)(Math.random() * (double)(var5.field1081 - var5.field1086)); - } + 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.field3159 != 0) { + try { + Buffer var7 = new Buffer(4); + var7.writeByte(4); + var7.writeByte(NetCache.field3159); + var7.writeShort(0); + NetCache.NetCache_socket.write(var7.array, 0, 4); + } catch (IOException var5) { + try { + NetCache.NetCache_socket.close(); + } catch (Exception var4) { + } + ++NetCache.NetCache_ioExceptions; + NetCache.NetCache_socket = null; + } + } + + NetCache.NetCache_loadTime = 0; + NetCache.field3145 = SequenceDefinition.method4686(); + 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; + } } - @ObfuscatedName("l") + @ObfuscatedName("fd") @ObfuscatedSignature( - signature = "(ILcx;ZI)I", - garbageValue = "-9434950" + signature = "(II)V", + garbageValue = "1982108989" ) - static int method1994(int var0, Script var1, boolean var2) { - int var4 = -1; - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var3 = class80.getWidget(var4); - } else { - var3 = var2 ? Interpreter.field1111 : Calendar.field2507; + static final void method1997(int var0) { + class65.method1182(); + switch(var0) { + case 1: + PendingSpawn.method1661(); + break; + case 2: + Login.loginIndex = 24; + GrandExchangeOfferOwnWorldComparator.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); } - if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3.scrollX = Interpreter.Interpreter_intStack[HealthBarUpdate.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[HealthBarUpdate.Interpreter_intStackSize + 1]; - if (var3.scrollY > var3.scrollHeight - var3.height) { - var3.scrollY = var3.scrollHeight - var3.height; - } - - if (var3.scrollY < 0) { - var3.scrollY = 0; - } - - Strings.invalidateWidget(var3); - return 1; - } - if (var0 == ScriptOpcodes.CC_SETCOLOUR) { - var3.color = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Strings.invalidateWidget(var3); - return 1; - } - if (var0 == ScriptOpcodes.CC_SETFILL) { - var3.fill = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - Strings.invalidateWidget(var3); - return 1; - } - if (var0 == ScriptOpcodes.CC_SETTRANS) { - var3.transparencyTop = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Strings.invalidateWidget(var3); - return 1; - } - if (var0 == ScriptOpcodes.CC_SETLINEWID) { - var3.lineWid = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Strings.invalidateWidget(var3); - return 1; - } - if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { - var3.spriteId2 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Strings.invalidateWidget(var3); - return 1; - } - if (var0 == ScriptOpcodes.CC_SET2DANGLE) { - var3.spriteAngle = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Strings.invalidateWidget(var3); - return 1; - } - if (var0 == ScriptOpcodes.CC_SETTILING) { - var3.spriteTiling = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - Strings.invalidateWidget(var3); - return 1; - } - if (var0 == ScriptOpcodes.CC_SETMODEL) { - var3.modelType = 1; - var3.modelId = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Strings.invalidateWidget(var3); - return 1; - } - if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { - HealthBarUpdate.Interpreter_intStackSize -= 6; - var3.modelOffsetX = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var3.modelOffsetY = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - var3.modelAngleX = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2]; - var3.modelAngleY = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 3]; - var3.modelAngleZ = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 4]; - var3.modelZoom = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 5]; - Strings.invalidateWidget(var3); - return 1; - } - int var8; - if (var0 == ScriptOpcodes.CC_SETMODELANIM) { - var8 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - if (var8 != var3.sequenceId) { - var3.sequenceId = var8; - var3.modelFrame = 0; - var3.modelFrameCycle = 0; - Strings.invalidateWidget(var3); - } - - return 1; - } - if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { - var3.modelOrthog = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - Strings.invalidateWidget(var3); - return 1; - } - if (var0 == ScriptOpcodes.CC_SETTEXT) { - String var7 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - if (!var7.equals(var3.text)) { - var3.text = var7; - Strings.invalidateWidget(var3); - } - - return 1; - } - if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { - var3.fontId = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Strings.invalidateWidget(var3); - return 1; - } - if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { - HealthBarUpdate.Interpreter_intStackSize -= 3; - var3.textXAlignment = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var3.textYAlignment = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - var3.textLineHeight = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2]; - Strings.invalidateWidget(var3); - return 1; - } - if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { - var3.textShadowed = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - Strings.invalidateWidget(var3); - return 1; - } - if (var0 == ScriptOpcodes.CC_SETOUTLINE) { - var3.outline = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Strings.invalidateWidget(var3); - return 1; - } - if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { - var3.spriteShadow = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Strings.invalidateWidget(var3); - return 1; - } - if (var0 == ScriptOpcodes.CC_SETVFLIP) { - var3.spriteFlipV = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - Strings.invalidateWidget(var3); - return 1; - } - if (var0 == ScriptOpcodes.CC_SETHFLIP) { - var3.spriteFlipH = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - Strings.invalidateWidget(var3); - return 1; - } - if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3.scrollWidth = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var3.scrollHeight = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Strings.invalidateWidget(var3); - if (var4 != -1 && var3.type == 0) { - WorldMapSprite.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var4 >> 16], var3, false); - } - - return 1; - } - if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { - ScriptFrame.resumePauseWidget(var3.id, var3.childIndex); - Client.meslayerContinueWidget = var3; - Strings.invalidateWidget(var3); - return 1; - } - if (var0 == 1122) { - var3.spriteId = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Strings.invalidateWidget(var3); - return 1; - } - if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { - var3.color2 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Strings.invalidateWidget(var3); - return 1; - } - if (var0 == 1124) { - var3.transparencyBot = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Strings.invalidateWidget(var3); - return 1; - } - if (var0 == ScriptOpcodes.CC_SETFILLMODE) { - var8 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - FillMode var6 = (FillMode)SoundSystem.findEnumerated(PcmPlayer.FillMode_values(), var8); - if (var6 != null) { - var3.fillMode = var6; - Strings.invalidateWidget(var3); - } - - return 1; - } - boolean var5; - if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { - var5 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - var3.field2598 = var5; - return 1; - } - if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { - var5 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - var3.modelTransparency = var5; - return 1; - } - return 2; - } - - @ObfuscatedName("gp") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1224050195" - ) - @Export("getHighestVisiblePlane") - static final int getHighestVisiblePlane() { - if (WorldMapLabelSize.clientPreferences.roofsHidden) { - return class42.plane; - } - int var0 = ScriptEvent.getTileHeight(PacketBuffer.cameraX, class1.cameraZ, class42.plane); - return var0 - class43.cameraY < 800 && (Tiles.Tiles_renderFlags[class42.plane][PacketBuffer.cameraX >> 7][class1.cameraZ >> 7] & 4) != 0 ? class42.plane : 3; } } diff --git a/runescape-client/src/main/java/class96.java b/runescape-client/src/main/java/class96.java index 83c3102fd8..8d66b8bc25 100644 --- a/runescape-client/src/main/java/class96.java +++ b/runescape-client/src/main/java/class96.java @@ -1,427 +1,42 @@ -import java.io.IOException; 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("cv") +@ObfuscatedName("cz") public class class96 { - @ObfuscatedName("qm") - @ObfuscatedGetter( - intValue = 164873785 - ) - static int field1327; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lju;" + signature = "Ljp;" ) @Export("reflectionChecks") - static IterableNodeDeque reflectionChecks; - @ObfuscatedName("az") + public static IterableNodeDeque reflectionChecks; + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lls;" + signature = "Llq;" ) - static Bounds field1325; + static IndexedSprite field1303; + @ObfuscatedName("kk") + @ObfuscatedGetter( + intValue = -894552657 + ) + @Export("menuY") + static int menuY; static { reflectionChecks = new IterableNodeDeque(); } - @ObfuscatedName("w") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(Lbb;II)V", - garbageValue = "-806238798" + signature = "(II)Ljava/lang/String;", + garbageValue = "-1331218775" ) - @Export("runScript") - static void runScript(ScriptEvent var0, int var1) { - Object[] var2 = var0.args; - Script var3; - int var17; - if (PacketBufferNode.isWorldMapEvent(var0.type)) { - WorldMapIcon_0.worldMapEvent = (WorldMapEvent)var2[0]; - WorldMapElement var4 = class222.WorldMapElement_get(WorldMapIcon_0.worldMapEvent.mapElement); - var3 = ObjectSound.getWorldMapScript(var0.type, var4.objectId, var4.category); + static final String method2201(int var0) { + if (var0 < 100000) { + return "" + var0 + ""; } else { - var17 = (Integer)var2[0]; - var3 = ViewportMouse.getScript(var17); + return var0 < 10000000 ? "" + var0 / 1000 + "K" + "" : "" + var0 / 1000000 + "M" + ""; } - - if (var3 == null) { - return; - } - HealthBarUpdate.Interpreter_intStackSize = 0; - Skills.Interpreter_stringStackSize = 0; - var17 = -1; - int[] var5 = var3.opcodes; - int[] var6 = var3.intOperands; - byte var7 = -1; - Interpreter.Interpreter_frameDepth = 0; - Interpreter.field1104 = false; - - try { - Interpreter.Interpreter_intLocals = new int[var3.localIntCount]; - int var8 = 0; - GZipDecompressor.Interpreter_stringLocals = new String[var3.localStringCount]; - int var9 = 0; - - int var11; - String var18; - for (int var10 = 1; var10 < var2.length; ++var10) { - if (var2[var10] instanceof Integer) { - var11 = (Integer)var2[var10]; - if (var11 == 0x80000001) { - var11 = var0.mouseX; - } - - if (var11 == 0x80000002) { - var11 = var0.mouseY; - } - - if (var11 == 0x80000003) { - var11 = var0.widget != null ? var0.widget.id : -1; - } - - if (var11 == 0x80000004) { - var11 = var0.opIndex; - } - - if (var11 == 0x80000005) { - var11 = var0.widget != null ? var0.widget.childIndex : -1; - } - - if (var11 == 0x80000006) { - var11 = var0.dragTarget != null ? var0.dragTarget.id : -1; - } - - if (var11 == 0x80000007) { - var11 = var0.dragTarget != null ? var0.dragTarget.childIndex : -1; - } - - if (var11 == 0x80000008) { - var11 = var0.keyTyped; - } - - if (var11 == 0x80000009) { - 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; - } - - GZipDecompressor.Interpreter_stringLocals[var9++] = var18; - } - } - - int var10 = 0; - Interpreter.field1106 = var0.field583; - - while (++var10 <= var1) { - int var29 = var5[++var17]; - int var20; - if (var29 >= 100) { - boolean var32; - if (var3.intOperands[var17] == 1) { - var32 = true; - } else { - var32 = false; - } - - var20 = NPC.method1977(var29, var3, var32); - switch (var20) { - case 0: - return; - case 1: - default: - break; - case 2: - throw new IllegalStateException(); - } - } else if (var29 == 0) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6[var17]; - } else if (var29 == ScriptOpcodes.GET_VARP) { - var11 = var6[var17]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Varps.Varps_main[var11]; - } else if (var29 == ScriptOpcodes.SET_VARP) { - var11 = var6[var17]; - Varps.Varps_main[var11] = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - GrandExchangeOfferUnitPriceComparator.method124(var11); - } else if (var29 == ScriptOpcodes.SCONST) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.stringOperands[var17]; - } else if (var29 == ScriptOpcodes.JUMP) { - var17 += var6[var17]; - } else if (var29 == ScriptOpcodes.IF_ICMPNE) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.IF_ICMPEQ) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.IF_ICMPLT) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.IF_ICMPGT) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[HealthBarUpdate.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; - GZipDecompressor.Interpreter_stringLocals = var34.stringLocals; - } else if (var29 == ScriptOpcodes.GET_VARBIT) { - var11 = var6[var17]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = GrandExchangeOfferOwnWorldComparator.getVarbit(var11); - } else if (var29 == ScriptOpcodes.SET_VARBIT) { - var11 = var6[var17]; - NetSocket.method3554(var11, Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - } else if (var29 == ScriptOpcodes.IF_ICMPLE) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.IF_ICMPGE) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.ILOAD) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Interpreter.Interpreter_intLocals[var6[var17]]; - } else if (var29 == ScriptOpcodes.ISTORE) { - Interpreter.Interpreter_intLocals[var6[var17]] = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - } else if (var29 == ScriptOpcodes.SLOAD) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = GZipDecompressor.Interpreter_stringLocals[var6[var17]]; - } else if (var29 == ScriptOpcodes.SSTORE) { - GZipDecompressor.Interpreter_stringLocals[var6[var17]] = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - } else if (var29 == ScriptOpcodes.JOIN_STRING) { - var11 = var6[var17]; - Skills.Interpreter_stringStackSize -= var11; - String var31 = Timer.method5015(Interpreter.Interpreter_stringStack, Skills.Interpreter_stringStackSize, var11); - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var31; - } else if (var29 == ScriptOpcodes.POP_INT) { - --HealthBarUpdate.Interpreter_intStackSize; - } else if (var29 == ScriptOpcodes.POP_STRING) { - --Skills.Interpreter_stringStackSize; - } else if (var29 == ScriptOpcodes.INVOKE) { - var11 = var6[var17]; - Script var12 = ViewportMouse.getScript(var11); - int[] var13 = new int[var12.localIntCount]; - String[] var14 = new String[var12.localStringCount]; - - for (int var15 = 0; var15 < var12.intArgumentCount; ++var15) { - var13[var15] = Interpreter.Interpreter_intStack[var15 + (HealthBarUpdate.Interpreter_intStackSize - var12.intArgumentCount)]; - } - - for (int var15 = 0; var15 < var12.stringArgumentCount; ++var15) { - var14[var15] = Interpreter.Interpreter_stringStack[var15 + (Skills.Interpreter_stringStackSize - var12.stringArgumentCount)]; - } - - HealthBarUpdate.Interpreter_intStackSize -= var12.intArgumentCount; - Skills.Interpreter_stringStackSize -= var12.stringArgumentCount; - ScriptFrame var19 = new ScriptFrame(); - var19.script = var3; - var19.pc = var17; - var19.intLocals = Interpreter.Interpreter_intLocals; - var19.stringLocals = GZipDecompressor.Interpreter_stringLocals; - Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var19; - var3 = var12; - var5 = var12.opcodes; - var6 = var12.intOperands; - var17 = -1; - Interpreter.Interpreter_intLocals = var13; - GZipDecompressor.Interpreter_stringLocals = var14; - } else if (var29 == ScriptOpcodes.GET_VARC_INT) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Clock.varcs.getInt(var6[var17]); - } else if (var29 == ScriptOpcodes.SET_VARC_INT) { - Clock.varcs.setInt(var6[var17], Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - } else if (var29 == ScriptOpcodes.DEFINE_ARRAY) { - var11 = var6[var17] >> 16; - var20 = var6[var17] & 0xffff; - int var21 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - if (var21 < 0 || var21 > 5000) { - throw new RuntimeException(); - } - - Interpreter.Interpreter_arrayLengths[var11] = var21; - byte var22 = -1; - if (var20 == 105) { - var22 = 0; - } - - for (int 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[--HealthBarUpdate.Interpreter_intStackSize]; - if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { - throw new RuntimeException(); - } - - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var11][var20]; - } else if (var29 == ScriptOpcodes.SET_ARRAY_INT) { - var11 = var6[var17]; - HealthBarUpdate.Interpreter_intStackSize -= 2; - var20 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { - throw new RuntimeException(); - } - - Interpreter.Interpreter_arrays[var11][var20] = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - } else if (var29 == ScriptOpcodes.GET_VARC_STRING_OLD) { - var18 = Clock.varcs.getStringOld(var6[var17]); - if (var18 == null) { - var18 = "null"; - } - - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var18; - } else if (var29 == ScriptOpcodes.SET_VARC_STRING_OLD) { - Clock.varcs.setStringOld(var6[var17], Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]); - } else if (var29 == ScriptOpcodes.GET_VARC_STRING) { - var18 = Clock.varcs.getString(var6[var17]); - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var18; - } else if (var29 == ScriptOpcodes.SET_VARC_STRING) { - Clock.varcs.setString(var6[var17], Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]); - } else if (var29 == ScriptOpcodes.SWITCH) { - IterableNodeHashTable var33 = var3.switches[var6[var17]]; - IntegerNode var30 = (IntegerNode) var33.get((long) Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - if (var30 != null) { - var17 += var30.integer; - } - } else { - throw new IllegalStateException(); - } - } - - throw new RuntimeException(); - } catch (Exception var27) { - StringBuilder var24 = new StringBuilder(30); - var24.append("").append(var3.key).append(" "); - - for (int var10 = Interpreter.Interpreter_frameDepth - 1; var10 >= 0; --var10) { - var24.append("").append(Interpreter.Interpreter_frames[var10].script.key).append(" "); - } - - var24.append("").append(var7); - HitSplatDefinition.RunException_sendStackTrace(var24.toString(), var27); - } finally { - if (Interpreter.field1104) { - Interpreter.field1105 = true; - GrandExchangeEvent.method73(); - Interpreter.field1105 = false; - Interpreter.field1104 = false; - } - } - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "-2113880295" - ) - public static boolean method2266(int var0) { - return (var0 >> 21 & 1) != 0; - } - - @ObfuscatedName("ei") - @ObfuscatedSignature( - signature = "(IS)V", - garbageValue = "-12345" - ) - @Export("updateGameState") - static void updateGameState(int var0) { - if (var0 == Client.gameState) { - return; - } - if (Client.gameState == 0) { - WorldMapSprite.client.method885(); - } - - if (var0 == 20 || var0 == 40 || var0 == 45) { - Client.loginState = 0; - Client.field687 = 0; - Client.field688 = 0; - Client.timer.method4996(var0); - if (var0 != 20) { - GrandExchangeOffer.method99(false); - } - } - - if (var0 != 20 && var0 != 40 && class269.field3563 != null) { - class269.field3563.close(); - class269.field3563 = null; - } - - if (Client.gameState == 25) { - Client.field709 = 0; - Client.field705 = 0; - Client.field706 = 1; - Client.field707 = 0; - Client.field896 = 1; - } - - if (var0 == 5 || var0 == 10) { - BufferedSource.method5892(WorldMapLabelSize.archive10, Client.archive8, true, 0); - } else if (var0 == 20) { - BufferedSource.method5892(WorldMapLabelSize.archive10, Client.archive8, true, Client.gameState == 11 ? 4 : 0); - } else if (var0 == 11) { - BufferedSource.method5892(WorldMapLabelSize.archive10, Client.archive8, false, 4); - } else if (Login.field1179) { - Login.titleboxSprite = null; - VarpDefinition.titlebuttonSprite = null; - Login.runesSprite = null; - GrandExchangeOfferWorldComparator.leftTitleSprite = null; - NPC.rightTitleSprite = null; - TileItem.logoSprite = null; - Login.title_muteSprite = null; - Login.options_buttons_0Sprite = null; - Decimator.options_buttons_2Sprite = null; - WorldMapID.worldSelectBackSprites = null; - SecureRandomCallable.worldSelectFlagSprites = null; - class225.worldSelectArrows = null; - FriendSystem.worldSelectStars = null; - class30.field264 = null; - Ignored.loginScreenRunesAnimation.method1720(); - class40.method729(2); - if (NetCache.NetCache_socket != null) { - try { - Buffer var1 = new Buffer(4); - var1.writeByte(2); - 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; - } - } - - Login.field1179 = false; - } - - Client.gameState = var0; } } diff --git a/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java b/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java index 739bbbb533..c4236130f5 100644 --- a/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java +++ b/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java @@ -66,7 +66,6 @@ public class ScriptOpcodes { public static final int CC_SETSCROLLSIZE = 1120; public static final int CC_RESUME_PAUSEBUTTON = 1121; public static final int CC_SETFILLCOLOUR = 1123; - public static final int CC_SETTRANSBOT = 1124; public static final int CC_SETFILLMODE = 1125; public static final int CC_SETLINEDIRECTION = 1126; public static final int CC_SETMODELTRANSPARENT = 1127; @@ -173,7 +172,6 @@ public class ScriptOpcodes { public static final int IF_SETTRANSBOT = 2124; public static final int IF_SETFILLMODE = 2125; public static final int IF_SETLINEDIRECTION = 2126; - public static final int IF_SETMODELTRANSPARENT = 2127; public static final int IF_SETOBJECT = 2200; public static final int IF_SETNPCHEAD = 2201; public static final int IF_SETPLAYERHEAD_SELF = 2202;